From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=148.251.105.195 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795100797; b=uG8GGj6VOj58bmlc81DK8XQfVvpVkhwD1uzbJTV+lvKtevUTFnfB+lAODB1HR/HdnoQN CMqwxI6YFQfrsZflP5ZIEKMfyloHISW7l3r3DdLEbuMW87uIHL+g5OV2Nc9FEGJJ87EsQ 5EiBKyTXdJEBGiWzO1/ojnoKu8l9wH79AumwXxQSStsE50yWja+Lk9f+4vOv6tnsJZqzl HexjXvm1ZrzhMtICyySapsoyPh7xPITiYBVlf48NMxj+QSNU7/TMvixP3Oim5irEedtD0 uwvavUAuVGxLCeyL9q9tOl/S/Oh4AF8nkVVFwBssveBXhig+6PGLb18o3S+rbwXHZPA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795100797; h=DMARC-Filter:DKIM-Signature:Received:From:Date:Subject:MIME-Version: Content-Type:Content-Transfer-Encoding:Message-Id:References: In-Reply-To:To:Cc:X-Mailer:X-Developer-Signature:X-Developer-Key; bh=Gj80eFwLVU+/fgnvvJuLEDqSQSHxEoPKHAJ/FUE09Q4=; b=FkJIEwfItHO6cpAd/59ZEkMs6p1VFYmdUrlQdfN0p6nU0HOoDfsdCrjoXJeR+sjV65t/ DwbHgMZInC3j9HgdugD8KTSe98j8/fldqI/4g0+l2AQwXNWDI+nXV9dr2yFr0KAAfAB6Z FDpXwXYoA/W03kk2i/WHbdLf6EeBDScKZ1VuSIf4eQzgjCKhGXuGb+BTta1IFAO2rGpHr 39fPgN2kavg6z05xYPKmeEHfjWJ7wPFJct90BDd/gBAyv92MO71dLTtHsFQC17rXjrBQN b2ES4xRPxoQYQ1OP9jTEu2QBnpL0xY+3zkY08x/Ewd5TZfAZNh+OcC7O1BSAorZ+5hA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass header.d=collabora.com header.i=@collabora.com header.a=rsa-sha256 header.s=mail header.b=cVS0wmR2; arc=none smtp.remote-ip=148.251.105.195 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E95FE606A7D4; Thu, 19 Nov 2026 15:06:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org E95FE606A7D4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.a=rsa-sha256 header.s=mail header.b=cVS0wmR2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1795100795; bh=A9VjgMSqumxrtw2DbGIUmrnMN89AOdNrasbN/EgDoNA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=cVS0wmR2XJgNUS890aQWy7+WFlomDRRRb8QBwYMDdwMzIwHRnBSDEYJMk7Yz4Q+t3 rl7gN/egQPSeXBO/VA59KjOXZx7jpoKk9frFE6JZ5WbZyeMlt7hl5kMfB0HUdMNlVf 2f6fowFsvW64LVWJ/uNl+nvRtxrpL2s/OU2SMBjCcbQRpU8Ov9aO68GiI8nWQll4wL Hv5qbhBdXKQz+amoPjINmnUNmWsr4toddpwOisp+/4YMElH7SjlasK0XzbdKpCrRXB qxOH1sVKB3mvtxhgFWL4VSu0Ut4El+uk7V0EUK4gDT13DSv3umgcqC+Zt+WIg2xMT/ rdRQ/8RngJnTA== Received: from yukiji.home (unknown [100.64.0.131]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: laeyraud) by bali.collaboradmins.com (Postfix) with ESMTPSA id 6079717E0DF7; Thu, 19 Nov 2026 16:06:34 +0100 (CET) From: Louis-Alexis Eyraud Date: Thu, 19 Nov 2026 16:06:04 +0100 Subject: [PATCH v15 16/23] scsi: ufs: mediatek: Rework _ufs_mtk_clk_scale error paths X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261119-mt8196-ufs-v15-16-aae1eb0382e8@collabora.com> References: <20261119-mt8196-ufs-v15-0-aae1eb0382e8@collabora.com> In-Reply-To: <20261119-mt8196-ufs-v15-0-aae1eb0382e8@collabora.com> To: Chunfeng Yun , Vinod Koul , Neil Armstrong , Manivannan Sadhasivam , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Peter Wang , Chaotian Jing , Alim Akhtar , Bart Van Assche , Bean Huo , Stanley Jhu , Stanley Jhu , "James E.J. Bottomley" , "Martin K. Petersen" , Philipp Zabel , Liam Girdwood , Mark Brown Cc: kernel@collabora.com, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, Nicolas Frattaroli , Louis-Alexis Eyraud X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1795100772; l=3592; i=louisalexis.eyraud@collabora.com; s=20250113; h=from:subject:message-id; bh=FPVniDw1EdLU1wktobUF42pCYakkfDIcqzwcW/hDOrQ=; b=x8R+uS0tAYHSYAJ4E1ylIrfoJXVHZ8ZqfymT1fXDN1G84Ufg6pgSnWu+uarI/bbVDPYoEBYop bByioBjjW0xAAXTLLzgWraqsD295VVwPr9t8NcY+/8qqvGkHGALQPVw X-Developer-Key: i=louisalexis.eyraud@collabora.com; a=ed25519; pk=CHFBDB2Kqh4EHc6JIqFn69GhxJJAzc0Zr4e8QxtumuM= From: Nicolas Frattaroli 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. Reviewed-by: AngeloGioacchino Del Regno Reviewed-by: Peter Wang Signed-off-by: Nicolas Frattaroli Signed-off-by: Louis-Alexis Eyraud --- 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 c496fafe9788..8c750dbd75e9 100644 --- a/drivers/ufs/host/ufs-mediatek.c +++ b/drivers/ufs/host/ufs-mediatek.c @@ -2045,16 +2045,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; } } @@ -2063,51 +2063,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.56.1