common/idpf: move PF specific functions from common init
PATCH 1/1 common/idpf: move PF specific functions from common init
From: Beilei Xing <[email protected]>
Move PF reset and PF mailbox initialization functions from idpf_adapter_init function to xxxx_adapter_ext_init function, since ther're different between PF and VF support.
--- drivers/common/idpf/idpf_common_device.c | 72 +++++------------------- drivers/common/idpf/idpf_common_device.h | 13 +++++ drivers/common/idpf/version.map | 5 ++ drivers/net/cpfl/cpfl_ethdev.c | 18 ++++++ drivers/net/idpf/idpf_ethdev.c | 51 +++++++++++++++++ 5 files changed, 100 insertions(+), 59 deletions(-)
drivers/common/idpf/idpf_common_device.c +13 -59
@@ -6,8 +6,8 @@#include <idpf_common_device.h> #include <idpf_common_virtchnl.h> -static void -idpf_reset_pf (struct idpf_hw *hw) +void +idpf_hw_pf_reset (struct idpf_hw *hw) {uint32_t reg;
@@ -15,9 +15,8 @@ idpf_reset_pf(struct idpf_hw *hw)IDPF_WRITE_REG (hw,PFGEN_CTRL , (reg |PFGEN_CTRL_PFSWR )); } -#define IDPF_RESET_WAIT_CNT 100 -static int -idpf_check_pf_reset_done (struct idpf_hw *hw) +int +idpf_hw_pf_reset_check (struct idpf_hw *hw) {uint32_t reg;int i;
@@ -33,48 +32,13 @@ idpf_check_pf_reset_done(struct idpf_hw *hw)return -EBUSY ; } -#define CTLQ_NUM 2 -static int -idpf_init_mbx (struct idpf_hw *hw) +int +idpf_hw_mbx_init (struct idpf_hw *hw,struct idpf_ctlq_create_info *ctlq_info) { -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 , - } - } - };struct idpf_ctlq_info *ctlq;int ret; - ret =idpf_ctlq_init (hw,CTLQ_NUM , ctlq_info); + ret =idpf_ctlq_init (hw,IDPF_CTLQ_NUM , ctlq_info);if (ret !=0 )return ret;
@@ -96,6 +60,12 @@ idpf_init_mbx(struct idpf_hw *hw)return ret; } +void +idpf_hw_mbx_deinit (struct idpf_hw *hw) +{ +idpf_ctlq_deinit (hw); +} +static int idpf_get_pkt_type (struct idpf_adapter *adapter) {
@@ -312,19 +282,6 @@ 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 (ret !=0 ) { -DRV_LOG (ERR ,"IDPF is still resetting" ); - goto err_check_reset; - } - - ret =idpf_init_mbx (hw); -if (ret !=0 ) { -DRV_LOG (ERR ,"Failed to init mailbox" ); - goto err_check_reset; - } - adapter->mbx_resp =rte_zmalloc ("idpf_adapter_mbx_resp" ,IDPF_DFLT_MBX_BUF_SIZE ,0 );if (adapter->mbx_resp ==NULL ) {
@@ -357,8 +314,6 @@ idpf_adapter_init(struct idpf_adapter *adapter)rte_free (adapter->mbx_resp); adapter->mbx_resp =NULL ; err_mbx_resp: -idpf_ctlq_deinit (hw); -err_check_reset:return ret; }
@@ -367,7 +322,6 @@ idpf_adapter_deinit(struct idpf_adapter *adapter) {struct idpf_hw *hw = &adapter->hw; -idpf_ctlq_deinit (hw);rte_free (adapter->mbx_resp); adapter->mbx_resp =NULL ;
drivers/common/idpf/idpf_common_device.h +13 -0
@@ -10,8 +10,11 @@#include <base/virtchnl2.h> #include <idpf_common_logs.h> +#define IDPF_RESET_WAIT_CNT 100 +#define IDPF_RSS_KEY_LEN 52 +#define IDPF_CTLQ_NUM 2#define IDPF_CTLQ_ID -1#define IDPF_CTLQ_LEN 64#define IDPF_DFLT_MBX_BUF_SIZE 4096
@@ -142,6 +145,8 @@ struct idpf_cmd_info {uint32_t out_size;/* buffer size for response */ }; +struct idpf_ctlq_create_info ctlq_info[IDPF_CTLQ_NUM ]; +/* notify current command done. Only call in case execute * _atomic_set_cmd successfully. */
@@ -180,6 +185,14 @@ atomic_set_cmd(struct idpf_adapter *adapter, uint32_t ops)return !ret; } +__rte_internal +void idpf_hw_pf_reset(struct idpf_hw *hw); +__rte_internal +int idpf_hw_pf_reset_check(struct idpf_hw *hw); +__rte_internal +int idpf_hw_mbx_init(struct idpf_hw *hw, struct idpf_ctlq_create_info *ctlq_info); +__rte_internal +void idpf_hw_mbx_deinit(struct idpf_hw *hw);__rte_internal int idpf_adapter_init(struct idpf_adapter *adapter); __rte_internal
drivers/common/idpf/version.map +5 -0
@@ -15,6 +15,11 @@ INTERNAL { idpf_dp_splitq_xmit_pkts; idpf_dp_splitq_xmit_pkts_avx512; + idpf_hw_mbx_deinit; + idpf_hw_mbx_init; + idpf_hw_pf_reset; + idpf_hw_pf_reset_check; + idpf_qc_rx_thresh_check; idpf_qc_rx_queue_release; idpf_qc_rxq_mbufs_release;
drivers/net/cpfl/cpfl_ethdev.c +18 -0
@@ -1165,6 +1165,8 @@ cpfl_dev_alarm_handler(void *param)rte_eal_alarm_set (CPFL_ALARM_INTERVAL , cpfl_dev_alarm_handler, adapter); } +extern struct idpf_ctlq_create_info ctlq_info[IDPF_CTLQ_NUM ]; +static int cpfl_adapter_ext_init (struct rte_pci_device *pci_dev,struct cpfl_adapter_ext *adapter) {
@@ -1181,6 +1183,19 @@ cpfl_adapter_ext_init(struct rte_pci_device *pci_dev, struct cpfl_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; + } + + 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_adapter_init (base);if (ret !=0 ) {PMD_INIT_LOG (ERR ,"Failed to init adapter" );
@@ -1213,6 +1228,8 @@ cpfl_adapter_ext_init(struct rte_pci_device *pci_dev, struct cpfl_adapter_ext *arte_eal_alarm_cancel (cpfl_dev_alarm_handler, adapter);idpf_adapter_deinit (base); err_adapter_init: +idpf_hw_mbx_deinit (hw); +err_reset_check:return ret; }
@@ -1323,6 +1340,7 @@ cpfl_adapter_ext_deinit(struct cpfl_adapter_ext *adapter) {rte_eal_alarm_cancel (cpfl_dev_alarm_handler, adapter);idpf_adapter_deinit (&adapter->base); +idpf_hw_mbx_deinit (&adapter->base.hw);rte_free (adapter->vports); adapter->vports =NULL ;
drivers/net/idpf/idpf_ethdev.c +51 -0
75 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH v2 1/1 common/idpf: move PF specific functions from common init
From: Beilei Xing <[email protected]>
Move PF reset and PF mailbox initialization functions from idpf_adapter_init function to xxxx_adapter_ext_init function, since they're different between PF and VF support.
---
v2 change:
- fix typo.
drivers/common/idpf/idpf_common_device.c | 72 +++++------------------- drivers/common/idpf/idpf_common_device.h | 13 +++++ drivers/common/idpf/version.map | 5 ++ drivers/net/cpfl/cpfl_ethdev.c | 18 ++++++ drivers/net/idpf/idpf_ethdev.c | 51 +++++++++++++++++ 5 files changed, 100 insertions(+), 59 deletions(-)
drivers/common/idpf/idpf_common_device.c +13 -59
@@ -6,8 +6,8 @@#include <idpf_common_device.h> #include <idpf_common_virtchnl.h> -static void -idpf_reset_pf (struct idpf_hw *hw) +void +idpf_hw_pf_reset (struct idpf_hw *hw) {uint32_t reg;
@@ -15,9 +15,8 @@ idpf_reset_pf(struct idpf_hw *hw)IDPF_WRITE_REG (hw,PFGEN_CTRL , (reg |PFGEN_CTRL_PFSWR )); } -#define IDPF_RESET_WAIT_CNT 100 -static int -idpf_check_pf_reset_done (struct idpf_hw *hw) +int +idpf_hw_pf_reset_check (struct idpf_hw *hw) {uint32_t reg;int i;
@@ -33,48 +32,13 @@ idpf_check_pf_reset_done(struct idpf_hw *hw)return -EBUSY ; } -#define CTLQ_NUM 2 -static int -idpf_init_mbx (struct idpf_hw *hw) +int +idpf_hw_mbx_init (struct idpf_hw *hw,struct idpf_ctlq_create_info *ctlq_info) { -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 , - } - } - };struct idpf_ctlq_info *ctlq;int ret; - ret =idpf_ctlq_init (hw,CTLQ_NUM , ctlq_info); + ret =idpf_ctlq_init (hw,IDPF_CTLQ_NUM , ctlq_info);if (ret !=0 )return ret;
@@ -96,6 +60,12 @@ idpf_init_mbx(struct idpf_hw *hw)return ret; } +void +idpf_hw_mbx_deinit (struct idpf_hw *hw) +{ +idpf_ctlq_deinit (hw); +} +static int idpf_get_pkt_type (struct idpf_adapter *adapter) {
@@ -312,19 +282,6 @@ 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 (ret !=0 ) { -DRV_LOG (ERR ,"IDPF is still resetting" ); - goto err_check_reset; - } - - ret =idpf_init_mbx (hw); -if (ret !=0 ) { -DRV_LOG (ERR ,"Failed to init mailbox" ); - goto err_check_reset; - } - adapter->mbx_resp =rte_zmalloc ("idpf_adapter_mbx_resp" ,IDPF_DFLT_MBX_BUF_SIZE ,0 );if (adapter->mbx_resp ==NULL ) {
@@ -357,8 +314,6 @@ idpf_adapter_init(struct idpf_adapter *adapter)rte_free (adapter->mbx_resp); adapter->mbx_resp =NULL ; err_mbx_resp: -idpf_ctlq_deinit (hw); -err_check_reset:return ret; }
@@ -367,7 +322,6 @@ idpf_adapter_deinit(struct idpf_adapter *adapter) {struct idpf_hw *hw = &adapter->hw; -idpf_ctlq_deinit (hw);rte_free (adapter->mbx_resp); adapter->mbx_resp =NULL ;
drivers/common/idpf/idpf_common_device.h +13 -0
@@ -10,8 +10,11 @@#include <base/virtchnl2.h> #include <idpf_common_logs.h> +#define IDPF_RESET_WAIT_CNT 100 +#define IDPF_RSS_KEY_LEN 52 +#define IDPF_CTLQ_NUM 2#define IDPF_CTLQ_ID -1#define IDPF_CTLQ_LEN 64#define IDPF_DFLT_MBX_BUF_SIZE 4096
@@ -142,6 +145,8 @@ struct idpf_cmd_info {uint32_t out_size;/* buffer size for response */ }; +struct idpf_ctlq_create_info ctlq_info[IDPF_CTLQ_NUM ]; +/* notify current command done. Only call in case execute * _atomic_set_cmd successfully. */
@@ -180,6 +185,14 @@ atomic_set_cmd(struct idpf_adapter *adapter, uint32_t ops)return !ret; } +__rte_internal +void idpf_hw_pf_reset(struct idpf_hw *hw); +__rte_internal +int idpf_hw_pf_reset_check(struct idpf_hw *hw); +__rte_internal +int idpf_hw_mbx_init(struct idpf_hw *hw, struct idpf_ctlq_create_info *ctlq_info); +__rte_internal +void idpf_hw_mbx_deinit(struct idpf_hw *hw);__rte_internal int idpf_adapter_init(struct idpf_adapter *adapter); __rte_internal
drivers/common/idpf/version.map +5 -0
@@ -15,6 +15,11 @@ INTERNAL { idpf_dp_splitq_xmit_pkts; idpf_dp_splitq_xmit_pkts_avx512; + idpf_hw_mbx_deinit; + idpf_hw_mbx_init; + idpf_hw_pf_reset; + idpf_hw_pf_reset_check; + idpf_qc_rx_thresh_check; idpf_qc_rx_queue_release; idpf_qc_rxq_mbufs_release;
drivers/net/cpfl/cpfl_ethdev.c +18 -0
@@ -1165,6 +1165,8 @@ cpfl_dev_alarm_handler(void *param)rte_eal_alarm_set (CPFL_ALARM_INTERVAL , cpfl_dev_alarm_handler, adapter); } +extern struct idpf_ctlq_create_info ctlq_info[IDPF_CTLQ_NUM ]; +static int cpfl_adapter_ext_init (struct rte_pci_device *pci_dev,struct cpfl_adapter_ext *adapter) {
@@ -1181,6 +1183,19 @@ cpfl_adapter_ext_init(struct rte_pci_device *pci_dev, struct cpfl_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; + } + + 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_adapter_init (base);if (ret !=0 ) {PMD_INIT_LOG (ERR ,"Failed to init adapter" );
@@ -1213,6 +1228,8 @@ cpfl_adapter_ext_init(struct rte_pci_device *pci_dev, struct cpfl_adapter_ext *arte_eal_alarm_cancel (cpfl_dev_alarm_handler, adapter);idpf_adapter_deinit (base); err_adapter_init: +idpf_hw_mbx_deinit (hw); +err_reset_check:return ret; }
@@ -1323,6 +1340,7 @@ cpfl_adapter_ext_deinit(struct cpfl_adapter_ext *adapter) {rte_eal_alarm_cancel (cpfl_dev_alarm_handler, adapter);idpf_adapter_deinit (&adapter->base); +idpf_hw_mbx_deinit (&adapter->base.hw);rte_free (adapter->vports); adapter->vports =NULL ;
drivers/net/idpf/idpf_ethdev.c +51 -0
75 lines not on this page · raw message
Signature · 1 line
2.26.2
v3 cover refine common module
From: Beilei Xing <[email protected]>
Refine common module to support different configuration for different PMDs.
V3 changes:
- refine capability get.
Beilei Xing (2):
common/idpf: move PF specific functions from common init common/idpf: refine capability get
drivers/common/idpf/idpf_common_device.c | 72 +++-------------- drivers/common/idpf/idpf_common_device.h | 11 +++ drivers/common/idpf/idpf_common_virtchnl.c | 45 +---------- drivers/common/idpf/version.map | 5 ++ drivers/net/cpfl/cpfl_ethdev.c | 92 ++++++++++++++++++++++ drivers/net/idpf/idpf_ethdev.c | 91 +++++++++++++++++++++ 6 files changed, 215 insertions(+), 101 deletions(-)
Signature · 1 line
2.26.2
PATCH v3 1/2 common/idpf: move PF specific functions from common init
From: Beilei Xing <[email protected]>
Move PF reset and PF mailbox initialization functions from idpf_adapter_init function to xxxx_adapter_ext_init function, since they're different between PF and VF support.
--- drivers/common/idpf/idpf_common_device.c | 72 +++++------------------- drivers/common/idpf/idpf_common_device.h | 11 ++++ drivers/common/idpf/version.map | 5 ++ drivers/net/cpfl/cpfl_ethdev.c | 51 +++++++++++++++++ drivers/net/idpf/idpf_ethdev.c | 51 +++++++++++++++++ 5 files changed, 131 insertions(+), 59 deletions(-)
drivers/common/idpf/idpf_common_device.c +13 -59
@@ -6,8 +6,8 @@#include <idpf_common_device.h> #include <idpf_common_virtchnl.h> -static void -idpf_reset_pf (struct idpf_hw *hw) +void +idpf_hw_pf_reset (struct idpf_hw *hw) {uint32_t reg;
@@ -15,9 +15,8 @@ idpf_reset_pf(struct idpf_hw *hw)IDPF_WRITE_REG (hw,PFGEN_CTRL , (reg |PFGEN_CTRL_PFSWR )); } -#define IDPF_RESET_WAIT_CNT 100 -static int -idpf_check_pf_reset_done (struct idpf_hw *hw) +int +idpf_hw_pf_reset_check (struct idpf_hw *hw) {uint32_t reg;int i;
@@ -33,48 +32,13 @@ idpf_check_pf_reset_done(struct idpf_hw *hw)return -EBUSY ; } -#define CTLQ_NUM 2 -static int -idpf_init_mbx (struct idpf_hw *hw) +int +idpf_hw_mbx_init (struct idpf_hw *hw,struct idpf_ctlq_create_info *ctlq_info) { -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 , - } - } - };struct idpf_ctlq_info *ctlq;int ret; - ret =idpf_ctlq_init (hw,CTLQ_NUM , ctlq_info); + ret =idpf_ctlq_init (hw,IDPF_CTLQ_NUM , ctlq_info);if (ret !=0 )return ret;
@@ -96,6 +60,12 @@ idpf_init_mbx(struct idpf_hw *hw)return ret; } +void +idpf_hw_mbx_deinit (struct idpf_hw *hw) +{ +idpf_ctlq_deinit (hw); +} +static int idpf_get_pkt_type (struct idpf_adapter *adapter) {
@@ -312,19 +282,6 @@ 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 (ret !=0 ) { -DRV_LOG (ERR ,"IDPF is still resetting" ); - goto err_check_reset; - } - - ret =idpf_init_mbx (hw); -if (ret !=0 ) { -DRV_LOG (ERR ,"Failed to init mailbox" ); - goto err_check_reset; - } - adapter->mbx_resp =rte_zmalloc ("idpf_adapter_mbx_resp" ,IDPF_DFLT_MBX_BUF_SIZE ,0 );if (adapter->mbx_resp ==NULL ) {
@@ -357,8 +314,6 @@ idpf_adapter_init(struct idpf_adapter *adapter)rte_free (adapter->mbx_resp); adapter->mbx_resp =NULL ; err_mbx_resp: -idpf_ctlq_deinit (hw); -err_check_reset:return ret; }
@@ -367,7 +322,6 @@ idpf_adapter_deinit(struct idpf_adapter *adapter) {struct idpf_hw *hw = &adapter->hw; -idpf_ctlq_deinit (hw);rte_free (adapter->mbx_resp); adapter->mbx_resp =NULL ;
drivers/common/idpf/idpf_common_device.h +11 -0
@@ -10,8 +10,11 @@#include <base/virtchnl2.h> #include <idpf_common_logs.h> +#define IDPF_RESET_WAIT_CNT 100 +#define IDPF_RSS_KEY_LEN 52 +#define IDPF_CTLQ_NUM 2#define IDPF_CTLQ_ID -1#define IDPF_CTLQ_LEN 64#define IDPF_DFLT_MBX_BUF_SIZE 4096
@@ -180,6 +183,14 @@ atomic_set_cmd(struct idpf_adapter *adapter, uint32_t ops)return !ret; } +__rte_internal +void idpf_hw_pf_reset(struct idpf_hw *hw); +__rte_internal +int idpf_hw_pf_reset_check(struct idpf_hw *hw); +__rte_internal +int idpf_hw_mbx_init(struct idpf_hw *hw, struct idpf_ctlq_create_info *ctlq_info); +__rte_internal +void idpf_hw_mbx_deinit(struct idpf_hw *hw);__rte_internal int idpf_adapter_init(struct idpf_adapter *adapter); __rte_internal
drivers/common/idpf/version.map +5 -0
@@ -15,6 +15,11 @@ INTERNAL { idpf_dp_splitq_xmit_pkts; idpf_dp_splitq_xmit_pkts_avx512; + idpf_hw_mbx_deinit; + idpf_hw_mbx_init; + idpf_hw_pf_reset; + idpf_hw_pf_reset_check; + idpf_qc_rx_thresh_check; idpf_qc_rx_queue_release; idpf_qc_rxq_mbufs_release;
drivers/net/cpfl/cpfl_ethdev.c +51 -0
75 lines not on this page · raw message
drivers/net/idpf/idpf_ethdev.c +51 -0
75 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH v3 2/2 common/idpf: refine capability get
In reply to [email protected]From: Beilei Xing <[email protected]>
Initialize required capability in PMD, and refine idpf_vc_caps_get function. Then different PMDs can require different capability.
--- drivers/common/idpf/idpf_common_virtchnl.c | 45 ++-------------------- drivers/net/cpfl/cpfl_ethdev.c | 41 ++++++++++++++++++++ drivers/net/idpf/idpf_ethdev.c | 40 +++++++++++++++++++ 3 files changed, 84 insertions(+), 42 deletions(-)
drivers/common/idpf/idpf_common_virtchnl.c +3 -42
@@ -278,51 +278,12 @@ idpf_vc_api_version_check(struct idpf_adapter *adapter)int idpf_vc_caps_get (struct idpf_adapter *adapter) { -struct virtchnl2_get_capabilities caps_msg;struct idpf_cmd_info args;int err; -memset (&caps_msg,0 ,sizeof (struct virtchnl2_get_capabilities )); - - caps_msg.csum_caps = -VIRTCHNL2_CAP_TX_CSUM_L3_IPV4 | -VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_TCP | -VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_UDP | -VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_SCTP | -VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_TCP | -VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_UDP | -VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_SCTP | -VIRTCHNL2_CAP_TX_CSUM_GENERIC | -VIRTCHNL2_CAP_RX_CSUM_L3_IPV4 | -VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_TCP | -VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_UDP | -VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_SCTP | -VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_TCP | -VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_UDP | -VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_SCTP | -VIRTCHNL2_CAP_RX_CSUM_GENERIC ; - - caps_msg.rss_caps = -VIRTCHNL2_CAP_RSS_IPV4_TCP | -VIRTCHNL2_CAP_RSS_IPV4_UDP | -VIRTCHNL2_CAP_RSS_IPV4_SCTP | -VIRTCHNL2_CAP_RSS_IPV4_OTHER | -VIRTCHNL2_CAP_RSS_IPV6_TCP | -VIRTCHNL2_CAP_RSS_IPV6_UDP | -VIRTCHNL2_CAP_RSS_IPV6_SCTP | -VIRTCHNL2_CAP_RSS_IPV6_OTHER | -VIRTCHNL2_CAP_RSS_IPV4_AH | -VIRTCHNL2_CAP_RSS_IPV4_ESP | -VIRTCHNL2_CAP_RSS_IPV4_AH_ESP | -VIRTCHNL2_CAP_RSS_IPV6_AH | -VIRTCHNL2_CAP_RSS_IPV6_ESP | -VIRTCHNL2_CAP_RSS_IPV6_AH_ESP ; - - caps_msg.other_caps =VIRTCHNL2_CAP_WB_ON_ITR ; - args.ops =VIRTCHNL2_OP_GET_CAPS ; - args.in_args = (uint8_t *)&caps_msg; - args.in_args_size =sizeof (caps_msg); + args.in_args = (uint8_t *)&adapter->caps; + args.in_args_size =sizeof (struct virtchnl2_get_capabilities ); args.out_buffer = adapter->mbx_resp; args.out_size =IDPF_DFLT_MBX_BUF_SIZE ;
@@ -333,7 +294,7 @@ idpf_vc_caps_get(struct idpf_adapter *adapter)return err; } -rte_memcpy (&adapter->caps, args.out_buffer,sizeof (caps_msg)); +rte_memcpy (&adapter->caps, args.out_buffer,sizeof (struct virtchnl2_get_capabilities ));return 0 ; }
drivers/net/cpfl/cpfl_ethdev.c +41 -0
53 lines not on this page · raw message
drivers/net/idpf/idpf_ethdev.c +40 -0
@@ -1163,6 +1163,44 @@ static struct idpf_ctlq_create_info idpf_ctlq_info[IDPF_CTLQ_NUM] = { } }; +static struct virtchnl2_get_capabilities req_caps = { + .csum_caps = +VIRTCHNL2_CAP_TX_CSUM_L3_IPV4 | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_TCP | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_UDP | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_SCTP | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_TCP | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_UDP | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_SCTP | +VIRTCHNL2_CAP_TX_CSUM_GENERIC | +VIRTCHNL2_CAP_RX_CSUM_L3_IPV4 | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_TCP | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_UDP | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_SCTP | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_TCP | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_UDP | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_SCTP | +VIRTCHNL2_CAP_RX_CSUM_GENERIC , + + .rss_caps = +VIRTCHNL2_CAP_RSS_IPV4_TCP | +VIRTCHNL2_CAP_RSS_IPV4_UDP | +VIRTCHNL2_CAP_RSS_IPV4_SCTP | +VIRTCHNL2_CAP_RSS_IPV4_OTHER | +VIRTCHNL2_CAP_RSS_IPV6_TCP | +VIRTCHNL2_CAP_RSS_IPV6_UDP | +VIRTCHNL2_CAP_RSS_IPV6_SCTP | +VIRTCHNL2_CAP_RSS_IPV6_OTHER | +VIRTCHNL2_CAP_RSS_IPV4_AH | +VIRTCHNL2_CAP_RSS_IPV4_ESP | +VIRTCHNL2_CAP_RSS_IPV4_AH_ESP | +VIRTCHNL2_CAP_RSS_IPV6_AH | +VIRTCHNL2_CAP_RSS_IPV6_ESP | +VIRTCHNL2_CAP_RSS_IPV6_AH_ESP , + + .other_caps =VIRTCHNL2_CAP_WB_ON_ITR +}; +static int idpf_adapter_ext_init (struct rte_pci_device *pci_dev,struct idpf_adapter_ext *adapter) {
@@ -1192,6 +1230,8 @@ idpf_adapter_ext_init(struct rte_pci_device *pci_dev, struct idpf_adapter_ext *a goto err_reset_check; } +rte_memcpy (&base->caps, &req_caps,sizeof (struct virtchnl2_get_capabilities )); + ret =idpf_adapter_init (base);if (ret !=0 ) {PMD_INIT_LOG (ERR ,"Failed to init adapter" );
Signature · 1 line
2.26.2
v4 cover refine common module
In reply to [email protected]From: Beilei Xing <[email protected]>
Refine common module to support different configuration for different PMDs.
V4 changes:
- No need to require PTP CAP for CPFL.
V3 changes:
- refine capability get.
Beilei Xing (2):
common/idpf: move PF specific functions from common init common/idpf: refine capability get
drivers/common/idpf/idpf_common_device.c | 72 ++++------------- drivers/common/idpf/idpf_common_device.h | 11 +++ drivers/common/idpf/idpf_common_virtchnl.c | 45 +---------- drivers/common/idpf/version.map | 5 ++ drivers/net/cpfl/cpfl_ethdev.c | 91 ++++++++++++++++++++++ drivers/net/idpf/idpf_ethdev.c | 91 ++++++++++++++++++++++ 6 files changed, 214 insertions(+), 101 deletions(-)
Signature · 1 line
2.26.2
PATCH v4 1/2 common/idpf: move PF specific functions from common init
From: Beilei Xing <[email protected]>
Move PF reset and PF mailbox initialization functions from idpf_adapter_init function to xxxx_adapter_ext_init function, since they're different between PF and VF support.
--- drivers/common/idpf/idpf_common_device.c | 72 +++++------------------- drivers/common/idpf/idpf_common_device.h | 11 ++++ drivers/common/idpf/version.map | 5 ++ drivers/net/cpfl/cpfl_ethdev.c | 51 +++++++++++++++++ drivers/net/idpf/idpf_ethdev.c | 51 +++++++++++++++++ 5 files changed, 131 insertions(+), 59 deletions(-)
drivers/common/idpf/idpf_common_device.c +13 -59
@@ -6,8 +6,8 @@#include <idpf_common_device.h> #include <idpf_common_virtchnl.h> -static void -idpf_reset_pf (struct idpf_hw *hw) +void +idpf_hw_pf_reset (struct idpf_hw *hw) {uint32_t reg;
@@ -15,9 +15,8 @@ idpf_reset_pf(struct idpf_hw *hw)IDPF_WRITE_REG (hw,PFGEN_CTRL , (reg |PFGEN_CTRL_PFSWR )); } -#define IDPF_RESET_WAIT_CNT 100 -static int -idpf_check_pf_reset_done (struct idpf_hw *hw) +int +idpf_hw_pf_reset_check (struct idpf_hw *hw) {uint32_t reg;int i;
@@ -33,48 +32,13 @@ idpf_check_pf_reset_done(struct idpf_hw *hw)return -EBUSY ; } -#define CTLQ_NUM 2 -static int -idpf_init_mbx (struct idpf_hw *hw) +int +idpf_hw_mbx_init (struct idpf_hw *hw,struct idpf_ctlq_create_info *ctlq_info) { -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 , - } - } - };struct idpf_ctlq_info *ctlq;int ret; - ret =idpf_ctlq_init (hw,CTLQ_NUM , ctlq_info); + ret =idpf_ctlq_init (hw,IDPF_CTLQ_NUM , ctlq_info);if (ret !=0 )return ret;
@@ -96,6 +60,12 @@ idpf_init_mbx(struct idpf_hw *hw)return ret; } +void +idpf_hw_mbx_deinit (struct idpf_hw *hw) +{ +idpf_ctlq_deinit (hw); +} +static int idpf_get_pkt_type (struct idpf_adapter *adapter) {
@@ -312,19 +282,6 @@ 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 (ret !=0 ) { -DRV_LOG (ERR ,"IDPF is still resetting" ); - goto err_check_reset; - } - - ret =idpf_init_mbx (hw); -if (ret !=0 ) { -DRV_LOG (ERR ,"Failed to init mailbox" ); - goto err_check_reset; - } - adapter->mbx_resp =rte_zmalloc ("idpf_adapter_mbx_resp" ,IDPF_DFLT_MBX_BUF_SIZE ,0 );if (adapter->mbx_resp ==NULL ) {
@@ -357,8 +314,6 @@ idpf_adapter_init(struct idpf_adapter *adapter)rte_free (adapter->mbx_resp); adapter->mbx_resp =NULL ; err_mbx_resp: -idpf_ctlq_deinit (hw); -err_check_reset:return ret; }
@@ -367,7 +322,6 @@ idpf_adapter_deinit(struct idpf_adapter *adapter) {struct idpf_hw *hw = &adapter->hw; -idpf_ctlq_deinit (hw);rte_free (adapter->mbx_resp); adapter->mbx_resp =NULL ;
drivers/common/idpf/idpf_common_device.h +11 -0
@@ -10,8 +10,11 @@#include <base/virtchnl2.h> #include <idpf_common_logs.h> +#define IDPF_RESET_WAIT_CNT 100 +#define IDPF_RSS_KEY_LEN 52 +#define IDPF_CTLQ_NUM 2#define IDPF_CTLQ_ID -1#define IDPF_CTLQ_LEN 64#define IDPF_DFLT_MBX_BUF_SIZE 4096
@@ -180,6 +183,14 @@ atomic_set_cmd(struct idpf_adapter *adapter, uint32_t ops)return !ret; } +__rte_internal +void idpf_hw_pf_reset(struct idpf_hw *hw); +__rte_internal +int idpf_hw_pf_reset_check(struct idpf_hw *hw); +__rte_internal +int idpf_hw_mbx_init(struct idpf_hw *hw, struct idpf_ctlq_create_info *ctlq_info); +__rte_internal +void idpf_hw_mbx_deinit(struct idpf_hw *hw);__rte_internal int idpf_adapter_init(struct idpf_adapter *adapter); __rte_internal
drivers/common/idpf/version.map +5 -0
@@ -15,6 +15,11 @@ INTERNAL { idpf_dp_splitq_xmit_pkts; idpf_dp_splitq_xmit_pkts_avx512; + idpf_hw_mbx_deinit; + idpf_hw_mbx_init; + idpf_hw_pf_reset; + idpf_hw_pf_reset_check; + idpf_qc_rx_thresh_check; idpf_qc_rx_queue_release; idpf_qc_rxq_mbufs_release;
drivers/net/cpfl/cpfl_ethdev.c +51 -0
75 lines not on this page · raw message
drivers/net/idpf/idpf_ethdev.c +51 -0
75 lines not on this page · raw message
Signature · 1 line
2.26.2
Quoted 105 lines
-----Original Message-----
From: Xing, Beilei <[email protected]>
Sent: Thursday, April 6, 2023 3:43 PM
To: Wu, Jingjing <[email protected]>
Cc: [email protected]; Xing, Beilei <[email protected]>
Subject: [PATCH v4 1/2] common/idpf: move PF specific functions from common initFrom: Beilei Xing <[email protected]>
Move PF reset and PF mailbox initialization functions from
idpf_adapter_initfunction toxxxx_adapter_ext_initfunction, since they're different between PF and VF support.Signed-off-by Beilei Xing <[email protected]>--- drivers/common/idpf/idpf_common_device.c | 72 +++++------------------- drivers/common/idpf/idpf_common_device.h | 11 ++++ drivers/common/idpf/version.map | 5 ++ drivers/net/cpfl/cpfl_ethdev.c | 51 +++++++++++++++++ drivers/net/idpf/idpf_ethdev.c | 51 +++++++++++++++++ 5 files changed, 131 insertions(+), 59 deletions(-)drivers/common/idpf/idpf_common_device.c +7
-43@@ -6,8 +6,8 @@#include <idpf_common_device.h> #include <idpf_common_virtchnl.h> -static void -idpf_reset_pf (struct idpf_hw *hw) +void +idpf_hw_pf_reset (struct idpf_hw *hw) {uint32_t reg;@@ -15,9 +15,8 @@ idpf_reset_pf(struct idpf_hw *hw)IDPF_WRITE_REG (hw,PFGEN_CTRL , (reg |PFGEN_CTRL_PFSWR )); } -#define IDPF_RESET_WAIT_CNT 100 -static int -idpf_check_pf_reset_done (struct idpf_hw *hw) +int +idpf_hw_pf_reset_check (struct idpf_hw *hw) {uint32_t reg;int i;@@ -33,48 +32,13 @@ idpf_check_pf_reset_done(struct idpf_hw *hw)return -EBUSY ; } -#define CTLQ_NUM 2 -static int -idpf_init_mbx (struct idpf_hw *hw) +int +idpf_hw_mbx_init (struct idpf_hw *hw,struct idpf_ctlq_create_info *ctlq_info) { -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 , - } - } - };struct idpf_ctlq_info *ctlq;int ret; - ret =idpf_ctlq_init (hw,CTLQ_NUM , ctlq_info); + ret =idpf_ctlq_init (hw,IDPF_CTLQ_NUM , ctlq_info);if (ret !=0 )return ret;
drivers/common/idpf/idpf_common_device.c idpf_init_mbx(struct idpf_hw *hw) · line 61
Quoted 2 lines
drivers/common/idpf/idpf_common_device.c +0
-0@@ -96,6 +60,12 @@ idpf_init_mbx(struct idpf_hw *hw)return ret; }
You can check the device id if idpf_hw, and then decide how to init ctlq and then this function can also be consumed by VF driver. No need to move them out from common. The same as other functions.
Quoted 1 line
PATCH v4 2/2 common/idpf: refine capability get
In reply to [email protected]From: Beilei Xing <[email protected]>
Initialize required capability in PMD, and refine idpf_vc_caps_get function. Then different PMDs can require different capability.
--- drivers/common/idpf/idpf_common_virtchnl.c | 45 ++-------------------- drivers/net/cpfl/cpfl_ethdev.c | 40 +++++++++++++++++++ drivers/net/idpf/idpf_ethdev.c | 40 +++++++++++++++++++ 3 files changed, 83 insertions(+), 42 deletions(-)
drivers/common/idpf/idpf_common_virtchnl.c +3 -42
@@ -278,51 +278,12 @@ idpf_vc_api_version_check(struct idpf_adapter *adapter)int idpf_vc_caps_get (struct idpf_adapter *adapter) { -struct virtchnl2_get_capabilities caps_msg;struct idpf_cmd_info args;int err; -memset (&caps_msg,0 ,sizeof (struct virtchnl2_get_capabilities )); - - caps_msg.csum_caps = -VIRTCHNL2_CAP_TX_CSUM_L3_IPV4 | -VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_TCP | -VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_UDP | -VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_SCTP | -VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_TCP | -VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_UDP | -VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_SCTP | -VIRTCHNL2_CAP_TX_CSUM_GENERIC | -VIRTCHNL2_CAP_RX_CSUM_L3_IPV4 | -VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_TCP | -VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_UDP | -VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_SCTP | -VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_TCP | -VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_UDP | -VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_SCTP | -VIRTCHNL2_CAP_RX_CSUM_GENERIC ; - - caps_msg.rss_caps = -VIRTCHNL2_CAP_RSS_IPV4_TCP | -VIRTCHNL2_CAP_RSS_IPV4_UDP | -VIRTCHNL2_CAP_RSS_IPV4_SCTP | -VIRTCHNL2_CAP_RSS_IPV4_OTHER | -VIRTCHNL2_CAP_RSS_IPV6_TCP | -VIRTCHNL2_CAP_RSS_IPV6_UDP | -VIRTCHNL2_CAP_RSS_IPV6_SCTP | -VIRTCHNL2_CAP_RSS_IPV6_OTHER | -VIRTCHNL2_CAP_RSS_IPV4_AH | -VIRTCHNL2_CAP_RSS_IPV4_ESP | -VIRTCHNL2_CAP_RSS_IPV4_AH_ESP | -VIRTCHNL2_CAP_RSS_IPV6_AH | -VIRTCHNL2_CAP_RSS_IPV6_ESP | -VIRTCHNL2_CAP_RSS_IPV6_AH_ESP ; - - caps_msg.other_caps =VIRTCHNL2_CAP_WB_ON_ITR ; - args.ops =VIRTCHNL2_OP_GET_CAPS ; - args.in_args = (uint8_t *)&caps_msg; - args.in_args_size =sizeof (caps_msg); + args.in_args = (uint8_t *)&adapter->caps; + args.in_args_size =sizeof (struct virtchnl2_get_capabilities ); args.out_buffer = adapter->mbx_resp; args.out_size =IDPF_DFLT_MBX_BUF_SIZE ;
@@ -333,7 +294,7 @@ idpf_vc_caps_get(struct idpf_adapter *adapter)return err; } -rte_memcpy (&adapter->caps, args.out_buffer,sizeof (caps_msg)); +rte_memcpy (&adapter->caps, args.out_buffer,sizeof (struct virtchnl2_get_capabilities ));return 0 ; }
drivers/net/cpfl/cpfl_ethdev.c +40 -0
@@ -1200,6 +1200,44 @@ static struct idpf_ctlq_create_info ctlq_info[IDPF_CTLQ_NUM] = { } }; +static struct virtchnl2_get_capabilities req_caps = { + .csum_caps = +VIRTCHNL2_CAP_TX_CSUM_L3_IPV4 | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_TCP | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_UDP | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_SCTP | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_TCP | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_UDP | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_SCTP | +VIRTCHNL2_CAP_TX_CSUM_GENERIC | +VIRTCHNL2_CAP_RX_CSUM_L3_IPV4 | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_TCP | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_UDP | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_SCTP | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_TCP | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_UDP | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_SCTP | +VIRTCHNL2_CAP_RX_CSUM_GENERIC , + + .rss_caps = +VIRTCHNL2_CAP_RSS_IPV4_TCP | +VIRTCHNL2_CAP_RSS_IPV4_UDP | +VIRTCHNL2_CAP_RSS_IPV4_SCTP | +VIRTCHNL2_CAP_RSS_IPV4_OTHER | +VIRTCHNL2_CAP_RSS_IPV6_TCP | +VIRTCHNL2_CAP_RSS_IPV6_UDP | +VIRTCHNL2_CAP_RSS_IPV6_SCTP | +VIRTCHNL2_CAP_RSS_IPV6_OTHER | +VIRTCHNL2_CAP_RSS_IPV4_AH | +VIRTCHNL2_CAP_RSS_IPV4_ESP | +VIRTCHNL2_CAP_RSS_IPV4_AH_ESP | +VIRTCHNL2_CAP_RSS_IPV6_AH | +VIRTCHNL2_CAP_RSS_IPV6_ESP | +VIRTCHNL2_CAP_RSS_IPV6_AH_ESP , + + .other_caps =VIRTCHNL2_CAP_WB_ON_ITR +}; +static int cpfl_adapter_ext_init (struct rte_pci_device *pci_dev,struct cpfl_adapter_ext *adapter) {
@@ -1229,6 +1267,8 @@ cpfl_adapter_ext_init(struct rte_pci_device *pci_dev, struct cpfl_adapter_ext *a goto err_reset_check; } +rte_memcpy (&base->caps, &req_caps,sizeof (struct virtchnl2_get_capabilities )); + ret =idpf_adapter_init (base);if (ret !=0 ) {PMD_INIT_LOG (ERR ,"Failed to init adapter" );
drivers/net/idpf/idpf_ethdev.c +40 -0
@@ -1163,6 +1163,44 @@ static struct idpf_ctlq_create_info idpf_ctlq_info[IDPF_CTLQ_NUM] = { } }; +static struct virtchnl2_get_capabilities req_caps = { + .csum_caps = +VIRTCHNL2_CAP_TX_CSUM_L3_IPV4 | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_TCP | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_UDP | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_SCTP | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_TCP | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_UDP | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_SCTP | +VIRTCHNL2_CAP_TX_CSUM_GENERIC | +VIRTCHNL2_CAP_RX_CSUM_L3_IPV4 | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_TCP | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_UDP | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_SCTP | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_TCP | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_UDP | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_SCTP | +VIRTCHNL2_CAP_RX_CSUM_GENERIC , + + .rss_caps = +VIRTCHNL2_CAP_RSS_IPV4_TCP | +VIRTCHNL2_CAP_RSS_IPV4_UDP | +VIRTCHNL2_CAP_RSS_IPV4_SCTP | +VIRTCHNL2_CAP_RSS_IPV4_OTHER | +VIRTCHNL2_CAP_RSS_IPV6_TCP | +VIRTCHNL2_CAP_RSS_IPV6_UDP | +VIRTCHNL2_CAP_RSS_IPV6_SCTP | +VIRTCHNL2_CAP_RSS_IPV6_OTHER | +VIRTCHNL2_CAP_RSS_IPV4_AH | +VIRTCHNL2_CAP_RSS_IPV4_ESP | +VIRTCHNL2_CAP_RSS_IPV4_AH_ESP | +VIRTCHNL2_CAP_RSS_IPV6_AH | +VIRTCHNL2_CAP_RSS_IPV6_ESP | +VIRTCHNL2_CAP_RSS_IPV6_AH_ESP , + + .other_caps =VIRTCHNL2_CAP_WB_ON_ITR +}; +static int idpf_adapter_ext_init (struct rte_pci_device *pci_dev,struct idpf_adapter_ext *adapter) {
@@ -1192,6 +1230,8 @@ idpf_adapter_ext_init(struct rte_pci_device *pci_dev, struct idpf_adapter_ext *a goto err_reset_check; } +rte_memcpy (&base->caps, &req_caps,sizeof (struct virtchnl2_get_capabilities )); + ret =idpf_adapter_init (base);if (ret !=0 ) {PMD_INIT_LOG (ERR ,"Failed to init adapter" );
Signature · 1 line
2.26.2
PATCH v5 1/1 common/idpf: refine capability get
In reply to [email protected]From: Beilei Xing <[email protected]>
Initialize required capability in PMD, and refine idpf_vc_caps_get function. Then different PMDs can require different capability.
---
v5 changes:
- No need to move check_pf_reset_done and mbx_init from common module.
V4 changes:
- No need to require PTP CAP for CPFL.
V3 changes:
- refine capability get.
drivers/common/idpf/idpf_common_virtchnl.c | 45 ++-------------------- drivers/net/cpfl/cpfl_ethdev.c | 40 +++++++++++++++++++ drivers/net/idpf/idpf_ethdev.c | 40 +++++++++++++++++++ 3 files changed, 83 insertions(+), 42 deletions(-)
drivers/common/idpf/idpf_common_virtchnl.c +3 -42
@@ -278,51 +278,12 @@ idpf_vc_api_version_check(struct idpf_adapter *adapter)int idpf_vc_caps_get (struct idpf_adapter *adapter) { -struct virtchnl2_get_capabilities caps_msg;struct idpf_cmd_info args;int err; -memset (&caps_msg,0 ,sizeof (struct virtchnl2_get_capabilities )); - - caps_msg.csum_caps = -VIRTCHNL2_CAP_TX_CSUM_L3_IPV4 | -VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_TCP | -VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_UDP | -VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_SCTP | -VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_TCP | -VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_UDP | -VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_SCTP | -VIRTCHNL2_CAP_TX_CSUM_GENERIC | -VIRTCHNL2_CAP_RX_CSUM_L3_IPV4 | -VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_TCP | -VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_UDP | -VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_SCTP | -VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_TCP | -VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_UDP | -VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_SCTP | -VIRTCHNL2_CAP_RX_CSUM_GENERIC ; - - caps_msg.rss_caps = -VIRTCHNL2_CAP_RSS_IPV4_TCP | -VIRTCHNL2_CAP_RSS_IPV4_UDP | -VIRTCHNL2_CAP_RSS_IPV4_SCTP | -VIRTCHNL2_CAP_RSS_IPV4_OTHER | -VIRTCHNL2_CAP_RSS_IPV6_TCP | -VIRTCHNL2_CAP_RSS_IPV6_UDP | -VIRTCHNL2_CAP_RSS_IPV6_SCTP | -VIRTCHNL2_CAP_RSS_IPV6_OTHER | -VIRTCHNL2_CAP_RSS_IPV4_AH | -VIRTCHNL2_CAP_RSS_IPV4_ESP | -VIRTCHNL2_CAP_RSS_IPV4_AH_ESP | -VIRTCHNL2_CAP_RSS_IPV6_AH | -VIRTCHNL2_CAP_RSS_IPV6_ESP | -VIRTCHNL2_CAP_RSS_IPV6_AH_ESP ; - - caps_msg.other_caps =VIRTCHNL2_CAP_WB_ON_ITR ; - args.ops =VIRTCHNL2_OP_GET_CAPS ; - args.in_args = (uint8_t *)&caps_msg; - args.in_args_size =sizeof (caps_msg); + args.in_args = (uint8_t *)&adapter->caps; + args.in_args_size =sizeof (struct virtchnl2_get_capabilities ); args.out_buffer = adapter->mbx_resp; args.out_size =IDPF_DFLT_MBX_BUF_SIZE ;
@@ -333,7 +294,7 @@ idpf_vc_caps_get(struct idpf_adapter *adapter)return err; } -rte_memcpy (&adapter->caps, args.out_buffer,sizeof (caps_msg)); +rte_memcpy (&adapter->caps, args.out_buffer,sizeof (struct virtchnl2_get_capabilities ));return 0 ; }
drivers/net/cpfl/cpfl_ethdev.c +40 -0
@@ -1165,6 +1165,44 @@ cpfl_dev_alarm_handler(void *param)rte_eal_alarm_set (CPFL_ALARM_INTERVAL , cpfl_dev_alarm_handler, adapter); } +static struct virtchnl2_get_capabilities req_caps = { + .csum_caps = +VIRTCHNL2_CAP_TX_CSUM_L3_IPV4 | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_TCP | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_UDP | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_SCTP | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_TCP | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_UDP | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_SCTP | +VIRTCHNL2_CAP_TX_CSUM_GENERIC | +VIRTCHNL2_CAP_RX_CSUM_L3_IPV4 | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_TCP | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_UDP | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_SCTP | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_TCP | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_UDP | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_SCTP | +VIRTCHNL2_CAP_RX_CSUM_GENERIC , + + .rss_caps = +VIRTCHNL2_CAP_RSS_IPV4_TCP | +VIRTCHNL2_CAP_RSS_IPV4_UDP | +VIRTCHNL2_CAP_RSS_IPV4_SCTP | +VIRTCHNL2_CAP_RSS_IPV4_OTHER | +VIRTCHNL2_CAP_RSS_IPV6_TCP | +VIRTCHNL2_CAP_RSS_IPV6_UDP | +VIRTCHNL2_CAP_RSS_IPV6_SCTP | +VIRTCHNL2_CAP_RSS_IPV6_OTHER | +VIRTCHNL2_CAP_RSS_IPV4_AH | +VIRTCHNL2_CAP_RSS_IPV4_ESP | +VIRTCHNL2_CAP_RSS_IPV4_AH_ESP | +VIRTCHNL2_CAP_RSS_IPV6_AH | +VIRTCHNL2_CAP_RSS_IPV6_ESP | +VIRTCHNL2_CAP_RSS_IPV6_AH_ESP , + + .other_caps =VIRTCHNL2_CAP_WB_ON_ITR +}; +static int cpfl_adapter_ext_init (struct rte_pci_device *pci_dev,struct cpfl_adapter_ext *adapter) {
@@ -1181,6 +1219,8 @@ cpfl_adapter_ext_init(struct rte_pci_device *pci_dev, struct cpfl_adapter_ext *astrncpy (adapter->name, pci_dev->device.name,PCI_PRI_STR_SIZE ); +rte_memcpy (&base->caps, &req_caps,sizeof (struct virtchnl2_get_capabilities )); + ret =idpf_adapter_init (base);if (ret !=0 ) {PMD_INIT_LOG (ERR ,"Failed to init adapter" );
drivers/net/idpf/idpf_ethdev.c +40 -0
@@ -1128,6 +1128,44 @@ idpf_dev_alarm_handler(void *param)rte_eal_alarm_set (IDPF_ALARM_INTERVAL , idpf_dev_alarm_handler, adapter); } +static struct virtchnl2_get_capabilities req_caps = { + .csum_caps = +VIRTCHNL2_CAP_TX_CSUM_L3_IPV4 | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_TCP | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_UDP | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_SCTP | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_TCP | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_UDP | +VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_SCTP | +VIRTCHNL2_CAP_TX_CSUM_GENERIC | +VIRTCHNL2_CAP_RX_CSUM_L3_IPV4 | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_TCP | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_UDP | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_SCTP | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_TCP | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_UDP | +VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_SCTP | +VIRTCHNL2_CAP_RX_CSUM_GENERIC , + + .rss_caps = +VIRTCHNL2_CAP_RSS_IPV4_TCP | +VIRTCHNL2_CAP_RSS_IPV4_UDP | +VIRTCHNL2_CAP_RSS_IPV4_SCTP | +VIRTCHNL2_CAP_RSS_IPV4_OTHER | +VIRTCHNL2_CAP_RSS_IPV6_TCP | +VIRTCHNL2_CAP_RSS_IPV6_UDP | +VIRTCHNL2_CAP_RSS_IPV6_SCTP | +VIRTCHNL2_CAP_RSS_IPV6_OTHER | +VIRTCHNL2_CAP_RSS_IPV4_AH | +VIRTCHNL2_CAP_RSS_IPV4_ESP | +VIRTCHNL2_CAP_RSS_IPV4_AH_ESP | +VIRTCHNL2_CAP_RSS_IPV6_AH | +VIRTCHNL2_CAP_RSS_IPV6_ESP | +VIRTCHNL2_CAP_RSS_IPV6_AH_ESP , + + .other_caps =VIRTCHNL2_CAP_WB_ON_ITR +}; +static int idpf_adapter_ext_init (struct rte_pci_device *pci_dev,struct idpf_adapter_ext *adapter) {
@@ -1144,6 +1182,8 @@ 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 ); +rte_memcpy (&base->caps, &req_caps,sizeof (struct virtchnl2_get_capabilities )); + ret =idpf_adapter_init (base);if (ret !=0 ) {PMD_INIT_LOG (ERR ,"Failed to init adapter" );
Signature · 1 line
2.26.2
RE: [PATCH v5] common/idpf: refine capability get
Quoted 9 lines
-----Original Message-----
From: Xing, Beilei <[email protected]>
Sent: Monday, April 24, 2023 4:08 PM
To: Wu, Jingjing <[email protected]>
Cc: [email protected]; Xing, Beilei <[email protected]>
Subject: [PATCH v5] common/idpf: refine capability get
Quoted 7 lines
From: Beilei Xing <[email protected]>
Initialize required capability in PMD, and refine
idpf_vc_caps_getfunction. Then different PMDs can require different capability.Signed-off-by Beilei Xing <[email protected]>
Zhang, Qi Z
AppliedRE: [PATCH v5] common/idpf: refine capability get
Quoted 18 lines
-----Original Message-----
From: Wu, Jingjing <[email protected]>
Sent: Wednesday, April 26, 2023 1:18 PM
To: Xing, Beilei <[email protected]>
Cc: [email protected]
Subject: RE: [PATCH v5] common/idpf: refine capability getQuoted 7 lines
-----Original Message-----
From: Xing, Beilei <[email protected]>
Sent: Monday, April 24, 2023 4:08 PM
To: Wu, Jingjing <[email protected]>
Cc: [email protected]; Xing, Beilei <[email protected]>
Subject: [PATCH v5] common/idpf: refine capability get
Quoted 7 lines
Quoted 6 lines
From: Beilei Xing <[email protected]>
Initialize required capability in PMD, and refine
idpf_vc_caps_getfunction. Then different PMDs can require different capability.Signed-off-by Beilei Xing <[email protected]>Acked-by Jingjing Wu <[email protected]>
Applied to dpdk-next-net-intel.
Thanks
Qi