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

Commit 386af664 authored by Yaniv Gardi's avatar Yaniv Gardi
Browse files

scsi: ufs: add power param check to avoid illegal value configuration 



When reading gear/lane value from unipro and from the UFS device,
we might get wrong values, due to HW failures, so we need to report
it and ignore.
gear = 0, in both RX and TX is invalid and should be reported as
error, and same case for number of connected lanes (RX or TX) which
are 0.

Change-Id: Ib5d0963836cdd20178546372a356a14f2a1acd5f
Signed-off-by: default avatarYaniv Gardi <ygardi@codeaurora.org>
parent 5cc57e3e

drivers/scsi/ufs/ufshcd.c

+20 −1
Original line number Diff line number Diff line
@@ -2169,6 +2169,12 @@ static int ufshcd_config_max_pwr_mode(struct ufs_hba *hba) 
	ufshcd_dme_get(hba, UIC_ARG_MIB(PA_CONNECTEDRXDATALANES), &lanes[RX]);

	ufshcd_dme_get(hba, UIC_ARG_MIB(PA_CONNECTEDTXDATALANES), &lanes[TX]);



	if (!lanes[RX] || !lanes[TX]) {

		dev_err(hba->dev, "%s: invalid connected lanes value. rx=%d, tx=%d\n",

				__func__, lanes[RX], lanes[TX]);

		return -EINVAL;

	}



	/*

	 * First, get the maximum gears of HS speed.

	 * If a zero value, it means there is no HSGEAR capability.
@@ -2177,6 +2183,11 @@ static int ufshcd_config_max_pwr_mode(struct ufs_hba *hba) 
	ufshcd_dme_get(hba, UIC_ARG_MIB(PA_MAXRXHSGEAR), &gear[RX]);

	if (!gear[RX]) {

		ufshcd_dme_get(hba, UIC_ARG_MIB(PA_MAXRXPWMGEAR), &gear[RX]);

		if (!gear[RX]) {

			dev_err(hba->dev, "%s: invalid rx gear read = %d\n",

				__func__, gear[RX]);

			return -EINVAL;

		}

		pwr[RX] = SLOWAUTO_MODE;

	}
@@ -2184,6 +2195,11 @@ static int ufshcd_config_max_pwr_mode(struct ufs_hba *hba) 
	if (!gear[TX]) {

		ufshcd_dme_peer_get(hba, UIC_ARG_MIB(PA_MAXRXPWMGEAR),

				    &gear[TX]);

		if (!gear[TX]) {

			dev_err(hba->dev, "%s: invalid tx gear read = %d\n",

				__func__, gear[TX]);

			return -EINVAL;

		}

		pwr[TX] = SLOWAUTO_MODE;

	}
@@ -3943,7 +3959,10 @@ static int ufshcd_probe_hba(struct ufs_hba *hba) 
	ufshcd_force_reset_auto_bkops(hba);

	hba->ufshcd_state = UFSHCD_STATE_OPERATIONAL;



	ufshcd_config_max_pwr_mode(hba);

	if (ufshcd_config_max_pwr_mode(hba))

		dev_err(hba->dev,

			"%s: Failed configuring max supported power mode\n",

			__func__);



	/*

	 * If we are in error handling context or in power management callbacks