On Mon, Oct 24, 2022 at 09:24:14AM +0200, Otto Moerbeek wrote:
> Hello,
>
> after updating my M1 macmini after my vacatiuon to the latest snap it
> seems to have lost a few sysctl nodes, making apm(8) fail:
>
> [otto@macmini:4]$ ktrace apm
> Battery state: unknown, 0% remaining, unknown life estimate
> AC adapter state: not known
> Performance adjustment mode: invalid (0 MHz)
>
> ...
> 88255 apm CALL sysctl(6.12<hw.cpuspeed>,0x7fffff10d4,0x7fffff10c8,0,0)
> 88255 apm RET sysctl -1 errno 45 Operation not supported
> ...
>
>
> Beforre I spend time on this, does anybody have a clue?
>
> -Otto
>
I'm seeing the same on my m1 mini. Reverting the commit below fixes it
for me.
>From 7486b163f559b1a80fe0fb55e4e58a6eabb5d2c1 Mon Sep 17 00:00:00 2001
From: kettenis <kette...@openbsd.org>
Date: Tue, 18 Oct 2022 15:12:13 +0000
Subject: [PATCH] No longer match on "apple,cluster-cpufreq" compatible string.
ok miod@, kn@
---
sys/arch/arm64/dev/aplcpu.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/sys/arch/arm64/dev/aplcpu.c b/sys/arch/arm64/dev/aplcpu.c
index f6ce7cd3fba..22d672629b9 100644
--- a/sys/arch/arm64/dev/aplcpu.c
+++ b/sys/arch/arm64/dev/aplcpu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aplcpu.c,v 1.3 2022/08/25 19:16:29 kettenis Exp $ */
+/* $OpenBSD: aplcpu.c,v 1.4 2022/10/18 15:12:13 kettenis Exp $ */
/*
* Copyright (c) 2022 Mark Kettenis <kette...@openbsd.org>
*
@@ -105,9 +105,7 @@ aplcpu_match(struct device *parent, void *match, void *aux)
{
struct fdt_attach_args *faa = aux;
- /* XXX Remove "apple,cluster-cpufreq" after OpenBSD 7.2 release. */
- return OF_is_compatible(faa->fa_node, "apple,soc-cpufreq") ||
- OF_is_compatible(faa->fa_node, "apple,cluster-cpufreq");
+ return OF_is_compatible(faa->fa_node, "apple,soc-cpufreq");
}
void
--
2.38.1
