Kaynağa Gözat

[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 19 yıl önce
ebeveyn
işleme
284a940675
1 değiştirilmiş dosya ile 8 ekleme ve 2 silme
  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;
 }
 }