From patchwork Fri Nov 9 17:47:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shivasharan Srikanteshwara X-Patchwork-Id: 10676395 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 2B6BB14BD for ; Fri, 9 Nov 2018 17:47:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 182A229962 for ; Fri, 9 Nov 2018 17:47:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0C6AB2F05F; Fri, 9 Nov 2018 17:47:37 +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 A4FE829962 for ; Fri, 9 Nov 2018 17:47:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728172AbeKJD3M (ORCPT ); Fri, 9 Nov 2018 22:29:12 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:33131 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727995AbeKJD3M (ORCPT ); Fri, 9 Nov 2018 22:29:12 -0500 Received: by mail-pg1-f195.google.com with SMTP id q5-v6so1156433pgv.0 for ; Fri, 09 Nov 2018 09:47:35 -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; bh=MCgs3O4OP2GSAtSPjmCHefKl3Il3KemBTA41mbqmyhk=; b=VYP77pwwrE3QrL+De1s+mXkrFc2U6nt0az3IdilOt1GPud75GagfS3s4wm04EOcer4 T6laTj2I6UugB4mGgXgBYvuqSnViIY1xmoTS+mMke5MChX7h4D6xRgts7SYoNZWTYaVX KlgQvs5H8JhOfiR/O3x2Nsn6iLuWddCts4U20= 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; bh=MCgs3O4OP2GSAtSPjmCHefKl3Il3KemBTA41mbqmyhk=; b=S+PLM7WxqtCIObAmh28tbKsak4NOnPkX3Jf/jpPols5ys9K0KQeb39wHk+aErnNSyd 7ISkJgr9h3KlCcL+iIpvi50l7UWFThmJZsZ8bmpOSqA1TTUup3EzXwAx6TKYa2nTLFLc 6wNkJo3cRKRnn7mXb3csE8EgNewwgq92n2A6YBIqsquScsBC8nA+TxjfXf98HmUuOByo 6b9Dcnr1hpmk0i4ZeLlA9E48ZKS6CI5nF/9OaD/f9YmLuoX3Ck2tjV4UnCXtF7VN9FwH 8AkWPhdxD6JMCLvEMft8DBKu3jgLdsgf3+DNaUxK/aPfwqk5DKdNZyhHUiPWww2PgL8D fhbw== X-Gm-Message-State: AGRZ1gLMAQ9VOIU4RS92YsolggNiF/bJD4UooCnpytKpJkbuNUr48DAj odAhvxlM2VulfMPt6nLoXfCVZTmXW8k= X-Google-Smtp-Source: AJdET5eTS3FIbEsIJRLJ1segxmixueJAkk8cX47rnr+wgk2cR2dq8NkNn0skNDoa/CfZei63vMdDFQ== X-Received: by 2002:a63:81c7:: with SMTP id t190mr8401173pgd.393.1541785653968; Fri, 09 Nov 2018 09:47:33 -0800 (PST) Received: from dhcp-135-24-192-142.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id f10-v6sm6609198pgp.72.2018.11.09.09.47.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Nov 2018 09:47:32 -0800 (PST) From: Shivasharan S To: linux-scsi@vger.kernel.org Cc: kashyap.desai@broadcom.com, sumit.saxena@broadcom.com, martin.petersen@oracle.com, Shivasharan S Subject: [PATCH v2] megaraid_sas: Add support for MegaRAID Aero controllers Date: Fri, 9 Nov 2018 09:47:20 -0800 Message-Id: <1541785640-1452-1-git-send-email-shivasharan.srikanteshwara@broadcom.com> X-Mailer: git-send-email 2.4.3 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 This patch adds support for MegaRAID Aero controller PCI IDs. Throw a message when a Configurable secure type controller is encountered. Signed-off-by: Shivasharan S Reviewed-by: Hannes Reinecke --- Changes in v2: Change dev_warn to dev_info. drivers/scsi/megaraid/megaraid_sas.h | 4 ++++ drivers/scsi/megaraid/megaraid_sas_base.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h index 8edba2227cd3..55f6662ceb55 100644 --- a/drivers/scsi/megaraid/megaraid_sas.h +++ b/drivers/scsi/megaraid/megaraid_sas.h @@ -60,6 +60,10 @@ #define PCI_DEVICE_ID_LSI_TOMCAT 0x0017 #define PCI_DEVICE_ID_LSI_VENTURA_4PORT 0x001B #define PCI_DEVICE_ID_LSI_CRUSADER_4PORT 0x001C +#define PCI_DEVICE_ID_LSI_AERO_10E1 0x10e1 +#define PCI_DEVICE_ID_LSI_AERO_10E2 0x10e2 +#define PCI_DEVICE_ID_LSI_AERO_10E5 0x10e5 +#define PCI_DEVICE_ID_LSI_AERO_10E6 0x10e6 /* * Intel HBA SSDIDs diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 27fab13c55ea..bc8e4d91d34b 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -162,6 +162,10 @@ static struct pci_device_id megasas_pci_table[] = { {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_TOMCAT)}, {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_VENTURA_4PORT)}, {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_CRUSADER_4PORT)}, + {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_AERO_10E1)}, + {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_AERO_10E2)}, + {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_AERO_10E5)}, + {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_AERO_10E6)}, {} }; @@ -6235,6 +6239,10 @@ static inline void megasas_set_adapter_type(struct megasas_instance *instance) instance->adapter_type = MFI_SERIES; } else { switch (instance->pdev->device) { + case PCI_DEVICE_ID_LSI_AERO_10E1: + case PCI_DEVICE_ID_LSI_AERO_10E2: + case PCI_DEVICE_ID_LSI_AERO_10E5: + case PCI_DEVICE_ID_LSI_AERO_10E6: case PCI_DEVICE_ID_LSI_VENTURA: case PCI_DEVICE_ID_LSI_CRUSADER: case PCI_DEVICE_ID_LSI_HARPOON: @@ -6598,6 +6606,13 @@ static int megasas_probe_one(struct pci_dev *pdev, struct megasas_instance *instance; u16 control = 0; + switch (pdev->device) { + case PCI_DEVICE_ID_LSI_AERO_10E1: + case PCI_DEVICE_ID_LSI_AERO_10E5: + dev_info(&pdev->dev, "Adapter is in configurable secure mode\n"); + break; + } + /* Reset MSI-X in the kdump kernel */ if (reset_devices) { pos = pci_find_capability(pdev, PCI_CAP_ID_MSIX);