kernel: mtk_sgmii: re-organize PCS link status reporting

Don't report speed in case link is down.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/target/linux/generic/pending-5.15/724-net-mtk_sgmii-implement-mtk_pcs_ops.patch b/target/linux/generic/pending-5.15/724-net-mtk_sgmii-implement-mtk_pcs_ops.patch
index 896f0169d2b9453f6af9ba23367a6edb36724182..cd97706658740a093c38318e825c2e9fc9f35723 100644 (file)
--- a/target/linux/generic/pending-5.15/724-net-mtk_sgmii-implement-mtk_pcs_ops.patch
+++ b/target/linux/generic/pending-5.15/724-net-mtk_sgmii-implement-mtk_pcs_ops.patch
@@ -15,7 +15,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 
 --- a/drivers/net/ethernet/mediatek/mtk_sgmii.c
 +++ b/drivers/net/ethernet/mediatek/mtk_sgmii.c
-@@ -122,10 +122,26 @@ static void mtk_pcs_link_up(struct phyli
+@@ -122,10 +122,28 @@ static void mtk_pcs_link_up(struct phyli
        regmap_write(mpcs->regmap, SGMSYS_SGMII_MODE, val);
  }
  
@@ -24,12 +24,14 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 +      struct mtk_pcs *mpcs = pcs_to_mtk_pcs(pcs);
 +      unsigned int val;
 +
-+      regmap_read(mpcs->regmap, mpcs->ana_rgc3, &val);
-+      state->speed = val & RG_PHY_SPEED_3_125G ? SPEED_2500 : SPEED_1000;
-+
 +      regmap_read(mpcs->regmap, SGMSYS_PCS_CONTROL_1, &val);
 +      state->an_complete = !!(val & SGMII_AN_COMPLETE);
 +      state->link = !!(val & SGMII_LINK_STATYS);
++      if (!state->link)
++              return;
++
++      regmap_read(mpcs->regmap, mpcs->ana_rgc3, &val);
++      state->speed = val & RG_PHY_SPEED_3_125G ? SPEED_2500 : SPEED_1000;
 +      state->duplex = DUPLEX_FULL;
 +      state->pause = 0;
 +}