Skip to content

Commit 86dcb94

Browse files
zhangshkgregkh
authored andcommitted
drivers/perf: hisi: Fixup one DDRC PMU register offset
commit eb4f521 upstream. For DDRC PMU, each PMU counter is fixed-purpose. There is a mismatch between perf list and driver definition on rw_chg event. # perf list | grep chg hisi_sccl1_ddrc0/rnk_chg/ [Kernel PMU event] hisi_sccl1_ddrc0/rw_chg/ [Kernel PMU event] But the register offset of rw_chg event is not defined in the driver, meanwhile bnk_chg register offset is mis-defined, let's fixup it. Fixes: 904dcf0 ("perf: hisi: Add support for HiSilicon SoC DDRC PMU driver") Cc: stable@vger.kernel.org Cc: John Garry <john.garry@huawei.com> Cc: Will Deacon <will.deacon@arm.com> Cc: Mark Rutland <mark.rutland@arm.com> Reported-by: Weijian Huang <huangweijian4@hisilicon.com> Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent c1aa0c8 commit 86dcb94

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
#define DDRC_FLUX_RCMD 0x38c
3131
#define DDRC_PRE_CMD 0x3c0
3232
#define DDRC_ACT_CMD 0x3c4
33-
#define DDRC_BNK_CHG 0x3c8
3433
#define DDRC_RNK_CHG 0x3cc
34+
#define DDRC_RW_CHG 0x3d0
3535
#define DDRC_EVENT_CTRL 0x6C0
3636
#define DDRC_INT_MASK 0x6c8
3737
#define DDRC_INT_STATUS 0x6cc
@@ -51,7 +51,7 @@
5151

5252
static const u32 ddrc_reg_off[] = {
5353
DDRC_FLUX_WR, DDRC_FLUX_RD, DDRC_FLUX_WCMD, DDRC_FLUX_RCMD,
54-
DDRC_PRE_CMD, DDRC_ACT_CMD, DDRC_BNK_CHG, DDRC_RNK_CHG
54+
DDRC_PRE_CMD, DDRC_ACT_CMD, DDRC_RNK_CHG, DDRC_RW_CHG
5555
};
5656

5757
/*

0 commit comments

Comments
 (0)