From ef4eab7b4c1bc948a46c660c122a0baba8cc8d7c Mon Sep 17 00:00:00 2001
From: kangkaiping <kangkaiping1377@phytium.com.cn>
Date: Tue, 5 Aug 2025 17:12:06 +0800
Subject: [PATCH] code update 2025_08_05

---
 arch/armv8/common/fpsci.c                     |  19 +++++++++++++--
 arch/armv8/common/fpsci.h                     |   8 ++++--
 doc/ChangeLog.md                              |  20 +++++++++++++++
 example/system/arch/armv8/psci/README.md      |  12 +++++++--
 .../armv8/psci/figs/get_cpu_type_and_id.png   | Bin 0 -> 17130 bytes
 .../armv8/psci/psci_test/build/amp_packed.c   |   0
 .../arch/armv8/psci/psci_test/inc/psci_test.h |   9 ++++---
 .../system/arch/armv8/psci/psci_test/main.c   |   2 +-
 .../arch/armv8/psci/psci_test/sdkconfig       |   2 ++
 .../arch/armv8/psci/psci_test/sdkconfig.h     |   2 ++
 .../arch/armv8/psci/psci_test/src/cmd_psci.c  |  14 +++++++++--
 .../arch/armv8/psci/psci_test/src/psci_test.c |  23 ++++++++++++++++--
 third-party/libmetal/src.mk                   |   9 -------
 third-party/openamp/include.mk                |   1 +
 .../lib/include/openamp/remoteproc_virtio.h   |   3 +--
 .../openamp/{ports => lib}/version_def.h      |   4 +--
 .../machine/phytium/platform_info.c           |   4 +--
 17 files changed, 102 insertions(+), 30 deletions(-)
 create mode 100644 example/system/arch/armv8/psci/figs/get_cpu_type_and_id.png
 delete mode 100644 example/system/arch/armv8/psci/psci_test/build/amp_packed.c
 rename third-party/openamp/{ports => lib}/version_def.h (94%)

diff --git a/arch/armv8/common/fpsci.c b/arch/armv8/common/fpsci.c
index 004f5b769..cb819bcf5 100644
--- a/arch/armv8/common/fpsci.c
+++ b/arch/armv8/common/fpsci.c
@@ -16,13 +16,14 @@
  * 
  * FilePath: fpsci.c
  * Created Date: 2023-06-21 10:36:53
- * Last Modified: 2024-11-22 15:30:25
+ * Last Modified: 2025-08-05 10:49:55
  * Description:  This file is for
  * 
  * Modify History:
  *  Ver      Who        Date               Changes
  * -----  ----------  --------  ---------------------------------
  * 1.0      huanghe   2023-06-21    first release
+ * 1.1   kangkaiping  2025-08-04    add get cpuinfo
  */
 
 
@@ -30,7 +31,6 @@
 #include "fsmcc.h" /* 根据你的平台和编译环境来确定这个路径 */
 #include "fpsci.h"
 #include "fassert.h"
-#include "fcompiler.h"
 #include "fdebug.h"
 #include "fcpu_info.h"
 
@@ -43,6 +43,9 @@
 /* 定义PSCI 函数值 */
 #define FPSCI_0_2_FN32_BASE             0x84000000
 #define FPSCI_0_2_FN64_BASE             0xC4000000
+#define FPSCI_SIP_FN64_BASE               0xC2000000
+#define FPSCI_CPU_VERSION               (FPSCI_SIP_FN64_BASE + 0x002)
+
 #define FPSCI_VERSION                   (FPSCI_0_2_FN32_BASE + 0x000)
 #define FPSCI_FEATURES                  (FPSCI_0_2_FN32_BASE + 0x00a)
 #define FPSCI_CPU_SUSPEND_AARCH32            (FPSCI_0_2_FN32_BASE + 0x001)
@@ -60,6 +63,7 @@
 #define FPSCI_SYSTEM_RESET                   (FPSCI_0_2_FN32_BASE + 0x009)
 #define FPSCI_SYSTEM_SUSPEND                   (FPSCI_0_2_FN32_BASE + 0x00E)
 
