From patchwork Fri Jun 12 09:42:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sreekanth Reddy X-Patchwork-Id: 6596921 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5258C9F326 for ; Fri, 12 Jun 2015 09:48:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6CA542052D for ; Fri, 12 Jun 2015 09:48:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7FFCB20525 for ; Fri, 12 Jun 2015 09:48:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755225AbbFLJsX (ORCPT ); Fri, 12 Jun 2015 05:48:23 -0400 Received: from mail-qk0-f176.google.com ([209.85.220.176]:33101 "EHLO mail-qk0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932197AbbFLJna (ORCPT ); Fri, 12 Jun 2015 05:43:30 -0400 Received: by qkhg32 with SMTP id g32so14880010qkh.0 for ; Fri, 12 Jun 2015 02:43:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=avagotech.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MsPVOLZvl5xYHCjT88uVPFQgms/uSCR6DN89WuQhcrU=; b=Q3ttFDl7s/VaVzzBWrTtDw/gDFeyjNA1zGXHiTF8dSHDdPjsUvA+7KK1L/QbOLCopb 62jdgNE2XK5r9b2t9740u/8a4NZsBblVO1E0M6Rj14JubOf30XDQgqNqPJPYh9yGVVn6 r/INY2sjfHMId8OcIHD72eY9TdYVx5UpOUZ+I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MsPVOLZvl5xYHCjT88uVPFQgms/uSCR6DN89WuQhcrU=; b=Fhogx4B8BZIbBziK3tNNii+7IX/DN3Le4GUaFRPAgWKfhXVkvMqecPM3fdSOtjee3h aawzjM5zUwRXMFyp+lKSgEzyk5qe0P/ztfIGm00s7q0cLP3RecyiUWnTbJ38kchMk//p CODnHDfC697sjKPCb55WAK8dX7c7z0O4Nd/VId79FuOKaBnvSWjKH48He4Jcv83WxT6C RP0AcC92Fv9/fS4DNhH8++1Y3zPepKUvURqk2YSybUABzzDLk/5/IYLI76INrlWElGgf l/ksTlyPnhYkal3/UxMQyVQ4M6hXTuoD8RLbCbc+UpxVcbiq+On1QtB+AufJJdraxt9R VGkA== X-Gm-Message-State: ALoCoQkQfyU2JpYC+ktGWA65NCCh7UNyxT8BKYHZHqxtNGbMSFtJ/3BGVClYRpVDeDy6Wqn0ZONP X-Received: by 10.55.15.135 with SMTP id 7mr28685063qkp.12.1434102209501; Fri, 12 Jun 2015 02:43:29 -0700 (PDT) Received: from host1.lsi.com ([192.19.239.250]) by mx.google.com with ESMTPSA id 18sm1466219qgh.40.2015.06.12.02.43.24 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 Jun 2015 02:43:28 -0700 (PDT) From: Sreekanth Reddy X-Google-Original-From: Sreekanth Reddy To: jejb@kernel.org, hch@infradead.org Cc: martin.petersen@oracle.com, linux-scsi@vger.kernel.org, JBottomley@Parallels.com, Sathya.Prakash@avagotech.com, linux-kernel@vger.kernel.org, Sreekanth Reddy Subject: [PATCH 08/20] [SCSI] mpt3sas: Update MPI2 strings to MPI2.5 Date: Fri, 12 Jun 2015 15:12:20 +0530 Message-Id: <1434102153-38581-9-git-send-email-Sreekanth.Reddy@avagotech.com> X-Mailer: git-send-email 2.0.2 In-Reply-To: <1434102153-38581-1-git-send-email-Sreekanth.Reddy@avagotech.com> References: <1434102153-38581-1-git-send-email-Sreekanth.Reddy@avagotech.com> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Update MPI2 strings to MPI2.5. Signed-off-by: Sreekanth Reddy Reviewed-by: Johannes Thumshirn Reviewed-by: Martin K. Petersen --- drivers/scsi/mpt3sas/mpt3sas_base.c | 3 +-- drivers/scsi/mpt3sas/mpt3sas_base.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c index 32b86bf..6739c0a 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c @@ -3901,7 +3901,7 @@ _base_send_ioc_init(struct MPT3SAS_ADAPTER *ioc, int sleep_flag) mpi_request.WhoInit = MPI2_WHOINIT_HOST_DRIVER; mpi_request.VF_ID = 0; /* TODO */ mpi_request.VP_ID = 0; - mpi_request.MsgVersion = cpu_to_le16(MPI2_VERSION); + mpi_request.MsgVersion = cpu_to_le16(MPI25_VERSION); mpi_request.HeaderVersion = cpu_to_le16(MPI2_HEADER_VERSION); if (_base_is_controller_msix_enabled(ioc)) @@ -4769,7 +4769,6 @@ mpt3sas_base_attach(struct MPT3SAS_ADAPTER *ioc) ioc->build_sg_scmd = &_base_build_sg_scmd_ieee; ioc->build_sg = &_base_build_sg_ieee; ioc->build_zero_len_sge = &_base_build_zero_len_sge_ieee; - ioc->mpi25 = 1; ioc->sge_size_ieee = sizeof(Mpi2IeeeSgeSimple64_t); /* diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h b/drivers/scsi/mpt3sas/mpt3sas_base.h index 9396a76..2318ef8 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.h +++ b/drivers/scsi/mpt3sas/mpt3sas_base.h @@ -819,7 +819,6 @@ struct MPT3SAS_ADAPTER { MPT_BUILD_SG_SCMD build_sg_scmd; MPT_BUILD_SG build_sg; MPT_BUILD_ZERO_LEN_SGE build_zero_len_sge; - u8 mpi25; u16 sge_size_ieee; /* function ptr for MPI sg elements only */