Commit 939b7cbc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RISC-V updates from Palmer Dabbelt:

 - Support for the memtest= kernel command-line argument.

 - Support for building the kernel with FORTIFY_SOURCE.

 - Support for generic clockevent broadcasts.

 - Support for the buildtar build target.

 - Some build system cleanups to pass more LLVM-friendly arguments.

 - Support for kprobes.

 - A rearranged kernel memory map, the first part of supporting sv48
   systems.

 - Improvements to kexec, along with support for kdump and crash
   kernels.

 - An alternatives-based errata framework, along with support for
   handling a pair of errata that manifest on some SiFive designs
   (including the HiFive Unmatched).

 - Support for XIP.

 - A device tree for the Microchip PolarFire ICICLE SoC and associated
   dev board.

... along with a bunch of cleanups.  There are already a handful of fixes
on the list so there will likely be a part 2.

* tag 'riscv-for-linus-5.13-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux: (45 commits)
  RISC-V: Always define XIP_FIXUP
  riscv: Remove 32b kernel mapping from page table dump
  riscv: Fix 32b kernel build with CONFIG_DEBUG_VIRTUAL=y
  RISC-V: Fix error code returned by riscv_hartid_to_cpuid()
  RISC-V: Enable Microchip PolarFire ICICLE SoC
  RISC-V: Initial DTS for Microchip ICICLE board
  dt-bindings: riscv: microchip: Add YAML documentation for the PolarFire SoC
  RISC-V: Add Microchip PolarFire SoC kconfig option
  RISC-V: enable XIP
  RISC-V: Add crash kernel support
  RISC-V: Add kdump support
  RISC-V: Improve init_resources()
  RISC-V: Add kexec support
  RISC-V: Add EM_RISCV to kexec UAPI header
  riscv: vdso: fix and clean-up Makefile
  riscv/mm: Use BUG_ON instead of if condition followed by BUG.
  riscv/kprobe: fix kernel panic when invoking sys_read traced by kprobe
  riscv: Set ARCH_HAS_STRICT_MODULE_RWX if MMU
  riscv: module: Create module allocations without exec permissions
  riscv: bpf: Avoid breaking W^X
  ...
parents 5e5948e5 f54c7b58

Documentation/admin-guide/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -2821,7 +2821,7 @@ 
			Note that even when enabled, there are a few cases where

			the feature is not effective.



	memtest=	[KNL,X86,ARM,PPC] Enable memtest

	memtest=	[KNL,X86,ARM,PPC,RISCV] Enable memtest

			Format: <integer>

			default : 0 <disable>

			Specifies the number of memtest passes to be

Documentation/devicetree/bindings/riscv/microchip.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/microchip.yaml#

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



title: Microchip PolarFire SoC-based boards device tree bindings



maintainers:

  - Cyril Jean <Cyril.Jean@microchip.com>

  - Lewis Hanly <lewis.hanly@microchip.com>



description:

  Microchip PolarFire SoC-based boards



properties:

  $nodename:

    const: '/'

  compatible:

    items:

      - enum:

          - microchip,mpfs-icicle-kit

      - const: microchip,mpfs



additionalProperties: true



...

Documentation/riscv/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ RISC-V architecture 
    :maxdepth: 1



    boot-image-header

    vm-layout

    pmu

    patch-acceptance

Documentation/riscv/vm-layout.rst

0 → 100644
+63 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



=====================================

Virtual Memory Layout on RISC-V Linux

=====================================



:Author: Alexandre Ghiti <alex@ghiti.fr>

:Date: 12 February 2021



This document describes the virtual memory layout used by the RISC-V Linux

Kernel.



RISC-V Linux Kernel 32bit

=========================



RISC-V Linux Kernel SV32

------------------------



TODO



RISC-V Linux Kernel 64bit

=========================



The RISC-V privileged architecture document states that the 64bit addresses

"must have bits 63–48 all equal to bit 47, or else a page-fault exception will

