leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: ethernet: Add helper for MACs which support asym pause

Browse Source 
Rather than have the MAC drivers manipulate phydev members to indicate
they support Asym Pause, add a helper function.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andrew Lunn
2018-09-12 01:53:15 +02:00
committed by David S. Miller
parent 41124fa64d
commit af8d9bb2f2
17 changed files with 33 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
View File

@@ -879,8 +879,8 @@ static bool xgbe_phy_finisar_phy_quirks(struct xgbe_prv_data *pdata)
phy_write(phy_data->phydev, 0x00, 0x9140); phy_write(phy_data->phydev, 0x00, 0x9140);
phy_data->phydev->supported = PHY_GBIT_FEATURES; phy_data->phydev->supported = PHY_GBIT_FEATURES;
phy_data->phydev->supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause;
phy_data->phydev->advertising = phy_data->phydev->supported; phy_data->phydev->advertising = phy_data->phydev->supported;
phy_support_asym_pause(phy_data->phydev);
netif_dbg(pdata, drv, pdata->netdev, netif_dbg(pdata, drv, pdata->netdev,
"Finisar PHY quirk in place\n"); "Finisar PHY quirk in place\n");
@@ -951,8 +951,8 @@ static bool xgbe_phy_belfuse_phy_quirks(struct xgbe_prv_data *pdata)
phy_write(phy_data->phydev, 0x00, reg & ~0x00800); phy_write(phy_data->phydev, 0x00, reg & ~0x00800);
phy_data->phydev->supported = PHY_GBIT_FEATURES; phy_data->phydev->supported = PHY_GBIT_FEATURES;
phy_data->phydev->supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause;
phy_data->phydev->advertising = phy_data->phydev->supported; phy_data->phydev->advertising = phy_data->phydev->supported;
phy_support_asym_pause(phy_data->phydev);
netif_dbg(pdata, drv, pdata->netdev, netif_dbg(pdata, drv, pdata->netdev,
"BelFuse PHY quirk in place\n"); "BelFuse PHY quirk in place\n");

4
drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
View File

@@ -898,9 +898,7 @@ int xgene_enet_phy_connect(struct net_device *ndev)
phy_remove_link_mode(phy_dev, ETHTOOL_LINK_MODE_10baseT_Half_BIT); phy_remove_link_mode(phy_dev, ETHTOOL_LINK_MODE_10baseT_Half_BIT);
phy_remove_link_mode(phy_dev, ETHTOOL_LINK_MODE_100baseT_Half_BIT); phy_remove_link_mode(phy_dev, ETHTOOL_LINK_MODE_100baseT_Half_BIT);
phy_remove_link_mode(phy_dev, ETHTOOL_LINK_MODE_1000baseT_Half_BIT); phy_remove_link_mode(phy_dev, ETHTOOL_LINK_MODE_1000baseT_Half_BIT);
phy_dev->supported |= SUPPORTED_Pause | phy_support_asym_pause(phy_dev);
SUPPORTED_Asym_Pause;
phy_dev->advertising = phy_dev->supported;
return 0; return 0;
} }

5
drivers/net/ethernet/broadcom/sb1250-mac.c
View File

@@ -2358,13 +2358,10 @@ static int sbmac_mii_probe(struct net_device *dev)
/* Remove any features not supported by the controller */ /* Remove any features not supported by the controller */
phy_set_max_speed(phy_dev, SPEED_1000); phy_set_max_speed(phy_dev, SPEED_1000);
phy_dev->supported |= SUPPORTED_Pause | phy_support_asym_pause(phy_dev);
SUPPORTED_Asym_Pause;
phy_attached_info(phy_dev); phy_attached_info(phy_dev);
phy_dev->advertising = phy_dev->supported;
sc->phy_dev = phy_dev; sc->phy_dev = phy_dev;
return 0; return 0;

8
drivers/net/ethernet/broadcom/tg3.c
View File

@@ -2123,15 +2123,13 @@ static int tg3_phy_init(struct tg3 *tp)
case PHY_INTERFACE_MODE_RGMII: case PHY_INTERFACE_MODE_RGMII:
if (!(tp->phy_flags & TG3_PHYFLG_10_100_ONLY)) { if (!(tp->phy_flags & TG3_PHYFLG_10_100_ONLY)) {
phy_set_max_speed(phydev, SPEED_1000); phy_set_max_speed(phydev, SPEED_1000);
phydev->supported |= (SUPPORTED_Pause | phy_support_asym_pause(phydev);
SUPPORTED_Asym_Pause);
break; break;
} }
/* fallthru */ /* fallthru */
case PHY_INTERFACE_MODE_MII: case PHY_INTERFACE_MODE_MII:
phy_set_max_speed(phydev, SPEED_100); phy_set_max_speed(phydev, SPEED_100);
phydev->supported |= (SUPPORTED_Pause | phy_support_asym_pause(phydev);
SUPPORTED_Asym_Pause);
break; break;
default: default:
phy_disconnect(mdiobus_get_phy(tp->mdio_bus, tp->phy_addr)); phy_disconnect(mdiobus_get_phy(tp->mdio_bus, tp->phy_addr));
@@ -2140,8 +2138,6 @@ static int tg3_phy_init(struct tg3 *tp)
tp->phy_flags |= TG3_PHYFLG_IS_CONNECTED; tp->phy_flags |= TG3_PHYFLG_IS_CONNECTED;
phydev->advertising = phydev->supported;
phy_attached_info(phydev); phy_attached_info(phydev);
return 0; return 0;

