Module Name: src Committed By: jmcneill Date: Tue Jul 16 20:29:54 UTC 2019
Modified Files: src/sys/arch/aarch64/aarch64: cpu.c Log Message: Need CPU_PARTMASK for eMAG CPU ID To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/aarch64/aarch64/cpu.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.19 src/sys/arch/aarch64/aarch64/cpu.c:1.20 --- src/sys/arch/aarch64/aarch64/cpu.c:1.19 Tue Jul 16 10:37:12 2019 +++ src/sys/arch/aarch64/aarch64/cpu.c Tue Jul 16 20:29:53 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.19 2019/07/16 10:37:12 jmcneill Exp $ */ +/* $NetBSD: cpu.c,v 1.20 2019/07/16 20:29:53 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.19 2019/07/16 10:37:12 jmcneill Exp $"); +__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.20 2019/07/16 20:29:53 jmcneill Exp $"); #include "locators.h" #include "opt_arm_debug.h" @@ -195,7 +195,7 @@ const struct cpuidtab cpuids[] = { { CPU_ID_CORTEXA76R3 & CPU_PARTMASK, "Cortex-A76", "Cortex", "V8.2-A+" }, { CPU_ID_CORTEXA76AER1 & CPU_PARTMASK, "Cortex-A76AE", "Cortex", "V8.2-A+" }, { CPU_ID_CORTEXA77R0 & CPU_PARTMASK, "Cortex-A77", "Cortex", "V8.2-A+" }, - { CPU_ID_EMAG8180, "Ampere eMAG 8180", "Skylark", "V8-A" }, + { CPU_ID_EMAG8180 & CPU_PARTMASK, "Ampere eMAG", "Skylark", "V8-A" }, { CPU_ID_THUNDERXRX, "Cavium ThunderX", "Cavium", "V8-A" }, { CPU_ID_THUNDERX81XXRX, "Cavium ThunderX CN81XX", "Cavium", "V8-A" }, { CPU_ID_THUNDERX83XXRX, "Cavium ThunderX CN83XX", "Cavium", "V8-A" },