Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Frank Li <Frank.Li@nxp.com>
To:     vkoul@kernel.org, kishon@kernel.org, robh+dt@kernel.org,
        krzysztof.kozlowski+dt@linaro.org, shawnguo@kernel.org,
        s.hauer@pengutronix.de, kernel@pengutronix.de,
        linux-phy@lists.infradead.org, devicetree@vger.kernel.org,
        linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        imx@lists.linux.dev, fushi.peng@nxp.com
Subject: [PATCH 1/2] phy: cadence: salvo: Add usb2-disconnect-threshold-microvolt property
Date:   Fri,  5 May 2023 14:52:46 -0400
Message-Id: <20230505185247.1854677-1-Frank.Li@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?oVREFqihoF/9Y/+5VFmSmGO7mSY6LeXB6CNKuMU80Hh8omEU1G0H6zyn7PBN?=
 =?us-ascii?Q?pqdKbF+yYG6Qwjk//oRMhVBpVyl8VV/1Vc3T6BPgCHlqUu9haw2YWxbRmfgi?=
 =?us-ascii?Q?c7IDKgaFVOq4pGjnNSWWaJFE5WwHKzEVAahIFcd+2c3re5UuVGNZTe8AdeqS?=
 =?us-ascii?Q?+7HTZtiEis7IatUDbWKOlGGns3N9xJTb7Wc+goQJGeK2Kbf4CmmcWlOkgMcd?=
 =?us-ascii?Q?/+2b2MyJjuNZAcSOKouPP40qO+JPcrIj4zAVWrPFEriJocDQEGVB30mHZcfE?=
 =?us-ascii?Q?7PRQ8zZZDTXgq6CoKykQXthTPg6q38pFLrAA1T6GCNcDoygiEcYQbdwJanYE?=
 =?us-ascii?Q?fkHJOEMV4MCLnIUQuqrOv+WDr30BPWLsmT10UEWH59StaacTGJHMRj1DsMNJ?=
 =?us-ascii?Q?G2Btm2QeN+wfxwpL/1Sz31loytvgh6QNxPLL1yTIPNxh/t40YRTegWdAhTgx?=
 =?us-ascii?Q?ACk1B9m+6204uf1tE8LzGtTEUpZocC3AqPi8+PW+Etxo8BOUREW/IvpkpK6S?=
 =?us-ascii?Q?yHIwyKDuhn/OUZ7cWkgggmAOoqqV9OT6H9/i2a8mnWP+svaVOGDalvyVVoI8?=
 =?us-ascii?Q?iy3Tt363+qhtkhmlDJR/n/SaH0uqcyenukCa71t2yk9CiQTfcgwe5K7e0OJY?=
 =?us-ascii?Q?E+1ZX7W5DkWCMSXOxXGHOQq8sMEc3XI2okBIA7aMZ+gLBBFisMzEU/IIMzy9?=
 =?us-ascii?Q?SrqQw0OmnhcQbH38PT279Og2mBk8Ec0eXAqW7XGfxjJGulef8wCvfjhPFt9w?=
 =?us-ascii?Q?yCw2Unso0AaSIENBLLt11BAbpGe/3I1nihxQKOegRf5qnwkoTKOrNyaXsiDb?=
 =?us-ascii?Q?S/sepSwll4rqLq/ue783k3m+gPjd5yYRe0QkbK7tIIxM8QCNcMHwsOtQvs8D?=
 =?us-ascii?Q?daMxa5Fx+5mwt5DHuqu6sGvcZxNWdEbrpAGChMI9oP+I4IaTanUX8inr5nbF?=
 =?us-ascii?Q?eoZ7pb8/YMPAoi7nlzKtvk8LH2jX0lSiYXf0fl5lTbWNPBi0tT6jUUDE1sWM?=
 =?us-ascii?Q?3mr9/hnkWTaXct/HNXv5QMNcbWynXkC4LL3e2XSoEQuYkN5ZezxwQSD+EIBz?=
 =?us-ascii?Q?kVIEEm0JEuc52PLtQL4NgLCs6Xn34ttj4rkbAofrjbK2qd/ZWZmIUb6zw04a?=
 =?us-ascii?Q?a0iM0ccwBJdNhXh1VtO8u5/vBeEPyNoc2I/TRw1ISuM7pi/h36PD+t+0GX8J?=
 =?us-ascii?Q?U6iaCifD2Ju5+CugqJJUSZF+0EAi9LArA+FJJ91zdpoQmXDb9ZodMRuzo3qI?=
 =?us-ascii?Q?x27YDjtefTmmnUOaSWed+RZQbCEMLX6JqBettOBWZYx88PC1/dDEBY4isnKm?=
 =?us-ascii?Q?751HgMOTRDQ6nycgBhgxyYnwPWotSOBv0HxLOfFSg1gaKfMENGkihXgLxAry?=
 =?us-ascii?Q?3+ixIFORPi/jglXRWp3UgU5DhPDoE4eTj8mhXqMVsPCNo4lJ8S19QtGKAFQO?=
 =?us-ascii?Q?CZ4VKFLS6bNyv2iNohSfzqQzGjw0DDzecPLP5DRpN4CNecy4tWG1Bk1/yH6c?=
 =?us-ascii?Q?TulVb9cQNcT5vY1XRZICSXqyb/olMNkca4UHQ6cTI0n8NjRGUOSo3crAA+UK?=
 =?us-ascii?Q?En99o/PKIcloV6A31sJJjkLX9bVp+QU5GgN613Ms?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 690dc766-0ab7-4382-bb37-08db4d99fcfd
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4838.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2023 18:53:17.4314
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 1OuiS4Ruj3fMLem8kS9G8+kEcI8VCMFEltiwb/hBHxXtxA/mqmn0ahX0Ecjdh+J7R1/ZRWxDSFnm4j+KqDFkFg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS5PR04MB9894
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Add usb2-disconnect-threshold-microvolt property to address fake USB
disconnection issue during enumeration or suspend state for difference
platform.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 arch/arm64/boot/dts/freescale/imx8x-mek.dtsi |  1 +
 drivers/phy/cadence/phy-cadence-salvo.c      | 30 +++++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/freescale/imx8x-mek.dtsi b/arch/arm64/boot/dts/freescale/imx8x-mek.dtsi
