Skip to content

FROMLIST scsi: ufs: ufs-qcom: Add specified gear support for multi gear scaling #1030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ggiriprasad wants to merge 2 commits into
base: qcom-6.18.y
Choose a base branch
from
Open

FROMLIST scsi: ufs: ufs-qcom: Add specified gear support for multi gear scaling #1030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
738c56e
FROMLIST scsi: ufs: ufs-qcom: Add specified gear support for multi ge…
quic-ziqichen Aug 29, 2026
466daf3
FROMLIST arm64: dts: qcom: Set specified gear configuration for Hamoa
nitinrawat123 Aug 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions arch/arm64/boot/dts/qcom/hamoa.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3961,6 +3961,7 @@
/bits/ 64 <0>,
/bits/ 64 <0>,
/bits/ 64 <0>;
opp-level = <1>; /* HS-G1 */
required-opps = <&rpmhpd_opp_low_svs>;
};

Expand All @@ -3973,6 +3974,7 @@
/bits/ 64 <0>,
/bits/ 64 <0>,
/bits/ 64 <0>;
opp-level = <3>; /* HS-G3 */
required-opps = <&rpmhpd_opp_svs>;
};

Expand All @@ -3985,6 +3987,7 @@
/bits/ 64 <0>,
/bits/ 64 <0>,
/bits/ 64 <0>;
opp-level = <5>; /* HS-G5 */
required-opps = <&rpmhpd_opp_nom>;
};
};
Expand Down
30 changes: 26 additions & 4 deletions drivers/ufs/host/ufs-qcom.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2182,8 +2182,9 @@ static unsigned long ufs_qcom_opp_freq_to_clk_freq(struct ufs_hba *hba,
bool found = false;

opp = dev_pm_opp_find_freq_exact_indexed(hba->dev, freq, 0, true);
if (IS_ERR(opp)) {
dev_err(hba->dev, "Failed to find OPP for exact frequency %lu\n", freq);
if (IS_ERR_OR_NULL(opp)) {
dev_err(hba->dev, "%s: Failed to find OPP for exact frequency %lu\n",
__func__, freq);
return 0;
}

Expand Down Expand Up @@ -2211,12 +2212,32 @@ static unsigned long ufs_qcom_opp_freq_to_clk_freq(struct ufs_hba *hba,

static u32 ufs_qcom_freq_to_gear_speed(struct ufs_hba *hba, unsigned long freq)
{
u32 gear = UFS_HS_DONT_CHANGE;
struct dev_pm_opp *opp;
unsigned long unipro_freq;
u32 gear = UFS_HS_DONT_CHANGE;

if (!hba->use_pm_opp)
return gear;

opp = dev_pm_opp_find_freq_exact_indexed(hba->dev, freq, 0, true);
if (IS_ERR_OR_NULL(opp)) {
dev_err(hba->dev, "%s: Failed to find OPP for exact frequency %lu\n",
__func__, freq);
return gear;
}

/* Get HS gear speed from 'opp-level' */
gear = dev_pm_opp_get_level(opp);
dev_pm_opp_put(opp);

/*
* Greater than max gear means that there is no specified gear configured in DT
* or the specified gear is invalid.
*/
if (gear <= hba->max_pwr_info.info.gear_rx)
return gear;

gear = UFS_HS_DONT_CHANGE;
unipro_freq = ufs_qcom_opp_freq_to_clk_freq(hba, freq, "core_clk_unipro");
switch (unipro_freq) {
case 403000000:
Expand All @@ -2237,7 +2258,8 @@ static u32 ufs_qcom_freq_to_gear_speed(struct ufs_hba *hba, unsigned long freq)
gear = UFS_HS_G1;
break;
default:
dev_err(hba->dev, "%s: Unsupported clock freq : %lu\n", __func__, freq);
dev_err(hba->dev, "%s: Unsupported clock freq [sys_clk: %lu, unipro_clk: %lu]\n",
__func__, freq, unipro_freq);
return UFS_HS_DONT_CHANGE;
}

Expand Down
Loading