From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 7BE1BC2BB86 for ; Sat, 11 Apr 2020 23:06:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4718D20787 for ; Sat, 11 Apr 2020 23:06:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586646397; bh=GoiEiaxMkSmC3deUYvrLpIzfI0ZOZrg8e1NxkKqlHEk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FYBeOHVpvgIqafcKGmqO/HJGncH6+sq2q/Hk7LBLtlX1r8KZMlhzdgYOV3I1/6vhE 4YUe8KLzNVIA1tH9IVps/sTWXvE1gwUQlxjzPpl27XFUhw4HZSLzRm7uKif7n4ljL/ IpwvAvXb+ukYgvefS/YP/Dh2xieoizcum5nrsSTU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728456AbgDKXGf (ORCPT ); Sat, 11 Apr 2020 19:06:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:41746 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728398AbgDKXG0 (ORCPT ); Sat, 11 Apr 2020 19:06:26 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 87C1720787; Sat, 11 Apr 2020 23:06:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586646386; bh=GoiEiaxMkSmC3deUYvrLpIzfI0ZOZrg8e1NxkKqlHEk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vJh2Pm38SNZp7Q/nBWEoAUa+KwKr7TDIbvcuibrRlGi5WKjsO31IHhmjipKaYQHP8 NtD/ukNcwykOHNHSbmgiqIZQlnEAjdBWK1BBUKZ5DQ1a+yxgR1KcusU93o+eD7hGBD elxvxdcEuZOpF1C4KRPJHgyuWBtG2vAFwEy6Jhzc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Himanshu Madhani , "Martin K . Petersen" , Sasha Levin , linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 5.6 126/149] scsi: qla2xxx: Add fixes for mailbox command Date: Sat, 11 Apr 2020 19:03:23 -0400 Message-Id: <20200411230347.22371-126-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200411230347.22371-1-sashal@kernel.org> References: <20200411230347.22371-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Himanshu Madhani [ Upstream commit 345f574dac85276d1471492c6e90c57e3f90a4f3 ] This patch fixes: - qla2x00_issue_iocb_timeout will now return if chip is down - only check for sp->qpair in abort handling Link: https://lore.kernel.org/r/20200212214436.25532-24-hmadhani@marvell.com Signed-off-by: Himanshu Madhani Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/qla2xxx/qla_mbx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c index 9e09964f5c0e4..f0846ce0c4da4 100644 --- a/drivers/scsi/qla2xxx/qla_mbx.c +++ b/drivers/scsi/qla2xxx/qla_mbx.c @@ -1405,6 +1405,9 @@ qla2x00_issue_iocb_timeout(scsi_qla_host_t *vha, void *buffer, mbx_cmd_t mc; mbx_cmd_t *mcp = &mc; + if (qla2x00_chip_is_down(vha)) + return QLA_INVALID_COMMAND; + ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1038, "Entered %s.\n", __func__); @@ -1475,7 +1478,7 @@ qla2x00_abort_command(srb_t *sp) ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x103b, "Entered %s.\n", __func__); - if (vha->flags.qpairs_available && sp->qpair) + if (sp->qpair) req = sp->qpair->req; else req = vha->req; -- 2.20.1