From 763864aa95c744b7fa4fd25e9231fb47c83205b1 Mon Sep 17 00:00:00 2001 From: Nathan Whitehorn Date: Sat, 25 Nov 2017 21:46:51 +0000 Subject: [PATCH] Do not bind to CPUs with SMT, which use a different CPU numbering convention that does not play well with this driver. MFC after: 2 weeks --- sys/dev/ofw/ofw_cpu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/ofw/ofw_cpu.c b/sys/dev/ofw/ofw_cpu.c index 782f56af52a..b1d5b9d2d18 100644 --- a/sys/dev/ofw/ofw_cpu.c +++ b/sys/dev/ofw/ofw_cpu.c @@ -191,6 +191,10 @@ ofw_cpu_probe(device_t dev) if (type == NULL || strcmp(type, "cpu") != 0) return (ENXIO); + /* Skip SMT CPUs, which we can't reasonably represent with this code */ + if (OF_hasprop(ofw_bus_get_node(dev), "ibm,ppc-interrupt-server#s")) + return (ENXIO); + device_set_desc(dev, "Open Firmware CPU"); return (0); }