From nobody Sat Feb 7 06:35:24 2026 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (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 239682DEA8C; Sat, 24 Jan 2026 12:02:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769256178; cv=pass; b=GO87JaluaMmCwLOHp41RudJQ4R+vlmOZl/0ifMrpq2KC2yFXsLvkCeCP6vZxmwrnnc/cM97ZHERoRECAJLRndnY7JAHLyjUYw7vRJVZbXzDiemaLRTffQCmnzF78q9gfonZ00VevYBp+qIkfA9vXhn/ElvjnFtmtvdtYgg8cOCE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769256178; c=relaxed/simple; bh=Li2TtgPQCWGmlIMXsUike50fTShKhzRXfyS8CHvC6iE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cM7Sk06sGm1+qg6W+ojD47S7SDHXIImNzW4WJO00RtTWPeZKABf89cMlj7gyo4fxeZa3qnCtd420o3huwAJ7lCbAC2LAA+orNdU0gijvEPB0SfQQxtoidTX1kBvr4GKwWD23YTQwM5CCo1ArQ+q1C7gMX0iEaNdAlCOXYStEX6A= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=nicolas.frattaroli@collabora.com header.b=Xjtgvgbr; arc=pass smtp.client-ip=136.143.188.112 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 (1024-bit key) header.d=collabora.com header.i=nicolas.frattaroli@collabora.com header.b="Xjtgvgbr" ARC-Seal: i=1; a=rsa-sha256; t=1769256142; cv=none; d=zohomail.com; s=zohoarc; b=A0DNq5Tu5vvecSc20JqO0j71kj0NsR3nB0SWkaRryZXHKYaG6/wxcUazOJG+lORN/JJGB84XjFfDx+lAOtHQyNlRhNVPfIk53oPoic8D1kYuib6CZ98/Gr1DTV9wSUBR0Yyl9b23geTFXqxFGNthCryi7Avq9GoMYoFP7PZIY98= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769256142; 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=TO3+E3gSmoEer+wUEBmMZcLhWnkiVKWQshWXIMoQP/o=; b=hO8wvBfvJqcN6UVYfowSDyxpznGyLluM63/5xoXVKetay2ODa+bitmoOUusCCaJUBMgNHzUuIQBPKFyLLmOPcq45zxzuIY4ES0eR2SCgQMGXlPPOobB7BD+dxaAObWWwNjdxbQFSpGfedWOR3iMNsHz4U0PAXwPlIQ/q9+N/TPk= 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=1769256142; 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=TO3+E3gSmoEer+wUEBmMZcLhWnkiVKWQshWXIMoQP/o=; b=Xjtgvgbrlo6sE6XbZ4LHciQwi9hs3LsC33/qRNeXwmcBki4ihhbLqpUSOe1IhD3f A0xiwu12sRiGEoQhLPxnHTg3kotLmR9N+aGt/CmnlgnUP5bg0KIQGL2MaMgsZho3JZa KdcwvjIZZQVu53M7/M57VgtMcRh9dZqJz681FfFo= Received: by mx.zohomail.com with SMTPS id 176925614141982.60531836079974; Sat, 24 Jan 2026 04:02:21 -0800 (PST) From: Nicolas Frattaroli Date: Sat, 24 Jan 2026 13:00:57 +0100 Subject: [PATCH v6 11/24] scsi: ufs: mediatek: Rework probe function Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260124-mt8196-ufs-v6-11-e7c005b60028@collabora.com> References: <20260124-mt8196-ufs-v6-0-e7c005b60028@collabora.com> In-Reply-To: <20260124-mt8196-ufs-v6-0-e7c005b60028@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 , Chaotian Jing , Neil Armstrong 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 Remove the ti,syscon-reset cruft, as it was never documented in the binding, and is not modelling the hardware correctly. Make PHY mandatory. All the compatibles supported by the binding make it mandatory. Entertain this driver's insistence on playing with the PHY's RPM, but at least fix the part where it doesn't increase the reference count, which would lead to use-after-free. Reviewed-by: AngeloGioacchino Del Regno Signed-off-by: Nicolas Frattaroli --- drivers/ufs/host/ufs-mediatek.c | 87 +++++++++++++++----------------------= ---- 1 file changed, 32 insertions(+), 55 deletions(-) diff --git a/drivers/ufs/host/ufs-mediatek.c b/drivers/ufs/host/ufs-mediate= k.c index 954d6768aa64..fc72bf54ec2a 100644 --- a/drivers/ufs/host/ufs-mediatek.c +++ b/drivers/ufs/host/ufs-mediatek.c @@ -2382,74 +2382,49 @@ MODULE_DEVICE_TABLE(of, ufs_mtk_of_match); */ static int ufs_mtk_probe(struct platform_device *pdev) { - int err; - struct device *dev =3D &pdev->dev, *phy_dev =3D NULL; - struct device_node *reset_node, *phy_node =3D NULL; - struct platform_device *reset_pdev, *phy_pdev =3D NULL; - struct device_link *link; - struct ufs_hba *hba; + struct platform_device *phy_pdev; + struct device *dev =3D &pdev->dev; + struct device_node *phy_node; struct ufs_mtk_host *host; + struct device *phy_dev; + struct ufs_hba *hba; + int err; =20 - reset_node =3D of_find_compatible_node(NULL, NULL, - "ti,syscon-reset"); - if (!reset_node) { - dev_notice(dev, "find ti,syscon-reset fail\n"); - goto skip_reset; - } - reset_pdev =3D of_find_device_by_node(reset_node); - if (!reset_pdev) { - dev_notice(dev, "find reset_pdev fail\n"); - goto skip_reset; - } - link =3D device_link_add(dev, &reset_pdev->dev, - DL_FLAG_AUTOPROBE_CONSUMER); - put_device(&reset_pdev->dev); - if (!link) { - dev_notice(dev, "add reset device_link fail\n"); - goto skip_reset; - } - /* supplier is not probed */ - if (link->status =3D=3D DL_STATE_DORMANT) { - err =3D -EPROBE_DEFER; - goto out; - } - -skip_reset: /* find phy node */ phy_node =3D of_parse_phandle(dev->of_node, "phys", 0); + if (!phy_node) + return dev_err_probe(dev, -ENOENT, "No PHY node found\n"); =20 - if (phy_node) { - phy_pdev =3D of_find_device_by_node(phy_node); - if (!phy_pdev) - goto skip_phy; - phy_dev =3D &phy_pdev->dev; + phy_pdev =3D of_find_device_by_node(phy_node); + of_node_put(phy_node); + if (!phy_pdev) + return dev_err_probe(dev, -ENODEV, "No PHY device found\n"); =20 - pm_runtime_set_active(phy_dev); - pm_runtime_enable(phy_dev); - pm_runtime_get_sync(phy_dev); + phy_dev =3D &phy_pdev->dev; =20 - put_device(phy_dev); - dev_info(dev, "phys node found\n"); - } else { - dev_notice(dev, "phys node not found\n"); + err =3D pm_runtime_set_active(phy_dev); + if (err) { + dev_err_probe(dev, err, "Failed to activate PHY RPM\n"); + goto err_put_phy; + } + pm_runtime_enable(phy_dev); + err =3D pm_runtime_get_sync(phy_dev); + if (err) { + dev_err_probe(dev, err, "Failed to power on PHY\n"); + goto err_put_phy; } =20 -skip_phy: /* perform generic probe */ err =3D ufshcd_pltfrm_init(pdev, &ufs_hba_mtk_vops); if (err) { - dev_err(dev, "probe failed %d\n", err); - goto out; + dev_err_probe(dev, err, "Generic platform probe failed\n"); + goto err_put_phy; } =20 hba =3D platform_get_drvdata(pdev); - if (!hba) - goto out; =20 - if (phy_node && phy_dev) { - host =3D ufshcd_get_variant(hba); - host->phy_dev =3D phy_dev; - } + host =3D ufshcd_get_variant(hba); + host->phy_dev =3D phy_dev; =20 /* * Because the default power setting of VSx (the upper layer of @@ -2458,9 +2433,11 @@ static int ufs_mtk_probe(struct platform_device *pde= v) */ ufs_mtk_dev_vreg_set_lpm(hba, false); =20 -out: - of_node_put(phy_node); - of_node_put(reset_node); + return 0; + +err_put_phy: + put_device(phy_dev); + return err; } =20 --=20 2.52.0