occur.": that splits the virtual address space into 2 halves separated by a very

big hole, the lower half is where the userspace resides, the upper half is where

the RISC-V Linux Kernel resides.



RISC-V Linux Kernel SV39

------------------------



::



  ========================================================================================================================

      Start addr    |   Offset   |     End addr     |  Size   | VM area description

  ========================================================================================================================

                    |            |                  |         |

   0000000000000000 |    0       | 0000003fffffffff |  256 GB | user-space virtual memory, different per mm

  __________________|____________|__________________|_________|___________________________________________________________

                    |            |                  |         |

   0000004000000000 | +256    GB | ffffffbfffffffff | ~16M TB | ... huge, almost 64 bits wide hole of non-canonical

                    |            |                  |         |     virtual memory addresses up to the -256 GB

                    |            |                  |         |     starting offset of kernel mappings.

  __________________|____________|__________________|_________|___________________________________________________________

                                                              |

                                                              | Kernel-space virtual memory, shared between all processes:

  ____________________________________________________________|___________________________________________________________

                    |            |                  |         |

   ffffffc000000000 | -256    GB | ffffffc7ffffffff |   32 GB | kasan

   ffffffcefee00000 | -196    GB | ffffffcefeffffff |    2 MB | fixmap

   ffffffceff000000 | -196    GB | ffffffceffffffff |   16 MB | PCI io

   ffffffcf00000000 | -196    GB | ffffffcfffffffff |    4 GB | vmemmap

   ffffffd000000000 | -192    GB | ffffffdfffffffff |   64 GB | vmalloc/ioremap space

   ffffffe000000000 | -128    GB | ffffffff7fffffff |  124 GB | direct mapping of all physical memory

  __________________|____________|__________________|_________|____________________________________________________________

                                                              |

                                                              |

  ____________________________________________________________|____________________________________________________________

                    |            |                  |         |

   ffffffff00000000 |   -4    GB | ffffffff7fffffff |    2 GB | modules

   ffffffff80000000 |   -2    GB | ffffffffffffffff |    2 GB | kernel, BPF

  __________________|____________|__________________|_________|____________________________________________________________

arch/riscv/Kconfig

+86 −4
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ config RISCV 
	select ARCH_HAS_DEBUG_VM_PGTABLE

	select ARCH_HAS_DEBUG_VIRTUAL if MMU

	select ARCH_HAS_DEBUG_WX

	select ARCH_HAS_FORTIFY_SOURCE

	select ARCH_HAS_GCOV_PROFILE_ALL

	select ARCH_HAS_GIGANTIC_PAGE

	select ARCH_HAS_KCOV
@@ -27,7 +28,9 @@ config RISCV 
	select ARCH_HAS_PTE_SPECIAL

	select ARCH_HAS_SET_DIRECT_MAP

	select ARCH_HAS_SET_MEMORY

	select ARCH_HAS_STRICT_KERNEL_RWX if MMU

	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_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX

	select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT

	select ARCH_SUPPORTS_HUGETLBFS if MMU
@@ -41,6 +44,7 @@ config RISCV 
	select EDAC_SUPPORT

	select GENERIC_ARCH_TOPOLOGY if SMP

	select GENERIC_ATOMIC64 if !64BIT

	select GENERIC_CLOCKEVENTS_BROADCAST if SMP

	select GENERIC_EARLY_IOREMAP

	select GENERIC_GETTIMEOFDAY if HAVE_GENERIC_VDSO

	select GENERIC_IOREMAP
@@ -202,6 +206,7 @@ config LOCKDEP_SUPPORT 
	def_bool y



source "arch/riscv/Kconfig.socs"

source "arch/riscv/Kconfig.erratas"



