Skip to content

Commit d1d0b3f

Browse files
saschahauerchanwoochoi
authored andcommitted
PM / devfreq: rockchip-dfi: make register stride SoC specific
The currently supported RK3399 has a stride of 20 between the channel specific registers. Upcoming RK3588 has a different stride, so put the stride into driver data to make it configurable. While at it convert decimal 20 to hex 0x14 for consistency with RK3588 which has a register stride 0x4000 and we want to write that in hex as well. Link: https://lore.kernel.org/all/[email protected]/ Reviewed-by: Jonathan Cameron <[email protected]> Reviewed-by: Sebastian Reichel <[email protected]> Signed-off-by: Sascha Hauer <[email protected]> Signed-off-by: Chanwoo Choi <[email protected]>
1 parent 4d586b5 commit d1d0b3f

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

drivers/devfreq/event/rockchip-dfi.c

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ struct rockchip_dfi {
113113
int active_events;
114114
int burst_len;
115115
int buswidth[DMC_MAX_CHANNELS];
116+
int ddrmon_stride;
116117
};
117118

118119
static int rockchip_dfi_enable(struct rockchip_dfi *dfi)
@@ -190,13 +191,13 @@ static void rockchip_dfi_read_counters(struct rockchip_dfi *dfi, struct dmc_coun
190191
if (!(dfi->channel_mask & BIT(i)))
191192
continue;
192193
res->c[i].read_access = readl_relaxed(dfi_regs +
193-
DDRMON_CH0_RD_NUM + i * 20);
194+
DDRMON_CH0_RD_NUM + i * dfi->ddrmon_stride);
194195
res->c[i].write_access = readl_relaxed(dfi_regs +
195-
DDRMON_CH0_WR_NUM + i * 20);
196+
DDRMON_CH0_WR_NUM + i * dfi->ddrmon_stride);
196197
res->c[i].access = readl_relaxed(dfi_regs +
197-
DDRMON_CH0_DFI_ACCESS_NUM + i * 20);
198+
DDRMON_CH0_DFI_ACCESS_NUM + i * dfi->ddrmon_stride);
198199
res->c[i].clock_cycles = readl_relaxed(dfi_regs +
199-
DDRMON_CH0_COUNT_NUM + i * 20);
200+
DDRMON_CH0_COUNT_NUM + i * dfi->ddrmon_stride);
200201
}
201202
}
202203

@@ -664,6 +665,8 @@ static int rk3399_dfi_init(struct rockchip_dfi *dfi)
664665
dfi->buswidth[0] = FIELD_GET(RK3399_PMUGRF_OS_REG2_BW_CH0, val) == 0 ? 4 : 2;
665666
dfi->buswidth[1] = FIELD_GET(RK3399_PMUGRF_OS_REG2_BW_CH1, val) == 0 ? 4 : 2;
666667

668+
dfi->ddrmon_stride = 0x14;
669+
667670
return 0;
668671
};
669672

@@ -690,6 +693,8 @@ static int rk3568_dfi_init(struct rockchip_dfi *dfi)
690693

691694
dfi->buswidth[0] = FIELD_GET(RK3568_PMUGRF_OS_REG2_BW_CH0, reg2) == 0 ? 4 : 2;
692695

696+
dfi->ddrmon_stride = 0x0; /* not relevant, we only have a single channel on this SoC */
697+
693698
return 0;
694699
};
695700

0 commit comments

Comments
 (0)