Commit 55a21105 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RISC-V fixes from Palmer Dabbelt:

 - RISC-V architecture-specific ELF attributes have been disabled in the
   kernel builds

 - A fix for a locking failure while during errata patching that
   manifests on SiFive-based systems

 - A fix for a KASAN failure during stack unwinding

 - A fix for some lockdep failures during text patching

* tag 'riscv-for-linus-6.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  RISC-V: Don't check text_mutex during stop_machine
  riscv: Use READ_ONCE_NOCHECK in imprecise unwinding stack mode
  RISC-V: fix taking the text_mutex twice during sifive errata patching
  RISC-V: Stop emitting attributes
parents b0d14d2a 2a8db5ec

arch/riscv/Makefile

+7 −0
Original line number Diff line number Diff line
@@ -84,6 +84,13 @@ endif 
# Avoid generating .eh_frame sections.

KBUILD_CFLAGS += -fno-asynchronous-unwind-tables -fno-unwind-tables



# The RISC-V attributes frequently cause compatibility issues and provide no

# information, so just turn them off.

KBUILD_CFLAGS += $(call cc-option,-mno-riscv-attribute)

KBUILD_AFLAGS += $(call cc-option,-mno-riscv-attribute)

KBUILD_CFLAGS += $(call as-option,-Wa$(comma)-mno-arch-attr)

KBUILD_AFLAGS += $(call as-option,-Wa$(comma)-mno-arch-attr)



KBUILD_CFLAGS_MODULE += $(call cc-option,-mno-relax)

KBUILD_AFLAGS_MODULE += $(call as-option,-Wa$(comma)-mno-relax)

arch/riscv/errata/sifive/errata.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ void __init_or_module sifive_errata_patch_func(struct alt_entry *begin, 
			mutex_lock(&text_mutex);

			patch_text_nosync(ALT_OLD_PTR(alt), ALT_ALT_PTR(alt),

					  alt->alt_len);

			mutex_lock(&text_mutex);

			mutex_unlock(&text_mutex);

			cpu_apply_errata |= tmp;

		}

	}

arch/riscv/include/asm/ftrace.h

+1 −1
Original line number Diff line number Diff line
@@ -109,6 +109,6 @@ int ftrace_init_nop(struct module *mod, struct dyn_ftrace *rec); 
#define ftrace_init_nop ftrace_init_nop

#endif



#endif

#endif /* CONFIG_DYNAMIC_FTRACE */



#endif /* _ASM_RISCV_FTRACE_H */

arch/riscv/include/asm/patch.h

+2 −0
Original line number Diff line number Diff line
@@ -9,4 +9,6 @@ 
int patch_text_nosync(void *addr, const void *insns, size_t len);

int patch_text(void *addr, u32 *insns, int ninsns);



extern int riscv_patch_in_stop_machine;



#endif /* _ASM_RISCV_PATCH_H */

arch/riscv/kernel/compat_vdso/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ COMPAT_LD := $(LD) 
COMPAT_CC_FLAGS := -march=rv32g -mabi=ilp32

COMPAT_LD_FLAGS := -melf32lriscv



# Disable attributes, as they're useless and break the build.

COMPAT_CC_FLAGS += $(call cc-option,-mno-riscv-attribute)

COMPAT_CC_FLAGS += $(call as-option,-Wa$(comma)-mno-arch-attr)



# Files to link into the compat_vdso

obj-compat_vdso = $(patsubst %, %.o, $(compat_vdso-syms)) note.o