From: Peng Zhang <peng.zh...@corigine.com>
Configure the VF queue, now every VF just have one queue.
Signed-off-by: Peng Zhang <peng.zh...@corigine.com>
Reviewed-by: Chaoyong He <chaoyong...@corigine.com>
Reviewed-by: Long Wu <long...@corigine.com>
---
drivers/common/nfp/nfp_common_ctrl.h | 2 ++
drivers/net/nfp/nfp_ethdev.c | 3 +++
drivers/net/nfp/nfp_net_common.c | 38 ++++++++++++++++++++++++++++
drivers/net/nfp/nfp_net_common.h | 2 ++
4 files changed, 45 insertions(+)
diff --git a/drivers/common/nfp/nfp_common_ctrl.h
b/drivers/common/nfp/nfp_common_ctrl.h
index a52c33508e..69596dd6f5 100644
--- a/drivers/common/nfp/nfp_common_ctrl.h
+++ b/drivers/common/nfp/nfp_common_ctrl.h
@@ -24,9 +24,11 @@
/* VF config mailbox */
#define NFP_NET_VF_CFG_MB 0x0
#define NFP_NET_VF_CFG_MB_CAP 0x0
+#define NFP_NET_VF_CFG_MB_CAP_QUEUE_CONFIG (0x1 << 7)
#define NFP_NET_VF_CFG_MB_CAP_SPLIT (0x1 << 8)
#define NFP_NET_VF_CFG_MB_RET 0x2
#define NFP_NET_VF_CFG_MB_UPD 0x4
+#define NFP_NET_VF_CFG_MB_UPD_QUEUE_CONFIG (0x1 << 7)
#define NFP_NET_VF_CFG_MB_UPD_SPLIT (0x1 << 8)
#define NFP_NET_VF_CFG_MB_VF_CNT 0x6
#define NFP_NET_VF_CFG_MB_VF_NUM 0x7
diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index f9f0884c88..1d88f33756 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -36,6 +36,7 @@
#define NFP_PF_DRIVER_NAME net_nfp_pf
#define NFP_PF_FORCE_RELOAD_FW "force_reload_fw"
#define NFP_CPP_SERVICE_ENABLE "cpp_service_enable"
+#define NFP_QUEUE_PER_VF 1
struct nfp_net_init {
/** Sequential physical port number, only valid for CoreNIC firmware */
@@ -1973,6 +1974,8 @@ nfp_net_get_vf_info(struct nfp_pf_dev *pf_dev,
if (ret < 0)
return ret;
+ pf_dev->queue_per_vf = NFP_QUEUE_PER_VF;
+
return 0;
}
diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c
index e1cae983b2..f8566d94d7 100644
--- a/drivers/net/nfp/nfp_net_common.c
+++ b/drivers/net/nfp/nfp_net_common.c
@@ -2654,6 +2654,38 @@ nfp_net_sriov_update(struct nfp_net_hw *net_hw,
return 0;
}
+static int
+nfp_net_vf_queues_config(struct nfp_net_hw *net_hw,
+ struct nfp_pf_dev *pf_dev)
+{
+ int ret;
+ uint32_t i;
+ uint32_t offset;
+
+ ret = nfp_net_sriov_check(pf_dev, NFP_NET_VF_CFG_MB_CAP_QUEUE_CONFIG);
+ if (ret != 0) {
+ if (ret == -ENOTSUP) {
+ PMD_INIT_LOG(WARNING, "Set VF max queue not supported");
+ return 0;
+ }
+
+ PMD_INIT_LOG(ERR, "Set VF max queue failed");
+ return ret;
+ }
+
+ offset = NFP_NET_VF_CFG_MB_SZ + pf_dev->max_vfs * NFP_NET_VF_CFG_SZ;
+ for (i = 0; i < pf_dev->sriov_vf; i++) {
+ ret = nfp_net_vf_reconfig(net_hw, pf_dev,
NFP_NET_VF_CFG_MB_UPD_QUEUE_CONFIG,
+ pf_dev->queue_per_vf, pf_dev->vf_base_id +
offset + i);
+ if (ret != 0) {
+ PMD_INIT_LOG(ERR, "Set VF max_queue failed");
+ return ret;
+ }
+ }
+
+ return 0;
+}
+
static int
nfp_net_sriov_init(struct nfp_net_hw *net_hw,
struct nfp_pf_dev *pf_dev)
@@ -2697,5 +2729,11 @@ nfp_net_vf_config_app_init(struct nfp_net_hw *net_hw,
return ret;
}
+ ret = nfp_net_vf_queues_config(net_hw, pf_dev);
+ if (ret != 0) {
+ PMD_INIT_LOG(ERR, "Failed to config vf queue");
+ return ret;
+ }
+
return 0;
}
diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h
index 4b5029f3f4..b5c6152857 100644
--- a/drivers/net/nfp/nfp_net_common.h
+++ b/drivers/net/nfp/nfp_net_common.h
@@ -158,6 +158,8 @@ struct nfp_pf_dev {
uint8_t total_phyports;
/** Id of first VF that belongs to this PF */
uint8_t vf_base_id;
+ /** Number of queues per VF */
+ uint32_t queue_per_vf;
};
#define NFP_NET_FLOW_LIMIT 1024
--
2.39.1
