Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c79d47f1 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:
 "The major fix is the bfa firmware, since the latest 10Gb cards fail
  probing with the current firmware.

  The rest is a set of minor fixes: one missed Kconfig dependency
  causing randconfig failures, a missed error return on an error leg, a
  change for how multiqueue waits on a blocked device and a don't reset
  while in reset fix"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: bfa: Increase requested firmware version to 3.2.5.1
  scsi: snic: Return error code on memory allocation failure
  scsi: fnic: Avoid sending reset to firmware when another reset is in progress
  scsi: qedi: fix build, depends on UIO
  scsi: scsi-mq: Wait for .queue_rq() if necessary
parents 6d90b4f9 a47fff10

drivers/scsi/bfa/bfad.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -64,9 +64,9 @@ int max_rport_logins = BFA_FCS_MAX_RPORT_LOGINS; 
u32	bfi_image_cb_size, bfi_image_ct_size, bfi_image_ct2_size;

u32	bfi_image_cb_size, bfi_image_ct_size, bfi_image_ct2_size;

u32	*bfi_image_cb, *bfi_image_ct, *bfi_image_ct2;

u32	*bfi_image_cb, *bfi_image_ct, *bfi_image_ct2;





#define BFAD_FW_FILE_CB		"cbfw-3.2.3.0.bin"

#define BFAD_FW_FILE_CB		"cbfw-3.2.5.1.bin"

#define BFAD_FW_FILE_CT		"ctfw-3.2.3.0.bin"

#define BFAD_FW_FILE_CT		"ctfw-3.2.5.1.bin"

#define BFAD_FW_FILE_CT2	"ct2fw-3.2.3.0.bin"

#define BFAD_FW_FILE_CT2	"ct2fw-3.2.5.1.bin"





static u32 *bfad_load_fwimg(struct pci_dev *pdev);

static u32 *bfad_load_fwimg(struct pci_dev *pdev);

static void bfad_free_fwimg(void);

static void bfad_free_fwimg(void);

drivers/scsi/bfa/bfad_drv.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -58,7 +58,7 @@ 
#ifdef BFA_DRIVER_VERSION

#ifdef BFA_DRIVER_VERSION

#define BFAD_DRIVER_VERSION    BFA_DRIVER_VERSION

#define BFAD_DRIVER_VERSION    BFA_DRIVER_VERSION

#else

#else

#define BFAD_DRIVER_VERSION    "3.2.25.0"

#define BFAD_DRIVER_VERSION    "3.2.25.1"

#endif

#endif





#define BFAD_PROTO_NAME FCPI_NAME

#define BFAD_PROTO_NAME FCPI_NAME

drivers/scsi/fnic/fnic.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -248,6 +248,7 @@ struct fnic { 
	struct completion *remove_wait; /* device remove thread blocks */

	struct completion *remove_wait; /* device remove thread blocks */





	atomic_t in_flight;		/* io counter */

	atomic_t in_flight;		/* io counter */

	bool internal_reset_inprogress;

	u32 _reserved;			/* fill hole */

	u32 _reserved;			/* fill hole */

	unsigned long state_flags;	/* protected by host lock */

	unsigned long state_flags;	/* protected by host lock */

	enum fnic_state state;

	enum fnic_state state;

drivers/scsi/fnic/fnic_scsi.c

+16 −0
Original line number Original line Diff line number Diff line
@@ -2581,6 +2581,19 @@ int fnic_host_reset(struct scsi_cmnd *sc) 
	unsigned long wait_host_tmo;

	unsigned long wait_host_tmo;

	struct Scsi_Host *shost = sc->device->host;

	struct Scsi_Host *shost = sc->device->host;

	struct fc_lport *lp = shost_priv(shost);

	struct fc_lport *lp = shost_priv(shost);

	struct fnic *fnic = lport_priv(lp);

	unsigned long flags;



	spin_lock_irqsave(&fnic->fnic_lock, flags);

	if (fnic->internal_reset_inprogress == 0) {

		fnic->internal_reset_inprogress = 1;

	} else {

		spin_unlock_irqrestore(&fnic->fnic_lock, flags);

		FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,

			"host reset in progress skipping another host reset\n");

		return SUCCESS;

	}

	spin_unlock_irqrestore(&fnic->fnic_lock, flags);





	/*

	/*

	 * If fnic_reset is successful, wait for fabric login to complete

	 * If fnic_reset is successful, wait for fabric login to complete
@@ -2601,6 +2614,9 @@ int fnic_host_reset(struct scsi_cmnd *sc) 
		}

		}

	}

	}





	spin_lock_irqsave(&fnic->fnic_lock, flags);

	fnic->internal_reset_inprogress = 0;

	spin_unlock_irqrestore(&fnic->fnic_lock, flags);

	return ret;

	return ret;

}

}

drivers/scsi/qedi/Kconfig

+1 −1
Original line number Original line Diff line number Diff line 
config QEDI

config QEDI

	tristate "QLogic QEDI 25/40/100Gb iSCSI Initiator Driver Support"

	tristate "QLogic QEDI 25/40/100Gb iSCSI Initiator Driver Support"

	depends on PCI && SCSI

	depends on PCI && SCSI && UIO

	depends on QED

	depends on QED

	select SCSI_ISCSI_ATTRS

	select SCSI_ISCSI_ATTRS

	select QED_LL2

	select QED_LL2