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

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

Pull RISC-V fixes from Palmer Dabbelt:

 - A fix for an issue where C instructions ended up in non-C builds, due
   to some broken inline assembly in the KGDB breakpoint insertion code

 - A fix to avoid spurious printk messages about misaligned access
   performance probing

 - A fix for a handful of issues with /proc/iomem's reserved region
   handling

 - A pair of fixes for module relocation processing

 - A few build-time fixes

* tag 'riscv-for-linus-6.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: KGDB: Remove ".option norvc/.option rvc" for kgdb_compiled_break
  riscv: KGDB: Do not inline arch_kgdb_breakpoint()
  riscv: Avoid fortify warning in syscall_get_arguments()
  riscv: Provide all alternative macros all the time
  riscv: module: Allocate PLT entries for R_RISCV_PLT32
  riscv: module: Fix out-of-bounds relocation access
  riscv: Properly export reserved regions in /proc/iomem
  riscv: Fix unaligned access info messages
  riscv: Avoid fortify warning in syscall_get_arguments()
  Documentation: riscv: Fix typo MIMPLID -> MIMPID
  riscv: Use kvmalloc_array on relocation_hashtable
parents 7f424c66 615e705f

Documentation/arch/riscv/hwprobe.rst

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ The following keys are defined: 
* :c:macro:`RISCV_HWPROBE_KEY_MARCHID`: Contains the value of ``marchid``, as

  defined by the RISC-V privileged architecture specification.



* :c:macro:`RISCV_HWPROBE_KEY_MIMPLID`: Contains the value of ``mimplid``, as

* :c:macro:`RISCV_HWPROBE_KEY_MIMPID`: Contains the value of ``mimpid``, as

  defined by the RISC-V privileged architecture specification.



* :c:macro:`RISCV_HWPROBE_KEY_BASE_BEHAVIOR`: A bitmask containing the base

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

+7 −12
Original line number Diff line number Diff line
@@ -115,24 +115,19 @@ 
	\old_c

.endm



#define _ALTERNATIVE_CFG(old_c, ...)	\

	ALTERNATIVE_CFG old_c



#define _ALTERNATIVE_CFG_2(old_c, ...)	\

	ALTERNATIVE_CFG old_c

#define __ALTERNATIVE_CFG(old_c, ...)		ALTERNATIVE_CFG old_c

#define __ALTERNATIVE_CFG_2(old_c, ...)		ALTERNATIVE_CFG old_c



#else /* !__ASSEMBLY__ */



#define __ALTERNATIVE_CFG(old_c)	\

	old_c "\n"

#define __ALTERNATIVE_CFG(old_c, ...)		old_c "\n"

#define __ALTERNATIVE_CFG_2(old_c, ...)		old_c "\n"



#define _ALTERNATIVE_CFG(old_c, ...)	\

	__ALTERNATIVE_CFG(old_c)

#endif /* __ASSEMBLY__ */



#define _ALTERNATIVE_CFG_2(old_c, ...)	\

	__ALTERNATIVE_CFG(old_c)

#define _ALTERNATIVE_CFG(old_c, ...)		__ALTERNATIVE_CFG(old_c)

#define _ALTERNATIVE_CFG_2(old_c, ...)		__ALTERNATIVE_CFG_2(old_c)



#endif /* __ASSEMBLY__ */

#endif /* CONFIG_RISCV_ALTERNATIVE */



/*

arch/riscv/include/asm/kgdb.h

+1 −8
Original line number Diff line number Diff line
@@ -19,16 +19,9 @@ 


#ifndef	__ASSEMBLY__



void arch_kgdb_breakpoint(void);

extern unsigned long kgdb_compiled_break;



static inline void arch_kgdb_breakpoint(void)

{

	asm(".global kgdb_compiled_break\n"

	    ".option norvc\n"

	    "kgdb_compiled_break: ebreak\n"

	    ".option rvc\n");

}



#endif /* !__ASSEMBLY__ */



#define DBG_REG_ZERO "zero"

arch/riscv/include/asm/syscall.h

+5 −2
Original line number Diff line number Diff line
@@ -62,8 +62,11 @@ static inline void syscall_get_arguments(struct task_struct *task, 
					 unsigned long *args)

{

	args[0] = regs->orig_a0;

	args++;

	memcpy(args, &regs->a1, 5 * sizeof(args[0]));

	args[1] = regs->a1;

	args[2] = regs->a2;

	args[3] = regs->a3;

	args[4] = regs->a4;

	args[5] = regs->a5;

}



static inline int syscall_get_arch(struct task_struct *task)

arch/riscv/kernel/kgdb.c

+6 −0
Original line number Diff line number Diff line
@@ -254,6 +254,12 @@ void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long pc) 
	regs->epc = pc;

}



noinline void arch_kgdb_breakpoint(void)

{

	asm(".global kgdb_compiled_break\n"

	    "kgdb_compiled_break: ebreak\n");

}



void kgdb_arch_handle_qxfer_pkt(char *remcom_in_buffer,

				char *remcom_out_buffer)

{