From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794064467; b=XPFjK6ttadLhI0tlGOXvTP0RDrm2hogcOAUtSi0E3Li21xHP6ybRe5p4CpOrHKj0pPyV fL+jhDoOGVTd0GOPZYGnmiSNalfGEX0eR3hzaADDAqZbg2MD07rlNp+P7sXrpFwnXNG43 2mlAxAK47UkRZS7X719+zwF9/BNAu8CCWrfzX9/hYPmSgqffQUjsEli8gXtykok6SBSQY a3BdDvCsvoy71D+4NyUk4W/f6eFWOd41hyWVsVzJM4sWKqI9hVyEc97rTCRPNwwFXjeqW i2UPrTaB2EciT64pMR+hqn5Fw474uy8bZOt2IVukeTxwkRdrC6CY4k6gzFIK4K1kcaQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794064467; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=JAAZ2U0DmoDEH7OUChfCnsht4RJC4vO00aLHsnEByZs=; b=xHfWhX14MVH7uusuvMj4iLnHnL28bluTecINtIihXOEz6xrQGpBf+a7a755XOHsAyseu ew7cym9/tVslX8HXCktYYMo+PhQya35CiNaKuS67Hq5LkDoFk4zxW1iR1cqovA2tQQ2lZ zQmtoTUiMHRCNikrDocZWpAU2Xsyv9b0kpn0elM8otrMUIWsme93GNQLpMJe1w2iDCJBK KjyUyvzQwLP8mtaAQJKZxWc3It8okT1YdNj17r8DIcfefv02lGFhMmgBoOtemTnVcwb7d aJ7WSRiJMIyR07twGfwmXzqlrXF60TnUit1ptUH3cwDxYh+3rOHtI53PxGcFW4z8jZQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=vbaWqqaj; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 62192606A9E9; Sat, 7 Nov 2026 15:14:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=vbaWqqaj Received: by smtp.kernel.org (Postfix) with ESMTPSA id E2CA11F008A1; Sat, 7 Nov 2026 15:14:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794064467; bh=JAAZ2U0DmoDEH7OUChfCnsht4RJC4vO00aLHsnEByZs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vbaWqqaj1ySpAIiwdO3k3gEukxAaUf+2GHuO9SDlDuQTVbNbYnWkfK5Wen0cTZkpU mu2Uiu4d83iYj/vaESMakmEADeq6DKLXqE0iM27WDslqWstYhqRJQz/bOkGVfJykVv QU2cTpj+KYUJAle1c2TK8Cm6ZX43KPRHgRhopCOw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Tharit Tangkijwanichakul , Benjamin Gaignard , Nicolas Dufresne , Hans Verkuil , Sasha Levin Subject: [PATCH 7.3 0469/1257] media: hantro: disable runtime PM before hardware teardown Date: Sat, 7 Nov 2026 08:46:05 -0500 Message-ID: <20261107134952.413482386@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261107134939.434104957@linuxfoundation.org> References: <20261107134939.434104957@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.3-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tharit Tangkijwanichakul [ Upstream commit 8e26d4c20ed218db6c3123480a4a4e2545680566 ] Removing the Hantro driver may trigger an SError on RK3588: SError Interrupt on CPU6, code 0x00000000be000011 -- SError ... do_serror+0x5c/0x74 el1h_64_error_handler+0x34/0x50 el1h_64_error+0x6c/0x70 regmap_mmio_read32le+0x10/0x20 (P) _regmap_bus_reg_read+0x6c/0xb4 _regmap_read+0x60/0xdc regmap_read+0x4c/0x80 rockchip_pd_power+0xe4/0x600 rockchip_pd_power_off+0x1c/0x60 _genpd_power_off+0x98/0x198 genpd_power_off.part.0+0x178/0x288 genpd_runtime_suspend+0x210/0x300 __rpm_callback+0x48/0x1e0 rpm_callback+0x74/0x80 rpm_suspend+0x10c/0x580 rpm_idle+0x134/0x1b8 update_autosuspend+0x30/0xc4 __pm_runtime_use_autosuspend+0x48/0x64 hantro_remove+0x8c/0xa8 [hantro_vpu] ... hantro_remove() currently asserts the device resets before disabling runtime PM. Calling pm_runtime_dont_use_autosuspend() causes an idle device to be runtime-suspended immediately. At that point the Hantro hardware has already been torn down, while the generic power-domain genpd code still performs the power-off sequence. genpd regmap_mmio_read causes panic subsequently because the reset lines were asserted. Disable runtime PM before asserting the reset lines so that no runtime-PM transition can race with hardware teardown. Apply the same ordering to the probe error paths as well. Fixes: ea71631b7129 ("media: hantro: add support for reset lines") Cc: stable@vger.kernel.org Signed-off-by: Tharit Tangkijwanichakul Reviewed-by: Benjamin Gaignard Signed-off-by: Nicolas Dufresne Signed-off-by: Hans Verkuil Signed-off-by: Sasha Levin --- drivers/media/platform/verisilicon/hantro_drv.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c index 43f67b9fcf273..d945cc83323e2 100644 --- a/drivers/media/platform/verisilicon/hantro_drv.c +++ b/drivers/media/platform/verisilicon/hantro_drv.c @@ -1210,7 +1210,7 @@ static int hantro_probe(struct platform_device *pdev) ret = clk_bulk_prepare(vpu->variant->num_clocks, vpu->clocks); if (ret) { dev_err(&pdev->dev, "Failed to prepare clocks\n"); - goto err_rst_assert; + goto err_pm_disable_assert_reset; } ret = v4l2_device_register(&pdev->dev, &vpu->v4l2_dev); @@ -1264,8 +1264,11 @@ static int hantro_probe(struct platform_device *pdev) v4l2_device_unregister(&vpu->v4l2_dev); err_clk_unprepare: clk_bulk_unprepare(vpu->variant->num_clocks, vpu->clocks); -err_rst_assert: +err_pm_disable_assert_reset: + pm_runtime_dont_use_autosuspend(vpu->dev); + pm_runtime_disable(vpu->dev); reset_control_assert(vpu->resets); + return ret; err_pm_disable: pm_runtime_dont_use_autosuspend(vpu->dev); pm_runtime_disable(vpu->dev); @@ -1285,9 +1288,9 @@ static void hantro_remove(struct platform_device *pdev) v4l2_m2m_put(vpu->m2m_dev); v4l2_device_unregister(&vpu->v4l2_dev); clk_bulk_unprepare(vpu->variant->num_clocks, vpu->clocks); - reset_control_assert(vpu->resets); pm_runtime_dont_use_autosuspend(vpu->dev); pm_runtime_disable(vpu->dev); + reset_control_assert(vpu->resets); } #ifdef CONFIG_PM -- 2.53.0