[pci] Formalise the PCI I/O API

4 files changed, 78 insertions, 76 deletions

diff --git a/src/arch/i386/include/bits/pci_io.h b/src/arch/i386/include/bits/pci_io.h
new file mode 100644
index 00000000..0fbb439d
--- /dev/null
+++ b/src/arch/i386/include/bits/pci_io.h
@@ -0,0 +1,13 @@
+#ifndef _BITS_PCI_IO_H
+#define _BITS_PCI_IO_H
+
+/** @file
+ *
+ * i386-specific PCI I/O API implementations
+ *
+ */
+
+#include <gpxe/pcibios.h>
+#include <gpxe/pcidirect.h>
+
+#endif /* _BITS_PCI_IO_H */
diff --git a/src/arch/i386/include/pcibios.h b/src/arch/i386/include/gpxe/pcibios.h
index 3d08d135..b86f5abd 100644
--- a/src/arch/i386/include/pcibios.h
+++ b/src/arch/i386/include/gpxe/pcibios.h
@@ -1,5 +1,5 @@
-#ifndef _PCIBIOS_H
-#define _PCIBIOS_H
+#ifndef _GPXE_PCIBIOS_H
+#define _GPXE_PCIBIOS_H
 
 #include <stdint.h>
 
@@ -9,6 +9,12 @@
  *
  */
 
+#ifdef PCIAPI_PCBIOS
+#define PCIAPI_PREFIX_pcbios
+#else
+#define PCIAPI_PREFIX_pcbios __pcbios_
+#endif
+
 struct pci_device;
 
 #define PCIBIOS_INSTALLATION_CHECK	0xb1010000
@@ -19,7 +25,6 @@ struct pci_device;
 #define PCIBIOS_WRITE_CONFIG_WORD	0xb10c0000
 #define PCIBIOS_WRITE_CONFIG_DWORD	0xb10d0000
 
