ASV support for Exynos4 series
Subsystems (3)
v2 cover ASV support for Exynos4 series
Each SoC has specification.For example voltage or ids current.
These values are related to production process.
If you have a good specification SoC, you can supply lower voltage into SoC.
Also, If your SoC has bad specification, you have to supply higher voltage into SoC.
So, after get these SoC specification value on initialize time, we can use these value to fix voltage for running SoC. Using by this patch set, Exynos4210 can get SoC specification and adjust voltage.
[PATCH V2 1/3] ARM: EXYNOS4: Add ASV feature for Exynos4 series [PATCH V2 2/3] ARM: EXYNOS4: Add clock for Exynos4210 asv feature [PATCH V2 3/3] ARM: EXYNOS4: Support ASV for Exynos4210
PATCH v2 1/3 ARM: EXYNOS4: Add ASV feature for Exynos4 series
This patch adds ASV feature for exynos4 series.
ASV(Adaptive support voltage) feature support to get spec of SoC. And we can use to adjust voltage for operation SoC using by ASV result.
--- arch/arm/mach-exynos4/Makefile | 1 + arch/arm/mach-exynos4/asv.c | 66 ++++++++++++++++++++++++++++++ arch/arm/mach-exynos4/include/mach/asv.h | 40 ++++++++++++++++++ 3 files changed, 107 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-exynos4/asv.c create mode 100644 arch/arm/mach-exynos4/include/mach/asv.h
arch/arm/mach-exynos4/Makefile +1 -0
@@ -18,6 +18,7 @@ obj-$(CONFIG_CPU_EXYNOS4210) += clock-exynos4210.o obj-$(CONFIG_SOC_EXYNOS4212) += clock-exynos4212.o obj-$(CONFIG_PM) += pm.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o +obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ) += asv.o obj-$(CONFIG_SMP) += platsmp.o headsmp.o
arch/arm/mach-exynos4/asv.c new file +66 -0
66 lines not on this page · raw message
arch/arm/mach-exynos4/include/mach/asv.h new file +40 -0
@@ -0,0 +1,40 @@ +/* linux/arch/arm/mach-exynos4/include/mach/asv.h +* +* Copyright (c) 2011 Samsung Electronics Co., Ltd. +* http://www.samsung.com/ +* +* EXYNOS4 - Adaptive Support Voltage Header file +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#ifndef __ASM_ARCH_ASV_H +#define __ASM_ARCH_ASV_H __FILE__ + +#define JUDGE_TABLE_END NULL + +struct asv_judge_table { +unsigned int hpm_limit;/* HPM value to decide group of target */ +unsigned int ids_limit;/* IDS value to decide group of target */ +}; + +struct samsung_asv { +unsigned int pkg_id;/* fused value for chip */ +unsigned int ids_offset;/* ids_offset of chip */ +unsigned int ids_mask;/* ids_mask of chip */ +unsigned int hpm_result;/* hpm value of chip */ +unsigned int ids_result;/* ids value of chip */ +int (*check_vdd_arm)(void );/* check vdd_arm value, this function is selectable */ +int (*pre_clock_init)(void );/* clock init function to get hpm */ +int (*pre_clock_setup)(void );/* clock setup function to get hpm */ +/* specific get ids function */ +int (*get_ids)(struct samsung_asv *asv_info); +/* specific get hpm function */ +int (*get_hpm)(struct samsung_asv *asv_info); +/* store into some repository to send result of asv */ +int (*store_result)(struct samsung_asv *asv_info); +}; + +#endif /* __ASM_ARCH_ASV_H */
Signature · 1 line
1.7.1
PATCH 1/3 ARM: EXYNOS4: Add ASV feature for Exynos4 series
Quoted 6 lines · Jongpill Lee
This patch adds ASV feature for exynos4 series.
ASV(Adaptive support voltage) feature support to get spec of SoC. And we can use to adjust voltage for operation SoC using by ASV result.Signed-off-by Jongpill Lee<[email protected]>---
...
Quoted 39 lines
arch/arm/mach-exynos4/asv.c new file +33
-0@@ -0,0 +1,66 @@ +/* linux/arch/arm/mach-exynos4/asv.c +* +* Copyright (c) 2011 Samsung Electronics Co., Ltd. +* http://www.samsung.com/ +* +* EXYNOS4 - ASV(Adaptive Support Voltage) driver +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#include <linux/init.h> +#include <linux/types.h> +#include <linux/kernel.h> +#include <linux/err.h> +#include <linux/io.h> +#include <linux/slab.h> + +#include <mach/map.h> +#include <mach/asv.h> + +static struct samsung_asv *exynos_asv; + +static int __init exynos_asv_init (void ) +{ + exynos_asv =kzalloc (sizeof (struct samsung_asv ),GFP_KERNEL ); +if (!exynos_asv) +return -ENOMEM ; + +/* I will add asv driver of exynos4 series to regist */ + +if (exynos_asv->check_vdd_arm) {
arch/arm/mach-exynos4/asv.c line 43
Quoted 10 lines
arch/arm/mach-exynos4/asv.c new file +10
-0+if (exynos_asv->check_vdd_arm ()) + goto out; + } + +/* Get HPM Delay value */ +if (exynos_asv->get_hpm) { +if (exynos_asv->get_hpm (exynos_asv)) + goto out; + }else + goto out;
The 'else' statements should also be enclosed in brackets, according to the coding style rules. How about just doing:
if (!exynos_asv->get_hpm || exynos_asv->get_hpm(exynos_asv)) goto out;
?
Quoted 22 lines
arch/arm/mach-exynos4/asv.c new file +22
-0+ +/* Get IDS ARM Value */ +if (exynos_asv->get_ids) { +if (exynos_asv->get_ids (exynos_asv)) + goto out; + }else + goto out; + +if (exynos_asv->store_result) { +if (exynos_asv->store_result (exynos_asv)) + goto out; + }else + goto out; + +return 0 ; +out: +pr_err ("EXYNOS : Fail to initialize ASV\n" ); + +kfree (exynos_asv); + +return -EINVAL ; +}
...
PATCH v2 2/3 ARM: EXYNOS4: Add clock for Exynos4210 asv feature
In reply to Jongpill LeeThis patch adds clock for exynos4210 asv feature which name is sclk_pwi,sclk_hpm,dout_copy. These clock is used for HPM devices. Also These clock is always on.
--- arch/arm/mach-exynos4/clock.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-)
arch/arm/mach-exynos4/clock.c +34 -1
@@ -306,6 +306,25 @@ static struct clksrc_clk clk_periphclk = { .reg_div = { .reg = S5P_CLKDIV_CPU, .shift = 12, .size = 3 }, }; +static struct clk *clkset_mout_hpm_list[] = { + [0 ] = &clk_mout_apll.clk, + [1 ] = &clk_mout_mpll.clk, +}; + +static struct clksrc_sources clkset_sclk_hpm = { + .sources = clkset_mout_hpm_list, + .nr_sources =ARRAY_SIZE (clkset_mout_hpm_list), +}; + +static struct clksrc_clk clk_dout_copy = { + .clk = { + .name ="dout_copy" , + }, + .sources = &clkset_sclk_hpm, + .reg_src = { .reg =S5P_CLKSRC_CPU , .shift =20 , .size =1 }, + .reg_div = { .reg =S5P_CLKDIV_CPU1 , .shift =0 , .size =3 }, +}; +/* Core list of CMU_CORE side */ struct clk *clkset_corebus_list[] = {
@@ -1239,7 +1258,20 @@ static struct clksrc_clk clksrcs[] = { .ctrlbit = (1 << 16), }, .reg_div = { .reg = S5P_CLKDIV_FSYS3, .shift = 8, .size = 8 }, - } + }, { + .clk = { + .name = "sclk_hpm", + .parent = &clk_dout_copy.clk, + }, + .reg_div = { .reg = S5P_CLKDIV_CPU1, .shift = 4, .size = 3 }, + }, { + .clk = { + .name = "sclk_pwi", + }, + .sources = &clkset_group, + .reg_src = { .reg = S5P_CLKSRC_DMC, .shift = 16, .size = 4 }, + .reg_div = { .reg = S5P_CLKDIV_DMC1, .shift = 8, .size = 4 }, + }, };/* Clock initialization code */
@@ -1253,6 +1285,7 @@ static struct clksrc_clk *sysclks[] = { &clk_armclk, &clk_aclk_corem0, &clk_aclk_cores, + &clk_dout_copy, &clk_aclk_corem1, &clk_periphclk, &clk_mout_corebus,
Signature · 1 line
1.7.1
PATCH v2 3/3 ARM: EXYNOS4: Support ASV for Exynos4210
In reply to Jongpill LeeThis patch adds function for exynos4210's asv driver. On Exynos4210, we can get ASV result using by HPM and IDS value. If you want to use asv result on your driver, please define exynos_result_of_asv with extern.
--- arch/arm/mach-exynos4/Makefile | 2 +- arch/arm/mach-exynos4/asv-4210.c | 339 +++++++++++++++++++++++ arch/arm/mach-exynos4/asv.c | 9 +- arch/arm/mach-exynos4/include/mach/asv.h | 3 + arch/arm/mach-exynos4/include/mach/map.h | 2 + arch/arm/mach-exynos4/include/mach/regs-clock.h | 18 ++ arch/arm/mach-exynos4/include/mach/regs-iem.h | 27 ++ 7 files changed, 397 insertions(+), 3 deletions(-) create mode 100644 arch/arm/mach-exynos4/asv-4210.c create mode 100644 arch/arm/mach-exynos4/include/mach/regs-iem.h
arch/arm/mach-exynos4/Makefile +1 -1
@@ -18,7 +18,7 @@ obj-$(CONFIG_CPU_EXYNOS4210) += clock-exynos4210.o obj-$(CONFIG_SOC_EXYNOS4212) += clock-exynos4212.o obj-$(CONFIG_PM) += pm.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o -obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ) += asv.o +obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ) += asv.o asv-4210.o obj-$(CONFIG_SMP) += platsmp.o headsmp.o
arch/arm/mach-exynos4/asv-4210.c new file +339 -0
339 lines not on this page · raw message
arch/arm/mach-exynos4/asv.c +7 -2
@@ -17,6 +17,8 @@#include <linux/io.h> #include <linux/slab.h> +#include <plat/cpu.h> +#include <mach/map.h> #include <mach/asv.h>
@@ -26,9 +28,12 @@ static int __init exynos_asv_init(void) { exynos_asv =kzalloc (sizeof (struct samsung_asv ),GFP_KERNEL );if (!exynos_asv) -return -ENOMEM ; + goto out; -/* I will add asv driver of exynos4 series to regist */ +if (soc_is_exynos4210 ()) +exynos4210_asv_init (exynos_asv); +else + goto out;if (exynos_asv->check_vdd_arm) {if (exynos_asv->check_vdd_arm ())
arch/arm/mach-exynos4/include/mach/asv.h +3 -0
@@ -14,6 +14,7 @@#define __ASM_ARCH_ASV_H __FILE__#define JUDGE_TABLE_END NULL +#define EXYNOS4_LOOP_CNT 10struct asv_judge_table {unsigned int hpm_limit;/* HPM value to decide group of target */
@@ -37,4 +38,6 @@ struct samsung_asv { int (*store_result)(struct samsung_asv *asv_info); }; +extern void exynos4210_asv_init (struct samsung_asv *asv_info); +#endif /* __ASM_ARCH_ASV_H */
arch/arm/mach-exynos4/include/mach/map.h +2 -0
@@ -60,6 +60,8 @@#define EXYNOS4_PA_COMBINER 0x10440000 +#define EXYNOS4_PA_IEM 0x10460000 +#define EXYNOS4_PA_GIC_CPU 0x10480000#define EXYNOS4_PA_GIC_DIST 0x10490000
arch/arm/mach-exynos4/include/mach/regs-clock.h +18 -0
@@ -130,6 +130,24 @@#define S5P_CLKGATE_SCLKCPU S5P_CLKREG(0x14800)#define S5P_CLKGATE_IP_CPU S5P_CLKREG(0x14900) +#define S5P_APLL_CON0L8 S5P_CLKREG(0x15100) +#define S5P_APLL_CON0L7 S5P_CLKREG(0x15104) +#define S5P_APLL_CON0L6 S5P_CLKREG(0x15108) +#define S5P_APLL_CON0L5 S5P_CLKREG(0x1510C) +#define S5P_APLL_CON0L4 S5P_CLKREG(0x15110) +#define S5P_APLL_CON0L3 S5P_CLKREG(0x15114) +#define S5P_APLL_CON0L2 S5P_CLKREG(0x15118) +#define S5P_APLL_CON0L1 S5P_CLKREG(0x1511C) + +#define S5P_CLKDIV_IEM_L8 S5P_CLKREG(0x15300) +#define S5P_CLKDIV_IEM_L7 S5P_CLKREG(0x15304) +#define S5P_CLKDIV_IEM_L6 S5P_CLKREG(0x15308) +#define S5P_CLKDIV_IEM_L5 S5P_CLKREG(0x1530C) +#define S5P_CLKDIV_IEM_L4 S5P_CLKREG(0x15310) +#define S5P_CLKDIV_IEM_L3 S5P_CLKREG(0x15314) +#define S5P_CLKDIV_IEM_L2 S5P_CLKREG(0x15318) +#define S5P_CLKDIV_IEM_L1 S5P_CLKREG(0x1531C) +#define S5P_APLL_LOCKTIME (0x1C20)/* 300us */ #define S5P_APLLCON0_ENABLE_SHIFT (31)
arch/arm/mach-exynos4/include/mach/regs-iem.h new file +27 -0
@@ -0,0 +1,27 @@ +/* linux/arch/arm/mach-exynos/include/mach/regs-iem.h +* +* Copyright (c) 2011 Samsung Electronics Co., Ltd. +* http://www.samsung.com/ +* +* EXYNOS4 - IEM(INTELLIGENT ENERGY MANAGEMENT) register discription +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#ifndef __ASM_ARCH_REGS_IEM_H +#define __ASM_ARCH_REGS_IEM_H __FILE__ + +/* Register for IEC */ +#define EXYNOS4_IECDPCCR (0x00000) + +/* Register for APC */ +#define EXYNOS4_APC_CONTROL (0x10010) +#define EXYNOS4_APC_PREDLYSEL (0x10024) +#define EXYNOS4_APC_DBG_DLYCODE (0x100E0) + +#define APC_HPM_EN (1 << 4) +#define IEC_EN (1 << 0) + +#endif /* __ASM_ARCH_REGS_IEM_H */
Signature · 1 line
1.7.1
PATCH 3/3 ARM: EXYNOS4: Support ASV for Exynos4210
Quoted 4 lines · Jongpill Lee
This patch adds function for exynos4210's asv driver. On Exynos4210, we can get ASV result using by HPM and IDS value. If you want to use asv result on your driver, please define
exynos_result_of_asvwith extern.
Thank you! Looks much better with a variable than a register. At least, it's now fully compatible with DVFS drivers. :) I'll add a devfreq driver for Exynos4210 bus soon.
Quoted 502 lines
Signed-off-by Jongpill Lee <[email protected]>---
?arch/arm/mach-exynos4/Makefile ? ? ? ? ? ? ? ? ?| ? ?2 +- ?arch/arm/mach-exynos4/asv-4210.c ? ? ? ? ? ? ? ?| ?339 +++++++++++++++++++++++ ?arch/arm/mach-exynos4/asv.c ? ? ? ? ? ? ? ? ? ? | ? ?9 +- ?arch/arm/mach-exynos4/include/mach/asv.h ? ? ? ?| ? ?3 + ?arch/arm/mach-exynos4/include/mach/map.h ? ? ? ?| ? ?2 + ?arch/arm/mach-exynos4/include/mach/regs-clock.h | ? 18 ++ ?arch/arm/mach-exynos4/include/mach/regs-iem.h ? | ? 27 ++?7 files changed, 397 insertions(+), 3 deletions(-) ?create mode 100644
arch/arm/mach-exynos4/asv-4210.c?create mode 100644arch/arm/mach-exynos4/include/mach/regs-iem.harch/arm/mach-exynos4/Makefile +0
-0@@ -18,7 +18,7 @@ obj-$(CONFIG_CPU_EXYNOS4210) ?+= clock-exynos4210.o?obj-$(CONFIG_SOC_EXYNOS4212) ? += clock-exynos4212.o ?obj-$(CONFIG_PM) ? ? ? ? ? ? ? += pm.o ?obj-$(CONFIG_CPU_IDLE) ? ? ? ? += cpuidle.o
arch/arm/mach-exynos4/Makefile +1
-1-obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ) ? += asv.o +obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ) ? += asv.o asv-4210.o?obj-$(CONFIG_SMP) ? ? ? ? ? ? ?+= platsmp.o headsmp.o
arch/arm/mach-exynos4/asv-4210.c new file +339
-0@@ -0,0 +1,339 @@ +/* linux/arch/arm/mach-exynos/asv-4210.c +* +* Copyright (c) 2011 Samsung Electronics Co., Ltd. +* ? ? ? ? ? ? http://www.samsung.com/ +* +* EXYNOS4210 - ASV(Adaptive Support Voltage) driver +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#include <linux/init.h> +#include <linux/types.h> +#include <linux/kernel.h> +#include <linux/err.h> +#include <linux/clk.h> +#include <linux/io.h> + +#include <plat/clock.h> + +#include <mach/regs-iem.h> +#include <mach/regs-clock.h> +#include <mach/asv.h> + +/* +* exynos_result_of_asv is result of ASV group. +* Using by this value, other driver can adjust voltage. +*/ +unsigned int exynos_result_of_asv; + +enum target_asv { + ? ? ? EXYNOS4210_1200, + ? ? ? EXYNOS4210_1400, + ? ? ? EXYNOS4210_SINGLE_1200, +}; + +struct asv_judge_table exynos4210_1200_limit[] = { + ? ? ? /* HPM , IDS */ + ? ? ? {8 , 4}, + ? ? ? {11 , 8}, + ? ? ? {14 , 12}, + ? ? ? {18 , 17}, + ? ? ? {21 , 27}, + ? ? ? {23 , 45}, + ? ? ? {25 , 55}, +}; + +static struct asv_judge_table exynos4210_1400_limit[] = { + ? ? ? /* HPM , IDS */ + ? ? ? {13 , 8}, + ? ? ? {17 , 12}, + ? ? ? {22 , 32}, + ? ? ? {26 , 52}, +}; + +static struct asv_judge_table exynos4210_single_1200_limit[] = { + ? ? ? /* HPM , IDS */ + ? ? ? {8 , 4}, + ? ? ? {14 , 12}, + ? ? ? {21 , 27}, + ? ? ? {25 , 55}, +}; + +static int exynos4210_asv_pre_clock_init (void ) +{ + ? ? ? struct clk *clk_hpm; + ? ? ? struct clk *clk_copy; + ? ? ? struct clk *clk_parent; + + ? ? ? /* PWI clock setting */ + ? ? ? clk_copy = clk_get(NULL, "sclk_pwi"); + ? ? ? if (IS_ERR(clk_copy)) + ? ? ? ? ? ? ? goto clock_fail; + ? ? ? else { + ? ? ? ? ? ? ? clk_parent = clk_get(NULL, "xusbxti"); + + ? ? ? ? ? ? ? if (IS_ERR(clk_parent)) { + ? ? ? ? ? ? ? ? ? ? ? clk_put(clk_copy); + + ? ? ? ? ? ? ? ? ? ? ? goto clock_fail; + ? ? ? ? ? ? ? } + ? ? ? ? ? ? ? if (clk_set_parent(clk_copy, clk_parent)) + ? ? ? ? ? ? ? ? ? ? ? goto clock_fail; + + ? ? ? ? ? ? ? clk_put(clk_parent); + ? ? ? } + ? ? ? clk_set_rate(clk_copy, (48 * MHZ)); + + ? ? ? clk_put(clk_copy); + + ? ? ? /* HPM clock setting */ + ? ? ? clk_copy = clk_get(NULL, "dout_copy"); + ? ? ? if (IS_ERR(clk_copy)) + ? ? ? ? ? ? ? goto clock_fail; + ? ? ? else { + ? ? ? ? ? ? ? clk_parent = clk_get(NULL, "mout_mpll"); + ? ? ? ? ? ? ? if (IS_ERR(clk_parent)) { + ? ? ? ? ? ? ? ? ? ? ? clk_put(clk_copy); + + ? ? ? ? ? ? ? ? ? ? ? goto clock_fail; + ? ? ? ? ? ? ? } + ? ? ? ? ? ? ? if (clk_set_parent(clk_copy, clk_parent)) + ? ? ? ? ? ? ? ? ? ? ? goto clock_fail; + + ? ? ? ? ? ? ? clk_put(clk_parent); + ? ? ? } + + ? ? ? clk_set_rate(clk_copy, (400 * MHZ)); + + ? ? ? clk_put(clk_copy); + + ? ? ? clk_hpm = clk_get(NULL, "sclk_hpm"); + ? ? ? if (IS_ERR(clk_hpm)) + ? ? ? ? ? ? ? goto clock_fail; + + ? ? ? clk_set_rate(clk_hpm, (200 * MHZ)); + + ? ? ? clk_put(clk_hpm); + + ? ? ? return 0; + +clock_fail: + ? ? ? pr_err("EXYNOS4210: ASV: Clock init fail\n"); + + ? ? ? return -EBUSY; +} + +static int exynos4210_asv_pre_clock_setup (void ) +{ + ? ? ? /* APLL_CON0 level register */ + ? ? ? __raw_writel(0x80FA0601, S5P_APLL_CON0L8); + ? ? ? __raw_writel(0x80C80601, S5P_APLL_CON0L7); + ? ? ? __raw_writel(0x80C80602, S5P_APLL_CON0L6); + ? ? ? __raw_writel(0x80C80604, S5P_APLL_CON0L5); + ? ? ? __raw_writel(0x80C80601, S5P_APLL_CON0L4); + ? ? ? __raw_writel(0x80C80601, S5P_APLL_CON0L3); + ? ? ? __raw_writel(0x80C80601, S5P_APLL_CON0L2); + ? ? ? __raw_writel(0x80C80601, S5P_APLL_CON0L1); + + ? ? ? /* IEM Divider register */ + ? ? ? __raw_writel(0x00500000, S5P_CLKDIV_IEM_L8); + ? ? ? __raw_writel(0x00500000, S5P_CLKDIV_IEM_L7); + ? ? ? __raw_writel(0x00500000, S5P_CLKDIV_IEM_L6); + ? ? ? __raw_writel(0x00500000, S5P_CLKDIV_IEM_L5); + ? ? ? __raw_writel(0x00500000, S5P_CLKDIV_IEM_L4); + ? ? ? __raw_writel(0x00500000, S5P_CLKDIV_IEM_L3); + ? ? ? __raw_writel(0x00500000, S5P_CLKDIV_IEM_L2); + ? ? ? __raw_writel(0x00500000, S5P_CLKDIV_IEM_L1); + + ? ? ? return 0; +} + +static int exynos4210_find_group (struct samsung_asv *asv_info, + ? ? ? ? ? ? ? ? ? ? ? ? ? ? enum target_asv exynos4_target) +{ + ? ? ? unsigned int ret = 0; + ? ? ? unsigned int i; + + ? ? ? if (exynos4_target == EXYNOS4210_1200) { + ? ? ? ? ? ? ? ret = ARRAY_SIZE(exynos4210_1200_limit); + + ? ? ? ? ? ? ? for (i = 0; i < ARRAY_SIZE(exynos4210_1200_limit); i++) { + ? ? ? ? ? ? ? ? ? ? ? if (asv_info->hpm_result <= exynos4210_1200_limit[i].hpm_limit || + ? ? ? ? ? ? ? ? ? ? ? ? ?asv_info->ids_result <= exynos4210_1200_limit[i].ids_limit) { + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ret = i; + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? break; + ? ? ? ? ? ? ? ? ? ? ? } + ? ? ? ? ? ? ? } + ? ? ? } else if (exynos4_target == EXYNOS4210_1400) { + ? ? ? ? ? ? ? ret = ARRAY_SIZE(exynos4210_1400_limit); + + ? ? ? ? ? ? ? for (i = 0; i < ARRAY_SIZE(exynos4210_1400_limit); i++) { + ? ? ? ? ? ? ? ? ? ? ? if (asv_info->hpm_result <= exynos4210_1400_limit[i].hpm_limit || + ? ? ? ? ? ? ? ? ? ? ? ? ?asv_info->ids_result <= exynos4210_1400_limit[i].ids_limit) { + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ret = i; + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? break; + ? ? ? ? ? ? ? ? ? ? ? } + ? ? ? ? ? ? ? } + ? ? ? } else if (exynos4_target == EXYNOS4210_SINGLE_1200) { + ? ? ? ? ? ? ? ret = ARRAY_SIZE(exynos4210_single_1200_limit); + + ? ? ? ? ? ? ? for (i = 0; i < ARRAY_SIZE(exynos4210_single_1200_limit); i++) { + ? ? ? ? ? ? ? ? ? ? ? if (asv_info->hpm_result <= exynos4210_single_1200_limit[i].hpm_limit || + ? ? ? ? ? ? ? ? ? ? ? ? ?asv_info->ids_result <= exynos4210_single_1200_limit[i].ids_limit) { + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ret = i; + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? break; + ? ? ? ? ? ? ? ? ? ? ? } + ? ? ? ? ? ? ? } + ? ? ? } + + ? ? ? return ret; +} + +#define PACK_ID ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?8 +#define PACK_MASK ? ? ? ? ? ? ? ? ? ? ?0x3 + +#define SUPPORT_1400MHZ ? ? ? ? ? ? ? ? ? ? ? ?(1 << 31) +#define SUPPORT_1200MHZ ? ? ? ? ? ? ? ? ? ? ? ?(1 << 30) +#define SUPPORT_1000MHZ ? ? ? ? ? ? ? ? ? ? ? ?(1 << 29) + +static int exynos4210_get_hpm (struct samsung_asv *asv_info) +{ + ? ? ? unsigned int i; + ? ? ? unsigned int tmp; + ? ? ? unsigned int hpm_delay = 0; + ? ? ? void __iomem *iem_base; + + ? ? ? iem_base = ioremap(EXYNOS4_PA_IEM, SZ_128K); + + ? ? ? if (!iem_base) { + ? ? ? ? ? ? ? pr_err("EXYNOS4210: ASV: ioremap fail\n"); + ? ? ? ? ? ? ? return -EPERM; + ? ? ? } + + ? ? ? /* Clock setting to get asv value */ + ? ? ? if (!asv_info->pre_clock_init) + ? ? ? ? ? ? ? goto err; + ? ? ? else { + ? ? ? ? ? ? ? if (asv_info->pre_clock_init()) + ? ? ? ? ? ? ? ? ? ? ? goto err; + ? ? ? ? ? ? ? else { + ? ? ? ? ? ? ? ? ? ? ? /* HPM enable ?*/ + ? ? ? ? ? ? ? ? ? ? ? tmp = __raw_readl(iem_base + EXYNOS4_APC_CONTROL); + ? ? ? ? ? ? ? ? ? ? ? tmp |= APC_HPM_EN; + ? ? ? ? ? ? ? ? ? ? ? __raw_writel(tmp, (iem_base + EXYNOS4_APC_CONTROL)); + + ? ? ? ? ? ? ? ? ? ? ? asv_info->pre_clock_setup(); + + ? ? ? ? ? ? ? ? ? ? ? /* IEM enable */ + ? ? ? ? ? ? ? ? ? ? ? tmp = __raw_readl(iem_base + EXYNOS4_IECDPCCR); + ? ? ? ? ? ? ? ? ? ? ? tmp |= IEC_EN; + ? ? ? ? ? ? ? ? ? ? ? __raw_writel(tmp, (iem_base + EXYNOS4_IECDPCCR)); + ? ? ? ? ? ? ? } + ? ? ? } + + ? ? ? /* Get HPM Delay value */ + ? ? ? for (i = 0; i < EXYNOS4_LOOP_CNT; i++) { + ? ? ? ? ? ? ? tmp = __raw_readb(iem_base + EXYNOS4_APC_DBG_DLYCODE); + ? ? ? ? ? ? ? hpm_delay += tmp; + ? ? ? } + + ? ? ? hpm_delay /= EXYNOS4_LOOP_CNT; + + ? ? ? /* Store result of hpm value */ + ? ? ? asv_info->hpm_result = hpm_delay; + + ? ? ? return 0; + +err: + ? ? ? pr_err("EXYNOS4210: ASV: Failt to get hpm function\n"); + + ? ? ? iounmap(iem_base); + + ? ? ? return -EPERM; +} + +static int exynos4210_get_ids (struct samsung_asv *asv_info) +{ + ? ? ? unsigned int pkg_id_val; + + ? ? ? if (!asv_info->ids_offset || !asv_info->ids_mask) { + ? ? ? ? ? ? ? pr_err("EXYNOS4210: ASV: No ids_offset or No ids_mask\n"); + + ? ? ? ? ? ? ? return -EPERM; + ? ? ? } + + ? ? ? pkg_id_val = __raw_readl(S5P_VA_CHIPID + 0x4); + ? ? ? asv_info->pkg_id = pkg_id_val; + ? ? ? asv_info->ids_result = ((pkg_id_val >> asv_info->ids_offset) & + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? asv_info->ids_mask); + + ? ? ? return 0; +} + +static int exynos4210_asv_store_result (struct samsung_asv *asv_info) +{ + ? ? ? unsigned int result_grp; + ? ? ? char *support_freq; + ? ? ? unsigned int exynos_idcode = 0x0; + + ? ? ? exynos_result_of_asv = 0; + + ? ? ? exynos_idcode = __raw_readl(S5P_VA_CHIPID); + + ? ? ? /* Single chip is only support 1.2GHz */ + ? ? ? if (!((exynos_idcode >> PACK_ID) & PACK_MASK)) { + ? ? ? ? ? ? ? result_grp = exynos4210_find_group(asv_info, EXYNOS4210_SINGLE_1200); + ? ? ? ? ? ? ? result_grp |= SUPPORT_1200MHZ; + ? ? ? ? ? ? ? support_freq = "1.2GHz"; + + ? ? ? ? ? ? ? goto set_reg; + ? ? ? } + + ? ? ? /* Check support freq */ + ? ? ? switch (asv_info->pkg_id & 0x7) { + ? ? ? /* Support 1.2GHz */ + ? ? ? case 1: + ? ? ? case 7: + ? ? ? ? ? ? ? result_grp = exynos4210_find_group(asv_info, EXYNOS4210_1200); + ? ? ? ? ? ? ? result_grp |= SUPPORT_1200MHZ; + ? ? ? ? ? ? ? support_freq = "1.2GHz"; + ? ? ? ? ? ? ? break; + ? ? ? /* Support 1.4GHz */ + ? ? ? case 5: + ? ? ? ? ? ? ? result_grp = exynos4210_find_group(asv_info, EXYNOS4210_1400); + ? ? ? ? ? ? ? result_grp |= SUPPORT_1200MHZ; + ? ? ? ? ? ? ? support_freq = "1.4GHz"; + ? ? ? ? ? ? ? break; + ? ? ? /* Defalut support 1.0GHz */ + ? ? ? default: + ? ? ? ? ? ? ? result_grp = exynos4210_find_group(asv_info, EXYNOS4210_1200); + ? ? ? ? ? ? ? result_grp |= SUPPORT_1000MHZ; + ? ? ? ? ? ? ? support_freq = "1.0GHz"; + ? ? ? ? ? ? ? break; + ? ? ? } + +set_reg: + ? ? ? exynos_result_of_asv = result_grp; + + ? ? ? pr_info("EXYNOS4: ASV: Support %s and Group is 0x%x\n", + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? support_freq, result_grp); + + ? ? ? return 0; +} + +void exynos4210_asv_init (struct samsung_asv *asv_info) +{ + ? ? ? pr_info("EXYNOS4210: Adaptive Support Voltage init\n"); + + ? ? ? asv_info->ids_offset = 24; + ? ? ? asv_info->ids_mask = 0xFF; + + ? ? ? asv_info->get_ids = exynos4210_get_ids; + ? ? ? asv_info->get_hpm = exynos4210_get_hpm; + ? ? ? asv_info->pre_clock_init = exynos4210_asv_pre_clock_init; + ? ? ? asv_info->pre_clock_setup = exynos4210_asv_pre_clock_setup; + ? ? ? asv_info->store_result = exynos4210_asv_store_result; +}arch/arm/mach-exynos4/asv.c +0
-0@@ -17,6 +17,8 @@?#include <
linux/io.h>
?#include <linux/slab.h>arch/arm/mach-exynos4/asv.c +2
-0+#include <plat/cpu.h> +?#include <
mach/map.h>
?#include <mach/asv.h>arch/arm/mach-exynos4/asv.c +5
-2@@ -26,9 +28,12 @@ static int __init exynos_asv_init(void) ?{ ? ? ? ?exynos_asv = kzalloc(sizeof(struct samsung_asv), GFP_KERNEL); ? ? ? ?if (!exynos_asv) - ? ? ? ? ? ? ? return -ENOMEM; + ? ? ? ? ? ? ? goto out; - ? ? ? /* I will add asv driver of exynos4 series to regist */ + ? ? ? if (soc_is_exynos4210()) + ? ? ? ? ? ? ? exynos4210_asv_init(exynos_asv); + ? ? ? else + ? ? ? ? ? ? ? goto out; ? ? ? ?if (exynos_asv->check_vdd_arm) { ? ? ? ? ? ? ? ?if (exynos_asv->check_vdd_arm())arch/arm/mach-exynos4/include/mach/asv.h +0
-0@@ -14,6 +14,7 @@?#define
__ASM_ARCH_ASV_H__FILE__?#define
JUDGE_TABLE_END? ? ? ? ? ? ? ? ? ? ? ?NULL +#defineEXYNOS4_LOOP_CNT? ? ? ? ? ? ? 10?struct
asv_judge_table{
? ? ? ?unsigned inthpm_limit; /* HPM value to decide group of target */arch/arm/mach-exynos4/include/mach/asv.h +2
-0@@ -37,4 +38,6 @@ struct samsung_asv { ? ? ? ?int (*store_result)(struct samsung_asv *asv_info); ?}; +extern void exynos4210_asv_init (struct samsung_asv *asv_info); +?#endif /*
__ASM_ARCH_ASV_H*/arch/arm/mach-exynos4/include/mach/map.h +0
-0@@ -60,6 +60,8 @@?#define
EXYNOS4_PA_COMBINER? ? ? ? ? ?0x10440000arch/arm/mach-exynos4/include/mach/map.h +2
-0+#define EXYNOS4_PA_IEM ? ? ? ? ? ? ? ? 0x10460000 +?#define
EXYNOS4_PA_GIC_CPU? ? ? ? ? ?0x10480000?#defineEXYNOS4_PA_GIC_DIST? ? ? ? ? ?0x10490000arch/arm/mach-exynos4/include/mach/regs-clock.h +18
-0@@ -130,6 +130,24 @@ ?#define S5P_CLKGATE_SCLKCPU ? ? ? ? ? ?S5P_CLKREG(0x14800) ?#define S5P_CLKGATE_IP_CPU ? ? ? ? ? ? S5P_CLKREG(0x14900) +#define S5P_APLL_CON0L8 ? ? ? ? ? ? ? ? ? ? ? ?S5P_CLKREG(0x15100) +#define S5P_APLL_CON0L7 ? ? ? ? ? ? ? ? ? ? ? ?S5P_CLKREG(0x15104) +#define S5P_APLL_CON0L6 ? ? ? ? ? ? ? ? ? ? ? ?S5P_CLKREG(0x15108) +#define S5P_APLL_CON0L5 ? ? ? ? ? ? ? ? ? ? ? ?S5P_CLKREG(0x1510C) +#define S5P_APLL_CON0L4 ? ? ? ? ? ? ? ? ? ? ? ?S5P_CLKREG(0x15110) +#define S5P_APLL_CON0L3 ? ? ? ? ? ? ? ? ? ? ? ?S5P_CLKREG(0x15114) +#define S5P_APLL_CON0L2 ? ? ? ? ? ? ? ? ? ? ? ?S5P_CLKREG(0x15118) +#define S5P_APLL_CON0L1 ? ? ? ? ? ? ? ? ? ? ? ?S5P_CLKREG(0x1511C) + +#define S5P_CLKDIV_IEM_L8 ? ? ? ? ? ? ?S5P_CLKREG(0x15300) +#define S5P_CLKDIV_IEM_L7 ? ? ? ? ? ? ?S5P_CLKREG(0x15304) +#define S5P_CLKDIV_IEM_L6 ? ? ? ? ? ? ?S5P_CLKREG(0x15308) +#define S5P_CLKDIV_IEM_L5 ? ? ? ? ? ? ?S5P_CLKREG(0x1530C) +#define S5P_CLKDIV_IEM_L4 ? ? ? ? ? ? ?S5P_CLKREG(0x15310) +#define S5P_CLKDIV_IEM_L3 ? ? ? ? ? ? ?S5P_CLKREG(0x15314) +#define S5P_CLKDIV_IEM_L2 ? ? ? ? ? ? ?S5P_CLKREG(0x15318) +#define S5P_CLKDIV_IEM_L1 ? ? ? ? ? ? ?S5P_CLKREG(0x1531C) +?#define
S5P_APLL_LOCKTIME? ? ? ? ? ? ?(0x1C20) ? ? ? ?/* 300us */?#define
S5P_APLLCON0_ENABLE_SHIFT? ? ?(31)arch/arm/mach-exynos4/include/mach/regs-iem.h new file +27
-1@@ -0,0 +1,27 @@ +/* linux/arch/arm/mach-exynos/include/mach/regs-iem.h +* +* Copyright (c) 2011 Samsung Electronics Co., Ltd. +* ? ? ? ? ? ? http://www.samsung.com/ +* +* EXYNOS4 - IEM(INTELLIGENT ENERGY MANAGEMENT) register discription +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#ifndef __ASM_ARCH_REGS_IEM_H +#define __ASM_ARCH_REGS_IEM_H __FILE__ + +/* Register for IEC ?*/ +#define EXYNOS4_IECDPCCR ? ? ? ? ? ? ? (0x00000) + +/* Register for APC */ +#define EXYNOS4_APC_CONTROL ? ? ? ? ? ?(0x10010) +#define EXYNOS4_APC_PREDLYSEL ? ? ? ? ?(0x10024) +#define EXYNOS4_APC_DBG_DLYCODE ? ? ? ? ? ? ? ?(0x100E0) + +#define APC_HPM_EN ? ? ? ? ? ? ? ? ? ? (1 << 4) +#define IEC_EN ? ? ? ? ? ? ? ? ? ? ? ? (1 << 0) + +#endif /* __ASM_ARCH_REGS_IEM_H */ --1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo at vger.kernel.org
More majordomo info at ?http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
MyungJoo Ham, Ph.D. Mobile Software Platform Lab, DMC Business, Samsung Electronics
PATCH v2 3/3 ARM: EXYNOS4: Support ASV for Exynos4210
In reply to Jongpill LeeQuoted 10 lines · Jongpill Lee
This patch adds function for exynos4210's asv driver. On Exynos4210, we can get ASV result using by HPM and IDS value. If you want to use asv result on your driver, please define
exynos_result_of_asvwith extern.Signed-off-by Jongpill Lee <[email protected]>--- arch/arm/mach-exynos4/Makefile | 2 +- arch/arm/mach-exynos4/asv-4210.c | 339
I would prefer, asv-exynos4210.c like others.
arch/arm/mach-exynos4/Makefile obj-$(CONFIG_CPU_EXYNOS4210) +=
Quoted 16 lines
+++++++++++++++++++++++
arch/arm/mach-exynos4/asv.c | 9 +- arch/arm/mach-exynos4/include/mach/asv.h | 3 + arch/arm/mach-exynos4/include/mach/map.h | 2 + arch/arm/mach-exynos4/include/mach/regs-clock.h | 18 ++ arch/arm/mach-exynos4/include/mach/regs-iem.h | 27 ++ 7 files changed, 397 insertions(+), 3 deletions(-) create mode 100644 arch/arm/mach-exynos4/asv-4210.c create mode 100644 arch/arm/mach-exynos4/include/mach/regs-iem.harch/arm/mach- renamed from arch/arm/mach-exynos4/Makefile +0
-0exynos4/Makefile
index 587ce90..5422b01 100644arch/arm/mach-exynos4/Makefile +0
-0@@ -18,7 +18,7 @@ obj-$(CONFIG_CPU_EXYNOS4210) +=
clock-exynos4210.o
arch/arm/mach-exynos4/Makefile obj-$(CONFIG_CPU_EXYNOS4210) += clock-exynos4210.o · line 21
Quoted 5 lines
arch/arm/mach-exynos4/Makefile +1
-1obj-$(CONFIG_SOC_EXYNOS4212) += clock-exynos4212.o obj-$(CONFIG_PM) += pm.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o -obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ) += asv.o +obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ) += asv.o asv-4210.o
If select 'cpufreq', asv should be enabled?
Quoted 35 lines
arch/arm/mach-exynos4/Makefile +0
-0obj-$(CONFIG_SMP) += platsmp.o headsmp.oarch/arm/mach-exynos4/asv- renamed from arch/arm/mach-exynos4/asv-4210.c +0
-04210.c
new file mode 100644
index 0000000..1260ab8arch/arm/mach-exynos4/asv-4210.c new file +25
-0@@ -0,0 +1,339 @@ +/* linux/arch/arm/mach-exynos/asv-4210.c +* +* Copyright (c) 2011 Samsung Electronics Co., Ltd. +* http://www.samsung.com/ +* +* EXYNOS4210 - ASV(Adaptive Support Voltage) driver +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#include <linux/init.h> +#include <linux/types.h> +#include <linux/kernel.h> +#include <linux/err.h> +#include <linux/clk.h> +#include <linux/io.h> + +#include <plat/clock.h> + +#include <mach/regs-iem.h> +#include <mach/regs-clock.h> +#include <mach/asv.h> +
arch/arm/mach-exynos4/asv-4210.c line 35
Quoted 10 lines
arch/arm/mach-exynos4/asv-4210.c new file +10
-0+/* +* exynos_result_of_asv is result of ASV group. +* Using by this value, other driver can adjust voltage. +*/ +unsigned int exynos_result_of_asv; + +enum target_asv { +EXYNOS4210_1200 , +EXYNOS4210_1400 , +EXYNOS4210_SINGLE_1200 ,
As I know, _1200 and _1400 do not mean voltage but they looks like voltage when I see above, target_a(daptive)s(upport)v(oltage).
arch/arm/mach-exynos4/asv-4210.c line 38
Quoted 3 lines
arch/arm/mach-exynos4/asv-4210.c new file +3
-0+}; + +struct asv_judge_table exynos4210_1200_limit[] = {
static?
arch/arm/mach-exynos4/asv-4210.c line 46
Quoted 8 lines
arch/arm/mach-exynos4/asv-4210.c new file +8
-0+/* HPM , IDS */ + {8 , 4}, + {11 , 8}, + {14 , 12}, + {18 , 17}, + {21 , 27}, + {23 , 45}, + {25 , 55},
And I think, needs comments about above.
Quoted 19 lines
arch/arm/mach-exynos4/asv-4210.c new file +19
-0+}; + +static struct asv_judge_table exynos4210_1400_limit[] = { +/* HPM , IDS */ + {13 ,8 }, + {17 ,12 }, + {22 ,32 }, + {26 ,52 }, +}; + +static struct asv_judge_table exynos4210_single_1200_limit[] = { +/* HPM , IDS */ + {8 ,4 }, + {14 ,12 }, + {21 ,27 }, + {25 ,55 }, +}; + +static int exynos4210_asv_pre_clock_init (void )
arch/arm/mach-exynos4/asv-4210.c line 75
Quoted 10 lines
arch/arm/mach-exynos4/asv-4210.c new file +10
-0+{ +struct clk *clk_hpm; +struct clk *clk_copy; +struct clk *clk_parent; + +/* PWI clock setting */ + clk_copy =clk_get (NULL ,"sclk_pwi" ); +if (IS_ERR (clk_copy)) + goto clock_fail; +else {
No need 'else' here.
arch/arm/mach-exynos4/asv-4210.c line 83
Quoted 8 lines
arch/arm/mach-exynos4/asv-4210.c new file +8
-0+ clk_parent =clk_get (NULL ,"xusbxti" ); + +if (IS_ERR (clk_parent)) { +clk_put (clk_copy); + + goto clock_fail; + } +if (clk_set_parent (clk_copy, clk_parent))
Don't we need clk_put(clk_copy) and clk_put(clk_parent) here before out?
arch/arm/mach-exynos4/asv-4210.c line 91
Quoted 8 lines
arch/arm/mach-exynos4/asv-4210.c new file +8
-0+ goto clock_fail; + +clk_put (clk_parent); + } +clk_set_rate (clk_copy, (48 *MHZ )); + +clk_put (clk_copy); +
I think, you need to sort out this function like following.
a = clk_get A
if (error a)
goto fail1;
b = clk_get B
if (error b)
goto fail2;
c = clk_get C
if (error c)
goto fail3;
...
clk_put(c)
fail3:
... clk_put(b)
fail2:
... clk_put(a)
fail1:
...
Quoted 19 lines
arch/arm/mach-exynos4/asv-4210.c new file +19
-0+/* HPM clock setting */ + clk_copy =clk_get (NULL ,"dout_copy" ); +if (IS_ERR (clk_copy)) + goto clock_fail; +else { + clk_parent =clk_get (NULL ,"mout_mpll" ); +if (IS_ERR (clk_parent)) { +clk_put (clk_copy); + + goto clock_fail; + } +if (clk_set_parent (clk_copy, clk_parent)) + goto clock_fail; + +clk_put (clk_parent); + } + +clk_set_rate (clk_copy, (400 *MHZ )); +
arch/arm/mach-exynos4/asv-4210.c line 120
Quoted 10 lines
arch/arm/mach-exynos4/asv-4210.c new file +10
-0+clk_put (clk_copy); + + clk_hpm =clk_get (NULL ,"sclk_hpm" ); +if (IS_ERR (clk_hpm)) + goto clock_fail; + +clk_set_rate (clk_hpm, (200 *MHZ )); + +clk_put (clk_hpm); +
Same as above...
Quoted 20 lines
arch/arm/mach-exynos4/asv-4210.c new file +20
-0+return 0 ; + +clock_fail: +pr_err ("EXYNOS4210: ASV: Clock init fail\n" ); + +return -EBUSY ; +} + +static int exynos4210_asv_pre_clock_setup (void ) +{ +/* APLL_CON0 level register */ +__raw_writel (0x80FA0601 ,S5P_APLL_CON0L8 ); +__raw_writel (0x80C80601 ,S5P_APLL_CON0L7 ); +__raw_writel (0x80C80602 ,S5P_APLL_CON0L6 ); +__raw_writel (0x80C80604 ,S5P_APLL_CON0L5 ); +__raw_writel (0x80C80601 ,S5P_APLL_CON0L4 ); +__raw_writel (0x80C80601 ,S5P_APLL_CON0L3 ); +__raw_writel (0x80C80601 ,S5P_APLL_CON0L2 ); +__raw_writel (0x80C80601 ,S5P_APLL_CON0L1 ); +
arch/arm/mach-exynos4/asv-4210.c line 150
Quoted 10 lines
arch/arm/mach-exynos4/asv-4210.c new file +10
-0+/* IEM Divider register */ +__raw_writel (0x00500000 ,S5P_CLKDIV_IEM_L8 ); +__raw_writel (0x00500000 ,S5P_CLKDIV_IEM_L7 ); +__raw_writel (0x00500000 ,S5P_CLKDIV_IEM_L6 ); +__raw_writel (0x00500000 ,S5P_CLKDIV_IEM_L5 ); +__raw_writel (0x00500000 ,S5P_CLKDIV_IEM_L4 ); +__raw_writel (0x00500000 ,S5P_CLKDIV_IEM_L3 ); +__raw_writel (0x00500000 ,S5P_CLKDIV_IEM_L2 ); +__raw_writel (0x00500000 ,S5P_CLKDIV_IEM_L1 ); +
Could you please add comments why this is needed?
arch/arm/mach-exynos4/asv-4210.c line 160
Quoted 10 lines
arch/arm/mach-exynos4/asv-4210.c new file +10
-0+return 0 ; +} + +static int exynos4210_find_group (struct samsung_asv *asv_info, +enum target_asv exynos4_target) +{ +unsigned int ret =0 ; +unsigned int i; + +if (exynos4_target ==EXYNOS4210_1200 ) {
How about to use 'switch' instead of 'if'?
arch/arm/mach-exynos4/asv-4210.c line 163
Quoted 3 lines
arch/arm/mach-exynos4/asv-4210.c new file +3
-0+ ret =ARRAY_SIZE (exynos4210_1200_limit); + +for (i =0 ; i <ARRAY_SIZE (exynos4210_1200_limit); i++) {
for (i = 0; i < ret; i++) ?
arch/arm/mach-exynos4/asv-4210.c
Quoted 6 lines
arch/arm/mach-exynos4/asv-4210.c new file +1
-0+ if (asv_info->hpm_result <=exynos4210_1200_limit[i].hpm_limit ||
arch/arm/mach-exynos4/asv-4210.c new file +1
-0+ asv_info->ids_result <=exynos4210_1200_limit[i].ids_limit) {
arch/arm/mach-exynos4/asv-4210.c new file +2
-0+ ret = i; +break ;
Just 'return i;' instead of 'ret = i; break; and return ret;'?
Quoted 28 lines
arch/arm/mach-exynos4/asv-4210.c new file +7
-0+ } + } + }else if (exynos4_target ==EXYNOS4210_1400 ) { + ret =ARRAY_SIZE (exynos4210_1400_limit); + +for (i =0 ; i <ARRAY_SIZE (exynos4210_1400_limit); i++) { + if (asv_info->hpm_result <=exynos4210_1400_limit[i].hpm_limit ||
arch/arm/mach-exynos4/asv-4210.c new file +1
-0+ asv_info->ids_result <=exynos4210_1400_limit[i].ids_limit) {
arch/arm/mach-exynos4/asv-4210.c new file +8
-0+ ret = i; +break ; + } + } + }else if (exynos4_target ==EXYNOS4210_SINGLE_1200 ) { + ret =ARRAY_SIZE (exynos4210_single_1200_limit); + + for (i = 0; i < ARRAY_SIZE(exynos4210_single_1200_limit);i++) {
arch/arm/mach-exynos4/asv-4210.c new file +1
-0+ if (asv_info->hpm_result <=exynos4210_single_1200_limit[i].hpm_limit ||
arch/arm/mach-exynos4/asv-4210.c new file +1
-0+ asv_info->ids_result <=exynos4210_single_1200_limit[i].ids_limit) {
arch/arm/mach-exynos4/asv-4210.c new file +5
-0+ ret = i; +break ; + } + } + }
arch/arm/mach-exynos4/asv-4210.c line 200
Quoted 10 lines
arch/arm/mach-exynos4/asv-4210.c new file +10
-0+ +return ret; +} + +#define PACK_ID 8 +#define PACK_MASK 0x3 + +#define SUPPORT_1400MHZ (1 << 31) +#define SUPPORT_1200MHZ (1 << 30) +#define SUPPORT_1000MHZ (1 << 29)
Hmm...
arch/arm/mach-exynos4/asv-4210.c line 213
Quoted 13 lines
arch/arm/mach-exynos4/asv-4210.c new file +13
-0+ +static int exynos4210_get_hpm (struct samsung_asv *asv_info) +{ +unsigned int i; +unsigned int tmp; +unsigned int hpm_delay =0 ; +void __iomem *iem_base; + + iem_base =ioremap (EXYNOS4_PA_IEM ,SZ_128K ); + +if (!iem_base) { +pr_err ("EXYNOS4210: ASV: ioremap fail\n" ); +return -EPERM ;
Maybe -ENOMEM?
Quoted 23 lines
arch/arm/mach-exynos4/asv-4210.c new file +23
-0+ } + +/* Clock setting to get asv value */ +if (!asv_info->pre_clock_init) + goto err; +else { +if (asv_info->pre_clock_init ()) + goto err; +else { +/* HPM enable */ + tmp =__raw_readl (iem_base +EXYNOS4_APC_CONTROL ); + tmp |=APC_HPM_EN ; +__raw_writel (tmp, (iem_base +EXYNOS4_APC_CONTROL )); + + asv_info->pre_clock_setup (); + +/* IEM enable */ + tmp =__raw_readl (iem_base +EXYNOS4_IECDPCCR ); + tmp |=IEC_EN ; +__raw_writel (tmp, (iem_base +EXYNOS4_IECDPCCR )); + } + } +
arch/arm/mach-exynos4/asv-4210.c line 246
Quoted 10 lines
arch/arm/mach-exynos4/asv-4210.c new file +10
-0+/* Get HPM Delay value */ +for (i =0 ; i <EXYNOS4_LOOP_CNT ; i++) { + tmp =__raw_readb (iem_base +EXYNOS4_APC_DBG_DLYCODE ); + hpm_delay += tmp; + } + + hpm_delay /=EXYNOS4_LOOP_CNT ; + +/* Store result of hpm value */ + asv_info->hpm_result = hpm_delay;
Don't we need 'iounmap(iem_base);' before out?
arch/arm/mach-exynos4/asv-4210.c line 251
Quoted 5 lines
arch/arm/mach-exynos4/asv-4210.c new file +5
-0+ +return 0 ; + +err: +pr_err ("EXYNOS4210: ASV: Failt to get hpm function\n" );
Fail to ...?
and how about to add function name in error message? pr_err("%s: ...\n", __func__);
arch/arm/mach-exynos4/asv-4210.c line 255
Quoted 4 lines
arch/arm/mach-exynos4/asv-4210.c new file +4
-0+ +iounmap (iem_base); + +return -EPERM ;
Why?
arch/arm/mach-exynos4/asv-4210.c line 265
Quoted 10 lines
arch/arm/mach-exynos4/asv-4210.c new file +10
-0+} + +static int exynos4210_get_ids (struct samsung_asv *asv_info) +{ +unsigned int pkg_id_val; + +if (!asv_info->ids_offset || !asv_info->ids_mask) { +pr_err ("EXYNOS4210: ASV: No ids_offset or No ids_mask\n" ); + +return -EPERM ;
Hmm...please check the return value again.
Quoted 93 lines
arch/arm/mach-exynos4/asv-4210.c new file +23
-0+ } + + pkg_id_val =__raw_readl (S5P_VA_CHIPID +0x4 ); + asv_info->pkg_id = pkg_id_val; + asv_info->ids_result = ((pkg_id_val >> asv_info->ids_offset) & + asv_info->ids_mask); + +return 0 ; +} + +static int exynos4210_asv_store_result (struct samsung_asv *asv_info) +{ +unsigned int result_grp; +char *support_freq; +unsigned int exynos_idcode =0x0 ; + + exynos_result_of_asv =0 ; + + exynos_idcode =__raw_readl (S5P_VA_CHIPID ); + +/* Single chip is only support 1.2GHz */ +if (!((exynos_idcode >>PACK_ID ) &PACK_MASK )) { + result_grp = exynos4210_find_group(asv_info,
EXYNOS4210_SINGLE_1200);arch/arm/mach-exynos4/asv-4210.c new file +12
-0+ result_grp |=SUPPORT_1200MHZ ; + support_freq ="1.2GHz" ; + + goto set_reg; + } + +/* Check support freq */ +switch (asv_info->pkg_id &0x7 ) { +/* Support 1.2GHz */ +case 1 : +case 7 : + result_grp = exynos4210_find_group(asv_info,
EXYNOS4210_1200);arch/arm/mach-exynos4/asv-4210.c new file +6
-0+ result_grp |=SUPPORT_1200MHZ ; + support_freq ="1.2GHz" ; +break ; +/* Support 1.4GHz */ +case 5 : + result_grp = exynos4210_find_group(asv_info,
EXYNOS4210_1400);arch/arm/mach-exynos4/asv-4210.c new file +6
-0+ result_grp |=SUPPORT_1200MHZ ; + support_freq ="1.4GHz" ; +break ; +/* Defalut support 1.0GHz */ +default : + result_grp = exynos4210_find_group(asv_info,
EXYNOS4210_1200);arch/arm/mach-exynos4/asv-4210.c new file +27
-0+ result_grp |=SUPPORT_1000MHZ ; + support_freq ="1.0GHz" ; +break ; + } + +set_reg: + exynos_result_of_asv = result_grp; + +pr_info ("EXYNOS4: ASV: Support %s and Group is 0x%x\n" , + support_freq, result_grp); + +return 0 ; +} + +void exynos4210_asv_init (struct samsung_asv *asv_info) +{ +pr_info ("EXYNOS4210: Adaptive Support Voltage init\n" ); + + asv_info->ids_offset =24 ; + asv_info->ids_mask =0xFF ; + + asv_info->get_ids = exynos4210_get_ids; + asv_info->get_hpm = exynos4210_get_hpm; + asv_info->pre_clock_init = exynos4210_asv_pre_clock_init; + asv_info->pre_clock_setup = exynos4210_asv_pre_clock_setup; + asv_info->store_result = exynos4210_asv_store_result; +}arch/arm/mach-exynos4/asv.c +2
-0@@ -17,6 +17,8 @@#include <linux/io.h> #include <linux/slab.h> +#include <plat/cpu.h> +#include <mach/map.h> #include <mach/asv.h>
arch/arm/mach-exynos4/asv.c static int __init exynos_asv_init(void) · line 31
Quoted 5 lines
arch/arm/mach-exynos4/asv.c +1
-1@@ -26,9 +28,12 @@ static int __init exynos_asv_init(void) { exynos_asv =kzalloc (sizeof (struct samsung_asv ),GFP_KERNEL );if (!exynos_asv) -return -ENOMEM ; + goto out;
NO, see your 'out:' which includes 'kfree(exynos_asv)'
Quoted 15 lines
arch/arm/mach-exynos4/asv.c +4
-1-/* I will add asv driver of exynos4 series to regist */ +if (soc_is_exynos4210 ()) +exynos4210_asv_init (exynos_asv); +else + goto out;if (exynos_asv->check_vdd_arm) {if (exynos_asv->check_vdd_arm ())arch/arm/mach- renamed from arch/arm/mach-exynos4/include/mach/asv.h +0
-0
exynos4/include/mach/asv.h
index 9a4a8f4..cd43c48 100644
arch/arm/mach-exynos4/include/mach/asv.h line 17
Quoted 4 lines
arch/arm/mach-exynos4/include/mach/asv.h +1
-0@@ -14,6 +14,7 @@#define __ASM_ARCH_ASV_H __FILE__#define JUDGE_TABLE_END NULL +#define EXYNOS4_LOOP_CNT 10
Is there any specific reason, 10?
Quoted 72 lines
arch/arm/mach-exynos4/include/mach/asv.h +2
-0struct asv_judge_table {unsigned int hpm_limit;/* HPM value to decide group of target */ @@ -37,4 +38,6 @@ struct samsung_asv { int (*store_result)(struct samsung_asv *asv_info); }; +extern void exynos4210_asv_init (struct samsung_asv *asv_info); +#endif /* __ASM_ARCH_ASV_H */ arch/arm/mach- renamed from arch/arm/mach-exynos4/include/mach/map.h +0
-0
exynos4/include/mach/map.h
index 918a979..81fa158 100644arch/arm/mach-exynos4/include/mach/map.h +2
-0@@ -60,6 +60,8 @@#define EXYNOS4_PA_COMBINER 0x10440000 +#define EXYNOS4_PA_IEM 0x10460000 +#define EXYNOS4_PA_GIC_CPU 0x10480000#define EXYNOS4_PA_GIC_DIST 0x10490000arch/arm/mach-exynos4/include/mach/regs-clock.h +18
-0@@ -130,6 +130,24 @@#define S5P_CLKGATE_SCLKCPU S5P_CLKREG(0x14800)#define S5P_CLKGATE_IP_CPU S5P_CLKREG(0x14900) +#define S5P_APLL_CON0L8 S5P_CLKREG(0x15100) +#define S5P_APLL_CON0L7 S5P_CLKREG(0x15104) +#define S5P_APLL_CON0L6 S5P_CLKREG(0x15108) +#define S5P_APLL_CON0L5 S5P_CLKREG(0x1510C) +#define S5P_APLL_CON0L4 S5P_CLKREG(0x15110) +#define S5P_APLL_CON0L3 S5P_CLKREG(0x15114) +#define S5P_APLL_CON0L2 S5P_CLKREG(0x15118) +#define S5P_APLL_CON0L1 S5P_CLKREG(0x1511C) + +#define S5P_CLKDIV_IEM_L8 S5P_CLKREG(0x15300) +#define S5P_CLKDIV_IEM_L7 S5P_CLKREG(0x15304) +#define S5P_CLKDIV_IEM_L6 S5P_CLKREG(0x15308) +#define S5P_CLKDIV_IEM_L5 S5P_CLKREG(0x1530C) +#define S5P_CLKDIV_IEM_L4 S5P_CLKREG(0x15310) +#define S5P_CLKDIV_IEM_L3 S5P_CLKREG(0x15314) +#define S5P_CLKDIV_IEM_L2 S5P_CLKREG(0x15318) +#define S5P_CLKDIV_IEM_L1 S5P_CLKREG(0x1531C) +#define S5P_APLL_LOCKTIME (0x1C20)/* 300us */ #define S5P_APLLCON0_ENABLE_SHIFT (31)arch/arm/mach-exynos4/include/mach/regs-iem.h new file +11
-0@@ -0,0 +1,27 @@ +/* linux/arch/arm/mach-exynos/include/mach/regs-iem.h +* +* Copyright (c) 2011 Samsung Electronics Co., Ltd. +* http://www.samsung.com/ +* +* EXYNOS4 - IEM(INTELLIGENT ENERGY MANAGEMENT) register discription +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/
arch/arm/mach-exynos4/include/mach/regs-iem.h line 21
Quoted 10 lines
arch/arm/mach-exynos4/include/mach/regs-iem.h new file +10
-0+ +#ifndef __ASM_ARCH_REGS_IEM_H +#define __ASM_ARCH_REGS_IEM_H __FILE__ + +/* Register for IEC */ +#define EXYNOS4_IECDPCCR (0x00000) + +/* Register for APC */ +#define EXYNOS4_APC_CONTROL (0x10010) +#define EXYNOS4_APC_PREDLYSEL (0x10024)
above is not used.
Quoted 8 lines
arch/arm/mach-exynos4/include/mach/regs-iem.h new file +6
-1+#define EXYNOS4_APC_DBG_DLYCODE (0x100E0) + +#define APC_HPM_EN (1 << 4) +#define IEC_EN (1 << 0) + +#endif /* __ASM_ARCH_REGS_IEM_H */ --1.7.1
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
v2 cover ASV support for Exynos4 series
In reply to Jongpill LeeQuoted 12 lines · Jongpill Lee
Each SoC has specification.For example voltage or ids current. These values are related to production process.
If you have a good specification SoC, you can supply lower voltage into SoC.
Also, If your SoC has bad specification, you have to supply higher voltage into SoC.
So, after get these SoC specification value on initialize time, we can use these value to fix voltage for running SoC.
Using by this patch set, Exynos4210 can get SoC specification and adjust voltage.
Quoted 3 lines
[PATCH V2 1/3] ARM: EXYNOS4: Add ASV feature for Exynos4 series [PATCH V2 2/3] ARM: EXYNOS4: Add clock for Exynos4210 asv feature [PATCH V2 3/3] ARM: EXYNOS4: Support ASV for Exynos4210
Hi Jongpill,
See my comments and then could you please rebase this series based on latest my for-next?
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.