diff options
| author | Marat Dukhan <marat@fb.com> | 2018-03-29 18:36:31 -0700 |
|---|---|---|
| committer | Marat Dukhan <marat@fb.com> | 2018-03-29 18:36:31 -0700 |
| commit | 10eae00293d63dd096e5b6f39fb7f0e1fd501d78 (patch) | |
| tree | a1a5e16883e611eddde78c0cf34a02b679bac4d9 | |
| parent | d0222b47948234cc01983243a2e0ede018f97f3a (diff) | |
| download | cpuinfo-10eae00293d63dd096e5b6f39fb7f0e1fd501d78.tar.gz | |
Rename Mongoose-M3 to Meerkat-M3
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | include/cpuinfo.h | 4 | ||||
| -rw-r--r-- | src/arm/uarch.c | 4 | ||||
| -rw-r--r-- | tools/cpu-info.c | 4 |
4 files changed, 9 insertions, 9 deletions
@@ -155,10 +155,10 @@ pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpu_set); - [x] AMD-designed x86/x86-64 cores (up to Puma/Jaguar and Zen) - [ ] VIA-designed x86/x86-64 cores - [ ] Other x86 cores (DM&P, RDC, Transmeta, Cyrix, Rise) - - [x] ARM-designed ARM cores (up to Cortex-A17, Cortex-A75) - - [x] Qualcomm-designed ARM cores (up to Kryo and Kryo-280) + - [x] ARM-designed ARM cores (up to Cortex-A55 and Cortex-A75) + - [x] Qualcomm-designed ARM cores (up to Kryo, Kryo-280, and Kryo-385) - [x] Nvidia-designed ARM cores (Denver) - - [x] Samsung-designed ARM cores (Mongoose) + - [x] Samsung-designed ARM cores (Mongoose and Meerkat) - [x] Intel-designed ARM cores (XScale up to 3rd-gen) - [x] Apple-designed ARM cores (up to Hurricane) - [x] Cavium-designed ARM cores (ThunderX) diff --git a/include/cpuinfo.h b/include/cpuinfo.h index b02104e..ae1fa01 100644 --- a/include/cpuinfo.h +++ b/include/cpuinfo.h @@ -390,8 +390,8 @@ enum cpuinfo_uarch { cpuinfo_uarch_mongoose_m1 = 0x00600100, /** Samsung Mongoose M2 (Exynos 8895 big cores). */ cpuinfo_uarch_mongoose_m2 = 0x00600101, - /** Samsung Mongoose M3 (Exynos 9810 big cores). */ - cpuinfo_uarch_mongoose_m3 = 0x00600102, + /** Samsung Meerkat M3 (Exynos 9810 big cores). */ + cpuinfo_uarch_meerkat_m3 = 0x00600102, /** Apple A6 and A6X processors. */ cpuinfo_uarch_swift = 0x00700100, diff --git a/src/arm/uarch.c b/src/arm/uarch.c index 2e8d70f..89b84a3 100644 --- a/src/arm/uarch.c +++ b/src/arm/uarch.c @@ -217,11 +217,11 @@ void cpuinfo_arm_decode_vendor_uarch( break; case 0x00100020: /* - * Exynos 9810 MIDR = 0x531F0020, assume Mongoose M3 has: + * Exynos 9810 MIDR = 0x531F0020, assume Meerkat M3 has: * - CPU variant 0x1 * - CPU part 0x002 */ - *uarch = cpuinfo_uarch_mongoose_m3; + *uarch = cpuinfo_uarch_meerkat_m3; break; default: cpuinfo_log_warning("unknown Samsung CPU variant 0x%01"PRIx32" part 0x%03"PRIx32" ignored", diff --git a/tools/cpu-info.c b/tools/cpu-info.c index 0390bdb..d1a5aad 100644 --- a/tools/cpu-info.c +++ b/tools/cpu-info.c @@ -167,8 +167,8 @@ static const char* uarch_to_string(enum cpuinfo_uarch uarch) { return "Mongoose M1"; case cpuinfo_uarch_mongoose_m2: return "Mongoose M2"; - case cpuinfo_uarch_mongoose_m3: - return "Mongoose M3"; + case cpuinfo_uarch_meerkat_m3: + return "Meerkat M3"; case cpuinfo_uarch_swift: return "Swift"; case cpuinfo_uarch_cyclone: |