diff mbox series

[v4,26/30] riscv/hwprobe: zicfilp / zicfiss enumeration in hwprobe

Message ID 20240912231650.3740732-27-debug@rivosinc.com (mailing list archive)
State New
Headers show
Series riscv control-flow integrity for usermode | expand

Checks

Context Check Description
conchuod/vmtest-fixes-PR fail merge-conflict
conchuod/vmtest-for-next-PR fail PR summary
conchuod/patch-26-test-1 fail .github/scripts/patches/tests/build_rv32_defconfig.sh took 111.22s
conchuod/patch-26-test-2 fail .github/scripts/patches/tests/build_rv64_clang_allmodconfig.sh took 938.22s
conchuod/patch-26-test-3 fail .github/scripts/patches/tests/build_rv64_gcc_allmodconfig.sh took 1174.27s
conchuod/patch-26-test-4 fail .github/scripts/patches/tests/build_rv64_nommu_k210_defconfig.sh took 18.07s
conchuod/patch-26-test-5 fail .github/scripts/patches/tests/build_rv64_nommu_virt_defconfig.sh took 19.78s
conchuod/patch-26-test-6 warning .github/scripts/patches/tests/checkpatch.sh took 0.67s
conchuod/patch-26-test-7 success .github/scripts/patches/tests/dtb_warn_rv64.sh took 40.32s
conchuod/patch-26-test-8 success .github/scripts/patches/tests/header_inline.sh took 0.01s
conchuod/patch-26-test-9 success .github/scripts/patches/tests/kdoc.sh took 0.56s
conchuod/patch-26-test-10 success .github/scripts/patches/tests/module_param.sh took 0.01s
conchuod/patch-26-test-11 success .github/scripts/patches/tests/verify_fixes.sh took 0.00s
conchuod/patch-26-test-12 success .github/scripts/patches/tests/verify_signedoff.sh took 0.04s

Commit Message

Deepak Gupta Sept. 12, 2024, 11:16 p.m. UTC
Adding enumeration of zicfilp and zicfiss extensions in hwprobe syscall.

Signed-off-by: Deepak Gupta <debug@rivosinc.com>
---
 arch/riscv/include/uapi/asm/hwprobe.h | 2 ++
 arch/riscv/kernel/sys_hwprobe.c       | 2 ++
 2 files changed, 4 insertions(+)
diff mbox series

Patch

diff --git a/arch/riscv/include/uapi/asm/hwprobe.h b/arch/riscv/include/uapi/asm/hwprobe.h
index 1e153cda57db..d5c5dec9ae6c 100644
--- a/arch/riscv/include/uapi/asm/hwprobe.h
+++ b/arch/riscv/include/uapi/asm/hwprobe.h
@@ -72,6 +72,8 @@  struct riscv_hwprobe {
 #define		RISCV_HWPROBE_EXT_ZCF		(1ULL << 46)
 #define		RISCV_HWPROBE_EXT_ZCMOP		(1ULL << 47)
 #define		RISCV_HWPROBE_EXT_ZAWRS		(1ULL << 48)
+#define		RISCV_HWPROBE_EXT_ZICFILP	(1ULL << 49)
+#define		RISCV_HWPROBE_EXT_ZICFISS	(1ULL << 50)
 #define RISCV_HWPROBE_KEY_CPUPERF_0	5
 #define		RISCV_HWPROBE_MISALIGNED_UNKNOWN	(0 << 0)
 #define		RISCV_HWPROBE_MISALIGNED_EMULATED	(1 << 0)
diff --git a/arch/riscv/kernel/sys_hwprobe.c b/arch/riscv/kernel/sys_hwprobe.c
index cea0ca2bf2a2..98f72ad7124f 100644
--- a/arch/riscv/kernel/sys_hwprobe.c
+++ b/arch/riscv/kernel/sys_hwprobe.c
@@ -107,6 +107,8 @@  static void hwprobe_isa_ext0(struct riscv_hwprobe *pair,
 		EXT_KEY(ZCB);
 		EXT_KEY(ZCMOP);
 		EXT_KEY(ZICBOZ);
+		EXT_KEY(ZICFILP);
+		EXT_KEY(ZICFISS);
 		EXT_KEY(ZICOND);
 		EXT_KEY(ZIHINTNTL);
 		EXT_KEY(ZIHINTPAUSE);