Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 265A8C4332F for ; Thu, 22 Dec 2022 00:48:18 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 43E0485355; Thu, 22 Dec 2022 01:47:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1671670040; bh=6tMlawIdMEz4oSjcyxVaQ3GrVOCOBSO/c/yBrfM7ePA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=Vy19gb/ObPYivpy9JW8zNirWeWG0nn7SzecEQIUCFeNhtViCvILktCcA4l0z6NeMG VRVU2cnpV2ZsexVgHZAu5VLMx+5e0SgBg4/FiTFU7EwTHic792VVx8TzvZFXZbbXDO 5nlnI19auFpp3mn0tH4RTnItF9QY6l+Sj4nOcobDgbfZ/3w3j3fxQzoxMNT4DYtyRu 2tkdCVROrU1/DjvShWYwIZ4UgM9NSxc62JtB/xiFtpNrJNKXGwGhCX+McB9yhg+PZU BSZ1hzM7MSyTxo1vm5XUfPfJzdblxEO+7hoLUW+0nfFii0gZDdW0JH5Ga4JTvHYygl /sxPICwA6fK+A== Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id C96838523B; Thu, 22 Dec 2022 01:47:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1671670025; bh=6tMlawIdMEz4oSjcyxVaQ3GrVOCOBSO/c/yBrfM7ePA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V4Te9kUe76gbnV4NRcecg23NKmVb8W2GmtOCQGglsdqkf7qrv7KtHSSK5dmdXiwSv TqIve9iUE9xgEWfhjU7arYsjKpE7ySwvL/gCxUHeXVE8KyzCgrtMqLTZVdP3RPPG0Y Ubsyv117JBp1em0ORh3S5pECEwMBy86GrPHgP+rnwfvCyG6V0dK184DylLD4WUasup plZzt24AkV1Q2juW5F1g2ZNKydvjgNsVqkC/LweeVpOt9lisRCulpwF45NI5wHG529 K0W9QRoS6P5Y6JevZuSKIXrePbOakDovUbAAZz7eosqBEONhVkRFplAS5rKyLKNzgs YTZGyffNN+77w== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , "NXP i.MX U-Boot Team" , "Ying-Chun Liu (PaulLiu)" , Adam Ford , Andrejs Cainikovs , Fabio Estevam , Manoj Sai , Marcel Ziswiler , Michael Trimarchi , Peng Fan , Ricardo Salveti , Simon Glass , Stefano Babic , Tim Harvey , Ye Li Subject: [PATCH 07/10] arm: imx: imx8m: Map RAM as NS if PSCI provider Date: Thu, 22 Dec 2022 01:46:40 +0100 Message-Id: <20221222004643.1013095-7-marex@denx.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221222004643.1013095-1-marex@denx.de> References: <20221222004643.1013095-1-marex@denx.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean In case U-Boot is a PSCI provider, map RAM explicitly as NS, otherwise secondary cores crash with SError when attempting to access RAM mapped as secure in EL2. Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "NXP i.MX U-Boot Team" Cc: "Ying-Chun Liu (PaulLiu)" Cc: Adam Ford Cc: Andrejs Cainikovs Cc: Fabio Estevam Cc: Manoj Sai Cc: Marcel Ziswiler Cc: Michael Trimarchi Cc: Peng Fan Cc: Ricardo Salveti Cc: Simon Glass Cc: Stefano Babic Cc: Tim Harvey Cc: Ye Li --- arch/arm/mach-imx/imx8m/soc.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 96c6e69aae4..706ba8509da 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -100,6 +100,12 @@ void set_wdog_reset(struct wdog_regs *wdog) setbits_le16(&wdog->wcr, WDOG_WDT_MASK | WDOG_WDZST_MASK); } +#ifdef CONFIG_ARMV8_PSCI +#define PTE_MAP_NS PTE_BLOCK_NS +#else +#define PTE_MAP_NS 0 +#endif + static struct mm_region imx8m_mem_map[] = { { /* ROM */ @@ -122,7 +128,7 @@ static struct mm_region imx8m_mem_map[] = { .phys = 0x180000UL, .size = 0x8000UL, .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | - PTE_BLOCK_OUTER_SHARE + PTE_BLOCK_OUTER_SHARE | PTE_MAP_NS }, { /* TCM */ .virt = 0x7C0000UL, @@ -130,14 +136,14 @@ static struct mm_region imx8m_mem_map[] = { .size = 0x80000UL, .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE | - PTE_BLOCK_PXN | PTE_BLOCK_UXN + PTE_BLOCK_PXN | PTE_BLOCK_UXN | PTE_MAP_NS }, { /* OCRAM */ .virt = 0x900000UL, .phys = 0x900000UL, .size = 0x200000UL, .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | - PTE_BLOCK_OUTER_SHARE + PTE_BLOCK_OUTER_SHARE | PTE_MAP_NS }, { /* AIPS */ .virt = 0xB00000UL, @@ -152,7 +158,7 @@ static struct mm_region imx8m_mem_map[] = { .phys = 0x40000000UL, .size = PHYS_SDRAM_SIZE, .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | - PTE_BLOCK_OUTER_SHARE + PTE_BLOCK_OUTER_SHARE | PTE_MAP_NS #ifdef PHYS_SDRAM_2_SIZE }, { /* DRAM2 */ @@ -160,7 +166,7 @@ static struct mm_region imx8m_mem_map[] = { .phys = 0x100000000UL, .size = PHYS_SDRAM_2_SIZE, .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | - PTE_BLOCK_OUTER_SHARE + PTE_BLOCK_OUTER_SHARE | PTE_MAP_NS #endif }, { /* empty entrie to split table entry 5 if needed when TEEs are used */ -- 2.35.1