+
 /* 定义每个PSCI函数ID的位标记 */
 #define FPSCI_PSCI_VERSION_BIT               (1 << 0)
 #define FPSCI_PSCI_FEATURES_BIT              (1 << 1)
@@ -118,6 +122,17 @@ int FPsciFeatures(u32 psci_fid) {
     return res.a0 == FPSCI_SUCCESS ? 1 : 0;
 }
 
+
+#if defined(FAARCH64_USE)
+int FPsciCpuVersion(struct FSmcccRes *res,u32 cpu_index)
+{
+
+    FASSERT((*f_psci_invoke));
+    (*f_psci_invoke)(FPSCI_CPU_VERSION, cpu_index, 0, 0, 0, 0, 0, 0, res);
+    return res->a0 == FPSCI_SUCCESS ? 1 : 0;
+}
+#endif
+
 /**
  * @name: FPsciCpuSuspend
  * @msg: Suspend execution on a particular CPU.
diff --git a/arch/armv8/common/fpsci.h b/arch/armv8/common/fpsci.h
index 2dbac4646..738dead31 100644
--- a/arch/armv8/common/fpsci.h
+++ b/arch/armv8/common/fpsci.h
@@ -16,7 +16,7 @@
  * 
  * FilePath: fpsci.h
  * Created Date: 2023-06-21 16:13:14
- * Last Modified: 2023-06-27 15:33:23
+ * Last Modified: 2025-08-05 10:49:01
  * Description:  This file is for
  * 
  * Modify History:
@@ -33,7 +33,8 @@ extern "C"
 {
 #endif
 #include "ftypes.h"
-
+#include "fsmcc.h"
+#include "fcompiler.h"
 /* 版本掩码 */
 
 #define FPSCI_VERSION_MASK 0x0000FFFF
@@ -84,6 +85,9 @@ void FPsciSystemReset(u32 reset_type) ;
 int FPsciFeatures(u32 psci_fid) ;
 int FPsciCpuOff(void) ;
 int FPsciCpuMaskOn(s32 cpu_id_mask, uintptr bootaddr) ;
+#if defined(FAARCH64_USE)
+int FPsciCpuVersion(struct FSmcccRes *res,u32 cpu_index) ;
+#endif
 #ifdef __cplusplus
 }
 #endif
diff --git a/doc/ChangeLog.md b/doc/ChangeLog.md
index d2e9ce1be..a5efdde57 100644
--- a/doc/ChangeLog.md
+++ b/doc/ChangeLog.md
@@ -1,3 +1,12 @@
+# Phytium Standalone SDK 2025-07-31 ChangeLog
+
+Change Log since 2025-07-28
+
+## third-party
+
+- move version.h to third-party/openamp/lib
+- VIRTIO_CACHED_RSC_TABLE is deprecated, delete it
+
 # Phytium Standalone SDK 2025-07-28 ChangeLog
 
 Change Log since 2025-07-28
@@ -5,6 +14,17 @@ Change Log since 2025-07-28
 ## arch 
 
 - add barrier to solve the gicv3 issue
+# Phytium Standalone SDK 2025-07-25 ChangeLog
+
+Change Log since 2025-07-25
+
+## driver
+
+- modify add psci get cpuid ability
+
+## example
+
+- modify add psci_test.c cmd for psci cpu_version
 
 # Phytium Standalone SDK 2025-07-21 ChangeLog
 
diff --git a/example/system/arch/armv8/psci/README.md b/example/system/arch/armv8/psci/README.md
index 1fbedb300..a94ab6192 100644
--- a/example/system/arch/armv8/psci/README.md
+++ b/example/system/arch/armv8/psci/README.md
@@ -7,7 +7,7 @@
 
 `<font size="1">`介绍例程的用途，使用场景，相关基本概念，描述用户可以使用例程完成哪些工作 `</font><br />`
 
