Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 06:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

ufs-qcom: save controller revision info in internal structure

Browse Source 
Sometimes, specific information about the UFS controller revision is
required in order to determine certain operations or execute
controller dependent quirks.
In order to avoid reading the controller revision multiple times,
we simply read it once and save this information in internal structure.

Signed-off-by: Yaniv Gardi <ygardi@codeaurora.org>
Reviewed-by: Gilad Broner <gbroner@codeaurora.org>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
This commit is contained in:
Yaniv Gardi 2015-03-31 17:37:13 +03:00 committed by James Bottomley
parent a776e39416
commit bfdbe8ba21
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/scsi/ufs/ufs-qcom.c
View File

@ -214,8 +214,6 @@ static int ufs_qcom_power_up_sequence(struct ufs_hba *hba)
struct ufs_qcom_host *host = hba->priv; struct ufs_qcom_host *host = hba->priv;
struct phy *phy = host->generic_phy; struct phy *phy = host->generic_phy;
int ret = 0; int ret = 0;
u8 major;
u16 minor, step;
bool is_rate_B = (UFS_QCOM_LIMIT_HS_RATE == PA_HS_MODE_B) bool is_rate_B = (UFS_QCOM_LIMIT_HS_RATE == PA_HS_MODE_B)
? true : false; ? true : false;
@ -224,8 +222,6 @@ static int ufs_qcom_power_up_sequence(struct ufs_hba *hba)
/* provide 1ms delay to let the reset pulse propagate */ /* provide 1ms delay to let the reset pulse propagate */
usleep_range(1000, 1100); usleep_range(1000, 1100);
ufs_qcom_get_controller_revision(hba, &major, &minor, &step);
ufs_qcom_phy_save_controller_version(phy, major, minor, step);
ret = ufs_qcom_phy_calibrate_phy(phy, is_rate_B); ret = ufs_qcom_phy_calibrate_phy(phy, is_rate_B);
if (ret) { if (ret) {
dev_err(hba->dev, "%s: ufs_qcom_phy_calibrate_phy() failed, ret = %d\n", dev_err(hba->dev, "%s: ufs_qcom_phy_calibrate_phy() failed, ret = %d\n",
@ -698,10 +694,7 @@ out:
*/ */
static void ufs_qcom_advertise_quirks(struct ufs_hba *hba) static void ufs_qcom_advertise_quirks(struct ufs_hba *hba)
{ {
u8 major;
u16 minor, step;
ufs_qcom_get_controller_revision(hba, &major, &minor, &step);
/* /*
* TBD * TBD
@ -929,6 +922,13 @@ static int ufs_qcom_init(struct ufs_hba *hba)
if (err) if (err)
goto out_host_free; goto out_host_free;
ufs_qcom_get_controller_revision(hba, &host->hw_ver.major,
&host->hw_ver.minor, &host->hw_ver.step);
/* update phy revision information before calling phy_init() */
ufs_qcom_phy_save_controller_version(host->generic_phy,
host->hw_ver.major, host->hw_ver.minor, host->hw_ver.step);
phy_init(host->generic_phy); phy_init(host->generic_phy);
err = phy_power_on(host->generic_phy); err = phy_power_on(host->generic_phy);
if (err) if (err)

8
drivers/scsi/ufs/ufs-qcom.h
View File

@ -151,6 +151,12 @@ struct ufs_qcom_bus_vote {
struct device_attribute max_bus_bw; struct device_attribute max_bus_bw;
}; };
/* Host controller hardware version: major.minor.step */
struct ufs_hw_version {
u16 step;
u16 minor;
u8 major;
};
struct ufs_qcom_host { struct ufs_qcom_host {
struct phy *generic_phy; struct phy *generic_phy;
struct ufs_hba *hba; struct ufs_hba *hba;
@ -161,6 +167,8 @@ struct ufs_qcom_host {
struct clk *rx_l1_sync_clk; struct clk *rx_l1_sync_clk;
struct clk *tx_l1_sync_clk; struct clk *tx_l1_sync_clk;
bool is_lane_clks_enabled; bool is_lane_clks_enabled;
struct ufs_hw_version hw_ver;
}; };
#define ufs_qcom_is_link_off(hba) ufshcd_is_link_off(hba) #define ufs_qcom_is_link_off(hba) ufshcd_is_link_off(hba)