On Fri, Jan 17, 2020 at 2:05 PM Esben Haabendal <esben@xxxxxxxxxx> 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@xxxxxxxxxxxxxxx > Signed-off-by: Esben Haabendal <esben@xxxxxxxxxx> > --- > 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@xxxxxxx> > -- > 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/