diff mbox series

[v3] net/iavf: fix link speed

Message ID 20200430032111.21380-1-alvinx.zhang@intel.com (mailing list archive)
State Accepted, archived
Delegated to: xiaolong ye
Headers
Series [v3] net/iavf: fix link speed |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-nxp-Performance success Performance Testing PASS
ci/iol-intel-Performance fail Performance Testing issues
ci/iol-mellanox-Performance success Performance Testing PASS
ci/Intel-compilation success Compilation OK
ci/iol-testing success Testing PASS

Commit Message

Alvin Zhang April 30, 2020, 3:21 a.m. UTC 
  From: Alvin Zhang <alvinx.zhang@intel.com>

If the PF driver does not support the new speed reporting capabilities then
use link_event instead of link_event_adv to get the speed.

Fixes: 48de41ca11f0 (net/iavf: enable link status update)
Cc: jingjing.wu@intel.com
Cc: stable@dpdk.org

Signed-off-by: Alvin Zhang <alvinx.zhang@intel.com>

V2: Modify codes according to comments.
V3: Update git log.
---
 drivers/net/iavf/iavf_vchnl.c | 47 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

Comments

Xing, Beilei April 30, 2020, 6:18 a.m. UTC | #1 
> -----Original Message-----
> From: Zhang, AlvinX <alvinx.zhang@intel.com>
> Sent: Thursday, April 30, 2020 11:21 AM
> To: dev@dpdk.org
> Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Xing, Beilei <beilei.xing@intel.com>;
> Zhang, AlvinX <alvinx.zhang@intel.com>; Wu, Jingjing
> <jingjing.wu@intel.com>; stable@dpdk.org
> Subject: [PATCH v3] net/iavf: fix link speed
> 
> From: Alvin Zhang <alvinx.zhang@intel.com>
> 
> If the PF driver does not support the new speed reporting capabilities then
> use link_event instead of link_event_adv to get the speed.
> 
> Fixes: 48de41ca11f0 (net/iavf: enable link status update)
> Cc: jingjing.wu@intel.com
> Cc: stable@dpdk.org
> 
> Signed-off-by: Alvin Zhang <alvinx.zhang@intel.com>
> 
> V2: Modify codes according to comments.
> V3: Update git log.
> ---
>  drivers/net/iavf/iavf_vchnl.c | 47
> ++++++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 46 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c index
> 2a0cdd9..5b8d32e 100644
> --- a/drivers/net/iavf/iavf_vchnl.c
> +++ b/drivers/net/iavf/iavf_vchnl.c
> @@ -130,6 +130,44 @@
>  	return err;
>  }
> 
> +static uint32_t
> +iavf_convert_link_speed(enum virtchnl_link_speed virt_link_speed) {
> +	uint32_t speed;
> +
> +	switch (virt_link_speed) {
> +	case VIRTCHNL_LINK_SPEED_100MB:
> +		speed = 100;
> +		break;
> +	case VIRTCHNL_LINK_SPEED_1GB:
> +		speed = 1000;
> +		break;
> +	case VIRTCHNL_LINK_SPEED_10GB:
> +		speed = 10000;
> +		break;
> +	case VIRTCHNL_LINK_SPEED_40GB:
> +		speed = 40000;
> +		break;
> +	case VIRTCHNL_LINK_SPEED_20GB:
> +		speed = 20000;
> +		break;
> +	case VIRTCHNL_LINK_SPEED_25GB:
> +		speed = 25000;
> +		break;
> +	case VIRTCHNL_LINK_SPEED_2_5GB:
> +		speed = 2500;
> +		break;
> +	case VIRTCHNL_LINK_SPEED_5GB:
> +		speed = 5000;
> +		break;
> +	default:
> +		speed = 0;
> +		break;
> +	}
> +
> +	return speed;
> +}
> +
>  static void
>  iavf_handle_pf_event_msg(struct rte_eth_dev *dev, uint8_t *msg,
>  			uint16_t msglen)
> @@ -151,7 +189,14 @@
>  	case VIRTCHNL_EVENT_LINK_CHANGE:
>  		PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_LINK_CHANGE
> event");
>  		vf->link_up = pf_msg->event_data.link_event.link_status;
> -		vf->link_speed = pf_msg-
> >event_data.link_event_adv.link_speed;
> +		if (vf->vf_res->vf_cap_flags &
> VIRTCHNL_VF_CAP_ADV_LINK_SPEED) {
> +			vf->link_speed =
> +				pf_msg-
> >event_data.link_event_adv.link_speed;
> +		} else {
> +			enum virtchnl_link_speed speed;
> +			speed = pf_msg->event_data.link_event.link_speed;
> +			vf->link_speed = iavf_convert_link_speed(speed);
> +		}
>  		iavf_dev_link_update(dev, 0);
>  		_rte_eth_dev_callback_process(dev,
> RTE_ETH_EVENT_INTR_LSC,
>  					      NULL);
> --
> 1.8.3.1

