[GIT PULL] RISC-V Patches for the 6.14 Merge Window, Part 1
From: Palmer Dabbelt
Date: Fri Jan 31 2025 - 15:08:49 EST
The following changes since commit fac04efc5c793dccbd07e2d59af9f90b7fc0dca4:
Linux 6.13-rc2 (2024-12-08 14:03:39 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv-for-linus-6.14-mw1
for you to fetch changes up to 101971298be2aa4706c8602bd81066a0f6f2ced5:
riscv: add a warning when physical memory address overflows (2025-01-29 18:36:09 -0800)
----------------------------------------------------------------
RISC-V Patches for the 6.14 Merge Window, Part 1
* The PH1520 pinctrl and dwmac drivers are enabeled in defconfig.
* A redundant AQRL barrier has been removed from the futex cmpxchg
implementation.
* Support for the T-Head vector extensions, which includes exposing
these extensions to userspace on systems that implement them.
* Some more page table information is now printed on die() and systems
that cause PA overflows.
----------------------------------------------------------------
I don't have a second PR planned, I've been pretty sick lately so every if
something does blow up I'm probably going to be too out of it to notice this
weekend. That means this also hasn't gotten as much love as usual, but
hopefully that's just resulted in this being small and not buggy.
There's a pair of conflicts. The v_initval_nolibc.c changes also landed in the
new v_exec_initval_nolibc.c, so just removing it looks good to me. The
vstate_prctl test had an in-flight fixup/rewrite. Not sure if I'm just slow
today, but I'm having trouble trying to get a pre-merge `git diff` to show me
anything so here's my `git show --diff-merges=remerge`, hopefully that helps
diff --git a/tools/testing/selftests/riscv/vector/vstate_prctl.c b/tools/testing/selftests/riscv/vector/vstate_prctl.c
remerge CONFLICT (content): Merge conflict in tools/testing/selftests/riscv/vector/vstate_prctl.c
index 340ca64ccc2b..62fbb17a0556 100644
--- a/tools/testing/selftests/riscv/vector/vstate_prctl.c
+++ b/tools/testing/selftests/riscv/vector/vstate_prctl.c
@@ -36,19 +36,8 @@ TEST(get_control_no_v)
{
long rc;
-<<<<<<< 101971298be2 (riscv: add a warning when physical memory address overflows)
if (is_vector_supported() || is_xtheadvector_supported())
SKIP(return, "Test expects vector to be not supported");
-=======
- ksft_set_plan(1);
-
- pair.key = RISCV_HWPROBE_KEY_IMA_EXT_0;
- rc = riscv_hwprobe(&pair, 1, 0, NULL, 0);
- if (rc < 0) {
- ksft_test_result_fail("hwprobe() failed with %ld\n", rc);
- return -1;
- }
->>>>>>> 69b8923f5003 (Merge tag 'for-linus-6.14-ofs4' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux)
rc = prctl(PR_RISCV_V_GET_CONTROL);
EXPECT_EQ(-1, rc)
----------------------------------------------------------------
Celeste Liu (1):
riscv: defconfig: drop RT_GROUP_SCHED=y
Charlie Jenkins (13):
dt-bindings: riscv: Add xtheadvector ISA extension description
dt-bindings: cpus: add a thead vlen register length property
riscv: dts: allwinner: Add xtheadvector to the D1/D1s devicetree
riscv: Add thead and xtheadvector as a vendor extension
riscv: vector: Use vlenb from DT for thead
riscv: csr: Add CSR encodings for CSR_VXRM/CSR_VXSAT
riscv: Add xtheadvector instruction definitions
riscv: vector: Support xtheadvector save/restore
riscv: hwprobe: Add thead vendor extension probing
riscv: hwprobe: Document thead vendor extensions and xtheadvector extension
selftests: riscv: Fix vector tests
selftests: riscv: Support xtheadvector in vector tests
riscv: Add ghostwrite vulnerability
Davidlohr Bueso (1):
riscv/futex: Optimize atomic cmpxchg
Drew Fustini (1):
riscv: defconfig: enable pinctrl and dwmac support for TH1520
Heiko Stuebner (1):
RISC-V: define the elements of the VCSR vector CSR
Palmer Dabbelt (2):
RISC-V: Mark riscv_v_init() as __init
Merge patch series "riscv: Add support for xtheadvector"
Yunhui Cui (2):
riscv/mm/fault: add show_pte() before die()
riscv: add a warning when physical memory address overflows
Documentation/arch/riscv/hwprobe.rst | 10 +
Documentation/devicetree/bindings/riscv/cpus.yaml | 19 ++
.../devicetree/bindings/riscv/extensions.yaml | 10 +
arch/riscv/Kconfig.errata | 11 +
arch/riscv/Kconfig.vendor | 26 ++
arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi | 3 +-
arch/riscv/configs/defconfig | 3 +-
arch/riscv/errata/thead/errata.c | 28 ++
arch/riscv/include/asm/bugs.h | 22 ++
arch/riscv/include/asm/cpufeature.h | 2 +
arch/riscv/include/asm/csr.h | 15 +
arch/riscv/include/asm/errata_list.h | 3 +-
arch/riscv/include/asm/futex.h | 2 +-
arch/riscv/include/asm/hwprobe.h | 5 +-
arch/riscv/include/asm/switch_to.h | 2 +-
arch/riscv/include/asm/vector.h | 222 +++++++++++----
arch/riscv/include/asm/vendor_extensions/thead.h | 47 ++++
.../include/asm/vendor_extensions/thead_hwprobe.h | 19 ++
.../include/asm/vendor_extensions/vendor_hwprobe.h | 37 +++
arch/riscv/include/uapi/asm/hwprobe.h | 3 +-
arch/riscv/include/uapi/asm/vendor/thead.h | 3 +
arch/riscv/kernel/Makefile | 2 +
arch/riscv/kernel/bugs.c | 60 ++++
arch/riscv/kernel/cpufeature.c | 59 +++-
arch/riscv/kernel/kernel_mode_vector.c | 8 +-
arch/riscv/kernel/process.c | 4 +-
arch/riscv/kernel/signal.c | 6 +-
arch/riscv/kernel/sys_hwprobe.c | 5 +
arch/riscv/kernel/vector.c | 26 +-
arch/riscv/kernel/vendor_extensions.c | 10 +
arch/riscv/kernel/vendor_extensions/Makefile | 2 +
arch/riscv/kernel/vendor_extensions/thead.c | 29 ++
.../riscv/kernel/vendor_extensions/thead_hwprobe.c | 19 ++
arch/riscv/mm/fault.c | 52 ++++
arch/riscv/mm/init.c | 8 +-
drivers/base/cpu.c | 3 +
include/linux/cpu.h | 1 +
scripts/selinux/genheaders/genheaders | Bin 0 -> 90112 bytes
tools/testing/selftests/riscv/vector/.gitignore | 3 +-
tools/testing/selftests/riscv/vector/Makefile | 17 +-
.../selftests/riscv/vector/v_exec_initval_nolibc.c | 94 +++++++
tools/testing/selftests/riscv/vector/v_helpers.c | 68 +++++
tools/testing/selftests/riscv/vector/v_helpers.h | 8 +
tools/testing/selftests/riscv/vector/v_initval.c | 22 ++
.../selftests/riscv/vector/v_initval_nolibc.c | 68 -----
.../selftests/riscv/vector/vstate_exec_nolibc.c | 20 +-
.../testing/selftests/riscv/vector/vstate_prctl.c | 305 +++++++++++++--------
47 files changed, 1114 insertions(+), 277 deletions(-)
create mode 100644 arch/riscv/include/asm/bugs.h
create mode 100644 arch/riscv/include/asm/vendor_extensions/thead.h
create mode 100644 arch/riscv/include/asm/vendor_extensions/thead_hwprobe.h
create mode 100644 arch/riscv/include/asm/vendor_extensions/vendor_hwprobe.h
create mode 100644 arch/riscv/include/uapi/asm/vendor/thead.h
create mode 100644 arch/riscv/kernel/bugs.c
create mode 100644 arch/riscv/kernel/vendor_extensions/thead.c
create mode 100644 arch/riscv/kernel/vendor_extensions/thead_hwprobe.c
create mode 100755 scripts/selinux/genheaders/genheaders
create mode 100644 tools/testing/selftests/riscv/vector/v_exec_initval_nolibc.c
create mode 100644 tools/testing/selftests/riscv/vector/v_helpers.c
create mode 100644 tools/testing/selftests/riscv/vector/v_helpers.h
create mode 100644 tools/testing/selftests/riscv/vector/v_initval.c
delete mode 100644 tools/testing/selftests/riscv/vector/v_initval_nolibc.c