[S390] Add new fields for System z10 to /proc/sysinfo

Add permanent and temporary model capacity and the corresponding
capacity value fields for the three capacity identifiers to the
output of /proc/sysinfo.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>

diff --git a/drivers/s390/sysinfo.c b/drivers/s390/sysinfo.c
index 43fffa3..c3e4ab0 100644 (file)
--- a/drivers/s390/sysinfo.c
+++ b/drivers/s390/sysinfo.c
@@ -35,6 +35,8 @@ static int stsi_1_1_1(struct sysinfo_1_1_1 *info, char *page, int len)
        EBCASC(info->sequence, sizeof(info->sequence));
        EBCASC(info->plant, sizeof(info->plant));
        EBCASC(info->model_capacity, sizeof(info->model_capacity));
+       EBCASC(info->model_perm_cap, sizeof(info->model_perm_cap));
+       EBCASC(info->model_temp_cap, sizeof(info->model_temp_cap));
        len += sprintf(page + len, "Manufacturer:         %-16.16s\n",
                       info->manufacturer);
        len += sprintf(page + len, "Type:                 %-4.4s\n",
@@ -57,8 +59,18 @@ static int stsi_1_1_1(struct sysinfo_1_1_1 *info, char *page, int len)
                       info->sequence);
        len += sprintf(page + len, "Plant:                %-4.4s\n",
                       info->plant);
-       len += sprintf(page + len, "Model Capacity:       %-16.16s\n",
-                      info->model_capacity);
+       len += sprintf(page + len, "Model Capacity:       %-16.16s %08u\n",
+                      info->model_capacity, *(u32 *) info->model_cap_rating);
+       if (info->model_perm_cap[0] != '\0')
+               len += sprintf(page + len,
+                              "Model Perm. Capacity: %-16.16s %08u\n",
+                              info->model_perm_cap,
+                              *(u32 *) info->model_perm_cap_rating);
+       if (info->model_temp_cap[0] != '\0')
+               len += sprintf(page + len,
+                              "Model Temp. Capacity: %-16.16s %08u\n",
+                              info->model_temp_cap,
+                              *(u32 *) info->model_temp_cap_rating);
        return len;
 }
 

diff --git a/include/asm-s390/sysinfo.h b/include/asm-s390/sysinfo.h
index 014f2a2..abe10ae 100644 (file)
--- a/include/asm-s390/sysinfo.h
+++ b/include/asm-s390/sysinfo.h
@@ -20,6 +20,11 @@ struct sysinfo_1_1_1 {
        char sequence[16];
        char plant[4];
        char model[16];
+       char model_perm_cap[16];
+       char model_temp_cap[16];
+       char model_cap_rating[4];
+       char model_perm_cap_rating[4];
+       char model_temp_cap_rating[4];
 };
 
 struct sysinfo_1_2_1 {