From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2EFA8ECAAD8 for ; Fri, 23 Sep 2022 09:36:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=MATBLKm8MAjGi4xSTRc7EZz+46MblMM4I5R24QIZGXM=; b=Ny+4aL+4GcK/qH oHepOt83OF1QOp9bXd04l1y/dYEscgZOzTBc4RCtE8D5zSzFBLbGOIiX2Z8TCS48NxYtY714ESObd um6zRCCkSRblaxL1FQFqMVUojxnQ113faQh7EtJG9x8fxwDMvn0zidHCuHm1lXklCREzyTZGX5Eoa ctseJYfEPL/vW87VMsUGUqdNFNSlt8Yhi4Umhrje/G9dcl8jSSoIH78LqshvGMdYYVS3zCtQtfuHQ 2/Frgfpez7TMO3njhdlpmQchiP5givQMhOWEv2Mo2KZhPOvbCUdCg+jSahB82Bw2WHnItzVmzNd0T 4z3166acZBq5dn0L8cXw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1obf6E-003Nzy-Ob; Fri, 23 Sep 2022 09:35:58 +0000 Received: from gloria.sntech.de ([185.11.138.130]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1obf6A-003Nwi-Dp for linux-riscv@lists.infradead.org; Fri, 23 Sep 2022 09:35:56 +0000 Received: from p508fdb48.dip0.t-ipconnect.de ([80.143.219.72] helo=phil.localnet) by gloria.sntech.de with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1obf61-0005SF-PN; Fri, 23 Sep 2022 11:35:45 +0200 From: Heiko Stuebner To: Palmer Dabbelt , linux-riscv@lists.infradead.org, Samuel Holland Cc: Samuel Holland , Albert Ou , Guo Ren , Paul Walmsley , linux-kernel@vger.kernel.org, Alexandre Ghiti , Arnd Bergmann , Geert Uytterhoeven , Jisheng Zhang , Nick Kossifidis , Qinglin Pan , Tong Tiangen Subject: Re: [PATCH 2/2] riscv: Move cast inside kernel_mapping_[pv]a_to_[vp]a Date: Fri, 23 Sep 2022 11:35:44 +0200 Message-ID: <3482469.aeNJFYEL58@phil> In-Reply-To: <20220922054743.30159-2-samuel@sholland.org> References: <20220922054743.30159-1-samuel@sholland.org> <20220922054743.30159-2-samuel@sholland.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220923_023554_511578_AC09B8CE X-CRM114-Status: GOOD ( 17.46 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Am Donnerstag, 22. September 2022, 07:47:42 CEST schrieb Samuel Holland: > Before commit 44c922572952 ("RISC-V: enable XIP"), these macros cast > their argument to unsigned long. That commit moved the cast after an > assignment to an unsigned long variable, rendering it ineffectual. > Move the cast back, so we can remove the cast at each call site. > > Signed-off-by: Samuel Holland makes the code a lot nicer to read Reviewed-by: Heiko Stuebner > --- > > arch/riscv/errata/thead/errata.c | 4 ++-- > arch/riscv/include/asm/page.h | 18 +++++++++--------- > arch/riscv/mm/init.c | 16 ++++++++-------- > 3 files changed, 19 insertions(+), 19 deletions(-) > > diff --git a/arch/riscv/errata/thead/errata.c b/arch/riscv/errata/thead/errata.c > index 83174f13783e..38c2c6b0f6b8 100644 > --- a/arch/riscv/errata/thead/errata.c > +++ b/arch/riscv/errata/thead/errata.c > @@ -76,8 +76,8 @@ void __init_or_module thead_errata_patch_func(struct alt_entry *begin, struct al > if (cpu_req_errata & tmp) { > /* On vm-alternatives, the mmu isn't running yet */ > if (stage == RISCV_ALTERNATIVES_EARLY_BOOT) > - memcpy((void *)kernel_mapping_va_to_pa((unsigned long)alt->old_ptr), > - (void *)kernel_mapping_va_to_pa((unsigned long)alt->alt_ptr), > + memcpy((void *)kernel_mapping_va_to_pa(alt->old_ptr), > + (void *)kernel_mapping_va_to_pa(alt->alt_ptr), > alt->alt_len); > else > patch_text_nosync(alt->old_ptr, alt->alt_ptr, alt->alt_len); > diff --git a/arch/riscv/include/asm/page.h b/arch/riscv/include/asm/page.h > index ac70b0fd9a9a..9f432c1b5289 100644 > --- a/arch/riscv/include/asm/page.h > +++ b/arch/riscv/include/asm/page.h > @@ -123,20 +123,20 @@ extern phys_addr_t phys_ram_base; > ((x) >= PAGE_OFFSET && (!IS_ENABLED(CONFIG_64BIT) || (x) < PAGE_OFFSET + KERN_VIRT_SIZE)) > > #define linear_mapping_pa_to_va(x) ((void *)((unsigned long)(x) + kernel_map.va_pa_offset)) > -#define kernel_mapping_pa_to_va(y) ({ \ > - unsigned long _y = y; \ > - (IS_ENABLED(CONFIG_XIP_KERNEL) && _y < phys_ram_base) ? \ > - (void *)((unsigned long)(_y) + kernel_map.va_kernel_xip_pa_offset) : \ > - (void *)((unsigned long)(_y) + kernel_map.va_kernel_pa_offset + XIP_OFFSET); \ > +#define kernel_mapping_pa_to_va(y) ({ \ > + unsigned long _y = (unsigned long)(y); \ > + (IS_ENABLED(CONFIG_XIP_KERNEL) && _y < phys_ram_base) ? \ > + (void *)(_y + kernel_map.va_kernel_xip_pa_offset) : \ > + (void *)(_y + kernel_map.va_kernel_pa_offset + XIP_OFFSET); \ > }) > #define __pa_to_va_nodebug(x) linear_mapping_pa_to_va(x) > > #define linear_mapping_va_to_pa(x) ((unsigned long)(x) - kernel_map.va_pa_offset) > #define kernel_mapping_va_to_pa(y) ({ \ > - unsigned long _y = y; \ > - (IS_ENABLED(CONFIG_XIP_KERNEL) && _y < kernel_map.virt_addr + XIP_OFFSET) ? \ > - ((unsigned long)(_y) - kernel_map.va_kernel_xip_pa_offset) : \ > - ((unsigned long)(_y) - kernel_map.va_kernel_pa_offset - XIP_OFFSET); \ > + unsigned long _y = (unsigned long)(y); \ > + (IS_ENABLED(CONFIG_XIP_KERNEL) && _y < kernel_map.virt_addr + XIP_OFFSET) ? \ > + (_y - kernel_map.va_kernel_xip_pa_offset) : \ > + (_y - kernel_map.va_kernel_pa_offset - XIP_OFFSET); \ > }) > > #define __va_to_pa_nodebug(x) ({ \ > diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c > index b56a0a75533f..7d59516ce6b3 100644 > --- a/arch/riscv/mm/init.c > +++ b/arch/riscv/mm/init.c > @@ -927,15 +927,15 @@ static void __init pt_ops_set_early(void) > */ > static void __init pt_ops_set_fixmap(void) > { > - pt_ops.alloc_pte = kernel_mapping_pa_to_va((uintptr_t)alloc_pte_fixmap); > - pt_ops.get_pte_virt = kernel_mapping_pa_to_va((uintptr_t)get_pte_virt_fixmap); > + pt_ops.alloc_pte = kernel_mapping_pa_to_va(alloc_pte_fixmap); > + pt_ops.get_pte_virt = kernel_mapping_pa_to_va(get_pte_virt_fixmap); > #ifndef __PAGETABLE_PMD_FOLDED > - pt_ops.alloc_pmd = kernel_mapping_pa_to_va((uintptr_t)alloc_pmd_fixmap); > - pt_ops.get_pmd_virt = kernel_mapping_pa_to_va((uintptr_t)get_pmd_virt_fixmap); > - pt_ops.alloc_pud = kernel_mapping_pa_to_va((uintptr_t)alloc_pud_fixmap); > - pt_ops.get_pud_virt = kernel_mapping_pa_to_va((uintptr_t)get_pud_virt_fixmap); > - pt_ops.alloc_p4d = kernel_mapping_pa_to_va((uintptr_t)alloc_p4d_fixmap); > - pt_ops.get_p4d_virt = kernel_mapping_pa_to_va((uintptr_t)get_p4d_virt_fixmap); > + pt_ops.alloc_pmd = kernel_mapping_pa_to_va(alloc_pmd_fixmap); > + pt_ops.get_pmd_virt = kernel_mapping_pa_to_va(get_pmd_virt_fixmap); > + pt_ops.alloc_pud = kernel_mapping_pa_to_va(alloc_pud_fixmap); > + pt_ops.get_pud_virt = kernel_mapping_pa_to_va(get_pud_virt_fixmap); > + pt_ops.alloc_p4d = kernel_mapping_pa_to_va(alloc_p4d_fixmap); > + pt_ops.get_p4d_virt = kernel_mapping_pa_to_va(get_p4d_virt_fixmap); > #endif > } > > _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv