| Message ID | 20200225161201.1975-1-git@andred.net |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | [v2,1/6] dt-bindings: crypto: fsl-sec4: add snvs clock to pwrkey | expand |
On 2020/02/26 André Draszik <git@andred.net> wrote: > The snvs_pwrkey shares the SNVS LPSR status register with the snvs_rtc. > > This driver here should only return IRQ_HANDLED if the status register > indicates that the event we're handling in the irq handler was genuinely > intended for this driver. Otheriwse the interrupt subsystem will assume the > interrupt was handled successfully even though it wasn't at all. > > Signed-off-by: André Draszik <git@andred.net> > 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: Shawn Guo <shawnguo@kernel.org> > Cc: Sascha Hauer <s.hauer@pengutronix.de> > Cc: Pengutronix Kernel Team <kernel@pengutronix.de> > Cc: Fabio Estevam <festevam@gmail.com> > Cc: NXP Linux Team <linux-imx@nxp.com> > Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> > Cc: Anson Huang <Anson.Huang@nxp.com> > Cc: Robin Gong <yibin.gong@nxp.com> > Cc: linux-crypto@vger.kernel.org > Cc: devicetree@vger.kernel.org > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-input@vger.kernel.org > > --- > v2: > * no changes > --- > drivers/input/keyboard/snvs_pwrkey.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/drivers/input/keyboard/snvs_pwrkey.c > b/drivers/input/keyboard/snvs_pwrkey.c > index 382d2ae82c9b..980867886b34 100644 > --- a/drivers/input/keyboard/snvs_pwrkey.c > +++ b/drivers/input/keyboard/snvs_pwrkey.c > @@ -82,7 +82,9 @@ static irqreturn_t imx_snvs_pwrkey_interrupt(int irq, void > *dev_id) > clk_enable(pdata->clk); > > regmap_read(pdata->snvs, SNVS_LPSR_REG, &lp_status); > - if (lp_status & SNVS_LPSR_SPO) { > + lp_status &= SNVS_LPSR_SPO; > + > + if (lp_status) { > if (pdata->minor_rev == 0) { > /* > * The first generation i.MX[6|7] SoCs only send an @@ -98,14 > +100,14 @@ static irqreturn_t imx_snvs_pwrkey_interrupt(int irq, void > *dev_id) > mod_timer(&pdata->check_timer, > jiffies + msecs_to_jiffies(DEBOUNCE_TIME)); > } > - } > > - /* clear SPO status */ > - regmap_write(pdata->snvs, SNVS_LPSR_REG, SNVS_LPSR_SPO); > + /* clear SPO status */ > + regmap_write(pdata->snvs, SNVS_LPSR_REG, SNVS_LPSR_SPO); But irq storm will come in once there is other interrupt triggered as unexpected, although I never met it before. Could we drop this patch now? Others are ok for me. Reviewed-by: Robin Gong <yibin.gong@nxp> > + } > > clk_disable(pdata->clk); > > - return IRQ_HANDLED; > + return lp_status ? IRQ_HANDLED : IRQ_NONE; > } > > static void imx_snvs_pwrkey_act(void *pdata) > -- > 2.23.0.rc1
On Wed, 2020-02-26 at 01:15 +0000, Robin Gong wrote: > On 2020/02/26 André Draszik <git@andred.net> wrote: > > The snvs_pwrkey shares the SNVS LPSR status register with the snvs_rtc. > > > > This driver here should only return IRQ_HANDLED if the status register > > indicates that the event we're handling in the irq handler was genuinely > > intended for this driver. Otheriwse the interrupt subsystem will assume the > > interrupt was handled successfully even though it wasn't at all. > > > > Signed-off-by: André Draszik <git@andred.net> > > 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: Shawn Guo <shawnguo@kernel.org> > > Cc: Sascha Hauer <s.hauer@pengutronix.de> > > Cc: Pengutronix Kernel Team <kernel@pengutronix.de> > > Cc: Fabio Estevam <festevam@gmail.com> > > Cc: NXP Linux Team <linux-imx@nxp.com> > > Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> > > Cc: Anson Huang <Anson.Huang@nxp.com> > > Cc: Robin Gong <yibin.gong@nxp.com> > > Cc: linux-crypto@vger.kernel.org > > Cc: devicetree@vger.kernel.org > > Cc: linux-arm-kernel@lists.infradead.org > > Cc: linux-input@vger.kernel.org > > > > --- > > v2: > > * no changes > > --- > > drivers/input/keyboard/snvs_pwrkey.c | 12 +++++++----- > > 1 file changed, 7 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/input/keyboard/snvs_pwrkey.c > > b/drivers/input/keyboard/snvs_pwrkey.c > > index 382d2ae82c9b..980867886b34 100644 > > --- a/drivers/input/keyboard/snvs_pwrkey.c > > +++ b/drivers/input/keyboard/snvs_pwrkey.c > > @@ -82,7 +82,9 @@ static irqreturn_t imx_snvs_pwrkey_interrupt(int irq, void > > *dev_id) > > clk_enable(pdata->clk); > > > > regmap_read(pdata->snvs, SNVS_LPSR_REG, &lp_status); > > - if (lp_status & SNVS_LPSR_SPO) { > > + lp_status &= SNVS_LPSR_SPO; > > + > > + if (lp_status) { > > if (pdata->minor_rev == 0) { > > /* > > * The first generation i.MX[6|7] SoCs only send an @@ -98,14 > > +100,14 @@ static irqreturn_t imx_snvs_pwrkey_interrupt(int irq, void > > *dev_id) > > mod_timer(&pdata->check_timer, > > jiffies + msecs_to_jiffies(DEBOUNCE_TIME)); > > } > > - } > > > > - /* clear SPO status */ > > - regmap_write(pdata->snvs, SNVS_LPSR_REG, SNVS_LPSR_SPO); > > + /* clear SPO status */ > > + regmap_write(pdata->snvs, SNVS_LPSR_REG, SNVS_LPSR_SPO); > But irq storm will come in once there is other interrupt triggered as unexpected, > although I never met it before. Could we drop this patch now? Others are ok for me. I don't have strong feelings about this patch, but this bit merely changes behaviour to clear SP0 if SP0 was in fact != 0 in the first place, whereas before SP0 was always cleared, even if it was == 0 anyway. Seems more logical in my eyes. > Reviewed-by: Robin Gong <yibin.gong@nxp> > > + } > > > > clk_disable(pdata->clk); > > > > - return IRQ_HANDLED; > > + return lp_status ? IRQ_HANDLED : IRQ_NONE; If you're talking about this part, the rtc-snvs driver does the same in its interrupt handler. In other words, this driver here could prevent the rtc-snvs driver from seeing its events. Cheers, Andre' > > } > > > > static void imx_snvs_pwrkey_act(void *pdata) > > -- > > 2.23.0.rc1
On 2020/02/27 André Draszik <git@andred.net> wrote: > On Wed, 2020-02-26 at 01:15 +0000, Robin Gong wrote: > > On 2020/02/26 André Draszik <git@andred.net> wrote: > > > The snvs_pwrkey shares the SNVS LPSR status register with the snvs_rtc. > > > > > > This driver here should only return IRQ_HANDLED if the status > > > register indicates that the event we're handling in the irq handler > > > was genuinely intended for this driver. Otheriwse the interrupt > > > subsystem will assume the interrupt was handled successfully even though > it wasn't at all. > > > > > > Signed-off-by: André Draszik <git@andred.net> > > > 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: Shawn Guo <shawnguo@kernel.org> > > > Cc: Sascha Hauer <s.hauer@pengutronix.de> > > > Cc: Pengutronix Kernel Team <kernel@pengutronix.de> > > > Cc: Fabio Estevam <festevam@gmail.com> > > > Cc: NXP Linux Team <linux-imx@nxp.com> > > > Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> > > > Cc: Anson Huang <Anson.Huang@nxp.com> > > > Cc: Robin Gong <yibin.gong@nxp.com> > > > Cc: linux-crypto@vger.kernel.org > > > Cc: devicetree@vger.kernel.org > > > Cc: linux-arm-kernel@lists.infradead.org > > > Cc: linux-input@vger.kernel.org > > > > > > --- > > > v2: > > > * no changes > > > --- > > > drivers/input/keyboard/snvs_pwrkey.c | 12 +++++++----- > > > 1 file changed, 7 insertions(+), 5 deletions(-) > > > > > > diff --git a/drivers/input/keyboard/snvs_pwrkey.c > > > b/drivers/input/keyboard/snvs_pwrkey.c > > > index 382d2ae82c9b..980867886b34 100644 > > > --- a/drivers/input/keyboard/snvs_pwrkey.c > > > +++ b/drivers/input/keyboard/snvs_pwrkey.c > > > @@ -82,7 +82,9 @@ static irqreturn_t imx_snvs_pwrkey_interrupt(int > > > irq, void > > > *dev_id) > > > clk_enable(pdata->clk); > > > > > > regmap_read(pdata->snvs, SNVS_LPSR_REG, &lp_status); > > > - if (lp_status & SNVS_LPSR_SPO) { > > > + lp_status &= SNVS_LPSR_SPO; > > > + > > > + if (lp_status) { > > > if (pdata->minor_rev == 0) { > > > /* > > > * The first generation i.MX[6|7] SoCs only send an @@ > -98,14 > > > +100,14 @@ static irqreturn_t imx_snvs_pwrkey_interrupt(int irq, > > > +void > > > *dev_id) > > > mod_timer(&pdata->check_timer, > > > jiffies + msecs_to_jiffies(DEBOUNCE_TIME)); > > > } > > > - } > > > > > > - /* clear SPO status */ > > > - regmap_write(pdata->snvs, SNVS_LPSR_REG, SNVS_LPSR_SPO); > > > + /* clear SPO status */ > > > + regmap_write(pdata->snvs, SNVS_LPSR_REG, SNVS_LPSR_SPO); > > But irq storm will come in once there is other interrupt triggered as > > unexpected, although I never met it before. Could we drop this patch now? > Others are ok for me. > > I don't have strong feelings about this patch, but this bit merely changes > behaviour to clear SP0 if SP0 was in fact != 0 in the first place, whereas before > SP0 was always cleared, even if it was == 0 anyway. Seems more logical in my > eyes. Seems we care something never happen:) I'm okay if you really want to do that. > > > > Reviewed-by: Robin Gong <yibin.gong@nxp> > > > + } > > > > > > clk_disable(pdata->clk); > > > > > > - return IRQ_HANDLED; > > > + return lp_status ? IRQ_HANDLED : IRQ_NONE; > > If you're talking about this part, the rtc-snvs driver does the same in its > interrupt handler. > In other words, this driver here could prevent the rtc-snvs driver from seeing its > events But rtc driver has another interrupt number, and snvs_pwrkey driver just touch SPO bit as below: regmap_write(pdata->snvs, SNVS_LPSR_REG, SNVS_LPSR_SPO); So I don't think it could impact rtc-snvs driver. But you remind me rtc-snvs driver may clear SPO status, because lpsr is read from SNVS_LPSR which may SPO has already been set. regmap_write(data->regmap, data->offset + SNVS_LPSR, lpsr); I'll send a patch for fix that potential issue. Besides, if you really want to follow rtc driver please initialize lp_status with 0. > > > > Cheers, > Andre' > > > > > } > > > > > > static void imx_snvs_pwrkey_act(void *pdata) > > > -- > > > 2.23.0.rc1
On 2/25/2020 6:12 PM, André Draszik wrote: > On i.MX7 and i.MX8M, the SNVS requires a clock. This is similar to the > clock bound to the SNVS RTC node, but if the SNVS RTC driver isn't > enabled, then SNVS doesn't work, and as such the pwrkey driver doesn't > work (i.e. hangs the kernel, as the clock isn't enabled). > > Also see commit ec2a844ef7c1 > ("ARM: dts: imx7s: add snvs rtc clock") > for a similar fix. > > Signed-off-by: André Draszik <git@andred.net> > Acked-by: Rob Herring <robh@kernel.org> > 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: Shawn Guo <shawnguo@kernel.org> > Cc: Sascha Hauer <s.hauer@pengutronix.de> > Cc: Pengutronix Kernel Team <kernel@pengutronix.de> > Cc: Fabio Estevam <festevam@gmail.com> > Cc: NXP Linux Team <linux-imx@nxp.com> > Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> > Cc: Anson Huang <Anson.Huang@nxp.com> > Cc: Robin Gong <yibin.gong@nxp.com> > Cc: linux-crypto@vger.kernel.org > Cc: devicetree@vger.kernel.org > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-input@vger.kernel.org Reviewed-by: Horia Geantă <horia.geanta@nxp.com> Thanks, Horia
On 2/25/2020 6:12 PM, André Draszik wrote: > The snvs_pwrkey shares the SNVS LPSR status register with the snvs_rtc. > > This driver here should only return IRQ_HANDLED if the status register > indicates that the event we're handling in the irq handler was genuinely > intended for this driver. Otheriwse the interrupt subsystem will > assume the interrupt was handled successfully even though it wasn't > at all. > > Signed-off-by: André Draszik <git@andred.net> > 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: Shawn Guo <shawnguo@kernel.org> > Cc: Sascha Hauer <s.hauer@pengutronix.de> > Cc: Pengutronix Kernel Team <kernel@pengutronix.de> > Cc: Fabio Estevam <festevam@gmail.com> > Cc: NXP Linux Team <linux-imx@nxp.com> > Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> > Cc: Anson Huang <Anson.Huang@nxp.com> > Cc: Robin Gong <yibin.gong@nxp.com> > Cc: linux-crypto@vger.kernel.org > Cc: devicetree@vger.kernel.org > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-input@vger.kernel.org For patches 2-6: Reviewed-by: Horia Geantă <horia.geanta@nxp.com> Also imx8mn.dtsi and imx8mp.dtsi will have to be updated. Thanks, Horia
On Tue, Feb 25, 2020 at 04:11:57PM +0000, André Draszik wrote: > On i.MX7, the SNVS requires a clock. This is similar to the clock > bound to the SNVS RTC node, but if the SNVS RTC driver isn't enabled, > then SNVS doesn't work, and as such the pwrkey driver doesn't > work (i.e. hangs the kernel, as the clock isn't enabled). > > Also see commit ec2a844ef7c1 > ("ARM: dts: imx7s: add snvs rtc clock") > for a similar fix. > > Signed-off-by: André Draszik <git@andred.net> > Acked-by: Rob Herring <robh@kernel.org> Applied, thanks.
On Tue, Feb 25, 2020 at 04:11:58PM +0000, André Draszik wrote: > On i.MX8MM, the SNVS requires a clock. This is similar to the clock > bound to the SNVS RTC node, but if the SNVS RTC driver isn't enabled, > then SNVS doesn't work, and as such the pwrkey driver doesn't > work (i.e. hangs the kernel, as the clock isn't enabled). > > Also see commit ec2a844ef7c1 > ("ARM: dts: imx7s: add snvs rtc clock") > for a similar fix. > > Signed-off-by: André Draszik <git@andred.net> Applied, thanks.
On Tue, Feb 25, 2020 at 04:11:59PM +0000, André Draszik wrote: > On i.MX8MM, the SNVS requires a clock. This is similar to the clock > bound to the SNVS RTC node, but if the SNVS RTC driver isn't enabled, > then SNVS doesn't work, and as such the pwrkey driver doesn't > work (i.e. hangs the kernel, as the clock isn't enabled). > > Also see commit ec2a844ef7c1 > ("ARM: dts: imx7s: add snvs rtc clock") > for a similar fix. > > Signed-off-by: André Draszik <git@andred.net> Applied, thanks.
On Mon, Mar 2, 2020 at 3:22 AM Horia Geanta <horia.geanta@nxp.com> wrote: > > On 2/25/2020 6:12 PM, André Draszik wrote: > > The snvs_pwrkey shares the SNVS LPSR status register with the snvs_rtc. > > > > This driver here should only return IRQ_HANDLED if the status register > > indicates that the event we're handling in the irq handler was genuinely > > intended for this driver. Otheriwse the interrupt subsystem will > > assume the interrupt was handled successfully even though it wasn't > > at all. > > > > Signed-off-by: André Draszik <git@andred.net> > > 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: Shawn Guo <shawnguo@kernel.org> > > Cc: Sascha Hauer <s.hauer@pengutronix.de> > > Cc: Pengutronix Kernel Team <kernel@pengutronix.de> > > Cc: Fabio Estevam <festevam@gmail.com> > > Cc: NXP Linux Team <linux-imx@nxp.com> > > Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> > > Cc: Anson Huang <Anson.Huang@nxp.com> > > Cc: Robin Gong <yibin.gong@nxp.com> > > Cc: linux-crypto@vger.kernel.org > > Cc: devicetree@vger.kernel.org > > Cc: linux-arm-kernel@lists.infradead.org > > Cc: linux-input@vger.kernel.org > For patches 2-6: > Reviewed-by: Horia Geantă <horia.geanta@nxp.com> > > Also imx8mn.dtsi and imx8mp.dtsi will have to be updated. Is there an update coming for the 8mn family? I am seeing it not wake from the power key, and I was hoping to resolve that before i make a push to submit a new 8MN board for review. thanks adam > > Thanks, > Horia > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On 3/28/2020 5:43 AM, Adam Ford wrote: > On Mon, Mar 2, 2020 at 3:22 AM Horia Geanta <horia.geanta@nxp.com> wrote: >> >> On 2/25/2020 6:12 PM, André Draszik wrote: >>> The snvs_pwrkey shares the SNVS LPSR status register with the snvs_rtc. >>> >>> This driver here should only return IRQ_HANDLED if the status register >>> indicates that the event we're handling in the irq handler was genuinely >>> intended for this driver. Otheriwse the interrupt subsystem will >>> assume the interrupt was handled successfully even though it wasn't >>> at all. >>> >>> Signed-off-by: André Draszik <git@andred.net> >>> 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: Shawn Guo <shawnguo@kernel.org> >>> Cc: Sascha Hauer <s.hauer@pengutronix.de> >>> Cc: Pengutronix Kernel Team <kernel@pengutronix.de> >>> Cc: Fabio Estevam <festevam@gmail.com> >>> Cc: NXP Linux Team <linux-imx@nxp.com> >>> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> >>> Cc: Anson Huang <Anson.Huang@nxp.com> >>> Cc: Robin Gong <yibin.gong@nxp.com> >>> Cc: linux-crypto@vger.kernel.org >>> Cc: devicetree@vger.kernel.org >>> Cc: linux-arm-kernel@lists.infradead.org >>> Cc: linux-input@vger.kernel.org >> For patches 2-6: >> Reviewed-by: Horia Geantă <horia.geanta@nxp.com> >> >> Also imx8mn.dtsi and imx8mp.dtsi will have to be updated. > > Is there an update coming for the 8mn family? I am seeing it not wake > from the power key, and I was hoping to resolve that before i make a > push to submit a new 8MN board for review. > Starting with linux-next next-20200320, there's commit arm64: dts: imx8mn: Add snvs clock to powerkey Could you confirm you've tested with a tree including it? Thanks, Horia
Hi Herbert, Dmitry, On 4/1/2020 11:58 AM, Horia Geanta wrote: > On 3/28/2020 5:43 AM, Adam Ford wrote: >> On Mon, Mar 2, 2020 at 3:22 AM Horia Geanta <horia.geanta@nxp.com> wrote: >>> >>> On 2/25/2020 6:12 PM, André Draszik wrote: >>>> The snvs_pwrkey shares the SNVS LPSR status register with the snvs_rtc. >>>> >>>> This driver here should only return IRQ_HANDLED if the status register >>>> indicates that the event we're handling in the irq handler was genuinely >>>> intended for this driver. Otheriwse the interrupt subsystem will >>>> assume the interrupt was handled successfully even though it wasn't >>>> at all. >>>> >>>> Signed-off-by: André Draszik <git@andred.net> >>>> 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: Shawn Guo <shawnguo@kernel.org> >>>> Cc: Sascha Hauer <s.hauer@pengutronix.de> >>>> Cc: Pengutronix Kernel Team <kernel@pengutronix.de> >>>> Cc: Fabio Estevam <festevam@gmail.com> >>>> Cc: NXP Linux Team <linux-imx@nxp.com> >>>> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> >>>> Cc: Anson Huang <Anson.Huang@nxp.com> >>>> Cc: Robin Gong <yibin.gong@nxp.com> >>>> Cc: linux-crypto@vger.kernel.org >>>> Cc: devicetree@vger.kernel.org >>>> Cc: linux-arm-kernel@lists.infradead.org >>>> Cc: linux-input@vger.kernel.org >>> For patches 2-6: >>> Reviewed-by: Horia Geantă <horia.geanta@nxp.com> >>> >>> Also imx8mn.dtsi and imx8mp.dtsi will have to be updated. >> >> Is there an update coming for the 8mn family? I am seeing it not wake >> from the power key, and I was hoping to resolve that before i make a >> push to submit a new 8MN board for review. >> > Starting with linux-next next-20200320, there's commit > arm64: dts: imx8mn: Add snvs clock to powerkey > > Could you confirm you've tested with a tree including it? > Seems that from this series: https://lore.kernel.org/linux-crypto/20200225161201.1975-5-git@andred.net/T/ only DT patches (2,3,4) were applied. Would it be ok to go via crypto tree with: [PATCH v2 1/6] dt-bindings: crypto: fsl-sec4: add snvs clock to pwrkey and via input tree with: [PATCH v2 5/6] Input: snvs_pwrkey - enable snvs clock as needed [PATCH v2 6/6] Input: snvs_pwrkey - only IRQ_HANDLED for our own events ? Thanks, Horia
diff --git a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt index 2fe245ca816a..a73722c58fab 100644 --- a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt +++ b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt @@ -449,6 +449,19 @@ System ON/OFF key driver Value type: <phandle> Definition: this is phandle to the register map node. + - clocks + Usage: optional, required if SNVS LP requires explicit + enablement of clocks + Value type: <prop_encoded-array> + Definition: a clock specifier describing the clock required for + enabling and disabling SNVS LP. + + - clock-names + Usage: optional, required if SNVS LP requires explicit + enablement of clocks + Value type: <string> + Definition: clock name string should be "snvs-pwrkey". + EXAMPLE: snvs-pwrkey@020cc000 { compatible = "fsl,sec-v4.0-pwrkey"; @@ -456,6 +469,8 @@ EXAMPLE: interrupts = <0 4 0x4> linux,keycode = <116>; /* KEY_POWER */ wakeup-source; + clocks = <&clks IMX7D_SNVS_CLK>; + clock-names = "snvs-pwrkey"; }; ===================================================================== @@ -547,6 +562,8 @@ FULL EXAMPLE interrupts = <0 4 0x4>; linux,keycode = <116>; /* KEY_POWER */ wakeup-source; + clocks = <&clks IMX7D_SNVS_CLK>; + clock-names = "snvs-pwrkey"; }; };
On i.MX7 and i.MX8M, the SNVS requires a clock. This is similar to the clock bound to the SNVS RTC node, but if the SNVS RTC driver isn't enabled, then SNVS doesn't work, and as such the pwrkey driver doesn't work (i.e. hangs the kernel, as the clock isn't enabled). Also see commit ec2a844ef7c1 ("ARM: dts: imx7s: add snvs rtc clock") for a similar fix. Signed-off-by: André Draszik <git@andred.net> Acked-by: Rob Herring <robh@kernel.org> 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: Shawn Guo <shawnguo@kernel.org> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Pengutronix Kernel Team <kernel@pengutronix.de> Cc: Fabio Estevam <festevam@gmail.com> Cc: NXP Linux Team <linux-imx@nxp.com> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: Anson Huang <Anson.Huang@nxp.com> Cc: Robin Gong <yibin.gong@nxp.com> Cc: linux-crypto@vger.kernel.org Cc: devicetree@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-input@vger.kernel.org --- v2: * split documentation and i.MX7 dts update into two patches * remove stray RTC references from documentation (copy/paste error) --- .../devicetree/bindings/crypto/fsl-sec4.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)