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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2898ACCD193 for ; Thu, 23 Oct 2025 19:52:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=2aDKj6WNDWNLHF3f3XJYCSyGQVnYFF06NugjrW7Y14w=; b=UFEFm+yhkSCJSyVsIYRtJSqKJP G9i28ezktJr6avMJTIm35ZJ4y159Oz272e1jtSUDsxFYXlhgv+SzoJ22XcFtTSfOwZsq7QJX0cix+ qWDvCXxpAzsdW8k/uQ9hA+6NQGEEh1I1+mmqXi8IJdfMfRtxH6kpF5t9jIti05wAcyi/fAvhaoXna 5Ijp/SLZ3PABs8r38cLX7DD37P5bjEzKROocAAE7LVVJeFzpE/4+DVOqa9cw0f1BUPmtFgTzuss/4 hLuAAV6rkvfu8byJOtXYNjqtog50fRGK+XSwh70Mx1e1hM/ro4+9DTIar4a0tGexmGxnVmsqVeVn+ 46U+1+vw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vC1Lx-00000007QnY-01zQ; Thu, 23 Oct 2025 19:52:05 +0000 Received: from sender4-pp-f112.zoho.com ([136.143.188.112]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vC1Lr-00000007Qgk-21ts; Thu, 23 Oct 2025 19:52:01 +0000 ARC-Seal: i=1; a=rsa-sha256; t=1761249108; cv=none; d=zohomail.com; s=zohoarc; b=UjYck4NtCRh07bo3PLr54WhHz9HjjPWD9/RO5RcsuofaTM3XS2OnqkfKfER7HmJ0x2mOnJ0kymJwOF/7HDuNWVkGQIPoaxYzCZSDzbMT7OlsqlqjgoZ8jc/M3DAWHtfZMId0tuwbfbSMV2sLjZ0X9pTZ5yViwKBc0y+154Qr5sA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761249108; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=2aDKj6WNDWNLHF3f3XJYCSyGQVnYFF06NugjrW7Y14w=; b=SrZPIDKNJpJAw6FYX6n1AavMV8N6sO+ErxWW9OOEyX0FjNaI5nQATkDTPY5zBhW3NSWJ9Ce3DoMl8dACAUi/7dgeIZqSRY5fGjWGXElKsfvUjlCuz5X2UTPGes8/4/yfu2t18X4uy22aRF2SzOCOY4l4qMSfEP8zF2eScdl/KR4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=nicolas.frattaroli@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1761249108; s=zohomail; d=collabora.com; i=nicolas.frattaroli@collabora.com; h=From:From:Date:Date:Subject:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Message-Id:References:In-Reply-To:To:To:Cc:Cc:Reply-To; bh=2aDKj6WNDWNLHF3f3XJYCSyGQVnYFF06NugjrW7Y14w=; b=AUU/Z/tf+JwCpPfvqGN7ErU9Hcl/M9Iy6LHsBA6OXHA1Bt2NORmkShfXvxilfSE7 CHZq2eAu/fBeM8UCN9YNBFiYrfdP9/h2wdJfRqRMjxWTpyuEWLpbo6jk5+uJbw1rM9E RrYp0lTiqLYkH6DCy6vt+lL+0jE2fGCHJNYo0XAs= Received: by mx.zohomail.com with SMTPS id 1761249106241227.6363113071401; Thu, 23 Oct 2025 12:51:46 -0700 (PDT) From: Nicolas Frattaroli Date: Thu, 23 Oct 2025 21:49:33 +0200 Subject: [PATCH v3 15/24] scsi: ufs: mediatek: Rework _ufs_mtk_clk_scale error paths MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251023-mt8196-ufs-v3-15-0f04b4a795ff@collabora.com> References: <20251023-mt8196-ufs-v3-0-0f04b4a795ff@collabora.com> In-Reply-To: <20251023-mt8196-ufs-v3-0-0f04b4a795ff@collabora.com> To: Alim Akhtar , Avri Altman , Bart Van Assche , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Chunfeng Yun , Vinod Koul , Kishon Vijay Abraham I , Peter Wang , Stanley Jhu , "James E.J. Bottomley" , "Martin K. Petersen" , Philipp Zabel , Liam Girdwood , Mark Brown Cc: Louis-Alexis Eyraud , kernel@collabora.com, linux-scsi@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-phy@lists.infradead.org, Nicolas Frattaroli X-Mailer: b4 0.14.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20251023_125159_586326_AAE25036 X-CRM114-Status: GOOD ( 13.30 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Errors should be printed at the correct log level. Additionally, it looks like some "goto out"'s were omitted in the scale up case, which looks like a mistake, as the scale down branch of the code does use them. Rework the error messages to make them nicer and at the correct verbosity, and add the missing gotos. Signed-off-by: Nicolas Frattaroli --- drivers/ufs/host/ufs-mediatek.c | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/drivers/ufs/host/ufs-mediatek.c b/drivers/ufs/host/ufs-mediatek.c index 44676ba4c392..7a890302c240 100644 --- a/drivers/ufs/host/ufs-mediatek.c +++ b/drivers/ufs/host/ufs-mediatek.c @@ -1948,16 +1948,16 @@ static void _ufs_mtk_clk_scale(struct ufs_hba *hba, bool scale_up) ret = clk_prepare_enable(clki->clk); if (ret) { - dev_info(hba->dev, - "clk_prepare_enable() fail, ret: %d\n", ret); + dev_err(hba->dev, "%s: Failed to enable clock: %pe\n", __func__, ERR_PTR(ret)); return; } if (clk_fde_scale) { ret = clk_prepare_enable(fde_clki->clk); if (ret) { - dev_info(hba->dev, - "fde clk_prepare_enable() fail, ret: %d\n", ret); + dev_err(hba->dev, "%s: Failed to enable FDE clock: %pe\n", + __func__, ERR_PTR(ret)); + clk_disable_unprepare(clki->clk); return; } } @@ -1966,51 +1966,48 @@ static void _ufs_mtk_clk_scale(struct ufs_hba *hba, bool scale_up) if (clk_bind_vcore) { ret = regulator_set_voltage(reg, volt, INT_MAX); if (ret) { - dev_info(hba->dev, - "Failed to set vcore to %d\n", volt); + dev_err(hba->dev, "Failed to set vcore to %d\n", volt); goto out; } } ret = clk_set_parent(clki->clk, mclk->ufs_sel_max_clki->clk); if (ret) { - dev_info(hba->dev, "Failed to set clk mux, ret = %d\n", - ret); + dev_err(hba->dev, "%s: Failed to set clock mux: %pe\n", + __func__, ERR_PTR(ret)); + goto out; } if (clk_fde_scale) { - ret = clk_set_parent(fde_clki->clk, - mclk->ufs_fde_max_clki->clk); + ret = clk_set_parent(fde_clki->clk, mclk->ufs_fde_max_clki->clk); if (ret) { - dev_info(hba->dev, - "Failed to set fde clk mux, ret = %d\n", - ret); + dev_err(hba->dev, "%s: Failed to set fde clock mux: %pe\n", + __func__, ERR_PTR(ret)); + goto out; } } } else { if (clk_fde_scale) { - ret = clk_set_parent(fde_clki->clk, - mclk->ufs_fde_min_clki->clk); + ret = clk_set_parent(fde_clki->clk, mclk->ufs_fde_min_clki->clk); if (ret) { - dev_info(hba->dev, - "Failed to set fde clk mux, ret = %d\n", - ret); + dev_err(hba->dev, "%s: Failed to set fde clock mux: %pe\n", + __func__, ERR_PTR(ret)); goto out; } } ret = clk_set_parent(clki->clk, mclk->ufs_sel_min_clki->clk); if (ret) { - dev_info(hba->dev, "Failed to set clk mux, ret = %d\n", - ret); + dev_err(hba->dev, "%s: Failed to set clock mux: %pe\n", + __func__, ERR_PTR(ret)); goto out; } if (clk_bind_vcore) { ret = regulator_set_voltage(reg, 0, INT_MAX); if (ret) { - dev_info(hba->dev, - "failed to set vcore to MIN\n"); + dev_err(hba->dev, "%s: Failed to set vcore to minimum: %pe\n", + __func__, ERR_PTR(ret)); } } } -- 2.51.1.dirty