| Message ID | 1539755947-27014-4-git-send-email-suganath-prabu.subramani@broadcom.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | mpt3sas: Hot-Plug Surprise removal support on IOC. | expand |
On Wed, Oct 17, 2018 at 8:59 AM Suganath Prabu <suganath-prabu.subramani@broadcom.com> wrote: > > * If EEDPTagMode field in manufacturing page11 is set, > unset it. This is needed to fix a hardware bug > in SAS3/SAS2 cards, So, skipping EEDPTagMode changes > in Manufacturing page11 for SAS35 controllers. > > * Fix driver modifying NVRAM/persistent data in > Manufacturing page11 along with current copy. Driver should > change only current copy of Manufacturing page11. > - if (ioc->manu_pg11.EEDPTagMode == 0) { > + if ((!ioc->is_gen35_ioc) && (ioc->manu_pg11.EEDPTagMode == 0)) { No need to have parens.
On Wed, Oct 17, 2018 at 1:54 PM Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > > On Wed, Oct 17, 2018 at 8:59 AM Suganath Prabu > <suganath-prabu.subramani@broadcom.com> wrote: > > > > * If EEDPTagMode field in manufacturing page11 is set, > > unset it. This is needed to fix a hardware bug > > in SAS3/SAS2 cards, So, skipping EEDPTagMode changes > > in Manufacturing page11 for SAS35 controllers. > > > > * Fix driver modifying NVRAM/persistent data in > > Manufacturing page11 along with current copy. Driver should > > change only current copy of Manufacturing page11. > > > - if (ioc->manu_pg11.EEDPTagMode == 0) { > > + if ((!ioc->is_gen35_ioc) && (ioc->manu_pg11.EEDPTagMode == 0)) { > > No need to have parens. > Yes, We ll remove parentheses in v6 patch set. Thanks, > > -- > With Best Regards, > Andy Shevchenko
diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c index a6c217c..770f52b 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c @@ -4062,7 +4062,7 @@ _base_static_config_pages(struct MPT3SAS_ADAPTER *ioc) * flag unset in NVDATA. */ mpt3sas_config_get_manufacturing_pg11(ioc, &mpi_reply, &ioc->manu_pg11); - if (ioc->manu_pg11.EEDPTagMode == 0) { + if ((!ioc->is_gen35_ioc) && (ioc->manu_pg11.EEDPTagMode == 0)) { pr_err("%s: overriding NVDATA EEDPTagMode setting\n", ioc->name); ioc->manu_pg11.EEDPTagMode &= ~0x3; diff --git a/drivers/scsi/mpt3sas/mpt3sas_config.c b/drivers/scsi/mpt3sas/mpt3sas_config.c index 14a195c..aa41cb9 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_config.c +++ b/drivers/scsi/mpt3sas/mpt3sas_config.c @@ -660,10 +660,6 @@ mpt3sas_config_set_manufacturing_pg11(struct MPT3SAS_ADAPTER *ioc, r = _config_request(ioc, &mpi_request, mpi_reply, MPT3_CONFIG_PAGE_DEFAULT_TIMEOUT, config_page, sizeof(*config_page)); - mpi_request.Action = MPI2_CONFIG_ACTION_PAGE_WRITE_NVRAM; - r = _config_request(ioc, &mpi_request, mpi_reply, - MPT3_CONFIG_PAGE_DEFAULT_TIMEOUT, config_page, - sizeof(*config_page)); out: return r; }
* If EEDPTagMode field in manufacturing page11 is set, unset it. This is needed to fix a hardware bug in SAS3/SAS2 cards, So, skipping EEDPTagMode changes in Manufacturing page11 for SAS35 controllers. * Fix driver modifying NVRAM/persistent data in Manufacturing page11 along with current copy. Driver should change only current copy of Manufacturing page11. Signed-off-by: Suganath Prabu <suganath-prabu.subramani@broadcom.com> --- drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +- drivers/scsi/mpt3sas/mpt3sas_config.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-)