53 lines
1.8 KiB
Diff
53 lines
1.8 KiB
Diff
From 12198c3a410fe69843e335c1bbf6d4c2a4d48e4e Mon Sep 17 00:00:00 2001
|
|
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
|
|
Date: Thu, 27 Oct 2022 14:11:03 +0100
|
|
Subject: [PATCH 05/10] net: mtk_eth_soc: add out of band forcing of speed and
|
|
duplex in pcs_link_up
|
|
|
|
Add support for forcing the link speed and duplex setting in the
|
|
pcs_link_up() method for out of band modes, which will be useful when
|
|
we finish converting the pcs_config() method. Until then, we still have
|
|
to force duplex for 802.3z modes to work correctly.
|
|
|
|
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/mediatek/mtk_sgmii.c | 28 ++++++++++++++---------
|
|
1 file changed, 17 insertions(+), 11 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_sgmii.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_sgmii.c
|
|
@@ -108,17 +108,23 @@ static void mtk_pcs_link_up(struct phyli
|
|
struct mtk_pcs *mpcs = pcs_to_mtk_pcs(pcs);
|
|
unsigned int sgm_mode;
|
|
|
|
- if (!phy_interface_mode_is_8023z(interface))
|
|
- return;
|
|
+ if (!phylink_autoneg_inband(mode) ||
|
|
+ phy_interface_mode_is_8023z(interface)) {
|
|
+ /* Force the speed and duplex setting */
|
|
+ if (speed == SPEED_10)
|
|
+ sgm_mode = SGMII_SPEED_10;
|
|
+ else if (speed == SPEED_100)
|
|
+ sgm_mode = SGMII_SPEED_100;
|
|
+ else
|
|
+ sgm_mode = SGMII_SPEED_1000;
|
|
|
|
- /* SGMII force duplex setting */
|
|
- if (duplex == DUPLEX_FULL)
|
|
- sgm_mode = SGMII_DUPLEX_FULL;
|
|
- else
|
|
- sgm_mode = 0;
|
|
+ if (duplex == DUPLEX_FULL)
|
|
+ sgm_mode |= SGMII_DUPLEX_FULL;
|
|
|
|
- regmap_update_bits(mpcs->regmap, SGMSYS_SGMII_MODE,
|
|
- SGMII_DUPLEX_FULL, sgm_mode);
|
|
+ regmap_update_bits(mpcs->regmap, SGMSYS_SGMII_MODE,
|
|
+ SGMII_DUPLEX_FULL | SGMII_SPEED_MASK,
|
|
+ sgm_mode);
|
|
+ }
|
|
}
|
|
|
|
static const struct phylink_pcs_ops mtk_pcs_ops = {
|