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

Commit 0e94ecd0 authored by Yinghai Lu's avatar Yinghai Lu Committed by Jesse Barnes
Browse files

x86/PCI: set_pci_bus_resources_arch_default cleanups 



Rename set_pci_bus_resources_arch_default to x86_pci_root_bus_res_quirks, move
the weak version from common.c to i386.c, and before calling, make sure it's a
root bus.

Reviewed-by: default avatarMatthew Wilcox <willy@linux.intel.com>
Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 0bb1be3e

arch/x86/include/asm/topology.h

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static inline void arch_fix_phys_package_id(int num, u32 slot) 
}



struct pci_bus;

void set_pci_bus_resources_arch_default(struct pci_bus *b);

void x86_pci_root_bus_res_quirks(struct pci_bus *b);



#ifdef CONFIG_SMP

#define mc_capable()	(cpumask_weight(cpu_core_mask(0)) != nr_cpu_ids)

arch/x86/pci/amd_bus.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ struct pci_root_info { 
static int pci_root_num;

static struct pci_root_info pci_root_info[PCI_ROOT_NR];



void set_pci_bus_resources_arch_default(struct pci_bus *b)

void x86_pci_root_bus_res_quirks(struct pci_bus *b)

{

	int i;

	int j;

arch/x86/pci/common.c

+3 −5
Original line number Diff line number Diff line
@@ -142,10 +142,6 @@ static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev) 
	}

}



void __attribute__((weak)) set_pci_bus_resources_arch_default(struct pci_bus *b)

{

}



/*

 *  Called after each bus is probed, but before its children

 *  are examined.
@@ -155,7 +151,9 @@ void __devinit pcibios_fixup_bus(struct pci_bus *b) 
{

	struct pci_dev *dev;



	set_pci_bus_resources_arch_default(b);

	/* root bus? */

	if (!b->parent)

		x86_pci_root_bus_res_quirks(b);

	pci_read_bridge_bases(b);

	list_for_each_entry(dev, &b->devices, bus_list)

		pcibios_fixup_device_resources(dev);

arch/x86/pci/i386.c

+4 −0
Original line number Diff line number Diff line
@@ -238,6 +238,10 @@ void __init pcibios_resource_survey(void) 
 */

fs_initcall(pcibios_assign_resources);



void __weak x86_pci_root_bus_res_quirks(struct pci_bus *b)

{

}



/*

 *  If we set up a device for bus mastering, we need to check the latency

 *  timer as certain crappy BIOSes forget to set it properly.