Module Name: src
Committed By: martin
Date: Fri Sep 20 09:33:48 UTC 2024
Modified Files:
src/sys/arch/aarch64/aarch64 [netbsd-10]: cpu.c
src/usr.sbin/cpuctl/arch [netbsd-10]: aarch64.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #869):
usr.sbin/cpuctl/arch/aarch64.c: revision 1.22
sys/arch/aarch64/aarch64/cpu.c: revision 1.73
Remove useless/harmful casts in debug messages. MPIDR AFF3 would not
be printed before.
MPIDR is 64bits. Without this AFF3 would always be zero.
Spotted by Cyprien.
To generate a diff of this commit:
cvs rdiff -u -r1.70.4.1 -r1.70.4.2 src/sys/arch/aarch64/aarch64/cpu.c
cvs rdiff -u -r1.21 -r1.21.2.1 src/usr.sbin/cpuctl/arch/aarch64.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/aarch64/cpu.c
diff -u src/sys/arch/aarch64/aarch64/cpu.c:1.70.4.1 src/sys/arch/aarch64/aarch64/cpu.c:1.70.4.2
--- src/sys/arch/aarch64/aarch64/cpu.c:1.70.4.1 Fri Dec 23 08:09:48 2022
+++ src/sys/arch/aarch64/aarch64/cpu.c Fri Sep 20 09:33:48 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.70.4.1 2022/12/23 08:09:48 martin Exp $ */
+/* $NetBSD: cpu.c,v 1.70.4.2 2024/09/20 09:33:48 martin Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <r...@nerv.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.70.4.1 2022/12/23 08:09:48 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.70.4.2 2024/09/20 09:33:48 martin Exp $");
#include "locators.h"
#include "opt_arm_debug.h"
@@ -329,8 +329,8 @@ cpu_identify2(device_t self, struct cpu_
{
struct aarch64_sysctl_cpu_id * const id = &ci->ci_id;
- aprint_debug_dev(self, "midr=0x%" PRIx32 " mpidr=0x%" PRIx32 "\n",
- (uint32_t)id->ac_midr, (uint32_t)id->ac_mpidr);
+ aprint_debug_dev(self, "midr=0x%" PRIx64 " mpidr=0x%" PRIx64 "\n",
+ id->ac_midr, id->ac_mpidr);
aprint_verbose_dev(self, "revID=0x%" PRIx64, id->ac_revidr);
/* ID_AA64DFR0_EL1 */
Index: src/usr.sbin/cpuctl/arch/aarch64.c
diff -u src/usr.sbin/cpuctl/arch/aarch64.c:1.21 src/usr.sbin/cpuctl/arch/aarch64.c:1.21.2.1
--- src/usr.sbin/cpuctl/arch/aarch64.c:1.21 Sat Apr 30 14:06:10 2022
+++ src/usr.sbin/cpuctl/arch/aarch64.c Fri Sep 20 09:33:48 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: aarch64.c,v 1.21 2022/04/30 14:06:10 ryo Exp $ */
+/* $NetBSD: aarch64.c,v 1.21.2.1 2024/09/20 09:33:48 martin Exp $ */
/*
* Copyright (c) 2018 Ryo Shimizu <r...@nerv.org>
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: aarch64.c,v 1.21 2022/04/30 14:06:10 ryo Exp $");
+__RCSID("$NetBSD: aarch64.c,v 1.21.2.1 2024/09/20 09:33:48 martin Exp $");
#endif /* no lint */
#include <sys/types.h>
@@ -1073,7 +1073,7 @@ identify_revidr(const char *cpuname, uin
/* MPIDR_EL1 - Multiprocessor Affinity Register */
static void
-identify_mpidr(const char *cpuname, uint32_t mpidr)
+identify_mpidr(const char *cpuname, uint64_t mpidr)
{
const char *setname = "multiprocessor affinity";