-extern int pcibios_max_bus ( void );
 extern int pcibios_read ( struct pci_device *pci, uint32_t command,
 			  uint32_t *value );
 extern int pcibios_write ( struct pci_device *pci, uint32_t command,
@@ -33,9 +38,10 @@ extern int pcibios_write ( struct pci_device *pci, uint32_t command,
  * @v value	Value read
  * @ret rc	Return status code
  */
-static inline __attribute__ (( always_inline )) int
-pcibios_read_config_byte ( struct pci_device *pci, unsigned int where,
-			   uint8_t *value ) {
+static inline __always_inline int
+PCIAPI_INLINE ( pcbios, pci_read_config_byte ) ( struct pci_device *pci,
+						 unsigned int where,
+						 uint8_t *value ) {
 	uint32_t tmp;
 	int rc;
 
@@ -52,9 +58,10 @@ pcibios_read_config_byte ( struct pci_device *pci, unsigned int where,
  * @v value	Value read
  * @ret rc	Return status code
  */
-static inline __attribute__ (( always_inline )) int
-pcibios_read_config_word ( struct pci_device *pci, unsigned int where,
-			   uint16_t *value ) {
+static inline __always_inline int
+PCIAPI_INLINE ( pcbios, pci_read_config_word ) ( struct pci_device *pci,
+						 unsigned int where,
+						 uint16_t *value ) {
 	uint32_t tmp;
 	int rc;
 
@@ -71,9 +78,10 @@ pcibios_read_config_word ( struct pci_device *pci, unsigned int where,
  * @v value	Value read
  * @ret rc	Return status code
  */
-static inline __attribute__ (( always_inline )) int
-pcibios_read_config_dword ( struct pci_device *pci, unsigned int where,
-			    uint32_t *value ) {
+static inline __always_inline int
+PCIAPI_INLINE ( pcbios, pci_read_config_dword ) ( struct pci_device *pci,
+						  unsigned int where,
+						  uint32_t *value ) {
 	return pcibios_read ( pci, PCIBIOS_READ_CONFIG_DWORD | where, value );
 }
 
@@ -85,9 +93,10 @@ pcibios_read_config_dword ( struct pci_device *pci, unsigned int where,
  * @v value	Value to be written
  * @ret rc	Return status code
  */
-static inline __attribute__ (( always_inline )) int
-pcibios_write_config_byte ( struct pci_device *pci, unsigned int where,
-			    uint8_t value ) {
+static inline __always_inline int
+PCIAPI_INLINE ( pcbios, pci_write_config_byte ) ( struct pci_device *pci,
+						  unsigned int where,
+						  uint8_t value ) {
 	return pcibios_write ( pci, PCIBIOS_WRITE_CONFIG_BYTE | where, value );
 }
 
@@ -99,9 +108,10 @@ pcibios_write_config_byte ( struct pci_device *pci, unsigned int where,
  * @v value	Value to be written
  * @ret rc	Return status code
  */
-static inline __attribute__ (( always_inline )) int
-pcibios_write_config_word ( struct pci_device *pci, unsigned int where,
-			    uint16_t value ) {
+static inline __always_inline int
+PCIAPI_INLINE ( pcbios, pci_write_config_word ) ( struct pci_device *pci,
+						  unsigned int where,
+						  uint16_t value ) {
 	return pcibios_write ( pci, PCIBIOS_WRITE_CONFIG_WORD | where, value );
 }
 
@@ -113,10 +123,11 @@ pcibios_write_config_word ( struct pci_device *pci, unsigned int where,
  * @v value	Value to be written
  * @ret rc	Return status code
  */
-static inline __attribute__ (( always_inline )) int
-pcibios_write_config_dword ( struct pci_device *pci, unsigned int where,
-			     uint32_t value ) {
+static inline __always_inline int
+PCIAPI_INLINE ( pcbios, pci_write_config_dword ) ( struct pci_device *pci,
+						   unsigned int where,
+						   uint32_t value ) {
 	return pcibios_write ( pci, PCIBIOS_WRITE_CONFIG_DWORD | where, value);
 }
 
-#endif /* _PCIBIOS_H */
+#endif /* _GPXE_PCIBIOS_H */
diff --git a/src/arch/i386/include/pcidirect.h b/src/arch/i386/include/gpxe/pcidirect.h
index c333424d..fe433c6f 100644
--- a/src/arch/i386/include/pcidirect.h
+++ b/src/arch/i386/include/gpxe/pcidirect.h
@@ -4,6 +4,12 @@
 #include <stdint.h>
 #include <gpxe/io.h>
 
+#ifdef PCIAPI_DIRECT
+#define PCIAPI_PREFIX_direct
+#else
+#define PCIAPI_PREFIX_direct __direct_
+#endif
+
 /** @file
  *
  * PCI configuration space access via Type 1 accesses
@@ -22,7 +28,8 @@ extern void pcidirect_prepare ( struct pci_device *pci, int where );
  *
  * @ret max_bus		Maximum bus number
  */
-static inline int pcidirect_max_bus ( void ) {
+static inline __always_inline int
+PCIAPI_INLINE ( direct, pci_max_bus ) ( void ) {
 	/* No way to work this out via Type 1 accesses */
 	return 0xff;
 }
@@ -35,9 +42,10 @@ static inline int pcidirect_max_bus ( void ) {
  * @v value	Value read
  * @ret rc	Return status code
  */
-static inline __attribute__ (( always_inline )) int
-pcidirect_read_config_byte ( struct pci_device *pci, unsigned int where,
-			     uint8_t *value ) {
+static inline __always_inline int
+PCIAPI_INLINE ( direct, pci_read_config_byte ) ( struct pci_device *pci,
+						 unsigned int where,
+						 uint8_t *value ) {
 	pcidirect_prepare ( pci, where );
 	*value = inb ( PCIDIRECT_CONFIG_DATA + ( where & 3 ) );
 	return 0;
@@ -51,9 +59,10 @@ pcidirect_read_config_byte ( struct pci_device *pci, unsigned int where,
  * @v value	Value read
  * @ret rc	Return status code
  */
-static inline __attribute__ (( always_inline )) int
-pcidirect_read_config_word ( struct pci_device *pci, unsigned int where,
-			     uint16_t *value ) {
+static inline __always_inline int
+PCIAPI_INLINE ( direct, pci_read_config_word ) ( struct pci_device *pci,
+						 unsigned int where,
+						 uint16_t *value ) {
 	pcidirect_prepare ( pci, where );
 	*value = inw ( PCIDIRECT_CONFIG_DATA + ( where & 2 ) );
 	return 0;
@@ -67,9 +76,10 @@ pcidirect_read_config_word ( struct pci_device *pci, unsigned int where,
  * @v value	Value read
  * @ret rc	Return status code
  */
-static inline __attribute__ (( always_inline )) int
-pcidirect_read_config_dword ( struct pci_device *pci, unsigned int where,
-			      uint32_t *value ) {
+static inline __always_inline int
+PCIAPI_INLINE ( direct, pci_read_config_dword ) ( struct pci_device *pci,
+						  unsigned int where,
+						  uint32_t *value ) {
 	pcidirect_prepare ( pci, where );
 	*value = inl ( PCIDIRECT_CONFIG_DATA );
 	return 0;
@@ -83,9 +93,10 @@ pcidirect_read_config_dword ( struct pci_device *pci, unsigned int where,
  * @v value	Value to be written
  * @ret rc	Return status code
  */
-static inline __attribute__ (( always_inline )) int
-pcidirect_write_config_byte ( struct pci_device *pci, unsigned int where,
-			      uint8_t value ) {
+static inline __always_inline int
+PCIAPI_INLINE ( direct, pci_write_config_byte ) ( struct pci_device *pci,
+						  unsigned int where,
+						  uint8_t value ) {
 	pcidirect_prepare ( pci, where );
 	outb ( value, PCIDIRECT_CONFIG_DATA + ( where & 3 ) );
 	return 0;
@@ -99,9 +110,10 @@ pcidirect_write_config_byte ( struct pci_device *pci, unsigned int where,
  * @v value	Value to be written
  * @ret rc	Return status code
  */
-static inline __attribute__ (( always_inline )) int
-pcidirect_write_config_word ( struct pci_device *pci, unsigned int where,
-			      uint16_t value ) {
+static inline __always_inline int
+PCIAPI_INLINE ( direct, pci_write_config_word ) ( struct pci_device *pci,
+						  unsigned int where,
+						  uint16_t value ) {
 	pcidirect_prepare ( pci, where );
 	outw ( value, PCIDIRECT_CONFIG_DATA + ( where & 2 ) );
 	return 0;
@@ -115,9 +127,10 @@ pcidirect_write_config_word ( struct pci_device *pci, unsigned int where,
  * @v value	Value to be written
  * @ret rc	Return status code
  */
-static inline __attribute__ (( always_inline )) int
-pcidirect_write_config_dword ( struct pci_device *pci, unsigned int where,
-			       uint32_t value ) {
+static inline __always_inline int
+PCIAPI_INLINE ( direct, pci_write_config_dword ) ( struct pci_device *pci,
+						   unsigned int where,
+						   uint32_t value ) {
 	pcidirect_prepare ( pci, where );
 	outl ( value, PCIDIRECT_CONFIG_DATA );
 	return 0;
diff --git a/src/arch/i386/include/pci_io.h b/src/arch/i386/include/pci_io.h
deleted file mode 100644
index 4888d557..00000000
--- a/src/arch/i386/include/pci_io.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef _PCI_IO_H
-#define _PCI_IO_H
-
-#include <pcibios.h>
-#include <pcidirect.h>
-
-/** @file
- *
- * i386 PCI configuration space access
- *
- * We have two methods of PCI configuration space access: the PCI BIOS
- * and direct Type 1 accesses.  Selecting between them is via the
- * compile-time switch -DCONFIG_PCI_DIRECT.
- *
- */
-
-#if CONFIG_PCI_DIRECT
-#define pci_max_bus		pcidirect_max_bus
-#define pci_read_config_byte	pcidirect_read_config_byte
-#define pci_read_config_word	pcidirect_read_config_word
-#define pci_read_config_dword	pcidirect_read_config_dword
-#define pci_write_config_byte	pcidirect_write_config_byte
-#define pci_write_config_word	pcidirect_write_config_word
-#define pci_write_config_dword	pcidirect_write_config_dword
-#else /* CONFIG_PCI_DIRECT */
-#define pci_max_bus		pcibios_max_bus
-#define pci_read_config_byte	pcibios_read_config_byte
-#define pci_read_config_word	pcibios_read_config_word
-#define pci_read_config_dword	pcibios_read_config_dword
-#define pci_write_config_byte	pcibios_write_config_byte
-#define pci_write_config_word	pcibios_write_config_word
-#define pci_write_config_dword	pcibios_write_config_dword
-#endif /* CONFIG_PCI_DIRECT */
-
-#endif /* _PCI_IO_H */