From patchwork Fri Dec 7 07:28: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: 10717567 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 F33F41750 for ; Fri, 7 Dec 2018 07:29:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE4392E946 for ; Fri, 7 Dec 2018 07:29:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D27C82EA4B; Fri, 7 Dec 2018 07:29:06 +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 6EEE32E387 for ; Fri, 7 Dec 2018 07:29:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726062AbeLGH3G (ORCPT ); Fri, 7 Dec 2018 02:29:06 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:50868 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725998AbeLGH3G (ORCPT ); Fri, 7 Dec 2018 02:29:06 -0500 Received: by mail-wm1-f68.google.com with SMTP id n190so3357242wmd.0 for ; Thu, 06 Dec 2018 23:29:04 -0800 (PST) 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=ypRGzoIWXF8tEG14l3fT1mCIYyxdn10qesUV+trV0eo=; b=UhzIbfzpFPNMAwp34vXlVUHCIps+xH3Dim4aUyZMDKxmhm3tExibxZQX9bUe8I3L/+ VsnPPL3NTHV+Jlx1n0U+3zT72F+JwGjZFtiH0mBYqMG46vDOUuFP/vdiSs4ZlrRpHaxY JlJJgyhVQ88Ij9EU5RdgnFOLmS1azFH3F/yhI= 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=ypRGzoIWXF8tEG14l3fT1mCIYyxdn10qesUV+trV0eo=; b=luEKmCbauh6swJvBfOyDjvTGU8QWKcXer/MUbhrao+JhZfpSQiKsu2P+G98FKBg0Oe UIx6Lf3U6YlWLqRLtabtejMlDb4ydeJM09pyK+/vZ4sbFUtHygN00se08sWl0jPbnp81 Bi7XHaoPIdkQlmJyxyw4aNk29+/Uy2knGSQeruNwF9ylNcQngqaHXy2qKOCGzo3tzzDN y1/Lq8UTXW4QJfCKikOwXT/NXzF60iUXpC7yx84tpdtGl+MpfGcYcW4+xdpd9aSTLUjU xgjtsTysPzYow/77Yrd635LMbi7dsTy4TkogFkIBJSwL0PnOrC8hgerfvpcaArOOXXPG lolA== X-Gm-Message-State: AA+aEWZLslfO3XNuK0Js7KgUmElrHiQyLTnp0xuPLGdpaAYegYftxr9/ aWTYlvRyfpEGGlEerEtZ/SxlVw== X-Google-Smtp-Source: AFSGD/WnKchjgcHW9h8tPHVV79waFEssj3w3dCp3nqUvTzZ2bUaCwv2LKc5QgUQ0y3kJ4hvqR1Q7kA== X-Received: by 2002:a1c:c645:: with SMTP id w66mr1317653wmf.18.1544167743513; Thu, 06 Dec 2018 23:29:03 -0800 (PST) Received: from dhcp-10-123-74-106.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id b16sm1589317wrm.41.2018.12.06.23.29.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Dec 2018 23:29:03 -0800 (PST) From: Suganath Prabu To: martin.petersen@oracle.com, linux-scsi@vger.kernel.org Cc: sathya.prakash@broadcom.com, suganath-prabu.subramani@broadcom.com Subject: [PATCH 1/4] mpt3sas: Introduce flag for aero based controllers. Date: Fri, 7 Dec 2018 12:58:32 +0530 Message-Id: <1544167715-5595-2-git-send-email-suganath-prabu.subramani@broadcom.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1544167715-5595-1-git-send-email-suganath-prabu.subramani@broadcom.com> References: <1544167715-5595-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 Adding flag "is_aero_ioc" to differentiate aero based controllers from other gen35 controllers. Signed-off-by: Suganath Prabu --- drivers/scsi/mpt3sas/mpt3sas_base.h | 1 + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h b/drivers/scsi/mpt3sas/mpt3sas_base.h index 4b8b602..f200929 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.h +++ b/drivers/scsi/mpt3sas/mpt3sas_base.h @@ -1399,6 +1399,7 @@ struct MPT3SAS_ADAPTER { void *device_remove_in_progress; u16 device_remove_in_progress_sz; u8 is_gen35_ioc; + u8 is_aero_ioc; PUT_SMID_IO_FP_HIP put_smid_scsi_io; }; diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c index 5b9806d..039dee4 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -10366,10 +10366,6 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id) ioc->id = mpt3_ids++; sprintf(ioc->driver_name, "%s", MPT3SAS_DRIVER_NAME); switch (pdev->device) { - case MPI26_MFGPAGE_DEVID_CFG_SEC_3816: - case MPI26_MFGPAGE_DEVID_CFG_SEC_3916: - dev_info(&pdev->dev, - "HBA is in Configurable Secure mode\n"); case MPI26_MFGPAGE_DEVID_SAS3508: case MPI26_MFGPAGE_DEVID_SAS3508_1: case MPI26_MFGPAGE_DEVID_SAS3408: @@ -10377,12 +10373,18 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id) case MPI26_MFGPAGE_DEVID_SAS3516_1: case MPI26_MFGPAGE_DEVID_SAS3416: case MPI26_MFGPAGE_DEVID_SAS3616: + ioc->is_gen35_ioc = 1; + break; + case MPI26_MFGPAGE_DEVID_CFG_SEC_3816: + case MPI26_MFGPAGE_DEVID_CFG_SEC_3916: + dev_info(&pdev->dev, + "HBA is in Configurable Secure mode\n"); case MPI26_MFGPAGE_DEVID_HARD_SEC_3816: case MPI26_MFGPAGE_DEVID_HARD_SEC_3916: - ioc->is_gen35_ioc = 1; + ioc->is_aero_ioc = ioc->is_gen35_ioc = 1; break; default: - ioc->is_gen35_ioc = 0; + ioc->is_gen35_ioc = ioc->is_aero_ioc = 0; } if ((ioc->hba_mpi_version_belonged == MPI25_VERSION && pdev->revision >= SAS3_PCI_DEVICE_C0_REVISION) ||