Module Name: src
Committed By: martin
Date: Thu Oct 3 16:11:37 UTC 2024
Modified Files:
src/sys/arch/aarch64/aarch64 [netbsd-10]: cpu.c
src/sys/arch/arm/include [netbsd-10]: cputypes.h
src/usr.sbin/cpuctl/arch [netbsd-10]: aarch64.c
Log Message:
Pull up following revision(s) (requested by jakllsch in ticket #922):
sys/arch/aarch64/aarch64/cpu.c: revision 1.79
sys/arch/arm/include/cputypes.h: revision 1.17
usr.sbin/cpuctl/arch/aarch64.c: revision 1.24
sys/arch/aarch64/aarch64/cpu.c: revision 1.80
Add Ampere 1 and 1A CPU IDs
refine previous
add Ampere 1 and 1A
To generate a diff of this commit:
cvs rdiff -u -r1.70.4.2 -r1.70.4.3 src/sys/arch/aarch64/aarch64/cpu.c
cvs rdiff -u -r1.16 -r1.16.4.1 src/sys/arch/arm/include/cputypes.h
cvs rdiff -u -r1.21.2.1 -r1.21.2.2 src/usr.sbin/cpuctl/arch/aarch64.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/aarch64/aarch64/cpu.c
diff -u src/sys/arch/aarch64/aarch64/cpu.c:1.70.4.2 src/sys/arch/aarch64/aarch64/cpu.c:1.70.4.3
--- src/sys/arch/aarch64/aarch64/cpu.c:1.70.4.2 Fri Sep 20 09:33:48 2024
+++ src/sys/arch/aarch64/aarch64/cpu.c Thu Oct 3 16:11:36 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.70.4.2 2024/09/20 09:33:48 martin Exp $ */
+/* $NetBSD: cpu.c,v 1.70.4.3 2024/10/03 16:11:36 martin Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <r...@nerv.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.70.4.2 2024/09/20 09:33:48 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.70.4.3 2024/10/03 16:11:36 martin Exp $");
#include "locators.h"
#include "opt_arm_debug.h"
@@ -213,6 +213,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 & CPU_PARTMASK, "Ampere-1", "Ampere", "v8.6-A+" },
+ { CPU_ID_AMPERE1A & CPU_PARTMASK, "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.16.4.1
--- src/sys/arch/arm/include/cputypes.h:1.16 Sat Nov 13 01:09:51 2021
+++ src/sys/arch/arm/include/cputypes.h Thu Oct 3 16:11:36 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cputypes.h,v 1.16 2021/11/13 01:09:51 simonb Exp $ */
+/* $NetBSD: cputypes.h,v 1.16.4.1 2024/10/03 16:11:36 martin 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
Index: src/usr.sbin/cpuctl/arch/aarch64.c
diff -u src/usr.sbin/cpuctl/arch/aarch64.c:1.21.2.1 src/usr.sbin/cpuctl/arch/aarch64.c:1.21.2.2
--- src/usr.sbin/cpuctl/arch/aarch64.c:1.21.2.1 Fri Sep 20 09:33:48 2024
+++ src/usr.sbin/cpuctl/arch/aarch64.c Thu Oct 3 16:11:37 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: aarch64.c,v 1.21.2.1 2024/09/20 09:33:48 martin Exp $ */
+/* $NetBSD: aarch64.c,v 1.21.2.2 2024/10/03 16:11:37 martin Exp $ */
/*
* Copyright (c) 2018 Ryo Shimizu <r...@nerv.org>
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: aarch64.c,v 1.21.2.1 2024/09/20 09:33:48 martin Exp $");
+__RCSID("$NetBSD: aarch64.c,v 1.21.2.2 2024/10/03 16:11:37 martin Exp $");
#endif /* no lint */
#include <sys/types.h>
@@ -93,6 +93,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 & CPU_PARTMASK, "Ampere-1", "Ampere", "v8.6-A+" },
+ { CPU_ID_AMPERE1A & CPU_PARTMASK, "Ampere-1A", "Ampere", "v8.6-A+" },
};
const struct impltab implids[] = {
@@ -110,7 +112,8 @@ const struct impltab implids[] = {
{ CPU_ID_MARVELL, "Marvell International Ltd." },
{ CPU_ID_APPLE, "Apple Inc." },
{ CPU_ID_FARADAY, "Faraday Technology Corporation" },
- { CPU_ID_INTEL, "Intel Corporation" }
+ { CPU_ID_INTEL, "Intel Corporation" },
+ { CPU_ID_AMPERE, "Ampere" },
};
#define FIELDNAME(_bitpos, _bitwidth, _name) \
