From 115c987b3f80a23936de527de434ebb77b06bddd Mon Sep 17 00:00:00 2001 From: Brandon Bergren Date: Mon, 14 Sep 2020 15:20:37 +0000 Subject: [PATCH] [PowerPC] Make cpu frequency detection endian-independent On ibm,extended-clock-frequency, ensure we be64toh() the value. On clock-frequency, remove the right-shifting hack (which was needed due to reading a 32 bit value into a 64 bit variable) and switch to OF_getencprop() for reading (which will handle endian conversion internally.) Reviewed by: jhibbits (in irc) Sponsored by: Tag1 Consulting, Inc. --- sys/powerpc/powerpc/cpu.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/powerpc/powerpc/cpu.c b/sys/powerpc/powerpc/cpu.c index ad30d2853d0..ca4671ad761 100644 --- a/sys/powerpc/powerpc/cpu.c +++ b/sys/powerpc/powerpc/cpu.c @@ -72,6 +72,7 @@ #include #include #include +#include #include #include @@ -358,6 +359,7 @@ cpu_est_clockrate(int cpu_id, uint64_t *cps) uint16_t vers; register_t msr; phandle_t cpu, dev, root; + uint32_t freq32; int res = 0; char buf[8]; @@ -428,10 +430,11 @@ cpu_est_clockrate(int cpu_id, uint64_t *cps) return (ENOENT); if (OF_getprop(cpu, "ibm,extended-clock-frequency", cps, sizeof(*cps)) >= 0) { + *cps = be64toh(*cps); return (0); - } else if (OF_getprop(cpu, "clock-frequency", cps, - sizeof(cell_t)) >= 0) { - *cps >>= 32; + } else if (OF_getencprop(cpu, "clock-frequency", + &freq32, sizeof(freq32)) >= 0) { + *cps = freq32; return (0); } else { return (ENOENT);