soc: am65x_sr2: Add sec proxy info

[k3conf/k3conf.git] / common / socinfo.c

diff --git a/common/socinfo.c b/common/socinfo.c
index 94b2610947116eb6ade7b32e5241b81d62c009a9..dc26cf8dd2e071df393cba54a81ed38883f3f436 100644 (file)
--- a/common/socinfo.c
+++ b/common/socinfo.c
@@ -38,7 +38,17 @@
 #include <string.h>
 #include <sec_proxy.h>
 #include <soc/am65x/am65x_host_info.h>
+#include <soc/am65x/am65x_sec_proxy_info.h>
+#include <soc/am65x/am65x_processors_info.h>
+#include <soc/am65x/am65x_devices_info.h>
+#include <soc/am65x/am65x_clocks_info.h>
+#include <soc/am65x_sr2/am65x_sr2_host_info.h>
+#include <soc/am65x_sr2/am65x_sr2_sec_proxy_info.h>
 #include <soc/j721e/j721e_host_info.h>
+#include <soc/j721e/j721e_sec_proxy_info.h>
+#include <soc/j721e/j721e_processors_info.h>
+#include <soc/j721e/j721e_devices_info.h>
+#include <soc/j721e/j721e_clocks_info.h>
 
 /* Assuming these addresses and definitions stay common across K3 devices */
 #define CTRLMMR_WKUP_JTAG_DEVICE_ID    0x43000018
@@ -73,8 +83,8 @@ static const char soc_name[K3_MAX + 1][SOC_NAME_MAX_LENGTH] = {
 };
 
 static const char soc_revision[REV_PG_MAX + 1][SOC_REVISION_MAX_LENGTH] = {
-       [REV_PG1_0] = "1.0",
-       [REV_PG2_0] = "2.0",
+       [REV_SR1_0] = "1.0",
+       [REV_SR2_0] = "2.0",
        [REV_PG_MAX] = "NULL"
 };
 
@@ -84,6 +94,28 @@ static void am654_init(void)
 
        sci_info->host_info = am65x_host_info;
        sci_info->num_hosts = AM65X_MAX_HOST_IDS;
+       sci_info->sp_info[MAIN_SEC_PROXY] = am65x_main_sp_info;
+       sci_info->num_sp_threads[MAIN_SEC_PROXY] = AM65X_MAIN_SEC_PROXY_THREADS;
+       sci_info->sp_info[MCU_SEC_PROXY] = am65x_mcu_sp_info;
+       sci_info->num_sp_threads[MCU_SEC_PROXY] = AM65X_MCU_SEC_PROXY_THREADS;
+       sci_info->processors_info = am65x_processors_info;
+       sci_info->num_processors = AM65X_MAX_PROCESSORS_IDS;
+       sci_info->devices_info = am65x_devices_info;
+       sci_info->num_devices = AM65X_MAX_DEVICES;
+       sci_info->clocks_info = am65x_clocks_info;
+       sci_info->num_clocks = AM65X_MAX_CLOCKS;
+}
+
+static void am654_sr2_init(void)
+{
+       struct ti_sci_info *sci_info = &soc_info.sci_info;
+
+       sci_info->host_info = am65x_sr2_host_info;
+       sci_info->num_hosts = AM65X_SR2_MAX_HOST_IDS;
+       sci_info->sp_info[MAIN_SEC_PROXY] = am65x_sr2_main_sp_info;
+       sci_info->num_sp_threads[MAIN_SEC_PROXY] = AM65X_SR2_MAIN_SEC_PROXY_THREADS;
+       sci_info->sp_info[MCU_SEC_PROXY] = am65x_sr2_mcu_sp_info;
+       sci_info->num_sp_threads[MCU_SEC_PROXY] = AM65X_SR2_MCU_SEC_PROXY_THREADS;
 }
 
 static void j721e_init(void)
@@ -92,9 +124,19 @@ static void j721e_init(void)
 
        sci_info->host_info = j721e_host_info;
        sci_info->num_hosts = J721E_MAX_HOST_IDS;
+       sci_info->sp_info[MAIN_SEC_PROXY] = j721e_main_sp_info;
+       sci_info->num_sp_threads[MAIN_SEC_PROXY] = J721E_MAIN_SEC_PROXY_THREADS;
+       sci_info->sp_info[MCU_SEC_PROXY] = j721e_mcu_sp_info;
+       sci_info->num_sp_threads[MCU_SEC_PROXY] = J721E_MCU_SEC_PROXY_THREADS;
+       sci_info->processors_info = j721e_processors_info;
+       sci_info->num_processors = J721E_MAX_PROCESSORS_IDS;
+       sci_info->devices_info = j721e_devices_info;
+       sci_info->num_devices = J721E_MAX_DEVICES;
+       sci_info->clocks_info = j721e_clocks_info;
+       sci_info->num_clocks = J721E_MAX_CLOCKS;
 }
 
-int soc_init(void)
+int soc_init(uint32_t host_id)
 {
        memset(&soc_info, 0, sizeof(soc_info));
 
@@ -115,13 +157,15 @@ int soc_init(void)
 
        strncpy(soc_info.soc_full_name, "", sizeof(soc_info.soc_full_name));
        strcat(soc_info.soc_full_name, soc_name[soc_info.soc]);
-       strcat(soc_info.soc_full_name, " PG");
+       strcat(soc_info.soc_full_name, " SR");
        strcat(soc_info.soc_full_name, soc_revision[soc_info.rev]);
 
-       soc_info.host_id = DEFAULT_HOST_ID;
+       soc_info.host_id = host_id;
 
-       if (soc_info.soc == AM654)
+       if (soc_info.soc == AM654 && soc_info.rev == REV_SR1_0)
                am654_init();
+       else if (soc_info.soc == AM654 && soc_info.rev == REV_SR2_0)
+               am654_sr2_init();
        else if (soc_info.soc == J721E)
                j721e_init();