Hi Greg,
On 12/28/22 09:34, Greg Kroah-Hartman wrote:
> From: Sean Anderson <sean.anderson@xxxxxxxx>
>
> [ Upstream commit 36926a7d70c2d462fca1ed85bfee000d17fd8662 ]
>
> On the T208X SoCs, MAC1 and MAC2 support XGMII. Add some new MAC dtsi
> fragments, and mark the QMAN ports as 10G.
>
> Fixes: da414bb923d9 ("powerpc/mpc85xx: Add FSL QorIQ DPAA FMan support to the SoC device tree(s)")
> Signed-off-by: Sean Anderson <sean.anderson@xxxxxxxx>
> Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
This shouldn't be backported without [1].
That said, this fix isn't necessary for kernels which don't use phylink for this ethernet driver.
--Sean
[1] https://lore.kernel.org/netdev/20221216172937.2960054-1-sean.anderson@xxxxxxxx/
> ---
> .../boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi | 44 +++++++++++++++++++
> .../boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi | 44 +++++++++++++++++++
> arch/powerpc/boot/dts/fsl/t2081si-post.dtsi | 4 +-
> 3 files changed, 90 insertions(+), 2 deletions(-)
> create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi
> create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi
>
> diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi
> new file mode 100644
> index 000000000000..437dab3fc017
> --- /dev/null
> +++ b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi
> @@ -0,0 +1,44 @@
> +// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-or-later
> +/*
> + * QorIQ FMan v3 10g port #2 device tree stub [ controller @ offset 0x400000 ]
> + *
> + * Copyright 2022 Sean Anderson <sean.anderson@xxxxxxxx>
> + * Copyright 2012 - 2015 Freescale Semiconductor Inc.
> + */
> +
> +fman@400000 {
> + fman0_rx_0x08: port@88000 {
> + cell-index = <0x8>;
> + compatible = "fsl,fman-v3-port-rx";
> + reg = <0x88000 0x1000>;
> + fsl,fman-10g-port;
> + };
> +
> + fman0_tx_0x28: port@a8000 {
> + cell-index = <0x28>;
> + compatible = "fsl,fman-v3-port-tx";
> + reg = <0xa8000 0x1000>;
> + fsl,fman-10g-port;
> + };
> +
> + ethernet@e0000 {
> + cell-index = <0>;
> + compatible = "fsl,fman-memac";
> + reg = <0xe0000 0x1000>;
> + fsl,fman-ports = <&fman0_rx_0x08 &fman0_tx_0x28>;
> + ptp-timer = <&ptp_timer0>;
> + pcsphy-handle = <&pcsphy0>;
> + };
> +
> + mdio@e1000 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
> + reg = <0xe1000 0x1000>;
> + fsl,erratum-a011043; /* must ignore read errors */
> +
> + pcsphy0: ethernet-phy@0 {
> + reg = <0x0>;
> + };
> + };
> +};
> diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi
> new file mode 100644
> index 000000000000..ad116b17850a
> --- /dev/null
> +++ b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi
> @@ -0,0 +1,44 @@
> +// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-or-later
> +/*
> + * QorIQ FMan v3 10g port #3 device tree stub [ controller @ offset 0x400000 ]
> + *
> + * Copyright 2022 Sean Anderson <sean.anderson@xxxxxxxx>
> + * Copyright 2012 - 2015 Freescale Semiconductor Inc.
> + */
> +
> +fman@400000 {
> + fman0_rx_0x09: port@89000 {
> + cell-index = <0x9>;
> + compatible = "fsl,fman-v3-port-rx";
> + reg = <0x89000 0x1000>;
> + fsl,fman-10g-port;
> + };
> +
> + fman0_tx_0x29: port@a9000 {
> + cell-index = <0x29>;
> + compatible = "fsl,fman-v3-port-tx";
> + reg = <0xa9000 0x1000>;
> + fsl,fman-10g-port;
> + };
> +
> + ethernet@e2000 {
> + cell-index = <1>;
> + compatible = "fsl,fman-memac";
> + reg = <0xe2000 0x1000>;
> + fsl,fman-ports = <&fman0_rx_0x09 &fman0_tx_0x29>;
> + ptp-timer = <&ptp_timer0>;
> + pcsphy-handle = <&pcsphy1>;
> + };
> +
> + mdio@e3000 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
> + reg = <0xe3000 0x1000>;
> + fsl,erratum-a011043; /* must ignore read errors */
> +
> + pcsphy1: ethernet-phy@0 {
> + reg = <0x0>;
> + };
> + };
> +};
> diff --git a/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi b/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi
> index ecbb447920bc..74e17e134387 100644
> --- a/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi
> +++ b/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi
> @@ -609,8 +609,8 @@ usb1: usb@211000 {
> /include/ "qoriq-bman1.dtsi"
>
> /include/ "qoriq-fman3-0.dtsi"
> -/include/ "qoriq-fman3-0-1g-0.dtsi"
> -/include/ "qoriq-fman3-0-1g-1.dtsi"
> +/include/ "qoriq-fman3-0-10g-2.dtsi"
> +/include/ "qoriq-fman3-0-10g-3.dtsi"
> /include/ "qoriq-fman3-0-1g-2.dtsi"
> /include/ "qoriq-fman3-0-1g-3.dtsi"
> /include/ "qoriq-fman3-0-1g-4.dtsi"
