| Message ID | mvmednx301n.fsf@suse.de |
|---|---|
| State | New |
| Headers | show |
| Series | [v3] linux-user: Add /proc/cpuinfo handler for RISC-V | expand |
On Wed, 03 May 2023 08:30:12 PDT (-0700), schwab@suse.de wrote: > From 912af433fa5d93ce81d2054135ed475ab7462d2d Mon Sep 17 00:00:00 2001 > From: Andreas Schwab <schwab@suse.de> > Date: Tue, 18 Apr 2023 11:54:01 +0200 > > Signed-off-by: Andreas Schwab <schwab@suse.de> > --- > v3: fix isa order > > 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..5207259b56 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, RVC)) > + isa[i++] = 'c'; > + if (riscv_has_ext (cpu_env, RVV)) > + isa[i++] = 'v'; > + 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) Reviewed-by: Palmer Dabbelt <palmer@rivosinc.com> Thanks!
Le 03/05/2023 à 17:34, Palmer Dabbelt a écrit : > On Wed, 03 May 2023 08:30:12 PDT (-0700), schwab@suse.de wrote: >> From 912af433fa5d93ce81d2054135ed475ab7462d2d Mon Sep 17 00:00:00 2001 >> From: Andreas Schwab <schwab@suse.de> >> Date: Tue, 18 Apr 2023 11:54:01 +0200 >> >> Signed-off-by: Andreas Schwab <schwab@suse.de> >> --- >> v3: fix isa order >> >> 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..5207259b56 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, RVC)) >> + isa[i++] = 'c'; >> + if (riscv_has_ext (cpu_env, RVV)) >> + isa[i++] = 'v'; >> + 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) > > Reviewed-by: Palmer Dabbelt <palmer@rivosinc.com> > > Thanks! > In my linux-user branch I have already queued: [PATCH qemu v2] linux-user: Emulate /proc/cpuinfo output for riscv https://patchew.org/QEMU/167873059442.9885.15152085316575248452-0@git.sr.ht/ IS this one better? Thanks, Laurent
On Mai 05 2023, Laurent Vivier wrote: > [PATCH qemu v2] linux-user: Emulate /proc/cpuinfo output for riscv > https://patchew.org/QEMU/167873059442.9885.15152085316575248452-0@git.sr.ht/ This looks better. You can drop my patch.
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 69f740ff98..5207259b56 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, RVC)) + isa[i++] = 'c'; + if (riscv_has_ext (cpu_env, RVV)) + isa[i++] = 'v'; + 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)