Unverified Commit 4e2bbecd authored by Palmer Dabbelt's avatar Palmer Dabbelt
Browse files

RISC-V: Various XIP fixes 

This fixes a handful of issues with the XIP support, which has bit
rotted some lately.

* palmer/riscv-xip:
  RISC-V: Fix the XIP build
  RISC-V: Split out the XIP fixups into their own file
  RISC-V: ignore xipImage
  RISC-V: Avoid empty create_*_mapping definitions
parents 324373f4 d9e418d0

arch/riscv/boot/.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -4,3 +4,4 @@ Image.* 
loader

loader.lds

loader.bin

xipImage

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