Path: csiph.com!goblin3!goblin2!goblin.stu.neva.ru!aioe.org!bofh.it!news.nic.it!robomod From: Suganath Prabu S Newsgroups: linux.kernel Subject: [PATCH 11/13] mpt3sas: Fix nvme drives checking for tlr. Date: Thu, 29 Jun 2017 16:30:03 +0200 Message-ID: References: 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=VrxhjzvmVLpjZ31oRbZr9enU4R13jK2t/w6FGhr9gIk=; b=Px1dv6dgs2AaR54I99ADKJl2WznYhyygG+fFujApxwNPsL6fApzZu6nytEWOib7sYr uc8e+ovLO4oDypR/9jjL/1Qp3Ov6A/o8sH+eC6yMWoooqz/conn/b08cSEkp8i6joOOm QXNDjBueKdh47X/wYqqKhs2b3wOdZaWH6eBYM= 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=VrxhjzvmVLpjZ31oRbZr9enU4R13jK2t/w6FGhr9gIk=; b=SKcbtYEIfSzyDtqoFz1qWFDuouKkzDV6UOt0QWMLXOFW3G13L1qJnV2xtVNfeaNiUZ ouDAXELP7wMX0rb/zktcT+Au3Sflb5dXQQMsziP6fgYIg+IEkVBKfgEw9fnC9e+u5Y5P QfTumsFQW22KP/XpO6QNqwoFJBsLzRzjNhIBRSnJMHjAXYijAYHD5bKTrN3p3tqUcXDO ekGPshGMHYnj2zSRc96kq4c2r62qbLP43DIyhv5Jf23mCSjxmmgJRge//5nfJMUF3UXg oRqnQrsBh/DjowPe39N2mCIMf6XSUozmhpNJqwNS6TGFke7VsEuE7k2a8lgCNXe9vekH dVLA== X-Gm-Message-State: AKS2vOzh5Z55Ovbx92sgiKq4J+rUEH95szi7ipXZ5BLGEvkEnZZjMzaW 81OuqqLQvgUwn8Ke X-Received: by 10.28.24.213 with SMTP id 204mr2336673wmy.15.1498746107262; Thu, 29 Jun 2017 07:21:47 -0700 (PDT) X-Mailer: git-send-email 2.0.2 Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 65 Organization: linux.* mail to news gateway X-Original-Cc: martin.petersen@oracle.com, linux-scsi@vger.kernel.org, Sathya.Prakash@broadcom.com, kashyap.desai@broadcom.com, krishnaraddi.mankani@broadcom.com, linux-kernel@vger.kernel.org, suganath-prabu.subramani@broadcom.com, chaitra.basappa@broadcom.com, sreekanth.reddy@broadcom.com X-Original-Date: Thu, 29 Jun 2017 19:49:12 +0530 X-Original-Message-ID: <1498745954-7907-12-git-send-email-suganath-prabu.subramani@broadcom.com> X-Original-References: <1498745954-7907-1-git-send-email-suganath-prabu.subramani@broadcom.com> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1677814 Check for NVMe drives before enabling or checking tlr. Signed-off-by: Chaitra P B Signed-off-by: Suganath Prabu S --- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c index b96da33..4d71ef7 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -2013,6 +2013,14 @@ scsih_is_raid(struct device *dev) return (sdev->channel == RAID_CHANNEL) ? 1 : 0; } +static int +scsih_is_nvme(struct device *dev) +{ + struct scsi_device *sdev = to_scsi_device(dev); + + return (sdev->channel == PCIE_CHANNEL) ? 1 : 0; +} + /** * scsih_get_resync - get raid volume resync percent complete * @dev the device struct object @@ -4810,8 +4818,9 @@ scsih_qcmd(struct Scsi_Host *shost, struct scsi_cmnd *scmd) /* Make sure Device is not raid volume. * We do not expose raid functionality to upper layer for warpdrive. */ - if (!ioc->is_warpdrive && !scsih_is_raid(&scmd->device->sdev_gendev) - && sas_is_tlr_enabled(scmd->device) && scmd->cmd_len != 32) + if (((!ioc->is_warpdrive && !scsih_is_raid(&scmd->device->sdev_gendev)) + && !scsih_is_nvme(&scmd->device->sdev_gendev)) + && sas_is_tlr_enabled(scmd->device) && scmd->cmd_len != 32) mpi_control |= MPI2_SCSIIO_CONTROL_TLR_ON; smid = mpt3sas_base_get_smid_scsiio(ioc, ioc->scsi_io_cb_idx, scmd); @@ -4856,8 +4865,8 @@ scsih_qcmd(struct Scsi_Host *shost, struct scsi_cmnd *scmd) raid_device = sas_target_priv_data->raid_device; if (raid_device && raid_device->direct_io_enabled) - mpt3sas_setup_direct_io(ioc, scmd, raid_device, mpi_request, - smid); + mpt3sas_setup_direct_io(ioc, scmd, + raid_device, mpi_request, smid); if (likely(mpi_request->Function == MPI2_FUNCTION_SCSI_IO_REQUEST)) { if (sas_target_priv_data->flags & MPT_TARGET_FASTPATH_IO) { @@ -5405,9 +5414,10 @@ _scsih_io_done(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index, u32 reply) le32_to_cpu(mpi_reply->ResponseInfo) & 0xFF; if (!sas_device_priv_data->tlr_snoop_check) { sas_device_priv_data->tlr_snoop_check++; - if (!ioc->is_warpdrive && + if ((!ioc->is_warpdrive && !scsih_is_raid(&scmd->device->sdev_gendev) && - sas_is_tlr_enabled(scmd->device) && + !scsih_is_nvme(&scmd->device->sdev_gendev)) + && sas_is_tlr_enabled(scmd->device) && response_code == MPI2_SCSITASKMGMT_RSP_INVALID_FRAME) { sas_disable_tlr(scmd->device); sdev_printk(KERN_INFO, scmd->device, "TLR disabled\n"); -- 1.7.1