Unverified Commit e7681beb authored by Palmer Dabbelt's avatar Palmer Dabbelt
Browse files

RISC-V: Split out the XIP fixups into their own file 

This was broken by the original refactoring (as the XIP definitions
depend on <asm/pgtable.h>) and then more broken by the merge (as I
accidentally took the old version).  This fixes both breakages, while
also pulling this out of <asm/asm.h> to avoid polluting most assembly
files with the XIP fixups.

Fixes: bee7fbc3 ("RISC-V CPU Idle Support")
Fixes: 63b13e64 ("RISC-V: Add arch functions for non-retentive suspend entry/exit")
Link: https://lore.kernel.org/r/20220420184056.7886-4-palmer@rivosinc.com


Reviewed-by: default avatarGuo Ren <guoren@kernel.org>
Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 1ae41598

arch/riscv/include/asm/asm.h

+0 −26
Original line number Diff line number Diff line
@@ -67,30 +67,4 @@ 
#error "Unexpected __SIZEOF_SHORT__"

#endif



#ifdef __ASSEMBLY__



/* Common assembly source macros */



#ifdef CONFIG_XIP_KERNEL

.macro XIP_FIXUP_OFFSET reg

	REG_L t0, _xip_fixup

	add \reg, \reg, t0

.endm

.macro XIP_FIXUP_FLASH_OFFSET reg

	la t1, __data_loc

	REG_L t1, _xip_phys_offset

	sub \reg, \reg, t1

	add \reg, \reg, t0

.endm

_xip_fixup: .dword CONFIG_PHYS_RAM_BASE - CONFIG_XIP_PHYS_ADDR - XIP_OFFSET

_xip_phys_offset: .dword CONFIG_XIP_PHYS_ADDR + XIP_OFFSET

#else

.macro XIP_FIXUP_OFFSET reg

.endm

.macro XIP_FIXUP_FLASH_OFFSET reg

.endm

#endif /* CONFIG_XIP_KERNEL */



#endif /* __ASSEMBLY__ */



#endif /* _ASM_RISCV_ASM_H */

arch/riscv/include/asm/xip_fixup.h

0 → 100644
+31 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * XIP fixup macros, only useful in assembly.

 */

#ifndef _ASM_RISCV_XIP_FIXUP_H

#define _ASM_RISCV_XIP_FIXUP_H



#include <linux/pgtable.h>



#ifdef CONFIG_XIP_KERNEL

.macro XIP_FIXUP_OFFSET reg

        REG_L t0, _xip_fixup

        add \reg, \reg, t0

.endm

.macro XIP_FIXUP_FLASH_OFFSET reg

	la t1, __data_loc

	REG_L t1, _xip_phys_offset

	sub \reg, \reg, t1

	add \reg, \reg, t0

.endm



_xip_fixup: .dword CONFIG_PHYS_RAM_BASE - CONFIG_XIP_PHYS_ADDR - XIP_OFFSET

_xip_phys_offset: .dword CONFIG_XIP_PHYS_ADDR + XIP_OFFSET

#else

.macro XIP_FIXUP_OFFSET reg

.endm

.macro XIP_FIXUP_FLASH_OFFSET reg

.endm

#endif /* CONFIG_XIP_KERNEL */



#endif

arch/riscv/kernel/head.S

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <asm/cpu_ops_sbi.h>

#include <asm/hwcap.h>

#include <asm/image.h>

#include <asm/xip_fixup.h>

#include "efi-header.S"



__HEAD

arch/riscv/kernel/suspend_entry.S

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <asm/asm.h>

#include <asm/asm-offsets.h>

#include <asm/csr.h>

#include <asm/xip_fixup.h>



	.text

	.altmacro