From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 753ECC432C0 for ; Wed, 27 Nov 2019 21:32:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4358B20665 for ; Wed, 27 Nov 2019 21:32:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574890336; bh=uDcN+zJQIqDGXr9Kza332+ObxD3mF/nXCieJBCiZ5Ww=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DzTaPvt7RaIpGj0DHLpANZdfCL8tf/ypj6nf9sXR8CPpbadd4TeZDUHWQMmBR8ahn dm69TrXMyL0EduYYiUwSTC0IVG0kUlQ+pEZE4NURhdjtZlFVPY39u5wJmhtdfGMpiu ZIDFgtwhDAcHi1Rrjc47lALq/T/N+ODk6OF0u70k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730365AbfK0Uxg (ORCPT ); Wed, 27 Nov 2019 15:53:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:42618 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730751AbfK0Uxg (ORCPT ); Wed, 27 Nov 2019 15:53:36 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 930FD2192D; Wed, 27 Nov 2019 20:53:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574888016; bh=uDcN+zJQIqDGXr9Kza332+ObxD3mF/nXCieJBCiZ5Ww=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DI2hpBb8TR7OATh97w2qtmxAjL3lLos2B1Z37MNvMsMbqz36ynkq8ePpoxNdN+rG7 jmzwA3rrTs8hyod0wJ15WuI22DKpPwrxUtffB6eTL9+G0TtcgmBrq4UT0xjamYUhXT xBMFfR4iRj8YvWZqyGbBxYn8GyykmxIWHdLOZEgg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Suganath Prabu , Bjorn Helgaas , Andy Shevchenko , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 4.14 142/211] scsi: mpt3sas: Fix driver modifying persistent data in Manufacturing page11 Date: Wed, 27 Nov 2019 21:31:15 +0100 Message-Id: <20191127203107.417664772@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127203049.431810767@linuxfoundation.org> References: <20191127203049.431810767@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Suganath Prabu [ 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 Reviewed-by: Bjorn Helgaas Reviewed-by: Andy Shevchenko Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/mpt3sas/mpt3sas_config.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_config.c b/drivers/scsi/mpt3sas/mpt3sas_config.c index dd62701256142..58acbff40abc8 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_config.c +++ b/drivers/scsi/mpt3sas/mpt3sas_config.c @@ -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; } -- 2.20.1