Re: [PATCH -fixes 3/3] riscv: Optimize kernel virtual address conversion macro

From: Vitaly Wool
Date: Sun Aug 08 2021 - 08:28:42 EST


On Wed, Jul 21, 2021 at 10:04 AM Alexandre Ghiti <alex@xxxxxxxx> wrote:
>
> The current test in kernel_mapping_va_to_pa only applies when
> CONFIG_XIP_KERNEL is set, so use IS_ENABLED to optimize this macro at
> compile-time in standard kernels that do not require this test.
>
> Signed-off-by: Alexandre Ghiti <alex@xxxxxxxx>

Just in case you need it, here comes

Reviewed-By: Vitaly Wool <vitaly.wool@xxxxxxxxxxxx>

> ---
> arch/riscv/include/asm/page.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/riscv/include/asm/page.h b/arch/riscv/include/asm/page.h
> index b0ca5058e7ae..10dc063868f6 100644
> --- a/arch/riscv/include/asm/page.h
> +++ b/arch/riscv/include/asm/page.h
> @@ -123,7 +123,7 @@ extern phys_addr_t phys_ram_base;
> #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; \
> - (_y < kernel_map.virt_addr + XIP_OFFSET) ? \
> + (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); \
> })
> --
> 2.30.2
>
>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/linux-riscv