diff options
| author | Sheng Yang <sheng@linux.intel.com> | 2010-11-11 15:46:55 +0800 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-12-23 12:53:08 -0800 |
| commit | 8d805286968811223cca002134ba3d81244d5313 (patch) | |
| tree | d67154a6c21d9b0c9b71a9cf7bfc4e636737e73e | |
| parent | 00aaaef9a51a1a25c5d6d52ce510772f149a0eb0 (diff) | |
| download | kernel_samsung_aries-8d805286968811223cca002134ba3d81244d5313.zip kernel_samsung_aries-8d805286968811223cca002134ba3d81244d5313.tar.gz kernel_samsung_aries-8d805286968811223cca002134ba3d81244d5313.tar.bz2 | |
PCI: Add mask bit definition for MSI-X table
Then we can use it instead of magic number 1.
Reviewed-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Cc: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: Sheng Yang <sheng@linux.intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
| -rw-r--r-- | drivers/pci/msi.c | 5 | ||||
| -rw-r--r-- | include/linux/pci_regs.h | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 7c24dce..44b0aee 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -168,8 +168,9 @@ static u32 __msix_mask_irq(struct msi_desc *desc, u32 flag) u32 mask_bits = desc->masked; unsigned offset = desc->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE + PCI_MSIX_ENTRY_VECTOR_CTRL; - mask_bits &= ~1; - mask_bits |= flag; + mask_bits &= ~PCI_MSIX_ENTRY_CTRL_MASKBIT; + if (flag) + mask_bits |= PCI_MSIX_ENTRY_CTRL_MASKBIT; writel(mask_bits, desc->mask_base + offset); return mask_bits; diff --git a/include/linux/pci_regs.h b/include/linux/pci_regs.h index b21d33e..d4f2c80 100644 --- a/include/linux/pci_regs.h +++ b/include/linux/pci_regs.h @@ -315,6 +315,7 @@ #define PCI_MSIX_ENTRY_UPPER_ADDR 4 #define PCI_MSIX_ENTRY_DATA 8 #define PCI_MSIX_ENTRY_VECTOR_CTRL 12 +#define PCI_MSIX_ENTRY_CTRL_MASKBIT 1 /* CompactPCI Hotswap Register */ |