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

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

Pull more RISC-V updates from Palmer Dabbelt:

 - Support for NUMA (via SRAT and SLIT), console output (via SPCR), and
   cache info (via PPTT) on ACPI-based systems.

 - The trap entry/exit code no longer breaks the return address stack
   predictor on many systems, which results in an improvement to trap
   latency.

 - Support for HAVE_ARCH_STACKLEAK.

 - The sv39 linear map has been extended to support 128GiB mappings.

 - The frequency of the mtime CSR is now visible via hwprobe.

* tag 'riscv-for-linus-6.11-mw2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux: (21 commits)
  RISC-V: Provide the frequency of time CSR via hwprobe
  riscv: Extend sv39 linear mapping max size to 128G
  riscv: enable HAVE_ARCH_STACKLEAK
  riscv: signal: Remove unlikely() from WARN_ON() condition
  riscv: Improve exception and system call latency
  RISC-V: Select ACPI PPTT drivers
  riscv: cacheinfo: initialize cacheinfo's level and type from ACPI PPTT
  riscv: cacheinfo: remove the useless input parameter (node) of ci_leaf_init()
  RISC-V: ACPI: Enable SPCR table for console output on RISC-V
  riscv: boot: remove duplicated targets line
  trace: riscv: Remove deprecated kprobe on ftrace support
  riscv: cpufeature: Extract common elements from extension checking
  riscv: Introduce vendor variants of extension helpers
  riscv: Add vendor extensions to /proc/cpuinfo
  riscv: Extend cpufeature.c to detect vendor extensions
  RISC-V: run savedefconfig for defconfig
  RISC-V: hwprobe: sort EXT_KEY()s in hwprobe_isa_ext0() alphabetically
  ACPI: NUMA: replace pr_info with pr_debug in arch_acpi_numa_init
  ACPI: NUMA: change the ACPI_NUMA to a hidden option
  ACPI: NUMA: Add handler for SRAT RINTC affinity structure
  ...
parents c17f1224 52420e48

Documentation/arch/riscv/hwprobe.rst

+2 −0
Original line number Diff line number Diff line
@@ -264,3 +264,5 @@ The following keys are defined: 


* :c:macro:`RISCV_HWPROBE_KEY_HIGHEST_VIRT_ADDRESS`: An unsigned long which

  represent the highest userspace virtual address usable.



* :c:macro:`RISCV_HWPROBE_KEY_TIME_CSR_FREQ`: Frequency (in Hz) of `time CSR`.

Documentation/arch/riscv/vm-layout.rst

+6 −5
Original line number Diff line number Diff line
@@ -47,11 +47,12 @@ RISC-V Linux Kernel SV39 
                                                              | Kernel-space virtual memory, shared between all processes:

  ____________________________________________________________|___________________________________________________________

                    |            |                  |         |

   ffffffc6fea00000 | -228    GB | ffffffc6feffffff |    6 MB | fixmap

   ffffffc6ff000000 | -228    GB | ffffffc6ffffffff |   16 MB | PCI io

   ffffffc700000000 | -228    GB | ffffffc7ffffffff |    4 GB | vmemmap

   ffffffc800000000 | -224    GB | ffffffd7ffffffff |   64 GB | vmalloc/ioremap space

   ffffffd800000000 | -160    GB | fffffff6ffffffff |  124 GB | direct mapping of all physical memory

   ffffffc4fea00000 | -236    GB | ffffffc4feffffff |    6 MB | fixmap

   ffffffc4ff000000 | -236    GB | ffffffc4ffffffff |   16 MB | PCI io

   ffffffc500000000 | -236    GB | ffffffc5ffffffff |    4 GB | vmemmap

   ffffffc600000000 | -232    GB | ffffffd5ffffffff |   64 GB | vmalloc/ioremap space

   ffffffd600000000 | -168    GB | fffffff5ffffffff |  128 GB | direct mapping of all physical memory

                    |            |                  |         |

   fffffff700000000 |  -36    GB | fffffffeffffffff |   32 GB | kasan

  __________________|____________|__________________|_________|____________________________________________________________

                                                              |

arch/arm64/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -1471,7 +1471,6 @@ config HOTPLUG_CPU 
config NUMA

	bool "NUMA Memory Allocation and Scheduler Support"

	select GENERIC_ARCH_NUMA

	select ACPI_NUMA if ACPI

	select OF_NUMA

	select HAVE_SETUP_PER_CPU_AREA

	select NEED_PER_CPU_EMBED_FIRST_CHUNK

arch/loongarch/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -476,7 +476,6 @@ config NR_CPUS 
config NUMA

	bool "NUMA Support"

	select SMP

	select ACPI_NUMA if ACPI

	help

	  Say Y to compile the kernel with NUMA (Non-Uniform Memory Access)

	  support.  This option improves performance on systems with more

arch/riscv/Kconfig

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

	def_bool y

	select ACPI_GENERIC_GSI if ACPI

	select ACPI_PPTT if ACPI

	select ACPI_REDUCED_HARDWARE_ONLY if ACPI

	select ACPI_SPCR_TABLE if ACPI

	select ARCH_DMA_DEFAULT_COHERENT

	select ARCH_ENABLE_HUGEPAGE_MIGRATION if HUGETLB_PAGE && MIGRATION

	select ARCH_ENABLE_MEMORY_HOTPLUG if SPARSEMEM_VMEMMAP
@@ -123,6 +125,7 @@ config RISCV 
	select HAVE_ARCH_MMAP_RND_COMPAT_BITS if COMPAT

	select HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET

	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_STACKLEAK

	select HAVE_ARCH_THREAD_STRUCT_WHITELIST

	select HAVE_ARCH_TRACEHOOK

	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT && MMU
@@ -154,7 +157,6 @@ config RISCV 
	select HAVE_KERNEL_UNCOMPRESSED if !XIP_KERNEL && !EFI_ZBOOT

	select HAVE_KERNEL_ZSTD if !XIP_KERNEL && !EFI_ZBOOT

	select HAVE_KPROBES if !XIP_KERNEL

	select HAVE_KPROBES_ON_FTRACE if !XIP_KERNEL

	select HAVE_KRETPROBES if !XIP_KERNEL

	# https://github.com/ClangBuiltLinux/linux/issues/1881

	select HAVE_LD_DEAD_CODE_DATA_ELIMINATION if !LD_IS_LLD
@@ -820,6 +822,8 @@ config RISCV_EFFICIENT_UNALIGNED_ACCESS 


endchoice



source "arch/riscv/Kconfig.vendor"



endmenu # "Platform type"



menu "Kernel features"