| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960 |
- From 9d32637122de88f1ef614c29703f0e050cad342e Mon Sep 17 00:00:00 2001
- From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <[email protected]>
- Date: Wed, 1 Feb 2023 19:23:30 +0100
- Subject: [PATCH] net: mediatek: sgmii: fix duplex configuration
- MIME-Version: 1.0
- Content-Type: text/plain; charset=UTF-8
- Content-Transfer-Encoding: 8bit
- The logic of the duplex bit is inverted. Setting it means half
- duplex, not full duplex.
- Fix and rename macro to avoid confusion.
- Fixes: 7e538372694b ("net: ethernet: mediatek: Re-add support SGMII")
- Reviewed-by: Russell King (Oracle) <[email protected]>
- Signed-off-by: Bjørn Mork <[email protected]>
- Acked-by: Daniel Golle <[email protected]>
- Tested-by: Daniel Golle <[email protected]>
- Signed-off-by: Jakub Kicinski <[email protected]>
- ---
- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 2 +-
- drivers/net/ethernet/mediatek/mtk_sgmii.c | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
- --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
- +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
- @@ -523,7 +523,7 @@
- #define SGMII_SPEED_10 FIELD_PREP(SGMII_SPEED_MASK, 0)
- #define SGMII_SPEED_100 FIELD_PREP(SGMII_SPEED_MASK, 1)
- #define SGMII_SPEED_1000 FIELD_PREP(SGMII_SPEED_MASK, 2)
- -#define SGMII_DUPLEX_FULL BIT(4)
- +#define SGMII_DUPLEX_HALF BIT(4)
- #define SGMII_IF_MODE_BIT5 BIT(5)
- #define SGMII_REMOTE_FAULT_DIS BIT(8)
- #define SGMII_CODE_SYNC_SET_VAL BIT(9)
- --- a/drivers/net/ethernet/mediatek/mtk_sgmii.c
- +++ b/drivers/net/ethernet/mediatek/mtk_sgmii.c
- @@ -66,7 +66,7 @@ static int mtk_pcs_setup_mode_force(stru
-
- /* Set the speed etc but leave the duplex unchanged */
- regmap_read(mpcs->regmap, SGMSYS_SGMII_MODE, &val);
- - val &= SGMII_DUPLEX_FULL | ~SGMII_IF_MODE_MASK;
- + val &= SGMII_DUPLEX_HALF | ~SGMII_IF_MODE_MASK;
- val |= SGMII_SPEED_1000;
- regmap_write(mpcs->regmap, SGMSYS_SGMII_MODE, val);
-
- @@ -131,9 +131,10 @@ static void mtk_pcs_link_up(struct phyli
-
- /* SGMII force duplex setting */
- regmap_read(mpcs->regmap, SGMSYS_SGMII_MODE, &val);
- - val &= ~SGMII_DUPLEX_FULL;
- - if (duplex == DUPLEX_FULL)
- - val |= SGMII_DUPLEX_FULL;
- +
- + val &= ~SGMII_DUPLEX_HALF;
- + if (duplex != DUPLEX_FULL)
- + val |= SGMII_DUPLEX_HALF;
-
- regmap_write(mpcs->regmap, SGMSYS_SGMII_MODE, val);
- }
|
