[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <90ea4709cf07d951aaad16e1e63f13842bb4608f.1725251103.git.kwmad.kim@samsung.com>
Date: Mon, 2 Sep 2024 13:26:45 +0900
From: Kiwoong Kim <kwmad.kim@...sung.com>
To: linux-scsi@...r.kernel.org, linux-kernel@...r.kernel.org,
huobean@...il.com, alim.akhtar@...sung.com, avri.altman@....com,
bvanassche@....org, jejb@...ux.ibm.com, martin.petersen@...cle.com,
beanhuo@...ron.com, adrian.hunter@...el.com, h10.kim@...sung.com,
hy50.seo@...sung.com, sh425.lee@...sung.com, kwangwon.min@...sung.com,
junwoo80.lee@...sung.com, wkon.kim@...sung.com
Cc: Kiwoong Kim <kwmad.kim@...sung.com>
Subject: [RESEND PATCH v2 1/2] scsi: ufs: core: introduce override_cqe_ocs
This patch is to declare override_cqe_ocs callback to
override OCS value.
Signed-off-by: Kiwoong Kim <kwmad.kim@...sung.com>
---
drivers/ufs/core/ufshcd-priv.h | 9 +++++++++
drivers/ufs/core/ufshcd.c | 11 +++++++----
include/ufs/ufshcd.h | 1 +
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/drivers/ufs/core/ufshcd-priv.h b/drivers/ufs/core/ufshcd-priv.h
index ce36154ce963..6ebc83029e09 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(ocs);
+
+ 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 0dd26059f5d7..0615e372fe44 100644
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -821,11 +821,14 @@ static inline bool ufshcd_is_device_present(struct ufs_hba *hba)
*
* Return: the OCS field in the UTRD.
*/
-static enum utp_ocs ufshcd_get_tr_ocs(struct ufshcd_lrb *lrbp,
+static enum utp_ocs ufshcd_get_tr_ocs(struct ufs_hba *hba,
+ 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;
}
@@ -3180,7 +3183,7 @@ static int ufshcd_wait_for_dev_cmd(struct ufs_hba *hba,
* not trigger any race conditions.
*/
hba->dev_cmd.complete = NULL;
- err = ufshcd_get_tr_ocs(lrbp, NULL);
+ err = ufshcd_get_tr_ocs(hba, lrbp, NULL);
if (!err)
err = ufshcd_dev_cmd_completion(hba, lrbp);
} else {
@@ -5351,7 +5354,7 @@ ufshcd_transfer_rsp_status(struct ufs_hba *hba, struct ufshcd_lrb *lrbp,
scsi_set_resid(lrbp->cmd, resid);
/* overall command status of utrd */
- ocs = ufshcd_get_tr_ocs(lrbp, cqe);
+ ocs = ufshcd_get_tr_ocs(hba, lrbp, cqe);
if (hba->quirks & UFSHCD_QUIRK_BROKEN_OCS_FATAL_ERROR) {
if (lrbp->ucd_rsp_ptr->header.response ||
diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h
index a43b14276bc3..3dbd3e41b022 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)(enum utp_ocs);
};
/* clock gating state */
--
2.26.0
Powered by blists - more mailing lists