[PATCH v2 04/15] net/zxdh: port tables unint implementations

[Stephen Hemminger]

On Tue, 10 Dec 2024 13:53:22 +0800
Junlong Wang <wang.junlong1 at zte.com.cn> wrote:

> delete port tables in host.
> 
> Signed-off-by: Junlong Wang <wang.junlong1 at zte.com.cn>
> ---
>  drivers/net/zxdh/zxdh_ethdev.c |  19 ++++++
>  drivers/net/zxdh/zxdh_msg.h    |   1 +
>  drivers/net/zxdh/zxdh_np.c     | 113 +++++++++++++++++++++++++++++++++
>  drivers/net/zxdh/zxdh_np.h     |   9 +++
>  drivers/net/zxdh/zxdh_tables.c |  36 ++++++++++-
>  drivers/net/zxdh/zxdh_tables.h |   1 +
>  6 files changed, 177 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/zxdh/zxdh_ethdev.c b/drivers/net/zxdh/zxdh_ethdev.c
> index 8a9ca87183..a72319758a 100644
> --- a/drivers/net/zxdh/zxdh_ethdev.c
> +++ b/drivers/net/zxdh/zxdh_ethdev.c
> @@ -887,12 +887,31 @@ zxdh_np_uninit(struct rte_eth_dev *dev)
>  		zxdh_np_dtb_data_res_free(hw);
>  }
>  
> +static int
> +zxdh_tables_uninit(struct rte_eth_dev *dev)
> +{
> +	int ret = 0;
> +
> +	ret = zxdh_port_attr_uninit(dev);
> +	if (ret) {
> +		PMD_DRV_LOG(ERR, "zxdh_port_attr_uninit failed");
> +		return ret;
> +	}
> +	return ret;
> +}
> +
>  static int
>  zxdh_dev_close(struct rte_eth_dev *dev)
>  {
>  	struct zxdh_hw *hw = dev->data->dev_private;
>  	int ret = 0;
>  
> +	ret = zxdh_tables_uninit(dev);
> +	if (ret != 0) {
> +		PMD_DRV_LOG(ERR, "%s :tables uninit %s failed ", __func__, dev->device->name);
> +		return -1;
> +	}
> +
>  	zxdh_intr_release(dev);
>  	zxdh_np_uninit(dev);
>  	zxdh_pci_reset(hw);
> diff --git a/drivers/net/zxdh/zxdh_msg.h b/drivers/net/zxdh/zxdh_msg.h
> index 35ed5d1a1c..9997417f28 100644
> --- a/drivers/net/zxdh/zxdh_msg.h
> +++ b/drivers/net/zxdh/zxdh_msg.h
> @@ -167,6 +167,7 @@ enum pciebar_layout_type {
>  enum zxdh_msg_type {
>  	ZXDH_NULL = 0,
>  	ZXDH_VF_PORT_INIT = 1,
> +	ZXDH_VF_PORT_UNINIT = 2,
>  
>  	ZXDH_MSG_TYPE_END,
>  } __rte_packed;
> diff --git a/drivers/net/zxdh/zxdh_np.c b/drivers/net/zxdh/zxdh_np.c
> index 736994643d..1c1c3cbbcc 100644
> --- a/drivers/net/zxdh/zxdh_np.c
> +++ b/drivers/net/zxdh/zxdh_np.c
> @@ -24,6 +24,7 @@ ZXDH_RISCV_DTB_MGR *p_riscv_dtb_queue_mgr[ZXDH_DEV_CHANNEL_MAX] = {NULL};
>  ZXDH_TLB_MGR_T *g_p_dpp_tlb_mgr[ZXDH_DEV_CHANNEL_MAX]   = {NULL};
>  ZXDH_REG_T g_dpp_reg_info[4];
>  ZXDH_DTB_TABLE_T g_dpp_dtb_table_info[4];
> +ZXDH_SDT_TBL_DATA_T  g_sdt_info[ZXDH_DEV_CHANNEL_MAX][ZXDH_DEV_SDT_ID_MAX];
>  
>  #define ZXDH_COMM_ASSERT(x)           assert(x)
>  #define ZXDH_SDT_MGR_PTR_GET()    (&g_sdt_mgr)
> @@ -1497,3 +1498,115 @@ zxdh_np_dtb_table_entry_write(uint32_t dev_id,
>  
>  	return rc;
>  }
> +
> +static uint32_t
> +zxdh_np_sdt_tbl_data_get(uint32_t dev_id, uint32_t sdt_no, ZXDH_SDT_TBL_DATA_T *p_sdt_data)
> +{
> +	uint32_t rc   = 0;
> +
> +	p_sdt_data->data_high32 = g_sdt_info[dev_id][sdt_no].data_high32;
> +	p_sdt_data->data_low32  = g_sdt_info[dev_id][sdt_no].data_low32;
> +
> +	return rc;
> +}
> +
> +int
> +zxdh_np_dtb_table_entry_delete(uint32_t dev_id,
> +			 uint32_t queue_id,
> +			 uint32_t entrynum,
> +			 ZXDH_DTB_USER_ENTRY_T *delete_entries)
> +{
> +	uint32_t rc = 0;
> +	uint32_t entry_index = 0;
> +	uint32_t sdt_no = 0;
> +	uint32_t tbl_type = 0;
> +	uint32_t element_id = 0xff;
> +	uint32_t one_dtb_len = 0;
> +	uint32_t dtb_len = 0;
> +	uint32_t addr_offset = 0;
> +	uint32_t max_size = 0;
> +	uint8_t *p_data_buff = NULL;
> +	uint8_t *p_data_buff_ex = NULL;
> +	ZXDH_DTB_LPM_ENTRY_T lpm_entry = {0};
> +
> +	uint8_t entry_cmd[ZXDH_DTB_TABLE_CMD_SIZE_BIT / 8] = {0};
> +	uint8_t entry_data[ZXDH_ETCAM_WIDTH_MAX / 8] = {0};
> +	ZXDH_SDT_TBL_DATA_T sdt_tbl = {0};
> +	ZXDH_DTB_USER_ENTRY_T *pentry = NULL;
> +	ZXDH_DTB_ENTRY_T   dtb_one_entry = {0};
> +
> +	ZXDH_COMM_CHECK_POINT(delete_entries);
> +
> +	p_data_buff = (uint8_t *)rte_malloc(NULL, ZXDH_DTB_TABLE_DATA_BUFF_SIZE, 0);

cast not needed.

> +	ZXDH_COMM_CHECK_POINT(p_data_buff);
> +	memset(p_data_buff, 0, ZXDH_DTB_TABLE_DATA_BUFF_SIZE);

If you use rte_calloc() the memset is not needed.

> +
> +	p_data_buff_ex =
> +		(uint8_t *)rte_malloc(NULL, ZXDH_DTB_TABLE_DATA_BUFF_SIZE * sizeof(uint8_t), 0);

cast not needed.

> +	memset(p_data_buff_ex, 0, ZXDH_DTB_TABLE_DATA_BUFF_SIZE);

use rte_calloc instead.

> +
> +	memset((uint8_t *)&lpm_entry, 0x0, sizeof(ZXDH_DTB_LPM_ENTRY_T));

unnecessary, you already initialized this.

> +	memset((uint8_t *)&dtb_one_entry, 0x0, sizeof(ZXDH_DTB_ENTRY_T));

Also already internalized.

> +	memset(entry_cmd, 0x0, sizeof(entry_cmd));
> +	memset(entry_data, 0x0, sizeof(entry_data));
ditto