Commit dbf83817 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RISC-V updates from Palmer Dabbelt:
 "We have a lot of new kernel features for this merge window:

   - ARCH_SUPPORTS_ATOMIC_RMW, to allow OSQ locks to be enabled

   - The ability to enable NO_HZ_FULL

   - Support for enabling kcov, kmemleak, stack protector, and VM
     debugging

   - JUMP_LABEL support

  There are also a handful of cleanups"

* tag 'riscv-for-linus-5.9-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux: (24 commits)
  riscv: disable stack-protector for vDSO
  RISC-V: Fix build warning for smpboot.c
  riscv: fix build warning of mm/pageattr
  riscv: Fix build warning for mm/init
  RISC-V: Setup exception vector early
  riscv: Select ARCH_HAS_DEBUG_VM_PGTABLE
  riscv: Use generic pgprot_* macros from <linux/pgtable.h>
  mm: pgtable: Make generic pgprot_* macros available for no-MMU
  riscv: Cleanup unnecessary define in asm-offset.c
  riscv: Add jump-label implementation
  riscv: Support R_RISCV_ADD64 and R_RISCV_SUB64 relocs
  Replace HTTP links with HTTPS ones: RISC-V
  riscv: Add STACKPROTECTOR supported
  riscv: Fix typo in asm/hwcap.h uapi header
  riscv: Add kmemleak support
  riscv: Allow building with kcov coverage
  riscv: Enable context tracking
  riscv: Support irq_work via self IPIs
  riscv: Enable LOCKDEP_SUPPORT & fixup TRACE_IRQFLAGS_SUPPORT
  riscv: Fixup lockdep_assert_held with wrong param cpu_running
  ...
parents e1ec517e 40284a07

Documentation/features/core/jump-labels/arch-support.txt

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
    |    openrisc: | TODO |

    |      parisc: |  ok  |

    |     powerpc: |  ok  |

    |       riscv: | TODO |

    |       riscv: |  ok  |

    |        s390: |  ok  |

    |          sh: | TODO |

    |       sparc: |  ok  |

Documentation/features/debug/debug-vm-pgtable/arch-support.txt

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
    |    openrisc: | TODO |

    |      parisc: | TODO |

    |     powerpc: |  ok  |

    |       riscv: | TODO |

    |       riscv: |  ok  |

    |        s390: |  ok  |

    |          sh: | TODO |

    |       sparc: | TODO |

arch/riscv/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -13,11 +13,14 @@ config 32BIT 
config RISCV

	def_bool y

	select ARCH_CLOCKSOURCE_INIT

	select ARCH_SUPPORTS_ATOMIC_RMW

	select ARCH_HAS_BINFMT_FLAT

	select ARCH_HAS_DEBUG_VM_PGTABLE

	select ARCH_HAS_DEBUG_VIRTUAL if MMU

	select ARCH_HAS_DEBUG_WX

	select ARCH_HAS_GCOV_PROFILE_ALL

	select ARCH_HAS_GIGANTIC_PAGE

	select ARCH_HAS_KCOV

	select ARCH_HAS_MMIOWB

	select ARCH_HAS_PTE_SPECIAL

	select ARCH_HAS_SET_DIRECT_MAP
@@ -47,6 +50,8 @@ config RISCV 
	select GENERIC_TIME_VSYSCALL if MMU && 64BIT

	select HANDLE_DOMAIN_IRQ

	select HAVE_ARCH_AUDITSYSCALL

	select HAVE_ARCH_JUMP_LABEL

	select HAVE_ARCH_JUMP_LABEL_RELATIVE

	select HAVE_ARCH_KASAN if MMU && 64BIT

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_KGDB_QXFER_PKT
@@ -54,14 +59,18 @@ config RISCV 
	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_TRACEHOOK

	select HAVE_ASM_MODVERSIONS

	select HAVE_CONTEXT_TRACKING

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DMA_CONTIGUOUS if MMU

	select HAVE_EBPF_JIT if MMU

	select HAVE_FUTEX_CMPXCHG if FUTEX

	select HAVE_GCC_PLUGINS

	select HAVE_GENERIC_VDSO if MMU && 64BIT

	select HAVE_PCI

	select HAVE_PERF_EVENTS

	select HAVE_PERF_REGS

	select HAVE_PERF_USER_STACK_DUMP

	select HAVE_STACKPROTECTOR

	select HAVE_SYSCALL_TRACEPOINTS

	select IRQ_DOMAIN

	select MODULES_USE_ELF_RELA if MODULES
@@ -179,6 +188,9 @@ config PGTABLE_LEVELS 
	default 3 if 64BIT

	default 2



config LOCKDEP_SUPPORT

	def_bool y



source "arch/riscv/Kconfig.socs"



menu "Platform type"

arch/riscv/boot/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
# Based on the ia64 and arm64 boot/Makefile.

#



KCOV_INSTRUMENT := n



OBJCOPYFLAGS_Image :=-O binary -R .note -R .note.gnu.build-id -R .comment -S



targets := Image loader

arch/riscv/configs/defconfig

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ CONFIG_BPF_SYSCALL=y 
CONFIG_SOC_SIFIVE=y

CONFIG_SOC_VIRT=y

CONFIG_SMP=y

CONFIG_JUMP_LABEL=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_NET=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE