Commit eea6e4b4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull SCSI fixes from James Bottomley:
 "Four driver fixes in UFS, mostly to do with power management"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: ufs: qcom: Power down the controller/device during system suspend for SM8550/SM8650 SoCs
  scsi: ufs: qcom: Allow passing platform specific OF data
  scsi: ufs: core: Honor runtime/system PM levels if set by host controller drivers
  scsi: ufs: qcom: Power off the PHY if it was already powered on in ufs_qcom_power_up_sequence()
parents 0b7958fa 3b2f5686

drivers/ufs/core/ufshcd-priv.h

+0 −6
Original line number Diff line number Diff line
@@ -237,12 +237,6 @@ static inline void ufshcd_vops_config_scaling_param(struct ufs_hba *hba, 
		hba->vops->config_scaling_param(hba, p, data);

}



static inline void ufshcd_vops_reinit_notify(struct ufs_hba *hba)

{

	if (hba->vops && hba->vops->reinit_notify)

		hba->vops->reinit_notify(hba);

}



static inline int ufshcd_vops_mcq_config_resource(struct ufs_hba *hba)

{

	if (hba->vops && hba->vops->mcq_config_resource)

drivers/ufs/core/ufshcd.c

+6 −4
Original line number Diff line number Diff line
@@ -8858,7 +8858,6 @@ static int ufshcd_probe_hba(struct ufs_hba *hba, bool init_dev_params) 
		ufshcd_device_reset(hba);

		ufs_put_device_desc(hba);

		ufshcd_hba_stop(hba);

		ufshcd_vops_reinit_notify(hba);

		ret = ufshcd_hba_enable(hba);

		if (ret) {

			dev_err(hba->dev, "Host controller enable failed\n");
@@ -10591,13 +10590,16 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) 
	}



	/*

	 * Set the default power management level for runtime and system PM.

	 * Set the default power management level for runtime and system PM if

	 * not set by the host controller drivers.

	 * Default power saving mode is to keep UFS link in Hibern8 state

	 * and UFS device in sleep state.

	 */

	if (!hba->rpm_lvl)

		hba->rpm_lvl = ufs_get_desired_pm_lvl_for_dev_link_state(

						UFS_SLEEP_PWR_MODE,

						UIC_LINK_HIBERN8_STATE);

	if (!hba->spm_lvl)

		hba->spm_lvl = ufs_get_desired_pm_lvl_for_dev_link_state(

						UFS_SLEEP_PWR_MODE,

						UIC_LINK_HIBERN8_STATE);

drivers/ufs/host/ufs-qcom.c

