[PATCH 03/10] vdpa/nfp: fix the logic of reconfiguration

[Chaoyong He]

From: Xinying Yu <xinying...@corigine.com>

The ctrl words of vDPA is locate on the extend word, so should
use the 'nfp_ext_reconfig()' rather than 'nfp_reconfig()'.

Also replace the misuse of 'NFP_NET_CFG_CTRL_SCATTER' macro
with 'NFP_NET_CFG_CTRL_VIRTIO'.

Fixes: b47a0373903f ("vdpa/nfp: add datapath update")
Cc: chaoyong...@corigine.com
Cc: sta...@dpdk.org

Signed-off-by: Xinying Yu <xinying...@corigine.com>
Reviewed-by: Chaoyong He <chaoyong...@corigine.com>
Reviewed-by: Long Wu <long...@corigine.com>
Reviewed-by: Peng Zhang <peng.zh...@corigine.com>
---
 drivers/common/nfp/nfp_common_ctrl.h |  1 +
 drivers/vdpa/nfp/nfp_vdpa_core.c     | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/drivers/common/nfp/nfp_common_ctrl.h 
b/drivers/common/nfp/nfp_common_ctrl.h
index 6badf769fc..a0e62b063d 100644
--- a/drivers/common/nfp/nfp_common_ctrl.h
+++ b/drivers/common/nfp/nfp_common_ctrl.h
@@ -184,6 +184,7 @@ struct nfp_net_fw_ver {
 #define NFP_NET_CFG_CTRL_IPSEC_LM_LOOKUP  (0x1 << 4) /**< SA long match lookup 
*/
 #define NFP_NET_CFG_CTRL_MULTI_PF         (0x1 << 5)
 #define NFP_NET_CFG_CTRL_FLOW_STEER       (0x1 << 8) /**< Flow Steering */
+#define NFP_NET_CFG_CTRL_VIRTIO           (0x1 << 10) /**< Virtio offload */
 #define NFP_NET_CFG_CTRL_IN_ORDER         (0x1 << 11) /**< Virtio in-order 
flag */
 #define NFP_NET_CFG_CTRL_USO              (0x1 << 16) /**< UDP segmentation 
offload */
 
diff --git a/drivers/vdpa/nfp/nfp_vdpa_core.c b/drivers/vdpa/nfp/nfp_vdpa_core.c
index 291798196c..6d07356581 100644
--- a/drivers/vdpa/nfp/nfp_vdpa_core.c
+++ b/drivers/vdpa/nfp/nfp_vdpa_core.c
@@ -101,7 +101,7 @@ nfp_vdpa_hw_init(struct nfp_vdpa_hw *vdpa_hw,
 static uint32_t
 nfp_vdpa_check_offloads(void)
 {
-       return NFP_NET_CFG_CTRL_SCATTER |
+       return NFP_NET_CFG_CTRL_VIRTIO  |
                        NFP_NET_CFG_CTRL_IN_ORDER;
 }
 
@@ -112,6 +112,7 @@ nfp_vdpa_hw_start(struct nfp_vdpa_hw *vdpa_hw,
        int ret;
        uint32_t update;
        uint32_t new_ctrl;
+       uint32_t new_ext_ctrl;
        struct timespec wait_tst;
        struct nfp_hw *hw = &vdpa_hw->super;
        uint8_t mac_addr[RTE_ETHER_ADDR_LEN];
@@ -131,8 +132,6 @@ nfp_vdpa_hw_start(struct nfp_vdpa_hw *vdpa_hw,
        nfp_disable_queues(hw);
        nfp_enable_queues(hw, NFP_VDPA_MAX_QUEUES, NFP_VDPA_MAX_QUEUES);
 
-       new_ctrl = nfp_vdpa_check_offloads();
-
        nn_cfg_writel(hw, NFP_NET_CFG_MTU, 9216);
        nn_cfg_writel(hw, NFP_NET_CFG_FLBUFSZ, 10240);
 
@@ -147,8 +146,17 @@ nfp_vdpa_hw_start(struct nfp_vdpa_hw *vdpa_hw,
        /* Writing new MAC to the specific port BAR address */
        nfp_write_mac(hw, (uint8_t *)mac_addr);
 
+       new_ext_ctrl = nfp_vdpa_check_offloads();
+
+       update = NFP_NET_CFG_UPDATE_GEN;
+       ret = nfp_ext_reconfig(hw, new_ext_ctrl, update);
+       if (ret != 0)
+               return -EIO;
+
+       hw->ctrl_ext = new_ext_ctrl;
+
        /* Enable device */
-       new_ctrl |= NFP_NET_CFG_CTRL_ENABLE;
+       new_ctrl = NFP_NET_CFG_CTRL_ENABLE;
 
        /* Signal the NIC about the change */
        update = NFP_NET_CFG_UPDATE_MACADDR |
-- 
2.39.1