[dpdk-dev] [PATCH dpdk-dev] net/mlx5: support hairpin between different ports

[xiangxia . m . yue]

From: Tonghao Zhang 

In the dpdk upstream, each hairpin Rxq can be connected
Txq which can belong to a same port. This patch allows
Rxq connected to different port Txq.

rte_eth_hairpin_conf_check will check the hairpin_conf valid
in high level.

Signed-off-by: Tonghao Zhang 
---
 drivers/net/mlx5/mlx5_rxq.c |  5 ++-
 drivers/net/mlx5/mlx5_trigger.c | 41 ---
 drivers/net/mlx5/mlx5_txq.c |  4 +--
 lib/librte_ethdev/rte_ethdev.c  | 73 -
 4 files changed, 83 insertions(+), 40 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index 986ec01..c2daebd 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -547,9 +547,8 @@
res = mlx5_rx_queue_pre_setup(dev, idx, desc);
if (res)
return res;
-   if (hairpin_conf->peer_count != 1 ||
-   hairpin_conf->peers[0].port != dev->data->port_id ||
-   hairpin_conf->peers[0].queue >= priv->txqs_n) {
+
+   if (hairpin_conf->peer_count != 1) {
DRV_LOG(ERR, "port %u unable to setup hairpin queue index %u "
" invalid hairpind configuration", dev->data->port_id,
idx);
diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c
index ab6937a..3eb2984 100644
--- a/drivers/net/mlx5/mlx5_trigger.c
+++ b/drivers/net/mlx5/mlx5_trigger.c
@@ -185,6 +185,10 @@
struct mlx5_rxq_ctrl *rxq_ctrl;
struct mlx5_devx_obj *sq;
struct mlx5_devx_obj *rq;
+   struct rte_eth_dev *rxq_dev;
+   struct mlx5_priv *rxq_priv;
+   uint16_t peer_queue_id;
+   uint16_t peer_port_id;
unsigned int i;
int ret = 0;
 
@@ -203,37 +207,50 @@
mlx5_txq_release(dev, i);
return -rte_errno;
}
-   sq = txq_ctrl->obj->sq;
-   rxq_ctrl = mlx5_rxq_get(dev,
-   txq_ctrl->hairpin_conf.peers[0].queue);
+   peer_port_id = txq_ctrl->hairpin_conf.peers[0].port;
+   peer_queue_id = txq_ctrl->hairpin_conf.peers[0].queue;
+   rxq_dev = &rte_eth_devices[peer_port_id];
+   rxq_priv = rxq_dev->data->dev_private;
+
+   rxq_ctrl = mlx5_rxq_get(rxq_dev, peer_queue_id);
if (!rxq_ctrl) {
mlx5_txq_release(dev, i);
rte_errno = EINVAL;
DRV_LOG(ERR, "port %u no rxq object found: %d",
-   dev->data->port_id,
-   txq_ctrl->hairpin_conf.peers[0].queue);
+   peer_port_id, peer_queue_id);
return -rte_errno;
}
if (rxq_ctrl->type != MLX5_RXQ_TYPE_HAIRPIN ||
rxq_ctrl->hairpin_conf.peers[0].queue != i) {
rte_errno = ENOMEM;
DRV_LOG(ERR, "port %u Tx queue %d can't be binded to "
-   "Rx queue %d", dev->data->port_id,
-   i, txq_ctrl->hairpin_conf.peers[0].queue);
+   "port %u Rx queue %d",
+   dev->data->port_id, i,
+   peer_port_id, peer_queue_id);
goto error;
}
+   if (!rxq_ctrl->obj) {
+   DRV_LOG(ERR, "port %u rxq obj not created, "
+   "you may start it firstly.",
+   peer_port_id);
+   goto error;
+   }
+
+   sq = txq_ctrl->obj->sq;
rq = rxq_ctrl->obj->rq;
if (!rq) {
rte_errno = ENOMEM;
-   DRV_LOG(ERR, "port %u hairpin no matching rxq: %d",
+   DRV_LOG(ERR, "port %u hairpin no matching port"
+   " %u rxq %d",
dev->data->port_id,
-   txq_ctrl->hairpin_conf.peers[0].queue);
+   peer_port_id,
+   peer_queue_id);
goto error;
}
sq_attr.state = MLX5_SQC_STATE_RDY;
sq_attr.sq_state = MLX5_SQC_STATE_RST;
sq_attr.hairpin_peer_rq = rq->id;
-   sq_attr.hairpin_peer_vhca = priv->config.hca_attr.vhca_id;
+   sq_attr.hairpin_peer_vhca = rxq_priv->config.hca_attr.vhca_id;
ret = mlx5_devx_cmd_modify_sq(sq, &sq_attr);
if (ret)
goto error;
@@ -245,12 +262,12 @@
if (ret)
goto error;
mlx5_txq_release(dev, i);
-   mlx5_rxq_release(dev, txq_ctrl->hairpin_conf.peers[0].queue);
+   mlx5_rxq_release(rxq_de

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

[Ye Xiaolong]

On 11/29, Stephen Hemminger wrote:
>On Fri, 29 Nov 2019 16:19:11 +0800
>Xiaolong Ye  wrote:
>
>> This doc describes how to enable DPDK on openwrt in both virtual and
>> physical x86 environment.
>> 
>> Signed-off-by: Xiaolong Ye 
>> ---
>>  doc/guides/howto/index.rst   |   1 +
>>  doc/guides/howto/openwrt.rst | 180 +++
>>  2 files changed, 181 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..62be3a031
>> --- /dev/null
>> +++ b/doc/guides/howto/openwrt.rst
>> @@ -0,0 +1,180 @@
>> +..  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 x86 environment.
>> +
>> +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
>> +~
>> +
>> +* 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
>> +~~~
>> +
>> +1. Run ``./scripts/feeds update -a`` to obtain all the latest package 
>> definitions
>> +defined in feeds.conf / feeds.conf.default
>> +
>> +2. Run ``./scripts/feeds install -a`` to install symlinks for all obtained
>> +packages into package/feeds/
>> +
>> +3. Run ``make menuconfig`` to select preferred configuration mentioned 
>> above for
>> +the toolchain, target system & firmware packages.
>> +
>> +3. Run ``make kernel_menuconfig`` to select preferred kernel configurations.
>> +
>> +4. Run ``make`` to build your firmware. This will download all sources, 
>> build
>> +the cross-compile toolchain and then cross-compile the Linux kernel & all
>> +chosen applications for your target system.
>> +
>> +After build is done, you can find the images and sdk in ``> Root>/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=> sdk>/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=> toolchain dir>
>> +make install
>> +
>> +The numa header files and lib file is generated in the include and lib 
>> folder respectively under .
>> +
>> +Build DPDK
>> +~~
>> +
>> +.. code-block:: console
>> +
>> +e

Re: [dpdk-dev] Interrupt is catched in kernel, but not handled

[Stephen Hemminger]

On Sat, 30 Nov 2019 19:49:16 +0200
Ranran  wrote:

> > >
> > > I also verified that there are no additional irq numbered 23 except
> > > for our device.
> > >
> > > How can it be that irq is catched, but not delivered to userspace ?
> > > Any suggestion is much appreciated,
> > >
> > > ran  
> >
> > UIO PCI generic does not support interrupts.
> > You need to use VFIO (preferred) or igb_uio
> >  

Actually UIO PCI generic does support interrupts but only legacy INTx,
it does not support MSI or MSI-x modes.

Re: [dpdk-dev] Interrupt is catched in kernel, but not handled

[Ranran]

בתאריך יום א׳, 1 בדצמ׳ 2019, 19:07, מאת Stephen Hemminger ‏<
step...@networkplumber.org>:

> On Sat, 30 Nov 2019 19:49:16 +0200
> Ranran  wrote:
>
> > > >
> > > > I also verified that there are no additional irq numbered 23 except
> > > > for our device.
> > > >
> > > > How can it be that irq is catched, but not delivered to userspace ?
> > > > Any suggestion is much appreciated,
> > > >
> > > > ran
> > >
> > > UIO PCI generic does not support interrupts.
> > > You need to use VFIO (preferred) or igb_uio
> > >
>
> Actually UIO PCI generic does support interrupts but only legacy INTx,
> it does not support MSI or MSI-x modes.
>

Right.
The device I work with is FPGA xilinx which should support INTx. Yet, even
though irqhandler is called, it does not pass pci_check_and_mask_intx, and
therefore irq is not handled, as I written in the original post.

Thanks

>

[dpdk-dev] [PATCH 0/9] updates for hns3 PMD driver

[Wei Hu (Xavier)]

This series are updates for hns3 ethernet PMD driver.

Hao Chen (4):
  net/hns3: support Rx interrupt
  net/hns3: optimize RSS's default algorithm
  net/hns3: remove the redundant function call
  net/hns3: remove the unused macros

Hongbo Zheng (1):
  net/hns3: get link state change through mailbox

Huisong Li (1):
  net/hns3: modify custom macro

Wei Hu (Xavier) (3):
  net/hns3: modify the return value of enable msix
  net/hns3: remove the redundant variable initialization
  net/hns3: remove the unnecessary assignment

 doc/guides/nics/features/hns3.ini|   1 +
 doc/guides/nics/features/hns3_vf.ini |   1 +
 drivers/net/hns3/hns3_cmd.h  |  28 +
 drivers/net/hns3/hns3_ethdev.c   | 176 ---
 drivers/net/hns3/hns3_ethdev.h   |   2 +-
 drivers/net/hns3/hns3_ethdev_vf.c| 167 ++---
 drivers/net/hns3/hns3_mbx.c  |  37 ++
 drivers/net/hns3/hns3_mbx.h  |  21 
 drivers/net/hns3/hns3_regs.h |   3 +
 drivers/net/hns3/hns3_rss.c  |  14 ++-
 drivers/net/hns3/hns3_rss.h  |  10 --
 drivers/net/hns3/hns3_rxtx.c |  58 -
 drivers/net/hns3/hns3_rxtx.h |   4 +
 13 files changed, 473 insertions(+), 49 deletions(-)

-- 
2.23.0

[dpdk-dev] [PATCH 4/9] net/hns3: modify custom macro

[Wei Hu (Xavier)]

From: Huisong Li 

This patch replaces custom macro named HNS3_MIN_FRAME_LEN for ethernet
minimum frame length with the macro named RTE_ETHER_MIN_LEN that defined
in dpdk framework.

Signed-off-by: Huisong Li 
Signed-off-by: Wei Hu (Xavier) 
---
 drivers/net/hns3/hns3_ethdev.c | 2 +-
 drivers/net/hns3/hns3_ethdev.h | 1 -
 drivers/net/hns3/hns3_rxtx.c   | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 3c591be51..e401bc0d0 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -2147,7 +2147,7 @@ hns3_set_mac_mtu(struct hns3_hw *hw, uint16_t new_mps)
 
req = (struct hns3_config_max_frm_size_cmd *)desc.data;
req->max_frm_size = rte_cpu_to_le_16(new_mps);
-   req->min_frm_size = HNS3_MIN_FRAME_LEN;
+   req->min_frm_size = RTE_ETHER_MIN_LEN;
 
return hns3_cmd_send(hw, &desc, 1);
 }
diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
index 004cd75a9..7422706a8 100644
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -33,7 +33,6 @@
 #define HNS3_MAX_BD_SIZE   65535
 #define HNS3_MAX_TX_BD_PER_PKT 8
 #define HNS3_MAX_FRAME_LEN 9728
-#define HNS3_MIN_FRAME_LEN 64
 #define HNS3_VLAN_TAG_SIZE 4
 #define HNS3_DEFAULT_RX_BUF_LEN2048
 
diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c
index e7f0c8fc9..0090cda31 100644
--- a/drivers/net/hns3/hns3_rxtx.c
+++ b/drivers/net/hns3/hns3_rxtx.c
@@ -1561,7 +1561,7 @@ hns3_prep_pkts(__rte_unused void *tx_queue, struct 
rte_mbuf **tx_pkts,
m = tx_pkts[i];
 
/* check the size of packet */
-   if (m->pkt_len < HNS3_MIN_FRAME_LEN) {
+   if (m->pkt_len < RTE_ETHER_MIN_LEN) {
rte_errno = EINVAL;
return i;
}
-- 
2.23.0

[dpdk-dev] [PATCH 5/9] net/hns3: optimize RSS's default algorithm

[Wei Hu (Xavier)]

From: Hao Chen 

This patch changed the default algorithm of RSS from simle_xor to
toeplitz because toeplitz is used more frequently by upper applications
such as ceph.

Signed-off-by: Hao Chen 
Signed-off-by: Wei Hu (Xavier) 
---
 drivers/net/hns3/hns3_rss.c | 14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c
index b8c20e6d9..dfc42f840 100644
--- a/drivers/net/hns3/hns3_rss.c
+++ b/drivers/net/hns3/hns3_rss.c
@@ -211,7 +211,11 @@ hns3_set_rss_tuple_by_rss_hf(struct hns3_hw *hw,
req->ipv6_fragment_en |= HNS3_IP_OTHER_BIT_MASK;
break;
default:
-   /* Other unsupported flow types won't change tuples */
+   /*
+* rss_hf doesn't include unsupported flow types
+* because the API framework has checked it, and
+* this branch will never go unless rss_hf is zero.
+*/
break;
}
}
@@ -251,8 +255,8 @@ hns3_dev_rss_hash_update(struct rte_eth_dev *dev,
struct hns3_hw *hw = &hns->hw;
struct hns3_rss_tuple_cfg *tuple = &hw->rss_info.rss_tuple_sets;
struct hns3_rss_conf *rss_cfg = &hw->rss_info;
-   uint8_t algo = rss_cfg->conf.func;
uint8_t key_len = rss_conf->rss_key_len;
+   uint8_t algo;
uint64_t rss_hf = rss_conf->rss_hf;
uint8_t *key = rss_conf->rss_key;
int ret;
@@ -285,6 +289,8 @@ hns3_dev_rss_hash_update(struct rte_eth_dev *dev,
ret = -EINVAL;
goto conf_err;
}
+   algo = rss_cfg->conf.func == RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ?
+   HNS3_RSS_HASH_ALGO_SIMPLE : HNS3_RSS_HASH_ALGO_TOEPLITZ;
ret = hns3_set_rss_algo_key(hw, algo, key);
if (ret)
goto conf_err;
@@ -500,7 +506,9 @@ hns3_set_default_rss_args(struct hns3_hw *hw)
int i;
 
/* Default hash algorithm */
-   rss_cfg->conf.func = RTE_ETH_HASH_FUNCTION_SIMPLE_XOR;
+   rss_cfg->conf.func = RTE_ETH_HASH_FUNCTION_TOEPLITZ;
+
+   /* Default RSS key */
memcpy(rss_cfg->key, hns3_hash_key, HNS3_RSS_KEY_SIZE);
 
/* Initialize RSS indirection table */
-- 
2.23.0

[dpdk-dev] [PATCH 3/9] net/hns3: modify the return value of enable msix

[Wei Hu (Xavier)]

From: "Wei Hu (Xavier)" 

This patch replaces the return value "-1" with "-ENXIO".

Signed-off-by: Wei Hu (Xavier) 
---
 drivers/net/hns3/hns3_ethdev_vf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/hns3/hns3_ethdev_vf.c 
b/drivers/net/hns3/hns3_ethdev_vf.c
index 9b6bc83e4..781374c82 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -131,7 +131,7 @@ hns3vf_enable_msix(const struct rte_pci_device *device, 
bool op)
 (pos + PCI_MSIX_FLAGS));
return 0;
}
-   return -1;
+   return -ENXIO;
 }
 
 static int
-- 
2.23.0

[dpdk-dev] [PATCH 6/9] net/hns3: remove the redundant function call

[Wei Hu (Xavier)]

From: Hao Chen 

This patch removes the redundant statement calling hns3_stats_reset()
to clear statistical information explicitly in the initialization of
VF device, because hardware has been reseted by FLR in the initialization
and the initial hardware and software statistics values are 0.

Signed-off-by: Hao Chen 
Signed-off-by: Wei Hu (Xavier) 
---
 drivers/net/hns3/hns3_ethdev_vf.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/hns3/hns3_ethdev_vf.c 
b/drivers/net/hns3/hns3_ethdev_vf.c
index 781374c82..46d3efad0 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -1167,7 +1167,6 @@ hns3vf_init_vf(struct rte_eth_dev *eth_dev)
 
hns3_set_default_rss_args(hw);
 
-   (void)hns3_stats_reset(eth_dev);
return 0;
 
 err_get_config:
-- 
2.23.0

[dpdk-dev] [PATCH 1/9] net/hns3: support Rx interrupt

[Wei Hu (Xavier)]

From: Hao Chen 

This patch supports of receive packets through interrupt mode for hns3
PF/VF driver. The following ops functions should be implemented defined
in struct eth_dev_ops:
rx_queue_intr_enable
rx_queue_intr_disable
rx_queue_count

Signed-off-by: Hao Chen 
Signed-off-by: Wei Hu (Xavier) 
---
 doc/guides/nics/features/hns3.ini|   1 +
 doc/guides/nics/features/hns3_vf.ini |   1 +
 drivers/net/hns3/hns3_cmd.h  |  28 +
 drivers/net/hns3/hns3_ethdev.c   | 160 --
 drivers/net/hns3/hns3_ethdev_vf.c| 166 ---
 drivers/net/hns3/hns3_mbx.h  |  13 +++
 drivers/net/hns3/hns3_regs.h |   3 +
 drivers/net/hns3/hns3_rxtx.c |  51 
 drivers/net/hns3/hns3_rxtx.h |   4 +
 9 files changed, 405 insertions(+), 22 deletions(-)

diff --git a/doc/guides/nics/features/hns3.ini 
b/doc/guides/nics/features/hns3.ini
index 6df789ed1..cd5c08a9d 100644
--- a/doc/guides/nics/features/hns3.ini
+++ b/doc/guides/nics/features/hns3.ini
@@ -5,6 +5,7 @@
 ;
 [Features]
 Link status  = Y
+Rx interrupt = Y
 MTU update   = Y
 Jumbo frame  = Y
 Promiscuous mode = Y
diff --git a/doc/guides/nics/features/hns3_vf.ini 
b/doc/guides/nics/features/hns3_vf.ini
index 41497c4c2..fd00ac3e2 100644
--- a/doc/guides/nics/features/hns3_vf.ini
+++ b/doc/guides/nics/features/hns3_vf.ini
@@ -5,6 +5,7 @@
 ;
 [Features]
 Link status  = Y
+Rx interrupt = Y
 MTU update   = Y
 Jumbo frame  = Y
 Unicast MAC filter   = Y
diff --git a/drivers/net/hns3/hns3_cmd.h b/drivers/net/hns3/hns3_cmd.h
index be0ecbe86..897dc1420 100644
--- a/drivers/net/hns3/hns3_cmd.h
+++ b/drivers/net/hns3/hns3_cmd.h
@@ -209,6 +209,10 @@ enum hns3_opcode_type {
/* SFP command */
HNS3_OPC_SFP_GET_SPEED  = 0x7104,
 
+   /* Interrupts commands */
+   HNS3_OPC_ADD_RING_TO_VECTOR = 0x1503,
+   HNS3_OPC_DEL_RING_TO_VECTOR = 0x1504,
+
/* Error INT commands */
HNS3_QUERY_MSIX_INT_STS_BD_NUM  = 0x1513,
HNS3_QUERY_CLEAR_ALL_MPF_MSIX_INT   = 0x1514,
@@ -673,6 +677,30 @@ struct hns3_tqp_map_cmd {
uint8_t rsv[18];
 };
 
+#define HNS3_RING_TYPE_B   0
+#define HNS3_RING_TYPE_TX  0
+#define HNS3_RING_TYPE_RX  1
+#define HNS3_RING_GL_IDX_S 0
+#define HNS3_RING_GL_IDX_M GENMASK(1, 0)
+#define HNS3_RING_GL_RX0
+#define HNS3_RING_GL_TX1
+
+#define HNS3_VECTOR_ELEMENTS_PER_CMD   10
+
+#define HNS3_INT_TYPE_S0
+#define HNS3_INT_TYPE_MGENMASK(1, 0)
+#define HNS3_TQP_ID_S  2
+#define HNS3_TQP_ID_M  GENMASK(12, 2)
+#define HNS3_INT_GL_IDX_S  13
+#define HNS3_INT_GL_IDX_M  GENMASK(14, 13)
+struct hns3_ctrl_vector_chain_cmd {
+   uint8_t int_vector_id;
+   uint8_t int_cause_num;
+   uint16_t tqp_type_and_id[HNS3_VECTOR_ELEMENTS_PER_CMD];
+   uint8_t vfid;
+   uint8_t rsv;
+};
+
 struct hns3_config_max_frm_size_cmd {
uint16_t max_frm_size;
uint8_t min_frm_size;
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 72315718a..bf0ab458f 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -2021,6 +2021,40 @@ hns3_check_dcb_cfg(struct rte_eth_dev *dev)
return hns3_check_mq_mode(dev);
 }
 
+static int
+hns3_bind_ring_with_vector(struct rte_eth_dev *dev, uint8_t vector_id,
+  bool mmap, uint16_t queue_id)
+{
+   struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+   struct hns3_cmd_desc desc;
+   struct hns3_ctrl_vector_chain_cmd *req =
+   (struct hns3_ctrl_vector_chain_cmd *)desc.data;
+   enum hns3_cmd_status status;
+   enum hns3_opcode_type op;
+   uint16_t tqp_type_and_id = 0;
+
+   op = mmap ? HNS3_OPC_ADD_RING_TO_VECTOR : HNS3_OPC_DEL_RING_TO_VECTOR;
+   hns3_cmd_setup_basic_desc(&desc, op, false);
+   req->int_vector_id = vector_id;
+
+   hns3_set_field(tqp_type_and_id, HNS3_INT_TYPE_M, HNS3_INT_TYPE_S,
+  HNS3_RING_TYPE_RX);
+   hns3_set_field(tqp_type_and_id, HNS3_TQP_ID_M, HNS3_TQP_ID_S, queue_id);
+   hns3_set_field(tqp_type_and_id, HNS3_INT_GL_IDX_M, HNS3_INT_GL_IDX_S,
+  HNS3_RING_GL_RX);
+   req->tqp_type_and_id[0] = rte_cpu_to_le_16(tqp_type_and_id);
+
+   req->int_cause_num = 1;
+   status = hns3_cmd_send(hw, &desc, 1);
+   if (status) {
+   hns3_err(hw, "Map TQP %d fail, vector_id is %d, status is %d.",
+queue_id, vector_id, status);
+   return -EIO;
+   }
+
+   return 0;
+}
+
 static int
 hns3_dev_configure(struct rte_eth_dev *dev)
 {
@@ -4020,15 +4054,83 @@ hns3_do_start(struct hns3_adapter *hns, bool 
reset_queue)
 }
 
 static int
-hns3_dev_start(struct rte_eth_dev *eth_dev)
+hns3_map_rx_interrupt(struct rte_eth_dev *dev)

[dpdk-dev] [PATCH 7/9] net/hns3: remove the redundant variable initialization

[Wei Hu (Xavier)]

From: "Wei Hu (Xavier)" 

This patch removes the redundant initialization of the variable
named ret.

Signed-off-by: Hongbo Zheng 
Signed-off-by: Hao Chen 
Signed-off-by: Wei Hu (Xavier) 
---
 drivers/net/hns3/hns3_ethdev.c| 10 +-
 drivers/net/hns3/hns3_ethdev_vf.c |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index e401bc0d0..55caafc27 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -3591,7 +3591,7 @@ hns3_dev_promiscuous_enable(struct rte_eth_dev *dev)
struct hns3_adapter *hns = dev->data->dev_private;
struct hns3_hw *hw = &hns->hw;
bool en_mc_pmc = (dev->data->all_multicast == 1) ? true : false;
-   int ret = 0;
+   int ret;
 
rte_spinlock_lock(&hw->lock);
ret = hns3_set_promisc_mode(hw, true, en_mc_pmc);
@@ -3608,7 +3608,7 @@ hns3_dev_promiscuous_disable(struct rte_eth_dev *dev)
struct hns3_adapter *hns = dev->data->dev_private;
struct hns3_hw *hw = &hns->hw;
bool en_mc_pmc = (dev->data->all_multicast == 1) ? true : false;
-   int ret = 0;
+   int ret;
 
/* If now in all_multicast mode, must remain in all_multicast mode. */
rte_spinlock_lock(&hw->lock);
@@ -3626,7 +3626,7 @@ hns3_dev_allmulticast_enable(struct rte_eth_dev *dev)
struct hns3_adapter *hns = dev->data->dev_private;
struct hns3_hw *hw = &hns->hw;
bool en_uc_pmc = (dev->data->promiscuous == 1) ? true : false;
-   int ret = 0;
+   int ret;
 
rte_spinlock_lock(&hw->lock);
ret = hns3_set_promisc_mode(hw, en_uc_pmc, true);
@@ -3643,7 +3643,7 @@ hns3_dev_allmulticast_disable(struct rte_eth_dev *dev)
struct hns3_adapter *hns = dev->data->dev_private;
struct hns3_hw *hw = &hns->hw;
bool en_uc_pmc = (dev->data->promiscuous == 1) ? true : false;
-   int ret = 0;
+   int ret;
 
/* If now in promiscuous mode, must remain in all_multicast mode. */
if (dev->data->promiscuous == 1)
@@ -4129,7 +4129,7 @@ hns3_dev_start(struct rte_eth_dev *dev)
 {
struct hns3_adapter *hns = dev->data->dev_private;
struct hns3_hw *hw = &hns->hw;
-   int ret = 0;
+   int ret;
 
PMD_INIT_FUNC_TRACE();
if (rte_atomic16_read(&hw->reset.resetting))
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c 
b/drivers/net/hns3/hns3_ethdev_vf.c
index 46d3efad0..45e061d96 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -1465,7 +1465,7 @@ hns3vf_dev_start(struct rte_eth_dev *dev)
 {
struct hns3_adapter *hns = dev->data->dev_private;
struct hns3_hw *hw = &hns->hw;
-   int ret = 0;
+   int ret;
 
PMD_INIT_FUNC_TRACE();
if (rte_atomic16_read(&hw->reset.resetting))
-- 
2.23.0

[dpdk-dev] [PATCH 2/9] net/hns3: get link state change through mailbox

[Wei Hu (Xavier)]

From: Hongbo Zheng 

When link down occurs, firmware adds the function of sending message
to PF driver through mailbox, hns3 PMD driver can recognize link state
change faster through the message.

Signed-off-by: Hongbo Zheng 
Signed-off-by: Wei Hu (Xavier) 
---
 drivers/net/hns3/hns3_ethdev.c |  8 ++--
 drivers/net/hns3/hns3_ethdev.h |  1 +
 drivers/net/hns3/hns3_mbx.c| 37 ++
 drivers/net/hns3/hns3_mbx.h|  8 
 4 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index bf0ab458f..3c591be51 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -218,6 +218,8 @@ hns3_interrupt_handler(void *param)
hns3_schedule_reset(hns);
} else if (event_cause == HNS3_VECTOR0_EVENT_RST)
hns3_schedule_reset(hns);
+   else if (event_cause == HNS3_VECTOR0_EVENT_MBX)
+   hns3_dev_handle_mbx_msg(hw);
else
hns3_err(hw, "Received unknown event");
 
@@ -3806,14 +3808,16 @@ hns3_get_mac_link_status(struct hns3_hw *hw)
return !!link_status;
 }
 
-static void
+void
 hns3_update_link_status(struct hns3_hw *hw)
 {
int state;
 
state = hns3_get_mac_link_status(hw);
-   if (state != hw->mac.link_status)
+   if (state != hw->mac.link_status) {
hw->mac.link_status = state;
+   hns3_warn(hw, "Link status change to %s!", state ? "up" : 
"down");
+   }
 }
 
 static void
diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
index e9a3fe410..004cd75a9 100644
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -631,6 +631,7 @@ int hns3_dev_filter_ctrl(struct rte_eth_dev *dev,
 enum rte_filter_op filter_op, void *arg);
 bool hns3_is_reset_pending(struct hns3_adapter *hns);
 bool hns3vf_is_reset_pending(struct hns3_adapter *hns);
+void hns3_update_link_status(struct hns3_hw *hw);
 
 static inline bool
 is_reset_pending(struct hns3_adapter *hns)
diff --git a/drivers/net/hns3/hns3_mbx.c b/drivers/net/hns3/hns3_mbx.c
index c1647af4b..26807bc4b 100644
--- a/drivers/net/hns3/hns3_mbx.c
+++ b/drivers/net/hns3/hns3_mbx.c
@@ -282,6 +282,40 @@ hns3_update_resp_position(struct hns3_hw *hw, uint32_t 
resp_msg)
resp->tail = tail;
 }
 