-本例程主要演示了PSCI 初始化特性以及CPU hotplug 的功能
+本例程主要演示了PSCI 初始化特性以及CPU hotplug, 获取CPU相关信息(只支持AARCH64)的功能
 
 本例程一共包含了两个工程目录，分别如下所示：
 
@@ -97,6 +97,13 @@ bootelf -p f0000000
 
 ![master_slave_test](figs/master_slave_test.png)
 
+```c
+  psci cpu_version
+```
+
+- 此命令用于获取cpu的类型号及ID值
+
+![psci_feature](figs/get_cpu_type_and_id.png)
 
 ## 3. 如何解决问题 (Q&A)
 
@@ -107,4 +114,5 @@ bootelf -p f0000000
 > `<font size="1">`记录例程的重大修改记录，标明修改发生的版本号 `</font><br />`
 
 - 2023-06-27 ：v1.0.0 初始化项目
-- 2024-06-27 ：v1.1.0 整改多核启动方式，优化代码结构
\ No newline at end of file
+- 2024-06-27 ：v1.1.0 整改多核启动方式，优化代码结构
+- 2025-08-05 ：       添加读CPU信息,只支持aarch64
\ No newline at end of file
diff --git a/example/system/arch/armv8/psci/figs/get_cpu_type_and_id.png b/example/system/arch/armv8/psci/figs/get_cpu_type_and_id.png
new file mode 100644
index 0000000000000000000000000000000000000000..f02e65d61b0ba50e9763c3cf2303d6d10281c8b1
GIT binary patch
literal 17130
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

literal 0
HcmV?d00001

diff --git a/example/system/arch/armv8/psci/psci_test/build/amp_packed.c b/example/system/arch/armv8/psci/psci_test/build/amp_packed.c
deleted file mode 100644
index e69de29bb..000000000
diff --git a/example/system/arch/armv8/psci/psci_test/inc/psci_test.h b/example/system/arch/armv8/psci/psci_test/inc/psci_test.h
index 06570f438..5803aac77 100644
--- a/example/system/arch/armv8/psci/psci_test/inc/psci_test.h
+++ b/example/system/arch/armv8/psci/psci_test/inc/psci_test.h
@@ -16,13 +16,14 @@
  * 
  * FilePath: psci_test.h
  * Created Date: 2023-06-16 15:42:14
- * Last Modified: 2024-06-28 17:14:23
+ * Last Modified: 2025-08-05 10:43:46
  * Description:  This file is for example header.
  * 
  * Modify History:
  *  Ver      Who        Date               Changes
  * -----  ----------  --------  ---------------------------------
  * 1.0    huanghe     2023-06-30        first version
+ * 1.1    kangkaiping 2025-08-05   add get cpuinfo
  */
 #ifndef  PSCI_EXAMPLE_H
 #define  PSCI_EXAMPLE_H
@@ -31,10 +32,12 @@
 extern "C"
 {
 #endif
-
+#include "fcompiler.h"
 int FPsciFeatureTest(void) ;
 int FPsciHotplugTest(void) ;
-
+#if defined(FAARCH64_USE)
+int FPsciGetCpuInfo(void) ;
+#endif
 #ifdef __cplusplus
 }
 #endif
diff --git a/example/system/arch/armv8/psci/psci_test/main.c b/example/system/arch/armv8/psci/psci_test/main.c
index 4953e298d..4a35c5b5a 100644
--- a/example/system/arch/armv8/psci/psci_test/main.c
+++ b/example/system/arch/armv8/psci/psci_test/main.c
@@ -16,7 +16,7 @@
  * 
  * FilePath: main.c
  * Created Date: 2023-06-16 13:26:03
- * Last Modified: 2024-07-05 10:09:50
+ * Last Modified: 2025-08-05 11:02:44
  * Description:  This file is for
  * 
  * Modify History:
