* [PATCH v2] linux-user: Add /proc/cpuinfo handler for RISC-V
@ 2023-05-03 11:20 Andreas Schwab
2023-05-03 15:01 ` Palmer Dabbelt
0 siblings, 1 reply; 2+ messages in thread
From: Andreas Schwab @ 2023-05-03 11:20 UTC (permalink / raw)
To: Laurent Vivier; +Cc: Palmer Dabbelt, qemu-devel
Signed-off-by: Andreas Schwab <schwab@suse.de>
---
v2: dynmically compute the isa string
linux-user/syscall.c | 55 ++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 53 insertions(+), 2 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 69f740ff98..6df138c8b6 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -8231,7 +8231,8 @@ void target_exception_dump(CPUArchState *env, const char *fmt, int code)
}
#if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN || \
- defined(TARGET_SPARC) || defined(TARGET_M68K) || defined(TARGET_HPPA)
+ defined(TARGET_SPARC) || defined(TARGET_M68K) || defined(TARGET_HPPA) || \
+ defined(TARGET_RISCV)
static int is_proc(const char *filename, const char *entry)
{
return strcmp(filename, entry) == 0;
@@ -8309,6 +8310,56 @@ static int open_cpuinfo(CPUArchState *cpu_env, int fd)
}
#endif
+#if defined(TARGET_RISCV)
+static int open_cpuinfo(CPUArchState *cpu_env, int fd)
+{
+ int i, num_cpus;
+ char isa[32];
+
+#if defined(TARGET_RISCV32)
+ strcpy (isa, "rv32");
+#endif
+#if defined(TARGET_RISCV64)
+ strcpy (isa, "rv64");
+#endif
+ i = strlen (isa);
+ if (riscv_has_ext (cpu_env, RVI))
+ isa[i++] = 'i';
+ if (riscv_has_ext (cpu_env, RVE))
+ isa[i++] = 'e';
+ if (riscv_has_ext (cpu_env, RVM))
+ isa[i++] = 'm';
+ if (riscv_has_ext (cpu_env, RVA))
+ isa[i++] = 'a';
+ if (riscv_has_ext (cpu_env, RVF))
+ isa[i++] = 'f';
+ if (riscv_has_ext (cpu_env, RVD))
+ isa[i++] = 'd';
+ if (riscv_has_ext (cpu_env, RVV))
+ isa[i++] = 'v';
+ if (riscv_has_ext (cpu_env, RVC))
+ isa[i++] = 'c';
+ isa[i] = 0;
+
+ num_cpus = sysconf(_SC_NPROCESSORS_ONLN);
+ for (i = 0; i < num_cpus; i++) {
+ dprintf(fd, "processor\t: %d\n", i);
+ dprintf(fd, "hart\t\t: %d\n", i);
+ dprintf(fd, "isa\t\t: %s\n", isa);
+#if defined(TARGET_RISCV32)
+ dprintf(fd, "mmu\t\t: sv32\n");
+#endif
+#if defined(TARGET_RISCV64)
+ dprintf(fd, "mmu\t\t: sv57\n");
+#endif
+ dprintf(fd, "mvendorid\t: 0x0\n");
+ dprintf(fd, "marchid\t\t: 0x0\n");
+ dprintf(fd, "mimpid\t\t: 0x0\n\n");
+ }
+ return 0;
+}
+#endif
+
#if defined(TARGET_M68K)
static int open_hardware(CPUArchState *cpu_env, int fd)
{
@@ -8333,7 +8384,7 @@ static int do_openat(CPUArchState *cpu_env, int dirfd, const char *pathname, int
#if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN
{ "/proc/net/route", open_net_route, is_proc },
#endif
-#if defined(TARGET_SPARC) || defined(TARGET_HPPA)
+#if defined(TARGET_SPARC) || defined(TARGET_HPPA) || defined(TARGET_RISCV)
{ "/proc/cpuinfo", open_cpuinfo, is_proc },
#endif
#if defined(TARGET_M68K)
--
2.40.1
--
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] linux-user: Add /proc/cpuinfo handler for RISC-V
2023-05-03 11:20 [PATCH v2] linux-user: Add /proc/cpuinfo handler for RISC-V Andreas Schwab
@ 2023-05-03 15:01 ` Palmer Dabbelt
0 siblings, 0 replies; 2+ messages in thread
From: Palmer Dabbelt @ 2023-05-03 15:01 UTC (permalink / raw)
To: schwab; +Cc: laurent, qemu-devel
On Wed, 03 May 2023 04:20:09 PDT (-0700), schwab@suse.de wrote:
> Signed-off-by: Andreas Schwab <schwab@suse.de>
> ---
> v2: dynmically compute the isa string
>
> linux-user/syscall.c | 55 ++++++++++++++++++++++++++++++++++++++++++--
> 1 file changed, 53 insertions(+), 2 deletions(-)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 69f740ff98..6df138c8b6 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -8231,7 +8231,8 @@ void target_exception_dump(CPUArchState *env, const char *fmt, int code)
> }
>
> #if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN || \
> - defined(TARGET_SPARC) || defined(TARGET_M68K) || defined(TARGET_HPPA)
> + defined(TARGET_SPARC) || defined(TARGET_M68K) || defined(TARGET_HPPA) || \
> + defined(TARGET_RISCV)
> static int is_proc(const char *filename, const char *entry)
> {
> return strcmp(filename, entry) == 0;
> @@ -8309,6 +8310,56 @@ static int open_cpuinfo(CPUArchState *cpu_env, int fd)
> }
> #endif
>
> +#if defined(TARGET_RISCV)
> +static int open_cpuinfo(CPUArchState *cpu_env, int fd)
> +{
> + int i, num_cpus;
> + char isa[32];
> +
> +#if defined(TARGET_RISCV32)
> + strcpy (isa, "rv32");
> +#endif
> +#if defined(TARGET_RISCV64)
> + strcpy (isa, "rv64");
> +#endif
> + i = strlen (isa);
> + if (riscv_has_ext (cpu_env, RVI))
> + isa[i++] = 'i';
> + if (riscv_has_ext (cpu_env, RVE))
> + isa[i++] = 'e';
> + if (riscv_has_ext (cpu_env, RVM))
> + isa[i++] = 'm';
> + if (riscv_has_ext (cpu_env, RVA))
> + isa[i++] = 'a';
> + if (riscv_has_ext (cpu_env, RVF))
> + isa[i++] = 'f';
> + if (riscv_has_ext (cpu_env, RVD))
> + isa[i++] = 'd';
> + if (riscv_has_ext (cpu_env, RVV))
> + isa[i++] = 'v';
> + if (riscv_has_ext (cpu_env, RVC))
> + isa[i++] = 'c';
Oddly enough, pretty much the only "must" in the ISA string rules is the
ordering of extensions and it's C before V
\caption{Standard ISA extension names. The table also defines the
canonical order in which extension names must appear in the name
string, with top-to-bottom in table indicating first-to-last in the
name string, e.g., RV32IMACV is legal, whereas RV32IMAVC is not.}
I guess that assumes figure captions are normative? I'm not sure we get
into that level of detail, though.
> + isa[i] = 0;
> +
> + num_cpus = sysconf(_SC_NPROCESSORS_ONLN);
> + for (i = 0; i < num_cpus; i++) {
> + dprintf(fd, "processor\t: %d\n", i);
> + dprintf(fd, "hart\t\t: %d\n", i);
> + dprintf(fd, "isa\t\t: %s\n", isa);
> +#if defined(TARGET_RISCV32)
> + dprintf(fd, "mmu\t\t: sv32\n");
> +#endif
> +#if defined(TARGET_RISCV64)
> + dprintf(fd, "mmu\t\t: sv57\n");
> +#endif
> + dprintf(fd, "mvendorid\t: 0x0\n");
> + dprintf(fd, "marchid\t\t: 0x0\n");
> + dprintf(fd, "mimpid\t\t: 0x0\n\n");
> + }
> + return 0;
> +}
> +#endif
> +
> #if defined(TARGET_M68K)
> static int open_hardware(CPUArchState *cpu_env, int fd)
> {
> @@ -8333,7 +8384,7 @@ static int do_openat(CPUArchState *cpu_env, int dirfd, const char *pathname, int
> #if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN
> { "/proc/net/route", open_net_route, is_proc },
> #endif
> -#if defined(TARGET_SPARC) || defined(TARGET_HPPA)
> +#if defined(TARGET_SPARC) || defined(TARGET_HPPA) || defined(TARGET_RISCV)
> { "/proc/cpuinfo", open_cpuinfo, is_proc },
> #endif
> #if defined(TARGET_M68K)
Aside from that,
Reviewed-by: Palmer Dabbelt <palmer@rivosinc.com>
Thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-05-03 15:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-03 11:20 [PATCH v2] linux-user: Add /proc/cpuinfo handler for RISC-V Andreas Schwab
2023-05-03 15:01 ` Palmer Dabbelt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).