Unverified Commit 3c349eac authored by Palmer Dabbelt's avatar Palmer Dabbelt
Browse files

Merge patch "riscv: Fix build with CONFIG_CC_OPTIMIZE_FOR_SIZE=y" 

This is a single fix, but it conflicts with some recent features.  I'm
merging it on top of the commit it fixes to ease backporting.

* b4-shazam-merge:
  riscv: Fix build with CONFIG_CC_OPTIMIZE_FOR_SIZE=y

Link: https://lore.kernel.org/r/20220922060958.44203-1-samuel@sholland.org


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parents c1d61058 0b1d60d6

arch/riscv/include/asm/hwcap.h

+0 −3
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ static_assert(RISCV_ISA_EXT_ID_MAX <= RISCV_ISA_EXT_MAX); 
 */

enum riscv_isa_ext_key {

	RISCV_ISA_EXT_KEY_FPU,		/* For 'F' and 'D' */

	RISCV_ISA_EXT_KEY_ZIHINTPAUSE,

	RISCV_ISA_EXT_KEY_SVINVAL,

	RISCV_ISA_EXT_KEY_MAX,

};
@@ -91,8 +90,6 @@ static __always_inline int riscv_isa_ext2key(int num) 
		return RISCV_ISA_EXT_KEY_FPU;

	case RISCV_ISA_EXT_d:

		return RISCV_ISA_EXT_KEY_FPU;

	case RISCV_ISA_EXT_ZIHINTPAUSE:

		return RISCV_ISA_EXT_KEY_ZIHINTPAUSE;

	case RISCV_ISA_EXT_SVINVAL:

		return RISCV_ISA_EXT_KEY_SVINVAL;

	default:

arch/riscv/include/asm/vdso/processor.h

+12 −16
Original line number Diff line number Diff line
@@ -4,30 +4,26 @@ 


#ifndef __ASSEMBLY__



#include <linux/jump_label.h>

#include <asm/barrier.h>

#include <asm/hwcap.h>



static inline void cpu_relax(void)

{

	if (!static_branch_likely(&riscv_isa_ext_keys[RISCV_ISA_EXT_KEY_ZIHINTPAUSE])) {

#ifdef __riscv_muldiv

	int dummy;

	/* In lieu of a halt instruction, induce a long-latency stall. */

	__asm__ __volatile__ ("div %0, %0, zero" : "=r" (dummy));

#endif

	} else {



#ifdef __riscv_zihintpause

	/*

	 * Reduce instruction retirement.

	 * This assumes the PC changes.

	 */

#ifdef CONFIG_TOOLCHAIN_HAS_ZIHINTPAUSE

	__asm__ __volatile__ ("pause");

#else

	/* Encoding of the pause instruction */

	__asm__ __volatile__ (".4byte 0x100000F");

#endif

	}

	barrier();

}