From patchwork Mon Sep 24 06:35:15 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: 10611933 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 11FA713A4 for ; Mon, 24 Sep 2018 06:35:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1D05E29B5E for ; Mon, 24 Sep 2018 06:35:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1101D29D36; Mon, 24 Sep 2018 06:35:42 +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 7928529B5E for ; Mon, 24 Sep 2018 06:35:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727430AbeIXMgN (ORCPT ); Mon, 24 Sep 2018 08:36:13 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:41505 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727229AbeIXMgN (ORCPT ); Mon, 24 Sep 2018 08:36:13 -0400 Received: by mail-pl1-f193.google.com with SMTP id b12-v6so8671630plr.8 for ; Sun, 23 Sep 2018 23:35:40 -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=Qub/dioptc5DoD0Ch7SpF0hZ6JxCzX83iDHbCuuetQg=; b=YyuKnl+Tm9VCYZBbS6bzZUUAljRccyHppdSTPNYauDz+Se3mi2RqvpcJxoZH3KgEHY gKx6pdk26lKwC+o9XjQLDtqAvbnxB1jYFPBWnTFYjpdkaC5Bh9jA0/ehaxOjvpP65T7o kf4pEpZumMT64rdzMkOofUZQuBFbH5fQS/yMA= 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=Qub/dioptc5DoD0Ch7SpF0hZ6JxCzX83iDHbCuuetQg=; b=A8gLwE9O+Ovd5xaCRzXnSJca8+lHRRoTdVqoMJoWgQfmIBsxUfeEN+5w9oHzpxJ91t kbxT7ueuJZwRmbwxvfAcxMvkGhq5YT2zw2b34sPEMpp3FczI7V/g5mgVWWxwalFRj/uT QehcRAhC0aZbaEuZtIKMXrBv5REShbd0gfxOy/aKSe/OVW1UeQbfZz1eebB7oJgmHFaP n5Y32fU7ZsAmL0js8S1j6YVLKpPHIcNxxiXTraSheReE7qG7lmVC6OAwx+HybCPKb2h1 T6s0DJvh93ppIEpmaVBGR/xbTH2k/7aLys/gKa1C40FTrmyLxLSe8CRP1GzMuGhDSygo 1umA== X-Gm-Message-State: ABuFfoiwTB/Lvz0LoO9NsTWZhWogDzZrRsfRUvnGI2bRRe3l8F95ewTV VQzHPyeoD78kuRPSdclFa2EOp9f4Bmc= X-Google-Smtp-Source: ACcGV62rNI9qiRSfKrbg/F4RRp2F0T8DgxexwwWxwXaKUs5TdosQvMz1LV5TwB2naEHQipaTuqB+zQ== X-Received: by 2002:a17:902:3fa5:: with SMTP id a34-v6mr9240261pld.244.1537770939780; Sun, 23 Sep 2018 23:35:39 -0700 (PDT) Received: from dhcp-10-123-74-106.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id 203-v6sm12287064pge.25.2018.09.23.23.35.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Sep 2018 23:35:38 -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 v3 5/6] mpt3sas: Fix driver modifying NVRAM/persistent data. Date: Mon, 24 Sep 2018 12:05:15 +0530 Message-Id: <1537770916-16337-6-git-send-email-suganath-prabu.subramani@broadcom.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1537770916-16337-1-git-send-email-suganath-prabu.subramani@broadcom.com> References: <1537770916-16337-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 55e6fd0..87a67fe 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c @@ -4122,7 +4122,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; }