UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Russell King (Oracle) 2023-06-16 13:06:32 +01:00 committed by Jakub Kicinski
parent cdb08aa047
commit febf2aaf05
5 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/ethernet/freescale/fman/fman_dtsec.c
View File

@ -763,15 +763,15 @@ static void dtsec_pcs_get_state(struct phylink_pcs *pcs,
phylink_mii_c22_pcs_get_state(dtsec->tbidev, state); 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, phy_interface_t interface,
const unsigned long *advertising, const unsigned long *advertising,
bool permit_pause_to_mac) bool permit_pause_to_mac)
{ {
struct fman_mac *dtsec = pcs_to_dtsec(pcs); struct fman_mac *dtsec = pcs_to_dtsec(pcs);
return phylink_mii_c22_pcs_config(dtsec->tbidev, mode, interface, return phylink_mii_c22_pcs_config(dtsec->tbidev, interface,
advertising); advertising, neg_mode);
} }
static void dtsec_pcs_an_restart(struct phylink_pcs *pcs) static void dtsec_pcs_an_restart(struct phylink_pcs *pcs)
@ -1447,6 +1447,7 @@ int dtsec_initialization(struct mac_device *mac_dev,
goto _return_fm_mac_free; goto _return_fm_mac_free;
} }
dtsec->pcs.ops = &dtsec_pcs_ops; dtsec->pcs.ops = &dtsec_pcs_ops;
dtsec->pcs.neg_mode = true;
dtsec->pcs.poll = true; dtsec->pcs.poll = true;
supported = mac_dev->phylink_config.supported_interfaces; supported = mac_dev->phylink_config.supported_interfaces;

6
drivers/net/ethernet/xilinx/xilinx_axienet_main.c
View File

@ -1631,7 +1631,7 @@ static void axienet_pcs_an_restart(struct phylink_pcs *pcs)
phylink_mii_c22_pcs_an_restart(pcs_phy); 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, phy_interface_t interface,
const unsigned long *advertising, const unsigned long *advertising,
bool permit_pause_to_mac) bool permit_pause_to_mac)
@ -1653,7 +1653,8 @@ static int axienet_pcs_config(struct phylink_pcs *pcs, unsigned int mode,
} }
} }
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) if (ret < 0)
netdev_warn(ndev, "Failed to configure PCS: %d\n", ret); netdev_warn(ndev, "Failed to configure PCS: %d\n", ret);
@ -2129,6 +2130,7 @@ static int axienet_probe(struct platform_device *pdev)
} }
of_node_put(np); of_node_put(np);
lp->pcs.ops = &axienet_pcs_ops; lp->pcs.ops = &axienet_pcs_ops;
lp->pcs.neg_mode = true;
lp->pcs.poll = true; lp->pcs.poll = true;
} }

18
drivers/net/pcs/pcs-lynx.c
View File

