Commit 839a74b5 authored by Avri Altman's avatar Avri Altman Committed by Martin K. Petersen
Browse files

scsi: ufs: Fix toggling of clk_gating.state when clock gating is not allowed 



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: 1ab27c9c ("ufs: Add support for clock gating")
Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Tested-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarAvri Altman <avri.altman@wdc.com>
Link: https://lore.kernel.org/r/20250128071207.75494-3-avri.altman@wdc.com


Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 3d4114a1

drivers/ufs/core/ufshcd.c

+1 −1
Original line number Diff line number Diff line
@@ -9140,7 +9140,7 @@ static int ufshcd_setup_clocks(struct ufs_hba *hba, bool on) 
			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),