Commit 17f2d86f authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/numa-cleanup' into next 

* pci/numa-cleanup:
  ACPI / numa: Use __weak, not the gcc-specific version
  ACPI / numa: Make __acpi_map_pxm_to_node(), acpi_get_pxm() static
  ACPI / numa: Simplify acpi_get_node() style
  ACPI / numa: Fix acpi_get_node() prototype
  ia64: Remove acpi_get_pxm() usage
  ia64 / sba_iommu: Use NUMA_NO_NODE, not MAX_NUMNODES, for unknown node
  x86/PCI: Remove acpi_get_pxm() usage
  x86/PCI: Use NUMA_NO_NODE, not -1, for unknown node
  x86/PCI: Remove unnecessary list_empty(&pci_root_infos) check
  x86/PCI: Remove mp_bus_to_node[], set_mp_bus_to_node(), get_mp_bus_to_node()
  x86/PCI: Use x86_pci_root_bus_node() instead of get_mp_bus_to_node()
  x86/PCI: Add x86_pci_root_bus_node() to look up NUMA node from PCI bus
  x86/PCI: Drop return value of pcibios_scan_root()
  x86/PCI: Merge pci_scan_bus_on_node() into pcibios_scan_root()
  x86/PCI: Use pcibios_scan_root() instead of pci_scan_bus_on_node()
  x86/PCI: Use pcibios_scan_root() instead of pci_scan_bus_with_sysdata()
  x86/PCI: Drop pcibios_scan_root() check for bus already scanned
parents 38dbfb59 beffbe54

arch/ia64/hp/common/sba_iommu.c

+11 −21
Original line number Diff line number Diff line
@@ -1140,11 +1140,13 @@ sba_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, 


#ifdef CONFIG_NUMA

	{

		int node = ioc->node;

		struct page *page;

		page = alloc_pages_exact_node(ioc->node == MAX_NUMNODES ?

		                        numa_node_id() : ioc->node, flags,

		                        get_order(size));



		if (node == NUMA_NO_NODE)

			node = numa_node_id();



		page = alloc_pages_exact_node(node, flags, get_order(size));

		if (unlikely(!page))

			return NULL;
@@ -1914,7 +1916,7 @@ ioc_show(struct seq_file *s, void *v) 
	seq_printf(s, "Hewlett Packard %s IOC rev %d.%d\n",

		ioc->name, ((ioc->rev >> 4) & 0xF), (ioc->rev & 0xF));

#ifdef CONFIG_NUMA

	if (ioc->node != MAX_NUMNODES)

	if (ioc->node != NUMA_NO_NODE)

		seq_printf(s, "NUMA node       : %d\n", ioc->node);

#endif

	seq_printf(s, "IOVA size       : %ld MB\n", ((ioc->pdir_size >> 3) * iovp_size)/(1024*1024));
@@ -2015,31 +2017,19 @@ sba_connect_bus(struct pci_bus *bus) 
	printk(KERN_WARNING "No IOC for PCI Bus %04x:%02x in ACPI\n", pci_domain_nr(bus), bus->number);

}



#ifdef CONFIG_NUMA

static void __init

sba_map_ioc_to_node(struct ioc *ioc, acpi_handle handle)

{

#ifdef CONFIG_NUMA

	unsigned int node;

	int pxm;



	ioc->node = MAX_NUMNODES;



	pxm = acpi_get_pxm(handle);



	if (pxm < 0)

		return;



	node = pxm_to_node(pxm);



	if (node >= MAX_NUMNODES || !node_online(node))

		return;

	node = acpi_get_node(handle);

	if (node != NUMA_NO_NODE && !node_online(node))

		node = NUMA_NO_NODE;



	ioc->node = node;

	return;

}

#else

#define sba_map_ioc_to_node(ioc, handle)

#endif

}



static int __init

acpi_sba_ioc_add(struct acpi_device *device,

arch/ia64/include/asm/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ struct pci_controller { 
	struct acpi_device *companion;

	void *iommu;

	int segment;

	int node;		/* nearest node with memory or -1 for global allocation */

	int node;		/* nearest node with memory or NUMA_NO_NODE for global allocation */



	void *platform_data;

};

arch/ia64/kernel/acpi.c

+7 −21
Original line number Diff line number Diff line
@@ -803,14 +803,9 @@ int acpi_isa_irq_to_gsi(unsigned isa_irq, u32 *gsi) 
 *  ACPI based hotplug CPU support

 */

#ifdef CONFIG_ACPI_HOTPLUG_CPU

static

int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)

