From 05d7ee9d87bebc7e27f1da329d76fa1a8bba8f51 Mon Sep 17 00:00:00 2001 From: kettenis Date: Sat, 1 Jan 2022 18:54:09 +0000 Subject: [PATCH] Revert the hack for Apple M1 systems. ok patrick@ --- sys/arch/arm64/arm64/cpu.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/arch/arm64/arm64/cpu.c b/sys/arch/arm64/arm64/cpu.c index e1771226794..de47b83b8eb 100644 --- a/sys/arch/arm64/arm64/cpu.c +++ b/sys/arch/arm64/arm64/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.59 2021/11/26 14:45:13 jsg Exp $ */ +/* $OpenBSD: cpu.c,v 1.60 2022/01/01 18:54:09 kettenis Exp $ */ /* * Copyright (c) 2016 Dale Rahn @@ -638,17 +638,12 @@ cpu_attach(struct device *parent, struct device *dev, void *aux) #ifdef MULTIPROCESSOR if (ci->ci_flags & CPUF_AP) { - uint64_t midr = READ_SPECIALREG(midr_el1); char buf[32]; uint64_t spinup_data = 0; int spinup_method = 0; int timeout = 10000; int len; - /* XXX SMP on Apple CPUs is busted. */ - if (CPU_IMPL(midr) == CPU_IMPL_APPLE) - ci->ci_smt_id = 1; - len = OF_getprop(ci->ci_node, "enable-method", buf, sizeof(buf)); if (strcmp(buf, "psci") == 0) { -- 2.20.1