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 56C5E2FD1B5 for ; Tue, 27 Jan 2026 13:21:13 +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=1769520073; cv=none; b=beVHfxMkDGPzkTzkID07pX/0r38baiJBEELIrHcObzKwqiTy+DGIZuNU+uUd+E1ubHixf38o9Vs/rEx4oz1Z+ThCjj2qjabIzvhsW5dCvKGtYR9VnXlJo8Ik9snZ0BQE6ELirhsxVuPzHHOESxKvQRuHbyB7+8cHkJChGJwZPnc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769520073; c=relaxed/simple; bh=/l4FEafHQ8ZaeA8Ln+EjJP/rN/UDlo12qh8UKX5l+x8=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=su4BogvUjxsBkI0pB5cgVEBVhgjR08gC7qtBcIh4SWoFdOxN+XM0+JEynA1lIZ6W5dV8rQuP65tL8q0ZpDBN+0N3SdS0GBBNwkCSIUicSMx+tmlatIUzUeOX61CvfyshvKy3vjRUzm2vZRB7RKklMAa8UUYJHUPYinwCpdGH1kg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=zM968CE/; 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="zM968CE/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6BA71C116C6; Tue, 27 Jan 2026 13:21:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1769520072; bh=/l4FEafHQ8ZaeA8Ln+EjJP/rN/UDlo12qh8UKX5l+x8=; h=Subject:To:Cc:From:Date:From; b=zM968CE/9kbdxEyu+6fDgKW+BQhQZlc/8vDRkdZWMSRssl1U08VMaXDtliwRZiqNZ 0oGjXPGZHE5z3E05Elcg4OoopivCPFfUFhx7hiyUC/KzPKa7bbnNgb4HD9B4xnIZ2s A1FEl6pLp++SH8fh4X2ZkzW5Gohz56ROXMMkiEEw= Subject: FAILED: patch "[PATCH] pmdomain: imx8m-blk-ctrl: Remove separate rst and clk mask" failed to apply to 6.1-stable tree To: ming.qian@oss.nxp.com,Frank.Li@nxp.com,benjamin.gaignard@collabora.com,peng.fan@nxp.com,ulf.hansson@linaro.org Cc: From: Date: Tue, 27 Jan 2026 14:21:09 +0100 Message-ID: <2026012709-declared-threefold-0e87@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 3de49966499634454fd59e0e6fecd50baab7febd # git commit -s git send-email --to '' --in-reply-to '2026012709-declared-threefold-0e87@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 3de49966499634454fd59e0e6fecd50baab7febd Mon Sep 17 00:00:00 2001 From: Ming Qian Date: Fri, 5 Dec 2025 09:54:25 +0800 Subject: [PATCH] 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: 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 diff --git a/drivers/pmdomain/imx/imx8m-blk-ctrl.c b/drivers/pmdomain/imx/imx8m-blk-ctrl.c index 5c83e5599f1e..74bf4936991d 100644 --- a/drivers/pmdomain/imx/imx8m-blk-ctrl.c +++ b/drivers/pmdomain/imx/imx8m-blk-ctrl.c @@ -846,22 +846,25 @@ static int imx8mq_vpu_power_notifier(struct notifier_block *nb, 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), }, };