kernel: 6.18: backport mxl862xx driver for Linxu 6.18

The signature of phylink_pcs get_state has changed, and we need to set
.supported_interfaces.

Both has been removed when backporting the driver to Linux 6.12, readd
to make it build and work with Linux 6.18.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Link: https://github.com/openwrt/openwrt/pull/22668
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/generic/backport-6.18/767-v7.0-net-dsa-MxL862xx-don-t-force-enable-MAXLINEAR_GPHY.patch b/target/linux/generic/backport-6.18/767-v7.0-net-dsa-mxl862xx-don-t-read-out-of-bounds.patch
similarity index 100%
rename from target/linux/generic/backport-6.18/767-v7.0-net-dsa-MxL862xx-don-t-force-enable-MAXLINEAR_GPHY.patch
rename to target/linux/generic/backport-6.18/767-v7.0-net-dsa-mxl862xx-don-t-read-out-of-bounds.patch

diff --git a/target/linux/generic/pending-6.18/760-11-net-dsa-mxl862xx-add-support-for-SerDes-ports.patch b/target/linux/generic/pending-6.18/760-11-net-dsa-mxl862xx-add-support-for-SerDes-ports.patch
index 790f50c87dfee6ed0d86a9258fa43c38b8b7661f..5680ac1747511191436044fe784ccf861102a647 100644 (file)
--- a/target/linux/generic/pending-6.18/760-11-net-dsa-mxl862xx-add-support-for-SerDes-ports.patch
+++ b/target/linux/generic/pending-6.18/760-11-net-dsa-mxl862xx-add-support-for-SerDes-ports.patch
@@ -576,7 +576,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  #include "mxl862xx-phylink.h"
  
  void mxl862xx_phylink_get_caps(struct dsa_switch *ds, int port,
-@@ -19,8 +23,393 @@ void mxl862xx_phylink_get_caps(struct ds
+@@ -19,8 +23,410 @@ void mxl862xx_phylink_get_caps(struct ds
        config->mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE | MAC_10 |
                                   MAC_100 | MAC_1000 | MAC_2500FD;
  
@@ -808,6 +808,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 +}
 +
 +static void mxl862xx_pcs_get_state(struct phylink_pcs *pcs,
++                                 unsigned int neg_mode,
 +                                 struct phylink_link_state *state)
 +{
 +      struct mxl862xx_priv *priv = pcs_to_mxl862xx_pcs(pcs)->priv;
@@ -845,7 +846,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 +              bmsr = BMSR_LSTATUS;
 +              if (st.an_complete)
 +                      bmsr |= BMSR_ANEGCOMPLETE;
-+              phylink_mii_c22_pcs_decode_state(state, bmsr, lpa);
++              phylink_mii_c22_pcs_decode_state(state, neg_mode, bmsr, lpa);
 +
 +              /* Override speed/duplex with firmware's resolved values
 +               * for downshift detection.
@@ -950,6 +951,22 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 +
 +      pcs->pcs.ops = &mxl862xx_pcs_ops;
 +      pcs->pcs.poll = true;
++
++      /* Sub-ports only support QSGMII (quad mode with dedicated
++       * PHY_INTERFACE_MODE). Single-lane USXGMII is supported on main
++       * ports only; quad USXGMII is not yet supported as Linux lacks the
++       * infrastructure to signal TDM mode before AN.
++       */
++      __set_bit(PHY_INTERFACE_MODE_QSGMII, pcs->pcs.supported_interfaces);
++      if (port != 9 && port != 13)
++              return;
++
++      __set_bit(PHY_INTERFACE_MODE_SGMII, pcs->pcs.supported_interfaces);
++      __set_bit(PHY_INTERFACE_MODE_1000BASEX, pcs->pcs.supported_interfaces);
++      __set_bit(PHY_INTERFACE_MODE_2500BASEX, pcs->pcs.supported_interfaces);
++      __set_bit(PHY_INTERFACE_MODE_10GBASER, pcs->pcs.supported_interfaces);
++      __set_bit(PHY_INTERFACE_MODE_10GKR, pcs->pcs.supported_interfaces);
++      __set_bit(PHY_INTERFACE_MODE_USXGMII, pcs->pcs.supported_interfaces);
 +}
 +
 +static struct phylink_pcs *
@@ -972,7 +989,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  }
  
  static void mxl862xx_phylink_mac_config(struct phylink_config *config,
-@@ -48,4 +437,5 @@ const struct phylink_mac_ops mxl862xx_ph
+@@ -48,4 +454,5 @@ const struct phylink_mac_ops mxl862xx_ph
        .mac_config = mxl862xx_phylink_mac_config,
        .mac_link_down = mxl862xx_phylink_mac_link_down,
        .mac_link_up = mxl862xx_phylink_mac_link_up,

diff --git a/target/linux/generic/pending-6.18/760-12-net-dsa-mxl862xx-add-SerDes-ethtool-statistics.patch b/target/linux/generic/pending-6.18/760-12-net-dsa-mxl862xx-add-SerDes-ethtool-statistics.patch
index 5f1e1bb3e592b6662c114c2b017795fbe1bd006e..26c0452fb895e4b01c86f41cc9f70059ff79a7d7 100644 (file)
--- a/target/linux/generic/pending-6.18/760-12-net-dsa-mxl862xx-add-SerDes-ethtool-statistics.patch
+++ b/target/linux/generic/pending-6.18/760-12-net-dsa-mxl862xx-add-SerDes-ethtool-statistics.patch
@@ -129,7 +129,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  
 --- a/drivers/net/dsa/mxl862xx/mxl862xx-phylink.c
 +++ b/drivers/net/dsa/mxl862xx/mxl862xx-phylink.c
-@@ -439,3 +439,96 @@ const struct phylink_mac_ops mxl862xx_ph
+@@ -456,3 +456,96 @@ const struct phylink_mac_ops mxl862xx_ph
        .mac_link_up = mxl862xx_phylink_mac_link_up,
        .mac_select_pcs = mxl862xx_phylink_mac_select_pcs,
  };

diff --git a/target/linux/generic/pending-6.18/760-13-net-dsa-mxl862xx-add-SerDes-self-test-via-PRBS-and-B.patch b/target/linux/generic/pending-6.18/760-13-net-dsa-mxl862xx-add-SerDes-self-test-via-PRBS-and-B.patch
index 1da11ae9c07e2ece4b30b82c4fd059a001d34752..1fb76182d36cfce7a40101c364633d20bff870d2 100644 (file)
--- a/target/linux/generic/pending-6.18/760-13-net-dsa-mxl862xx-add-SerDes-self-test-via-PRBS-and-B.patch
+++ b/target/linux/generic/pending-6.18/760-13-net-dsa-mxl862xx-add-SerDes-self-test-via-PRBS-and-B.patch
@@ -89,7 +89,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  
 --- a/drivers/net/dsa/mxl862xx/mxl862xx-phylink.c
 +++ b/drivers/net/dsa/mxl862xx/mxl862xx-phylink.c
-@@ -532,3 +532,88 @@ void mxl862xx_serdes_get_stats(struct ds
+@@ -549,3 +549,88 @@ void mxl862xx_serdes_get_stats(struct ds
                data += 4;
        }
  }

diff --git a/target/linux/generic/pending-6.18/760-26-DO-NOT-SUBMIT-net-dsa-mxl862xx-legacy-SFP-API-fallba.patch b/target/linux/generic/pending-6.18/760-26-DO-NOT-SUBMIT-net-dsa-mxl862xx-legacy-SFP-API-fallba.patch
index 41cd927ac4fbaac1dfa3edb0c5f5a006f77b4402..8a964014569084413a8a2144110309824a9fc47d 100644 (file)
--- a/target/linux/generic/pending-6.18/760-26-DO-NOT-SUBMIT-net-dsa-mxl862xx-legacy-SFP-API-fallba.patch
+++ b/target/linux/generic/pending-6.18/760-26-DO-NOT-SUBMIT-net-dsa-mxl862xx-legacy-SFP-API-fallba.patch
@@ -62,7 +62,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  #define MXL862XX_XPCS_PCS_CONFIG      (MXL862XX_XPCS_MAGIC + 0x1)
 --- a/drivers/net/dsa/mxl862xx/mxl862xx-phylink.c
 +++ b/drivers/net/dsa/mxl862xx/mxl862xx-phylink.c
-@@ -52,6 +52,155 @@ static struct mxl862xx_pcs *pcs_to_mxl86
+@@ -52,6 +52,156 @@ static struct mxl862xx_pcs *pcs_to_mxl86
        return container_of(pcs, struct mxl862xx_pcs, pcs);
  }
  
