From: Horia Geanta <horia.geanta@nxp.com>
To: "André Draszik" <git@andred.net>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: Anson Huang <anson.huang@nxp.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Aymen Sghaier <aymen.sghaier@nxp.com>,
Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
"linux-crypto@vger.kernel.org" <linux-crypto@vger.kernel.org>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
"linux-input@vger.kernel.org" <linux-input@vger.kernel.org>,
Robin Gong <yibin.gong@nxp.com>, dl-linux-imx <linux-imx@nxp.com>
Subject: Re: [PATCH 2/3] Input: snvs_pwrkey - enable snvs clock as needed
Date: Fri, 7 Feb 2020 08:10:22 +0000 [thread overview]
Message-ID: <VI1PR0402MB3485EC2F82DDE52DC5CA0795981C0@VI1PR0402MB3485.eurprd04.prod.outlook.com> (raw)
In-Reply-To: 20200130204516.4760-2-git@andred.net
On 1/30/2020 10:45 PM, André Draszik wrote:
> At the moment, enabling this driver without the SNVS RTC driver
> being active will hang the kernel as soon as the power button
> is pressed.
>
> The reason is that in that case the SNVS isn't enabled, and
> any attempt to read the SNVS registers will simply hang forever.
>
> Ensure the clock is enabled (during the interrupt handler) to
> make this driver work.
>
> Also see commit 7f8993995410 ("drivers/rtc/rtc-snvs: add clock support")
> and commit edb190cb1734
> ("rtc: snvs: make sure clock is enabled for interrupt handle")
> for similar updates to the snvs rtc driver.
>
> Signed-off-by: André Draszik <git@andred.net>
> Cc: Anson Huang <Anson.Huang@nxp.com>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Cc: "Horia Geantă" <horia.geanta@nxp.com>
> Cc: Aymen Sghaier <aymen.sghaier@nxp.com>
> Cc: Herbert Xu <herbert@gondor.apana.org.au>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Rob Herring <robh+dt@kernel.org>
> Cc: Mark Rutland <mark.rutland@arm.com>
> Cc: linux-crypto@vger.kernel.org
> Cc: devicetree@vger.kernel.org
> Cc: linux-input@vger.kernel.org
> ---
> drivers/input/keyboard/snvs_pwrkey.c | 27 +++++++++++++++++++++++++++
> 1 file changed, 27 insertions(+)
>
> diff --git a/drivers/input/keyboard/snvs_pwrkey.c b/drivers/input/keyboard/snvs_pwrkey.c
> index 2f5e3ab5ed63..c29711d8735c 100644
> --- a/drivers/input/keyboard/snvs_pwrkey.c
> +++ b/drivers/input/keyboard/snvs_pwrkey.c
> @@ -16,6 +16,7 @@
> #include <linux/of_address.h>
> #include <linux/platform_device.h>
> #include <linux/pm_wakeirq.h>
> +#include <linux/clk.h>
> #include <linux/mfd/syscon.h>
> #include <linux/regmap.h>
>
> @@ -38,6 +39,7 @@ struct pwrkey_drv_data {
> int wakeup;
> struct timer_list check_timer;
> struct input_dev *input;
> + struct clk *clk;
> u8 minor_rev;
> };
>
> @@ -72,6 +74,9 @@ static irqreturn_t imx_snvs_pwrkey_interrupt(int irq, void *dev_id)
> struct input_dev *input = pdata->input;
> u32 lp_status;
>
> + if (pdata->clk)
> + clk_enable(pdata->clk);
> +
clk framework handles NULL pointers internally, the check is redundant.
> pm_wakeup_event(input->dev.parent, 0);
>
> regmap_read(pdata->snvs, SNVS_LPSR_REG, &lp_status);
> @@ -96,6 +101,9 @@ static irqreturn_t imx_snvs_pwrkey_interrupt(int irq, void *dev_id)
> /* clear SPO status */
> regmap_write(pdata->snvs, SNVS_LPSR_REG, SNVS_LPSR_SPO);
>
> + if (pdata->clk)
> + clk_disable(pdata->clk);
> +
> return IRQ_HANDLED;
> }
>
> @@ -140,6 +148,25 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev)
> if (pdata->irq < 0)
> return -EINVAL;
>
> + pdata->clk = devm_clk_get(&pdev->dev, "snvs-pwrkey");
> + if (IS_ERR(pdata->clk)) {
> + pdata->clk = NULL;
Using devm_clk_get_optional() would simplify error handling.
> + } else {
> + error = clk_prepare_enable(pdata->clk);
> + if (error) {
> + dev_err(&pdev->dev,
> + "Could not prepare or enable the snvs clock\n");
> + return error;
> + }
> + error = devm_add_action_or_reset(&pdev->dev,
> + (void(*)(void *))clk_disable_unprepare,
> + pdata->clk);
> + if (error) {
> + dev_err(&pdev->dev, "failed to add reset action on 'snvs-pwrkey'");
> + return error;
> + }
> + }
> +
> regmap_read(pdata->snvs, SNVS_HPVIDR1_REG, &vid);
> pdata->minor_rev = vid & 0xff;
>
>
next prev parent reply other threads:[~2020-02-07 8:10 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-30 20:45 [PATCH 1/3] ARM: dts: imx7s: add snvs clock to pwrkey André Draszik
2020-01-30 20:45 ` [PATCH 2/3] Input: snvs_pwrkey - enable snvs clock as needed André Draszik
2020-02-07 8:10 ` Horia Geanta [this message]
2020-02-09 22:38 ` Dmitry Torokhov
2020-02-10 2:03 ` Robin Gong
2020-02-10 6:33 ` Horia Geanta
2020-02-10 17:55 ` Dmitry Torokhov
2020-02-11 1:54 ` Robin Gong
2020-02-11 9:13 ` André Draszik
2020-02-12 0:58 ` Robin Gong
2020-02-06 18:30 ` [PATCH 1/3] ARM: dts: imx7s: add snvs clock to pwrkey Rob Herring
2020-02-07 7:36 ` Horia Geanta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=VI1PR0402MB3485EC2F82DDE52DC5CA0795981C0@VI1PR0402MB3485.eurprd04.prod.outlook.com \
--to=horia.geanta@nxp.com \
--cc=anson.huang@nxp.com \
--cc=aymen.sghaier@nxp.com \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.torokhov@gmail.com \
--cc=git@andred.net \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-imx@nxp.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=yibin.gong@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).