diff options
| author | Matthew Wilcox <willy@linux.intel.com> | 2009-03-17 08:54:08 -0400 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-03-20 10:48:13 -0700 |
| commit | 264d9caaa1c574c0274b019a810abfe957391005 (patch) | |
| tree | 06ac3d9df11a0e64e2f8571145e8865424fb7dc6 | |
| parent | 379f5327a86f7822a51ec7d088a085167724df75 (diff) | |
| download | kernel_samsung_espresso10-264d9caaa1c574c0274b019a810abfe957391005.zip kernel_samsung_espresso10-264d9caaa1c574c0274b019a810abfe957391005.tar.gz kernel_samsung_espresso10-264d9caaa1c574c0274b019a810abfe957391005.tar.bz2 | |
PCI MSI: Use mask_pos instead of mask_base when appropriate
MSI interrupts have a mask_pos where MSI-X have a mask_base. Use a
transparent union to get rid of some ugly casts.
Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
| -rw-r--r-- | drivers/pci/msi.c | 5 | ||||
| -rw-r--r-- | include/linux/msi.h | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index a658c0f..fcde04d 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -145,7 +145,7 @@ static int msi_set_mask_bits(struct irq_desc *desc, u32 mask, u32 flag) if (!entry->msi_attrib.maskbit) return 0; - pos = (long)entry->mask_base; + pos = entry->mask_pos; pci_read_config_dword(entry->dev, pos, &mask_bits); mask_bits &= ~mask; mask_bits |= flag & mask; @@ -363,8 +363,7 @@ static int msi_capability_init(struct pci_dev *dev) unsigned int base, maskbits, temp; base = msi_mask_bits_reg(pos, entry->msi_attrib.is_64); - entry->mask_base = (void __iomem *)(long)base; - + entry->mask_pos = base; /* All MSIs are unmasked by default, Mask them all */ pci_read_config_dword(dev, base, &maskbits); temp = msi_mask((control & PCI_MSI_FLAGS_QMASK) >> 1); diff --git a/include/linux/msi.h b/include/linux/msi.h index 9c5ce21..5025ca4 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -33,7 +33,10 @@ struct msi_desc { unsigned int irq; struct list_head list; - void __iomem *mask_base; + union { + void __iomem *mask_base; + u8 mask_pos; + }; struct pci_dev *dev; /* Last set MSI message */ |