From patchwork Thu Oct 25 14:03:41 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: 10655849 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 3364F14DE for ; Thu, 25 Oct 2018 14:04:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 235FB2BA34 for ; Thu, 25 Oct 2018 14:04:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 178142BA54; Thu, 25 Oct 2018 14:04:20 +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 A13482BA2A for ; Thu, 25 Oct 2018 14:04:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727508AbeJYWhA (ORCPT ); Thu, 25 Oct 2018 18:37:00 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:39976 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727497AbeJYWhA (ORCPT ); Thu, 25 Oct 2018 18:37:00 -0400 Received: by mail-wr1-f68.google.com with SMTP id d2-v6so9461267wro.7 for ; Thu, 25 Oct 2018 07:04:06 -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=HACt8ml0njX/72qFHpEvwHCi5Al01vqXe2z4OYhbfEY=; b=Pnq5AiZNiyDdDi04bZrnLee1GYVMnX28xehpcuoKyg81NdDNK8g2P55+wb7bOZdxNZ jExUb2dVjuSERPRvOJmdH51CimCip2ZPtJbYKmxIhtydMlKGu4grm7fmyfsyS3Tp6n3D DhbabAVLZTNtBQTs/U/Xk7PJoAaxmv3V0V/mU= 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=HACt8ml0njX/72qFHpEvwHCi5Al01vqXe2z4OYhbfEY=; b=CS3k9/c05qME4D10V8SyezKpP/ecg1rWo+Wb23ALQzHdEI4mt3VtaAOq+8YvoCFaEw ZYlbzdgu4oEE2iumPK35E3oPUaCCuv8rQPOa6UneJXaDjTmcBi+HTZv+80zR1jEZ7GtQ JadZ5+RzAALeTMWAYtrnISfzWA0rJmYZKkiipCQBCxAGeDmJo3sSRyjuS8OcP7M/liUN jLEVkOcAb09RwHwqIIIBSO/8B+3fmN/z1bloJrTqqfY+7EzQ330cVWTZaAA1wI5LiBdf F884Ousp2208k4j5durUIUBDBu1rJCGsmWhUKKR8GFQiiedS/fheONQQK6Spe/yszaNl CKxQ== X-Gm-Message-State: AGRZ1gIF6DlB1nr+70lOa5OqKbKPAf8fKzWfVH4mIIRxFGOONqBOfoQB svhf4UJsjwdWik0jOas+3MyhVskp+3o= X-Google-Smtp-Source: AJdET5feXAZ6zBsOBfO70KJ0sbszrMr3LTokniU70EAeoQCeh85IcZnt9fOjXa8IWp6f8ayjIHtVIw== X-Received: by 2002:adf:a591:: with SMTP id g17-v6mr2200996wrc.188.1540476245746; Thu, 25 Oct 2018 07:04:05 -0700 (PDT) Received: from dhcp-10-123-74-106.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id u10-v6sm7313771wrt.59.2018.10.25.07.04.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Oct 2018 07:04:05 -0700 (PDT) From: Suganath Prabu To: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sathya.Prakash@broadcom.com, sreekanth.reddy@broadcom.com, Suganath Prabu Subject: [Resend 2/2] mpt3sas: Add support to Aero PCI IDs. Date: Thu, 25 Oct 2018 19:33:41 +0530 Message-Id: <1540476221-14987-3-git-send-email-suganath-prabu.subramani@broadcom.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1540476221-14987-1-git-send-email-suganath-prabu.subramani@broadcom.com> References: <1540476221-14987-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 Add support for Aero/Sea controllers and add warning for configurable secure type IOC. Signed-off-by: Suganath Prabu --- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c index df56cbe..5001439 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -10284,6 +10284,10 @@ _scsih_determine_hba_mpi_version(struct pci_dev *pdev) case MPI26_MFGPAGE_DEVID_SAS3516_1: case MPI26_MFGPAGE_DEVID_SAS3416: case MPI26_MFGPAGE_DEVID_SAS3616: + case MPI26_MFGPAGE_DEVID_CFG_SEC_3916: + case MPI26_MFGPAGE_DEVID_HARD_SEC_3916: + case MPI26_MFGPAGE_DEVID_CFG_SEC_3816: + case MPI26_MFGPAGE_DEVID_HARD_SEC_3816: return MPI26_VERSION; } return 0; @@ -10369,6 +10373,11 @@ _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: + case MPI26_MFGPAGE_DEVID_CFG_SEC_3816: + case MPI26_MFGPAGE_DEVID_CFG_SEC_3916: + ioc_warn(ioc, "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; break; default: @@ -10830,6 +10839,23 @@ static const struct pci_device_id mpt3sas_pci_table[] = { /* Mercator ~ 3616*/ { MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3616, PCI_ANY_ID, PCI_ANY_ID }, + + /* Aero SI 0x00E1 Configurable Secure + * 0x00E2 Hard Secure + */ + { MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_CFG_SEC_3916, + PCI_ANY_ID, PCI_ANY_ID }, + { MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_HARD_SEC_3916, + PCI_ANY_ID, PCI_ANY_ID }, + + /* Sea SI 0x00E5 Configurable Secure + * 0x00E6 Hard Secure + */ + { MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_CFG_SEC_3816, + PCI_ANY_ID, PCI_ANY_ID }, + { MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_HARD_SEC_3816, + PCI_ANY_ID, PCI_ANY_ID }, + {0} /* Terminating entry */ }; MODULE_DEVICE_TABLE(pci, mpt3sas_pci_table);