menu "Platform type"
@@ -225,7 +230,7 @@ config ARCH_RV64I 
	bool "RV64I"

	select 64BIT

	select ARCH_SUPPORTS_INT128 if CC_HAS_INT128 && GCC_VERSION >= 50000

	select HAVE_DYNAMIC_FTRACE if MMU

	select HAVE_DYNAMIC_FTRACE if MMU && $(cc-option,-fpatchable-function-entry=8)

	select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_FUNCTION_GRAPH_TRACER
@@ -384,6 +389,31 @@ config RISCV_SBI_V01 
	help

	  This config allows kernel to use SBI v0.1 APIs. This will be

	  deprecated in future once legacy M-mode software are no longer in use.



config KEXEC

	bool "Kexec system call"

	select KEXEC_CORE

	select HOTPLUG_CPU if SMP

	depends on MMU

	help

	  kexec is a system call that implements the ability to shutdown your

	  current kernel, and to start another kernel. It is like a reboot

	  but it is independent of the system firmware. And like a reboot

	  you can start any kernel with it, not just Linux.



	  The name comes from the similarity to the exec system call.



config CRASH_DUMP

	bool "Build kdump crash kernel"

	help

	  Generate crash dump after being started by kexec. This should

	  be normally only set in special crash dump kernels which are

	  loaded in the main kernel with kexec-tools into a specially

	  reserved region and then later executed after a crash by

	  kdump/kexec.



	  For more details see Documentation/admin-guide/kdump/kdump.rst



endmenu



menu "Boot options"
@@ -436,7 +466,7 @@ config EFI_STUB 


config EFI

	bool "UEFI runtime support"

	depends on OF

	depends on OF && !XIP_KERNEL

	select LIBFDT

	select UCS2_STRING

	select EFI_PARAMS_FROM_FDT
@@ -460,11 +490,63 @@ config STACKPROTECTOR_PER_TASK 
	def_bool y

	depends on STACKPROTECTOR && CC_HAVE_STACKPROTECTOR_TLS



config PHYS_RAM_BASE_FIXED

	bool "Explicitly specified physical RAM address"

	default n



config PHYS_RAM_BASE

	hex "Platform Physical RAM address"

	depends on PHYS_RAM_BASE_FIXED

	default "0x80000000"

	help

	  This is the physical address of RAM in the system. It has to be

	  explicitly specified to run early relocations of read-write data

	  from flash to RAM.



config XIP_KERNEL

	bool "Kernel Execute-In-Place from ROM"

	depends on MMU && SPARSEMEM

	# This prevents XIP from being enabled by all{yes,mod}config, which

	# fail to build since XIP doesn't support large kernels.

	depends on !COMPILE_TEST

	select PHYS_RAM_BASE_FIXED

	help

	  Execute-In-Place allows the kernel to run from non-volatile storage

	  directly addressable by the CPU, such as NOR flash. This saves RAM

	  space since the text section of the kernel is not loaded from flash

	  to RAM.  Read-write sections, such as the data section and stack,

	  are still copied to RAM.  The XIP kernel is not compressed since

	  it has to run directly from flash, so it will take more space to

	  store it.  The flash address used to link the kernel object files,

	  and for storing it, is configuration dependent. Therefore, if you

	  say Y here, you must know the proper physical address where to

	  store the kernel image depending on your own flash memory usage.



	  Also note that the make target becomes "make xipImage" rather than

	  "make zImage" or "make Image".  The final kernel binary to put in

	  ROM memory will be arch/riscv/boot/xipImage.



	  SPARSEMEM is required because the kernel text and rodata that are

	  flash resident are not backed by memmap, then any attempt to get

	  a struct page on those regions will trigger a fault.



	  If unsure, say N.



config XIP_PHYS_ADDR

	hex "XIP Kernel Physical Location"

	depends on XIP_KERNEL

	default "0x21000000"

	help

	  This is the physical address in your flash memory the kernel will

	  be linked for and stored to.  This address is dependent on your

	  own flash usage.



endmenu



config BUILTIN_DTB

	def_bool n

	bool

	depends on OF

	default y if XIP_KERNEL



menu "Power management options"