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

Commit 25453e9e authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

x86/PCI: Remove mp_bus_to_node[], set_mp_bus_to_node(), get_mp_bus_to_node() 



There are no callers of get_mp_bus_to_node(), so we no longer need
mp_bus_to_node[], get_mp_bus_to_node(), or set_mp_bus_to_node().
This removes them.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 6616dbdf

arch/x86/include/asm/topology.h

+0 −13
Original line number Diff line number Diff line
@@ -140,17 +140,4 @@ void x86_pci_root_bus_resources(int bus, struct list_head *resources); 
#define smt_capable()			(smp_num_siblings > 1)

#endif



#ifdef CONFIG_NUMA

extern int get_mp_bus_to_node(int busnum);

extern void set_mp_bus_to_node(int busnum, int node);

#else

static inline int get_mp_bus_to_node(int busnum)

{

	return 0;

}

static inline void set_mp_bus_to_node(int busnum, int node)

{

}

#endif



#endif /* _ASM_X86_TOPOLOGY_H */

arch/x86/pci/acpi.c

+1 −3
Original line number Diff line number Diff line
@@ -499,10 +499,8 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) 
	pxm = acpi_get_pxm(device->handle);

	if (pxm >= 0)

		node = pxm_to_node(pxm);

	if (node != -1)

		set_mp_bus_to_node(busnum, node);

	else

#endif

	if (node == -1)

		node = x86_pci_root_bus_node(busnum);



	if (node != -1 && !node_online(node))

arch/x86/pci/amd_bus.c

+0 −10
Original line number Diff line number Diff line
@@ -44,15 +44,6 @@ static struct pci_root_info __init *find_pci_root_info(int node, int link) 
	return NULL;

}



static void __init set_mp_bus_range_to_node(int min_bus, int max_bus, int node)

{

#ifdef CONFIG_NUMA

	int j;



	for (j = min_bus; j <= max_bus; j++)

		set_mp_bus_to_node(j, node);

#endif

}

/**

 * early_fill_mp_bus_to_node()

 * called before pcibios_scan_root and pci_scan_bus
@@ -117,7 +108,6 @@ static int __init early_fill_mp_bus_info(void) 
		min_bus = (reg >> 16) & 0xff;

		max_bus = (reg >> 24) & 0xff;

		node = (reg >> 4) & 0x07;

		set_mp_bus_range_to_node(min_bus, max_bus, node);

		link = (reg >> 8) & 0x03;



		info = alloc_pci_root_info(min_bus, max_bus, node, link);

arch/x86/pci/common.c

+0 −69
Original line number Diff line number Diff line
@@ -683,72 +683,3 @@ int pci_ext_cfg_avail(void) 
	else

		return 0;

}
 


/*

 * NUMA info for PCI busses

 *

 * Early arch code is responsible for filling in reasonable values here.

 * A node id of "-1" means "use current node".  In other words, if a bus

 * has a -1 node id, it's not tightly coupled to any particular chunk

 * of memory (as is the case on some Nehalem systems).

 */

#ifdef CONFIG_NUMA



#define BUS_NR 256



#ifdef CONFIG_X86_64



static int mp_bus_to_node[BUS_NR] = {

	[0 ... BUS_NR - 1] = -1

};



void set_mp_bus_to_node(int busnum, int node)

{

	if (busnum >= 0 &&  busnum < BUS_NR)

		mp_bus_to_node[busnum] = node;

}



int get_mp_bus_to_node(int busnum)

{

	int node = -1;



	if (busnum < 0 || busnum > (BUS_NR - 1))

		return node;



	node = mp_bus_to_node[busnum];



	/*

	 * let numa_node_id to decide it later in dma_alloc_pages

	 * if there is no ram on that node

	 */

	if (node != -1 && !node_online(node))

		node = -1;



	return node;

}



#else /* CONFIG_X86_32 */



static int mp_bus_to_node[BUS_NR] = {

	[0 ... BUS_NR - 1] = -1

};



void set_mp_bus_to_node(int busnum, int node)

{

	if (busnum >= 0 &&  busnum < BUS_NR)

	mp_bus_to_node[busnum] = (unsigned char) node;

}



int get_mp_bus_to_node(int busnum)

{

	int node;



	if (busnum < 0 || busnum > (BUS_NR - 1))

		return 0;

	node = mp_bus_to_node[busnum];

	return node;

}



#endif /* CONFIG_X86_32 */



#endif /* CONFIG_NUMA */