UCS/ARCH: Fix review comments

Signed-off-by: JonasZhou <JonasZhou@zhaoxin.com>
kunpengcompute · Nov 26, 2020 · ebbd95b · ebbd95b
1 parent 85cc9ba
commit ebbd95b
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 23 deletions.
diff --git a/src/tools/info/sys_info.c b/src/tools/info/sys_info.c
@@ -1,5 +1,6 @@
 /**
 * Copyright (C) Mellanox Technologies Ltd. 2001-2015.  ALL RIGHTS RESERVED.
+* Copyright (C) Shanghai Zhaoxin Semiconductor Co., Ltd. 2020. ALL RIGHTS RESERVED.
 *
 * See file LICENSE for terms.
 */
@@ -19,20 +20,20 @@
 
 
 static const char* cpu_model_names[] = {
-    [UCS_CPU_MODEL_UNKNOWN]           = "unknown",
-    [UCS_CPU_MODEL_INTEL_IVYBRIDGE]   = "IvyBridge",
-    [UCS_CPU_MODEL_INTEL_SANDYBRIDGE] = "SandyBridge",
-    [UCS_CPU_MODEL_INTEL_NEHALEM]     = "Nehalem",
-    [UCS_CPU_MODEL_INTEL_WESTMERE]    = "Westmere",
-    [UCS_CPU_MODEL_INTEL_HASWELL]     = "Haswell",
-    [UCS_CPU_MODEL_INTEL_BROADWELL]   = "Broadwell",
-    [UCS_CPU_MODEL_INTEL_SKYLAKE]     = "Skylake",
-    [UCS_CPU_MODEL_ARM_AARCH64]       = "ARM 64-bit",
-    [UCS_CPU_MODEL_AMD_NAPLES]        = "Naples",
-    [UCS_CPU_MODEL_AMD_ROME]          = "Rome",
-    [UCS_CPU_MODEL_ZHAOXIN_Zhangjiang]= "Zhangjiang",
-    [UCS_CPU_MODEL_ZHAOXIN_Wudaokou]  = "Wudaokou",
-    [UCS_CPU_MODEL_ZHAOXIN_Lujiazui]  = "Lujiazui"
+    [UCS_CPU_MODEL_UNKNOWN]            = "unknown",
+    [UCS_CPU_MODEL_INTEL_IVYBRIDGE]    = "IvyBridge",
+    [UCS_CPU_MODEL_INTEL_SANDYBRIDGE]  = "SandyBridge",
+    [UCS_CPU_MODEL_INTEL_NEHALEM]      = "Nehalem",
+    [UCS_CPU_MODEL_INTEL_WESTMERE]     = "Westmere",
+    [UCS_CPU_MODEL_INTEL_HASWELL]      = "Haswell",
+    [UCS_CPU_MODEL_INTEL_BROADWELL]    = "Broadwell",
+    [UCS_CPU_MODEL_INTEL_SKYLAKE]      = "Skylake",
+    [UCS_CPU_MODEL_ARM_AARCH64]        = "ARM 64-bit",
+    [UCS_CPU_MODEL_AMD_NAPLES]         = "Naples",
+    [UCS_CPU_MODEL_AMD_ROME]           = "Rome",
+    [UCS_CPU_MODEL_ZHAOXIN_ZHANGJIANG] = "Zhangjiang",
+    [UCS_CPU_MODEL_ZHAOXIN_WUDAOKOU]   = "Wudaokou",
+    [UCS_CPU_MODEL_ZHAOXIN_LUJIAZUI]   = "Lujiazui"
 };
 
 static const char* cpu_vendor_names[] = {

diff --git a/src/ucs/arch/cpu.c b/src/ucs/arch/cpu.c
@@ -1,5 +1,6 @@
 /**
 * Copyright (C) Mellanox Technologies Ltd. 2019. ALL RIGHTS RESERVED.
+* Copyright (C) Shanghai Zhaoxin Semiconductor Co., Ltd. 2020. ALL RIGHTS RESERVED.
 *
 * See file LICENSE for terms.
 */

diff --git a/src/ucs/arch/cpu.h b/src/ucs/arch/cpu.h
@@ -1,6 +1,7 @@
 /**
 * Copyright (C) Mellanox Technologies Ltd. 2001-2015.  ALL RIGHTS RESERVED.
 * Copyright (C) ARM Ltd. 2016.  ALL RIGHTS RESERVED.
+* Copyright (C) Shanghai Zhaoxin Semiconductor Co., Ltd. 2020. ALL RIGHTS RESERVED.
 *
 * See file LICENSE for terms.
 */
@@ -30,9 +31,9 @@ typedef enum ucs_cpu_model {
     UCS_CPU_MODEL_ARM_AARCH64,
     UCS_CPU_MODEL_AMD_NAPLES,
     UCS_CPU_MODEL_AMD_ROME,
-    UCS_CPU_MODEL_ZHAOXIN_Zhangjiang,
-    UCS_CPU_MODEL_ZHAOXIN_Wudaokou,
-    UCS_CPU_MODEL_ZHAOXIN_Lujiazui,
+    UCS_CPU_MODEL_ZHAOXIN_ZHANGJIANG,
+    UCS_CPU_MODEL_ZHAOXIN_WUDAOKOU,
+    UCS_CPU_MODEL_ZHAOXIN_LUJIAZUI,
     UCS_CPU_MODEL_LAST
 } ucs_cpu_model_t;
 

diff --git a/src/ucs/arch/x86_64/cpu.c b/src/ucs/arch/x86_64/cpu.c
@@ -1,6 +1,7 @@
 /**
 * Copyright (C) Mellanox Technologies Ltd. 2001-2018.  ALL RIGHTS RESERVED.
 * Copyright (C) Advanced Micro Devices, Inc. 2019. ALL RIGHTS RESERVED.
+* Copyright (C) Shanghai Zhaoxin Semiconductor Co., Ltd. 2020. ALL RIGHTS RESERVED.
 *
 * See file LICENSE for terms.
 */
@@ -340,20 +341,20 @@ ucs_cpu_model_t ucs_arch_get_cpu_model()
         model = (version.ext_model << 4) | model;
     }
 
-    if (ucs_arch_get_cpu_vendor() == UCS_CPU_VENDOR_ZHAOXIN){
-        if (family == 0x06){
-            switch (model){
+    if (ucs_arch_get_cpu_vendor() == UCS_CPU_VENDOR_ZHAOXIN) {
+        if (family == 0x06) {
+            switch (model) {
             case 0x0f:
-                return UCS_CPU_MODEL_ZHAOXIN_Zhangjiang;
+                return UCS_CPU_MODEL_ZHAOXIN_ZHANGJIANG;
             }
         }
 
         if (family == 0x07) {
             switch (model) {
             case 0x1b:
-                return UCS_CPU_MODEL_ZHAOXIN_Wudaokou;
+                return UCS_CPU_MODEL_ZHAOXIN_WUDAOKOU;
             case 0x3b:
-                return UCS_CPU_MODEL_ZHAOXIN_Lujiazui;
+                return UCS_CPU_MODEL_ZHAOXIN_LUJIAZUI;
             }
         }
     } else {