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,