From patchwork Tue Jun 30 06:54:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sreekanth Reddy X-Patchwork-Id: 6693821 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 10E95C05AC for ; Tue, 30 Jun 2015 06:56:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 356E220549 for ; Tue, 30 Jun 2015 06:56:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3EFBD20544 for ; Tue, 30 Jun 2015 06:56:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752902AbbF3G4X (ORCPT ); Tue, 30 Jun 2015 02:56:23 -0400 Received: from mail-pd0-f171.google.com ([209.85.192.171]:36640 "EHLO mail-pd0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752733AbbF3G4A (ORCPT ); Tue, 30 Jun 2015 02:56:00 -0400 Received: by pdcu2 with SMTP id u2so746604pdc.3 for ; Mon, 29 Jun 2015 23:55:59 -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=vzzzpQGD0gFBssAa4yNgGshgIyAxFYjntIGNvHAvOGo=; b=ZOk3FMz5w0pREPvh00yAApCIbwDm3Eo4mAsaMKu41yzBgtF7ZZjIguoQOsPoft4R4v FlivnNI4A2dGVy5rhZUvS20u4D+amAxsaeUsq+V8K3FRm40/ooXDLr7zBO3jlC/ENeJm DMMGKP+m1qJ+B3aE55Y6Us6SbLPpVUAFQU6jQ= 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=vzzzpQGD0gFBssAa4yNgGshgIyAxFYjntIGNvHAvOGo=; b=WUJ9MWd9FqAxmkR54DDf+/CB88d7sNZ3j0uoTgpL/hzzWjDlhoxAdrDFzt2/e56Jkz IGhCJld4DrzjcG0MYAvSLvcYIiYyzpTkn9+qhPkKPCeDZLKeyfGhfxQF7AtLkg2qlbLZ vay2f5mfUYfoiiB+n4d8lM0S1hotAnLdWI/ounLQCB6y6CWlcrWlmVQ33+vBp/smLwS2 ZZS8Cx+qeWKpVSjUnXa0f1GO5KSGmJmwOXs1BwlWURSxcBvn8Z6lda7PtI9jT5A4Z7Md jina3WWtuqmjWD3pm8Z1P0zdNmS7iTZSh7UhsX2MHbS15xtoHaqzwf6KPIXKPksuAa08 oiAA== X-Gm-Message-State: ALoCoQnrYa3R+JtoPAYElHKSbTMxoiPgKeLqw0neW4/f59yHlTSSIY44bMHhtQ+k1Xp3CzVO190z X-Received: by 10.68.229.40 with SMTP id sn8mr39773579pbc.59.1435647359465; Mon, 29 Jun 2015 23:55:59 -0700 (PDT) Received: from host1.lsi.com ([192.19.239.250]) by mx.google.com with ESMTPSA id 1sm935543pds.79.2015.06.29.23.55.54 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 29 Jun 2015 23:55:58 -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, jthumshirn@suse.de, Sreekanth Reddy Subject: [PATCH v2 08/20] [SCSI] mpt3sas: Update MPI2 strings to MPI2.5 Date: Tue, 30 Jun 2015 12:24:54 +0530 Message-Id: <1435647306-36956-9-git-send-email-Sreekanth.Reddy@avagotech.com> X-Mailer: git-send-email 2.0.2 In-Reply-To: <1435647306-36956-1-git-send-email-Sreekanth.Reddy@avagotech.com> References: <1435647306-36956-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=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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. Changes in v2: Patch version change only. Signed-off-by: Sreekanth Reddy Reviewed-by: Martin K. Petersen Reviewed-by: Johannes Thumshirn --- 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 bf2d7dc..8730160 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c @@ -3924,7 +3924,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)) @@ -4793,7 +4793,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 d635612..c0c774f 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.h +++ b/drivers/scsi/mpt3sas/mpt3sas_base.h @@ -826,7 +826,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 */