From patchwork Tue Jan 29 12:14:40 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: 10786105 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 0C6151390 for ; Tue, 29 Jan 2019 12:15:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F14532ABA0 for ; Tue, 29 Jan 2019 12:15:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E54622ABFC; Tue, 29 Jan 2019 12:15:18 +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 912B22ABA0 for ; Tue, 29 Jan 2019 12:15:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728837AbfA2MO6 (ORCPT ); Tue, 29 Jan 2019 07:14:58 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:45137 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727697AbfA2MO5 (ORCPT ); Tue, 29 Jan 2019 07:14:57 -0500 Received: by mail-pg1-f196.google.com with SMTP id y4so8647976pgc.12 for ; Tue, 29 Jan 2019 04:14:57 -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=qbR01j/6Y5h4jK4Q4Vw3PWE240tOgVvX27Ci2PbGkEw=; b=M3IZaBegnoYdvBkE8DdhBKGslbiz6GdhajJtSd1Rh/P3gW1GD4YG9m+F229t4dmQtV AJHsSk6Qb8ohPHkCjHnRcU54JR8LmzljTw/tWFf5ynT6uB3FG6TQ5iOTSbIuQcwYdLsv JPj3wKPk8erfnFurLBNYG9Y0+AZZnqkt3M4vU= 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=qbR01j/6Y5h4jK4Q4Vw3PWE240tOgVvX27Ci2PbGkEw=; b=RtsvCnMOnqWS8vcPnBs5Q+xEl6Ey9PwZ8Nn9remL9hJB7NQcLX83IHRZ+W4gtJCRop PGpPXvtxar9qKmOOQZu5Wh2LIydgQnjaC2+/1Z65wfIeKT+w5dCrAUX11M+cDDbA0235 rnXZNGaxjh2r+qL5kiyXjoFQ8dMJrjOqy7rjYwGuD/ZORMFQkDzvNiHKEYMVEXFlSaSk Cx7GGdIn7vaLdlbauRorkbVm45MW9Ys9PA7Sr3QDmnqCBm0mrlaLtvY6DaZz+GHsYsY7 rUwxWVGQYOlhXcD0+Q2JQ7rFjCwA1VvlfR4bd+ecQjhuT/6NGULxItm/ZU8IXV2obuRG GmPA== X-Gm-Message-State: AJcUukdku157No0SEx84Ew1eoSfdMLCWRiZlfddy23bY4/I22U9a5cg1 OY6afifDnyCM3+d/Z5TfxwNRPAGrkSgyVsUTxG/IyFRyCthjQWKBdJpRNQDSb/H51yPE3QGcD6K XWFl2Ew1M6QnALYN34KTsWqf1nrL16Nswn+h1zWjOapDBAcGsorFH3gfRea2BiVYp0NOOmBW1su RuHuhcEG22lp5KvCLADA== X-Google-Smtp-Source: ALg8bN4s+9H1vmKnrN+jxM4P4BiNZBKQxb3fDla6gUtDMB+GC+eicQP9xwypEtGWTVr5AKtzBglbJg== X-Received: by 2002:a63:b24a:: with SMTP id t10mr22748387pgo.223.1548764096626; Tue, 29 Jan 2019 04:14:56 -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.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Jan 2019 04:14:56 -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 1/4] mpt3sas: Rename mpi endpoint device ID macro. Date: Tue, 29 Jan 2019 07:14:40 -0500 Message-Id: <1548764083-5781-2-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 MPI Endpoint is a PCIe switch based on MPI2, Renaming device ID macro from MPI2_MFGPAGE_DEVID_SAS2308_MPI_EP to MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP Signed-off-by: Suganath Prabu S --- drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 2 +- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h b/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h index 398fa6f..a53a758 100644 --- a/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h +++ b/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h @@ -548,7 +548,7 @@ typedef struct _MPI2_CONFIG_REPLY { #define MPI2_MFGPAGE_DEVID_SAS2308_1 (0x0086) #define MPI2_MFGPAGE_DEVID_SAS2308_2 (0x0087) #define MPI2_MFGPAGE_DEVID_SAS2308_3 (0x006E) -#define MPI2_MFGPAGE_DEVID_SAS2308_MPI_EP (0x02B0) +#define MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP (0x02B0) /*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 6be39dc..c3a0f70 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -10256,7 +10256,7 @@ _scsih_determine_hba_mpi_version(struct pci_dev *pdev) case MPI2_MFGPAGE_DEVID_SAS2308_1: case MPI2_MFGPAGE_DEVID_SAS2308_2: case MPI2_MFGPAGE_DEVID_SAS2308_3: - case MPI2_MFGPAGE_DEVID_SAS2308_MPI_EP: + case MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP: return MPI2_VERSION; case MPI25_MFGPAGE_DEVID_SAS3004: case MPI25_MFGPAGE_DEVID_SAS3008: @@ -10343,7 +10343,7 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id) ioc->is_warpdrive = 1; ioc->hide_ir_msg = 1; break; - case MPI2_MFGPAGE_DEVID_SAS2308_MPI_EP: + case MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP: ioc->is_mcpu_endpoint = 1; break; default: @@ -10783,7 +10783,7 @@ static const struct pci_device_id mpt3sas_pci_table[] = { PCI_ANY_ID, PCI_ANY_ID }, { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2308_3, PCI_ANY_ID, PCI_ANY_ID }, - { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2308_MPI_EP, + { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP, PCI_ANY_ID, PCI_ANY_ID }, /* SSS6200 */ { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SSS6200, 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 }, From patchwork Tue Jan 29 12:14:42 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: 10786101 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 0F6601390 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 F376D2ABA0 for ; Tue, 29 Jan 2019 12:15:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E70E02ABFC; Tue, 29 Jan 2019 12:15:15 +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 7669C2ABA0 for ; Tue, 29 Jan 2019 12:15:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729006AbfA2MPO (ORCPT ); Tue, 29 Jan 2019 07:15:14 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:45643 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728903AbfA2MPC (ORCPT ); Tue, 29 Jan 2019 07:15:02 -0500 Received: by mail-pf1-f194.google.com with SMTP id g62so9554592pfd.12 for ; Tue, 29 Jan 2019 04:15:01 -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=60j29YiQO+NbAgDxRNhc0vRULzmZeAHIIxA4lYHbQg8=; b=Uy2kcgxCm1GTEti5saOOlqzBlQJFQjq/hi8O++a8DpnK5QUZLkMRbwt0HLacm04utU 47D3S5buKgbATnO+Ol4ECQY/K7QL+NSG61I2aOYOW00JZodqYLInG1/WQqtflxgDgNAe LeZdZlLE2wn4W1uAuE/ZtOhB/fWCgSl5HWVbs= 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=60j29YiQO+NbAgDxRNhc0vRULzmZeAHIIxA4lYHbQg8=; b=bOGJZ4Q1bQbDA9cN6H4vaA88Y7nhjpOWvU/kEfc9K3VTm5RqDNTALlOSRFW02lVLCb XNZHeLm9IQNuP1dUVDjN4X0NxtIv1Q0PKzYzfPNmzyzRjOJIV+KX3L3J5GwP80oXV9rO ibKqeOLPee68zOR1Nb6KA0+duo3siv/5m0e3MsOCtBX1uR8fqY8hvZgphQRVUvGGDbjV 7c1MSmiQtLB5e+YqOzaHL9ABwXnI838WRorHgiCvJHNBg7E2iazomLy7rwJNNWUUTv8g rgBBr8aazlhtv3+MpVt1R4ZYdAdW06AbEoDe0aI9sGE1d9d8ZtupEvTtYD7lmWqe5PUI C+ew== X-Gm-Message-State: AJcUukc0YTefGNR90xcrU2+yakPHPLtXcWqurtmB5ZGWqiOhNkR26U9o kBKI0mdRw2EhWIDEd0dMbWDSRWyzuWeBdYSPi+j09wl5jGvUBoDBcWuYnlwTiAJxcCtO/n/iTgF GJNouzY9W7TLfRJk38O1HT52PRDp/DcHHOSa4DOwSmISJhP0UfcEIg0C2bbhBqJKghre/KM7F/f L3N/yRPMy+LPcza9G0zw== X-Google-Smtp-Source: ALg8bN6M52qvmq8fX6oiy5kv72t7XEaUY+6q9M3aNVMU4pyzrN/urIpMAF2nVU/Gp9b0QURcC0eUtw== X-Received: by 2002:a65:4784:: with SMTP id e4mr23012858pgs.12.1548764101171; Tue, 29 Jan 2019 04:15:01 -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.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Jan 2019 04:15:00 -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 3/4] mpt3sas: Add support for ATLAS PCIe switch. Date: Tue, 29 Jan 2019 07:14:42 -0500 Message-Id: <1548764083-5781-4-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 Add Atlas PCIe Switch Management Port device PNPID, Vendor Id: 0x1000 device Id: 0x00B2 This device is based on MPI 2.6 spec and it exposes one SES device to accept management commands for the PCIe switch. Signed-off-by: Suganath Prabu S --- drivers/scsi/mpt3sas/mpt3sas_base.h | 3 +++ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h b/drivers/scsi/mpt3sas/mpt3sas_base.h index 8003519..db12c1b 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.h +++ b/drivers/scsi/mpt3sas/mpt3sas_base.h @@ -193,6 +193,9 @@ struct mpt3sas_nvme_cmd { #define SAS2_PCI_DEVICE_B0_REVISION (0x01) #define SAS3_PCI_DEVICE_C0_REVISION (0x02) +/* Atlas PCIe Switch Management Port */ +#define MPI26_ATLAS_PCIe_SWITCH_DEVID (0x00B2) + /* * Intel HBA branding */ diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c index 4a73753..8bb5b8f 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -10283,6 +10283,7 @@ _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_ATLAS_PCIe_SWITCH_DEVID: case MPI26_MFGPAGE_DEVID_CFG_SEC_3916: case MPI26_MFGPAGE_DEVID_HARD_SEC_3916: case MPI26_MFGPAGE_DEVID_CFG_SEC_3816: @@ -10373,6 +10374,7 @@ _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_ATLAS_PCIe_SWITCH_DEVID: ioc->is_gen35_ioc = 1; break; case MPI26_MFGPAGE_DEVID_CFG_SEC_3816: @@ -10853,6 +10855,10 @@ static const struct pci_device_id mpt3sas_pci_table[] = { { MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_HARD_SEC_3916, PCI_ANY_ID, PCI_ANY_ID }, + /* Atlas PCIe Switch Management Port */ + { MPI2_MFGPAGE_VENDORID_LSI, MPI26_ATLAS_PCIe_SWITCH_DEVID, + PCI_ANY_ID, PCI_ANY_ID }, + /* Sea SI 0x00E5 Configurable Secure * 0x00E6 Hard Secure */ From patchwork Tue Jan 29 12:14:43 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: 10786099 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 B7A541390 for ; Tue, 29 Jan 2019 12:15:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A3E862ABA0 for ; Tue, 29 Jan 2019 12:15:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 915862ABFC; Tue, 29 Jan 2019 12:15:10 +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 264952ABA0 for ; Tue, 29 Jan 2019 12:15:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728974AbfA2MPF (ORCPT ); Tue, 29 Jan 2019 07:15:05 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:39091 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728966AbfA2MPE (ORCPT ); Tue, 29 Jan 2019 07:15:04 -0500 Received: by mail-pf1-f195.google.com with SMTP id r136so9575177pfc.6 for ; Tue, 29 Jan 2019 04:15: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=GTyESbyE1Bpdox0hntYxCmNfn5GilDfGYVGS46aUYsA=; b=BhUkRkb2bMEgzep6A3SKSZKvEzR6H6/3n/rvcT9mofQ8LUc9dho8t/Yu7ehFO8Gy0n CJiCHypBp3852r/2ztKoR9l49EAKec9rzKDN4v4L4Sd88fRu4wheopoPzQir0fCXj7MC XmX+XyYB7eQ2Txlo/k/YOz5wDI86AKfCgoSbU= 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=GTyESbyE1Bpdox0hntYxCmNfn5GilDfGYVGS46aUYsA=; b=mSS6j+YqmQkSbVhTieodY4x6XloSa6fak27Y0Yu9HZP/pfPTkJlLvr5Sr1pFhGYGoM WZSS7r9QgyLkbkm7LwqHX2ggoXK5spbRIp/6lLp200LWFVCbF/K8PT9kcN77w9vQbXmh cKnFzXgc90wlBd4Sv9NIqMuPwzpnJX2DZgdcKRycLNhDkGfpUYZl9DiKFI+4nK3wADM4 GQwEEgBXf0y0/A/fM+NBMQWao3qKtpirfHqpcAh9W+mDIViNQV34bbPYr/FxZH8ZOgRm OpthFKbNOrHzcs/O1b1yDBPAcprdRzQWK7C6mxXKrTgW5oJl4ZqSXH0tcxddpgH1k0BL ky9A== X-Gm-Message-State: AJcUukcVL6iOIjfekLscmHa+Y8hVP4J/5NKscuTgNh78dePRL2eDt3/G m7KIllZ5enJBeSIDDtKEvCdDWUUkCxuLCcifGqwiZ2frRPULcwa1R/t4LpLSwhMfGOkn8/Ttdzu au+GQSRRYI5G5UOMDgdCSVMizSn1Ll74Hg8wU5A5b/R3yxDKaK5QzE0rVRnYXEPWsQ6iVqm7Wm0 1TipaIqxHMYa455G0hpQ== X-Google-Smtp-Source: ALg8bN4FE2qffeDN1lQde5hoHGlib7HnYbcDKdqfAlYQ310ohGauCiO940dyApIYxK2coeNyP8ZMwA== X-Received: by 2002:a62:1542:: with SMTP id 63mr26094526pfv.230.1548764103610; Tue, 29 Jan 2019 04:15:03 -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.15.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Jan 2019 04:15:03 -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 4/4] mpt3sas: Update driver version to 27.102.00.00 Date: Tue, 29 Jan 2019 07:14:43 -0500 Message-Id: <1548764083-5781-5-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 Updated driver version to 27.102.00.00 from 27.101.00.00. Signed-off-by: Suganath Prabu S --- drivers/scsi/mpt3sas/mpt3sas_base.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h b/drivers/scsi/mpt3sas/mpt3sas_base.h index db12c1b..19158cb 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.h +++ b/drivers/scsi/mpt3sas/mpt3sas_base.h @@ -75,9 +75,9 @@ #define MPT3SAS_DRIVER_NAME "mpt3sas" #define MPT3SAS_AUTHOR "Avago Technologies " #define MPT3SAS_DESCRIPTION "LSI MPT Fusion SAS 3.0 Device Driver" -#define MPT3SAS_DRIVER_VERSION "27.101.00.00" +#define MPT3SAS_DRIVER_VERSION "27.102.00.00" #define MPT3SAS_MAJOR_VERSION 27 -#define MPT3SAS_MINOR_VERSION 101 +#define MPT3SAS_MINOR_VERSION 102 #define MPT3SAS_BUILD_VERSION 0 #define MPT3SAS_RELEASE_VERSION 00