1 From 3b2de56a146f34e3f70a84cc3a1897064e445d16 Mon Sep 17 00:00:00 2001
2 From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
3 Date: Fri, 16 Jun 2023 13:06:43 +0100
4 Subject: [PATCH] net: pcs: lynxi: update PCS driver to use neg_mode
6 Update the Lynxi PCS driver to use neg_mode rather than the mode
7 argument. This ensures that the link_up() method will always program
8 the speed and duplex when negotiation is disabled.
10 Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
11 Link: https://lore.kernel.org/r/E1qA8Dz-00EaFY-5A@rmk-PC.armlinux.org.uk
12 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
14 drivers/net/pcs/pcs-mtk-lynxi.c | 39 ++++++++++++++-------------------
15 1 file changed, 16 insertions(+), 23 deletions(-)
17 --- a/drivers/net/pcs/pcs-mtk-lynxi.c
18 +++ b/drivers/net/pcs/pcs-mtk-lynxi.c
19 @@ -102,13 +102,13 @@ static void mtk_pcs_lynxi_get_state(stru
20 FIELD_GET(SGMII_LPA, adv));
23 -static int mtk_pcs_lynxi_config(struct phylink_pcs *pcs, unsigned int mode,
24 +static int mtk_pcs_lynxi_config(struct phylink_pcs *pcs, unsigned int neg_mode,
25 phy_interface_t interface,
26 const unsigned long *advertising,
27 bool permit_pause_to_mac)
29 struct mtk_pcs_lynxi *mpcs = pcs_to_mtk_pcs_lynxi(pcs);
30 - bool mode_changed = false, changed, use_an;
31 + bool mode_changed = false, changed;
32 unsigned int rgc3, sgm_mode, bmcr;
33 int advertise, link_timer;
35 @@ -121,30 +121,22 @@ static int mtk_pcs_lynxi_config(struct p
36 * we assume that fixes it's speed at bitrate = line rate (in
37 * other words, 1000Mbps or 2500Mbps).
39 - if (interface == PHY_INTERFACE_MODE_SGMII) {
40 + if (interface == PHY_INTERFACE_MODE_SGMII)
41 sgm_mode = SGMII_IF_MODE_SGMII;
42 - if (phylink_autoneg_inband(mode)) {
43 - sgm_mode |= SGMII_REMOTE_FAULT_DIS |
44 - SGMII_SPEED_DUPLEX_AN;
49 - } else if (phylink_autoneg_inband(mode)) {
50 - /* 1000base-X or 2500base-X autoneg */
51 - sgm_mode = SGMII_REMOTE_FAULT_DIS;
52 - use_an = linkmode_test_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,
56 /* 1000base-X or 2500base-X without autoneg */
62 + if (neg_mode & PHYLINK_PCS_NEG_INBAND)
63 + sgm_mode |= SGMII_REMOTE_FAULT_DIS;
65 + if (neg_mode == PHYLINK_PCS_NEG_INBAND_ENABLED) {
66 + if (interface == PHY_INTERFACE_MODE_SGMII)
67 + sgm_mode |= SGMII_SPEED_DUPLEX_AN;
74 if (mpcs->interface != interface) {
75 link_timer = phylink_get_link_timer_ns(interface);
76 @@ -216,14 +208,15 @@ static void mtk_pcs_lynxi_restart_an(str
77 regmap_set_bits(mpcs->regmap, SGMSYS_PCS_CONTROL_1, BMCR_ANRESTART);
80 -static void mtk_pcs_lynxi_link_up(struct phylink_pcs *pcs, unsigned int mode,
81 +static void mtk_pcs_lynxi_link_up(struct phylink_pcs *pcs,
82 + unsigned int neg_mode,
83 phy_interface_t interface, int speed,
86 struct mtk_pcs_lynxi *mpcs = pcs_to_mtk_pcs_lynxi(pcs);
87 unsigned int sgm_mode;
89 - if (!phylink_autoneg_inband(mode)) {
90 + if (neg_mode != PHYLINK_PCS_NEG_INBAND_ENABLED) {
91 /* Force the speed and duplex setting */
92 if (speed == SPEED_10)
93 sgm_mode = SGMII_SPEED_10;
94 @@ -286,6 +279,7 @@ struct phylink_pcs *mtk_pcs_lynxi_create
95 mpcs->regmap = regmap;
97 mpcs->pcs.ops = &mtk_pcs_lynxi_ops;
98 + mpcs->pcs.neg_mode = true;
99 mpcs->pcs.poll = true;
100 mpcs->interface = PHY_INTERFACE_MODE_NA;