| Message ID | 20230601162541.689621-4-iii@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | linux-user: Emulate /proc/cpuinfo on s390x | expand |
On 01.06.23 18:25, Ilya Leoshkevich wrote: > It is required for implementing /proc/cpuinfo emulation. > > Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> > --- > linux-user/elfload.c | 27 +++++++++++++++++++++++++++ > linux-user/loader.h | 1 + > 2 files changed, 28 insertions(+) > > diff --git a/linux-user/elfload.c b/linux-user/elfload.c > index 49ec9ccc944..d80d68484b6 100644 > --- a/linux-user/elfload.c > +++ b/linux-user/elfload.c > @@ -1605,6 +1605,33 @@ uint32_t get_elf_hwcap(void) > return hwcap; > } > > +const char *elf_hwcap_str(uint32_t bit) > +{ > + static const char *hwcap_str[] = { > + [HWCAP_S390_ESAN3] = "esan3", > + [HWCAP_S390_ZARCH] = "zarch", > + [HWCAP_S390_STFLE] = "stfle", > + [HWCAP_S390_MSA] = "msa", > + [HWCAP_S390_LDISP] = "ldisp", > + [HWCAP_S390_EIMM] = "eimm", > + [HWCAP_S390_DFP] = "dfp", > + [HWCAP_S390_HPAGE] = "edat", > + [HWCAP_S390_ETF3EH] = "etf3eh", > + [HWCAP_S390_HIGH_GPRS] = "highgprs", > + [HWCAP_S390_TE] = "te", > + [HWCAP_S390_VXRS] = "vx", > + [HWCAP_S390_VXRS_BCD] = "vxd", > + [HWCAP_S390_VXRS_EXT] = "vxe", > + [HWCAP_S390_GS] = "gs", > + [HWCAP_S390_VXRS_EXT2] = "vxe2", > + [HWCAP_S390_VXRS_PDE] = "vxp", > + [HWCAP_S390_SORT] = "sort", > + [HWCAP_S390_DFLT] = "dflt", > + }; > + > + return bit < ARRAY_SIZE(hwcap_str) ? hwcap_str[bit] : NULL; > +} > + > static inline void init_thread(struct target_pt_regs *regs, struct image_info *infop) > { > regs->psw.addr = infop->entry; > diff --git a/linux-user/loader.h b/linux-user/loader.h > index ad6ca9dbe35..59cbeacf24f 100644 > --- a/linux-user/loader.h > +++ b/linux-user/loader.h > @@ -58,6 +58,7 @@ extern unsigned long guest_stack_size; > > #ifdef TARGET_S390X > uint32_t get_elf_hwcap(void); > +const char *elf_hwcap_str(uint32_t bit); > #endif > > #endif /* LINUX_USER_LOADER_H */ Reviewed-by: David Hildenbrand <david@redhat.com>
diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 49ec9ccc944..d80d68484b6 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1605,6 +1605,33 @@ uint32_t get_elf_hwcap(void) return hwcap; } +const char *elf_hwcap_str(uint32_t bit) +{ + static const char *hwcap_str[] = { + [HWCAP_S390_ESAN3] = "esan3", + [HWCAP_S390_ZARCH] = "zarch", + [HWCAP_S390_STFLE] = "stfle", + [HWCAP_S390_MSA] = "msa", + [HWCAP_S390_LDISP] = "ldisp", + [HWCAP_S390_EIMM] = "eimm", + [HWCAP_S390_DFP] = "dfp", + [HWCAP_S390_HPAGE] = "edat", + [HWCAP_S390_ETF3EH] = "etf3eh", + [HWCAP_S390_HIGH_GPRS] = "highgprs", + [HWCAP_S390_TE] = "te", + [HWCAP_S390_VXRS] = "vx", + [HWCAP_S390_VXRS_BCD] = "vxd", + [HWCAP_S390_VXRS_EXT] = "vxe", + [HWCAP_S390_GS] = "gs", + [HWCAP_S390_VXRS_EXT2] = "vxe2", + [HWCAP_S390_VXRS_PDE] = "vxp", + [HWCAP_S390_SORT] = "sort", + [HWCAP_S390_DFLT] = "dflt", + }; + + return bit < ARRAY_SIZE(hwcap_str) ? hwcap_str[bit] : NULL; +} + static inline void init_thread(struct target_pt_regs *regs, struct image_info *infop) { regs->psw.addr = infop->entry; diff --git a/linux-user/loader.h b/linux-user/loader.h index ad6ca9dbe35..59cbeacf24f 100644 --- a/linux-user/loader.h +++ b/linux-user/loader.h @@ -58,6 +58,7 @@ extern unsigned long guest_stack_size; #ifdef TARGET_S390X uint32_t get_elf_hwcap(void); +const char *elf_hwcap_str(uint32_t bit); #endif #endif /* LINUX_USER_LOADER_H */
It is required for implementing /proc/cpuinfo emulation. Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> --- linux-user/elfload.c | 27 +++++++++++++++++++++++++++ linux-user/loader.h | 1 + 2 files changed, 28 insertions(+)