@ -112,9 +112,10 @@ static void lynx_pcs_get_state(struct phylink_pcs *pcs,
state->link, state->an_complete); 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, phy_interface_t interface,
const unsigned long *advertising) const unsigned long *advertising,
unsigned int neg_mode)
{ {
int link_timer_ns; int link_timer_ns;
u32 link_timer; u32 link_timer;
@ -132,8 +133,9 @@ static int lynx_pcs_config_giga(struct mdio_device *pcs, unsigned int mode,
if (interface == PHY_INTERFACE_MODE_1000BASEX) { if (interface == PHY_INTERFACE_MODE_1000BASEX) {
if_mode = 0; if_mode = 0;
} else { } else {
/* SGMII and QSGMII */
if_mode = IF_MODE_SGMII_EN; 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; if_mode |= IF_MODE_USE_SGMII_AN;
} }
@ -143,7 +145,8 @@ static int lynx_pcs_config_giga(struct mdio_device *pcs, unsigned int mode,
if (err) if (err)
return 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, static int lynx_pcs_config_usxgmii(struct mdio_device *pcs, unsigned int mode,
@ -170,13 +173,16 @@ static int lynx_pcs_config(struct phylink_pcs *pcs, unsigned int mode,
bool permit) bool permit)
{ {
struct lynx_pcs *lynx = phylink_pcs_to_lynx(pcs); struct lynx_pcs *lynx = phylink_pcs_to_lynx(pcs);
unsigned int neg_mode;
neg_mode = phylink_pcs_neg_mode(mode, ifmode, advertising);
switch (ifmode) { switch (ifmode) {
case PHY_INTERFACE_MODE_1000BASEX: case PHY_INTERFACE_MODE_1000BASEX:
case PHY_INTERFACE_MODE_SGMII: case PHY_INTERFACE_MODE_SGMII:
case PHY_INTERFACE_MODE_QSGMII: case PHY_INTERFACE_MODE_QSGMII:
return lynx_pcs_config_giga(lynx->mdio, mode, ifmode, return lynx_pcs_config_giga(lynx->mdio, ifmode, advertising,
advertising); neg_mode);
case PHY_INTERFACE_MODE_2500BASEX: case PHY_INTERFACE_MODE_2500BASEX:
if (phylink_autoneg_inband(mode)) { if (phylink_autoneg_inband(mode)) {
dev_err(&lynx->mdio->dev, dev_err(&lynx->mdio->dev,

9
drivers/net/phy/phylink.c
View File

@ -3545,20 +3545,20 @@ EXPORT_SYMBOL_GPL(phylink_mii_c22_pcs_encode_advertisement);
/** /**
* phylink_mii_c22_pcs_config() - configure clause 22 PCS * phylink_mii_c22_pcs_config() - configure clause 22 PCS
* @pcs: a pointer to a &struct mdio_device. * @pcs: a pointer to a &struct mdio_device.
* @mode: link autonegotiation mode
* @interface: the PHY interface mode being configured * @interface: the PHY interface mode being configured
* @advertising: the ethtool advertisement mask * @advertising: the ethtool advertisement mask
* @neg_mode: PCS negotiation mode
* *
* Configure a Clause 22 PCS PHY with the appropriate negotiation * Configure a Clause 22 PCS PHY with the appropriate negotiation
* parameters for the @mode, @interface and @advertising parameters. * parameters for the @mode, @interface and @advertising parameters.
* Returns negative error number on failure, zero if the advertisement * Returns negative error number on failure, zero if the advertisement
* has not changed, or positive if there is a change. * 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, phy_interface_t interface,
const unsigned long *advertising) const unsigned long *advertising,
unsigned int neg_mode)
{ {
unsigned int neg_mode;
bool changed = 0; bool changed = 0;
u16 bmcr; u16 bmcr;
int ret, adv; int ret, adv;
@ -3572,7 +3572,6 @@ int phylink_mii_c22_pcs_config(struct mdio_device *pcs, unsigned int mode,
changed = ret; changed = ret;
} }
neg_mode = phylink_pcs_neg_mode(mode, interface, advertising);
if (neg_mode == PHYLINK_PCS_NEG_INBAND_ENABLED) if (neg_mode == PHYLINK_PCS_NEG_INBAND_ENABLED)
bmcr = BMCR_ANENABLE; bmcr = BMCR_ANENABLE;
else else

5
include/linux/phylink.h
View File

@ -743,9 +743,10 @@ void phylink_mii_c22_pcs_get_state(struct mdio_device *pcs,
struct phylink_link_state *state); struct phylink_link_state *state);
int phylink_mii_c22_pcs_encode_advertisement(phy_interface_t interface, int phylink_mii_c22_pcs_encode_advertisement(phy_interface_t interface,
const unsigned long *advertising); 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, 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_mii_c22_pcs_an_restart(struct mdio_device *pcs);
void phylink_resolve_c73(struct phylink_link_state *state); void phylink_resolve_c73(struct phylink_link_state *state);