change the pci ordering patch

2 files changed, 41 insertions, 65 deletions

diff --git a/pci/pci-give-pci-config-access-initialization-a-defined-ordering.patch b/pci/i386-pci-ordering.patch
index 28586405592ee..9fc34bbbef840 100644
--- a/pci/pci-give-pci-config-access-initialization-a-defined-ordering.patch
+++ b/pci/i386-pci-ordering.patch
@@ -2,11 +2,6 @@ From ak@suse.de Fri Feb 10 02:47:08 2006
 From: Andi Kleen <ak@suse.de>
 To: Greg KH <greg@kroah.com>
 Subject: PCI: Give PCI config access initialization a defined ordering
-Date: Fri, 10 Feb 2006 11:46:29 +0100
-Cc: Stephen Hemminger <shemminger@osdl.org>, Matthew Wilcox <matthew@wil.cx>
-Content-Disposition: inline
-Message-Id: <200602101146.30126.ak@suse.de>
-
 
 I moved it to a separate function which is safer.
 
@@ -16,10 +11,13 @@ over the better ones.
 
 Fixes some problems with broken MMCONFIG
 
+Cc: Dave Hansen <haveblue@us.ibm.com>
 Signed-off-by: Andi Kleen <ak@suse.de>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 ---
+
+---
  arch/i386/pci/Makefile   |    2 +-
  arch/i386/pci/direct.c   |   15 +++++----------
  arch/i386/pci/init.c     |   25 +++++++++++++++++++++++++
@@ -27,7 +25,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  arch/i386/pci/pcbios.c   |    4 +---
  arch/i386/pci/pci.h      |    3 +++
  arch/x86_64/pci/Makefile |    3 ++-
- 7 files changed, 40 insertions(+), 23 deletions(-)
+ include/asm-i386/acpi.h  |    9 ++++++---
+ 8 files changed, 46 insertions(+), 26 deletions(-)
 
 --- gregkh-2.6.orig/arch/i386/pci/Makefile
 +++ gregkh-2.6/arch/i386/pci/Makefile
@@ -102,13 +101,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +#endif
 +	if (raw_pci_ops)
 +		return 0;
-+#ifdef CONFIG_PCI_DIRECT
-+	pci_direct_init();
++#ifdef CONFIG_PCI_BIOS
++	pci_pcbios_init();
 +#endif
 +	if (raw_pci_ops)
 +		return 0;
-+#ifdef CONFIG_PCI_BIOS
-+	pci_pcbios_init();
++#ifdef CONFIG_PCI_DIRECT
++	pci_direct_init();
 +#endif
 +	return 0;
 +}
@@ -188,3 +187,35 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  fixup-y  += ../../i386/pci/fixup.o
  i386-y  += ../../i386/pci/i386.o
 +init-y += ../../i386/pci/init.o
+--- gregkh-2.6.orig/include/asm-i386/acpi.h
++++ gregkh-2.6/include/asm-i386/acpi.h
+@@ -103,6 +103,12 @@ __acpi_release_global_lock (unsigned int
+         :"=r"(n_hi), "=r"(n_lo)     \
+         :"0"(n_hi), "1"(n_lo))
+ 
++#ifdef CONFIG_X86_IO_APIC
++extern void check_acpi_pci(void);
++#else
++static inline void check_acpi_pci(void) { }
++#endif
++
+ #ifdef CONFIG_ACPI 
+ extern int acpi_lapic;
+ extern int acpi_ioapic;
+@@ -128,7 +134,6 @@ extern int acpi_gsi_to_irq(u32 gsi, unsi
+ extern int skip_ioapic_setup;
+ extern int acpi_skip_timer_override;
+ 
+-extern void check_acpi_pci(void);
+ 
+ static inline void disable_ioapic_setup(void)
+ {
+@@ -142,8 +147,6 @@ static inline int ioapic_setup_disabled(
+ 
+ #else
+ static inline void disable_ioapic_setup(void) { }
+-static inline void check_acpi_pci(void) { }
+-
+ #endif
+ 
+ static inline void acpi_noirq_set(void) { acpi_noirq = 1; }
diff --git a/pci/pci-i386-run-bios-pci-detection-before-direct.patch b/pci/pci-i386-run-bios-pci-detection-before-direct.patch
deleted file mode 100644
index 3ef9a677480a1..0000000000000
--- a/pci/pci-i386-run-bios-pci-detection-before-direct.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From haveblue@us.ibm.com  Thu Mar 16 16:14:54 2006
-From: Dave Hansen <haveblue@us.ibm.com>
-Subject: PCI: i386: run BIOS PCI detection before direct
-To: linux-kernel@vger.kernel.org
-Cc: <akpm@osdl.org>, <ak@suse.de>, <gregkh@suse.de>,
-	Dave Hansen <haveblue@us.ibm.com>
-Date: Thu, 16 Mar 2006 16:03:03 -0800
-Message-Id: <20060317000303.13252107@localhost.localdomain>
-
-
-from 2.6.16-rc3-mm1 through at least 2.6.16-rc6-mm1 a patch from
-Andi Kleen, titled
-
-        x86_64-i386-pci-ordering.patch
-
-which is now called:
-
-	gregkh-pci-pci-give-pci-config-access-initialization-a-defined-ordering.patch
-
-has caused a 4-way PIII Xeon (non-NUMA) to stop detecting its SCSI
-card.  I believe this is also the issue keeping -mm from booting
-on "elm3b67" from http://test.kernel.org/. 
-
-The following patch reverts the ordering of the PCI detection code
-to always run the BIOS initialization, first.  As far as I can
-tell, this was the original behavior, and it makes my machine boot
-again.
-
-Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
----
-
- arch/i386/pci/init.c |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- gregkh-2.6.orig/arch/i386/pci/init.c
-+++ gregkh-2.6/arch/i386/pci/init.c
-@@ -12,13 +12,13 @@ static __init int pci_access_init(void)
- #endif
- 	if (raw_pci_ops)
- 		return 0;
--#ifdef CONFIG_PCI_DIRECT
--	pci_direct_init();
-+#ifdef CONFIG_PCI_BIOS
-+	pci_pcbios_init();
- #endif
- 	if (raw_pci_ops)
- 		return 0;
--#ifdef CONFIG_PCI_BIOS
--	pci_pcbios_init();
-+#ifdef CONFIG_PCI_DIRECT
-+	pci_direct_init();
- #endif
- 	return 0;
- }