Commit-ID: c59124fa59757fadc80ad881056a21f98c71b146 Gitweb: https://git.kernel.org/tip/c59124fa59757fadc80ad881056a21f98c71b146 Author: Thomas Richter <tmri...@linux.vnet.ibm.com> AuthorDate: Tue, 13 Feb 2018 16:14:17 +0100 Committer: Arnaldo Carvalho de Melo <a...@redhat.com> CommitDate: Fri, 16 Feb 2018 15:16:57 -0300
perf annotate: Scan cpuid for s390 and save machine type Scan the cpuid string and extract the type number for later use. Signed-off-by: Thomas Richter <tmri...@linux.vnet.ibm.com> Reviewed-by: Hendrik Brueckner <brueck...@linux.vnet.ibm.com> Cc: Heiko Carstens <heiko.carst...@de.ibm.com> Cc: Martin Schwidefsky <schwidef...@de.ibm.com> Link: http://lkml.kernel.org/r/20180213151419.80737-2-tmri...@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- tools/perf/arch/s390/annotate/instructions.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/tools/perf/arch/s390/annotate/instructions.c b/tools/perf/arch/s390/annotate/instructions.c index 8c72b44..01df9d8 100644 --- a/tools/perf/arch/s390/annotate/instructions.c +++ b/tools/perf/arch/s390/annotate/instructions.c @@ -23,12 +23,37 @@ static struct ins_ops *s390__associate_ins_ops(struct arch *arch, const char *na return ops; } +static int s390__cpuid_parse(struct arch *arch, char *cpuid) +{ + unsigned int family; + char model[16], model_c[16], cpumf_v[16], cpumf_a[16]; + int ret; + + /* + * cpuid string format: + * "IBM,family,model-capacity,model[,cpum_cf-version,cpum_cf-authorization]" + */ + ret = sscanf(cpuid, "%*[^,],%u,%[^,],%[^,],%[^,],%s", &family, model_c, + model, cpumf_v, cpumf_a); + if (ret >= 2) { + arch->family = family; + arch->model = 0; + return 0; + } + + return -1; +} + static int s390__annotate_init(struct arch *arch, char *cpuid __maybe_unused) { + int err = 0; + if (!arch->initialized) { arch->initialized = true; arch->associate_instruction_ops = s390__associate_ins_ops; + if (cpuid) + err = s390__cpuid_parse(arch, cpuid); } - return 0; + return err; }
