Refactor the pm code to use DT based lookup
v4 cover Refactor the pm code to use DT based lookup
Refactoring the pm.c to avoid using "soc_is_exynos" checks, instead use the DT based lookup.
While at it, move exynos5250 specific disabling of JPEG USE_RETENTION to pmu.c
changes since v3:
- Addressed comments from Tomasz Figa.
changes since v2:
- Addressed Tomasz Figa's comments to unify the functions for exynos4 and exynos5250.
- Added new patch to move exynos5250 specific disabling of
JPEG USE_RETENTION to pmu.c
- Addressed comment from Thomas Abraham.
changes since v1:
- Address Kukjin Kim comments to respin this patch separately from
http://lists.infradead.org/pipermail/linux-arm-kernel/2014-July/272574.html
- removed panic, returned if no PMU node found and added check in exynos_wkup_irq.
Rebased on Kukjin Kim's tree, for-next branch
https://git.kernel.org/cgit/linux/kernel/git/kgene/linux-samsung.git/log/?h=for-next
Tested on 5250 based Chromebook.
Vikas Sajjan (2):
ARM: EXYNOS: Move Disabling of JPEG USE_RETENTION for exynos5250 to
pmu.c
ARM: EXYNOS: Refactor the pm code to use DT based lookup
arch/arm/mach-exynos/pm.c | 172 ++++++++++++++++++++++++++++----------- arch/arm/mach-exynos/pmu.c | 1 + arch/arm/mach-exynos/regs-pmu.h | 1 + 3 files changed, 127 insertions(+), 47 deletions(-)
Signature · 1 line
1.7.9.5
PATCH RESEND v4 1/2 ARM: EXYNOS: Move Disabling of JPEG USE_RETENTION for exynos5250 to pmu.c
Move the Disabling of JPEG USE_RETENTION for exynos5250 to pmu.c to make way for refactoring of pm.c and to create common functions across exynos4 and exynos5250.
--- arch/arm/mach-exynos/pm.c | 7 +------ arch/arm/mach-exynos/pmu.c | 1 + 2 files changed, 2 insertions(+), 6 deletions(-)
arch/arm/mach-exynos/pm.c +1 -6
@@ -255,13 +255,8 @@ static void exynos_pm_prepare(void)s3c_pm_do_save (exynos_core_save,ARRAY_SIZE (exynos_core_save)); -if (soc_is_exynos5250 ()) { +if (soc_is_exynos5250 ())s3c_pm_do_save (exynos5_sys_save,ARRAY_SIZE (exynos5_sys_save)); -/* Disable USE_RETENTION of JPEG_MEM_OPTION */ - tmp =pmu_raw_readl (EXYNOS5_JPEG_MEM_OPTION ); - tmp &= ~EXYNOS5_OPTION_USE_RETENTION ; -pmu_raw_writel (tmp,EXYNOS5_JPEG_MEM_OPTION ); - }/* Set value of power down register for sleep mode */
arch/arm/mach-exynos/pmu.c +1 -0
@@ -264,6 +264,7 @@ static const struct exynos_pmu_conf exynos5250_pmu_config[] = { { EXYNOS5_INTRAM_MEM_SYS_PWR_REG, { 0x3, 0x0, 0x0} }, { EXYNOS5_INTROM_MEM_SYS_PWR_REG, { 0x3, 0x0, 0x0} }, { EXYNOS5_JPEG_MEM_SYS_PWR_REG, { 0x3, 0x0, 0x0} }, + { EXYNOS5_JPEG_MEM_OPTION, { 0x10, 0x10, 0x0} }, { EXYNOS5_HSI_MEM_SYS_PWR_REG, { 0x3, 0x0, 0x0} }, { EXYNOS5_MCUIOP_MEM_SYS_PWR_REG, { 0x3, 0x0, 0x0} }, { EXYNOS5_SATA_MEM_SYS_PWR_REG, { 0x3, 0x0, 0x0} },
Signature · 1 line
1.7.9.5
PATCH RESEND v4 2/2 ARM: EXYNOS: Refactor the pm code to use DT based lookup
In reply to Vikas SajjanRefactoring the pm.c to avoid using "soc_is_exynos" checks, instead use the DT based lookup.
While at it, consolidate the common code across SoCs and create static helper functions.
--- arch/arm/mach-exynos/pm.c | 167 +++++++++++++++++++++++++++++---------- arch/arm/mach-exynos/regs-pmu.h | 1 + 2 files changed, 126 insertions(+), 42 deletions(-)
arch/arm/mach-exynos/pm.c +125 -42
@@ -36,6 +36,8 @@#include "regs-pmu.h" #include "regs-sys.h" +#define REG_TABLE_END (-1U) +/** * struct exynos_wkup_irq - Exynos GIC to PMU IRQ mapping * @hwirq: Hardware IRQ signal of the GIC
@@ -59,6 +61,21 @@ static struct sleep_save exynos_core_save[] = { SAVE_ITEM(S5P_SROM_BC3), }; +struct exynos_pm_data { +const struct exynos_wkup_irq *wkup_irq; +struct sleep_save *extra_save; +int num_extra_save; +unsigned int wake_disable_mask; +unsigned int *release_ret_regs; + +void (*pm_prepare)(void ); +void (*pm_resume)(void ); +int (*pm_suspend)(void ); +int (*cpu_suspend)(unsigned long ); +}; + +struct exynos_pm_data *pm_data; +/* * GIC wake-up support */
@@ -77,14 +94,24 @@ static const struct exynos_wkup_irq exynos5250_wkup_irq[] = { { /* sentinel */ }, }; +unsigned int exynos_release_ret_regs[] = { +S5P_PAD_RET_MAUDIO_OPTION , +S5P_PAD_RET_GPIO_OPTION , +S5P_PAD_RET_UART_OPTION , +S5P_PAD_RET_MMCA_OPTION , +S5P_PAD_RET_MMCB_OPTION , +S5P_PAD_RET_EBIA_OPTION , +S5P_PAD_RET_EBIB_OPTION , +REG_TABLE_END , +}; +static int exynos_irq_set_wake (struct irq_data *data,unsigned int state) {const struct exynos_wkup_irq *wkup_irq; -if (soc_is_exynos5250 ()) - wkup_irq = exynos5250_wkup_irq; -else - wkup_irq = exynos4_wkup_irq; +if (!pm_data->wkup_irq) +return -ENOENT ; + wkup_irq = pm_data->wkup_irq;while (wkup_irq->mask) {if (wkup_irq->hwirq == data->hwirq) {
@@ -229,15 +256,8 @@ void exynos_enter_aftr(void)cpu_pm_exit (); } -static int exynos_cpu_suspend (unsigned long arg) +static int exynos_cpu_do_idle (void ) { -#ifdef CONFIG_CACHE_L2X0 -outer_flush_all (); -#endif - -if (soc_is_exynos5250 ()) -flush_cache_all (); -/* issue the standby signal into the pm unit. */ cpu_do_idle ();
@@ -245,29 +265,44 @@ static int exynos_cpu_suspend(unsigned long arg)return 1 ;/* Aborting suspend */ } -static void exynos_pm_prepare (void ) +static int exynos_cpu_suspend (unsigned long arg) { -unsigned int tmp; +flush_cache_all (); +outer_flush_all (); +return exynos_cpu_do_idle (); +} +static void exynos_pm_set_wakeup_mask (void ) +{/* Set wake-up mask registers */ pmu_raw_writel (exynos_get_eint_wake_mask (),S5P_EINT_WAKEUP_MASK );pmu_raw_writel (exynos_irqwake_intmask & ~(1 <<31 ),S5P_WAKEUP_MASK ); +} -s3c_pm_do_save (exynos_core_save,ARRAY_SIZE (exynos_core_save)); - -if (soc_is_exynos5250 ()) -s3c_pm_do_save (exynos5_sys_save,ARRAY_SIZE (exynos5_sys_save)); - +static void exynos_pm_enter_sleep_mode (void ) +{/* Set value of power down register for sleep mode */ -exynos_sys_powerdown_conf (SYS_SLEEP );pmu_raw_writel (S5P_CHECK_SLEEP ,S5P_INFORM1 );/* ensure@least INFORM0 has the resume address */ -pmu_raw_writel (virt_to_phys (exynos_cpu_resume),S5P_INFORM0 ); } +static void exynos_pm_prepare (void ) +{ +/* Set wake-up mask registers */ +exynos_pm_set_wakeup_mask (); + +s3c_pm_do_save (exynos_core_save,ARRAY_SIZE (exynos_core_save)); + +if (pm_data->extra_save) +s3c_pm_do_save (pm_data->extra_save, + pm_data->num_extra_save); + +exynos_pm_enter_sleep_mode (); +} +static int exynos_pm_suspend (void ) {unsigned long tmp;
@@ -285,6 +320,15 @@ static int exynos_pm_suspend(void)return 0 ; } +static void exynos_pm_release_retention (void ) +{ +unsigned int i; + +for (i =0 ; (pm_data->release_ret_regs[i] !=REG_TABLE_END ); i++) +pmu_raw_writel (EXYNOS_WAKEUP_FROM_LOWPWR , + pm_data->release_ret_regs[i]); +} +static void exynos_pm_resume (void ) {if (exynos_pm_central_resume ())
@@ -294,18 +338,11 @@ static void exynos_pm_resume(void)exynos_cpu_restore_register ();/* For release retention */ +exynos_pm_release_retention (); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_MAUDIO_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_GPIO_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_UART_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_MMCA_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_MMCB_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_EBIA_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_EBIB_OPTION ); - -if (soc_is_exynos5250 ()) -s3c_pm_do_restore (exynos5_sys_save, -ARRAY_SIZE (exynos5_sys_save)); +if (pm_data->extra_save) +s3c_pm_do_restore_core (pm_data->extra_save, + pm_data->num_extra_save);s3c_pm_do_restore_core (exynos_core_save,ARRAY_SIZE (exynos_core_save));
@@ -316,15 +353,8 @@ early_wakeup:/* Clear SLEEP mode set in INFORM1 */ pmu_raw_writel (0x0 ,S5P_INFORM1 ); - -return ; } -static struct syscore_ops exynos_pm_syscore_ops = { - .suspend = exynos_pm_suspend, - .resume = exynos_pm_resume, -}; -/* * Suspend Ops */
@@ -348,11 +378,12 @@ static int exynos_suspend_enter(suspend_state_t state) }s3c_pm_save_uarts (); -exynos_pm_prepare (); +if (pm_data->pm_prepare) + pm_data->pm_prepare ();flush_cache_all ();s3c_pm_check_store (); - ret =cpu_suspend (0 , exynos_cpu_suspend); + ret =cpu_suspend (0 , pm_data->cpu_suspend);if (ret)return ret;
@@ -387,18 +418,70 @@ static const struct platform_suspend_ops exynos_suspend_ops = { .valid = suspend_valid_only_mem, }; +static const struct exynos_pm_data exynos4_pm_data = { + .wkup_irq = exynos4_wkup_irq, + .wake_disable_mask = ((0xFF <<8 ) | (0x1F <<1 )), + .release_ret_regs = exynos_release_ret_regs, + .pm_suspend = exynos_pm_suspend, + .pm_resume = exynos_pm_resume, + .pm_prepare = exynos_pm_prepare, + .cpu_suspend = exynos_cpu_suspend, +}; + +static const struct exynos_pm_data exynos5250_pm_data = { + .wkup_irq = exynos5250_wkup_irq, + .wake_disable_mask = ((0xFF <<8 ) | (0x1F <<1 )), + .release_ret_regs = exynos_release_ret_regs, + .extra_save = exynos5_sys_save, + .num_extra_save =ARRAY_SIZE (exynos5_sys_save), + .pm_suspend = exynos_pm_suspend, + .pm_resume = exynos_pm_resume, + .pm_prepare = exynos_pm_prepare, + .cpu_suspend = exynos_cpu_suspend, +}; + +static struct of_device_id exynos_pmu_of_device_ids[] = { + { + .compatible ="samsung,exynos4210-pmu" , + .data = &exynos4_pm_data, + }, { + .compatible ="samsung,exynos4212-pmu" , + .data = &exynos4_pm_data, + }, { + .compatible ="samsung,exynos4412-pmu" , + .data = &exynos4_pm_data, + }, { + .compatible ="samsung,exynos5250-pmu" , + .data = &exynos5250_pm_data, + }, + {/*sentinel*/ }, +}; + +static struct syscore_ops exynos_pm_syscore_ops; +void __init exynos_pm_init (void ) { +const struct of_device_id *match;u32 tmp; +of_find_matching_node_and_match (NULL , exynos_pmu_of_device_ids, &match); +if (!match) { +pr_err ("Failed to find PMU node\n" ); +return ; + } + pm_data = (struct exynos_pm_data *) match->data; +/* Platform-specific GIC callback */ gic_arch_extn.irq_set_wake = exynos_irq_set_wake;/* All wakeup disable */ tmp =pmu_raw_readl (S5P_WAKEUP_MASK ); - tmp |= ((0xFF <<8 ) | (0x1F <<1 )); + tmp |= pm_data->wake_disable_mask;pmu_raw_writel (tmp,S5P_WAKEUP_MASK ); + exynos_pm_syscore_ops.suspend = pm_data->pm_suspend; + exynos_pm_syscore_ops.resume = pm_data->pm_resume; +register_syscore_ops (&exynos_pm_syscore_ops);suspend_set_ops (&exynos_suspend_ops); }
arch/arm/mach-exynos/regs-pmu.h +1 -0
@@ -21,6 +21,7 @@#define S5P_USE_STANDBY_WFI0 (1 << 16)#define S5P_USE_STANDBY_WFE0 (1 << 24) +#define EXYNOS_WAKEUP_FROM_LOWPWR (1 << 28)#define EXYNOS_SWRESET 0x0400#define EXYNOS5440_SWRESET 0x00C4
Signature · 1 line
1.7.9.5
PATCH RESEND v4 2/2 ARM: EXYNOS: Refactor the pm code to use DT based lookup
Hi Kukjin,
Quoted 8 lines · Vikas Sajjan
Refactoring the
pm.cto avoid using "soc_is_exynos" checks, instead use the DT based lookup.While at it, consolidate the common code across SoCs and create static helper functions.
Signed-off-by Vikas Sajjan <[email protected]>Reviewed-by Tomasz Figa <[email protected]>
Can you pick this series...
Quoted 297 lines
--- arch/arm/mach-exynos/pm.c | 167 +++++++++++++++++++++++++++++---------- arch/arm/mach-exynos/regs-pmu.h | 1 + 2 files changed, 126 insertions(+), 42 deletions(-)arch/arm/mach-exynos/pm.c +125
-42@@ -36,6 +36,8 @@#include "regs-pmu.h" #include "regs-sys.h" +#define REG_TABLE_END (-1U) +/** * struct exynos_wkup_irq - Exynos GIC to PMU IRQ mapping * @hwirq: Hardware IRQ signal of the GIC @@ -59,6 +61,21 @@ static struct sleep_save exynos_core_save[] = { SAVE_ITEM(S5P_SROM_BC3), }; +struct exynos_pm_data { +const struct exynos_wkup_irq *wkup_irq; +struct sleep_save *extra_save; +int num_extra_save; +unsigned int wake_disable_mask; +unsigned int *release_ret_regs; + +void (*pm_prepare)(void ); +void (*pm_resume)(void ); +int (*pm_suspend)(void ); +int (*cpu_suspend)(unsigned long ); +}; + +struct exynos_pm_data *pm_data; +/* * GIC wake-up support */ @@ -77,14 +94,24 @@ static const struct exynos_wkup_irq exynos5250_wkup_irq[] = { { /* sentinel */ }, }; +unsigned int exynos_release_ret_regs[] = { +S5P_PAD_RET_MAUDIO_OPTION , +S5P_PAD_RET_GPIO_OPTION , +S5P_PAD_RET_UART_OPTION , +S5P_PAD_RET_MMCA_OPTION , +S5P_PAD_RET_MMCB_OPTION , +S5P_PAD_RET_EBIA_OPTION , +S5P_PAD_RET_EBIB_OPTION , +REG_TABLE_END , +}; +static int exynos_irq_set_wake (struct irq_data *data,unsigned int state) {const struct exynos_wkup_irq *wkup_irq; -if (soc_is_exynos5250 ()) - wkup_irq = exynos5250_wkup_irq; -else - wkup_irq = exynos4_wkup_irq; +if (!pm_data->wkup_irq) +return -ENOENT ; + wkup_irq = pm_data->wkup_irq;while (wkup_irq->mask) {if (wkup_irq->hwirq == data->hwirq) {@@ -229,15 +256,8 @@ void exynos_enter_aftr(void)cpu_pm_exit (); } -static int exynos_cpu_suspend (unsigned long arg) +static int exynos_cpu_do_idle (void ) { -#ifdef CONFIG_CACHE_L2X0 -outer_flush_all (); -#endif - -if (soc_is_exynos5250 ()) -flush_cache_all (); -/* issue the standby signal into the pm unit. */ cpu_do_idle ();@@ -245,29 +265,44 @@ static int exynos_cpu_suspend(unsigned long arg)return 1 ;/* Aborting suspend */ } -static void exynos_pm_prepare (void ) +static int exynos_cpu_suspend (unsigned long arg) { -unsigned int tmp; +flush_cache_all (); +outer_flush_all (); +return exynos_cpu_do_idle (); +} +static void exynos_pm_set_wakeup_mask (void ) +{/* Set wake-up mask registers */ pmu_raw_writel (exynos_get_eint_wake_mask (),S5P_EINT_WAKEUP_MASK );pmu_raw_writel (exynos_irqwake_intmask & ~(1 <<31 ),S5P_WAKEUP_MASK ); +} -s3c_pm_do_save (exynos_core_save,ARRAY_SIZE (exynos_core_save)); - -if (soc_is_exynos5250 ()) -s3c_pm_do_save (exynos5_sys_save,ARRAY_SIZE (exynos5_sys_save)); - +static void exynos_pm_enter_sleep_mode (void ) +{/* Set value of power down register for sleep mode */ -exynos_sys_powerdown_conf (SYS_SLEEP );pmu_raw_writel (S5P_CHECK_SLEEP ,S5P_INFORM1 );/* ensure at least INFORM0 has the resume address */ -pmu_raw_writel (virt_to_phys (exynos_cpu_resume),S5P_INFORM0 ); } +static void exynos_pm_prepare (void ) +{ +/* Set wake-up mask registers */ +exynos_pm_set_wakeup_mask (); + +s3c_pm_do_save (exynos_core_save,ARRAY_SIZE (exynos_core_save)); + +if (pm_data->extra_save) +s3c_pm_do_save (pm_data->extra_save, + pm_data->num_extra_save); + +exynos_pm_enter_sleep_mode (); +} +static int exynos_pm_suspend (void ) {unsigned long tmp;@@ -285,6 +320,15 @@ static int exynos_pm_suspend(void)return 0 ; } +static void exynos_pm_release_retention (void ) +{ +unsigned int i; + +for (i =0 ; (pm_data->release_ret_regs[i] !=REG_TABLE_END ); i++) +pmu_raw_writel (EXYNOS_WAKEUP_FROM_LOWPWR , + pm_data->release_ret_regs[i]); +} +static void exynos_pm_resume (void ) {if (exynos_pm_central_resume ())@@ -294,18 +338,11 @@ static void exynos_pm_resume(void)exynos_cpu_restore_register ();/* For release retention */ +exynos_pm_release_retention (); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_MAUDIO_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_GPIO_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_UART_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_MMCA_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_MMCB_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_EBIA_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_EBIB_OPTION ); - -if (soc_is_exynos5250 ()) -s3c_pm_do_restore (exynos5_sys_save, -ARRAY_SIZE (exynos5_sys_save)); +if (pm_data->extra_save) +s3c_pm_do_restore_core (pm_data->extra_save, + pm_data->num_extra_save);s3c_pm_do_restore_core (exynos_core_save,ARRAY_SIZE (exynos_core_save));@@ -316,15 +353,8 @@ early_wakeup:/* Clear SLEEP mode set in INFORM1 */ pmu_raw_writel (0x0 ,S5P_INFORM1 ); - -return ; } -static struct syscore_ops exynos_pm_syscore_ops = { - .suspend = exynos_pm_suspend, - .resume = exynos_pm_resume, -}; -/* * Suspend Ops */ @@ -348,11 +378,12 @@ static int exynos_suspend_enter(suspend_state_t state) }s3c_pm_save_uarts (); -exynos_pm_prepare (); +if (pm_data->pm_prepare) + pm_data->pm_prepare ();flush_cache_all ();s3c_pm_check_store (); - ret =cpu_suspend (0 , exynos_cpu_suspend); + ret =cpu_suspend (0 , pm_data->cpu_suspend);if (ret)return ret;@@ -387,18 +418,70 @@ static const struct platform_suspend_ops exynos_suspend_ops = { .valid = suspend_valid_only_mem, }; +static const struct exynos_pm_data exynos4_pm_data = { + .wkup_irq = exynos4_wkup_irq, + .wake_disable_mask = ((0xFF <<8 ) | (0x1F <<1 )), + .release_ret_regs = exynos_release_ret_regs, + .pm_suspend = exynos_pm_suspend, + .pm_resume = exynos_pm_resume, + .pm_prepare = exynos_pm_prepare, + .cpu_suspend = exynos_cpu_suspend, +}; + +static const struct exynos_pm_data exynos5250_pm_data = { + .wkup_irq = exynos5250_wkup_irq, + .wake_disable_mask = ((0xFF <<8 ) | (0x1F <<1 )), + .release_ret_regs = exynos_release_ret_regs, + .extra_save = exynos5_sys_save, + .num_extra_save =ARRAY_SIZE (exynos5_sys_save), + .pm_suspend = exynos_pm_suspend, + .pm_resume = exynos_pm_resume, + .pm_prepare = exynos_pm_prepare, + .cpu_suspend = exynos_cpu_suspend, +}; + +static struct of_device_id exynos_pmu_of_device_ids[] = { + { + .compatible ="samsung,exynos4210-pmu" , + .data = &exynos4_pm_data, + }, { + .compatible ="samsung,exynos4212-pmu" , + .data = &exynos4_pm_data, + }, { + .compatible ="samsung,exynos4412-pmu" , + .data = &exynos4_pm_data, + }, { + .compatible ="samsung,exynos5250-pmu" , + .data = &exynos5250_pm_data, + }, + {/*sentinel*/ }, +}; + +static struct syscore_ops exynos_pm_syscore_ops; +void __init exynos_pm_init (void ) { +const struct of_device_id *match;u32 tmp; +of_find_matching_node_and_match (NULL , exynos_pmu_of_device_ids, &match); +if (!match) { +pr_err ("Failed to find PMU node\n" ); +return ; + } + pm_data = (struct exynos_pm_data *) match->data; +/* Platform-specific GIC callback */ gic_arch_extn.irq_set_wake = exynos_irq_set_wake;/* All wakeup disable */ tmp =pmu_raw_readl (S5P_WAKEUP_MASK ); - tmp |= ((0xFF <<8 ) | (0x1F <<1 )); + tmp |= pm_data->wake_disable_mask;pmu_raw_writel (tmp,S5P_WAKEUP_MASK ); + exynos_pm_syscore_ops.suspend = pm_data->pm_suspend; + exynos_pm_syscore_ops.resume = pm_data->pm_resume; +register_syscore_ops (&exynos_pm_syscore_ops);suspend_set_ops (&exynos_suspend_ops); }arch/arm/mach-exynos/regs-pmu.h +1
-1@@ -21,6 +21,7 @@#define S5P_USE_STANDBY_WFI0 (1 << 16)#define S5P_USE_STANDBY_WFE0 (1 << 24) +#define EXYNOS_WAKEUP_FROM_LOWPWR (1 << 28)#define EXYNOS_SWRESET 0x0400#define EXYNOS5440_SWRESET 0x00C4 --1.7.9.5
PATCH RESEND v4 2/2 ARM: EXYNOS: Refactor the pm code to use DT based lookup
Hi,
Quoted 6 lines · Vikas Sajjan
Hi Kukjin,
Quoted 3 lines · Vikas Sajjan
Refactoring the
pm.cto avoid using "soc_is_exynos" checks, instead use the DT based lookup.
Quoted 7 lines
Quoted 5 lines
While at it, consolidate the common code across SoCs and create static helper functions.
Signed-off-by Vikas Sajjan <[email protected]>Reviewed-by Tomasz Figa <[email protected]>Can you pick this series...
I think that my PM_SLEEP=n build fixes should go in before this cleanup series:
http://www.mail-archive.com/linux-samsung-soc at vger.kernel.org/msg35430.html
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
Quoted 293 lines
Quoted 293 lines
--- arch/arm/mach-exynos/pm.c | 167 +++++++++++++++++++++++++++++---------- arch/arm/mach-exynos/regs-pmu.h | 1 + 2 files changed, 126 insertions(+), 42 deletions(-)arch/arm/mach-exynos/pm.c +125
-42@@ -36,6 +36,8 @@#include "regs-pmu.h" #include "regs-sys.h" +#define REG_TABLE_END (-1U) +/** * struct exynos_wkup_irq - Exynos GIC to PMU IRQ mapping * @hwirq: Hardware IRQ signal of the GIC @@ -59,6 +61,21 @@ static struct sleep_save exynos_core_save[] = { SAVE_ITEM(S5P_SROM_BC3), }; +struct exynos_pm_data { +const struct exynos_wkup_irq *wkup_irq; +struct sleep_save *extra_save; +int num_extra_save; +unsigned int wake_disable_mask; +unsigned int *release_ret_regs; + +void (*pm_prepare)(void ); +void (*pm_resume)(void ); +int (*pm_suspend)(void ); +int (*cpu_suspend)(unsigned long ); +}; + +struct exynos_pm_data *pm_data; +/* * GIC wake-up support */ @@ -77,14 +94,24 @@ static const struct exynos_wkup_irq exynos5250_wkup_irq[] = { { /* sentinel */ }, }; +unsigned int exynos_release_ret_regs[] = { +S5P_PAD_RET_MAUDIO_OPTION , +S5P_PAD_RET_GPIO_OPTION , +S5P_PAD_RET_UART_OPTION , +S5P_PAD_RET_MMCA_OPTION , +S5P_PAD_RET_MMCB_OPTION , +S5P_PAD_RET_EBIA_OPTION , +S5P_PAD_RET_EBIB_OPTION , +REG_TABLE_END , +}; +static int exynos_irq_set_wake (struct irq_data *data,unsigned int state) {const struct exynos_wkup_irq *wkup_irq; -if (soc_is_exynos5250 ()) - wkup_irq = exynos5250_wkup_irq; -else - wkup_irq = exynos4_wkup_irq; +if (!pm_data->wkup_irq) +return -ENOENT ; + wkup_irq = pm_data->wkup_irq;while (wkup_irq->mask) {if (wkup_irq->hwirq == data->hwirq) {@@ -229,15 +256,8 @@ void exynos_enter_aftr(void)cpu_pm_exit (); } -static int exynos_cpu_suspend (unsigned long arg) +static int exynos_cpu_do_idle (void ) { -#ifdef CONFIG_CACHE_L2X0 -outer_flush_all (); -#endif - -if (soc_is_exynos5250 ()) -flush_cache_all (); -/* issue the standby signal into the pm unit. */ cpu_do_idle ();@@ -245,29 +265,44 @@ static int exynos_cpu_suspend(unsigned long arg)return 1 ;/* Aborting suspend */ } -static void exynos_pm_prepare (void ) +static int exynos_cpu_suspend (unsigned long arg) { -unsigned int tmp; +flush_cache_all (); +outer_flush_all (); +return exynos_cpu_do_idle (); +} +static void exynos_pm_set_wakeup_mask (void ) +{/* Set wake-up mask registers */ pmu_raw_writel (exynos_get_eint_wake_mask (),S5P_EINT_WAKEUP_MASK );pmu_raw_writel (exynos_irqwake_intmask & ~(1 <<31 ),S5P_WAKEUP_MASK ); +} -s3c_pm_do_save (exynos_core_save,ARRAY_SIZE (exynos_core_save)); - -if (soc_is_exynos5250 ()) -s3c_pm_do_save (exynos5_sys_save,ARRAY_SIZE (exynos5_sys_save)); - +static void exynos_pm_enter_sleep_mode (void ) +{/* Set value of power down register for sleep mode */ -exynos_sys_powerdown_conf (SYS_SLEEP );pmu_raw_writel (S5P_CHECK_SLEEP ,S5P_INFORM1 );/* ensure at least INFORM0 has the resume address */ -pmu_raw_writel (virt_to_phys (exynos_cpu_resume),S5P_INFORM0 ); } +static void exynos_pm_prepare (void ) +{ +/* Set wake-up mask registers */ +exynos_pm_set_wakeup_mask (); + +s3c_pm_do_save (exynos_core_save,ARRAY_SIZE (exynos_core_save)); + +if (pm_data->extra_save) +s3c_pm_do_save (pm_data->extra_save, + pm_data->num_extra_save); + +exynos_pm_enter_sleep_mode (); +} +static int exynos_pm_suspend (void ) {unsigned long tmp;@@ -285,6 +320,15 @@ static int exynos_pm_suspend(void)return 0 ; } +static void exynos_pm_release_retention (void ) +{ +unsigned int i; + +for (i =0 ; (pm_data->release_ret_regs[i] !=REG_TABLE_END ); i++) +pmu_raw_writel (EXYNOS_WAKEUP_FROM_LOWPWR , + pm_data->release_ret_regs[i]); +} +static void exynos_pm_resume (void ) {if (exynos_pm_central_resume ())@@ -294,18 +338,11 @@ static void exynos_pm_resume(void)exynos_cpu_restore_register ();/* For release retention */ +exynos_pm_release_retention (); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_MAUDIO_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_GPIO_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_UART_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_MMCA_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_MMCB_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_EBIA_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_EBIB_OPTION ); - -if (soc_is_exynos5250 ()) -s3c_pm_do_restore (exynos5_sys_save, -ARRAY_SIZE (exynos5_sys_save)); +if (pm_data->extra_save) +s3c_pm_do_restore_core (pm_data->extra_save, + pm_data->num_extra_save);s3c_pm_do_restore_core (exynos_core_save,ARRAY_SIZE (exynos_core_save));@@ -316,15 +353,8 @@ early_wakeup:/* Clear SLEEP mode set in INFORM1 */ pmu_raw_writel (0x0 ,S5P_INFORM1 ); - -return ; } -static struct syscore_ops exynos_pm_syscore_ops = { - .suspend = exynos_pm_suspend, - .resume = exynos_pm_resume, -}; -/* * Suspend Ops */ @@ -348,11 +378,12 @@ static int exynos_suspend_enter(suspend_state_t state) }s3c_pm_save_uarts (); -exynos_pm_prepare (); +if (pm_data->pm_prepare) + pm_data->pm_prepare ();flush_cache_all ();s3c_pm_check_store (); - ret =cpu_suspend (0 , exynos_cpu_suspend); + ret =cpu_suspend (0 , pm_data->cpu_suspend);if (ret)return ret;@@ -387,18 +418,70 @@ static const struct platform_suspend_ops exynos_suspend_ops = { .valid = suspend_valid_only_mem, }; +static const struct exynos_pm_data exynos4_pm_data = { + .wkup_irq = exynos4_wkup_irq, + .wake_disable_mask = ((0xFF <<8 ) | (0x1F <<1 )), + .release_ret_regs = exynos_release_ret_regs, + .pm_suspend = exynos_pm_suspend, + .pm_resume = exynos_pm_resume, + .pm_prepare = exynos_pm_prepare, + .cpu_suspend = exynos_cpu_suspend, +}; + +static const struct exynos_pm_data exynos5250_pm_data = { + .wkup_irq = exynos5250_wkup_irq, + .wake_disable_mask = ((0xFF <<8 ) | (0x1F <<1 )), + .release_ret_regs = exynos_release_ret_regs, + .extra_save = exynos5_sys_save, + .num_extra_save =ARRAY_SIZE (exynos5_sys_save), + .pm_suspend = exynos_pm_suspend, + .pm_resume = exynos_pm_resume, + .pm_prepare = exynos_pm_prepare, + .cpu_suspend = exynos_cpu_suspend, +}; + +static struct of_device_id exynos_pmu_of_device_ids[] = { + { + .compatible ="samsung,exynos4210-pmu" , + .data = &exynos4_pm_data, + }, { + .compatible ="samsung,exynos4212-pmu" , + .data = &exynos4_pm_data, + }, { + .compatible ="samsung,exynos4412-pmu" , + .data = &exynos4_pm_data, + }, { + .compatible ="samsung,exynos5250-pmu" , + .data = &exynos5250_pm_data, + }, + {/*sentinel*/ }, +}; + +static struct syscore_ops exynos_pm_syscore_ops; +void __init exynos_pm_init (void ) { +const struct of_device_id *match;u32 tmp; +of_find_matching_node_and_match (NULL , exynos_pmu_of_device_ids, &match); +if (!match) { +pr_err ("Failed to find PMU node\n" ); +return ; + } + pm_data = (struct exynos_pm_data *) match->data; +/* Platform-specific GIC callback */ gic_arch_extn.irq_set_wake = exynos_irq_set_wake;/* All wakeup disable */ tmp =pmu_raw_readl (S5P_WAKEUP_MASK ); - tmp |= ((0xFF <<8 ) | (0x1F <<1 )); + tmp |= pm_data->wake_disable_mask;pmu_raw_writel (tmp,S5P_WAKEUP_MASK ); + exynos_pm_syscore_ops.suspend = pm_data->pm_suspend; + exynos_pm_syscore_ops.resume = pm_data->pm_resume; +register_syscore_ops (&exynos_pm_syscore_ops);suspend_set_ops (&exynos_suspend_ops); }arch/arm/mach-exynos/regs-pmu.h +1
-0@@ -21,6 +21,7 @@#define S5P_USE_STANDBY_WFI0 (1 << 16)#define S5P_USE_STANDBY_WFE0 (1 << 24) +#define EXYNOS_WAKEUP_FROM_LOWPWR (1 << 28)#define EXYNOS_SWRESET 0x0400#define EXYNOS5440_SWRESET 0x00C4
PATCH RESEND v4 2/2 ARM: EXYNOS: Refactor the pm code to use DT based lookup
Hi,
Quoted 13 lines · Bartlomiej Zolnierkiewicz
Hi,
Quoted 9 lines · Vikas Sajjan
Hi Kukjin,
Quoted 6 lines · Vikas Sajjan
Refactoring the
pm.cto avoid using "soc_is_exynos" checks, instead use the DT based lookup.While at it, consolidate the common code across SoCs and create static helper functions.
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Signed-off-by Vikas Sajjan <[email protected]>Reviewed-by Tomasz Figa <[email protected]>Can you pick this series...
I think that my PM_SLEEP=n build fixes should go in before this cleanup series:
Its better for Kukjin to decide which series he wants to pick first.
Quoted 303 lines
http://www.mail-archive.com/linux-samsung-soc at vger.kernel.org/msg35430.html
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung ElectronicsQuoted 293 lines
Quoted 293 lines
--- arch/arm/mach-exynos/pm.c | 167 +++++++++++++++++++++++++++++---------- arch/arm/mach-exynos/regs-pmu.h | 1 + 2 files changed, 126 insertions(+), 42 deletions(-)arch/arm/mach-exynos/pm.c +125
-42@@ -36,6 +36,8 @@#include "regs-pmu.h" #include "regs-sys.h" +#define REG_TABLE_END (-1U) +/** * struct exynos_wkup_irq - Exynos GIC to PMU IRQ mapping * @hwirq: Hardware IRQ signal of the GIC @@ -59,6 +61,21 @@ static struct sleep_save exynos_core_save[] = { SAVE_ITEM(S5P_SROM_BC3), }; +struct exynos_pm_data { +const struct exynos_wkup_irq *wkup_irq; +struct sleep_save *extra_save; +int num_extra_save; +unsigned int wake_disable_mask; +unsigned int *release_ret_regs; + +void (*pm_prepare)(void ); +void (*pm_resume)(void ); +int (*pm_suspend)(void ); +int (*cpu_suspend)(unsigned long ); +}; + +struct exynos_pm_data *pm_data; +/* * GIC wake-up support */ @@ -77,14 +94,24 @@ static const struct exynos_wkup_irq exynos5250_wkup_irq[] = { { /* sentinel */ }, }; +unsigned int exynos_release_ret_regs[] = { +S5P_PAD_RET_MAUDIO_OPTION , +S5P_PAD_RET_GPIO_OPTION , +S5P_PAD_RET_UART_OPTION , +S5P_PAD_RET_MMCA_OPTION , +S5P_PAD_RET_MMCB_OPTION , +S5P_PAD_RET_EBIA_OPTION , +S5P_PAD_RET_EBIB_OPTION , +REG_TABLE_END , +}; +static int exynos_irq_set_wake (struct irq_data *data,unsigned int state) {const struct exynos_wkup_irq *wkup_irq; -if (soc_is_exynos5250 ()) - wkup_irq = exynos5250_wkup_irq; -else - wkup_irq = exynos4_wkup_irq; +if (!pm_data->wkup_irq) +return -ENOENT ; + wkup_irq = pm_data->wkup_irq;while (wkup_irq->mask) {if (wkup_irq->hwirq == data->hwirq) {@@ -229,15 +256,8 @@ void exynos_enter_aftr(void)cpu_pm_exit (); } -static int exynos_cpu_suspend (unsigned long arg) +static int exynos_cpu_do_idle (void ) { -#ifdef CONFIG_CACHE_L2X0 -outer_flush_all (); -#endif - -if (soc_is_exynos5250 ()) -flush_cache_all (); -/* issue the standby signal into the pm unit. */ cpu_do_idle ();@@ -245,29 +265,44 @@ static int exynos_cpu_suspend(unsigned long arg)return 1 ;/* Aborting suspend */ } -static void exynos_pm_prepare (void ) +static int exynos_cpu_suspend (unsigned long arg) { -unsigned int tmp; +flush_cache_all (); +outer_flush_all (); +return exynos_cpu_do_idle (); +} +static void exynos_pm_set_wakeup_mask (void ) +{/* Set wake-up mask registers */ pmu_raw_writel (exynos_get_eint_wake_mask (),S5P_EINT_WAKEUP_MASK );pmu_raw_writel (exynos_irqwake_intmask & ~(1 <<31 ),S5P_WAKEUP_MASK ); +} -s3c_pm_do_save (exynos_core_save,ARRAY_SIZE (exynos_core_save)); - -if (soc_is_exynos5250 ()) -s3c_pm_do_save (exynos5_sys_save,ARRAY_SIZE (exynos5_sys_save)); - +static void exynos_pm_enter_sleep_mode (void ) +{/* Set value of power down register for sleep mode */ -exynos_sys_powerdown_conf (SYS_SLEEP );pmu_raw_writel (S5P_CHECK_SLEEP ,S5P_INFORM1 );/* ensure at least INFORM0 has the resume address */ -pmu_raw_writel (virt_to_phys (exynos_cpu_resume),S5P_INFORM0 ); } +static void exynos_pm_prepare (void ) +{ +/* Set wake-up mask registers */ +exynos_pm_set_wakeup_mask (); + +s3c_pm_do_save (exynos_core_save,ARRAY_SIZE (exynos_core_save)); + +if (pm_data->extra_save) +s3c_pm_do_save (pm_data->extra_save, + pm_data->num_extra_save); + +exynos_pm_enter_sleep_mode (); +} +static int exynos_pm_suspend (void ) {unsigned long tmp;@@ -285,6 +320,15 @@ static int exynos_pm_suspend(void)return 0 ; } +static void exynos_pm_release_retention (void ) +{ +unsigned int i; + +for (i =0 ; (pm_data->release_ret_regs[i] !=REG_TABLE_END ); i++) +pmu_raw_writel (EXYNOS_WAKEUP_FROM_LOWPWR , + pm_data->release_ret_regs[i]); +} +static void exynos_pm_resume (void ) {if (exynos_pm_central_resume ())@@ -294,18 +338,11 @@ static void exynos_pm_resume(void)exynos_cpu_restore_register ();/* For release retention */ +exynos_pm_release_retention (); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_MAUDIO_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_GPIO_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_UART_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_MMCA_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_MMCB_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_EBIA_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_EBIB_OPTION ); - -if (soc_is_exynos5250 ()) -s3c_pm_do_restore (exynos5_sys_save, -ARRAY_SIZE (exynos5_sys_save)); +if (pm_data->extra_save) +s3c_pm_do_restore_core (pm_data->extra_save, + pm_data->num_extra_save);s3c_pm_do_restore_core (exynos_core_save,ARRAY_SIZE (exynos_core_save));@@ -316,15 +353,8 @@ early_wakeup:/* Clear SLEEP mode set in INFORM1 */ pmu_raw_writel (0x0 ,S5P_INFORM1 ); - -return ; } -static struct syscore_ops exynos_pm_syscore_ops = { - .suspend = exynos_pm_suspend, - .resume = exynos_pm_resume, -}; -/* * Suspend Ops */ @@ -348,11 +378,12 @@ static int exynos_suspend_enter(suspend_state_t state) }s3c_pm_save_uarts (); -exynos_pm_prepare (); +if (pm_data->pm_prepare) + pm_data->pm_prepare ();flush_cache_all ();s3c_pm_check_store (); - ret =cpu_suspend (0 , exynos_cpu_suspend); + ret =cpu_suspend (0 , pm_data->cpu_suspend);if (ret)return ret;@@ -387,18 +418,70 @@ static const struct platform_suspend_ops exynos_suspend_ops = { .valid = suspend_valid_only_mem, }; +static const struct exynos_pm_data exynos4_pm_data = { + .wkup_irq = exynos4_wkup_irq, + .wake_disable_mask = ((0xFF <<8 ) | (0x1F <<1 )), + .release_ret_regs = exynos_release_ret_regs, + .pm_suspend = exynos_pm_suspend, + .pm_resume = exynos_pm_resume, + .pm_prepare = exynos_pm_prepare, + .cpu_suspend = exynos_cpu_suspend, +}; + +static const struct exynos_pm_data exynos5250_pm_data = { + .wkup_irq = exynos5250_wkup_irq, + .wake_disable_mask = ((0xFF <<8 ) | (0x1F <<1 )), + .release_ret_regs = exynos_release_ret_regs, + .extra_save = exynos5_sys_save, + .num_extra_save =ARRAY_SIZE (exynos5_sys_save), + .pm_suspend = exynos_pm_suspend, + .pm_resume = exynos_pm_resume, + .pm_prepare = exynos_pm_prepare, + .cpu_suspend = exynos_cpu_suspend, +}; + +static struct of_device_id exynos_pmu_of_device_ids[] = { + { + .compatible ="samsung,exynos4210-pmu" , + .data = &exynos4_pm_data, + }, { + .compatible ="samsung,exynos4212-pmu" , + .data = &exynos4_pm_data, + }, { + .compatible ="samsung,exynos4412-pmu" , + .data = &exynos4_pm_data, + }, { + .compatible ="samsung,exynos5250-pmu" , + .data = &exynos5250_pm_data, + }, + {/*sentinel*/ }, +}; + +static struct syscore_ops exynos_pm_syscore_ops; +void __init exynos_pm_init (void ) { +const struct of_device_id *match;u32 tmp; +of_find_matching_node_and_match (NULL , exynos_pmu_of_device_ids, &match); +if (!match) { +pr_err ("Failed to find PMU node\n" ); +return ; + } + pm_data = (struct exynos_pm_data *) match->data; +/* Platform-specific GIC callback */ gic_arch_extn.irq_set_wake = exynos_irq_set_wake;/* All wakeup disable */ tmp =pmu_raw_readl (S5P_WAKEUP_MASK ); - tmp |= ((0xFF <<8 ) | (0x1F <<1 )); + tmp |= pm_data->wake_disable_mask;pmu_raw_writel (tmp,S5P_WAKEUP_MASK ); + exynos_pm_syscore_ops.suspend = pm_data->pm_suspend; + exynos_pm_syscore_ops.resume = pm_data->pm_resume; +register_syscore_ops (&exynos_pm_syscore_ops);suspend_set_ops (&exynos_suspend_ops); }arch/arm/mach-exynos/regs-pmu.h +1
-0@@ -21,6 +21,7 @@#define S5P_USE_STANDBY_WFI0 (1 << 16)#define S5P_USE_STANDBY_WFE0 (1 << 24) +#define EXYNOS_WAKEUP_FROM_LOWPWR (1 << 28)#define EXYNOS_SWRESET 0x0400#define EXYNOS5440_SWRESET 0x00C4
PATCH RESEND v4 2/2 ARM: EXYNOS: Refactor the pm code to use DT based lookup
Quoted 3 lines · Vikas Sajjan
Hi,
Hi,
Sorry for late response...
Quoted 18 lines
Quoted 16 lines · Bartlomiej Zolnierkiewicz
Hi,
Quoted 12 lines · Vikas Sajjan
Hi Kukjin,
Quoted 8 lines · Vikas Sajjan
Refactoring the
pm.cto avoid using "soc_is_exynos" checks, instead use the DT based lookup.While at it, consolidate the common code across SoCs and create static helper functions.
Signed-off-by Vikas Sajjan <[email protected]>Reviewed-by Tomasz Figa <[email protected]>
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Can you pick this series...
I think that my PM_SLEEP=n build fixes should go in before this cleanup series:
Its better for Kukjin to decide which series he wants to pick first.
Hmm...I need to have a look at the Bart's fix then I'll let you know. Maybe tomorrow morning ;)
Quoted 4 lines
Quoted 4 lines
http://www.mail-archive.com/linux-samsung-soc at vger.kernel.org/msg35430.html
- Kukjin
PATCH RESEND v4 2/2 ARM: EXYNOS: Refactor the pm code to use DT based lookup
Hi Kukjin,
Quoted 28 lines · Kukjin Kim
Quoted 3 lines · Vikas Sajjan
Hi,
Hi,
Sorry for late response...
Quoted 20 lines
Quoted 18 lines · Bartlomiej Zolnierkiewicz
Hi,
Quoted 13 lines · Vikas Sajjan
Hi Kukjin,
Quoted 8 lines · Vikas Sajjan
Refactoring the
pm.cto avoid using "soc_is_exynos" checks, instead use the DT based lookup.While at it, consolidate the common code across SoCs and create static helper functions.
Signed-off-by Vikas Sajjan <[email protected]>Reviewed-by Tomasz Figa <[email protected]>Can you pick this series...
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
I think that my PM_SLEEP=n build fixes should go in before this cleanup series:
Its better for Kukjin to decide which series he wants to pick first.
Hmm...I need to have a look at the Bart's fix then I'll let you know. Maybe tomorrow morning ;)
PING...
Quoted 11 lines
Quoted 4 lines
Quoted 4 lines
http://www.mail-archive.com/linux-samsung-soc at vger.kernel.org/msg35430.html
- Kukjin
--
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
PATCH RESEND v4 2/2 ARM: EXYNOS: Refactor the pm code to use DT based lookup
Hi kukjin,
Quoted 39 lines · Vikas Sajjan
Hi Kukjin,
Quoted 36 lines · Kukjin Kim
Quoted 3 lines · Vikas Sajjan
Hi,
Hi,
Sorry for late response...
Quoted 18 lines
Quoted 16 lines · Bartlomiej Zolnierkiewicz
Hi,
Quoted 12 lines · Vikas Sajjan
Hi Kukjin,
Quoted 8 lines · Vikas Sajjan
Refactoring the
pm.cto avoid using "soc_is_exynos" checks, instead use the DT based lookup.While at it, consolidate the common code across SoCs and create static helper functions.
Signed-off-by Vikas Sajjan <[email protected]>Reviewed-by Tomasz Figa <[email protected]>Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Can you pick this series...
I think that my PM_SLEEP=n build fixes should go in before this cleanup series:
Its better for Kukjin to decide which series he wants to pick first.
Hmm...I need to have a look at the Bart's fix then I'll let you know. Maybe tomorrow morning ;)
Any plans to apply this series....
Quoted 14 lines
PING...
Quoted 11 lines
Quoted 4 lines
Quoted 4 lines
http://www.mail-archive.com/linux-samsung-soc at vger.kernel.org/msg35430.html
- Kukjin
--
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
Kukjin Kim
maintainerPATCH RESEND v4 2/2 ARM: EXYNOS: Refactor the pm code to use DT based lookup
In reply to Bartlomiej ZolnierkiewiczQuoted 3 lines · Bartlomiej Zolnierkiewicz
Hi,
Hi,
Quoted 13 lines · Vikas Sajjan
Quoted 12 lines
Hi Kukjin,
Quoted 8 lines · Vikas Sajjan
Refactoring the
pm.cto avoid using "soc_is_exynos" checks, instead use the DT based lookup.While at it, consolidate the common code across SoCs and create static helper functions.
Signed-off-by Vikas Sajjan <[email protected]>Reviewed-by Tomasz Figa <[email protected]>
Quoted 7 lines
Quoted 1 line
Can you pick this series...
I think that my PM_SLEEP=n build fixes should go in before this cleanup series:
http://www.mail-archive.com/linux-samsung-soc at vger.kernel.org/msg35430.html
Bart, your patch has a problem due to dependency, Firmware-assisted suspend/ resume patch from Tomasz as I emailed today morning in my time. So I will apply this series firstly. Please respin the fixes once the build breakage resolved. If you have any idea, please let me know.
Thanks,
Kukjin
Quoted 10 lines
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung ElectronicsQuoted 4 lines
Quoted 4 lines
--- arch/arm/mach-exynos/pm.c | 167 +++++++++++++++++++++++++++++---------- arch/arm/mach-exynos/regs-pmu.h | 1 + 2 files changed, 126 insertions(+), 42 deletions(-)
PATCH RESEND v4 2/2 ARM: EXYNOS: Refactor the pm code to use DT based lookup
In reply to Vikas SajjanHi kukjin,
Quoted 8 lines · Vikas Sajjan
Refactoring the
pm.cto avoid using "soc_is_exynos" checks, instead use the DT based lookup.While at it, consolidate the common code across SoCs and create static helper functions.
Signed-off-by Vikas Sajjan <[email protected]>Reviewed-by Tomasz Figa <[email protected]>
Can you apply this patch series.
Quoted 297 lines
--- arch/arm/mach-exynos/pm.c | 167 +++++++++++++++++++++++++++++---------- arch/arm/mach-exynos/regs-pmu.h | 1 + 2 files changed, 126 insertions(+), 42 deletions(-)arch/arm/mach-exynos/pm.c +125
-42@@ -36,6 +36,8 @@#include "regs-pmu.h" #include "regs-sys.h" +#define REG_TABLE_END (-1U) +/** * struct exynos_wkup_irq - Exynos GIC to PMU IRQ mapping * @hwirq: Hardware IRQ signal of the GIC @@ -59,6 +61,21 @@ static struct sleep_save exynos_core_save[] = { SAVE_ITEM(S5P_SROM_BC3), }; +struct exynos_pm_data { +const struct exynos_wkup_irq *wkup_irq; +struct sleep_save *extra_save; +int num_extra_save; +unsigned int wake_disable_mask; +unsigned int *release_ret_regs; + +void (*pm_prepare)(void ); +void (*pm_resume)(void ); +int (*pm_suspend)(void ); +int (*cpu_suspend)(unsigned long ); +}; + +struct exynos_pm_data *pm_data; +/* * GIC wake-up support */ @@ -77,14 +94,24 @@ static const struct exynos_wkup_irq exynos5250_wkup_irq[] = { { /* sentinel */ }, }; +unsigned int exynos_release_ret_regs[] = { +S5P_PAD_RET_MAUDIO_OPTION , +S5P_PAD_RET_GPIO_OPTION , +S5P_PAD_RET_UART_OPTION , +S5P_PAD_RET_MMCA_OPTION , +S5P_PAD_RET_MMCB_OPTION , +S5P_PAD_RET_EBIA_OPTION , +S5P_PAD_RET_EBIB_OPTION , +REG_TABLE_END , +}; +static int exynos_irq_set_wake (struct irq_data *data,unsigned int state) {const struct exynos_wkup_irq *wkup_irq; -if (soc_is_exynos5250 ()) - wkup_irq = exynos5250_wkup_irq; -else - wkup_irq = exynos4_wkup_irq; +if (!pm_data->wkup_irq) +return -ENOENT ; + wkup_irq = pm_data->wkup_irq;while (wkup_irq->mask) {if (wkup_irq->hwirq == data->hwirq) {@@ -229,15 +256,8 @@ void exynos_enter_aftr(void)cpu_pm_exit (); } -static int exynos_cpu_suspend (unsigned long arg) +static int exynos_cpu_do_idle (void ) { -#ifdef CONFIG_CACHE_L2X0 -outer_flush_all (); -#endif - -if (soc_is_exynos5250 ()) -flush_cache_all (); -/* issue the standby signal into the pm unit. */ cpu_do_idle ();@@ -245,29 +265,44 @@ static int exynos_cpu_suspend(unsigned long arg)return 1 ;/* Aborting suspend */ } -static void exynos_pm_prepare (void ) +static int exynos_cpu_suspend (unsigned long arg) { -unsigned int tmp; +flush_cache_all (); +outer_flush_all (); +return exynos_cpu_do_idle (); +} +static void exynos_pm_set_wakeup_mask (void ) +{/* Set wake-up mask registers */ pmu_raw_writel (exynos_get_eint_wake_mask (),S5P_EINT_WAKEUP_MASK );pmu_raw_writel (exynos_irqwake_intmask & ~(1 <<31 ),S5P_WAKEUP_MASK ); +} -s3c_pm_do_save (exynos_core_save,ARRAY_SIZE (exynos_core_save)); - -if (soc_is_exynos5250 ()) -s3c_pm_do_save (exynos5_sys_save,ARRAY_SIZE (exynos5_sys_save)); - +static void exynos_pm_enter_sleep_mode (void ) +{/* Set value of power down register for sleep mode */ -exynos_sys_powerdown_conf (SYS_SLEEP );pmu_raw_writel (S5P_CHECK_SLEEP ,S5P_INFORM1 );/* ensure at least INFORM0 has the resume address */ -pmu_raw_writel (virt_to_phys (exynos_cpu_resume),S5P_INFORM0 ); } +static void exynos_pm_prepare (void ) +{ +/* Set wake-up mask registers */ +exynos_pm_set_wakeup_mask (); + +s3c_pm_do_save (exynos_core_save,ARRAY_SIZE (exynos_core_save)); + +if (pm_data->extra_save) +s3c_pm_do_save (pm_data->extra_save, + pm_data->num_extra_save); + +exynos_pm_enter_sleep_mode (); +} +static int exynos_pm_suspend (void ) {unsigned long tmp;@@ -285,6 +320,15 @@ static int exynos_pm_suspend(void)return 0 ; } +static void exynos_pm_release_retention (void ) +{ +unsigned int i; + +for (i =0 ; (pm_data->release_ret_regs[i] !=REG_TABLE_END ); i++) +pmu_raw_writel (EXYNOS_WAKEUP_FROM_LOWPWR , + pm_data->release_ret_regs[i]); +} +static void exynos_pm_resume (void ) {if (exynos_pm_central_resume ())@@ -294,18 +338,11 @@ static void exynos_pm_resume(void)exynos_cpu_restore_register ();/* For release retention */ +exynos_pm_release_retention (); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_MAUDIO_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_GPIO_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_UART_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_MMCA_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_MMCB_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_EBIA_OPTION ); -pmu_raw_writel ((1 <<28 ),S5P_PAD_RET_EBIB_OPTION ); - -if (soc_is_exynos5250 ()) -s3c_pm_do_restore (exynos5_sys_save, -ARRAY_SIZE (exynos5_sys_save)); +if (pm_data->extra_save) +s3c_pm_do_restore_core (pm_data->extra_save, + pm_data->num_extra_save);s3c_pm_do_restore_core (exynos_core_save,ARRAY_SIZE (exynos_core_save));@@ -316,15 +353,8 @@ early_wakeup:/* Clear SLEEP mode set in INFORM1 */ pmu_raw_writel (0x0 ,S5P_INFORM1 ); - -return ; } -static struct syscore_ops exynos_pm_syscore_ops = { - .suspend = exynos_pm_suspend, - .resume = exynos_pm_resume, -}; -/* * Suspend Ops */ @@ -348,11 +378,12 @@ static int exynos_suspend_enter(suspend_state_t state) }s3c_pm_save_uarts (); -exynos_pm_prepare (); +if (pm_data->pm_prepare) + pm_data->pm_prepare ();flush_cache_all ();s3c_pm_check_store (); - ret =cpu_suspend (0 , exynos_cpu_suspend); + ret =cpu_suspend (0 , pm_data->cpu_suspend);if (ret)return ret;@@ -387,18 +418,70 @@ static const struct platform_suspend_ops exynos_suspend_ops = { .valid = suspend_valid_only_mem, }; +static const struct exynos_pm_data exynos4_pm_data = { + .wkup_irq = exynos4_wkup_irq, + .wake_disable_mask = ((0xFF <<8 ) | (0x1F <<1 )), + .release_ret_regs = exynos_release_ret_regs, + .pm_suspend = exynos_pm_suspend, + .pm_resume = exynos_pm_resume, + .pm_prepare = exynos_pm_prepare, + .cpu_suspend = exynos_cpu_suspend, +}; + +static const struct exynos_pm_data exynos5250_pm_data = { + .wkup_irq = exynos5250_wkup_irq, + .wake_disable_mask = ((0xFF <<8 ) | (0x1F <<1 )), + .release_ret_regs = exynos_release_ret_regs, + .extra_save = exynos5_sys_save, + .num_extra_save =ARRAY_SIZE (exynos5_sys_save), + .pm_suspend = exynos_pm_suspend, + .pm_resume = exynos_pm_resume, + .pm_prepare = exynos_pm_prepare, + .cpu_suspend = exynos_cpu_suspend, +}; + +static struct of_device_id exynos_pmu_of_device_ids[] = { + { + .compatible ="samsung,exynos4210-pmu" , + .data = &exynos4_pm_data, + }, { + .compatible ="samsung,exynos4212-pmu" , + .data = &exynos4_pm_data, + }, { + .compatible ="samsung,exynos4412-pmu" , + .data = &exynos4_pm_data, + }, { + .compatible ="samsung,exynos5250-pmu" , + .data = &exynos5250_pm_data, + }, + {/*sentinel*/ }, +}; + +static struct syscore_ops exynos_pm_syscore_ops; +void __init exynos_pm_init (void ) { +const struct of_device_id *match;u32 tmp; +of_find_matching_node_and_match (NULL , exynos_pmu_of_device_ids, &match); +if (!match) { +pr_err ("Failed to find PMU node\n" ); +return ; + } + pm_data = (struct exynos_pm_data *) match->data; +/* Platform-specific GIC callback */ gic_arch_extn.irq_set_wake = exynos_irq_set_wake;/* All wakeup disable */ tmp =pmu_raw_readl (S5P_WAKEUP_MASK ); - tmp |= ((0xFF <<8 ) | (0x1F <<1 )); + tmp |= pm_data->wake_disable_mask;pmu_raw_writel (tmp,S5P_WAKEUP_MASK ); + exynos_pm_syscore_ops.suspend = pm_data->pm_suspend; + exynos_pm_syscore_ops.resume = pm_data->pm_resume; +register_syscore_ops (&exynos_pm_syscore_ops);suspend_set_ops (&exynos_suspend_ops); }arch/arm/mach-exynos/regs-pmu.h +1
-1@@ -21,6 +21,7 @@#define S5P_USE_STANDBY_WFI0 (1 << 16)#define S5P_USE_STANDBY_WFE0 (1 << 24) +#define EXYNOS_WAKEUP_FROM_LOWPWR (1 << 28)#define EXYNOS_SWRESET 0x0400#define EXYNOS5440_SWRESET 0x00C4 --1.7.9.5