From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 9 Apr 2020 17:51:30 +0000 (-0700)
Subject: Merge tag 'riscv-for-linus-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=eab40026605f4717a9749ffcaec8119d58494999;p=linux.git

Merge tag 'riscv-for-linus-5.7' of git://git./linux/kernel/git/riscv/linux

Pull RISC-V updates from Palmer Dabbelt:
 "This contains a handful of new features:

   - Partial support for the Kendryte K210.

     There are still a few outstanding issues that I have patches for,
     but I don't actually have a board to test them so they're not
     included yet.

   - SBI v0.2 support.

   - Fixes to support for building with LLVM-based toolchains. The
     resulting images are known not to boot yet.

  I don't anticipate a part two, but I'll probably have something early
  in the RCs to finish up the K210 support"

* tag 'riscv-for-linus-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux: (38 commits)
  riscv: create a loader.bin boot image for Kendryte SoC
  riscv: Kendryte K210 default config
  riscv: Add Kendryte K210 device tree
  riscv: Select required drivers for Kendryte SOC
  riscv: Add Kendryte K210 SoC support
  riscv: Add SOC early init support
  riscv: Unaligned load/store handling for M_MODE
  RISC-V: Support cpu hotplug
  RISC-V: Add supported for ordered booting method using HSM
  RISC-V: Add SBI HSM extension definitions
  RISC-V: Export SBI error to linux error mapping function
  RISC-V: Add cpu_ops and modify default booting method
  RISC-V: Move relocate and few other functions out of __init
  RISC-V: Implement new SBI v0.2 extensions
  RISC-V: Introduce a new config for SBI v0.1
  RISC-V: Add SBI v0.2 extension definitions
  RISC-V: Add basic support for SBI v0.2
  RISC-V: Mark existing SBI as 0.1 SBI.
  riscv: Use macro definition instead of magic number
  riscv: Add support to dump the kernel page tables
  ...
---

eab40026605f4717a9749ffcaec8119d58494999
diff --cc arch/riscv/Kconfig
index 8672e77a5b7a5,bc713666f00a4..a197258595ef6
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -55,9 -56,12 +55,12 @@@ config RISC
  	select ARCH_HAS_PTE_SPECIAL
  	select ARCH_HAS_MMIOWB
  	select ARCH_HAS_DEBUG_VIRTUAL
 -	select HAVE_EBPF_JIT if 64BIT
 +	select HAVE_EBPF_JIT
  	select EDAC_SUPPORT
  	select ARCH_HAS_GIGANTIC_PAGE
+ 	select ARCH_HAS_SET_DIRECT_MAP
+ 	select ARCH_HAS_SET_MEMORY
+ 	select ARCH_HAS_STRICT_KERNEL_RWX
  	select ARCH_WANT_HUGE_PMD_SHARE if 64BIT
  	select SPARSEMEM_STATIC if 32BIT
  	select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU