Commit 5321d1b1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RISC-V fixes from Palmer Dabbelt:

 - A build warning fix for BUILTIN_DTB=y

 - Hibernation support is hidden behind NONPORTABLE, as it depends on
   some undocumented early boot behavior and breaks on most platforms

 - A fix for relocatable kernels on systems with early boot errata

 - A fix to properly handle perf callchains for kernel tracepoints

 - A pair of fixes for NAPOT to avoid inconsistencies between PTEs and
   handle hardware that sets arbitrary A/D bits

* tag 'riscv-for-linus-6.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: Implement missing huge_ptep_get
  riscv: Fix huge_ptep_set_wrprotect when PTE is a NAPOT
  riscv: perf: Fix callchain parse error with kernel tracepoint events
  riscv: Fix relocatable kernels with early alternatives using -fno-pie
  RISC-V: mark hibernation as nonportable
  riscv: Fix unused variable warning when BUILTIN_DTB is set
parents a746ca66 6966d798

arch/riscv/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -799,8 +799,11 @@ menu "Power management options" 


source "kernel/power/Kconfig"



# Hibernation is only possible on systems where the SBI implementation has

# marked its reserved memory as not accessible from, or does not run

# from the same memory as, Linux

config ARCH_HIBERNATION_POSSIBLE

	def_bool y

	def_bool NONPORTABLE



config ARCH_HIBERNATION_HEADER

	def_bool HIBERNATION

arch/riscv/errata/Makefile

+4 −0
Original line number Diff line number Diff line 
ifdef CONFIG_RELOCATABLE

KBUILD_CFLAGS += -fno-pie

endif



obj-$(CONFIG_ERRATA_SIFIVE) += sifive/

obj-$(CONFIG_ERRATA_THEAD) += thead/

arch/riscv/include/asm/hugetlb.h

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ int huge_ptep_set_access_flags(struct vm_area_struct *vma, 
			       unsigned long addr, pte_t *ptep,

			       pte_t pte, int dirty);



#define __HAVE_ARCH_HUGE_PTEP_GET

pte_t huge_ptep_get(pte_t *ptep);



pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags_t flags);

#define arch_make_huge_pte arch_make_huge_pte

arch/riscv/include/asm/perf_event.h

+7 −0
Original line number Diff line number Diff line
@@ -10,4 +10,11 @@ 


#include <linux/perf_event.h>

#define perf_arch_bpf_user_pt_regs(regs) (struct user_regs_struct *)regs



#define perf_arch_fetch_caller_regs(regs, __ip) { \

	(regs)->epc = (__ip); \

	(regs)->s0 = (unsigned long) __builtin_frame_address(0); \

	(regs)->sp = current_stack_pointer; \

	(regs)->status = SR_PP; \

}

#endif /* _ASM_RISCV_PERF_EVENT_H */

arch/riscv/kernel/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,10 @@ ifdef CONFIG_FTRACE 
CFLAGS_REMOVE_alternative.o = $(CC_FLAGS_FTRACE)

CFLAGS_REMOVE_cpufeature.o = $(CC_FLAGS_FTRACE)

endif

ifdef CONFIG_RELOCATABLE

CFLAGS_alternative.o += -fno-pie

CFLAGS_cpufeature.o += -fno-pie

endif

ifdef CONFIG_KASAN

KASAN_SANITIZE_alternative.o := n

KASAN_SANITIZE_cpufeature.o := n