diff mbox

[dpdk-dev,v4] net/ixgbe: add support of 2.5G and 5G on X550

Message ID 1501082978-58784-1-git-send-email-wei.dai@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Ferruh Yigit
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Wei Dai July 26, 2017, 3:29 p.m. UTC 
  This patch adds support of 2.5G and 5G ethernet interface on X550.

Signed-off-by: Wei Dai <wei.dai@intel.com>
---
 drivers/net/ixgbe/base/ixgbe_type.h |  5 +++++
 drivers/net/ixgbe/ixgbe_ethdev.c    | 27 ++++++++++++++++++++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)

Comments

Wenzhuo Lu July 26, 2017, 4:59 p.m. UTC | #1 
Hi Wei,

> -----Original Message-----
> From: Dai, Wei
> Sent: Wednesday, July 26, 2017 11:30 AM
> To: Lu, Wenzhuo <wenzhuo.lu@intel.com>; Ananyev, Konstantin
> <konstantin.ananyev@intel.com>
> Cc: dev@dpdk.org; Dai, Wei <wei.dai@intel.com>
> Subject: [PATCH v4] net/ixgbe: add support of 2.5G and 5G on X550
> 
> This patch adds support of 2.5G and 5G ethernet interface on X550.
> 
> Signed-off-by: Wei Dai <wei.dai@intel.com>
> ---
>  drivers/net/ixgbe/base/ixgbe_type.h |  5 +++++
>  drivers/net/ixgbe/ixgbe_ethdev.c    | 27 ++++++++++++++++++++++++---
>  2 files changed, 29 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/ixgbe/base/ixgbe_type.h
> b/drivers/net/ixgbe/base/ixgbe_type.h
> index bda8558..3fd5425 100644
> --- a/drivers/net/ixgbe/base/ixgbe_type.h
> +++ b/drivers/net/ixgbe/base/ixgbe_type.h
> @@ -3408,6 +3408,11 @@ typedef u32 ixgbe_link_speed;
>  #define IXGBE_LINK_SPEED_82599_AUTONEG
> 	(IXGBE_LINK_SPEED_100_FULL | \
>  					 IXGBE_LINK_SPEED_1GB_FULL | \
>  					 IXGBE_LINK_SPEED_10GB_FULL)
> +#define IXGBE_LINK_SPEED_X550_AUTONEG
> 	(IXGBE_LINK_SPEED_100_FULL | \
> +					IXGBE_LINK_SPEED_1GB_FULL | \
> +					IXGBE_LINK_SPEED_2_5GB_FULL | \
> +					IXGBE_LINK_SPEED_5GB_FULL | \
> +					IXGBE_LINK_SPEED_10GB_FULL)
Just noticed you changed base code. As we discussed before, I don't mean that. Actually, I suggest to put it in, for example, ixgbe_ethdev.h
Wei Dai July 26, 2017, 11:57 p.m. UTC | #2 
> -----Original Message-----
> From: Lu, Wenzhuo
> Sent: Thursday, July 27, 2017 12:59 AM
> To: Dai, Wei <wei.dai@intel.com>; Ananyev, Konstantin
> <konstantin.ananyev@intel.com>
> Cc: dev@dpdk.org
> Subject: RE: [PATCH v4] net/ixgbe: add support of 2.5G and 5G on X550
> 
> Hi Wei,
> 
> > -----Original Message-----
> > From: Dai, Wei
> > Sent: Wednesday, July 26, 2017 11:30 AM
> > To: Lu, Wenzhuo <wenzhuo.lu@intel.com>; Ananyev, Konstantin
> > <konstantin.ananyev@intel.com>
> > Cc: dev@dpdk.org; Dai, Wei <wei.dai@intel.com>
> > Subject: [PATCH v4] net/ixgbe: add support of 2.5G and 5G on X550
> >
> > This patch adds support of 2.5G and 5G ethernet interface on X550.
> >
> > Signed-off-by: Wei Dai <wei.dai@intel.com>
> > ---
> >  drivers/net/ixgbe/base/ixgbe_type.h |  5 +++++
> >  drivers/net/ixgbe/ixgbe_ethdev.c    | 27
> ++++++++++++++++++++++++---
> >  2 files changed, 29 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/net/ixgbe/base/ixgbe_type.h
> > b/drivers/net/ixgbe/base/ixgbe_type.h
> > index bda8558..3fd5425 100644
> > --- a/drivers/net/ixgbe/base/ixgbe_type.h
> > +++ b/drivers/net/ixgbe/base/ixgbe_type.h
> > @@ -3408,6 +3408,11 @@ typedef u32 ixgbe_link_speed;  #define
> > IXGBE_LINK_SPEED_82599_AUTONEG
> > 	(IXGBE_LINK_SPEED_100_FULL | \
> >  					 IXGBE_LINK_SPEED_1GB_FULL | \
> >  					 IXGBE_LINK_SPEED_10GB_FULL)
> > +#define IXGBE_LINK_SPEED_X550_AUTONEG
> > 	(IXGBE_LINK_SPEED_100_FULL | \
> > +					IXGBE_LINK_SPEED_1GB_FULL | \
> > +					IXGBE_LINK_SPEED_2_5GB_FULL | \
> > +					IXGBE_LINK_SPEED_5GB_FULL | \
> > +					IXGBE_LINK_SPEED_10GB_FULL)
> Just noticed you changed base code. As we discussed before, I don't mean
> that. Actually, I suggest to put it in, for example, ixgbe_ethdev.h
Yes, you are right. Your method is better.
I will follow it in my v5 patch.
diff mbox

Patch

diff --git a/drivers/net/ixgbe/base/ixgbe_type.h b/drivers/net/ixgbe/base/ixgbe_type.h
index bda8558..3fd5425 100644
--- a/drivers/net/ixgbe/base/ixgbe_type.h
+++ b/drivers/net/ixgbe/base/ixgbe_type.h
@@ -3408,6 +3408,11 @@  typedef u32 ixgbe_link_speed;
 #define IXGBE_LINK_SPEED_82599_AUTONEG	(IXGBE_LINK_SPEED_100_FULL | \
 					 IXGBE_LINK_SPEED_1GB_FULL | \
 					 IXGBE_LINK_SPEED_10GB_FULL)
+#define IXGBE_LINK_SPEED_X550_AUTONEG	(IXGBE_LINK_SPEED_100_FULL | \
+					IXGBE_LINK_SPEED_1GB_FULL | \
+					IXGBE_LINK_SPEED_2_5GB_FULL | \
+					IXGBE_LINK_SPEED_5GB_FULL | \
+					IXGBE_LINK_SPEED_10GB_FULL)
 
 /* Physical layer type */
 typedef u64 ixgbe_physical_layer;
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 194058f..a63ae8d 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -2647,9 +2647,22 @@  ixgbe_dev_start(struct rte_eth_dev *dev)
 
 	speed = 0x0;
 	if (*link_speeds == ETH_LINK_SPEED_AUTONEG) {
-		speed = (hw->mac.type != ixgbe_mac_82598EB) ?
-				IXGBE_LINK_SPEED_82599_AUTONEG :
-				IXGBE_LINK_SPEED_82598_AUTONEG;
+		switch (hw->mac.type) {
+		case ixgbe_mac_82598EB:
+			speed = IXGBE_LINK_SPEED_82598_AUTONEG;
+			break;
+		case ixgbe_mac_82599EB:
+		case ixgbe_mac_X540:
+			speed = IXGBE_LINK_SPEED_82599_AUTONEG;
+			break;
+		case ixgbe_mac_X550:
+		case ixgbe_mac_X550EM_x:
+		case ixgbe_mac_X550EM_a:
+			speed = IXGBE_LINK_SPEED_X550_AUTONEG;
+			break;
+		default:
+			speed = IXGBE_LINK_SPEED_82599_AUTONEG;
+		}
 	} else {
 		if (*link_speeds & ETH_LINK_SPEED_10G)
 			speed |= IXGBE_LINK_SPEED_10GB_FULL;
@@ -3972,6 +3985,14 @@  ixgbe_dev_link_update_share(struct rte_eth_dev *dev,
 		link.link_speed = ETH_SPEED_NUM_1G;
 		break;
 
+	case IXGBE_LINK_SPEED_2_5GB_FULL:
+		link.link_speed = ETH_SPEED_NUM_2_5G;
+		break;
+
+	case IXGBE_LINK_SPEED_5GB_FULL:
+		link.link_speed = ETH_SPEED_NUM_5G;
+		break;
+
 	case IXGBE_LINK_SPEED_10GB_FULL:
 		link.link_speed = ETH_SPEED_NUM_10G;
 		break;