Skip to content

Commit 9b3e150

Browse files
atishp04palmer-dabbelt
atishp04
authored and
palmer-dabbelt
committed
RISC-V: Add a simple platform driver for RISC-V legacy perf
The old RISC-V perf implementation allowed counting of only cycle/instruction counters using perf. Restore that feature by implementing a simple platform driver under a separate config to provide backward compatibility. Any existing software stack will continue to work as it is. However, it provides an easy way out in future where we can remove the legacy driver. Reviewed-by: Anup Patel <anup@brainfault.org> Signed-off-by: Atish Patra <atish.patra@wdc.com> Signed-off-by: Atish Patra <atishp@rivosinc.com> Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
1 parent f5bfa23 commit 9b3e150

4 files changed

Lines changed: 159 additions & 0 deletions

File tree

‎drivers/perf/Kconfig‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,16 @@ config RISCV_PMU
6666
PMU functionalities in a core library so that different PMU drivers
6767
can reuse it.
6868

69+
config RISCV_PMU_LEGACY
70+
depends on RISCV_PMU
71+
bool "RISC-V legacy PMU implementation"
72+
default y
73+
help
74+
Say y if you want to use the legacy CPU performance monitor
75+
implementation on RISC-V based systems. This only allows counting
76+
of cycle/instruction counter and doesn't support counter overflow,
77+
or programmable counters. It will be removed in future.
78+
6979
config ARM_PMU_ACPI
7080
depends on ARM_PMU && ACPI
7181
def_bool y

‎drivers/perf/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ obj-$(CONFIG_HISI_PMU) += hisilicon/
1111
obj-$(CONFIG_QCOM_L2_PMU) += qcom_l2_pmu.o
1212
obj-$(CONFIG_QCOM_L3_PMU) += qcom_l3_pmu.o
1313
obj-$(CONFIG_RISCV_PMU) += riscv_pmu.o
14+
obj-$(CONFIG_RISCV_PMU_LEGACY) += riscv_pmu_legacy.o
1415
obj-$(CONFIG_THUNDERX2_PMU) += thunderx2_pmu.o
1516
obj-$(CONFIG_XGENE_PMU) += xgene_pmu.o
1617
obj-$(CONFIG_ARM_SPE_PMU) += arm_spe_pmu.o

