mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-08-17 06:47:39 +00:00
494c403ff1
On ARM the cpuid is dependent on the core type of the CPU in question. The PMU was passed for the sake of the CPU map but this means in places a temporary PMU is created just to pass a CPU value. Just pass the CPU and fix up the callers. As there are no longer PMU users in header.h, shuffle forward declarations earlier to work around build failures. Reviewed-by: James Clark <james.clark@linaro.org> Signed-off-by: Ian Rogers <irogers@google.com> Tested-by: Xu Yang <xu.yang_2@nxp.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Albert Ou <aou@eecs.berkeley.edu> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Alexandre Ghiti <alexghiti@rivosinc.com> Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com> Cc: Ben Zong-You Xie <ben717@andestech.com> Cc: Benjamin Gray <bgray@linux.ibm.com> Cc: Bibo Mao <maobibo@loongson.cn> Cc: Clément Le Goffic <clement.legoffic@foss.st.com> Cc: Dima Kogan <dima@secretsauce.net> Cc: Dr. David Alan Gilbert <linux@treblig.org> Cc: Huacai Chen <chenhuacai@kernel.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: John Garry <john.g.garry@oracle.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Leo Yan <leo.yan@linux.dev> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Mike Leach <mike.leach@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Palmer Dabbelt <palmer@dabbelt.com> Cc: Paul Walmsley <paul.walmsley@sifive.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ravi Bangoria <ravi.bangoria@amd.com> Cc: Sandipan Das <sandipan.das@amd.com> Cc: Will Deacon <will@kernel.org> Cc: Yicong Yang <yangyicong@hisilicon.com> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-riscv@lists.infradead.org Link: https://lore.kernel.org/r/20241107162035.52206-7-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
105 lines
1.9 KiB
C
105 lines
1.9 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Implementation of get_cpuid().
|
|
*
|
|
* Author: Nikita Shubin <n.shubin@yadro.com>
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <api/fs/fs.h>
|
|
#include <errno.h>
|
|
#include "../../util/debug.h"
|
|
#include "../../util/header.h"
|
|
|
|
#define CPUINFO_MVEN "mvendorid"
|
|
#define CPUINFO_MARCH "marchid"
|
|
#define CPUINFO_MIMP "mimpid"
|
|
#define CPUINFO "/proc/cpuinfo"
|
|
|
|
static char *_get_field(const char *line)
|
|
{
|
|
char *line2, *nl;
|
|
|
|
line2 = strrchr(line, ' ');
|
|
if (!line2)
|
|
return NULL;
|
|
|
|
line2++;
|
|
nl = strrchr(line, '\n');
|
|
if (!nl)
|
|
return NULL;
|
|
|
|
return strndup(line2, nl - line2);
|
|
}
|
|
|
|
static char *_get_cpuid(void)
|
|
{
|
|
char *line = NULL;
|
|
char *mvendorid = NULL;
|
|
char *marchid = NULL;
|
|
char *mimpid = NULL;
|
|
char *cpuid = NULL;
|
|
int read;
|
|
size_t line_sz;
|
|
FILE *cpuinfo;
|
|
|
|
cpuinfo = fopen(CPUINFO, "r");
|
|
if (cpuinfo == NULL)
|
|
return cpuid;
|
|
|
|
while ((read = getline(&line, &line_sz, cpuinfo)) != -1) {
|
|
if (!strncmp(line, CPUINFO_MVEN, strlen(CPUINFO_MVEN))) {
|
|
mvendorid = _get_field(line);
|
|
if (!mvendorid)
|
|
goto free;
|
|
} else if (!strncmp(line, CPUINFO_MARCH, strlen(CPUINFO_MARCH))) {
|
|
marchid = _get_field(line);
|
|
if (!marchid)
|
|
goto free;
|
|
} else if (!strncmp(line, CPUINFO_MIMP, strlen(CPUINFO_MIMP))) {
|
|
mimpid = _get_field(line);
|
|
if (!mimpid)
|
|
goto free;
|
|
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (!mvendorid || !marchid || !mimpid)
|
|
goto free;
|
|
|
|
if (asprintf(&cpuid, "%s-%s-%s", mvendorid, marchid, mimpid) < 0)
|
|
cpuid = NULL;
|
|
|
|
free:
|
|
fclose(cpuinfo);
|
|
free(mvendorid);
|
|
free(marchid);
|
|
free(mimpid);
|
|
|
|
return cpuid;
|
|
}
|
|
|
|
int get_cpuid(char *buffer, size_t sz, struct perf_cpu cpu __maybe_unused)
|
|
{
|
|
char *cpuid = _get_cpuid();
|
|
int ret = 0;
|
|
|
|
if (sz < strlen(cpuid)) {
|
|
ret = -EINVAL;
|
|
goto free;
|
|
}
|
|
|
|
scnprintf(buffer, sz, "%s", cpuid);
|
|
free:
|
|
free(cpuid);
|
|
return ret;
|
|
}
|
|
|
|
char *
|
|
get_cpuid_str(struct perf_cpu cpu __maybe_unused)
|
|
{
|
|
return _get_cpuid();
|
|
}
|