Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a261ee8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "scsi: ufs: core power collapse after clock gating"

parents b1d493c3 403e3c04

drivers/scsi/ufs/ufshcd.c

+6 −0
Original line number Diff line number Diff line
@@ -371,6 +371,8 @@ static int ufshcd_host_reset_and_restore(struct ufs_hba *hba); 
static void ufshcd_resume_clkscaling(struct ufs_hba *hba);

static void ufshcd_suspend_clkscaling(struct ufs_hba *hba);

static void ufshcd_release_all(struct ufs_hba *hba);

static void ufshcd_hba_vreg_set_lpm(struct ufs_hba *hba);

static void ufshcd_hba_vreg_set_hpm(struct ufs_hba *hba);



static inline bool ufshcd_valid_tag(struct ufs_hba *hba, int tag)

{
@@ -1133,6 +1135,7 @@ static void ufshcd_ungate_work(struct work_struct *work) 
	}



	spin_unlock_irqrestore(hba->host->host_lock, flags);

	ufshcd_hba_vreg_set_hpm(hba);

	ufshcd_setup_clocks(hba, true);



	/* Exit from hibern8 */
@@ -1273,6 +1276,9 @@ static void ufshcd_gate_work(struct work_struct *work) 
		/* If link is active, device ref_clk can't be switched off */

		__ufshcd_setup_clocks(hba, false, true);



	/* Put the host controller in low power mode if possible */

	ufshcd_hba_vreg_set_lpm(hba);



	/*

	 * In case you are here to cancel this work the gating state

	 * would be marked as REQ_CLKS_ON. In this case keep the state