Commit 58921443 authored by Ahmed S. Darwish's avatar Ahmed S. Darwish Committed by Thomas Gleixner

tools/x86/kcpuid: Parse subleaf ranges if provided

It's a common pattern in cpuid leaves to have the same bitfields format
repeated across a number of subleaves.  Typically, this is used for
enumerating hierarchial structures like cache and TLB levels, CPU
topology levels, etc.

Modify kcpuid.c to handle subleaf ranges in the CSV file subleaves
column.  For example, make it able to parse lines in the form:

 # LEAF, SUBLEAVES,  reg,    bits,    short_name             , ...
    0xb,       1:0,  eax,     4:0,    x2apic_id_shift        , ...
    0xb,       1:0,  ebx,    15:0,    domain_lcpus_count     , ...
    0xb,       1:0,  ecx,     7:0,    domain_nr              , ...

This way, full output can be printed to the user.
Signed-off-by: default avatarAhmed S. Darwish <darwi@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20240718134755.378115-8-darwi@linutronix.de
parent b0a59d14
...@@ -305,6 +305,8 @@ static int parse_line(char *line) ...@@ -305,6 +305,8 @@ static int parse_line(char *line)
struct bits_desc *bdesc; struct bits_desc *bdesc;
int reg_index; int reg_index;
char *start, *end; char *start, *end;
u32 subleaf_start, subleaf_end;
unsigned bit_start, bit_end;
/* Skip comments and NULL line */ /* Skip comments and NULL line */
if (line[0] == '#' || line[0] == '\n') if (line[0] == '#' || line[0] == '\n')
...@@ -343,13 +345,25 @@ static int parse_line(char *line) ...@@ -343,13 +345,25 @@ static int parse_line(char *line)
return 0; return 0;
/* subleaf */ /* subleaf */
sub = strtoul(tokens[1], NULL, 0); buf = tokens[1];
if ((int)sub > func->nr) end = strtok(buf, ":");
return -1; start = strtok(NULL, ":");
subleaf_end = strtoul(end, NULL, 0);
/* A subleaf range is given? */
if (start) {
subleaf_start = strtoul(start, NULL, 0);
subleaf_end = min(subleaf_end, (u32)(func->nr - 1));
if (subleaf_start > subleaf_end)
return 0;
} else {
subleaf_start = subleaf_end;
if (subleaf_start > (u32)(func->nr - 1))
return 0;
}
leaf = &func->leafs[sub]; /* register */
buf = tokens[2]; buf = tokens[2];
if (strcasestr(buf, "EAX")) if (strcasestr(buf, "EAX"))
reg_index = R_EAX; reg_index = R_EAX;
else if (strcasestr(buf, "EBX")) else if (strcasestr(buf, "EBX"))
...@@ -361,23 +375,23 @@ static int parse_line(char *line) ...@@ -361,23 +375,23 @@ static int parse_line(char *line)
else else
goto err_exit; goto err_exit;
reg = &leaf->info[reg_index];
bdesc = &reg->descs[reg->nr++];
/* bit flag or bits field */ /* bit flag or bits field */
buf = tokens[3]; buf = tokens[3];
end = strtok(buf, ":"); end = strtok(buf, ":");
bdesc->end = strtoul(end, NULL, 0);
bdesc->start = bdesc->end;
/* start != NULL means it is bit fields */
start = strtok(NULL, ":"); start = strtok(NULL, ":");
if (start) bit_end = strtoul(end, NULL, 0);
bdesc->start = strtoul(start, NULL, 0); bit_start = (start) ? strtoul(start, NULL, 0) : bit_end;
strcpy(bdesc->simp, strtok(tokens[4], " \t")); for (sub = subleaf_start; sub <= subleaf_end; sub++) {
strcpy(bdesc->detail, tokens[5]); leaf = &func->leafs[sub];
reg = &leaf->info[reg_index];
bdesc = &reg->descs[reg->nr++];
bdesc->end = bit_end;
bdesc->start = bit_start;
strcpy(bdesc->simp, strtok(tokens[4], " \t"));
strcpy(bdesc->detail, tokens[5]);
}
return 0; return 0;
err_exit: err_exit:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment