Commit 4b1d362d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RISC-V fixes from Palmer Dabbelt:

 - SPDX comment style fix

 - ignore memory that is unusable

 - avoid setting a kernel text offset for the !MMU kernels, where
   skipping the first page of memory is both unnecessary and costly

 - avoid passing the flag bits in satp to pfn_to_virt()

 - fix __put_kernel_nofault, where we had the arguments to
   __put_user_nocheck reversed

 - workaround for a bug in the FU540 to avoid triggering PMP issues
   during early boot

 - change to how we pull symbols out of the vDSO. The old mechanism was
   removed from binutils-2.35 (and has been backported to Debian's 2.34)

* tag 'riscv-for-linus-5.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  RISC-V: Fix the VDSO symbol generaton for binutils-2.35+
  RISC-V: Use non-PGD mappings for early DTB access
  riscv: uaccess: fix __put_kernel_nofault()
  riscv: fix pfn_to_virt err in do_page_fault().
  riscv: Set text_offset correctly for M-Mode
  RISC-V: Remove any memblock representing unusable memory area
  risc-v: kernel: ftrace: Fixes improper SPDX comment style
parents 659caaf6 c2c81bb2

arch/riscv/include/asm/uaccess.h

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ do { \ 
do {									\

	long __kr_err;							\

									\

	__put_user_nocheck(*((type *)(dst)), (type *)(src), __kr_err);	\

	__put_user_nocheck(*((type *)(src)), (type *)(dst), __kr_err);	\

	if (unlikely(__kr_err))						\

		goto err_label;						\

} while (0)

arch/riscv/kernel/ftrace.c

+1 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (C) 2013 Linaro Limited

 * Author: AKASHI Takahiro <takahiro.akashi@linaro.org>

arch/riscv/kernel/head.S

+5 −0
Original line number Diff line number Diff line
@@ -35,12 +35,17 @@ ENTRY(_start) 
	.word 0

#endif

	.balign 8

#ifdef CONFIG_RISCV_M_MODE

	/* Image load offset (0MB) from start of RAM for M-mode */

	.dword 0

#else

#if __riscv_xlen == 64

	/* Image load offset(2MB) from start of RAM */

	.dword 0x200000

#else

	/* Image load offset(4MB) from start of RAM */

	.dword 0x400000

#endif

#endif

	/* Effective size of kernel image */

	.dword _end - _start

arch/riscv/kernel/vdso/.gitignore

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

vdso.lds

*.tmp

vdso-syms.S

arch/riscv/kernel/vdso/Makefile

+9 −9
Original line number Diff line number Diff line
@@ -43,19 +43,14 @@ $(obj)/vdso.o: $(obj)/vdso.so 
SYSCFLAGS_vdso.so.dbg = $(c_flags)

$(obj)/vdso.so.dbg: $(src)/vdso.lds $(obj-vdso) FORCE

	$(call if_changed,vdsold)

SYSCFLAGS_vdso.so.dbg = -shared -s -Wl,-soname=linux-vdso.so.1 \

	-Wl,--build-id -Wl,--hash-style=both



# We also create a special relocatable object that should mirror the symbol

# table and layout of the linked DSO. With ld --just-symbols we can then

# refer to these symbols in the kernel code rather than hand-coded addresses.



SYSCFLAGS_vdso.so.dbg = -shared -s -Wl,-soname=linux-vdso.so.1 \

	-Wl,--build-id=sha1 -Wl,--hash-style=both

$(obj)/vdso-dummy.o: $(src)/vdso.lds $(obj)/rt_sigreturn.o FORCE

	$(call if_changed,vdsold)



LDFLAGS_vdso-syms.o := -r --just-symbols

$(obj)/vdso-syms.o: $(obj)/vdso-dummy.o FORCE

	$(call if_changed,ld)

$(obj)/vdso-syms.S: $(obj)/vdso.so FORCE

	$(call if_changed,so2s)



# strip rule for the .so file

$(obj)/%.so: OBJCOPYFLAGS := -S
@@ -73,6 +68,11 @@ quiet_cmd_vdsold = VDSOLD $@ 
                           $(patsubst %, -G __vdso_%, $(vdso-syms)) $@.tmp $@ && \

                   rm $@.tmp



# Extracts symbol offsets from the VDSO, converting them into an assembly file

# that contains the same symbols at the same offsets.

quiet_cmd_so2s = SO2S    $@

      cmd_so2s = $(NM) -D $< | $(srctree)/$(src)/so2s.sh > $@



# install commands for the unstripped file

quiet_cmd_vdso_install = INSTALL $@

      cmd_vdso_install = cp $(obj)/$@.dbg $(MODLIB)/vdso/$@

CRA Git | Maintained and supported by SUSTech CRA and CCSE