All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tero Kristo <t-kristo@ti.com>
To: u-boot@lists.denx.de
Subject: [PATCH 22/26] arm: mach-k3: sysfw-loader: pass boardcfg to sciserver
Date: Tue, 10 Nov 2020 11:05:58 +0200	[thread overview]
Message-ID: <20201110090602.2255-23-t-kristo@ti.com> (raw)
In-Reply-To: <20201110090602.2255-1-t-kristo@ti.com>

Copy the contents of the board config loaded from sysfw.itb into an
EXTBOOT shared memory buffer that gets passed to sciserver. This only
needs to be done if EXTBOOT area has not been populated by ROM code yet.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
---
 arch/arm/mach-k3/sysfw-loader.c | 98 +++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)

diff --git a/arch/arm/mach-k3/sysfw-loader.c b/arch/arm/mach-k3/sysfw-loader.c
index 154d2df049..c20b601848 100644
--- a/arch/arm/mach-k3/sysfw-loader.c
+++ b/arch/arm/mach-k3/sysfw-loader.c
@@ -39,6 +39,43 @@ DECLARE_GLOBAL_DATA_PTR;
  */
 #define K3_SYSTEM_CONTROLLER_RPROC_ID	0
 
+#define BOARDCFG_ADDRESS		0x41c80000
+
+#define COMP_TYPE_SBL_DATA		0x11
+#define DESC_TYPE_BOARDCFG_PM_INDEX	0x2
+#define DESC_TYPE_BOARDCFG_RM_INDEX	0x3
+
+#define BOARD_CONFIG_RM_DESC_TYPE	0x000c
+#define BOARD_CONFIG_PM_DESC_TYPE	0x000e
+
+struct extboot_comp {
+	u32 comp_type;
+	u32 boot_core;
+	u32 comp_opts;
+	u64 dest_addr;
+	u32 comp_size;
+} __packed;
+
+struct extboot_header {
+	u8 magic[8];
+	u32 num_comps;
+	struct extboot_comp comps[5];
+} __packed;
+
+struct bcfg_desc {
+	u16 type;
+	u16 offset;
+	u16 size;
+	u8 devgrp;
+	u8 reserved;
+} __packed;
+
+struct bcfg_header {
+	u8 num_elems;
+	u8 sw_rev;
+	struct bcfg_desc descs[4];
+} __packed;
+
 static bool sysfw_loaded;
 static void *sysfw_load_address;
 
