From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 05 Dec 2023 09:26:03 +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 1rAQkk-003wjC-1m for lore@lore.pengutronix.de; Tue, 05 Dec 2023 09:26:03 +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 1rAQkk-0007Bz-ID for lore@pengutronix.de; Tue, 05 Dec 2023 09:26:03 +0100 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:From:In-Reply-To: Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=uflsuAkgmxTG/qGnzUExu2BUN0M9d/AZIpkMUSv5FVg=; b=0LWE5WO4arzw8Qpn0R0Qg92cah BeSN9DlIm8dIuL8Kn6NfS+6j/LlRQ71pQlLSbvHXStER8wnGQIMhtLS9yjPIUFmNaZd/hjVqpfHuv qsXw9pD8YlZ1AwwVPs7RGMGh6cqwbd8IbNjmiSsZiK5hc7GROUxmm+zkooAfAdDfRF1C9+GSQKeZo 9Oy3JMgUoBEKn5nOwbtLmHuc0BvDcV4b+c8zDIoJ/ESyJaeEAD2Qjs7uLkdXqvaE0TpNha/c0PsJ4 FNbrbpRf7Lxn3DNHKl9jAzRYI1oAPxwzFgJyODJEP6dELkuapOzfMU9+d1WezGDa17DRbP2OAVGmq WCOCrzPA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rAQje-006dsf-2R; Tue, 05 Dec 2023 08:24:54 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rAQjO-006dqv-12 for barebox@lists.infradead.org; Tue, 05 Dec 2023 08:24:52 +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 1rAQjN-0006xR-5A; Tue, 05 Dec 2023 09:24:37 +0100 Received: from [2a0a:edc0:2:b01:1d::c0] (helo=ptx.whiteo.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rAQjM-00DhYS-PI; Tue, 05 Dec 2023 09:24:36 +0100 Received: from sha by ptx.whiteo.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1rAQjM-005M3L-NB; Tue, 05 Dec 2023 09:24:36 +0100 Date: Tue, 5 Dec 2023 09:24:36 +0100 To: Ahmad Fatoum Cc: barebox@lists.infradead.org Message-ID: <20231205082436.GU1057032@pengutronix.de> References: <20231205081247.4148947-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231205081247.4148947-1-a.fatoum@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain User-Agent: Mutt/1.10.1 (2018-07-13) From: Sascha Hauer X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231205_002449_786578_3397441B X-CRM114-Status: GOOD ( 21.10 ) 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.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.0 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: Re: [PATCH master] ARM: mmu: align size of remapped region to page size 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) On Tue, Dec 05, 2023 at 09:12:47AM +0100, Ahmad Fatoum wrote: > Currently, barebox ARM arch_remap_range() will hang in an infinite loop, > when called with a size that's not aligned to a page boundary. > Its Linux equivalent, ioremap(), will just rounds up to page size and > work correctly. Adopt the Linux behavior to make porting code easier, > e.g. when calling devm_ioremap(). > > The only other arch_remap_range() in barebox, is PowerPC's. That one > wouldn't loop indefinitely if the size isn't page aligned, so nothing to > do there. > > Signed-off-by: Ahmad Fatoum > --- > arch/arm/cpu/mmu_32.c | 3 +++ > arch/arm/cpu/mmu_64.c | 3 +++ > 2 files changed, 6 insertions(+) Applied, thanks Sascha > > diff --git a/arch/arm/cpu/mmu_32.c b/arch/arm/cpu/mmu_32.c > index d0ada5866f05..c6eecf9c9d2d 100644 > --- a/arch/arm/cpu/mmu_32.c > +++ b/arch/arm/cpu/mmu_32.c > @@ -18,6 +18,7 @@ > #include > #include > #include > +#include > > #include "mmu_32.h" > > @@ -253,6 +254,8 @@ static void __arch_remap_range(void *_virt_addr, phys_addr_t phys_addr, size_t s > pte_flags = get_pte_flags(map_type); > pmd_flags = pte_flags_to_pmd(pte_flags); > > + size = PAGE_ALIGN(size); > + > while (size) { > const bool pgdir_size_aligned = IS_ALIGNED(virt_addr, PGDIR_SIZE); > u32 *pgd = (u32 *)&ttb[pgd_index(virt_addr)]; > diff --git a/arch/arm/cpu/mmu_64.c b/arch/arm/cpu/mmu_64.c > index 12c4dc90b392..c6ea63e655ad 100644 > --- a/arch/arm/cpu/mmu_64.c > +++ b/arch/arm/cpu/mmu_64.c > @@ -19,6 +19,7 @@ > #include > #include > #include > +#include > > #include "mmu_64.h" > > @@ -132,6 +133,8 @@ static void create_sections(uint64_t virt, uint64_t phys, uint64_t size, > > attr &= ~PTE_TYPE_MASK; > > + size = PAGE_ALIGN(size); > + > while (size) { > table = ttb; > for (level = 0; level < 4; level++) { > -- > 2.39.2 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |