UFSHCI defines OCS values but doesn't specify what exact
conditions raise them. E.g. when some commands are nullified
or cleaned up, Exynos host reposts OCS_ABORT. Even if
an OEM wants to issue them again, not fail, current UFS driver
fails them because it set command result to DID_ABORT.
So I think it needs another callback to replace the original OCS
value with the value that works the way you want.
Signed-off-by: Kiwoong Kim <kwmad.kim@xxxxxxxxxxx>
---
drivers/ufs/core/ufshcd-priv.h | 9 +++++++++
drivers/ufs/core/ufshcd.c | 4 +++-
include/ufs/ufshcd.h | 1 +
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/drivers/ufs/core/ufshcd-priv.h b/drivers/ufs/core/ufshcd-priv.h
index ce36154..4dec6eb 100644
--- a/drivers/ufs/core/ufshcd-priv.h
+++ b/drivers/ufs/core/ufshcd-priv.h
@@ -275,6 +275,15 @@ static inline int ufshcd_mcq_vops_config_esi(struct ufs_hba *hba)
return -EOPNOTSUPP;
}
+static inline enum utp_ocs ufshcd_vops_override_cqe_ocs(struct ufs_hba *hba,
+ enum utp_ocs ocs)
+{
+ if (hba->vops && hba->vops->override_cqe_ocs)
+ return hba->vops->override_cqe_ocs(hba);
+
+ return ocs;
+}
+
extern const struct ufs_pm_lvl_states ufs_pm_lvl_states[];
/**
diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 0dd2605..83a1870 100644
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -825,7 +825,9 @@ static enum utp_ocs ufshcd_get_tr_ocs(struct ufshcd_lrb *lrbp,
struct cq_entry *cqe)
{
if (cqe)
- return le32_to_cpu(cqe->status) & MASK_OCS;
+ return ufshcd_vops_override_cqe_ocs(hba,
+ le32_to_cpu(cqe->status) &
+ MASK_OCS);
return lrbp->utr_descriptor_ptr->header.ocs & MASK_OCS;
}
diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h
index a43b142..64444fb 100644
--- a/include/ufs/ufshcd.h
+++ b/include/ufs/ufshcd.h
@@ -382,6 +382,7 @@ struct ufs_hba_variant_ops {
int (*get_outstanding_cqs)(struct ufs_hba *hba,
unsigned long *ocqs);
int (*config_esi)(struct ufs_hba *hba);
+ enum utp_ocs (*override_cqe_ocs)(struct ufs_hba *hba, enum utp_ocs);
};
/* clock gating state */
--
2.7.4
