Skip to contentSkip to conversation

net: stmmac: add gmac autonego set for ethtool support

PATCH In review Byungho An 2 participants 4 messages Jan 8, 2013 – Jan 10, 2013

Subsystems (4)
Networking Network drivers Arm STM32 stmmac Ethernet driver
lore
Share & tools
lore

Byungho An

author
#0 lore raw

PATCH v2 3/3 net: stmmac: add gmac autonego set for ethtool support

This patch adds gmac auto-negotiation setting for ethtool. If interface is SGMII, TBI or RTBI, gmac's auto-negotiation enable bit is need to set.

Signed-off-by Byungho An <[email protected]>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c |    5 +++++
 1 file changed, 5 insertions(+)
(quoted diff) +0 -0

b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c index 1372ce2..457c1a4 100644

drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +5 -0
@@ -335,6 +335,7 @@ stmmac_set_pauseparam(struct net_device *netdev,
 	struct phy_device *phy = priv->phydev;
 	int new_pause = FLOW_OFF;
 	int ret = 0;
+	int interface = priv->plat->interface;
 
 	spin_lock(&priv->lock);
 

@@ -348,6 +349,10 @@ stmmac_set_pauseparam(struct net_device *netdev,
 
 	if (phy->autoneg) {
 		if (netif_running(netdev))
+			if((interface == PHY_INTERFACE_MODE_SGMII) ||
+				(interface == PHY_INTERFACE_MODE_TBI) ||
+				(interface == PHY_INTERFACE_MODE_RTBI)) 
+				priv->hw->mac->set_autoneg(priv->ioaddr);
 			ret = phy_start_aneg(phy);
 	} else
 		priv->hw->mac->flow_ctrl(priv->ioaddr, phy->duplex,
Signature · 1 line
1.7.10.4
maintainer
#1 lore raw

From: Byungho An <[email protected]>
Date: Tue, 08 Jan 2013 15:32:02 -0800

drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c stmmac_set_pauseparam(struct net_device *netdev, · line 355

Quoted 8 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +4 -0
@@ -348,6 +349,10 @@ stmmac_set_pauseparam(struct net_device *netdev,
 
 	if (phy->autoneg) {
 		if (netif_running(netdev))
+			if((interface == PHY_INTERFACE_MODE_SGMII) ||
+				(interface == PHY_INTERFACE_MODE_TBI) ||
+				(interface == PHY_INTERFACE_MODE_RTBI)) 
+				priv->hw->mac->set_autoneg(priv->ioaddr);

This is improperly indented and formatted, use this style:

	if (A ||
	    B ||
	    C)
		statement();

I can tell what you're trying to do, you are just trying to use TAB characters exclusivly to indent because you are lazy. But that's not the objective here.

author
#2 lore raw

This patch adds gmac auto-negotiation setting for ethtool. If interface is SGMII, TBI or RTBI, gmac's auto-negotiation enable bit is need to set.

Signed-off-by Byungho An <[email protected]>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c |    5 +++++
 1 file changed, 5 insertions(+)
(quoted diff) +0 -0

b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c index 1372ce2..457c1a4 100644

drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +5 -0
@@ -335,6 +335,7 @@ stmmac_set_pauseparam(struct net_device *netdev,
 	struct phy_device *phy = priv->phydev;
 	int new_pause = FLOW_OFF;
 	int ret = 0;
+	int interface = priv->plat->interface;
 
 	spin_lock(&priv->lock);
 

@@ -348,6 +349,10 @@ stmmac_set_pauseparam(struct net_device *netdev,
 
 	if (phy->autoneg) {
 		if (netif_running(netdev))
+			if((interface == PHY_INTERFACE_MODE_SGMII) ||
+			   (interface == PHY_INTERFACE_MODE_TBI) ||
+			   (interface == PHY_INTERFACE_MODE_RTBI)) 
+				priv->hw->mac->set_autoneg(priv->ioaddr);
 			ret = phy_start_aneg(phy);
 	} else
 		priv->hw->mac->flow_ctrl(priv->ioaddr, phy->duplex,
Signature · 1 line
1.7.10.4
maintainer
#3 lore raw

From: Byungho An <[email protected]>
Date: Thu, 10 Jan 2013 15:54:24 -0800

drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c stmmac_set_pauseparam(struct net_device *netdev, · line 355

Quoted 8 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +4 -0
@@ -348,6 +349,10 @@ stmmac_set_pauseparam(struct net_device *netdev,
 
 	if (phy->autoneg) {
 		if (netif_running(netdev))
+			if((interface == PHY_INTERFACE_MODE_SGMII) ||
+			   (interface == PHY_INTERFACE_MODE_TBI) ||
+			   (interface == PHY_INTERFACE_MODE_RTBI)) 
+				priv->hw->mac->set_autoneg(priv->ioaddr);

This is still not properly formatted.

You also didn't submit this properly. Never use email thread replies to submit new versions of patches.

Always use fresh, new, mailing list postings to submit new versions of patches.

Also, when one patch has to change in a series, you must reubmit the entire set of patches even if some of them have no changes at all. I do not see patch #2 here at all.