* [PATCH v2] pinctrl: qcom: use restart_notifier mechanism for ps_hold
@ 2014-09-23 20:59 Josh Cartwright
2014-09-23 21:57 ` Guenter Roeck
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Josh Cartwright @ 2014-09-23 20:59 UTC (permalink / raw)
To: Bjorn Andersson, Linus Walleij, linux-kernel; +Cc: Pramod Gurav, Guenter Roeck
By converting to the restart_notifier mechanism for restart, we allow
for other mechanisms, like the watchdog, to be used for restart in the
case where PS_HOLD has failed to reset the chip.
Since this mechanism may be one of several mechanisms registered, change
the post-ps_hold write timeout to be a more reasonable 1 second instead
of 10 seconds.
Choose priority 128, as according to documentation, this mechanism "is
sufficient to restart the entire system".
Cc: Pramod Gurav <pramod.gurav@smartplayin.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Tested-by: Pramod Gurav <pramod.gurav@smartplayin.com>
Signed-off-by: Josh Cartwright <joshc@codeaurora.org>
---
Changes since v1:
- Simplified conditional notifier block registration
- Reduced wait time to 1s, which I've found to be sufficient on an IFC6410
board.
drivers/pinctrl/qcom/pinctrl-msm.c | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c
index d5ed127..d30dddd 100644
--- a/drivers/pinctrl/qcom/pinctrl-msm.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm.c
@@ -27,8 +27,7 @@
#include <linux/gpio.h>
#include <linux/interrupt.h>
#include <linux/spinlock.h>
-
-#include <asm/system_misc.h>
+#include <linux/reboot.h>
#include "../core.h"
#include "../pinconf.h"
@@ -43,6 +42,7 @@
* @dev: device handle.
* @pctrl: pinctrl handle.
* @chip: gpiochip handle.
+ * @restart_nb: restart notifier block.
* @irq: parent irq for the TLMM irq_chip.
* @lock: Spinlock to protect register resources as well
* as msm_pinctrl data structures.
@@ -56,6 +56,7 @@ struct msm_pinctrl {
struct device *dev;
struct pinctrl_dev *pctrl;
struct gpio_chip chip;
+ struct notifier_block restart_nb;
int irq;
spinlock_t lock;
@@ -852,13 +853,14 @@ static int msm_gpio_init(struct msm_pinctrl *pctrl)
return 0;
}
-#ifdef CONFIG_ARM
-static void __iomem *msm_ps_hold;
-
-static void msm_reset(enum reboot_mode reboot_mode, const char *cmd)
+static int msm_ps_hold_restart(struct notifier_block *nb, unsigned long action,
+ void *data)
{
- writel(0, msm_ps_hold);
- mdelay(10000);
+ struct msm_pinctrl *pctrl = container_of(nb, struct msm_pinctrl, restart_nb);
+
+ writel(0, pctrl->regs + PS_HOLD_OFFSET);
+ mdelay(1000);
+ return NOTIFY_DONE;
}
static void msm_pinctrl_setup_pm_reset(struct msm_pinctrl *pctrl)
@@ -868,13 +870,14 @@ static void msm_pinctrl_setup_pm_reset(struct msm_pinctrl *pctrl)
for (; i <= pctrl->soc->nfunctions; i++)
if (!strcmp(func[i].name, "ps_hold")) {
- msm_ps_hold = pctrl->regs + PS_HOLD_OFFSET;
- arm_pm_restart = msm_reset;
+ pctrl->restart_nb.notifier_call = msm_ps_hold_restart;
+ pctrl->restart_nb.priority = 128;
+ if (register_restart_handler(&pctrl->restart_nb))
+ dev_err(pctrl->dev,
+ "failed to setup restart handler.\n");
+ break;
}
}
-#else
-static void msm_pinctrl_setup_pm_reset(const struct msm_pinctrl *pctrl) {}
-#endif
int msm_pinctrl_probe(struct platform_device *pdev,
const struct msm_pinctrl_soc_data *soc_data)
@@ -943,6 +946,8 @@ int msm_pinctrl_remove(struct platform_device *pdev)
pinctrl_unregister(pctrl->pctrl);
+ unregister_restart_handler(&pctrl->restart_nb);
+
return 0;
}
EXPORT_SYMBOL(msm_pinctrl_remove);
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2] pinctrl: qcom: use restart_notifier mechanism for ps_hold
2014-09-23 20:59 [PATCH v2] pinctrl: qcom: use restart_notifier mechanism for ps_hold Josh Cartwright
@ 2014-09-23 21:57 ` Guenter Roeck
2014-09-25 7:41 ` Linus Walleij
2014-09-26 8:37 ` Linus Walleij
2 siblings, 0 replies; 5+ messages in thread
From: Guenter Roeck @ 2014-09-23 21:57 UTC (permalink / raw)
To: Josh Cartwright
Cc: Bjorn Andersson, Linus Walleij, linux-kernel, Pramod Gurav
On Tue, Sep 23, 2014 at 03:59:53PM -0500, Josh Cartwright wrote:
> By converting to the restart_notifier mechanism for restart, we allow
> for other mechanisms, like the watchdog, to be used for restart in the
> case where PS_HOLD has failed to reset the chip.
>
> Since this mechanism may be one of several mechanisms registered, change
> the post-ps_hold write timeout to be a more reasonable 1 second instead
> of 10 seconds.
>
> Choose priority 128, as according to documentation, this mechanism "is
> sufficient to restart the entire system".
>
> Cc: Pramod Gurav <pramod.gurav@smartplayin.com>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Tested-by: Pramod Gurav <pramod.gurav@smartplayin.com>
> Signed-off-by: Josh Cartwright <joshc@codeaurora.org>
Looks good to me.
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
>
> Changes since v1:
> - Simplified conditional notifier block registration
> - Reduced wait time to 1s, which I've found to be sufficient on an IFC6410
> board.
>
> drivers/pinctrl/qcom/pinctrl-msm.c | 31 ++++++++++++++++++-------------
> 1 file changed, 18 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c
> index d5ed127..d30dddd 100644
> --- a/drivers/pinctrl/qcom/pinctrl-msm.c
> +++ b/drivers/pinctrl/qcom/pinctrl-msm.c
> @@ -27,8 +27,7 @@
> #include <linux/gpio.h>
> #include <linux/interrupt.h>
> #include <linux/spinlock.h>
> -
> -#include <asm/system_misc.h>
> +#include <linux/reboot.h>
>
> #include "../core.h"
> #include "../pinconf.h"
> @@ -43,6 +42,7 @@
> * @dev: device handle.
> * @pctrl: pinctrl handle.
> * @chip: gpiochip handle.
> + * @restart_nb: restart notifier block.
> * @irq: parent irq for the TLMM irq_chip.
> * @lock: Spinlock to protect register resources as well
> * as msm_pinctrl data structures.
> @@ -56,6 +56,7 @@ struct msm_pinctrl {
> struct device *dev;
> struct pinctrl_dev *pctrl;
> struct gpio_chip chip;
> + struct notifier_block restart_nb;
> int irq;
>
> spinlock_t lock;
> @@ -852,13 +853,14 @@ static int msm_gpio_init(struct msm_pinctrl *pctrl)
> return 0;
> }
>
> -#ifdef CONFIG_ARM
> -static void __iomem *msm_ps_hold;
> -
> -static void msm_reset(enum reboot_mode reboot_mode, const char *cmd)
> +static int msm_ps_hold_restart(struct notifier_block *nb, unsigned long action,
> + void *data)
> {
> - writel(0, msm_ps_hold);
> - mdelay(10000);
> + struct msm_pinctrl *pctrl = container_of(nb, struct msm_pinctrl, restart_nb);
> +
> + writel(0, pctrl->regs + PS_HOLD_OFFSET);
> + mdelay(1000);
> + return NOTIFY_DONE;
> }
>
> static void msm_pinctrl_setup_pm_reset(struct msm_pinctrl *pctrl)
> @@ -868,13 +870,14 @@ static void msm_pinctrl_setup_pm_reset(struct msm_pinctrl *pctrl)
>
> for (; i <= pctrl->soc->nfunctions; i++)
> if (!strcmp(func[i].name, "ps_hold")) {
> - msm_ps_hold = pctrl->regs + PS_HOLD_OFFSET;
> - arm_pm_restart = msm_reset;
> + pctrl->restart_nb.notifier_call = msm_ps_hold_restart;
> + pctrl->restart_nb.priority = 128;
> + if (register_restart_handler(&pctrl->restart_nb))
> + dev_err(pctrl->dev,
> + "failed to setup restart handler.\n");
> + break;
> }
> }
> -#else
> -static void msm_pinctrl_setup_pm_reset(const struct msm_pinctrl *pctrl) {}
> -#endif
>
> int msm_pinctrl_probe(struct platform_device *pdev,
> const struct msm_pinctrl_soc_data *soc_data)
> @@ -943,6 +946,8 @@ int msm_pinctrl_remove(struct platform_device *pdev)
>
> pinctrl_unregister(pctrl->pctrl);
>
> + unregister_restart_handler(&pctrl->restart_nb);
> +
> return 0;
> }
> EXPORT_SYMBOL(msm_pinctrl_remove);
> --
> Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
> hosted by The Linux Foundation
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] pinctrl: qcom: use restart_notifier mechanism for ps_hold
2014-09-23 20:59 [PATCH v2] pinctrl: qcom: use restart_notifier mechanism for ps_hold Josh Cartwright
2014-09-23 21:57 ` Guenter Roeck
@ 2014-09-25 7:41 ` Linus Walleij
2014-09-26 0:49 ` Bjorn Andersson
2014-09-26 8:37 ` Linus Walleij
2 siblings, 1 reply; 5+ messages in thread
From: Linus Walleij @ 2014-09-25 7:41 UTC (permalink / raw)
To: Josh Cartwright, Bjorn Andersson
Cc: linux-kernel, Pramod Gurav, Guenter Roeck
On Tue, Sep 23, 2014 at 10:59 PM, Josh Cartwright <joshc@codeaurora.org> wrote:
> By converting to the restart_notifier mechanism for restart, we allow
> for other mechanisms, like the watchdog, to be used for restart in the
> case where PS_HOLD has failed to reset the chip.
>
> Since this mechanism may be one of several mechanisms registered, change
> the post-ps_hold write timeout to be a more reasonable 1 second instead
> of 10 seconds.
>
> Choose priority 128, as according to documentation, this mechanism "is
> sufficient to restart the entire system".
>
> Cc: Pramod Gurav <pramod.gurav@smartplayin.com>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Tested-by: Pramod Gurav <pramod.gurav@smartplayin.com>
> Signed-off-by: Josh Cartwright <joshc@codeaurora.org>
> ---
>
> Changes since v1:
> - Simplified conditional notifier block registration
> - Reduced wait time to 1s, which I've found to be sufficient on an IFC6410
> board.
Björn, are you OK with this patch?
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] pinctrl: qcom: use restart_notifier mechanism for ps_hold
2014-09-25 7:41 ` Linus Walleij
@ 2014-09-26 0:49 ` Bjorn Andersson
0 siblings, 0 replies; 5+ messages in thread
From: Bjorn Andersson @ 2014-09-26 0:49 UTC (permalink / raw)
To: Linus Walleij; +Cc: Josh Cartwright, linux-kernel, Pramod Gurav, Guenter Roeck
On Thu 25 Sep 00:41 PDT 2014, Linus Walleij wrote:
> On Tue, Sep 23, 2014 at 10:59 PM, Josh Cartwright <joshc@codeaurora.org> wrote:
>
> > By converting to the restart_notifier mechanism for restart, we allow
> > for other mechanisms, like the watchdog, to be used for restart in the
> > case where PS_HOLD has failed to reset the chip.
> >
> > Since this mechanism may be one of several mechanisms registered, change
> > the post-ps_hold write timeout to be a more reasonable 1 second instead
> > of 10 seconds.
> >
> > Choose priority 128, as according to documentation, this mechanism "is
> > sufficient to restart the entire system".
> >
> > Cc: Pramod Gurav <pramod.gurav@smartplayin.com>
> > Cc: Guenter Roeck <linux@roeck-us.net>
> > Tested-by: Pramod Gurav <pramod.gurav@smartplayin.com>
> > Signed-off-by: Josh Cartwright <joshc@codeaurora.org>
> > ---
> >
> > Changes since v1:
> > - Simplified conditional notifier block registration
> > - Reduced wait time to 1s, which I've found to be sufficient on an IFC6410
> > board.
>
> Björn, are you OK with this patch?
>
Indeed, this is better than overriding arm_pm_restart.
Acked-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Regards,
Bjorn
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] pinctrl: qcom: use restart_notifier mechanism for ps_hold
2014-09-23 20:59 [PATCH v2] pinctrl: qcom: use restart_notifier mechanism for ps_hold Josh Cartwright
2014-09-23 21:57 ` Guenter Roeck
2014-09-25 7:41 ` Linus Walleij
@ 2014-09-26 8:37 ` Linus Walleij
2 siblings, 0 replies; 5+ messages in thread
From: Linus Walleij @ 2014-09-26 8:37 UTC (permalink / raw)
To: Josh Cartwright
Cc: Bjorn Andersson, linux-kernel, Pramod Gurav, Guenter Roeck
On Tue, Sep 23, 2014 at 10:59 PM, Josh Cartwright <joshc@codeaurora.org> wrote:
> By converting to the restart_notifier mechanism for restart, we allow
> for other mechanisms, like the watchdog, to be used for restart in the
> case where PS_HOLD has failed to reset the chip.
>
> Since this mechanism may be one of several mechanisms registered, change
> the post-ps_hold write timeout to be a more reasonable 1 second instead
> of 10 seconds.
>
> Choose priority 128, as according to documentation, this mechanism "is
> sufficient to restart the entire system".
>
> Cc: Pramod Gurav <pramod.gurav@smartplayin.com>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Tested-by: Pramod Gurav <pramod.gurav@smartplayin.com>
> Signed-off-by: Josh Cartwright <joshc@codeaurora.org>
> ---
>
> Changes since v1:
> - Simplified conditional notifier block registration
> - Reduced wait time to 1s, which I've found to be sufficient on an IFC6410
> board.
Patch applied with ACKs.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-09-26 8:37 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-23 20:59 [PATCH v2] pinctrl: qcom: use restart_notifier mechanism for ps_hold Josh Cartwright
2014-09-23 21:57 ` Guenter Roeck
2014-09-25 7:41 ` Linus Walleij
2014-09-26 0:49 ` Bjorn Andersson
2014-09-26 8:37 ` Linus Walleij
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).