From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 14 Jan 2026 13:36:04 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vg06X-001Ea6-0x for lore@lore.pengutronix.de; Wed, 14 Jan 2026 13:36:04 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1vg06W-0005cz-6d for lore@pengutronix.de; Wed, 14 Jan 2026 13:36:04 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:To:In-Reply-To: References:Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version: Subject:Date:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=j+li7K330bfuRbzr4ETxJmIVibdoREcjDjW0FGjDtpk=; b=fHi3nsaJoNz+nq4UbtIOfMm3km QsUzAs8Mbw5rX8NmQGm9x6hlTlFC8Jx7XHsGyr06xZl/kaf2h8TkF20cTzsdEBF1/w8LAPbQAXLgz Zgpb3dIsfWQOR4gK67Q2EUHrpaXqqz4kSxDO3BYuV3EtNvgq82ea+D+0ZQyNS36F2QMwhgfe866OC qhKSEpwW3bPdHovE03NrbohIfeAPDJEYACdtZRi+97J+N5FpCw9BW3eDI6PivFrjcWq5hjhPJmVdL UkxTun3u8Bw31v4Jc04hl3XYdYPrme2Dg9V75+fIB0d4wm+dYFoRoNx6+dC1ZFbm8mbpkqUDzLrKR wGgtxXYQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vg05v-00000009C63-4Bz6; Wed, 14 Jan 2026 12:35:28 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vg05n-00000009Bvi-0WMP for barebox@lists.infradead.org; Wed, 14 Jan 2026 12:35:24 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1vg05l-00051c-J2; Wed, 14 Jan 2026 13:35:17 +0100 Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vg05m-000afZ-0A; Wed, 14 Jan 2026 13:35:17 +0100 Received: from localhost ([::1] helo=dude02.red.stw.pengutronix.de) by dude02.red.stw.pengutronix.de with esmtp (Exim 4.98.2) (envelope-from ) id 1vfzlc-00000000TKs-17PV; Wed, 14 Jan 2026 13:14:28 +0100 From: Sascha Hauer Date: Wed, 14 Jan 2026 13:14:38 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260114-pbl-load-elf-v4-13-0afa78d95a7e@pengutronix.de> References: <20260114-pbl-load-elf-v4-0-0afa78d95a7e@pengutronix.de> In-Reply-To: <20260114-pbl-load-elf-v4-0-0afa78d95a7e@pengutronix.de> To: BAREBOX X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1768392868; l=3876; i=s.hauer@pengutronix.de; s=20230412; h=from:subject:message-id; bh=y1suZhGcW6wu4Ln7QaFCRwLnMeyGsvc3AVg3EQzIV/8=; b=KBI08wwr/l5B5sX4ieQGvXIgMS3Qij+TupAbnD1v2L4cAqfOMxdTGxqJ0vuk95Brw77+fzjpr /ARFfhkh/keAkkt0AuCGbTUPmZvan6O1qjdgTxHK6Kg7mTH+SMdN75X X-Developer-Key: i=s.hauer@pengutronix.de; a=ed25519; pk=4kuc9ocmECiBJKWxYgqyhtZOHj5AWi7+d0n/UjhkwTg= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260114_043520_172046_32BE9ED4 X-CRM114-Status: GOOD ( 12.86 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Claude Sonnet 4.5" , Ahmad Fatoum Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-3.9 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v4 13/22] mmu: add MAP_CACHED_RO mapping type X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) ARM32 and ARM64 have ARCH_MAP_CACHED_RO. We'll move parts of the MMU initialization to generic code later, so add a new mapping type to include/mmu.h. Reviewed-by: Ahmad Fatoum Signed-off-by: Sascha Hauer --- arch/arm/cpu/mmu-common.c | 4 ++-- arch/arm/cpu/mmu-common.h | 3 +-- arch/arm/cpu/mmu_32.c | 4 ++-- arch/arm/cpu/mmu_64.c | 2 +- include/mmu.h | 3 ++- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/cpu/mmu-common.c b/arch/arm/cpu/mmu-common.c index a1431c0ff46112552d2919269cc8a7a66d7a20c1..67317f127cadb138cc2e85bb18c92ab47bc1206f 100644 --- a/arch/arm/cpu/mmu-common.c +++ b/arch/arm/cpu/mmu-common.c @@ -22,7 +22,7 @@ const char *map_type_tostr(maptype_t map_type) switch (map_type) { case ARCH_MAP_CACHED_RWX: return "RWX"; - case ARCH_MAP_CACHED_RO: return "RO"; + case MAP_CACHED_RO: return "RO"; case MAP_CACHED: return "CACHED"; case MAP_UNCACHED: return "UNCACHED"; case MAP_CODE: return "CODE"; @@ -158,7 +158,7 @@ static void mmu_remap_memory_banks(void) } remap_range((void *)code_start, code_size, MAP_CODE); - remap_range((void *)rodata_start, rodata_size, ARCH_MAP_CACHED_RO); + remap_range((void *)rodata_start, rodata_size, MAP_CACHED_RO); setup_trap_pages(); } diff --git a/arch/arm/cpu/mmu-common.h b/arch/arm/cpu/mmu-common.h index a111e15a21b479b5ffa2ea8973e2ad189e531925..b42c421ffde8ebba84b17c6311b735f7759dc69b 100644 --- a/arch/arm/cpu/mmu-common.h +++ b/arch/arm/cpu/mmu-common.h @@ -12,7 +12,6 @@ #include #define ARCH_MAP_CACHED_RWX MAP_ARCH(2) -#define ARCH_MAP_CACHED_RO MAP_ARCH(3) #define ARCH_MAP_FLAG_PAGEWISE BIT(31) @@ -32,7 +31,7 @@ static inline maptype_t arm_mmu_maybe_skip_permissions(maptype_t map_type) switch (map_type & MAP_TYPE_MASK) { case MAP_CODE: case MAP_CACHED: - case ARCH_MAP_CACHED_RO: + case MAP_CACHED_RO: return ARCH_MAP_CACHED_RWX; default: return map_type; diff --git a/arch/arm/cpu/mmu_32.c b/arch/arm/cpu/mmu_32.c index caa41e1beb3ac4fea8ef55a882f662ad5efc31b4..eee1385a8f413fdb2fda0539e017c99f99bdea1a 100644 --- a/arch/arm/cpu/mmu_32.c +++ b/arch/arm/cpu/mmu_32.c @@ -304,7 +304,7 @@ static uint32_t get_pte_flags(maptype_t map_type) switch (map_type & MAP_TYPE_MASK) { case ARCH_MAP_CACHED_RWX: return PTE_FLAGS_CACHED_V7_RWX; - case ARCH_MAP_CACHED_RO: + case MAP_CACHED_RO: return PTE_FLAGS_CACHED_RO_V7; case MAP_CACHED: return PTE_FLAGS_CACHED_V7; @@ -320,7 +320,7 @@ static uint32_t get_pte_flags(maptype_t map_type) } } else { switch (map_type & MAP_TYPE_MASK) { - case ARCH_MAP_CACHED_RO: + case MAP_CACHED_RO: case MAP_CODE: return PTE_FLAGS_CACHED_RO_V4; case ARCH_MAP_CACHED_RWX: diff --git a/arch/arm/cpu/mmu_64.c b/arch/arm/cpu/mmu_64.c index 56c6a21f2b2a8d8300fd6dbfaaf36a54d264a0f3..ddf1373ec0a801baad043146187d7f4c3eac6a2a 100644 --- a/arch/arm/cpu/mmu_64.c +++ b/arch/arm/cpu/mmu_64.c @@ -159,7 +159,7 @@ static unsigned long get_pte_attrs(maptype_t map_type) return attrs_xn() | MEM_ALLOC_WRITECOMBINE; case MAP_CODE: return CACHED_MEM | PTE_BLOCK_RO; - case ARCH_MAP_CACHED_RO: + case MAP_CACHED_RO: return attrs_xn() | CACHED_MEM | PTE_BLOCK_RO; case ARCH_MAP_CACHED_RWX: return CACHED_MEM; diff --git a/include/mmu.h b/include/mmu.h index f79619808829532ed05f018b982e4bc76bca72a4..9f582f25e1de14d47cfe2eff64f9cce81c4e492d 100644 --- a/include/mmu.h +++ b/include/mmu.h @@ -9,9 +9,10 @@ #define MAP_CACHED 1 #define MAP_FAULT 2 #define MAP_CODE 3 +#define MAP_CACHED_RO 4 #ifdef CONFIG_ARCH_HAS_DMA_WRITE_COMBINE -#define MAP_WRITECOMBINE 4 +#define MAP_WRITECOMBINE 5 #else #define MAP_WRITECOMBINE MAP_UNCACHED #endif -- 2.47.3