static int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)

{

#ifdef CONFIG_ACPI_NUMA

	int pxm_id;

	int nid;



	pxm_id = acpi_get_pxm(handle);

	/*

	 * We don't have cpu-only-node hotadd. But if the system equips

	 * SRAT table, pxm is already found and node is ready.
@@ -818,11 +813,10 @@ int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid) 
	 * This code here is for the system which doesn't have full SRAT

  	 * table for possible cpus.

	 */

	nid = acpi_map_pxm_to_node(pxm_id);

	node_cpuid[cpu].phys_id = physid;

	node_cpuid[cpu].nid = nid;

	node_cpuid[cpu].nid = acpi_get_node(handle);

#endif

	return (0);

	return 0;

}



int additional_cpus __initdata = -1;
@@ -929,7 +923,7 @@ static acpi_status acpi_map_iosapic(acpi_handle handle, u32 depth, 
	union acpi_object *obj;

	struct acpi_madt_io_sapic *iosapic;

	unsigned int gsi_base;

	int pxm, node;

	int node;



	/* Only care about objects w/ a method that returns the MADT */

	if (ACPI_FAILURE(acpi_evaluate_object(handle, "_MAT", NULL, &buffer)))
@@ -956,17 +950,9 @@ static acpi_status acpi_map_iosapic(acpi_handle handle, u32 depth, 


	kfree(buffer.pointer);



	/*

	 * OK, it's an IOSAPIC MADT entry, look for a _PXM value to tell

	 * us which node to associate this with.

	 */

	pxm = acpi_get_pxm(handle);

	if (pxm < 0)

		return AE_OK;



	node = pxm_to_node(pxm);



	if (node >= MAX_NUMNODES || !node_online(node) ||

	/* OK, it's an IOSAPIC MADT entry; associate it with a node */

	node = acpi_get_node(handle);

	if (node == NUMA_NO_NODE || !node_online(node) ||

	    cpumask_empty(cpumask_of_node(node)))

		return AE_OK;

arch/ia64/pci/pci.c

+2 −8
Original line number Diff line number Diff line
@@ -126,7 +126,6 @@ static struct pci_controller *alloc_pci_controller(int seg) 
		return NULL;



	controller->segment = seg;

	controller->node = -1;

	return controller;

}
@@ -430,19 +429,14 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) 
	struct pci_root_info *info = NULL;

	int busnum = root->secondary.start;

	struct pci_bus *pbus;

	int pxm, ret;

	int ret;



	controller = alloc_pci_controller(domain);

	if (!controller)

		return NULL;



	controller->companion = device;



	pxm = acpi_get_pxm(device->handle);

#ifdef CONFIG_NUMA

	if (pxm >= 0)

		controller->node = pxm_to_node(pxm);

#endif

	controller->node = acpi_get_node(device->handle);



	info = kzalloc(sizeof(*info), GFP_KERNEL);

	if (!info) {

arch/x86/include/asm/pci.h

+1 −6
Original line number Diff line number Diff line
@@ -26,11 +26,6 @@ extern int pci_routeirq; 
extern int noioapicquirk;

extern int noioapicreroute;



/* scan a bus after allocating a pci_sysdata for it */

extern struct pci_bus *pci_scan_bus_on_node(int busno, struct pci_ops *ops,

					    int node);

extern struct pci_bus *pci_scan_bus_with_sysdata(int busno);



#ifdef CONFIG_PCI



#ifdef CONFIG_PCI_DOMAINS
@@ -70,7 +65,7 @@ extern unsigned long pci_mem_start; 


extern int pcibios_enabled;

void pcibios_config_init(void);

struct pci_bus *pcibios_scan_root(int bus);

void pcibios_scan_root(int bus);



void pcibios_set_master(struct pci_dev *dev);

void pcibios_penalize_isa_irq(int irq, int active);

CRA Git | Maintained and supported by SUSTech CRA and CCSE