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 CCC3ECCD193 for ; Thu, 23 Oct 2025 19:51:38 +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=b6NzRNKiv3Nyg0F/aRgR7DPEXa3XyvQBX/ydFnGvTNg=; b=IXZMtNr7UkjFDh05RJPrY91jvx j9g87rNKIPnFesMpT6jlIjHY6+WneYg2sBck1jauAStEpTBrO9NxLVLDF2sIfDQJB4k/p+KSRvrr0 ApMnIIt6OX8uTCuv3dOOM2pVVu6MEGOH12giX2xuvhRh5l/+p9ET7qV1qqKRteHeagv5qSA0ISI73 zI2ab3a5Knqo0LslmiEeswxaQs9aitykkDCFIhTjhTkBHB1FzCRsTnIq+Pi0pFRuVzTI5jEDzBzAp 4RTK851IvXQDIjNbNClQlFo8OeEraYEi0wbtrB5lt7A6SNzAxgFjuQs/hhSO70LvesMyfmNMsbYkS nHqsDUqQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vC1LQ-00000007QCX-023u; Thu, 23 Oct 2025 19:51:32 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vC1LL-00000007Q6P-0fHI; Thu, 23 Oct 2025 19:51:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Sender:Reply-To:Content-ID:Content-Description; bh=b6NzRNKiv3Nyg0F/aRgR7DPEXa3XyvQBX/ydFnGvTNg=; b=ntSCTdKc3b1OymFtirNAAFqM6N SF97aAlHjy29F53p3Hhaph6tycJqq6z1YywcCePgFdCHDR3ZJHs1SEi0zvK+3m0tDdeZV4z30QMxr /ajRr13WtY40PeknYh0FHfbkbOa4yF/Tlh5G6a2QmLmqG8CWJMFMw1ne5lWPsfC9hx11xtc4NwSII gKXJAmA2AMnZEc62jtlKZ2VhMjynWdm+vbENf5jRxV7fJrx4U5ZqQ9TNc/q/ybg7Kho5XGdNtwOMO GkZO5YJE48HlWpYmF/w5MNoAZYQfrnwM/KEWro13S5A6mLH9x/XANEicsTqSotBGt8Q3WQu7Ytqxj Tjb0oasA==; Received: from sender4-pp-f112.zoho.com ([136.143.188.112]) by desiato.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vC0Td-00000001gBS-0bKC; Thu, 23 Oct 2025 18:55:59 +0000 ARC-Seal: i=1; a=rsa-sha256; t=1761249070; cv=none; d=zohomail.com; s=zohoarc; b=kh2DOk86wNOd/SNL8t9Y2k595JSm+vN0O7rsHjVHuHBlUNJIS/kxMXKVRs74WO4tek3YKaxg8RoREl5LhWL+CBiU0T6nmaRsZRLM9aw+QVCrqmyh5aPCZPQOsokpIjxY04TyRLFyrq0/Ffm0ux32HHPKurCZ1JJYCiIYkOxhJHw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761249070; 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=b6NzRNKiv3Nyg0F/aRgR7DPEXa3XyvQBX/ydFnGvTNg=; b=b9PAMB9hZVZp+CMz92vuH+nQqtqyyOeC/CA1ognpgJD1el6s4X8mry96g+ZtB0qs9VjQwxdQu/cA6xAN9Adz12W+52ZunD/yPyp5wMUEIlauG0raE++QPom/1bz8DXjznSVCJ4//SmTjySoEWf41AOlkIfxGTIpsV7c1Pzvfbjo= 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=1761249070; 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=b6NzRNKiv3Nyg0F/aRgR7DPEXa3XyvQBX/ydFnGvTNg=; b=EfYbZfF7gbLSTnK6tv97bD76v7y0QIB01K1i5OyKHvmuTUmY9dbLD3Q6OWAKoApW Ic30PWMym9eQiR0bCwQQUktstXeON5E7F3hdiA0g7CQWc5Jw26xcvQZTSn8IdkD4t5K 9L/bMuUrCXdDqNn4CecSOumeQepgXbdb0WzBmPpw= Received: by mx.zohomail.com with SMTPS id 1761249069163707.8494877333445; Thu, 23 Oct 2025 12:51:09 -0700 (PDT) From: Nicolas Frattaroli Date: Thu, 23 Oct 2025 21:49:27 +0200 Subject: [PATCH v3 09/24] scsi: ufs: mediatek: Rework the crypt-boost stuff MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251023-mt8196-ufs-v3-9-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_195557_727494_12F0A586 X-CRM114-Status: GOOD ( 15.09 ) 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 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. Signed-off-by: Nicolas Frattaroli --- drivers/ufs/host/ufs-mediatek.c | 91 +++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 59 deletions(-) diff --git a/drivers/ufs/host/ufs-mediatek.c b/drivers/ufs/host/ufs-mediatek.c index 131f71145a12..9c0ac72d6e43 100644 --- a/drivers/ufs/host/ufs-mediatek.c +++ b/drivers/ufs/host/ufs-mediatek.c @@ -562,21 +562,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); @@ -633,65 +618,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) +static int 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 -ENOMEM; - 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", cfg->reg_vcore); + return PTR_ERR(cfg->reg_vcore); } - 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", + &cfg->vcore_volt); + if (ret) { + dev_err(dev, "Failed to get mediatek,boost-crypt-vcore-min: %pe\n", + ERR_PTR(ret)); + return ret; } - 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 PTR_ERR(cfg->clk_crypt_mux); + } - 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 PTR_ERR(cfg->clk_crypt_lp); + } - 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 PTR_ERR(cfg->clk_crypt_perf); + } - cfg->reg_vcore = reg; - cfg->vcore_volt = volt; + host->crypt = cfg; host->caps |= UFS_MTK_CAP_BOOST_CRYPT_ENGINE; -disable_caps: - return; + return 0; } static void ufs_mtk_init_host_caps(struct ufs_hba *hba) -- 2.51.1.dirty