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

Merge tag 'riscv-for-linus-4.21-rc2-v2' of... 

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

Pull RISC-V updates from Palmer Dabbelt:
 "This tag contains a handful of updates that slipped through the cracks
  during the merge window due to the holidays. The fixes are mostly
  independent, with the exception of one larger audit-related branch.

  Core RISC-V updates:

   - The BSS has been moved, which shrinks flat images.

   - A fix to test-bpf so it compiles on RV64I-based systems.

   - A fix to respect the kernel commandline when there is no device
     tree.

   - A fix to prevent CPUs from trying to put themselves to sleep when
     bringing down the system.

   - Support for MODULE_SECTIONS on RV32I-based systems.

   - [new in v2] The addition of an SBI earlycon driver. This is
     definately a new feature, but I'd like to include it now because I
     dropped this patch when submitting the merge window PR that removed
     our EARLY_PRINTK support.

  RISC-V audit updates:

   - The addition of NR_syscalls into unistd.h, which is necessary for
     CONFIG_FTRACE_SYSCALLS.

   - The definition of CREATE_TRACE_POINTS so __tracepoint_sys_{enter,exit}
     get defined.

   - A fix for trace_sys_exit() so we can enable HAVE_SYSCALL_TRACEPOINTS

  As usual, I've tested this by booting a Fedora-based image on a recent
  QEMU (this time just whatever I had lying around).

* tag 'riscv-for-linus-4.21-rc2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux:
  tty/serial: Add RISC-V SBI earlycon support
  riscv: add HAVE_SYSCALL_TRACEPOINTS to Kconfig
  riscv: fix trace_sys_exit hook
  riscv: define CREATE_TRACE_POINTS in ptrace.c
  riscv: define NR_syscalls in unistd.h
  riscv: audit: add audit hook in do_syscall_trace_enter/exit()
  riscv: add audit support
  RISC-V: Support MODULE_SECTIONS mechanism on RV32
  MAINTAINERS: SiFive drivers: add myself as a SiFive driver maintainer
  MAINTAINERS: SiFive drivers: change the git tree to a SiFive git tree
  riscv: don't stop itself in smp_send_stop
  arch: riscv: support kernel command line forcing when no DTB passed
  tools uapi: fix RISC-V 64-bit support
  RISC-V: Make BSS section as the last section in vmlinux.lds.S
parents 1bdbe227 27de1f54

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -13820,8 +13820,9 @@ F: drivers/media/mmc/siano/ 


SIFIVE DRIVERS

M:	Palmer Dabbelt <palmer@sifive.com>

M:	Paul Walmsley <paul.walmsley@sifive.com>

L:	linux-riscv@lists.infradead.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux.git

T:	git git://github.com/sifive/riscv-linux.git

S:	Supported

K:	sifive

N:	sifive

arch/riscv/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -28,11 +28,13 @@ config RISCV 
	select GENERIC_STRNLEN_USER

	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_ATOMIC64 if !64BIT || !RISCV_ISA_A

	select HAVE_ARCH_AUDITSYSCALL

	select HAVE_MEMBLOCK_NODE_MAP

	select HAVE_DMA_CONTIGUOUS

	select HAVE_FUTEX_CMPXCHG if FUTEX

	select HAVE_GENERIC_DMA_COHERENT

	select HAVE_PERF_EVENTS

	select HAVE_SYSCALL_TRACEPOINTS

	select IRQ_DOMAIN

	select RISCV_ISA_A if SMP

	select SPARSE_IRQ
@@ -40,6 +42,7 @@ config RISCV 
	select HAVE_ARCH_TRACEHOOK

	select HAVE_PCI

	select MODULES_USE_ELF_RELA if MODULES

	select MODULE_SECTIONS if MODULES

	select THREAD_INFO_IN_TASK

	select PCI_DOMAINS_GENERIC if PCI

	select PCI_MSI if PCI
@@ -152,7 +155,6 @@ choice 
		bool "2GiB"

	config MAXPHYSMEM_128GB

		depends on 64BIT && CMODEL_MEDANY

		select MODULE_SECTIONS if MODULES

		bool "128GiB"

endchoice

arch/riscv/include/asm/module.h