3
drivers/net/ethernet/cortina/gemini.c
View File

@@ -373,8 +373,7 @@ static int gmac_setup_phy(struct net_device *netdev)
netdev->phydev = phy; netdev->phydev = phy;
phy_set_max_speed(phy, SPEED_1000); phy_set_max_speed(phy, SPEED_1000);
phy->supported |= SUPPORTED_Asym_Pause | SUPPORTED_Pause; phy_support_asym_pause(phy);
phy->advertising = phy->supported;
/* set PHY interface type */ /* set PHY interface type */
switch (phy->interface) { switch (phy->interface) {

4
drivers/net/ethernet/dnet.c
View File

@@ -288,9 +288,7 @@ static int dnet_mii_probe(struct net_device *dev)
else else
phy_set_max_speed(phydev, SPEED_100); phy_set_max_speed(phydev, SPEED_100);
phydev->supported |= SUPPORTED_Asym_Pause | SUPPORTED_Pause; phy_support_asym_pause(phydev);
phydev->advertising = phydev->supported;
bp->link = 0; bp->link = 0;
bp->speed = 0; bp->speed = 0;

3
drivers/net/ethernet/faraday/ftgmac100.c
View File

@@ -1079,8 +1079,7 @@ static int ftgmac100_mii_probe(struct ftgmac100 *priv, phy_interface_t intf)
/* Indicate that we support PAUSE frames (see comment in /* Indicate that we support PAUSE frames (see comment in
* Documentation/networking/phy.txt) * Documentation/networking/phy.txt)
*/ */
phydev->supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause; phy_support_asym_pause(phydev);
phydev->advertising = phydev->supported;
/* Display what we found */ /* Display what we found */
phy_attached_info(phydev); phy_attached_info(phydev);

3
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
View File

@@ -2491,8 +2491,7 @@ static int dpaa_phy_init(struct net_device *net_dev)
/* Remove any features not supported by the controller */ /* Remove any features not supported by the controller */
phy_dev->supported &= mac_dev->if_support; phy_dev->supported &= mac_dev->if_support;
phy_dev->supported |= (SUPPORTED_Pause | SUPPORTED_Asym_Pause); phy_support_asym_pause(phy_dev);
phy_dev->advertising = phy_dev->supported;
mac_dev->phy_dev = phy_dev; mac_dev->phy_dev = phy_dev;
net_dev->phydev = phy_dev; net_dev->phydev = phy_dev;

4
drivers/net/ethernet/freescale/gianfar.c
View File

@@ -1814,8 +1814,8 @@ static int init_phy(struct net_device *dev)
phydev->supported &= (GFAR_SUPPORTED | gigabit_support); phydev->supported &= (GFAR_SUPPORTED | gigabit_support);
phydev->advertising = phydev->supported; phydev->advertising = phydev->supported;
/* Add support for flow control, but don't advertise it by default */ /* Add support for flow control */
phydev->supported |= (SUPPORTED_Pause | SUPPORTED_Asym_Pause); phy_support_asym_pause(phydev);
/* disable EEE autoneg, EEE not supported by eTSEC */ /* disable EEE autoneg, EEE not supported by eTSEC */
memset(&edata, 0, sizeof(struct ethtool_eee)); memset(&edata, 0, sizeof(struct ethtool_eee));

4
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c
View File

@@ -211,9 +211,7 @@ int hclge_mac_connect_phy(struct hclge_dev *hdev)
} }
phydev->supported &= HCLGE_PHY_SUPPORTED_FEATURES; phydev->supported &= HCLGE_PHY_SUPPORTED_FEATURES;
phydev->supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause; phy_support_asym_pause(phydev);
phydev->advertising = phydev->supported;
return 0; return 0;
} }

6
drivers/net/ethernet/mediatek/mtk_eth_soc.c
View File

@@ -355,12 +355,8 @@ static int mtk_phy_connect(struct net_device *dev)
dev->phydev->speed = 0; dev->phydev->speed = 0;
dev->phydev->duplex = 0; dev->phydev->duplex = 0;
if (of_phy_is_fixed_link(mac->of_node))
dev->phydev->supported |=
SUPPORTED_Pause | SUPPORTED_Asym_Pause;
phy_set_max_speed(dev->phydev, SPEED_1000); phy_set_max_speed(dev->phydev, SPEED_1000);
dev->phydev->supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause; phy_support_asym_pause(dev->phydev);
dev->phydev->advertising = dev->phydev->supported | dev->phydev->advertising = dev->phydev->supported |
ADVERTISED_Autoneg; ADVERTISED_Autoneg;
phy_start_aneg(dev->phydev); phy_start_aneg(dev->phydev);

