From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EA3A72C21CB; Wed, 4 Feb 2026 15:16:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770218163; cv=none; b=nckaIzMGv81KAl+/aChlH2udArZek+fuQQ/j5kT/OlWsJuCsGVqCnBTlBGJZcI8Rmy7doJQ8vzoDpFli+cRXpHBTGVhlyrsSCbZt1h2w+E5vgkU3p3rZK9PGg9KspN6VS9wU/QeZFw3gbAFoaT/2nQrdKI5IGBFZGJwz7E2vW+A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770218163; c=relaxed/simple; bh=sqxE/YzKzKju44qm8b3p+AxWQyp228zF1IYYktldEzA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D8r05ekcmr3AXGK+w8pnNVubV4YHwGMqGNdnl7nl5OCQrKM+sjLBe9Irx/s7K06j7U6EDq5SuRVZi62ssUdQfflJBMbVlZC/v/MUFWmgMod8lxJI18GlsJ6+5kvtH7/nIXTnMbP90lwi0E1mywj5d3PIMtkAqmHcKKadAUr9n50= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=mbFL0cvN; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="mbFL0cvN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4FF7CC4CEF7; Wed, 4 Feb 2026 15:16:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1770218162; bh=sqxE/YzKzKju44qm8b3p+AxWQyp228zF1IYYktldEzA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mbFL0cvNIy+CxhRHsciLqV+UzP3/Ym5DTZvjMoEJqTbJZuBRMNVTYwi/9XFXSs+Pv w7TViEBncPXPV0tB6Yp8t9XKbNtByfEH2S1zo6KnkILT3jndvJ7D3gWTy5iZNDtgyX bLK+eCbZoc+Hq3fIYqId1qPubZyrq4oIdVIqAXpI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ming Qian , Benjamin Gaignard , Peng Fan , Frank Li , Ulf Hansson , Sasha Levin Subject: [PATCH 6.1 229/280] pmdomain: imx8m-blk-ctrl: Remove separate rst and clk mask for 8mq vpu Date: Wed, 4 Feb 2026 15:40:03 +0100 Message-ID: <20260204143917.859861173@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260204143909.614719725@linuxfoundation.org> References: <20260204143909.614719725@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ming Qian [ Upstream commit 3de49966499634454fd59e0e6fecd50baab7febd ] 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: 608d7c325e85 ("soc: imx: imx8m-blk-ctrl: add i.MX8MQ VPU blk-ctrl") Signed-off-by: Ming Qian Reviewed-by: Benjamin Gaignard Reviewed-by: Peng Fan Reviewed-by: Frank Li Cc: stable@vger.kernel.org Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/soc/imx/imx8m-blk-ctrl.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) --- a/drivers/soc/imx/imx8m-blk-ctrl.c +++ b/drivers/soc/imx/imx8m-blk-ctrl.c @@ -810,22 +810,25 @@ static int imx8mq_vpu_power_notifier(str return NOTIFY_OK; } +/* + * For i.MX8MQ, the ADB in the VPUMIX domain has no separate reset and clock + * enable bits, but is ungated and reset together with the VPUs. + * Resetting G1 or G2 separately may led to system hang. + * Remove the rst_mask and clk_mask from the domain data of G1 and G2, + * Let imx8mq_vpu_power_notifier() do really vpu reset. + */ static const struct imx8m_blk_ctrl_domain_data imx8mq_vpu_blk_ctl_domain_data[] = { [IMX8MQ_VPUBLK_PD_G1] = { .name = "vpublk-g1", .clk_names = (const char *[]){ "g1", }, .num_clks = 1, .gpc_name = "g1", - .rst_mask = BIT(1), - .clk_mask = BIT(1), }, [IMX8MQ_VPUBLK_PD_G2] = { .name = "vpublk-g2", .clk_names = (const char *[]){ "g2", }, .num_clks = 1, .gpc_name = "g2", - .rst_mask = BIT(0), - .clk_mask = BIT(0), }, };