소스 검색

PCI: Make some MSI-X #defines generic

Move some MSI-X #defines into pci_regs.h so they can be used
outside of drivers/pci.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Michael Ellerman 18 년 전
부모
커밋
e65e5fb5ce
2개의 변경된 파일6개의 추가작업 그리고 8개의 파일을 삭제
  1. 0 8
      drivers/pci/msi.h
  2. 6 0
      include/linux/pci_regs.h

+ 0 - 8
drivers/pci/msi.h

@@ -6,14 +6,6 @@
 #ifndef MSI_H
 #ifndef MSI_H
 #define 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_SIZE			16
 #define  PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET	0
 #define  PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET	0
 #define  PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET	4
 #define  PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET	4

+ 6 - 0
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_DATA_64		12	/* 16 bits of data for 64-bit devices */
 #define PCI_MSI_MASK_BIT	16	/* Mask bits register */
 #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 */
 /* CompactPCI Hotswap Register */
 
 
 #define PCI_CHSWP_CSR		2	/* Control and Status Register */
 #define PCI_CHSWP_CSR		2	/* Control and Status Register */