mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +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>
80 lines
1.9 KiB
C
80 lines
1.9 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <sys/types.h>
|
|
#include <errno.h>
|
|
#include <unistd.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <linux/stringify.h>
|
|
#include "header.h"
|
|
#include "utils_header.h"
|
|
#include "metricgroup.h"
|
|
#include <api/fs/fs.h>
|
|
#include <sys/auxv.h>
|
|
|
|
static bool is_compat_mode(void)
|
|
{
|
|
u64 base_platform = getauxval(AT_BASE_PLATFORM);
|
|
u64 platform = getauxval(AT_PLATFORM);
|
|
|
|
if (!strcmp((char *)platform, (char *)base_platform))
|
|
return false;
|
|
|
|
return true;
|
|
}
|
|
|
|
int
|
|
get_cpuid(char *buffer, size_t sz, struct perf_cpu cpu __maybe_unused)
|
|
{
|
|
unsigned long pvr;
|
|
int nb;
|
|
|
|
pvr = mfspr(SPRN_PVR);
|
|
|
|
nb = scnprintf(buffer, sz, "%lu,%lu$", PVR_VER(pvr), PVR_REV(pvr));
|
|
|
|
/* look for end marker to ensure the entire data fit */
|
|
if (strchr(buffer, '$')) {
|
|
buffer[nb-1] = '\0';
|
|
return 0;
|
|
}
|
|
return ENOBUFS;
|
|
}
|
|
|
|
char *
|
|
get_cpuid_str(struct perf_cpu cpu __maybe_unused)
|
|
{
|
|
char *bufp;
|
|
unsigned long pvr;
|
|
|
|
/*
|
|
* IBM Power System supports compatible mode. That is
|
|
* Nth generation platform can support previous generation
|
|
* OS in a mode called compatibile mode. For ex. LPAR can be
|
|
* booted in a Power9 mode when the system is a Power10.
|
|
*
|
|
* In the compatible mode, care must be taken when generating
|
|
* PVR value. When read, PVR will be of the AT_BASE_PLATFORM
|
|
* To support generic events, return 0x00ffffff as pvr when
|
|
* booted in compat mode. Based on this pvr value, json will
|
|
* pick events from pmu-events/arch/powerpc/compat
|
|
*/
|
|
if (!is_compat_mode())
|
|
pvr = mfspr(SPRN_PVR);
|
|
else
|
|
pvr = 0x00ffffff;
|
|
|
|
if (asprintf(&bufp, "0x%.8lx", pvr) < 0)
|
|
bufp = NULL;
|
|
|
|
return bufp;
|
|
}
|
|
|
|
int arch_get_runtimeparam(const struct pmu_metric *pm)
|
|
{
|
|
int count;
|
|
char path[PATH_MAX] = "/devices/hv_24x7/interface/";
|
|
|
|
strcat(path, pm->aggr_mode == PerChip ? "sockets" : "coresperchip");
|
|
return sysfs__read_int(path, &count) < 0 ? 1 : count;
|
|
}
|