From patchwork Mon Oct 17 10:24:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Saxena X-Patchwork-Id: 9378905 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8C050607D4 for ; Mon, 17 Oct 2016 10:32:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7EA3328D53 for ; Mon, 17 Oct 2016 10:32:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 736F528D9B; Mon, 17 Oct 2016 10:32:04 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 676D828D53 for ; Mon, 17 Oct 2016 10:32:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932550AbcJQKcD (ORCPT ); Mon, 17 Oct 2016 06:32:03 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:36691 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932335AbcJQKcC (ORCPT ); Mon, 17 Oct 2016 06:32:02 -0400 Received: by mail-pa0-f47.google.com with SMTP id ry6so62400011pac.3 for ; Mon, 17 Oct 2016 03:32:02 -0700 (PDT) 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=GuCgSoOfB5U3YNjn926TsJ8I4BMQVhKl87y9NxYOMu8=; b=QjrCx8TFKNPXu3d6Dut8K+f36z8LsgLLn4LtZxZp1Cmom+vfmNqzhDUlasQexc8mZQ f847pkft1D1ZJ0OFDs/34pa1t5SgLxk8EwpD8yZ+rSrmxyzw4da+peASauW11KuFchNZ 43WCAFNRYXACar0yGFlMy1qdIjpf2tOqe20T4= 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=GuCgSoOfB5U3YNjn926TsJ8I4BMQVhKl87y9NxYOMu8=; b=L0jsHdpLYI7wXh/kucHmBawglXm5vVQlg77TJFVsEQeFX8xj8oe4Nq35cpdUjQ1nYx koc8SAQ75B0aZfBiS8abXDr7177lGbOictccHpnnNGDvdBxaLWPfyQ3pEHZfsGtYomyk 5iJeH7dtwCJD6GT4MvnGzAjwH0vFVmGT856irrDumTRUYLPPRapIHkkAJ6vfAExOq/11 V0vkXCpcjfXn6ywd9fbOfHEprrjkuT2cWkuypjzK2qGMhqjXGDA6Z+S8AApxV7T9ZV4b OZSfErKVvDklfLYTYw+weQFV2zT0EHgjwGFGFc8dSpLpFI/zxcfDOV7SywuQh5gWEuF+ yI+g== X-Gm-Message-State: AA6/9Rl28harp+4Scl0rBVgydzVCN99q6ytP8ZzkWjj1jFFM4tam87Ed9B0qHTT9++Rv311R X-Received: by 10.66.154.202 with SMTP id vq10mr27849543pab.0.1476699880088; Mon, 17 Oct 2016 03:24:40 -0700 (PDT) Received: from dhcp-135-24-192-142.localdomain ([192.19.239.250]) by smtp.gmail.com with ESMTPSA id dj3sm36203777pad.1.2016.10.17.03.24.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Oct 2016 03:24:39 -0700 (PDT) From: Sumit Saxena To: linux-scsi@vger.kernel.org Cc: martin.petersen@oracle.com, thenzl@redhat.com, jejb@linux.vnet.ibm.com, kashyap.desai@broadcom.com, Sumit Saxena , stable@vger.kernel.org Subject: [PATCH 7/7] megaraid_sas: Do not set MPI2_TYPE_CUDA for JBOD FP path for FW which does not support JBOD sequence map Date: Mon, 17 Oct 2016 03:24:10 -0700 Message-Id: <1476699850-25083-8-git-send-email-sumit.saxena@broadcom.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1476699850-25083-1-git-send-email-sumit.saxena@broadcom.com> References: <1476699850-25083-1-git-send-email-sumit.saxena@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 Do not set MPI2_TYPE_CUDA for JBOD fastpath IOs for firmware which does not support JBOD sequence map. CC: stable@vger.kernel.org Signed-off-by: Sumit Saxena Signed-off-by: Kashyap Desai Reviewed-by: Hannes Reinecke Reviewed-by: Tomas Henzl --- drivers/scsi/megaraid/megaraid_sas_fusion.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c index 8237580..25b7720 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c @@ -2003,6 +2003,8 @@ megasas_build_syspd_fusion(struct megasas_instance *instance, io_request->DevHandle = pd_sync->seq[pd_index].devHandle; pRAID_Context->regLockFlags |= (MR_RL_FLAGS_SEQ_NUM_ENABLE|MR_RL_FLAGS_GRANT_DESTINATION_CUDA); + pRAID_Context->Type = MPI2_TYPE_CUDA; + pRAID_Context->nseg = 0x1; } else if (fusion->fast_path_io) { pRAID_Context->VirtualDiskTgtId = cpu_to_le16(device_id); pRAID_Context->configSeqNum = 0; @@ -2038,12 +2040,10 @@ megasas_build_syspd_fusion(struct megasas_instance *instance, pRAID_Context->timeoutValue = cpu_to_le16((os_timeout_value > timeout_limit) ? timeout_limit : os_timeout_value); - if (fusion->adapter_type == INVADER_SERIES) { - pRAID_Context->Type = MPI2_TYPE_CUDA; - pRAID_Context->nseg = 0x1; + if (fusion->adapter_type == INVADER_SERIES) io_request->IoFlags |= cpu_to_le16(MPI25_SAS_DEVICE0_FLAGS_ENABLED_FAST_PATH); - } + cmd->request_desc->SCSIIO.RequestFlags = (MPI2_REQ_DESCRIPT_FLAGS_FP_IO << MEGASAS_REQ_DESCRIPT_FLAGS_TYPE_SHIFT);