Acked-by: Beilei Xing <beilei.xing@intel.com>
Xiaolong Ye May 6, 2020, 5:14 a.m. UTC | #2 
On 04/30, alvinx.zhang@intel.com wrote:
>From: Alvin Zhang <alvinx.zhang@intel.com>
>
>If the PF driver does not support the new speed reporting capabilities then
>use link_event instead of link_event_adv to get the speed.
>
>Fixes: 48de41ca11f0 (net/iavf: enable link status update)
>Cc: jingjing.wu@intel.com
>Cc: stable@dpdk.org
>
>Signed-off-by: Alvin Zhang <alvinx.zhang@intel.com>
>
>V2: Modify codes according to comments.
>V3: Update git log.
>---

Please put the changelog after '---' mark.

> drivers/net/iavf/iavf_vchnl.c | 47 ++++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 46 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c
>index 2a0cdd9..5b8d32e 100644
>--- a/drivers/net/iavf/iavf_vchnl.c
>+++ b/drivers/net/iavf/iavf_vchnl.c
>@@ -130,6 +130,44 @@
> 	return err;
> }
> 
>+static uint32_t
>+iavf_convert_link_speed(enum virtchnl_link_speed virt_link_speed)
>+{
>+	uint32_t speed;
>+
>+	switch (virt_link_speed) {
>+	case VIRTCHNL_LINK_SPEED_100MB:
>+		speed = 100;
>+		break;
>+	case VIRTCHNL_LINK_SPEED_1GB:
>+		speed = 1000;
>+		break;
>+	case VIRTCHNL_LINK_SPEED_10GB:
>+		speed = 10000;
>+		break;
>+	case VIRTCHNL_LINK_SPEED_40GB:
>+		speed = 40000;
>+		break;
>+	case VIRTCHNL_LINK_SPEED_20GB:
>+		speed = 20000;
>+		break;
>+	case VIRTCHNL_LINK_SPEED_25GB:
>+		speed = 25000;
>+		break;
>+	case VIRTCHNL_LINK_SPEED_2_5GB:
>+		speed = 2500;
>+		break;
>+	case VIRTCHNL_LINK_SPEED_5GB:
>+		speed = 5000;
>+		break;
>+	default:
>+		speed = 0;
>+		break;
>+	}
>+
>+	return speed;
>+}
>+
> static void
> iavf_handle_pf_event_msg(struct rte_eth_dev *dev, uint8_t *msg,
> 			uint16_t msglen)
>@@ -151,7 +189,14 @@
> 	case VIRTCHNL_EVENT_LINK_CHANGE:
> 		PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_LINK_CHANGE event");
> 		vf->link_up = pf_msg->event_data.link_event.link_status;
>-		vf->link_speed = pf_msg->event_data.link_event_adv.link_speed;
>+		if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_CAP_ADV_LINK_SPEED) {
>+			vf->link_speed =
>+				pf_msg->event_data.link_event_adv.link_speed;
>+		} else {
>+			enum virtchnl_link_speed speed;
>+			speed = pf_msg->event_data.link_event.link_speed;
>+			vf->link_speed = iavf_convert_link_speed(speed);
>+		}
> 		iavf_dev_link_update(dev, 0);
> 		_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC,
> 					      NULL);
>-- 
>1.8.3.1
>

Applied to dpdk-next-net-intel with beilei's ack, Thanks.
diff mbox series

Patch

diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c
index 2a0cdd9..5b8d32e 100644
--- a/drivers/net/iavf/iavf_vchnl.c
+++ b/drivers/net/iavf/iavf_vchnl.c
@@ -130,6 +130,44 @@ 
 	return err;
 }
 
+static uint32_t
+iavf_convert_link_speed(enum virtchnl_link_speed virt_link_speed)
+{
+	uint32_t speed;
+
+	switch (virt_link_speed) {
+	case VIRTCHNL_LINK_SPEED_100MB:
+		speed = 100;
+		break;
+	case VIRTCHNL_LINK_SPEED_1GB:
+		speed = 1000;
+		break;
+	case VIRTCHNL_LINK_SPEED_10GB:
+		speed = 10000;
+		break;
+	case VIRTCHNL_LINK_SPEED_40GB:
+		speed = 40000;
+		break;
+	case VIRTCHNL_LINK_SPEED_20GB:
+		speed = 20000;
+		break;
+	case VIRTCHNL_LINK_SPEED_25GB:
+		speed = 25000;
+		break;
+	case VIRTCHNL_LINK_SPEED_2_5GB:
+		speed = 2500;
+		break;
+	case VIRTCHNL_LINK_SPEED_5GB:
+		speed = 5000;
+		break;
+	default:
+		speed = 0;
+		break;
+	}
+
+	return speed;
+}
+
 static void
 iavf_handle_pf_event_msg(struct rte_eth_dev *dev, uint8_t *msg,
 			uint16_t msglen)
@@ -151,7 +189,14 @@ 
 	case VIRTCHNL_EVENT_LINK_CHANGE:
 		PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_LINK_CHANGE event");
 		vf->link_up = pf_msg->event_data.link_event.link_status;
-		vf->link_speed = pf_msg->event_data.link_event_adv.link_speed;
+		if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_CAP_ADV_LINK_SPEED) {
+			vf->link_speed =
+				pf_msg->event_data.link_event_adv.link_speed;
+		} else {
+			enum virtchnl_link_speed speed;
+			speed = pf_msg->event_data.link_event.link_speed;
+			vf->link_speed = iavf_convert_link_speed(speed);
+		}
 		iavf_dev_link_update(dev, 0);
 		_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC,
 					      NULL);