2 files changed, 27 insertions, 13 deletions

diff --git a/arch/s390/include/asm/sysinfo.h b/arch/s390/include/asm/sysinfo.h
index 2728114d5484..229326c942c7 100644
--- a/arch/s390/include/asm/sysinfo.h
+++ b/arch/s390/include/asm/sysinfo.h
@@ -107,6 +107,11 @@ struct sysinfo_2_2_2 {
         char reserved_3[5];
         unsigned short cpus_dedicated;
         unsigned short cpus_shared;
+        char reserved_4[3];
+        unsigned char vsne;
+        uuid_be uuid;
+        char reserved_5[160];
+        char ext_name[256];
 };
 
 #define LPAR_CHAR_DEDICATED     (1 << 7)
@@ -127,7 +132,7 @@ struct sysinfo_3_2_2 {
                 unsigned int caf;
                 char cpi[16];
                 char reserved_1[3];
-                char ext_name_encoding;
+                unsigned char evmne;
                 unsigned int reserved_2;
                 uuid_be uuid;
         } vm[8];
diff --git a/arch/s390/kernel/sysinfo.c b/arch/s390/kernel/sysinfo.c
index bfda6aa40280..24021c1e3ecb 100644
--- a/arch/s390/kernel/sysinfo.c
+++ b/arch/s390/kernel/sysinfo.c
@@ -56,6 +56,20 @@ int stsi(void *sysinfo, int fc, int sel1, int sel2)
 }
 EXPORT_SYMBOL(stsi);
 
+static bool convert_ext_name(unsigned char encoding, char *name, size_t len)
+{
+        switch (encoding) {
+        case 1: /* EBCDIC */
+                EBCASC(name, len);
+                break;
+        case 2: /* UTF-8 */
+                break;
+        default:
+                return false;
+        }
+        return true;
+}
+
 static void stsi_1_1_1(struct seq_file *m, struct sysinfo_1_1_1 *info)
 {
         int i;
@@ -207,24 +221,19 @@ static void stsi_2_2_2(struct seq_file *m, struct sysinfo_2_2_2 *info)
                 seq_printf(m, "LPAR CPUs S-MTID:     %d\n", info->mt_stid);
                 seq_printf(m, "LPAR CPUs PS-MTID:    %d\n", info->mt_psmtid);
         }
+        if (convert_ext_name(info->vsne, info->ext_name, sizeof(info->ext_name))) {
+                seq_printf(m, "LPAR Extended Name:   %-.256s\n", info->ext_name);
+                seq_printf(m, "LPAR UUID:            %pUb\n", &info->uuid);
+        }
 }
 
 static void print_ext_name(struct seq_file *m, int lvl,
                            struct sysinfo_3_2_2 *info)
 {
-        if (info->vm[lvl].ext_name_encoding == 0)
-                return;
-        if (info->ext_names[lvl][0] == 0)
-                return;
-        switch (info->vm[lvl].ext_name_encoding) {
-        case 1: /* EBCDIC */
-                EBCASC(info->ext_names[lvl], sizeof(info->ext_names[lvl]));
-                break;
-        case 2: /* UTF-8 */
-                break;
-        default:
+        size_t len = sizeof(info->ext_names[lvl]);
+
+        if (!convert_ext_name(info->vm[lvl].evmne, info->ext_names[lvl], len))
                 return;
-        }
         seq_printf(m, "VM%02d Extended Name:   %-.256s\n", lvl,
                    info->ext_names[lvl]);
 }