Module Name: src
Committed By: jmcneill
Date: Mon Aug 30 22:57:33 UTC 2021
Modified Files:
src/sys/arch/aarch64/aarch64: cpu.c
src/sys/arch/arm/include: cputypes.h
Log Message:
Identify Apple M1 "Icestorm" and "Firestorm" CPU types.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/aarch64/aarch64/cpu.c
cvs rdiff -u -r1.13 -r1.14 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.60 src/sys/arch/aarch64/aarch64/cpu.c:1.61
--- src/sys/arch/aarch64/aarch64/cpu.c:1.60 Sat Jun 19 13:40:00 2021
+++ src/sys/arch/aarch64/aarch64/cpu.c Mon Aug 30 22:57:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.60 2021/06/19 13:40:00 jmcneill Exp $ */
+/* $NetBSD: cpu.c,v 1.61 2021/08/30 22:57:33 jmcneill 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.60 2021/06/19 13:40:00 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.61 2021/08/30 22:57:33 jmcneill Exp $");
#include "locators.h"
#include "opt_arm_debug.h"
@@ -203,6 +203,8 @@ const struct cpuidtab cpuids[] = {
{ CPU_ID_THUNDERX81XXRX, "ThunderX CN81XX", "Cavium", "v8-A" },
{ CPU_ID_THUNDERX83XXRX, "ThunderX CN83XX", "Cavium", "v8-A" },
{ 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" },
};
static void
Index: src/sys/arch/arm/include/cputypes.h
diff -u src/sys/arch/arm/include/cputypes.h:1.13 src/sys/arch/arm/include/cputypes.h:1.14
--- src/sys/arch/arm/include/cputypes.h:1.13 Wed Jul 1 08:02:13 2020
+++ src/sys/arch/arm/include/cputypes.h Mon Aug 30 22:57:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cputypes.h,v 1.13 2020/07/01 08:02:13 ryo Exp $ */
+/* $NetBSD: cputypes.h,v 1.14 2021/08/30 22:57:33 jmcneill Exp $ */
/*
* Copyright (c) 1998, 2001 Ben Harris
@@ -208,6 +208,9 @@
#define CPU_ID_THUNDERX83XXRX 0x43000a30
#define CPU_ID_THUNDERX2RX 0x43000af0
+#define CPU_ID_APPLE_M1_ICESTORM 0x61000220
+#define CPU_ID_APPLE_M1_FIRESTORM 0x61000230
+
#define CPU_ID_SA110 0x4401a100
#define CPU_ID_SA1100 0x4401a110
#define CPU_ID_NVIDIADENVER2 0x4e0f0030
