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 C0AC3C88E50 for ; Mon, 14 Sep 2026 11:41:18 +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=TwuDmXTp/yMxS4PJLBICIbT6xalVWkCdf6vuQT6g2zU=; b=c2j0WQED9Vytm/l+k2d8TBqzVa z/ScqoTmNueggQdT30yY5W20l9gpQcoxiHMErI/JJrzPk8NA38jGy4kwingxo6D9iO8IsJXQg4l6E awiUweZNwUN1J7DVNRwAxSCrxWxrhjnIozXb9wSKdXqXEuyxEp5DZhOZMB8jpl3KcmyX1rLkKSpHV Vr7uNhupUbI6n+dNAthrtuBXV9AJfuVAuW7GQbXYFIEA1I146gBw2zLM50Hldm7sSNIQILuQPDMLB vUFdqPoBGgdzYj6GdTNKtQ+G9YZCF8wNZs8ytaOchaOEv+IFYOi5f6E8WOu4GGkG1/aIbeE/Slu+o oOc6Vryg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1x653Y-00000003Jyk-2tsA; Mon, 14 Sep 2026 11:41:04 +0000 Received: from bali.collaboradmins.com ([2a01:4f8:201:9162::2]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1x652H-00000003Ip3-3qsR; Mon, 14 Sep 2026 11:39:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1789385983; bh=y5Di7+69fCQl0wYSk3/JjkiS6NC5NT+qUdcZSCHWsDI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=M4JWbnzBu1QBaNJRj9hpdzOxER16FG3N/IY8ntNT6V6P0Zl8lQ+iZovQCsyqIDQZS 8nZqDZNd1vA4nS6Dr66z/fljuHYLzn8qZ1DAJQ+pycoFDwybHpBQpPRy47SvAUYF1C q+KHEstNxul7SK41fmbUHhe9cCJX7f+sat47zncEtiMuZYeFgK8u4JRsNyOwWiHJKu ejoijC8I55OAwab+lr1b9pLKapbh427hWj3VVCgu8SKhnf38rSMyzNz/dgNlrpf15g rF/FPq/aUhZk7J1GpIM9YUKGM1h2AP5OQib+3RPqA6R5UKa/Xu1IpjCY34PJC+Z7Kb kingwF/qUxj2A== 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 1938917E08A1; Mon, 14 Sep 2026 13:39:42 +0200 (CEST) From: Louis-Alexis Eyraud Date: Mon, 14 Sep 2026 13:39:05 +0200 Subject: [PATCH v12 19/24] scsi: ufs: mediatek: Don't acquire dvfsrc-vcore twice MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260914-mt8196-ufs-v12-19-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=7843; i=louisalexis.eyraud@collabora.com; s=20250113; h=from:subject:message-id; bh=u5hsoUo2apmHj49YkhJ3H2LGdAnXHoKSFcuZGmRNLzk=; b=/4aRhR89n1PvGTjjQKKlw68pDQa29Jb8NDRCuQUjG/zKG9fRvPZZUCfH6BFKg7aNhy17xt8rh WUjhgZpiHrtAO3UggGXVLBlc3SqyXI6dKPcBRbQp+Q/McDqyeFtU/+d X-Developer-Key: i=louisalexis.eyraud@collabora.com; a=ed25519; pk=CHFBDB2Kqh4EHc6JIqFn69GhxJJAzc0Zr4e8QxtumuM= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260914_043946_146387_B09B7863 X-CRM114-Status: GOOD ( 22.45 ) 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 From: Nicolas Frattaroli As part of its featureset, the ufs-mediatek driver needs to play with an optional dvfsrc-vcore regulator for some of them. However, it currently does this by acquiring two different references to it in two different places, needlessly duplicating logic. Move reg_vcore to the host struct, acquire it in the same function as avdd09 is acquired, and rework the users of reg_vcore. 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 | 60 +++++++++++++++++++---------------------- drivers/ufs/host/ufs-mediatek.h | 3 +-- 2 files changed, 28 insertions(+), 35 deletions(-) diff --git a/drivers/ufs/host/ufs-mediatek.c b/drivers/ufs/host/ufs-mediatek.c index 4a8f13e67f3f..b599e9f4624e 100644 --- a/drivers/ufs/host/ufs-mediatek.c +++ b/drivers/ufs/host/ufs-mediatek.c @@ -554,7 +554,6 @@ static void ufs_mtk_boost_crypt(struct ufs_hba *hba, bool boost) { struct ufs_mtk_host *host = ufshcd_get_variant(hba); struct ufs_mtk_crypt_cfg *cfg; - struct regulator *reg; int volt, ret; if (!ufs_mtk_is_boost_crypt_enabled(hba)) @@ -562,7 +561,6 @@ static void ufs_mtk_boost_crypt(struct ufs_hba *hba, bool boost) cfg = host->crypt; volt = cfg->vcore_volt; - reg = cfg->reg_vcore; ret = clk_prepare_enable(cfg->clk_crypt_mux); if (ret) { @@ -572,7 +570,7 @@ static void ufs_mtk_boost_crypt(struct ufs_hba *hba, bool boost) } if (boost) { - ret = regulator_set_voltage(reg, volt, INT_MAX); + ret = regulator_set_voltage(host->reg_vcore, volt, INT_MAX); if (ret) { dev_err(hba->dev, "%s: Failed to set vcore to %d: %pe\n", __func__, volt, ERR_PTR(ret)); @@ -583,7 +581,7 @@ static void ufs_mtk_boost_crypt(struct ufs_hba *hba, bool boost) if (ret) { dev_err(hba->dev, "%s: Failed to reparent clk_crypt_perf: %pe\n", __func__, ERR_PTR(ret)); - regulator_set_voltage(reg, 0, INT_MAX); + regulator_set_voltage(host->reg_vcore, 0, INT_MAX); goto out; } } else { @@ -594,7 +592,7 @@ static void ufs_mtk_boost_crypt(struct ufs_hba *hba, bool boost) goto out; } - ret = regulator_set_voltage(reg, 0, INT_MAX); + ret = regulator_set_voltage(host->reg_vcore, 0, INT_MAX); if (ret) { dev_err(hba->dev, "%s: Failed to set vcore to minimum: %pe\n", __func__, ERR_PTR(ret)); @@ -612,15 +610,12 @@ static void ufs_mtk_init_boost_crypt(struct ufs_hba *hba) u32 volt; int ret; - cfg = devm_kzalloc(dev, sizeof(*cfg), GFP_KERNEL); - if (!cfg) + if (!host->reg_vcore) return; - 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); + cfg = devm_kzalloc(dev, sizeof(*cfg), GFP_KERNEL); + if (!cfg) return; - } ret = of_property_read_u32(dev->of_node, "mediatek,boost-crypt-vcore-min", &volt); @@ -926,7 +921,6 @@ static void ufs_mtk_init_clocks(struct ufs_hba *hba) struct list_head *head = &hba->clk_list_head; struct ufs_clk_info *clki, *clki_tmp; struct device *dev = hba->dev; - struct regulator *reg; u32 volt; /* @@ -967,16 +961,8 @@ static void ufs_mtk_init_clocks(struct ufs_hba *hba) return; } - /* - * Default get vcore if dts have these settings. - * No matter clock scaling support or not. (may disable by customer) - */ - reg = devm_regulator_get_optional(dev, "dvfsrc-vcore"); - if (IS_ERR(reg)) { - if (PTR_ERR(reg) != -ENODEV) - dev_err(dev, "Failed to get dvfsrc-vcore: %pe\n", reg); + if (!host->reg_vcore) return; - } if (of_property_read_u32(dev->of_node, "clk-scale-up-vcore-min", &volt)) { @@ -984,12 +970,11 @@ static void ufs_mtk_init_clocks(struct ufs_hba *hba) return; } - host->mclk.reg_vcore = reg; host->mclk.vcore_volt = volt; /* If default boot is max gear, request vcore */ - if (reg && volt && host->clk_scale_up) - if (regulator_set_voltage(reg, volt, INT_MAX)) + if (volt && host->clk_scale_up) + if (regulator_set_voltage(host->reg_vcore, volt, INT_MAX)) dev_err(hba->dev, "Failed to set vcore to %d\n", volt); } @@ -1101,6 +1086,17 @@ static int ufs_mtk_get_supplies(struct ufs_mtk_host *host) const struct ufs_mtk_soc_data *data = of_device_get_match_data(dev); int ret; + host->reg_vcore = devm_regulator_get_optional(dev, "dvfsrc-vcore"); + if (IS_ERR(host->reg_vcore)) { + if (PTR_ERR(host->reg_vcore) != -ENODEV) { + dev_err(dev, "Failed to get dvfsrc-vcore supply: %pe\n", + host->reg_vcore); + return PTR_ERR(host->reg_vcore); + } + + host->reg_vcore = NULL; + } + if (!data) return 0; @@ -1169,6 +1165,10 @@ static int ufs_mtk_init(struct ufs_hba *hba) host->hba = hba; ufshcd_set_variant(hba, host); + err = ufs_mtk_get_supplies(host); + if (err) + goto out_variant_clear; + /* Initialize host capability */ ufs_mtk_init_host_caps(hba); @@ -1223,10 +1223,6 @@ static int ufs_mtk_init(struct ufs_hba *hba) ufs_mtk_init_clocks(hba); - err = ufs_mtk_get_supplies(host); - if (err) - goto out_phy_exit; - /* * ufshcd_vops_init() is invoked after * ufshcd_setup_clock(true) in ufshcd_hba_init() thus @@ -1978,7 +1974,6 @@ static void _ufs_mtk_clk_scale(struct ufs_hba *hba, bool scale_up) struct ufs_mtk_clk *mclk = &host->mclk; struct ufs_clk_info *clki = mclk->ufs_sel_clki; struct ufs_clk_info *fde_clki = mclk->ufs_fde_clki; - struct regulator *reg; int volt, ret = 0; bool clk_bind_vcore = false; bool clk_fde_scale = false; @@ -1989,9 +1984,8 @@ static void _ufs_mtk_clk_scale(struct ufs_hba *hba, bool scale_up) if (!clki || !fde_clki) return; - reg = host->mclk.reg_vcore; volt = host->mclk.vcore_volt; - if (reg && volt != 0) + if (host->reg_vcore && volt) clk_bind_vcore = true; if (mclk->ufs_fde_max_clki && mclk->ufs_fde_min_clki) @@ -2015,7 +2009,7 @@ static void _ufs_mtk_clk_scale(struct ufs_hba *hba, bool scale_up) if (scale_up) { if (clk_bind_vcore) { - ret = regulator_set_voltage(reg, volt, INT_MAX); + ret = regulator_set_voltage(host->reg_vcore, volt, INT_MAX); if (ret) { dev_err(hba->dev, "Failed to set vcore to %d\n", volt); goto out; @@ -2055,7 +2049,7 @@ static void _ufs_mtk_clk_scale(struct ufs_hba *hba, bool scale_up) } if (clk_bind_vcore) { - ret = regulator_set_voltage(reg, 0, INT_MAX); + ret = regulator_set_voltage(host->reg_vcore, 0, INT_MAX); if (ret) { dev_err(hba->dev, "%s: Failed to set vcore to minimum: %pe\n", __func__, ERR_PTR(ret)); diff --git a/drivers/ufs/host/ufs-mediatek.h b/drivers/ufs/host/ufs-mediatek.h index d97951ee1f4e..6b81c8f76201 100644 --- a/drivers/ufs/host/ufs-mediatek.h +++ b/drivers/ufs/host/ufs-mediatek.h @@ -141,7 +141,6 @@ enum ufs_mtk_host_caps { }; struct ufs_mtk_crypt_cfg { - struct regulator *reg_vcore; struct clk *clk_crypt_perf; struct clk *clk_crypt_mux; struct clk *clk_crypt_lp; @@ -155,7 +154,6 @@ struct ufs_mtk_clk { struct ufs_clk_info *ufs_fde_clki; /* Mux */ struct ufs_clk_info *ufs_fde_max_clki; /* Max src */ struct ufs_clk_info *ufs_fde_min_clki; /* Min src */ - struct regulator *reg_vcore; int vcore_volt; }; @@ -175,6 +173,7 @@ struct ufs_mtk_host { struct phy *mphy; struct regulator *reg_avdd09; struct regulator *reg_avdd09_1; + struct regulator *reg_vcore; struct reset_control_bulk_data resets[MTK_UFS_NUM_RESETS]; struct ufs_hba *hba; struct ufs_mtk_crypt_cfg *crypt; -- 2.55.0