diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-13 15:38:36 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-13 15:38:36 -0500 |
commit | c79d47f14fbadce94af3b606a54984a3f25ea558 (patch) | |
tree | 54e3b57baf492f84f63e198952716f478e16c56f | |
parent | 6d90b4f99d62e6cf7643c7d8b48a9d7c005455bd (diff) | |
parent | a47fff1056376fab0929661e8cc85f90572cf55a (diff) |
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
-rw-r--r-- | drivers/scsi/bfa/bfad.c | 6 | ||||
-rw-r--r-- | drivers/scsi/bfa/bfad_drv.h | 2 | ||||
-rw-r--r-- | drivers/scsi/fnic/fnic.h | 1 | ||||
-rw-r--r-- | drivers/scsi/fnic/fnic_scsi.c | 16 | ||||
-rw-r--r-- | drivers/scsi/qedi/Kconfig | 2 | ||||
-rw-r--r-- | drivers/scsi/scsi_lib.c | 2 | ||||
-rw-r--r-- | drivers/scsi/snic/snic_main.c | 3 |
7 files changed, 26 insertions, 6 deletions
diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c index d9e15210b110..5caf5f3ff642 100644 --- a/drivers/scsi/bfa/bfad.c +++ b/drivers/scsi/bfa/bfad.c | |||
@@ -64,9 +64,9 @@ int max_rport_logins = BFA_FCS_MAX_RPORT_LOGINS; | |||
64 | u32 bfi_image_cb_size, bfi_image_ct_size, bfi_image_ct2_size; | 64 | u32 bfi_image_cb_size, bfi_image_ct_size, bfi_image_ct2_size; |
65 | u32 *bfi_image_cb, *bfi_image_ct, *bfi_image_ct2; | 65 | u32 *bfi_image_cb, *bfi_image_ct, *bfi_image_ct2; |
66 | 66 | ||
67 | #define BFAD_FW_FILE_CB "cbfw-3.2.3.0.bin" | 67 | #define BFAD_FW_FILE_CB "cbfw-3.2.5.1.bin" |
68 | #define BFAD_FW_FILE_CT "ctfw-3.2.3.0.bin" | 68 | #define BFAD_FW_FILE_CT "ctfw-3.2.5.1.bin" |
69 | #define BFAD_FW_FILE_CT2 "ct2fw-3.2.3.0.bin" | 69 | #define BFAD_FW_FILE_CT2 "ct2fw-3.2.5.1.bin" |
70 | 70 | ||
71 | static u32 *bfad_load_fwimg(struct pci_dev *pdev); | 71 | static u32 *bfad_load_fwimg(struct pci_dev *pdev); |
72 | static void bfad_free_fwimg(void); | 72 | static void bfad_free_fwimg(void); |
diff --git a/drivers/scsi/bfa/bfad_drv.h b/drivers/scsi/bfa/bfad_drv.h index f9e862093a25..cfcfff48e8e1 100644 --- a/drivers/scsi/bfa/bfad_drv.h +++ b/drivers/scsi/bfa/bfad_drv.h | |||
@@ -58,7 +58,7 @@ | |||
58 | #ifdef BFA_DRIVER_VERSION | 58 | #ifdef BFA_DRIVER_VERSION |
59 | #define BFAD_DRIVER_VERSION BFA_DRIVER_VERSION | 59 | #define BFAD_DRIVER_VERSION BFA_DRIVER_VERSION |
60 | #else | 60 | #else |
61 | #define BFAD_DRIVER_VERSION "3.2.25.0" | 61 | #define BFAD_DRIVER_VERSION "3.2.25.1" |
62 | #endif | 62 | #endif |
63 | 63 | ||
64 | #define BFAD_PROTO_NAME FCPI_NAME | 64 | #define BFAD_PROTO_NAME FCPI_NAME |
diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h index 9ddc9200e0a4..9e4b7709043e 100644 --- a/drivers/scsi/fnic/fnic.h +++ b/drivers/scsi/fnic/fnic.h | |||
@@ -248,6 +248,7 @@ struct fnic { | |||
248 | struct completion *remove_wait; /* device remove thread blocks */ | 248 | struct completion *remove_wait; /* device remove thread blocks */ |
249 | 249 | ||
250 | atomic_t in_flight; /* io counter */ | 250 | atomic_t in_flight; /* io counter */ |
251 | bool internal_reset_inprogress; | ||
251 | u32 _reserved; /* fill hole */ | 252 | u32 _reserved; /* fill hole */ |
252 | unsigned long state_flags; /* protected by host lock */ | 253 | unsigned long state_flags; /* protected by host lock */ |
253 | enum fnic_state state; | 254 | enum fnic_state state; |
diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c index 2544a37ece0a..adb3d5871e74 100644 --- a/drivers/scsi/fnic/fnic_scsi.c +++ b/drivers/scsi/fnic/fnic_scsi.c | |||
@@ -2581,6 +2581,19 @@ int fnic_host_reset(struct scsi_cmnd *sc) | |||
2581 | unsigned long wait_host_tmo; | 2581 | unsigned long wait_host_tmo; |
2582 | struct Scsi_Host *shost = sc->device->host; | 2582 | struct Scsi_Host *shost = sc->device->host; |
2583 | struct fc_lport *lp = shost_priv(shost); | 2583 | struct fc_lport *lp = shost_priv(shost); |
2584 | struct fnic *fnic = lport_priv(lp); | ||
2585 | unsigned long flags; | ||
2586 | |||
2587 | spin_lock_irqsave(&fnic->fnic_lock, flags); | ||
2588 | if (fnic->internal_reset_inprogress == 0) { | ||
2589 | fnic->internal_reset_inprogress = 1; | ||
2590 | } else { | ||
2591 | spin_unlock_irqrestore(&fnic->fnic_lock, flags); | ||
2592 | FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, | ||
2593 | "host reset in progress skipping another host reset\n"); | ||
2594 | return SUCCESS; | ||
2595 | } | ||
2596 | spin_unlock_irqrestore(&fnic->fnic_lock, flags); | ||
2584 | 2597 | ||
2585 | /* | 2598 | /* |
2586 | * If fnic_reset is successful, wait for fabric login to complete | 2599 | * If fnic_reset is successful, wait for fabric login to complete |
@@ -2601,6 +2614,9 @@ int fnic_host_reset(struct scsi_cmnd *sc) | |||
2601 | } | 2614 | } |
2602 | } | 2615 | } |
2603 | 2616 | ||
2617 | spin_lock_irqsave(&fnic->fnic_lock, flags); | ||
2618 | fnic->internal_reset_inprogress = 0; | ||
2619 | spin_unlock_irqrestore(&fnic->fnic_lock, flags); | ||
2604 | return ret; | 2620 | return ret; |
2605 | } | 2621 | } |
2606 | 2622 | ||
diff --git a/drivers/scsi/qedi/Kconfig b/drivers/scsi/qedi/Kconfig index 23ca8a274586..21331453db7b 100644 --- a/drivers/scsi/qedi/Kconfig +++ b/drivers/scsi/qedi/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config QEDI | 1 | config QEDI |
2 | tristate "QLogic QEDI 25/40/100Gb iSCSI Initiator Driver Support" | 2 | tristate "QLogic QEDI 25/40/100Gb iSCSI Initiator Driver Support" |
3 | depends on PCI && SCSI | 3 | depends on PCI && SCSI && UIO |
4 | depends on QED | 4 | depends on QED |
5 | select SCSI_ISCSI_ATTRS | 5 | select SCSI_ISCSI_ATTRS |
6 | select QED_LL2 | 6 | select QED_LL2 |
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index c35b6de4ca64..9fd9a977c695 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
@@ -2893,7 +2893,7 @@ scsi_internal_device_block(struct scsi_device *sdev) | |||
2893 | * request queue. | 2893 | * request queue. |
2894 | */ | 2894 | */ |
2895 | if (q->mq_ops) { | 2895 | if (q->mq_ops) { |
2896 | blk_mq_stop_hw_queues(q); | 2896 | blk_mq_quiesce_queue(q); |
2897 | } else { | 2897 | } else { |
2898 | spin_lock_irqsave(q->queue_lock, flags); | 2898 | spin_lock_irqsave(q->queue_lock, flags); |
2899 | blk_stop_queue(q); | 2899 | blk_stop_queue(q); |
diff --git a/drivers/scsi/snic/snic_main.c b/drivers/scsi/snic/snic_main.c index 396b32dca074..7cf70aaec0ba 100644 --- a/drivers/scsi/snic/snic_main.c +++ b/drivers/scsi/snic/snic_main.c | |||
@@ -591,6 +591,7 @@ snic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
591 | if (!pool) { | 591 | if (!pool) { |
592 | SNIC_HOST_ERR(shost, "dflt sgl pool creation failed\n"); | 592 | SNIC_HOST_ERR(shost, "dflt sgl pool creation failed\n"); |
593 | 593 | ||
594 | ret = -ENOMEM; | ||
594 | goto err_free_res; | 595 | goto err_free_res; |
595 | } | 596 | } |
596 | 597 | ||
@@ -601,6 +602,7 @@ snic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
601 | if (!pool) { | 602 | if (!pool) { |
602 | SNIC_HOST_ERR(shost, "max sgl pool creation failed\n"); | 603 | SNIC_HOST_ERR(shost, "max sgl pool creation failed\n"); |
603 | 604 | ||
605 | ret = -ENOMEM; | ||
604 | goto err_free_dflt_sgl_pool; | 606 | goto err_free_dflt_sgl_pool; |
605 | } | 607 | } |
606 | 608 | ||
@@ -611,6 +613,7 @@ snic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
611 | if (!pool) { | 613 | if (!pool) { |
612 | SNIC_HOST_ERR(shost, "snic tmreq info pool creation failed.\n"); | 614 | SNIC_HOST_ERR(shost, "snic tmreq info pool creation failed.\n"); |
613 | 615 | ||
616 | ret = -ENOMEM; | ||
614 | goto err_free_max_sgl_pool; | 617 | goto err_free_max_sgl_pool; |
615 | } | 618 | } |
616 | 619 | ||