Module Name: src
Committed By: jakllsch
Date: Fri Sep 27 15:07:17 UTC 2024
Modified Files:
src/sys/arch/aarch64/aarch64: cpu.c
src/sys/arch/arm/include: cputypes.h
Log Message:
Add Ampere 1 and 1A CPU IDs
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/aarch64/aarch64/cpu.c
cvs rdiff -u -r1.16 -r1.17 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.78 src/sys/arch/aarch64/aarch64/cpu.c:1.79
--- src/sys/arch/aarch64/aarch64/cpu.c:1.78 Sat Aug 10 15:20:59 2024
+++ src/sys/arch/aarch64/aarch64/cpu.c Fri Sep 27 15:07:16 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.78 2024/08/10 15:20:59 riastradh Exp $ */
+/* $NetBSD: cpu.c,v 1.79 2024/09/27 15:07:16 jakllsch Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.78 2024/08/10 15:20:59 riastradh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.79 2024/09/27 15:07:16 jakllsch Exp $");
#include "locators.h"
#include "opt_arm_debug.h"
@@ -239,6 +239,8 @@ const struct cpuidtab cpuids[] = {
{ CPU_ID_THUNDERX2RX, "ThunderX2", "Marvell", "v8.1-A" },
{ CPU_ID_APPLE_M1_ICESTORM & CPU_PARTMASK, "M1 Icestorm", "Apple", "Apple Silicon" },
{ CPU_ID_APPLE_M1_FIRESTORM & CPU_PARTMASK, "M1 Firestorm", "Apple", "Apple Silicon" },
+ { CPU_ID_AMPERE1, "Ampere-1", "Ampere", "v8.6-A+" },
+ { CPU_ID_AMPERE1A, "Ampere-1A", "Ampere", "v8.6-A+" },
};
static void
Index: src/sys/arch/arm/include/cputypes.h
diff -u src/sys/arch/arm/include/cputypes.h:1.16 src/sys/arch/arm/include/cputypes.h:1.17
--- src/sys/arch/arm/include/cputypes.h:1.16 Sat Nov 13 01:09:51 2021
+++ src/sys/arch/arm/include/cputypes.h Fri Sep 27 15:07:16 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cputypes.h,v 1.16 2021/11/13 01:09:51 simonb Exp $ */
+/* $NetBSD: cputypes.h,v 1.17 2024/09/27 15:07:16 jakllsch Exp $ */
/*
* Copyright (c) 1998, 2001 Ben Harris
@@ -61,6 +61,7 @@
#define CPU_ID_APPLE 0x61000000 /* 'a' */
#define CPU_ID_FARADAY 0x66000000 /* 'f' */
#define CPU_ID_INTEL 0x69000000 /* 'i' */
+#define CPU_ID_AMPERE 0xc0000000 /* 'À' */
/* How to decide what format the CPUID is in. */
#define CPU_ID_ISOLD(x) (((x) & 0x0000f000) == 0x00000000)
@@ -208,6 +209,9 @@
#define CPU_ID_THUNDERX83XXRX 0x43000a30
#define CPU_ID_THUNDERX2RX 0x43000af0
+#define CPU_ID_AMPERE1 0xc00fac30
+#define CPU_ID_AMPERE1A 0xc00fac40
+
/*
* Chip-specific errata. These defines are intended to be
* booleans used within if statements. When an appropriate
