]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
scsi: ufs: Fix toggling of clk_gating.state when clock gating is not allowed
authorAvri Altman <avri.altman@wdc.com>
Tue, 28 Jan 2025 07:12:07 +0000 (09:12 +0200)
committerMartin K. Petersen <martin.petersen@oracle.com>
Mon, 3 Feb 2025 21:53:00 +0000 (16:53 -0500)
This commit addresses an issue where clk_gating.state is being toggled in
ufshcd_setup_clocks() even if clock gating is not allowed.

The fix is to add a check for hba->clk_gating.is_initialized before toggling
clk_gating.state in ufshcd_setup_clocks().

Since clk_gating.lock is now initialized unconditionally, it can no longer
lead to the spinlock being used before it is properly initialized, but
instead it is mostly for documentation purposes.

Fixes: 1ab27c9cf8b6 ("ufs: Add support for clock gating")
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Avri Altman <avri.altman@wdc.com>
Link: https://lore.kernel.org/r/20250128071207.75494-3-avri.altman@wdc.com
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/ufs/core/ufshcd.c

index db20b1d505b79c1c4419d6220c86100e60c16dd1..d3741b1f43821708f4f8e46aaca35bb2b0bade69 100644 (file)
@@ -9140,7 +9140,7 @@ out:
                        if (!IS_ERR_OR_NULL(clki->clk) && clki->enabled)
                                clk_disable_unprepare(clki->clk);
                }
-       } else if (!ret && on) {
+       } else if (!ret && on && hba->clk_gating.is_initialized) {
                scoped_guard(spinlock_irqsave, &hba->clk_gating.lock)
                        hba->clk_gating.state = CLKS_ON;
                trace_ufshcd_clk_gating(dev_name(hba->dev),