| Message ID | 20190522004911.573-20-jsmart2021@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | aa6ff309187256ee542a8cf47adbfcfdaa888c46 |
| Headers | show |
| Series | lpfc: Update lpfc to revision 12.2.0.3 | expand |
On Tue, 2019-05-21 at 17:49 -0700, James Smart wrote: > Crashes in scsi_queue_rq or in dma_unmap_direct_sg during BFS when > lpfc has lpfc_enable_bg=1. > > lpfc is setting the t10-dif and prot sg after scsi_add_host_with_dma() > has been called. The scsi_host_set_prot() and scsi_host_set_guard() > routines need to be called before scsi_add_host_with_dma(). > > Revise the calling sequence to set the protection/guard data before > calling scsi_add_host_with_dma(). > > Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com> > Signed-off-by: James Smart <jsmart2021@gmail.com> > --- > drivers/scsi/lpfc/lpfc_init.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c > index 416f0fb155f5..a2b827dd36ff 100644 > --- a/drivers/scsi/lpfc/lpfc_init.c > +++ b/drivers/scsi/lpfc/lpfc_init.c > @@ -94,6 +94,7 @@ static void lpfc_sli4_disable_intr(struct lpfc_hba *); > static uint32_t lpfc_sli4_enable_intr(struct lpfc_hba *, uint32_t); > static void lpfc_sli4_oas_verify(struct lpfc_hba *phba); > static uint16_t lpfc_find_cpu_handle(struct lpfc_hba *, uint16_t, int); > +static void lpfc_setup_bg(struct lpfc_hba *, struct Scsi_Host *); > > static struct scsi_transport_template *lpfc_transport_template = NULL; > static struct scsi_transport_template *lpfc_vport_transport_template = NULL; > @@ -4348,6 +4349,9 @@ lpfc_create_port(struct lpfc_hba *phba, int instance, struct device *dev) > > timer_setup(&vport->delayed_disc_tmo, lpfc_delayed_disc_tmo, 0); > > + if (phba->sli3_options & LPFC_SLI3_BG_ENABLED) > + lpfc_setup_bg(phba, shost); > + > error = scsi_add_host_with_dma(shost, dev, &phba->pcidev->dev); > if (error) > goto out_put_shost; > @@ -7669,8 +7673,6 @@ lpfc_post_init_setup(struct lpfc_hba *phba) > */ > shost = pci_get_drvdata(phba->pcidev); > shost->can_queue = phba->cfg_hba_queue_depth - 10; > - if (phba->sli3_options & LPFC_SLI3_BG_ENABLED) > - lpfc_setup_bg(phba, shost); > > lpfc_host_attrib_init(shost); > Reviewed-by: Ewan D. Milne <emilne@redhat.com>
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index 416f0fb155f5..a2b827dd36ff 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -94,6 +94,7 @@ static void lpfc_sli4_disable_intr(struct lpfc_hba *); static uint32_t lpfc_sli4_enable_intr(struct lpfc_hba *, uint32_t); static void lpfc_sli4_oas_verify(struct lpfc_hba *phba); static uint16_t lpfc_find_cpu_handle(struct lpfc_hba *, uint16_t, int); +static void lpfc_setup_bg(struct lpfc_hba *, struct Scsi_Host *); static struct scsi_transport_template *lpfc_transport_template = NULL; static struct scsi_transport_template *lpfc_vport_transport_template = NULL; @@ -4348,6 +4349,9 @@ lpfc_create_port(struct lpfc_hba *phba, int instance, struct device *dev) timer_setup(&vport->delayed_disc_tmo, lpfc_delayed_disc_tmo, 0); + if (phba->sli3_options & LPFC_SLI3_BG_ENABLED) + lpfc_setup_bg(phba, shost); + error = scsi_add_host_with_dma(shost, dev, &phba->pcidev->dev); if (error) goto out_put_shost; @@ -7669,8 +7673,6 @@ lpfc_post_init_setup(struct lpfc_hba *phba) */ shost = pci_get_drvdata(phba->pcidev); shost->can_queue = phba->cfg_hba_queue_depth - 10; - if (phba->sli3_options & LPFC_SLI3_BG_ENABLED) - lpfc_setup_bg(phba, shost); lpfc_host_attrib_init(shost);