| Message ID | 20240403-ufs-icc-fix-v2-2-958412a5eb45@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | scsi: ufs: qcom: Add missing interconnect bandwidth values for Gear 5 | expand |
On Wed, Apr 03, 2024 at 06:50:04PM +0530, Manivannan Sadhasivam wrote: > Let's add the checks to warn the user if the ICC scaling is not supported > for the gear/lane values and also fallback to the max value if that's the > case. > > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Reviewed-by: Andrew Halaney <ahalaney@redhat.com> > --- > drivers/ufs/host/ufs-qcom.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c > index 696540ca835e..79b4ce05f7c5 100644 > --- a/drivers/ufs/host/ufs-qcom.c > +++ b/drivers/ufs/host/ufs-qcom.c > @@ -696,6 +696,16 @@ static struct __ufs_qcom_bw_table ufs_qcom_get_bw_table(struct ufs_qcom_host *ho > int gear = max_t(u32, p->gear_rx, p->gear_tx); > int lane = max_t(u32, p->lane_rx, p->lane_tx); > > + if (WARN_ONCE(gear > QCOM_UFS_MAX_GEAR, > + "ICC scaling for UFS Gear (%d) not supported. Using Gear (%d) bandwidth\n", > + gear, QCOM_UFS_MAX_GEAR)) > + gear = QCOM_UFS_MAX_GEAR; > + > + if (WARN_ONCE(lane > QCOM_UFS_MAX_LANE, > + "ICC scaling for UFS Lane (%d) not supported. Using Lane (%d) bandwidth\n", > + lane, QCOM_UFS_MAX_LANE)) > + lane = QCOM_UFS_MAX_LANE; > + > if (ufshcd_is_hs_mode(p)) { > if (p->hs_rate == PA_HS_MODE_B) > return ufs_qcom_bw_table[MODE_HS_RB][gear][lane]; > > -- > 2.25.1 > >
diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c index 696540ca835e..79b4ce05f7c5 100644 --- a/drivers/ufs/host/ufs-qcom.c +++ b/drivers/ufs/host/ufs-qcom.c @@ -696,6 +696,16 @@ static struct __ufs_qcom_bw_table ufs_qcom_get_bw_table(struct ufs_qcom_host *ho int gear = max_t(u32, p->gear_rx, p->gear_tx); int lane = max_t(u32, p->lane_rx, p->lane_tx); + if (WARN_ONCE(gear > QCOM_UFS_MAX_GEAR, + "ICC scaling for UFS Gear (%d) not supported. Using Gear (%d) bandwidth\n", + gear, QCOM_UFS_MAX_GEAR)) + gear = QCOM_UFS_MAX_GEAR; + + if (WARN_ONCE(lane > QCOM_UFS_MAX_LANE, + "ICC scaling for UFS Lane (%d) not supported. Using Lane (%d) bandwidth\n", + lane, QCOM_UFS_MAX_LANE)) + lane = QCOM_UFS_MAX_LANE; + if (ufshcd_is_hs_mode(p)) { if (p->hs_rate == PA_HS_MODE_B) return ufs_qcom_bw_table[MODE_HS_RB][gear][lane];
Let's add the checks to warn the user if the ICC scaling is not supported for the gear/lane values and also fallback to the max value if that's the case. Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> --- drivers/ufs/host/ufs-qcom.c | 10 ++++++++++ 1 file changed, 10 insertions(+)