diff --git a/example/system/arch/armv8/psci/psci_test/sdkconfig b/example/system/arch/armv8/psci/psci_test/sdkconfig
index d8c5ca601..3a88219b2 100644
--- a/example/system/arch/armv8/psci/psci_test/sdkconfig
+++ b/example/system/arch/armv8/psci/psci_test/sdkconfig
@@ -72,6 +72,7 @@ CONFIG_F64BIT_MEMORY_LENGTH=0x800000000
 CONFIG_DEFAULT_DEBUG_PRINT_UART1=y
 # CONFIG_DEFAULT_DEBUG_PRINT_UART0 is not set
 # CONFIG_DEFAULT_DEBUG_PRINT_UART2 is not set
+# CONFIG_UART_INIT_NOT_CLR_INTR is not set
 # end of Soc configuration
 
 #
@@ -141,6 +142,7 @@ CONFIG_ENABLE_Pl011_UART=y
 # CONFIG_USE_PWM is not set
 # CONFIG_USE_IPC is not set
 # CONFIG_USE_MEDIA is not set
+# CONFIG_USE_SEC is not set
 # CONFIG_USE_SCMI_MHU is not set
 # CONFIG_USE_I2S is not set
 # CONFIG_USE_I3C is not set
diff --git a/example/system/arch/armv8/psci/psci_test/sdkconfig.h b/example/system/arch/armv8/psci/psci_test/sdkconfig.h
index 35de59823..2498348e7 100644
--- a/example/system/arch/armv8/psci/psci_test/sdkconfig.h
+++ b/example/system/arch/armv8/psci/psci_test/sdkconfig.h
@@ -68,6 +68,7 @@
 #define CONFIG_DEFAULT_DEBUG_PRINT_UART1
 /* CONFIG_DEFAULT_DEBUG_PRINT_UART0 is not set */
 /* CONFIG_DEFAULT_DEBUG_PRINT_UART2 is not set */
+/* CONFIG_UART_INIT_NOT_CLR_INTR is not set */
 /* end of Soc configuration */
 
 /* Board Configuration */
@@ -131,6 +132,7 @@
 /* CONFIG_USE_PWM is not set */
 /* CONFIG_USE_IPC is not set */
 /* CONFIG_USE_MEDIA is not set */
+/* CONFIG_USE_SEC is not set */
 /* CONFIG_USE_SCMI_MHU is not set */
 /* CONFIG_USE_I2S is not set */
 /* CONFIG_USE_I3C is not set */
diff --git a/example/system/arch/armv8/psci/psci_test/src/cmd_psci.c b/example/system/arch/armv8/psci/psci_test/src/cmd_psci.c
index b01f59e29..665ab4c75 100644
--- a/example/system/arch/armv8/psci/psci_test/src/cmd_psci.c
+++ b/example/system/arch/armv8/psci/psci_test/src/cmd_psci.c
@@ -16,13 +16,14 @@
  * 
  * FilePath: cmd_psci.c
  * Created Date: 2023-06-16 13:35:21
- * Last Modified: 2024-03-08 15:32:00
+ * Last Modified: 2025-08-05 10:43:51
  * Description:  This file is for
  * 
  * Modify History:
  *  Ver      Who        Date               Changes
  * -----  ----------  --------  ---------------------------------
  * 1.0    huanghe     2023-06-28        first version
+ * 1.1    kangkaiping 2025-08-05    add get cpuinfo
  */
 #include "sdkconfig.h"
 #ifndef SDK_CONFIG_H__
@@ -43,6 +44,10 @@ static void FPsciCmdUsage(void)
     printf("-- display psci some features\r\n") ;
     printf("psci amp\r\n") ;
     printf("-- The cpu hotplug function was tested using psci protocol \r\n") ;
+#if defined(FAARCH64_USE)
+    printf("psci cpu_version\r\n") ;
+    printf("--  get cpu version \r\n") ;
+#endif
 }
 
 static int FPsciExampleEntry(int argc, char *argv[])
@@ -65,7 +70,12 @@ static int FPsciExampleEntry(int argc, char *argv[])
     {
         FPsciHotplugTest() ;
     }
-
+#if defined(FAARCH64_USE)
+    if(!strcmp(argv[1], "cpu_version"))
+    {
+        FPsciGetCpuInfo() ;
+    }
+#endif
     return ret ;
 }
 
