[dpdk-dev] [PATCH] E1000: fix for forced speed/duplex config

[Ananda Sathyanarayana]

>From the code, it looks like, hw->mac.autoneg, variable is used to
switch between calling either autoneg function or forcing
speed/duplex function. But this variable is not modified in
eth_em_start/eth_igb_start routines (it is always set to 1)
even while forcing the link speed.

Following discussion thread has some more information on
this

http://dpdk.org/ml/archives/dev/2016-October/049272.html

Signed-off-by: Ananda Sathyanarayana <ananda at versa-networks.com>
---
 drivers/net/e1000/em_ethdev.c  | 16 ++++++++++++++--
 drivers/net/e1000/igb_ethdev.c | 16 ++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c
index 7cf5f0c..a2412f5 100644
--- a/drivers/net/e1000/em_ethdev.c
+++ b/drivers/net/e1000/em_ethdev.c
@@ -639,6 +639,7 @@ eth_em_start(struct rte_eth_dev *dev)
 	speeds = &dev->data->dev_conf.link_speeds;
 	if (*speeds == ETH_LINK_SPEED_AUTONEG) {
 		hw->phy.autoneg_advertised = E1000_ALL_SPEED_DUPLEX;
+                hw->mac.autoneg = 1;
 	} else {
 		num_speeds = 0;
 		autoneg = (*speeds & ETH_LINK_SPEED_FIXED) == 0;
@@ -672,9 +673,20 @@ eth_em_start(struct rte_eth_dev *dev)
 			hw->phy.autoneg_advertised |= ADVERTISE_1000_FULL;
 			num_speeds++;
 		}
-		if (num_speeds == 0 || (!autoneg && (num_speeds > 1)))
+		if (num_speeds == 0 || (!autoneg && (num_speeds > 1))) {
 			goto error_invalid_config;
-	}
+                }
+                /*
+                 * Set/reset the mac.autoneg based on the link speed,
+                 * fixed or not
+                 */
+                if (!autoneg) {
+                        hw->mac.autoneg = 0;
+                        hw->mac.forced_speed_duplex = hw->phy.autoneg_advertised;
+                } else {
+                        hw->mac.autoneg = 1;
+                }
+        }
 
 	e1000_setup_link(hw);
 
diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index 4924396..9fb498f 100644
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -1327,6 +1327,7 @@ eth_igb_start(struct rte_eth_dev *dev)
 	speeds = &dev->data->dev_conf.link_speeds;
 	if (*speeds == ETH_LINK_SPEED_AUTONEG) {
 		hw->phy.autoneg_advertised = E1000_ALL_SPEED_DUPLEX;
+                hw->mac.autoneg = 1;
 	} else {
 		num_speeds = 0;
 		autoneg = (*speeds & ETH_LINK_SPEED_FIXED) == 0;
@@ -1360,9 +1361,20 @@ eth_igb_start(struct rte_eth_dev *dev)
 			hw->phy.autoneg_advertised |= ADVERTISE_1000_FULL;
 			num_speeds++;
 		}
-		if (num_speeds == 0 || (!autoneg && (num_speeds > 1)))
+		if (num_speeds == 0 || (!autoneg && (num_speeds > 1))) {
 			goto error_invalid_config;
-	}
+                }
+                /*
+                 * Set/reset the mac.autoneg based on the link speed,
+                 * fixed or not
+                 */
+                if (!autoneg) {
+                        hw->mac.autoneg = 0;
+                        hw->mac.forced_speed_duplex = hw->phy.autoneg_advertised;
+                } else {
+                        hw->mac.autoneg = 1;
+                }
+        }
 
 	e1000_setup_link(hw);
 
-- 
1.9.1