All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] soc: imx: gpcv2: Assert reset before ungating clock
@ 2021-06-30 22:59 Marek Vasut
  2021-07-01  1:53 ` Peng Fan
  2021-07-16 23:32 ` Lucas Stach
  0 siblings, 2 replies; 8+ messages in thread
From: Marek Vasut @ 2021-06-30 22:59 UTC (permalink / raw)
  To: linux-arm-kernel
  Cc: ch, Marek Vasut, Fabio Estevam, Frieder Schrempf, NXP Linux Team,
	Peng Fan, Shawn Guo

In case the power domain clock are ungated before the reset is asserted,
the system might freeze completely. However, the MX8MM GPUMIX and VPUMIX
domains require different reset deassertion timing, and incorrect reset
deassertion timing also leads to hang.

Add per-domain reset_{,de}assert_early flags which allow fine-grained
control of the reset assertion and deassertion sequence. Currently, on
MX8MM, the behavior is as follows and aligned with NXP downstream ATF
fork:
- VPUMIX: reset assert, reset deassert, domain power up
- GPUMIX: reset assert, domain power on, reset deassert

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Frieder Schrempf <frieder.schrempf@kontron.de>
Cc: NXP Linux Team <linux-imx@nxp.com>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Shawn Guo <shawnguo@kernel.org>
To: linux-arm-kernel@lists.infradead.org
---
 drivers/soc/imx/gpcv2.c | 41 +++++++++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/drivers/soc/imx/gpcv2.c b/drivers/soc/imx/gpcv2.c
index 34a9ac1f2b9b1..388c4c729c95b 100644
--- a/drivers/soc/imx/gpcv2.c
+++ b/drivers/soc/imx/gpcv2.c
@@ -201,6 +201,9 @@ struct imx_pgc_domain {
 		u32 hskack;
 	} bits;
 
+	bool reset_assert_early;
+	bool reset_deassert_early;
+
 	const int voltage;
 	struct device *dev;
 };
@@ -237,6 +240,17 @@ static int imx_pgc_power_up(struct generic_pm_domain *genpd)
 		}
 	}
 
+	/* delays for reset to propagate */
+	if (domain->reset_assert_early) {
+		reset_control_assert(domain->reset);
+		udelay(5);
+	}
+
+	if (domain->reset_deassert_early) {
+		reset_control_deassert(domain->reset);
+		udelay(5);
+	}
+
 	/* Enable reset clocks for all devices in the domain */
 	ret = clk_bulk_prepare_enable(domain->num_clks, domain->clks);
 	if (ret) {
@@ -245,6 +259,10 @@ static int imx_pgc_power_up(struct generic_pm_domain *genpd)
 	}
 
 	if (domain->bits.pxx) {
+		/* disable power control */
+		regmap_clear_bits(domain->regmap, GPC_PGC_CTRL(domain->pgc),
+				  GPC_PGC_CTRL_PCR);
+
 		/* request the domain to power up */
 		regmap_update_bits(domain->regmap, GPC_PU_PGC_SW_PUP_REQ,
 				   domain->bits.pxx, domain->bits.pxx);
@@ -260,18 +278,19 @@ static int imx_pgc_power_up(struct generic_pm_domain *genpd)
 			dev_err(domain->dev, "failed to command PGC\n");
 			goto out_clk_disable;
 		}
-
-		/* disable power control */
-		regmap_clear_bits(domain->regmap, GPC_PGC_CTRL(domain->pgc),
-				  GPC_PGC_CTRL_PCR);
 	}
 
-	reset_control_assert(domain->reset);
 
-	/* delay for reset to propagate */
-	udelay(5);
+	/* delays for reset to propagate */
+	if (!domain->reset_assert_early) {
+		reset_control_assert(domain->reset);
+		udelay(5);
+	}
 
-	reset_control_deassert(domain->reset);
+	if (!domain->reset_deassert_early) {
+		reset_control_deassert(domain->reset);
+		udelay(5);
+	}
 
 	/* request the ADB400 to power up */
 	if (domain->bits.hskreq) {
@@ -676,6 +695,9 @@ static const struct imx_pgc_domain imx8mm_pgc_domains[] = {
 			.hskack = IMX8MM_GPU_HSK_PWRDNACKN,
 		},
 		.pgc   = IMX8MM_PGC_GPU2D,
+		/* Assert reset, power up domain, deassert reset */
+		.reset_assert_early = true,
+		.reset_deassert_early = false,
 	},
 
 	[IMX8MM_POWER_DOMAIN_VPUMIX] = {
@@ -689,6 +711,9 @@ static const struct imx_pgc_domain imx8mm_pgc_domains[] = {
 			.hskack = IMX8MM_VPUMIX_HSK_PWRDNACKN,
 		},
 		.pgc   = IMX8MM_PGC_VPUMIX,
+		/* Assert reset, deassert reset, power up domain */
+		.reset_assert_early = true,
+		.reset_deassert_early = true,
 	},
 
 	[IMX8MM_POWER_DOMAIN_VPUG1] = {
-- 
2.30.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2021-07-19  8:48 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-30 22:59 [PATCH] soc: imx: gpcv2: Assert reset before ungating clock Marek Vasut
2021-07-01  1:53 ` Peng Fan
2021-07-01  1:59   ` Marek Vasut
2021-07-16 23:32 ` Lucas Stach
2021-07-17  0:55   ` Marek Vasut
2021-07-17  9:07     ` Lucas Stach
2021-07-17 12:07       ` Marek Vasut
2021-07-19  8:46         ` Lucas Stach

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.