[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20251014060406.1420475-2-palash.kambar@oss.qualcomm.com>
Date: Tue, 14 Oct 2025 11:34:05 +0530
From: palash.kambar@....qualcomm.com
To: mani@...nel.org, alim.akhtar@...sung.com, avri.altman@....com,
bvanassche@....org, peter.griffin@...aro.org, krzk@...nel.org,
peter.wang@...iatek.com, beanhuo@...ron.com, quic_nguyenb@...cinc.com,
adrian.hunter@...el.com, ebiggers@...nel.org,
neil.armstrong@...aro.org, James.Bottomley@...senPartnership.com,
martin.petersen@...cle.com
Cc: linux-arm-msm@...r.kernel.org, linux-scsi@...r.kernel.org,
linux-kernel@...r.kernel.org, quic_cang@...cinc.com,
quic_nitirawa@...cinc.com,
Palash Kambar <palash.kambar@....qualcomm.com>
Subject: [PATCH V1 1/2] ufs: core:Add vendor-specific callbacks and update setup_xfer_req interface
From: Palash Kambar <palash.kambar@....qualcomm.com>
On QCOM UFSHC V6 in MCQ mode, a race condition exists where simultaneous
data and hibernate commands can cause data commands to be dropped when
the Auto-Hibernate Idle Timer (AHIT) is near expiration.
To mitigate this, AHIT is disabled before updating the SQ tail pointer,
and re-enabled only when no active commands remain. This prevents
conflicting command sequences from reaching the UniPro layer during
critical timing windows.
To support this:
- Introduce a new vendor operation `compl_command` to allow vendors to
handle command completion in a customized manner.
- Update the argument list for the existing `setup_xfer_req` vendor
operation to align with the updated UFS core interface.
- Modify the Exynos-specific `setup_xfer_req` implementation to match
the new interface and support the AHIT handling logic.
Signed-off-by: Palash Kambar <palash.kambar@....qualcomm.com>
---
drivers/ufs/core/ufshcd.c | 6 ++++--
drivers/ufs/host/ufs-exynos.c | 6 +++++-
include/ufs/ufshcd.h | 5 +++--
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 568a449e7331..fd771d6c315e 100644
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -2383,11 +2383,11 @@ void ufshcd_send_command(struct ufs_hba *hba, unsigned int task_tag,
memcpy(dest, src, utrd_size);
ufshcd_inc_sq_tail(hwq);
spin_unlock(&hwq->sq_lock);
+ hba->vops->setup_xfer_req(hba, lrbp);
} else {
spin_lock_irqsave(&hba->outstanding_lock, flags);
if (hba->vops && hba->vops->setup_xfer_req)
- hba->vops->setup_xfer_req(hba, lrbp->task_tag,
- !!lrbp->cmd);
+ hba->vops->setup_xfer_req(hba, lrbp);
__set_bit(lrbp->task_tag, &hba->outstanding_reqs);
ufshcd_writel(hba, 1 << lrbp->task_tag,
REG_UTP_TRANSFER_REQ_DOOR_BELL);
@@ -5637,6 +5637,7 @@ void ufshcd_compl_one_cqe(struct ufs_hba *hba, int task_tag,
}
cmd = lrbp->cmd;
if (cmd) {
+ hba->vops->compl_command(hba, lrbp);
if (unlikely(ufshcd_should_inform_monitor(hba, lrbp)))
ufshcd_update_monitor(hba, lrbp);
ufshcd_add_command_trace(hba, task_tag, UFS_CMD_COMP);
@@ -5645,6 +5646,7 @@ void ufshcd_compl_one_cqe(struct ufs_hba *hba, int task_tag,
/* Do not touch lrbp after scsi done */
scsi_done(cmd);
} else {
+ hba->vops->compl_command(hba, lrbp);
if (cqe) {
ocs = le32_to_cpu(cqe->status) & MASK_OCS;
lrbp->utr_descriptor_ptr->header.ocs = ocs;
diff --git a/drivers/ufs/host/ufs-exynos.c b/drivers/ufs/host/ufs-exynos.c
index 70d195179eba..d87276f45e01 100644
--- a/drivers/ufs/host/ufs-exynos.c
+++ b/drivers/ufs/host/ufs-exynos.c
@@ -910,11 +910,15 @@ static int exynos_ufs_post_pwr_mode(struct ufs_hba *hba,
}
static void exynos_ufs_specify_nexus_t_xfer_req(struct ufs_hba *hba,
- int tag, bool is_scsi_cmd)
+ struct ufshcd_lrb *lrbp)
{
struct exynos_ufs *ufs = ufshcd_get_variant(hba);
u32 type;
+ int tag;
+ bool is_scsi_cmd;
+ tag = lrbp->task_tag;
+ is_scsi_cmd = !!lrbp->cmd;
type = hci_readl(ufs, HCI_UTRL_NEXUS_TYPE);
if (is_scsi_cmd)
diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h
index ea0021f067c9..845f0df34281 100644
--- a/include/ufs/ufshcd.h
+++ b/include/ufs/ufshcd.h
@@ -356,8 +356,9 @@ struct ufs_hba_variant_ops {
enum ufs_notify_change_status status,
const struct ufs_pa_layer_attr *desired_pwr_mode,
struct ufs_pa_layer_attr *final_params);
- void (*setup_xfer_req)(struct ufs_hba *hba, int tag,
- bool is_scsi_cmd);
+ void (*setup_xfer_req)(struct ufs_hba *hba, struct ufshcd_lrb *lrbp);
+ void (*compl_command)(struct ufs_hba *hba,
+ struct ufshcd_lrb *lrbp);
void (*setup_task_mgmt)(struct ufs_hba *, int, u8);
void (*hibern8_notify)(struct ufs_hba *, enum uic_cmd_dme,
enum ufs_notify_change_status);
--
2.34.1
Powered by blists - more mailing lists