scsi: mpt3sas: Fix driver modifying persistent data in Manufacturing page11
authorSuganath Prabu <suganath-prabu.subramani@broadcom.com>
Wed, 31 Oct 2018 13:23:38 +0000 (18:53 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 28 Nov 2019 17:28:58 +0000 (18:28 +0100)
[ Upstream commit 97f35194093362a63b33caba2485521ddabe2c95 ]

Currently driver is modifying both current & NVRAM/persistent data in
Manufacturing page11. Driver should change only current copy of
Manufacturing page11. It should not modify the persistent data.

So removed the section of code where driver is modifying the persistent
data of Manufacturing page11.

Signed-off-by: Suganath Prabu <suganath-prabu.subramani@broadcom.com>
Reviewed-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/scsi/mpt3sas/mpt3sas_config.c

index cebfd734fd769c78a36fb66c1805f5fb89e37ac2..a9fef0cd382bd734acd10508423a5e3d17aa54eb 100644 (file)
@@ -674,10 +674,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;
 }