瀏覽代碼

[POWERPC] Check for offline nodes in pci NUMA code

During boot we bring up all memory and cpu nodes. Normally a PCI device
will be in one of these online nodes, however in some weird setups it
may not.

We have only seen this in the lab but we may as well check for the case
and fallback to -1 (all nodes).

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Anton Blanchard 18 年之前
父節點
當前提交
284a940675
共有 1 個文件被更改,包括 8 次插入2 次删除
  1. 8 2
      arch/powerpc/kernel/pci_64.c

+ 8 - 2
arch/powerpc/kernel/pci_64.c

@@ -199,8 +199,14 @@ struct pci_controller * pcibios_alloc_controller(struct device_node *dev)
 	pci_setup_pci_controller(phb);
 	pci_setup_pci_controller(phb);
 	phb->arch_data = dev;
 	phb->arch_data = dev;
 	phb->is_dynamic = mem_init_done;
 	phb->is_dynamic = mem_init_done;
-	if (dev)
-		PHB_SET_NODE(phb, of_node_to_nid(dev));
+	if (dev) {
+		int nid = of_node_to_nid(dev);
+
+		if (nid < 0 || !node_online(nid))
+			nid = -1;
+
+		PHB_SET_NODE(phb, nid);
+	}
 	return phb;
 	return phb;
 }
 }