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

Commit b1932bb3 authored by Subhash Jadavani's avatar Subhash Jadavani
Browse files

scsi: ufs: disable vccq if it's not needed by UFS device 



Some UFS devices don't require VCCQ rail for device operations hence
this change adds support to recognize such devices and remove vote for
the unused VCCQ rail.

Change-Id: I7f0ffb9141bf9f13ce457c8c5eba7705ae288872
Signed-off-by: default avatarSubhash Jadavani <subhashj@codeaurora.org>
parent b3d542ec

drivers/scsi/ufs/ufs_quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


static struct ufs_card_fix ufs_fixups[] = {

	/* UFS cards deviations table */

	UFS_FIX(UFS_VENDOR_SAMSUNG, UFS_ANY_MODEL, UFS_DEVICE_NO_VCCQ),

	END_FIX

};

drivers/scsi/ufs/ufs_quirks.h

+10 −2
Original line number Diff line number Diff line
@@ -22,7 +22,9 @@ 


#define MAX_MODEL_LEN 16



#define UFS_VENDOR_TOSHIBA 0x98

#define UFS_VENDOR_TOSHIBA     0x198

#define UFS_VENDOR_SAMSUNG     0x1CE



/* UFS TOSHIBA MODELS */

#define UFS_MODEL_TOSHIBA_32GB "THGLF2G8D4KBADR"

#define UFS_MODEL_TOSHIBA_64GB "THGLF2G9D8KBADG"
@@ -64,7 +66,13 @@ struct ufs_card_fix { 
 * the LCC transmission on UFS host controller (by clearing

 * TX_LCC_ENABLE attribute of host to 0).

 */

#define UFS_DEVICE_QUIRK_BROKEN_LCC		UFS_BIT(0)

#define UFS_DEVICE_QUIRK_BROKEN_LCC (1 << 0)



/*

 * Some UFS devices don't need VCCQ rail for device operations. Enabling this

 * quirk for such devices will make sure that VCCQ rail is not voted.

 */

#define UFS_DEVICE_NO_VCCQ (1 << 1)



struct ufs_hba;

void ufs_advertise_fixup_device(struct ufs_hba *hba);

drivers/scsi/ufs/ufshcd.c

+55 −4
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ static inline int ufshcd_read_unit_desc_param(struct ufs_hba *hba, 
static int __ufshcd_setup_clocks(struct ufs_hba *hba, bool on,

				 bool skip_ref_clk);

static int ufshcd_setup_clocks(struct ufs_hba *hba, bool on);

static int ufshcd_set_vccq_rail_unused(struct ufs_hba *hba, bool unused);

static int ufshcd_uic_hibern8_exit(struct ufs_hba *hba);

static int ufshcd_uic_hibern8_enter(struct ufs_hba *hba);

static int ufshcd_host_reset_and_restore(struct ufs_hba *hba);
@@ -5701,6 +5702,11 @@ static int ufshcd_probe_hba(struct ufs_hba *hba) 
	ufs_advertise_fixup_device(hba);

	ufshcd_tune_unipro_params(hba);



	ret = ufshcd_set_vccq_rail_unused(hba,

		(hba->dev_quirks & UFS_DEVICE_NO_VCCQ) ? true : false);

	if (ret)

		goto out;



	if (!hba->is_init_prefetch) {

		ret = ufshcd_get_device_ref_clk(hba);

		if (ret) {
@@ -6053,12 +6059,23 @@ static int ufshcd_config_vreg_load(struct device *dev, struct ufs_vreg *vreg, 
static inline int ufshcd_config_vreg_lpm(struct ufs_hba *hba,

					 struct ufs_vreg *vreg)

{

	return ufshcd_config_vreg_load(hba->dev, vreg, UFS_VREG_LPM_LOAD_UA);

	if (!vreg)

		return 0;

	else if (vreg->unused)

		return 0;

	else

		return ufshcd_config_vreg_load(hba->dev, vreg,

					       UFS_VREG_LPM_LOAD_UA);

}



static inline int ufshcd_config_vreg_hpm(struct ufs_hba *hba,

					 struct ufs_vreg *vreg)

{

	if (!vreg)

		return 0;

	else if (vreg->unused)

		return 0;

	else

		return ufshcd_config_vreg_load(hba->dev, vreg, vreg->max_uA);

}
@@ -6094,7 +6111,9 @@ static int ufshcd_enable_vreg(struct device *dev, struct ufs_vreg *vreg) 
{

	int ret = 0;



	if (!vreg || vreg->enabled)

	if (!vreg)

		goto out;

	else if (vreg->enabled || vreg->unused)

		goto out;



	ret = ufshcd_config_vreg(dev, vreg, true);
@@ -6114,7 +6133,9 @@ static int ufshcd_disable_vreg(struct device *dev, struct ufs_vreg *vreg) 
{

	int ret = 0;



	if (!vreg || !vreg->enabled)

	if (!vreg)

		goto out;

	else if (!vreg->enabled || vreg->unused)

		goto out;



	ret = regulator_disable(vreg->reg);
@@ -6225,6 +6246,36 @@ static int ufshcd_init_hba_vreg(struct ufs_hba *hba) 
		return 0;

}



static int ufshcd_set_vccq_rail_unused(struct ufs_hba *hba, bool unused)

{

	int ret = 0;

	struct ufs_vreg_info *info = &hba->vreg_info;



	if (!info)

		goto out;

	else if (!info->vccq)

		goto out;



	if (unused) {

		/* shut off the rail here */

		ret = ufshcd_toggle_vreg(hba->dev, info->vccq, false);

		/*

		 * Mark this rail as no longer used, so it doesn't get enabled

		 * later by mistake

		 */

		if (!ret)

			info->vccq->unused = true;

	} else {

		/*

		 * rail should have been already enabled hence just make sure

		 * that unused flag is cleared.

		 */

		info->vccq->unused = false;

	}

out:

	return ret;

}



static int __ufshcd_setup_clocks(struct ufs_hba *hba, bool on,

				 bool skip_ref_clk)

{

include/linux/scsi/ufs/ufs.h

+1 −0
Original line number Diff line number Diff line
@@ -469,6 +469,7 @@ struct ufs_vreg { 
	struct regulator *reg;

	const char *name;

	bool enabled;

	bool unused;

	int min_uV;

	int max_uV;

	int min_uA;