[PATCH v2 2/2] ARM: EXYNOS: PMU: move restart code into pmu driver

[Pankaj Dubey]

Hi,

On Wednesday, October 01, 2014 7:23 PM Guenter Roeck wrote:
> On 10/01/2014 04:36 AM, Pankaj Dubey wrote:
> > Let's register reboot_notifier from PMU driver for reboot
> > functionality. So that we can remove restart hooks from machine
> > specific file, and thus moving ahead when PMU moved to driver folder,
> > this functionality can be reused for ARM64 based Exynos SoC's.
> >
> > Signed-off-by: Pankaj Dubey <pankaj.dubey at samsung.com>
> > ---
> >   arch/arm/mach-exynos/common.h |    1 -
> >   arch/arm/mach-exynos/exynos.c |    6 ------
> >   arch/arm/mach-exynos/pmu.c    |   25
> +++++++++++++++++++++++++
> >   3 files changed, 25 insertions(+), 7 deletions(-)
> >
> > diff --git a/arch/arm/mach-exynos/common.h
> > b/arch/arm/mach-exynos/common.h index 431be1b..865f878 100644
> > --- a/arch/arm/mach-exynos/common.h
> > +++ b/arch/arm/mach-exynos/common.h
> > @@ -12,7 +12,6 @@
> >   #ifndef __ARCH_ARM_MACH_EXYNOS_COMMON_H
> >   #define __ARCH_ARM_MACH_EXYNOS_COMMON_H
> >
> > -#include <linux/reboot.h>
> >   #include <linux/of.h>
> >
> >   #define EXYNOS3250_SOC_ID	0xE3472000
> > diff --git a/arch/arm/mach-exynos/exynos.c
> > b/arch/arm/mach-exynos/exynos.c index aa394cb..3aa75b8e 100644
> > --- a/arch/arm/mach-exynos/exynos.c
> > +++ b/arch/arm/mach-exynos/exynos.c
> > @@ -137,11 +137,6 @@ static struct map_desc exynos5_iodesc[] __initdata
= {
> >   	},
> >   };
> >
> > -static void exynos_restart(enum reboot_mode mode, const char *cmd) -{
> > -	__raw_writel(0x1, pmu_base_addr + EXYNOS_SWRESET);
> > -}
> > -
> >   static struct platform_device exynos_cpuidle = {
> >   	.name              = "exynos_cpuidle",
> >   #ifdef CONFIG_ARM_EXYNOS_CPUIDLE
> > @@ -365,7 +360,6 @@ DT_MACHINE_START(EXYNOS_DT, "SAMSUNG
> EXYNOS (Flattened Device Tree)")
> >   	.init_machine	= exynos_dt_machine_init,
> >   	.init_late	= exynos_init_late,
> >   	.dt_compat	= exynos_dt_compat,
> > -	.restart	= exynos_restart,
> >   	.reserve	= exynos_reserve,
> >   	.dt_fixup	= exynos_dt_fixup,
> >   MACHINE_END
> > diff --git a/arch/arm/mach-exynos/pmu.c b/arch/arm/mach-exynos/pmu.c
> > index 1993e08..c0855a5 100644
> > --- a/arch/arm/mach-exynos/pmu.c
> > +++ b/arch/arm/mach-exynos/pmu.c
> > @@ -11,7 +11,10 @@
> >
> >   #include <linux/io.h>
> >   #include <linux/of.h>
> > +#include <linux/of_address.h>
> >   #include <linux/platform_device.h>
> > +#include <linux/notifier.h>
> > +#include <linux/reboot.h>
> >
> >   #include "exynos-pmu.h"
> >   #include "regs-pmu.h"
> > @@ -439,6 +442,15 @@ static void exynos5250_pmu_init(void)
> >   	pmu_raw_writel(value, EXYNOS5_MASK_WDTRESET_REQUEST);
> >   }
> >
> > +static int pmu_reboot_notify_handler(struct notifier_block *this,
> > +		unsigned long code, void *unused)
> > +{
> > +	if (code == SYS_RESTART)
> > +		pmu_raw_writel(0x1, EXYNOS_SWRESET);
> > +
> > +	return NOTIFY_DONE;
> > +}
> > +
> >   static const struct exynos_pmu_data exynos4210_pmu_data = {
> >   	.pmu_config	= exynos4210_pmu_config,
> >   };
> > @@ -478,11 +490,20 @@ static const struct of_device_id
> exynos_pmu_of_device_ids[] = {
> >   	{ /*sentinel*/ },
> >   };
> >
> > +/*
> > + * Exynos PMU reboot notifier, handles reboot functionality  */
> > +static struct notifier_block pmu_reboot_notifier = {
> > +	.notifier_call = pmu_reboot_notify_handler,
> > +	.priority = 128,
> > +};
> > +
> >   static int exynos_pmu_probe(struct platform_device *pdev)
> >   {
> >   	const struct of_device_id *match;
> >   	struct device *dev = &pdev->dev;
> >   	struct resource *res;
> > +	int ret;
> >
> >   	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> >   	pmu_base_addr = devm_ioremap_resource(dev, res); @@ -507,6 +528,10
> > @@ static int exynos_pmu_probe(struct platform_device *pdev)
> >
> >   	platform_set_drvdata(pdev, pmu_context);
> >
> > +	ret = register_reboot_notifier(&pmu_reboot_notifier);
> > +	if (ret)
> > +		dev_err(dev, "can't register reboot notifier err=%d\n",
ret);
> > +
> >   	dev_dbg(dev, "Exynos PMU Driver probe done\n");
> >   	return 0;
> >   }
> >
> 
> Something went wrong here.
> 
> You don't want to register with reboot_notifier, but with
restart_notifier.
> The code is not SYS_RESTART, but the value of reboot_mode.
> 
> The same applies to the other patch as well.
> 

Yes, you are right. Thanks for review and pointing out this.

Originally restart hooks of Exynos machine_desc are getting called from
machine_restart,
so I should have registered restart_notifier. Somehow I missed this part. I
will update both patches shortly.

Thanks,
Pankaj Dubey

> Guenter