From patchwork Thu Aug 30 03:26:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suganath Prabu S X-Patchwork-Id: 10581183 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A75B413AC for ; Thu, 30 Aug 2018 03:27:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 981C92BCE4 for ; Thu, 30 Aug 2018 03:27:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8C4FF2BCE6; Thu, 30 Aug 2018 03:27:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3AA8B2BCE4 for ; Thu, 30 Aug 2018 03:27:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727511AbeH3H1S (ORCPT ); Thu, 30 Aug 2018 03:27:18 -0400 Received: from mail-qk0-f194.google.com ([209.85.220.194]:43344 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727281AbeH3H1S (ORCPT ); Thu, 30 Aug 2018 03:27:18 -0400 Received: by mail-qk0-f194.google.com with SMTP id 130-v6so4847796qkd.10 for ; Wed, 29 Aug 2018 20:27:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sEa83ndTTHtBa0QfRevnaxbYJ7M15l5LiRBDfnXqEmI=; b=Bvms/fTOUUCS6hQddF4hWI77EmmmjsF6XZ67habRUdSJmF0f7lhbZgfw2+C/yZtgBw btDydcz2wm/GbVnDRK0kfjkUzEsKrcYDF8fsZOUixjaVFX9XvT1mD80KOrdxo/I0uSIZ /WyPOR9WZr61MNSqOxEvQ065SdTITfC5GT23k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sEa83ndTTHtBa0QfRevnaxbYJ7M15l5LiRBDfnXqEmI=; b=WJlqgAQXx/s02WyUBBOdgbWEVgp+bzeDU2OtppiNWYx3rCFC6IS3klpAJHzdK9+e4r cJ9NaGyuWWfg2FmY+VQ1UwG1+Izn3hNzNiPZbpD+AtIgAUwiCor8+W7k/B/2e9w7gqiW IW/oKZX2R1k5YTOiiRhE5VbkyQRGyx4ul5De14buKnckuNZ10wFHEYmHIoi2q0VzKSZa WBA7WaDwypR99KwSiSBeEcCATZ7YHuf2oJ6olAWFq7/ghn63M1zWIb86mYIVZQgj8/S6 xnsZGotCk4Vg93vJO+DwxEdjRnEFYx2qgyBFDavdqMLX4jCGAe+M3gWrTqLcbKpiXpdR yQAA== X-Gm-Message-State: APzg51COFvsMC1IBmspwR8fqLIdknsgFdPw0j8EnbweJYuMm/1jYWout u0wtN4bkh0b7Dhk4NmB1wxj+/aQaGd8= X-Google-Smtp-Source: ANB0VdYcnB/SyqhK652S5+yun4JNDCiSV8QTryGOL43kg8j/oigRrSVw01plgVrWWPTbB3Vt+NaHDg== X-Received: by 2002:a37:66d3:: with SMTP id a202-v6mr9017996qkc.20.1535599636207; Wed, 29 Aug 2018 20:27:16 -0700 (PDT) Received: from localhost.localdomain.localdomain ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id f184-v6sm3215427qkc.23.2018.08.29.20.27.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Aug 2018 20:27:15 -0700 (PDT) From: Suganath Prabu S To: linux-scsi@vger.kernel.org Cc: Sathya.Prakash@broadcom.com, sreekanth.reddy@broadcom.com, Suganath Prabu S Subject: [PATCH 6/7] mpt3sas: Fix driver modifying NVRAM/persistent data. Date: Wed, 29 Aug 2018 23:26:32 -0400 Message-Id: <1535599593-4739-7-git-send-email-suganath-prabu.subramani@broadcom.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1535599593-4739-1-git-send-email-suganath-prabu.subramani@broadcom.com> References: <1535599593-4739-1-git-send-email-suganath-prabu.subramani@broadcom.com> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP * 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 S --- drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +- drivers/scsi/mpt3sas/mpt3sas_config.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c index bebc2b0..732d749 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c @@ -4235,7 +4235,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 5713a2d..f2a326a 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_config.c +++ b/drivers/scsi/mpt3sas/mpt3sas_config.c @@ -676,10 +676,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; }