Snap for 10843824 from 49eb4d6a8baaa85e046f0a9fe9751da7dcce0275 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: Ie6de30088d07bb38eeab6fe22aa79242cddc4671

4 files changed, 21 insertions, 0 deletions

diff --git a/linux/riscv/syscallent.h b/linux/riscv/syscallent.h
index 3dfed89e..0b5960a9 100644
--- a/linux/riscv/syscallent.h
+++ b/linux/riscv/syscallent.h
@@ -1,4 +1,6 @@
 #include "64/syscallent.h"
 
+/* #define __NR_riscv_hwprobe (__NR_arch_specific_syscall + 14) */
+[258] = { 5,	0,		SEN(riscv_hwprobe),		"riscv_hwprobe"	},
 /* #define __NR_riscv_flush_icache (__NR_arch_specific_syscall + 15) */
 [259] = { 3,	TM,		SEN(riscv_flush_icache),	"riscv_flush_icache"	},
diff --git a/riscv.c b/riscv.c
index aaa39325..7b9ae889 100644
--- a/riscv.c
+++ b/riscv.c
@@ -50,4 +50,21 @@ SYS_FUNC(riscv_flush_icache)
 	return RVAL_DECODED;
 }
 
+SYS_FUNC(riscv_hwprobe)
+{
+	/* uintptr_t probes */
+	printaddr(tcp->u_arg[0]);
+
+	/* size_t probe_count, size_t cpu_count */
+	tprintf(", %lu, %lu, ", tcp->u_arg[1], tcp->u_arg[2]);
+
+	/* uintptr_t pcus */
+	printaddr(tcp->u_arg[3]);
+
+	/* unsigned flags */
+	tprintf(", %#lx", tcp->u_arg[4]);
+
+	return RVAL_DECODED;
+}
+
 #endif /* RISCV */
diff --git a/sen.h b/sen.h
index fb29d69d..c5febcc8 100644
--- a/sen.h
+++ b/sen.h
@@ -273,6 +273,7 @@ SEN_renameat2,
 SEN_request_key,
 SEN_restart_syscall,
 SEN_riscv_flush_icache,
+SEN_riscv_hwprobe,
 SEN_rmdir,
 SEN_rseq,
 SEN_rt_sigaction,
diff --git a/sys_func.h b/sys_func.h
index 22cb3788..cdb63180 100644
--- a/sys_func.h
+++ b/sys_func.h
@@ -208,6 +208,7 @@ extern SYS_FUNC(renameat2);
 extern SYS_FUNC(request_key);
 extern SYS_FUNC(restart_syscall);
 extern SYS_FUNC(riscv_flush_icache);
+extern SYS_FUNC(riscv_hwprobe);
 extern SYS_FUNC(rt_sigaction);
 extern SYS_FUNC(rt_sigpending);
 extern SYS_FUNC(rt_sigprocmask);