Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 01:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pci/alexander-msi' into next

Browse Source 
* pci/alexander-msi:
  x86/MSI: Conserve interrupt resources when using multiple-MSIs
  PCI: Allocate only as many MSI vectors as requested by driver
This commit is contained in:
Bjorn Helgaas 2013-06-05 11:15:41 -06:00
commit 06886e8043
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/iommu/irq_remapping.c
View File

@ -51,26 +51,27 @@ static void irq_remapping_disable_io_apic(void)
static int do_setup_msi_irqs(struct pci_dev *dev, int nvec) static int do_setup_msi_irqs(struct pci_dev *dev, int nvec)
{ {
int node, ret, sub_handle, index = 0; int node, ret, sub_handle, nvec_pow2, index = 0;
unsigned int irq; unsigned int irq;
struct msi_desc *msidesc; struct msi_desc *msidesc;
nvec = __roundup_pow_of_two(nvec);
WARN_ON(!list_is_singular(&dev->msi_list)); WARN_ON(!list_is_singular(&dev->msi_list));
msidesc = list_entry(dev->msi_list.next, struct msi_desc, list); msidesc = list_entry(dev->msi_list.next, struct msi_desc, list);
WARN_ON(msidesc->irq); WARN_ON(msidesc->irq);
WARN_ON(msidesc->msi_attrib.multiple); WARN_ON(msidesc->msi_attrib.multiple);
WARN_ON(msidesc->nvec_used);
node = dev_to_node(&dev->dev); node = dev_to_node(&dev->dev);
irq = __create_irqs(get_nr_irqs_gsi(), nvec, node); irq = __create_irqs(get_nr_irqs_gsi(), nvec, node);
if (irq == 0) if (irq == 0)
return -ENOSPC; return -ENOSPC;
msidesc->msi_attrib.multiple = ilog2(nvec); nvec_pow2 = __roundup_pow_of_two(nvec);
msidesc->nvec_used = nvec;
msidesc->msi_attrib.multiple = ilog2(nvec_pow2);
for (sub_handle = 0; sub_handle < nvec; sub_handle++) { for (sub_handle = 0; sub_handle < nvec; sub_handle++) {
if (!sub_handle) { if (!sub_handle) {
index = msi_alloc_remapped_irq(dev, irq, nvec); index = msi_alloc_remapped_irq(dev, irq, nvec_pow2);
if (index < 0) { if (index < 0) {
ret = index; ret = index;
goto error; goto error;
@ -95,6 +96,7 @@ error:
* IRQs from tearing down again in default_teardown_msi_irqs() * IRQs from tearing down again in default_teardown_msi_irqs()
*/ */
msidesc->irq = 0; msidesc->irq = 0;
msidesc->nvec_used = 0;
msidesc->msi_attrib.multiple = 0; msidesc->msi_attrib.multiple = 0;
return ret; return ret;

6
drivers/pci/msi.c
View File

@ -81,6 +81,9 @@ void default_teardown_msi_irqs(struct pci_dev *dev)
int i, nvec; int i, nvec;
if (entry->irq == 0) if (entry->irq == 0)
continue; continue;
if (entry->nvec_used)
nvec = entry->nvec_used;
else
nvec = 1 << entry->msi_attrib.multiple; nvec = 1 << entry->msi_attrib.multiple;
for (i = 0; i < nvec; i++) for (i = 0; i < nvec; i++)
arch_teardown_msi_irq(entry->irq + i); arch_teardown_msi_irq(entry->irq + i);
@ -336,6 +339,9 @@ static void free_msi_irqs(struct pci_dev *dev)
int i, nvec; int i, nvec;
if (!entry->irq) if (!entry->irq)
continue; continue;
if (entry->nvec_used)
nvec = entry->nvec_used;
else
nvec = 1 << entry->msi_attrib.multiple; nvec = 1 << entry->msi_attrib.multiple;
#ifdef CONFIG_GENERIC_HARDIRQS #ifdef CONFIG_GENERIC_HARDIRQS
for (i = 0; i < nvec; i++) for (i = 0; i < nvec; i++)

1
include/linux/msi.h
View File

@ -35,6 +35,7 @@ struct msi_desc {
u32 masked; /* mask bits */ u32 masked; /* mask bits */
unsigned int irq; unsigned int irq;
unsigned int nvec_used; /* number of messages */
struct list_head list; struct list_head list;
union { union {