| Message ID | 20181112085837.24450-1-mwilck@suse.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | dfb7513374c1f8e7cd595106fbdba3fd07ebaf30 |
| Headers | show |
| Series | scsi: lpfc: fix block guard enablement on SLI3 adapters | expand |
On 11/12/18 9:58 AM, Martin Wilck wrote: > Since f44ac12f1dcc, BG enablement is tracked with the > LPFC_SLI3_BG_ENABLED bit, which is set in lpfc_get_cfgparam > before lpfc_sli_config_sli_port() is called. The bit > shouldn't be cleared before checking the feature. > Based on problem analysis by David Bond. > > Fixes: f44ac12f1dcc "scsi: lpfc: Memory allocation error during driver start-up on power8" > Tested-by: David Bond <dbond@suse.com> > Signed-off-by: Martin Wilck <mwilck@suse.com> > Cc: stable@vger.kernel.org # 4.17.x > Cc: stable@vger.kernel.org # 4.18.x > Cc: stable@vger.kernel.org # 4.19.x > --- > drivers/scsi/lpfc/lpfc_init.c | 6 +++++- > drivers/scsi/lpfc/lpfc_sli.c | 1 - > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c > index 323a32e..6b61cae 100644 > --- a/drivers/scsi/lpfc/lpfc_init.c > +++ b/drivers/scsi/lpfc/lpfc_init.c > @@ -167,7 +167,11 @@ lpfc_config_port_prep(struct lpfc_hba *phba) > sizeof(phba->wwpn)); > } > > - phba->sli3_options = 0x0; > + /* > + * Clear all option bits except LPFC_SLI3_BG_ENABLED, > + * which was already set in lpfc_get_cfgparam() > + */ > + phba->sli3_options &= (uint32_t)LPFC_SLI3_BG_ENABLED; > > /* Setup and issue mailbox READ REV command */ > lpfc_read_rev(phba, pmb); > diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c > index 783a154..b9e5cd7 100644 > --- a/drivers/scsi/lpfc/lpfc_sli.c > +++ b/drivers/scsi/lpfc/lpfc_sli.c > @@ -4965,7 +4965,6 @@ lpfc_sli_config_port(struct lpfc_hba *phba, int sli_mode) > phba->sli3_options &= ~(LPFC_SLI3_NPIV_ENABLED | > LPFC_SLI3_HBQ_ENABLED | > LPFC_SLI3_CRP_ENABLED | > - LPFC_SLI3_BG_ENABLED | > LPFC_SLI3_DSS_ENABLED); > if (rc != MBX_SUCCESS) { > lpfc_printf_log(phba, KERN_ERR, LOG_INIT, > Reviewed-by: Hannes Reinecke <hare@suse.com> Cheers, Hannes
> Since f44ac12f1dcc, BG enablement is tracked with the > LPFC_SLI3_BG_ENABLED bit, which is set in lpfc_get_cfgparam before > lpfc_sli_config_sli_port() is called. The bit shouldn't be cleared > before checking the feature. James, please review. Thanks!
On 11/12/2018 12:58 AM, Martin Wilck wrote: > Since f44ac12f1dcc, BG enablement is tracked with the > LPFC_SLI3_BG_ENABLED bit, which is set in lpfc_get_cfgparam > before lpfc_sli_config_sli_port() is called. The bit > shouldn't be cleared before checking the feature. > Based on problem analysis by David Bond. > > Fixes: f44ac12f1dcc "scsi: lpfc: Memory allocation error during driver start-up on power8" > Tested-by: David Bond <dbond@suse.com> > Signed-off-by: Martin Wilck <mwilck@suse.com> > Cc: stable@vger.kernel.org # 4.17.x > Cc: stable@vger.kernel.org # 4.18.x > Cc: stable@vger.kernel.org # 4.19.x > --- > drivers/scsi/lpfc/lpfc_init.c | 6 +++++- > drivers/scsi/lpfc/lpfc_sli.c | 1 - > 2 files changed, 5 insertions(+), 2 deletions(-) > > thanks Signed-off-by: James Smart <jsmart2021@gmail.com> -- james
Martin, > Since f44ac12f1dcc, BG enablement is tracked with the > LPFC_SLI3_BG_ENABLED bit, which is set in lpfc_get_cfgparam before > lpfc_sli_config_sli_port() is called. The bit shouldn't be cleared > before checking the feature. Based on problem analysis by David Bond. Applied to 4.20/scsi-fixes, thanks!
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index 323a32e..6b61cae 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -167,7 +167,11 @@ lpfc_config_port_prep(struct lpfc_hba *phba) sizeof(phba->wwpn)); } - phba->sli3_options = 0x0; + /* + * Clear all option bits except LPFC_SLI3_BG_ENABLED, + * which was already set in lpfc_get_cfgparam() + */ + phba->sli3_options &= (uint32_t)LPFC_SLI3_BG_ENABLED; /* Setup and issue mailbox READ REV command */ lpfc_read_rev(phba, pmb); diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index 783a154..b9e5cd7 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c @@ -4965,7 +4965,6 @@ lpfc_sli_config_port(struct lpfc_hba *phba, int sli_mode) phba->sli3_options &= ~(LPFC_SLI3_NPIV_ENABLED | LPFC_SLI3_HBQ_ENABLED | LPFC_SLI3_CRP_ENABLED | - LPFC_SLI3_BG_ENABLED | LPFC_SLI3_DSS_ENABLED); if (rc != MBX_SUCCESS) { lpfc_printf_log(phba, KERN_ERR, LOG_INIT,