* [PATCH v2 0/2] mtd: rawnand: gpmi: Suspend/resume fixes
@ 2020-01-17 20:05 Esben Haabendal
2020-01-17 20:05 ` [PATCH v2 1/2] mtd: rawnand: gpmi: Fix suspend/resume problem Esben Haabendal
2020-01-17 20:05 ` [PATCH v2 2/2] mtd: rawnand: gpmi: Restore nfc timing setup after suspend/resume Esben Haabendal
0 siblings, 2 replies; 7+ messages in thread
From: Esben Haabendal @ 2020-01-17 20:05 UTC (permalink / raw)
To: linux-mtd, Sascha Hauer, Han Xu, Miquel Raynal
Cc: Richard Weinberger, Boris Brezillon, Vignesh Raghavendra
This fixes a couple of suspend/resume problems in gpmi-nand driver,
introduced in 5.3 with the implementation of exec_op for gpmi-nand driver.
Changes since v1:
- Fixed bug in gpmi_init() causing runtime pm becoming disabled
- Added Fixes tags and cc to stable
- Rebased to v5.5-rc6
Esben Haabendal (2):
mtd: rawnand: gpmi: Fix suspend/resume problem
mtd: rawnand: gpmi: Restore nfc timing setup after suspend/resume
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
--
2.25.0
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 1/2] mtd: rawnand: gpmi: Fix suspend/resume problem
2020-01-17 20:05 [PATCH v2 0/2] mtd: rawnand: gpmi: Suspend/resume fixes Esben Haabendal
@ 2020-01-17 20:05 ` Esben Haabendal
2020-01-17 21:30 ` Han Xu
2020-01-17 21:47 ` Miquel Raynal
2020-01-17 20:05 ` [PATCH v2 2/2] mtd: rawnand: gpmi: Restore nfc timing setup after suspend/resume Esben Haabendal
1 sibling, 2 replies; 7+ messages in thread
From: Esben Haabendal @ 2020-01-17 20:05 UTC (permalink / raw)
To: linux-mtd, Sascha Hauer, Han Xu, Miquel Raynal
Cc: Richard Weinberger, Boris Brezillon, Vignesh Raghavendra, stable
On system resume, the gpmi clock must be enabled before accessing gpmi
block. Without this, resume causes something like
[ 661.348790] gpmi_reset_block(5cbb0f7e): module reset timeout
[ 661.348889] gpmi-nand 1806000.gpmi-nand: Error setting GPMI : -110
[ 661.348928] PM: dpm_run_callback(): platform_pm_resume+0x0/0x44 returns -110
[ 661.348961] PM: Device 1806000.gpmi-nand failed to resume: error -110
Fixes: ef347c0cfd61 ("mtd: rawnand: gpmi: Implement exec_op")
Cc: stable@vger.kernel.org
Signed-off-by: Esben Haabendal <esben@geanix.com>
---
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
index 334fe3130285..879df8402446 100644
--- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
@@ -148,6 +148,10 @@ static int gpmi_init(struct gpmi_nand_data *this)
struct resources *r = &this->resources;
int ret;
+ ret = pm_runtime_get_sync(this->dev);
+ if (ret < 0)
+ return ret;
+
ret = gpmi_reset_block(r->gpmi_regs, false);
if (ret)
goto err_out;
@@ -179,8 +183,9 @@ static int gpmi_init(struct gpmi_nand_data *this)
*/
writel(BM_GPMI_CTRL1_DECOUPLE_CS, r->gpmi_regs + HW_GPMI_CTRL1_SET);
- return 0;
err_out:
+ pm_runtime_mark_last_busy(this->dev);
+ pm_runtime_put_autosuspend(this->dev);
return ret;
}
--
2.25.0
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v2 1/2] mtd: rawnand: gpmi: Fix suspend/resume problem
2020-01-17 20:05 ` [PATCH v2 1/2] mtd: rawnand: gpmi: Fix suspend/resume problem Esben Haabendal
@ 2020-01-17 21:30 ` Han Xu
2020-01-17 21:47 ` Miquel Raynal
1 sibling, 0 replies; 7+ messages in thread
From: Han Xu @ 2020-01-17 21:30 UTC (permalink / raw)
To: Esben Haabendal
Cc: Vignesh Raghavendra, Richard Weinberger, Sascha Hauer, stable,
Boris Brezillon, linux-mtd, Miquel Raynal, Han Xu
On Fri, Jan 17, 2020 at 2:05 PM Esben Haabendal <esben@geanix.com> wrote:
>
> On system resume, the gpmi clock must be enabled before accessing gpmi
> block. Without this, resume causes something like
>
> [ 661.348790] gpmi_reset_block(5cbb0f7e): module reset timeout
> [ 661.348889] gpmi-nand 1806000.gpmi-nand: Error setting GPMI : -110
> [ 661.348928] PM: dpm_run_callback(): platform_pm_resume+0x0/0x44 returns -110
> [ 661.348961] PM: Device 1806000.gpmi-nand failed to resume: error -110
>
> Fixes: ef347c0cfd61 ("mtd: rawnand: gpmi: Implement exec_op")
> Cc: stable@vger.kernel.org
> Signed-off-by: Esben Haabendal <esben@geanix.com>
> ---
> drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
> index 334fe3130285..879df8402446 100644
> --- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
> +++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
> @@ -148,6 +148,10 @@ static int gpmi_init(struct gpmi_nand_data *this)
> struct resources *r = &this->resources;
> int ret;
>
> + ret = pm_runtime_get_sync(this->dev);
> + if (ret < 0)
> + return ret;
> +
> ret = gpmi_reset_block(r->gpmi_regs, false);
> if (ret)
> goto err_out;
> @@ -179,8 +183,9 @@ static int gpmi_init(struct gpmi_nand_data *this)
> */
> writel(BM_GPMI_CTRL1_DECOUPLE_CS, r->gpmi_regs + HW_GPMI_CTRL1_SET);
>
> - return 0;
> err_out:
> + pm_runtime_mark_last_busy(this->dev);
> + pm_runtime_put_autosuspend(this->dev);
> return ret;
> }
>
Acked-by: Han Xu <han.xu@nxp.com>
> --
> 2.25.0
>
>
> ______________________________________________________
> Linux MTD discussion mailing list
> http://lists.infradead.org/mailman/listinfo/linux-mtd/
--
Sincerely,
Han XU
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH v2 1/2] mtd: rawnand: gpmi: Fix suspend/resume problem
2020-01-17 20:05 ` [PATCH v2 1/2] mtd: rawnand: gpmi: Fix suspend/resume problem Esben Haabendal
2020-01-17 21:30 ` Han Xu
@ 2020-01-17 21:47 ` Miquel Raynal
1 sibling, 0 replies; 7+ messages in thread
From: Miquel Raynal @ 2020-01-17 21:47 UTC (permalink / raw)
To: Esben Haabendal, linux-mtd, Sascha Hauer, Han Xu, Miquel Raynal
Cc: Richard Weinberger, Boris Brezillon, Vignesh Raghavendra, stable
On Fri, 2020-01-17 at 20:05:36 UTC, Esben Haabendal wrote:
> On system resume, the gpmi clock must be enabled before accessing gpmi
> block. Without this, resume causes something like
>
> [ 661.348790] gpmi_reset_block(5cbb0f7e): module reset timeout
> [ 661.348889] gpmi-nand 1806000.gpmi-nand: Error setting GPMI : -110
> [ 661.348928] PM: dpm_run_callback(): platform_pm_resume+0x0/0x44 returns -110
> [ 661.348961] PM: Device 1806000.gpmi-nand failed to resume: error -110
>
> Fixes: ef347c0cfd61 ("mtd: rawnand: gpmi: Implement exec_op")
> Cc: stable@vger.kernel.org
> Signed-off-by: Esben Haabendal <esben@geanix.com>
> Acked-by: Han Xu <han.xu@nxp.com>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/fixes, thanks.
Miquel
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 2/2] mtd: rawnand: gpmi: Restore nfc timing setup after suspend/resume
2020-01-17 20:05 [PATCH v2 0/2] mtd: rawnand: gpmi: Suspend/resume fixes Esben Haabendal
2020-01-17 20:05 ` [PATCH v2 1/2] mtd: rawnand: gpmi: Fix suspend/resume problem Esben Haabendal
@ 2020-01-17 20:05 ` Esben Haabendal
2020-01-17 21:30 ` Han Xu
2020-01-17 21:47 ` Miquel Raynal
1 sibling, 2 replies; 7+ messages in thread
From: Esben Haabendal @ 2020-01-17 20:05 UTC (permalink / raw)
To: linux-mtd, Sascha Hauer, Han Xu, Miquel Raynal
Cc: Richard Weinberger, Boris Brezillon, Vignesh Raghavendra, stable
As we reset the GPMI block at resume, the timing parameters setup by a
previous exec_op is lost. Rewriting GPMI timing registers on first exec_op
after resume fixes the problem.
Fixes: ef347c0cfd61 ("mtd: rawnand: gpmi: Implement exec_op")
Cc: stable@vger.kernel.org
Signed-off-by: Esben Haabendal <esben@geanix.com>
---
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
index 879df8402446..b9d5d55a5edb 100644
--- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
@@ -2727,6 +2727,10 @@ static int gpmi_pm_resume(struct device *dev)
return ret;
}
+ /* Set flag to get timing setup restored for next exec_op */
+ if (this->hw.clk_rate)
+ this->hw.must_apply_timings = true;
+
/* re-init the BCH registers */
ret = bch_set_geometry(this);
if (ret) {
--
2.25.0
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v2 2/2] mtd: rawnand: gpmi: Restore nfc timing setup after suspend/resume
2020-01-17 20:05 ` [PATCH v2 2/2] mtd: rawnand: gpmi: Restore nfc timing setup after suspend/resume Esben Haabendal
@ 2020-01-17 21:30 ` Han Xu
2020-01-17 21:47 ` Miquel Raynal
1 sibling, 0 replies; 7+ messages in thread
From: Han Xu @ 2020-01-17 21:30 UTC (permalink / raw)
To: Esben Haabendal
Cc: Vignesh Raghavendra, Richard Weinberger, Sascha Hauer, stable,
Boris Brezillon, linux-mtd, Miquel Raynal, Han Xu
On Fri, Jan 17, 2020 at 2:06 PM Esben Haabendal <esben@geanix.com> wrote:
>
> As we reset the GPMI block at resume, the timing parameters setup by a
> previous exec_op is lost. Rewriting GPMI timing registers on first exec_op
> after resume fixes the problem.
>
> Fixes: ef347c0cfd61 ("mtd: rawnand: gpmi: Implement exec_op")
> Cc: stable@vger.kernel.org
> Signed-off-by: Esben Haabendal <esben@geanix.com>
> ---
> drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
> index 879df8402446..b9d5d55a5edb 100644
> --- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
> +++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
> @@ -2727,6 +2727,10 @@ static int gpmi_pm_resume(struct device *dev)
> return ret;
> }
>
> + /* Set flag to get timing setup restored for next exec_op */
> + if (this->hw.clk_rate)
> + this->hw.must_apply_timings = true;
> +
Acked-by: Han Xu <han.xu@nxp.com>
> /* re-init the BCH registers */
> ret = bch_set_geometry(this);
> if (ret) {
> --
> 2.25.0
>
>
> ______________________________________________________
> Linux MTD discussion mailing list
> http://lists.infradead.org/mailman/listinfo/linux-mtd/
--
Sincerely,
Han XU
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH v2 2/2] mtd: rawnand: gpmi: Restore nfc timing setup after suspend/resume
2020-01-17 20:05 ` [PATCH v2 2/2] mtd: rawnand: gpmi: Restore nfc timing setup after suspend/resume Esben Haabendal
2020-01-17 21:30 ` Han Xu
@ 2020-01-17 21:47 ` Miquel Raynal
1 sibling, 0 replies; 7+ messages in thread
From: Miquel Raynal @ 2020-01-17 21:47 UTC (permalink / raw)
To: Esben Haabendal, linux-mtd, Sascha Hauer, Han Xu, Miquel Raynal
Cc: Richard Weinberger, Boris Brezillon, Vignesh Raghavendra, stable
On Fri, 2020-01-17 at 20:05:37 UTC, Esben Haabendal wrote:
> As we reset the GPMI block at resume, the timing parameters setup by a
> previous exec_op is lost. Rewriting GPMI timing registers on first exec_op
> after resume fixes the problem.
>
> Fixes: ef347c0cfd61 ("mtd: rawnand: gpmi: Implement exec_op")
> Cc: stable@vger.kernel.org
> Signed-off-by: Esben Haabendal <esben@geanix.com>
> Acked-by: Han Xu <han.xu@nxp.com>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/fixes, thanks.
Miquel
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-01-17 21:49 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-17 20:05 [PATCH v2 0/2] mtd: rawnand: gpmi: Suspend/resume fixes Esben Haabendal
2020-01-17 20:05 ` [PATCH v2 1/2] mtd: rawnand: gpmi: Fix suspend/resume problem Esben Haabendal
2020-01-17 21:30 ` Han Xu
2020-01-17 21:47 ` Miquel Raynal
2020-01-17 20:05 ` [PATCH v2 2/2] mtd: rawnand: gpmi: Restore nfc timing setup after suspend/resume Esben Haabendal
2020-01-17 21:30 ` Han Xu
2020-01-17 21:47 ` Miquel Raynal
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).