shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

ddrfreq: separate ddr from clk frame to fix dead lock and advance performance

Browse Source
This commit is contained in:
陈亮
2014-05-21 02:11:06 -07:00
parent 129ae0dd4f
commit 7dc0b3f526
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
arch/arm/mach-rockchip/ddr_freq.c
View File

@@ -26,6 +26,7 @@
#include <asm/io.h>
#include <linux/rockchip/grf.h>
#include <linux/rockchip/iomap.h>
#include <linux/clk-private.h>
#include "../../../drivers/clk/rockchip/clk-pd.h"
extern int rockchip_cpufreq_reboot_limit_freq(void);
@@ -734,6 +735,20 @@ int of_init_ddr_freq_table(void)
return 0;
}
static int ddrfreq_scale_rate_for_dvfs(struct clk *clk, unsigned long rate)
{
unsigned long real_rate;
real_rate = ddr_change_freq(rate/MHZ);
real_rate *= MHZ;
if (!real_rate)
return -EAGAIN;
clk->parent->rate = clk->rate = real_rate;
return 0;
}
#if defined(CONFIG_RK_PM_TESTS)
static void ddrfreq_tst_init(void);
#endif
@@ -758,6 +773,8 @@ static int ddrfreq_init(void)
return -EINVAL;
}
clk_enable_dvfs(ddr.clk_dvfs_node);
dvfs_clk_register_set_rate_callback(ddr.clk_dvfs_node, ddrfreq_scale_rate_for_dvfs);
init_waitqueue_head(&ddr.wait);
INIT_LIST_HEAD(&ddr.video_info_list);

12
arch/arm/mach-rockchip/dvfs.c
View File

@@ -341,7 +341,7 @@ static void dvfs_table_round_clk_rate(struct dvfs_node *clk_dvfs_node)
//ddr rate = real rate+flags
flags = clk_dvfs_node->dvfs_table[i].frequency%1000;
rate = (clk_dvfs_node->dvfs_table[i].frequency/1000)*1000;
temp_rate = clk_round_rate(clk_dvfs_node->clk, rate*1000);
temp_rate = __clk_round_rate(clk_dvfs_node->clk, rate*1000);
if(temp_rate <= 0){
DVFS_WARNING("%s: clk(%s) rate %d round return %d\n",
__func__, clk_dvfs_node->name, clk_dvfs_node->dvfs_table[i].frequency, temp_rate);
@@ -564,7 +564,7 @@ int dvfs_clk_enable_limit(struct dvfs_node *clk_dvfs_node, unsigned int min_rate
}
if (clk_dvfs_node->last_set_rate == 0)
rate = clk_get_rate(clk_dvfs_node->clk);
rate = __clk_get_rate(clk_dvfs_node->clk);
else
rate = clk_dvfs_node->last_set_rate;
ret = clk_dvfs_node->vd->vd_dvfs_target(clk_dvfs_node, rate);
@@ -865,8 +865,8 @@ static int dvfs_target(struct dvfs_node *clk_dvfs_node, unsigned long rate)
}
rate = dvfs_get_limit_rate(clk_dvfs_node, rate);
new_rate = clk_round_rate(clk, rate);
old_rate = clk_get_rate(clk);
new_rate = __clk_round_rate(clk, rate);
old_rate = __clk_get_rate(clk);
if (new_rate == old_rate)
return 0;
@@ -908,7 +908,7 @@ static int dvfs_target(struct dvfs_node *clk_dvfs_node, unsigned long rate)
clk_dvfs_node->set_freq = new_rate / 1000;
DVFS_DBG("%s:dvfs clk(%s) set rate %lu ok\n",
__func__, clk_dvfs_node->name, clk_get_rate(clk));
__func__, clk_dvfs_node->name, __clk_get_rate(clk));
/* if down the rate */
if (new_rate < old_rate) {
@@ -926,7 +926,7 @@ out:
unsigned long dvfs_clk_get_rate(struct dvfs_node *clk_dvfs_node)
{
return clk_get_rate(clk_dvfs_node->clk);
return __clk_get_rate(clk_dvfs_node->clk);
}
EXPORT_SYMBOL_GPL(dvfs_clk_get_rate);