diff options
| author | Ewan D. Milne | 2018-12-13 21:25:16 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-01-13 09:51:03 +0100 |
| commit | d257d4299ae7bc4b5ee16f9aea004ada8293164e (patch) | |
| tree | d4091d16054261407b986389cd8e08d9bb3809c6 | |
| parent | scsi: zfcp: fix posting too many status read buffers leading to adapter shutdown (diff) | |
| download | kernel-qcow2-linux-d257d4299ae7bc4b5ee16f9aea004ada8293164e.tar.gz kernel-qcow2-linux-d257d4299ae7bc4b5ee16f9aea004ada8293164e.tar.xz kernel-qcow2-linux-d257d4299ae7bc4b5ee16f9aea004ada8293164e.zip | |
scsi: lpfc: do not set queue->page_count to 0 if pc_sli4_params.wqpcnt is invalid
commit 4e87eb2f46ea547d12a276b2e696ab934d16cfb6 upstream.
Certain older adapters such as the OneConnect OCe10100 may not have a valid
wqpcnt value. In this case, do not set queue->page_count to 0 in
lpfc_sli4_queue_alloc() as this will prevent the driver from initializing.
Fixes: 895427bd01 ("scsi: lpfc: NVME Initiator: Base modifications")
Cc: stable@vger.kernel.org # 4.11+
Signed-off-by: Ewan D. Milne <emilne@redhat.com>
Reviewed-by: Laurence Oberman <loberman@redhat.com>
Tested-by: Laurence Oberman <loberman@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_sli.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index be2bac9355cd..a490e63c94b6 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c @@ -14221,7 +14221,8 @@ lpfc_sli4_queue_alloc(struct lpfc_hba *phba, uint32_t page_size, hw_page_size))/hw_page_size; /* If needed, Adjust page count to match the max the adapter supports */ - if (queue->page_count > phba->sli4_hba.pc_sli4_params.wqpcnt) + if (phba->sli4_hba.pc_sli4_params.wqpcnt && + (queue->page_count > phba->sli4_hba.pc_sli4_params.wqpcnt)) queue->page_count = phba->sli4_hba.pc_sli4_params.wqpcnt; INIT_LIST_HEAD(&queue->list); |