+static void
+hns3_link_fail_parse(struct hns3_hw *hw, uint8_t link_fail_code)
+{
+   switch (link_fail_code) {
+   case HNS3_MBX_LF_NORMAL:
+   break;
+   case HNS3_MBX_LF_REF_CLOCK_LOST:
+   hns3_warn(hw, "Reference clock lost!");
+   break;
+   case HNS3_MBX_LF_XSFP_TX_DISABLE:
+   hns3_warn(hw, "SFP tx is disabled!");
+   break;
+   case HNS3_MBX_LF_XSFP_ABSENT:
+   hns3_warn(hw, "SFP is absent!");
+   break;
+   default:
+   hns3_warn(hw, "Unknown fail code:%u!", link_fail_code);
+   break;
+   }
+}
+
+static void
+hns3_handle_link_change_event(struct hns3_hw *hw,
+ struct hns3_mbx_pf_to_vf_cmd *req)
+{
+#define LINK_STATUS_OFFSET 1
+#define LINK_FAIL_CODE_OFFSET  2
+
+   if (!req->msg[LINK_STATUS_OFFSET])
+   hns3_link_fail_parse(hw, req->msg[LINK_FAIL_CODE_OFFSET]);
+
+   hns3_update_link_status(hw);
+}
+
 void
 hns3_dev_handle_mbx_msg(struct hns3_hw *hw)
 {
@@ -335,6 +369,9 @@ hns3_dev_handle_mbx_msg(struct hns3_hw *hw)
 
hns3_mbx_handler(hw);
break;
+   case HNS3_MBX_PUSH_LINK_STATUS:
+   hns3_handle_link_change_event(hw, req);
+   break;
default:
hns3_err(hw,
 "VF received unsupported(%d) mbx msg from PF",
diff --git a/drivers/net/hns3/hns3_mbx.h b/drivers/net/hns3/hns3_mbx.h
index d1a6bfead..3722c8760 100644
--- a/drivers/net/hns3/hns3_mbx.h
+++ b/drivers/net/hns3/hns3_mbx.h
@@ -41,6 +41,7 @@ enum HNS3_MBX_OPCODE {
HNS3_MBX_GET_QID_IN_PF, /* (VF -> PF) get queue id in pf */
 
HNS3_MBX_HANDLE_VF_TBL = 38,/* (VF -> PF) store/clear hw cfg tbl */
+   HNS3_MBX_PUSH_LINK_STATUS = 201, /* (IMP -> PF) get port link status */
 };
 
 /* below are per-VF mac-vlan subcodes */
@@ -64,6 +65,13 @@ enum hns3_mbx_tbl_cfg_subcode {
HNS3_MBX_VPORT_LIST_CLEAR = 0,
 };
 
+enum hns3_mbx_link_fail_subcode {
+   HNS3_MBX_LF_NORMAL = 0,
+   HNS3_MBX_LF_REF_CLOCK_LOST,
+   HNS3_MBX_LF_XSFP_TX_DISABLE,
+   HNS3_MBX_LF_XSFP_ABSENT,
+};
+
 #define HNS3_MBX_MAX_MSG_SIZE  16
 #define HNS3_MBX_MAX_RESP_DATA_SIZE8
 #define HNS3_MBX_RING_MAP_BASIC_MSG_NUM3
-- 
2.23.0

[dpdk-dev] [PATCH 8/9] net/hns3: remove the unnecessary assignment

[Wei Hu (Xavier)]

From: "Wei Hu (Xavier)" 

This patch removes the unncessary assignment in hns3_xmit_pkts function
to avoid performance loss.

Signed-off-by: Wei Hu (Xavier) 
---
 drivers/net/hns3/hns3_rxtx.c | 5 -
 1 file changed, 5 deletions(-)

diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c
index 0090cda31..18c07b85e 100644
--- a/drivers/net/hns3/hns3_rxtx.c
+++ b/drivers/net/hns3/hns3_rxtx.c
@@ -1612,7 +1612,6 @@ hns3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, 
uint16_t nb_pkts)
struct rte_mbuf *m_seg;
struct rte_mbuf *temp;
uint32_t nb_hold = 0;
-   uint16_t tx_next_clean;
uint16_t tx_next_use;
uint16_t tx_bd_ready;
uint16_t tx_pkt_num;
@@ -1627,11 +1626,8 @@ hns3_xmit_pkts(void *tx_queue, struct rte_mbuf 
**tx_pkts, uint16_t nb_pkts)
if (tx_bd_ready == 0)
return 0;
 
-   tx_next_clean = txq->next_to_clean;
tx_next_use   = txq->next_to_use;
tx_bd_max = txq->nb_tx_desc;
-   tx_bak_pkt = &txq->sw_ring[tx_next_clean];
-
tx_pkt_num = (tx_bd_ready < nb_pkts) ? tx_bd_ready : nb_pkts;
 
/* send packets */
@@ -1707,7 +1703,6 @@ hns3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, 
uint16_t nb_pkts)
 
if (likely(nb_tx)) {
hns3_queue_xmit(txq, nb_hold);
-   txq->next_to_clean = tx_next_clean;
txq->tx_bd_ready   = tx_bd_ready - nb_hold;
}
 
-- 
2.23.0

[dpdk-dev] [PATCH 9/9] net/hns3: remove the unused macros

[Wei Hu (Xavier)]

From: Hao Chen 

This patch removed some unused macros defined in hns3_rss.h,
these macros are used to set tuples for abandoned RTE_ETH_FILTER_HASH
in hns3_dev_filter_ctrl().

Signed-off-by: Hao Chen 
Signed-off-by: Wei Hu (Xavier) 
---
 drivers/net/hns3/hns3_rss.h | 10 --
 1 file changed, 10 deletions(-)

diff --git a/drivers/net/hns3/hns3_rss.h b/drivers/net/hns3/hns3_rss.h
index 7ffc15131..725970f89 100644
--- a/drivers/net/hns3/hns3_rss.h
+++ b/drivers/net/hns3/hns3_rss.h
@@ -27,7 +27,6 @@
 
 #define HNS3_RSS_HASH_ALGO_TOEPLITZ0
 #define HNS3_RSS_HASH_ALGO_SIMPLE  1
-#define HNS3_RSS_HASH_ALGO_SYMMETRIC   2
 #define HNS3_RSS_HASH_ALGO_MASK0xf
 
 #define HNS3_RSS_INPUT_TUPLE_OTHER GENMASK(3, 0)
@@ -56,15 +55,6 @@ struct hns3_rss_conf {
uint16_t queue[HNS3_RSS_QUEUES_BUFFER_NUM]; /* Queues indices to use */
 };
 
-/* Bit 8 ~Bit 15 */
-#define HNS3_INSET_IPV4_SRC0x0100UL
-#define HNS3_INSET_IPV4_DST0x0200UL
-#define HNS3_INSET_IPV6_SRC0x0400UL
-#define HNS3_INSET_IPV6_DST0x0800UL
-#define HNS3_INSET_SRC_PORT0x1000UL
-#define HNS3_INSET_DST_PORT0x2000UL
-#define HNS3_INSET_SCTP_VT 0x4000UL
-
 #ifndef ilog2
 static inline int rss_ilog2(uint32_t x)
 {
-- 
2.23.0

[dpdk-dev] [PATCH 1/3] net/bnxt: rework code to select chip type

[Kalesh A P]

From: Kalesh AP 

Use switch-case statement to replace if-else statement.

Signed-off-by: Kalesh AP 
Reviewed-by: Somnath Kotur 
---
 drivers/net/bnxt/bnxt_ethdev.c | 73 --
 1 file changed, 42 insertions(+), 31 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 41848f3..081bb46 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -4028,49 +4028,60 @@ static void bnxt_cancel_fw_health_check(struct bnxt *bp)
bp->flags &= ~BNXT_FLAG_FW_HEALTH_CHECK_SCHEDULED;
 }
 
