Module Name: src
Committed By: skrll
Date: Fri Jan 25 18:31:44 UTC 2019
Modified Files:
src/sys/arch/arm/arm32: arm32_boot.c cpu.c
Log Message:
Make sure ci_{smt,core,package}_id are all filled in appropriately.
Previously the BP was missed and __SHIFTOUT wasn't used.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/arm/arm32/arm32_boot.c
cvs rdiff -u -r1.126 -r1.127 src/sys/arch/arm/arm32/cpu.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/arm/arm32/arm32_boot.c
diff -u src/sys/arch/arm/arm32/arm32_boot.c:1.30 src/sys/arch/arm/arm32/arm32_boot.c:1.31
--- src/sys/arch/arm/arm32/arm32_boot.c:1.30 Thu Jan 3 15:33:06 2019
+++ src/sys/arch/arm/arm32/arm32_boot.c Fri Jan 25 18:31:44 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_boot.c,v 1.30 2019/01/03 15:33:06 skrll Exp $ */
+/* $NetBSD: arm32_boot.c,v 1.31 2019/01/25 18:31:44 skrll Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -122,7 +122,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.30 2019/01/03 15:33:06 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.31 2019/01/25 18:31:44 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_cputypes.h"
@@ -352,12 +352,12 @@ cpu_hatch(struct cpu_info *ci, u_int cpu
uint32_t mpidr = armreg_mpidr_read();
ci->ci_mpidr = mpidr;
if (mpidr & MPIDR_MT) {
- ci->ci_smt_id = mpidr & MPIDR_AFF0;
- ci->ci_core_id = mpidr & MPIDR_AFF1;
- ci->ci_package_id = mpidr & MPIDR_AFF2;
+ ci->ci_smt_id = __SHIFTOUT(mpidr, MPIDR_AFF0);
+ ci->ci_core_id = __SHIFTOUT(mpidr, MPIDR_AFF1);
+ ci->ci_package_id = __SHIFTOUT(mpidr, MPIDR_AFF2);
} else {
- ci->ci_core_id = mpidr & MPIDR_AFF0;
- ci->ci_package_id = mpidr & MPIDR_AFF1;
+ ci->ci_core_id = __SHIFTOUT(mpidr, MPIDR_AFF0);
+ ci->ci_package_id = __SHIFTOUT(mpidr, MPIDR_AFF1);
}
ci->ci_arm_cpuid = cpu_idnum();
Index: src/sys/arch/arm/arm32/cpu.c
diff -u src/sys/arch/arm/arm32/cpu.c:1.126 src/sys/arch/arm/arm32/cpu.c:1.127
--- src/sys/arch/arm/arm32/cpu.c:1.126 Thu Jan 3 15:12:00 2019
+++ src/sys/arch/arm/arm32/cpu.c Fri Jan 25 18:31:44 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.126 2019/01/03 15:12:00 jmcneill Exp $ */
+/* $NetBSD: cpu.c,v 1.127 2019/01/25 18:31:44 skrll Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@@ -46,7 +46,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.126 2019/01/03 15:12:00 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.127 2019/01/25 18:31:44 skrll Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -103,7 +103,17 @@ cpu_attach(device_t dv, cpuid_t id)
ci->ci_arm_cputype = ci->ci_arm_cpuid & CPU_ID_CPU_MASK;
ci->ci_arm_cpurev = ci->ci_arm_cpuid & CPU_ID_REVISION_MASK;
#ifdef MULTIPROCESSOR
- ci->ci_mpidr = armreg_mpidr_read();
+ uint32_t mpidr = armreg_mpidr_read();
+ ci->ci_mpidr = mpidr;
+
+ if (mpidr & MPIDR_MT) {
+ ci->ci_smt_id = __SHIFTOUT(mpidr, MPIDR_AFF0);
+ ci->ci_core_id = __SHIFTOUT(mpidr, MPIDR_AFF1);
+ ci->ci_package_id = __SHIFTOUT(mpidr, MPIDR_AFF2);
+ } else {
+ ci->ci_core_id = __SHIFTOUT(mpidr, MPIDR_AFF0);
+ ci->ci_package_id = __SHIFTOUT(mpidr, MPIDR_AFF1);
+ }
#endif
} else {
#ifdef MULTIPROCESSOR