diff --git a/example/system/arch/armv8/psci/psci_test/src/psci_test.c b/example/system/arch/armv8/psci/psci_test/src/psci_test.c
index 32e35b9af..a7f0a18d4 100644
--- a/example/system/arch/armv8/psci/psci_test/src/psci_test.c
+++ b/example/system/arch/armv8/psci/psci_test/src/psci_test.c
@@ -16,18 +16,20 @@
  *
  * FilePath: psci_test.c
  * Created Date: 2023-06-25 09:27:28
- * Last Modified: 2024-06-28 17:20:24
+ * Last Modified: 2025-08-05 10:44:59
  * Description:  This file is for
  *
  * Modify History:
  *  Ver      Who        Date               Changes
  * -----  ----------  --------  ---------------------------------
  * 1.0     huanghe   2023-06-27         first release
+ * 1.1   kangkaiping 2025-08-05       add get cpuinfo
  */
 
 
-#include "fcpu_info.h"
+
 #include "fpsci.h"
+#include "psci_test.h"
 #include "stdio.h"
 #include "fcpu_info.h"
 #include "../psci_slave/sdkconfig.h"//此处采用从核的sdkconfig.h文件中获取配置信息
@@ -60,3 +62,20 @@ int FPsciHotplugTest(void)
     return FPsciCpuMaskOn(1 << CONFIG_IMAGE_CORE, CONFIG_IMAGE_LOAD_ADDRESS) ;
 }
 
+#if defined(FAARCH64_USE)
+int FPsciGetCpuInfo(void)
+{
+    struct FSmcccRes res;
+    if(FPsciCpuVersion(&res,0) == 0)
+    {
+        printf("not support psci cpu version \r\n") ;
+        return -1 ;
+    }
+    else
+    {
+        printf("psci cpu type is 0x%x \r\n", res.a1) ;
+        printf("psci cpu id is  high_id: 0x%llx low_id: 0x%llx \r\n", res.a3,res.a2) ;
+        return 0 ;
+    }
+}
+#endif
\ No newline at end of file
diff --git a/third-party/libmetal/src.mk b/third-party/libmetal/src.mk
index 28f7a432e..6d86752ca 100644
--- a/third-party/libmetal/src.mk
+++ b/third-party/libmetal/src.mk
@@ -1,16 +1,7 @@
 ifdef CONFIG_USE_LIBMETAL
 
