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=1795100794; b=xuHHs37iLkOw5oVGW3HILw+zgLVvOnrWsMnBWiMAhiPQ2eSdJYzTuDjRf5kO1G6o9uJH Yocb0NPssAF+Rt4DBTKxY+qhpZS3vSI5LYhJoO9xKQkMmSZjqwNzqNKPdCpl7dn9jsaSm fhT+QXV8s3kn06RrslEDCP4R6fYtDhMBvnPQAYvdvu2tOA4Sta6vZWgpcpcwOyAeqvjjq DWVP2TnYs88K5tW8hkoa5fmfqcjlcAVBXuDtRhU5SA3EZci2iz3eeVWtbeGnEeH09z+ao XybGATig9xqBl0jjQ1yaOmGqWCeoBLFZmlqXrtHB2OLHTVEfZJ6xo+2vCJFOtJZAtcA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795100794; 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=mnm6W1VVAEdciykzmVkU1c35ej7kmu/d2c0i4+OOB10=; b=HD8yrmSZls8t8SUdzZyvKscV5VC+NZ1bmskEpCHCJjKr6iExaRmsrizR8pvfY/GuoMP4 wmxyKGEszerEC1WORPdJIbx5WaPEBW1l3NZUhBuTHzSAXMcRLPWdCI/OEb+c5ljveJWbC 77Wd3pSZuJU8qJXlUpYY+K7NjWVa1TmowQApDtp1SgtU6hoa6gK/GKF0Vnx5LckSCGIp8 bQz58b6HuwQt2H7rR9bwoQJKR5F8MD568c50kkpvGUupabXkGasJfpkTkgsDJRZySC+yW O9NMbRwQeXn3hRr2YnjZh0dTr08DfW0n6h0zXHi5uUGE/mvD/HqPB3OIWmfsXKiVlOQ== 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=m3rjL6ul; 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 35B186071684; Thu, 19 Nov 2026 15:06:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 35B186071684 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=m3rjL6ul DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1795100792; bh=sZT+h9Vajp7tVktn63EBtPKgCYMpIrRjBnCXkN+MhsA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=m3rjL6ullrbXD1bHy0wSgE8SFmWeHz5wEalxWki2tNoXpTOO+Lp9zHoUOw24t3s2G 84P3FFuJcZdEUR8xgW/pdc7IwdtobJq7+4d9XqKxlb9e1XHWaxMAdszrxxybxHLulV h8yd0NFVWfNDkYIrcv3JxqSYLtYoArMvJjFly9cMMtw9/HF3DroLRAXT57ZnJUU/vy DYrUvEPgT1NE+6ic3/8RLB/nAo/f3dR5Q7AzFYyF43TV87Rs+QiIUZrc4Gmaapswd8 /mGLcHQUNdT3wd8Y6szbchw9BC9TzEOQHzdp9vP3Fh8YvEkzXMcyy0cpFobNupSf5s UlMkD37vsRwzQ== 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 B66A017E0DCD; Thu, 19 Nov 2026 16:06:31 +0100 (CET) From: Louis-Alexis Eyraud Date: Thu, 19 Nov 2026 16:06:02 +0100 Subject: [PATCH v15 14/23] scsi: ufs: mediatek: Use the common PHY framework 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-14-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=7875; i=louisalexis.eyraud@collabora.com; s=20250113; h=from:subject:message-id; bh=e23tk1pHvMEII8E4ls8oxcmc8nVoiVEakSG0oJWSlZU=; b=c274NP3Y0SlNjK0AiDKAjH5F1h9EwCOu0TT0unCeUFtilPlNvTAs8rDSZv/d1ZOAbLqfha6Jv EL7Rtz/NnY8DtsvDr63WofJkuGnxvNHELqXYx/3eoPEb8O+hCpOtHYu X-Developer-Key: i=louisalexis.eyraud@collabora.com; a=ed25519; pk=CHFBDB2Kqh4EHc6JIqFn69GhxJJAzc0Zr4e8QxtumuM= From: Nicolas Frattaroli There is no need to reinvent the PHY framework, especially not its OF parsing. Change the code to simply use the PHY framework to acquire the device's PHY in the ufshcd init, so that it's device linked to the right device. Reviewed-by: AngeloGioacchino Del Regno Signed-off-by: Nicolas Frattaroli Reviewed-by: Chaotian Jing Signed-off-by: Louis-Alexis Eyraud --- drivers/ufs/host/ufs-mediatek.c | 138 +++++++++++++--------------------------- drivers/ufs/host/ufs-mediatek.h | 1 - 2 files changed, 45 insertions(+), 94 deletions(-) diff --git a/drivers/ufs/host/ufs-mediatek.c b/drivers/ufs/host/ufs-mediatek.c index fec0fb24e7a2..a78e015e329a 100644 --- a/drivers/ufs/host/ufs-mediatek.c +++ b/drivers/ufs/host/ufs-mediatek.c @@ -296,44 +296,6 @@ static int ufs_mtk_hce_enable_notify(struct ufs_hba *hba, return 0; } -static int ufs_mtk_bind_mphy(struct ufs_hba *hba) -{ - struct ufs_mtk_host *host = ufshcd_get_variant(hba); - struct device *dev = hba->dev; - struct device_node *np = dev->of_node; - int err = 0; - - host->mphy = devm_of_phy_get_by_index(dev, np, 0); - - if (host->mphy == ERR_PTR(-EPROBE_DEFER)) { - /* - * UFS driver might be probed before the phy driver does. - * In that case we would like to return EPROBE_DEFER code. - */ - err = -EPROBE_DEFER; - dev_info(dev, - "%s: required phy hasn't probed yet. err = %d\n", - __func__, err); - } else if (IS_ERR(host->mphy)) { - err = PTR_ERR(host->mphy); - if (err != -ENODEV) { - dev_info(dev, "%s: PHY get failed %d\n", __func__, - err); - } - } - - if (err) - host->mphy = NULL; - /* - * Allow unbound mphy because not every platform needs specific - * mphy control. - */ - if (err == -ENODEV) - err = 0; - - return err; -} - static int ufs_mtk_setup_ref_clk(struct ufs_hba *hba, bool on) { struct ufs_mtk_host *host = ufshcd_get_variant(hba); @@ -1249,13 +1211,21 @@ static int ufs_mtk_init(struct ufs_hba *hba) ufs_mtk_init_mcq_irq(hba); - err = ufs_mtk_bind_mphy(hba); - if (err) + host->mphy = devm_phy_optional_get(dev, NULL); + if (IS_ERR(host->mphy)) { + err = dev_err_probe(dev, PTR_ERR(host->mphy), "Failed to get PHY\n"); + goto out_variant_clear; + } + + err = phy_init(host->mphy); + if (err) { + dev_err_probe(dev, err, "Failed to initialize PHY\n"); goto out_variant_clear; + } err = ufs_mtk_init_reset(hba); if (err) - goto out_variant_clear; + goto out_phy_exit; /* Enable runtime autosuspend */ hba->caps |= UFSHCD_CAP_RPM_AUTOSUSPEND; @@ -1294,7 +1264,7 @@ static int ufs_mtk_init(struct ufs_hba *hba) err = ufs_mtk_get_supplies(host); if (err) - goto out_variant_clear; + goto out_phy_exit; /* * ufshcd_vops_init() is invoked after @@ -1305,7 +1275,7 @@ static int ufs_mtk_init(struct ufs_hba *hba) */ err = ufs_mtk_mphy_power_on(hba, true); if (err) - goto out_variant_clear; + goto out_phy_exit; if (ufs_mtk_is_rtff_mtcmos(hba)) { /* First Restore here, to avoid backup unexpected value */ @@ -1321,11 +1291,22 @@ static int ufs_mtk_init(struct ufs_hba *hba) return 0; +out_phy_exit: + phy_exit(host->mphy); out_variant_clear: ufshcd_set_variant(hba, NULL); return err; } +static void ufs_mtk_exit(struct ufs_hba *hba) +{ + struct ufs_mtk_host *host = ufshcd_get_variant(hba); + + ufs_mtk_mphy_power_on(hba, false); + + phy_exit(host->mphy); +} + static int ufs_mtk_negotiate_pwr_mode(struct ufs_hba *hba, const struct ufs_pa_layer_attr *dev_max_params, struct ufs_pa_layer_attr *dev_req_params) @@ -2346,6 +2327,7 @@ static void ufs_mtk_config_scsi_dev(struct scsi_device *sdev) static const struct ufs_hba_variant_ops ufs_hba_mtk_vops = { .name = "mediatek.ufshci", .init = ufs_mtk_init, + .exit = ufs_mtk_exit, .get_ufs_hci_version = ufs_mtk_get_ufs_hci_version, .setup_clocks = ufs_mtk_setup_clocks, .hce_enable_notify = ufs_mtk_hce_enable_notify, @@ -2406,48 +2388,15 @@ MODULE_DEVICE_TABLE(of, ufs_mtk_of_match); */ static int ufs_mtk_probe(struct platform_device *pdev) { - int err; + struct device *dev = &pdev->dev; struct ufs_hba *hba; - struct platform_device *phy_pdev = NULL; - struct device *dev = &pdev->dev, *phy_dev = NULL; - struct device_node *phy_node = NULL; - struct ufs_mtk_host *host; - - /* find phy node */ - phy_node = of_parse_phandle(dev->of_node, "phys", 0); - - if (phy_node) { - phy_pdev = of_find_device_by_node(phy_node); - if (!phy_pdev) - goto skip_phy; - phy_dev = &phy_pdev->dev; - - pm_runtime_set_active(phy_dev); - pm_runtime_enable(phy_dev); - pm_runtime_get_sync(phy_dev); - - put_device(phy_dev); - dev_info(dev, "phys node found\n"); - } else { - dev_notice(dev, "phys node not found\n"); - } + int ret; -skip_phy: - /* perform generic probe */ - err = ufshcd_pltfrm_init(pdev, &ufs_hba_mtk_vops); - if (err) { - dev_err(dev, "probe failed %d\n", err); - goto out; - } + ret = ufshcd_pltfrm_init(pdev, &ufs_hba_mtk_vops); + if (ret) + return dev_err_probe(dev, ret, "Generic platform probe failed\n"); hba = platform_get_drvdata(pdev); - if (!hba) - goto out; - - if (phy_node && phy_dev) { - host = ufshcd_get_variant(hba); - host->phy_dev = phy_dev; - } /* * Because the default power setting of VSx (the upper layer of @@ -2456,16 +2405,12 @@ static int ufs_mtk_probe(struct platform_device *pdev) */ ufs_mtk_dev_vreg_set_lpm(hba, false); -out: - of_node_put(phy_node); - return err; + return 0; } /** * ufs_mtk_remove - set driver_data of the device to NULL * @pdev: pointer to platform device handle - * - * Always return 0 */ static void ufs_mtk_remove(struct platform_device *pdev) { @@ -2522,9 +2467,8 @@ static int ufs_mtk_system_resume(struct device *dev) static int ufs_mtk_runtime_suspend(struct device *dev) { struct ufs_hba *hba = dev_get_drvdata(dev); - struct ufs_mtk_host *host = ufshcd_get_variant(hba); struct arm_smccc_res res; - int ret = 0; + int ret; ret = ufshcd_runtime_suspend(dev); if (ret) @@ -2535,8 +2479,13 @@ static int ufs_mtk_runtime_suspend(struct device *dev) if (ufs_mtk_is_rtff_mtcmos(hba)) ufs_mtk_mtcmos_ctrl(false, res); - if (host->phy_dev) - pm_runtime_put_sync(host->phy_dev); + if (!ufshcd_is_link_active(hba)) { + ret = ufs_mtk_mphy_power_on(hba, false); + if (ret) { + dev_err(dev, "Failed to power off PHY: %pe\n", ERR_PTR(ret)); + return ret; + } + } return 0; } @@ -2544,14 +2493,17 @@ static int ufs_mtk_runtime_suspend(struct device *dev) static int ufs_mtk_runtime_resume(struct device *dev) { struct ufs_hba *hba = dev_get_drvdata(dev); - struct ufs_mtk_host *host = ufshcd_get_variant(hba); struct arm_smccc_res res; + int ret; if (ufs_mtk_is_rtff_mtcmos(hba)) ufs_mtk_mtcmos_ctrl(true, res); - if (host->phy_dev) - pm_runtime_get_sync(host->phy_dev); + ret = ufs_mtk_mphy_power_on(hba, true); + if (ret) { + dev_err(dev, "Failed to power on PHY: %pe\n", ERR_PTR(ret)); + return ret; + } ufs_mtk_dev_vreg_set_lpm(hba, false); diff --git a/drivers/ufs/host/ufs-mediatek.h b/drivers/ufs/host/ufs-mediatek.h index 477fb9e36555..bde2b53f5798 100644 --- a/drivers/ufs/host/ufs-mediatek.h +++ b/drivers/ufs/host/ufs-mediatek.h @@ -196,7 +196,6 @@ struct ufs_mtk_host { bool is_mcq_intr_enabled; int mcq_nr_intr; struct ufs_mtk_mcq_intr_info mcq_intr_info[UFSHCD_MAX_Q_NR]; - struct device *phy_dev; }; /* MTK delay of autosuspend: 500 ms */ -- 2.56.1