perf: marvell: Add CN20K DDR PMU support
Subsystems (2)
v8 cover perf: marvell: Add CN20K DDR PMU support
This series adds support for the DDR Performance Monitoring Unit (PMU) present in Marvell CN20K SoCs.
The DDR PMU is part of the DRAM Subsystem (DSS) and provides hardware counters to monitor DDR traffic and performance events. The block implements eight programmable counters and two fixed-function counters tracking DDR read and write activity, and is accessed via a dedicated MMIO region.
CN20K is the successor to CN10K, and the DDR PMU hardware is functionally equivalent to the CN10K implementation, with only minor differences in register offsets and event mappings. To allow software to distinguish between the two silicon variants, this series introduces a specific "marvell,cn20k-ddr-pmu" compatible and extends the existing marvell_cn10k_ddr_pmu driver to handle CN20K via variant-specific data.
Chnages in v8:
- perf: Cancel the poll hrtimer in cn10k_ddr_perf_remove() before devm frees struct cn10k_ddr_pmu (pre-existing for CN10K/Odyssey).
Changes in v7:
- dt-bindings: dropped the CN20K DeviceTree example.
- perf: Handle ZQ sysfs IDs (62/63) in a dedicated switch case before the DFI range so GCC does not see overlapping case labels and Odyssey IDs 58-61 no longer fall through into ZQ handling.
- perf: Resolve shared numeric IDs 58-61 inside the DFI case for CN20K vs Odyssey (identical bitmap); extend programmable-event coverage to CAS events (36-38) for CN20K sysfs.
- perf: On event_add failure from ddr_perf_get_event_bitmap, cancel the hrtimer if needed and free the counter slot instead of returning with partial setup.
- perf: For CN20K, zero CFG0 before writing ZQ to CFG1 and zero CFG1 before non-ZQ CFG0 so stale masks do not combine across banks.
Changes in v6:
- dt-bindings: Document CN20K in the existing marvell-cn10k-ddr.yaml; add maintainer, description, compatible enum entry, and a CN20K example with unit-address aligned to reg.
- perf: Route CN20K ZQ events via dedicated sysfs IDs (62/63) and CFG1 programming; use (eventid - 42) for CFG1 bit positions and reject those IDs on non-CN20K silicon.
- perf: Disambiguate CN20K perf width events (58-61) from Odyssey DFI events at the same numeric IDs using an early CN20K branch and fallthrough into the existing DFI + programmable-event path on Odyssey.
- perf: Run CN20K programmable counters through the same manual-mode / start sequence as Odyssey.
Changes in v4:
- Fixed document file name.
Changes in v3:
- Expanded cover letter and commit message to better describe the DDR PMU hardware and its relationship to CN10K
- Fixed the file name.
Changes in v2:
- Fixed YAML syntax error triggered by a tab character in the examples section, which caused dt_binding_check to fail.
Changes in v1:
- Added a description field to the binding.
- Simplified the compatible property using 'const' instead of 'items/enum'.
- Updated the example node name to include a unit-address matching the reg base.
Geetha sowjanya (3):
dt-bindings: perf: marvell: Extend CN10K DDR PMU binding for CN20K
perf: marvell: Add CN20K DDR PMU support
perf: marvell: Cancel CN10K DDR PMU hrtimer on device remove
.../bindings/perf/marvell-cn10k-ddr.yaml | 18 +- drivers/perf/marvell_cn10k_ddr_pmu.c | 236 ++++++++++++++++-- 2 files changed, 220 insertions(+), 15 deletions(-)
Signature · 1 line
2.25.1
PATCH v8 1/3 dt-bindings: perf: marvell: Add CN20K DDR PMU binding
Marvell CN20K SoCs integrate a DDR Performance Monitoring Unit (PMU) associated with the DDR controller. The block provides hardware counters to monitor DDR traffic and performance events and is accessed via a dedicated MMIO region.
The CN20K DDR PMU is functionally equivalent to the CN10K DDR PMU, with minor register offset differences.
---
Changes in v7:
- Dropped the CN20K DeviceTree example.
Changes in v6:
- dt-bindings: Document CN20K in the existing marvell-cn10k-ddr.yaml; add maintainer, description, compatible enum entry, and a CN20K example with unit-address aligned to reg.
.../devicetree/bindings/perf/marvell-cn10k-ddr.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/perf/marvell-cn10k-ddr.yaml +7 -1
@@ -4,16 +4,22 @@ $id: http://devicetree.org/schemas/perf/marvell-cn10k-ddr.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Marvell CN10K DDR performance monitor +title: Marvell CN10K / CN20K DDR performance monitor + +description: + Performance Monitoring Unit (PMU) for the DDR controller on Marvell + CN10K and CN20K SoCs. The block is accessed via a dedicated MMIO region. maintainers: - Bharat Bhushan <[email protected]> + - Geetha sowjanya <[email protected]> properties: compatible: items: - enum: - marvell,cn10k-ddr-pmu + - marvell,cn20k-ddr-pmu reg: maxItems: 1
Signature · 1 line
2.25.1
PATCH v8 2/3 perf: marvell: Add CN20K DDR PMU support
In reply to Geetha sowjanyaThe CN20K DRAM Subsystem exposes eight programmable performance counters and two fixed counters for DDR read and write traffic. Software selects events for the programmable counters from traffic at the DDR PHY interface, the CHI interconnect, or inside the DDR controller.
Add CN20K register offsets, event maps, and sysfs attributes; match the device via OF (marvell,cn20k-ddr-pmu) and ACPI (MRVL000B). Represent the SoC variant in platform data with bit flags so CN20K can reuse the CN10K PMU code path where appropriate.
---
Changes in v7:
- perf: Add ZQ case (62/63) before the DFI switch range; handle shared IDs 58-61 only inside the DFI branch (fixes overlapping cases and Odyssey EINVAL for perf-width events).
- perf: Widen programmable-event case to EVENT_OP_IS_CAS_WS through EVENT_OP_IS_ZQLATCH so CAS sysfs events (36-38) map in ddr_perf_get_event_bitmap.
- perf: On event_add failure from ddr_perf_get_event_bitmap, cancel timer if needed and free the counter slot instead of returning with partial setup.
- perf: For CN20K, zero CFG0 before writing ZQ to CFG1 and zero CFG1 before non-ZQ CFG0 so stale masks do not combine across banks.
drivers/perf/marvell_cn10k_ddr_pmu.c | 230 +++++++++++++++++++++++++-- 1 file changed, 214 insertions(+), 16 deletions(-)
drivers/perf/marvell_cn10k_ddr_pmu.c +214 -16
@@ -13,31 +13,43 @@#include <linux/hrtimer.h> #include <linux/acpi.h> #include <linux/platform_device.h> +#include <linux/bits.h> + +/* SoC variant flags for struct ddr_pmu_platform_data (mutually exclusive in pdata) */ +#define IS_CN10K BIT(0) +#define IS_ODY BIT(1) +#define IS_CN20K BIT(2)/* Performance Counters Operating Mode Control Registers */ #define CN10K_DDRC_PERF_CNT_OP_MODE_CTRL 0x8020#define ODY_DDRC_PERF_CNT_OP_MODE_CTRL 0x20020 +#define CN20K_DDRC_PERF_CNT_OP_MODE_CTRL 0x20000#define OP_MODE_CTRL_VAL_MANUAL 0x1/* Performance Counters Start Operation Control Registers */ #define CN10K_DDRC_PERF_CNT_START_OP_CTRL 0x8028#define ODY_DDRC_PERF_CNT_START_OP_CTRL 0x200A0 +#define CN20K_DDRC_PERF_CNT_START_OP_CTRL 0x20080#define START_OP_CTRL_VAL_START 0x1ULL#define START_OP_CTRL_VAL_ACTIVE 0x2/* Performance Counters End Operation Control Registers */ #define CN10K_DDRC_PERF_CNT_END_OP_CTRL 0x8030#define ODY_DDRC_PERF_CNT_END_OP_CTRL 0x200E0 +#define CN20K_DDRC_PERF_CNT_END_OP_CTRL 0x200C0#define END_OP_CTRL_VAL_END 0x1ULL/* Performance Counters End Status Registers */ #define CN10K_DDRC_PERF_CNT_END_STATUS 0x8038#define ODY_DDRC_PERF_CNT_END_STATUS 0x20120 +#define CN20K_DDRC_PERF_CNT_END_STATUS 0x20100#define END_STATUS_VAL_END_TIMER_MODE_END 0x1/* Performance Counters Configuration Registers */ #define CN10K_DDRC_PERF_CFG_BASE 0x8040#define ODY_DDRC_PERF_CFG_BASE 0x20160 +#define CN20K_DDRC_PERF_CFG_BASE 0x20140 +#define CN20K_DDRC_PERF_CFG1_BASE 0x20180/* 8 Generic event counter + 2 fixed event counters */ #define DDRC_PERF_NUM_GEN_COUNTERS 8
@@ -61,6 +73,24 @@* DO NOT change these event-id numbers, they are used to * program event bitmap in h/w. */ + +/* CN20K specific events */ +#define EVENT_PERF_OP_IS_RD16 61 +#define EVENT_PERF_OP_IS_RD32 60 +#define EVENT_PERF_OP_IS_WR16 59 +#define EVENT_PERF_OP_IS_WR32 58 +#define EVENT_OP_IS_ENTER_DSM 44 +#define EVENT_OP_IS_RFM 43 + + +#define EVENT_CN20K_OP_IS_ZQLATCH 62 +#define EVENT_CN20K_OP_IS_ZQSTART 63 +#define EVENT_CN20K_OP_IS_TCR_MRR 50 +#define EVENT_CN20K_OP_IS_DQSOSC_MRR 49 +#define EVENT_CN20K_OP_IS_DQSOSC_MPC 48 +#define EVENT_CN20K_VISIBLE_WIN_LIMIT_REACHED_WR 47 +#define EVENT_CN20K_VISIBLE_WIN_LIMIT_REACHED_RD 46 +#define EVENT_DFI_CMD_IS_RETRY 61#define EVENT_RD_UC_ECC_ERROR 60#define EVENT_RD_CRC_ERROR 59
@@ -87,6 +117,9 @@#define EVENT_OP_IS_SPEC_REF 41#define EVENT_OP_IS_CRIT_REF 40#define EVENT_OP_IS_REFRESH 39 +#define EVENT_OP_IS_CAS_WCK_SUS 38 +#define EVENT_OP_IS_CAS_WS_OFF 37 +#define EVENT_OP_IS_CAS_WS 36#define EVENT_OP_IS_ENTER_MPSM 35#define EVENT_OP_IS_ENTER_POWERDOWN 31#define EVENT_OP_IS_ENTER_SELFREF 27
@@ -183,8 +216,8 @@ struct ddr_pmu_platform_data {u64 cnt_freerun_clr;u64 cnt_value_wr_op;u64 cnt_value_rd_op; -bool is_cn10k; -bool is_ody; +u64 cfg1_base; +unsigned int silicon_flags;/* IS_CN10K, IS_ODY, or IS_CN20K */ }; static ssize_t cn10k_ddr_pmu_event_show(struct device *dev,
@@ -336,6 +369,80 @@ static struct attribute *odyssey_ddr_perf_events_attrs[] = {NULL }; +static struct attribute *cn20k_ddr_perf_events_attrs[] = { +/* Programmable */ +CN10K_DDR_PMU_EVENT_ATTR (ddr_hif_rd_or_wr_access,EVENT_HIF_RD_OR_WR ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_hif_wr_access,EVENT_HIF_WR ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_hif_rd_access,EVENT_HIF_RD ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_hif_rmw_access,EVENT_HIF_RMW ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_hif_pri_rdaccess,EVENT_HIF_HI_PRI_RD ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_rd_bypass_access,EVENT_READ_BYPASS ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_act_bypass_access,EVENT_ACT_BYPASS ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_dfi_wr_data_access, +EVENT_DFI_WR_DATA_CYCLES ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_dfi_rd_data_access, +EVENT_DFI_RD_DATA_CYCLES ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_hpri_sched_rd_crit_access, +EVENT_HPR_XACT_WHEN_CRITICAL ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_lpri_sched_rd_crit_access, +EVENT_LPR_XACT_WHEN_CRITICAL ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_wr_trxn_crit_access, +EVENT_WR_XACT_WHEN_CRITICAL ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_cam_active_access,EVENT_OP_IS_ACTIVATE ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_cam_rd_or_wr_access, +EVENT_OP_IS_RD_OR_WR ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_cam_rd_active_access, +EVENT_OP_IS_RD_ACTIVATE ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_cam_read,EVENT_OP_IS_RD ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_cam_write,EVENT_OP_IS_WR ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_cam_mwr,EVENT_OP_IS_MWR ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_precharge,EVENT_OP_IS_PRECHARGE ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_precharge_for_rdwr, +EVENT_PRECHARGE_FOR_RDWR ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_precharge_for_other, +EVENT_PRECHARGE_FOR_OTHER ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_rdwr_transitions,EVENT_RDWR_TRANSITIONS ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_write_combine,EVENT_WRITE_COMBINE ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_war_hazard,EVENT_WAR_HAZARD ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_raw_hazard,EVENT_RAW_HAZARD ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_waw_hazard,EVENT_WAW_HAZARD ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_enter_selfref,EVENT_OP_IS_ENTER_SELFREF ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_enter_powerdown, +EVENT_OP_IS_ENTER_POWERDOWN ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_cas_ws,EVENT_OP_IS_CAS_WS ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_cas_ws_off,EVENT_OP_IS_CAS_WS_OFF ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_cas_wck_sus,EVENT_OP_IS_CAS_WCK_SUS ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_refresh,EVENT_OP_IS_REFRESH ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_crit_ref,EVENT_OP_IS_CRIT_REF ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_spec_ref,EVENT_OP_IS_SPEC_REF ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_load_mode,EVENT_OP_IS_LOAD_MODE ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_rfm,EVENT_OP_IS_RFM ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_enter_dsm,EVENT_OP_IS_ENTER_DSM ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_dfi_cycles,EVENT_DFI_CYCLES ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_win_limit_reached_rd, +EVENT_CN20K_VISIBLE_WIN_LIMIT_REACHED_RD ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_win_limit_reached_wr, +EVENT_CN20K_VISIBLE_WIN_LIMIT_REACHED_WR ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_dqsosc_mpc,EVENT_CN20K_OP_IS_DQSOSC_MPC ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_dqsosc_mrr,EVENT_CN20K_OP_IS_DQSOSC_MRR ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_tcr_mrr,EVENT_CN20K_OP_IS_TCR_MRR ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_zqstart,EVENT_CN20K_OP_IS_ZQSTART ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_zqlatch,EVENT_CN20K_OP_IS_ZQLATCH ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_read16,EVENT_PERF_OP_IS_RD16 ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_read32,EVENT_PERF_OP_IS_RD32 ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_write16,EVENT_PERF_OP_IS_WR16 ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_write32,EVENT_PERF_OP_IS_WR32 ), +/* Free run event counters */ +CN10K_DDR_PMU_EVENT_ATTR (ddr_ddr_reads,EVENT_DDR_READS ), +CN10K_DDR_PMU_EVENT_ATTR (ddr_ddr_writes,EVENT_DDR_WRITES ), +NULL +}; + +static struct attribute_group cn20k_ddr_perf_events_attr_group = { + .name ="events" , + .attrs = cn20k_ddr_perf_events_attrs, +}; +static struct attribute_group odyssey_ddr_perf_events_attr_group = { .name ="events" , .attrs = odyssey_ddr_perf_events_attrs,
@@ -393,6 +500,13 @@ static const struct attribute_group *odyssey_attr_groups[] = { NULL }; +static const struct attribute_group *cn20k_attr_groups[] = { + &cn20k_ddr_perf_events_attr_group, + &cn10k_ddr_perf_format_attr_group, + &cn10k_ddr_perf_cpumask_attr_group, +NULL +}; +/* Default poll timeout is 100 sec, which is very sufficient for * 48 bit counter incremented max at 5.6 GT/s, which may take many * hours to overflow.
@@ -411,14 +525,38 @@ static int ddr_perf_get_event_bitmap(int eventid, u64 *event_bitmap,int err =0 ;switch (eventid) { + case EVENT_CN20K_OP_IS_ZQLATCH ... EVENT_CN20K_OP_IS_ZQSTART: +if (ddr_pmu->p_data->silicon_flags &IS_CN20K ) { + *event_bitmap = (1ULL << (eventid -42 )); +break ; + } + err = -EINVAL ; +break ; case EVENT_DFI_PARITY_POISON ...EVENT_DFI_CMD_IS_RETRY: -if (!ddr_pmu->p_data->is_ody) { +/* +* 58..61: CN20K perf width events share numeric IDs with Odyssey +* DFI events; same 1ULL << (eventid - 1) bitmap on both paths. +*/ +if (eventid >=EVENT_PERF_OP_IS_WR32 && + eventid <=EVENT_PERF_OP_IS_RD16 ) { +if (ddr_pmu->p_data->silicon_flags &IS_CN20K ) { + *event_bitmap = (1ULL << (eventid -1 )); +break ; + } +if (!(ddr_pmu->p_data->silicon_flags &IS_ODY )) { + err = -EINVAL ; +break ; + } + *event_bitmap = (1ULL << (eventid -1 )); +break ; + } +if (!(ddr_pmu->p_data->silicon_flags &IS_ODY )) { err = -EINVAL ;break ; } fallthrough; case EVENT_HIF_RD_OR_WR ... EVENT_WAW_HAZARD: - case EVENT_OP_IS_REFRESH ... EVENT_OP_IS_ZQLATCH: + case EVENT_OP_IS_CAS_WS ... EVENT_OP_IS_ZQLATCH: *event_bitmap = (1ULL << (eventid -1 ));break ;case EVENT_OP_IS_ENTER_SELFREF :
@@ -524,9 +662,9 @@ static void cn10k_ddr_perf_counter_enable(struct cn10k_ddr_pmu *pmu, int counter, bool enable) {const struct ddr_pmu_platform_data *p_data = pmu->p_data; +unsigned int silicon_flags = pmu->p_data->silicon_flags;u64 ctrl_reg = pmu->p_data->cnt_op_mode_ctrl;const struct ddr_pmu_ops *ops = pmu->ops; -bool is_ody = pmu->p_data->is_ody;u32 reg;u64 val;
@@ -546,7 +684,7 @@ static void cn10k_ddr_perf_counter_enable(struct cn10k_ddr_pmu *pmu,writeq_relaxed (val, pmu->base + reg); -if (is_ody) { +if ((silicon_flags &IS_ODY ) || (silicon_flags &IS_CN20K )) {if (enable) {/* * Setup the PMU counter to work in
@@ -621,6 +759,7 @@ static int cn10k_ddr_perf_event_add(struct perf_event *event, int flags) {struct cn10k_ddr_pmu *pmu =to_cn10k_ddr_pmu (event->pmu);const struct ddr_pmu_platform_data *p_data = pmu->p_data; +unsigned int silicon_flags = pmu->p_data->silicon_flags;const struct ddr_pmu_ops *ops = pmu->ops;struct hw_perf_event *hwc = &event->hw;u8 config = event->attr.config;
@@ -642,10 +781,27 @@ static int cn10k_ddr_perf_event_add(struct perf_event *event, int flags)if (counter <DDRC_PERF_NUM_GEN_COUNTERS ) {/* Generic counters, configure event id */ reg_offset =DDRC_PERF_CFG (p_data->cfg_base, counter); + ret =ddr_perf_get_event_bitmap (config, &val, pmu);if (ret) -return ret; - + goto err_free_counter; + +if (silicon_flags &IS_CN20K ) { +if (config ==EVENT_CN20K_OP_IS_ZQSTART || + config ==EVENT_CN20K_OP_IS_ZQLATCH ) { +/* ZQ lives in CFG1; clear stale event mask in CFG0 */ +writeq_relaxed (0 , pmu->base + +DDRC_PERF_CFG (p_data->cfg_base, + counter)); + reg_offset =DDRC_PERF_CFG (p_data->cfg1_base, + counter); + }else { +/* Clear CFG1 so a prior ZQ select cannot linger */ +writeq_relaxed (0 , pmu->base + +DDRC_PERF_CFG (p_data->cfg1_base, + counter)); + } + }writeq_relaxed (val, pmu->base + reg_offset); }else {/* fixed event counter, clear counter value */
@@ -661,6 +817,14 @@ static int cn10k_ddr_perf_event_add(struct perf_event *event, int flags)cn10k_ddr_perf_event_start (event, flags);return 0 ; + +err_free_counter: +if (pmu->active_events ==1 ) +hrtimer_cancel (&pmu->hrtimer); + pmu->active_events--; +cn10k_ddr_perf_free_counter (pmu, counter); + hwc->idx =-1 ; +return ret; }static void cn10k_ddr_perf_event_stop (struct perf_event *event,int flags)
@@ -952,7 +1116,25 @@ static const struct ddr_pmu_platform_data cn10k_ddr_pmu_pdata = { .cnt_freerun_clr = 0, .cnt_value_wr_op = CN10K_DDRC_PERF_CNT_VALUE_WR_OP, .cnt_value_rd_op = CN10K_DDRC_PERF_CNT_VALUE_RD_OP, - .is_cn10k = TRUE, + .silicon_flags = IS_CN10K, +}; + +static const struct ddr_pmu_platform_data cn20k_ddr_pmu_pdata = { + .counter_overflow_val =0 , + .counter_max_val =GENMASK_ULL (63 ,0 ), + .cnt_base =ODY_DDRC_PERF_CNT_VALUE_BASE , + .cfg_base =CN20K_DDRC_PERF_CFG_BASE , + .cfg1_base =CN20K_DDRC_PERF_CFG1_BASE , + .cnt_op_mode_ctrl =CN20K_DDRC_PERF_CNT_OP_MODE_CTRL , + .cnt_start_op_ctrl =CN20K_DDRC_PERF_CNT_START_OP_CTRL , + .cnt_end_op_ctrl =CN20K_DDRC_PERF_CNT_END_OP_CTRL , + .cnt_end_status =CN20K_DDRC_PERF_CNT_END_STATUS , + .cnt_freerun_en =0 , + .cnt_freerun_ctrl =ODY_DDRC_PERF_CNT_FREERUN_CTRL , + .cnt_freerun_clr =ODY_DDRC_PERF_CNT_FREERUN_CLR , + .cnt_value_wr_op =ODY_DDRC_PERF_CNT_VALUE_WR_OP , + .cnt_value_rd_op =ODY_DDRC_PERF_CNT_VALUE_RD_OP , + .silicon_flags =IS_CN20K , };#endif
@@ -979,7 +1161,7 @@ static const struct ddr_pmu_platform_data odyssey_ddr_pmu_pdata = { .cnt_freerun_clr = ODY_DDRC_PERF_CNT_FREERUN_CLR, .cnt_value_wr_op = ODY_DDRC_PERF_CNT_VALUE_WR_OP, .cnt_value_rd_op = ODY_DDRC_PERF_CNT_VALUE_RD_OP, - .is_ody = TRUE, + .silicon_flags = IS_ODY, };#endif
@@ -989,8 +1171,7 @@ static int cn10k_ddr_perf_probe(struct platform_device *pdev)struct cn10k_ddr_pmu *ddr_pmu;struct resource *res;void __iomem *base; -bool is_cn10k; -bool is_ody; +unsigned int silicon_flags;char *name;int ret;
@@ -1014,10 +1195,9 @@ static int cn10k_ddr_perf_probe(struct platform_device *pdev) ddr_pmu->base = base; ddr_pmu->p_data = dev_data; - is_cn10k = ddr_pmu->p_data->is_cn10k; - is_ody = ddr_pmu->p_data->is_ody; + silicon_flags = ddr_pmu->p_data->silicon_flags; -if (is_cn10k) { +if (silicon_flags &IS_CN10K ) { ddr_pmu->ops = &ddr_pmu_ops;/* Setup the PMU counter to work in manual mode */ writeq_relaxed(OP_MODE_CTRL_VAL_MANUAL, ddr_pmu->base +
@@ -1039,7 +1219,7 @@ static int cn10k_ddr_perf_probe(struct platform_device *pdev) }; } -if (is_ody) { +if (silicon_flags &IS_ODY ) { ddr_pmu->ops = &ddr_pmu_ody_ops; ddr_pmu->pmu = (struct pmu ) {
@@ -1056,6 +1236,22 @@ static int cn10k_ddr_perf_probe(struct platform_device *pdev) }; } +if (silicon_flags &IS_CN20K ) { + ddr_pmu->ops = &ddr_pmu_ody_ops; + + ddr_pmu->pmu = (struct pmu ) { + .module =THIS_MODULE , + .capabilities =PERF_PMU_CAP_NO_EXCLUDE , + .task_ctx_nr = perf_invalid_context, + .attr_groups = cn20k_attr_groups, + .event_init = cn10k_ddr_perf_event_init, + .add = cn10k_ddr_perf_event_add, + .del = cn10k_ddr_perf_event_del, + .start = cn10k_ddr_perf_event_start, + .stop = cn10k_ddr_perf_event_stop, + .read = cn10k_ddr_perf_event_update, + }; + }/* Choose this cpu to collect perf data */ ddr_pmu->cpu =raw_smp_processor_id ();
@@ -1098,6 +1294,7 @@ static void cn10k_ddr_perf_remove(struct platform_device *pdev)#ifdef CONFIG_OF static const struct of_device_id cn10k_ddr_pmu_of_match[] = { { .compatible ="marvell,cn10k-ddr-pmu" , .data = &cn10k_ddr_pmu_pdata }, + { .compatible ="marvell,cn20k-ddr-pmu" , .data = &cn20k_ddr_pmu_pdata }, { }, };MODULE_DEVICE_TABLE (of, cn10k_ddr_pmu_of_match);
@@ -1107,6 +1304,7 @@ MODULE_DEVICE_TABLE(of, cn10k_ddr_pmu_of_match);static const struct acpi_device_id cn10k_ddr_pmu_acpi_match[] = { {"MRVL000A" , (kernel_ulong_t)&cn10k_ddr_pmu_pdata }, {"MRVL000C" , (kernel_ulong_t)&odyssey_ddr_pmu_pdata}, + {"MRVL000B" , (kernel_ulong_t)&cn20k_ddr_pmu_pdata}, {}, };MODULE_DEVICE_TABLE (acpi, cn10k_ddr_pmu_acpi_match);
Signature · 1 line
2.25.1
PATCH v8 3/3 perf: marvell: Cancel CN10K DDR PMU hrtimer on device remove
In reply to Geetha sowjanyacn10k_ddr_perf_remove() did not cancel the poll hrtimer before returning. If the device was unbound while perf events were still active the timer callback could run post-free.
To fix the issue by adding hrtimer_cancel() in remove().
---
Changes in v8:
- perf: Cancel poll hrtimer in cn10k_ddr_perf_remove() to avoid use-after-free on device unbind (pre-existing for CN10K/Odyssey).
drivers/perf/marvell_cn10k_ddr_pmu.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/perf/marvell_cn10k_ddr_pmu.c +6 -0
@@ -1284,6 +1284,12 @@ static void cn10k_ddr_perf_remove(struct platform_device *pdev) {struct cn10k_ddr_pmu *ddr_pmu =platform_get_drvdata (pdev); +/* +* Cancel the poll timer before further teardown so the handler +* cannot run after this function returns. +*/ +hrtimer_cancel (&ddr_pmu->hrtimer); +cpuhp_state_remove_instance_nocalls (CPUHP_AP_PERF_ARM_MARVELL_CN10K_DDR_ONLINE , &ddr_pmu->node);
Signature · 1 line
2.25.1
Quoted 10 lines · Geetha sowjanya
This series adds support for the DDR Performance Monitoring Unit (PMU) present in Marvell CN20K SoCs.
The DDR PMU is part of the DRAM Subsystem (DSS) and provides hardware counters to monitor DDR traffic and performance events. The block implements eight programmable counters and two fixed-function counters tracking DDR read and write activity, and is accessed via a dedicated MMIO region.
[...]
Applied to arm64 (for-next/perf), thanks!
[1/3] dt-bindings: perf: marvell: Add CN20K DDR PMU binding
https://git.kernel.org/arm64/c/6e0aa591af99 [2/3] perf: marvell: Add CN20K DDR PMU support https://git.kernel.org/arm64/c/9b551a2446b2 [3/3] perf: marvell: Cancel CN10K DDR PMU hrtimer on device remove https://git.kernel.org/arm64/c/7dbcb0268d1e
Cheers,
Signature · 5 lines
Will https://fixes.arm64.dev https://next.arm64.dev https://will.arm64.dev