Commit 0df18ff3 authored Apr 14, 2008 by Yinghai Lu Committed by Jesse Barnes May 05, 2008

x86 PCI: call dmi_check_pciprobe()



this change:

| commit 08f1c192
| Author: Muli Ben-Yehuda <muli@il.ibm.com>
| Date:   Sun Jul 22 00:23:39 2007 +0300
|
|    x86-64: introduce struct pci_sysdata to facilitate sharing of ->sysdata
|
|    This patch introduces struct pci_sysdata to x86 and x86-64, and
|    converts the existing two users (NUMA, Calgary) to use it.
|
|    This lays the groundwork for having other users of sysdata, such as
|    the PCI domains work.
|
|    The Calgary bits are tested, the NUMA bits just look ok.

replaces pcibios_scan_root with pci_scan_bus_parented...

but in pcibios_scan_root we have a DMI check:

    dmi_check_system(pciprobe_dmi_table);

when when have several peer root buses this could be called multiple
times (which is bad), so move that call to pci_access_init().

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

parent 13a6ddb0

arch/x86/pci/common.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -362,13 +362,16 @@ static struct dmi_system_id __devinitdata pciprobe_dmi_table[] = {
		{}
		};

		void __init dmi_check_pciprobe(void)
		{
		dmi_check_system(pciprobe_dmi_table);
		}

		struct pci_bus * __devinit pcibios_scan_root(int busnum)
		{
		struct pci_bus *bus = NULL;
		struct pci_sysdata *sd;

		dmi_check_system(pciprobe_dmi_table);

		while ((bus = pci_find_next_bus(bus)) != NULL) {
		if (bus->number == busnum) {
		/* Already scanned */

arch/x86/pci/init.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,8 @@ static __init int pci_access_init(void)
		printk(KERN_ERR
		"PCI: Fatal: No config space access function found\n");

		dmi_check_pciprobe();

		dmi_check_skip_isa_align();

		return 0;

arch/x86/pci/pci.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ enum pci_bf_sort_state {
		pci_dmi_bf,
		};

		extern void __init dmi_check_pciprobe(void);
		extern void __init dmi_check_skip_isa_align(void);

		/* pci-i386.c */

Admin message