‎drivers/perf/riscv_pmu_legacy.c‎

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
/*
3+
* RISC-V performance counter support.
4+
*
5+
* Copyright (C) 2021 Western Digital Corporation or its affiliates.
6+
*
7+
* This implementation is based on old RISC-V perf and ARM perf event code
8+
* which are in turn based on sparc64 and x86 code.
9+
*/
10+
11+
#include <linux/mod_devicetable.h>
12+
#include <linux/perf/riscv_pmu.h>
13+
#include <linux/platform_device.h>
14+
15+
#define RISCV_PMU_LEGACY_CYCLE 0
16+
#define RISCV_PMU_LEGACY_INSTRET 1
17+
#define RISCV_PMU_LEGACY_NUM_CTR 2
18+
19+
static bool pmu_init_done;
20+
21+
static int pmu_legacy_ctr_get_idx(struct perf_event *event)
22+
{
23+
struct perf_event_attr *attr = &event->attr;
24+
25+
if (event->attr.type != PERF_TYPE_HARDWARE)
26+
return -EOPNOTSUPP;
27+
if (attr->config == PERF_COUNT_HW_CPU_CYCLES)
28+
return RISCV_PMU_LEGACY_CYCLE;
29+
else if (attr->config == PERF_COUNT_HW_INSTRUCTIONS)
30+
return RISCV_PMU_LEGACY_INSTRET;
31+
else
32+
return -EOPNOTSUPP;
33+
}
34+
35+
/* For legacy config & counter index are same */
36+
static int pmu_legacy_event_map(struct perf_event *event, u64 *config)
37+
{
38+
return pmu_legacy_ctr_get_idx(event);
39+
}
40+
41+
static u64 pmu_legacy_read_ctr(struct perf_event *event)
42+
{
43+
struct hw_perf_event *hwc = &event->hw;
44+
int idx = hwc->idx;
45+
u64 val;
46+
47+
if (idx == RISCV_PMU_LEGACY_CYCLE) {
48+
val = riscv_pmu_ctr_read_csr(CSR_CYCLE);
49+
if (IS_ENABLED(CONFIG_32BIT))
50+
val = (u64)riscv_pmu_ctr_read_csr(CSR_CYCLEH) << 32 | val;
51+
} else if (idx == RISCV_PMU_LEGACY_INSTRET) {
52+
val = riscv_pmu_ctr_read_csr(CSR_INSTRET);
53+
if (IS_ENABLED(CONFIG_32BIT))
54+
val = ((u64)riscv_pmu_ctr_read_csr(CSR_INSTRETH)) << 32 | val;
55+
} else
56+
return 0;
57+
58+
return val;
59+
}
60+
61+
static void pmu_legacy_ctr_start(struct perf_event *event, u64 ival)
62+
{
63+
struct hw_perf_event *hwc = &event->hw;
64+
u64 initial_val = pmu_legacy_read_ctr(event);
65+
66+
/**
67+
* The legacy method doesn't really have a start/stop method.
68+
* It also can not update the counter with a initial value.
69+
* But we still need to set the prev_count so that read() can compute
70+
* the delta. Just use the current counter value to set the prev_count.
71+
*/
72+
local64_set(&hwc->prev_count, initial_val);
73+
}
74+
75+
/**
76+
* This is just a simple implementation to allow legacy implementations
77+
* compatible with new RISC-V PMU driver framework.
78+
* This driver only allows reading two counters i.e CYCLE & INSTRET.
79+
* However, it can not start or stop the counter. Thus, it is not very useful
80+
* will be removed in future.
81+
*/
82+
static void pmu_legacy_init(struct riscv_pmu *pmu)
83+
{
84+
pr_info("Legacy PMU implementation is available\n");
85+
86+
pmu->num_counters = RISCV_PMU_LEGACY_NUM_CTR;
87+
pmu->ctr_start = pmu_legacy_ctr_start;
88+
pmu->ctr_stop = NULL;
89+
pmu->event_map = pmu_legacy_event_map;
90+
pmu->ctr_get_idx = pmu_legacy_ctr_get_idx;
91+
pmu->ctr_get_width = NULL;
92+
pmu->ctr_clear_idx = NULL;
93+
pmu->ctr_read = pmu_legacy_read_ctr;
94+
95+
perf_pmu_register(&pmu->pmu, "cpu", PERF_TYPE_RAW);
96+
}
97+
98+
static int pmu_legacy_device_probe(struct platform_device *pdev)
99+
{
100+
struct riscv_pmu *pmu = NULL;
101+
102+
pmu = riscv_pmu_alloc();
103+
if (!pmu)
104+
return -ENOMEM;
105+
pmu_legacy_init(pmu);
106+
107+
return 0;
108+
}
109+
110+
static struct platform_driver pmu_legacy_driver = {
111+
.probe = pmu_legacy_device_probe,
112+
.driver = {
113+
.name = RISCV_PMU_LEGACY_PDEV_NAME,
114+
},
115+
};
116+
117+
static int __init riscv_pmu_legacy_devinit(void)
118+
{
119+
int ret;
120+
struct platform_device *pdev;
121+
122+
if (likely(pmu_init_done))
123+
return 0;
124+
125+
ret = platform_driver_register(&pmu_legacy_driver);
126+
if (ret)
127+
return ret;
128+
129+
pdev = platform_device_register_simple(RISCV_PMU_LEGACY_PDEV_NAME, -1, NULL, 0);
130+
if (IS_ERR(pdev)) {
131+
platform_driver_unregister(&pmu_legacy_driver);
132+
return PTR_ERR(pdev);
133+
}
134+
135+
return ret;
136+
}
137+
late_initcall(riscv_pmu_legacy_devinit);
138+
139+
void riscv_pmu_legacy_skip_init(void)
140+
{
141+
pmu_init_done = true;
142+
}

‎include/linux/perf/riscv_pmu.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#define RISCV_MAX_COUNTERS 64
2323
#define RISCV_OP_UNSUPP (-EOPNOTSUPP)
2424
#define RISCV_PMU_PDEV_NAME "riscv-pmu"
25+
#define RISCV_PMU_LEGACY_PDEV_NAME "riscv-pmu-legacy"
2526

2627
#define RISCV_PMU_STOP_FLAG_RESET 1
2728

@@ -58,6 +59,11 @@ unsigned long riscv_pmu_ctr_read_csr(unsigned long csr);
5859
int riscv_pmu_event_set_period(struct perf_event *event);
5960
uint64_t riscv_pmu_ctr_get_width_mask(struct perf_event *event);
6061
u64 riscv_pmu_event_update(struct perf_event *event);
62+
#ifdef CONFIG_RISCV_PMU_LEGACY
63+
void riscv_pmu_legacy_skip_init(void);
64+
#else
65+
static inline void riscv_pmu_legacy_skip_init(void) {};
66+
#endif
6167
struct riscv_pmu *riscv_pmu_alloc(void);
6268

6369
#endif /* CONFIG_RISCV_PMU */

0 commit comments

Comments
 (0)