From: Martin K. Petersen <martin.petersen@oracle.com>
Date: Fri, 25 Jul 2025 02:44:23 +0000 (-0400)
Subject: Merge patch series "scsi: ufs: ufs-pci: Fix hibernate state transition for Intel... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa8c53346e38bc3529f0773ee377efb8ea7b610a;p=thirdparty%2Fkernel%2Flinux.git

Merge patch series "scsi: ufs: ufs-pci: Fix hibernate state transition for Intel MTL-like host controllers"

Adrian Hunter <adrian.hunter@intel.com> says:

Hi

Here is V2 of a couple of fixes for Intel MTL-like UFS host controllers,
related to link Hibernation state.

Following the fixes are some improvements for the enabling and disabling
of UIC Completion interrupts.

Link: https://lore.kernel.org/r/20250723165856.145750-1-adrian.hunter@intel.com

Conflicts:
	drivers/ufs/core/ufshcd.c

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---

aa8c53346e38bc3529f0773ee377efb8ea7b610a
diff --cc drivers/ufs/core/ufshcd.c
index ad7cfdf0244f8,fa1fdba372677..5442bb8540b50
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@@ -4381,9 -4336,7 +4379,7 @@@ out
  	spin_lock_irqsave(hba->host->host_lock, flags);
  	hba->active_uic_cmd = NULL;
  	hba->uic_async_done = NULL;
- 	if (reenable_intr)
- 		ufshcd_enable_intr(hba, UIC_COMMAND_COMPL);
 -	if (ret) {
 +	if (ret && !hba->pm_op_in_progress) {
  		ufshcd_set_link_broken(hba);
  		ufshcd_schedule_eh_work(hba);
  	}