Commit ee229e7c authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: ufs: core: Configure MCQ after link startup 



Commit f46b9a59 ("scsi: ufs: core: Allocate the SCSI host earlier")
did not only cause scsi_add_host() to be called earlier. It also swapped
the order of link startup and enabling and configuring MCQ mode. Before
that commit, the call chains for link startup and enabling MCQ were as
follows:

ufshcd_init()
  ufshcd_link_startup()
  ufshcd_add_scsi_host()
    ufshcd_mcq_enable()

Apparently this change causes link startup to fail. Fix this by configuring
MCQ after link startup has completed.

Reported-by: default avatarNitin Rawat <nitin.rawat@oss.qualcomm.com>
Fixes: f46b9a59 ("scsi: ufs: core: Allocate the SCSI host earlier")
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarPeter Wang <peter.wang@mediatek.com>
Link: https://patch.msgid.link/20251218230741.2661049-1-bvanassche@acm.org


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 9a49157d

drivers/ufs/core/ufshcd.c

+4 −3
Original line number Diff line number Diff line
@@ -10736,9 +10736,7 @@ static int ufshcd_add_scsi_host(struct ufs_hba *hba) 
	if (is_mcq_supported(hba)) {

		ufshcd_mcq_enable(hba);

		err = ufshcd_alloc_mcq(hba);

		if (!err) {

			ufshcd_config_mcq(hba);

		} else {

		if (err) {

			/* Continue with SDB mode */

			ufshcd_mcq_disable(hba);

			use_mcq_mode = false;
@@ -11011,6 +11009,9 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) 
	if (err)

		goto out_disable;



	if (hba->mcq_enabled)

		ufshcd_config_mcq(hba);



	if (hba->quirks & UFSHCD_QUIRK_SKIP_PH_CONFIGURATION)

		goto initialized;