net/idpf: add VF support
PATCH 1/1 net/idpf: add VF support
From: Beilei Xing <[email protected]>
Support VF whose device id is 0x145c.
---
This patch depends on
https://patches.dpdk.org/project/dpdk/patch/[email protected]/.
drivers/net/idpf/idpf_ethdev.c | 88 ++++++++++++++++++++++++++++++---- drivers/net/idpf/idpf_ethdev.h | 2 + 2 files changed, 80 insertions(+), 10 deletions(-)
drivers/net/idpf/idpf_ethdev.c +78 -10
@@ -1078,6 +1078,7 @@ idpf_handle_virtchnl_msg(struct idpf_adapter_ext *adapter_ex)switch (mbx_op) {case idpf_mbq_opc_send_msg_to_peer_pf: +case idpf_mbq_opc_send_msg_to_peer_drv:if (vc_op ==VIRTCHNL2_OP_EVENT ) {if (ctlq_msg.data_len <sizeof (struct virtchnl2_event )) {PMD_DRV_LOG (ERR ,"Error event" );
@@ -1128,6 +1129,23 @@ idpf_dev_alarm_handler(void *param)rte_eal_alarm_set (IDPF_ALARM_INTERVAL , idpf_dev_alarm_handler, adapter); } +static int +idpf_hw_vf_reset_check (struct idpf_hw *hw) +{ +uint32_t reg; +int i; + +for (i =0 ; i <IDPF_RESET_WAIT_CNT ; i++) { + reg =IDPF_READ_REG (hw,VFGEN_RSTAT ); +if (reg !=0xFFFFFFFF && (reg &VFGEN_RSTAT_VFR_STATE_M )) +return 0 ; +rte_delay_ms (1000 ); + } + +PMD_INIT_LOG (ERR ,"VF reset timeout" ); +return -EBUSY ; +} +struct idpf_ctlq_create_info ctlq_info[IDPF_CTLQ_NUM ] = { { .type =IDPF_CTLQ_TYPE_MAILBOX_TX ,
@@ -1163,6 +1181,41 @@ struct idpf_ctlq_create_info ctlq_info[IDPF_CTLQ_NUM] = { } }; +struct idpf_ctlq_create_info vf_ctlq_info[IDPF_CTLQ_NUM ] = { + { + .type =IDPF_CTLQ_TYPE_MAILBOX_TX , + .id =IDPF_CTLQ_ID , + .len =IDPF_CTLQ_LEN , + .buf_size =IDPF_DFLT_MBX_BUF_SIZE , + .reg = { + .head =VF_ATQH , + .tail =VF_ATQT , + .len =VF_ATQLEN , + .bah =VF_ATQBAH , + .bal =VF_ATQBAL , + .len_mask =VF_ATQLEN_ATQLEN_M , + .len_ena_mask =VF_ATQLEN_ATQENABLE_M , + .head_mask =VF_ATQH_ATQH_M , + } + }, + { + .type =IDPF_CTLQ_TYPE_MAILBOX_RX , + .id =IDPF_CTLQ_ID , + .len =IDPF_CTLQ_LEN , + .buf_size =IDPF_DFLT_MBX_BUF_SIZE , + .reg = { + .head =VF_ARQH , + .tail =VF_ARQT , + .len =VF_ARQLEN , + .bah =VF_ARQBAH , + .bal =VF_ARQBAL , + .len_mask =VF_ARQLEN_ARQLEN_M , + .len_ena_mask =VF_ARQLEN_ARQENABLE_M , + .head_mask =VF_ARQH_ARQH_M , + } + } +}; +static int idpf_adapter_ext_init (struct rte_pci_device *pci_dev,struct idpf_adapter_ext *adapter) {
@@ -1179,17 +1232,31 @@ idpf_adapter_ext_init(struct rte_pci_device *pci_dev, struct idpf_adapter_ext *astrncpy (adapter->name, pci_dev->device.name,PCI_PRI_STR_SIZE ); -idpf_hw_pf_reset (hw); - ret =idpf_hw_pf_reset_check (hw); -if (ret !=0 ) { -PMD_INIT_LOG (ERR ,"PF is still resetting" ); - goto err_reset_check; - } +if (hw->device_id ==IDPF_DEV_ID_PF ) { +idpf_hw_pf_reset (hw); + ret =idpf_hw_pf_reset_check (hw); +if (ret !=0 ) { +PMD_INIT_LOG (ERR ,"PF is still resetting" ); + goto err_reset_check; + } - ret =idpf_hw_mbx_init (hw, ctlq_info); -if (ret !=0 ) { -PMD_INIT_LOG (ERR ,"Failed to init mailbox" ); - goto err_reset_check; + ret =idpf_hw_mbx_init (hw, ctlq_info); +if (ret !=0 ) { +PMD_INIT_LOG (ERR ,"Failed to init mailbox" ); + goto err_reset_check; + } + }else if (hw->device_id ==IDPF_DEV_ID_VF ) { + ret =idpf_hw_vf_reset_check (hw); +if (ret !=0 ) { +PMD_INIT_LOG (ERR ,"VF is still resetting" ); + goto err_reset_check; + } + + ret =idpf_hw_mbx_init (hw, vf_ctlq_info); +if (ret !=0 ) { +PMD_INIT_LOG (ERR ,"Failed to init mailbox" ); + goto err_reset_check; + } } ret =idpf_adapter_init (base);
@@ -1329,6 +1396,7 @@ idpf_dev_vport_init(struct rte_eth_dev *dev, void *init_params)static const struct rte_pci_id pci_id_idpf_map[] = { {RTE_PCI_DEVICE (IDPF_INTEL_VENDOR_ID ,IDPF_DEV_ID_PF ) }, + {RTE_PCI_DEVICE (IDPF_INTEL_VENDOR_ID ,IDPF_DEV_ID_SRIOV ) }, { .vendor_id =0 ,/* sentinel */ }, };
drivers/net/idpf/idpf_ethdev.h +2 -0
@@ -20,6 +20,8 @@#include <base/idpf_prototype.h> #include <base/virtchnl2.h> +#define IDPF_DEV_ID_SRIOV 0x145c +#define IDPF_MAX_VPORT_NUM 8#define IDPF_INVALID_VPORT_IDX 0xffff
Signature · 1 line
2.26.2
PATCH v2 1/1 net/idpf: add VF support
From: Beilei Xing <[email protected]>
Support VF whose device id is 0x145c.
---
v2 change:
- Rebase code based on new patchset:
https://patches.dpdk.org/project/dpdk/cover/[email protected]/
drivers/net/idpf/idpf_ethdev.c | 89 ++++++++++++++++++++++++++++++---- drivers/net/idpf/idpf_ethdev.h | 2 + 2 files changed, 81 insertions(+), 10 deletions(-)
drivers/net/idpf/idpf_ethdev.c +79 -10
@@ -1078,6 +1078,7 @@ idpf_handle_virtchnl_msg(struct idpf_adapter_ext *adapter_ex)switch (mbx_op) {case idpf_mbq_opc_send_msg_to_peer_pf: +case idpf_mbq_opc_send_msg_to_peer_drv:if (vc_op ==VIRTCHNL2_OP_EVENT ) {if (ctlq_msg.data_len <sizeof (struct virtchnl2_event )) {PMD_DRV_LOG (ERR ,"Error event" );
@@ -1128,6 +1129,23 @@ idpf_dev_alarm_handler(void *param)rte_eal_alarm_set (IDPF_ALARM_INTERVAL , idpf_dev_alarm_handler, adapter); } +static int +idpf_hw_vf_reset_check (struct idpf_hw *hw) +{ +uint32_t reg; +int i; + +for (i =0 ; i <IDPF_RESET_WAIT_CNT ; i++) { + reg =IDPF_READ_REG (hw,VFGEN_RSTAT ); +if (reg !=0xFFFFFFFF && (reg &VFGEN_RSTAT_VFR_STATE_M )) +return 0 ; +rte_delay_ms (1000 ); + } + +PMD_INIT_LOG (ERR ,"VF reset timeout" ); +return -EBUSY ; +} +static struct idpf_ctlq_create_info idpf_ctlq_info[IDPF_CTLQ_NUM ] = { { .type =IDPF_CTLQ_TYPE_MAILBOX_TX ,
@@ -1201,6 +1219,41 @@ static struct virtchnl2_get_capabilities req_caps = { .other_caps = VIRTCHNL2_CAP_WB_ON_ITR }; +struct idpf_ctlq_create_info vf_ctlq_info[IDPF_CTLQ_NUM ] = { + { + .type =IDPF_CTLQ_TYPE_MAILBOX_TX , + .id =IDPF_CTLQ_ID , + .len =IDPF_CTLQ_LEN , + .buf_size =IDPF_DFLT_MBX_BUF_SIZE , + .reg = { + .head =VF_ATQH , + .tail =VF_ATQT , + .len =VF_ATQLEN , + .bah =VF_ATQBAH , + .bal =VF_ATQBAL , + .len_mask =VF_ATQLEN_ATQLEN_M , + .len_ena_mask =VF_ATQLEN_ATQENABLE_M , + .head_mask =VF_ATQH_ATQH_M , + } + }, + { + .type =IDPF_CTLQ_TYPE_MAILBOX_RX , + .id =IDPF_CTLQ_ID , + .len =IDPF_CTLQ_LEN , + .buf_size =IDPF_DFLT_MBX_BUF_SIZE , + .reg = { + .head =VF_ARQH , + .tail =VF_ARQT , + .len =VF_ARQLEN , + .bah =VF_ARQBAH , + .bal =VF_ARQBAL , + .len_mask =VF_ARQLEN_ARQLEN_M , + .len_ena_mask =VF_ARQLEN_ARQENABLE_M , + .head_mask =VF_ARQH_ARQH_M , + } + } +}; +static int idpf_adapter_ext_init (struct rte_pci_device *pci_dev,struct idpf_adapter_ext *adapter) {
@@ -1217,17 +1270,32 @@ idpf_adapter_ext_init(struct rte_pci_device *pci_dev, struct idpf_adapter_ext *astrncpy (adapter->name, pci_dev->device.name,PCI_PRI_STR_SIZE ); -idpf_hw_pf_reset (hw); - ret =idpf_hw_pf_reset_check (hw); -if (ret !=0 ) { -PMD_INIT_LOG (ERR ,"PF is still resetting" ); - goto err_reset_check; - } +if (hw->device_id ==IDPF_DEV_ID_PF ) { +idpf_hw_pf_reset (hw); + ret =idpf_hw_pf_reset_check (hw); +if (ret !=0 ) { +PMD_INIT_LOG (ERR ,"PF is still resetting" ); + goto err_reset_check; + } + + ret =idpf_hw_mbx_init (hw, idpf_ctlq_info); +if (ret !=0 ) { +PMD_INIT_LOG (ERR ,"Failed to init mailbox" ); + goto err_reset_check; + } + }else if (hw->device_id ==IDPF_DEV_ID_VF ) { + ret =idpf_hw_vf_reset_check (hw); +if (ret !=0 ) { +PMD_INIT_LOG (ERR ,"VF is still resetting" ); + goto err_reset_check; + } + + ret =idpf_hw_mbx_init (hw, vf_ctlq_info); +if (ret !=0 ) { +PMD_INIT_LOG (ERR ,"Failed to init mailbox" ); + goto err_reset_check; + } - ret =idpf_hw_mbx_init (hw, idpf_ctlq_info); -if (ret !=0 ) { -PMD_INIT_LOG (ERR ,"Failed to init mailbox" ); - goto err_reset_check; }rte_memcpy (&base->caps, &req_caps,sizeof (struct virtchnl2_get_capabilities ));
@@ -1369,6 +1437,7 @@ idpf_dev_vport_init(struct rte_eth_dev *dev, void *init_params)static const struct rte_pci_id pci_id_idpf_map[] = { {RTE_PCI_DEVICE (IDPF_INTEL_VENDOR_ID ,IDPF_DEV_ID_PF ) }, + {RTE_PCI_DEVICE (IDPF_INTEL_VENDOR_ID ,IDPF_DEV_ID_SRIOV ) }, { .vendor_id =0 ,/* sentinel */ }, };
drivers/net/idpf/idpf_ethdev.h +2 -0
@@ -20,6 +20,8 @@#include <base/idpf_prototype.h> #include <base/virtchnl2.h> +#define IDPF_DEV_ID_SRIOV 0x145c +#define IDPF_MAX_VPORT_NUM 8#define IDPF_INVALID_VPORT_IDX 0xffff
Signature · 1 line
2.26.2
PATCH 1/1 net/idpf: add VF support
From: Beilei Xing <[email protected]>
Support VF whose device id is 0x145c.
---
v3 change:
- move check reset done function and mail box init to common module.
v2 change:
- Rebase code based on new patchset:
https://patches.dpdk.org/project/dpdk/cover/[email protected]/
drivers/common/idpf/idpf_common_device.c | 140 ++++++++++++++++------- drivers/common/idpf/idpf_common_device.h | 2 + drivers/net/idpf/idpf_ethdev.c | 2 + 3 files changed, 105 insertions(+), 39 deletions(-)
drivers/common/idpf/idpf_common_device.c +101 -39
@@ -16,6 +16,7 @@ idpf_reset_pf(struct idpf_hw *hw) }#define IDPF_RESET_WAIT_CNT 100 +static int idpf_check_pf_reset_done (struct idpf_hw *hw) {
@@ -33,48 +34,105 @@ idpf_check_pf_reset_done(struct idpf_hw *hw)return -EBUSY ; } -#define CTLQ_NUM 2static int -idpf_init_mbx (struct idpf_hw *hw) +idpf_check_vf_reset_done (struct idpf_hw *hw) { -struct idpf_ctlq_create_info ctlq_info[CTLQ_NUM ] = { - { - .type =IDPF_CTLQ_TYPE_MAILBOX_TX , - .id =IDPF_CTLQ_ID , - .len =IDPF_CTLQ_LEN , - .buf_size =IDPF_DFLT_MBX_BUF_SIZE , - .reg = { - .head =PF_FW_ATQH , - .tail =PF_FW_ATQT , - .len =PF_FW_ATQLEN , - .bah =PF_FW_ATQBAH , - .bal =PF_FW_ATQBAL , - .len_mask =PF_FW_ATQLEN_ATQLEN_M , - .len_ena_mask =PF_FW_ATQLEN_ATQENABLE_M , - .head_mask =PF_FW_ATQH_ATQH_M , - } - }, - { - .type =IDPF_CTLQ_TYPE_MAILBOX_RX , - .id =IDPF_CTLQ_ID , - .len =IDPF_CTLQ_LEN , - .buf_size =IDPF_DFLT_MBX_BUF_SIZE , - .reg = { - .head =PF_FW_ARQH , - .tail =PF_FW_ARQT , - .len =PF_FW_ARQLEN , - .bah =PF_FW_ARQBAH , - .bal =PF_FW_ARQBAL , - .len_mask =PF_FW_ARQLEN_ARQLEN_M , - .len_ena_mask =PF_FW_ARQLEN_ARQENABLE_M , - .head_mask =PF_FW_ARQH_ARQH_M , - } +uint32_t reg; +int i; + +for (i =0 ; i <IDPF_RESET_WAIT_CNT ; i++) { + reg =IDPF_READ_REG (hw,VFGEN_RSTAT ); +if (reg !=0xFFFFFFFF && (reg &VFGEN_RSTAT_VFR_STATE_M )) +return 0 ; +rte_delay_ms (1000 ); + } + +DRV_LOG (ERR ,"VF reset timeout" ); +return -EBUSY ; +} + +#define IDPF_CTLQ_NUM 2 + +struct idpf_ctlq_create_info pf_ctlq_info[IDPF_CTLQ_NUM ] = { + { + .type =IDPF_CTLQ_TYPE_MAILBOX_TX , + .id =IDPF_CTLQ_ID , + .len =IDPF_CTLQ_LEN , + .buf_size =IDPF_DFLT_MBX_BUF_SIZE , + .reg = { + .head =PF_FW_ATQH , + .tail =PF_FW_ATQT , + .len =PF_FW_ATQLEN , + .bah =PF_FW_ATQBAH , + .bal =PF_FW_ATQBAL , + .len_mask =PF_FW_ATQLEN_ATQLEN_M , + .len_ena_mask =PF_FW_ATQLEN_ATQENABLE_M , + .head_mask =PF_FW_ATQH_ATQH_M , } - }; + }, + { + .type =IDPF_CTLQ_TYPE_MAILBOX_RX , + .id =IDPF_CTLQ_ID , + .len =IDPF_CTLQ_LEN , + .buf_size =IDPF_DFLT_MBX_BUF_SIZE , + .reg = { + .head =PF_FW_ARQH , + .tail =PF_FW_ARQT , + .len =PF_FW_ARQLEN , + .bah =PF_FW_ARQBAH , + .bal =PF_FW_ARQBAL , + .len_mask =PF_FW_ARQLEN_ARQLEN_M , + .len_ena_mask =PF_FW_ARQLEN_ARQENABLE_M , + .head_mask =PF_FW_ARQH_ARQH_M , + } + } +}; + +struct idpf_ctlq_create_info vf_ctlq_info[IDPF_CTLQ_NUM ] = { + { + .type =IDPF_CTLQ_TYPE_MAILBOX_TX , + .id =IDPF_CTLQ_ID , + .len =IDPF_CTLQ_LEN , + .buf_size =IDPF_DFLT_MBX_BUF_SIZE , + .reg = { + .head =VF_ATQH , + .tail =VF_ATQT , + .len =VF_ATQLEN , + .bah =VF_ATQBAH , + .bal =VF_ATQBAL , + .len_mask =VF_ATQLEN_ATQLEN_M , + .len_ena_mask =VF_ATQLEN_ATQENABLE_M , + .head_mask =VF_ATQH_ATQH_M , + } + }, + { + .type =IDPF_CTLQ_TYPE_MAILBOX_RX , + .id =IDPF_CTLQ_ID , + .len =IDPF_CTLQ_LEN , + .buf_size =IDPF_DFLT_MBX_BUF_SIZE , + .reg = { + .head =VF_ARQH , + .tail =VF_ARQT , + .len =VF_ARQLEN , + .bah =VF_ARQBAH , + .bal =VF_ARQBAL , + .len_mask =VF_ARQLEN_ARQLEN_M , + .len_ena_mask =VF_ARQLEN_ARQENABLE_M , + .head_mask =VF_ARQH_ARQH_M , + } + } +}; + +static int +idpf_init_mbx (struct idpf_hw *hw) +{struct idpf_ctlq_info *ctlq; -int ret; +int ret =0 ; - ret =idpf_ctlq_init (hw,CTLQ_NUM , ctlq_info); +if (hw->device_id ==IDPF_DEV_ID_PF ) + ret =idpf_ctlq_init (hw,IDPF_CTLQ_NUM , pf_ctlq_info); +else if (hw->device_id ==IDPF_DEV_ID_SRIOV ) + ret =idpf_ctlq_init (hw,IDPF_CTLQ_NUM , vf_ctlq_info);if (ret !=0 )return ret;
@@ -312,8 +370,12 @@ idpf_adapter_init(struct idpf_adapter *adapter)struct idpf_hw *hw = &adapter->hw;int ret; -idpf_reset_pf (hw); - ret =idpf_check_pf_reset_done (hw); +if (hw->device_id ==IDPF_DEV_ID_PF ) { +idpf_reset_pf (hw); + ret =idpf_check_pf_reset_done (hw); + }else if (hw->device_id ==IDPF_DEV_ID_SRIOV ) { + ret =idpf_check_vf_reset_done (hw); + }if (ret !=0 ) {DRV_LOG (ERR ,"IDPF is still resetting" ); goto err_check_reset;
drivers/common/idpf/idpf_common_device.h +2 -0
@@ -10,6 +10,8 @@#include <base/virtchnl2.h> #include <idpf_common_logs.h> +#define IDPF_DEV_ID_SRIOV 0x145C +#define IDPF_RSS_KEY_LEN 52#define IDPF_CTLQ_ID -1
drivers/net/idpf/idpf_ethdev.c +2 -0
@@ -1078,6 +1078,7 @@ idpf_handle_virtchnl_msg(struct idpf_adapter_ext *adapter_ex)switch (mbx_op) {case idpf_mbq_opc_send_msg_to_peer_pf: +case idpf_mbq_opc_send_msg_to_peer_drv:if (vc_op ==VIRTCHNL2_OP_EVENT ) {if (ctlq_msg.data_len <sizeof (struct virtchnl2_event )) {PMD_DRV_LOG (ERR ,"Error event" );
@@ -1319,6 +1320,7 @@ idpf_dev_vport_init(struct rte_eth_dev *dev, void *init_params)static const struct rte_pci_id pci_id_idpf_map[] = { {RTE_PCI_DEVICE (IDPF_INTEL_VENDOR_ID ,IDPF_DEV_ID_PF ) }, + {RTE_PCI_DEVICE (IDPF_INTEL_VENDOR_ID ,IDPF_DEV_ID_SRIOV ) }, { .vendor_id =0 ,/* sentinel */ }, };
Signature · 1 line
2.26.2
PATCH v3 1/1 net/idpf: add VF support
In reply to [email protected]From: Beilei Xing <[email protected]>
Support VF whose device id is 0x145c.
---
v3 change:
- move check reset done function and mail box init to common module.
v2 change:
- Rebase code based on new patchset:
https://patches.dpdk.org/project/dpdk/cover/[email protected]/
drivers/common/idpf/idpf_common_device.c | 140 ++++++++++++++++------- drivers/common/idpf/idpf_common_device.h | 2 + drivers/net/idpf/idpf_ethdev.c | 2 + 3 files changed, 105 insertions(+), 39 deletions(-)
drivers/common/idpf/idpf_common_device.c +101 -39
@@ -16,6 +16,7 @@ idpf_reset_pf(struct idpf_hw *hw) }#define IDPF_RESET_WAIT_CNT 100 +static int idpf_check_pf_reset_done (struct idpf_hw *hw) {
@@ -33,48 +34,105 @@ idpf_check_pf_reset_done(struct idpf_hw *hw)return -EBUSY ; } -#define CTLQ_NUM 2static int -idpf_init_mbx (struct idpf_hw *hw) +idpf_check_vf_reset_done (struct idpf_hw *hw) { -struct idpf_ctlq_create_info ctlq_info[CTLQ_NUM ] = { - { - .type =IDPF_CTLQ_TYPE_MAILBOX_TX , - .id =IDPF_CTLQ_ID , - .len =IDPF_CTLQ_LEN , - .buf_size =IDPF_DFLT_MBX_BUF_SIZE , - .reg = { - .head =PF_FW_ATQH , - .tail =PF_FW_ATQT , - .len =PF_FW_ATQLEN , - .bah =PF_FW_ATQBAH , - .bal =PF_FW_ATQBAL , - .len_mask =PF_FW_ATQLEN_ATQLEN_M , - .len_ena_mask =PF_FW_ATQLEN_ATQENABLE_M , - .head_mask =PF_FW_ATQH_ATQH_M , - } - }, - { - .type =IDPF_CTLQ_TYPE_MAILBOX_RX , - .id =IDPF_CTLQ_ID , - .len =IDPF_CTLQ_LEN , - .buf_size =IDPF_DFLT_MBX_BUF_SIZE , - .reg = { - .head =PF_FW_ARQH , - .tail =PF_FW_ARQT , - .len =PF_FW_ARQLEN , - .bah =PF_FW_ARQBAH , - .bal =PF_FW_ARQBAL , - .len_mask =PF_FW_ARQLEN_ARQLEN_M , - .len_ena_mask =PF_FW_ARQLEN_ARQENABLE_M , - .head_mask =PF_FW_ARQH_ARQH_M , - } +uint32_t reg; +int i; + +for (i =0 ; i <IDPF_RESET_WAIT_CNT ; i++) { + reg =IDPF_READ_REG (hw,VFGEN_RSTAT ); +if (reg !=0xFFFFFFFF && (reg &VFGEN_RSTAT_VFR_STATE_M )) +return 0 ; +rte_delay_ms (1000 ); + } + +DRV_LOG (ERR ,"VF reset timeout" ); +return -EBUSY ; +} + +#define IDPF_CTLQ_NUM 2 + +struct idpf_ctlq_create_info pf_ctlq_info[IDPF_CTLQ_NUM ] = { + { + .type =IDPF_CTLQ_TYPE_MAILBOX_TX , + .id =IDPF_CTLQ_ID , + .len =IDPF_CTLQ_LEN , + .buf_size =IDPF_DFLT_MBX_BUF_SIZE , + .reg = { + .head =PF_FW_ATQH , + .tail =PF_FW_ATQT , + .len =PF_FW_ATQLEN , + .bah =PF_FW_ATQBAH , + .bal =PF_FW_ATQBAL , + .len_mask =PF_FW_ATQLEN_ATQLEN_M , + .len_ena_mask =PF_FW_ATQLEN_ATQENABLE_M , + .head_mask =PF_FW_ATQH_ATQH_M , } - }; + }, + { + .type =IDPF_CTLQ_TYPE_MAILBOX_RX , + .id =IDPF_CTLQ_ID , + .len =IDPF_CTLQ_LEN , + .buf_size =IDPF_DFLT_MBX_BUF_SIZE , + .reg = { + .head =PF_FW_ARQH , + .tail =PF_FW_ARQT , + .len =PF_FW_ARQLEN , + .bah =PF_FW_ARQBAH , + .bal =PF_FW_ARQBAL , + .len_mask =PF_FW_ARQLEN_ARQLEN_M , + .len_ena_mask =PF_FW_ARQLEN_ARQENABLE_M , + .head_mask =PF_FW_ARQH_ARQH_M , + } + } +}; + +struct idpf_ctlq_create_info vf_ctlq_info[IDPF_CTLQ_NUM ] = { + { + .type =IDPF_CTLQ_TYPE_MAILBOX_TX , + .id =IDPF_CTLQ_ID , + .len =IDPF_CTLQ_LEN , + .buf_size =IDPF_DFLT_MBX_BUF_SIZE , + .reg = { + .head =VF_ATQH , + .tail =VF_ATQT , + .len =VF_ATQLEN , + .bah =VF_ATQBAH , + .bal =VF_ATQBAL , + .len_mask =VF_ATQLEN_ATQLEN_M , + .len_ena_mask =VF_ATQLEN_ATQENABLE_M , + .head_mask =VF_ATQH_ATQH_M , + } + }, + { + .type =IDPF_CTLQ_TYPE_MAILBOX_RX , + .id =IDPF_CTLQ_ID , + .len =IDPF_CTLQ_LEN , + .buf_size =IDPF_DFLT_MBX_BUF_SIZE , + .reg = { + .head =VF_ARQH , + .tail =VF_ARQT , + .len =VF_ARQLEN , + .bah =VF_ARQBAH , + .bal =VF_ARQBAL , + .len_mask =VF_ARQLEN_ARQLEN_M , + .len_ena_mask =VF_ARQLEN_ARQENABLE_M , + .head_mask =VF_ARQH_ARQH_M , + } + } +}; + +static int +idpf_init_mbx (struct idpf_hw *hw) +{struct idpf_ctlq_info *ctlq; -int ret; +int ret =0 ; - ret =idpf_ctlq_init (hw,CTLQ_NUM , ctlq_info); +if (hw->device_id ==IDPF_DEV_ID_PF ) + ret =idpf_ctlq_init (hw,IDPF_CTLQ_NUM , pf_ctlq_info); +else if (hw->device_id ==IDPF_DEV_ID_SRIOV ) + ret =idpf_ctlq_init (hw,IDPF_CTLQ_NUM , vf_ctlq_info);if (ret !=0 )return ret;
@@ -312,8 +370,12 @@ idpf_adapter_init(struct idpf_adapter *adapter)struct idpf_hw *hw = &adapter->hw;int ret; -idpf_reset_pf (hw); - ret =idpf_check_pf_reset_done (hw); +if (hw->device_id ==IDPF_DEV_ID_PF ) { +idpf_reset_pf (hw); + ret =idpf_check_pf_reset_done (hw); + }else if (hw->device_id ==IDPF_DEV_ID_SRIOV ) { + ret =idpf_check_vf_reset_done (hw); + }if (ret !=0 ) {DRV_LOG (ERR ,"IDPF is still resetting" ); goto err_check_reset;
drivers/common/idpf/idpf_common_device.h +2 -0
@@ -10,6 +10,8 @@#include <base/virtchnl2.h> #include <idpf_common_logs.h> +#define IDPF_DEV_ID_SRIOV 0x145C +#define IDPF_RSS_KEY_LEN 52#define IDPF_CTLQ_ID -1
drivers/net/idpf/idpf_ethdev.c +2 -0
@@ -1078,6 +1078,7 @@ idpf_handle_virtchnl_msg(struct idpf_adapter_ext *adapter_ex)switch (mbx_op) {case idpf_mbq_opc_send_msg_to_peer_pf: +case idpf_mbq_opc_send_msg_to_peer_drv:if (vc_op ==VIRTCHNL2_OP_EVENT ) {if (ctlq_msg.data_len <sizeof (struct virtchnl2_event )) {PMD_DRV_LOG (ERR ,"Error event" );
@@ -1319,6 +1320,7 @@ idpf_dev_vport_init(struct rte_eth_dev *dev, void *init_params)static const struct rte_pci_id pci_id_idpf_map[] = { {RTE_PCI_DEVICE (IDPF_INTEL_VENDOR_ID ,IDPF_DEV_ID_PF ) }, + {RTE_PCI_DEVICE (IDPF_INTEL_VENDOR_ID ,IDPF_DEV_ID_SRIOV ) }, { .vendor_id =0 ,/* sentinel */ }, };
Signature · 1 line
2.26.2
PATCH v4 1/1 net/idpf: add VF support
From: Beilei Xing <[email protected]>
Support VF whose device id is 0x145c.
---
v4 change:
- refine if condition.
v3 change:
- move check reset done function and mail box init to common module.
v2 change:
- Rebase code based on new patchset:
https://patches.dpdk.org/project/dpdk/cover/[email protected]/
drivers/common/idpf/idpf_common_device.c | 140 ++++++++++++++++------- drivers/common/idpf/idpf_common_device.h | 2 + drivers/net/idpf/idpf_ethdev.c | 2 + 3 files changed, 105 insertions(+), 39 deletions(-)
drivers/common/idpf/idpf_common_device.c +101 -39
@@ -16,6 +16,7 @@ idpf_reset_pf(struct idpf_hw *hw) }#define IDPF_RESET_WAIT_CNT 100 +static int idpf_check_pf_reset_done (struct idpf_hw *hw) {
@@ -33,48 +34,105 @@ idpf_check_pf_reset_done(struct idpf_hw *hw)return -EBUSY ; } -#define CTLQ_NUM 2static int -idpf_init_mbx (struct idpf_hw *hw) +idpf_check_vf_reset_done (struct idpf_hw *hw) { -struct idpf_ctlq_create_info ctlq_info[CTLQ_NUM ] = { - { - .type =IDPF_CTLQ_TYPE_MAILBOX_TX , - .id =IDPF_CTLQ_ID , - .len =IDPF_CTLQ_LEN , - .buf_size =IDPF_DFLT_MBX_BUF_SIZE , - .reg = { - .head =PF_FW_ATQH , - .tail =PF_FW_ATQT , - .len =PF_FW_ATQLEN , - .bah =PF_FW_ATQBAH , - .bal =PF_FW_ATQBAL , - .len_mask =PF_FW_ATQLEN_ATQLEN_M , - .len_ena_mask =PF_FW_ATQLEN_ATQENABLE_M , - .head_mask =PF_FW_ATQH_ATQH_M , - } - }, - { - .type =IDPF_CTLQ_TYPE_MAILBOX_RX , - .id =IDPF_CTLQ_ID , - .len =IDPF_CTLQ_LEN , - .buf_size =IDPF_DFLT_MBX_BUF_SIZE , - .reg = { - .head =PF_FW_ARQH , - .tail =PF_FW_ARQT , - .len =PF_FW_ARQLEN , - .bah =PF_FW_ARQBAH , - .bal =PF_FW_ARQBAL , - .len_mask =PF_FW_ARQLEN_ARQLEN_M , - .len_ena_mask =PF_FW_ARQLEN_ARQENABLE_M , - .head_mask =PF_FW_ARQH_ARQH_M , - } +uint32_t reg; +int i; + +for (i =0 ; i <IDPF_RESET_WAIT_CNT ; i++) { + reg =IDPF_READ_REG (hw,VFGEN_RSTAT ); +if (reg !=0xFFFFFFFF && (reg &VFGEN_RSTAT_VFR_STATE_M )) +return 0 ; +rte_delay_ms (1000 ); + } + +DRV_LOG (ERR ,"VF reset timeout" ); +return -EBUSY ; +} + +#define IDPF_CTLQ_NUM 2 + +struct idpf_ctlq_create_info pf_ctlq_info[IDPF_CTLQ_NUM ] = { + { + .type =IDPF_CTLQ_TYPE_MAILBOX_TX , + .id =IDPF_CTLQ_ID , + .len =IDPF_CTLQ_LEN , + .buf_size =IDPF_DFLT_MBX_BUF_SIZE , + .reg = { + .head =PF_FW_ATQH , + .tail =PF_FW_ATQT , + .len =PF_FW_ATQLEN , + .bah =PF_FW_ATQBAH , + .bal =PF_FW_ATQBAL , + .len_mask =PF_FW_ATQLEN_ATQLEN_M , + .len_ena_mask =PF_FW_ATQLEN_ATQENABLE_M , + .head_mask =PF_FW_ATQH_ATQH_M , + } + }, + { + .type =IDPF_CTLQ_TYPE_MAILBOX_RX , + .id =IDPF_CTLQ_ID , + .len =IDPF_CTLQ_LEN , + .buf_size =IDPF_DFLT_MBX_BUF_SIZE , + .reg = { + .head =PF_FW_ARQH , + .tail =PF_FW_ARQT , + .len =PF_FW_ARQLEN , + .bah =PF_FW_ARQBAH , + .bal =PF_FW_ARQBAL , + .len_mask =PF_FW_ARQLEN_ARQLEN_M , + .len_ena_mask =PF_FW_ARQLEN_ARQENABLE_M , + .head_mask =PF_FW_ARQH_ARQH_M , + } + } +}; + +struct idpf_ctlq_create_info vf_ctlq_info[IDPF_CTLQ_NUM ] = { + { + .type =IDPF_CTLQ_TYPE_MAILBOX_TX , + .id =IDPF_CTLQ_ID , + .len =IDPF_CTLQ_LEN , + .buf_size =IDPF_DFLT_MBX_BUF_SIZE , + .reg = { + .head =VF_ATQH , + .tail =VF_ATQT , + .len =VF_ATQLEN , + .bah =VF_ATQBAH , + .bal =VF_ATQBAL , + .len_mask =VF_ATQLEN_ATQLEN_M , + .len_ena_mask =VF_ATQLEN_ATQENABLE_M , + .head_mask =VF_ATQH_ATQH_M , } - }; + }, + { + .type =IDPF_CTLQ_TYPE_MAILBOX_RX , + .id =IDPF_CTLQ_ID , + .len =IDPF_CTLQ_LEN , + .buf_size =IDPF_DFLT_MBX_BUF_SIZE , + .reg = { + .head =VF_ARQH , + .tail =VF_ARQT , + .len =VF_ARQLEN , + .bah =VF_ARQBAH , + .bal =VF_ARQBAL , + .len_mask =VF_ARQLEN_ARQLEN_M , + .len_ena_mask =VF_ARQLEN_ARQENABLE_M , + .head_mask =VF_ARQH_ARQH_M , + } + } +}; + +static int +idpf_init_mbx (struct idpf_hw *hw) +{struct idpf_ctlq_info *ctlq; -int ret; +int ret =0 ; - ret =idpf_ctlq_init (hw,CTLQ_NUM , ctlq_info); +if (hw->device_id ==IDPF_DEV_ID_SRIOV ) + ret =idpf_ctlq_init (hw,IDPF_CTLQ_NUM , vf_ctlq_info); +else + ret =idpf_ctlq_init (hw,IDPF_CTLQ_NUM , pf_ctlq_info);if (ret !=0 )return ret;
@@ -312,8 +370,12 @@ idpf_adapter_init(struct idpf_adapter *adapter)struct idpf_hw *hw = &adapter->hw;int ret; -idpf_reset_pf (hw); - ret =idpf_check_pf_reset_done (hw); +if (hw->device_id ==IDPF_DEV_ID_SRIOV ) { + ret =idpf_check_vf_reset_done (hw); + }else { +idpf_reset_pf (hw); + ret =idpf_check_pf_reset_done (hw); + }if (ret !=0 ) {DRV_LOG (ERR ,"IDPF is still resetting" ); goto err_check_reset;
drivers/common/idpf/idpf_common_device.h +2 -0
@@ -10,6 +10,8 @@#include <base/virtchnl2.h> #include <idpf_common_logs.h> +#define IDPF_DEV_ID_SRIOV 0x145C +#define IDPF_RSS_KEY_LEN 52#define IDPF_CTLQ_ID -1
drivers/net/idpf/idpf_ethdev.c +2 -0
@@ -1078,6 +1078,7 @@ idpf_handle_virtchnl_msg(struct idpf_adapter_ext *adapter_ex)switch (mbx_op) {case idpf_mbq_opc_send_msg_to_peer_pf: +case idpf_mbq_opc_send_msg_to_peer_drv:if (vc_op ==VIRTCHNL2_OP_EVENT ) {if (ctlq_msg.data_len <sizeof (struct virtchnl2_event )) {PMD_DRV_LOG (ERR ,"Error event" );
@@ -1319,6 +1320,7 @@ idpf_dev_vport_init(struct rte_eth_dev *dev, void *init_params)static const struct rte_pci_id pci_id_idpf_map[] = { {RTE_PCI_DEVICE (IDPF_INTEL_VENDOR_ID ,IDPF_DEV_ID_PF ) }, + {RTE_PCI_DEVICE (IDPF_INTEL_VENDOR_ID ,IDPF_DEV_ID_SRIOV ) }, { .vendor_id =0 ,/* sentinel */ }, };
Signature · 1 line
2.26.2
Quoted 9 lines
-----Original Message-----
From: Xing, Beilei <[email protected]>
Sent: Monday, April 24, 2023 8:45 PM
To: Wu, Jingjing <[email protected]>
Cc: [email protected]; Xing, Beilei <[email protected]>
Subject: [PATCH v4] net/idpf: add VF support
Quoted 5 lines
From: Beilei Xing <[email protected]>
Support VF whose device id is
0x145c.Signed-off-by Beilei Xing <[email protected]>
Zhang, Qi Z
AppliedQuoted 18 lines
-----Original Message-----
From: Wu, Jingjing <[email protected]>
Sent: Tuesday, April 25, 2023 5:11 PM
To: Xing, Beilei <[email protected]>
Cc: [email protected]
Subject: RE: [PATCH v4] net/idpf: add VF supportQuoted 7 lines
-----Original Message-----
From: Xing, Beilei <[email protected]>
Sent: Monday, April 24, 2023 8:45 PM
To: Wu, Jingjing <[email protected]>
Cc: [email protected]; Xing, Beilei <[email protected]>
Subject: [PATCH v4] net/idpf: add VF support
Quoted 6 lines
Quoted 5 lines
From: Beilei Xing <[email protected]>
Support VF whose device id is
0x145c.Signed-off-by Beilei Xing <[email protected]>Acked-by Jingjing Wu <[email protected]>
Applied to dpdk-next-net-intel.
Thanks
Qi