-static bool bnxt_vf_pciid(uint16_t id)
+static bool bnxt_vf_pciid(uint16_t device_id)
 {
-   if (id == BROADCOM_DEV_ID_57304_VF ||
-   id == BROADCOM_DEV_ID_57406_VF ||
-   id == BROADCOM_DEV_ID_5731X_VF ||
-   id == BROADCOM_DEV_ID_5741X_VF ||
-   id == BROADCOM_DEV_ID_57414_VF ||
-   id == BROADCOM_DEV_ID_STRATUS_NIC_VF1 ||
-   id == BROADCOM_DEV_ID_STRATUS_NIC_VF2 ||
-   id == BROADCOM_DEV_ID_58802_VF ||
-   id == BROADCOM_DEV_ID_57500_VF1 ||
-   id == BROADCOM_DEV_ID_57500_VF2)
+   switch (device_id) {
+   case BROADCOM_DEV_ID_57304_VF:
+   case BROADCOM_DEV_ID_57406_VF:
+   case BROADCOM_DEV_ID_5731X_VF:
+   case BROADCOM_DEV_ID_5741X_VF:
+   case BROADCOM_DEV_ID_57414_VF:
+   case BROADCOM_DEV_ID_STRATUS_NIC_VF1:
+   case BROADCOM_DEV_ID_STRATUS_NIC_VF2:
+   case BROADCOM_DEV_ID_58802_VF:
+   case BROADCOM_DEV_ID_57500_VF1:
+   case BROADCOM_DEV_ID_57500_VF2:
+   /* FALLTHROUGH */
return true;
-   return false;
+   default:
+   return false;
+   }
 }
 
-static bool bnxt_thor_device(uint16_t id)
+static bool bnxt_thor_device(uint16_t device_id)
 {
-   if (id == BROADCOM_DEV_ID_57508 ||
-   id == BROADCOM_DEV_ID_57504 ||
-   id == BROADCOM_DEV_ID_57502 ||
-   id == BROADCOM_DEV_ID_57508_MF1 ||
-   id == BROADCOM_DEV_ID_57504_MF1 ||
-   id == BROADCOM_DEV_ID_57502_MF1 ||
-   id == BROADCOM_DEV_ID_57508_MF2 ||
-   id == BROADCOM_DEV_ID_57504_MF2 ||
-   id == BROADCOM_DEV_ID_57502_MF2 ||
-   id == BROADCOM_DEV_ID_57500_VF1 ||
-   id == BROADCOM_DEV_ID_57500_VF2)
+   switch (device_id) {
+   case BROADCOM_DEV_ID_57508:
+   case BROADCOM_DEV_ID_57504:
+   case BROADCOM_DEV_ID_57502:
+   case BROADCOM_DEV_ID_57508_MF1:
+   case BROADCOM_DEV_ID_57504_MF1:
+   case BROADCOM_DEV_ID_57502_MF1:
+   case BROADCOM_DEV_ID_57508_MF2:
+   case BROADCOM_DEV_ID_57504_MF2:
+   case BROADCOM_DEV_ID_57502_MF2:
+   case BROADCOM_DEV_ID_57500_VF1:
+   case BROADCOM_DEV_ID_57500_VF2:
+   /* FALLTHROUGH */
return true;
-
-   return false;
+   default:
+   return false;
+   }
 }
 
 bool bnxt_stratus_device(struct bnxt *bp)
 {
-   uint16_t id = bp->pdev->id.device_id;
+   uint16_t device_id = bp->pdev->id.device_id;
 
-   if (id == BROADCOM_DEV_ID_STRATUS_NIC ||
-   id == BROADCOM_DEV_ID_STRATUS_NIC_VF1 ||
-   id == BROADCOM_DEV_ID_STRATUS_NIC_VF2)
+   switch (device_id) {
+   case BROADCOM_DEV_ID_STRATUS_NIC:
+   case BROADCOM_DEV_ID_STRATUS_NIC_VF1:
+   case BROADCOM_DEV_ID_STRATUS_NIC_VF2:
+   /* FALLTHROUGH */
return true;
-   return false;
+   default:
+   return false;
+   }
 }
 
 static int bnxt_init_board(struct rte_eth_dev *eth_dev)
-- 
2.10.1

[dpdk-dev] [PATCH 3/3] net/bnxt: use macro for getting default vnic

[Kalesh A P]

From: Kalesh AP 

BNXT_GET_DEFAULT_VNIC macro returns the default VNIC of the
function and fixed all occurrences of code to use the macro.

