From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A0E87443C0F; Mon, 14 Sep 2026 11:39:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789385969; cv=none; b=VjPZCtUzeNTjc4xqn9liqV7P0gEVbRY6pmgCTV4msjS6pVjRWuC4njVyaiBvnGy/syDCKwwaKoWXZi5+EXONCZDXWiwJQQwazv4L5kH2CW+I7xikqTCvYRB/rDjFsvagpInFqfznTsn5q+jiQ46fOk2M72jt5mxmoFDzrpYw0os= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789385969; c=relaxed/simple; bh=oor2NDHiDaqQSgzpct7sf2GKbcOfNhc9ZjhJEf/isOA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=b7VK9B0KgqRUkMqwWDDjzl4L5/a024zz0LHL7Q/tnPYRTY1moiY2K9JXK2QRgyLpi5gpEtHhuxSx3G0Uf5U1cvhXecsQ3fiP/TC2xQFW2ISqxCGWmTVtKbmwkkfcKRQSThmCyD9+xzYPjTygNQdnlaveHDevPhWIGxGFqKJFPDo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=maxQRTnF; arc=none smtp.client-ip=148.251.105.195 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.b="maxQRTnF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1789385965; bh=oor2NDHiDaqQSgzpct7sf2GKbcOfNhc9ZjhJEf/isOA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=maxQRTnFs0o3m4n4Qvoqa2usM+ltQKXtzhswOBmRIYMapRy3IurHbVRaoHxngx++j 6g0bW2zplwfP5iSGD1cS2IBzpZxQmJnFsqBAdRPcRJ2NO6qsHzMoRzpvLtCTdJd+0n YDjFZfbSfZhg6zmFo4ZT5x3egAZGPEllcJ1s/0v9zb9WY/a9RIEXEW38BOe0jhIarJ Yq5G4LSk9qiL9OV32A8fwcXcGd1lA3EQjkMfXHjMWQ/VORjIWW7fBcrb8Iq2Ohm81I MTp2QM3PyxjFmd4QCCB5bmykcoIjMyvr+eSMROYmzWbfI455sq19H82elzpYWD1V47 APJ/b2cRwNnWA== 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 E64AC17E08A1; Mon, 14 Sep 2026 13:39:23 +0200 (CEST) From: Louis-Alexis Eyraud Date: Mon, 14 Sep 2026 13:38:56 +0200 Subject: [PATCH v12 10/24] scsi: ufs: mediatek: Rework the crypt-boost stuff Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20260914-mt8196-ufs-v12-10-9279d7ef814d@collabora.com> References: <20260914-mt8196-ufs-v12-0-9279d7ef814d@collabora.com> In-Reply-To: <20260914-mt8196-ufs-v12-0-9279d7ef814d@collabora.com> To: Chunfeng Yun , Vinod Koul , Neil Armstrong , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Peter Wang , Chaotian Jing , Alim Akhtar , Avri Altman , Bart Van Assche , Stanley Jhu , "James E.J. Bottomley" , Philipp Zabel , Liam Girdwood , Mark Brown , Manivannan Sadhasivam , "Martin K. Petersen" 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=1789385943; l=4293; i=louisalexis.eyraud@collabora.com; s=20250113; h=from:subject:message-id; bh=QmHMe9SNsPNb3PxMp5MFOHQX7hvRU18z+upxvLaR3+o=; b=m49APqd+1CHTIki3MXV/wB46nc7hRMsv7yOZpgpsvrzJ8VXfIbJTD0EYRfVvlANvgP1gnz3s5 zuzRlMFUqfhAh3IBpZCESIU0RxJj+5NUmNNYuN6sNEqvPlI/KrpYW1m X-Developer-Key: i=louisalexis.eyraud@collabora.com; a=ed25519; pk=CHFBDB2Kqh4EHc6JIqFn69GhxJJAzc0Zr4e8QxtumuM= From: Nicolas Frattaroli I don't know whether the crypt-boost functionality as it is currently implemented is even appropriate for mainline. It might be better done in some generic way. But what I do know is that I can rework the code to make it less obtuse. Prefix the boost stuff with the appropriate vendor prefix, remove the pointless clock wrappers, and rework the function. 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 | 89 ++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 58 deletions(-) diff --git a/drivers/ufs/host/ufs-mediatek.c b/drivers/ufs/host/ufs-mediatek.c index 2543810fcef3..4e6182d2cb6d 100644 --- a/drivers/ufs/host/ufs-mediatek.c +++ b/drivers/ufs/host/ufs-mediatek.c @@ -596,21 +596,6 @@ static int ufs_mtk_mphy_power_on(struct ufs_hba *hba, bool on) return 0; } -static int ufs_mtk_get_host_clk(struct device *dev, const char *name, - struct clk **clk_out) -{ - struct clk *clk; - int err = 0; - - clk = devm_clk_get(dev, name); - if (IS_ERR(clk)) - err = PTR_ERR(clk); - else - *clk_out = clk; - - return err; -} - static void ufs_mtk_boost_crypt(struct ufs_hba *hba, bool boost) { struct ufs_mtk_host *host = ufshcd_get_variant(hba); @@ -667,65 +652,53 @@ static void ufs_mtk_boost_crypt(struct ufs_hba *hba, bool boost) clk_disable_unprepare(cfg->clk_crypt_mux); } -static int ufs_mtk_init_host_clk(struct ufs_hba *hba, const char *name, - struct clk **clk) -{ - int ret; - - ret = ufs_mtk_get_host_clk(hba->dev, name, clk); - if (ret) { - dev_info(hba->dev, "%s: failed to get %s: %d", __func__, - name, ret); - } - - return ret; -} - static void ufs_mtk_init_boost_crypt(struct ufs_hba *hba) { struct ufs_mtk_host *host = ufshcd_get_variant(hba); struct ufs_mtk_crypt_cfg *cfg; struct device *dev = hba->dev; - struct regulator *reg; u32 volt; + int ret; - host->crypt = devm_kzalloc(dev, sizeof(*(host->crypt)), - GFP_KERNEL); - if (!host->crypt) - goto disable_caps; + cfg = devm_kzalloc(dev, sizeof(*cfg), GFP_KERNEL); + if (!cfg) + return; - reg = devm_regulator_get_optional(dev, "dvfsrc-vcore"); - if (IS_ERR(reg)) { - dev_info(dev, "failed to get dvfsrc-vcore: %ld", - PTR_ERR(reg)); - goto disable_caps; + cfg->reg_vcore = devm_regulator_get_optional(dev, "dvfsrc-vcore"); + if (IS_ERR(cfg->reg_vcore)) { + dev_err(dev, "Failed to get dvfsrc-vcore: %pe\n", cfg->reg_vcore); + return; } - if (of_property_read_u32(dev->of_node, "boost-crypt-vcore-min", - &volt)) { - dev_info(dev, "failed to get boost-crypt-vcore-min"); - goto disable_caps; + ret = of_property_read_u32(dev->of_node, "mediatek,boost-crypt-vcore-min", + &volt); + if (ret) { + dev_err(dev, "Failed to get mediatek,boost-crypt-vcore-min: %pe\n", + ERR_PTR(ret)); + return; } + cfg->vcore_volt = volt; - cfg = host->crypt; - if (ufs_mtk_init_host_clk(hba, "crypt_mux", - &cfg->clk_crypt_mux)) - goto disable_caps; + cfg->clk_crypt_mux = devm_clk_get(dev, "crypt_mux"); + if (IS_ERR(cfg->clk_crypt_mux)) { + dev_err(dev, "Failed to get clock crypt_mux: %pe\n", cfg->clk_crypt_mux); + return; + } - if (ufs_mtk_init_host_clk(hba, "crypt_lp", - &cfg->clk_crypt_lp)) - goto disable_caps; + cfg->clk_crypt_lp = devm_clk_get(dev, "crypt_lp"); + if (IS_ERR(cfg->clk_crypt_lp)) { + dev_err(dev, "Failed to get clock crypt_lp: %pe\n", cfg->clk_crypt_lp); + return; + } - if (ufs_mtk_init_host_clk(hba, "crypt_perf", - &cfg->clk_crypt_perf)) - goto disable_caps; + cfg->clk_crypt_perf = devm_clk_get(dev, "crypt_perf"); + if (IS_ERR(cfg->clk_crypt_perf)) { + dev_err(dev, "Failed to get clock crypt_perf: %pe\n", cfg->clk_crypt_perf); + return; + } - cfg->reg_vcore = reg; - cfg->vcore_volt = volt; + host->crypt = cfg; host->caps |= UFS_MTK_CAP_BOOST_CRYPT_ENGINE; - -disable_caps: - return; } static void ufs_mtk_init_host_caps(struct ufs_hba *hba) -- 2.55.0