2020-05-06 20:05:03

by Grygorii Strashko

Subject: [PATCH next] ARM: dts: am57xx: fix networking on boards with ksz9031 phy

Since commit bcf3440c6dd7 ("net: phy: micrel: add phy-mode support for the
KSZ9031 PHY") the networking is broken on boards:
am571x-idk
am572x-idk
am574x-idk
am57xx-beagle-x15

All above boards have phy-mode = "rgmii" and this is worked before because
KSZ9031 PHY started with default RGMII internal delays configuration (TX
off, RX on 1.2 ns) and MAC provided TX delay. After above commit, the
KSZ9031 PHY starts handling phy mode properly and disables RX delay, as
result networking is become broken.

Fix it by switching to phy-mode = "rgmii-rxid" to reflect previous
behavior.

Cc: Oleksij Rempel <[email protected]>
Cc: Andrew Lunn <[email protected]>
Cc: Philippe Schenker <[email protected]>
Fixes: commit bcf3440c6dd7 ("net: phy: micrel: add phy-mode support for the KSZ9031 PHY")
Signed-off-by: Grygorii Strashko <[email protected]>
---
arch/arm/boot/dts/am571x-idk.dts | 4 ++--
arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 4 ++--
arch/arm/boot/dts/am57xx-idk-common.dtsi | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/am571x-idk.dts b/arch/arm/boot/dts/am571x-idk.dts
index 669559c9c95b..c13756fa0f55 100644
--- a/arch/arm/boot/dts/am571x-idk.dts
+++ b/arch/arm/boot/dts/am571x-idk.dts
@@ -190,13 +190,13 @@

&cpsw_port1 {
phy-handle = <&ethphy0_sw>;
- phy-mode = "rgmii";
+ phy-mode = "rgmii-rxid";
ti,dual-emac-pvid = <1>;
};

&cpsw_port2 {
phy-handle = <&ethphy1_sw>;
- phy-mode = "rgmii";
+ phy-mode = "rgmii-rxid";
ti,dual-emac-pvid = <2>;
};

diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
index a813a0cf3ff3..565675354de4 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
@@ -433,13 +433,13 @@

&cpsw_emac0 {
phy-handle = <&phy0>;
- phy-mode = "rgmii";
+ phy-mode = "rgmii-rxid";
dual_emac_res_vlan = <1>;
};

&cpsw_emac1 {
phy-handle = <&phy1>;
- phy-mode = "rgmii";
+ phy-mode = "rgmii-rxid";
dual_emac_res_vlan = <2>;
};

diff --git a/arch/arm/boot/dts/am57xx-idk-common.dtsi b/arch/arm/boot/dts/am57xx-idk-common.dtsi
index aa5e55f98179..a3ff1237d1fa 100644
--- a/arch/arm/boot/dts/am57xx-idk-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-idk-common.dtsi
@@ -408,13 +408,13 @@

&cpsw_emac0 {
phy-handle = <&ethphy0>;
- phy-mode = "rgmii";
+ phy-mode = "rgmii-rxid";
dual_emac_res_vlan = <1>;
};

&cpsw_emac1 {
phy-handle = <&ethphy1>;
- phy-mode = "rgmii";
+ phy-mode = "rgmii-rxid";
dual_emac_res_vlan = <2>;
};

--
2.17.1

2020-05-07 08:44:46

by Philippe Schenker

Subject: Re: [PATCH next] ARM: dts: am57xx: fix networking on boards with ksz9031 phy

On Wed, 2020-05-06 at 22:11 +0300, Grygorii Strashko wrote:
> Since commit bcf3440c6dd7 ("net: phy: micrel: add phy-mode support for
> the
> KSZ9031 PHY") the networking is broken on boards:
> am571x-idk
> am572x-idk
> am574x-idk
> am57xx-beagle-x15
>
> All above boards have phy-mode = "rgmii" and this is worked before
> because
> KSZ9031 PHY started with default RGMII internal delays configuration
> (TX
> off, RX on 1.2 ns) and MAC provided TX delay. After above commit, the
> KSZ9031 PHY starts handling phy mode properly and disables RX delay,
> as
> result networking is become broken.
>
> Fix it by switching to phy-mode = "rgmii-rxid" to reflect previous
> behavior.
>
> Cc: Oleksij Rempel <[email protected]>
> Cc: Andrew Lunn <[email protected]>
> Cc: Philippe Schenker <[email protected]>
> Fixes: commit bcf3440c6dd7 ("net: phy: micrel: add phy-mode support
> for the KSZ9031 PHY")
> Signed-off-by: Grygorii Strashko <[email protected]>

Thanks Grygorii!

Reviewed-by: Philippe Schenker <
[email protected]>

> ---
> arch/arm/boot/dts/am571x-idk.dts | 4 ++--
> arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 4 ++--
> arch/arm/boot/dts/am57xx-idk-common.dtsi | 4 ++--
> 3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/boot/dts/am571x-idk.dts
> b/arch/arm/boot/dts/am571x-idk.dts
> index 669559c9c95b..c13756fa0f55 100644
> --- a/arch/arm/boot/dts/am571x-idk.dts
> +++ b/arch/arm/boot/dts/am571x-idk.dts
> @@ -190,13 +190,13 @@
>
> &cpsw_port1 {
> phy-handle = <&ethphy0_sw>;
> - phy-mode = "rgmii";
> + phy-mode = "rgmii-rxid";
> ti,dual-emac-pvid = <1>;
> };
>
> &cpsw_port2 {
> phy-handle = <&ethphy1_sw>;
> - phy-mode = "rgmii";
> + phy-mode = "rgmii-rxid";
> ti,dual-emac-pvid = <2>;
> };
>
> diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
> b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
> index a813a0cf3ff3..565675354de4 100644
> --- a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
> +++ b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
> @@ -433,13 +433,13 @@
>
> &cpsw_emac0 {
> phy-handle = <&phy0>;
> - phy-mode = "rgmii";
> + phy-mode = "rgmii-rxid";
> dual_emac_res_vlan = <1>;
> };
>
> &cpsw_emac1 {
> phy-handle = <&phy1>;
> - phy-mode = "rgmii";
> + phy-mode = "rgmii-rxid";
> dual_emac_res_vlan = <2>;
> };
>
> diff --git a/arch/arm/boot/dts/am57xx-idk-common.dtsi
> b/arch/arm/boot/dts/am57xx-idk-common.dtsi
> index aa5e55f98179..a3ff1237d1fa 100644
> --- a/arch/arm/boot/dts/am57xx-idk-common.dtsi
> +++ b/arch/arm/boot/dts/am57xx-idk-common.dtsi
> @@ -408,13 +408,13 @@
>
> &cpsw_emac0 {
> phy-handle = <&ethphy0>;
> - phy-mode = "rgmii";
> + phy-mode = "rgmii-rxid";
> dual_emac_res_vlan = <1>;
> };
>
> &cpsw_emac1 {
> phy-handle = <&ethphy1>;
> - phy-mode = "rgmii";
> + phy-mode = "rgmii-rxid";
> dual_emac_res_vlan = <2>;
> };
>

2020-05-07 17:53:52

by Tony Lindgren

Subject: Re: [PATCH next] ARM: dts: am57xx: fix networking on boards with ksz9031 phy

* Philippe Schenker <[email protected]> [200507 08:43]:
> On Wed, 2020-05-06 at 22:11 +0300, Grygorii Strashko wrote:
> > Since commit bcf3440c6dd7 ("net: phy: micrel: add phy-mode support for
> > the
> > KSZ9031 PHY") the networking is broken on boards:
> > am571x-idk
> > am572x-idk
> > am574x-idk
> > am57xx-beagle-x15
> >
> > All above boards have phy-mode = "rgmii" and this is worked before
> > because
> > KSZ9031 PHY started with default RGMII internal delays configuration
> > (TX
> > off, RX on 1.2 ns) and MAC provided TX delay. After above commit, the
> > KSZ9031 PHY starts handling phy mode properly and disables RX delay,
> > as
> > result networking is become broken.
> >
> > Fix it by switching to phy-mode = "rgmii-rxid" to reflect previous
> > behavior.
> >
> > Cc: Oleksij Rempel <[email protected]>
> > Cc: Andrew Lunn <[email protected]>
> > Cc: Philippe Schenker <[email protected]>
> > Fixes: commit bcf3440c6dd7 ("net: phy: micrel: add phy-mode support
> > for the KSZ9031 PHY")
> > Signed-off-by: Grygorii Strashko <[email protected]>
>
> Thanks Grygorii!
>
> Reviewed-by: Philippe Schenker <
> [email protected]>

Thanks applying this into fixes.

Tony