]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge patch series "scsi: ufs: ufs-pci: Fix hibernate state transition for Intel...
authorMartin K. Petersen <martin.petersen@oracle.com>
Fri, 25 Jul 2025 02:44:23 +0000 (22:44 -0400)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 25 Jul 2025 02:44:23 +0000 (22:44 -0400)
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>
1  2 
drivers/ufs/core/ufshcd.c

index ad7cfdf0244f81b20ac598154d867223b71815cb,fa1fdba372677722061f0aad2979b5ce846ff009..5442bb8540b50f92f98424e52f637fa7c9191b98
@@@ -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);
        }