@@ -130,6 +167,15 @@ static void k3_sysfw_configure_using_fit(void *fit,
 	const void *cfg_fragment_addr;
 	size_t cfg_fragment_size;
 	int ret;
+#ifndef CONFIG_CLK_TI_SCI
+	u8 *buf;
+	struct extboot_header *common_header;
+	struct bcfg_header *bcfg_header;
+	struct extboot_comp *comp;
+	struct bcfg_desc *desc;
+	u32 addr;
+	bool copy_bcfg = false;
+#endif
 
 	/* Find the node holding the images information */
 	images = fdt_path_offset(fit, FIT_IMAGES_PATH);
@@ -164,6 +210,46 @@ static void k3_sysfw_configure_using_fit(void *fit,
 					 (u32)cfg_fragment_size);
 	if (ret)
 		panic("Failed to set board PM configuration (%d)\n", ret);
+#else
+	/* Initialize shared memory boardconfig buffer */
+	buf = (u8 *)BOARDCFG_ADDRESS;
+	common_header = (struct extboot_header *)buf;
+
+	/* Check if we have a struct populated by ROM in memory already */
+	if (strcmp((char *)common_header->magic, "EXTBOOT"))
+		copy_bcfg = true;
+
+	if (copy_bcfg) {
+		strcpy((char *)common_header->magic, "EXTBOOT");
+		common_header->num_comps = 1;
+
+		comp = &common_header->comps[0];
+
+		comp->comp_type = COMP_TYPE_SBL_DATA;
+		comp->boot_core = 0x10;
+		comp->comp_opts = 0;
+		addr = (u32)buf + sizeof(*common_header);
+		comp->dest_addr = addr;
+		comp->comp_size = sizeof(*bcfg_header);
+
+		bcfg_header = (struct bcfg_header *)addr;
+
+		bcfg_header->num_elems = 2;
+		bcfg_header->sw_rev = 0;
+
+		desc = &bcfg_header->descs[0];
+
+		desc->type = BOARD_CONFIG_PM_DESC_TYPE;
+		desc->offset = sizeof(*bcfg_header);
+		desc->size = cfg_fragment_size;
+		comp->comp_size += desc->size;
+		desc->devgrp = 0;
+		desc->reserved = 0;
+		memcpy((u8 *)bcfg_header + desc->offset, cfg_fragment_addr,
+		       cfg_fragment_size);
+
+		bcfg_header->descs[1].offset = desc->offset + desc->size;
+	}
 #endif
 
 	/* Extract resource management (RM) specific configuration from FIT */
@@ -180,6 +266,18 @@ static void k3_sysfw_configure_using_fit(void *fit,
 					 (u32)cfg_fragment_size);
 	if (ret)
 		panic("Failed to set board RM configuration (%d)\n", ret);
+#else
+	if (copy_bcfg) {
+		desc = &bcfg_header->descs[1];
+
+		desc->type = BOARD_CONFIG_RM_DESC_TYPE;
+		desc->size = cfg_fragment_size;
+		comp->comp_size += desc->size;
+		desc->devgrp = 0;
+		desc->reserved = 0;
+		memcpy((u8 *)bcfg_header + desc->offset, cfg_fragment_addr,
+		       cfg_fragment_size);
+	}
 #endif
 
 	/* Extract security specific configuration from FIT */
-- 
2.17.1

--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

  parent reply	other threads:[~2020-11-10  9:05 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-10  9:05 [PATCH 00/26] TI J7 SoC HSM Rearch support series Tero Kristo
2020-11-10  9:05 ` [PATCH 01/26] lib: rational: copy the rational fraction lib routines from Linux Tero Kristo
2020-11-10 12:55   ` Tom Rini
2020-11-11  7:03     ` Tero Kristo
2020-11-10  9:05 ` [PATCH 02/26] ram: k3-j721e: fix clk_set_rate API usage Tero Kristo
2020-11-10  9:05 ` [PATCH 03/26] remoteproc: k3-r5: remove sysfw PM calls if not supported Tero Kristo
2020-11-15 10:29   ` Lokesh Vutla
2020-11-16 12:08     ` Tero Kristo
2020-11-10  9:05 ` [PATCH 04/26] common: fit: Update board_fit_image_post_process() to pass fit and node_offset Tero Kristo
2020-11-10  9:05 ` [PATCH 05/26] clk: fixed_rate: add API for directly registering fixed rate clocks Tero Kristo
2020-11-15 10:27   ` Lokesh Vutla
2020-11-16  0:42   ` Peng Fan
2020-11-10  9:05 ` [PATCH 06/26] clk: fix clock tree dump to properly dump out every registered clock Tero Kristo
2020-11-15 10:28   ` Lokesh Vutla
2020-11-10  9:05 ` [PATCH 07/26] clk: do not attempt to fetch clock pointer with null device Tero Kristo
2020-11-10  9:05 ` [PATCH 08/26] clk: add support for setting clk rate from cmdline Tero Kristo
2020-11-15 10:29   ` Lokesh Vutla
2020-11-16 12:06     ` Tero Kristo
2020-11-16 14:26       ` Lukasz Majewski
2020-11-10  9:05 ` [PATCH 09/26] clk: sci-clk: fix return value of set_rate Tero Kristo
2020-11-10  9:05 ` [PATCH 10/26] clk: fix assigned-clocks to pass with deferring provider Tero Kristo
2020-11-10  9:05 ` [PATCH 11/26] clk: fix set_rate to clean up cached rates for the hierarchy Tero Kristo
2020-11-10  9:05 ` [PATCH 12/26] clk: add support for TI K3 SoC PLL Tero Kristo
2020-11-10  9:05 ` [PATCH 13/26] clk: add support for TI K3 SoC clocks Tero Kristo
2020-11-10  9:05 ` [PATCH 14/26] power: domain: Introduce driver for raw TI K3 PDs Tero Kristo
2020-11-10  9:05 ` [PATCH 15/26] cmd: ti: pd: Add debug command for K3 power domains Tero Kristo
2020-11-10  9:05 ` [PATCH 16/26] tools: k3_fit_atf: add DM binary to the FIT image Tero Kristo
2020-11-10  9:05 ` [PATCH 17/26] arm: mach-k3: Add platform data for j721e and j7200 Tero Kristo
2020-11-10  9:05 ` [PATCH 18/26] arm: mach-k3: add support for detecting firmware images from FIT Tero Kristo
2020-11-10  9:05 ` [PATCH 19/26] arm: mach-k3: j721e: force enable A72 core 0 during spl shutdown Tero Kristo
2020-11-16  4:21   ` Lokesh Vutla
2020-11-16 12:22     ` Tero Kristo
2020-11-10  9:05 ` [PATCH 20/26] arm: mach-k3: do board config for PM and RM only if supported Tero Kristo
2020-11-16  4:23   ` Lokesh Vutla
2020-11-16 12:27     ` Tero Kristo
2020-11-17  6:14       ` Lokesh Vutla
2020-11-17  9:22         ` Tero Kristo
2020-11-18 10:23           ` Tero Kristo
2020-11-10  9:05 ` [PATCH 21/26] arm: mach-k3: common: Drop main r5 start Tero Kristo
2020-11-16  4:24   ` Lokesh Vutla
2020-11-16 12:28     ` Tero Kristo
2020-11-10  9:05 ` Tero Kristo [this message]
2020-11-10  9:05 ` [PATCH 23/26] configs: j721e_evm_r5: Enable raw access power management features Tero Kristo
2020-11-10  9:06 ` [PATCH 24/26] configs: j721e_evm_r5: disable SCI PM drivers Tero Kristo
2020-11-10  9:06 ` [PATCH 25/26] configs: j721e_evm_r5: enable FIT image post processing Tero Kristo
2020-11-10  9:06 ` [PATCH 26/26] configs: j7200_evm_r5: Enable raw access power management features Tero Kristo
2020-11-16  4:13 ` [PATCH 00/26] TI J7 SoC HSM Rearch support series Lokesh Vutla
2020-11-16 12:13   ` Tero Kristo
2020-11-16 15:53     ` Tom Rini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201110090602.2255-23-t-kristo@ti.com \
    --to=t-kristo@ti.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.