Module Name: src
Committed By: jmcneill
Date: Wed Jan 8 18:47:43 UTC 2020
Modified Files:
src/sys/arch/arm/arm32: arm32_boot.c cpu.c
Log Message:
cpu_hatch is too late to report AP topology, do it at attach time instead
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/arm/arm32/arm32_boot.c
cvs rdiff -u -r1.136 -r1.137 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.35 src/sys/arch/arm/arm32/arm32_boot.c:1.36
--- src/sys/arch/arm/arm32/arm32_boot.c:1.35 Fri Dec 20 21:05:33 2019
+++ src/sys/arch/arm/arm32/arm32_boot.c Wed Jan 8 18:47:43 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_boot.c,v 1.35 2019/12/20 21:05:33 ad Exp $ */
+/* $NetBSD: arm32_boot.c,v 1.36 2020/01/08 18:47:43 jmcneill 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.35 2019/12/20 21:05:33 ad Exp $");
+__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.36 2020/01/08 18:47:43 jmcneill Exp $");
#include "opt_arm_debug.h"
#include "opt_cputypes.h"
@@ -357,20 +357,6 @@ cpu_hatch(struct cpu_info *ci, u_int cpu
ci->ci_ctrl = armreg_sctlr_read();
uint32_t mpidr = armreg_mpidr_read();
ci->ci_mpidr = mpidr;
- if (mpidr & MPIDR_MT) {
- cpu_topology_set(ci,
- __SHIFTOUT(mpidr, MPIDR_AFF2),
- __SHIFTOUT(mpidr, MPIDR_AFF1),
- __SHIFTOUT(mpidr, MPIDR_AFF0),
- 0);
- } else {
- cpu_topology_set(ci,
- __SHIFTOUT(mpidr, MPIDR_AFF1),
- __SHIFTOUT(mpidr, MPIDR_AFF0),
- 0,
- 0);
- }
-
ci->ci_arm_cpuid = cpu_idnum();
ci->ci_arm_cputype = ci->ci_arm_cpuid & CPU_ID_CPU_MASK;
ci->ci_arm_cpurev = ci->ci_arm_cpuid & CPU_ID_REVISION_MASK;
Index: src/sys/arch/arm/arm32/cpu.c
diff -u src/sys/arch/arm/arm32/cpu.c:1.136 src/sys/arch/arm/arm32/cpu.c:1.137
--- src/sys/arch/arm/arm32/cpu.c:1.136 Fri Dec 20 21:05:33 2019
+++ src/sys/arch/arm/arm32/cpu.c Wed Jan 8 18:47:43 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.136 2019/12/20 21:05:33 ad Exp $ */
+/* $NetBSD: cpu.c,v 1.137 2020/01/08 18:47:43 jmcneill 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.136 2019/12/20 21:05:33 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.137 2020/01/08 18:47:43 jmcneill Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -109,20 +109,6 @@ cpu_attach(device_t dv, cpuid_t id)
#ifdef MULTIPROCESSOR
uint32_t mpidr = armreg_mpidr_read();
ci->ci_mpidr = mpidr;
-
- if (mpidr & MPIDR_MT) {
- cpu_topology_set(ci,
- __SHIFTOUT(mpidr, MPIDR_AFF2),
- __SHIFTOUT(mpidr, MPIDR_AFF1),
- __SHIFTOUT(mpidr, MPIDR_AFF0),
- 0);
- } else {
- cpu_topology_set(ci,
- __SHIFTOUT(mpidr, MPIDR_AFF1),
- __SHIFTOUT(mpidr, MPIDR_AFF0),
- 0,
- 0);
- }
#endif
} else {
#ifdef MULTIPROCESSOR
@@ -152,6 +138,20 @@ cpu_attach(device_t dv, cpuid_t id)
ci->ci_dev = dv;
dv->dv_private = ci;
+ if (id & MPIDR_MT) {
+ cpu_topology_set(ci,
+ __SHIFTOUT(id, MPIDR_AFF2),
+ __SHIFTOUT(id, MPIDR_AFF1),
+ __SHIFTOUT(id, MPIDR_AFF0),
+ 0);
+ } else {
+ cpu_topology_set(ci,
+ __SHIFTOUT(id, MPIDR_AFF1),
+ __SHIFTOUT(id, MPIDR_AFF0),
+ 0,
+ 0);
+ }
+
evcnt_attach_dynamic(&ci->ci_arm700bugcount, EVCNT_TYPE_MISC,
NULL, xname, "arm700swibug");
