From 04e917ff22d33c0ca0bcdf97ca6a77cabb0bfc13 Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Tue, 7 Nov 2006 18:21:21 +1100 Subject: [PATCH] --- yaml --- r: 41207 b: refs/heads/master c: e65e5fb5ceb02aaea7b65bf8b3b0d0c9057718b6 h: refs/heads/master i: 41205: 48e77cb15aa237a81ce921c1193d82d82b1886ef 41203: d48e331f932f2d372766938072332b24099e85b7 41199: 9de893c5643ddfb100e2df824f002348d227ec88 v: v3 --- [refs] | 2 +- trunk/drivers/pci/msi.h | 8 -------- trunk/include/linux/pci_regs.h | 6 ++++++ 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index d6b977a48b19..902e192a6a33 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 009af1ff78bfc30b9a27807dd0207fc32848218a +refs/heads/master: e65e5fb5ceb02aaea7b65bf8b3b0d0c9057718b6 diff --git a/trunk/drivers/pci/msi.h b/trunk/drivers/pci/msi.h index f0cca1772f9c..3898f5237144 100644 --- a/trunk/drivers/pci/msi.h +++ b/trunk/drivers/pci/msi.h @@ -6,14 +6,6 @@ #ifndef MSI_H #define MSI_H -/* - * MSI-X Address Register - */ -#define PCI_MSIX_FLAGS_QSIZE 0x7FF -#define PCI_MSIX_FLAGS_ENABLE (1 << 15) -#define PCI_MSIX_FLAGS_BIRMASK (7 << 0) -#define PCI_MSIX_FLAGS_BITMASK (1 << 0) - #define PCI_MSIX_ENTRY_SIZE 16 #define PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET 0 #define PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET 4 diff --git a/trunk/include/linux/pci_regs.h b/trunk/include/linux/pci_regs.h index c321316f1bc7..064b1dc71c22 100644 --- a/trunk/include/linux/pci_regs.h +++ b/trunk/include/linux/pci_regs.h @@ -292,6 +292,12 @@ #define PCI_MSI_DATA_64 12 /* 16 bits of data for 64-bit devices */ #define PCI_MSI_MASK_BIT 16 /* Mask bits register */ +/* MSI-X registers (these are at offset PCI_MSI_FLAGS) */ +#define PCI_MSIX_FLAGS_QSIZE 0x7FF +#define PCI_MSIX_FLAGS_ENABLE (1 << 15) +#define PCI_MSIX_FLAGS_BIRMASK (7 << 0) +#define PCI_MSIX_FLAGS_BITMASK (1 << 0) + /* CompactPCI Hotswap Register */ #define PCI_CHSWP_CSR 2 /* Control and Status Register */