Module Name: src
Committed By: jmcneill
Date: Mon Dec 9 21:52:53 UTC 2024
Modified Files:
src/sys/arch/aarch64/aarch64: cpu.c
src/sys/arch/arm/include: cputypes.h
Log Message:
arm64: Identify Qualcomm Oryon CPUs
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/aarch64/aarch64/cpu.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/include/cputypes.h
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.81 src/sys/arch/aarch64/aarch64/cpu.c:1.82
--- src/sys/arch/aarch64/aarch64/cpu.c:1.81 Mon Oct 7 23:11:33 2024
+++ src/sys/arch/aarch64/aarch64/cpu.c Mon Dec 9 21:52:53 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.81 2024/10/07 23:11:33 jakllsch Exp $ */
+/* $NetBSD: cpu.c,v 1.82 2024/12/09 21:52:53 jmcneill Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.81 2024/10/07 23:11:33 jakllsch Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.82 2024/12/09 21:52:53 jmcneill Exp $");
#include "locators.h"
#include "opt_arm_debug.h"
@@ -245,6 +245,7 @@ const struct cpuidtab cpuids[] = {
{ CPU_ID_AMPERE1 & CPU_PARTMASK, "Ampere-1", "Ampere", "v8.6-A+" },
{ CPU_ID_AMPERE1A & CPU_PARTMASK, "Ampere-1A", "Ampere", "v8.6-A+" },
{ CPU_ID_A64FX & CPU_PARTMASK, "A64FX", "Fujitsu", "v8.2-A+" },
+ { CPU_ID_ORYON & CPU_PARTMASK, "Oryon", "Qualcomm", "v8.7-A+" },
};
static void
Index: src/sys/arch/arm/include/cputypes.h
diff -u src/sys/arch/arm/include/cputypes.h:1.18 src/sys/arch/arm/include/cputypes.h:1.19
--- src/sys/arch/arm/include/cputypes.h:1.18 Mon Oct 7 23:11:33 2024
+++ src/sys/arch/arm/include/cputypes.h Mon Dec 9 21:52:52 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cputypes.h,v 1.18 2024/10/07 23:11:33 jakllsch Exp $ */
+/* $NetBSD: cputypes.h,v 1.19 2024/12/09 21:52:52 jmcneill Exp $ */
/*
* Copyright (c) 1998, 2001 Ben Harris
@@ -218,6 +218,9 @@
#define CPU_ID_AMPERE1 0xc00fac30
#define CPU_ID_AMPERE1A 0xc00fac40
+#define CPU_ID_ORYON 0x510f0010
+#define CPU_ID_ORYON_P(n) ((n & 0xff0ffff0) == CPU_ID_ORYON)
+
/*
* Chip-specific errata. These defines are intended to be
* booleans used within if statements. When an appropriate
