From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 22 May 2023 07:22:21 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1q0xzz-009Ilv-7k for lore@lore.pengutronix.de; Mon, 22 May 2023 07:22:21 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q0xzw-00016D-U7 for lore@pengutronix.de; Mon, 22 May 2023 07:22:21 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=DKRQtiiq9QrK5LJELGjF2ptNgmvgV3bUY8reaIOAHWw=; b=dlZmt24+OUfJEvpAWV22p//83s cd29vTH49h7Ne4xGct3TOrrvCuUB7zmHSFfbUw6UACqEW8KH5LtCaY/otUhKXmjNCkVIeyEeWd41S mTe0W1QIrRPIpRpWboDSV7szLpnZPLuPknUS2jUUnjePcvJVT3u1aKr8YohAAl40n9i9k9QIPFihl zilqSFXFXN0D4KOK/XbaO6WRmGlMCcghDqF70LFJJIzRT9NtFC2Po7sYRzYKyY9kSk7FDNekC93OU D0jgQ4Cq1YWL8tpq/djByGJSXLAax/i53zbCSmyw0D0uBxzgW3+UsqklLh7eMJDG27c1UqiJGxcWL dAaoCj8g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q0xyg-005MvN-2b; Mon, 22 May 2023 05:21:02 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q0xye-005MuB-0K for barebox@lists.infradead.org; Mon, 22 May 2023 05:21:01 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q0xyb-0000zq-Dq; Mon, 22 May 2023 07:20:57 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1q0xyZ-001vtm-M4; Mon, 22 May 2023 07:20:55 +0200 Received: from afa by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1q0xyZ-004Lu2-43; Mon, 22 May 2023 07:20:55 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Mon, 22 May 2023 07:20:54 +0200 Message-Id: <20230522052054.1037494-1-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230521_222100_138188_B60280B8 X-CRM114-Status: GOOD ( 10.74 ) 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: , 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.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.8 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH] fixup! ARM: mmu32: Use pages for early MMU setup X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) ARM: mmu32: fix alignment when early remapping .text section arch_remap_range has a BUG_ON unaligned memory region start. On AM335x (Tested with Beaglebone Black), _stext for the second stage barebox.bin is not page-aligned, so this broke the boot. Use PAGE_ALIGN_DOWN to fix this. Signed-off-by: Ahmad Fatoum --- arch/arm/cpu/mmu_32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/mmu_32.c b/arch/arm/cpu/mmu_32.c index dc4b0e414d57..852c5626dedd 100644 --- a/arch/arm/cpu/mmu_32.c +++ b/arch/arm/cpu/mmu_32.c @@ -583,7 +583,7 @@ void mmu_early_enable(unsigned long membase, unsigned long memsize) /* maps main memory as cachable */ arch_remap_range((void *)membase, memsize - OPTEE_SIZE, MAP_CACHED); arch_remap_range((void *)membase + memsize - OPTEE_SIZE, OPTEE_SIZE, MAP_UNCACHED); - arch_remap_range(_stext, PAGE_ALIGN(_etext - _stext), MAP_CACHED); + arch_remap_range((void *)PAGE_ALIGN_DOWN((uintptr_t)_stext), PAGE_ALIGN(_etext - _stext), MAP_CACHED); __mmu_cache_on(); } -- 2.39.2