On Wed, 13 Oct 2010 15:00:23 +0900 Hidetoshi Seto <seto.hidetoshi@xxxxxxxxxxxxxx> wrote: > These are already defined in pcilib's pci/header.h but not in kernel's > linux/pci_regs.h. Copy them to avoid using magic numbers. > > Signed-off-by: Hidetoshi Seto <seto.hidetoshi@xxxxxxxxxxxxxx> > --- > drivers/pci/msi.h | 4 ++-- > include/linux/pci_regs.h | 6 ++++-- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/pci/msi.h b/drivers/pci/msi.h > index de27c1c..feff3be 100644 > --- a/drivers/pci/msi.h > +++ b/drivers/pci/msi.h > @@ -22,8 +22,8 @@ > #define is_64bit_address(control) (!!(control & PCI_MSI_FLAGS_64BIT)) > #define is_mask_bit_support(control) (!!(control & PCI_MSI_FLAGS_MASKBIT)) > > -#define msix_table_offset_reg(base) (base + 0x04) > -#define msix_pba_offset_reg(base) (base + 0x08) > +#define msix_table_offset_reg(base) (base + PCI_MSIX_TABLE) > +#define msix_pba_offset_reg(base) (base + PCI_MSIX_PBA) > #define msix_table_size(control) ((control & PCI_MSIX_FLAGS_QSIZE)+1) > #define multi_msix_capable(control) msix_table_size((control)) > > diff --git a/include/linux/pci_regs.h b/include/linux/pci_regs.h > index 455b9cc..af83076 100644 > --- a/include/linux/pci_regs.h > +++ b/include/linux/pci_regs.h > @@ -300,12 +300,14 @@ > #define PCI_MSI_DATA_64 12 /* 16 bits of data for 64-bit devices */ > #define PCI_MSI_MASK_64 16 /* Mask bits register for 64-bit devices */ > > -/* MSI-X registers (these are at offset PCI_MSIX_FLAGS) */ > +/* MSI-X registers */ > #define PCI_MSIX_FLAGS 2 > #define PCI_MSIX_FLAGS_QSIZE 0x7FF > #define PCI_MSIX_FLAGS_ENABLE (1 << 15) > #define PCI_MSIX_FLAGS_MASKALL (1 << 14) > -#define PCI_MSIX_FLAGS_BIRMASK (7 << 0) > +#define PCI_MSIX_TABLE 4 > +#define PCI_MSIX_PBA 8 > +#define PCI_MSIX_FLAGS_BIRMASK (7 << 0) > > /* CompactPCI Hotswap Register */ > Applied, thanks. -- Jesse Barnes, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
