From patchwork Thu May 13 08:35:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kashyap Desai X-Patchwork-Id: 12255323 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,MIME_HEADER_CTYPE_ONLY, SPF_HELO_NONE,SPF_PASS,T_TVD_MIME_NO_HEADERS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3BC1C433ED for ; Thu, 13 May 2021 08:34:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9402A613E6 for ; Thu, 13 May 2021 08:34:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232017AbhEMIfS (ORCPT ); Thu, 13 May 2021 04:35:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232016AbhEMIee (ORCPT ); Thu, 13 May 2021 04:34:34 -0400 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9C68C061763 for ; Thu, 13 May 2021 01:33:23 -0700 (PDT) Received: by mail-pl1-x62c.google.com with SMTP id t4so13988478plc.6 for ; Thu, 13 May 2021 01:33:23 -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=mcJT8H1EkgJRv1HBamWMhXjOqeevZo4D2FR4eS5lv3M=; b=UxfynRvaSR2zPK5MZhnwiAT9u/gr62RoYtamRrx9603eHT3iJF59Lord9X/rt6GskW BLbnxifqShRAB9sh4fWWxUZMPCP6cZ6ovv+VfpnEvL699eM5CLCSuIRtrYrbVIDA6gmi henUcIgCiaKu+qhpvrrg0LMRwxrvuw2p83Suw= 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=mcJT8H1EkgJRv1HBamWMhXjOqeevZo4D2FR4eS5lv3M=; b=mL3eFgxCbmXUIeK7xJE2M0W3X/APCAO0jRu4abejY5AgWxAJgdZWwgyuHOAp/KclYf K16hAhKRZnGqP1MGU12N5AWvekEUA5m2iMptpIzSIOGBVCS9RbC0/GfTRDVppot8oOpG D7d4zWGTRnu8ey5zf/tsSeVb/c4nsP2726g2fnhQc4zLU2VAMeUKxQ6mNyAjGrcdO4dG 64xj0WlKha/T5xVrBrY/BxZvQ3/kF2rb6pl4aA3hghbLjjs+bAPfYKLR3xibP1uuXiLM RbZpH+XqeobPko6kYAevXfty8ccGkcer29NsSArKjfcjSk9yH1tvVvZKikmT1HtLLiTR tbOQ== X-Gm-Message-State: AOAM530fDX6uqjYG725mpycDo64V3Wa6koA1XRhc+QLBoE7ZxeOBvX8z NkWHq3WahBdp+SrVsBSd5z52oLJdcBSMAjwnbxbhJzhmM/i97eqpZO6ZvxnvqpieRB6SFVK0XP7 IgkrImMIxKS9uU/RvpHU6f6hNnXdtbB4Y/UyUHiaG7UnsjQpna7xDXenTPQg65Kq4vr71fAfflU j8bRpm/g== X-Google-Smtp-Source: ABdhPJy2ttIKD9pJFOreHqIBDnm19rNfL8L93o/4TesGZD3akewX16qIzONUC4ihf0J6gba2PERlkg== X-Received: by 2002:a17:902:a388:b029:ef:8970:2825 with SMTP id x8-20020a170902a388b02900ef89702825mr5774244pla.77.1620894802664; Thu, 13 May 2021 01:33:22 -0700 (PDT) Received: from drv-bst-rhel8.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id i123sm1632468pfc.53.2021.05.13.01.33.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 May 2021 01:33:22 -0700 (PDT) From: Kashyap Desai To: linux-scsi@vger.kernel.org Cc: jejb@linux.ibm.com, martin.petersen@oracle.com, steve.hagan@broadcom.com, peter.rivera@broadcom.com, mpi3mr-linuxdrv.pdl@broadcom.com, Kashyap Desai , sathya.prakash@broadcom.com Subject: [PATCH v5 14/24] mpi3mr: add change queue depth support Date: Thu, 13 May 2021 14:05:58 +0530 Message-Id: <20210513083608.2243297-15-kashyap.desai@broadcom.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20210513083608.2243297-1-kashyap.desai@broadcom.com> References: <20210513083608.2243297-1-kashyap.desai@broadcom.com> Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Signed-off-by: Kashyap Desai Reviewed-by: Hannes Reinecke Reviewed-by: Tomas Henzl Reviewed-by: Himanshu Madhani Cc: sathya.prakash@broadcom.com --- drivers/scsi/mpi3mr/mpi3mr.h | 3 +++ drivers/scsi/mpi3mr/mpi3mr_os.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/drivers/scsi/mpi3mr/mpi3mr.h b/drivers/scsi/mpi3mr/mpi3mr.h index d6aab3b04eff..960943452a7a 100644 --- a/drivers/scsi/mpi3mr/mpi3mr.h +++ b/drivers/scsi/mpi3mr/mpi3mr.h @@ -141,6 +141,9 @@ extern struct list_head mrioc_list; /* Command retry count definitions */ #define MPI3MR_DEV_RMHS_RETRY_COUNT 3 +/* Default target device queue depth */ +#define MPI3MR_DEFAULT_SDEV_QD 32 + /* SGE Flag definition */ #define MPI3MR_SGEFLAGS_SYSTEM_SIMPLE_END_OF_LIST \ (MPI3_SGE_FLAGS_ELEMENT_TYPE_SIMPLE | MPI3_SGE_FLAGS_DLAS_SYSTEM | \ diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c index d3eedc2ac410..786128da1b54 100644 --- a/drivers/scsi/mpi3mr/mpi3mr_os.c +++ b/drivers/scsi/mpi3mr/mpi3mr_os.c @@ -643,6 +643,33 @@ static int mpi3mr_report_tgtdev_to_host(struct mpi3mr_ioc *mrioc, return retval; } +/** + * mpi3mr_change_queue_depth- Change QD callback handler + * @sdev: SCSI device reference + * @q_depth: Queue depth + * + * Validate and limit QD and call scsi_change_queue_depth. + * + * Return: return value of scsi_change_queue_depth + */ +static int mpi3mr_change_queue_depth(struct scsi_device *sdev, + int q_depth) +{ + struct scsi_target *starget = scsi_target(sdev); + struct Scsi_Host *shost = dev_to_shost(&starget->dev); + int retval = 0; + + if (!sdev->tagged_supported) + q_depth = 1; + if (q_depth > shost->can_queue) + q_depth = shost->can_queue; + else if (!q_depth) + q_depth = MPI3MR_DEFAULT_SDEV_QD; + retval = scsi_change_queue_depth(sdev, q_depth); + + return retval; +} + /** * mpi3mr_update_sdev - Update SCSI device information * @sdev: SCSI device reference @@ -663,6 +690,7 @@ mpi3mr_update_sdev(struct scsi_device *sdev, void *data) if (!tgtdev) return; + mpi3mr_change_queue_depth(sdev, tgtdev->q_depth); switch (tgtdev->dev_type) { case MPI3_DEVICE_DEVFORM_PCIE: /*The block layer hw sector size = 512*/ @@ -2632,6 +2660,7 @@ static int mpi3mr_slave_configure(struct scsi_device *sdev) if (!tgt_dev) return -ENXIO; + mpi3mr_change_queue_depth(sdev, tgt_dev->q_depth); switch (tgt_dev->dev_type) { case MPI3_DEVICE_DEVFORM_PCIE: /*The block layer hw sector size = 512*/ @@ -2885,6 +2914,7 @@ static struct scsi_host_template mpi3mr_driver_template = { .slave_destroy = mpi3mr_slave_destroy, .scan_finished = mpi3mr_scan_finished, .scan_start = mpi3mr_scan_start, + .change_queue_depth = mpi3mr_change_queue_depth, .eh_device_reset_handler = mpi3mr_eh_dev_reset, .eh_target_reset_handler = mpi3mr_eh_target_reset, .eh_host_reset_handler = mpi3mr_eh_host_reset,