Commit 3dca04d6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'riscv-for-linus-4.20-mw2' of... 

Merge tag 'riscv-for-linus-4.20-mw2' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux

Pull more RISC-V updates from Palmer Dabbelt:
 "This contains the follow-on patches I'd like to target for the 4.20
  merge window. I'm being somewhat conservative here, as while there are
  a few patches on the mailing list that were posted early in the merge
  window I'd like to let those bake for another round -- this was a
  fairly big release as far as RISC-V is concerened, and we need to walk
  before we can run.

  As far as the patches that made it go:

   - A patch to ignore offline CPUs when calculating AT_HWCAP. This
     should fix GDB on the HiFive unleashed, which has an embedded core
     for hart 0 which is exposed to Linux as an offline CPU.

   - A move of EM_RISCV to elf-em.h, which is where it should have been
     to begin with.

   - I've also removed the 64-bit divide routines. I know I'm not really
     playing by my own rules here because I posted the patches this
     morning, but since they shouldn't be in the kernel I think it's
     better to err on the side of going too fast here.

  I don't anticipate any more patch sets for the merge window"

* tag 'riscv-for-linus-4.20-mw2' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux:
  Move EM_RISCV into elf-em.h
  RISC-V: properly determine hardware caps
  Revert "lib: Add umoddi3 and udivmoddi4 of GCC library routines"
  Revert "RISC-V: Select GENERIC_LIB_UMODDI3 on RV32"
parents 9bb9d4fd ef70696a

arch/riscv/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ config ARCH_RV32I 
	select GENERIC_LIB_ASHRDI3

	select GENERIC_LIB_LSHRDI3

	select GENERIC_LIB_UCMPDI2

	select GENERIC_LIB_UMODDI3



config ARCH_RV64I

	bool "RV64I"

arch/riscv/include/asm/elf.h

+0 −3
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 
#include <asm/auxvec.h>

#include <asm/byteorder.h>



/* TODO: Move definition into include/uapi/linux/elf-em.h */

#define EM_RISCV	0xF3



/*

 * These are used to set parameters in the core dumps.

 */

arch/riscv/kernel/cpufeature.c

+5 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ bool has_fpu __read_mostly; 


void riscv_fill_hwcap(void)

{

	struct device_node *node;

	struct device_node *node = NULL;

	const char *isa;

	size_t i;

	static unsigned long isa2hwcap[256] = {0};
@@ -44,9 +44,11 @@ void riscv_fill_hwcap(void) 


	/*

	 * We don't support running Linux on hertergenous ISA systems.  For

	 * now, we just check the ISA of the first processor.

	 * now, we just check the ISA of the first "okay" processor.

	 */

	node = of_find_node_by_type(NULL, "cpu");

	while ((node = of_find_node_by_type(node, "cpu")))

		if (riscv_of_processor_hartid(node) >= 0)

			break;

	if (!node) {

		pr_warning("Unable to find \"cpu\" devicetree entry");

		return;

include/uapi/linux/elf-em.h

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#define EM_TILEPRO	188	/* Tilera TILEPro */

#define EM_MICROBLAZE	189	/* Xilinx MicroBlaze */

#define EM_TILEGX	191	/* Tilera TILE-Gx */

#define EM_RISCV	243	/* RISC-V */

#define EM_BPF		247	/* Linux BPF - in-kernel virtual machine */

#define EM_FRV		0x5441	/* Fujitsu FR-V */

lib/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -624,6 +624,3 @@ config GENERIC_LIB_CMPDI2 


config GENERIC_LIB_UCMPDI2

	bool
 


config GENERIC_LIB_UMODDI3

	bool

CRA Git | Maintained and supported by SUSTech CRA and CCSE