188 lines
6.8 KiB
Diff
188 lines
6.8 KiB
Diff
From febf2aaf05641f3258cc30e072aff65cffc7c82c Mon Sep 17 00:00:00 2001
|
|
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
|
|
Date: Fri, 16 Jun 2023 13:06:32 +0100
|
|
Subject: [PATCH 2/2] net: phylink: pass neg_mode into
|
|
phylink_mii_c22_pcs_config()
|
|
|
|
Convert fman_dtsec, xilinx_axienet and pcs-lynx to pass the neg_mode
|
|
into phylink_mii_c22_pcs_config(). Where appropriate, drivers are
|
|
updated to have neg_mode passed into their pcs_config() and
|
|
pcs_link_up() functions. For other drivers, we just hoist the call
|
|
to phylink_pcs_neg_mode() to their pcs_config() method out of
|
|
phylink_mii_c22_pcs_config().
|
|
|
|
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
|
Link: https://lore.kernel.org/r/E1qA8Do-00EaFM-Ra@rmk-PC.armlinux.org.uk
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
.../net/ethernet/freescale/fman/fman_dtsec.c | 7 ++++---
|
|
.../net/ethernet/xilinx/xilinx_axienet_main.c | 6 ++++--
|
|
drivers/net/pcs/pcs-lynx.c | 18 ++++++++++++------
|
|
drivers/net/phy/phylink.c | 9 ++++-----
|
|
include/linux/phylink.h | 5 +++--
|
|
5 files changed, 27 insertions(+), 18 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/freescale/fman/fman_dtsec.c
|
|
+++ b/drivers/net/ethernet/freescale/fman/fman_dtsec.c
|
|
@@ -763,15 +763,15 @@ static void dtsec_pcs_get_state(struct p
|
|
phylink_mii_c22_pcs_get_state(dtsec->tbidev, state);
|
|
}
|
|
|
|
-static int dtsec_pcs_config(struct phylink_pcs *pcs, unsigned int mode,
|
|
+static int dtsec_pcs_config(struct phylink_pcs *pcs, unsigned int neg_mode,
|
|
phy_interface_t interface,
|
|
const unsigned long *advertising,
|
|
bool permit_pause_to_mac)
|
|
{
|
|
struct fman_mac *dtsec = pcs_to_dtsec(pcs);
|
|
|
|
- return phylink_mii_c22_pcs_config(dtsec->tbidev, mode, interface,
|
|
- advertising);
|
|
+ return phylink_mii_c22_pcs_config(dtsec->tbidev, interface,
|
|
+ advertising, neg_mode);
|
|
}
|
|
|
|
static void dtsec_pcs_an_restart(struct phylink_pcs *pcs)
|
|
@@ -1447,6 +1447,7 @@ int dtsec_initialization(struct mac_devi
|
|
goto _return_fm_mac_free;
|
|
}
|
|
dtsec->pcs.ops = &dtsec_pcs_ops;
|
|
+ dtsec->pcs.neg_mode = true;
|
|
dtsec->pcs.poll = true;
|
|
|
|
supported = mac_dev->phylink_config.supported_interfaces;
|
|
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
|
|
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
|
|
@@ -1631,7 +1631,7 @@ static void axienet_pcs_an_restart(struc
|
|
phylink_mii_c22_pcs_an_restart(pcs_phy);
|
|
}
|
|
|
|
-static int axienet_pcs_config(struct phylink_pcs *pcs, unsigned int mode,
|
|
+static int axienet_pcs_config(struct phylink_pcs *pcs, unsigned int neg_mode,
|
|
phy_interface_t interface,
|
|
const unsigned long *advertising,
|
|
bool permit_pause_to_mac)
|
|
@@ -1653,7 +1653,8 @@ static int axienet_pcs_config(struct phy
|
|
}
|
|
}
|
|
|
|
- ret = phylink_mii_c22_pcs_config(pcs_phy, mode, interface, advertising);
|
|
+ ret = phylink_mii_c22_pcs_config(pcs_phy, interface, advertising,
|
|
+ neg_mode);
|
|
if (ret < 0)
|
|
netdev_warn(ndev, "Failed to configure PCS: %d\n", ret);
|
|
|
|
@@ -2129,6 +2130,7 @@ static int axienet_probe(struct platform
|
|
}
|
|
of_node_put(np);
|
|
lp->pcs.ops = &axienet_pcs_ops;
|
|
+ lp->pcs.neg_mode = true;
|
|
lp->pcs.poll = true;
|
|
}
|
|
|
|
--- a/drivers/net/pcs/pcs-lynx.c
|
|
+++ b/drivers/net/pcs/pcs-lynx.c
|
|
@@ -122,9 +122,10 @@ static void lynx_pcs_get_state(struct ph
|
|
state->link, state->an_complete);
|
|
}
|
|
|
|
-static int lynx_pcs_config_giga(struct mdio_device *pcs, unsigned int mode,
|
|
+static int lynx_pcs_config_giga(struct mdio_device *pcs,
|
|
phy_interface_t interface,
|
|
- const unsigned long *advertising)
|
|
+ const unsigned long *advertising,
|
|
+ unsigned int neg_mode)
|
|
{
|
|
u32 link_timer;
|
|
u16 if_mode;
|
|
@@ -137,8 +138,9 @@ static int lynx_pcs_config_giga(struct m
|
|
|
|
if_mode = 0;
|
|
} else {
|
|
+ /* SGMII and QSGMII */
|
|
if_mode = IF_MODE_SGMII_EN;
|
|
- if (mode == MLO_AN_INBAND) {
|
|
+ if (neg_mode == PHYLINK_PCS_NEG_INBAND_ENABLED) {
|
|
if_mode |= IF_MODE_USE_SGMII_AN;
|
|
|
|
/* Adjust link timer for SGMII */
|
|
@@ -154,7 +156,8 @@ static int lynx_pcs_config_giga(struct m
|
|
if (err)
|
|
return err;
|
|
|
|
- return phylink_mii_c22_pcs_config(pcs, mode, interface, advertising);
|
|
+ return phylink_mii_c22_pcs_config(pcs, interface, advertising,
|
|
+ neg_mode);
|
|
}
|
|
|
|
static int lynx_pcs_config_usxgmii(struct mdio_device *pcs, unsigned int mode,
|
|
@@ -181,13 +184,16 @@ static int lynx_pcs_config(struct phylin
|
|
bool permit)
|
|
{
|
|
struct lynx_pcs *lynx = phylink_pcs_to_lynx(pcs);
|
|
+ unsigned int neg_mode;
|
|
+
|
|
+ neg_mode = phylink_pcs_neg_mode(mode, ifmode, advertising);
|
|
|
|
switch (ifmode) {
|
|
case PHY_INTERFACE_MODE_1000BASEX:
|
|
case PHY_INTERFACE_MODE_SGMII:
|
|
case PHY_INTERFACE_MODE_QSGMII:
|
|
- return lynx_pcs_config_giga(lynx->mdio, mode, ifmode,
|
|
- advertising);
|
|
+ return lynx_pcs_config_giga(lynx->mdio, ifmode, advertising,
|
|
+ neg_mode);
|
|
case PHY_INTERFACE_MODE_2500BASEX:
|
|
if (phylink_autoneg_inband(mode)) {
|
|
dev_err(&lynx->mdio->dev,
|
|
--- a/drivers/net/phy/phylink.c
|
|
+++ b/drivers/net/phy/phylink.c
|
|
@@ -3545,20 +3545,20 @@ EXPORT_SYMBOL_GPL(phylink_mii_c22_pcs_en
|
|
/**
|
|
* phylink_mii_c22_pcs_config() - configure clause 22 PCS
|
|
* @pcs: a pointer to a &struct mdio_device.
|
|
- * @mode: link autonegotiation mode
|
|
* @interface: the PHY interface mode being configured
|
|
* @advertising: the ethtool advertisement mask
|
|
+ * @neg_mode: PCS negotiation mode
|
|
*
|
|
* Configure a Clause 22 PCS PHY with the appropriate negotiation
|
|
* parameters for the @mode, @interface and @advertising parameters.
|
|
* Returns negative error number on failure, zero if the advertisement
|
|
* has not changed, or positive if there is a change.
|
|
*/
|
|
-int phylink_mii_c22_pcs_config(struct mdio_device *pcs, unsigned int mode,
|
|
+int phylink_mii_c22_pcs_config(struct mdio_device *pcs,
|
|
phy_interface_t interface,
|
|
- const unsigned long *advertising)
|
|
+ const unsigned long *advertising,
|
|
+ unsigned int neg_mode)
|
|
{
|
|
- unsigned int neg_mode;
|
|
bool changed = 0;
|
|
u16 bmcr;
|
|
int ret, adv;
|
|
@@ -3572,7 +3572,6 @@ int phylink_mii_c22_pcs_config(struct md
|
|
changed = ret;
|
|
}
|
|
|
|
- neg_mode = phylink_pcs_neg_mode(mode, interface, advertising);
|
|
if (neg_mode == PHYLINK_PCS_NEG_INBAND_ENABLED)
|
|
bmcr = BMCR_ANENABLE;
|
|
else
|
|
--- a/include/linux/phylink.h
|
|
+++ b/include/linux/phylink.h
|
|
@@ -743,9 +743,10 @@ void phylink_mii_c22_pcs_get_state(struc
|
|
struct phylink_link_state *state);
|
|
int phylink_mii_c22_pcs_encode_advertisement(phy_interface_t interface,
|
|
const unsigned long *advertising);
|
|
-int phylink_mii_c22_pcs_config(struct mdio_device *pcs, unsigned int mode,
|
|
+int phylink_mii_c22_pcs_config(struct mdio_device *pcs,
|
|
phy_interface_t interface,
|
|
- const unsigned long *advertising);
|
|
+ const unsigned long *advertising,
|
|
+ unsigned int neg_mode);
|
|
void phylink_mii_c22_pcs_an_restart(struct mdio_device *pcs);
|
|
|
|
void phylink_resolve_c73(struct phylink_link_state *state);
|