mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
![Linus Torvalds](/assets/img/avatar_default.png)
* Improvements to the CPU topology subsystem, which fix some issues where RISC-V would report bad topology information. * The default NR_CPUS has increased to XLEN, and the maximum configurable value is 512. * The CD-ROM filesystems have been enabled in the defconfig. * Support for THP_SWAP has been added for rv64 systems. There are also a handful of cleanups and fixes throughout the tree. -----BEGIN PGP SIGNATURE----- iQJHBAABCAAxFiEEKzw3R0RoQ7JKlDp6LhMZ81+7GIkFAmNAWgwTHHBhbG1lckBk YWJiZWx0LmNvbQAKCRAuExnzX7sYicSiEACmuB9WuGZmAasKvmPgz7thyLqakg7/ cE4YK0MxgJxkhsXzYSAv1Fn+WUfX7DSzhK4OOM5wEngAYul7QoFdc84MF0DYKO+E InjdOvVavzUsWYqETNCuMHPRK6xyzvfHCqqBDDxKHx5jUoicCQfFwJyHLw+cvouR 7WSJoFdvOEV01QyN5Qw9bQp7ASx61ZZX1yE6OAPc2/EJlDEA2QSnjBAi4M+n2ZCx ZsQz+Dp9RfSU8/nIr13oGiL3Zm+kyXwdOS/8PaDqtrkyiGh6+vSeGqZZwRLVITP/ oUxqGEgnn2eFBD1y8vjsQNWMLWoi9Av4746Fxr8CEHX+jX1cp9CCkU2OkkLxaFcv 6XFtXPJIh/UjzVgPmjZxK+ArEX28QOM5IVyBFxsSl0dNtvyVqKpBXCV1RQ+fFHkO ntHF3ZxibqOn8ZJmziCn0nzWSOqugNTdAhD4dJAbl58RB/IQtQT0OnHpmpXCG3xh +/JBzy//xkr7u2HMqU69PzwPtWwZrENUV6jl5SHUDUoW8pySng2Pl4pbmTFqgWty JTfc5EdyWOWyshhoSCtK2//bnVFryl2ntwGr3LIZrZxkiUiOeYjn+C/YedXZIRob yy2CN+QanW/FXdIa4GMNeGc9sGDApd3/RtP+8L9mV1kWK6OE0EVskkI1UMCGXrIP 5JoE1jLMVhjcKQ== =LJg6 -----END PGP SIGNATURE----- Merge tag 'riscv-for-linus-6.1-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux Pull RISC-V updates from Palmer Dabbelt: - Improvements to the CPU topology subsystem, which fix some issues where RISC-V would report bad topology information. - The default NR_CPUS has increased to XLEN, and the maximum configurable value is 512. - The CD-ROM filesystems have been enabled in the defconfig. - Support for THP_SWAP has been added for rv64 systems. There are also a handful of cleanups and fixes throughout the tree. * tag 'riscv-for-linus-6.1-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux: riscv: enable THP_SWAP for RV64 RISC-V: Print SSTC in canonical order riscv: compat: s/failed/unsupported if compat mode isn't supported RISC-V: Increase range and default value of NR_CPUS cpuidle: riscv-sbi: Fix CPU_PM_CPU_IDLE_ENTER_xyz() macro usage perf: RISC-V: throttle perf events perf: RISC-V: exclude invalid pmu counters from SBI calls riscv: enable CD-ROM file systems in defconfig riscv: topology: fix default topology reporting arm64: topology: move store_cpu_topology() to shared code
142 lines
3.6 KiB
C
142 lines
3.6 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* RISC-V performance counter support.
|
|
*
|
|
* Copyright (C) 2021 Western Digital Corporation or its affiliates.
|
|
*
|
|
* This implementation is based on old RISC-V perf and ARM perf event code
|
|
* which are in turn based on sparc64 and x86 code.
|
|
*/
|
|
|
|
#include <linux/mod_devicetable.h>
|
|
#include <linux/perf/riscv_pmu.h>
|
|
#include <linux/platform_device.h>
|
|
|
|
#define RISCV_PMU_LEGACY_CYCLE 0
|
|
#define RISCV_PMU_LEGACY_INSTRET 1
|
|
|
|
static bool pmu_init_done;
|
|
|
|
static int pmu_legacy_ctr_get_idx(struct perf_event *event)
|
|
{
|
|
struct perf_event_attr *attr = &event->attr;
|
|
|
|
if (event->attr.type != PERF_TYPE_HARDWARE)
|
|
return -EOPNOTSUPP;
|
|
if (attr->config == PERF_COUNT_HW_CPU_CYCLES)
|
|
return RISCV_PMU_LEGACY_CYCLE;
|
|
else if (attr->config == PERF_COUNT_HW_INSTRUCTIONS)
|
|
return RISCV_PMU_LEGACY_INSTRET;
|
|
else
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
/* For legacy config & counter index are same */
|
|
static int pmu_legacy_event_map(struct perf_event *event, u64 *config)
|
|
{
|
|
return pmu_legacy_ctr_get_idx(event);
|
|
}
|
|
|
|
static u64 pmu_legacy_read_ctr(struct perf_event *event)
|
|
{
|
|
struct hw_perf_event *hwc = &event->hw;
|
|
int idx = hwc->idx;
|
|
u64 val;
|
|
|
|
if (idx == RISCV_PMU_LEGACY_CYCLE) {
|
|
val = riscv_pmu_ctr_read_csr(CSR_CYCLE);
|
|
if (IS_ENABLED(CONFIG_32BIT))
|
|
val = (u64)riscv_pmu_ctr_read_csr(CSR_CYCLEH) << 32 | val;
|
|
} else if (idx == RISCV_PMU_LEGACY_INSTRET) {
|
|
val = riscv_pmu_ctr_read_csr(CSR_INSTRET);
|
|
if (IS_ENABLED(CONFIG_32BIT))
|
|
val = ((u64)riscv_pmu_ctr_read_csr(CSR_INSTRETH)) << 32 | val;
|
|
} else
|
|
return 0;
|
|
|
|
return val;
|
|
}
|
|
|
|
static void pmu_legacy_ctr_start(struct perf_event *event, u64 ival)
|
|
{
|
|
struct hw_perf_event *hwc = &event->hw;
|
|
u64 initial_val = pmu_legacy_read_ctr(event);
|
|
|
|
/**
|
|
* The legacy method doesn't really have a start/stop method.
|
|
* It also can not update the counter with a initial value.
|
|
* But we still need to set the prev_count so that read() can compute
|
|
* the delta. Just use the current counter value to set the prev_count.
|
|
*/
|
|
local64_set(&hwc->prev_count, initial_val);
|
|
}
|
|
|
|
/*
|
|
* This is just a simple implementation to allow legacy implementations
|
|
* compatible with new RISC-V PMU driver framework.
|
|
* This driver only allows reading two counters i.e CYCLE & INSTRET.
|
|
* However, it can not start or stop the counter. Thus, it is not very useful
|
|
* will be removed in future.
|
|
*/
|
|
static void pmu_legacy_init(struct riscv_pmu *pmu)
|
|
{
|
|
pr_info("Legacy PMU implementation is available\n");
|
|
|
|
pmu->cmask = BIT(RISCV_PMU_LEGACY_CYCLE) |
|
|
BIT(RISCV_PMU_LEGACY_INSTRET);
|
|
pmu->ctr_start = pmu_legacy_ctr_start;
|
|
pmu->ctr_stop = NULL;
|
|
pmu->event_map = pmu_legacy_event_map;
|
|
pmu->ctr_get_idx = pmu_legacy_ctr_get_idx;
|
|
pmu->ctr_get_width = NULL;
|
|
pmu->ctr_clear_idx = NULL;
|
|
pmu->ctr_read = pmu_legacy_read_ctr;
|
|
|
|
perf_pmu_register(&pmu->pmu, "cpu", PERF_TYPE_RAW);
|
|
}
|
|
|
|
static int pmu_legacy_device_probe(struct platform_device *pdev)
|
|
{
|
|
struct riscv_pmu *pmu = NULL;
|
|
|
|
pmu = riscv_pmu_alloc();
|
|
if (!pmu)
|
|
return -ENOMEM;
|
|
pmu_legacy_init(pmu);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver pmu_legacy_driver = {
|
|
.probe = pmu_legacy_device_probe,
|
|
.driver = {
|
|
.name = RISCV_PMU_LEGACY_PDEV_NAME,
|
|
},
|
|
};
|
|
|
|
static int __init riscv_pmu_legacy_devinit(void)
|
|
{
|
|
int ret;
|
|
struct platform_device *pdev;
|
|
|
|
if (likely(pmu_init_done))
|
|
return 0;
|
|
|
|
ret = platform_driver_register(&pmu_legacy_driver);
|
|
if (ret)
|
|
return ret;
|
|
|
|
pdev = platform_device_register_simple(RISCV_PMU_LEGACY_PDEV_NAME, -1, NULL, 0);
|
|
if (IS_ERR(pdev)) {
|
|
platform_driver_unregister(&pmu_legacy_driver);
|
|
return PTR_ERR(pdev);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
late_initcall(riscv_pmu_legacy_devinit);
|
|
|
|
void riscv_pmu_legacy_skip_init(void)
|
|
{
|
|
pmu_init_done = true;
|
|
}
|