TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s390/sysinfo: add variable capacity information

Browse Source 
If available, add machine variable capacity information to /proc/sysinfo

Acked-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
This commit is contained in:
Vasily Gorbik
2022-01-19 23:44:32 +01:00
committed by Alexander Gordeev
parent 98b1cc82c4
commit d12292fdea
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/s390/include/asm/sysinfo.h
+4
View File
@@ -40,6 +40,10 @@ struct sysinfo_1_1_1 {
unsigned int ncr; unsigned int ncr;
unsigned int npr; unsigned int npr;
unsigned int ntr; unsigned int ntr;
char reserved_3[4];
char model_var_cap[16];
unsigned int model_var_cap_rating;
unsigned int nvr;
}; };
struct sysinfo_1_2_1 { struct sysinfo_1_2_1 {
arch/s390/kernel/sysinfo.c
+10
View File
@@ -81,10 +81,12 @@ static bool convert_ext_name(unsigned char encoding, char *name, size_t len)
static void stsi_1_1_1(struct seq_file *m, struct sysinfo_1_1_1 *info) static void stsi_1_1_1(struct seq_file *m, struct sysinfo_1_1_1 *info)
{ {
bool has_var_cap;
int i; int i;
if (stsi(info, 1, 1, 1)) if (stsi(info, 1, 1, 1))
return; return;
has_var_cap = !!info->model_var_cap[0];
EBCASC(info->manufacturer, sizeof(info->manufacturer)); EBCASC(info->manufacturer, sizeof(info->manufacturer));
EBCASC(info->type, sizeof(info->type)); EBCASC(info->type, sizeof(info->type));
EBCASC(info->model, sizeof(info->model)); EBCASC(info->model, sizeof(info->model));
@@ -93,6 +95,8 @@ static void stsi_1_1_1(struct seq_file *m, struct sysinfo_1_1_1 *info)
EBCASC(info->model_capacity, sizeof(info->model_capacity)); EBCASC(info->model_capacity, sizeof(info->model_capacity));
EBCASC(info->model_perm_cap, sizeof(info->model_perm_cap)); EBCASC(info->model_perm_cap, sizeof(info->model_perm_cap));
EBCASC(info->model_temp_cap, sizeof(info->model_temp_cap)); EBCASC(info->model_temp_cap, sizeof(info->model_temp_cap));
if (has_var_cap)
EBCASC(info->model_var_cap, sizeof(info->model_var_cap));
seq_printf(m, "Manufacturer: %-16.16s\n", info->manufacturer); seq_printf(m, "Manufacturer: %-16.16s\n", info->manufacturer);
seq_printf(m, "Type: %-4.4s\n", info->type); seq_printf(m, "Type: %-4.4s\n", info->type);
if (info->lic) if (info->lic)
@@ -120,12 +124,18 @@ static void stsi_1_1_1(struct seq_file *m, struct sysinfo_1_1_1 *info)
seq_printf(m, "Model Temp. Capacity: %-16.16s %08u\n", seq_printf(m, "Model Temp. Capacity: %-16.16s %08u\n",
info->model_temp_cap, info->model_temp_cap,
info->model_temp_cap_rating); info->model_temp_cap_rating);
if (has_var_cap && info->model_var_cap_rating)
seq_printf(m, "Model Var. Capacity: %-16.16s %08u\n",
info->model_var_cap,
info->model_var_cap_rating);
if (info->ncr) if (info->ncr)
seq_printf(m, "Nominal Cap. Rating: %08u\n", info->ncr); seq_printf(m, "Nominal Cap. Rating: %08u\n", info->ncr);
if (info->npr) if (info->npr)
seq_printf(m, "Nominal Perm. Rating: %08u\n", info->npr); seq_printf(m, "Nominal Perm. Rating: %08u\n", info->npr);
if (info->ntr) if (info->ntr)
seq_printf(m, "Nominal Temp. Rating: %08u\n", info->ntr); seq_printf(m, "Nominal Temp. Rating: %08u\n", info->ntr);
if (has_var_cap && info->nvr)
seq_printf(m, "Nominal Var. Rating: %08u\n", info->nvr);
if (info->cai) { if (info->cai) {
seq_printf(m, "Capacity Adj. Ind.: %d\n", info->cai); seq_printf(m, "Capacity Adj. Ind.: %d\n", info->cai);
seq_printf(m, "Capacity Ch. Reason: %d\n", info->ccr); seq_printf(m, "Capacity Ch. Reason: %d\n", info->ccr);