[PATCH] Make pci-bios function ids per machine type

Yes NEC use *different* function numbers!!

diff --git a/arch/i386/pci/pcbios.c b/arch/i386/pci/pcbios.c
index 9c34dc3772d8267c24c1ebd7781700ff692fc34b..1a21e2600964bbf53e1aa943e71d2924402f7d56 100644 (file)
--- a/arch/i386/pci/pcbios.c
+++ b/arch/i386/pci/pcbios.c
@@ -5,22 +5,9 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include "pci.h"
+#include "pci-functions.h"
 
 
-#define PCIBIOS_PCI_FUNCTION_ID        0xb1XX
-#define PCIBIOS_PCI_BIOS_PRESENT       0xb101
-#define PCIBIOS_FIND_PCI_DEVICE                0xb102
-#define PCIBIOS_FIND_PCI_CLASS_CODE    0xb103
-#define PCIBIOS_GENERATE_SPECIAL_CYCLE 0xb106
-#define PCIBIOS_READ_CONFIG_BYTE       0xb108
-#define PCIBIOS_READ_CONFIG_WORD       0xb109
-#define PCIBIOS_READ_CONFIG_DWORD      0xb10a
-#define PCIBIOS_WRITE_CONFIG_BYTE      0xb10b
-#define PCIBIOS_WRITE_CONFIG_WORD      0xb10c
-#define PCIBIOS_WRITE_CONFIG_DWORD     0xb10d
-#define PCIBIOS_GET_ROUTING_OPTIONS    0xb10e
-#define PCIBIOS_SET_PCI_HW_INT         0xb10f
-
 /* BIOS32 signature: "_32_" */
 #define BIOS32_SIGNATURE       (('_' << 0) + ('3' << 8) + ('2' << 16) + ('_' << 24))
 

diff --git a/include/asm-i386/mach-default/pci-functions.h b/include/asm-i386/mach-default/pci-functions.h
new file mode 100644 (file)
index 0000000..ed0bab4
--- /dev/null
+++ b/include/asm-i386/mach-default/pci-functions.h
@@ -0,0 +1,19 @@
+/*
+ *     PCI BIOS function numbering for conventional PCI BIOS 
+ *     systems
+ */
+
+#define PCIBIOS_PCI_FUNCTION_ID        0xb1XX
+#define PCIBIOS_PCI_BIOS_PRESENT       0xb101
+#define PCIBIOS_FIND_PCI_DEVICE                0xb102
+#define PCIBIOS_FIND_PCI_CLASS_CODE    0xb103
+#define PCIBIOS_GENERATE_SPECIAL_CYCLE 0xb106
+#define PCIBIOS_READ_CONFIG_BYTE       0xb108
+#define PCIBIOS_READ_CONFIG_WORD       0xb109
+#define PCIBIOS_READ_CONFIG_DWORD      0xb10a
+#define PCIBIOS_WRITE_CONFIG_BYTE      0xb10b
+#define PCIBIOS_WRITE_CONFIG_WORD      0xb10c
+#define PCIBIOS_WRITE_CONFIG_DWORD     0xb10d
+#define PCIBIOS_GET_ROUTING_OPTIONS    0xb10e
+#define PCIBIOS_SET_PCI_HW_INT         0xb10f
+

diff --git a/include/asm-i386/mach-pc9800/pci-functions.h b/include/asm-i386/mach-pc9800/pci-functions.h
new file mode 100644 (file)
index 0000000..9130cab
--- /dev/null
+++ b/include/asm-i386/mach-pc9800/pci-functions.h
@@ -0,0 +1,20 @@
+/*
+ *     PCI BIOS function codes for the PC9800. Different to
+ *     standard PC systems
+ */
+
+/* Note: PC-9800 confirms PCI 2.1 on only few models */
+
+#define PCIBIOS_PCI_FUNCTION_ID        0xccXX
+#define PCIBIOS_PCI_BIOS_PRESENT       0xcc81
+#define PCIBIOS_FIND_PCI_DEVICE                0xcc82
+#define PCIBIOS_FIND_PCI_CLASS_CODE    0xcc83
+/*      PCIBIOS_GENERATE_SPECIAL_CYCLE 0xcc86  (not supported by bios) */
+#define PCIBIOS_READ_CONFIG_BYTE       0xcc88
+#define PCIBIOS_READ_CONFIG_WORD       0xcc89
+#define PCIBIOS_READ_CONFIG_DWORD      0xcc8a
+#define PCIBIOS_WRITE_CONFIG_BYTE      0xcc8b
+#define PCIBIOS_WRITE_CONFIG_WORD      0xcc8c
+#define PCIBIOS_WRITE_CONFIG_DWORD     0xcc8d
+#define PCIBIOS_GET_ROUTING_OPTIONS    0xcc8e  /* PCI 2.1 only */
+#define PCIBIOS_SET_PCI_HW_INT         0xcc8f  /* PCI 2.1 only */