public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Marek Vasut <marex@denx.de>
To: u-boot@lists.denx.de
Cc: Marek Vasut <marex@denx.de>,
	"Ariel D'Alessandro" <ariel.dalessandro@collabora.com>,
	"NXP i.MX U-Boot Team" <uboot-imx@nxp.com>,
	"Ying-Chun Liu (PaulLiu)" <paul.liu@linaro.org>,
	Adam Ford <aford173@gmail.com>,
	Andrejs Cainikovs <andrejs.cainikovs@toradex.com>,
	Fabio Estevam <festevam@gmail.com>,
	Manoj Sai <abbaraju.manojsai@amarulasolutions.com>,
	Marcel Ziswiler <marcel.ziswiler@toradex.com>,
	Michael Trimarchi <michael@amarulasolutions.com>,
	Peng Fan <peng.fan@nxp.com>,
	Ricardo Salveti <ricardo@foundries.io>,
	Simon Glass <sjg@chromium.org>, Stefano Babic <sbabic@denx.de>,
	Tim Harvey <tharvey@gateworks.com>, Ye Li <ye.li@nxp.com>
Subject: [PATCH 09/10] arm: imx: imx8m: Program CSU and TZASC if PSCI provider
Date: Thu, 22 Dec 2022 01:46:42 +0100	[thread overview]
Message-ID: <20221222004643.1013095-9-marex@denx.de> (raw)
In-Reply-To: <20221222004643.1013095-1-marex@denx.de>

In case U-Boot is the PSCI provider, it is necessary to correctly
program CSU and TZASC registers. Those are poorly documented, so
push in the correct values.

Signed-off-by: Marek Vasut <marex@denx.de>
---
Cc: "Ariel D'Alessandro" <ariel.dalessandro@collabora.com>
Cc: "NXP i.MX U-Boot Team" <uboot-imx@nxp.com>
Cc: "Ying-Chun Liu (PaulLiu)" <paul.liu@linaro.org>
Cc: Adam Ford <aford173@gmail.com>
Cc: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Manoj Sai <abbaraju.manojsai@amarulasolutions.com>
Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Ricardo Salveti <ricardo@foundries.io>
Cc: Simon Glass <sjg@chromium.org>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Tim Harvey <tharvey@gateworks.com>
Cc: Ye Li <ye.li@nxp.com>
---
 arch/arm/include/asm/arch-imx8m/imx-regs.h |  1 +
 arch/arm/mach-imx/imx8m/soc.c              | 25 ++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/arch/arm/include/asm/arch-imx8m/imx-regs.h b/arch/arm/include/asm/arch-imx8m/imx-regs.h
index 3034d280cc3..1559bf6d218 100644
--- a/arch/arm/include/asm/arch-imx8m/imx-regs.h
+++ b/arch/arm/include/asm/arch-imx8m/imx-regs.h
@@ -31,6 +31,7 @@
 #define CCM_BASE_ADDR		0x30380000
 #define SRC_BASE_ADDR		0x30390000
 #define GPC_BASE_ADDR		0x303A0000
+#define CSU_BASE_ADDR		0x303E0000
 
 #define SYSCNT_RD_BASE_ADDR	0x306A0000
 #define SYSCNT_CMP_BASE_ADDR	0x306B0000
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index 706ba8509da..99c41c654a1 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -561,6 +561,29 @@ static void imx8m_setup_snvs(void)
 	writel(0xffffffff, SNVS_BASE_ADDR + SNVS_LPSR);
 }
 
