diff --git a/common/socinfo.c b/common/socinfo.c
index f975bc529d47b21b163eff98c05ab394bce601c3..4fab6d5bce57c043f5f9dc6f0c26ccf6bdc9669c 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/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/am64x/am64x_host_info.h>
+#include <soc/am64x/am64x_sec_proxy_info.h>
+#include <soc/am64x/am64x_processors_info.h>
/* Assuming these addresses and definitions stay common across K3 devices */
#define CTRLMMR_WKUP_JTAG_DEVICE_ID 0x43000018
#define JTAG_ID_VARIANT_SHIFT 28
#define JTAG_ID_VARIANT_MASK (0xf << 28)
#define JTAG_ID_PARTNO_SHIFT 12
-#define JTAG_ID_PARTNO_MASK (0x7ff << 1)
+#define JTAG_ID_PARTNO_MASK (0xffff << 12)
#define CTRLMMR_WKUP_DIE_ID0 0x43000020
#define CTRLMMR_WKUP_DIE_ID1 0x43000024
struct k3conf_soc_info soc_info;
-static const char soc_name[K3_MAX + 1][SOC_NAME_MAX_LENGTH] = {
- [AM654] = "AM654",
- [J721E] = "J721E",
- [K3_MAX] = "UNKNOWN"
-};
-
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"
};
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)
+{
+ 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;
+ sci_info->processors_info = am65x_sr2_processors_info;
+ sci_info->num_processors = AM65X_SR2_MAX_PROCESSORS_IDS;
+ sci_info->devices_info = am65x_sr2_devices_info;
+ 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 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;
+}
+
+static void j7200_init(void)
+{
+ struct ti_sci_info *sci_info = &soc_info.sci_info;
+
+ sci_info->host_info = j7200_host_info;
+ sci_info->num_hosts = J7200_MAX_HOST_IDS;
+ sci_info->sp_info[MAIN_SEC_PROXY] = j7200_main_sp_info;
+ sci_info->num_sp_threads[MAIN_SEC_PROXY] = J7200_MAIN_SEC_PROXY_THREADS;
+ sci_info->sp_info[MCU_SEC_PROXY] = j7200_mcu_sp_info;
+ sci_info->num_sp_threads[MCU_SEC_PROXY] = J7200_MCU_SEC_PROXY_THREADS;
+ sci_info->processors_info = j7200_processors_info;
+ sci_info->num_processors = J7200_MAX_PROCESSORS_IDS;
+ sci_info->devices_info = j7200_devices_info;
+ 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;
+}
+
+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;
+ soc_info.host_id = 13;
+ soc_info.sec_proxy = &k3_lite_sec_proxy_base;
}
int soc_init(uint32_t host_id)
{
+ char *name;
+
memset(&soc_info, 0, sizeof(soc_info));
- soc_info.soc = (mmio_read_32(CTRLMMR_WKUP_JTAG_DEVICE_ID) &
- DEVICE_ID_FAMILY_MASK) >> DEVICE_ID_FAMILY_SHIFT;
+ soc_info.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) &
JTAG_ID_VARIANT_MASK) >> JTAG_ID_VARIANT_SHIFT;
- if (soc_info.soc > K3_MAX || !soc_name[soc_info.soc]) {
+ switch (soc_info.soc) {
+ case AM65X:
+ name = "AM65x";
+ break;
+ case J721E:
+ name = "J721E";
+ break;
+ case J7200:
+ name = "J7200";
+ break;
+ case AM64X:
+ name = "AM64x";
+ break;
+ default:
fprintf(stderr, "Unknown Silicon %d\n", soc_info.soc);
return -1;
- }
+ };
+
if (soc_info.rev > REV_PG_MAX) {
fprintf(stderr, "Unknown Silicon revision %d for SoC %s\n",
- soc_info.rev, soc_name[soc_info.soc]);
+ soc_info.rev, name);
return -1;
}
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, 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;
-
- if (soc_info.soc == AM654)
+ if (soc_info.soc == AM65X && soc_info.rev == REV_SR1_0)
am654_init();
+ else if (soc_info.soc == AM65X && soc_info.rev == REV_SR2_0)
+ am654_sr2_init();
else if (soc_info.soc == J721E)
j721e_init();
+ else if (soc_info.soc == J7200)
+ j7200_init();
+ else if (soc_info.soc == AM64X)
+ am64x_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())
int soc_is_am654(void)
{
- return soc_info.soc == AM654;
+ return soc_info.soc == AM65X;
}