5
drivers/net/ethernet/microchip/lan743x_main.c
View File

@@ -999,7 +999,6 @@ static int lan743x_phy_open(struct lan743x_adapter *adapter)
struct phy_device *phydev; struct phy_device *phydev;
struct net_device *netdev; struct net_device *netdev;
int ret = -EIO; int ret = -EIO;
u32 mii_adv;
netdev = adapter->netdev; netdev = adapter->netdev;
phydev = phy_find_first(adapter->mdiobus); phydev = phy_find_first(adapter->mdiobus);
@@ -1016,10 +1015,8 @@ static int lan743x_phy_open(struct lan743x_adapter *adapter)
phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_1000baseT_Half_BIT); phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_1000baseT_Half_BIT);
/* support both flow controls */ /* support both flow controls */
phy_support_asym_pause(phydev);
phy->fc_request_control = (FLOW_CTRL_RX | FLOW_CTRL_TX); phy->fc_request_control = (FLOW_CTRL_RX | FLOW_CTRL_TX);
phydev->advertising &= ~(ADVERTISED_Pause | ADVERTISED_Asym_Pause);
mii_adv = (u32)mii_advertise_flowctrl(phy->fc_request_control);
phydev->advertising |= mii_adv_to_ethtool_adv_t(mii_adv);
phy->fc_autoneg = phydev->autoneg; phy->fc_autoneg = phydev->autoneg;
phy_start(phydev); phy_start(phydev);

3
drivers/net/ethernet/smsc/smsc911x.c
View File

@@ -1051,8 +1051,7 @@ static int smsc911x_mii_probe(struct net_device *dev)
phy_set_max_speed(phydev, SPEED_100); phy_set_max_speed(phydev, SPEED_100);
/* mask with MAC supported features */ /* mask with MAC supported features */
phydev->supported |= (SUPPORTED_Pause | SUPPORTED_Asym_Pause); phy_support_asym_pause(phydev);
phydev->advertising = phydev->supported;
pdata->last_duplex = -1; pdata->last_duplex = -1;
pdata->last_carrier = -1; pdata->last_carrier = -1;

3
drivers/net/ethernet/smsc/smsc9420.c
View File

@@ -1138,8 +1138,7 @@ static int smsc9420_mii_probe(struct net_device *dev)
phy_set_max_speed(phydev, SPEED_100); phy_set_max_speed(phydev, SPEED_100);
/* mask with MAC supported features */ /* mask with MAC supported features */
phydev->supported |= (SUPPORTED_Pause | SUPPORTED_Asym_Pause); phy_support_asym_pause(phydev);
phydev->advertising = phydev->supported;
phy_attached_info(phydev); phy_attached_info(phydev);

3
drivers/net/ethernet/socionext/sni_ave.c
View File

@@ -1225,7 +1225,8 @@ static int ave_init(struct net_device *ndev)
if (!phy_interface_is_rgmii(phydev)) if (!phy_interface_is_rgmii(phydev))
phy_set_max_speed(phydev, SPEED_100); phy_set_max_speed(phydev, SPEED_100);
phydev->supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause;
phy_support_asym_pause(phydev);
phy_attached_info(phydev); phy_attached_info(phydev);

13
drivers/net/phy/phy_device.c
View File

@@ -1783,6 +1783,19 @@ void phy_remove_link_mode(struct phy_device *phydev, u32 link_mode)
} }
EXPORT_SYMBOL(phy_remove_link_mode); EXPORT_SYMBOL(phy_remove_link_mode);
/**
* phy_support_asym_pause - Enable support of asym pause
* @phydev: target phy_device struct
*
* Description: Called by the MAC to indicate is supports Asym Pause.
*/
void phy_support_asym_pause(struct phy_device *phydev)
{
phydev->supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause;
phydev->advertising = phydev->supported;
}
EXPORT_SYMBOL(phy_support_asym_pause);
static void of_set_phy_supported(struct phy_device *phydev) static void of_set_phy_supported(struct phy_device *phydev)
{ {
struct device_node *node = phydev->mdio.dev.of_node; struct device_node *node = phydev->mdio.dev.of_node;

1
include/linux/phy.h
View File

@@ -1050,6 +1050,7 @@ int phy_start_interrupts(struct phy_device *phydev);
void phy_print_status(struct phy_device *phydev); void phy_print_status(struct phy_device *phydev);
int phy_set_max_speed(struct phy_device *phydev, u32 max_speed); int phy_set_max_speed(struct phy_device *phydev, u32 max_speed);
void phy_remove_link_mode(struct phy_device *phydev, u32 link_mode); void phy_remove_link_mode(struct phy_device *phydev, u32 link_mode);
void phy_support_asym_pause(struct phy_device *phydev);
int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask, int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask,
int (*run)(struct phy_device *)); int (*run)(struct phy_device *));