From: kettenis Date: Thu, 16 Jun 2022 20:44:09 +0000 (+0000) Subject: The 64-core versions of the Ampere Altra SoC still have 80 redistributors. X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=8624b7892d57930179c47966f7524b08183757d6;p=openbsd The 64-core versions of the Ampere Altra SoC still have 80 redistributors. Presumably these are the same silicon and the 64-core version just has some of the cores disabled. This means that the redistributors don't necessarily all match up with a core that is actually enabled. So remove the panic that would happen if we found a redistributor without a matching core. ok patrick@, deraadt@ --- diff --git a/sys/arch/arm64/dev/agintc.c b/sys/arch/arm64/dev/agintc.c index d62dd41ee13..ec744b0669b 100644 --- a/sys/arch/arm64/dev/agintc.c +++ b/sys/arch/arm64/dev/agintc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agintc.c,v 1.36 2022/01/02 20:00:21 kettenis Exp $ */ +/* $OpenBSD: agintc.c,v 1.37 2022/06/16 20:44:09 kettenis Exp $ */ /* * Copyright (c) 2007, 2009, 2011, 2017 Dale Rahn * Copyright (c) 2018 Mark Kettenis @@ -453,11 +453,6 @@ agintc_attach(struct device *parent, struct device *self, void *aux) } if (ci != NULL) sc->sc_cpuremap[ci->ci_cpuid] = nredist; -#ifdef MULTIPROCESSOR - else - panic("%s: no CPU found for affinity %08x", - sc->sc_sbus.sc_dev.dv_xname, affinity); -#endif sc->sc_processor[nredist] = bus_space_read_8(sc->sc_iot, sc->sc_redist_base, offset + GICR_TYPER) >> 8;