mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Rouven Czerwinski <r.czerwinski@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Subject: [PATCH 3/4] ARM: mach-imx: OPTEE PBL configures PL210
Date: Mon, 20 Jan 2020 06:03:29 +0100	[thread overview]
Message-ID: <20200120050330.161859-3-r.czerwinski@pengutronix.de> (raw)
In-Reply-To: <20200120050330.161859-1-r.czerwinski@pengutronix.de>

If OP-TEE early loading is performed, OP-TEE will configure the PL210
and lock access to the controller from the normal world. Skip the
configuration in this case.

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
 arch/arm/mach-imx/imx6.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-imx/imx6.c b/arch/arm/mach-imx/imx6.c
index 41e0066add..f2311efd92 100644
--- a/arch/arm/mach-imx/imx6.c
+++ b/arch/arm/mach-imx/imx6.c
@@ -278,7 +278,7 @@ static int imx6_mmu_init(void)
 	void __iomem *l2x0_base = IOMEM(0x00a02000);
 	u32 val, cache_part, cache_rtl;
 
-	if (!cpu_is_mx6())
+	if (!cpu_is_mx6() || IS_ENABLED(CONFIG_PBL_OPTEE))
 		return 0;
 
 	val = readl(l2x0_base + L2X0_CACHE_ID);
-- 
2.25.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2020-01-20  5:04 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-20  5:03 [PATCH 1/4] optee: move optee_verify_header() to common Rouven Czerwinski
2020-01-20  5:03 ` [PATCH 2/4] ARM: add optee early loading function Rouven Czerwinski
2020-01-20  8:21   ` Sascha Hauer
2020-01-20  5:03 ` Rouven Czerwinski [this message]
2020-01-20  5:03 ` [PATCH 4/4] user: add documentation for OP-TEE loading Rouven Czerwinski

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=20200120050330.161859-3-r.czerwinski@pengutronix.de \
    --to=r.czerwinski@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /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