android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FROMLIST: ufs: mcq: Use ufshcd_mcq_poll_cqe_lock() in mcq mode

Browse Source 
In preparation for adding mcq error handler support, update the mcq
code to use the ufshcd_mcq_poll_cqe_lock() in interrupt context
instead of using ufshcd_mcq_poll_cqe_nolock(). This is to keep
synchronization between mcq interrupt and error handler contexts
because both need to access the mcq hardware in separate contexts.

Signed-off-by: Bao D. Nguyen <quic_nguyenb@quicinc.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>

Exported the ufshcd_mcq_poll_cqe_nolock() again as it is previously
exported and part of other ABI lists.

Bug: 285631559
Link: https://lore.kernel.org/linux-scsi/6ae727ad2a4040469b8f0632b55e0577d80da11b.1685396241.git.quic_nguyenb@quicinc.com/
Change-Id: I02bf672c113401d8273c98bedc1ecf7fadaf15c9
Signed-off-by: SEO HOYOUNG <hy50.seo@samsung.com>
Signed-off-by: Sandeep Dhavale <dhavale@google.com>
This commit is contained in:
Bao D. Nguyen 2023-05-29 15:12:25 -07:00 committed by Carlos Llamas
parent e3d62e38a9
commit 4f319f6367
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -286,7 +286,7 @@ static void ufshcd_mcq_process_cqe(struct ufs_hba *hba,
}
unsigned long ufshcd_mcq_poll_cqe_nolock(struct ufs_hba *hba,
struct ufs_hw_queue *hwq)
struct ufs_hw_queue *hwq)
{
unsigned long completed_reqs = 0;
@ -315,6 +315,7 @@ unsigned long ufshcd_mcq_poll_cqe_lock(struct ufs_hba *hba,
return completed_reqs;
}
EXPORT_SYMBOL_GPL(ufshcd_mcq_poll_cqe_lock);
void ufshcd_mcq_make_queues_operational(struct ufs_hba *hba)
{

2
drivers/ufs/core/ufshcd-priv.h
View File

@ -71,8 +71,6 @@ void ufshcd_mcq_config_mac(struct ufs_hba *hba, u32 max_active_cmds);
void ufshcd_mcq_select_mcq_mode(struct ufs_hba *hba);
u32 ufshcd_mcq_read_cqis(struct ufs_hba *hba, int i);
void ufshcd_mcq_write_cqis(struct ufs_hba *hba, u32 val, int i);
unsigned long ufshcd_mcq_poll_cqe_nolock(struct ufs_hba *hba,
struct ufs_hw_queue *hwq);
struct ufs_hw_queue *ufshcd_mcq_req_to_hwq(struct ufs_hba *hba,
struct request *req);
unsigned long ufshcd_mcq_poll_cqe_lock(struct ufs_hba *hba,

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

@ -6850,7 +6850,7 @@ static irqreturn_t ufshcd_handle_mcq_cq_events(struct ufs_hba *hba)
ufshcd_mcq_write_cqis(hba, events, i);
if (events & UFSHCD_MCQ_CQIS_TAIL_ENT_PUSH_STS)
ufshcd_mcq_poll_cqe_nolock(hba, hwq);
ufshcd_mcq_poll_cqe_lock(hba, hwq);
}
return IRQ_HANDLED;

2
drivers/ufs/host/ufs-qcom.c
View File

@ -1537,7 +1537,7 @@ static irqreturn_t ufs_qcom_mcq_esi_handler(int irq, void *__hba)
struct ufs_hw_queue *hwq = &hba->uhq[id];
ufshcd_mcq_write_cqis(hba, 0x1, id);
ufshcd_mcq_poll_cqe_nolock(hba, hwq);
ufshcd_mcq_poll_cqe_lock(hba, hwq);
return IRQ_HANDLED;
}

2
include/ufs/ufshcd.h
View File

@ -1287,6 +1287,8 @@ void ufshcd_schedule_eh_work(struct ufs_hba *hba);
void ufshcd_mcq_write_cqis(struct ufs_hba *hba, u32 val, int i);
unsigned long ufshcd_mcq_poll_cqe_nolock(struct ufs_hba *hba,
struct ufs_hw_queue *hwq);
unsigned long ufshcd_mcq_poll_cqe_lock(struct ufs_hba *hba,
struct ufs_hw_queue *hwq);
void ufshcd_mcq_enable_esi(struct ufs_hba *hba);
void ufshcd_mcq_config_esi(struct ufs_hba *hba, struct msi_msg *msg);