From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f0Xfd-0000fx-6T for barebox@lists.infradead.org; Mon, 26 Mar 2018 19:20:45 +0000 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7] helo=dude.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.89) (envelope-from ) id 1f0XfN-0000ll-EY for barebox@lists.infradead.org; Mon, 26 Mar 2018 21:20:25 +0200 From: Lucas Stach Date: Mon, 26 Mar 2018 21:20:20 +0200 Message-Id: <20180326192025.28809-5-l.stach@pengutronix.de> In-Reply-To: <20180326192025.28809-1-l.stach@pengutronix.de> References: <20180326192025.28809-1-l.stach@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH v3 05/10] ARM: don't try to install secure monitor when entered in HYP mode To: barebox@lists.infradead.org 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 Tested-by: Roland Hieber --- 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.16.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox