[dpdk-dev] [PATCH] ixgbe: fix x550 shutdown API issue

[dpdk-dev] [PATCH] ixgbe: fix x550 shutdown API issue

[Wenzhuo Lu]

For there're only laser ports on x550 before, we only considered laser
ports for the testpmd CLIs "port start/stop ...". Now we have new x550
devices which have copper ports. Use the API for copper to enable/disable
these ports.

And also let the testpmd CLI "set link-up/down ..." support copper
ports.

Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
---
 drivers/net/ixgbe/ixgbe_ethdev.c | 44 +++++++++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 7414a2e..ac7608e 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -1522,8 +1522,13 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
 			goto error;
 	}
 
-	/* Turn on the laser */
-	ixgbe_enable_tx_laser(hw);
+	if (hw->mac.ops.get_media_type(hw) == ixgbe_media_type_copper) {
+		/* Turn on the copper */
+		ixgbe_set_phy_power(hw, true);
+	} else {
+		/* Turn on the laser */
+		ixgbe_enable_tx_laser(hw);
+	}
 
 	err = ixgbe_check_link(hw, &speed, &link_up, 0);
 	if (err)
@@ -1643,8 +1648,13 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)
 		     vf < dev->pci_dev->max_vfs; vf++)
 		vfinfo[vf].clear_to_send = false;
 
-	/* Turn off the laser */
-	ixgbe_disable_tx_laser(hw);
+	if (hw->mac.ops.get_media_type(hw) == ixgbe_media_type_copper) {
+		/* Turn off the copper */
+		ixgbe_set_phy_power(hw, false);
+	} else {
+		/* Turn off the laser */
+		ixgbe_disable_tx_laser(hw);
+	}
 
 	ixgbe_dev_clear_queues(dev);
 
@@ -1670,7 +1680,7 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)
 }
 
 /*
- * Set device link up: enable tx laser.
+ * Set device link up: enable tx.
  */
 static int
 ixgbe_dev_set_link_up(struct rte_eth_dev *dev)
@@ -1686,18 +1696,21 @@ ixgbe_dev_set_link_up(struct rte_eth_dev *dev)
 			return -ENOTSUP;
 		}
 #endif
+	}
+
+	if (hw->mac.ops.get_media_type(hw) == ixgbe_media_type_copper) {
+		/* Turn on the copper */
+		ixgbe_set_phy_power(hw, true);
+	} else {
 		/* Turn on the laser */
 		ixgbe_enable_tx_laser(hw);
-		return 0;
 	}
 
-	PMD_INIT_LOG(ERR, "Set link up is not supported by device id 0x%x",
-		     hw->device_id);
-	return -ENOTSUP;
+	return 0;
 }
 
 /*
- * Set device link down: disable tx laser.
+ * Set device link down: disable tx.
  */
 static int
 ixgbe_dev_set_link_down(struct rte_eth_dev *dev)
@@ -1713,14 +1726,17 @@ ixgbe_dev_set_link_down(struct rte_eth_dev *dev)
 			return -ENOTSUP;
 		}
 #endif
+	}
+
+	if (hw->mac.ops.get_media_type(hw) == ixgbe_media_type_copper) {
+		/* Turn off the copper */
+		ixgbe_set_phy_power(hw, false);
+	} else {
 		/* Turn off the laser */
 		ixgbe_disable_tx_laser(hw);
-		return 0;
 	}
 
-	PMD_INIT_LOG(ERR, "Set link down is not supported by device id 0x%x",
-		     hw->device_id);
-	return -ENOTSUP;
+	return 0;
 }
 
 /*
-- 
1.9.3

Re: [dpdk-dev] [PATCH] ixgbe: fix x550 shutdown API issue

[Ananyev, Konstantin]

> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Wenzhuo Lu
> Sent: Tuesday, June 16, 2015 9:08 AM
> To: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH] ixgbe: fix x550 shutdown API issue
> 
> For there're only laser ports on x550 before, we only considered laser
> ports for the testpmd CLIs "port start/stop ...". Now we have new x550
> devices which have copper ports. Use the API for copper to enable/disable
> these ports.
> 
> And also let the testpmd CLI "set link-up/down ..." support copper
> ports.
> 
> Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>

Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>

> ---

Re: [dpdk-dev] [PATCH] ixgbe: fix x550 shutdown API issue

[Thomas Monjalon]

> > For there're only laser ports on x550 before, we only considered laser
> > ports for the testpmd CLIs "port start/stop ...". Now we have new x550
> > devices which have copper ports. Use the API for copper to enable/disable
> > these ports.
> > 
> > And also let the testpmd CLI "set link-up/down ..." support copper
> > ports.
> > 
> > Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
> 
> Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>

Applied, thanks