Commit e3b8bb45 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull SCSI fixes from James Bottomley:
 "Two patches, both in drivers.

  One is a fix to FC recovery (lpfc) and the other is an enhancement to
  support the Intel Alder Motherboard with the UFS driver which comes
  under the -rc exception process for hardware enabling"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: ufs: ufs-pci: Add support for Intel ADL
  scsi: lpfc: Fix non-recovery of remote ports following an unsolicited LOGO
parents 5c623c36 7dc9fb47

drivers/scsi/lpfc/lpfc_els.c

+2 −7
Original line number Diff line number Diff line
@@ -5095,14 +5095,9 @@ lpfc_cmpl_els_logo_acc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
		/* NPort Recovery mode or node is just allocated */

		if (!lpfc_nlp_not_used(ndlp)) {

			/* A LOGO is completing and the node is in NPR state.

			 * If this a fabric node that cleared its transport

			 * registration, release the rpi.

			 * Just unregister the RPI because the node is still

			 * required.

			 */

			spin_lock_irq(&ndlp->lock);

			ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;

			if (phba->sli_rev == LPFC_SLI_REV4)

				ndlp->nlp_flag |= NLP_RELEASE_RPI;

			spin_unlock_irq(&ndlp->lock);

			lpfc_unreg_rpi(vport, ndlp);

		} else {

			/* Indicate the node has already released, should

drivers/scsi/ufs/ufshcd-pci.c

+18 −0
Original line number Diff line number Diff line
@@ -421,6 +421,13 @@ static int ufs_intel_lkf_init(struct ufs_hba *hba) 
	return err;

}



static int ufs_intel_adl_init(struct ufs_hba *hba)

{

	hba->nop_out_timeout = 200;

	hba->quirks |= UFSHCD_QUIRK_BROKEN_AUTO_HIBERN8;

	return ufs_intel_common_init(hba);

}



static struct ufs_hba_variant_ops ufs_intel_cnl_hba_vops = {

	.name                   = "intel-pci",

	.init			= ufs_intel_common_init,
@@ -449,6 +456,15 @@ static struct ufs_hba_variant_ops ufs_intel_lkf_hba_vops = { 
	.device_reset		= ufs_intel_device_reset,

};



static struct ufs_hba_variant_ops ufs_intel_adl_hba_vops = {

	.name			= "intel-pci",

	.init			= ufs_intel_adl_init,

	.exit			= ufs_intel_common_exit,

	.link_startup_notify	= ufs_intel_link_startup_notify,

	.resume			= ufs_intel_resume,

	.device_reset		= ufs_intel_device_reset,

};



#ifdef CONFIG_PM_SLEEP

static int ufshcd_pci_restore(struct device *dev)

{
@@ -563,6 +579,8 @@ static const struct pci_device_id ufshcd_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0x4B41), (kernel_ulong_t)&ufs_intel_ehl_hba_vops },

	{ PCI_VDEVICE(INTEL, 0x4B43), (kernel_ulong_t)&ufs_intel_ehl_hba_vops },

	{ PCI_VDEVICE(INTEL, 0x98FA), (kernel_ulong_t)&ufs_intel_lkf_hba_vops },

	{ PCI_VDEVICE(INTEL, 0x51FF), (kernel_ulong_t)&ufs_intel_adl_hba_vops },

	{ PCI_VDEVICE(INTEL, 0x54FF), (kernel_ulong_t)&ufs_intel_adl_hba_vops },

	{ }	/* terminate list */

};