+19 −12
Original line number Diff line number Diff line
@@ -368,6 +368,11 @@ static int ufs_qcom_power_up_sequence(struct ufs_hba *hba) 
	if (ret)

		return ret;



	if (phy->power_count) {

		phy_power_off(phy);

		phy_exit(phy);

	}



	/* phy initialization - calibrate the phy */

	ret = phy_init(phy);

	if (ret) {
@@ -866,6 +871,7 @@ static u32 ufs_qcom_get_ufs_hci_version(struct ufs_hba *hba) 
 */

static void ufs_qcom_advertise_quirks(struct ufs_hba *hba)

{

	const struct ufs_qcom_drvdata *drvdata = of_device_get_match_data(hba->dev);

	struct ufs_qcom_host *host = ufshcd_get_variant(hba);



	if (host->hw_ver.major == 0x2)
@@ -874,9 +880,8 @@ static void ufs_qcom_advertise_quirks(struct ufs_hba *hba) 
	if (host->hw_ver.major > 0x3)

		hba->quirks |= UFSHCD_QUIRK_REINIT_AFTER_MAX_GEAR_SWITCH;



	if (of_device_is_compatible(hba->dev->of_node, "qcom,sm8550-ufshc") ||

	    of_device_is_compatible(hba->dev->of_node, "qcom,sm8650-ufshc"))

		hba->quirks |= UFSHCD_QUIRK_BROKEN_LSDBS_CAP;

	if (drvdata && drvdata->quirks)

		hba->quirks |= drvdata->quirks;

}



static void ufs_qcom_set_phy_gear(struct ufs_qcom_host *host)
@@ -1064,6 +1069,7 @@ static int ufs_qcom_init(struct ufs_hba *hba) 
	struct device *dev = hba->dev;

	struct ufs_qcom_host *host;

	struct ufs_clk_info *clki;

	const struct ufs_qcom_drvdata *drvdata = of_device_get_match_data(hba->dev);



	host = devm_kzalloc(dev, sizeof(*host), GFP_KERNEL);

	if (!host)
@@ -1143,6 +1149,9 @@ static int ufs_qcom_init(struct ufs_hba *hba) 
		dev_warn(dev, "%s: failed to configure the testbus %d\n",

				__func__, err);



	if (drvdata && drvdata->no_phy_retention)

		hba->spm_lvl = UFS_PM_LVL_5;



	return 0;



out_variant_clear:
@@ -1579,13 +1588,6 @@ static void ufs_qcom_config_scaling_param(struct ufs_hba *hba, 
}

#endif



static void ufs_qcom_reinit_notify(struct ufs_hba *hba)

{

	struct ufs_qcom_host *host = ufshcd_get_variant(hba);



	phy_power_off(host->generic_phy);

}



/* Resources */

static const struct ufshcd_res_info ufs_res_info[RES_MAX] = {

	{.name = "ufs_mem",},
@@ -1825,7 +1827,6 @@ static const struct ufs_hba_variant_ops ufs_hba_qcom_vops = { 
	.device_reset		= ufs_qcom_device_reset,

	.config_scaling_param = ufs_qcom_config_scaling_param,

	.program_key		= ufs_qcom_ice_program_key,

	.reinit_notify		= ufs_qcom_reinit_notify,

	.mcq_config_resource	= ufs_qcom_mcq_config_resource,

	.get_hba_mac		= ufs_qcom_get_hba_mac,

	.op_runtime_config	= ufs_qcom_op_runtime_config,
@@ -1868,9 +1869,15 @@ static void ufs_qcom_remove(struct platform_device *pdev) 
		platform_device_msi_free_irqs_all(hba->dev);

}



static const struct ufs_qcom_drvdata ufs_qcom_sm8550_drvdata = {

	.quirks = UFSHCD_QUIRK_BROKEN_LSDBS_CAP,

	.no_phy_retention = true,

};



static const struct of_device_id ufs_qcom_of_match[] __maybe_unused = {

	{ .compatible = "qcom,ufshc" },

	{ .compatible = "qcom,sm8550-ufshc" },

	{ .compatible = "qcom,sm8550-ufshc", .data = &ufs_qcom_sm8550_drvdata },

	{ .compatible = "qcom,sm8650-ufshc", .data = &ufs_qcom_sm8550_drvdata },

	{},

};

MODULE_DEVICE_TABLE(of, ufs_qcom_of_match);

drivers/ufs/host/ufs-qcom.h

+5 −0
Original line number Diff line number Diff line
@@ -217,6 +217,11 @@ struct ufs_qcom_host { 
	bool esi_enabled;

};



struct ufs_qcom_drvdata {

	enum ufshcd_quirks quirks;

	bool no_phy_retention;

};



static inline u32

ufs_qcom_get_debug_reg_offset(struct ufs_qcom_host *host, u32 reg)

{

include/ufs/ufshcd.h

+0 −2
Original line number Diff line number Diff line
@@ -329,7 +329,6 @@ struct ufs_pwr_mode_info { 
 * @program_key: program or evict an inline encryption key

 * @fill_crypto_prdt: initialize crypto-related fields in the PRDT

 * @event_notify: called to notify important events

 * @reinit_notify: called to notify reinit of UFSHCD during max gear switch

 * @mcq_config_resource: called to configure MCQ platform resources

 * @get_hba_mac: reports maximum number of outstanding commands supported by

 *	the controller. Should be implemented for UFSHCI 4.0 or later
@@ -381,7 +380,6 @@ struct ufs_hba_variant_ops { 
				    void *prdt, unsigned int num_segments);

	void	(*event_notify)(struct ufs_hba *hba,

				enum ufs_event_type evt, void *data);

	void	(*reinit_notify)(struct ufs_hba *);

	int	(*mcq_config_resource)(struct ufs_hba *hba);

	int	(*get_hba_mac)(struct ufs_hba *hba);

	int	(*op_runtime_config)(struct ufs_hba *hba);