History

Merge tag 'pci-v4.13-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI fix from Bjorn Helgaas: "Remove needlessly alarming MSI affinity warning (this is not actually a bug fix, but the warning prompts unnecessary bug reports)" * tag 'pci-v4.13-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: PCI/MSI: Don't warn when irq_create_affinity_masks() returns NULL

Linus Torvalds committed 9 years ago

Commit 9716bdb2 parents c153e62 8e1101d1 file · +3 −10Browse files

Unified · Split

drivers/pci/msi.c+3−10
@@ -538,12 +538,9 @@ msi_setup_entry(struct pci_dev *dev, int nvec, const struct irq_affinity *affd) · 537 unmodified lines
538 struct msi_desc *entry;538 struct msi_desc *entry;
539 u16 control;539 u16 control;
540 540
541 if (affd) {541 if (affd)
542 masks = irq_create_affinity_masks(nvec, affd);542 masks = irq_create_affinity_masks(nvec, affd);
543 if (!masks)543
544 dev_err(&dev->dev, "can't allocate MSI affinity masks for %d vectors\n",
545 nvec);
546 }
547 544
548 /* MSI Entry Initialization */545 /* MSI Entry Initialization */
549 entry = alloc_msi_entry(&dev->dev, nvec, masks);546 entry = alloc_msi_entry(&dev->dev, nvec, masks);
@@ -679,12 +676,8 @@ static int msix_setup_entries(struct pci_dev *dev, void __iomem *base, · 129 unmodified lines
679 struct msi_desc *entry;676 struct msi_desc *entry;
680 int ret, i;677 int ret, i;
681 678
682 if (affd) {679 if (affd)
683 masks = irq_create_affinity_masks(nvec, affd);680 masks = irq_create_affinity_masks(nvec, affd);
684 if (!masks)
685 dev_err(&dev->dev, "can't allocate MSI-X affinity masks for %d vectors\n",
686 nvec);
687 }
688 681
689 for (i = 0, curmsk = masks; i < nvec; i++) {682 for (i = 0, curmsk = masks; i < nvec; i++) {
690 entry = alloc_msi_entry(&dev->dev, 1, curmsk);683 entry = alloc_msi_entry(&dev->dev, 1, curmsk);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t