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=1794063180; b=0gJba130pVDRvs0LmtW2fVq50CEr5A3ygH4SPeJVYMLdTRI/ZREXa8NDU2Aefmyn8kR0 g1KYHqH7r2nJSy75SnIcoUs+H9djBK9frZhMOEqTT/6GHj9OMHh/SEhd6LaJshrgl4Rxy Ee1EoO2xC5dD4XZhPyV1TGVu6GuLcAZeHCSfWGf3/mCtpZW7JZYF2/kqJ+v31yuuT4KVy lTfAikPlH9eXUBa5BOzNHayfeNvaKfQ5mMc3lVXJru2ozg4zRZk0tehRlrdGjVL2B80Ha vr+tcBEx+Rpos3MYgcuPKzCaHqEQ84GFPLpoW7QKG7f79UsGKCYQyMbjQXhvTqWxJSg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794063180; 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=0kwhVB5HFJjZJ1gNwA4n8cuc5uVxWm+o7ugLuW9PEP0=; b=fYKQf6Hf1zfiYkv6HVUJGUQq3VtwNBoWzrC6+fSsZQmL0FQ+uhpzhGemFqQf9dmcC0+K GiYSdlSAuXOjIIygYYTY56CD3e2ugQC2/jGcXy7+WDnnDHJUd4LoEVbR1EA1A3fbEgAcf hqneB0OLauE9/Cw/3rGolx8CG+fGa2HVh+HLegF5y3zl0oYqTIJq1gn5//U+qwEl6nrO5 EqbUgJGLOUvFmvNLuUVALpDsLVYEsrCu5s7rwrJIrc+qr5OMOArS+4aHXwof368z9Nk0p LAWY77CnT3zlA9gfZtG9BhgDp1E73Z2J6/EvjsB1A4+B7etO4fxQ6fkXO9vEaFgXpsQ== 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=V1R0TeKL; 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 49781606A330; Sat, 7 Nov 2026 14:53:00 +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=V1R0TeKL Received: by smtp.kernel.org (Postfix) with ESMTPSA id E2A351F0089F; Sat, 7 Nov 2026 14:52:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794063180; bh=0kwhVB5HFJjZJ1gNwA4n8cuc5uVxWm+o7ugLuW9PEP0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=V1R0TeKLQMTwyczzR8uQdMMUrMRDnG6eMP1Cs30X31bmceqh+9WNKWcgGUrvlKPTO orqKz/khA7iLmkFfPKmTdNHlVM2J1oT2TtzFy04SFbCiTiAaRh552N+Oy35reSZiVz a1ouVvckTUvasm9SMAI27e56Wrm7aTRnQlOPS4Kg= 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 6.18 359/869] media: hantro: disable runtime PM before hardware teardown Date: Sat, 7 Nov 2026 08:50:41 -0500 Message-ID: <20261107134904.644721590@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261107134852.069646174@linuxfoundation.org> References: <20261107134852.069646174@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 6.18-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 d2d88d0d7eeff..32197f00c0bb5 100644 --- a/drivers/media/platform/verisilicon/hantro_drv.c +++ b/drivers/media/platform/verisilicon/hantro_drv.c @@ -1204,7 +1204,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); @@ -1258,8 +1258,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); @@ -1279,9 +1282,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