index 2f8fe59fc131..6a396844c02d 100644
--- a/arch/arm64/boot/dts/freescale/imx8x-mek.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8x-mek.dtsi
@@ -1051,6 +1051,7 @@ &usbotg1 {
 
 &usb3_phy {
 	status = "okay";
+	usb2-disconnect-threshold-microvolt = <645>;
 };
 
 &usbotg3 {
diff --git a/drivers/phy/cadence/phy-cadence-salvo.c b/drivers/phy/cadence/phy-cadence-salvo.c
index 23be27a747a9..06e705dbbc3c 100644
--- a/drivers/phy/cadence/phy-cadence-salvo.c
+++ b/drivers/phy/cadence/phy-cadence-salvo.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 2019-2020 NXP
  */
-
+#include <linux/bitfield.h>
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/module.h>
@@ -91,9 +91,19 @@
 
 /* USB2 PHY register definition */
 #define UTMI_REG15				0xaf
+#define UTMI_AFE_RX_REG0			0x0d
 #define UTMI_AFE_RX_REG5			0x12
 #define UTMI_AFE_BC_REG4			0x29
 
+/* Align UTMI_AFE_RX_REG0 bit[7:6] define */
+enum usb2_disconn_threshold {
+	USB2_DISCONN_THRESHOLD_575 = 0x0,
+	USB2_DISCONN_THRESHOLD_610 = 0x1,
+	USB2_DISCONN_THRESHOLD_645 = 0x3,
+};
+
+#define RX_USB2_DISCONN_MASK			GENMASK(7, 6)
+
 /* TB_ADDR_TX_RCVDETSC_CTRL */
 #define RXDET_IN_P3_32KHZ			BIT(0)
 /*
@@ -125,6 +135,7 @@ struct cdns_salvo_phy {
 	struct clk *clk;
 	void __iomem *base;
 	struct cdns_salvo_data *data;
+	enum usb2_disconn_threshold usb2_disconn;
 };
 
 static const struct of_device_id cdns_salvo_phy_of_match[];
@@ -261,6 +272,12 @@ static int cdns_salvo_phy_init(struct phy *phy)
 
 	cdns_salvo_write(salvo_phy, USB2_PHY_OFFSET, UTMI_AFE_RX_REG5,
 			 0x5);
+
+	value = cdns_salvo_read(salvo_phy, USB2_PHY_OFFSET, UTMI_AFE_RX_REG0);
+	value &= ~RX_USB2_DISCONN_MASK;
+	value = FIELD_PREP(RX_USB2_DISCONN_MASK, salvo_phy->usb2_disconn);
+	cdns_salvo_write(salvo_phy, USB2_PHY_OFFSET, UTMI_AFE_RX_REG0, value);
+
 	udelay(10);
 
 	clk_disable_unprepare(salvo_phy->clk);
@@ -315,6 +332,7 @@ static int cdns_salvo_phy_probe(struct platform_device *pdev)
 	struct device *dev = &pdev->dev;
 	struct cdns_salvo_phy *salvo_phy;
 	struct cdns_salvo_data *data;
+	u32 val;
 
 	data = (struct cdns_salvo_data *)of_device_get_match_data(dev);
 	salvo_phy = devm_kzalloc(dev, sizeof(*salvo_phy), GFP_KERNEL);
@@ -326,6 +344,16 @@ static int cdns_salvo_phy_probe(struct platform_device *pdev)
 	if (IS_ERR(salvo_phy->clk))
 		return PTR_ERR(salvo_phy->clk);
 
+	if (of_property_read_u32(dev->of_node, "usb2-disconnect-threshold-microvolt", &val))
+		val = 575;
+
+	if (val < 610)
+		salvo_phy->usb2_disconn = USB2_DISCONN_THRESHOLD_575;
+	else if (val < 645)
+		salvo_phy->usb2_disconn = USB2_DISCONN_THRESHOLD_610;
+	else
+		salvo_phy->usb2_disconn = USB2_DISCONN_THRESHOLD_645;
+
 	salvo_phy->base = devm_platform_ioremap_resource(pdev, 0);
 	if (IS_ERR(salvo_phy->base))
 		return PTR_ERR(salvo_phy->base);
-- 
2.34.1