forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

rk312x ddr: fix get bandwidth error

Browse source 
1.Using 64bit width variable to cached the read and write data bandwidth
because it may overflow when calculating read and write data bandwidth.
2.Get ddr burst length to calculating bandwidth because lpddr2's burst
length may be bl4 or bl8.

Change-Id: I28db1793e411fc3e18edc3b6421ab3d397d92aa5
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
This commit is contained in:
Tang Yun ping 2015-09-09 15:41:47 +08:00
commit 9ec5a8f5fd
1 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
arch/arm/mach-rockchip/ddr_rk3126.c Executable file → Normal file
View file

@ -2611,6 +2611,12 @@ static void _ddr_bandwidth_get(struct ddr_bw_info *ddr_bw_ch0, struct ddr_bw_inf
u64 temp64;
uint32 i;
uint32 ddr_bw;
uint32 bl;
if (p_ddr_reg->mem_type == DDR3)
bl = 8;
else
bl = ((pDDR_Reg->MCFG >> 20) & 0x3) << 2;
ddr_bw = READ_BW_INFO();
ddr_dfi_monitor_stop();
@ -2621,15 +2627,20 @@ static void _ddr_bandwidth_get(struct ddr_bw_info *ddr_bw_ch0, struct ddr_bw_inf
goto end;
ddr_freq = pDDR_Reg->TOGCNT1U;
temp64 = ((u64)ddr_bw_val[ddrbw_wr_num] + (u64)ddr_bw_val[ddrbw_rd_num])*4*100;
temp64 = ((u64)ddr_bw_val[ddrbw_wr_num] + (u64)ddr_bw_val[ddrbw_rd_num])
* bl / 2 * 100;
do_div(temp64, ddr_bw_val[ddrbw_time_num]);
ddr_bw_ch0->ddr_percent = (uint32)temp64;
ddr_bw_ch0->ddr_time = ddr_bw_val[ddrbw_time_num]/(ddr_freq*1000); /*ms*/
ddr_bw_ch0->ddr_wr = (ddr_bw_val[ddrbw_wr_num]*8*ddr_bw*2)*ddr_freq/ddr_bw_val[ddrbw_time_num];/*Byte/us,MB/s*/
ddr_bw_ch0->ddr_rd = (ddr_bw_val[ddrbw_rd_num]*8*ddr_bw*2)*ddr_freq/ddr_bw_val[ddrbw_time_num];
ddr_bw_ch0->ddr_time = ddr_bw_val[ddrbw_time_num] / (ddr_freq * 1000);
temp64 = ((u64)ddr_bw_val[ddrbw_wr_num] * bl * ddr_bw * 2) * ddr_freq;
do_div(temp64, ddr_bw_val[ddrbw_time_num]);
ddr_bw_ch0->ddr_wr = (uint32)temp64;
temp64 = ((u64)ddr_bw_val[ddrbw_rd_num] * bl * ddr_bw * 2) * ddr_freq;
do_div(temp64, ddr_bw_val[ddrbw_time_num]);
ddr_bw_ch0->ddr_rd = (uint32)temp64;
ddr_bw_ch0->ddr_act = ddr_bw_val[ddrbw_act_num];
ddr_bw_ch0->ddr_total = ddr_freq*2*ddr_bw*2;
ddr_bw_ch0->ddr_total = ddr_freq * 2 * ddr_bw * 2;
end:
ddr_dfi_monitor_strat();
}