diff options
| author | James Smart | 2013-04-18 02:16:15 +0200 |
|---|---|---|
| committer | James Bottomley | 2013-05-02 21:46:20 +0200 |
| commit | 96f7077f671254e957a2815e54bb20e8d50f0bbc (patch) | |
| tree | 491594535761bfcddeea83fbc56976211d8cb961 /drivers/scsi/lpfc/lpfc_mem.c | |
| parent | [SCSI] lpfc 8.3.39: Fix driver issues with large lpfc_sg_seg_cnt values (diff) | |
| download | kernel-qcow2-linux-96f7077f671254e957a2815e54bb20e8d50f0bbc.tar.gz kernel-qcow2-linux-96f7077f671254e957a2815e54bb20e8d50f0bbc.tar.xz kernel-qcow2-linux-96f7077f671254e957a2815e54bb20e8d50f0bbc.zip | |
[SCSI] lpfc 8.3.39: Fix driver issues with large s/g lists for BlockGuard
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_mem.c')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_mem.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/scsi/lpfc/lpfc_mem.c b/drivers/scsi/lpfc/lpfc_mem.c index cd86069a0ba8..812d0cd7c86d 100644 --- a/drivers/scsi/lpfc/lpfc_mem.c +++ b/drivers/scsi/lpfc/lpfc_mem.c @@ -64,18 +64,26 @@ lpfc_mem_alloc(struct lpfc_hba *phba, int align) struct lpfc_dma_pool *pool = &phba->lpfc_mbuf_safety_pool; int i; - if (phba->sli_rev == LPFC_SLI_REV4) + if (phba->sli_rev == LPFC_SLI_REV4) { + /* Calculate alignment */ + if (phba->cfg_sg_dma_buf_size < SLI4_PAGE_SIZE) + i = phba->cfg_sg_dma_buf_size; + else + i = SLI4_PAGE_SIZE; + phba->lpfc_scsi_dma_buf_pool = pci_pool_create("lpfc_scsi_dma_buf_pool", phba->pcidev, phba->cfg_sg_dma_buf_size, - phba->cfg_sg_dma_buf_size, + i, 0); - else + } else { phba->lpfc_scsi_dma_buf_pool = pci_pool_create("lpfc_scsi_dma_buf_pool", phba->pcidev, phba->cfg_sg_dma_buf_size, align, 0); + } + if (!phba->lpfc_scsi_dma_buf_pool) goto fail; |