| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <c0c8f87d-05d3-aa82-c54e-d250c52241b5@baylibre.com>
Date: Fri, 14 Jun 2019 11:03:51 +0200
From: Neil Armstrong <narmstrong@...libre.com>
To: Martin Blumenstingl <martin.blumenstingl@...glemail.com>,
linux-amlogic@...ts.infradead.org, khilman@...libre.com
Cc: andrew@...n.ch, netdev@...r.kernel.org, linus.walleij@...aro.org,
linux-kernel@...r.kernel.org, robin.murphy@....com,
linux-arm-kernel@...ts.infradead.org
Subject: Re: [PATCH v2 3/4] arm64: dts: meson: use the generic Ethernet PHY
reset GPIO bindings
On 12/06/2019 22:55, Martin Blumenstingl wrote:
> The snps,reset-gpio bindings are deprecated in favour of the generic
> "Ethernet PHY reset" bindings.
>
> Replace snps,reset-gpio from the ðmac node with reset-gpios in the
> ethernet-phy node. The old snps,reset-active-low property is now encoded
> directly as GPIO flag inside the reset-gpios property.
>
> snps,reset-delays-us is converted to reset-assert-us and
> reset-deassert-us. reset-assert-us is the second cell from
> snps,reset-delays-us while reset-deassert-us was the third cell.
>
> Instead of blindly copying the old values (which seems strange since
> they gave the PHY one second to come out of reset) over this also
> updates the delays based on the datasheets:
> - the Realtek RTL8211F PHY needs a 10ms assert delay (the datasheet
> mentions: "For a complete PHY reset, this pin must be asserted low
> for at least 10ms") and a 30ms deassert delay (the datasheet
> mentions: "Wait for a further 30ms (for internal circuits settling
> time) before accessing the PHY register". This applies to the
> following boards: GXBB NanoPi K2, GXBB Odroid-C2, GXBB Vega S95
> variants, GXBB Wetek variants, GXL P230, GXM Khadas VIM2, GXM Nexbox
> A1, GXM Q200, GXM RBox Pro boards.
> - the ICPlus IP101GR PHY needs a 10ms assert delay (the datasheet
> mentions: "Trst | Reset period | 10ms") and a deassert delay of 10ms
> as well (the datasheet mentions: "Tclk_MII_rdy | MII/RMII clock
> output ready after reset released | 10ms"). This applies to the GXBB
> Nexbox A95X board.
> - the Micrel KSZ9031 seems to require a 100us delay but use the same
> (seemingly safe) values from RTL8211F due to lack of a board to verify
> this. This applies to the GXBB P200 board.
>
> The GXBB P201 board is left out from this conversion because it doesn't
> have a dedicated PHY node (because it's not clear which PHY is used on
> that board).
>
> Signed-off-by: Martin Blumenstingl <martin.blumenstingl@...glemail.com>
> ---
> arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 9 +++++----
> .../arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 8 ++++----
> arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 9 +++++----
> arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 9 +++++----
> arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 9 +++++----
> arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 8 ++++----
> arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts | 11 ++++++-----
> arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 10 +++++-----
> arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 8 ++++----
> arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts | 11 ++++++-----
> arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 8 ++++----
> 11 files changed, 53 insertions(+), 47 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
> index 849c01650c4d..c34c1c90ccb6 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
> @@ -154,10 +154,6 @@
>
> amlogic,tx-delay-ns = <2>;
>
> - snps,reset-gpio = <&gpio GPIOZ_14 0>;
> - snps,reset-delays-us = <0 10000 1000000>;
> - snps,reset-active-low;
> -
> mdio {
> compatible = "snps,dwmac-mdio";
> #address-cells = <1>;
> @@ -166,6 +162,11 @@
> eth_phy0: ethernet-phy@0 {
> /* Realtek RTL8211F (0x001cc916) */
> reg = <0>;
> +
> + reset-assert-us = <10000>;
> + reset-deassert-us = <30000>;
> + reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
> +
> interrupt-parent = <&gpio_intc>;
> /* MAC_INTR on GPIOZ_15 */
> interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
> index 3c54f26eef15..b636912a2715 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
> @@ -162,10 +162,6 @@
> phy-handle = <ð_phy0>;
> phy-mode = "rmii";
>
> - snps,reset-gpio = <&gpio GPIOZ_14 0>;
> - snps,reset-delays-us = <0 10000 1000000>;
> - snps,reset-active-low;
> -
> mdio {
> compatible = "snps,dwmac-mdio";
> #address-cells = <1>;
> @@ -174,6 +170,10 @@
> eth_phy0: ethernet-phy@0 {
> /* IC Plus IP101GR (0x02430c54) */
> reg = <0>;
> +
> + reset-assert-us = <10000>;
> + reset-deassert-us = <10000>;
> + reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
> };
> };
> };
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
> index 5a139e7b1c60..9972b1515da6 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
> @@ -126,10 +126,6 @@
> phy-handle = <ð_phy0>;
> phy-mode = "rgmii";
>
> - snps,reset-gpio = <&gpio GPIOZ_14 0>;
> - snps,reset-delays-us = <0 10000 1000000>;
> - snps,reset-active-low;
> -
> amlogic,tx-delay-ns = <2>;
>
> mdio {
> @@ -140,6 +136,11 @@
> eth_phy0: ethernet-phy@0 {
> /* Realtek RTL8211F (0x001cc916) */
> reg = <0>;
> +
> + reset-assert-us = <10000>;
> + reset-deassert-us = <30000>;
> + reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
> +
> interrupt-parent = <&gpio_intc>;
> /* MAC_INTR on GPIOZ_15 */
> interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
> index 9d2406a7c4fa..3c93d1898b40 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
> @@ -68,10 +68,6 @@
>
> amlogic,tx-delay-ns = <2>;
>
> - snps,reset-gpio = <&gpio GPIOZ_14 0>;
> - snps,reset-delays-us = <0 10000 1000000>;
> - snps,reset-active-low;
> -
> mdio {
> compatible = "snps,dwmac-mdio";
> #address-cells = <1>;
> @@ -80,6 +76,11 @@
> eth_phy0: ethernet-phy@3 {
> /* Micrel KSZ9031 (0x00221620) */
> reg = <3>;
> +
> + reset-assert-us = <10000>;
> + reset-deassert-us = <30000>;
> + reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
> +
> interrupt-parent = <&gpio_intc>;
> /* MAC_INTR on GPIOZ_15 */
> interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
> index 18856f28fd60..43b11e3dfe11 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
> @@ -116,10 +116,6 @@
>
> amlogic,tx-delay-ns = <2>;
>
> - snps,reset-gpio = <&gpio GPIOZ_14 0>;
> - snps,reset-delays-us = <0 10000 1000000>;
> - snps,reset-active-low;
> -
> mdio {
> compatible = "snps,dwmac-mdio";
> #address-cells = <1>;
> @@ -128,6 +124,11 @@
> eth_phy0: ethernet-phy@0 {
> /* Realtek RTL8211F (0x001cc916) */
> reg = <0>;
> +
> + reset-assert-us = <10000>;
> + reset-deassert-us = <30000>;
> + reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
> +
> interrupt-parent = <&gpio_intc>;
> /* MAC_INTR on GPIOZ_15 */
> interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
> index 9ef6858779c1..4c539881fbb7 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
> @@ -137,10 +137,6 @@
>
> amlogic,tx-delay-ns = <2>;
>
> - snps,reset-gpio = <&gpio GPIOZ_14 0>;
> - snps,reset-delays-us = <0 10000 1000000>;
> - snps,reset-active-low;
> -
> mdio {
> compatible = "snps,dwmac-mdio";
> #address-cells = <1>;
> @@ -149,6 +145,10 @@
> eth_phy0: ethernet-phy@0 {
> /* Realtek RTL8211F (0x001cc916) */
> reg = <0>;
> +
> + reset-assert-us = <10000>;
> + reset-deassert-us = <30000>;
> + reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
> };
> };
> };
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
> index 767b1763a612..b08c4537f260 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
> @@ -70,11 +70,6 @@
>
> amlogic,tx-delay-ns = <2>;
>
> - /* External PHY reset is shared with internal PHY Led signals */
> - snps,reset-gpio = <&gpio GPIOZ_14 0>;
> - snps,reset-delays-us = <0 10000 1000000>;
> - snps,reset-active-low;
> -
> /* External PHY is in RGMII */
> phy-mode = "rgmii";
> };
> @@ -84,6 +79,12 @@
> /* Realtek RTL8211F (0x001cc916) */
> reg = <0>;
> max-speed = <1000>;
> +
> + /* External PHY reset is shared with internal PHY Led signal */
> + reset-assert-us = <10000>;
> + reset-deassert-us = <30000>;
> + reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
> +
> interrupt-parent = <&gpio_intc>;
> interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
> eee-broken-1000t;
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
> index ff4f0780824d..989d33ac6eae 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
> @@ -239,11 +239,6 @@
>
> amlogic,tx-delay-ns = <2>;
>
> - /* External PHY reset is shared with internal PHY Led signals */
> - snps,reset-gpio = <&gpio GPIOZ_14 0>;
> - snps,reset-delays-us = <0 10000 1000000>;
> - snps,reset-active-low;
> -
> /* External PHY is in RGMII */
> phy-mode = "rgmii";
>
> @@ -254,6 +249,11 @@
> external_phy: ethernet-phy@0 {
> /* Realtek RTL8211F (0x001cc916) */
> reg = <0>;
> +
> + reset-assert-us = <10000>;
> + reset-deassert-us = <30000>;
> + reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
> +
> interrupt-parent = <&gpio_intc>;
> /* MAC_INTR on GPIOZ_15 */
> interrupts = <25 IRQ_TYPE_LEVEL_LOW>;
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
> index 29715eae14a9..c2bd4dbbf38c 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
> @@ -101,10 +101,6 @@
>
> amlogic,tx-delay-ns = <2>;
>
> - snps,reset-gpio = <&gpio GPIOZ_14 0>;
> - snps,reset-delays-us = <0 10000 1000000>;
> - snps,reset-active-low;
> -
> /* External PHY is in RGMII */
> phy-mode = "rgmii";
> };
> @@ -114,6 +110,10 @@
> /* Realtek RTL8211F (0x001cc916) */
> reg = <0>;
> max-speed = <1000>;
> +
> + reset-assert-us = <10000>;
> + reset-deassert-us = <30000>;
> + reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
> };
> };
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
> index 8939c0fc5b62..ea45ae0c71b7 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
> @@ -52,11 +52,6 @@
>
> amlogic,tx-delay-ns = <2>;
>
> - /* External PHY reset is shared with internal PHY Led signals */
> - snps,reset-gpio = <&gpio GPIOZ_14 0>;
> - snps,reset-delays-us = <0 10000 1000000>;
> - snps,reset-active-low;
> -
> /* External PHY is in RGMII */
> phy-mode = "rgmii";
> };
> @@ -66,6 +61,12 @@
> /* Realtek RTL8211F (0x001cc916) */
> reg = <0>;
> max-speed = <1000>;
> +
> + /* External PHY reset is shared with internal PHY Led signal */
> + reset-assert-us = <10000>;
> + reset-deassert-us = <30000>;
> + reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
> +
> interrupt-parent = <&gpio_intc>;
> /* MAC_INTR on GPIOZ_15 */
> interrupts = <25 IRQ_TYPE_LEVEL_LOW>;
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
> index 13de1e8f58b5..5cd4d35006d0 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
> @@ -101,10 +101,6 @@
> /* Select external PHY by default */
> phy-handle = <&external_phy>;
>
> - snps,reset-gpio = <&gpio GPIOZ_14 0>;
> - snps,reset-delays-us = <0 10000 1000000>;
> - snps,reset-active-low;
> -
> amlogic,tx-delay-ns = <2>;
>
> /* External PHY is in RGMII */
> @@ -116,6 +112,10 @@
> /* Realtek RTL8211F (0x001cc916) */
> reg = <0>;
> max-speed = <1000>;
> +
> + reset-assert-us = <10000>;
> + reset-deassert-us = <30000>;
> + reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
> };
> };
>
>
Finally... !
This will break u-boot, but it's u-boot's fault not handling the mdio bus !
Reviewed-by: Neil Armstrong <narmstrong@...libre.com>
Powered by blists - more mailing lists