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 <[email protected]>
---
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
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 <[email protected]>
---
Documentation/devicetree/bindings/phy/cdns,salvo-phy.yaml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/Documentation/devicetree/bindings/phy/cdns,salvo-phy.yaml b/Documentation/devicetree/bindings/phy/cdns,salvo-phy.yaml
index 3a07285b5470..3c7f5b3f9211 100644
--- a/Documentation/devicetree/bindings/phy/cdns,salvo-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/cdns,salvo-phy.yaml
@@ -31,6 +31,13 @@ properties:
"#phy-cells":
const: 0
+ usb2-disconnect-threshold-microvolt:
+ description: The microvolt threshold value utilized for detecting
+ USB disconnection event.
+ $ref: /schemas/types.yaml#/definitions/uint32
+ enum: [575, 610, 645]
+ default: 575
+
required:
- compatible
- reg
--
2.34.1
On Fri, 05 May 2023 14:52:47 -0400, Frank Li wrote:
> 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 <[email protected]>
> ---
> Documentation/devicetree/bindings/phy/cdns,salvo-phy.yaml | 7 +++++++
> 1 file changed, 7 insertions(+)
>
My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check'
on your patch (DT_CHECKER_FLAGS is new in v5.13):
yamllint warnings/errors:
dtschema/dtc warnings/errors:
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/phy/cdns,salvo-phy.yaml: properties:usb2-disconnect-threshold-microvolt: '$ref' should not be valid under {'const': '$ref'}
hint: Standard unit suffix properties don't need a type $ref
from schema $id: http://devicetree.org/meta-schemas/core.yaml#
doc reference errors (make refcheckdocs):
See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/[email protected]
The base for the series is generally the latest rc1. A different dependency
should be noted in *this* patch.
If you already ran 'make dt_binding_check' and didn't see the above
error(s), then make sure 'yamllint' is installed and dt-schema is up to
date:
pip3 install dtschema --upgrade
Please check and re-submit after running the above command yourself. Note
that DT_SCHEMA_FILES can be set to your schema file to speed up checking
your schema. However, it must be unset to test all examples with your schema.
On 05/05/2023 20:52, Frank Li wrote:
> 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 <[email protected]>
> ---
> arch/arm64/boot/dts/freescale/imx8x-mek.dtsi | 1 +
> drivers/phy/cadence/phy-cadence-salvo.c | 30 +++++++++++++++++++-
DTS and drivers are always separate.
Best regards,
Krzysztof
On 05/05/2023 20:52, Frank Li wrote:
> Add usb2-disconnect-threshold-microvolt property to address fake USB
> disconnection issue during enumeration or suspend state for difference
> platform.
Use subject prefixes matching the subsystem (which you can get for
example with `git log --oneline -- DIRECTORY_OR_FILE` on the directory
your patch is touching). Two prefixes got wrong... It's not doc but it
is dt-bindings.
>
> Signed-off-by: Frank Li <[email protected]>
> ---
> Documentation/devicetree/bindings/phy/cdns,salvo-phy.yaml | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/phy/cdns,salvo-phy.yaml b/Documentation/devicetree/bindings/phy/cdns,salvo-phy.yaml
> index 3a07285b5470..3c7f5b3f9211 100644
> --- a/Documentation/devicetree/bindings/phy/cdns,salvo-phy.yaml
> +++ b/Documentation/devicetree/bindings/phy/cdns,salvo-phy.yaml
> @@ -31,6 +31,13 @@ properties:
> "#phy-cells":
> const: 0
>
> + usb2-disconnect-threshold-microvolt:
> + description: The microvolt threshold value utilized for detecting
> + USB disconnection event.
> + $ref: /schemas/types.yaml#/definitions/uint32
Does not look like you tested the bindings. Please run `make
dt_binding_check` (see
Documentation/devicetree/bindings/writing-schema.rst for instructions).
Drop ref. Add vendor prefix.
> + enum: [575, 610, 645]
> + default: 575
> +
> required:
> - compatible
> - reg
Best regards,
Krzysztof
On 05-05-23, 14:52, Frank Li wrote:
> 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 <[email protected]>
> ---
> 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
> */
> -
why this change?
> +#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
--
~Vinod