Skip to content

Commit 3de4996

Browse files
Ming Qianstorulf
authored andcommitted
pmdomain: imx8m-blk-ctrl: Remove separate rst and clk mask for 8mq vpu
For i.MX8MQ platform, the ADB in the VPUMIX domain has no separate reset and clock enable bits, but is ungated and reset together with the VPUs. So we can't reset G1 or G2 separately, it may led to the system hang. Remove rst_mask and clk_mask of imx8mq_vpu_blk_ctl_domain_data. Let imx8mq_vpu_power_notifier() do really vpu reset. Fixes: 608d7c3 ("soc: imx: imx8m-blk-ctrl: add i.MX8MQ VPU blk-ctrl") Signed-off-by: Ming Qian <ming.qian@oss.nxp.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@collabora.com> Reviewed-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Frank Li <Frank.Li@nxp.com> Cc: stable@vger.kernel.org Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
1 parent 73cb5f6 commit 3de4996

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

drivers/pmdomain/imx/imx8m-blk-ctrl.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -846,22 +846,25 @@ static int imx8mq_vpu_power_notifier(struct notifier_block *nb,
846846
return NOTIFY_OK;
847847
}
848848

849+
/*
850+
* For i.MX8MQ, the ADB in the VPUMIX domain has no separate reset and clock
851+
* enable bits, but is ungated and reset together with the VPUs.
852+
* Resetting G1 or G2 separately may led to system hang.
853+
* Remove the rst_mask and clk_mask from the domain data of G1 and G2,
854+
* Let imx8mq_vpu_power_notifier() do really vpu reset.
855+
*/
849856
static const struct imx8m_blk_ctrl_domain_data imx8mq_vpu_blk_ctl_domain_data[] = {
850857
[IMX8MQ_VPUBLK_PD_G1] = {
851858
.name = "vpublk-g1",
852859
.clk_names = (const char *[]){ "g1", },
853860
.num_clks = 1,
854861
.gpc_name = "g1",
855-
.rst_mask = BIT(1),
856-
.clk_mask = BIT(1),
857862
},
858863
[IMX8MQ_VPUBLK_PD_G2] = {
859864
.name = "vpublk-g2",
860865
.clk_names = (const char *[]){ "g2", },
861866
.num_clks = 1,
862867
.gpc_name = "g2",
863-
.rst_mask = BIT(0),
864-
.clk_mask = BIT(0),
865868
},
866869
};
867870

0 commit comments

Comments
 (0)