On Thu, Oct 10, 2019 at 10:29:49PM +0200, Arnd Bergmann wrote:
> The pm-debug code is one of the few things shared between s3c24xx/s3c64xx
> and the newer s5pv210. In order to make s5pv210 independent of plat-samsung,
> change the common bits of this code to no longer reference the s3c specific
> bits.
>
> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
> ---
> arch/arm/mach-s3c24xx/include/mach/pm-core.h | 7 +--
> arch/arm/mach-s3c64xx/include/mach/pm-core.h | 44 +---------------
> arch/arm/mach-s3c64xx/pm.c | 50 +++++++++++++++++++
> arch/arm/mach-s5pv210/pm.c | 6 +--
> .../arm/plat-samsung/include/plat/pm-common.h | 29 +++++------
> arch/arm/plat-samsung/pm-debug.c | 23 ++-------
> arch/arm/plat-samsung/pm.c | 10 ++--
> 7 files changed, 80 insertions(+), 89 deletions(-)
>
> diff --git a/arch/arm/mach-s3c24xx/include/mach/pm-core.h b/arch/arm/mach-s3c24xx/include/mach/pm-core.h
> index 5e4ce89d0158..8f87606c4cdc 100644
> --- a/arch/arm/mach-s3c24xx/include/mach/pm-core.h
> +++ b/arch/arm/mach-s3c24xx/include/mach/pm-core.h
> @@ -15,6 +15,7 @@
>
> static inline void s3c_pm_debug_init_uart(void)
> {
> +#ifdef CONFIG_SAMSUNG_PM_DEBUG
> unsigned long tmp = __raw_readl(S3C2410_CLKCON);
>
> /* re-start uart clocks */
> @@ -24,6 +25,7 @@ static inline void s3c_pm_debug_init_uart(void)
>
> __raw_writel(tmp, S3C2410_CLKCON);
> udelay(10);
> +#endif
> }
>
> static inline void s3c_pm_arch_prepare_irqs(void)
> @@ -75,11 +77,6 @@ static inline void s3c_pm_arch_show_resume_irqs(void)
> s3c_irqwake_eintmask);
> }
>
> -static inline void s3c_pm_arch_update_uart(void __iomem *regs,
> - struct pm_uart_save *save)
> -{
> -}
> -
> static inline void s3c_pm_restored_gpios(void) { }
> static inline void samsung_pm_saved_gpios(void) { }
>
> diff --git a/arch/arm/mach-s3c64xx/include/mach/pm-core.h b/arch/arm/mach-s3c64xx/include/mach/pm-core.h
> index bbf79ed28583..33cf242734a0 100644
> --- a/arch/arm/mach-s3c64xx/include/mach/pm-core.h
> +++ b/arch/arm/mach-s3c64xx/include/mach/pm-core.h
> @@ -20,6 +20,7 @@
>
> static inline void s3c_pm_debug_init_uart(void)
> {
> +#ifdef CONFIG_SAMSUNG_PM_DEBUG
> u32 tmp = __raw_readl(S3C_PCLK_GATE);
>
> /* As a note, since the S3C64XX UARTs generally have multiple
> @@ -35,6 +36,7 @@ static inline void s3c_pm_debug_init_uart(void)
>
> __raw_writel(tmp, S3C_PCLK_GATE);
> udelay(10);
> +#endif
> }
>
> static inline void s3c_pm_arch_prepare_irqs(void)
> @@ -63,48 +65,6 @@ static inline void s3c_pm_arch_show_resume_irqs(void)
> #define s3c_irqwake_intallow 0
> #endif
>
> -static inline void s3c_pm_arch_update_uart(void __iomem *regs,
> - struct pm_uart_save *save)
> -{
> - u32 ucon = __raw_readl(regs + S3C2410_UCON);
> - u32 ucon_clk = ucon & S3C6400_UCON_CLKMASK;
> - u32 save_clk = save->ucon & S3C6400_UCON_CLKMASK;
> - u32 new_ucon;
> - u32 delta;
> -
> - /* S3C64XX UART blocks only support level interrupts, so ensure that
> - * when we restore unused UART blocks we force the level interrupt
> - * settigs. */
> - save->ucon |= S3C2410_UCON_TXILEVEL | S3C2410_UCON_RXILEVEL;
> -
> - /* We have a constraint on changing the clock type of the UART
> - * between UCLKx and PCLK, so ensure that when we restore UCON
> - * that the CLK field is correctly modified if the bootloader
> - * has changed anything.
> - */
> - if (ucon_clk != save_clk) {
> - new_ucon = save->ucon;
> - delta = ucon_clk ^ save_clk;
> -
> - /* change from UCLKx => wrong PCLK,
> - * either UCLK can be tested for by a bit-test
> - * with UCLK0 */
> - if (ucon_clk & S3C6400_UCON_UCLK0 &&
> - !(save_clk & S3C6400_UCON_UCLK0) &&
> - delta & S3C6400_UCON_PCLK2) {
> - new_ucon &= ~S3C6400_UCON_UCLK0;
> - } else if (delta == S3C6400_UCON_PCLK2) {
> - /* as an precaution, don't change from
> - * PCLK2 => PCLK or vice-versa */
> - new_ucon ^= S3C6400_UCON_PCLK2;
> - }
> -
> - S3C_PMDBG("ucon change %04x => %04x (save=%04x)\n",
> - ucon, new_ucon, save->ucon);
> - save->ucon = new_ucon;
> - }
> -}
> -
> static inline void s3c_pm_restored_gpios(void)
> {
> /* ensure sleep mode has been cleared from the system */
> diff --git a/arch/arm/mach-s3c64xx/pm.c b/arch/arm/mach-s3c64xx/pm.c
> index fd6dbb263ed5..a612e9779057 100644
> --- a/arch/arm/mach-s3c64xx/pm.c
> +++ b/arch/arm/mach-s3c64xx/pm.c
> @@ -305,6 +305,56 @@ static void s3c64xx_pm_prepare(void)
> __raw_writel(__raw_readl(S3C64XX_WAKEUP_STAT), S3C64XX_WAKEUP_STAT);
> }
>
> +#ifdef CONFIG_SAMSUNG_PM_DEBUG
> +void s3c_pm_arch_update_uart(void __iomem *regs, struct pm_uart_save *save)
> +{
> + u32 ucon;
> + u32 ucon_clk
> + u32 save_clk;
> + u32 new_ucon;
> + u32 delta;
> +
> + if (!soc_is_s3c64xx())
> + return;
> +
> + ucon = __raw_readl(regs + S3C2410_UCON);
> + ucon_clk = ucon & S3C6400_UCON_CLKMASK;
> + sav_clk = save->ucon & S3C6400_UCON_CLKMASK;
> +
> + /* S3C64XX UART blocks only support level interrupts, so ensure that
> + * when we restore unused UART blocks we force the level interrupt
> + * settigs. */
> + save->ucon |= S3C2410_UCON_TXILEVEL | S3C2410_UCON_RXILEVEL;
> +
> + /* We have a constraint on changing the clock type of the UART
> + * between UCLKx and PCLK, so ensure that when we restore UCON
> + * that the CLK field is correctly modified if the bootloader
> + * has changed anything.
> + */
> + if (ucon_clk != save_clk) {
> + new_ucon = save->ucon;
> + delta = ucon_clk ^ save_clk;
> +
> + /* change from UCLKx => wrong PCLK,
> + * either UCLK can be tested for by a bit-test
> + * with UCLK0 */
> + if (ucon_clk & S3C6400_UCON_UCLK0 &&
> + !(save_clk & S3C6400_UCON_UCLK0) &&
> + delta & S3C6400_UCON_PCLK2) {
> + new_ucon &= ~S3C6400_UCON_UCLK0;
> + } else if (delta == S3C6400_UCON_PCLK2) {
> + /* as an precaution, don't change from
> + * PCLK2 => PCLK or vice-versa */
> + new_ucon ^= S3C6400_UCON_PCLK2;
> + }
> +
> + S3C_PMDBG("ucon change %04x => %04x (save=%04x)\n",
> + ucon, new_ucon, save->ucon);
> + save->ucon = new_ucon;
> + }
> +}
> +#endif
> +
> int __init s3c64xx_pm_init(void)
> {
> int i;
> diff --git a/arch/arm/mach-s5pv210/pm.c b/arch/arm/mach-s5pv210/pm.c
> index b336df0c57f3..efdb5a27c060 100644
> --- a/arch/arm/mach-s5pv210/pm.c
> +++ b/arch/arm/mach-s5pv210/pm.c
> @@ -99,8 +99,6 @@ static int s5pv210_suspend_enter(suspend_state_t state)
> u32 eint_wakeup_mask = s5pv210_read_eint_wakeup_mask();
> int ret;
>
> - s3c_pm_debug_init();
Your patch is not equivalent here. If there is a reason behind removal
of UART init (e.g. not needed), I prefer to make it in separate patch.
Rest looks good.
Best regards,
Krzysztof
