Skip to contentSkip to conversation

i386: run BIOS PCI detection before direct

PATCH In review Dave Hansen 4 participants 5 messages Mar 17, 2006 – Mar 22, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 i386: run BIOS PCI detection before direct

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.

---

 work-dave/arch/i386/pci/init.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
arch/i386/pci/init.c renamed from arch/i386/pci/init.c~run-bios-first-take2 +4 -4
diff -puN arch/i386/pci/init.c~run-bios-first-take2 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;
 }

_

#1 lore raw
Quoted 13 lines · Dave Hansen

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/.

Quoted 6 lines

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.

Ran this through the nightly regression suite on the affected machine and it boots fine with this patch applied.

-apw

#2 lore raw
Quoted 19 lines · Andy Whitcroft
Quoted 18 lines · Dave Hansen

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.

Quoted 4 lines
Quoted 1 line

Ran this through the nightly regression suite on the affected machine and it boots fine with this patch applied.

I fixed this up my copy of the patch.

Also fixed the warning with CONFIG_ACPI=n

Thanks,

-Andi

#3 lore raw
Quoted 20 lines · Andi Kleen
Quoted 19 lines · Andy Whitcroft
Quoted 18 lines · Dave Hansen

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.

Quoted 8 lines
Quoted 4 lines
Quoted 1 line

Ran this through the nightly regression suite on the affected machine and it boots fine with this patch applied.

I fixed this up my copy of the patch.

Also fixed the warning with CONFIG_ACPI=n

Care to send me that copy of the patch so I can forward it on?

thanks,

greg k-h

#4 lore raw
Quoted 2 lines · Greg KH

Care to send me that copy of the patch so I can forward it on?

ftp://ftp.firstfloor.org/pub/ak/x86_64/quilt/patches/i386-pci-ordering

-Andi