Signed-off-by: Kalesh AP 
Reviewed-by: Somnath Kotur 
---
 drivers/net/bnxt/bnxt_ethdev.c | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 081bb46..c70b072 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -1271,7 +1271,7 @@ static int bnxt_reta_update_op(struct rte_eth_dev 
*eth_dev,
 {
struct bnxt *bp = eth_dev->data->dev_private;
struct rte_eth_conf *dev_conf = &bp->eth_dev->data->dev_conf;
-   struct bnxt_vnic_info *vnic = &bp->vnic_info[0];
+   struct bnxt_vnic_info *vnic = BNXT_GET_DEFAULT_VNIC(bp);
uint16_t tbl_size = bnxt_rss_hash_tbl_size(bp);
uint16_t idx, sft;
int i, rc;
@@ -1328,7 +1328,7 @@ static int bnxt_reta_query_op(struct rte_eth_dev *eth_dev,
  uint16_t reta_size)
 {
struct bnxt *bp = eth_dev->data->dev_private;
-   struct bnxt_vnic_info *vnic = &bp->vnic_info[0];
+   struct bnxt_vnic_info *vnic = BNXT_GET_DEFAULT_VNIC(bp);
uint16_t tbl_size = bnxt_rss_hash_tbl_size(bp);
uint16_t idx, sft, i;
int rc;
@@ -1402,7 +1402,7 @@ static int bnxt_rss_hash_update_op(struct rte_eth_dev 
*eth_dev,
memcpy(&bp->rss_conf, rss_conf, sizeof(*rss_conf));
 
/* Update the default RSS VNIC(s) */
-   vnic = &bp->vnic_info[0];
+   vnic = BNXT_GET_DEFAULT_VNIC(bp);
vnic->hash_type = bnxt_rte_to_hwrm_hash_types(rss_conf->rss_hf);
 
/*
@@ -1428,7 +1428,7 @@ static int bnxt_rss_hash_conf_get_op(struct rte_eth_dev 
*eth_dev,
 struct rte_eth_rss_conf *rss_conf)
 {
struct bnxt *bp = eth_dev->data->dev_private;
-   struct bnxt_vnic_info *vnic = &bp->vnic_info[0];
+   struct bnxt_vnic_info *vnic = BNXT_GET_DEFAULT_VNIC(bp);
int len, rc;
uint32_t hash_types;
 
@@ -1964,7 +1964,7 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev,
 {
struct bnxt *bp = dev->data->dev_private;
/* Default Filter is tied to VNIC 0 */
-   struct bnxt_vnic_info *vnic = &bp->vnic_info[0];
+   struct bnxt_vnic_info *vnic = BNXT_GET_DEFAULT_VNIC(bp);
struct bnxt_filter_info *filter;
int rc;
 
@@ -2378,7 +2378,7 @@ bnxt_match_and_validate_ether_filter(struct bnxt *bp,
goto exit;
}
 
-   vnic0 = &bp->vnic_info[0];
+   vnic0 = BNXT_GET_DEFAULT_VNIC(bp);
vnic = &bp->vnic_info[efilter->queue];
if (vnic == NULL) {
PMD_DRV_LOG(ERR, "Invalid queue %d\n", efilter->queue);
@@ -2437,7 +2437,7 @@ bnxt_ethertype_filter(struct rte_eth_dev *dev,
return -EINVAL;
}
 
-   vnic0 = &bp->vnic_info[0];
+   vnic0 = BNXT_GET_DEFAULT_VNIC(bp);
vnic = &bp->vnic_info[efilter->queue];
 
switch (filter_op) {
@@ -2652,7 +2652,7 @@ bnxt_cfg_ntuple_filter(struct bnxt *bp,
goto free_filter;
 
vnic = &bp->vnic_info[nfilter->queue];
-   vnic0 = &bp->vnic_info[0];
+   vnic0 = BNXT_GET_DEFAULT_VNIC(bp);
filter1 = STAILQ_FIRST(&vnic0->filter);
if (filter1 == NULL) {
ret = -EINVAL;
@@ -2945,7 +2945,7 @@ bnxt_parse_fdir_filter(struct bnxt *bp,
return -EINVAL;
}
 
-   vnic0 = &bp->vnic_info[0];
+   vnic0 = BNXT_GET_DEFAULT_VNIC(bp);
vnic = &bp->vnic_info[fdir->action.rx_queue];
if (vnic == NULL) {
PMD_DRV_LOG(ERR, "Invalid queue %d\n", fdir->action.rx_queue);
-- 
2.10.1

[dpdk-dev] [PATCH 0/3] updates for bnxt PMD

[Kalesh A P]

From: Kalesh AP 

This series contains code cleanup patches for bnxt PMD.

Please apply.

Kalesh AP (3):
  net/bnxt: rework code to select chip type
  net/bnxt: remove an unnecessary log
  net/bnxt: use macro for getting default vnic

 drivers/net/bnxt/bnxt_ethdev.c | 91 +++---
 drivers/net/bnxt/bnxt_hwrm.c   |  1 -
 2 files changed, 51 insertions(+), 41 deletions(-)

-- 
2.10.1

[dpdk-dev] [PATCH 2/3] net/bnxt: remove an unnecessary log

[Kalesh A P]

From: Kalesh AP 

Remove an unnecessary log while deleting EM filters.

Signed-off-by: Kalesh AP 
Reviewed-by: Somnath Kotur 
---
 drivers/net/bnxt/bnxt_hwrm.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 4173008..b1f908e 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -4192,7 +4192,6 @@ int bnxt_hwrm_clear_em_filter(struct bnxt *bp, struct 
bnxt_filter_info *filter)
if (filter->fw_em_filter_id == UINT64_MAX)
return 0;
 
-   PMD_DRV_LOG(ERR, "Clear EM filter\n");
HWRM_PREP(req, CFA_EM_FLOW_FREE, BNXT_USE_KONG(bp));
 
req.em_filter_id = rte_cpu_to_le_64(filter->fw_em_filter_id);
-- 
2.10.1

Re: [dpdk-dev] [EXT] Re: [PATCH] config: update Marvell ARMADA

[Jerin Jacob]

>
> --
> On Fri, Nov 29, 2019 at 3:55 PM  wrote:
> >
> > From: Liron Himi 
> >
> > disable more NXP modules that conflict with MUSDK
>
> # Please share more details on the conflict.
> [L.H.] both components calls of_ APIs so when MUSDK is compiled statically 
> it conflicts with NXP's code.

If something implemented in the library, IMO, it should start with the
library name to avoid namespace collision.
Are we implementing of_x calls in MUSDK? Could you share the error logs?

> Note that the original armada config already had some NXP flags disabled, but 
> in recent version NXP moved the of_ code to be depends on 
> 'CONFIG_RTE_LIBRTE_COMMON_DPAAX' so needed to update it.

OK

> # What about meson build? "make" will be deprecated soon.
> [L.H.] only when compiling the MUSDK as static LIBs, we face this issue. In 
> meson we need to compile MUSDK as shared LIBS.

But nothing stopping us to compile MUSDK as static build with meson. Right?

> # This scheme won't work for distro build, Please spend the effort to analyze 
> the conflict and fix the conflict. IMO, That would be the correct solution.
>
>
> >
> > Signed-off-by: Liron Himi 
> > ---
> >  config/defconfig_arm64-armada-linuxapp-gcc | 17 +
> >  1 file changed, 17 insertions(+)
> >
> > diff --git a/config/defconfig_arm64-armada-linuxapp-gcc
> > b/config/defconfig_arm64-armada-linuxapp-gcc
> > index 059180284..c09751cf0 100644
> > --- a/config/defconfig_arm64-armada-linuxapp-gcc
> > +++ b/config/defconfig_arm64-armada-linuxapp-gcc
> > @@ -19,6 +19,23 @@ CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO=y
> >
> >  # Disable NXP as it is conflict with MUSDK
> > CONFIG_RTE_LIBRTE_DPAA_BUS=n
> > +CONFIG_RTE_LIBRTE_COMMON_DPAAX=n
> > +CONFIG_RTE_LIBRTE_FSLMC_BUS=n
> > +CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL=n
> > +CONFIG_RTE_LIBRTE_DPAA2_PMD=n
> > +CONFIG_RTE_LIBRTE_DPAA_BUS=n
> > +CONFIG_RTE_LIBRTE_DPAA_MEMPOOL=n
> > +CONFIG_RTE_LIBRTE_DPAA_PMD=n
> > +CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV=n
> > +CONFIG_RTE_LIBRTE_PMD_DPAA_SEC=n
> > +CONFIG_RTE_LIBRTE_PMD_CAAM_JR=n
> > +CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV=n
> > +CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC=n
> > +CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV=n
> > +CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV=n
> > +CONFIG_RTE_LIBRTE_PFE_PMD=n
> > +CONFIG_RTE_LIBRTE_ENETC_PMD=n
> > +
> >
> >  # Doesn't support NUMA
> >  CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n
> > --
> > 2.23.0
> >

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

[Jerin Jacob]

On Mon, Nov 25, 2019 at 8:39 PM Thomas Monjalon  wrote:
>
> 25/11/2019 11:44, Jerin Jacob:
> > On Sun, Nov 24, 2019 at 3:12 AM Thomas Monjalon  wrote:
> > >
> > > 23/11/2019 10:42, Jerin Jacob:
> > > > On Sat, Nov 23, 2019 at 3:58 AM Thomas Monjalon  
> > > > wrote:
> > > > > 22/11/2019 12:53, Andrew Rybchenko:
> > > > > > On 11/22/19 2:15 PM, Thomas Monjalon wrote:
> > > > > > > 22/11/2019 11:12, Andrew Rybchenko:
> > > > > > >> On 11/22/19 1:01 AM, Thomas Monjalon wrote:
> > > > > > >>> 19/11/2019 13:12, Andrew Rybchenko:
> > > > > >  The deprecation notice is required since it adds more 
> > > > > >  requirements
> > > > > >  when RTE flow mark and flag actions may be used and require
> > > > > >  changes in applications.
> > > > > > >>> I am still not sure what is the best solution here.
> > > > > > >>> I continued to think about it in this thread:
> > > > > > >>>   http://mails.dpdk.org/archives/dev/2019-November/151960.html
> > > > > > >>>
> > > > > > >>> I think we cannot require any application change until 20.11
> > > > > > >>> in order to keep API (and behaviour) compatibility.
> > > > > > >> Expected, but still very disappointing.
> > > > > > >>
> > > > > > >> The feature is implemented by Pavan (@ Marvell), supported by me,
> > > > > > >> used by Qi (@ Intel), looks better than alternatives from 
> > > > > > >> application
> > > > > > >> developer point of view [1] and finally postponed for 1 year 
> > > > > > >> without really
> > > > > > >> strong motivation.
> > > > > > >
> > > > > > > I see different valuable point of views. This is enough 
> > > > > > > motivation.
> > > > > >
> > > > > > It looks like I miss it in previous discussion, I would be thankful 
> > > > > > if
> > > > > > you give me links to read or hints how to find.
> > > > >
> > > > > http://mails.dpdk.org/archives/dev/2019-November/150793.html
> > > > >
> > > > > > Introducing new types of controls would make configuration more and
> > > > > > more complex. I think that many different types of control would
> > > > > > over-complicate it. May be it is unavoidable, but it should be clear
> > > > > > why the problem cannot be solved using existing types of controls
> > > > > > (e.g. offloads).
> > > > >
> > > > > The offload control is used as an effective configuration for now.
> > > > > The features which are configured with DEV_RX_OFFLOAD_*
> > > > > do not need any other API to be used.
> > > > > Extending DEV_RX_OFFLOAD_* bits for enabling features which
> > > > > must be configured via other API anyway, is possible.
> > > > > The real problem is that features in DEV_RX_OFFLOAD_* are supposed
> > > > > to be disabled by default. If we add some opt-in features here,
> > > > > we cannot enable them by default for API compatibility and do the
> > > > > right thing by default.
> > > > >
> > > > > Choosing DEV_RX_OFFLOAD_* bits or rte_eth_dev_opt* functions is a 
> > > > > detail.
> > > > > The real decision is to change the API for using all these features.
> > > > > Can we keep all features available by default (opt-out)?
> > > >
> > > > IMO, *rte_eth_dev_opt* has following problems
> > > >
> > > > 1) It is not multi-process friendly. If we are changing the Rx/Tx
> > > > function pointer, based on
> > > > the selected offload, then, using *rte_eth_dev_opt* scheme won't
> > > > really work(if the new API
> > > > called after the secondary process launch)
> > >
> > > Yes it must be used before launching the secondary process.
> > > It is the same as DEV_RX_OFFLOAD_* config.
> >
> > Yes. rte_eth_dev_opt_* has another dimension to enable and disable as API.
> > So, we need to document, opt-in -> start() -> opt-out case won't work
> > in multi process
> > case.
> >
> > >
> > > > 2) If we are taking rte_eth_dev_opt path then by default feature has
> > > > to be enabled to
> > > > not break the functional ABI. That scheme won't scale if as when we
> > > > keep adding the new features.
> > > > It is always easy for the application to define "what it wants" vs
> > > > "what it does not want"
> > >
> > > Yes, opt-in may look more natural than opt-out.
> > > But opt-in makes the default more complex, and changes the API.
> > >
> > > > 3) Defining the device state after the reconfigure operation.
> > > >
> > > > IMO, if any operation is connected to fastpath it is better to use
> > > > DEV_RX_OFFLOAD_ like
> > > > this feature where enable or disable PMDs from updating
> > > > ``rte_mbuf::hash::fdir`` so that if possible
> > > > we can use different Rx function pointer if possible(Hence it can work
> > > > with the multi-process case case)
> > >
> > > I reply to 2 and 3 together.
> > >
> > > We decided that offloads must be disabled by default.
> > > This is what we have in 19.11:
> > > - Some offloads are enabled before start with DEV_?X_OFFLOAD_*
> > > - Some offloads are enabled with functions at any time
> > >
> > > For the second type of offloads, you want to know, before start,
> > > whether it wil

Re: [dpdk-dev] [PATCH v5 3/6] net/axgbe: use common rte bit operation APIs instead

[Gavin Hu (Arm Technology China)]

Hi Bruce, Thomas,

This series of patches was reported a compilation issue[1] on 32bit Ubuntu. 
On mainstream 64-bit OS,  "unsigned long" is 64-bit in size and we uses the 
64-bit variant of APIs. But the 32-bit OS expect 32-bit 'unsigned long' 
arguments. 
This is where the error happens. 

My question is how 32-bit OSes shall we support, put another way, can we ignore 
this compilation issue? 
If we still need to care, how about making 'obsolete' of 'unsigned long' and 
use 'uint32' instead to be multi-OS friendly? 

*Meson Build Failed #1:
OS: UB1604-32
Target:build-gcc-static
[1] http://mails.dpdk.org/archives/test-report/2019-November/109515.html 

> -Original Message-
> From: Joyce Kong 
> Sent: Thursday, November 28, 2019 2:44 PM
> To: dev@dpdk.org
> Cc: nd ; tho...@monjalon.net; jer...@marvell.com;
> step...@networkplumber.org; m...@smartsharesystems.com;
> david.march...@redhat.com; Honnappa Nagarahalli
> ; Gavin Hu (Arm Technology China)
> ; ravi1.ku...@amd.com; rm...@marvell.com;
> shsha...@marvell.com; xuanziya...@huawei.com;
> cloud.wangxiao...@huawei.com; zhouguoy...@huawei.com
> Subject: [PATCH v5 3/6] net/axgbe: use common rte bit operation APIs
> instead
> 
> Remove its own bit operation APIs and use the common one,
> this can reduce the code duplication largely.
> 
> Signed-off-by: Joyce Kong 
> Reviewed-by: Gavin Hu 
> ---
>  drivers/net/axgbe/axgbe_common.h | 29 +
>  drivers/net/axgbe/axgbe_ethdev.c | 14 +++---
>  drivers/net/axgbe/axgbe_mdio.c   | 14 +++---
>  3 files changed, 15 insertions(+), 42 deletions(-)
> 
> diff --git a/drivers/net/axgbe/axgbe_common.h
> b/drivers/net/axgbe/axgbe_common.h
> index 34f60f1..9cabda8 100644
> --- a/drivers/net/axgbe/axgbe_common.h
> +++ b/drivers/net/axgbe/axgbe_common.h
> @@ -22,6 +22,7 @@
>  #include 
> 
>  #include 
> +#include 
>  #include 
>  #include 
>  #include 
> @@ -1674,34 +1675,6 @@ do {
>   \
>  #define time_after_eq(a, b) ((long)((a) - (b)) >= 0)
>  #define time_before_eq(a, b) time_after_eq(b, a)
> 
> -/*---bitmap support apis---*/
> -static inline int axgbe_test_bit(int nr, volatile unsigned long *addr)
> -{
> - int res;
> -
> - rte_mb();
> - res = ((*addr) & (1UL << nr)) != 0;
> - rte_mb();
> - return res;
> -}
> -
> -static inline void axgbe_set_bit(unsigned int nr, volatile unsigned long 
> *addr)
> -{
> - __sync_fetch_and_or(addr, (1UL << nr));
> -}
> -
> -static inline void axgbe_clear_bit(int nr, volatile unsigned long *addr)
> -{
> - __sync_fetch_and_and(addr, ~(1UL << nr));
> -}
> -
> -static inline int axgbe_test_and_clear_bit(int nr, volatile unsigned long
> *addr)
> -{
> - unsigned long mask = (1UL << nr);
> -
> - return __sync_fetch_and_and(addr, ~mask) & mask;
> -}
> -
>  static inline unsigned long msecs_to_timer_cycles(unsigned int m)
>  {
>   return rte_get_timer_hz() * (m / 1000);
> diff --git a/drivers/net/axgbe/axgbe_ethdev.c
> b/drivers/net/axgbe/axgbe_ethdev.c
> index d1f160e..fa597f3 100644
> --- a/drivers/net/axgbe/axgbe_ethdev.c
> +++ b/drivers/net/axgbe/axgbe_ethdev.c
> @@ -201,8 +201,8 @@ axgbe_dev_start(struct rte_eth_dev *dev)
>   axgbe_dev_enable_tx(dev);
>   axgbe_dev_enable_rx(dev);
> 
> - axgbe_clear_bit(AXGBE_STOPPED, &pdata->dev_state);
> - axgbe_clear_bit(AXGBE_DOWN, &pdata->dev_state);
> + rte_clear_bit64(AXGBE_STOPPED, &pdata->dev_state);
> + rte_clear_bit64(AXGBE_DOWN, &pdata->dev_state);
>   return 0;
>  }
> 
> @@ -216,17 +216,17 @@ axgbe_dev_stop(struct rte_eth_dev *dev)
> 
>   rte_intr_disable(&pdata->pci_dev->intr_handle);
> 
> - if (axgbe_test_bit(AXGBE_STOPPED, &pdata->dev_state))
> + if (rte_get_bit64(AXGBE_STOPPED, &pdata->dev_state))
>   return;
> 
> - axgbe_set_bit(AXGBE_STOPPED, &pdata->dev_state);
> + rte_set_bit64(AXGBE_STOPPED, &pdata->dev_state);
>   axgbe_dev_disable_tx(dev);
>   axgbe_dev_disable_rx(dev);
> 
>   pdata->phy_if.phy_stop(pdata);
>   pdata->hw_if.exit(pdata);
>   memset(&dev->data->dev_link, 0, sizeof(struct rte_eth_link));
> - axgbe_set_bit(AXGBE_DOWN, &pdata->dev_state);
> + rte_set_bit64(AXGBE_DOWN, &pdata->dev_state);
>  }
> 
>  /* Clear all resources like TX/RX queues. */
> @@ -598,8 +598,8 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
> 
>   pdata = eth_dev->data->dev_private;
>   /* initial state */
> - axgbe_set_bit(AXGBE_DOWN, &pdata->dev_state);
> - axgbe_set_bit(AXGBE_STOPPED, &pdata->dev_state);
> + rte_set_bit64(AXGBE_DOWN, &pdata->dev_state);
> + rte_set_bit64(AXGBE_STOPPED, &pdata->dev_state);
>   pdata->eth_dev = eth_dev;
> 
>   pci_dev = RTE_DEV_TO_PCI(eth_dev->device);
> diff --git a/drivers/net/axgbe/axgbe_mdio.c
> b/drivers/net/axgbe/axgbe_mdio.c
> index 2721e5c..00394a7 100644
> --- a/drivers/net/axgbe/axgbe_mdio.c
> +++ b/drivers/net/axgbe/axgbe_mdio.c
> @@ -743,7 +743,7 @@ static int __axgbe_phy_config_aneg

[dpdk-dev] [PATCH] kernel/linux: fix kernel dir for meson

[Xiaolong Ye]

kernel_dir option in meson build is equivalent to RTE_KERNELDIR in make
system, for cross-compilation case, users would specify it as local
kernel src dir like

//target-arm_glibc/linux-arm/linux-4.19.81/

Current meson build would fail to compile kernel module if user specify
kernel_dir as above, this patch fixes this issue.

Fixes: 317832f97c16 ("kernel/linux: fix modules install path")
Cc: sta...@dpdk.org
Cc: iryz...@nfware.com

Signed-off-by: Xiaolong Ye 
---
 kernel/linux/igb_uio/meson.build | 2 +-
 kernel/linux/kni/meson.build | 2 +-
 kernel/linux/meson.build | 4 ++--
 meson_options.txt| 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kernel/linux/igb_uio/meson.build b/kernel/linux/igb_uio/meson.build
index fac404f07..e66218dae 100644
--- a/kernel/linux/igb_uio/meson.build
+++ b/kernel/linux/igb_uio/meson.build
@@ -8,7 +8,7 @@ mkfile = custom_target('igb_uio_makefile',
 custom_target('igb_uio',
input: ['igb_uio.c', 'Kbuild'],
output: 'igb_uio.ko',
-   command: ['make', '-C', kernel_dir + '/build',
+   command: ['make', '-C', kernel_dir,
'M=' + meson.current_build_dir(),
'src=' + meson.current_source_dir(),
'EXTRA_CFLAGS=-I' + meson.current_source_dir() +
diff --git a/kernel/linux/kni/meson.build b/kernel/linux/kni/meson.build
index 955eec949..9fce0c16e 100644
--- a/kernel/linux/kni/meson.build
+++ b/kernel/linux/kni/meson.build
@@ -13,7 +13,7 @@ kni_sources = files(
 custom_target('rte_kni',
input: kni_sources,
output: 'rte_kni.ko',
-   command: ['make', '-j4', '-C', kernel_dir + '/build',
+   command: ['make', '-j4', '-C', kernel_dir,
'M=' + meson.current_build_dir(),
'src=' + meson.current_source_dir(),
'MODULE_CFLAGS=-include ' + meson.source_root() + 
'/config/rte_config.h' +
diff --git a/kernel/linux/meson.build b/kernel/linux/meson.build
index 1796cc686..a37c95752 100644
--- a/kernel/linux/meson.build
+++ b/kernel/linux/meson.build
@@ -13,11 +13,11 @@ kernel_dir = get_option('kernel_dir')
 if kernel_dir == ''
# use default path for native builds
kernel_version = run_command('uname', '-r').stdout().strip()
-   kernel_dir = '/lib/modules/' + kernel_version
+   kernel_dir = '/lib/modules/' + kernel_version + '/build'
 endif
 
 # test running make in kernel directory, using "make kernelversion"
-make_returncode = run_command('make', '-sC', kernel_dir + '/build',
+make_returncode = run_command('make', '-sC', kernel_dir,
'kernelversion').returncode()
 if make_returncode != 0
warning('Cannot compile kernel modules as requested - are kernel 
headers installed?')
diff --git a/meson_options.txt b/meson_options.txt
index bc369d06c..7eba3b720 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -17,7 +17,7 @@ option('ibverbs_link', type: 'combo', choices : ['shared', 
'dlopen'], value: 'sh
 option('include_subdir_arch', type: 'string', value: '',
description: 'subdirectory where to install arch-dependent headers')
 option('kernel_dir', type: 'string', value: '',
-   description: 'Path to the kernel for building kernel modules. Headers 
must be in $kernel_dir/build. Modules will be installed in 
$DEST_DIR/$kernel_dir/extra/dpdk.')
+   description: 'Path to the kernel for building kernel modules. Modules 
will be installed in $DEST_DIR/$kernel_dir/extra/dpdk.')
 option('lib_musdk_dir', type: 'string', value: '',
description: 'path to the MUSDK library installation directory')
 option('machine', type: 'string', value: 'native',
-- 
2.17.1

Re: [dpdk-dev] [EXT] Re: [PATCH] config: update Marvell ARMADA

[Liron Himi]

Regards,
Liron

-Original Message-
From: Jerin Jacob  
Sent: Monday, 2 December 2019 06:12
To: Liron Himi 
Cc: Jerin Jacob Kollanukkaran ; dpdk-dev ; 
dpdk stable 
Subject: Re: [EXT] Re: [dpdk-dev] [PATCH] config: update Marvell ARMADA

>
> --
> On Fri, Nov 29, 2019 at 3:55 PM  wrote:
> >
> > From: Liron Himi 
> >
> > disable more NXP modules that conflict with MUSDK
>
> # Please share more details on the conflict.
> [L.H.] both components calls of_ APIs so when MUSDK is compiled statically 
> it conflicts with NXP's code.

If something implemented in the library, IMO, it should start with the library 
name to avoid namespace collision.
Are we implementing of_x calls in MUSDK? 
[L.H.] yes. It is not the same implementation as in dpaa_of.c
Could you share the error logs?
[L.H.] 
/home/userlab/work/combined_git/dataplane/musdk/usr/local/lib/libmusdk.a(libmusdk_la-of.o):
 In function `of_n_addr_cells':
/home/userlab/work/combined_git/dataplane/musdk/src/env/of.c:348: multiple 
definition of `of_n_addr_cells'
/home/userlab/work/combined_git/dataplane/dpdk-19.11/build/lib/librte_common_dpaax.a(dpaa_of.o):dpaa_of.c:(.text+0x13b8):
 first defined here

> Note that the original armada config already had some NXP flags disabled, but 
> in recent version NXP moved the of_ code to be depends on 
> 'CONFIG_RTE_LIBRTE_COMMON_DPAAX' so needed to update it.

OK

> # What about meson build? "make" will be deprecated soon.
> [L.H.] only when compiling the MUSDK as static LIBs, we face this issue. In 
> meson we need to compile MUSDK as shared LIBS.

But nothing stopping us to compile MUSDK as static build with meson. Right?
[L.H.] right, but currently it will not work AFAIK there is no way to exclude 
modules from meson builds per configuration file (as we have with 'make' flow), 
right?

> # This scheme won't work for distro build, Please spend the effort to analyze 
> the conflict and fix the conflict. IMO, That would be the correct solution.
>
>
> >
> > Signed-off-by: Liron Himi 
> > ---
> >  config/defconfig_arm64-armada-linuxapp-gcc | 17 +
> >  1 file changed, 17 insertions(+)
> >
> > diff --git a/config/defconfig_arm64-armada-linuxapp-gcc
> > b/config/defconfig_arm64-armada-linuxapp-gcc
> > index 059180284..c09751cf0 100644
> > --- a/config/defconfig_arm64-armada-linuxapp-gcc
> > +++ b/config/defconfig_arm64-armada-linuxapp-gcc
> > @@ -19,6 +19,23 @@ CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO=y
> >
> >  # Disable NXP as it is conflict with MUSDK 
> > CONFIG_RTE_LIBRTE_DPAA_BUS=n
> > +CONFIG_RTE_LIBRTE_COMMON_DPAAX=n
> > +CONFIG_RTE_LIBRTE_FSLMC_BUS=n
> > +CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL=n
> > +CONFIG_RTE_LIBRTE_DPAA2_PMD=n
> > +CONFIG_RTE_LIBRTE_DPAA_BUS=n
> > +CONFIG_RTE_LIBRTE_DPAA_MEMPOOL=n
> > +CONFIG_RTE_LIBRTE_DPAA_PMD=n
> > +CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV=n
> > +CONFIG_RTE_LIBRTE_PMD_DPAA_SEC=n
> > +CONFIG_RTE_LIBRTE_PMD_CAAM_JR=n
> > +CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV=n
> > +CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC=n
> > +CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV=n
> > +CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV=n
> > +CONFIG_RTE_LIBRTE_PFE_PMD=n
> > +CONFIG_RTE_LIBRTE_ENETC_PMD=n
> > +
> >
> >  # Doesn't support NUMA
> >  CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n
> > --
> > 2.23.0
> >

[dpdk-dev] [PATCH v2] 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 
---

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 | 181 +++
 2 files changed, 182 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..b5ad66466
--- /dev/null
+++ b/doc/guides/howto/openwrt.rst
@@ -0,0 +1,181 @@
+..  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 x86 environment.
+
+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
+~
+
+* 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-64_gcc-8.3.0_glibc.Linux-x86_64/staging_dir
+   export RTE_SDK=`pwd`
+   export RTE_KERNELDIR=/build_dir/target-x86_64_glibc/linux-x86_64/linux-4.19.81/
+   make config T=x86_64-native-linuxapp-gcc
+   make -j 100 CROSS=x86_64-openwrt-linux-gnu-
+
+Running DPDK applic

Re: [dpdk-dev] [EXT] Re: [PATCH] config: update Marvell ARMADA

[Liron Himi]

Hi Jerin,

I have created a patch to MUSDK that fix this conflicts as you suggested.
This will be externally available in the next MUSDK release.
Once it will be out, we can simplify the armada-config, but until then if 
anyone want to build DPDK with MUSDK it either needs this patch or compile 
MUSDK as shared lib

Regards,
Liron

-Original Message-
From: Liron Himi 
Sent: Monday, 2 December 2019 08:32
To: Jerin Jacob 
Cc: Jerin Jacob Kollanukkaran ; dpdk-dev ; 
dpdk stable ; Liron Himi 
Subject: RE: [EXT] Re: [dpdk-dev] [PATCH] config: update Marvell ARMADA



Regards,
Liron

-Original Message-
From: Jerin Jacob 
Sent: Monday, 2 December 2019 06:12
To: Liron Himi 
Cc: Jerin Jacob Kollanukkaran ; dpdk-dev ; 
dpdk stable 
Subject: Re: [EXT] Re: [dpdk-dev] [PATCH] config: update Marvell ARMADA

>
> --
> On Fri, Nov 29, 2019 at 3:55 PM  wrote:
> >
> > From: Liron Himi 
> >
> > disable more NXP modules that conflict with MUSDK
>
> # Please share more details on the conflict.
> [L.H.] both components calls of_ APIs so when MUSDK is compiled statically 
> it conflicts with NXP's code.

If something implemented in the library, IMO, it should start with the library 
name to avoid namespace collision.
Are we implementing of_x calls in MUSDK? 
[L.H.] yes. It is not the same implementation as in dpaa_of.c Could you share 
the error logs?
[L.H.] 
/home/userlab/work/combined_git/dataplane/musdk/usr/local/lib/libmusdk.a(libmusdk_la-of.o):
 In function `of_n_addr_cells':
/home/userlab/work/combined_git/dataplane/musdk/src/env/of.c:348: multiple 
definition of `of_n_addr_cells'
/home/userlab/work/combined_git/dataplane/dpdk-19.11/build/lib/librte_common_dpaax.a(dpaa_of.o):dpaa_of.c:(.text+0x13b8):
 first defined here

> Note that the original armada config already had some NXP flags disabled, but 
> in recent version NXP moved the of_ code to be depends on 
> 'CONFIG_RTE_LIBRTE_COMMON_DPAAX' so needed to update it.

OK

> # What about meson build? "make" will be deprecated soon.
> [L.H.] only when compiling the MUSDK as static LIBs, we face this issue. In 
> meson we need to compile MUSDK as shared LIBS.

But nothing stopping us to compile MUSDK as static build with meson. Right?
[L.H.] right, but currently it will not work AFAIK there is no way to exclude 
modules from meson builds per configuration file (as we have with 'make' flow), 
right?

> # This scheme won't work for distro build, Please spend the effort to analyze 
> the conflict and fix the conflict. IMO, That would be the correct solution.
>
>
> >
> > Signed-off-by: Liron Himi 
> > ---
> >  config/defconfig_arm64-armada-linuxapp-gcc | 17 +
> >  1 file changed, 17 insertions(+)
> >
> > diff --git a/config/defconfig_arm64-armada-linuxapp-gcc
> > b/config/defconfig_arm64-armada-linuxapp-gcc
> > index 059180284..c09751cf0 100644
> > --- a/config/defconfig_arm64-armada-linuxapp-gcc
> > +++ b/config/defconfig_arm64-armada-linuxapp-gcc
> > @@ -19,6 +19,23 @@ CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO=y
> >
> >  # Disable NXP as it is conflict with MUSDK 
> > CONFIG_RTE_LIBRTE_DPAA_BUS=n
> > +CONFIG_RTE_LIBRTE_COMMON_DPAAX=n
> > +CONFIG_RTE_LIBRTE_FSLMC_BUS=n
> > +CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL=n
> > +CONFIG_RTE_LIBRTE_DPAA2_PMD=n
> > +CONFIG_RTE_LIBRTE_DPAA_BUS=n
> > +CONFIG_RTE_LIBRTE_DPAA_MEMPOOL=n
> > +CONFIG_RTE_LIBRTE_DPAA_PMD=n
> > +CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV=n
> > +CONFIG_RTE_LIBRTE_PMD_DPAA_SEC=n
> > +CONFIG_RTE_LIBRTE_PMD_CAAM_JR=n
> > +CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV=n
> > +CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC=n
> > +CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV=n
> > +CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV=n
> > +CONFIG_RTE_LIBRTE_PFE_PMD=n
> > +CONFIG_RTE_LIBRTE_ENETC_PMD=n
> > +
> >
> >  # Doesn't support NUMA
> >  CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n
> > --
> > 2.23.0
> >

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

[Jerin Jacob]

On Mon, Dec 2, 2019 at 3:38 PM Xiaolong Ye  wrote:
>
> This doc describes how to enable DPDK on openwrt in both virtual and
> physical x86 environment.


Could you split the documentation into generic and x86 specific? So
other architectures
can add the architecture-specific details instead of duplicating.


>
> Signed-off-by: Xiaolong Ye 
> ---
>
> 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 | 181 +++
>  2 files changed, 182 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..b5ad66466
> --- /dev/null
> +++ b/doc/guides/howto/openwrt.rst
> @@ -0,0 +1,181 @@
> +..  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 x86 environment.
> +
> +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
> +~
> +
> +* 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 `` Root>/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= sdk>/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= toolchain dir>
> +   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

Re: [dpdk-dev] [EXT] Re: [PATCH] config: update Marvell ARMADA

[Jerin Jacob]

On Mon, Dec 2, 2019 at 4:01 PM Liron Himi  wrote:
>
> Hi Jerin,
>
> I have created a patch to MUSDK that fix this conflicts as you suggested.
> This will be externally available in the next MUSDK release.
> Once it will be out, we can simplify the armada-config, but until then if 
> anyone want to build DPDK with MUSDK it either needs this patch or compile 
> MUSDK as shared lib

Good that it is fixed in the library. +1 for this patch as short terms
solution till next MUSDK releases shows up.


>
> Regards,
> Liron
>
> -Original Message-
> From: Liron Himi
> Sent: Monday, 2 December 2019 08:32
> To: Jerin Jacob 
> Cc: Jerin Jacob Kollanukkaran ; dpdk-dev ; 
> dpdk stable ; Liron Himi 
> Subject: RE: [EXT] Re: [dpdk-dev] [PATCH] config: update Marvell ARMADA
>
>
>
> Regards,
> Liron
>
> -Original Message-
> From: Jerin Jacob 
> Sent: Monday, 2 December 2019 06:12
> To: Liron Himi 
> Cc: Jerin Jacob Kollanukkaran ; dpdk-dev ; 
> dpdk stable 
> Subject: Re: [EXT] Re: [dpdk-dev] [PATCH] config: update Marvell ARMADA
>
> >
> > --
> > On Fri, Nov 29, 2019 at 3:55 PM  wrote:
> > >
> > > From: Liron Himi 
> > >
> > > disable more NXP modules that conflict with MUSDK
> >
> > # Please share more details on the conflict.
> > [L.H.] both components calls of_ APIs so when MUSDK is compiled 
> > statically it conflicts with NXP's code.
>
> If something implemented in the library, IMO, it should start with the 
> library name to avoid namespace collision.
> Are we implementing of_x calls in MUSDK?
> [L.H.] yes. It is not the same implementation as in dpaa_of.c Could you share 
> the error logs?
> [L.H.] 
> /home/userlab/work/combined_git/dataplane/musdk/usr/local/lib/libmusdk.a(libmusdk_la-of.o):
>  In function `of_n_addr_cells':
> /home/userlab/work/combined_git/dataplane/musdk/src/env/of.c:348: multiple 
> definition of `of_n_addr_cells'
> /home/userlab/work/combined_git/dataplane/dpdk-19.11/build/lib/librte_common_dpaax.a(dpaa_of.o):dpaa_of.c:(.text+0x13b8):
>  first defined here
>
> > Note that the original armada config already had some NXP flags disabled, 
> > but in recent version NXP moved the of_ code to be depends on 
> > 'CONFIG_RTE_LIBRTE_COMMON_DPAAX' so needed to update it.
>
> OK
>
> > # What about meson build? "make" will be deprecated soon.
> > [L.H.] only when compiling the MUSDK as static LIBs, we face this issue. In 
> > meson we need to compile MUSDK as shared LIBS.
>
> But nothing stopping us to compile MUSDK as static build with meson. Right?
> [L.H.] right, but currently it will not work AFAIK there is no way to exclude 
> modules from meson builds per configuration file (as we have with 'make' 
> flow), right?
>
> > # This scheme won't work for distro build, Please spend the effort to 
> > analyze the conflict and fix the conflict. IMO, That would be the correct 
> > solution.
> >
> >
> > >
> > > Signed-off-by: Liron Himi 
> > > ---
> > >  config/defconfig_arm64-armada-linuxapp-gcc | 17 +
> > >  1 file changed, 17 insertions(+)
> > >
> > > diff --git a/config/defconfig_arm64-armada-linuxapp-gcc
> > > b/config/defconfig_arm64-armada-linuxapp-gcc
> > > index 059180284..c09751cf0 100644
> > > --- a/config/defconfig_arm64-armada-linuxapp-gcc
> > > +++ b/config/defconfig_arm64-armada-linuxapp-gcc
> > > @@ -19,6 +19,23 @@ CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO=y
> > >
> > >  # Disable NXP as it is conflict with MUSDK
> > > CONFIG_RTE_LIBRTE_DPAA_BUS=n
> > > +CONFIG_RTE_LIBRTE_COMMON_DPAAX=n
> > > +CONFIG_RTE_LIBRTE_FSLMC_BUS=n
> > > +CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL=n
> > > +CONFIG_RTE_LIBRTE_DPAA2_PMD=n
> > > +CONFIG_RTE_LIBRTE_DPAA_BUS=n
> > > +CONFIG_RTE_LIBRTE_DPAA_MEMPOOL=n
> > > +CONFIG_RTE_LIBRTE_DPAA_PMD=n
> > > +CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV=n
> > > +CONFIG_RTE_LIBRTE_PMD_DPAA_SEC=n
> > > +CONFIG_RTE_LIBRTE_PMD_CAAM_JR=n
> > > +CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV=n
> > > +CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC=n
> > > +CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV=n
> > > +CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV=n
> > > +CONFIG_RTE_LIBRTE_PFE_PMD=n
> > > +CONFIG_RTE_LIBRTE_ENETC_PMD=n
> > > +
> > >
> > >  # Doesn't support NUMA
> > >  CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n
> > > --
> > > 2.23.0
> > >

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

[Xiaolong Ye]

Hi,

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.

Thanks,
Xiaolong

Xiaolong Ye (69):
  net/i40e/base: add support for feature flags
  net/i40e/base: add ESXi support to transition to flat NVM
  net/i40e/base: increase max VSI count for VFs
  net/i40e/base: change buffer address
  net/i40e/base: change for X722 10G-T ports LED
  net/i40e/base: decouple cfg_lldp_mib_change from init_dcb
  net/i40e/base: changed FW API version to 1.8
  net/i40e/base: change misleading error message
  net/i40e/base: shadowRAM checksum calculation change
  net/i40e/base: update Fort Park FW API to 1.8
  net/i40e/base: further implementation of LLDP
  net/i40e/base: add new device ids for Carlsville
  net/i40e/base: add check for MAC type
  net/i40e/base: adding flags for PHY types
  net/i40e/base: revert ShadowRAM checksum calculation change
  net/i40e/base: improve AQ log granularity
  net/i40e/base: change condition checks
  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 reading LPI state
  net/i40e/base: change for missing "link modes"
  net/i40e/base: add reading LPI counters
  net/i40e/base: update virtchnl.h
  net/i40e/base: add opcodes reserved comments
  net/i40e/base: revert Fix missing "fall through" comments
  net/i40e/base: backport style changes from upstream Linux
  net/i40e/base: update status codes
  net/i40e/base: use TX_LPI_EN bit to fully turn off EEE
  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: check_recovery_mode had wrong if statement
  net/i40e/base: update FVL FW API version to 1.9
  net/i40e/base: update FPK FW API version to 1.9
  net/i40e/base: add persistent lldp support
  net/i40e/base: make i40e_set_mac_type() public
  net/i40e/base: change retrying
  net/i40e/base: revert fix for X722 10G-T ports LED
  net/i40e/base: change link flapping on 25g cards
  net/i40e/base: changeed code wrapping for CARLSVILLE_HW
  net/i40e/base: change long redundant define names
  net/i40e/base: mark additional missing bits as reserved
  net/i40e/base: change for persistent lldp support
  net/i40e/base: change wrong 'Advertised FEC modes'
  net/i40e/base: implement lpi statistics read from registers
  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: add MRR field defines
  net/i40e/base: exposing missing LED functionality
  net/i40e/base: introduce firmware EMP reset register offsets
  net/i40e/base: change for reading lpi statistics
  net/i40e/base: update FVL FW API version to 1.10
  net/i40e/base: add CRC stripping capability
  net/i40e/base: update virtchnl header with advanced features
  net/i40e/base: add limits for nested structures
  net/i40e/base: put the check for zero nested elements higher
  net/i40e/base: clarify requirements
  net/i40e/base: change 'Unknown bps'
  net/i40e/base: add USO offload flag for AVF
  net/i40e/base: update the interrupt mapping and negotiation
  net/i40e/base: add inline ipsec data struct and commands
  net/i40e/base: change all zero-sized arrays
  net/i40e/base: support for additional flow type
  net/i40e/base: change GET/SET_RSS_LUT valid_len check
  net/i40e/base: add missing 0 length checks
  net/i40e/base: update version

 drivers/net/i40e/base/README|   2 +-
 drivers/net/i40e/base/i40e_adminq.c | 105 +--
 drivers/net/i40e/base/i40e_adminq_cmd.h | 100 ++-
 drivers/net/i40e/base/i40e_common.c | 554 +-
 drivers/net/i40e/base/i40e_dcb.c| 122 ++-
 drivers/net/i40e/base/i40e_dcb.h|  17 +-
 drivers/net/i40e/base/i40e_devids.h |   2 +
 drivers/net/i40e/base/i40e_nvm.c| 113 ++-
 drivers/net/i40e/base/i40e_prototype.h  |  68 +-
 drivers/net/i40e/base/i40e_register.h   |  95 +++
 drivers/net/i40e/base/i40e_type.h   |  51 +-
 drivers/net/i40e/base/virtchnl.h| 943 +++-
 drivers/net/i40e/i40e_ethdev.c  |  12 +-
 drivers/net/i40e/rte_pmd_i40e.c |   4 +-
 14 files changed, 2011 insertions(+), 177 deletions(-)

-- 
2.17.1

[dpdk-dev] [PATCH 01/69] 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 
Reviewed-by: Arkadiusz Grubba 
Reviewed-by: Williams Mitch A 
Reviewed-by: Joyner Eric 
Reviewed-by: Kirsher Jeffrey T 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_common.c | 25 +
 drivers/net/i40e/base/i40e_nvm.c| 42 ++---
 drivers/net/i40e/base/i40e_type.h   | 22 +++
 3 files changed, 86 insertions(+), 3 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_common.c 
b/drivers/net/i40e/base/i40e_common.c
index 37911a99e..68348858d 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -1015,6 +1015,31 @@ enum i40e_status_code i40e_init_shared_code(struct 
i40e_hw *hw)
hw->flags |= I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE |
 I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK;
 
+#ifdef I40E_NVMUPD_SUPPORT
+#ifndef EXTERNAL_RELEASE
+   /* At the moment there are only two OSes where this feature
+* is required - FreeBSD and Linux. FreeBSD driver does
+* not support transition to Flat NVM. Use preprocessor
+* tag to ensure that this is exposed only for Linux.
+*/
+#endif
+   /* 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);
+
+#ifdef LINUX_SUPPORT
+   hw->nvmupd_features.features[0] = I40E_NVMUPD_FEATURE_FLAT_NVM_SUPPORT;
+#else
+   /* No features supported at the moment */
+   hw->nvmupd_features.features[0] = 0;
+#endif
+#endif /* I40E_NVMUPD_SUPPORT */
+
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;
+   }

[dpdk-dev] [PATCH 03/69] 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 
Reviewed-by: Kirsher Jeffrey T 
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 05/69] net/i40e/base: change for X722 10G-T ports LED

[Xiaolong Ye]

On some hardware LEDs would not blink after command 'ethtool -p {eth-port}'
in certain circumstances. Now, function does not care about the activity
of the LED (though still preserves its state) but forcibly executes
identification blinking and then restores the LED state.

Signed-off-by: Piotr Marczak 
Reviewed-by: Aleksandr Loktionov 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_common.c | 35 -
 1 file changed, 35 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_common.c 
b/drivers/net/i40e/base/i40e_common.c
index a87d2fa6b..f6e55e3a9 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -1589,7 +1589,6 @@ static u32 i40e_led_is_mine(struct i40e_hw *hw, int idx)
  **/
 u32 i40e_led_get(struct i40e_hw *hw)
 {
-   u32 current_mode = 0;
u32 mode = 0;
int i;
 
@@ -1601,27 +1600,10 @@ u32 i40e_led_get(struct i40e_hw *hw)
 
if (!gpio_val)
continue;
-
-   /* ignore gpio LED src mode entries related to the activity
-*  LEDs
-*/
-   current_mode = ((gpio_val & I40E_GLGEN_GPIO_CTL_LED_MODE_MASK)
-   >> I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT);
-   switch (current_mode) {
-   case I40E_COMBINED_ACTIVITY:
-   case I40E_FILTER_ACTIVITY:
-   case I40E_MAC_ACTIVITY:
-   case I40E_LINK_ACTIVITY:
-   continue;
-   default:
-   break;
-   }
-
mode = (gpio_val & I40E_GLGEN_GPIO_CTL_LED_MODE_MASK) >>
I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT;
break;
}
-
return mode;
 }
 
@@ -1636,7 +1618,6 @@ u32 i40e_led_get(struct i40e_hw *hw)
  **/
 void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink)
 {
-   u32 current_mode = 0;
int i;
 
if (mode & 0xfff0)
@@ -1650,22 +1631,6 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool 
blink)
 
if (!gpio_val)
continue;
-
-   /* ignore gpio LED src mode entries related to the activity
-* LEDs
-*/
-   current_mode = ((gpio_val & I40E_GLGEN_GPIO_CTL_LED_MODE_MASK)
-   >> I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT);
-   switch (current_mode) {
-   case I40E_COMBINED_ACTIVITY:
-   case I40E_FILTER_ACTIVITY:
-   case I40E_MAC_ACTIVITY:
-   case I40E_LINK_ACTIVITY:
-   continue;
-   default:
-   break;
-   }
-
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) &
-- 
2.17.1

[dpdk-dev] [PATCH 08/69] 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 
Reviewed-by: Aleksandr Loktionov 
Reviewed-by: Kirsher Jeffrey T 
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 06/69] 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 
Reviewed-by: Aleksandr Loktionov 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_dcb.c | 52 +++-
 drivers/net/i40e/base/i40e_dcb.h |  5 ++-
 drivers/net/i40e/i40e_ethdev.c   |  4 +--
 3 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_dcb.c b/drivers/net/i40e/base/i40e_dcb.c
index a26f82b3a..832d8f3fb 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,27 +897,48 @@ 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 (enable_mib_change)
+   ret = i40e_aq_cfg_lldp_mib_change_event(hw, true, NULL);
+
+   return ret;
+}
+
+/**
+ * i40e_cfg_lldp_mib_change
+ * @hw: pointer to the hw struct
+ * @ena_mib: enable/disable MIB change event
+ *
+ * Configure (disable/enable) MIB
+ */
+enum i40e_status_code i40e_cfg_lldp_mib_change(struct i40e_hw *hw, bool 
ena_mib)
+{
+   enum i40e_status_code ret = I40E_SUCCESS;
+
+   if (!hw->func_caps.dcb)
+   return I40E_NOT_SUPPORTED;
+
+   /* Get DCBX status */
+   ret = i40e_get_dcbx_status(hw, &hw->dcbx_status);
if (ret)
return ret;
 
+   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, ena_mib, NULL);
+
return ret;
 }
 
diff --git a/drivers/net/i40e/base/i40e_dcb.h b/drivers/net/i40e/base/i40e_dcb.h
index 85b0eed3a..f7cdc27a3 100644
--- a/drivers/net/i40e/base/i40e_dcb.h
+++ b/drivers/net/i40e/base/i40e_dcb.h
@@ -186,7 +186,10 @@ 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_cfg_lldp_mib_change(struct i40e_hw *hw,
+  bool ena_mib);
 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..ca83c56df 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/dr

[dpdk-dev] [PATCH 07/69] net/i40e/base: changed FW API version to 1.8

[Xiaolong Ye]

A new FW has been released, which uses API version 1.8.

Signed-off-by: Adam Ludkiewicz 
Reviewed-by: Kirsher Jeffrey T 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_adminq_cmd.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/i40e/base/i40e_adminq_cmd.h 
b/drivers/net/i40e/base/i40e_adminq_cmd.h
index b459be921..660a9af04 100644
--- a/drivers/net/i40e/base/i40e_adminq_cmd.h
+++ b/drivers/net/i40e/base/i40e_adminq_cmd.h
@@ -13,7 +13,7 @@
 
 #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_X710 0x0008
 
 #define I40E_FW_MINOR_VERSION(_h) ((_h)->mac.type == I40E_MAC_XL710 ? \
I40E_FW_API_VERSION_MINOR_X710 : \
-- 
2.17.1

[dpdk-dev] [PATCH 02/69] net/i40e/base: add ESXi support to transition to flat NVM

[Xiaolong Ye]

ESXi is required to transition back to a flat NVM from structured. Adding
ifdef support for ESXi.

Signed-off-by: Doug Dziggel 
Reviewed-by: Stillwell Jr Paul M 
Reviewed-by: Williams Mitch A 
Reviewed-by: Kirsher Jeffrey T 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_common.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_common.c 
b/drivers/net/i40e/base/i40e_common.c
index 68348858d..ed9ad011d 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -1017,10 +1017,10 @@ enum i40e_status_code i40e_init_shared_code(struct 
i40e_hw *hw)
 
 #ifdef I40E_NVMUPD_SUPPORT
 #ifndef EXTERNAL_RELEASE
-   /* At the moment there are only two OSes where this feature
-* is required - FreeBSD and Linux. FreeBSD driver does
+   /* At the moment there are only three OSes where this feature
+* is required - ESX, FreeBSD and Linux. FreeBSD driver does
 * not support transition to Flat NVM. Use preprocessor
-* tag to ensure that this is exposed only for Linux.
+* tag to ensure that this is exposed only for Linux and esx.
 */
 #endif
/* NVMUpdate features structure initialization */
@@ -1032,7 +1032,7 @@ enum i40e_status_code i40e_init_shared_code(struct 
i40e_hw *hw)
sizeof(*hw->nvmupd_features.features),
I40E_NONDMA_MEM);
 
-#ifdef LINUX_SUPPORT
+#if defined(LINUX_SUPPORT) || defined(ESX_SUPPORT)
hw->nvmupd_features.features[0] = I40E_NVMUPD_FEATURE_FLAT_NVM_SUPPORT;
 #else
/* No features supported at the moment */
-- 
2.17.1

[dpdk-dev] [PATCH 04/69] 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 
Reviewed-by: Stillwell Jr Paul M 
Reviewed-by: Galazka Krzysztof 
Reviewed-by: Joyner Eric 
Reviewed-by: Kirsher Jeffrey T 
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 ed9ad011d..a87d2fa6b 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -4325,7 +4325,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 09/69] net/i40e/base: shadowRAM checksum calculation change

[Xiaolong Ye]

Due to changes in FW the SW is required to perform double SR dump in
some cases.
Implementation adds two new steps to update nvm checksum function:
- recalculate checksum and check if checksum in NVM is correct
- if checksum in NVM is not correct then update it again

Signed-off-by: Maciej Paczkowski 
Reviewed-by: Paul M Stillwell Jr 
Reviewed-by: Galazka Krzysztof 
Reviewed-by: Azarewicz Piotr 
Reviewed-by: Aleksandr Loktionov 
Reviewed-by: Kirsher Jeffrey T 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_nvm.c | 28 +---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_nvm.c b/drivers/net/i40e/base/i40e_nvm.c
index c8b401cdd..8c94b6072 100644
--- a/drivers/net/i40e/base/i40e_nvm.c
+++ b/drivers/net/i40e/base/i40e_nvm.c
@@ -676,16 +676,38 @@ enum i40e_status_code i40e_calc_nvm_checksum(struct 
i40e_hw *hw, u16 *checksum)
 enum i40e_status_code i40e_update_nvm_checksum(struct i40e_hw *hw)
 {
enum i40e_status_code ret_code = I40E_SUCCESS;
-   u16 checksum;
+   u16 checksum, checksum_sr;
__le16 le_sum;
 
DEBUGFUNC("i40e_update_nvm_checksum");
 
ret_code = i40e_calc_nvm_checksum(hw, &checksum);
+   if (ret_code)
+   return ret_code;
+
le_sum = CPU_TO_LE16(checksum);
-   if (ret_code == I40E_SUCCESS)
-   ret_code = i40e_write_nvm_aq(hw, 0x00, I40E_SR_SW_CHECKSUM_WORD,
+   ret_code = i40e_write_nvm_aq(hw, 0x00, I40E_SR_SW_CHECKSUM_WORD,
+1, &le_sum, true);
+   if (ret_code)
+   return ret_code;
+
+   /* Due to changes in FW the SW is required to perform double SR-dump
+* in some cases. SR-dump is the process when internal shadow RAM is
+* dumped into flash bank. It is triggered by setting "last_command"
+* argument in i40e_write_nvm_aq function call.
+* Since FW 1.8 we need to calculate SR checksum again and update it
+* in flash if it is not equal to previously computed checksum.
+* This situation would occur only in FW >= 1.8
+*/
+   ret_code = i40e_calc_nvm_checksum(hw, &checksum_sr);
+   if (ret_code)
+   return ret_code;
+   if (checksum_sr != checksum) {
+   le_sum = CPU_TO_LE16(checksum_sr);
+   ret_code = i40e_write_nvm_aq(hw, 0x00,
+I40E_SR_SW_CHECKSUM_WORD,
 1, &le_sum, true);
+   }
 
return ret_code;
 }
-- 
2.17.1

[dpdk-dev] [PATCH 10/69] net/i40e/base: update Fort Park FW API to 1.8

[Xiaolong Ye]

In previous commits only FVL FW API was updated to 1.8. However, NVMs
from upcoming FVL SW7 project advertise FW API version 1.8 both for FVL
and FPK.

Signed-off-by: Maciej Rabeda 
Reviewed-by: Galazka Krzysztof 
Reviewed-by: Nicholas Nunley 
Reviewed-by: Kirsher Jeffrey T 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_adminq_cmd.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/i40e/base/i40e_adminq_cmd.h 
b/drivers/net/i40e/base/i40e_adminq_cmd.h
index 660a9af04..7a980cde9 100644
--- a/drivers/net/i40e/base/i40e_adminq_cmd.h
+++ b/drivers/net/i40e/base/i40e_adminq_cmd.h
@@ -12,7 +12,7 @@
  */
 
 #define I40E_FW_API_VERSION_MAJOR  0x0001
-#define I40E_FW_API_VERSION_MINOR_X722 0x0006
+#define I40E_FW_API_VERSION_MINOR_X722 0x0008
 #define I40E_FW_API_VERSION_MINOR_X710 0x0008
 
 #define I40E_FW_MINOR_VERSION(_h) ((_h)->mac.type == I40E_MAC_XL710 ? \
-- 
2.17.1