Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b87e81e5 authored by yakui.zhao@intel.com's avatar yakui.zhao@intel.com Committed by Linus Torvalds
Browse files

acpi: unneccessary to scan the PCI bus already scanned 

http://bugzilla.kernel.org/show_bug.cgi?id=10124



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 by pci_scan_bus_parented...

but in pcibios_scan_root we have a check about scanned busses.

Cc: <yakui.zhao@intel.com>
Cc: Stian Jordet <stian@jordet.net>
Cc: Len Brown <lenb@kernel.org>
Cc: Greg KH <greg@kroah.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "Yinghai Lu" <yhlu.kernel@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5f1a3f2a

arch/ia64/pci/pci.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -362,7 +362,12 @@ pci_acpi_scan_root(struct acpi_device *device, int domain, int bus) 
	info.name = name;

	info.name = name;

	acpi_walk_resources(device->handle, METHOD_NAME__CRS, add_window,

	acpi_walk_resources(device->handle, METHOD_NAME__CRS, add_window,

			&info);

			&info);



	/*

	 * See arch/x86/pci/acpi.c.

	 * The desired pci bus might already be scanned in a quirk. We

	 * should handle the case here, but it appears that IA64 hasn't

	 * such quirk. So we just ignore the case now.

	 */

	pbus = pci_scan_bus_parented(NULL, bus, &pci_root_ops, controller);

	pbus = pci_scan_bus_parented(NULL, bus, &pci_root_ops, controller);

	if (pbus)

	if (pbus)

		pcibios_setup_root_windows(pbus, controller);

		pcibios_setup_root_windows(pbus, controller);

arch/x86/pci/acpi.c

+15 −2
Original line number Original line Diff line number Diff line
@@ -219,8 +219,21 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int do 
	if (pxm >= 0)

	if (pxm >= 0)

		sd->node = pxm_to_node(pxm);

		sd->node = pxm_to_node(pxm);

#endif

#endif



	/*

	 * Maybe the desired pci bus has been already scanned. In such case

	 * it is unnecessary to scan the pci bus with the given domain,busnum.

	 */

	bus = pci_find_bus(domain, busnum);

	if (bus) {

		/*

		 * If the desired bus exits, the content of bus->sysdata will

		 * be replaced by sd.

		 */

		memcpy(bus->sysdata, sd, sizeof(*sd));

		kfree(sd);

	} else

		bus = pci_scan_bus_parented(NULL, busnum, &pci_root_ops, sd);

		bus = pci_scan_bus_parented(NULL, busnum, &pci_root_ops, sd);



	if (!bus)

	if (!bus)

		kfree(sd);

		kfree(sd);
@@ -228,7 +241,7 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int do 
	if (bus != NULL) {

	if (bus != NULL) {

		if (pxm >= 0) {

		if (pxm >= 0) {

			printk("bus %d -> pxm %d -> node %d\n",

			printk("bus %d -> pxm %d -> node %d\n",

				busnum, pxm, sd->node);

				busnum, pxm, pxm_to_node(pxm));

		}

		}

	}

	}

#endif

#endif