From patchwork Tue Jan 29 12:14:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suganath Prabu S X-Patchwork-Id: 10786103 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 B24F714E1 for ; Tue, 29 Jan 2019 12:15:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A359C2ABA0 for ; Tue, 29 Jan 2019 12:15:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96C692ABFC; Tue, 29 Jan 2019 12:15:16 +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 43A902ABA0 for ; Tue, 29 Jan 2019 12:15:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728875AbfA2MPA (ORCPT ); Tue, 29 Jan 2019 07:15:00 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:44390 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727555AbfA2MPA (ORCPT ); Tue, 29 Jan 2019 07:15:00 -0500 Received: by mail-pf1-f195.google.com with SMTP id u6so9551048pfh.11 for ; Tue, 29 Jan 2019 04:14:59 -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=5LB3pwvnk4GJemSCy28xjYAPXvXv16KpVfezXgyBDJc=; b=SbeAVn+0hb9RxK2Sd8fQWQpk3LFtYhcWBCkrYqLQa5Ye+AAT3CMEfE9lCsFZ1i76f4 kxKLb/zkkHIi1dWM3B7whj4SE0xD+FBApm+qRpfEVIhQaVsbGdYDY9uBZ/yHaL4qtwiD LI8WBLnlxxqbvT88Y/98Ua/9BPgqymDBgf5Tk= 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=5LB3pwvnk4GJemSCy28xjYAPXvXv16KpVfezXgyBDJc=; b=k0TdCHQBugKvFR9+YMm8KnGMObYwEPLL+VaZVRD5fF9iskO336ssN7I/7giGoNiic7 C0emHgUP6ZMNheE3ZiCH71Gufq15vamXER75dYPHWpq/mH0L2zq/Hw1v/hJzk5HDq4G/ 9pFHsjzlI122ZZg0mQhETVh5wn1SY6MwBQdSIJ00mxpFj8Wake3DU0n7d5JeTnwwsYJf OKID+Ba7hKHmRD/uhpYxJUzPOEoUpA+EIXOFVXSDkz+tz78+ywThMCzA79oVjJ4PgQXY 4D8cn72sBU1ErY+FZqytqB7DZy898lQNC9WxggdKMp5A8yNPkFUudC/1ah3Veyp42Xvc 1AMw== X-Gm-Message-State: AJcUukfsQRzmww1hV90RXpwo0Bn8jRfJQzDtPM/+5dy3ztv6xCk6EUYE YW89WSc3xlpWvagUrwbCjHBglqcmZbNyFEpziY0l7lXKr/i+d0wbm32wa+OnG6sFLDnOGooXoO8 p8DyR5SJf3GUYB7bRHOFc0qVqR2H+hPbPcq/TKNGlczlb7vW3ruaDjX/IImHztukzgHLQlIbwVU aH+nfTnRx/AtaGRMuV9w== X-Google-Smtp-Source: ALg8bN4gOjzWAZMQq6xpp4wPkms7NB0GWs/NkEDDCsFiCD+mpVNKNVTAE0ui2itweN9aWhJ0I4vmXA== X-Received: by 2002:a63:e344:: with SMTP id o4mr23148364pgj.158.1548764098953; Tue, 29 Jan 2019 04:14:58 -0800 (PST) Received: from dhcp-10-123-20-72.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id g136sm48689876pfb.154.2019.01.29.04.14.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Jan 2019 04:14:58 -0800 (PST) From: Suganath Prabu S To: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sathya.Prakash@broadcom.com, sreekanth.reddy@broadcom.com, Suganath Prabu S Subject: [PATCH 2/4] mpt3sas: Add support for NVMe Switch Adapter Date: Tue, 29 Jan 2019 07:14:41 -0500 Message-Id: <1548764083-5781-3-git-send-email-suganath-prabu.subramani@broadcom.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548764083-5781-1-git-send-email-suganath-prabu.subramani@broadcom.com> References: <1548764083-5781-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 Added device ID for NVMe Switch Adapter (Ambrosia). VID: 0x1000 DID: 0x02B1 Signed-off-by: Suganath Prabu S --- drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 1 + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h b/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h index a53a758..a2f4a55 100644 --- a/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h +++ b/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h @@ -549,6 +549,7 @@ typedef struct _MPI2_CONFIG_REPLY { #define MPI2_MFGPAGE_DEVID_SAS2308_2 (0x0087) #define MPI2_MFGPAGE_DEVID_SAS2308_3 (0x006E) #define MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP (0x02B0) +#define MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP_1 (0x02B1) /*MPI v2.5 SAS products */ #define MPI25_MFGPAGE_DEVID_SAS3004 (0x0096) diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c index c3a0f70..4a73753 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -10257,6 +10257,7 @@ _scsih_determine_hba_mpi_version(struct pci_dev *pdev) case MPI2_MFGPAGE_DEVID_SAS2308_2: case MPI2_MFGPAGE_DEVID_SAS2308_3: case MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP: + case MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP_1: return MPI2_VERSION; case MPI25_MFGPAGE_DEVID_SAS3004: case MPI25_MFGPAGE_DEVID_SAS3008: @@ -10344,6 +10345,7 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id) ioc->hide_ir_msg = 1; break; case MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP: + case MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP_1: ioc->is_mcpu_endpoint = 1; break; default: @@ -10785,6 +10787,8 @@ static const struct pci_device_id mpt3sas_pci_table[] = { PCI_ANY_ID, PCI_ANY_ID }, { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP, PCI_ANY_ID, PCI_ANY_ID }, + { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP_1, + PCI_ANY_ID, PCI_ANY_ID }, /* SSS6200 */ { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SSS6200, PCI_ANY_ID, PCI_ANY_ID },