mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-30 08:02:30 +00:00
Code Issues Releases Wiki Activity

SCSI fixes on 20170113

Browse source 
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.
 
 Signed-off-by: James E.J. Bottomley <jejb@linux.vnet.ibm.com>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABAgAGBQJYeOuBAAoJEAVr7HOZEZN4TxEP/j3nlFKrs7XEhlbbZrezyHkA
 RvEWAkpoSXpQiVvuqHcObOX5Jh9I8ndBMRh2MyS2zLV4PA4SzwrprgemaB5rL9+j
 +5IIw7MdHY5SHP0IrvpTae+c1kOnHRfSdsLORqohB9uhqJiSbwhXgV0Q19hRzttA
 qmjD5RBI4sY3a+/CjGQevaM2Y/WQqCp4+J5kvclr3AmEoTjMkAiOsjbSuclFHWX9
 CxNKSMv/6z34ZgqS0FgqCrCAI5kO5UHrjznslcEtgVECIOTrNer3g5e75DhQOcD6
 Mhklxbx1dfG9r3h3oush8Zy9IIJoXZFZLRNmhhX7zcKkuYUaR9LU2COUVCTOEE+s
 SAtp4qdXxCZ8sFyHS+E9ajTYSeTw05fmGEbAu1dqJ8FUxkRnvsWouCiw/TI+ps94
 mJSiS2UGHAYxpLdWFbnKC+2CaCG32ygXINUcZbIItmT2cdA+ERAPAO6tDegjgb0S
 MoeRxAlUGfUehHReCppRV3igwjtw2vtQaY5hFq1+v8n00Ezt6kDNeeTanqobMrHr
 71rOZAos9aT5wa39pmbW18M3pfUB1qeuGn6di4ArYk8f9ILAMI4qykvnDHH3INcn
 BdCIY3SgRo/Zq+87vFWZr+56CcbVqq0GV38FKoRZcHglyOjDw8ibQY6elcsjBtJC
 S1Z5wlkv1T9tfA+8mRX6
 =kjPw
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2017-01-13 12:38:36 -08:00
commit c79d47f14f
7 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/scsi/bfa/bfad.c
View file

@ -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);

2
drivers/scsi/bfa/bfad_drv.h
View file

@ -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

1
drivers/scsi/fnic/fnic.h
View file

@ -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;

16
drivers/scsi/fnic/fnic_scsi.c
View file

@ -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;
} }

2
drivers/scsi/qedi/Kconfig
View file

@ -1,6 +1,6 @@
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

2
drivers/scsi/scsi_lib.c
View file

@ -2893,7 +2893,7 @@ scsi_internal_device_block(struct scsi_device *sdev)
* request queue. * request queue.
*/ */
if (q->mq_ops) { if (q->mq_ops) {
blk_mq_stop_hw_queues(q); blk_mq_quiesce_queue(q);
} else { } else {
spin_lock_irqsave(q->queue_lock, flags); spin_lock_irqsave(q->queue_lock, flags);
blk_stop_queue(q); blk_stop_queue(q);

3
drivers/scsi/snic/snic_main.c
View file

@ -591,6 +591,7 @@ snic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (!pool) { if (!pool) {
SNIC_HOST_ERR(shost, "dflt sgl pool creation failed\n"); SNIC_HOST_ERR(shost, "dflt sgl pool creation failed\n");
ret = -ENOMEM;
goto err_free_res; goto err_free_res;
} }
@ -601,6 +602,7 @@ snic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (!pool) { if (!pool) {
SNIC_HOST_ERR(shost, "max sgl pool creation failed\n"); SNIC_HOST_ERR(shost, "max sgl pool creation failed\n");
ret = -ENOMEM;
goto err_free_dflt_sgl_pool; goto err_free_dflt_sgl_pool;
} }
@ -611,6 +613,7 @@ snic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (!pool) { if (!pool) {
SNIC_HOST_ERR(shost, "snic tmreq info pool creation failed.\n"); SNIC_HOST_ERR(shost, "snic tmreq info pool creation failed.\n");
ret = -ENOMEM;
goto err_free_max_sgl_pool; goto err_free_max_sgl_pool;
} }