Commit 063df71a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RISC-V updates from Palmer Dabbelt:

 - support PC-relative instructions (auipc and branches) in kprobes

 - support for forced IRQ threading

 - support for the hlt/nohlt kernel command line options, via the
   generic idle loop

 - show the edge/level triggered behavior of interrupts
   in /proc/interrupts

 - a handful of cleanups to our address mapping mechanisms

 - support for allocating gigantic hugepages via CMA

 - support for the undefined behavior sanitizer (UBSAN)

 - a handful of cleanups to the VDSO that allow the kernel to build with
   LLD.

 - support for hugepage migration

* tag 'riscv-for-linus-5.15-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux: (21 commits)
  riscv: add support for hugepage migration
  RISC-V: Fix VDSO build for !MMU
  riscv: use strscpy to replace strlcpy
  riscv: explicitly use symbol offsets for VDSO
  riscv: Enable Undefined Behavior Sanitizer UBSAN
  riscv: Keep the riscv Kconfig selects sorted
  riscv: Support allocating gigantic hugepages using CMA
  riscv: fix the global name pfn_base confliction error
  riscv: Move early fdt mapping creation in its own function
  riscv: Simplify BUILTIN_DTB device tree mapping handling
  riscv: Use __maybe_unused instead of #ifdefs around variable declarations
  riscv: Get rid of map_size parameter to create_kernel_page_table
  riscv: Introduce va_kernel_pa_offset for 32-bit kernel
  riscv: Optimize kernel virtual address conversion macro
  dt-bindings: riscv: add starfive jh7100 bindings
  riscv: Enable GENERIC_IRQ_SHOW_LEVEL
  riscv: Enable idle generic idle loop
  riscv: Allow forced irq threading
  riscv: Implement thread_struct whitelist for hardened usercopy
  riscv: kprobes: implement the branch instructions
  ...
parents 3fe617cc c24a1967

Documentation/devicetree/bindings/riscv/starfive.yaml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/riscv/starfive.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: StarFive SoC-based boards



maintainers:

  - Michael Zhu <michael.zhu@starfivetech.com>

  - Drew Fustini <drew@beagleboard.org>



description:

  StarFive SoC-based boards



properties:

  $nodename:

    const: '/'

  compatible:

    oneOf:

      - items:

          - const: beagle,beaglev-starlight-jh7100-r0

          - const: starfive,jh7100



additionalProperties: true



...

arch/riscv/Kconfig

+9 −3
Original line number Diff line number Diff line
@@ -13,9 +13,7 @@ config 32BIT 
config RISCV

	def_bool y

	select ARCH_CLOCKSOURCE_INIT

	select ARCH_SUPPORTS_ATOMIC_RMW

	select ARCH_SUPPORTS_DEBUG_PAGEALLOC if MMU

	select ARCH_STACKWALK

	select ARCH_ENABLE_HUGEPAGE_MIGRATION if HUGETLB_PAGE && MIGRATION

	select ARCH_HAS_BINFMT_FLAT

	select ARCH_HAS_DEBUG_VM_PGTABLE

	select ARCH_HAS_DEBUG_VIRTUAL if MMU
@@ -31,8 +29,12 @@ config RISCV 
	select ARCH_HAS_STRICT_KERNEL_RWX if MMU && !XIP_KERNEL

	select ARCH_HAS_STRICT_MODULE_RWX if MMU && !XIP_KERNEL

	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_HAS_UBSAN_SANITIZE_ALL

	select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX

	select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT

	select ARCH_STACKWALK

	select ARCH_SUPPORTS_ATOMIC_RMW

	select ARCH_SUPPORTS_DEBUG_PAGEALLOC if MMU

	select ARCH_SUPPORTS_HUGETLBFS if MMU

	select ARCH_USE_MEMTEST

	select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU
@@ -48,9 +50,11 @@ config RISCV 
	select GENERIC_CLOCKEVENTS_BROADCAST if SMP

	select GENERIC_EARLY_IOREMAP

	select GENERIC_GETTIMEOFDAY if HAVE_GENERIC_VDSO

	select GENERIC_IDLE_POLL_SETUP

	select GENERIC_IOREMAP

	select GENERIC_IRQ_MULTI_HANDLER

	select GENERIC_IRQ_SHOW

	select GENERIC_IRQ_SHOW_LEVEL

	select GENERIC_LIB_DEVMEM_IS_ALLOWED

	select GENERIC_PCI_IOMAP

	select GENERIC_PTDUMP if MMU
@@ -70,6 +74,7 @@ config RISCV 
	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_TRACEHOOK

	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT && MMU

	select HAVE_ARCH_THREAD_STRUCT_WHITELIST

	select HAVE_ARCH_VMAP_STACK if MMU && 64BIT

	select HAVE_ASM_MODVERSIONS

	select HAVE_CONTEXT_TRACKING
