When using a device with UFS > 2.1 the error "invalid UFS version" is
misleadingly printed. There was a patch for this almost a year
ago to which this solution was suggested.
This series replaces the use of the growing UFSHCI_VERSION_xy macros with
an inline function to encode a major and minor version into the scheme
used on devices, that being:
(major << 8) + (minor << 4)
I dealt with the different encoding used for UFS 1.x by converting it
to match the newer versions in ufshcd_get_ufs_version(). That means it's
possible to use comparisons for version checks, e.g.
if (hba->ufs_version < ufshci_version(3, 0))
...
I've also dropped the "invalid UFS version" check entirely as it seems to
be more misleading than useful, and hasn't been accurate for a long time.
This has been tested on a device with UFS 3.0 and a device with UFS 2.1,
however I don't own any older devices to test with.
Caleb
---
Changes since v1:
* Switch from macro to static inline function
* Address Christoph's formatting comments
* Add Nitin's signoff on patch 3 ("scsi: ufshcd: remove version check")
Resend:
* Fix patches 1/3 referencing the macro from v1
instead of the new inline function
Changes since v2:
* Remove excessive parentheses from ufshci_version()
* Pick up Christoph's Reviewed-by
Caleb Connolly (3):
scsi: ufshcd: use a function to calculate versions
scsi: ufs: qcom: use ufshci_version function
scsi: ufshcd: remove version check
drivers/scsi/ufs/ufs-qcom.c | 4 +--
drivers/scsi/ufs/ufshcd.c | 66 ++++++++++++++++++---------------------------
drivers/scsi/ufs/ufshci.h | 17 +++++++-----
3 files changed, 38 insertions(+), 49 deletions(-)
