perf: marvell: Add CN20K DDR PMU support
Subsystems (2)
v6 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.
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 (2):
dt-bindings: perf: marvell: Extend CN10K DDR PMU binding for CN20K
perf: marvell: Add CN20K DDR PMU support
.../bindings/perf/marvell-cn10k-ddr.yaml | 18 +- drivers/perf/marvell_cn10k_ddr_pmu.c | 197 ++++++++++++++++-- 2 files changed, 200 insertions(+), 15 deletions(-)
Signature · 1 line
2.25.1
PATCH v6 1/2 dt-bindings: perf: marvell: Extend CN10K DDR PMU binding for CN20K
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 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.
--- .../bindings/perf/marvell-cn10k-ddr.yaml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/perf/marvell-cn10k-ddr.yaml +17 -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
@@ -35,3 +41,13 @@ examples: reg = <0x87e1 0xc0000000 0x0 0x10000>; }; }; + - | + bus { + #address-cells = <2>; + #size-cells = <2>; + + pmu@c20000000000 { + compatible = "marvell,cn20k-ddr-pmu"; + reg = <0xc200 0x00000000 0x0 0x100000>; + }; + };
Signature · 1 line
2.25.1
Re: [PATCH v6 1/2] dt-bindings: perf: marvell: Extend CN10K DDR PMU binding for CN20K
Quoted 5 lines · Geetha sowjanya
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.
Quoted 7 lines
The CN20K DDR PMU is functionally equivalent to the CN10K DDR PMU, with minor register offset differences.
Changes in v6:
- dt-bindings: Document CN20K in the existingmarvell-cn10k-ddr.yaml; add maintainer, description, compatible enum entry, and a CN20K example with unit-address aligned to reg.
Changelog is not part of commit msg, but changelog area, so after ---.
Quoted 36 lines
Signed-off-by Geetha sowjanya <[email protected]>--- .../bindings/perf/marvell-cn10k-ddr.yaml | 18 +++++++++++++++++- 1 file changed, 17 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@@ -35,3 +41,13 @@ examples: reg = <0x87e1 0xc0000000 0x0 0x10000>;
Documentation/devicetree/bindings/perf/marvell-cn10k-ddr.yaml examples: · line 51
Quoted 10 lines
Documentation/devicetree/bindings/perf/marvell-cn10k-ddr.yaml +8
-0}; }; + - | + bus { + #address-cells = <2>; + #size-cells = <2>; + + pmu@c20000000000 { + compatible = "marvell,cn20k-ddr-pmu"; + reg = <0xc200 0x00000000 0x0 0x100000>;
No need for a new example.
Best regards,
Krzysztof
RE: [EXTERNAL] Re: [PATCH v6 1/2] dt-bindings: perf: marvell: Extend CN10K DDR PMU binding for CN20K
Quoted 21 lines
-----Original Message-----
From: Krzysztof Kozlowski <[email protected]>
Sent: Wednesday, May 27, 2026 2:15 PM
To: Geethasowjanya Akula <[email protected]>
Cc: [email protected]; [email protected]; linux-arm- [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: [EXTERNAL] Re: [PATCH v6 1/2] dt-bindings: perf: marvell: Extend CN10K DDR PMU binding for CN20KQuoted 8 lines · Geetha sowjanya
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.
Quoted 6 lines
Quoted 4 lines
Changes in v6:
- dt-bindings: Document CN20K in the existingmarvell-cn10k-ddr.yaml; add maintainer, description, compatible enum entry, and a CN20K example with unit-address aligned to reg.Changelog is not part of commit msg, but changelog area, so after ---.
Will fix it in next version.
Quoted 56 lines
Quoted 15 lines
Signed-off-by Geetha sowjanya <[email protected]>--- .../bindings/perf/marvell-cn10k-ddr.yaml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)diff --git
a/Documentation/devicetree/bindings/perf/marvell-cn10k-ddr.yamlb/Documentation/devicetree/bindings/perf/marvell-cn10k-ddr.yamlindexa18dd0a8c43a..79fae9fdb6f1100644Documentation/devicetree/bindings/perf/marvell-cn10k-ddr.yaml +0
-0@@ -4,16 +4,22 @@ $id:Quoted 2 lines
https://urldefense.proofpoint.com/v2/url?u=http-3A__devicetree.org_sch
emas_perf_marvell-2Dcn10k-2Dddr.yaml-23&d=DwIBaQ&c=nKjWec2b6R0mOyPaz7x
Quoted 1 line
tfQ&r=UiEt_nUeYFctu7JVLXVlXDhTmq_EAfooaZEYInfGuEQ&m=KPupvCgvILuS9 YRzKR
Quoted 1 line
VMAwO0JiUqPQ1YTbqas_YAp_UUtzzdUgNdMbBRq73VWzCK&s=QEQyFv8YKF DGoUxGi46U7
Quoted 4 lines
YjmvjHKHqDmzoGi2ww3GLQ&e=
$schema:
https://urldefense.proofpoint.com/v2/url?u=http-3A__devicetree.org_met
a-2Dschemas_core.yaml-23&d=DwIBaQ&c=nKjWec2b6R0mOyPaz7xtfQ&r=UiEt_nUeY
Quoted 1 line
Fctu7JVLXVlXDhTmq_EAfooaZEYInfGuEQ&m=KPupvCgvILuS9YRzKRVMAwO0Ji UqPQ1YT
Quoted 1 line
bqas_YAp_UUtzzdUgNdMbBRq73VWzCK&s=3kP4V_gIcxiXPm4vOCnsrP8hkM0y HL6lTEfo
Documentation/devicetree/bindings/perf/marvell-cn10k-ddr.yaml
Quoted 8 lines
9X3fVno&e=
Documentation/devicetree/bindings/perf/marvell-cn10k-ddr.yaml +5
-1-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 MMIOregion.
Quoted 12 lines
maintainers:
- Bharat Bhushan <[email protected]>Documentation/devicetree/bindings/perf/marvell-cn10k-ddr.yaml +2
-0+ - Geetha sowjanya <[email protected]> properties: compatible: items: - enum: - marvell,cn10k-ddr-pmu + - marvell,cn20k-ddr-pmu
Quoted 16 lines
Quoted 4 lines
reg:
maxItems: 1Documentation/devicetree/bindings/perf/marvell-cn10k-ddr.yaml +0
-0@@ -35,3 +41,13 @@ examples: reg = <0x87e1 0xc0000000 0x0 0x10000>;Documentation/devicetree/bindings/perf/marvell-cn10k-ddr.yaml examples: · line 51
Quoted 10 lines
Documentation/devicetree/bindings/perf/marvell-cn10k-ddr.yaml +8
-0}; }; + - | + bus { + #address-cells = <2>; + #size-cells = <2>; + + pmu@c20000000000 { + compatible = "marvell,cn20k-ddr-pmu"; + reg = <0xc200 0x00000000 0x0 0x100000>;No need for a new example.
Added the example because the register address range differs from CN10K, and a separate example makes the CN20K mapping explicit. As suggested will drop the additional example in next version.
Thanks,
Geetha.
Quoted 3 lines
Best regards,
Krzysztof
PATCH v6 2/2 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 v6:
- perf: Route CN20K ZQ via sysfs IDs 62/63 and CFG1; bitmap uses (eventid - 42) for CFG1 bits; reject those IDs on non-CN20K silicon.
- perf: Disambiguate CN20K events 58-61 from Odyssey DFI; shared numeric IDs use CN20K branch plus fallthrough to DFI path.
- perf: Extend counter enable so CN20K gets Odyssey manual-mode and start (IS_CN20K OR IS_ODY in cn10k_ddr_perf_counter_enable).
--- drivers/perf/marvell_cn10k_ddr_pmu.c | 196 +++++++++++++++++++++++++-- 1 file changed, 182 insertions(+), 14 deletions(-)
drivers/perf/marvell_cn10k_ddr_pmu.c +182 -14
@@ -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,8 +525,22 @@ static int ddr_perf_get_event_bitmap(int eventid, u64 *event_bitmap,int err =0 ;switch (eventid) { + case EVENT_PERF_OP_IS_WR32 ... EVENT_PERF_OP_IS_RD16: +if (ddr_pmu->p_data->silicon_flags &IS_CN20K ) { + *event_bitmap = (1ULL << (eventid -1 )); +break ; + } +/* Same numeric IDs as Odyssey DFI events 58..61 */ + fallthrough; + 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) { +if (!(ddr_pmu->p_data->silicon_flags &IS_ODY )) { err = -EINVAL ;break ; }
@@ -524,9 +652,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 +674,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 +749,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 +771,15 @@ 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; - +if (silicon_flags &IS_CN20K ) { +if (config ==EVENT_CN20K_OP_IS_ZQSTART || + config ==EVENT_CN20K_OP_IS_ZQLATCH ) + reg_offset =DDRC_PERF_CFG (p_data->cfg1_base, counter); + }writeq_relaxed (val, pmu->base + reg_offset); }else {/* fixed event counter, clear counter value */
@@ -952,7 +1086,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 +1131,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 +1141,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 +1165,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 +1189,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 +1206,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 +1264,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 +1274,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
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 4 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 4 potential issue(s) to consider:
New issues:
- [High] Overlapping switch case ranges cause a compilation error, and broken fallthrough logic prevents Odyssey DFI events from being handled.
- [Medium] New CAS events are exported via sysfs but unhandled in the driver, rendering them unusable.
- [Medium] Incomplete configuration of CN20K ZQ events causes hardware state leakage and potential enablement failures.
Pre-existing issues:
- [Critical] The error path in cn10k_ddr_perf_event_add() leaks a counter allocation and leaves a dangling pointer, leading to a Use-After-Free. --
commit d7ca37a605c64e38783da21352c22989b06d59ba
Author: Geetha sowjanya <[email protected]>
perf: marvell: Add CN20K DDR PMU support
This patch adds support for the CN20K DRAM Subsystem PMU, which monitors DDR traffic. It introduces new events, sysfs attributes, and device match data for the CN20K variant. The PMU logic is also updated to handle CN20K-specific event mappings and register offsets.
Quoted 4 lines
drivers/perf/marvell_cn10k_ddr_pmu.c +0
-0
[ ... ]
Quoted 8 lines
drivers/perf/marvell_cn10k_ddr_pmu.c +3
-0@@ -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
[ ... ]
Quoted 1 line
drivers/perf/marvell_cn10k_ddr_pmu.c +0
-0@@ -336,6 +369,80 @@ static struct attribute *odyssey_ddr_perf_events_attrs[] = {
[ ... ]
drivers/perf/marvell_cn10k_ddr_pmu.c static struct attribute *odyssey_ddr_perf_events_attrs[] = { · line 414
Quoted 3 lines
drivers/perf/marvell_cn10k_ddr_pmu.c +3
-0+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),
[Severity: Medium]
Will these new CAS events return -EINVAL when configured?
The IDs for these events (36, 37, and 38) fall into the gap between EVENT_WAW_HAZARD (26) and EVENT_OP_IS_REFRESH (39).
Because ddr_perf_get_event_bitmap() was not updated to handle this range:
case EVENT_HIF_RD_OR_WR ... EVENT_WAW_HAZARD:
case EVENT_OP_IS_REFRESH ... EVENT_OP_IS_ZQLATCH:
*event_bitmap = (1ULL << (eventid - 1)); break;
it seems userspace attempts to use these attributes will fall to the default case and fail.
Quoted 1 line
drivers/perf/marvell_cn10k_ddr_pmu.c +1
-0+ CN10K_DDR_PMU_EVENT_ATTR(ddr_refresh, EVENT_OP_IS_REFRESH),
[ ... ]
drivers/perf/marvell_cn10k_ddr_pmu.c static int ddr_perf_get_event_bitmap(int eventid, u64 *event_bitmap, · line 528
Quoted 5 lines
drivers/perf/marvell_cn10k_ddr_pmu.c +1
-0@@ -411,8 +525,22 @@ static int ddr_perf_get_event_bitmap(int eventid, u64 *event_bitmap,int err =0 ;switch (eventid) { + case EVENT_PERF_OP_IS_WR32 ... EVENT_PERF_OP_IS_RD16:
[Severity: High]
Does this code introduce overlapping switch case ranges?
EVENT_PERF_OP_IS_WR32 is 58 and EVENT_PERF_OP_IS_RD16 is 61, so this covers values 58 to 61.
However, the existing code already handles EVENT_DFI_PARITY_POISON to EVENT_DFI_CMD_IS_RETRY:
case EVENT_DFI_PARITY_POISON ...EVENT_DFI_CMD_IS_RETRY:
If EVENT_DFI_PARITY_POISON is 56 and EVENT_DFI_CMD_IS_RETRY is 61, these ranges overlap, which will cause a compiler error.
drivers/perf/marvell_cn10k_ddr_pmu.c static int ddr_perf_get_event_bitmap(int eventid, u64 *event_bitmap, · line 534
Quoted 6 lines
drivers/perf/marvell_cn10k_ddr_pmu.c +6
-0+if (ddr_pmu->p_data->silicon_flags &IS_CN20K ) { + *event_bitmap = (1ULL << (eventid -1 )); +break ; + } +/* Same numeric IDs as Odyssey DFI events 58..61 */ + fallthrough;
[Severity: High]
Does the fallthrough correctly handle non-CN20K silicon events here?
It falls into the ZQLATCH/ZQSTART block below, which performs an explicit check for IS_CN20K:
drivers/perf/marvell_cn10k_ddr_pmu.c static int ddr_perf_get_event_bitmap(int eventid, u64 *event_bitmap, · line 541
Quoted 7 lines
drivers/perf/marvell_cn10k_ddr_pmu.c +7
-0+ 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 ;
If an Odyssey device processes an event between 58 and 61, it will fail the IS_CN20K check, hit err = -EINVAL, and break. This rejects all valid Odyssey events in this range instead of falling through to the DFI block below.
Quoted 6 lines
drivers/perf/marvell_cn10k_ddr_pmu.c +1
-1case EVENT_DFI_PARITY_POISON ...EVENT_DFI_CMD_IS_RETRY: -if (!ddr_pmu->p_data->is_ody) { +if (!(ddr_pmu->p_data->silicon_flags &IS_ODY )) { err = -EINVAL ;break ; }
[ ... ]
drivers/perf/marvell_cn10k_ddr_pmu.c static int cn10k_ddr_perf_event_add(struct perf_event *event, int flags) · line 777
Quoted 8 lines
drivers/perf/marvell_cn10k_ddr_pmu.c +1
-0@@ -642,10 +771,15 @@ 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;
[Severity: Critical]
This is a pre-existing issue, but does this error path lead to a Use-After-Free?
Earlier in cn10k_ddr_perf_event_add(), the driver calls cn10k_ddr_perf_alloc_counter() which stores the event pointer in pmu->events via pmu->events[counter] = event.
If ddr_perf_get_event_bitmap() fails here and returns early, the counter is not freed, active_events is not decremented, and the pointer remains in pmu->events.
When the perf core eventually frees the event, pmu->events[counter] is left dangling.
The background hrtimer then triggers an overflow, calls cn10k_ddr_perf_event_update_all(), and dereferences the freed event pointer.
drivers/perf/marvell_cn10k_ddr_pmu.c static int cn10k_ddr_perf_event_add(struct perf_event *event, int flags) · line 781
Quoted 5 lines
drivers/perf/marvell_cn10k_ddr_pmu.c +4
-1- +if (silicon_flags &IS_CN20K ) { +if (config ==EVENT_CN20K_OP_IS_ZQSTART || + config ==EVENT_CN20K_OP_IS_ZQLATCH ) + reg_offset =DDRC_PERF_CFG (p_data->cfg1_base, counter);
[Severity: Medium]
Will this leave hardware state behind and cause enablement failures?
When configuring a CN20K ZQ event, the code writes the event configuration to cfg1_base, but fails to clear the primary configuration register at cfg_base.
Later, cn10k_ddr_perf_counter_enable() unconditionally uses cfg_base to enable the event:
reg = DDRC_PERF_CFG(p_data->cfg_base, counter);
val = readq_relaxed(pmu->base + reg);
if (enable)
val |= EVENT_ENABLE;Because PMU counters do not clear cfg_base on event deletion, enabling a new ZQ event might inadvertently enable a stale event still left over in cfg_base, leading to corrupted performance counts.
Quoted 4 lines
drivers/perf/marvell_cn10k_ddr_pmu.c +1
-0+ }writeq_relaxed (val, pmu->base + reg_offset); }else {/* fixed event counter, clear counter value */
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=2