diff --git a/common/socinfo.c b/common/socinfo.c
index d7624f6be1831fd6639aad77587d12175a7c3d15..a39497a595be8a642f445835af04509917fb1646 100644 (file)
--- a/common/socinfo.c
+++ b/common/socinfo.c
/*
* K3 SoC detection and helper apis
*
- * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/
+ * Copyright (C) 2019 Texas Instruments Incorporated - https://www.ti.com/
* Lokesh Vutla <lokeshvutla@ti.com>
*
* Redistribution and use in source and binary forms, with or without
#include <soc/am65x/am65x_processors_info.h>
#include <soc/am65x/am65x_devices_info.h>
#include <soc/am65x/am65x_clocks_info.h>
+#include <soc/am65x/am65x_rm_info.h>
#include <soc/am65x_sr2/am65x_sr2_host_info.h>
#include <soc/am65x_sr2/am65x_sr2_sec_proxy_info.h>
#include <soc/am65x_sr2/am65x_sr2_processors_info.h>
#include <soc/am65x_sr2/am65x_sr2_devices_info.h>
#include <soc/am65x_sr2/am65x_sr2_clocks_info.h>
+#include <soc/am65x_sr2/am65x_sr2_rm_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>
+#include <soc/j721e/j721e_rm_info.h>
+#include <soc/j721e/j721e_ddr_info.h>
#include <soc/j7200/j7200_host_info.h>
#include <soc/j7200/j7200_sec_proxy_info.h>
#include <soc/j7200/j7200_processors_info.h>
#include <soc/j7200/j7200_devices_info.h>
#include <soc/j7200/j7200_clocks_info.h>
+#include <soc/j7200/j7200_rm_info.h>
+#include <soc/j7200/j7200_ddr_info.h>
+#include <soc/am64x/am64x_host_info.h>
+#include <soc/am64x/am64x_sec_proxy_info.h>
+#include <soc/am64x/am64x_processors_info.h>
+#include <soc/am64x/am64x_devices_info.h>
+#include <soc/am64x/am64x_clocks_info.h>
+#include <soc/am64x/am64x_rm_info.h>
+#include <soc/am62x/am62x_devices_info.h>
+#include <soc/am62x/am62x_clocks_info.h>
+#include <soc/am62x/am62x_host_info.h>
+#include <soc/am62x/am62x_processors_info.h>
+#include <soc/am62x/am62x_rm_info.h>
+#include <soc/am62x/am62x_sec_proxy_info.h>
+#include <soc/am62x/am62x_ddr_info.h>
+#include <soc/j721s2/j721s2_devices_info.h>
+#include <soc/j721s2/j721s2_clocks_info.h>
+#include <soc/j721s2/j721s2_host_info.h>
+#include <soc/j721s2/j721s2_processors_info.h>
+#include <soc/j721s2/j721s2_rm_info.h>
+#include <soc/j721s2/j721s2_sec_proxy_info.h>
+#include <soc/j784s4/j784s4_clocks_info.h>
+#include <soc/j784s4/j784s4_devices_info.h>
+#include <soc/j784s4/j784s4_host_info.h>
+#include <soc/j784s4/j784s4_processors_info.h>
+#include <soc/j784s4/j784s4_rm_info.h>
+#include <soc/j784s4/j784s4_sec_proxy_info.h>
+#include <soc/am62ax/am62ax_clocks_info.h>
+#include <soc/am62ax/am62ax_devices_info.h>
+#include <soc/am62ax/am62ax_host_info.h>
+#include <soc/am62ax/am62ax_processors_info.h>
+#include <soc/am62ax/am62ax_rm_info.h>
+#include <soc/am62ax/am62ax_sec_proxy_info.h>
+#include <soc/am62px/am62px_clocks_info.h>
+#include <soc/am62px/am62px_devices_info.h>
+#include <soc/am62px/am62px_host_info.h>
+#include <soc/am62px/am62px_processors_info.h>
+#include <soc/am62px/am62px_rm_info.h>
+#include <soc/am62px/am62px_sec_proxy_info.h>
+#include <soc/j722s/j722s_clocks_info.h>
+#include <soc/j722s/j722s_devices_info.h>
+#include <soc/j722s/j722s_host_info.h>
+#include <soc/j722s/j722s_processors_info.h>
+#include <soc/j722s/j722s_rm_info.h>
+#include <soc/j722s/j722s_sec_proxy_info.h>
/* Assuming these addresses and definitions stay common across K3 devices */
#define CTRLMMR_WKUP_JTAG_DEVICE_ID 0x43000018
#define CTRLMMR_WKUP_BOOTCFG 0x43000034
struct k3conf_soc_info soc_info;
+int soc_info_valid = 0;
-static const char soc_revision[REV_PG_MAX + 1][SOC_REVISION_MAX_LENGTH] = {
- [REV_SR1_0] = "1.0",
- [REV_SR2_0] = "2.0",
- [REV_PG_MAX] = "NULL"
+typedef enum {
+ REV_1,
+ REV_2,
+ REV_PG_MAX
+} k3_soc_rev;
+
+static const char *soc_revision_j721e[] = {
+ [REV_1] = " SR1.0",
+ [REV_2] = " SR1.1",
+};
+
+static const char *soc_revision_generic[] = {
+ [REV_1] = " SR1.0",
+ [REV_2] = " SR2.0",
};
static void am654_init(void)
sci_info->num_devices = AM65X_MAX_DEVICES;
sci_info->clocks_info = am65x_clocks_info;
sci_info->num_clocks = AM65X_MAX_CLOCKS;
+ sci_info->rm_info = am65x_rm_info;
+ sci_info->num_res = AM65X_MAX_RES;
+ soc_info.host_id = DEFAULT_HOST_ID;
+ soc_info.sec_proxy = &k3_generic_sec_proxy_base;
}
static void am654_sr2_init(void)
sci_info->num_devices = AM65X_SR2_MAX_DEVICES;
sci_info->clocks_info = am65x_sr2_clocks_info;
sci_info->num_clocks = AM65X_SR2_MAX_CLOCKS;
+ sci_info->rm_info = am65x_sr2_rm_info;
+ sci_info->num_res = AM65X_SR2_MAX_RES;
+ soc_info.host_id = DEFAULT_HOST_ID;
+ soc_info.sec_proxy = &k3_generic_sec_proxy_base;
+}
+
+static void j721s2_init(void)
+{
+ struct ti_sci_info *sci_info = &soc_info.sci_info;
+
+ sci_info->sp_info[MAIN_SEC_PROXY] = j721s2_main_sp_info;
+ sci_info->num_sp_threads[MAIN_SEC_PROXY] = J721S2_MAIN_SEC_PROXY_THREADS;
+ sci_info->sp_info[MCU_SEC_PROXY] = j721s2_mcu_sp_info;
+ sci_info->num_sp_threads[MCU_SEC_PROXY] = J721S2_MCU_SEC_PROXY_THREADS;
+ sci_info->rm_info = j721s2_rm_info;
+ sci_info->num_res = J721S2_MAX_RES;
+ sci_info->host_info = j721s2_host_info;
+ sci_info->num_hosts = J721S2_MAX_HOST_IDS;
+ sci_info->clocks_info = j721s2_clocks_info;
+ sci_info->num_clocks = J721S2_MAX_CLOCKS;
+ sci_info->devices_info = j721s2_devices_info;
+ sci_info->num_devices = J721S2_MAX_DEVICES;
+ sci_info->processors_info = j721s2_processors_info;
+ sci_info->num_processors = J721S2_MAX_PROCESSORS_IDS;
+ soc_info.host_id = DEFAULT_HOST_ID;
+ soc_info.sec_proxy = &k3_generic_sec_proxy_base;
}
static void j721e_init(void)
sci_info->num_devices = J721E_MAX_DEVICES;
sci_info->clocks_info = j721e_clocks_info;
sci_info->num_clocks = J721E_MAX_CLOCKS;
+ sci_info->rm_info = j721e_rm_info;
+ sci_info->num_res = J721E_MAX_RES;
+ soc_info.host_id = DEFAULT_HOST_ID;
+ soc_info.sec_proxy = &k3_generic_sec_proxy_base;
+ soc_info.ddr_perf_info = &j721e_ddr_perf_info;
}
static void j7200_init(void)
sci_info->num_devices = J7200_MAX_DEVICES;
sci_info->clocks_info = j7200_clocks_info;
sci_info->num_clocks = J7200_MAX_CLOCKS;
+ sci_info->rm_info = j7200_rm_info;
+ sci_info->num_res = J7200_MAX_RES;
+ soc_info.host_id = DEFAULT_HOST_ID;
+ soc_info.sec_proxy = &k3_generic_sec_proxy_base;
+ soc_info.ddr_perf_info = &j7200_ddr_perf_info;
}
-int soc_init(uint32_t host_id)
+static void am64x_init(void)
+{
+ struct ti_sci_info *sci_info = &soc_info.sci_info;
+
+ sci_info->host_info = am64x_host_info;
+ sci_info->num_hosts = AM64X_MAX_HOST_IDS;
+ sci_info->sp_info[MAIN_SEC_PROXY] = am64x_main_sp_info;
+ sci_info->num_sp_threads[MAIN_SEC_PROXY] = AM64X_MAIN_SEC_PROXY_THREADS;
+ sci_info->sp_info[MCU_SEC_PROXY] = NULL;
+ sci_info->num_sp_threads[MCU_SEC_PROXY] = 0;
+ sci_info->processors_info = am64x_processors_info;
+ sci_info->num_processors = AM64X_MAX_PROCESSORS_IDS;
+ sci_info->devices_info = am64x_devices_info;
+ sci_info->num_devices = AM64X_MAX_DEVICES;
+ sci_info->clocks_info = am64x_clocks_info;
+ sci_info->num_clocks = AM64X_MAX_CLOCKS;
+ sci_info->rm_info = am64x_rm_info;
+ sci_info->num_res = AM64X_MAX_RES;
+ soc_info.host_id = 13;
+ soc_info.sec_proxy = &k3_lite_sec_proxy_base;
+}
+
+static void am62x_init(void)
+{
+ struct ti_sci_info *sci_info = &soc_info.sci_info;
+
+ sci_info->sp_info[MAIN_SEC_PROXY] = am62x_main_sp_info;
+ sci_info->num_sp_threads[MAIN_SEC_PROXY] = AM62X_MAIN_SEC_PROXY_THREADS;
+ sci_info->sp_info[MCU_SEC_PROXY] = NULL;
+ sci_info->num_sp_threads[MCU_SEC_PROXY] = 0;
+ sci_info->rm_info = am62x_rm_info;
+ sci_info->num_res = AM62X_MAX_RES;
+ sci_info->processors_info = am62x_processors_info;
+ sci_info->num_processors = AM62X_MAX_PROCESSORS_IDS;
+ sci_info->host_info = am62x_host_info;
+ sci_info->num_hosts = AM62X_MAX_HOST_IDS;
+ sci_info->devices_info = am62x_devices_info;
+ sci_info->num_devices = AM62X_MAX_DEVICES;
+ sci_info->clocks_info = am62x_clocks_info;
+ sci_info->num_clocks = AM62X_MAX_CLOCKS;
+ soc_info.host_id = 13;
+ soc_info.sec_proxy = &k3_lite_sec_proxy_base;
+ soc_info.ddr_perf_info = &am62x_ddr_perf_info;
+}
+
+static void j722s_init(void)
+{
+ struct ti_sci_info *sci_info = &soc_info.sci_info;
+
+ sci_info->clocks_info = j722s_clocks_info;
+ sci_info->num_clocks = J722S_MAX_CLOCKS;
+ sci_info->devices_info = j722s_devices_info;
+ sci_info->num_devices = J722S_MAX_DEVICES;
+ sci_info->host_info = j722s_host_info;
+ sci_info->num_hosts = J722S_MAX_HOST_IDS;
+ sci_info->processors_info = j722s_processors_info;
+ sci_info->num_processors = J722S_MAX_PROCESSORS_IDS;
+ sci_info->rm_info = j722s_rm_info;
+ sci_info->num_res = J722S_MAX_RES;
+ sci_info->sp_info[MAIN_SEC_PROXY] = j722s_main_sp_info;
+ sci_info->num_sp_threads[MAIN_SEC_PROXY] = J722S_MAIN_SEC_PROXY_THREADS;
+ sci_info->sp_info[MCU_SEC_PROXY] = j722s_mcu_sp_info;
+ sci_info->num_sp_threads[MCU_SEC_PROXY] = J722S_MCU_SEC_PROXY_THREADS;
+
+ soc_info.host_id = 13;
+ soc_info.sec_proxy = &k3_lite_sec_proxy_base;
+}
+
+static void j784s4_init(void)
+{
+ struct ti_sci_info *sci_info = &soc_info.sci_info;
+
+ sci_info->clocks_info = j784s4_clocks_info;
+ sci_info->num_clocks = J784S4_MAX_CLOCKS;
+ sci_info->devices_info = j784s4_devices_info;
+ sci_info->num_devices = J784S4_MAX_DEVICES;
+ sci_info->host_info = j784s4_host_info;
+ sci_info->num_hosts = J784S4_MAX_HOST_IDS;
+ sci_info->processors_info = j784s4_processors_info;
+ sci_info->num_processors = J784S4_MAX_PROCESSORS_IDS;
+ sci_info->rm_info = j784s4_rm_info;
+ sci_info->num_res = J784S4_MAX_RES;
+ sci_info->sp_info[MAIN_SEC_PROXY] = j784s4_main_sp_info;
+ sci_info->num_sp_threads[MAIN_SEC_PROXY] = J784S4_MAIN_SEC_PROXY_THREADS;
+ sci_info->sp_info[MCU_SEC_PROXY] = j784s4_mcu_sp_info;
+ sci_info->num_sp_threads[MCU_SEC_PROXY] = J784S4_MCU_SEC_PROXY_THREADS;
+
+ soc_info.host_id = DEFAULT_HOST_ID;
+ soc_info.sec_proxy = &k3_generic_sec_proxy_base;
+}
+
+static void am62ax_init(void)
{
- char *name;
+ struct ti_sci_info *sci_info = &soc_info.sci_info;
+
+ sci_info->clocks_info = am62ax_clocks_info;
+ sci_info->num_clocks = AM62AX_MAX_CLOCKS;
+ sci_info->devices_info = am62ax_devices_info;
+ sci_info->num_devices = AM62AX_MAX_DEVICES;
+ sci_info->host_info = am62ax_host_info;
+ sci_info->num_hosts = AM62AX_MAX_HOST_IDS;
+ sci_info->processors_info = am62ax_processors_info;
+ sci_info->num_processors = AM62AX_MAX_PROCESSORS_IDS;
+ sci_info->rm_info = am62ax_rm_info;
+ sci_info->num_res = AM62AX_MAX_RES;
+ sci_info->sp_info[MAIN_SEC_PROXY] = am62ax_main_sp_info;
+ sci_info->num_sp_threads[MAIN_SEC_PROXY] = AM62AX_MAIN_SEC_PROXY_THREADS;
+ sci_info->sp_info[MCU_SEC_PROXY] = am62ax_mcu_sp_info;
+ sci_info->num_sp_threads[MCU_SEC_PROXY] = AM62AX_MCU_SEC_PROXY_THREADS;
+
+ soc_info.host_id = 13;
+ soc_info.sec_proxy = &k3_lite_sec_proxy_base;
+}
+
+static void am62px_init(void)
+{
+ struct ti_sci_info *sci_info = &soc_info.sci_info;
+
+ sci_info->clocks_info = am62px_clocks_info;
+ sci_info->num_clocks = AM62PX_MAX_CLOCKS;
+ sci_info->devices_info = am62px_devices_info;
+ sci_info->num_devices = AM62PX_MAX_DEVICES;
+ sci_info->host_info = am62px_host_info;
+ sci_info->num_hosts = AM62PX_MAX_HOST_IDS;
+ sci_info->processors_info = am62px_processors_info;
+ sci_info->num_processors = AM62PX_MAX_PROCESSORS_IDS;
+ sci_info->rm_info = am62px_rm_info;
+ sci_info->num_res = AM62PX_MAX_RES;
+ sci_info->sp_info[MAIN_SEC_PROXY] = am62px_main_sp_info;
+ sci_info->num_sp_threads[MAIN_SEC_PROXY] = AM62PX_MAIN_SEC_PROXY_THREADS;
+ sci_info->sp_info[MCU_SEC_PROXY] = am62px_mcu_sp_info;
+ sci_info->num_sp_threads[MCU_SEC_PROXY] = AM62PX_MCU_SEC_PROXY_THREADS;
+ soc_info.host_id = 13;
+ soc_info.sec_proxy = &k3_lite_sec_proxy_base;
+}
+
+int soc_init(uint32_t host_id)
+{
memset(&soc_info, 0, sizeof(soc_info));
- soc_info.soc = (mmio_read_32(CTRLMMR_WKUP_JTAG_ID) &
+ uint32_t soc = (mmio_read_32(CTRLMMR_WKUP_JTAG_ID) &
JTAG_ID_PARTNO_MASK) >> JTAG_ID_PARTNO_SHIFT;
- soc_info.rev = (mmio_read_32(CTRLMMR_WKUP_JTAG_ID) &
+ k3_soc_rev rev = (mmio_read_32(CTRLMMR_WKUP_JTAG_ID) &
JTAG_ID_VARIANT_MASK) >> JTAG_ID_VARIANT_SHIFT;
- switch (soc_info.soc) {
+ switch (soc) {
case AM65X:
- name = "AM65x";
+ soc_info.soc_name = "AM65x";
+ break;
+ case J721S2:
+ soc_info.soc_name = "J721S2";
break;
case J721E:
- name = "J721E";
+ soc_info.soc_name = "J721E";
break;
case J7200:
- name = "J7200";
+ soc_info.soc_name = "J7200";
+ break;
+ case AM64X:
+ soc_info.soc_name = "AM64x";
+ break;
+ case AM62X:
+ soc_info.soc_name = "AM62X";
+ break;
+ case AM62AX:
+ soc_info.soc_name = "AM62Ax";
+ break;
+ case AM62PX:
+ soc_info.soc_name = "AM62Px";
+ break;
+ case J784S4:
+ soc_info.soc_name = "J784S4";
+ break;
+ case J722S:
+ soc_info.soc_name = "J722S";
break;
default:
- fprintf(stderr, "Unknown Silicon %d\n", soc_info.soc);
- return -1;
+ fprintf(stderr, "Unknown Silicon %d\n", soc);
+ return SOC_INFO_UNKNOWN_SILICON;
};
- if (soc_info.rev > REV_PG_MAX) {
+ if (rev >= REV_PG_MAX) {
fprintf(stderr, "Unknown Silicon revision %d for SoC %s\n",
- soc_info.rev, name);
- return -1;
+ rev, soc_info.soc_name);
+ return SOC_INFO_UNKNOWN_SILICON;
}
- strncpy(soc_info.soc_full_name, "", sizeof(soc_info.soc_full_name));
- strcat(soc_info.soc_full_name, name);
- strcat(soc_info.soc_full_name, " SR");
- strcat(soc_info.soc_full_name, soc_revision[soc_info.rev]);
-
- soc_info.host_id = host_id;
+ switch (soc) {
+ case J721E:
+ soc_info.rev_name = soc_revision_j721e[rev];
+ break;
+ default:
+ soc_info.rev_name = soc_revision_generic[rev];
+ };
- if (soc_info.soc == AM65X && soc_info.rev == REV_SR1_0)
+ if (soc == AM65X && rev == REV_1)
am654_init();
- else if (soc_info.soc == AM65X && soc_info.rev == REV_SR2_0)
+ else if (soc == AM65X && rev == REV_2)
am654_sr2_init();
- else if (soc_info.soc == J721E)
+ else if (soc == J721S2)
+ j721s2_init();
+ else if (soc == J721E)
j721e_init();
- else if (soc_info.soc == J7200)
+ else if (soc == J7200)
j7200_init();
+ else if (soc == AM64X)
+ am64x_init();
+ else if (soc == AM62X)
+ am62x_init();
+ else if (soc == AM62AX)
+ am62ax_init();
+ else if (soc == AM62PX)
+ am62px_init();
+ else if (soc == J784S4)
+ j784s4_init();
+ else if (soc == J722S)
+ j722s_init();
+
+ if (host_id != INVALID_HOST_ID)
+ soc_info.host_id = host_id;
/* ToDo: Add error if sec_proxy_init/sci_init is failed */
if(!k3_sec_proxy_init())
if (!ti_sci_init())
soc_info.ti_sci_enabled = 1;
+ soc_info_valid = 1;
return 0;
}
-
-int soc_is_j721e(void)
-{
- return soc_info.soc == J721E;
-}
-
-int soc_is_am654(void)
-{
- return soc_info.soc == AM65X;
-}