On Mon, Apr 1, 2019 at 7:37 PM Fabio Estevam <festevam@xxxxxxxxx> wrote:
>
> Commit 6d4cd041f0af ("net: phy: at803x: disable delay only for RGMII mode")
> exposed an issue on imx DTS files using AR8031/AR8035 PHYs.
>
> The end result is that the boards can no longer obtain an IP address
> via UDHCP, for example.
>
> Quoting Andrew Lunn:
>
> "The problem here is, all the DTs were broken since day 0. However,
> because the PHY driver was also broken, nobody noticed and it
> worked. Now that the PHY driver has been fixed, all the bugs in the
> DTs now become an issue"
>
> To fix this problem, the phy-mode property needs to be "rgmii-id", which
> has the following meaning as per
> Documentation/devicetree/bindings/net/ethernet.txt:
>
> "RGMII with internal RX and TX delays provided by the PHY, the MAC should
> not add the RX or TX delays in this case)"
>
> Tested on imx6-sabresd, imx6sx-sdb and imx7d-pico boards with
> successfully restored networking.
>
> Based on the initial submission from Steve Twiss for the
> imx6qdl-sabresd.
>
> Cc: <stable@xxxxxxxxxxxxxxx> # 4.9+
> Signed-off-by: Fabio Estevam <festevam@xxxxxxxxx>
> Tested-by: Baruch Siach <baruch@xxxxxxxxxx>
> Tested-by: Soeren Moch <smoch@xxxxxx>
> Tested-by: Steve Twiss <stwiss.opensource@xxxxxxxxxxx>
> Tested-by: Adam Thomson <Adam.Thomson@xxxxxxxxxxx>
> Signed-off-by: Steve Twiss <stwiss.opensource@xxxxxxxxxxx>
> Tested-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
> Signed-off-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
Tested-by: Adam Ford <aford173@xxxxxxxxx>
> ---
> Changes since v1:
> - Also fix imx6-logicpd and imx6q-marsboard
>
> arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi | 2 +-
Thanks for doing that.
adam
> arch/arm/boot/dts/imx6dl-riotboard.dts | 2 +-
> arch/arm/boot/dts/imx6q-marsboard.dts | 2 +-
> arch/arm/boot/dts/imx6q-tbs2910.dts | 2 +-
> arch/arm/boot/dts/imx6qdl-apf6.dtsi | 2 +-
> arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 +-
> arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 +-
> arch/arm/boot/dts/imx6qdl-sr-som.dtsi | 2 +-
> arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 2 +-
> arch/arm/boot/dts/imx6sx-sabreauto.dts | 2 +-
> arch/arm/boot/dts/imx6sx-sdb.dtsi | 2 +-
> arch/arm/boot/dts/imx7d-pico.dtsi | 2 +-
> 12 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi b/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi
> index fb01fa6e4224..3cae139e6396 100644
> --- a/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi
> +++ b/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi
> @@ -216,7 +216,7 @@
> &fec {
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_enet>;
> - phy-mode = "rgmii";
> + phy-mode = "rgmii-id";
> phy-reset-duration = <10>;
> phy-reset-gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
> phy-supply = <®_enet>;
> diff --git a/arch/arm/boot/dts/imx6dl-riotboard.dts b/arch/arm/boot/dts/imx6dl-riotboard.dts
> index 65c184bb8fb0..d9de49efa802 100644
> --- a/arch/arm/boot/dts/imx6dl-riotboard.dts
> +++ b/arch/arm/boot/dts/imx6dl-riotboard.dts
> @@ -92,7 +92,7 @@
> &fec {
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_enet>;
> - phy-mode = "rgmii";
> + phy-mode = "rgmii-id";
> phy-reset-gpios = <&gpio3 31 GPIO_ACTIVE_LOW>;
> interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
> <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
> diff --git a/arch/arm/boot/dts/imx6q-marsboard.dts b/arch/arm/boot/dts/imx6q-marsboard.dts
> index d8ccb533b6b7..84b30bd6908f 100644
> --- a/arch/arm/boot/dts/imx6q-marsboard.dts
> +++ b/arch/arm/boot/dts/imx6q-marsboard.dts
> @@ -110,7 +110,7 @@
> &fec {
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_enet>;
> - phy-mode = "rgmii";
> + phy-mode = "rgmii-id";
> phy-reset-gpios = <&gpio3 31 GPIO_ACTIVE_LOW>;
> status = "okay";
> };
> diff --git a/arch/arm/boot/dts/imx6q-tbs2910.dts b/arch/arm/boot/dts/imx6q-tbs2910.dts
> index 2ce8399a10ba..bfff87ce2e1f 100644
> --- a/arch/arm/boot/dts/imx6q-tbs2910.dts
> +++ b/arch/arm/boot/dts/imx6q-tbs2910.dts
> @@ -98,7 +98,7 @@
> &fec {
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_enet>;
> - phy-mode = "rgmii";
> + phy-mode = "rgmii-id";
> phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
> status = "okay";
> };
> diff --git a/arch/arm/boot/dts/imx6qdl-apf6.dtsi b/arch/arm/boot/dts/imx6qdl-apf6.dtsi
> index 1ebf29f43a24..4738c3c1ab50 100644
> --- a/arch/arm/boot/dts/imx6qdl-apf6.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-apf6.dtsi
> @@ -51,7 +51,7 @@
> &fec {
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_enet>;
> - phy-mode = "rgmii";
> + phy-mode = "rgmii-id";
> phy-reset-duration = <10>;
> phy-reset-gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
> status = "okay";
> diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
> index 1280de50a984..f3404dd10537 100644
> --- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
> @@ -292,7 +292,7 @@
> &fec {
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_enet>;
> - phy-mode = "rgmii";
> + phy-mode = "rgmii-id";
> interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
> <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
> fsl,err006687-workaround-present;
> diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> index a0705066ccba..185fb17a3500 100644
> --- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> @@ -202,7 +202,7 @@
> &fec {
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_enet>;
> - phy-mode = "rgmii";
> + phy-mode = "rgmii-id";
> phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
> status = "okay";
> };
> diff --git a/arch/arm/boot/dts/imx6qdl-sr-som.dtsi b/arch/arm/boot/dts/imx6qdl-sr-som.dtsi
> index 4ccb7afc4b35..6d7f6b9035bc 100644
> --- a/arch/arm/boot/dts/imx6qdl-sr-som.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-sr-som.dtsi
> @@ -53,7 +53,7 @@
> &fec {
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_microsom_enet_ar8035>;
> - phy-mode = "rgmii";
> + phy-mode = "rgmii-id";
> phy-reset-duration = <2>;
> phy-reset-gpios = <&gpio4 15 GPIO_ACTIVE_LOW>;
> status = "okay";
> diff --git a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
> index b7d5fb421404..50d9a989e06a 100644
> --- a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
> @@ -224,7 +224,7 @@
> &fec {
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_enet>;
> - phy-mode = "rgmii";
> + phy-mode = "rgmii-id";
> phy-reset-gpios = <&gpio3 29 GPIO_ACTIVE_LOW>;
> interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
> <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
> diff --git a/arch/arm/boot/dts/imx6sx-sabreauto.dts b/arch/arm/boot/dts/imx6sx-sabreauto.dts
> index b0ee324afe58..315044ccd65f 100644
> --- a/arch/arm/boot/dts/imx6sx-sabreauto.dts
> +++ b/arch/arm/boot/dts/imx6sx-sabreauto.dts
> @@ -75,7 +75,7 @@
> &fec1 {
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_enet1>;
> - phy-mode = "rgmii";
> + phy-mode = "rgmii-id";
> phy-handle = <ðphy1>;
> fsl,magic-packet;
> status = "okay";
> diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi b/arch/arm/boot/dts/imx6sx-sdb.dtsi
> index 08ede56c3f10..f6972deb5e39 100644
> --- a/arch/arm/boot/dts/imx6sx-sdb.dtsi
> +++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi
> @@ -191,7 +191,7 @@
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_enet1>;
> phy-supply = <®_enet_3v3>;
> - phy-mode = "rgmii";
> + phy-mode = "rgmii-id";
> phy-handle = <ðphy1>;
> phy-reset-gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;
> status = "okay";
> diff --git a/arch/arm/boot/dts/imx7d-pico.dtsi b/arch/arm/boot/dts/imx7d-pico.dtsi
> index 3fd595a71202..6f50ebf31a0a 100644
> --- a/arch/arm/boot/dts/imx7d-pico.dtsi
> +++ b/arch/arm/boot/dts/imx7d-pico.dtsi
> @@ -92,7 +92,7 @@
> <&clks IMX7D_ENET1_TIME_ROOT_CLK>;
> assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>;
> assigned-clock-rates = <0>, <100000000>;
> - phy-mode = "rgmii";
> + phy-mode = "rgmii-id";
> phy-handle = <ðphy0>;
> fsl,magic-packet;
> phy-reset-gpios = <&gpio6 11 GPIO_ACTIVE_LOW>;
> --
> 2.17.1
>
