mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Lucas Stach <l.stach@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 05/10] ARM: don't try to install secure monitor when entered in HYP mode
Date: Mon, 29 Jan 2018 17:29:59 +0100	[thread overview]
Message-ID: <20180129163004.10512-6-l.stach@pengutronix.de> (raw)
In-Reply-To: <20180129163004.10512-1-l.stach@pengutronix.de>

When Barebox has been entered in HYP mode, the CPU is already switched
to the non-secure world and it's not possible for Barebox to install
it's own secure monitor.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/cpu/sm.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/cpu/sm.c b/arch/arm/cpu/sm.c
index 5808dfd92bdc..71bb394c8540 100644
--- a/arch/arm/cpu/sm.c
+++ b/arch/arm/cpu/sm.c
@@ -184,6 +184,9 @@ int armv7_secure_monitor_install(void)
 		return -EINVAL;
 	}
 
+	if (__boot_cpu_mode == HYP_MODE)
+		return 0;
+
 	mmuon = get_cr() & CR_M;
 
 	vbar = get_vbar();
-- 
2.15.1


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

  parent reply	other threads:[~2018-01-29 16:30 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-29 16:29 [PATCH 00/10] HYP mode handling and RasPi 3 support Lucas Stach
2018-01-29 16:29 ` [PATCH 01/10] ARM: import opcode helpers from Linux kernel Lucas Stach
2018-01-29 16:29 ` [PATCH 02/10] ARM: safely switch from HYP to SVC mode if required Lucas Stach
2018-01-29 16:29 ` [PATCH 03/10] ARM: allow secure monitor code to be built without PSCI Lucas Stach
2018-01-29 16:29 ` [PATCH 04/10] ARM: add file for HYP mode related setup Lucas Stach
2018-02-06 12:37   ` Sascha Hauer
2018-01-29 16:29 ` Lucas Stach [this message]
2018-01-29 16:30 ` [PATCH 06/10] ARM: default to starting kernel in HYP mode when entered in HYP Lucas Stach
2018-01-29 16:30 ` [PATCH 07/10] ARM: install HYP vectors at PBL and Barebox entry Lucas Stach
2018-01-29 16:30 ` [PATCH 08/10] ARM: rpi: add revision IDs for Pi 3 Model B and Pi Zero Lucas Stach
2018-01-29 16:30 ` [PATCH 09/10] ARM: rpi: add raspberry pi 3 support Lucas Stach
2018-01-29 16:30 ` [PATCH 10/10] ARM: rpi: autosize malloc area Lucas Stach
2018-01-30 11:23 ` [PATCH 00/10] HYP mode handling and RasPi 3 support Roland Hieber
2018-02-06  8:52 ` Sascha Hauer

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=20180129163004.10512-6-l.stach@pengutronix.de \
    --to=l.stach@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