diff options
| author | James Smart <james.smart@emulex.com> | 2013-09-06 12:21:50 -0400 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-09-10 17:30:09 -0700 |
| commit | 092cb034b55310c694c30b36208236d70ed3eae1 (patch) | |
| tree | f839ee0d2816c3b216c3c73746439b907f1fbfac | |
| parent | acbd86160acdd68946e24a71e608d832c9c9bc1c (diff) | |
| download | talos-op-linux-092cb034b55310c694c30b36208236d70ed3eae1.tar.gz talos-op-linux-092cb034b55310c694c30b36208236d70ed3eae1.zip | |
[SCSI] lpfc 8.3.42: Fixed failure to allocate SCSI buffer on PPC64 platform for SLI4 devices
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_scsi.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c index 46c4f1ba2475..9480c55963ea 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.c +++ b/drivers/scsi/lpfc/lpfc_scsi.c @@ -1000,9 +1000,12 @@ lpfc_new_scsi_buf_s4(struct lpfc_vport *vport, int num_to_alloc) } memset(psb->data, 0, phba->cfg_sg_dma_buf_size); - /* Page alignment is CRITICAL, double check to be sure */ - if (((unsigned long)(psb->data) & - (unsigned long)(SLI4_PAGE_SIZE - 1)) != 0) { + /* + * 4K Page alignment is CRITICAL to BlockGuard, double check + * to be sure. + */ + if (phba->cfg_enable_bg && (((unsigned long)(psb->data) & + (unsigned long)(SLI4_PAGE_SIZE - 1)) != 0)) { pci_pool_free(phba->lpfc_scsi_dma_buf_pool, psb->data, psb->dma_handle); kfree(psb); |