-
 	CSRCS_RELATIVE_FILES += $(wildcard metal/*.c)
 	CSRCS_RELATIVE_FILES += $(wildcard metal/system/generic/ft_platform/*.c)
-
-
-ifdef CONFIG_TARGET_ARMV8_AARCH32
-	CSRCS_RELATIVE_FILES += $(wildcard metal/system/generic/*.c)
-endif
-
-ifdef CONFIG_TARGET_ARMV8_AARCH64
 	CSRCS_RELATIVE_FILES += $(wildcard metal/system/generic/*.c)
-endif
 
 endif #CONFIG_USE_LIBMETAL
\ No newline at end of file
diff --git a/third-party/openamp/include.mk b/third-party/openamp/include.mk
index aadc792bf..0d105b893 100644
--- a/third-party/openamp/include.mk
+++ b/third-party/openamp/include.mk
@@ -8,6 +8,7 @@ BUILD_INC_PATH_DIR +=  $(SDK_DIR)/third-party/openamp/lib \
 			$(SDK_DIR)/third-party/openamp/ports \
 			$(SDK_DIR)/third-party/openamp/lib/service/rpmsg/rpc \
 			$(SDK_DIR)/third-party/openamp/lib/virtio \
+			$(SDK_DIR)/third-party/openamp/lib/ \
 			$(SDK_DIR)/third-party/openamp/openamp-system-reference/examples/legacy_apps/include \
 			$(SDK_DIR)/third-party/openamp/openamp-system-reference/examples/legacy_apps/machine/phytium \
 			$(SDK_DIR)/third-party/openamp/openamp-system-reference/examples/legacy_apps/system/generic/machine/phytium
diff --git a/third-party/openamp/lib/include/openamp/remoteproc_virtio.h b/third-party/openamp/lib/include/openamp/remoteproc_virtio.h
index a8639cac4..8d61cc912 100644
--- a/third-party/openamp/lib/include/openamp/remoteproc_virtio.h
+++ b/third-party/openamp/lib/include/openamp/remoteproc_virtio.h
@@ -22,8 +22,7 @@
 extern "C" {
 #endif
 
-#if defined(CONFIG_VIRTIO_CACHED_RSC_TABLE)
-#define VIRTIO_CACHED_RSC_TABLE
+#if defined(CONFIG_VIRTIO_USE_DCACHE)
 #define VIRTIO_USE_DCACHE
 #endif
 
diff --git a/third-party/openamp/ports/version_def.h b/third-party/openamp/lib/version_def.h
similarity index 94%
rename from third-party/openamp/ports/version_def.h
rename to third-party/openamp/lib/version_def.h
index 46903b1e9..26a9078e3 100644
--- a/third-party/openamp/ports/version_def.h
+++ b/third-party/openamp/lib/version_def.h
@@ -25,8 +25,8 @@
  * 1.0     LiuSM      2025-06-26 14:13:17  first version
  */
 
-#ifndef __OPENAMP_VERSION_DEF__H__
-#define __OPENAMP_VERSION_DEF__H__
+#ifndef OPENAMP_VERSION_DEF_H
+#define OPENAMP_VERSION_DEF_H
 
 /* @templates@ values come from cmake/option.cmake */
 
diff --git a/third-party/openamp/openamp-system-reference/examples/legacy_apps/machine/phytium/platform_info.c b/third-party/openamp/openamp-system-reference/examples/legacy_apps/machine/phytium/platform_info.c
index 72b6a454f..3691c0daa 100644
--- a/third-party/openamp/openamp-system-reference/examples/legacy_apps/machine/phytium/platform_info.c
+++ b/third-party/openamp/openamp-system-reference/examples/legacy_apps/machine/phytium/platform_info.c
@@ -38,7 +38,7 @@
 #include "fdebug.h"
 #include "helper.h"
 
-#define     FT_PLAT_INFO_MAIN_DEBUG_TAG "    FT_PLAT_INFO_MAIN"
+#define     FT_PLAT_INFO_MAIN_DEBUG_TAG "FT_PLAT_INFO_MAIN"
 #define     FT_PLAT_INFO_MAIN_DEBUG_I(format, ...) FT_DEBUG_PRINT_I( FT_PLAT_INFO_MAIN_DEBUG_TAG, format, ##__VA_ARGS__)
 #define     FT_PLAT_INFO_MAIN_DEBUG_W(format, ...) FT_DEBUG_PRINT_W( FT_PLAT_INFO_MAIN_DEBUG_TAG, format, ##__VA_ARGS__)
 #define     FT_PLAT_INFO_MAIN_DEBUG_E(format, ...) FT_DEBUG_PRINT_E( FT_PLAT_INFO_MAIN_DEBUG_TAG, format, ##__VA_ARGS__)
@@ -88,7 +88,6 @@ void rproc_clear_stop_flag(void)
     stop_flag &= ~REMOTE_PROC_STOP;
 }
 
-
 struct remoteproc *platform_create_proc(struct remoteproc * rproc_inst,struct remoteproc_priv *priv ,struct metal_device *kick_dev)
 {
 	struct remoteproc * rproc;
@@ -147,7 +146,6 @@ int platform_setup_share_mems(struct remoteproc *rproc_inst)
     return 0 ;
 }
 
-
 struct rpmsg_device *platform_create_rpmsg_vdev(void *platform, unsigned int vdev_index, unsigned int role,
 												void (*rst_cb)(struct virtio_device *vdev), rpmsg_ns_bind_cb ns_bind_cb)
 {
-- 
Gitee