@@ -95,6 +100,7 @@ config RISCV 
	select HAVE_STACKPROTECTOR

	select HAVE_SYSCALL_TRACEPOINTS

	select IRQ_DOMAIN

	select IRQ_FORCED_THREADING

	select MODULES_USE_ELF_RELA if MODULES

	select MODULE_SECTIONS if MODULES

	select OF

arch/riscv/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -108,6 +108,12 @@ PHONY += vdso_install 
vdso_install:

	$(Q)$(MAKE) $(build)=arch/riscv/kernel/vdso $@



ifeq ($(CONFIG_MMU),y)

prepare: vdso_prepare

vdso_prepare: prepare0

	$(Q)$(MAKE) $(build)=arch/riscv/kernel/vdso include/generated/vdso-offsets.h

endif



ifneq ($(CONFIG_XIP_KERNEL),y)

ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_SOC_CANAAN),yy)

KBUILD_IMAGE := $(boot)/loader.bin

arch/riscv/include/asm/page.h

+5 −16
Original line number Diff line number Diff line
@@ -79,8 +79,8 @@ typedef struct page *pgtable_t; 
#endif



#ifdef CONFIG_MMU

extern unsigned long pfn_base;

#define ARCH_PFN_OFFSET		(pfn_base)

extern unsigned long riscv_pfn_base;

#define ARCH_PFN_OFFSET		(riscv_pfn_base)

#else

#define ARCH_PFN_OFFSET		(PAGE_OFFSET >> PAGE_SHIFT)

#endif /* CONFIG_MMU */
@@ -91,10 +91,8 @@ struct kernel_mapping { 
	uintptr_t size;

	/* Offset between linear mapping virtual address and kernel load address */

	unsigned long va_pa_offset;

#ifdef CONFIG_64BIT

	/* Offset between kernel mapping virtual address and kernel load address */

	unsigned long va_kernel_pa_offset;

#endif

	unsigned long va_kernel_xip_pa_offset;

#ifdef CONFIG_XIP_KERNEL

	uintptr_t xiprom;
@@ -105,11 +103,11 @@ struct kernel_mapping { 
extern struct kernel_mapping kernel_map;

extern phys_addr_t phys_ram_base;



#ifdef CONFIG_64BIT

#define is_kernel_mapping(x)	\

	((x) >= kernel_map.virt_addr && (x) < (kernel_map.virt_addr + kernel_map.size))



#define is_linear_mapping(x)	\

	((x) >= PAGE_OFFSET && (x) < kernel_map.virt_addr)

	((x) >= PAGE_OFFSET && (!IS_ENABLED(CONFIG_64BIT) || (x) < kernel_map.virt_addr))



#define linear_mapping_pa_to_va(x)	((void *)((unsigned long)(x) + kernel_map.va_pa_offset))

#define kernel_mapping_pa_to_va(y)	({						\
@@ -123,7 +121,7 @@ extern phys_addr_t phys_ram_base; 
#define linear_mapping_va_to_pa(x)	((unsigned long)(x) - kernel_map.va_pa_offset)

#define kernel_mapping_va_to_pa(y) ({						\

	unsigned long _y = y;							\

	(_y < kernel_map.virt_addr + XIP_OFFSET) ?					\

	(IS_ENABLED(CONFIG_XIP_KERNEL) && _y < kernel_map.virt_addr + XIP_OFFSET) ?	\

		((unsigned long)(_y) - kernel_map.va_kernel_xip_pa_offset) :		\

		((unsigned long)(_y) - kernel_map.va_kernel_pa_offset - XIP_OFFSET);	\

	})
@@ -133,15 +131,6 @@ extern phys_addr_t phys_ram_base; 
	is_linear_mapping(_x) ?							\

		linear_mapping_va_to_pa(_x) : kernel_mapping_va_to_pa(_x);	\

	})

#else

#define is_kernel_mapping(x)	\

	((x) >= kernel_map.virt_addr && (x) < (kernel_map.virt_addr + kernel_map.size))

#define is_linear_mapping(x)	\

	((x) >= PAGE_OFFSET)



#define __pa_to_va_nodebug(x)  ((void *)((unsigned long) (x) + kernel_map.va_pa_offset))

#define __va_to_pa_nodebug(x)  ((unsigned long)(x) - kernel_map.va_pa_offset)

#endif /* CONFIG_64BIT */



#ifdef CONFIG_DEBUG_VIRTUAL

extern phys_addr_t __virt_to_phys(unsigned long x);

arch/riscv/include/asm/processor.h

+8 −0
Original line number Diff line number Diff line
@@ -37,6 +37,14 @@ struct thread_struct { 
	unsigned long bad_cause;

};



/* Whitelist the fstate from the task_struct for hardened usercopy */

static inline void arch_thread_struct_whitelist(unsigned long *offset,

						unsigned long *size)

{

	*offset = offsetof(struct thread_struct, fstate);

	*size = sizeof_field(struct thread_struct, fstate);

}



#define INIT_THREAD {					\

	.sp = sizeof(init_stack) + (long)&init_stack,	\

}