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,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 DDCD1C432C0 for ; Fri, 22 Nov 2019 05:54:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA03C2070A for ; Fri, 22 Nov 2019 05:54:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574402048; bh=0bjOreP6UDoqpGwH7kw2cdj5GUpaPE5SJN+86FJfrLs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=uVCD37bHqR2wppoPiWXGNZCf0eQ92Brc7xpzJ8tKvhOA6+oMPaTrMY2pSb4KmHSGl 5ISG0xP1rPdgYv6EkzNGdLxV8YvZrcH9t7FFBXqpU4/Yff23ixKeIyf4fC+dP3h5Zn 29F7yd4zTPmb22zEXi1JHXWGM2kxbyGFE0m/XkD8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727967AbfKVFyI (ORCPT ); Fri, 22 Nov 2019 00:54:08 -0500 Received: from mail.kernel.org ([198.145.29.99]:59226 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727637AbfKVFxN (ORCPT ); Fri, 22 Nov 2019 00:53:13 -0500 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 A28112068F; Fri, 22 Nov 2019 05:53:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574401992; bh=0bjOreP6UDoqpGwH7kw2cdj5GUpaPE5SJN+86FJfrLs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JLA64H4z1E5/40H1Flsih58h+5WRau2VHyhBWRUcJEug0/c+VIOaa2wmD02ijL8Cs N9n0Yh63TsjS/xf/B899pCxgNjav0rm8mbUTYi3PO/isTk+sjXneEZ3tDmk8ITviAk 3I5XSruvvJTGG3pirU1eU2O+XtM7TRyVHgj2+9ds= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: John Garry , Jian Luo , "Martin K . Petersen" , Sasha Levin , linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 210/219] scsi: libsas: Check SMP PHY control function result Date: Fri, 22 Nov 2019 00:49:01 -0500 Message-Id: <20191122054911.1750-202-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191122054911.1750-1-sashal@kernel.org> References: <20191122054911.1750-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: John Garry [ Upstream commit 01929a65dfa13e18d89264ab1378854a91857e59 ] Currently the SMP PHY control execution result is checked, however the function result for the command is not. As such, we may be missing all potential errors, like SMP FUNCTION FAILED, INVALID REQUEST FRAME LENGTH, etc., meaning the PHY control request has failed. In some scenarios we need to ensure the function result is accepted, so add a check for this. Tested-by: Jian Luo Signed-off-by: John Garry Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/libsas/sas_expander.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c index 23b5516e80304..c6ed75b6abeec 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c @@ -614,7 +614,14 @@ int sas_smp_phy_control(struct domain_device *dev, int phy_id, } res = smp_execute_task(dev, pc_req, PC_REQ_SIZE, pc_resp,PC_RESP_SIZE); - + if (res) { + pr_err("ex %016llx phy%02d PHY control failed: %d\n", + SAS_ADDR(dev->sas_addr), phy_id, res); + } else if (pc_resp[2] != SMP_RESP_FUNC_ACC) { + pr_err("ex %016llx phy%02d PHY control failed: function result 0x%x\n", + SAS_ADDR(dev->sas_addr), phy_id, pc_resp[2]); + res = pc_resp[2]; + } kfree(pc_resp); kfree(pc_req); return res; -- 2.20.1