Commit 5bc6bb60 authored Jan 17, 2020 by Esben Haabendal Committed by Miquel Raynal Jan 17, 2020

mtd: rawnand: gpmi: Fix suspend/resume problem



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: ef347c0c ("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>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>

parent da2ef812

drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message