]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
phy: core: Reinstate pm_runtime_enabled() check in phy_pm_runtime_put()
authorGeert Uytterhoeven <geert+renesas@glider.be>
Tue, 30 Dec 2025 15:04:05 +0000 (16:04 +0100)
committerVinod Koul <vkoul@kernel.org>
Thu, 1 Jan 2026 10:24:45 +0000 (15:54 +0530)
On Koelsch (R-Car M2-W), during boot and s2ram:

    phy phy-e6590100.usb-phy-controller.0: Runtime PM usage count underflow!

While phy_pm_runtime_get{,_sync}() and phy_pm_runtime_put_sync() still
contain pm_runtime_enabled() checks, the same check in
phy_pm_runtime_put() was deemed redundant and removed, causing count
underflows with PHY drivers like drivers/phy/renesas/phy-rcar-gen2.c
that do not use Runtime PM yet,

Fix this by reinstating the check.

Fixes: caad07ae07e3fb17 ("phy: core: Discard pm_runtime_put() return values")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/3ca9f8166d21685bfbf97535da30172f74822130.1767107014.git.geert+renesas@glider.be
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/phy/phy-core.c

index 160ecb757d1d62a0c03ad73079fd12c812559088..e2a2a99d069789c70689f0e76d444d7baacc247d 100644 (file)
@@ -195,6 +195,9 @@ void phy_pm_runtime_put(struct phy *phy)
        if (!phy)
                return;
 
+       if (!pm_runtime_enabled(&phy->dev))
+               return;
+
        pm_runtime_put(&phy->dev);
 }
 EXPORT_SYMBOL_GPL(phy_pm_runtime_put);