* [PATCH net-next 0/2] amd-xgbe: Remove baseT workaround for fixed speeds
@ 2014-07-14 19:05 Tom Lendacky
2014-07-14 19:05 ` [PATCH net-next 1/2] phy: Expand phy speed/duplex settings array Tom Lendacky
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Tom Lendacky @ 2014-07-14 19:05 UTC (permalink / raw
To: netdev; +Cc: Florian Fainelli, David Miller
The following series expands the speed/duplex settings array in phy.c
to support additional media types. With this expansion the workaround
in the amd-xgbe driver to set/remove baseT media types based on whether
auto negotiation is enabled can be removed.
This patch series is based on net-next.
---
Tom Lendacky (2):
phy: Expand phy speed/duplex settings array
amd-xgbe: Remove the adjustments needed for fixed speed
drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 10 ----------
drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 4 ----
drivers/net/phy/phy.c | 22 +++++++++++++++++++++-
3 files changed, 21 insertions(+), 15 deletions(-)
--
Tom Lendacky
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH net-next 1/2] phy: Expand phy speed/duplex settings array
2014-07-14 19:05 [PATCH net-next 0/2] amd-xgbe: Remove baseT workaround for fixed speeds Tom Lendacky
@ 2014-07-14 19:05 ` Tom Lendacky
2014-07-14 19:05 ` [PATCH net-next 2/2] amd-xgbe: Remove the adjustments needed for fixed speed Tom Lendacky
2014-07-15 23:31 ` [PATCH net-next 0/2] amd-xgbe: Remove baseT workaround for fixed speeds David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Tom Lendacky @ 2014-07-14 19:05 UTC (permalink / raw
To: netdev; +Cc: Florian Fainelli, David Miller
Expand the phy speed/duplex settings array to support more
than just baseT features. This change adds entries to support
the following additional speed/duplex/media types:
SUPPORTED_10000baseKR_Full
SUPPORTED_10000baseKX4_Full
SUPPORTED_2500baseX_Full
SUPPORTED_1000baseKX_Full
Additionally, it changes the 10GbE baseT entry from using the
hardcoded value 10000 to the SPEED_10000 define.
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
---
drivers/net/phy/phy.c | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index f7c6181..e56e269 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -138,11 +138,31 @@ struct phy_setting {
/* A mapping of all SUPPORTED settings to speed/duplex */
static const struct phy_setting settings[] = {
{
- .speed = 10000,
+ .speed = SPEED_10000,
+ .duplex = DUPLEX_FULL,
+ .setting = SUPPORTED_10000baseKR_Full,
+ },
+ {
+ .speed = SPEED_10000,
+ .duplex = DUPLEX_FULL,
+ .setting = SUPPORTED_10000baseKX4_Full,
+ },
+ {
+ .speed = SPEED_10000,
.duplex = DUPLEX_FULL,
.setting = SUPPORTED_10000baseT_Full,
},
{
+ .speed = SPEED_2500,
+ .duplex = DUPLEX_FULL,
+ .setting = SUPPORTED_2500baseX_Full,
+ },
+ {
+ .speed = SPEED_1000,
+ .duplex = DUPLEX_FULL,
+ .setting = SUPPORTED_1000baseKX_Full,
+ },
+ {
.speed = SPEED_1000,
.duplex = DUPLEX_FULL,
.setting = SUPPORTED_1000baseT_Full,
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH net-next 2/2] amd-xgbe: Remove the adjustments needed for fixed speed
2014-07-14 19:05 [PATCH net-next 0/2] amd-xgbe: Remove baseT workaround for fixed speeds Tom Lendacky
2014-07-14 19:05 ` [PATCH net-next 1/2] phy: Expand phy speed/duplex settings array Tom Lendacky
@ 2014-07-14 19:05 ` Tom Lendacky
2014-07-15 23:31 ` [PATCH net-next 0/2] amd-xgbe: Remove baseT workaround for fixed speeds David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Tom Lendacky @ 2014-07-14 19:05 UTC (permalink / raw
To: netdev; +Cc: Florian Fainelli, David Miller
With the addition of entries in the phy speed/duplex settings
array to support KR and KX mode, the work-around to add/remove
baseT settings to run at a fixed speed is no longer needed.
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
---
drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 10 ----------
drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 4 ----
2 files changed, 14 deletions(-)
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
index 8909f2b..f740526 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
@@ -331,16 +331,6 @@ static int xgbe_set_settings(struct net_device *netdev,
(cmd->duplex != DUPLEX_FULL)))
goto unlock;
- if (cmd->autoneg == AUTONEG_ENABLE) {
- /* Clear settings needed to force speeds */
- phydev->supported &= ~SUPPORTED_1000baseT_Full;
- phydev->supported &= ~SUPPORTED_10000baseT_Full;
- } else {
- /* Add settings needed to force speed */
- phydev->supported |= SUPPORTED_1000baseT_Full;
- phydev->supported |= SUPPORTED_10000baseT_Full;
- }
-
cmd->advertising &= phydev->supported;
if ((cmd->autoneg == AUTONEG_ENABLE) && !cmd->advertising)
goto unlock;
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
index ea7a5d6..225f22d 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
@@ -375,10 +375,6 @@ int xgbe_mdio_register(struct xgbe_prv_data *pdata)
phydev->autoneg = pdata->default_autoneg;
if (phydev->autoneg == AUTONEG_DISABLE) {
- /* Add settings needed to force speed */
- phydev->supported |= SUPPORTED_1000baseT_Full;
- phydev->supported |= SUPPORTED_10000baseT_Full;
-
phydev->speed = pdata->default_speed;
phydev->duplex = DUPLEX_FULL;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next 0/2] amd-xgbe: Remove baseT workaround for fixed speeds
2014-07-14 19:05 [PATCH net-next 0/2] amd-xgbe: Remove baseT workaround for fixed speeds Tom Lendacky
2014-07-14 19:05 ` [PATCH net-next 1/2] phy: Expand phy speed/duplex settings array Tom Lendacky
2014-07-14 19:05 ` [PATCH net-next 2/2] amd-xgbe: Remove the adjustments needed for fixed speed Tom Lendacky
@ 2014-07-15 23:31 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2014-07-15 23:31 UTC (permalink / raw
To: thomas.lendacky; +Cc: netdev, f.fainelli
From: Tom Lendacky <thomas.lendacky@amd.com>
Date: Mon, 14 Jul 2014 14:05:40 -0500
> The following series expands the speed/duplex settings array in phy.c
> to support additional media types. With this expansion the workaround
> in the amd-xgbe driver to set/remove baseT media types based on whether
> auto negotiation is enabled can be removed.
>
> This patch series is based on net-next.
Series applied, thanks Tom.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-07-15 23:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-14 19:05 [PATCH net-next 0/2] amd-xgbe: Remove baseT workaround for fixed speeds Tom Lendacky
2014-07-14 19:05 ` [PATCH net-next 1/2] phy: Expand phy speed/duplex settings array Tom Lendacky
2014-07-14 19:05 ` [PATCH net-next 2/2] amd-xgbe: Remove the adjustments needed for fixed speed Tom Lendacky
2014-07-15 23:31 ` [PATCH net-next 0/2] amd-xgbe: Remove baseT workaround for fixed speeds David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.