+15 −13
Original line number Diff line number Diff line
@@ -9,12 +9,12 @@ 
#define MODULE_ARCH_VERMAGIC    "riscv"



struct module;

u64 module_emit_got_entry(struct module *mod, u64 val);

u64 module_emit_plt_entry(struct module *mod, u64 val);

unsigned long module_emit_got_entry(struct module *mod, unsigned long val);

unsigned long module_emit_plt_entry(struct module *mod, unsigned long val);



#ifdef CONFIG_MODULE_SECTIONS

struct mod_section {

	struct elf64_shdr *shdr;

	Elf_Shdr *shdr;

	int num_entries;

	int max_entries;

};
@@ -26,18 +26,18 @@ struct mod_arch_specific { 
};



struct got_entry {

	u64 symbol_addr;	/* the real variable address */

	unsigned long symbol_addr;	/* the real variable address */

};



static inline struct got_entry emit_got_entry(u64 val)

static inline struct got_entry emit_got_entry(unsigned long val)

{

	return (struct got_entry) {val};

}



static inline struct got_entry *get_got_entry(u64 val,

static inline struct got_entry *get_got_entry(unsigned long val,

					      const struct mod_section *sec)

{

	struct got_entry *got = (struct got_entry *)sec->shdr->sh_addr;

	struct got_entry *got = (struct got_entry *)(sec->shdr->sh_addr);

	int i;

	for (i = 0; i < sec->num_entries; i++) {

		if (got[i].symbol_addr == val)
@@ -62,7 +62,9 @@ struct plt_entry { 
#define REG_T0     0x5

#define REG_T1     0x6



static inline struct plt_entry emit_plt_entry(u64 val, u64 plt, u64 got_plt)

static inline struct plt_entry emit_plt_entry(unsigned long val,

					      unsigned long plt,

					      unsigned long got_plt)

{

	/*

	 * U-Type encoding:
@@ -76,7 +78,7 @@ static inline struct plt_entry emit_plt_entry(u64 val, u64 plt, u64 got_plt) 
	 * +------------+------------+--------+----------+----------+

	 *

	 */

	u64 offset = got_plt - plt;

	unsigned long offset = got_plt - plt;

	u32 hi20 = (offset + 0x800) & 0xfffff000;

	u32 lo12 = (offset - hi20);

	return (struct plt_entry) {
@@ -86,7 +88,7 @@ static inline struct plt_entry emit_plt_entry(u64 val, u64 plt, u64 got_plt) 
	};

}



static inline int get_got_plt_idx(u64 val, const struct mod_section *sec)

static inline int get_got_plt_idx(unsigned long val, const struct mod_section *sec)

{

	struct got_entry *got_plt = (struct got_entry *)sec->shdr->sh_addr;

	int i;
@@ -97,7 +99,7 @@ static inline int get_got_plt_idx(u64 val, const struct mod_section *sec) 
	return -1;

}



static inline struct plt_entry *get_plt_entry(u64 val,

static inline struct plt_entry *get_plt_entry(unsigned long val,

					      const struct mod_section *sec_plt,

					      const struct mod_section *sec_got_plt)

{

arch/riscv/include/asm/ptrace.h

+5 −0
Original line number Diff line number Diff line
@@ -113,6 +113,11 @@ static inline void frame_pointer_set(struct pt_regs *regs, 
	SET_FP(regs, val);

}



static inline unsigned long regs_return_value(struct pt_regs *regs)

{

	return regs->a0;

}



#endif /* __ASSEMBLY__ */



#endif /* _ASM_RISCV_PTRACE_H */

arch/riscv/include/asm/syscall.h

+10 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#ifndef _ASM_RISCV_SYSCALL_H

#define _ASM_RISCV_SYSCALL_H



#include <uapi/linux/audit.h>

#include <linux/sched.h>

#include <linux/err.h>
@@ -99,4 +100,13 @@ static inline void syscall_set_arguments(struct task_struct *task, 
	memcpy(&regs->a1 + i * sizeof(regs->a1), args, n * sizeof(regs->a0));

}



static inline int syscall_get_arch(void)

{

#ifdef CONFIG_64BIT

	return AUDIT_ARCH_RISCV64;

#else

	return AUDIT_ARCH_RISCV32;

#endif

}



#endif	/* _ASM_RISCV_SYSCALL_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE