OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: phylink: Add PHYLINK_DEV operation type 

In the PHYLINK_DEV operation type, the PHYLINK infrastructure can work
without an attached net_device. For printing usecases, instead, a struct
device * should be passed to PHYLINK using the phylink_config structure.

Also, netif_carrier_* calls ar guarded by the presence of a valid
net_device. When using the PHYLINK_DEV operation type, we cannot check
link status using the netif_carrier_ok() API so instead, keep an
internal state of the MAC and call mac_link_{down,up} only when the link
changed.

Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: Vladimir Oltean <olteanv@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ioana Ciornei 2019-05-28 20:38:13 +03:00 committed by David S. Miller
parent 44cc27e43f
commit 43de61959b
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,8 @@ struct phylink {
struct net_device *netdev; struct net_device *netdev;
const struct phylink_mac_ops *ops; const struct phylink_mac_ops *ops;
struct phylink_config *config; struct phylink_config *config;
struct device *dev;
unsigned int old_link_state:1;
unsigned long phylink_disable_state; /* bitmask of disables */ unsigned long phylink_disable_state; /* bitmask of disables */
struct phy_device *phydev; struct phy_device *phydev;
@ -404,7 +406,8 @@ static void phylink_mac_link_up(struct phylink *pl,
pl->phy_state.interface, pl->phy_state.interface,
pl->phydev); pl->phydev);
netif_carrier_on(ndev); if (ndev)
netif_carrier_on(ndev);
netdev_info(ndev, netdev_info(ndev,
"Link is Up - %s/%s - flow control %s\n", "Link is Up - %s/%s - flow control %s\n",
@ -417,7 +420,8 @@ static void phylink_mac_link_down(struct phylink *pl)
{ {
struct net_device *ndev = pl->netdev; struct net_device *ndev = pl->netdev;
netif_carrier_off(ndev); if (ndev)
netif_carrier_off(ndev);
pl->ops->mac_link_down(pl->config, pl->link_an_mode, pl->ops->mac_link_down(pl->config, pl->link_an_mode,
pl->phy_state.interface); pl->phy_state.interface);
netdev_info(ndev, "Link is Down\n"); netdev_info(ndev, "Link is Down\n");
@ -428,6 +432,7 @@ static void phylink_resolve(struct work_struct *w)
struct phylink *pl = container_of(w, struct phylink, resolve); struct phylink *pl = container_of(w, struct phylink, resolve);
struct phylink_link_state link_state; struct phylink_link_state link_state;
struct net_device *ndev = pl->netdev; struct net_device *ndev = pl->netdev;
int link_changed;
mutex_lock(&pl->state_mutex); mutex_lock(&pl->state_mutex);
if (pl->phylink_disable_state) { if (pl->phylink_disable_state) {
@ -470,7 +475,13 @@ static void phylink_resolve(struct work_struct *w)
} }
} }
if (link_state.link != netif_carrier_ok(ndev)) { if (pl->netdev)
link_changed = (link_state.link != netif_carrier_ok(ndev));
else
link_changed = (link_state.link != pl->old_link_state);
if (link_changed) {
pl->old_link_state = link_state.link;
if (!link_state.link) if (!link_state.link)
phylink_mac_link_down(pl); phylink_mac_link_down(pl);
else else
@ -571,6 +582,8 @@ struct phylink *phylink_create(struct phylink_config *config,
pl->config = config; pl->config = config;
if (config->type == PHYLINK_NETDEV) { if (config->type == PHYLINK_NETDEV) {
pl->netdev = to_net_dev(config->dev); pl->netdev = to_net_dev(config->dev);
} else if (config->type == PHYLINK_DEV) {
pl->dev = config->dev;
} else { } else {
kfree(pl); kfree(pl);
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
@ -910,7 +923,8 @@ void phylink_start(struct phylink *pl)
phy_modes(pl->link_config.interface)); phy_modes(pl->link_config.interface));
/* Always set the carrier off */ /* Always set the carrier off */
netif_carrier_off(pl->netdev); if (pl->netdev)
netif_carrier_off(pl->netdev);
/* Apply the link configuration to the MAC when starting. This allows /* Apply the link configuration to the MAC when starting. This allows
* a fixed-link to start with the correct parameters, and also * a fixed-link to start with the correct parameters, and also
@ -1255,7 +1269,8 @@ int phylink_ethtool_set_pauseparam(struct phylink *pl,
switch (pl->link_an_mode) { switch (pl->link_an_mode) {
case MLO_AN_PHY: case MLO_AN_PHY:
/* Silently mark the carrier down, and then trigger a resolve */ /* Silently mark the carrier down, and then trigger a resolve */
netif_carrier_off(pl->netdev); if (pl->netdev)
netif_carrier_off(pl->netdev);
phylink_run_resolve(pl); phylink_run_resolve(pl);
break; break;

1
include/linux/phylink.h
View File

@ -56,6 +56,7 @@ struct phylink_link_state {
enum phylink_op_type { enum phylink_op_type {
PHYLINK_NETDEV = 0, PHYLINK_NETDEV = 0,
PHYLINK_DEV,
}; };
/** /**