aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIyappan Subramanian <isubramanian@apm.com>2014-10-09 21:32:07 -0400
committerDavid S. Miller <davem@davemloft.net>2014-10-10 15:07:00 -0400
commit41aace6e088d198f2441f3d0e579657d6815234c (patch)
tree154c54eb25208fd61ccdc861d4f5a4c5823f46bb
parent0148d38d36b76b190ddddff68f02d2617ada3bcb (diff)
drivers: net: xgene: Add 10GbE ethtool support
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com> Signed-off-by: Keyur Chudgar <kchudgar@apm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c28
1 files changed, 22 insertions, 6 deletions
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c b/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
index 63f2aa54a594..c1c997b92342 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
@@ -59,10 +59,22 @@ static int xgene_get_settings(struct net_device *ndev, struct ethtool_cmd *cmd)
59 struct xgene_enet_pdata *pdata = netdev_priv(ndev); 59 struct xgene_enet_pdata *pdata = netdev_priv(ndev);
60 struct phy_device *phydev = pdata->phy_dev; 60 struct phy_device *phydev = pdata->phy_dev;
61 61
62 if (phydev == NULL) 62 if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII) {
63 return -ENODEV; 63 if (phydev == NULL)
64 return -ENODEV;
64 65
65 return phy_ethtool_gset(phydev, cmd); 66 return phy_ethtool_gset(phydev, cmd);
67 }
68
69 cmd->supported = SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE;
70 cmd->advertising = cmd->supported;
71 ethtool_cmd_speed_set(cmd, SPEED_10000);
72 cmd->duplex = DUPLEX_FULL;
73 cmd->port = PORT_FIBRE;
74 cmd->transceiver = XCVR_EXTERNAL;
75 cmd->autoneg = AUTONEG_DISABLE;
76
77 return 0;
66} 78}
67 79
68static int xgene_set_settings(struct net_device *ndev, struct ethtool_cmd *cmd) 80static int xgene_set_settings(struct net_device *ndev, struct ethtool_cmd *cmd)
@@ -70,10 +82,14 @@ static int xgene_set_settings(struct net_device *ndev, struct ethtool_cmd *cmd)
70 struct xgene_enet_pdata *pdata = netdev_priv(ndev); 82 struct xgene_enet_pdata *pdata = netdev_priv(ndev);
71 struct phy_device *phydev = pdata->phy_dev; 83 struct phy_device *phydev = pdata->phy_dev;
72 84
73 if (phydev == NULL) 85 if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII) {
74 return -ENODEV; 86 if (phydev == NULL)
87 return -ENODEV;
88
89 return phy_ethtool_sset(phydev, cmd);
90 }
75 91
76 return phy_ethtool_sset(phydev, cmd); 92 return -EINVAL;
77} 93}
78 94
79static void xgene_get_strings(struct net_device *ndev, u32 stringset, u8 *data) 95static void xgene_get_strings(struct net_device *ndev, u32 stringset, u8 *data)