@@ -114,6 +114,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 +}
 +
 +static void mxl862xx_legacy_pcs_get_state(struct phylink_pcs *pcs,
++                                        unsigned int neg_mode,
 +                                        struct phylink_link_state *state)
 +{
 +      struct mxl862xx_priv *priv = pcs_to_mxl862xx_pcs(pcs)->priv;
@@ -218,7 +219,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  static int mxl862xx_xpcs_port_id(int port)
  {
        return port >= 13;
-@@ -389,7 +538,10 @@ void mxl862xx_setup_pcs(struct mxl862xx_
+@@ -390,7 +540,10 @@ void mxl862xx_setup_pcs(struct mxl862xx_
        pcs->priv = priv;
        pcs->port = port;
  
@@ -228,9 +229,9 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 +      else
 +              pcs->pcs.ops = &mxl862xx_legacy_pcs_ops;
        pcs->pcs.poll = true;
- }
  
-@@ -401,9 +553,6 @@ mxl862xx_phylink_mac_select_pcs(struct p
+       /* Sub-ports only support QSGMII (quad mode with dedicated
+@@ -418,9 +571,6 @@ mxl862xx_phylink_mac_select_pcs(struct p
        struct mxl862xx_priv *priv = dp->ds->priv;
        int port = dp->index;
  
@@ -240,7 +241,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
        switch (port) {
        case 9 ... 16:
                return &priv->serdes_ports[port - 9].pcs;
-@@ -534,7 +683,7 @@ void mxl862xx_serdes_get_stats(struct ds
+@@ -551,7 +701,7 @@ void mxl862xx_serdes_get_stats(struct ds
  }
  
  void mxl862xx_serdes_self_test(struct dsa_switch *ds, int port,