Re: [dpdk-dev] [PATCH dpdk-dev 1/3] net/mlx5: avoid crash when setting hairpin queues

[Raslan Darawsheh]

Hi,

> -Original Message-
> From: dev  On Behalf Of
> xiangxia.m@gmail.com
> Sent: Wednesday, November 27, 2019 4:19 PM
> To: dev@dpdk.org
> Cc: Tonghao Zhang ; Ori Kam
> 
> Subject: [dpdk-dev] [PATCH dpdk-dev 1/3] net/mlx5: avoid crash when
> setting hairpin queues
> 
> From: Tonghao Zhang 
> 
> If configuring the number of tx/rx queue with rte_eth_dev_configure
> to nr_queues + hairpin_nr_queues, and setting tx/rx queues to
> nr_queues with rte_eth_tx/rx_queue_setup. But not configuring the
> hairpin queues via rte_eth_tx/rx_hairpin_queue_setup.
> 
> When starting the netdev, there is a crash because of NULL accessing.
> 
> Fixes: cf5516696d77 ("ethdev: add hairpin queue")
> Cc: Ori Kam 
> Signed-off-by: Tonghao Zhang 
> ---
>  drivers/net/mlx5/mlx5_ethdev.c  | 2 +-
>  drivers/net/mlx5/mlx5_trigger.c | 5 -
>  2 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_ethdev.c
> b/drivers/net/mlx5/mlx5_ethdev.c
> index 1d6c084119ec..0076d05b00cc 100644
> --- a/drivers/net/mlx5/mlx5_ethdev.c
> +++ b/drivers/net/mlx5/mlx5_ethdev.c
> @@ -476,7 +476,7 @@ mlx5_dev_configure_rss_reta(struct rte_eth_dev
> *dev)
> 
>   rxq_data = (*priv->rxqs)[i];
>   rxq_ctrl = container_of(rxq_data, struct mlx5_rxq_ctrl, rxq);
> - if (rxq_ctrl->type == MLX5_RXQ_TYPE_STANDARD)
> + if (rxq_ctrl && rxq_ctrl->type ==
> MLX5_RXQ_TYPE_STANDARD)
>   rss_queue_arr[j++] = i;
>   }
>   rss_queue_n = j;
> diff --git a/drivers/net/mlx5/mlx5_trigger.c
> b/drivers/net/mlx5/mlx5_trigger.c
> index cafab25c67e7..ab6937ab10d1 100644
> --- a/drivers/net/mlx5/mlx5_trigger.c
> +++ b/drivers/net/mlx5/mlx5_trigger.c
> @@ -106,9 +106,12 @@ mlx5_rxq_start(struct rte_eth_dev *dev)
>   unsigned int i;
>   int ret = 0;
>   enum mlx5_rxq_obj_type obj_type = MLX5_RXQ_OBJ_TYPE_IBV;
> + struct mlx5_rxq_data *rxq = NULL;
> 
>   for (i = 0; i < priv->rxqs_n; ++i) {
> - if ((*priv->rxqs)[i]->lro) {
> + rxq = (*priv->rxqs)[i];
> +
> + if (rxq && rxq->lro) {
>   obj_type =  MLX5_RXQ_OBJ_TYPE_DEVX_RQ;
>   break;
>   }
> --
> 2.23.0

Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh

Re: [dpdk-dev] [PATCH dpdk-dev 2/3] net/mlx5: clean up redundant assignment

[Raslan Darawsheh]

Hi,

> -Original Message-
> From: dev  On Behalf Of
> xiangxia.m@gmail.com
> Sent: Wednesday, November 27, 2019 4:19 PM
> To: dev@dpdk.org
> Cc: Tonghao Zhang ; Ori Kam
> 
> Subject: [dpdk-dev] [PATCH dpdk-dev 2/3] net/mlx5: clean up redundant
> assignment
> 
> From: Tonghao Zhang 
> 
> The type of txq has been assigned in mlx5_txq_hairpin_new.
> 
> Fixes: ae18a1ae9692 ("net/mlx5: support Tx hairpin queues")
> Cc: Ori Kam 
> Signed-off-by: Tonghao Zhang 
> ---
>  drivers/net/mlx5/mlx5_txq.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c
> index a0d61644cb7f..e6a841c8d359 100644
> --- a/drivers/net/mlx5/mlx5_txq.c
> +++ b/drivers/net/mlx5/mlx5_txq.c
> @@ -271,7 +271,6 @@ mlx5_tx_hairpin_queue_setup(struct rte_eth_dev
> *dev, uint16_t idx,
>   DRV_LOG(DEBUG, "port %u adding Tx queue %u to list",
>   dev->data->port_id, idx);
>   (*priv->txqs)[idx] = &txq_ctrl->txq;
> - txq_ctrl->type = MLX5_TXQ_TYPE_HAIRPIN;
>   return 0;
>  }
> 
> --
> 2.23.0

Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh

Re: [dpdk-dev] [PATCH dpdk-dev 1/3] net/mlx5: avoid crash when setting hairpin queues

[Raslan Darawsheh]

Please be noted that only the first two patches where applied from this series,
The last patch is not needed anymore.

Also Added Cc: sta...@dpdk.org to the commits.
 
Kindest regards,
Raslan Darawsheh

> -Original Message-
> From: dev  On Behalf Of Raslan Darawsheh
> Sent: Sunday, December 15, 2019 10:55 AM
> To: xiangxia.m@gmail.com; dev@dpdk.org
> Cc: Ori Kam 
> Subject: Re: [dpdk-dev] [PATCH dpdk-dev 1/3] net/mlx5: avoid crash when
> setting hairpin queues
> 
> Hi,
> 
> > -Original Message-
> > From: dev  On Behalf Of
> > xiangxia.m@gmail.com
> > Sent: Wednesday, November 27, 2019 4:19 PM
> > To: dev@dpdk.org
> > Cc: Tonghao Zhang ; Ori Kam
> > 
> > Subject: [dpdk-dev] [PATCH dpdk-dev 1/3] net/mlx5: avoid crash when
> > setting hairpin queues
> >
> > From: Tonghao Zhang 
> >
> > If configuring the number of tx/rx queue with rte_eth_dev_configure
> > to nr_queues + hairpin_nr_queues, and setting tx/rx queues to
> > nr_queues with rte_eth_tx/rx_queue_setup. But not configuring the
> > hairpin queues via rte_eth_tx/rx_hairpin_queue_setup.
> >
> > When starting the netdev, there is a crash because of NULL accessing.
> >
> > Fixes: cf5516696d77 ("ethdev: add hairpin queue")
> > Cc: Ori Kam 
> > Signed-off-by: Tonghao Zhang 
> > ---
> >  drivers/net/mlx5/mlx5_ethdev.c  | 2 +-
> >  drivers/net/mlx5/mlx5_trigger.c | 5 -
> >  2 files changed, 5 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/mlx5/mlx5_ethdev.c
> > b/drivers/net/mlx5/mlx5_ethdev.c
> > index 1d6c084119ec..0076d05b00cc 100644
> > --- a/drivers/net/mlx5/mlx5_ethdev.c
> > +++ b/drivers/net/mlx5/mlx5_ethdev.c
> > @@ -476,7 +476,7 @@ mlx5_dev_configure_rss_reta(struct rte_eth_dev
> > *dev)
> >
> > rxq_data = (*priv->rxqs)[i];
> > rxq_ctrl = container_of(rxq_data, struct mlx5_rxq_ctrl, rxq);
> > -   if (rxq_ctrl->type == MLX5_RXQ_TYPE_STANDARD)
> > +   if (rxq_ctrl && rxq_ctrl->type ==
> > MLX5_RXQ_TYPE_STANDARD)
> > rss_queue_arr[j++] = i;
> > }
> > rss_queue_n = j;
> > diff --git a/drivers/net/mlx5/mlx5_trigger.c
> > b/drivers/net/mlx5/mlx5_trigger.c
> > index cafab25c67e7..ab6937ab10d1 100644
> > --- a/drivers/net/mlx5/mlx5_trigger.c
> > +++ b/drivers/net/mlx5/mlx5_trigger.c
> > @@ -106,9 +106,12 @@ mlx5_rxq_start(struct rte_eth_dev *dev)
> > unsigned int i;
> > int ret = 0;
> > enum mlx5_rxq_obj_type obj_type = MLX5_RXQ_OBJ_TYPE_IBV;
> > +   struct mlx5_rxq_data *rxq = NULL;
> >
> > for (i = 0; i < priv->rxqs_n; ++i) {
> > -   if ((*priv->rxqs)[i]->lro) {
> > +   rxq = (*priv->rxqs)[i];
> > +
> > +   if (rxq && rxq->lro) {
> > obj_type =  MLX5_RXQ_OBJ_TYPE_DEVX_RQ;
> > break;
> > }
> > --
> > 2.23.0
> 
> Patch applied to next-net-mlx,
> 
> Kindest regards,
> Raslan Darawsheh

[dpdk-dev] Intel platform guide

[Thomas Monjalon]

Hi,

I am reading the Linux guide which has a section about Intel platform:

http://doc.dpdk.org/guides/linux_gsg/nic_perf_intel_platform.html

After more thoughts, I think it would be better to have such information in the 
platform guide:

http://doc.dpdk.org/guides/platform/index.html

I guess a lot more information could be added for the Intel platform here.

Do you agree?
Please who could do this move?

[dpdk-dev] [PATCH] net/virtio-user: fix return value of tap offload sets not checked

[Yunjian Wang]

The function vhost_kernel_tap_set_offload() could return errors,
the return value need to be checked.

Fixes: 1db4d2330bc8 ("net/virtio-user: check negotiated features before set")
Cc: sta...@dpdk.org

Signed-off-by: Yunjian Wang 
---
 drivers/net/virtio/virtio_user/vhost_kernel_tap.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/virtio/virtio_user/vhost_kernel_tap.c 
b/drivers/net/virtio/virtio_user/vhost_kernel_tap.c
index 76bf754..f77d227 100644
--- a/drivers/net/virtio/virtio_user/vhost_kernel_tap.c
+++ b/drivers/net/virtio/virtio_user/vhost_kernel_tap.c
@@ -131,7 +131,8 @@
goto error;
}
 
-   vhost_kernel_tap_set_offload(tapfd, features);
+   if (vhost_kernel_tap_set_offload(tapfd, features) < 0)
+   goto error;
 
memset(&ifr, 0, sizeof(ifr));
ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
-- 
1.8.3.1

[dpdk-dev] [PATCH] net/vhost: fix return value of vhost creates not checked

[Yunjian Wang]

The function eth_dev_vhost_create() could return errors,
the return value need to be checked.

Fixes: ee584e9710b9 ("vhost: add driver on top of the library")
Cc: sta...@dpdk.org

Signed-off-by: Yunjian Wang 
---
 drivers/net/vhost/rte_eth_vhost.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/vhost/rte_eth_vhost.c 
b/drivers/net/vhost/rte_eth_vhost.c
index 46f01a7..7e4faf2 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -1455,8 +1455,10 @@ struct vhost_xstats_name_off {
if (dev->device.numa_node == SOCKET_ID_ANY)
dev->device.numa_node = rte_socket_id();
 
-   eth_dev_vhost_create(dev, iface_name, queues, dev->device.numa_node,
-   flags, disable_flags);
+   ret = eth_dev_vhost_create(dev, iface_name, queues,
+   dev->device.numa_node, flags, disable_flags);
+   if (ret == -1)
+   VHOST_LOG(ERR, "Failed to create %s", name);
 
 out_free:
rte_kvargs_free(kvlist);
-- 
1.8.3.1

Re: [dpdk-dev] [PATCH v2] net/mlx5: avoid crash when meter action conf is NULL

[Tonghao Zhang]

On Fri, Dec 13, 2019 at 10:21 PM  wrote:
>
> From: Tonghao Zhang 
>
> When offloading the meter, should check the action
> conf and make sure it is valid.
>
> Fixes: f46bf7488705 ("net/mlx5: support meter flow action")
> Cc: Suanming Mou 
>
> Signed-off-by: Tonghao Zhang 
> ---
> v2: coding style issues: http://patches.dpdk.org/patch/63849/
> ---
>  drivers/net/mlx5/mlx5_flow_dv.c | 9 -
>  1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
> index 73aaea4..7528556 100644
> --- a/drivers/net/mlx5/mlx5_flow_dv.c
> +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> @@ -3402,7 +3402,12 @@ struct field_modify_info modify_tcp[] = {
>  {
> struct mlx5_priv *priv = dev->data->dev_private;
> const struct rte_flow_action_meter *am = action->conf;
> -   struct mlx5_flow_meter *fm = mlx5_flow_meter_find(priv, am->mtr_id);
> +   struct mlx5_flow_meter *fm;
> +
> +   if (!am)
> +   return rte_flow_error_set(error, EINVAL,
> + RTE_FLOW_ERROR_TYPE_ACTION, NULL,
> + "meter action conf is NULL");
>
> if (action_flags & MLX5_FLOW_ACTION_METER)
> return rte_flow_error_set(error, ENOTSUP,
> @@ -3417,6 +3422,8 @@ struct field_modify_info modify_tcp[] = {
>   RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
>   NULL,
>   "meter action not supported");
> +
> +   fm = mlx5_flow_meter_find(priv, am->mtr_id);
> if (!fm)
> return rte_flow_error_set(error, EINVAL,
>   RTE_FLOW_ERROR_TYPE_ACTION, NULL,
> --
> 1.8.3.1
>
ping

Re: [dpdk-dev] [PATCH] raw/ntb: fix write memory barrier issue

[Li, Xiaoyun]

Didn't notice that. Will fix it in v2. Thanks!

> -Original Message-
> From: Gavin Hu (Arm Technology China) [mailto:gavin...@arm.com]
> Sent: Saturday, December 14, 2019 23:30
> To: Li, Xiaoyun ; Wu, Jingjing 
> Cc: dev@dpdk.org; sta...@dpdk.org; nd 
> Subject: RE: [dpdk-dev] [PATCH] raw/ntb: fix write memory barrier issue
> 
> Hi Xiaoyun,
> 
> > -Original Message-
> > From: dev  On Behalf Of Xiaoyun Li
> > Sent: Wednesday, December 4, 2019 11:19 PM
> > To: jingjing...@intel.com
> > Cc: dev@dpdk.org; Xiaoyun Li ; sta...@dpdk.org
> > Subject: [dpdk-dev] [PATCH] raw/ntb: fix write memory barrier issue
> >
> > All buffers and ring info should be written before tail register update.
> > This patch relocates the write memory barrier before updating tail register
> > to avoid potential issues.
> >
> > Fixes: 11b5c7daf019 ("raw/ntb: add enqueue and dequeue functions")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Xiaoyun Li 
> > ---
> >  drivers/raw/ntb/ntb.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/raw/ntb/ntb.c b/drivers/raw/ntb/ntb.c
> > index ad7f6abfd..dd0b72f8c 100644
> > --- a/drivers/raw/ntb/ntb.c
> > +++ b/drivers/raw/ntb/ntb.c
> > @@ -683,8 +683,8 @@ ntb_enqueue_bufs(struct rte_rawdev *dev,
> >sizeof(struct ntb_used) * nb1);
> > rte_memcpy(txq->tx_used_ring, tx_used + nb1,
> >sizeof(struct ntb_used) * nb2);
> > -   *txq->used_cnt = txq->last_used;
> > rte_wmb();
> > +   *txq->used_cnt = txq->last_used;
> I am ok with the re-location of the barrier, but why not the rte_io_wmb 
> instead
> of rte_wmb?
> Rte_io_wmb is sufficient to guarantee the preceding stores are visible to the
> device, rte_wmb is overkill.
> https://code.dpdk.org/dpdk/latest/source/lib/librte_eal/common/include/gener
> ic/rte_atomic.h#L92
> >
> > /* update queue stats */
> > hw->ntb_xstats[NTB_TX_BYTES_ID + off] += bytes;
> > @@ -789,8 +789,8 @@ ntb_dequeue_bufs(struct rte_rawdev *dev,
> >sizeof(struct ntb_desc) * nb1);
> > rte_memcpy(rxq->rx_desc_ring, rx_desc + nb1,
> >sizeof(struct ntb_desc) * nb2);
> > -   *rxq->avail_cnt = rxq->last_avail;
> > rte_wmb();
> > +   *rxq->avail_cnt = rxq->last_avail;
> >
> > /* update queue stats */
> > off = NTB_XSTATS_NUM * ((size_t)context + 1);
> > --
> > 2.17.1

[dpdk-dev] [PATCH v2] raw/ntb: fix write memory barrier issue

[Xiaoyun Li]

All buffers and ring info should be written before tail register update.
This patch relocates the write memory barrier before updating tail register
to avoid potential issues.

Fixes: 11b5c7daf019 ("raw/ntb: add enqueue and dequeue functions")
Cc: sta...@dpdk.org

Signed-off-by: Xiaoyun Li 
---
v2:
 * Replaced rte_wmb with rte_io_wmb since rte_io_wmb is enough.
---
 drivers/raw/ntb/ntb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/raw/ntb/ntb.c b/drivers/raw/ntb/ntb.c
index ad7f6abfd..c7de86f36 100644
--- a/drivers/raw/ntb/ntb.c
+++ b/drivers/raw/ntb/ntb.c
@@ -683,8 +683,8 @@ ntb_enqueue_bufs(struct rte_rawdev *dev,
   sizeof(struct ntb_used) * nb1);
rte_memcpy(txq->tx_used_ring, tx_used + nb1,
   sizeof(struct ntb_used) * nb2);
+   rte_io_wmb();
*txq->used_cnt = txq->last_used;
-   rte_wmb();
 
/* update queue stats */
hw->ntb_xstats[NTB_TX_BYTES_ID + off] += bytes;
@@ -789,8 +789,8 @@ ntb_dequeue_bufs(struct rte_rawdev *dev,
   sizeof(struct ntb_desc) * nb1);
rte_memcpy(rxq->rx_desc_ring, rx_desc + nb1,
   sizeof(struct ntb_desc) * nb2);
+   rte_io_wmb();
*rxq->avail_cnt = rxq->last_avail;
-   rte_wmb();
 
/* update queue stats */
off = NTB_XSTATS_NUM * ((size_t)context + 1);
-- 
2.17.1

[dpdk-dev] [PATCH v3] net/ixgbe: fix port can not link up in FreeBSD

[Lunyuan Cui]

In FreeBSD environment, nic_uio drivers do not support interrupts,
rte_intr_callback_register() will fail to register interrupts.
We can not make link status to change from down to up by interrupt
callback. So we need to wait for the controller to acquire link
when ports start. Through multiple tests, 5s should be enough.

Fixes: b9bd0f09fa15 ("ethdev: fix link status query")
Cc: sta...@dpdk.org

Signed-off-by: Lunyuan Cui 
---

v3 changes:
* Hide ifdef inside the function

v2 changes:
* Put waiting into a separate function to keep start() code clean.
---
 drivers/net/ixgbe/ixgbe_ethdev.c | 36 
 1 file changed, 36 insertions(+)

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 2c6fd0f13..d9b0c5b02 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -378,6 +378,7 @@ static int ixgbe_dev_udp_tunnel_port_del(struct rte_eth_dev 
*dev,
 struct rte_eth_udp_tunnel *udp_tunnel);
 static int ixgbe_filter_restore(struct rte_eth_dev *dev);
 static void ixgbe_l2_tunnel_conf(struct rte_eth_dev *dev);
+static int ixgbe_wait_for_link_up(struct ixgbe_hw *hw);
 
 /*
  * Define VF Stats MACRO for Non "cleared on read" register
@@ -2801,6 +2802,11 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
"please call hierarchy_commit() "
"before starting the port");
 
+   /* wait for the controller to acquire link */
+   err = ixgbe_wait_for_link_up(hw);
+   if (err)
+   goto error;
+
/*
 * Update link status right before return, because it may
 * start link configuration process in a separate thread.
@@ -4114,6 +4120,36 @@ ixgbe_dev_setup_link_alarm_handler(void *param)
intr->flags &= ~IXGBE_FLAG_NEED_LINK_CONFIG;
 }
 
+/*
+ * In freebsd environment, nic_uio drivers do not support interrupts,
+ * rte_intr_callback_register() will fail to register interrupts.
+ * We can not make link status to change from down to up by interrupt
+ * callback. So we need to wait for the controller to acquire link
+ * when ports start.
+ * It returns 0 on link up.
+ */
+static int
+ixgbe_wait_for_link_up(struct ixgbe_hw *hw)
+{
+#ifdef RTE_EXEC_ENV_FREEBSD
+   const int nb_iter = 25;
+#else
+   const int nb_iter = 0;
+#endif
+   int err, i, link_up = 0;
+   uint32_t speed = 0;
+
+   for (i = 0; i < nb_iter; i++) {
+   err = ixgbe_check_link(hw, &speed, &link_up, 0);
+   if (err)
+   return err;
+   if (link_up)
+   return 0;
+   msec_delay(200);
+   }
+   return 0;
+}
+
 /* return 0 means link status changed, -1 means not changed */
 int
 ixgbe_dev_link_update_share(struct rte_eth_dev *dev,
-- 
2.17.1

[dpdk-dev] [PATCH v3 00/36] update for i40e base code

[Xiaolong Ye]

This series is to support FVL 7.2 release.

The main changes include:

* virtchnl updates
* add lldp support
* Flow director updates
* extend PHY access AQ cmd
* add reading LPI counters
* add support for Energy Efficient Ethernet
* A few fixes.

V3:

* add missing SOBs

V2:

* strip some unnecessary code
* squash some fixes
* improve commit logs

Thanks,
Xiaolong


Xiaolong Ye (36):
  net/i40e/base: add support for feature flags
  net/i40e/base: increase max VSI count for VFs
  net/i40e/base: change buffer address
  net/i40e/base: decouple cfg_lldp_mib_change from init_dcb
  net/i40e/base: change misleading error message
  net/i40e/base: further implementation of LLDP
  net/i40e/base: add new device ids
  net/i40e/base: add check for MAC type
  net/i40e/base: adding flags for PHY types
  net/i40e/base: improve AQ log granularity
  net/i40e/base: add getter for FW LLDP agent status
  net/i40e/base: add support for Energy Efficient Ethernet
  net/i40e/base: read LPI status from external PHY
  net/i40e/base: change for missing "link modes"
  net/i40e/base: add reading LPI counters
  net/i40e/base: backport style changes from upstream Linux
  net/i40e/base: update status codes
  net/i40e/base: change of the incorrect Tx descriptors number
  net/i40e/base: extend PHY access AQ command
  net/i40e/base: add drop mode parameter to set MAC config
  net/i40e/base: add FWS1B register masks
  net/i40e/base: update FW API version
  net/i40e/base: add persistent lldp support
  net/i40e/base: make i40e_set_mac_type() public
  net/i40e/base: change retrying logic
  net/i40e/base: mark additional missing bits as reserved
  net/i40e/base: change wrong 'Advertised FEC modes'
  net/i40e/base: add Flow Director defines
  net/i40e/base: removed unreachable code
  net/i40e/base: set PHY Access flag on X722
  net/i40e/base: implement reading lpi statistics
  net/i40e/base: exposing missing LED functionality
  net/i40e/base: introduce firmware EMP reset register offsets
  net/i40e/base: add CRC stripping capability
  net/i40e/base: enable LED blinking flow
  net/i40e/base: add new link speed constants

 drivers/net/i40e/base/i40e_adminq.c | 142 +++---
 drivers/net/i40e/base/i40e_adminq_cmd.h |  95 +++-
 drivers/net/i40e/base/i40e_common.c | 651 +---
 drivers/net/i40e/base/i40e_dcb.c|  87 +++-
 drivers/net/i40e/base/i40e_dcb.h|  20 +-
 drivers/net/i40e/base/i40e_devids.h |   4 +
 drivers/net/i40e/base/i40e_nvm.c| 113 +++-
 drivers/net/i40e/base/i40e_prototype.h  |  76 ++-
 drivers/net/i40e/base/i40e_register.h   |  95 
 drivers/net/i40e/base/i40e_type.h   |  39 +-
 drivers/net/i40e/base/virtchnl.h|  32 +-
 drivers/net/i40e/i40e_ethdev.c  |  12 +-
 drivers/net/i40e/rte_pmd_i40e.c |   4 +-
 13 files changed, 1047 insertions(+), 323 deletions(-)

-- 
2.17.1

[dpdk-dev] [PATCH v3 03/36] net/i40e/base: change buffer address

[Xiaolong Ye]

The high 32-bits were being set incorrectly in the 'Set Local LLDP MIB'
AQ command (0x0A08). Change it to use the right macro to get the correct
bits.

Signed-off-by: Piotr Azarewicz 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/i40e/base/i40e_common.c 
b/drivers/net/i40e/base/i40e_common.c
index cee6de2a8..0b26f86c5 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -4311,7 +4311,7 @@ enum i40e_status_code i40e_aq_set_lldp_mib(struct i40e_hw 
*hw,
 
cmd->type = mib_type;
cmd->length = CPU_TO_LE16(buff_size);
-   cmd->address_high = CPU_TO_LE32(I40E_HI_WORD((u64)buff));
+   cmd->address_high = CPU_TO_LE32(I40E_HI_DWORD((u64)buff));
cmd->address_low =  CPU_TO_LE32(I40E_LO_DWORD((u64)buff));
 
status = i40e_asq_send_command(hw, &desc, buff, buff_size, cmd_details);
-- 
2.17.1

[dpdk-dev] [PATCH v3 02/36] net/i40e/base: increase max VSI count for VFs

[Xiaolong Ye]

For historical reasons, we allowed 3 VSIs per VF, but never used more
than one. Now with ADq, we can use up to 4 VSIs per VF, so change this
value to match.

Signed-off-by: Mitch Williams 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_type.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/i40e/base/i40e_type.h 
b/drivers/net/i40e/base/i40e_type.h
index fcdf0eb29..0cbb13262 100644
--- a/drivers/net/i40e/base/i40e_type.h
+++ b/drivers/net/i40e/base/i40e_type.h
@@ -38,7 +38,7 @@
 #define I40E_MAX_PF_VSI64
 #define I40E_MAX_PF_QP 128
 #define I40E_MAX_VSI_QP16
-#define I40E_MAX_VF_VSI3
+#define I40E_MAX_VF_VSI4
 #define I40E_MAX_CHAINED_RX_BUFFERS5
 #define I40E_MAX_PF_UDP_OFFLOAD_PORTS  16
 
-- 
2.17.1

[dpdk-dev] [PATCH v3 01/36] net/i40e/base: add support for feature flags

[Xiaolong Ye]

Extend NVM Update API to support reporting of features
available for the tools.

This change is needed by NVM Update to determine if driver
supports changing NVM layout from structured to flat.

Signed-off-by: Piotr Pietruszewski 
Signed-off-by: Galazka Krzysztof 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_common.c | 11 
 drivers/net/i40e/base/i40e_nvm.c| 42 ++---
 drivers/net/i40e/base/i40e_type.h   | 22 +++
 3 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_common.c 
b/drivers/net/i40e/base/i40e_common.c
index 37911a99e..cee6de2a8 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -1014,6 +1014,17 @@ enum i40e_status_code i40e_init_shared_code(struct 
i40e_hw *hw)
if (hw->mac.type == I40E_MAC_X722)
hw->flags |= I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE |
 I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK;
+   /* NVMUpdate features structure initialization */
+   hw->nvmupd_features.major = I40E_NVMUPD_FEATURES_API_VER_MAJOR;
+   hw->nvmupd_features.minor = I40E_NVMUPD_FEATURES_API_VER_MINOR;
+   hw->nvmupd_features.size = sizeof(hw->nvmupd_features);
+   i40e_memset(hw->nvmupd_features.features, 0x0,
+   I40E_NVMUPD_FEATURES_API_FEATURES_ARRAY_LEN *
+   sizeof(*hw->nvmupd_features.features),
+   I40E_NONDMA_MEM);
+
+   /* No features supported at the moment */
+   hw->nvmupd_features.features[0] = 0;
 
status = i40e_init_nvm(hw);
return status;
diff --git a/drivers/net/i40e/base/i40e_nvm.c b/drivers/net/i40e/base/i40e_nvm.c
index 6c8ca8771..c8b401cdd 100644
--- a/drivers/net/i40e/base/i40e_nvm.c
+++ b/drivers/net/i40e/base/i40e_nvm.c
@@ -797,6 +797,7 @@ STATIC const char *i40e_nvm_update_state_str[] = {
"I40E_NVMUPD_EXEC_AQ",
"I40E_NVMUPD_GET_AQ_RESULT",
"I40E_NVMUPD_GET_AQ_EVENT",
+   "I40E_NVMUPD_GET_FEATURES",
 };
 
 /**
@@ -859,6 +860,31 @@ enum i40e_status_code i40e_nvmupd_command(struct i40e_hw 
*hw,
return I40E_SUCCESS;
}
 
+   /*
+* A supported features request returns immediately
+* rather than going into state machine
+*/
+   if (upd_cmd == I40E_NVMUPD_FEATURES) {
+   if (cmd->data_size < hw->nvmupd_features.size) {
+   *perrno = -EFAULT;
+   return I40E_ERR_BUF_TOO_SHORT;
+   }
+
+   /*
+* If buffer is bigger than i40e_nvmupd_features structure,
+* make sure the trailing bytes are set to 0x0.
+*/
+   if (cmd->data_size > hw->nvmupd_features.size)
+   i40e_memset(bytes + hw->nvmupd_features.size, 0x0,
+   cmd->data_size - hw->nvmupd_features.size,
+   I40E_NONDMA_MEM);
+
+   i40e_memcpy(bytes, &hw->nvmupd_features,
+   hw->nvmupd_features.size, I40E_NONDMA_MEM);
+
+   return I40E_SUCCESS;
+   }
+
/* Clear status even it is not read and log */
if (hw->nvmupd_state == I40E_NVMUPD_STATE_ERROR) {
i40e_debug(hw, I40E_DEBUG_NVM,
@@ -1325,10 +1351,20 @@ STATIC enum i40e_nvmupd_cmd 
i40e_nvmupd_validate_command(struct i40e_hw *hw,
upd_cmd = I40E_NVMUPD_READ_SA;
break;
case I40E_NVM_EXEC:
-   if (module == 0xf)
-   upd_cmd = I40E_NVMUPD_STATUS;
-   else if (module == 0)
+   switch (module) {
+   case I40E_NVM_EXEC_GET_AQ_RESULT:
upd_cmd = I40E_NVMUPD_GET_AQ_RESULT;
+   break;
+   case I40E_NVM_EXEC_FEATURES:
+   upd_cmd = I40E_NVMUPD_FEATURES;
+   break;
+   case I40E_NVM_EXEC_STATUS:
+   upd_cmd = I40E_NVMUPD_STATUS;
+   break;
+   default:
+   *perrno = -EFAULT;
+   return I40E_NVMUPD_INVALID;
+   }
break;
case I40E_NVM_AQE:
upd_cmd = I40E_NVMUPD_GET_AQ_EVENT;
diff --git a/drivers/net/i40e/base/i40e_type.h 
b/drivers/net/i40e/base/i40e_type.h
index 06863d772..fcdf0eb29 100644
--- a/drivers/net/i40e/base/i40e_type.h
+++ b/drivers/net/i40e/base/i40e_type.h
@@ -478,6 +478,7 @@ enum i40e_nvmupd_cmd {
I40E_NVMUPD_EXEC_AQ,
I40E_NVMUPD_GET_AQ_RESULT,
I40E_NVMUPD_GET_AQ_EVENT,
+   I40E_NVMUPD_FEATURES,
 };
 
 enum i40e_nvmupd_state {
@@ -513,6 +514,10 @@ enum i40e_nvmupd_state {
 #define I40E_NVM_AQE

[dpdk-dev] [PATCH v3 06/36] net/i40e/base: further implementation of LLDP

[Xiaolong Ye]

This code implements changes necessary for LLDP Agent support.

1. Modified i40e_aq_start_lldp and i40e_aq_stop_lldp. Now Stop and Start
can also be persistent across power cycles.
2. Added new function i40e_aq_restore_lldp which restores factory
setting for LLDP Agent or gets its status.

Signed-off-by: Jaroslaw Ilgiewicz 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_adminq_cmd.h |  19 ++-
 drivers/net/i40e/base/i40e_common.c | 173 ++--
 drivers/net/i40e/base/i40e_prototype.h  |  18 +--
 drivers/net/i40e/base/i40e_type.h   |   1 +
 drivers/net/i40e/i40e_ethdev.c  |   4 +-
 drivers/net/i40e/rte_pmd_i40e.c |   4 +-
 6 files changed, 67 insertions(+), 152 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_adminq_cmd.h 
b/drivers/net/i40e/base/i40e_adminq_cmd.h
index b459be921..a89b88fa5 100644
--- a/drivers/net/i40e/base/i40e_adminq_cmd.h
+++ b/drivers/net/i40e/base/i40e_adminq_cmd.h
@@ -265,6 +265,7 @@ enum i40e_admin_queue_opc {
i40e_aqc_opc_get_cee_dcb_cfg= 0x0A07,
i40e_aqc_opc_lldp_set_local_mib = 0x0A08,
i40e_aqc_opc_lldp_stop_start_spec_agent = 0x0A09,
+   i40e_aqc_opc_lldp_restore   = 0x0A0A,
 
/* Tunnel commands */
i40e_aqc_opc_add_udp_tunnel = 0x0B00,
@@ -2554,8 +2555,9 @@ I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_update_tlv);
 /* Stop LLDP (direct 0x0A05) */
 struct i40e_aqc_lldp_stop {
u8  command;
-#define I40E_AQ_LLDP_AGENT_STOP0x0
-#define I40E_AQ_LLDP_AGENT_SHUTDOWN0x1
+#define I40E_AQ_LLDP_AGENT_STOP0x0
+#define I40E_AQ_LLDP_AGENT_SHUTDOWN0x1
+#define I40E_AQ_LLDP_AGENT_STOP_PERSIST0x2
u8  reserved[15];
 };
 
@@ -2565,7 +2567,8 @@ I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_stop);
 
 struct i40e_aqc_lldp_start {
u8  command;
-#define I40E_AQ_LLDP_AGENT_START   0x1
+#define I40E_AQ_LLDP_AGENT_START   0x1
+#define I40E_AQ_LLDP_AGENT_START_PERSIST   0x2
u8  reserved[15];
 };
 
@@ -2685,6 +2688,16 @@ struct i40e_aqc_lldp_stop_start_specific_agent {
 
 I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_stop_start_specific_agent);
 
+/* Restore LLDP Agent factory settings (direct 0x0A0A) */
+struct i40e_aqc_lldp_restore {
+   u8  command;
+#define I40E_AQ_LLDP_AGENT_RESTORE_NOT 0x0
+#define I40E_AQ_LLDP_AGENT_RESTORE 0x1
+   u8  reserved[15];
+};
+
+I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_restore);
+
 /* Add Udp Tunnel command and completion (direct 0x0B00) */
 struct i40e_aqc_add_udp_tunnel {
__le16  udp_port;
diff --git a/drivers/net/i40e/base/i40e_common.c 
b/drivers/net/i40e/base/i40e_common.c
index 0b26f86c5..8ebf8b856 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -4347,151 +4347,39 @@ enum i40e_status_code 
i40e_aq_cfg_lldp_mib_change_event(struct i40e_hw *hw,
 }
 
 /**
- * i40e_aq_add_lldp_tlv
+ * i40e_aq_restore_lldp
  * @hw: pointer to the hw struct
- * @bridge_type: type of bridge
- * @buff: buffer with TLV to add
- * @buff_size: length of the buffer
- * @tlv_len: length of the TLV to be added
- * @mib_len: length of the LLDP MIB returned in response
+ * @setting: pointer to factory setting variable or NULL
+ * @restore: True if factory settings should be restored
  * @cmd_details: pointer to command details structure or NULL
  *
- * Add the specified TLV to LLDP Local MIB for the given bridge type,
- * it is responsibility of the caller to make sure that the TLV is not
- * already present in the LLDPDU.
- * In return firmware will write the complete LLDP MIB with the newly
- * added TLV in the response buffer.
+ * Restore LLDP Agent factory settings if @restore set to True. In other case
+ * only returns factory setting in AQ response.
  **/
-enum i40e_status_code i40e_aq_add_lldp_tlv(struct i40e_hw *hw, u8 bridge_type,
-   void *buff, u16 buff_size, u16 tlv_len,
-   u16 *mib_len,
-   struct i40e_asq_cmd_details *cmd_details)
-{
-   struct i40e_aq_desc desc;
-   struct i40e_aqc_lldp_add_tlv *cmd =
-   (struct i40e_aqc_lldp_add_tlv *)&desc.params.raw;
-   enum i40e_status_code status;
-
-   if (buff_size == 0 || !buff || tlv_len == 0)
-   return I40E_ERR_PARAM;
-
-   i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_lldp_add_tlv);
-
-   /* Indirect Command */
-   desc.flags |= CPU_TO_LE16((u16)(I40E_AQ_FLAG_BUF | I40E_AQ_FLAG_RD));
-   if (buff_size > I40E_AQ_LARGE_BUF)
-   desc.flags |= CPU_TO_LE16((u16)I40E_AQ_FLAG_LB);
-   desc.datalen = CPU_TO_LE16(buff_size);
-
-   cmd->type = ((bridge_type << I40E_AQ_LLDP_BRIDGE_TYPE_SHIFT) &
- I40E_AQ_LLDP_BRIDGE_TYPE_MASK);
-   cmd->len = CPU_TO_LE16(tlv_len);
-
-   status = i40e_asq_send_command(hw, &desc, buff, buff_size, cmd_details);
- 

[dpdk-dev] [PATCH v3 04/36] net/i40e/base: decouple cfg_lldp_mib_change from init_dcb

[Xiaolong Ye]

There is a need to enable MIB change event, not at the same time as
init_dcb. This patch will serve this requirement.

Modify the i40e_init_dcb to return the correct error when LLDP or DCBX
is not in operational state.

Signed-off-by: Chinh T Cao 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_dcb.c | 28 +++-
 drivers/net/i40e/base/i40e_dcb.h |  3 ++-
 drivers/net/i40e/i40e_ethdev.c   |  4 ++--
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_dcb.c b/drivers/net/i40e/base/i40e_dcb.c
index a26f82b3a..7cc8c83dc 100644
--- a/drivers/net/i40e/base/i40e_dcb.c
+++ b/drivers/net/i40e/base/i40e_dcb.c
@@ -863,22 +863,23 @@ enum i40e_status_code i40e_get_dcb_config(struct i40e_hw 
*hw)
 /**
  * i40e_init_dcb
  * @hw: pointer to the hw struct
+ * @enable_mib_change: enable mib change event
  *
  * Update DCB configuration from the Firmware
  **/
-enum i40e_status_code i40e_init_dcb(struct i40e_hw *hw)
+enum i40e_status_code i40e_init_dcb(struct i40e_hw *hw, bool enable_mib_change)
 {
enum i40e_status_code ret = I40E_SUCCESS;
struct i40e_lldp_variables lldp_cfg;
u8 adminstatus = 0;
 
if (!hw->func_caps.dcb)
-   return ret;
+   return I40E_NOT_SUPPORTED;
 
/* Read LLDP NVM area */
ret = i40e_read_lldp_cfg(hw, &lldp_cfg);
if (ret)
-   return ret;
+   return I40E_ERR_NOT_READY;
 
/* Get the LLDP AdminStatus for the current port */
adminstatus = lldp_cfg.adminstatus >> (hw->port * 4);
@@ -887,7 +888,7 @@ enum i40e_status_code i40e_init_dcb(struct i40e_hw *hw)
/* LLDP agent disabled */
if (!adminstatus) {
hw->dcbx_status = I40E_DCBX_STATUS_DISABLED;
-   return ret;
+   return I40E_ERR_NOT_READY;
}
 
/* Get DCBX status */
@@ -896,26 +897,19 @@ enum i40e_status_code i40e_init_dcb(struct i40e_hw *hw)
return ret;
 
/* Check the DCBX Status */
-   switch (hw->dcbx_status) {
-   case I40E_DCBX_STATUS_DONE:
-   case I40E_DCBX_STATUS_IN_PROGRESS:
+   if (hw->dcbx_status == I40E_DCBX_STATUS_DONE ||
+   hw->dcbx_status == I40E_DCBX_STATUS_IN_PROGRESS) {
/* Get current DCBX configuration */
ret = i40e_get_dcb_config(hw);
if (ret)
return ret;
-   break;
-   case I40E_DCBX_STATUS_DISABLED:
-   return ret;
-   case I40E_DCBX_STATUS_NOT_STARTED:
-   case I40E_DCBX_STATUS_MULTIPLE_PEERS:
-   default:
-   break;
+   } else if (hw->dcbx_status == I40E_DCBX_STATUS_DISABLED) {
+   return I40E_ERR_NOT_READY;
}
 
/* Configure the LLDP MIB change event */
-   ret = i40e_aq_cfg_lldp_mib_change_event(hw, true, NULL);
-   if (ret)
-   return ret;
+   if (enable_mib_change)
+   ret = i40e_aq_cfg_lldp_mib_change_event(hw, true, NULL);
 
return ret;
 }
diff --git a/drivers/net/i40e/base/i40e_dcb.h b/drivers/net/i40e/base/i40e_dcb.h
index 85b0eed3a..253943308 100644
--- a/drivers/net/i40e/base/i40e_dcb.h
+++ b/drivers/net/i40e/base/i40e_dcb.h
@@ -186,7 +186,8 @@ enum i40e_status_code i40e_aq_get_dcb_config(struct i40e_hw 
*hw, u8 mib_type,
 u8 bridgetype,
 struct i40e_dcbx_config *dcbcfg);
 enum i40e_status_code i40e_get_dcb_config(struct i40e_hw *hw);
-enum i40e_status_code i40e_init_dcb(struct i40e_hw *hw);
+enum i40e_status_code i40e_init_dcb(struct i40e_hw *hw,
+   bool enable_mib_change);
 enum i40e_status_code i40e_set_dcb_config(struct i40e_hw *hw);
 enum i40e_status_code i40e_dcb_config_to_lldp(u8 *lldpmib, u16 *miblen,
  struct i40e_dcbx_config *dcbcfg);
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 5999c964b..765d9b495 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -11582,7 +11582,7 @@ i40e_dcb_init_configure(struct rte_eth_dev *dev, bool 
sw_dcb)
PMD_INIT_LOG(DEBUG, "Failed to stop lldp");
}
 
-   ret = i40e_init_dcb(hw);
+   ret = i40e_init_dcb(hw, true);
/* If lldp agent is stopped, the return value from
 * i40e_init_dcb we expect is failure with I40E_AQ_RC_EPERM
 * adminq status. Otherwise, it should return success.
@@ -11630,7 +11630,7 @@ i40e_dcb_init_configure(struct rte_eth_dev *dev, bool 
sw_dcb)
if (ret != I40E_SUCCESS)
PMD_INIT_LOG(DEBUG, "Failed to start lldp");
 
-   ret = i40e_init_dcb(hw);
+   ret = i40e_init_dcb(hw, true);
if (!ret) {
if (hw->dcbx_status == I40E_

[dpdk-dev] [PATCH v3 08/36] net/i40e/base: add check for MAC type

[Xiaolong Ye]

Some features were introduced in different FW API version on XL710 and X722
MACs. Others are available only on specific MAC type. Make sure that they
are properly assigned. Also fix the style issues reported by current
check-patch.

Signed-off-by: Galazka Krzysztof 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_adminq.c | 68 +++--
 1 file changed, 16 insertions(+), 52 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_adminq.c 
b/drivers/net/i40e/base/i40e_adminq.c
index b2fc6f590..b8c6e30f5 100644
--- a/drivers/net/i40e/base/i40e_adminq.c
+++ b/drivers/net/i40e/base/i40e_adminq.c
@@ -582,25 +582,22 @@ STATIC void i40e_resume_aq(struct i40e_hw *hw)
  **/
 enum i40e_status_code i40e_init_adminq(struct i40e_hw *hw)
 {
-#ifdef PF_DRIVER
+   struct i40e_adminq_info *aq = &hw->aq;
+   enum i40e_status_code ret_code;
u16 cfg_ptr, oem_hi, oem_lo;
u16 eetrack_lo, eetrack_hi;
-#endif
-   enum i40e_status_code ret_code;
-#ifdef PF_DRIVER
int retry = 0;
-#endif
 
/* verify input for valid configuration */
-   if ((hw->aq.num_arq_entries == 0) ||
-   (hw->aq.num_asq_entries == 0) ||
-   (hw->aq.arq_buf_size == 0) ||
-   (hw->aq.asq_buf_size == 0)) {
+   if (aq->num_arq_entries == 0 ||
+   aq->num_asq_entries == 0 ||
+   aq->arq_buf_size == 0 ||
+   aq->asq_buf_size == 0) {
ret_code = I40E_ERR_CONFIG;
goto init_adminq_exit;
}
-   i40e_init_spinlock(&hw->aq.asq_spinlock);
-   i40e_init_spinlock(&hw->aq.arq_spinlock);
+   i40e_init_spinlock(&aq->asq_spinlock);
+   i40e_init_spinlock(&aq->arq_spinlock);
 
/* Set up register offsets */
i40e_adminq_init_regs(hw);
@@ -618,23 +615,17 @@ enum i40e_status_code i40e_init_adminq(struct i40e_hw *hw)
if (ret_code != I40E_SUCCESS)
goto init_adminq_free_asq;
 
-#ifdef PF_DRIVER
-#ifdef INTEGRATED_VF
-   /* VF has no need of firmware */
-   if (i40e_is_vf(hw))
-   goto init_adminq_exit;
-#endif
/* There are some cases where the firmware may not be quite ready
 * for AdminQ operations, so we retry the AdminQ setup a few times
 * if we see timeouts in this first AQ call.
 */
do {
ret_code = i40e_aq_get_firmware_version(hw,
-   &hw->aq.fw_maj_ver,
-   &hw->aq.fw_min_ver,
-   &hw->aq.fw_build,
-   &hw->aq.api_maj_ver,
-   &hw->aq.api_min_ver,
+   &aq->fw_maj_ver,
+   &aq->fw_min_ver,
+   &aq->fw_build,
+   &aq->api_maj_ver,
+   &aq->api_min_ver,
NULL);
if (ret_code != I40E_ERR_ADMIN_QUEUE_TIMEOUT)
break;
@@ -658,31 +649,7 @@ enum i40e_status_code i40e_init_adminq(struct i40e_hw *hw)
   &oem_lo);
hw->nvm.oem_ver = ((u32)oem_hi << 16) | oem_lo;
 
-   /* The ability to RX (not drop) 802.1ad frames was added in API 1.7 */
-   if ((hw->aq.api_maj_ver > 1) ||
-   ((hw->aq.api_maj_ver == 1) &&
-(hw->aq.api_min_ver >= 7)))
-   hw->flags |= I40E_HW_FLAG_802_1AD_CAPABLE;
-
-   if (hw->mac.type == I40E_MAC_XL710 &&
-   hw->aq.api_maj_ver == I40E_FW_API_VERSION_MAJOR &&
-   hw->aq.api_min_ver >= I40E_MINOR_VER_GET_LINK_INFO_XL710) {
-   hw->flags |= I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE;
-   hw->flags |= I40E_HW_FLAG_FW_LLDP_STOPPABLE;
-   }
-   if (hw->mac.type == I40E_MAC_X722 &&
-   hw->aq.api_maj_ver == I40E_FW_API_VERSION_MAJOR &&
-   hw->aq.api_min_ver >= I40E_MINOR_VER_FW_LLDP_STOPPABLE_X722) {
-   hw->flags |= I40E_HW_FLAG_FW_LLDP_STOPPABLE;
-   }
-
-   /* Newer versions of firmware require lock when reading the NVM */
-   if ((hw->aq.api_maj_ver > 1) ||
-   ((hw->aq.api_maj_ver == 1) &&
-(hw->aq.api_min_ver >= 5)))
-   hw->flags |= I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK;
-
-   if (hw->aq.api_maj_ver > I40E_FW_API_VERSION_MAJOR) {
+   if (aq->api_maj_ver > I40E_FW_API_VERSION_MAJOR) {
ret_code = I40E_ERR_FIRMWARE_API_VERSION;
goto init_adminq_free_arq;
}
@@ -692,21 +659,18 @@ enum i40e_status_code i40e_init_adminq(struct i40e_hw *hw)
hw->nvm_release_on_done = false;
hw->nvmupd_state = I40E_NVMUPD_STATE_INIT;
 
-#endif /* PF_DRIVER *

[dpdk-dev] [PATCH v3 07/36] net/i40e/base: add new device ids

[Xiaolong Ye]

New device ids are created to support SFP+ and backplane connections.

Signed-off-by: Piotr Azarewicz 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_common.c | 2 ++
 drivers/net/i40e/base/i40e_devids.h | 2 ++
 drivers/net/i40e/i40e_ethdev.c  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/drivers/net/i40e/base/i40e_common.c 
b/drivers/net/i40e/base/i40e_common.c
index 8ebf8b856..73d0c29fd 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -36,6 +36,8 @@ STATIC enum i40e_status_code i40e_set_mac_type(struct i40e_hw 
*hw)
case I40E_DEV_ID_10G_BASE_T:
case I40E_DEV_ID_10G_BASE_T4:
case I40E_DEV_ID_10G_BASE_T_BC:
+   case I40E_DEV_ID_10G_B:
+   case I40E_DEV_ID_10G_SFP:
case I40E_DEV_ID_20G_KR2:
case I40E_DEV_ID_20G_KR2_A:
case I40E_DEV_ID_25G_B:
diff --git a/drivers/net/i40e/base/i40e_devids.h 
b/drivers/net/i40e/base/i40e_devids.h
index f3c59bdea..1700db17a 100644
--- a/drivers/net/i40e/base/i40e_devids.h
+++ b/drivers/net/i40e/base/i40e_devids.h
@@ -36,6 +36,8 @@
 #define I40E_DEV_ID_X722_A0_VF 0x374D
 #endif
 #endif
+#define I40E_DEV_ID_10G_B  0x104F
+#define I40E_DEV_ID_10G_SFP0x104E
 #define I40E_DEV_ID_KX_X7220x37CE
 #define I40E_DEV_ID_QSFP_X722  0x37CF
 #define I40E_DEV_ID_SFP_X722   0x37D0
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 26843584e..b93c56e46 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -443,6 +443,8 @@ static const struct rte_pci_id pci_id_i40e_map[] = {
{ RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_X710_N3000) },
{ RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_XXV710_N3000) },
{ RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_10G_BASE_T_BC) },
+   { RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_10G_B) },
+   { RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_10G_SFP) },
{ .vendor_id = 0, /* sentinel */ },
 };
 
-- 
2.17.1

[dpdk-dev] [PATCH v3 05/36] net/i40e/base: change misleading error message

[Xiaolong Ye]

This patch changes an error code for an admin queue head overrun to use
I40E_ERR_ADMIN_QUEUE_FULL instead of I40E_ERR_QUEUE_EMPTY.

Signed-off-by: Carolyn Wyborny 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_adminq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/i40e/base/i40e_adminq.c 
b/drivers/net/i40e/base/i40e_adminq.c
index 38214a373..b2fc6f590 100644
--- a/drivers/net/i40e/base/i40e_adminq.c
+++ b/drivers/net/i40e/base/i40e_adminq.c
@@ -835,7 +835,7 @@ enum i40e_status_code i40e_asq_send_command(struct i40e_hw 
*hw,
if (val >= hw->aq.num_asq_entries) {
i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE,
   "AQTX: head overrun at %d\n", val);
-   status = I40E_ERR_QUEUE_EMPTY;
+   status = I40E_ERR_ADMIN_QUEUE_FULL;
goto asq_send_command_error;
}
 
-- 
2.17.1

[dpdk-dev] [PATCH v3 09/36] net/i40e/base: adding flags for PHY types

[Xiaolong Ye]

Adding bit flags to enable/disable EEE capability for 2.5GBase-T and
5GBase-T PHY types as well as 'Set autonomous EEE for relevant enabled PHY
types' flag.

Signed-off-by: Doug Dziggel 
Signed-off-by: Michal Litwicki 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_adminq_cmd.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/i40e/base/i40e_adminq_cmd.h 
b/drivers/net/i40e/base/i40e_adminq_cmd.h
index a89b88fa5..2bd8f81f9 100644
--- a/drivers/net/i40e/base/i40e_adminq_cmd.h
+++ b/drivers/net/i40e/base/i40e_adminq_cmd.h
@@ -2027,12 +2027,15 @@ struct i40e_aq_get_phy_abilities_resp {
 #define I40E_AQ_PHY_FEC_ABILITY_KR 0x40
 #define I40E_AQ_PHY_FEC_ABILITY_RS 0x80
__le16  eee_capability;
+#define I40E_AQ_EEE_AUTO   0x0001
 #define I40E_AQ_EEE_100BASE_TX 0x0002
 #define I40E_AQ_EEE_1000BASE_T 0x0004
 #define I40E_AQ_EEE_10GBASE_T  0x0008
 #define I40E_AQ_EEE_1000BASE_KX0x0010
 #define I40E_AQ_EEE_10GBASE_KX40x0020
 #define I40E_AQ_EEE_10GBASE_KR 0x0040
+#define I40E_AQ_EEE_2_5GBASE_T 0x0100
+#define I40E_AQ_EEE_5GBASE_T   0x0200
__le32  eeer_val;
u8  d3_lpan;
 #define I40E_AQ_SET_PHY_D3_LPAN_ENA0x01
-- 
2.17.1

[dpdk-dev] [PATCH v3 12/36] net/i40e/base: add support for Energy Efficient Ethernet

[Xiaolong Ye]

This change adds i40e_enable_eee() function controlling advertisement
of Energy Efficient Ethernet mode (EEE).

Signed-off-by: Piotr Pietruszewski 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_common.c| 64 ++
 drivers/net/i40e/base/i40e_prototype.h |  1 +
 2 files changed, 65 insertions(+)

diff --git a/drivers/net/i40e/base/i40e_common.c 
b/drivers/net/i40e/base/i40e_common.c
index 4384a0795..c2e7cf7d5 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -6306,6 +6306,70 @@ enum i40e_status_code i40e_aq_debug_dump(struct i40e_hw 
*hw, u8 cluster_id,
return status;
 }
 
+
+/**
+ * i40e_enable_eee
+ * @hw: pointer to the hardware structure
+ * @enable: state of Energy Efficient Ethernet mode to be set
+ *
+ * Enables or disables Energy Efficient Ethernet (EEE) mode
+ * accordingly to @enable parameter.
+ **/
+enum i40e_status_code i40e_enable_eee(struct i40e_hw *hw, bool enable)
+{
+   struct i40e_aq_get_phy_abilities_resp abilities;
+   struct i40e_aq_set_phy_config config;
+   enum i40e_status_code status;
+   __le16 eee_capability;
+
+   /* Get initial PHY capabilities */
+   status = i40e_aq_get_phy_capabilities(hw, false, true, &abilities,
+ NULL);
+   if (status)
+   goto err;
+
+   /* Check whether NIC configuration is compatible with Energy Efficient
+* Ethernet (EEE) mode.
+*/
+   if (abilities.eee_capability == 0) {
+   status = I40E_ERR_CONFIG;
+   goto err;
+   }
+
+   /* Cache initial EEE capability */
+   eee_capability = abilities.eee_capability;
+
+   /* Get current configuration */
+   status = i40e_aq_get_phy_capabilities(hw, false, false, &abilities,
+ NULL);
+   if (status)
+   goto err;
+
+   /* Cache current configuration */
+   config.phy_type = abilities.phy_type;
+   config.link_speed = abilities.link_speed;
+   config.abilities = abilities.abilities |
+  I40E_AQ_PHY_ENABLE_ATOMIC_LINK;
+   config.eeer = abilities.eeer_val;
+   config.low_power_ctrl = abilities.d3_lpan;
+   config.fec_config = abilities.fec_cfg_curr_mod_ext_info &
+   I40E_AQ_PHY_FEC_CONFIG_MASK;
+
+   /* Set desired EEE state */
+   if (enable) {
+   config.eee_capability = eee_capability;
+   config.eeer |= I40E_PRTPM_EEER_TX_LPI_EN_MASK;
+   } else {
+   config.eee_capability = 0;
+   config.eeer &= ~I40E_PRTPM_EEER_TX_LPI_EN_MASK;
+   }
+
+   /* Save modified config */
+   status = i40e_aq_set_phy_config(hw, &config, NULL);
+err:
+   return status;
+}
+
 /**
  * i40e_read_bw_from_alt_ram
  * @hw: pointer to the hardware structure
diff --git a/drivers/net/i40e/base/i40e_prototype.h 
b/drivers/net/i40e/base/i40e_prototype.h
index 2f3e0bfee..38beb270b 100644
--- a/drivers/net/i40e/base/i40e_prototype.h
+++ b/drivers/net/i40e/base/i40e_prototype.h
@@ -458,6 +458,7 @@ void i40e_nvmupd_check_wait_event(struct i40e_hw *hw, u16 
opcode,
 void i40e_nvmupd_clear_wait_state(struct i40e_hw *hw);
 void i40e_set_pci_config_data(struct i40e_hw *hw, u16 link_status);
 #endif /* PF_DRIVER */
+enum i40e_status_code i40e_enable_eee(struct i40e_hw *hw, bool enable);
 
 #if defined(I40E_QV) || defined(VF_DRIVER)
 enum i40e_status_code i40e_set_mac_type(struct i40e_hw *hw);
-- 
2.17.1

[dpdk-dev] [PATCH v3 15/36] net/i40e/base: add reading LPI counters

[Xiaolong Ye]

This change introduces new function i40e_get_lpi_counters() reading
Low Power Idle (LPI) mode counters from Energy Efficient Ethernet (EEE)
statistics. Since reading EEE statistics requires running DNL script,
function i40e_aq_run_phy_activity() able to run it, was implemented.

i40e_lpi_stat_update() was introduced as helper function for retrieving
LPI counters' values relative to given offsets.

This change also fixes order of fields in struct
i40e_aqc_run_phy_activity and introduces union in the struct
providing more descriptive names of fields depending on usage
(command or response).

Signed-off-by: Piotr Pietruszewski 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_adminq_cmd.h |  29 --
 drivers/net/i40e/base/i40e_common.c | 130 
 drivers/net/i40e/base/i40e_prototype.h  |  10 ++
 3 files changed, 163 insertions(+), 6 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_adminq_cmd.h 
b/drivers/net/i40e/base/i40e_adminq_cmd.h
index 2bd8f81f9..d718c7326 100644
--- a/drivers/net/i40e/base/i40e_adminq_cmd.h
+++ b/drivers/net/i40e/base/i40e_adminq_cmd.h
@@ -2272,15 +2272,32 @@ enum i40e_aq_phy_reg_type {
I40E_AQC_PHY_REG_EXERNAL_MODULE = 0x3
 };
 
+#pragma pack(1)
 /* Run PHY Activity (0x0626) */
 struct i40e_aqc_run_phy_activity {
-   __le16  activity_id;
-   u8  flags;
-   u8  reserved1;
-   __le32  control;
-   __le32  data;
-   u8  reserved2[4];
+   u8  cmd_flags;
+   __le16  activity_id;
+#define I40E_AQ_RUN_PHY_ACT_ID_USR_DFND0x10
+   u8  reserved;
+   union {
+   struct {
+   __le32  dnl_opcode;
+#define I40E_AQ_RUN_PHY_ACT_DNL_OPCODE_GET_EEE_STAT_DUR0x801a
+#define I40E_AQ_RUN_PHY_ACT_DNL_OPCODE_GET_EEE_STAT0x801b
+#define I40E_AQ_RUN_PHY_ACT_DNL_OPCODE_GET_EEE_DUR 0x1801b
+   __le32  data;
+   u8  reserved2[4];
+   } cmd;
+   struct {
+   __le32  cmd_status;
+#define I40E_AQ_RUN_PHY_ACT_CMD_STAT_SUCC  0x4
+#define I40E_AQ_RUN_PHY_ACT_CMD_STAT_MASK  0x
+   __le32  data0;
+   __le32  data1;
+   } resp;
+   } params;
 };
+#pragma pack()
 
 I40E_CHECK_CMD_LENGTH(i40e_aqc_run_phy_activity);
 
diff --git a/drivers/net/i40e/base/i40e_common.c 
b/drivers/net/i40e/base/i40e_common.c
index e0028ac4d..9d76b6824 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -7027,6 +7027,91 @@ enum i40e_status_code i40e_get_phy_lpi_status(struct 
i40e_hw *hw,
return ret;
 }
 
+/**
+ * i40e_get_lpi_counters - read LPI counters from EEE statistics
+ * @hw: pointer to the hw struct
+ * @tx_counter: pointer to memory for TX LPI counter
+ * @rx_counter: pointer to memory for RX LPI counter
+ * @is_clear:   returns true if counters are clear after read
+ *
+ * Read Low Power Idle (LPI) mode counters from Energy Efficient
+ * Ethernet (EEE) statistics.
+ **/
+enum i40e_status_code i40e_get_lpi_counters(struct i40e_hw *hw,
+   u32 *tx_counter, u32 *rx_counter,
+   bool *is_clear)
+{
+   /* only X710-T*L requires special handling of counters
+* for other devices we just read the MAC registers
+*/
+   if (hw->device_id == I40E_DEV_ID_10G_BASE_T_BC &&
+   hw->phy.link_info.link_speed != I40E_LINK_SPEED_1GB) {
+   enum i40e_status_code retval;
+   u32 cmd_status = 0;
+
+   *is_clear = false;
+   retval = i40e_aq_run_phy_activity(hw,
+   I40E_AQ_RUN_PHY_ACT_ID_USR_DFND,
+   I40E_AQ_RUN_PHY_ACT_DNL_OPCODE_GET_EEE_STAT,
+   &cmd_status, tx_counter, rx_counter, NULL);
+
+   if (cmd_status != I40E_AQ_RUN_PHY_ACT_CMD_STAT_SUCC)
+   retval = I40E_ERR_ADMIN_QUEUE_ERROR;
+
+   return retval;
+   }
+
+   *is_clear = true;
+   *tx_counter = rd32(hw, I40E_PRTPM_TLPIC);
+   *rx_counter = rd32(hw, I40E_PRTPM_RLPIC);
+
+   return I40E_SUCCESS;
+}
+
+/**
+ * i40e_lpi_stat_update - update LPI counters with values relative to offset
+ * @hw: pointer to the hw struct
+ * @offset_loaded: flag indicating need of writing current value to offset
+ * @tx_offset: pointer to offset of TX LPI counter
+ * @tx_stat: pointer to value of TX LPI counter
+ * @rx_offset: pointer to offset of RX LPI counter
+ * @rx_stat: pointer to value of RX LPI counter
+ *
+ * Update Low Power Idle (LPI) mode counters while having regard to passed
+ * offsets.
+ **/
+enum i40e_status_code i40e_lpi_stat_update(struct i40e_hw *hw,
+  bool offset_loaded, u64 *tx_offset,
+  u64 *tx_stat, u64 *rx_offset,

[dpdk-dev] [PATCH v3 13/36] net/i40e/base: read LPI status from external PHY

[Xiaolong Ye]

When external PHY is used, MAC register may not reflect actual
state of LPI. Add function reading it directly from PHY or MAC,
depending on what is supported by the device.

Signed-off-by: Krzysztof Galazka 
Signed-off-by: Piotr Pietruszewski 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_common.c| 45 ++
 drivers/net/i40e/base/i40e_prototype.h |  2 ++
 drivers/net/i40e/base/i40e_type.h  |  6 
 3 files changed, 53 insertions(+)

diff --git a/drivers/net/i40e/base/i40e_common.c 
b/drivers/net/i40e/base/i40e_common.c
index c2e7cf7d5..f256651d7 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -6982,6 +6982,51 @@ enum i40e_status_code i40e_led_set_phy(struct i40e_hw 
*hw, bool on,
return status;
 }
 #endif /* PF_DRIVER */
+/**
+ * i40e_get_phy_lpi_status - read LPI status from PHY or MAC register
+ * @hw: pointer to the hw struct
+ * @stat: pointer to structure with status of rx and tx lpi
+ *
+ * Read LPI state directly from external PHY register or from MAC
+ * register, depending on device ID and current link speed.
+ */
+enum i40e_status_code i40e_get_phy_lpi_status(struct i40e_hw *hw,
+ struct i40e_hw_port_stats *stat)
+{
+   enum i40e_status_code ret = I40E_SUCCESS;
+   u32 val;
+
+   stat->rx_lpi_status = 0;
+   stat->tx_lpi_status = 0;
+
+   if (hw->device_id == I40E_DEV_ID_10G_BASE_T_BC &&
+   (hw->phy.link_info.link_speed == I40E_LINK_SPEED_2_5GB ||
+hw->phy.link_info.link_speed == I40E_LINK_SPEED_5GB)) {
+   ret = i40e_aq_get_phy_register(hw,
+  I40E_AQ_PHY_REG_ACCESS_EXTERNAL,
+  I40E_BCM_PHY_PCS_STATUS1_PAGE,
+  true,
+  I40E_BCM_PHY_PCS_STATUS1_REG,
+  &val, NULL);
+
+   if (ret != I40E_SUCCESS)
+   return ret;
+
+   stat->rx_lpi_status = !!(val & I40E_BCM_PHY_PCS_STATUS1_RX_LPI);
+   stat->tx_lpi_status = !!(val & I40E_BCM_PHY_PCS_STATUS1_TX_LPI);
+
+   return ret;
+   }
+
+   val = rd32(hw, I40E_PRTPM_EEE_STAT);
+   stat->rx_lpi_status = (val & I40E_PRTPM_EEE_STAT_RX_LPI_STATUS_MASK) >>
+  I40E_PRTPM_EEE_STAT_RX_LPI_STATUS_SHIFT;
+   stat->tx_lpi_status = (val & I40E_PRTPM_EEE_STAT_TX_LPI_STATUS_MASK) >>
+  I40E_PRTPM_EEE_STAT_TX_LPI_STATUS_SHIFT;
+
+   return ret;
+}
+
 
 /**
  * i40e_aq_rx_ctl_read_register - use FW to read from an Rx control register
diff --git a/drivers/net/i40e/base/i40e_prototype.h 
b/drivers/net/i40e/base/i40e_prototype.h
index 38beb270b..c6c45eb5a 100644
--- a/drivers/net/i40e/base/i40e_prototype.h
+++ b/drivers/net/i40e/base/i40e_prototype.h
@@ -74,6 +74,8 @@ enum i40e_status_code i40e_led_get_phy(struct i40e_hw *hw, 
u16 *led_addr,
 enum i40e_status_code i40e_blink_phy_link_led(struct i40e_hw *hw,
  u32 time, u32 interval);
 
+enum i40e_status_code i40e_get_phy_lpi_status(struct i40e_hw *hw,
+ struct i40e_hw_port_stats *stats);
 /* admin send queue commands */
 
 enum i40e_status_code i40e_aq_get_firmware_version(struct i40e_hw *hw,
diff --git a/drivers/net/i40e/base/i40e_type.h 
b/drivers/net/i40e/base/i40e_type.h
index 322300fa3..8d257e00a 100644
--- a/drivers/net/i40e/base/i40e_type.h
+++ b/drivers/net/i40e/base/i40e_type.h
@@ -2038,4 +2038,10 @@ struct i40e_profile_info {
u8 reserved[7];
u8 name[I40E_DDP_NAME_SIZE];
 };
+
+#define I40E_BCM_PHY_PCS_STATUS1_PAGE  0x3
+#define I40E_BCM_PHY_PCS_STATUS1_REG   0x0001
+#define I40E_BCM_PHY_PCS_STATUS1_RX_LPIBIT(8)
+#define I40E_BCM_PHY_PCS_STATUS1_TX_LPIBIT(9)
+
 #endif /* _I40E_TYPE_H_ */
-- 
2.17.1

[dpdk-dev] [PATCH v3 14/36] net/i40e/base: change for missing "link modes"

[Xiaolong Ye]

Fix for missing "Supported link modes" and "Advertised link modes"
info in ethtool after changed speed on X722 devices with BASE-T PHY
with FW API version >= 1.7.
The same FW API version on X710 and X722 does not mean the same
feature set so the change was needed as mac type of the device
should also be checked instead of FW API version only.

Signed-off-by: Martyna Szapar 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_common.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_common.c 
b/drivers/net/i40e/base/i40e_common.c
index f256651d7..e0028ac4d 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -2043,8 +2043,8 @@ enum i40e_status_code i40e_aq_get_link_info(struct 
i40e_hw *hw,
 hw->aq.fw_min_ver < 40)) && hw_link_info->phy_type == 0xE)
hw_link_info->phy_type = I40E_PHY_TYPE_10GBASE_SFPP_CU;
 
-   if (hw->aq.api_maj_ver == I40E_FW_API_VERSION_MAJOR &&
-   hw->aq.api_min_ver >= 7) {
+   if (hw->flags & I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE &&
+   hw->mac.type != I40E_MAC_X722) {
__le32 tmp;
 
i40e_memcpy(&tmp, resp->link_type, sizeof(tmp),
-- 
2.17.1

[dpdk-dev] [PATCH v3 10/36] net/i40e/base: improve AQ log granularity

[Xiaolong Ye]

This patch makes it possible to log only AQ descriptors, without the
entire AQ message buffers being dumped too. It should greatly reduce
kernel log size in cases where a full AQ dump is not needed.
Selection is made by setting flags in hw->debug_mask.

Additionally, some debug messages that preceded an AQ dump have been
moved to I40E_DEBUG_AQ_COMMAND class, which seems more appropriate.

Signed-off-by: Doug Dziggel 
Signed-off-by: Robert Konklewski 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_adminq.c |  8 
 drivers/net/i40e/base/i40e_common.c | 19 ---
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_adminq.c 
b/drivers/net/i40e/base/i40e_adminq.c
index b8c6e30f5..52bea842f 100644
--- a/drivers/net/i40e/base/i40e_adminq.c
+++ b/drivers/net/i40e/base/i40e_adminq.c
@@ -715,7 +715,7 @@ u16 i40e_clean_asq(struct i40e_hw *hw)
desc = I40E_ADMINQ_DESC(*asq, ntc);
details = I40E_ADMINQ_DETAILS(*asq, ntc);
while (rd32(hw, hw->aq.asq.head) != ntc) {
-   i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE,
+   i40e_debug(hw, I40E_DEBUG_AQ_COMMAND,
   "ntc %d head %d.\n", ntc, rd32(hw, hw->aq.asq.head));
 
if (details->callback) {
@@ -887,7 +887,7 @@ enum i40e_status_code i40e_asq_send_command(struct i40e_hw 
*hw,
}
 
/* bump the tail */
-   i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE, "AQTX: desc and buffer:\n");
+   i40e_debug(hw, I40E_DEBUG_AQ_COMMAND, "AQTX: desc and buffer:\n");
i40e_debug_aq(hw, I40E_DEBUG_AQ_COMMAND, (void *)desc_on_ring,
  buff, buff_size);
(hw->aq.asq.next_to_use)++;
@@ -940,7 +940,7 @@ enum i40e_status_code i40e_asq_send_command(struct i40e_hw 
*hw,
hw->aq.asq_last_status = (enum i40e_admin_queue_err)retval;
}
 
-   i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE,
+   i40e_debug(hw, I40E_DEBUG_AQ_COMMAND,
   "AQTX: desc and buffer writeback:\n");
i40e_debug_aq(hw, I40E_DEBUG_AQ_COMMAND, (void *)desc, buff, buff_size);
 
@@ -1069,7 +1069,7 @@ enum i40e_status_code i40e_clean_arq_element(struct 
i40e_hw *hw,
hw->aq.arq.r.arq_bi[desc_idx].va,
e->msg_len, I40E_DMA_TO_NONDMA);
 
-   i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE, "AQRX: desc and buffer:\n");
+   i40e_debug(hw, I40E_DEBUG_AQ_COMMAND, "AQRX: desc and buffer:\n");
i40e_debug_aq(hw, I40E_DEBUG_AQ_COMMAND, (void *)desc, e->msg_buf,
  hw->aq.arq_buf_size);
 
diff --git a/drivers/net/i40e/base/i40e_common.c 
b/drivers/net/i40e/base/i40e_common.c
index 73d0c29fd..4384a0795 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -307,32 +307,37 @@ void i40e_debug_aq(struct i40e_hw *hw, enum 
i40e_debug_mask mask, void *desc,
   void *buffer, u16 buf_len)
 {
struct i40e_aq_desc *aq_desc = (struct i40e_aq_desc *)desc;
+   u32 effective_mask = hw->debug_mask & mask;
u8 *buf = (u8 *)buffer;
u16 len;
-   u16 i = 0;
+   u16 i;
 
-   if ((!(mask & hw->debug_mask)) || (desc == NULL))
+   if (!effective_mask || !desc)
return;
 
len = LE16_TO_CPU(aq_desc->datalen);
 
-   i40e_debug(hw, mask,
+   i40e_debug(hw, mask & I40E_DEBUG_AQ_DESCRIPTOR,
   "AQ CMD: opcode 0x%04X, flags 0x%04X, datalen 0x%04X, retval 
0x%04X\n",
   LE16_TO_CPU(aq_desc->opcode),
   LE16_TO_CPU(aq_desc->flags),
   LE16_TO_CPU(aq_desc->datalen),
   LE16_TO_CPU(aq_desc->retval));
-   i40e_debug(hw, mask, "\tcookie (h,l) 0x%08X 0x%08X\n",
+   i40e_debug(hw, mask & I40E_DEBUG_AQ_DESCRIPTOR,
+  "\tcookie (h,l) 0x%08X 0x%08X\n",
   LE32_TO_CPU(aq_desc->cookie_high),
   LE32_TO_CPU(aq_desc->cookie_low));
-   i40e_debug(hw, mask, "\tparam (0,1)  0x%08X 0x%08X\n",
+   i40e_debug(hw, mask & I40E_DEBUG_AQ_DESCRIPTOR,
+  "\tparam (0,1)  0x%08X 0x%08X\n",
   LE32_TO_CPU(aq_desc->params.internal.param0),
   LE32_TO_CPU(aq_desc->params.internal.param1));
-   i40e_debug(hw, mask, "\taddr (h,l)   0x%08X 0x%08X\n",
+   i40e_debug(hw, mask & I40E_DEBUG_AQ_DESCRIPTOR,
+  "\taddr (h,l)   0x%08X 0x%08X\n",
   LE32_TO_CPU(aq_desc->params.external.addr_high),
   LE32_TO_CPU(aq_desc->params.external.addr_low));
 
-   if ((buffer != NULL) && (aq_desc->datalen != 0)) {
+   if (buffer && (buf_len != 0) && (len != 0) &&
+   (effective_mask & I40E_DEBUG_AQ_DESC_BUFFER)) {
i40e_debug(hw, mask, "AQ CMD Buffer:\n");
if (buf_len < len)
len = buf_len;
-- 
2.17.1

[dpdk-dev] [PATCH v3 16/36] net/i40e/base: backport style changes from upstream Linux

[Xiaolong Ye]

The upstream virtchnl.h has a few minor style differences to what is
out-of-tree, and there is no real reason we should prefer the current
style over whats upstream.

Signed-off-by: Jacob Keller 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/virtchnl.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/i40e/base/virtchnl.h b/drivers/net/i40e/base/virtchnl.h
index 88096cb45..a8d5eaf8a 100644
--- a/drivers/net/i40e/base/virtchnl.h
+++ b/drivers/net/i40e/base/virtchnl.h
@@ -123,13 +123,13 @@ enum virtchnl_ops {
 
 };
 
-/* This macro is used to generate a compilation error if a structure
+/* These macros are used to generate compilation errors if a structure/union
  * is not exactly the correct length. It gives a divide by zero error if the
  * structure is not of the correct size, otherwise it creates an enum that is
  * never used.
  */
 #define VIRTCHNL_CHECK_STRUCT_LEN(n, X) enum virtchnl_static_assert_enum_##X \
-   {virtchnl_static_assert_##X = (n) / ((sizeof(struct X) == (n)) ? 1 : 0)}
+   { virtchnl_static_assert_##X = (n)/((sizeof(struct X) == (n)) ? 1 : 0) }
 
 /* Virtual channel message descriptor. This overlays the admin queue
  * descriptor. All other data is passed in external buffers.
-- 
2.17.1

[dpdk-dev] [PATCH v3 11/36] net/i40e/base: add getter for FW LLDP agent status

[Xiaolong Ye]

This change introduces i40e_get_fw_lldp_status() function capable of
reporting status of FW Link Layer Discovery Protocol (LLDP) agent.

Since reading LLDP configuration from NVM only gives information what
is the default state of FW LLDP agent after POR, this change introduces
more reliable method for checking if agent is enabled.

Current state of FW LLDP agent may be different if user disabled the
agent, so i40e_get_fw_lldp_status() uses LLDP MIB checking to determine
status of the agent.

Signed-off-by: Piotr Pietruszewski 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_dcb.c | 43 
 drivers/net/i40e/base/i40e_dcb.h |  9 +++
 2 files changed, 52 insertions(+)

diff --git a/drivers/net/i40e/base/i40e_dcb.c b/drivers/net/i40e/base/i40e_dcb.c
index 7cc8c83dc..f1465daa3 100644
--- a/drivers/net/i40e/base/i40e_dcb.c
+++ b/drivers/net/i40e/base/i40e_dcb.c
@@ -914,6 +914,49 @@ enum i40e_status_code i40e_init_dcb(struct i40e_hw *hw, 
bool enable_mib_change)
return ret;
 }
 
+/**
+ * i40e_get_fw_lldp_status
+ * @hw: pointer to the hw struct
+ * @lldp_status: pointer to the status enum
+ *
+ * Get status of FW Link Layer Discovery Protocol (LLDP) Agent.
+ * Status of agent is reported via @lldp_status parameter.
+ **/
+enum i40e_status_code
+i40e_get_fw_lldp_status(struct i40e_hw *hw,
+   enum i40e_get_fw_lldp_status_resp *lldp_status)
+{
+   enum i40e_status_code ret;
+   struct i40e_virt_mem mem;
+   u8 *lldpmib;
+
+   if (!lldp_status)
+   return I40E_ERR_PARAM;
+
+   /* Allocate buffer for the LLDPDU */
+   ret = i40e_allocate_virt_mem(hw, &mem, I40E_LLDPDU_SIZE);
+   if (ret)
+   return ret;
+
+   lldpmib = (u8 *)mem.va;
+   ret = i40e_aq_get_lldp_mib(hw, 0, 0, (void *)lldpmib,
+  I40E_LLDPDU_SIZE, NULL, NULL, NULL);
+
+   if (ret == I40E_SUCCESS) {
+   *lldp_status = I40E_GET_FW_LLDP_STATUS_ENABLED;
+   } else if (hw->aq.asq_last_status == I40E_AQ_RC_ENOENT) {
+   /* MIB is not available yet but the agent is running */
+   *lldp_status = I40E_GET_FW_LLDP_STATUS_ENABLED;
+   ret = I40E_SUCCESS;
+   } else if (hw->aq.asq_last_status == I40E_AQ_RC_EPERM) {
+   *lldp_status = I40E_GET_FW_LLDP_STATUS_DISABLED;
+   ret = I40E_SUCCESS;
+   }
+
+   i40e_free_virt_mem(hw, &mem);
+   return ret;
+}
+
 /**
  * i40e_add_ieee_ets_tlv - Prepare ETS TLV in IEEE format
  * @tlv: Fill the ETS config data in IEEE format
diff --git a/drivers/net/i40e/base/i40e_dcb.h b/drivers/net/i40e/base/i40e_dcb.h
index 253943308..88fe405d7 100644
--- a/drivers/net/i40e/base/i40e_dcb.h
+++ b/drivers/net/i40e/base/i40e_dcb.h
@@ -178,6 +178,12 @@ struct i40e_dcbx_variables {
u32 deftsaassignment;
 };
 
+
+enum i40e_get_fw_lldp_status_resp {
+   I40E_GET_FW_LLDP_STATUS_DISABLED = 0,
+   I40E_GET_FW_LLDP_STATUS_ENABLED = 1
+};
+
 enum i40e_status_code i40e_get_dcbx_status(struct i40e_hw *hw,
   u16 *status);
 enum i40e_status_code i40e_lldp_to_dcb_config(u8 *lldpmib,
@@ -188,6 +194,9 @@ enum i40e_status_code i40e_aq_get_dcb_config(struct i40e_hw 
*hw, u8 mib_type,
 enum i40e_status_code i40e_get_dcb_config(struct i40e_hw *hw);
 enum i40e_status_code i40e_init_dcb(struct i40e_hw *hw,
bool enable_mib_change);
+enum i40e_status_code
+i40e_get_fw_lldp_status(struct i40e_hw *hw,
+   enum i40e_get_fw_lldp_status_resp *lldp_status);
 enum i40e_status_code i40e_set_dcb_config(struct i40e_hw *hw);
 enum i40e_status_code i40e_dcb_config_to_lldp(u8 *lldpmib, u16 *miblen,
  struct i40e_dcbx_config *dcbcfg);
-- 
2.17.1

[dpdk-dev] [PATCH v3 21/36] net/i40e/base: add FWS1B register masks

[Xiaolong Ye]

Function check_recovery_mode had wrong if statement. Now we check proper
FWS1B register values, which are responsible for the recovery mode.
Recovery mode has 6 values in total. That's why we need 6 different flags.
Now in if statement we recognize type of mac and register value. Without
those changes driver could show wrong state.

Signed-off-by: Adrian Podlawski 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_register.h | 12 
 1 file changed, 12 insertions(+)

diff --git a/drivers/net/i40e/base/i40e_register.h 
b/drivers/net/i40e/base/i40e_register.h
index e93ec3f58..6804aba51 100644
--- a/drivers/net/i40e/base/i40e_register.h
+++ b/drivers/net/i40e/base/i40e_register.h
@@ -366,6 +366,18 @@
 #define I40E_GL_FWSTS_FWRI_MASK   I40E_MASK(0x1, I40E_GL_FWSTS_FWRI_SHIFT)
 #define I40E_GL_FWSTS_FWS1B_SHIFT 16
 #define I40E_GL_FWSTS_FWS1B_MASK  I40E_MASK(0xFF, I40E_GL_FWSTS_FWS1B_SHIFT)
+#define I40E_XL710_GL_FWSTS_FWS1B_REC_MOD_CORER_MASK \
+   I40E_MASK(0x30, I40E_GL_FWSTS_FWS1B_SHIFT)
+#define I40E_XL710_GL_FWSTS_FWS1B_REC_MOD_GLOBR_MASK \
+   I40E_MASK(0x31, I40E_GL_FWSTS_FWS1B_SHIFT)
+#define I40E_XL710_GL_FWSTS_FWS1B_REC_MOD_TRANSITION_MASK \
+   I40E_MASK(0x32, I40E_GL_FWSTS_FWS1B_SHIFT)
+#define I40E_XL710_GL_FWSTS_FWS1B_REC_MOD_NVM_MASK \
+   I40E_MASK(0x33, I40E_GL_FWSTS_FWS1B_SHIFT)
+#define I40E_X722_GL_FWSTS_FWS1B_REC_MOD_CORER_MASK \
+   I40E_MASK(0xB, I40E_GL_FWSTS_FWS1B_SHIFT)
+#define I40E_X722_GL_FWSTS_FWS1B_REC_MOD_GLOBR_MASK \
+   I40E_MASK(0xC, I40E_GL_FWSTS_FWS1B_SHIFT)
 #define I40E_GLGEN_CLKSTAT0x000B8184 /* Reset: POR */
 #define I40E_GLGEN_CLKSTAT_CLKMODE_SHIFT  0
 #define I40E_GLGEN_CLKSTAT_CLKMODE_MASK   I40E_MASK(0x1, 
I40E_GLGEN_CLKSTAT_CLKMODE_SHIFT)
-- 
2.17.1

[dpdk-dev] [PATCH v3 23/36] net/i40e/base: add persistent lldp support

[Xiaolong Ye]

This patch adds a function to read nvm module data and uses it to
read current lldp agent configuration from nvm api version 1.8.

Signed-off-by: Wnuczko Sylwia 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_dcb.c   | 20 +++-
 drivers/net/i40e/base/i40e_dcb.h   |  5 ++
 drivers/net/i40e/base/i40e_nvm.c   | 71 ++
 drivers/net/i40e/base/i40e_prototype.h |  3 ++
 4 files changed, 98 insertions(+), 1 deletion(-)

diff --git a/drivers/net/i40e/base/i40e_dcb.c b/drivers/net/i40e/base/i40e_dcb.c
index f1465daa3..2ab5021ee 100644
--- a/drivers/net/i40e/base/i40e_dcb.c
+++ b/drivers/net/i40e/base/i40e_dcb.c
@@ -877,7 +877,25 @@ enum i40e_status_code i40e_init_dcb(struct i40e_hw *hw, 
bool enable_mib_change)
return I40E_NOT_SUPPORTED;
 
/* Read LLDP NVM area */
-   ret = i40e_read_lldp_cfg(hw, &lldp_cfg);
+   if (hw->flags & I40E_HW_FLAG_FW_LLDP_PERSISTENT) {
+   u8 offset = 0;
+
+   if (hw->mac.type == I40E_MAC_XL710)
+   offset = I40E_LLDP_CURRENT_STATUS_XL710_OFFSET;
+   else if (hw->mac.type == I40E_MAC_X722)
+   offset = I40E_LLDP_CURRENT_STATUS_X722_OFFSET;
+   else
+   return I40E_NOT_SUPPORTED;
+
+   ret = i40e_read_nvm_module_data(hw,
+   I40E_SR_EMP_SR_SETTINGS_PTR,
+   offset,
+   I40E_LLDP_CURRENT_STATUS_OFFSET,
+   I40E_LLDP_CURRENT_STATUS_SIZE,
+   &lldp_cfg.adminstatus);
+   } else {
+   ret = i40e_read_lldp_cfg(hw, &lldp_cfg);
+   }
if (ret)
return I40E_ERR_NOT_READY;
 
diff --git a/drivers/net/i40e/base/i40e_dcb.h b/drivers/net/i40e/base/i40e_dcb.h
index 88fe405d7..520c7db73 100644
--- a/drivers/net/i40e/base/i40e_dcb.h
+++ b/drivers/net/i40e/base/i40e_dcb.h
@@ -39,6 +39,11 @@
 #define I40E_LLDP_ADMINSTATUS_ENABLED_TX   2
 #define I40E_LLDP_ADMINSTATUS_ENABLED_RXTX 3
 
+#define I40E_LLDP_CURRENT_STATUS_XL710_OFFSET  0x2B
+#define I40E_LLDP_CURRENT_STATUS_X722_OFFSET   0x31
+#define I40E_LLDP_CURRENT_STATUS_OFFSET1
+#define I40E_LLDP_CURRENT_STATUS_SIZE  1
+
 /* Defines for LLDP TLV header */
 #define I40E_LLDP_MIB_HLEN 14
 #define I40E_LLDP_TLV_LEN_SHIFT0
diff --git a/drivers/net/i40e/base/i40e_nvm.c b/drivers/net/i40e/base/i40e_nvm.c
index c8b401cdd..fc24cc2ce 100644
--- a/drivers/net/i40e/base/i40e_nvm.c
+++ b/drivers/net/i40e/base/i40e_nvm.c
@@ -337,6 +337,77 @@ enum i40e_status_code i40e_read_nvm_word(struct i40e_hw 
*hw, u16 offset,
return ret_code;
 }
 
+/**
+ * i40e_read_nvm_module_data - Reads NVM Buffer to specified memory location
+ * @hw: Pointer to the HW structure
+ * @module_ptr: Pointer to module in words with respect to NVM beginning
+ * @module_offset: Offset in words from module start
+ * @data_offset: Offset in words from reading data area start
+ * @words_data_size: Words to read from NVM
+ * @data_ptr: Pointer to memory location where resulting buffer will be stored
+ **/
+enum i40e_status_code
+i40e_read_nvm_module_data(struct i40e_hw *hw, u8 module_ptr, u16 module_offset,
+ u16 data_offset, u16 words_data_size, u16 *data_ptr)
+{
+   enum i40e_status_code status;
+   u16 specific_ptr = 0;
+   u16 ptr_value = 0;
+   u16 offset = 0;
+
+   if (module_ptr != 0) {
+   status = i40e_read_nvm_word(hw, module_ptr, &ptr_value);
+   if (status != I40E_SUCCESS) {
+   i40e_debug(hw, I40E_DEBUG_ALL,
+  "Reading nvm word failed.Error code: %d.\n",
+  status);
+   return I40E_ERR_NVM;
+   }
+   }
+#define I40E_NVM_INVALID_PTR_VAL 0x7FFF
+#define I40E_NVM_INVALID_VAL 0x
+
+   /* Pointer not initialized */
+   if (ptr_value == I40E_NVM_INVALID_PTR_VAL ||
+   ptr_value == I40E_NVM_INVALID_VAL) {
+   i40e_debug(hw, I40E_DEBUG_ALL, "Pointer not initialized.\n");
+   return I40E_ERR_BAD_PTR;
+   }
+
+   /* Check whether the module is in SR mapped area or outside */
+   if (ptr_value & I40E_PTR_TYPE) {
+   /* Pointer points outside of the Shared RAM mapped area */
+   i40e_debug(hw, I40E_DEBUG_ALL,
+  "Reading nvm data failed. Pointer points outside of 
the Shared RAM mapped area.\n");
+
+   return I40E_ERR_PARAM;
+   } else {
+   /* Read from the Shadow RAM */
+
+   status = i40e_read_nvm_word(hw, ptr_value + module_offset,
+   &specific_ptr);
+   if (status != I40E_SUCCESS) {
+

[dpdk-dev] [PATCH v3 20/36] net/i40e/base: add drop mode parameter to set MAC config

[Xiaolong Ye]

This patch adds "drop mode" parameter to set mac config AQ command.
This bit controls the behavior when a no-drop packet is blocking a TC
queue.
0 – The PF driver is notified.
1 – The blocking packet is dropped and then the PF driver is notified.

Signed-off-by: Wnuczko Sylwia 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_adminq.c |  4 +++-
 drivers/net/i40e/base/i40e_adminq_cmd.h | 29 +
 drivers/net/i40e/base/i40e_common.c | 11 ++
 drivers/net/i40e/base/i40e_prototype.h  |  1 +
 drivers/net/i40e/base/i40e_type.h   |  1 +
 drivers/net/i40e/i40e_ethdev.c  |  2 +-
 6 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_adminq.c 
b/drivers/net/i40e/base/i40e_adminq.c
index 96e170e12..0676f9a25 100644
--- a/drivers/net/i40e/base/i40e_adminq.c
+++ b/drivers/net/i40e/base/i40e_adminq.c
@@ -611,8 +611,10 @@ STATIC void i40e_set_hw_flags(struct i40e_hw *hw)
 
if (aq->api_maj_ver > 1 ||
(aq->api_maj_ver == 1 &&
-aq->api_min_ver >= 8))
+aq->api_min_ver >= 8)) {
hw->flags |= I40E_HW_FLAG_FW_LLDP_PERSISTENT;
+   hw->flags |= I40E_HW_FLAG_DROP_MODE;
+   }
 
if (aq->api_maj_ver > 1 ||
(aq->api_maj_ver == 1 &&
diff --git a/drivers/net/i40e/base/i40e_adminq_cmd.h 
b/drivers/net/i40e/base/i40e_adminq_cmd.h
index 7181e0f58..f6c9d3e1a 100644
--- a/drivers/net/i40e/base/i40e_adminq_cmd.h
+++ b/drivers/net/i40e/base/i40e_adminq_cmd.h
@@ -2098,20 +2098,21 @@ I40E_CHECK_CMD_LENGTH(i40e_aq_set_phy_config);
 struct i40e_aq_set_mac_config {
__le16  max_frame_size;
u8  params;
-#define I40E_AQ_SET_MAC_CONFIG_CRC_EN  0x04
-#define I40E_AQ_SET_MAC_CONFIG_PACING_MASK 0x78
-#define I40E_AQ_SET_MAC_CONFIG_PACING_SHIFT3
-#define I40E_AQ_SET_MAC_CONFIG_PACING_NONE 0x0
-#define I40E_AQ_SET_MAC_CONFIG_PACING_1B_13TX  0xF
-#define I40E_AQ_SET_MAC_CONFIG_PACING_1DW_9TX  0x9
-#define I40E_AQ_SET_MAC_CONFIG_PACING_1DW_4TX  0x8
-#define I40E_AQ_SET_MAC_CONFIG_PACING_3DW_7TX  0x7
-#define I40E_AQ_SET_MAC_CONFIG_PACING_2DW_3TX  0x6
-#define I40E_AQ_SET_MAC_CONFIG_PACING_1DW_1TX  0x5
-#define I40E_AQ_SET_MAC_CONFIG_PACING_3DW_2TX  0x4
-#define I40E_AQ_SET_MAC_CONFIG_PACING_7DW_3TX  0x3
-#define I40E_AQ_SET_MAC_CONFIG_PACING_4DW_1TX  0x2
-#define I40E_AQ_SET_MAC_CONFIG_PACING_9DW_1TX  0x1
+#define I40E_AQ_SET_MAC_CONFIG_CRC_EN  0x04
+#define I40E_AQ_SET_MAC_CONFIG_PACING_MASK 0x78
+#define I40E_AQ_SET_MAC_CONFIG_PACING_SHIFT3
+#define I40E_AQ_SET_MAC_CONFIG_PACING_NONE 0x0
+#define I40E_AQ_SET_MAC_CONFIG_PACING_1B_13TX  0xF
+#define I40E_AQ_SET_MAC_CONFIG_PACING_1DW_9TX  0x9
+#define I40E_AQ_SET_MAC_CONFIG_PACING_1DW_4TX  0x8
+#define I40E_AQ_SET_MAC_CONFIG_PACING_3DW_7TX  0x7
+#define I40E_AQ_SET_MAC_CONFIG_PACING_2DW_3TX  0x6
+#define I40E_AQ_SET_MAC_CONFIG_PACING_1DW_1TX  0x5
+#define I40E_AQ_SET_MAC_CONFIG_PACING_3DW_2TX  0x4
+#define I40E_AQ_SET_MAC_CONFIG_PACING_7DW_3TX  0x3
+#define I40E_AQ_SET_MAC_CONFIG_PACING_4DW_1TX  0x2
+#define I40E_AQ_SET_MAC_CONFIG_PACING_9DW_1TX  0x1
+#define I40E_AQ_SET_MAC_CONFIG_DROP_BLOCKING_PACKET_EN 0x80
u8  tx_timer_priority; /* bitmap */
__le16  tx_timer_value;
__le16  fc_refresh_threshold;
diff --git a/drivers/net/i40e/base/i40e_common.c 
b/drivers/net/i40e/base/i40e_common.c
index ee081d6ad..eddc91e36 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -1873,6 +1873,7 @@ enum i40e_status_code i40e_set_fc(struct i40e_hw *hw, u8 
*aq_failures,
  * @max_frame_size: Maximum Frame Size to be supported by the port
  * @crc_en: Tell HW to append a CRC to outgoing frames
  * @pacing: Pacing configurations
+ * @auto_drop_blocking_packets: Tell HW to drop packets if TC queue is blocked
  * @cmd_details: pointer to command details structure or NULL
  *
  * Configure MAC settings for frame size, jumbo frame support and the
@@ -1881,6 +1882,7 @@ enum i40e_status_code i40e_set_fc(struct i40e_hw *hw, u8 
*aq_failures,
 enum i40e_status_code i40e_aq_set_mac_config(struct i40e_hw *hw,
u16 max_frame_size,
bool crc_en, u16 pacing,
+   bool auto_drop_blocking_packets,
struct i40e_asq_cmd_details *cmd_details)
 {
struct i40e_aq_desc desc;
@@ -1899,6 +1901,15 @@ enum i40e_status_code i40e_aq_set_mac_config(struct 
i40e_hw *hw,
if (crc_en)
cmd->params |= I40E_AQ_SET_MAC_CONFIG_CRC_EN;
 
+   if (auto_drop_blocking_packets) {
+   if (hw->flags & I40E_HW_FLAG_DROP_MODE)
+   cmd->params |=
+   I40E_AQ_SET_MAC_CONFIG_DROP_BLOCKING_PACKET_EN;
+   else
+   

[dpdk-dev] [PATCH v3 17/36] net/i40e/base: update status codes

[Xiaolong Ye]

Add a few new status codes and rename a few to make them more consistent.
Error code are mapped to similar values as in i40e_status.h, so as to be
compatible with older VF drivers not using this status enum.

Signed-off-by: Mitch Williams 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/virtchnl.h | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/net/i40e/base/virtchnl.h b/drivers/net/i40e/base/virtchnl.h
index a8d5eaf8a..c677d0eb5 100644
--- a/drivers/net/i40e/base/virtchnl.h
+++ b/drivers/net/i40e/base/virtchnl.h
@@ -40,13 +40,19 @@
 /* Error Codes */
 enum virtchnl_status_code {
VIRTCHNL_STATUS_SUCCESS = 0,
-   VIRTCHNL_ERR_PARAM  = -5,
+   VIRTCHNL_STATUS_ERR_PARAM   = -5,
+   VIRTCHNL_STATUS_ERR_NO_MEMORY   = -18,
VIRTCHNL_STATUS_ERR_OPCODE_MISMATCH = -38,
VIRTCHNL_STATUS_ERR_CQP_COMPL_ERROR = -39,
VIRTCHNL_STATUS_ERR_INVALID_VF_ID   = -40,
-   VIRTCHNL_STATUS_NOT_SUPPORTED   = -64,
+   VIRTCHNL_STATUS_ERR_ADMIN_QUEUE_ERROR   = -53,
+   VIRTCHNL_STATUS_ERR_NOT_SUPPORTED   = -64,
 };
 
+/* Backward compatibility */
+#define VIRTCHNL_ERR_PARAM VIRTCHNL_STATUS_ERR_PARAM
+#define VIRTCHNL_STATUS_NOT_SUPPORTED VIRTCHNL_STATUS_ERR_NOT_SUPPORTED
+
 #define VIRTCHNL_LINK_SPEED_100MB_SHIFT0x1
 #define VIRTCHNL_LINK_SPEED_1000MB_SHIFT   0x2
 #define VIRTCHNL_LINK_SPEED_10GB_SHIFT 0x3
@@ -732,7 +738,7 @@ virtchnl_vc_validate_vf_msg(struct virtchnl_version_info 
*ver, u32 v_opcode,
case VIRTCHNL_OP_EVENT:
case VIRTCHNL_OP_UNKNOWN:
default:
-   return VIRTCHNL_ERR_PARAM;
+   return VIRTCHNL_STATUS_ERR_PARAM;
}
/* few more checks */
if (err_msg_format || valid_len != msglen)
-- 
2.17.1

[dpdk-dev] [PATCH v3 18/36] net/i40e/base: change of the incorrect Tx descriptors number

[Xiaolong Ye]

The existing driver allows setting the number of TX descriptors
to the value that is indivisible by 32. This is not properly
supported by x710 hardware. The patch limits the number of TX
descriptors to the whole value of 32.

Signed-off-by: Doug Dziggel 
Signed-off-by: Dariusz Chaberski 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_type.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_type.h 
b/drivers/net/i40e/base/i40e_type.h
index 8d257e00a..f0e4b667a 100644
--- a/drivers/net/i40e/base/i40e_type.h
+++ b/drivers/net/i40e/base/i40e_type.h
@@ -79,8 +79,8 @@ typedef void (*I40E_ADMINQ_CALLBACK)(struct i40e_hw *, struct 
i40e_aq_desc *);
 #define I40E_HI_BYTE(x)((u8)(((x) >> 8) & 0xFF))
 #define I40E_LO_BYTE(x)((u8)((x) & 0xFF))
 
-/* Number of Transmit Descriptors must be a multiple of 8. */
-#define I40E_REQ_TX_DESCRIPTOR_MULTIPLE8
+/* Number of Transmit Descriptors must be a multiple of 32. */
+#define I40E_REQ_TX_DESCRIPTOR_MULTIPLE32
 /* Number of Receive Descriptors must be a multiple of 32 if
  * the number of descriptors is greater than 32.
  */
-- 
2.17.1

[dpdk-dev] [PATCH v3 19/36] net/i40e/base: extend PHY access AQ command

[Xiaolong Ye]

Currently FW use MDIO I/F number corresponded with current PF for PHY
access. This code allow to specify used MDIO I/F number.

Signed-off-by: Piotr Azarewicz 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_adminq.c | 57 +++
 drivers/net/i40e/base/i40e_adminq_cmd.h |  6 ++-
 drivers/net/i40e/base/i40e_common.c | 62 -
 drivers/net/i40e/base/i40e_prototype.h  | 27 +++
 drivers/net/i40e/base/i40e_type.h   |  1 +
 5 files changed, 132 insertions(+), 21 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_adminq.c 
b/drivers/net/i40e/base/i40e_adminq.c
index 52bea842f..96e170e12 100644
--- a/drivers/net/i40e/base/i40e_adminq.c
+++ b/drivers/net/i40e/base/i40e_adminq.c
@@ -569,6 +569,57 @@ STATIC void i40e_resume_aq(struct i40e_hw *hw)
 }
 #endif /* PF_DRIVER */
 
+/**
+ *  i40e_set_hw_flags - set HW flags
+ *  @hw: pointer to the hardware structure
+ **/
+STATIC void i40e_set_hw_flags(struct i40e_hw *hw)
+{
+   struct i40e_adminq_info *aq = &hw->aq;
+
+   hw->flags = 0;
+
+   switch (hw->mac.type) {
+   case I40E_MAC_XL710:
+   if (aq->api_maj_ver > 1 ||
+   (aq->api_maj_ver == 1 &&
+aq->api_min_ver >= I40E_MINOR_VER_GET_LINK_INFO_XL710)) {
+   hw->flags |= I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE;
+   hw->flags |= I40E_HW_FLAG_FW_LLDP_STOPPABLE;
+   /* The ability to RX (not drop) 802.1ad frames */
+   hw->flags |= I40E_HW_FLAG_802_1AD_CAPABLE;
+   }
+   break;
+   case I40E_MAC_X722:
+   hw->flags |= I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE |
+I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK;
+
+   if (aq->api_maj_ver > 1 ||
+   (aq->api_maj_ver == 1 &&
+aq->api_min_ver >= I40E_MINOR_VER_FW_LLDP_STOPPABLE_X722))
+   hw->flags |= I40E_HW_FLAG_FW_LLDP_STOPPABLE;
+   /* fall through */
+   default:
+   break;
+   }
+
+   /* Newer versions of firmware require lock when reading the NVM */
+   if (aq->api_maj_ver > 1 ||
+   (aq->api_maj_ver == 1 &&
+aq->api_min_ver >= 5))
+   hw->flags |= I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK;
+
+   if (aq->api_maj_ver > 1 ||
+   (aq->api_maj_ver == 1 &&
+aq->api_min_ver >= 8))
+   hw->flags |= I40E_HW_FLAG_FW_LLDP_PERSISTENT;
+
+   if (aq->api_maj_ver > 1 ||
+   (aq->api_maj_ver == 1 &&
+aq->api_min_ver >= 9))
+   hw->flags |= I40E_HW_FLAG_AQ_PHY_ACCESS_EXTENDED;
+}
+
 /**
  *  i40e_init_adminq - main initialization routine for Admin Queue
  *  @hw: pointer to the hardware structure
@@ -636,6 +687,12 @@ enum i40e_status_code i40e_init_adminq(struct i40e_hw *hw)
if (ret_code != I40E_SUCCESS)
goto init_adminq_free_arq;
 
+   /*
+* Some features were introduced in different FW API version
+* for different MAC type.
+*/
+   i40e_set_hw_flags(hw);
+
/* get the NVM version info */
i40e_read_nvm_word(hw, I40E_SR_NVM_DEV_STARTER_VERSION,
   &hw->nvm.version);
diff --git a/drivers/net/i40e/base/i40e_adminq_cmd.h 
b/drivers/net/i40e/base/i40e_adminq_cmd.h
index d718c7326..7181e0f58 100644
--- a/drivers/net/i40e/base/i40e_adminq_cmd.h
+++ b/drivers/net/i40e/base/i40e_adminq_cmd.h
@@ -2310,7 +2310,11 @@ struct i40e_aqc_phy_register_access {
 #define I40E_AQ_PHY_REG_ACCESS_EXTERNAL_MODULE 2
u8  dev_addres;
u8  cmd_flags;
-#define I40E_AQ_PHY_REG_ACCESS_DONT_CHANGE_QSFP_PAGE   1
+#define I40E_AQ_PHY_REG_ACCESS_DONT_CHANGE_QSFP_PAGE   0x01
+#define I40E_AQ_PHY_REG_ACCESS_SET_MDIO_IF_NUMBER  0x02
+#define I40E_AQ_PHY_REG_ACCESS_MDIO_IF_NUMBER_SHIFT2
+#define I40E_AQ_PHY_REG_ACCESS_MDIO_IF_NUMBER_MASK (0x3 << \
+   I40E_AQ_PHY_REG_ACCESS_MDIO_IF_NUMBER_SHIFT)
u8  reserved1;
__le32  reg_address;
__le32  reg_value;
diff --git a/drivers/net/i40e/base/i40e_common.c 
b/drivers/net/i40e/base/i40e_common.c
index 9d76b6824..ee081d6ad 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -7239,23 +7239,52 @@ void i40e_write_rx_ctl(struct i40e_hw *hw, u32 
reg_addr, u32 reg_val)
wr32(hw, reg_addr, reg_val);
 }
 
-#ifdef PF_DRIVER
 /**
- * i40e_aq_set_phy_register
+ * i40e_mdio_if_number_selection - MDIO I/F number selection
+ * @hw: pointer to the hw struct
+ * @set_mdio: use MDIO I/F number specified by mdio_num
+ * @mdio_num: MDIO I/F number
+ * @cmd: pointer to PHY Register command structure
+ **/
+static void
+i40e_mdio_if_number_selection(struct i40e_hw *hw, bool set_mdio, u8 mdio_num,
+ struct i40e_aqc_phy_register_access *cmd)
+{
+   if (set_mdio && cmd->phy_interface == I40E_AQ

[dpdk-dev] [PATCH v3 22/36] net/i40e/base: update FW API version

[Xiaolong Ye]

Update FW API version to 1.9.

Signed-off-by: Piotr Azarewicz 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_adminq_cmd.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_adminq_cmd.h 
b/drivers/net/i40e/base/i40e_adminq_cmd.h
index f6c9d3e1a..0443c6361 100644
--- a/drivers/net/i40e/base/i40e_adminq_cmd.h
+++ b/drivers/net/i40e/base/i40e_adminq_cmd.h
@@ -12,8 +12,8 @@
  */
 
 #define I40E_FW_API_VERSION_MAJOR  0x0001
-#define I40E_FW_API_VERSION_MINOR_X722 0x0006
-#define I40E_FW_API_VERSION_MINOR_X710 0x0007
+#define I40E_FW_API_VERSION_MINOR_X722 0x0009
+#define I40E_FW_API_VERSION_MINOR_X710 0x0009
 
 #define I40E_FW_MINOR_VERSION(_h) ((_h)->mac.type == I40E_MAC_XL710 ? \
I40E_FW_API_VERSION_MINOR_X710 : \
-- 
2.17.1

[dpdk-dev] [PATCH v3 24/36] net/i40e/base: make i40e_set_mac_type() public

[Xiaolong Ye]

Make i40e_set_mac_type() public. i40e driver requires i40e_set_mac_type()
to be public. It is required for recovery mode handling. Without this patch
recovery mode could not be detected at probe() function.

Signed-off-by: Piotr Kwapulinski 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_common.c| 4 
 drivers/net/i40e/base/i40e_prototype.h | 2 --
 2 files changed, 6 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_common.c 
b/drivers/net/i40e/base/i40e_common.c
index eddc91e36..4f87ec9fa 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -14,11 +14,7 @@
  * This function sets the mac type of the adapter based on the
  * vendor ID and device ID stored in the hw structure.
  **/
-#if defined(INTEGRATED_VF) || defined(VF_DRIVER)
 enum i40e_status_code i40e_set_mac_type(struct i40e_hw *hw)
-#else
-STATIC enum i40e_status_code i40e_set_mac_type(struct i40e_hw *hw)
-#endif
 {
enum i40e_status_code status = I40E_SUCCESS;
 
diff --git a/drivers/net/i40e/base/i40e_prototype.h 
b/drivers/net/i40e/base/i40e_prototype.h
index afebf441d..2b6198985 100644
--- a/drivers/net/i40e/base/i40e_prototype.h
+++ b/drivers/net/i40e/base/i40e_prototype.h
@@ -472,10 +472,8 @@ void i40e_set_pci_config_data(struct i40e_hw *hw, u16 
link_status);
 #endif /* PF_DRIVER */
 enum i40e_status_code i40e_enable_eee(struct i40e_hw *hw, bool enable);
 
-#if defined(I40E_QV) || defined(VF_DRIVER)
 enum i40e_status_code i40e_set_mac_type(struct i40e_hw *hw);
 
-#endif
 extern struct i40e_rx_ptype_decoded i40e_ptype_lookup[];
 
 STATIC INLINE struct i40e_rx_ptype_decoded decode_rx_desc_ptype(u8 ptype)
-- 
2.17.1

[dpdk-dev] [PATCH v3 29/36] net/i40e/base: removed unreachable code

[Xiaolong Ye]

The result of the check is always FALSE and the code within "if"
is never executed.

Signed-off-by: Dzmitry Sautsa 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_common.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_common.c 
b/drivers/net/i40e/base/i40e_common.c
index 9ad0dd654..8144d957e 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -4869,8 +4869,6 @@ enum i40e_status_code i40e_aq_add_mcast_etag(struct 
i40e_hw *hw, u16 pv_seid,
cmd->num_unicast_etags = num_tags_in_buf;
 
desc.flags |= CPU_TO_LE16((u16)(I40E_AQ_FLAG_BUF | I40E_AQ_FLAG_RD));
-   if (length > I40E_AQ_LARGE_BUF)
-   desc.flags |= CPU_TO_LE16((u16)I40E_AQ_FLAG_LB);
 
status = i40e_asq_send_command(hw, &desc, buf, length, cmd_details);
 
-- 
2.17.1

[dpdk-dev] [PATCH v3 26/36] net/i40e/base: mark additional missing bits as reserved

[Xiaolong Ye]

Mark bits 0xD through 0xF for the command flags of a cloud filter as
reserved. These bits are not yet defined and are considered as reserved
in the data sheet.

Signed-off-by: Jacob Keller 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_adminq_cmd.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/i40e/base/i40e_adminq_cmd.h 
b/drivers/net/i40e/base/i40e_adminq_cmd.h
index 0443c6361..658875a0d 100644
--- a/drivers/net/i40e/base/i40e_adminq_cmd.h
+++ b/drivers/net/i40e/base/i40e_adminq_cmd.h
@@ -1402,6 +1402,9 @@ struct i40e_aqc_cloud_filters_element_data {
 #define I40E_AQC_ADD_CLOUD_FILTER_IMAC 0x000A
 #define I40E_AQC_ADD_CLOUD_FILTER_OMAC_TEN_ID_IMAC 0x000B
 #define I40E_AQC_ADD_CLOUD_FILTER_IIP  0x000C
+/* 0x000D reserved */
+/* 0x000E reserved */
+/* 0x000F reserved */
 /* 0x0010 to 0x0017 is for custom filters */
 #define I40E_AQC_ADD_CLOUD_FILTER_IP_PORT  0x0010 /* Dest IP + L4 
Port */
 #define I40E_AQC_ADD_CLOUD_FILTER_MAC_PORT 0x0011 /* Dest MAC + L4 
Port */
-- 
2.17.1

[dpdk-dev] [PATCH v3 27/36] net/i40e/base: change wrong 'Advertised FEC modes'

[Xiaolong Ye]

Fix display of FEC settings for ethtool.
This patch change variable 'phy.link_info.req_fec_info' sent to ethtool.
Without this patch wrong FEC settings can be shown.

Signed-off-by: Jaroslaw Gawin 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_common.c | 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_common.c 
b/drivers/net/i40e/base/i40e_common.c
index a37e70599..9ad0dd654 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -2911,9 +2911,16 @@ enum i40e_status_code i40e_update_link_info(struct 
i40e_hw *hw)
if (status)
return status;
 
-   hw->phy.link_info.req_fec_info =
-   abilities.fec_cfg_curr_mod_ext_info &
-   (I40E_AQ_REQUEST_FEC_KR | I40E_AQ_REQUEST_FEC_RS);
+   if (abilities.fec_cfg_curr_mod_ext_info &
+   I40E_AQ_ENABLE_FEC_AUTO)
+   hw->phy.link_info.req_fec_info =
+   (I40E_AQ_REQUEST_FEC_KR |
+I40E_AQ_REQUEST_FEC_RS);
+   else
+   hw->phy.link_info.req_fec_info =
+   abilities.fec_cfg_curr_mod_ext_info &
+   (I40E_AQ_REQUEST_FEC_KR |
+I40E_AQ_REQUEST_FEC_RS);
 
i40e_memcpy(hw->phy.link_info.module_type, 
&abilities.module_type,
sizeof(hw->phy.link_info.module_type), 
I40E_NONDMA_TO_NONDMA);
-- 
2.17.1

[dpdk-dev] [PATCH v3 28/36] net/i40e/base: add Flow Director defines

[Xiaolong Ye]

Add defines for creating Flow Director flows as defined in datasheet
section 7.1.5.4 for field vectors.

Signed-off-by: Doug Dziggel 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_register.h | 81 +++
 1 file changed, 81 insertions(+)

diff --git a/drivers/net/i40e/base/i40e_register.h 
b/drivers/net/i40e/base/i40e_register.h
index 6804aba51..3a8c0ccd1 100644
--- a/drivers/net/i40e/base/i40e_register.h
+++ b/drivers/net/i40e/base/i40e_register.h
@@ -5287,6 +5287,87 @@
 #define I40E_GLGEN_STAT_HALT_HALT_CELLS_SHIFT 0
 #define I40E_GLGEN_STAT_HALT_HALT_CELLS_MASK  I40E_MASK(0x3FFF, 
I40E_GLGEN_STAT_HALT_HALT_CELLS_SHIFT)
 #endif /* PF_DRIVER */
+/* Flow Director */
+#define I40E_REG_INSET_L2_DMAC_SHIFT60
+#define I40E_REG_INSET_L2_DMAC_MASK I40E_MASK(0xEULL, 
I40E_REG_INSET_L2_DMAC_SHIFT)
+#define I40E_REG_INSET_L2_SMAC_SHIFT56
+#define I40E_REG_INSET_L2_SMAC_MASK I40E_MASK(0x1CULL, 
I40E_REG_INSET_L2_SMAC_SHIFT)
+#define I40E_REG_INSET_L2_OUTER_VLAN_SHIFT  26
+#define I40E_REG_INSET_L2_OUTER_VLAN_MASK   I40E_MASK(0x1ULL, 
I40E_REG_INSET_L2_OUTER_VLAN_SHIFT)
+#define I40E_REG_INSET_L2_INNER_VLAN_SHIFT  55
+#define I40E_REG_INSET_L2_INNER_VLAN_MASK   I40E_MASK(0x1ULL, 
I40E_REG_INSET_L2_INNER_VLAN_SHIFT)
+#define I40E_REG_INSET_TUNNEL_VLAN_SHIFT56
+#define I40E_REG_INSET_TUNNEL_VLAN_MASK I40E_MASK(0x1ULL, 
I40E_REG_INSET_TUNNEL_VLAN_SHIFT)
+#define I40E_REG_INSET_L3_SRC_IP4_SHIFT 47
+#define I40E_REG_INSET_L3_SRC_IP4_MASK  I40E_MASK(0x3ULL, 
I40E_REG_INSET_L3_SRC_IP4_SHIFT)
+#define I40E_REG_INSET_L3_DST_IP4_SHIFT 35
+#define I40E_REG_INSET_L3_DST_IP4_MASK  I40E_MASK(0x3ULL, 
I40E_REG_INSET_L3_DST_IP4_SHIFT)
+#define I40E_X722_REG_INSET_L3_SRC_IP4_SHIFT49
+#define I40E_X722_REG_INSET_L3_SRC_IP4_MASK I40E_MASK(0x3ULL, 
I40E_X722_REG_INSET_L3_SRC_IP4_SHIFT)
+#define I40E_X722_REG_INSET_L3_DST_IP4_SHIFT41
+#define I40E_X722_REG_INSET_L3_DST_IP4_MASK I40E_MASK(0x3ULL, 
I40E_X722_REG_INSET_L3_DST_IP4_SHIFT)
+#define I40E_X722_REG_INSET_L3_IP4_PROTO_SHIFT  52
+#define I40E_X722_REG_INSET_L3_IP4_PROTO_MASK   I40E_MASK(0x1ULL, 
I40E_X722_REG_INSET_L3_IP4_PROTO_SHIFT)
+#define I40E_X722_REG_INSET_L3_IP4_TTL_SHIFT52
+#define I40E_X722_REG_INSET_L3_IP4_TTL_MASK I40E_MASK(0x1ULL, 
I40E_X722_REG_INSET_L3_IP4_TTL_SHIFT)
+#define I40E_REG_INSET_L3_IP4_TOS_SHIFT 54
+#define I40E_REG_INSET_L3_IP4_TOS_MASK  I40E_MASK(0x1ULL, 
I40E_REG_INSET_L3_IP4_TOS_SHIFT)
+#define I40E_REG_INSET_L3_IP4_PROTO_SHIFT   50
+#define I40E_REG_INSET_L3_IP4_PROTO_MASKI40E_MASK(0x1ULL, 
I40E_REG_INSET_L3_IP4_PROTO_SHIFT)
+#define I40E_REG_INSET_L3_IP4_TTL_SHIFT 50
+#define I40E_REG_INSET_L3_IP4_TTL_MASK  I40E_MASK(0x1ULL, 
I40E_REG_INSET_L3_IP4_TTL_SHIFT)
+#define I40E_REG_INSET_L3_SRC_IP6_SHIFT 43
+#define I40E_REG_INSET_L3_SRC_IP6_MASK  I40E_MASK(0xFFULL, 
I40E_REG_INSET_L3_SRC_IP6_SHIFT)
+#define I40E_REG_INSET_L3_DST_IP6_SHIFT 35
+#define I40E_REG_INSET_L3_DST_IP6_MASK  I40E_MASK(0xFFULL, 
I40E_REG_INSET_L3_DST_IP6_SHIFT)
+#define I40E_REG_INSET_L3_IP6_TC_SHIFT  54
+#define I40E_REG_INSET_L3_IP6_TC_MASK   I40E_MASK(0x1ULL, 
I40E_REG_INSET_L3_IP6_TC_SHIFT)
+#define I40E_REG_INSET_L3_IP6_NEXT_HDR_SHIFT51
+#define I40E_REG_INSET_L3_IP6_NEXT_HDR_MASK I40E_MASK(0x1ULL, 
I40E_REG_INSET_L3_IP6_NEXT_HDR_SHIFT)
+#define I40E_REG_INSET_L3_IP6_HOP_LIMIT_SHIFT   51
+#define I40E_REG_INSET_L3_IP6_HOP_LIMIT_MASKI40E_MASK(0x1ULL, 
I40E_REG_INSET_L3_IP6_HOP_LIMIT_SHIFT)
+#define I40E_REG_INSET_L4_SRC_PORT_SHIFT34
+#define I40E_REG_INSET_L4_SRC_PORT_MASK I40E_MASK(0x1ULL, 
I40E_REG_INSET_L4_SRC_PORT_SHIFT)
+#define I40E_REG_INSET_L4_DST_PORT_SHIFT33
+#define I40E_REG_INSET_L4_DST_PORT_MASK I40E_MASK(0x1ULL, 
I40E_REG_INSET_L4_DST_PORT_SHIFT)
+#define I40E_REG_INSET_L4_SCTP_VERIFICATION_TAG_SHIFT 31
+#define I40E_REG_INSET_L4_SCTP_VERIFICATION_TAG_MASK  I40E_MASK(0x3ULL, 
I40E_REG_INSET_L4_SCTP_VERIFICATION_TAG_SHIFT)
+#define I40E_REG_INSET_TUNNEL_L2_INNER_DST_MAC_SHIFT  22
+#define I40E_REG_INSET_TUNNEL_L2_INNER_DST_MAC_MASK   I40E_MASK(0x7ULL, 
I40E_REG_INSET_TUNNEL_L2_INNER_DST_MAC_SHIFT)
+#define I40E_REG_INSET_TUNNEL_L2_INNER_SRC_MAC_SHIFT  11
+#define I40E_REG_INSET_TUNNEL_L2_INNER_SRC_MAC_MASK   I40E_MASK(0x7ULL, 
I40E_REG_INSET_TUNNEL_L2_INNER_SRC_MAC_SHIFT)
+#define I40E_REG_INSET_TUNNEL_L4_UDP_DST_PORT_SHIFT   21
+#define I40E_REG_INSET_TUNNEL_L4_UDP_DST_PORT_MASKI40E_MASK(0x1ULL, 
I40E_REG_INSET_TUNNEL_L4_UDP_DST_PORT_SHIFT)
+#define I40E_REG_INSET_TUNNEL_ID_SHIFT  18
+#define I40E_REG_INSET_TUNNEL_ID_MASK   I40E_MASK(0x3ULL, 
I40E_REG_INSET_TUNNEL_ID_SHIFT)
+#define I40E_REG_INSET_LAST_ETHER_TYPE_SHIFT14
+#define I40E_REG_INSET_LAST_ETHER_TYPE_MASK I40E_MASK(0x1ULL, 
I40E_REG_INSET_LAST_ETHER_TYPE_SHIFT)
+#define I4

[dpdk-dev] [PATCH v3 30/36] net/i40e/base: set PHY Access flag on X722

[Xiaolong Ye]

The X722 FW API version 1.9 adds support for accessing PHY
registers with Admin Queue Command. This enables reading
EEPROM data from (Q)SFP+ transceivers, what was previously
possible only on X710 devices.

Signed-off-by: Adam Ludkiewicz 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_adminq.c | 5 +
 drivers/net/i40e/base/i40e_adminq_cmd.h | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/drivers/net/i40e/base/i40e_adminq.c 
b/drivers/net/i40e/base/i40e_adminq.c
index 0676f9a25..221c327d1 100644
--- a/drivers/net/i40e/base/i40e_adminq.c
+++ b/drivers/net/i40e/base/i40e_adminq.c
@@ -598,6 +598,11 @@ STATIC void i40e_set_hw_flags(struct i40e_hw *hw)
(aq->api_maj_ver == 1 &&
 aq->api_min_ver >= I40E_MINOR_VER_FW_LLDP_STOPPABLE_X722))
hw->flags |= I40E_HW_FLAG_FW_LLDP_STOPPABLE;
+
+   if (aq->api_maj_ver > 1 ||
+   (aq->api_maj_ver == 1 &&
+aq->api_min_ver >= I40E_MINOR_VER_GET_LINK_INFO_X722))
+   hw->flags |= I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE;
/* fall through */
default:
break;
diff --git a/drivers/net/i40e/base/i40e_adminq_cmd.h 
b/drivers/net/i40e/base/i40e_adminq_cmd.h
index 658875a0d..d99fbbe6a 100644
--- a/drivers/net/i40e/base/i40e_adminq_cmd.h
+++ b/drivers/net/i40e/base/i40e_adminq_cmd.h
@@ -21,6 +21,8 @@
 
 /* API version 1.7 implements additional link and PHY-specific APIs  */
 #define I40E_MINOR_VER_GET_LINK_INFO_XL710 0x0007
+/* API version 1.9 for X722 implements additional link and PHY-specific APIs */
+#define I40E_MINOR_VER_GET_LINK_INFO_X722 0x0009
 /* API version 1.6 for X722 devices adds ability to stop FW LLDP agent */
 #define I40E_MINOR_VER_FW_LLDP_STOPPABLE_X722 0x0006
 
-- 
2.17.1

[dpdk-dev] [PATCH v3 25/36] net/i40e/base: change retrying logic

[Xiaolong Ye]

Fixed a bug where driver was breaking out of the loop and
reporting an error without retrying first.

Signed-off-by: Marcin Formela 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_common.c | 17 ++---
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_common.c 
b/drivers/net/i40e/base/i40e_common.c
index 4f87ec9fa..a37e70599 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -1714,19 +1714,22 @@ enum i40e_status_code 
i40e_aq_get_phy_capabilities(struct i40e_hw *hw,
status = i40e_asq_send_command(hw, &desc, abilities,
   abilities_size, cmd_details);
 
-   if (status != I40E_SUCCESS)
-   break;
-
-   if (hw->aq.asq_last_status == I40E_AQ_RC_EIO) {
+   switch (hw->aq.asq_last_status) {
+   case I40E_AQ_RC_EIO:
status = I40E_ERR_UNKNOWN_PHY;
break;
-   } else if (hw->aq.asq_last_status == I40E_AQ_RC_EAGAIN) {
+   case I40E_AQ_RC_EAGAIN:
i40e_msec_delay(1);
total_delay++;
status = I40E_ERR_TIMEOUT;
+   break;
+   /* also covers I40E_AQ_RC_OK */
+   default:
+   break;
}
-   } while ((hw->aq.asq_last_status != I40E_AQ_RC_OK) &&
-(total_delay < max_delay));
+
+   } while ((hw->aq.asq_last_status == I40E_AQ_RC_EAGAIN) &&
+   (total_delay < max_delay));
 
if (status != I40E_SUCCESS)
return status;
-- 
2.17.1

[dpdk-dev] [PATCH v3 32/36] net/i40e/base: exposing missing LED functionality

[Xiaolong Ye]

The previous code had the LED code wrapped such that, it was
static to the file and not usable outside of it. It is now available.

Signed-off-by: Rusinski 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_common.c| 8 
 drivers/net/i40e/base/i40e_prototype.h | 5 -
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_common.c 
b/drivers/net/i40e/base/i40e_common.c
index d90012fd7..d0cb53a9d 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -6851,8 +6851,8 @@ enum i40e_status_code i40e_blink_phy_link_led(struct 
i40e_hw *hw,
  * @led_addr: LED register address
  * @reg_val: read register value
  **/
-static enum i40e_status_code i40e_led_get_reg(struct i40e_hw *hw, u16 led_addr,
- u32 *reg_val)
+enum i40e_status_code i40e_led_get_reg(struct i40e_hw *hw, u16 led_addr,
+  u32 *reg_val)
 {
enum i40e_status_code status;
u8 phy_addr = 0;
@@ -6880,8 +6880,8 @@ static enum i40e_status_code i40e_led_get_reg(struct 
i40e_hw *hw, u16 led_addr,
  * @led_addr: LED register address
  * @reg_val: register value to write
  **/
-static enum i40e_status_code i40e_led_set_reg(struct i40e_hw *hw, u16 led_addr,
- u32 reg_val)
+enum i40e_status_code i40e_led_set_reg(struct i40e_hw *hw, u16 led_addr,
+  u32 reg_val)
 {
enum i40e_status_code status;
u8 phy_addr = 0;
diff --git a/drivers/net/i40e/base/i40e_prototype.h 
b/drivers/net/i40e/base/i40e_prototype.h
index 0d1adb689..0f06e3262 100644
--- a/drivers/net/i40e/base/i40e_prototype.h
+++ b/drivers/net/i40e/base/i40e_prototype.h
@@ -73,7 +73,10 @@ enum i40e_status_code i40e_led_get_phy(struct i40e_hw *hw, 
u16 *led_addr,
   u16 *val);
 enum i40e_status_code i40e_blink_phy_link_led(struct i40e_hw *hw,
  u32 time, u32 interval);
-
+enum i40e_status_code i40e_led_get_reg(struct i40e_hw *hw, u16 led_addr,
+  u32 *reg_val);
+enum i40e_status_code i40e_led_set_reg(struct i40e_hw *hw, u16 led_addr,
+  u32 reg_val);
 enum i40e_status_code i40e_get_phy_lpi_status(struct i40e_hw *hw,
  struct i40e_hw_port_stats *stats);
 enum i40e_status_code i40e_get_lpi_counters(struct i40e_hw *hw, u32 
*tx_counter,
-- 
2.17.1

[dpdk-dev] [PATCH v3 34/36] net/i40e/base: add CRC stripping capability

[Xiaolong Ye]

Some VFs may want to disable CRC stripping on incoming packets
so create an offload for that. The VF already sends information
about configuring it's RX queues so use that structure to
indicate that the CRC stripping should be enabled or not.

Signed-off-by: Paul M Stillwell Jr 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_dcb.h |  3 +--
 drivers/net/i40e/base/virtchnl.h | 12 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_dcb.h b/drivers/net/i40e/base/i40e_dcb.h
index 520c7db73..60193c98d 100644
--- a/drivers/net/i40e/base/i40e_dcb.h
+++ b/drivers/net/i40e/base/i40e_dcb.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2019
  */
 
 #ifndef _I40E_DCB_H_
@@ -205,5 +205,4 @@ i40e_get_fw_lldp_status(struct i40e_hw *hw,
 enum i40e_status_code i40e_set_dcb_config(struct i40e_hw *hw);
 enum i40e_status_code i40e_dcb_config_to_lldp(u8 *lldpmib, u16 *miblen,
  struct i40e_dcbx_config *dcbcfg);
-
 #endif /* _I40E_DCB_H_ */
diff --git a/drivers/net/i40e/base/virtchnl.h b/drivers/net/i40e/base/virtchnl.h
index c677d0eb5..c613d4761 100644
--- a/drivers/net/i40e/base/virtchnl.h
+++ b/drivers/net/i40e/base/virtchnl.h
@@ -228,6 +228,7 @@ VIRTCHNL_CHECK_STRUCT_LEN(16, virtchnl_vsi_resource);
 #define VIRTCHNL_VF_OFFLOAD_RSS_REG0x0010
 #define VIRTCHNL_VF_OFFLOAD_WB_ON_ITR  0x0020
 #define VIRTCHNL_VF_OFFLOAD_REQ_QUEUES 0x0040
+#define VIRTCHNL_VF_OFFLOAD_CRC0x0080
 #define VIRTCHNL_VF_OFFLOAD_VLAN   0x0001
 #define VIRTCHNL_VF_OFFLOAD_RX_POLLING 0x0002
 #define VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2  0x0004
@@ -276,7 +277,13 @@ VIRTCHNL_CHECK_STRUCT_LEN(24, virtchnl_txq_info);
 /* VIRTCHNL_OP_CONFIG_RX_QUEUE
  * VF sends this message to set up parameters for one RX queue.
  * External data buffer contains one instance of virtchnl_rxq_info.
- * PF configures requested queue and returns a status code.
+ * PF configures requested queue and returns a status code. The
+ * crc_disable flag disables CRC stripping on the VF. Setting
+ * the crc_disable flag to 1 will disable CRC stripping for each
+ * queue in the VF where the flag is set. The VIRTCHNL_VF_OFFLOAD_CRC
+ * offload must have been set prior to sending this info or the PF
+ * will ignore the request. This flag should be set the same for
+ * all of the queues for a VF.
  */
 
 /* Rx queue config info */
@@ -288,7 +295,8 @@ struct virtchnl_rxq_info {
u16 splithdr_enabled; /* deprecated with AVF 1.0 */
u32 databuffer_size;
u32 max_pkt_size;
-   u32 pad1;
+   u8 crc_disable;
+   u8 pad1[3];
u64 dma_ring_addr;
enum virtchnl_rx_hsplit rx_split_pos; /* deprecated with AVF 1.0 */
u32 pad2;
-- 
2.17.1

[dpdk-dev] [PATCH v3 33/36] net/i40e/base: introduce firmware EMP reset register offsets

[Xiaolong Ye]

Introduce offsets of firmware registers holding a number of EMP resets.
Implement offsets as a preprocessor's constants.
Required by drivers to read a number of EMP resets reported by FW.

Signed-off-by: Piotr Kwapulinski 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_register.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/i40e/base/i40e_register.h 
b/drivers/net/i40e/base/i40e_register.h
index 3a8c0ccd1..436f48efa 100644
--- a/drivers/net/i40e/base/i40e_register.h
+++ b/drivers/net/i40e/base/i40e_register.h
@@ -366,6 +366,8 @@
 #define I40E_GL_FWSTS_FWRI_MASK   I40E_MASK(0x1, I40E_GL_FWSTS_FWRI_SHIFT)
 #define I40E_GL_FWSTS_FWS1B_SHIFT 16
 #define I40E_GL_FWSTS_FWS1B_MASK  I40E_MASK(0xFF, I40E_GL_FWSTS_FWS1B_SHIFT)
+#define I40E_GL_FWSTS_FWS1B_EMPR_0 I40E_MASK(0x20, I40E_GL_FWSTS_FWS1B_SHIFT)
+#define I40E_GL_FWSTS_FWS1B_EMPR_10 I40E_MASK(0x2A, I40E_GL_FWSTS_FWS1B_SHIFT)
 #define I40E_XL710_GL_FWSTS_FWS1B_REC_MOD_CORER_MASK \
I40E_MASK(0x30, I40E_GL_FWSTS_FWS1B_SHIFT)
 #define I40E_XL710_GL_FWSTS_FWS1B_REC_MOD_GLOBR_MASK \
-- 
2.17.1

[dpdk-dev] [PATCH v3 35/36] net/i40e/base: enable LED blinking flow

[Xiaolong Ye]

Add X710T*L device specific operations (in port LED detection and
handling of GLGEN_GPIO_CTL.PIN_FUNC field) to enable LED blinking.

Signed-off-by: Damian Milosek 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_common.c | 28 +---
 drivers/net/i40e/base/i40e_devids.h |  2 ++
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_common.c 
b/drivers/net/i40e/base/i40e_common.c
index d0cb53a9d..84e67f285 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -1544,9 +1544,9 @@ static u32 i40e_led_is_mine(struct i40e_hw *hw, int idx)
u32 gpio_val = 0;
u32 port;
 
-   if (!hw->func_caps.led[idx])
+   if (!I40E_IS_X710TL_DEVICE(hw->device_id) &&
+   !hw->func_caps.led[idx])
return 0;
-
gpio_val = rd32(hw, I40E_GLGEN_GPIO_CTL(idx));
port = (gpio_val & I40E_GLGEN_GPIO_CTL_PRT_NUM_MASK) >>
I40E_GLGEN_GPIO_CTL_PRT_NUM_SHIFT;
@@ -1565,8 +1565,15 @@ static u32 i40e_led_is_mine(struct i40e_hw *hw, int idx)
 #define I40E_FILTER_ACTIVITY 0xE
 #define I40E_LINK_ACTIVITY 0xC
 #define I40E_MAC_ACTIVITY 0xD
+#define I40E_FW_LED BIT(4)
+#define I40E_LED_MODE_VALID (I40E_GLGEN_GPIO_CTL_LED_MODE_MASK >> \
+I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT)
+
 #define I40E_LED0 22
 
+#define I40E_PIN_FUNC_SDP 0x0
+#define I40E_PIN_FUNC_LED 0x1
+
 /**
  * i40e_led_get - return current on/off mode
  * @hw: pointer to the hw struct
@@ -1628,8 +1635,10 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool 
blink)
u32 current_mode = 0;
int i;
 
-   if (mode & 0xfff0)
+   if (mode & ~I40E_LED_MODE_VALID) {
DEBUGOUT1("invalid mode passed in %X\n", mode);
+   return;
+   }
 
/* as per the documentation GPIO 22-29 are the LED
 * GPIO pins named LED0..LED7
@@ -1655,6 +1664,19 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool 
blink)
break;
}
 
+   if (I40E_IS_X710TL_DEVICE(hw->device_id)) {
+   u32 pin_func = 0;
+
+   if (mode & I40E_FW_LED)
+   pin_func = I40E_PIN_FUNC_SDP;
+   else
+   pin_func = I40E_PIN_FUNC_LED;
+
+   gpio_val &= ~I40E_GLGEN_GPIO_CTL_PIN_FUNC_MASK;
+   gpio_val |= ((pin_func <<
+I40E_GLGEN_GPIO_CTL_PIN_FUNC_SHIFT) &
+I40E_GLGEN_GPIO_CTL_PIN_FUNC_MASK);
+   }
gpio_val &= ~I40E_GLGEN_GPIO_CTL_LED_MODE_MASK;
/* this & is a bit of paranoia, but serves as a range check */
gpio_val |= ((mode << I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT) &
diff --git a/drivers/net/i40e/base/i40e_devids.h 
b/drivers/net/i40e/base/i40e_devids.h
index 1700db17a..5897d38f6 100644
--- a/drivers/net/i40e/base/i40e_devids.h
+++ b/drivers/net/i40e/base/i40e_devids.h
@@ -38,6 +38,8 @@
 #endif
 #define I40E_DEV_ID_10G_B  0x104F
 #define I40E_DEV_ID_10G_SFP0x104E
+#define I40E_IS_X710TL_DEVICE(d) \
+   ((d) == I40E_DEV_ID_10G_BASE_T_BC)
 #define I40E_DEV_ID_KX_X7220x37CE
 #define I40E_DEV_ID_QSFP_X722  0x37CF
 #define I40E_DEV_ID_SFP_X722   0x37D0
-- 
2.17.1

[dpdk-dev] [PATCH v3 31/36] net/i40e/base: implement reading lpi statistics

[Xiaolong Ye]

There was no time duration statistics for LPI (Low Power Idle)
in EEE (Energy-Efficient Ethernet).
Added new procedure to get duration values from FW.
Otherwise there is no available procedure to get tx_lpi_duration
and rx_lpi_duration values.

Signed-off-by: Jaroslaw Gawin 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_common.c| 56 ++
 drivers/net/i40e/base/i40e_prototype.h |  3 ++
 drivers/net/i40e/base/i40e_type.h  |  2 +
 3 files changed, 61 insertions(+)

diff --git a/drivers/net/i40e/base/i40e_common.c 
b/drivers/net/i40e/base/i40e_common.c
index 8144d957e..d90012fd7 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -7083,6 +7083,62 @@ enum i40e_status_code i40e_get_lpi_counters(struct 
i40e_hw *hw,
return I40E_SUCCESS;
 }
 
+/**
+ * i40e_get_lpi_duration - read LPI time duration from EEE statistics
+ * @hw: pointer to the hw struct
+ * @stat: pointer to structure with status of rx and tx lpi
+ * @tx_duration: pointer to memory for TX LPI time duration
+ * @rx_duration: pointer to memory for RX LPI time duration
+ *
+ * Read Low Power Idle (LPI) mode time duration from Energy Efficient
+ * Ethernet (EEE) statistics.
+ */
+enum i40e_status_code i40e_get_lpi_duration(struct i40e_hw *hw,
+   struct i40e_hw_port_stats *stat,
+   u64 *tx_duration, u64 *rx_duration)
+{
+   u32 tx_time_dur, rx_time_dur;
+   enum i40e_status_code retval;
+   u32 cmd_status;
+
+   if (hw->device_id != I40E_DEV_ID_10G_BASE_T_BC)
+   return I40E_ERR_NOT_IMPLEMENTED;
+
+   retval = i40e_aq_run_phy_activity
+   (hw, I40E_AQ_RUN_PHY_ACT_ID_USR_DFND,
+   I40E_AQ_RUN_PHY_ACT_DNL_OPCODE_GET_EEE_DUR,
+   &cmd_status, &tx_time_dur, &rx_time_dur, NULL);
+
+   if (retval)
+   return retval;
+   if ((cmd_status & I40E_AQ_RUN_PHY_ACT_CMD_STAT_MASK) !=
+   I40E_AQ_RUN_PHY_ACT_CMD_STAT_SUCC)
+   return I40E_ERR_ADMIN_QUEUE_ERROR;
+
+   if (hw->phy.link_info.link_speed == I40E_LINK_SPEED_1GB &&
+   !tx_time_dur && !rx_time_dur &&
+   stat->tx_lpi_status && stat->rx_lpi_status) {
+   retval = i40e_aq_run_phy_activity
+   (hw, I40E_AQ_RUN_PHY_ACT_ID_USR_DFND,
+   I40E_AQ_RUN_PHY_ACT_DNL_OPCODE_GET_EEE_STAT_DUR,
+   &cmd_status,
+   &tx_time_dur, &rx_time_dur, NULL);
+
+   if (retval)
+   return retval;
+   if ((cmd_status & I40E_AQ_RUN_PHY_ACT_CMD_STAT_MASK) !=
+   I40E_AQ_RUN_PHY_ACT_CMD_STAT_SUCC)
+   return I40E_ERR_ADMIN_QUEUE_ERROR;
+   tx_time_dur = 0;
+   rx_time_dur = 0;
+   }
+
+   *tx_duration = tx_time_dur;
+   *rx_duration = rx_time_dur;
+
+   return retval;
+}
+
 /**
  * i40e_lpi_stat_update - update LPI counters with values relative to offset
  * @hw: pointer to the hw struct
diff --git a/drivers/net/i40e/base/i40e_prototype.h 
b/drivers/net/i40e/base/i40e_prototype.h
index 2b6198985..0d1adb689 100644
--- a/drivers/net/i40e/base/i40e_prototype.h
+++ b/drivers/net/i40e/base/i40e_prototype.h
@@ -82,6 +82,9 @@ enum i40e_status_code i40e_lpi_stat_update(struct i40e_hw *hw,
   bool offset_loaded, u64 *tx_offset,
   u64 *tx_stat, u64 *rx_offset,
   u64 *rx_stat);
+enum i40e_status_code i40e_get_lpi_duration(struct i40e_hw *hw,
+   struct i40e_hw_port_stats *stat,
+   u64 *tx_duration, u64 *rx_duration);
 /* admin send queue commands */
 
 enum i40e_status_code i40e_aq_get_firmware_version(struct i40e_hw *hw,
diff --git a/drivers/net/i40e/base/i40e_type.h 
b/drivers/net/i40e/base/i40e_type.h
index d20b0fe20..af9089829 100644
--- a/drivers/net/i40e/base/i40e_type.h
+++ b/drivers/net/i40e/base/i40e_type.h
@@ -1498,6 +1498,8 @@ struct i40e_hw_port_stats {
u32 rx_lpi_status;
u64 tx_lpi_count;   /* etlpic */
u64 rx_lpi_count;   /* erlpic */
+   u64 tx_lpi_duration;
+   u64 rx_lpi_duration;
 };
 
 /* Checksum and Shadow RAM pointers */
-- 
2.17.1

[dpdk-dev] [PATCH v3 36/36] net/i40e/base: add new link speed constants

[Xiaolong Ye]

This patch fixes 'NIC Link is Up, Unknown bps' message in dmesg
for 2.5Gb/5Gb speeds. This problem is fixed by adding constants
for VIRTCHNL_LINK_SPEED_2_5GB and VIRTCHNL_LINK_SPEED_5GB.

Signed-off-by: Aleksandr Loktionov 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_prototype.h | 4 
 drivers/net/i40e/base/virtchnl.h   | 4 
 2 files changed, 8 insertions(+)

diff --git a/drivers/net/i40e/base/i40e_prototype.h 
b/drivers/net/i40e/base/i40e_prototype.h
index 0f06e3262..d8ab3ea0a 100644
--- a/drivers/net/i40e/base/i40e_prototype.h
+++ b/drivers/net/i40e/base/i40e_prototype.h
@@ -505,6 +505,10 @@ i40e_virtchnl_link_speed(enum i40e_aq_link_speed 
link_speed)
return VIRTCHNL_LINK_SPEED_100MB;
case I40E_LINK_SPEED_1GB:
return VIRTCHNL_LINK_SPEED_1GB;
+   case I40E_LINK_SPEED_2_5GB:
+   return VIRTCHNL_LINK_SPEED_2_5GB;
+   case I40E_LINK_SPEED_5GB:
+   return VIRTCHNL_LINK_SPEED_5GB;
case I40E_LINK_SPEED_10GB:
return VIRTCHNL_LINK_SPEED_10GB;
case I40E_LINK_SPEED_40GB:
diff --git a/drivers/net/i40e/base/virtchnl.h b/drivers/net/i40e/base/virtchnl.h
index c613d4761..92515bf34 100644
--- a/drivers/net/i40e/base/virtchnl.h
+++ b/drivers/net/i40e/base/virtchnl.h
@@ -53,12 +53,14 @@ enum virtchnl_status_code {
 #define VIRTCHNL_ERR_PARAM VIRTCHNL_STATUS_ERR_PARAM
 #define VIRTCHNL_STATUS_NOT_SUPPORTED VIRTCHNL_STATUS_ERR_NOT_SUPPORTED
 
+#define VIRTCHNL_LINK_SPEED_2_5GB_SHIFT0x0
 #define VIRTCHNL_LINK_SPEED_100MB_SHIFT0x1
 #define VIRTCHNL_LINK_SPEED_1000MB_SHIFT   0x2
 #define VIRTCHNL_LINK_SPEED_10GB_SHIFT 0x3
 #define VIRTCHNL_LINK_SPEED_40GB_SHIFT 0x4
 #define VIRTCHNL_LINK_SPEED_20GB_SHIFT 0x5
 #define VIRTCHNL_LINK_SPEED_25GB_SHIFT 0x6
+#define VIRTCHNL_LINK_SPEED_5GB_SHIFT  0x7
 
 enum virtchnl_link_speed {
VIRTCHNL_LINK_SPEED_UNKNOWN = 0,
@@ -68,6 +70,8 @@ enum virtchnl_link_speed {
VIRTCHNL_LINK_SPEED_40GB= BIT(VIRTCHNL_LINK_SPEED_40GB_SHIFT),
VIRTCHNL_LINK_SPEED_20GB= BIT(VIRTCHNL_LINK_SPEED_20GB_SHIFT),
VIRTCHNL_LINK_SPEED_25GB= BIT(VIRTCHNL_LINK_SPEED_25GB_SHIFT),
+   VIRTCHNL_LINK_SPEED_2_5GB   = BIT(VIRTCHNL_LINK_SPEED_2_5GB_SHIFT),
+   VIRTCHNL_LINK_SPEED_5GB = BIT(VIRTCHNL_LINK_SPEED_5GB_SHIFT),
 };
 
 /* for hsplit_0 field of Rx HMC context */
-- 
2.17.1

[dpdk-dev] [PATCH v4] doc: introduce openwrt how-to guide

[Xiaolong Ye]

This doc describes how to enable DPDK on openwrt in both virtual and
physical x86 environment.

Signed-off-by: Xiaolong Ye 
---

V4 changes:

1. add release notes

V3 changes:

1. emphasize target select in `OpenWrt configuration` section

V2 changes:

1. add meson build steps for dpdk
2. replace steps about build openwrt and running dpdk application with
links

 doc/guides/howto/index.rst |   1 +
 doc/guides/howto/openwrt.rst   | 184 +
 doc/guides/rel_notes/release_20_02.rst |   4 +
 3 files changed, 189 insertions(+)
 create mode 100644 doc/guides/howto/openwrt.rst

diff --git a/doc/guides/howto/index.rst b/doc/guides/howto/index.rst
index a4c131652..5a97ea508 100644
--- a/doc/guides/howto/index.rst
+++ b/doc/guides/howto/index.rst
@@ -19,3 +19,4 @@ HowTo Guides
 packet_capture_framework
 telemetry
 debug_troubleshoot
+openwrt
diff --git a/doc/guides/howto/openwrt.rst b/doc/guides/howto/openwrt.rst
new file mode 100644
index 0..05097c62d
--- /dev/null
+++ b/doc/guides/howto/openwrt.rst
@@ -0,0 +1,184 @@
+..  SPDX-License-Identifier: BSD-3-Clause
+Copyright(c) 2019 Intel Corporation.
+
+Enable DPDK on openwrt
+==
+
+This document describes how to enable Data Plane Development Kit(DPDK) on
+OpenWrt in both virtual and physical machine.
+
+Introduction
+
+
+The OpenWrt project is a Linux operating system targeting embedded devices.
+Instead of trying to create a single, static firmware, OpenWrt provides a fully
+writable filesystem with package management. This frees user from the
+application selection and configuration provided by the vendor and allows user
+to customize the device through the use of packages to suit any application. 
For
+developers, OpenWrt is the framework to build and application without having to
+build a complete firmware around it, for users this means the ability for full
+customization, to use the device in ways never envisioned.
+
+Pre-requisites
+~~
+
+You need gcc, binutils, bzip2, flex, python3.5+, perl, make, find, grep, diff,
+unzip, gawk, getopt, subversion, libz-dev and libc headers installed.
+
+Build OpenWrt
+-
+
+You can obtain OpenWrt image through https://downloads.openwrt.org/releases. To
+fully customize your own OpenWrt, it is highly recommended to build it through
+the source code, you can clone the OpenWrt source code by:
+
+.. code-block:: console
+
+   git clone https://git.openwrt.org/openwrt/openwrt.git
+
+OpenWrt configuration
+~
+
+You need to specify the Traget System & Subtarget through OpenWrt 
configuration,
+take x86_64 for example, you need to:
+
+* Select ``x86`` in ``Target System``
+* Select ``x86_64`` in ``Subtarget``
+* Select ``Build the OpenWrt SDK`` for cross-compilation environment
+* Select ``Use glibc`` in ``Advanced configuration options (for developers)``
+  -> ``ToolChain Options``
+  -> ``C Library implementation``
+
+Kernel configuration
+
+
+Below configurations need to be enabled:
+
+* CONFIG_UIO=y
+* CONFIG_HUGETLBFS=y
+* CONFIG_HUGETLB_PAGE=y
+* CONFIG_PAGE_MONITOR=y
+
+Build steps
+~~~
+
+For detailed OpenWrt build steps, please refer to guide in its official site.
+
+`OpenWrt build guide
+`_.
+
+After build is done, you can find the images and sdk in ``/bin/targets/x86/64-glibc/``.
+
+DPDK Cross Compilation for OpenWrt
+--
+
+Pre-requisites
+~~
+
+NUMA is required to run dpdk in x86.
+
+.. note::
+
+   For compiling the NUMA lib, run libtool --version to ensure the libtool 
version >= 2.2,
+otherwise the compilation will fail with errors.
+
+.. code-block:: console
+
+   git clone https://github.com/numactl/numactl.git
+   cd numactl
+   git checkout v2.0.13 -b v2.0.13
+   ./autogen.sh
+   autoconf -i
+   export PATH=/glibc/openwrt-sdk-x86-64_gcc-8.3.0_glibc.Linux-x86_64/staging_dir/toolchain-x86_64_gcc-8.3.0_glibc/bin/:$PATH
+   ./configure CC=x86_64-openwrt-linux-gnu-gcc --prefix=
+   make install
+
+The numa header files and lib file is generated in the include and lib folder 
respectively under .
+
+Build DPDK
+~~
+
+* meson build
+
+To cross compile with meson build, you need to write customized cross file 
first.
+
+.. code-block:: console
+
+   [binaries]
+   c = 'x86_64-openwrt-linux-gcc'
+   cpp = 'x86_64-openwrt-linux-cpp'
+   ar = 'x86_64-openwrt-linux-ar'
+   strip = 'x86_64-openwrt-linux-strip'
+
+   meson builddir --cross-file openwrt-cross
+   ninja -C builddir
+
+.. note::
+
+   For compiling the igb_uio with the kernel version used in target 
machine, you need to explicitly specify kernel_dir in meson_options.txt.
+
+* make
+
+.. code-block:: console
+
+   export STAGING_DIR=/glibc/openwrt-sdk-x86

[dpdk-dev] [RFC PATCH] mbuf: fix to update documentation of PKT_RX_QINQ_STRIPPED

[Somnath Kotur]

Certain hardware may be able to strip and/or save only the outermost
VLAN instead of both the VLANs in the mbuf in a QinQ scenario.
To handle such cases, we could re-interpret setting of just PKT_RX_QINQ_STRIPPED
to indicate that only the outermost VLAN has been stripped by the hardware and
saved in mbuf->vlan_tci_outer.
Only When both PKT_RX_QINQ_STRIPPED and PKT_RX_VLAN_STRIPPED are set, the 2 
vlans
have been stripped by the hardware and their tci are saved in mbuf->vlan_tci 
(inner)
and mbuf->vlan_tci_outer (outer).

Signed-off-by: Somnath Kotur 
Signed-off-by: JP Lee 
---
 lib/librte_mbuf/rte_mbuf_core.h | 15 +++
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/librte_mbuf/rte_mbuf_core.h b/lib/librte_mbuf/rte_mbuf_core.h
index 9a8557d..db1070b 100644
--- a/lib/librte_mbuf/rte_mbuf_core.h
+++ b/lib/librte_mbuf/rte_mbuf_core.h
@@ -124,12 +124,19 @@
 #define PKT_RX_FDIR_FLX  (1ULL << 14)
 
 /**
- * The 2 vlans have been stripped by the hardware and their tci are
- * saved in mbuf->vlan_tci (inner) and mbuf->vlan_tci_outer (outer).
+ * The outer vlan has been stripped by the hardware and their tci are
+ * saved in mbuf->vlan_tci_outer (outer).
  * This can only happen if vlan stripping is enabled in the RX
  * configuration of the PMD.
- * When PKT_RX_QINQ_STRIPPED is set, the flags (PKT_RX_VLAN |
- * PKT_RX_VLAN_STRIPPED | PKT_RX_QINQ) must also be set.
+ * When PKT_RX_QINQ_STRIPPED is set, the flags (PKT_RX_VLAN |  PKT_RX_QINQ)
+ * must also be set.
+ * When both PKT_RX_QINQ_STRIPPED and PKT_RX_VLAN_STRIPPED are set, the 2 vlans
+ * have been stripped by the hardware and their tci are saved in
+ * mbuf->vlan_tci (inner) and mbuf->vlan_tci_outer (outer).
+ * This can only happen if vlan stripping is enabled in the RX configuration
+ * of the PMD.
+ * When PKT_RX_QINQ_STRIPPED and PKT_RX_VLAN_STRIPPED are set,
+ * (PKT_RX_VLAN | PKT_RX_QINQ) must also be set.
  */
 #define PKT_RX_QINQ_STRIPPED (1ULL << 15)
 
-- 
1.8.3.1

[dpdk-dev] [RFC v3 1/2] ethdev: add IPv4/IPv6 DSCP rewrite action

[Suanming Mou]

For some overlay network, such as VXLAN, the DSCP field in the new outer
IP header after VXLAN decapsulation may need to be updated accordingly.

This commit introduce the DSCP modify action for IPv4 and IPv6.

Signed-off-by: Suanming Mou 
Acked-by: Andrew Rybchenko 
---

v3:
 * Add testpmd code.
 * Add one more commit support action in mlx5 pmd code.

v2:
 * Add space to IPv4/6 DSCP.
 * Fix typo.

---
 app/test-pmd/cmdline_flow.c | 50 +
 doc/guides/prog_guide/rte_flow.rst  | 40 +++
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  8 +
 lib/librte_ethdev/rte_flow.c|  2 ++
 lib/librte_ethdev/rte_flow.h| 31 ++
 5 files changed, 131 insertions(+)

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 99dade7..af94dbe 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -326,6 +326,10 @@ enum index {
ACTION_SET_META,
ACTION_SET_META_DATA,
ACTION_SET_META_MASK,
+   ACTION_SET_IPV4_DSCP,
+   ACTION_SET_IPV4_DSCP_VALUE,
+   ACTION_SET_IPV6_DSCP,
+   ACTION_SET_IPV6_DSCP_VALUE,
 };
 
 /** Maximum size for pattern in struct rte_flow_item_raw. */
@@ -1087,6 +1091,8 @@ struct parse_action_priv {
ACTION_RAW_DECAP,
ACTION_SET_TAG,
ACTION_SET_META,
+   ACTION_SET_IPV4_DSCP,
+   ACTION_SET_IPV6_DSCP,
ZERO,
 };
 
@@ -1300,6 +1306,18 @@ struct parse_action_priv {
ZERO,
 };
 
+static const enum index action_set_ipv4_dscp[] = {
+   ACTION_SET_IPV4_DSCP_VALUE,
+   ACTION_NEXT,
+   ZERO,
+};
+
+static const enum index action_set_ipv6_dscp[] = {
+   ACTION_SET_IPV6_DSCP_VALUE,
+   ACTION_NEXT,
+   ZERO,
+};
+
 static int parse_set_raw_encap_decap(struct context *, const struct token *,
 const char *, unsigned int,
 void *, unsigned int);
@@ -3493,6 +3511,38 @@ static int comp_set_raw_index(struct context *, const 
struct token *,
 (struct rte_flow_action_set_meta, mask)),
.call = parse_vc_conf,
},
+   [ACTION_SET_IPV4_DSCP] = {
+   .name = "set_ipv4_dscp",
+   .help = "set dscp value",
+   .priv = PRIV_ACTION(SET_IPV4_DSCP,
+   sizeof(struct rte_flow_action_set_dscp)),
+   .next = NEXT(action_set_ipv4_dscp),
+   .call = parse_vc,
+   },
+   [ACTION_SET_IPV4_DSCP_VALUE] = {
+   .name = "dscp_value",
+   .help = "new IPv4 DSCP value to set",
+   .next = NEXT(action_set_ipv4_dscp, NEXT_ENTRY(UNSIGNED)),
+   .args = ARGS(ARGS_ENTRY
+(struct rte_flow_action_set_dscp, dscp)),
+   .call = parse_vc_conf,
+   },
+   [ACTION_SET_IPV6_DSCP] = {
+   .name = "set_ipv6_dscp",
+   .help = "set DSCP value",
+   .priv = PRIV_ACTION(SET_IPV6_DSCP,
+   sizeof(struct rte_flow_action_set_dscp)),
+   .next = NEXT(action_set_ipv6_dscp),
+   .call = parse_vc,
+   },
+   [ACTION_SET_IPV6_DSCP_VALUE] = {
+   .name = "dscp_value",
+   .help = "new IPv6 DSCP value to set",
+   .next = NEXT(action_set_ipv6_dscp, NEXT_ENTRY(UNSIGNED)),
+   .args = ARGS(ARGS_ENTRY
+(struct rte_flow_action_set_dscp, dscp)),
+   .call = parse_vc_conf,
+   },
 };
 
 /** Remove and return last entry from argument stack. */
diff --git a/doc/guides/prog_guide/rte_flow.rst 
b/doc/guides/prog_guide/rte_flow.rst
index a254c81..2f21309 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -2558,6 +2558,46 @@ the other path depending on HW capability.
| ``mask`` | bit-mask applies to "data" |
+--++
 
+Action: ``SET_IPV4_DSCP``
+^
+
+Set IPv4 DSCP.
+
+Modify DSCP in IPv4 header.
+
+It must be used with RTE_FLOW_ITEM_TYPE_IPV4 in pattern.
+Otherwise, RTE_FLOW_ERROR_TYPE_ACTION error will be returned.
+
+.. _table_rte_flow_action_set_ipv4_dscp:
+
+.. table:: SET_IPV4_DSCP
+
+   +---+-+
+   | Field | Value   |
+   +===+=+
+   | ``dscp``  | DSCP in low 6 bits, rest ignore |
+   +---+-+
+
+Action: ``SET_IPV6_DSCP``
+^
+
+Set IPv6 DSCP.
+
+Modify DSCP in IPv6 header.
+
+It must be used with RTE_FLOW_ITEM_TYPE_IPV6 in pattern.
+Otherwise, RTE_FLOW_ERROR_TYPE_ACTION error will be returned.
+
+.. _table_rte_flow_action_set_ipv6_dscp:
+
+.. table:: SET_IPV6_DSCP
+
+   +---+-+
+   | Field | Value   

[dpdk-dev] [RFC v3 2/2] net/mlx5: add IPv4/IPv6 DSCP rewrite action

[Suanming Mou]

This commit add the IPv4/IPv6 DSCP rewrite actions to the PMD code.

Supported actions:
RTE_FLOW_ACTION_TYPE_SET_IPV4_DSCP
RTE_FLOW_ACTION_TYPE_SET_IPV6_DSCP

Signed-off-by: Suanming Mou 
---
 drivers/net/mlx5/mlx5_flow.h|   6 +-
 drivers/net/mlx5/mlx5_flow_dv.c | 178 
 2 files changed, 183 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index 3fff5dd..88d2eb1 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -202,6 +202,8 @@ enum mlx5_feature_name {
 #define MLX5_FLOW_ACTION_MARK_EXT (1ull << 33)
 #define MLX5_FLOW_ACTION_SET_META (1ull << 34)
 #define MLX5_FLOW_ACTION_METER (1ull << 35)
+#define MLX5_FLOW_ACTION_SET_IPV4_DSCP (1ull << 36)
+#define MLX5_FLOW_ACTION_SET_IPV6_DSCP (1ull << 37)
 
 #define MLX5_FLOW_FATE_ACTIONS \
(MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_QUEUE | \
@@ -238,7 +240,9 @@ enum mlx5_feature_name {
  MLX5_FLOW_ACTION_OF_SET_VLAN_VID | \
  MLX5_FLOW_ACTION_SET_TAG | \
  MLX5_FLOW_ACTION_MARK_EXT | \
- MLX5_FLOW_ACTION_SET_META)
+ MLX5_FLOW_ACTION_SET_META | \
+ MLX5_FLOW_ACTION_SET_IPV4_DSCP | \
+ MLX5_FLOW_ACTION_SET_IPV6_DSCP)
 
 #define MLX5_FLOW_VLAN_ACTIONS (MLX5_FLOW_ACTION_OF_POP_VLAN | \
MLX5_FLOW_ACTION_OF_PUSH_VLAN)
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 73aaea4..105acd6 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -157,6 +157,7 @@ struct field_modify_info modify_vlan_out_first_vid[] = {
 };
 
 struct field_modify_info modify_ipv4[] = {
+   {1,  1, MLX5_MODI_OUT_IP_DSCP},
{1,  8, MLX5_MODI_OUT_IPV4_TTL},
{4, 12, MLX5_MODI_OUT_SIPV4},
{4, 16, MLX5_MODI_OUT_DIPV4},
@@ -164,6 +165,7 @@ struct field_modify_info modify_ipv4[] = {
 };
 
 struct field_modify_info modify_ipv6[] = {
+   {1,  0, MLX5_MODI_OUT_IP_DSCP},
{1,  7, MLX5_MODI_OUT_IPV6_HOPLIMIT},
{4,  8, MLX5_MODI_OUT_SIPV6_127_96},
{4, 12, MLX5_MODI_OUT_SIPV6_95_64},
@@ -1191,6 +1193,76 @@ struct field_modify_info modify_tcp[] = {
 }
 
 /**
+ * Convert modify-header set IPv4 DSCP action to DV specification.
+ *
+ * @param[in,out] resource
+ *   Pointer to the modify-header resource.
+ * @param[in] action
+ *   Pointer to action specification.
+ * @param[out] error
+ *   Pointer to the error structure.
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+static int
+flow_dv_convert_action_modify_ipv4_dscp
+   (struct mlx5_flow_dv_modify_hdr_resource *resource,
+const struct rte_flow_action *action,
+struct rte_flow_error *error)
+{
+   const struct rte_flow_action_set_dscp *conf =
+   (const struct rte_flow_action_set_dscp *)(action->conf);
+   struct rte_flow_item item = { .type = RTE_FLOW_ITEM_TYPE_IPV4 };
+   struct rte_flow_item_ipv4 ipv4;
+   struct rte_flow_item_ipv4 ipv4_mask;
+
+   memset(&ipv4, 0, sizeof(ipv4));
+   memset(&ipv4_mask, 0, sizeof(ipv4_mask));
+   ipv4.hdr.type_of_service = conf->dscp;
+   ipv4_mask.hdr.type_of_service = 0x3f;
+   item.spec = &ipv4;
+   item.mask = &ipv4_mask;
+   return flow_dv_convert_modify_action(&item, modify_ipv4, NULL, resource,
+MLX5_MODIFICATION_TYPE_SET, error);
+}
+
+/**
+ * Convert modify-header set IPv6 DSCP action to DV specification.
+ *
+ * @param[in,out] resource
+ *   Pointer to the modify-header resource.
+ * @param[in] action
+ *   Pointer to action specification.
+ * @param[out] error
+ *   Pointer to the error structure.
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+static int
+flow_dv_convert_action_modify_ipv6_dscp
+   (struct mlx5_flow_dv_modify_hdr_resource *resource,
+const struct rte_flow_action *action,
+struct rte_flow_error *error)
+{
+   const struct rte_flow_action_set_dscp *conf =
+   (const struct rte_flow_action_set_dscp *)(action->conf);
+   struct rte_flow_item item = { .type = RTE_FLOW_ITEM_TYPE_IPV6 };
+   struct rte_flow_item_ipv6 ipv6;
+   struct rte_flow_item_ipv6 ipv6_mask;
+
+   memset(&ipv6, 0, sizeof(ipv6));
+   memset(&ipv6_mask, 0, sizeof(ipv6_mask));
+   ipv6.hdr.vtc_flow = conf->dscp;
+   ipv6_mask.hdr.vtc_flow = 0x3f;
+   item.spec = &ipv6;
+   item.mask = &ipv6_mask;
+   return flow_dv_convert_modify_action(&item, modify_ipv6, NULL, resource,
+MLX5_MODIFIC

Re: [dpdk-dev] [PATCH v2 1/7] net/fm10k: add i2c sbus registers definition

[Jerin Jacob]

On Fri, Dec 13, 2019 at 8:14 AM Xiaojun Liu  wrote:
>
> 1. FM10K is the i2c master, the PCA9545/PCA9505/PCA9538 are the slave.
> 2. All the i2c slave connect on board to FM10K SoC.
> 3. To control the PHY and LED

Yes. These are onboard devices, so it makes sense to segregate code
for i2c master(in this case FM10K) and slave and bus API
to reuse the logic. This to address the case where PCA9545 used by
other i2c master or new board come up with a new i2c device instead of
PCA9545 etc.

And yes, DPDK is missing all these infrastructure code pieces.  So it
is good to add infrastructure first.
I am leaving the decision to you and/or community.



>
>
> -Original Message-
> From: Jerin Jacob [mailto:jerinjac...@gmail.com]
> Sent: Friday, December 13, 2019 1:12 AM
> To: Xiaojun Liu
> Cc: xiao.w.w...@intel.com; qi.z.zh...@intel.com; ngai-mint.k...@intel.com; 
> jakub.for...@intel.co; jacob.e.kel...@intel.com; dev@dpdk.org; Jeff Zheng; 
> Eyal Cohen
> Subject: Re: [dpdk-dev] [PATCH v2 1/7] net/fm10k: add i2c sbus registers 
> definition
>
> On Thu, Dec 12, 2019 at 3:05 PM Xiaojun Liu  wrote:
> >
> > This is not a generic i2c bus, but rather an indirect access to i2c devices 
> > through FM10k registers. It's only purpose is to support the fm10k chip. 
> > Also there's currently no i2c bus support framework in DPDK.
>
> To understand it better:
>
> # Who are the i2c master and i2c slave here?
> # Is i2c slave connected on board or in-built to FM10K SoC?
> # What is the purpose of the i2c API in the ethdev driver?
>
>
>
> >
> > -Original Message-
> > From: Jerin Jacob [mailto:jerinjac...@gmail.com]
> > Sent: Wednesday, December 11, 2019 11:48 PM
> > To: Xiaojun Liu
> > Cc: xiao.w.w...@intel.com; qi.z.zh...@intel.com; ngai-mint.k...@intel.com; 
> > jakub.for...@intel.co; jacob.e.kel...@intel.com; dev@dpdk.org
> > Subject: Re: [dpdk-dev] [PATCH v2 1/7] net/fm10k: add i2c sbus registers 
> > definition
> >
> > On Wed, Dec 11, 2019 at 3:22 PM Xiaojun Liu  
> > wrote:
> > >
> > > To support switch management, add the following files:
> > > Add fm10k/switch/fm10k_debug.h(define log Macros).
> > > Add fm10k/switch/fm10k_regs.h(define all the registers).
> > > Add fm10k/switch/fm10k_switch.h(define switch Macros and APIs).
> > > Add fm10k/switch/fm10k_i2c.h(define I2C interfaces).
> > > Add fm10k/switch/fm10k_i2c.c(support I2C access).
> > > Add fm10k/switch/fm10k_sbus.h(define SBUS interface).
> > > Add fm10k/switch/fm10k_sbus.c(support SBUS access).
> > > and modify fm10k/Makefile(add ENABLE_FM10K_MANAGEMENT support,
> > > add fm10k_i2c.c and fm10k_sbus.c).
> >
> > Integrating NIC with the integrated or onboard switches over i2c or
> > sbus is a common problem.
> > Instead of polluting ethdev driver with i2c and sbus _bus_ code, Why
> > not add new i2c bus
> > and move this code to driver/bus/i2c//
> >
> > >
> > > To avoid configuration for both kernel driver
> > > and userspace SDK outside DPDK, we add switch
> > > management in FM10K DPDK PMD driver.
> > > To enable switch management, you need add
> > > CONFIG_RTE_FM10K_MANAGEMENT=y in
> > > config/common_linux when building.
> > >
> > > Signed-off-by: Xiaojun Liu 

Re: [dpdk-dev] [PATCH v3] vhost: add config change slave msg support

[Tiwei Bie]

On Thu, Dec 05, 2019 at 01:38:33PM +0800, Li Feng wrote:
> This msg is used to notify qemu that should get the config of backend.
> 
> For example, vhost-user-blk uses this msg to notify guest os the
> compacity of backend has changed.

capacity?

> 
> Signed-off-by: Li Feng 
> ---
> v3:
> * Move the declare to rte_vhost.h
> * Add the symbol in rte_vhost_version.map
> 
> v2:
> * Fix a little log typo.
> 
>  lib/librte_vhost/rte_vhost.h   | 12 
>  lib/librte_vhost/rte_vhost_version.map |  1 +
>  lib/librte_vhost/vhost_user.c  | 31 +++
>  lib/librte_vhost/vhost_user.h  |  1 +
>  4 files changed, 45 insertions(+)
> 
> diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h
> index 7b5dc87c2..fc28da264 100644
> --- a/lib/librte_vhost/rte_vhost.h
> +++ b/lib/librte_vhost/rte_vhost.h
> @@ -977,6 +977,18 @@ __rte_experimental
>  int
>  rte_vhost_get_vdpa_device_id(int vid);
>  
> +/**
> + * Notify the guest that should get config from backend.
> + *
> + * @param vid
> + *  vhost device ID
> + * @return
> + *  0 on success, < 0 on failure
> + */
> +__rte_experimental
> +int
> +rte_vhost_user_slave_config_change(int vid);

Normally the prefix in vhost API is rte_vhost_
not rte_vhost_user_

> +
>  #ifdef __cplusplus
>  }
>  #endif
> diff --git a/lib/librte_vhost/rte_vhost_version.map 
> b/lib/librte_vhost/rte_vhost_version.map
> index c512377fe..acf013d6d 100644
> --- a/lib/librte_vhost/rte_vhost_version.map
> +++ b/lib/librte_vhost/rte_vhost_version.map
> @@ -65,4 +65,5 @@ EXPERIMENTAL {
>   rte_vhost_clr_inflight_desc_packed;
>   rte_vhost_get_vhost_ring_inflight;
>   rte_vhost_get_vring_base_from_inflight;
> + rte_vhost_user_slave_config_change;
>  };
> diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
> index 0cfb8b792..10f2e47d5 100644
> --- a/lib/librte_vhost/vhost_user.c
> +++ b/lib/librte_vhost/vhost_user.c
> @@ -2840,6 +2840,37 @@ vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t 
> iova, uint8_t perm)
>   return 0;
>  }
>  
> +static int
> +vhost_user_slave_config_change(struct virtio_net *dev)
> +{
> + int ret;
> + struct VhostUserMsg msg = {
> + .request.slave = VHOST_USER_SLAVE_CONFIG_CHANGE_MSG,
> + .flags = VHOST_USER_VERSION,

Will it be better to also set VHOST_USER_NEED_REPLY?

> + .size = 0,
> + };
> +
> + ret = send_vhost_message(dev->slave_req_fd, &msg);
> + if (ret < 0) {
> + RTE_LOG(ERR, VHOST_CONFIG,
> + "Failed to send config change (%d)\n",
> + ret);

Looks better to indent the code by 3 tabs.

> + return ret;
> + }
> +
> + return 0;
> +}
> +
> +int
> +rte_vhost_user_slave_config_change(int vid)
> +{
> + struct virtio_net *dev;
> + dev = get_device(vid);
> + if (!dev)
> + return -ENODEV;
> + return vhost_user_slave_config_change(dev);
> +}

I'm wondering will it be better to provide a generic API
to allow external backends to send any slave messages?

> +
>  static int vhost_user_slave_set_vring_host_notifier(struct virtio_net *dev,
>   int index, int fd,
>   uint64_t offset,
> diff --git a/lib/librte_vhost/vhost_user.h b/lib/librte_vhost/vhost_user.h
> index 6563f7315..86c364a93 100644
> --- a/lib/librte_vhost/vhost_user.h
> +++ b/lib/librte_vhost/vhost_user.h
> @@ -62,6 +62,7 @@ typedef enum VhostUserRequest {
>  typedef enum VhostUserSlaveRequest {
>   VHOST_USER_SLAVE_NONE = 0,
>   VHOST_USER_SLAVE_IOTLB_MSG = 1,
> + VHOST_USER_SLAVE_CONFIG_CHANGE_MSG = 2,
>   VHOST_USER_SLAVE_VRING_HOST_NOTIFIER_MSG = 3,
>   VHOST_USER_SLAVE_MAX
>  } VhostUserSlaveRequest;
> -- 
> 2.11.0
> 
> 
> -- 
> The SmartX email address is only for business purpose. Any sent message 
> that is not related to the business is not authorized or permitted by 
> SmartX.
> 本邮箱为北京志凌海纳科技有限公司（SmartX）工作邮箱. 如本邮箱发出的邮件与工作无关,该邮件未得到本公司任何的明示或默示的授权.
> 
> 

Re: [dpdk-dev] [PATCH] net/i40e: fix flow control broken

[Ye Xiaolong]

On 12/06, Guinan Sun wrote:
>Repeat switching flow control on or off during receiving traffic,
>testpmd reports "failed to switch Tx queue occurs" after quit.
>The patch fixes the issue.
>
>Fixes: f53577f06925 ("i40e: support flow control")
>Cc: sta...@dpdk.org
>
>Signed-off-by: Guinan Sun 
>---
> drivers/net/i40e/i40e_ethdev.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
>index 5999c964b..5507f6c39 100644
>--- a/drivers/net/i40e/i40e_ethdev.c
>+++ b/drivers/net/i40e/i40e_ethdev.c
>@@ -53,7 +53,7 @@
> 
> /* Wait count and interval */
> #define I40E_CHK_Q_ENA_COUNT   1000
>-#define I40E_CHK_Q_ENA_INTERVAL_US 1000
>+#define I40E_CHK_Q_ENA_INTERVAL_US 5
> 
> /* Maximun number of VSI */
> #define I40E_MAX_NUM_VSIS  (384UL)
>-- 
>2.17.1
>

Acked-by: Xiaolong Ye 

Applied to dpdk-next-net-intel, Thanks.

Re: [dpdk-dev] [PATCH] net/i40e: fix flow control broken

[Ye Xiaolong]

On 12/16, Ye Xiaolong wrote:
>On 12/06, Guinan Sun wrote:
>>Repeat switching flow control on or off during receiving traffic,
>>testpmd reports "failed to switch Tx queue occurs" after quit.
>>The patch fixes the issue.
>>
>>Fixes: f53577f06925 ("i40e: support flow control")
>>Cc: sta...@dpdk.org
>>
>>Signed-off-by: Guinan Sun 
>>---
>> drivers/net/i40e/i40e_ethdev.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>>diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
>>index 5999c964b..5507f6c39 100644
>>--- a/drivers/net/i40e/i40e_ethdev.c
>>+++ b/drivers/net/i40e/i40e_ethdev.c
>>@@ -53,7 +53,7 @@
>> 
>> /* Wait count and interval */
>> #define I40E_CHK_Q_ENA_COUNT   1000
>>-#define I40E_CHK_Q_ENA_INTERVAL_US 1000
>>+#define I40E_CHK_Q_ENA_INTERVAL_US 5
>> 
>> /* Maximun number of VSI */
>> #define I40E_MAX_NUM_VSIS  (384UL)
>>-- 
>>2.17.1
>>
>
>Acked-by: Xiaolong Ye 
>
>Applied to dpdk-next-net-intel, Thanks.

Sorry, there is still concern about this patch, drop it from next-net-intel 
first.

Re: [dpdk-dev] [PATCH] net/vhost: fix return value of vhost creates not checked

[Tiwei Bie]

On Mon, Dec 16, 2019 at 09:05:59AM +0800, Yunjian Wang wrote:
> The function eth_dev_vhost_create() could return errors,
> the return value need to be checked.
> 
> Fixes: ee584e9710b9 ("vhost: add driver on top of the library")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Yunjian Wang 
> ---
>  drivers/net/vhost/rte_eth_vhost.c | 6 --
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/vhost/rte_eth_vhost.c 
> b/drivers/net/vhost/rte_eth_vhost.c
> index 46f01a7..7e4faf2 100644
> --- a/drivers/net/vhost/rte_eth_vhost.c
> +++ b/drivers/net/vhost/rte_eth_vhost.c
> @@ -1455,8 +1455,10 @@ struct vhost_xstats_name_off {
>   if (dev->device.numa_node == SOCKET_ID_ANY)
>   dev->device.numa_node = rte_socket_id();
>  
> - eth_dev_vhost_create(dev, iface_name, queues, dev->device.numa_node,
> - flags, disable_flags);
> + ret = eth_dev_vhost_create(dev, iface_name, queues,
> + dev->device.numa_node, flags, disable_flags);
> + if (ret == -1)
> + VHOST_LOG(ERR, "Failed to create %s", name);

This will set "ret" to port id on success,
but we shouldn't return port id in probe.

>  
>  out_free:
>   rte_kvargs_free(kvlist);
> -- 
> 1.8.3.1
> 
> 

[dpdk-dev] [PATCH] examples/l2fwd-event: set RSS based on device capabilities

[pbhagavatula]

From: Pavan Nikhilesh 

Setup RSS configuration based on underlying device capabilities.

Signed-off-by: Satananda Burla 
Signed-off-by: Pavan Nikhilesh 
---
 examples/l2fwd-event/l2fwd_common.c | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/examples/l2fwd-event/l2fwd_common.c 
b/examples/l2fwd-event/l2fwd_common.c
index 0c069ec35..2fae6f52c 100644
--- a/examples/l2fwd-event/l2fwd_common.c
+++ b/examples/l2fwd-event/l2fwd_common.c
@@ -46,6 +46,17 @@ l2fwd_event_init_ports(struct l2fwd_resources *rsrc)
if (ret != 0)
rte_panic("Error during getting device (port %u) info: 
%s\n",
  port_id, strerror(-ret));
+   local_port_conf.rx_adv_conf.rss_conf.rss_hf &=
+   dev_info.flow_type_rss_offloads;
+   if (local_port_conf.rx_adv_conf.rss_conf.rss_hf !=
+   port_conf.rx_adv_conf.rss_conf.rss_hf) {
+   printf("Port %u modified RSS hash function based on 
hardware support,"
+  "requested:%#"PRIx64" configured:%#"PRIx64"",
+   port_id,
+   port_conf.rx_adv_conf.rss_conf.rss_hf,
+   local_port_conf.rx_adv_conf.rss_conf.rss_hf);
+   }
+
if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
local_port_conf.txmode.offloads |=
DEV_TX_OFFLOAD_MBUF_FAST_FREE;
-- 
2.17.1

Re: [dpdk-dev] [PATCH] examples/l2fwd-event: set RSS based on device capabilities

[Jerin Jacob]

On Mon, Dec 16, 2019 at 11:07 AM  wrote:
>
> From: Pavan Nikhilesh 
>
> Setup RSS configuration based on underlying device capabilities.
>
> Signed-off-by: Satananda Burla 
> Signed-off-by: Pavan Nikhilesh 
> ---


Please add Fixes: and cc stable as well as it is a fix for the bug.


>  examples/l2fwd-event/l2fwd_common.c | 11 +++
>  1 file changed, 11 insertions(+)
>
> diff --git a/examples/l2fwd-event/l2fwd_common.c 
> b/examples/l2fwd-event/l2fwd_common.c
> index 0c069ec35..2fae6f52c 100644
> --- a/examples/l2fwd-event/l2fwd_common.c
> +++ b/examples/l2fwd-event/l2fwd_common.c
> @@ -46,6 +46,17 @@ l2fwd_event_init_ports(struct l2fwd_resources *rsrc)
> if (ret != 0)
> rte_panic("Error during getting device (port %u) 
> info: %s\n",
>   port_id, strerror(-ret));
> +   local_port_conf.rx_adv_conf.rss_conf.rss_hf &=
> +   dev_info.flow_type_rss_offloads;
> +   if (local_port_conf.rx_adv_conf.rss_conf.rss_hf !=
> +   port_conf.rx_adv_conf.rss_conf.rss_hf) {
> +   printf("Port %u modified RSS hash function based on 
> hardware support,"
> +  "requested:%#"PRIx64" configured:%#"PRIx64"",
> +   port_id,
> +   port_conf.rx_adv_conf.rss_conf.rss_hf,
> +   local_port_conf.rx_adv_conf.rss_conf.rss_hf);
> +   }
> +
> if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
> local_port_conf.txmode.offloads |=
> DEV_TX_OFFLOAD_MBUF_FAST_FREE;
> --
> 2.17.1
>

Re: [dpdk-dev] [PATCH] net/virtio-user: fix return value of tap offload sets not checked

[Tiwei Bie]

On Mon, Dec 16, 2019 at 09:03:15AM +0800, Yunjian Wang wrote:
> The function vhost_kernel_tap_set_offload() could return errors,
> the return value need to be checked.
> 
> Fixes: 1db4d2330bc8 ("net/virtio-user: check negotiated features before set")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Yunjian Wang 
> ---
>  drivers/net/virtio/virtio_user/vhost_kernel_tap.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/virtio/virtio_user/vhost_kernel_tap.c 
> b/drivers/net/virtio/virtio_user/vhost_kernel_tap.c
> index 76bf754..f77d227 100644
> --- a/drivers/net/virtio/virtio_user/vhost_kernel_tap.c
> +++ b/drivers/net/virtio/virtio_user/vhost_kernel_tap.c
> @@ -131,7 +131,8 @@
>   goto error;
>   }
>  
> - vhost_kernel_tap_set_offload(tapfd, features);
> + if (vhost_kernel_tap_set_offload(tapfd, features) < 0)
> + goto error;

It's not necessary to fail in this case. At least, there
is no need to fail when error is -ENOTSUP.

>  
>   memset(&ifr, 0, sizeof(ifr));
>   ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
> -- 
> 1.8.3.1
> 
> 

Re: [dpdk-dev] [PATCH] vhost: Add dynamic logging system

[Tiwei Bie]

On Wed, Dec 04, 2019 at 04:07:29PM +0100, Adrian Moreno wrote:
> Currently there are a couple of limitations on the logging system: Most
> of the logs are compiled out and both datapath and controlpath logs
> share the same loglevel.
> 
> This patch tries to help fix that situation by:
> - Splitting control plane and data plane logs
> - Making control plane logs dynamic while keeping data plane logs
> compiled out by default for log levels lower than the INFO.
> 
> As a result, two macros are introduced:
> - VHOST_LOG_CONFIG(LEVEL, ...): Config path logging. Level can be
> dynamically controlled by "lib.vhost.config"
> 
> - VHOST_LOG_DATA(LEVEL, ...): Data path logging. Level can be dynamically
> controlled by "lib.vhost.data". Every log macro with a level lower than
> RTE_LOG_DP_LEVEL (which defaults to RTE_LOG_INFO) will be compiled out.
> 
> Signed-off-by: Adrian Moreno 

Acked-by: Tiwei Bie 

Re: [dpdk-dev] [PATCH v2] net/virtio: add link speed tuning

[Tiwei Bie]

On Fri, Dec 13, 2019 at 08:39:11PM +0300, Ivan Dyukov wrote:
> Hi Maxime,
> Thank you for comments.
> 
> 
> 13.12.2019 17:59, Maxime Coquelin пишет:
> > Hi Ivan,
> >
> > On 12/13/19 3:44 PM, Ivan Dyukov wrote:
> >> Some applications like pktgen use link_speed to calculate transmit
> >> rate. It limits outcome traffic to hardcoded 10G.
> >>
> >> This patch makes link_speed configurable at compile time.
> >>
> >> Signed-off-by: Ivan Dyukov 
> >> ---
> >>   config/common_base |  1 +
> >>   config/meson.build |  1 +
> >>   drivers/net/vhost/rte_eth_vhost.c  |  2 +-
> >>   drivers/net/virtio/virtio_ethdev.c | 20 
> >>   4 files changed, 19 insertions(+), 5 deletions(-)
> >>
> >> diff --git a/config/common_base b/config/common_base
> >> index 7dec7ed45..8589ca4ec 100644
> >> --- a/config/common_base
> >> +++ b/config/common_base
> >> @@ -433,6 +433,7 @@ CONFIG_RTE_LIBRTE_AVP_DEBUG_BUFFERS=n
> >>   # Compile burst-oriented VIRTIO PMD driver
> >>   #
> >>   CONFIG_RTE_LIBRTE_VIRTIO_PMD=y
> >> +CONFIG_RTE_LIBRTE_VIRTIO_LINK_SPEED=1
> >>   CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_RX=n
> >>   CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_TX=n
> >>   CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_DUMP=n
> >> diff --git a/config/meson.build b/config/meson.build
> >> index 364a8d739..78c30f334 100644
> >> --- a/config/meson.build
> >> +++ b/config/meson.build
> >> @@ -202,6 +202,7 @@ dpdk_conf.set('RTE_LIBEAL_USE_HPET', 
> >> get_option('use_hpet'))
> >>   dpdk_conf.set('RTE_MAX_VFIO_GROUPS', 64)
> >>   dpdk_conf.set('RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB', 64)
> >>   dpdk_conf.set('RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', true)
> >> +dpdk_conf.set('RTE_LIBRTE_VIRTIO_LINK_SPEED', 1)
> >>   
> >>   
> >>   compile_time_cpuflags = []
> >> diff --git a/drivers/net/vhost/rte_eth_vhost.c 
> >> b/drivers/net/vhost/rte_eth_vhost.c
> >> index 46f01a7f4..38eaa5955 100644
> >> --- a/drivers/net/vhost/rte_eth_vhost.c
> >> +++ b/drivers/net/vhost/rte_eth_vhost.c
> >> @@ -115,7 +115,7 @@ static struct internal_list_head internal_list =
> >>   static pthread_mutex_t internal_list_lock = PTHREAD_MUTEX_INITIALIZER;
> >>   
> >>   static struct rte_eth_link pmd_link = {
> >> -  .link_speed = 1,
> >> +  .link_speed = RTE_LIBRTE_VIRTIO_LINK_SPEED,
> >>.link_duplex = ETH_LINK_FULL_DUPLEX,
> >>.link_status = ETH_LINK_DOWN
> >>   };
> >> diff --git a/drivers/net/virtio/virtio_ethdev.c 
> >> b/drivers/net/virtio/virtio_ethdev.c
> >> index 044eb10a7..948091cc2 100644
> >> --- a/drivers/net/virtio/virtio_ethdev.c
> >> +++ b/drivers/net/virtio/virtio_ethdev.c
> >> @@ -2371,7 +2371,7 @@ virtio_dev_link_update(struct rte_eth_dev *dev, 
> >> __rte_unused int wait_to_complet
> >>   
> >>memset(&link, 0, sizeof(link));
> >>link.link_duplex = ETH_LINK_FULL_DUPLEX;
> >> -  link.link_speed  = ETH_SPEED_NUM_10G;
> >> +  link.link_speed  = RTE_LIBRTE_VIRTIO_LINK_SPEED;
> >>link.link_autoneg = ETH_LINK_FIXED;
> >>   
> >>if (!hw->started) {
> >> @@ -2426,9 +2426,21 @@ virtio_dev_info_get(struct rte_eth_dev *dev, struct 
> >> rte_eth_dev_info *dev_info)
> >>   {
> >>uint64_t tso_mask, host_features;
> >>struct virtio_hw *hw = dev->data->dev_private;
> >> -
> >> -  dev_info->speed_capa = ETH_LINK_SPEED_10G; /* fake value */
> >> -
> >> +#if RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_LINK_SPEED_20G
> >> +  dev_info->speed_capa = ETH_LINK_SPEED_20G;
> >> +#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_25G
> >> +  dev_info->speed_capa = ETH_LINK_SPEED_25G;
> >> +#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_40G
> >> +  dev_info->speed_capa = ETH_LINK_SPEED_40G;
> >> +#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_50G
> >> +  dev_info->speed_capa = ETH_LINK_SPEED_50G;
> >> +#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_56G
> >> +  dev_info->speed_capa = ETH_LINK_SPEED_56G;
> >> +#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_100G
> >> +  dev_info->speed_capa = ETH_LINK_SPEED_100G;
> >> +#else
> >> +  dev_info->speed_capa = ETH_LINK_SPEED_10G;
> >> +#endif
> >>dev_info->max_rx_queues =
> >>RTE_MIN(hw->max_queue_pairs, VIRTIO_MAX_RX_QUEUES);
> >>dev_info->max_tx_queues =
> >>
> > I think we may need toi extend the Virtio specification so that the
> > device can advertise the link speed.
> I agree. It will be more flexible solution, but it will require another 
> effort. I'll evalutate virtio spec and check if it's suitable for such 
> changes.

FYI: https://lists.oasis-open.org/archives/virtio-comment/201911/msg00058.html


> > Problem with your proposal is that it is build time only, so:
> > 1. It won't be configurable when using distros DPDK package.
> > 2. All the Virtio devices on a system will have the same value
> Current implementation is same. Nothing is broken here. :)
> > While any Virtio spec update introduce link speed support, wouldn't it
> > be preferable to have this as a devarg?
> For my case, compile time configuration is ok. Let me p

Re: [dpdk-dev] [RFC PATCH] mbuf: fix to update documentation of PKT_RX_QINQ_STRIPPED

[Andrew Rybchenko]

On 12/16/19 6:16 AM, Somnath Kotur wrote:
> Certain hardware may be able to strip and/or save only the outermost
> VLAN instead of both the VLANs in the mbuf in a QinQ scenario.
> To handle such cases, we could re-interpret setting of just 
> PKT_RX_QINQ_STRIPPED
> to indicate that only the outermost VLAN has been stripped by the hardware and
> saved in mbuf->vlan_tci_outer.
> Only When both PKT_RX_QINQ_STRIPPED and PKT_RX_VLAN_STRIPPED are set, the 2 
> vlans
> have been stripped by the hardware and their tci are saved in mbuf->vlan_tci 
> (inner)
> and mbuf->vlan_tci_outer (outer).
> 
> Signed-off-by: Somnath Kotur 
> Signed-off-by: JP Lee 
> ---
>  lib/librte_mbuf/rte_mbuf_core.h | 15 +++
>  1 file changed, 11 insertions(+), 4 deletions(-)
> 
> diff --git a/lib/librte_mbuf/rte_mbuf_core.h b/lib/librte_mbuf/rte_mbuf_core.h
> index 9a8557d..db1070b 100644
> --- a/lib/librte_mbuf/rte_mbuf_core.h
> +++ b/lib/librte_mbuf/rte_mbuf_core.h
> @@ -124,12 +124,19 @@
>  #define PKT_RX_FDIR_FLX  (1ULL << 14)
>  
>  /**
> - * The 2 vlans have been stripped by the hardware and their tci are
> - * saved in mbuf->vlan_tci (inner) and mbuf->vlan_tci_outer (outer).
> + * The outer vlan has been stripped by the hardware and their tci are
> + * saved in mbuf->vlan_tci_outer (outer).
>   * This can only happen if vlan stripping is enabled in the RX
>   * configuration of the PMD.
> - * When PKT_RX_QINQ_STRIPPED is set, the flags (PKT_RX_VLAN |
> - * PKT_RX_VLAN_STRIPPED | PKT_RX_QINQ) must also be set.
> + * When PKT_RX_QINQ_STRIPPED is set, the flags (PKT_RX_VLAN |  PKT_RX_QINQ)
> + * must also be set.
> + * When both PKT_RX_QINQ_STRIPPED and PKT_RX_VLAN_STRIPPED are set, the 2 
> vlans
> + * have been stripped by the hardware and their tci are saved in
> + * mbuf->vlan_tci (inner) and mbuf->vlan_tci_outer (outer).
> + * This can only happen if vlan stripping is enabled in the RX configuration
> + * of the PMD.
> + * When PKT_RX_QINQ_STRIPPED and PKT_RX_VLAN_STRIPPED are set,
> + * (PKT_RX_VLAN | PKT_RX_QINQ) must also be set.
>   */
>  #define PKT_RX_QINQ_STRIPPED (1ULL << 15)
>  

I always thought that PKT_RX_VLAN_STRIPPED means *one* VLAN
stripped regardless if it is outer (if the packet is double
tagged) or inner (if only one VLAN tag was present).

That's why PKT_RX_QINQ_STRIPPED description says that *two*
VLANs have been stripped.

What is the problem with such approach?

Re: [dpdk-dev] [PATCH] net/vhost: fix return value of vhost creates not checked

[wangyunjian]

> -Original Message-
> From: Tiwei Bie [mailto:tiwei@intel.com]
> Sent: Monday, December 16, 2019 1:33 PM
> To: wangyunjian 
> Cc: dev@dpdk.org; maxime.coque...@redhat.com; zhihong.w...@intel.com;
> xudingke ; sta...@dpdk.org
> Subject: Re: [PATCH] net/vhost: fix return value of vhost creates not checked
> 
> On Mon, Dec 16, 2019 at 09:05:59AM +0800, Yunjian Wang wrote:
> > The function eth_dev_vhost_create() could return errors, the return
> > value need to be checked.
> >
> > Fixes: ee584e9710b9 ("vhost: add driver on top of the library")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Yunjian Wang 
> > ---
> >  drivers/net/vhost/rte_eth_vhost.c | 6 --
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/vhost/rte_eth_vhost.c
> > b/drivers/net/vhost/rte_eth_vhost.c
> > index 46f01a7..7e4faf2 100644
> > --- a/drivers/net/vhost/rte_eth_vhost.c
> > +++ b/drivers/net/vhost/rte_eth_vhost.c
> > @@ -1455,8 +1455,10 @@ struct vhost_xstats_name_off {
> > if (dev->device.numa_node == SOCKET_ID_ANY)
> > dev->device.numa_node = rte_socket_id();
> >
> > -   eth_dev_vhost_create(dev, iface_name, queues, dev->device.numa_node,
> > -   flags, disable_flags);
> > +   ret = eth_dev_vhost_create(dev, iface_name, queues,
> > +   dev->device.numa_node, flags, disable_flags);
> > +   if (ret == -1)
> > +   VHOST_LOG(ERR, "Failed to create %s", name);
> 
> This will set "ret" to port id on success, but we shouldn't return port id in
> probe.

OK, I agree. How about function eth_dev_vhost_create can return 0 on success?

Thanks
Yunjian

> 
> >
> >  out_free:
> > rte_kvargs_free(kvlist);
> > --
> > 1.8.3.1
> >
> >

Re: [dpdk-dev] [PATCH v2] net/mlx5: avoid crash when meter action conf is NULL

[Suanming Mou]

> -Original Message-
> From: Tonghao Zhang 
> Sent: Monday, December 16, 2019 9:29 AM
> To: Matan Azrad ; Shahaf Shuler
> 
> Cc: dev@dpdk.org; Suanming Mou 
> Subject: Re: [PATCH v2] net/mlx5: avoid crash when meter action conf is
> NULL
> 
> On Fri, Dec 13, 2019 at 10:21 PM  wrote:
> >
> > From: Tonghao Zhang 
> >
> > When offloading the meter, should check the action conf and make sure
> > it is valid.
> >
> > Fixes: f46bf7488705 ("net/mlx5: support meter flow action")
> > Cc: Suanming Mou 
> >
> > Signed-off-by: Tonghao Zhang 
> > ---
> > v2: coding style issues:
> > https://eur03.safelinks.protection.outlook.com/?url=http%3A%2F%2Fpatch
> >
> es.dpdk.org%2Fpatch%2F63849%2F&data=02%7C01%7Csuanmingm%4
> 0mellanox
> > .com%7C65507f811a6c4e942c1d08d781c77b2a%7Ca652971c7d2e4d9ba6a4
> d149256f
> >
> 461b%7C0%7C0%7C637120566090170306&sdata=0qTU8puaLH8IQkUm
> %2B4nIDG8G
> > 3dTi9ktvYKp%2BcxJ8dE4%3D&reserved=0
> > ---
> >  drivers/net/mlx5/mlx5_flow_dv.c | 9 -
> >  1 file changed, 8 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/mlx5/mlx5_flow_dv.c
> > b/drivers/net/mlx5/mlx5_flow_dv.c index 73aaea4..7528556 100644
> > --- a/drivers/net/mlx5/mlx5_flow_dv.c
> > +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> > @@ -3402,7 +3402,12 @@ struct field_modify_info modify_tcp[] = {  {
> > struct mlx5_priv *priv = dev->data->dev_private;
> > const struct rte_flow_action_meter *am = action->conf;
> > -   struct mlx5_flow_meter *fm = mlx5_flow_meter_find(priv, am-
> >mtr_id);
> > +   struct mlx5_flow_meter *fm;
> > +
> > +   if (!am)
> > +   return rte_flow_error_set(error, EINVAL,
> > + RTE_FLOW_ERROR_TYPE_ACTION, NULL,
> > + "meter action conf is
> > + NULL");
> >
> > if (action_flags & MLX5_FLOW_ACTION_METER)
> > return rte_flow_error_set(error, ENOTSUP, @@ -3417,6
> > +3422,8 @@ struct field_modify_info modify_tcp[] = {
> >   RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> >   NULL,
> >   "meter action not
> > supported");
> > +

Redundant empty line.
Reviewed-by: Suanming Mou 

> > +   fm = mlx5_flow_meter_find(priv, am->mtr_id);
> > if (!fm)
> > return rte_flow_error_set(error, EINVAL,
> >   RTE_FLOW_ERROR_TYPE_ACTION,
> > NULL,
> > --
> > 1.8.3.1
> >
> ping

[dpdk-dev] [PATCH v3] examples/ipsec-secgw: fix application crash.

[Savinay Dharmappa]

if algo is NULL set the status to error and return. This change
prevent crashing of ipsec-secgw application when a specific
cipher/auth/aead algo are not supported by application.

Fixes: 0d547ed03717 ("examples/ipsec-secgw: support configuration file")

Signed-off-by: Savinay Dharmappa 
Acked-by: Konstantin Ananyev 
---
 examples/ipsec-secgw/sa.c | 9 +
 1 file changed, 9 insertions(+)

diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c
index 7f046e3ed..c75a5a15f 100644
--- a/examples/ipsec-secgw/sa.c
+++ b/examples/ipsec-secgw/sa.c
@@ -314,6 +314,9 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,
APP_CHECK(algo != NULL, status, "unrecognized "
"input \"%s\"", tokens[ti]);
 
+   if (status->status < 0)
+   return;
+
rule->cipher_algo = algo->algo;
rule->block_size = algo->block_size;
rule->iv_len = algo->iv_len;
@@ -378,6 +381,9 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,
APP_CHECK(algo != NULL, status, "unrecognized "
"input \"%s\"", tokens[ti]);
 
+   if (status->status < 0)
+   return;
+
rule->auth_algo = algo->algo;
rule->auth_key_len = algo->key_len;
rule->digest_len = algo->digest_len;
@@ -433,6 +439,9 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,
APP_CHECK(algo != NULL, status, "unrecognized "
"input \"%s\"", tokens[ti]);
 
+   if (status->status < 0)
+   return;
+
rule->aead_algo = algo->algo;
rule->cipher_key_len = algo->key_len;
rule->digest_len = algo->digest_len;
-- 
2.17.1

Re: [dpdk-dev] [PATCH v2 3/3] ethdev: improve flow mark Rx offload deprecation notice

[Jerin Jacob]

On Mon, Dec 9, 2019 at 2:47 PM Andrew Rybchenko
 wrote:
>
> On 12/5/19 11:12 AM, Jerin Jacob wrote:
> > On Mon, Dec 2, 2019 at 5:27 PM Andrew Rybchenko
> >  wrote:
> >>


>> >>>
> >>> Ack.
> >>
> >> Yes, I agree as well, but in general we already have an
> >> exception MBUF_FAST_FREE which is just a nice wrap for
> >> enabled by default support for mbufs from different
> >> mempools and support for mbuf reference counters.
> >> I don't suggest to change it. Just want to highlight
> >> that we already have exceptions (nicely wrapped).
> >> That's why I would not touch packet type parsing
> >> "offload". Packet type parsing is not just on/off and
> >> adding on/off in addition to existing API looks overkill.
> >> Yes, it is one more exception, but nicely wrapped as well.
> >
> > I am all for making offloads disabled by default.
> >
> >>
> > And what would be DEFAULT behavior for the mbuf MARK updation feature?
> > (That's where this thread started).
> 
>  As all other features, mark is disabled by default.
>  Using a rte_flow rule, it can be enabled.
>  No need to pre-enable it.
> >>>
> >>> Ok.
> >>
> >> But it returns us to the point where we started [1]:
> >>
> >> The problem:
> >> 
> >> PMD wants to know before port start if application wants to
> >> to use flow MARK/FLAG in the future. It is required because:
> >>
> >> 1. HW may be configured in a different way to reserve resources
> >>for MARK/FLAG delivery.
> >>
> >> 2. Datapath implementation choice may depend on it (e.g. vPMD
> >>is faster, but does not support MARK).
> >>
> >> opt-in/opt-out solution has drawbacks mentioned above.
> >> Also I'm not sure if opt-in/opt-out is per-queue or per-port.
> >> (Offloads may be naturally per-queue and it is a big advantage).
> >>
> >> IMHO feature which should be opt-out is almost equivalent to
> >> offload enabled by default. It has the same negative properties
> >> as enabled by default offloads.
> >>
> >> Am I missing something again?
> >>
> >> From my point of view I see no problem in necessity to say
> >> in advance (before device start) that application would like
> >> to use some features at run time.
> >
> > I agree with your problem definition and solution as offload.
> >
> > I think, our constraint is, we can not change functional ABI behavior
> > for the next year. i.e The existing application should work for the
> > next year without
> > changing the code.
> >
> > I think, it all boiling down to adhere to that constraint or not for
> > this specific case.
>
> May be the escape is to avoid consistency checks in generic
> code (not sure that such checks are doable/required in this
> case, but anyway) and make the behaviour change vendor/driver-
> specific. I understand that it is far from ideal solution.
>
> May be offload should be combined with opt-out as a way to
> disable. I.e. offload is positive (not negative), but enabled
> by default (i.e. automatically added to offloads as we do
> for RSS_HASH) with an experimental opt-out to disable it.
>
> As the result:
> 1. There is no changes in behaviour from application point of
>view.
> 2. Application which care about performance and ready to use
>experimental opt-out to optimize performance can do it.
>(i.e. use opt-out to avoid the offload enabled by default).
> 3. Later when window to normalize behaviour opens, opt-out
>becomes NOP (i.e. it still could be preserved for some
>time to simplify transition).
> 4. The offload is enabled by default during transition
>period only since it represents a feature which had
>no offload flag before and was always enabled before.
> 5. As an offload the feature may be controlled per-device
>and per-queue natively.

Looks good to me.
It makes sense to have a generic opt API to have for year ABI,
which works on

- per queue/per port
- Enable by default to keep backward compatible.
- Have a generic signature to allow probe() all the enabled opt-in features
and then disable if required by the application.
- I think, rte_eth_dev_set_ptypes()  needs to change to generic API as
it comes under opt-in/out scheme.


>
> It still does not sort out "necessity to enable twice"
> concern which for specified above "the problem", IMO,
> contradicts to "disabled by default offloads" (I read
> it as "the best performance" by default).
>
> > Once that is decided, we can wrap it in offload flags vs opt scheme
> > (by default enabled scheme).
>
> Yes. May be I don't understand all the details of the opt
> scheme right now, but I don't like what I can imagine as
> described above.
>
> >>
> >> Yes, all features which may be controlled at run-time are
> >> headache for optimizations (VLAN offloads).
> >>
> >> [1]
> >> http://inbox.dpdk.org/dev/f170105b-9c60-1b04-cb18-52e0951dd...@solarflare.com/
>

Re: [dpdk-dev] [RFC v3 1/2] ethdev: add IPv4/IPv6 DSCP rewrite action

[Ori Kam]

> -Original Message-
> From: Suanming Mou 
> Sent: Monday, December 16, 2019 5:42 AM
> To: Adrien Mazarguil ; Wenzhuo Lu
> ; Jingjing Wu ; Bernard
> Iremonger ; John McNamara
> ; Marko Kovacevic
> ; Thomas Monjalon ;
> Ferruh Yigit ; Andrew Rybchenko
> 
> Cc: dev@dpdk.org; Shahaf Shuler ; Ori Kam
> ; Matan Azrad ; Slava
> Ovsiienko 
> Subject: [RFC v3 1/2] ethdev: add IPv4/IPv6 DSCP rewrite action
> 
> For some overlay network, such as VXLAN, the DSCP field in the new outer
> IP header after VXLAN decapsulation may need to be updated accordingly.
> 
> This commit introduce the DSCP modify action for IPv4 and IPv6.
> 
> Signed-off-by: Suanming Mou 
> Acked-by: Andrew Rybchenko 
> ---
> 
> v3:
>  * Add testpmd code.
>  * Add one more commit support action in mlx5 pmd code.
> 
> v2:
>  * Add space to IPv4/6 DSCP.
>  * Fix typo.
> 
> ---



Acked-by: Ori Kam 
Best,
Ori

>  app/test-pmd/cmdline_flow.c | 50
> +
>  doc/guides/prog_guide/rte_flow.rst  | 40 +++
>  doc/guides/testpmd_app_ug/testpmd_funcs.rst |  8 +
>  lib/librte_ethdev/rte_flow.c|  2 ++
>  lib/librte_ethdev/rte_flow.h| 31 ++
>  5 files changed, 131 insertions(+)
> 
> diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
> index 99dade7..af94dbe 100644
> --- a/app/test-pmd/cmdline_flow.c
> +++ b/app/test-pmd/cmdline_flow.c
> @@ -326,6 +326,10 @@ enum index {
>   ACTION_SET_META,
>   ACTION_SET_META_DATA,
>   ACTION_SET_META_MASK,
> + ACTION_SET_IPV4_DSCP,
> + ACTION_SET_IPV4_DSCP_VALUE,
> + ACTION_SET_IPV6_DSCP,
> + ACTION_SET_IPV6_DSCP_VALUE,
>  };
> 
>  /** Maximum size for pattern in struct rte_flow_item_raw. */
> @@ -1087,6 +1091,8 @@ struct parse_action_priv {
>   ACTION_RAW_DECAP,
>   ACTION_SET_TAG,
>   ACTION_SET_META,
> + ACTION_SET_IPV4_DSCP,
> + ACTION_SET_IPV6_DSCP,
>   ZERO,
>  };
> 
> @@ -1300,6 +1306,18 @@ struct parse_action_priv {
>   ZERO,
>  };
> 
> +static const enum index action_set_ipv4_dscp[] = {
> + ACTION_SET_IPV4_DSCP_VALUE,
> + ACTION_NEXT,
> + ZERO,
> +};
> +
> +static const enum index action_set_ipv6_dscp[] = {
> + ACTION_SET_IPV6_DSCP_VALUE,
> + ACTION_NEXT,
> + ZERO,
> +};
> +
>  static int parse_set_raw_encap_decap(struct context *, const struct token
> *,
>const char *, unsigned int,
>void *, unsigned int);
> @@ -3493,6 +3511,38 @@ static int comp_set_raw_index(struct context *,
> const struct token *,
>(struct rte_flow_action_set_meta, mask)),
>   .call = parse_vc_conf,
>   },
> + [ACTION_SET_IPV4_DSCP] = {
> + .name = "set_ipv4_dscp",
> + .help = "set dscp value",
> + .priv = PRIV_ACTION(SET_IPV4_DSCP,
> + sizeof(struct rte_flow_action_set_dscp)),
> + .next = NEXT(action_set_ipv4_dscp),
> + .call = parse_vc,
> + },
> + [ACTION_SET_IPV4_DSCP_VALUE] = {
> + .name = "dscp_value",
> + .help = "new IPv4 DSCP value to set",
> + .next = NEXT(action_set_ipv4_dscp,
> NEXT_ENTRY(UNSIGNED)),
> + .args = ARGS(ARGS_ENTRY
> +  (struct rte_flow_action_set_dscp, dscp)),
> + .call = parse_vc_conf,
> + },
> + [ACTION_SET_IPV6_DSCP] = {
> + .name = "set_ipv6_dscp",
> + .help = "set DSCP value",
> + .priv = PRIV_ACTION(SET_IPV6_DSCP,
> + sizeof(struct rte_flow_action_set_dscp)),
> + .next = NEXT(action_set_ipv6_dscp),
> + .call = parse_vc,
> + },
> + [ACTION_SET_IPV6_DSCP_VALUE] = {
> + .name = "dscp_value",
> + .help = "new IPv6 DSCP value to set",
> + .next = NEXT(action_set_ipv6_dscp,
> NEXT_ENTRY(UNSIGNED)),
> + .args = ARGS(ARGS_ENTRY
> +  (struct rte_flow_action_set_dscp, dscp)),
> + .call = parse_vc_conf,
> + },
>  };
> 
>  /** Remove and return last entry from argument stack. */
> diff --git a/doc/guides/prog_guide/rte_flow.rst
> b/doc/guides/prog_guide/rte_flow.rst
> index a254c81..2f21309 100644
> --- a/doc/guides/prog_guide/rte_flow.rst
> +++ b/doc/guides/prog_guide/rte_flow.rst
> @@ -2558,6 +2558,46 @@ the other path depending on HW capability.
> | ``mask`` | bit-mask applies to "data" |
> +--++
> 
> +Action: ``SET_IPV4_DSCP``
> +^
> +
> +Set IPv4 DSCP.
> +
> +Modify DSCP in IPv4 header.
> +
> +It must be used with RTE_FLOW_ITEM_TYPE_IPV4 in pattern.
> +Otherwise, RTE_FLOW_ERROR_TYPE_ACTION error will be returned.
> +
> +.. _table_rte_flow_action_set_ipv4_dscp:
> +
> +.. table:: SET_IPV4_DSCP
> +
> +   +---+-+
> +   | Field

[dpdk-dev] [PATCH] bus/pci: restricted bus scanning to allowed devices

[Sunil Kumar Kori]

rte_bus_scan API scans all the available PCI devices irrespective of white
or black listing parameters then further devices are probed based on white
or black listing parameters. So unnecessary CPU cycles are wasted during
rte_pci_scan.

For Octeontx2 platform with core frequency 2.4 Ghz, rte_bus_scan consumes
around 26ms to scan around 90 PCI devices but all may not be used by the
application. So for the application which uses 2 NICs, rte_bus_scan
consumes few microseconds and rest time is saved with this patch.

Patch restricts devices to be scanned as per below mentioned conditions:
 - All devices will be scanned if no parameters are passed.
 - Only white listed devices will be scanned if white list is available.
 - All devices, except black listed, will be scanned if black list is
   available.

Signed-off-by: Sunil Kumar Kori 
---
 drivers/bus/pci/bsd/pci.c| 18 +-
 drivers/bus/pci/linux/pci.c  | 11 +++
 drivers/bus/pci/pci_common.c |  4 ++--
 drivers/bus/pci/private.h| 20 
 4 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/drivers/bus/pci/bsd/pci.c b/drivers/bus/pci/bsd/pci.c
index ebbfeb13a..58fa7a241 100644
--- a/drivers/bus/pci/bsd/pci.c
+++ b/drivers/bus/pci/bsd/pci.c
@@ -338,6 +338,9 @@ rte_pci_scan(void)
.match_buf_len = sizeof(matches),
.matches = &matches[0],
};
+   struct rte_pci_device dummy_dev;
+
+   memset(&dummy_dev, 0, sizeof(struct rte_pci_device));
 
/* for debug purposes, PCI can be disabled */
if (!rte_eal_has_pci())
@@ -357,9 +360,22 @@ rte_pci_scan(void)
goto error;
}
 
-   for (i = 0; i < conf_io.num_matches; i++)
+   for (i = 0; i < conf_io.num_matches; i++) {
+   /* Create dummy pci device to get devargs */
+   dummy_dev.addr.domain = matches[i].pc_sel.pc_domain;
+   dummy_dev.addr.bus = matches[i].pc_sel.pc_bus;
+   dummy_dev.addr.devid = matches[i].pc_sel.pc_dev;
+   dummy_dev.addr.function = matches[i].pc_sel.pc_func;
+   dummy_dev.device.devargs =
+   pci_devargs_lookup(&dummy_dev);
+
+   /* Check that device should be ignored or not  */
+   if (pci_ignore_device(&dummy_dev))
+   continue;
+
if (pci_scan_one(fd, &matches[i]) < 0)
goto error;
+   }
 
dev_count += conf_io.num_matches;
} while(conf_io.status == PCI_GETCONF_MORE_DEVS);
diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c
index 740a2cdad..f6335810b 100644
--- a/drivers/bus/pci/linux/pci.c
+++ b/drivers/bus/pci/linux/pci.c
@@ -458,6 +458,9 @@ rte_pci_scan(void)
DIR *dir;
char dirname[PATH_MAX];
struct rte_pci_addr addr;
+   struct rte_pci_device dummy_dev;
+
+   memset(&dummy_dev, 0, sizeof(struct rte_pci_device));
 
/* for debug purposes, PCI can be disabled */
if (!rte_eal_has_pci())
@@ -482,6 +485,14 @@ rte_pci_scan(void)
if (parse_pci_addr_format(e->d_name, sizeof(e->d_name), &addr) 
!= 0)
continue;
 
+   /* Create dummy pci device to get devargs */
+   dummy_dev.addr = addr;
+   dummy_dev.device.devargs = pci_devargs_lookup(&dummy_dev);
+
+   /* Check that device should be ignored or not  */
+   if (pci_ignore_device(&dummy_dev))
+   continue;
+
snprintf(dirname, sizeof(dirname), "%s/%s",
rte_pci_get_sysfs_path(), e->d_name);
 
diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index 3f5542076..ec063e832 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -42,7 +42,7 @@ const char *rte_pci_get_sysfs_path(void)
return path;
 }
 
-static struct rte_devargs *pci_devargs_lookup(struct rte_pci_device *dev)
+struct rte_devargs *pci_devargs_lookup(struct rte_pci_device *dev)
 {
struct rte_devargs *devargs;
struct rte_pci_addr addr;
@@ -589,7 +589,7 @@ pci_dma_unmap(struct rte_device *dev, void *addr, uint64_t 
iova, size_t len)
return -1;
 }
 
-static bool
+bool
 pci_ignore_device(const struct rte_pci_device *dev)
 {
struct rte_devargs *devargs = dev->device.devargs;
diff --git a/drivers/bus/pci/private.h b/drivers/bus/pci/private.h
index a205d4d9f..fc47768c6 100644
--- a/drivers/bus/pci/private.h
+++ b/drivers/bus/pci/private.h
@@ -42,6 +42,26 @@ int rte_pci_scan(void);
 void
 pci_name_set(struct rte_pci_device *dev);
 
+/**
+ * Get the devargs of a PCI device.
+ *
+ * @param pci_dev
+ * PCI device to be validated
+ * @return
+ * devargs on succes, NULL otherwise
+