Commit 8ecfa36c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'riscv-for-linus-5.13-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux 

Pull RISC-V fixes from Palmer Dabbelt:

 - A pair of XIP fixes: one to fix alternatives, and one to turn off the
   rest of the features that require code modification

 - A fix to a type that was causing some alternatives to break

 - A build fix for BUILTIN_DTB

* tag 'riscv-for-linus-5.13-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: Fix BUILTIN_DTB for sifive and microchip soc
  riscv: alternative: fix typo in macro name
  riscv: code patching only works on !XIP_KERNEL
  riscv: xip: support runtime trap patching
parents 2e302543 0ddd7eaf

arch/riscv/Kconfig

+9 −9
Original line number Diff line number Diff line
@@ -61,11 +61,11 @@ config RISCV 
	select GENERIC_TIME_VSYSCALL if MMU && 64BIT

	select HANDLE_DOMAIN_IRQ

	select HAVE_ARCH_AUDITSYSCALL

	select HAVE_ARCH_JUMP_LABEL

	select HAVE_ARCH_JUMP_LABEL_RELATIVE

	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL

	select HAVE_ARCH_JUMP_LABEL_RELATIVE if !XIP_KERNEL

	select HAVE_ARCH_KASAN if MMU && 64BIT

	select HAVE_ARCH_KASAN_VMALLOC if MMU && 64BIT

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_KGDB if !XIP_KERNEL

	select HAVE_ARCH_KGDB_QXFER_PKT

	select HAVE_ARCH_MMAP_RND_BITS if MMU

	select HAVE_ARCH_SECCOMP_FILTER
@@ -80,9 +80,9 @@ config RISCV 
	select HAVE_GCC_PLUGINS

	select HAVE_GENERIC_VDSO if MMU && 64BIT

	select HAVE_IRQ_TIME_ACCOUNTING

	select HAVE_KPROBES

	select HAVE_KPROBES_ON_FTRACE

	select HAVE_KRETPROBES

	select HAVE_KPROBES if !XIP_KERNEL

	select HAVE_KPROBES_ON_FTRACE if !XIP_KERNEL

	select HAVE_KRETPROBES if !XIP_KERNEL

	select HAVE_PCI

	select HAVE_PERF_EVENTS

	select HAVE_PERF_REGS
@@ -231,11 +231,11 @@ config ARCH_RV64I 
	bool "RV64I"

	select 64BIT

	select ARCH_SUPPORTS_INT128 if CC_HAS_INT128 && GCC_VERSION >= 50000

	select HAVE_DYNAMIC_FTRACE if MMU && $(cc-option,-fpatchable-function-entry=8)

	select HAVE_DYNAMIC_FTRACE if !XIP_KERNEL && MMU && $(cc-option,-fpatchable-function-entry=8)

	select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_TRACER if !XIP_KERNEL

	select SWIOTLB if MMU



endchoice

arch/riscv/boot/dts/microchip/Makefile

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

dtb-$(CONFIG_SOC_MICROCHIP_POLARFIRE) += microchip-mpfs-icicle-kit.dtb

obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))

arch/riscv/boot/dts/sifive/Makefile

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

dtb-$(CONFIG_SOC_SIFIVE) += hifive-unleashed-a00.dtb \

			    hifive-unmatched-a00.dtb

obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))

arch/riscv/include/asm/alternative-macros.h

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
	REG_ASM " " newlen "\n" \

	".word " errata_id "\n"



#define ALT_NEW_CONSTENT(vendor_id, errata_id, enable, new_c) \

#define ALT_NEW_CONTENT(vendor_id, errata_id, enable, new_c) \

	".if " __stringify(enable) " == 1\n"				\

	".pushsection .alternative, \"a\"\n"				\

	ALT_ENTRY("886b", "888f", __stringify(vendor_id), __stringify(errata_id), "889f - 888f") \
@@ -69,7 +69,7 @@ 
	"886 :\n"	\

	old_c "\n"	\

	"887 :\n"	\

	ALT_NEW_CONSTENT(vendor_id, errata_id, enable, new_c)

	ALT_NEW_CONTENT(vendor_id, errata_id, enable, new_c)



#define _ALTERNATIVE_CFG(old_c, new_c, vendor_id, errata_id, CONFIG_k)	\

	__ALTERNATIVE_CFG(old_c, new_c, vendor_id, errata_id, IS_ENABLED(CONFIG_k))

arch/riscv/kernel/traps.c

+9 −4
Original line number Diff line number Diff line
@@ -86,8 +86,13 @@ static void do_trap_error(struct pt_regs *regs, int signo, int code, 
	}

}



#if defined (CONFIG_XIP_KERNEL) && defined (CONFIG_RISCV_ERRATA_ALTERNATIVE)

#define __trap_section		__section(".xip.traps")

#else

#define __trap_section

#endif

#define DO_ERROR_INFO(name, signo, code, str)				\

asmlinkage __visible void name(struct pt_regs *regs)			\

asmlinkage __visible __trap_section void name(struct pt_regs *regs)	\

{									\

	do_trap_error(regs, signo, code, regs->epc, "Oops - " str);	\

}
@@ -111,7 +116,7 @@ DO_ERROR_INFO(do_trap_store_misaligned, 
int handle_misaligned_load(struct pt_regs *regs);

int handle_misaligned_store(struct pt_regs *regs);



asmlinkage void do_trap_load_misaligned(struct pt_regs *regs)

asmlinkage void __trap_section do_trap_load_misaligned(struct pt_regs *regs)

{

	if (!handle_misaligned_load(regs))

		return;
@@ -119,7 +124,7 @@ asmlinkage void do_trap_load_misaligned(struct pt_regs *regs) 
		      "Oops - load address misaligned");

}



asmlinkage void do_trap_store_misaligned(struct pt_regs *regs)

asmlinkage void __trap_section do_trap_store_misaligned(struct pt_regs *regs)

{

	if (!handle_misaligned_store(regs))

		return;
@@ -146,7 +151,7 @@ static inline unsigned long get_break_insn_length(unsigned long pc) 
	return GET_INSN_LENGTH(insn);

}



asmlinkage __visible void do_trap_break(struct pt_regs *regs)

asmlinkage __visible __trap_section void do_trap_break(struct pt_regs *regs)

{

#ifdef CONFIG_KPROBES

	if (kprobe_single_step_handler(regs))