admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

scsi: ufs: core: Change MCQ interrupt enable flow

Browse Source 
Move the MCQ interrupt enable process to
ufshcd_mcq_make_queues_operational() to ensure that interrupts are set
correctly when making queues operational, similar to
ufshcd_make_hba_operational(). This change addresses the issue where
ufshcd_mcq_make_queues_operational() was not fully operational due to
missing interrupt enablement.

This change only affects host drivers that call
ufshcd_mcq_make_queues_operational(), i.e. ufs-mediatek.

Signed-off-by: Peter Wang <peter.wang@mediatek.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Peter Wang
2025-09-24 17:16:19 +08:00
committed by Martin K. Petersen
parent 0ac3c901fb
commit 2537577979
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/ufs/core/ufs-mcq.c
View File

@@ -29,6 +29,10 @@
#define MCQ_ENTRY_SIZE_IN_DWORD 8 #define MCQ_ENTRY_SIZE_IN_DWORD 8
#define CQE_UCD_BA GENMASK_ULL(63, 7) #define CQE_UCD_BA GENMASK_ULL(63, 7)
#define UFSHCD_ENABLE_MCQ_INTRS (UTP_TASK_REQ_COMPL |\
UFSHCD_ERROR_MASK |\
MCQ_CQ_EVENT_STATUS)
/* Max mcq register polling time in microseconds */ /* Max mcq register polling time in microseconds */
#define MCQ_POLL_US 500000 #define MCQ_POLL_US 500000
@@ -355,9 +359,16 @@ EXPORT_SYMBOL_GPL(ufshcd_mcq_poll_cqe_lock);
void ufshcd_mcq_make_queues_operational(struct ufs_hba *hba) void ufshcd_mcq_make_queues_operational(struct ufs_hba *hba)
{ {
struct ufs_hw_queue *hwq; struct ufs_hw_queue *hwq;
u32 intrs;
u16 qsize; u16 qsize;
int i; int i;
/* Enable required interrupts */
intrs = UFSHCD_ENABLE_MCQ_INTRS;
if (hba->quirks & UFSHCD_QUIRK_MCQ_BROKEN_INTR)
intrs &= ~MCQ_CQ_EVENT_STATUS;
ufshcd_enable_intr(hba, intrs);
for (i = 0; i < hba->nr_hw_queues; i++) { for (i = 0; i < hba->nr_hw_queues; i++) {
hwq = &hba->uhq[i]; hwq = &hba->uhq[i];
hwq->id = i; hwq->id = i;

12
drivers/ufs/core/ufshcd.c
View File

@@ -45,11 +45,6 @@
UTP_TASK_REQ_COMPL |\ UTP_TASK_REQ_COMPL |\
UFSHCD_ERROR_MASK) UFSHCD_ERROR_MASK)
#define UFSHCD_ENABLE_MCQ_INTRS (UTP_TASK_REQ_COMPL |\
UFSHCD_ERROR_MASK |\
MCQ_CQ_EVENT_STATUS)
/* UIC command timeout, unit: ms */ /* UIC command timeout, unit: ms */
enum { enum {
UIC_CMD_TIMEOUT_DEFAULT = 500, UIC_CMD_TIMEOUT_DEFAULT = 500,
@@ -372,7 +367,7 @@ EXPORT_SYMBOL_GPL(ufshcd_disable_irq);
* @hba: per adapter instance * @hba: per adapter instance
* @intrs: interrupt bits * @intrs: interrupt bits
*/ */
static void ufshcd_enable_intr(struct ufs_hba *hba, u32 intrs) void ufshcd_enable_intr(struct ufs_hba *hba, u32 intrs)
{ {
u32 old_val = ufshcd_readl(hba, REG_INTERRUPT_ENABLE); u32 old_val = ufshcd_readl(hba, REG_INTERRUPT_ENABLE);
u32 new_val = old_val | intrs; u32 new_val = old_val | intrs;
@@ -8909,16 +8904,11 @@ err:
static void ufshcd_config_mcq(struct ufs_hba *hba) static void ufshcd_config_mcq(struct ufs_hba *hba)
{ {
int ret; int ret;
u32 intrs;
ret = ufshcd_mcq_vops_config_esi(hba); ret = ufshcd_mcq_vops_config_esi(hba);
hba->mcq_esi_enabled = !ret; hba->mcq_esi_enabled = !ret;
dev_info(hba->dev, "ESI %sconfigured\n", ret ? "is not " : ""); dev_info(hba->dev, "ESI %sconfigured\n", ret ? "is not " : "");
intrs = UFSHCD_ENABLE_MCQ_INTRS;
if (hba->quirks & UFSHCD_QUIRK_MCQ_BROKEN_INTR)
intrs &= ~MCQ_CQ_EVENT_STATUS;
ufshcd_enable_intr(hba, intrs);
ufshcd_mcq_make_queues_operational(hba); ufshcd_mcq_make_queues_operational(hba);
ufshcd_mcq_config_mac(hba, hba->nutrs); ufshcd_mcq_config_mac(hba, hba->nutrs);

1
include/ufs/ufshcd.h
View File

@@ -1292,6 +1292,7 @@ static inline void ufshcd_rmwl(struct ufs_hba *hba, u32 mask, u32 val, u32 reg)
void ufshcd_enable_irq(struct ufs_hba *hba); void ufshcd_enable_irq(struct ufs_hba *hba);
void ufshcd_disable_irq(struct ufs_hba *hba); void ufshcd_disable_irq(struct ufs_hba *hba);
void ufshcd_enable_intr(struct ufs_hba *hba, u32 intrs);
int ufshcd_alloc_host(struct device *, struct ufs_hba **); int ufshcd_alloc_host(struct device *, struct ufs_hba **);
int ufshcd_hba_enable(struct ufs_hba *hba); int ufshcd_hba_enable(struct ufs_hba *hba);
int ufshcd_init(struct ufs_hba *, void __iomem *, unsigned int); int ufshcd_init(struct ufs_hba *, void __iomem *, unsigned int);