+static void imx8m_setup_csu_tzasc(void)
+{
+	const uintptr_t tzasc_base[4] = {
+		0x301f0000, 0x301f0000, 0x301f0000, 0x301f0000
+	};
+	int i, j;
+
+	if (!IS_ENABLED(CONFIG_ARMV8_PSCI))
+		return;
+
+	/* CSU */
+	for (i = 0; i < 64; i++)
+		writel(0x00ff00ff, (void *)CSU_BASE_ADDR + (4 * i));
+
+	/* TZASC */
+	for (j = 0; j < 4; j++) {
+		writel(0x77777777, (void *)(tzasc_base[j]));
+		writel(0x77777777, (void *)(tzasc_base[j]) + 0x4);
+		for (i = 0; i <= 0x10; i += 4)
+			writel(0, (void *)(tzasc_base[j]) + 0x40 + i);
+	}
+}
+
 int arch_cpu_init(void)
 {
 	struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR;
@@ -613,6 +636,8 @@ int arch_cpu_init(void)
 
 	imx8m_setup_snvs();
 
+	imx8m_setup_csu_tzasc();
+
 	return 0;
 }
 
-- 
2.35.1


  parent reply	other threads:[~2022-12-22  0:48 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-22  0:46 [PATCH 01/10] arm: psci: Add PSCI v1.1 macro Marek Vasut
2022-12-22  0:46 ` [PATCH 02/10] arm: psci: Fix RESET2 hook Marek Vasut
2023-01-31 16:52   ` sbabic
2022-12-22  0:46 ` [PATCH 03/10] arm: imx: Drop custom lowlevel_init Marek Vasut
2023-01-31 16:52   ` sbabic
2022-12-22  0:46 ` [PATCH 04/10] arm: dts: imx8m: Require ATF BL31 blob only if not PSCI provider Marek Vasut
2023-01-31 16:52   ` sbabic
2022-12-22  0:46 ` [PATCH 05/10] arm: imx: imx8m: Only use ROM pointers " Marek Vasut
2023-01-31 16:52   ` sbabic
2022-12-22  0:46 ` [PATCH 06/10] arm: imx: imx8m: Enable GICv3 support if " Marek Vasut
2023-01-31 16:52   ` sbabic
2022-12-22  0:46 ` [PATCH 07/10] arm: imx: imx8m: Map RAM as NS " Marek Vasut
2023-01-31 16:52   ` sbabic
2022-12-22  0:46 ` [PATCH 08/10] arm: imx: imx8m: Define trampoline location " Marek Vasut
2023-01-31 16:52   ` sbabic
2022-12-22  0:46 ` Marek Vasut [this message]
2023-01-31 16:53   ` [PATCH 09/10] arm: imx: imx8m: Program CSU and TZASC " sbabic
2022-12-22  0:46 ` [PATCH 10/10] arm: imx: imx8m: Add basic PSCI provider implementation Marek Vasut
2022-12-22  3:05   ` Adam Ford
2022-12-22  3:58     ` Marek Vasut
2023-01-02 16:44       ` Adam Ford
2023-01-02 23:41         ` Marek Vasut
2023-01-02 23:47           ` Adam Ford
2023-01-02 23:58             ` Marek Vasut
2023-01-03  1:05               ` Adam Ford
2023-01-03  9:38                 ` Marek Vasut
2023-01-31 16:52   ` sbabic
2023-01-31 16:52 ` [PATCH 01/10] arm: psci: Add PSCI v1.1 macro sbabic

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=20221222004643.1013095-9-marex@denx.de \
    --to=marex@denx.de \
    --cc=abbaraju.manojsai@amarulasolutions.com \
    --cc=aford173@gmail.com \
    --cc=andrejs.cainikovs@toradex.com \
    --cc=ariel.dalessandro@collabora.com \
    --cc=festevam@gmail.com \
    --cc=marcel.ziswiler@toradex.com \
    --cc=michael@amarulasolutions.com \
    --cc=paul.liu@linaro.org \
    --cc=peng.fan@nxp.com \
    --cc=ricardo@foundries.io \
    --cc=sbabic@denx.de \
    --cc=sjg@chromium.org \
    --cc=tharvey@gateworks.com \
    --cc=u-boot@lists.denx.de \
    --cc=uboot-imx@nxp.com \
    --cc=ye.li@nxp.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox