svn commit: r352004 - in stable/12/sys/arm64: arm64 include

[Michael Tuexen]

Author: tuexen
Date: Sat Sep  7 12:03:13 2019
New Revision: 352004
URL: https://svnweb.freebsd.org/changeset/base/352004

Log:
  MFC r351511:
  
  Identify eMAG CPU used in Ampere Computing systems.
  
  Reviewed by:		emaste@
  Differential Revision:	https://reviews.freebsd.org/D21314

Modified:
  stable/12/sys/arm64/arm64/identcpu.c
  stable/12/sys/arm64/include/cpu.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/arm64/arm64/identcpu.c
==============================================================================
--- stable/12/sys/arm64/arm64/identcpu.c	Sat Sep  7 12:01:41 2019	(r352003)
+++ stable/12/sys/arm64/arm64/identcpu.c	Sat Sep  7 12:03:13 2019	(r352004)
@@ -145,6 +145,12 @@ static const struct cpu_parts cpu_parts_cavium[] = {
 	CPU_PART_NONE,
 };
 
+/* APM / Ampere */
+static const struct cpu_parts cpu_parts_apm[] = {
+	{ CPU_PART_EMAG8180, "eMAG 8180" },
+	CPU_PART_NONE,
+};
+
 /* Unknown */
 static const struct cpu_parts cpu_parts_none[] = {
 	CPU_PART_NONE,
@@ -161,7 +167,7 @@ const struct cpu_implementers cpu_implementers[] = {
 	{ CPU_IMPL_INFINEON,	"IFX",		cpu_parts_none },
 	{ CPU_IMPL_FREESCALE,	"Freescale",	cpu_parts_none },
 	{ CPU_IMPL_NVIDIA,	"NVIDIA",	cpu_parts_none },
-	{ CPU_IMPL_APM,		"APM",		cpu_parts_none },
+	{ CPU_IMPL_APM,		"APM",		cpu_parts_apm },
 	{ CPU_IMPL_QUALCOMM,	"Qualcomm",	cpu_parts_none },
 	{ CPU_IMPL_MARVELL,	"Marvell",	cpu_parts_none },
 	{ CPU_IMPL_INTEL,	"Intel",	cpu_parts_none },

Modified: stable/12/sys/arm64/include/cpu.h
==============================================================================
--- stable/12/sys/arm64/include/cpu.h	Sat Sep  7 12:01:41 2019	(r352003)
+++ stable/12/sys/arm64/include/cpu.h	Sat Sep  7 12:03:13 2019	(r352004)
@@ -100,6 +100,9 @@
 
 #define	CPU_REV_THUNDERX2_0	0x00
 
+/* APM / Ampere Part Number */
+#define CPU_PART_EMAG8180	0x000
+
 #define	CPU_IMPL(midr)	(((midr) >> 24) & 0xff)
 #define	CPU_PART(midr)	(((midr) >> 4) & 0xfff)
 #define	CPU_VAR(midr)	(((midr) >> 20) & 0xf)