Module Name: src
Committed By: skrll
Date: Tue Jul 6 08:34:28 UTC 2021
Modified Files:
src/sys/arch/arm/arm32: cpu.c
Log Message:
Assume all ARM11[37]6 r0 variants are missing ISAR and friends. This is
certainly the case for r0 variants I could find TRMs for.
PR/50596 CPU_ID_ARM1136JS r0p4 does not support feature registers
To generate a diff of this commit:
cvs rdiff -u -r1.147 -r1.148 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/cpu.c
diff -u src/sys/arch/arm/arm32/cpu.c:1.147 src/sys/arch/arm/arm32/cpu.c:1.148
--- src/sys/arch/arm/arm32/cpu.c:1.147 Thu Jul 2 11:49:48 2020
+++ src/sys/arch/arm/arm32/cpu.c Tue Jul 6 08:34:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.147 2020/07/02 11:49:48 martin Exp $ */
+/* $NetBSD: cpu.c,v 1.148 2021/07/06 08:34:28 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.147 2020/07/02 11:49:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.148 2021/07/06 08:34:28 skrll Exp $");
#include <sys/param.h>
@@ -739,7 +739,10 @@ identify_arm_cpu(device_t dv, struct cpu
aprint_normal("\n");
if (CPU_ID_CORTEX_P(arm_cpuid) || CPU_ID_ARM11_P(arm_cpuid) || CPU_ID_MV88SV58XX_P(arm_cpuid)) {
- identify_features(dv);
+ if ((arm_cpuid & CPU_ID_CPU_MASK) != CPU_ID_ARM1136JS &&
+ (arm_cpuid & CPU_ID_CPU_MASK) != CPU_ID_ARM1176JZS) {
+ identify_features(dv);
+ }
}
/* Print cache info. */
