From: isubramanian@apm.com (Iyappan Subramanian)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 08/11] drivers: net: xgene: ethtool: Use phy_ethtool_gset and sset
Date: Thu, 7 Jul 2016 16:02:56 -0700 [thread overview]
Message-ID: <1467932579-14320-9-git-send-email-isubramanian@apm.com> (raw)
In-Reply-To: <1467932579-14320-1-git-send-email-isubramanian@apm.com>
Changed SGMII 1G get_settings to use phy_ethtool_gset.
Changed SGMII 1G set_settings to use phy_ethtool_sset.
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
Tested-by: Fushen Chen <fchen@apm.com>
Tested-by: Toan Le <toanle@apm.com>
---
.../net/ethernet/apm/xgene/xgene_enet_ethtool.c | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c b/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
index 416d6eb..22a7b26 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
@@ -65,8 +65,15 @@ static int xgene_get_settings(struct net_device *ndev, struct ethtool_cmd *cmd)
return phy_ethtool_gset(phydev, cmd);
} else if (pdata->phy_mode == PHY_INTERFACE_MODE_SGMII) {
- cmd->supported = SUPPORTED_1000baseT_Full |
- SUPPORTED_Autoneg | SUPPORTED_MII;
+ if (pdata->mdio_driver) {
+ if (!phydev)
+ return -ENODEV;
+
+ return phy_ethtool_gset(phydev, cmd);
+ }
+
+ cmd->supported = SUPPORTED_1000baseT_Full | SUPPORTED_Autoneg |
+ SUPPORTED_MII;
cmd->advertising = cmd->supported;
ethtool_cmd_speed_set(cmd, SPEED_1000);
cmd->duplex = DUPLEX_FULL;
@@ -92,12 +99,21 @@ static int xgene_set_settings(struct net_device *ndev, struct ethtool_cmd *cmd)
struct phy_device *phydev = pdata->phy_dev;
if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII) {
- if (phydev == NULL)
+ if (!phydev)
return -ENODEV;
return phy_ethtool_sset(phydev, cmd);
}
+ if (pdata->phy_mode == PHY_INTERFACE_MODE_SGMII) {
+ if (pdata->mdio_driver) {
+ if (!phydev)
+ return -ENODEV;
+
+ return phy_ethtool_sset(phydev, cmd);
+ }
+ }
+
return -EINVAL;
}
--
1.9.1
next prev parent reply other threads:[~2016-07-07 23:02 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-07 23:02 [PATCH v5 00/11] drivers: net: xgene: Fix module crash and 1G hot-plug Iyappan Subramanian
2016-07-07 23:02 ` [PATCH v5 01/11] drivers: net: xgene: Separate set_speed from mac_init Iyappan Subramanian
2016-07-07 23:02 ` [PATCH v5 02/11] drivers: net: xgene: Fix module unload crash - hw resource cleanup Iyappan Subramanian
2016-07-07 23:02 ` [PATCH v5 03/11] drivers: net: xgene: Fix module unload crash - change sw sequence Iyappan Subramanian
2016-07-07 23:02 ` [PATCH v5 04/11] drivers: net: xgene: Fix module unload crash - clkrst sequence Iyappan Subramanian
2016-07-07 23:02 ` [PATCH v5 05/11] drivers: net: phy: xgene: Add MDIO driver Iyappan Subramanian
2016-07-08 5:13 ` Florian Fainelli
2016-07-07 23:02 ` [PATCH v5 06/11] drivers: net: xgene: Add backward compatibility Iyappan Subramanian
2016-07-07 23:02 ` [PATCH v5 07/11] drivers: net: xgene: Enable MDIO driver Iyappan Subramanian
2016-07-07 23:02 ` Iyappan Subramanian [this message]
2016-07-07 23:02 ` [PATCH v5 09/11] dtb: xgene: Add MDIO node Iyappan Subramanian
2016-08-01 21:13 ` Olof Johansson
2016-08-02 19:10 ` Duc Dang
2016-07-07 23:02 ` [PATCH v5 10/11] Documentation: " Iyappan Subramanian
2016-07-13 13:10 ` Rob Herring
2016-07-21 17:57 ` Iyappan Subramanian
2016-07-07 23:02 ` [PATCH v5 11/11] MAINTAINERS: xgene: Add driver and documentation path Iyappan Subramanian
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1467932579-14320-9-git-send-email-isubramanian@apm.com \
--to=isubramanian@apm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).