modify&nbsp;some&nbsp;vlan&nbsp;related&nbsp;issues,<br />which&nbsp;were&nbsp;discovered&nbsp;during&nbsp;the&nbsp;testing&nbsp;process.<br />
<br />Fixes:&nbsp;b4f996b7fcf6&nbsp;(&quot;net/zxdh:&nbsp;optimize&nbsp;VLAN&nbsp;filter&nbsp;and&nbsp;offload&quot;)<br />
<br />Signed-off-by:&nbsp;Junlong&nbsp;Wang&nbsp;&lt;wang.junlong1@zte.com.cn&gt;
<br />---<br />&nbsp;drivers/net/zxdh/zxdh_ethdev.c&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;9&nbsp;++++++++-<br />&nbsp;drivers/net/zxdh/zxdh_ethdev_ops.c&nbsp;|&nbsp;&nbsp;4&nbsp;++--<br />&nbsp;drivers/net/zxdh/zxdh_msg.c&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;28&nbsp;++++++++++++++++++++++++++--<br />&nbsp;drivers/net/zxdh/zxdh_tables.c&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;28&nbsp;++++++++++++++++++++++------<br />&nbsp;drivers/net/zxdh/zxdh_tables.h&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;7&nbsp;++++++-<br />&nbsp;5&nbsp;files&nbsp;changed,&nbsp;64&nbsp;insertions(+),&nbsp;12&nbsp;deletions(-)<br />
<br />diff&nbsp;--git&nbsp;a/drivers/net/zxdh/zxdh_ethdev.c&nbsp;b/drivers/net/zxdh/zxdh_ethdev.c<br />index&nbsp;74018821d1..d92df46d11&nbsp;100644<br />---&nbsp;a/drivers/net/zxdh/zxdh_ethdev.c<br />+++&nbsp;b/drivers/net/zxdh/zxdh_ethdev.c<br />@@&nbsp;-1907,6&nbsp;+1907,7&nbsp;@@&nbsp;zxdh_np_init(struct&nbsp;rte_eth_dev&nbsp;*eth_dev)<br />&nbsp;static&nbsp;int<br />&nbsp;zxdh_tables_init(struct&nbsp;rte_eth_dev&nbsp;*dev)<br />&nbsp;{<br />+&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_hw&nbsp;*hw&nbsp;=&nbsp;dev-&gt;data-&gt;dev_private;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;int&nbsp;ret&nbsp;=&nbsp;0;<br />&nbsp;
<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_port_attr_init(dev);<br />@@&nbsp;-1927,12&nbsp;+1928,18&nbsp;@@&nbsp;zxdh_tables_init(struct&nbsp;rte_eth_dev&nbsp;*dev)<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;ret;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br />&nbsp;
<br />-&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_vlan_filter_table_init(dev);<br />+&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_vlan_filter_table_init(hw,&nbsp;hw-&gt;vport.vport);<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(ret)&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PMD_DRV_LOG(ERR,&nbsp;&quot;vlan&nbsp;filter&nbsp;table&nbsp;init&nbsp;failed&quot;);<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;ret;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br />&nbsp;
<br />+&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_port_vlan_table_init(hw,&nbsp;hw-&gt;vport.vport);<br />+&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(ret)&nbsp;{<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PMD_DRV_LOG(ERR,&nbsp;&quot;port&nbsp;vlan&nbsp;table&nbsp;init&nbsp;failed&quot;);<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;ret;<br />+&nbsp;&nbsp;&nbsp;&nbsp;}<br />+<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;ret;<br />&nbsp;}<br />&nbsp;
<br />diff&nbsp;--git&nbsp;a/drivers/net/zxdh/zxdh_ethdev_ops.c&nbsp;b/drivers/net/zxdh/zxdh_ethdev_ops.c<br />index&nbsp;c7a9dc7854..3eed388dac&nbsp;100644<br />---&nbsp;a/drivers/net/zxdh/zxdh_ethdev_ops.c<br />+++&nbsp;b/drivers/net/zxdh/zxdh_ethdev_ops.c<br />@@&nbsp;-553,7&nbsp;+553,7&nbsp;@@&nbsp;zxdh_dev_mac_addr_add(struct&nbsp;rte_eth_dev&nbsp;*dev,&nbsp;struct&nbsp;rte_ether_addr&nbsp;*mac_addr,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;zxdh_msg_reply_info,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ZXDH_ST_SZ_BYTES(msg_reply_info));<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(ret)&nbsp;{<br />-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;flag&nbsp;=&nbsp;ZXDH_GET(mac_reply_msg,<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint8_t&nbsp;flag&nbsp;=&nbsp;ZXDH_GET(mac_reply_msg,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;mac_reply_msg_addr,&nbsp;mac_flag);<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(flag&nbsp;==&nbsp;ZXDH_EEXIST_MAC_FLAG)&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PMD_DRV_LOG(ERR,&nbsp;&quot;pf&nbsp;mac&nbsp;add&nbsp;failed&nbsp;mac&nbsp;is&nbsp;in&nbsp;used&quot;);<br />@@&nbsp;-895,7&nbsp;+895,7&nbsp;@@&nbsp;zxdh_dev_vlan_offload_set(struct&nbsp;rte_eth_dev&nbsp;*dev,&nbsp;int&nbsp;mask)<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;-EAGAIN;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}&nbsp;else&nbsp;{<br />-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;msg.data.vlan_filter_set_msg.enable&nbsp;=&nbsp;true;<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;msg.data.vlan_filter_set_msg.enable&nbsp;=&nbsp;false;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;zxdh_msg_head_build(hw,&nbsp;ZXDH_VLAN_FILTER_SET,&nbsp;&amp;msg);<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_vf_send_msg_to_pf(hw-&gt;eth_dev,&nbsp;&amp;msg,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;sizeof(struct&nbsp;zxdh_msg_info),&nbsp;NULL,&nbsp;0);<br />diff&nbsp;--git&nbsp;a/drivers/net/zxdh/zxdh_msg.c&nbsp;b/drivers/net/zxdh/zxdh_msg.c<br />index&nbsp;452c7ab2e3..e607ea1dab&nbsp;100644<br />---&nbsp;a/drivers/net/zxdh/zxdh_msg.c<br />+++&nbsp;b/drivers/net/zxdh/zxdh_msg.c<br />@@&nbsp;-1233,6&nbsp;+1233,24&nbsp;@@&nbsp;zxdh_vf_promisc_uninit(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;union&nbsp;zxdh_virport_num&nbsp;vport)<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;ret;<br />&nbsp;}<br />&nbsp;
<br />+static&nbsp;int<br />+zxdh_vf_vlan_table_init(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport)<br />+{<br />+&nbsp;&nbsp;&nbsp;&nbsp;int&nbsp;ret&nbsp;=&nbsp;0;<br />+&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_vlan_filter_table_init(hw,&nbsp;vport);<br />+&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(ret)&nbsp;{<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PMD_DRV_LOG(ERR,&nbsp;&quot;vf&nbsp;vlan&nbsp;filter&nbsp;table&nbsp;init&nbsp;failed,&nbsp;code:%d&quot;,&nbsp;ret);<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;-1;<br />+&nbsp;&nbsp;&nbsp;&nbsp;}<br />+<br />+&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_port_vlan_table_init(hw,&nbsp;vport);<br />+&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(ret)&nbsp;{<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PMD_DRV_LOG(ERR,&nbsp;&quot;vf&nbsp;port&nbsp;vlan&nbsp;table&nbsp;init&nbsp;failed,&nbsp;code:%d&quot;,&nbsp;ret);<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;-1;<br />+&nbsp;&nbsp;&nbsp;&nbsp;}<br />+&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;ret;<br />+}<br />+<br />&nbsp;static&nbsp;int<br />&nbsp;zxdh_vf_port_init(struct&nbsp;zxdh_hw&nbsp;*pf_hw,&nbsp;uint16_t&nbsp;vport,&nbsp;void&nbsp;*cfg_data,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;void&nbsp;*res_info,&nbsp;uint16_t&nbsp;*res_len)<br />@@&nbsp;-1252,9&nbsp;+1270,8&nbsp;@@&nbsp;zxdh_vf_port_init(struct&nbsp;zxdh_hw&nbsp;*pf_hw,&nbsp;uint16_t&nbsp;vport,&nbsp;void&nbsp;*cfg_data,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;port_attr.pf_vfid&nbsp;=&nbsp;pf_hw-&gt;vfid;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;port_attr.hash_search_index&nbsp;=&nbsp;pf_hw-&gt;hash_search_index;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;port_attr.port_base_qid&nbsp;=&nbsp;vf_init_msg-&gt;base_qid;<br />-&nbsp;&nbsp;&nbsp;&nbsp;uint16_t&nbsp;vfid&nbsp;=&nbsp;zxdh_vport_to_vfid(port);<br />&nbsp;
<br />-&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_set_port_attr(pf_hw,&nbsp;vfid,&nbsp;&amp;port_attr);<br />+&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_set_port_attr(pf_hw,&nbsp;vport,&nbsp;&amp;port_attr);<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(ret)&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PMD_DRV_LOG(ERR,&nbsp;&quot;set&nbsp;vport&nbsp;attr&nbsp;failed,&nbsp;code:%d&quot;,&nbsp;ret);<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;goto&nbsp;proc_end;<br />@@&nbsp;-1265,6&nbsp;+1282,13&nbsp;@@&nbsp;zxdh_vf_port_init(struct&nbsp;zxdh_hw&nbsp;*pf_hw,&nbsp;uint16_t&nbsp;vport,&nbsp;void&nbsp;*cfg_data,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PMD_DRV_LOG(ERR,&nbsp;&quot;vf_promisc_table_init&nbsp;failed,&nbsp;code:%d&quot;,&nbsp;ret);<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;goto&nbsp;proc_end;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br />+<br />+&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_vf_vlan_table_init(pf_hw,&nbsp;vport);<br />+&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(ret)&nbsp;{<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PMD_DRV_LOG(ERR,&nbsp;&quot;vf&nbsp;vlan&nbsp;table&nbsp;init&nbsp;failed,&nbsp;code:%d&quot;,&nbsp;ret);<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;goto&nbsp;proc_end;<br />+&nbsp;&nbsp;&nbsp;&nbsp;}<br />+<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ZXDH_SET(msg_reply_body,&nbsp;res_info,&nbsp;flag,&nbsp;ZXDH_REPS_SUCC);<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;*res_len&nbsp;=&nbsp;sizeof(uint8_t);<br />&nbsp;
<br />diff&nbsp;--git&nbsp;a/drivers/net/zxdh/zxdh_tables.c&nbsp;b/drivers/net/zxdh/zxdh_tables.c<br />index&nbsp;33f161c4cd..a213df4f23&nbsp;100644<br />---&nbsp;a/drivers/net/zxdh/zxdh_tables.c<br />+++&nbsp;b/drivers/net/zxdh/zxdh_tables.c<br />@@&nbsp;-699,10&nbsp;+699,11&nbsp;@@&nbsp;zxdh_dev_multicast_table_set(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,&nbsp;bool&nbsp;enable)<br />&nbsp;}<br />&nbsp;
<br />&nbsp;int<br />-zxdh_vlan_filter_table_init(struct&nbsp;rte_eth_dev&nbsp;*dev)<br />+zxdh_vlan_filter_table_init(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport)<br />&nbsp;{<br />-&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_hw&nbsp;*hw&nbsp;=&nbsp;dev-&gt;data-&gt;dev_private;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_dtb_shared_data&nbsp;*dtb_data&nbsp;=&nbsp;&amp;hw-&gt;dev_sd-&gt;dtb_sd;<br />+&nbsp;&nbsp;&nbsp;&nbsp;union&nbsp;zxdh_virport_num&nbsp;vport_num&nbsp;=&nbsp;(union&nbsp;zxdh_virport_num)vport;<br />+&nbsp;&nbsp;&nbsp;&nbsp;uint16_t&nbsp;vfid&nbsp;=&nbsp;zxdh_vport_to_vfid(vport_num);<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_vlan_filter_table&nbsp;vlan_table&nbsp;=&nbsp;{0};<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;int16_t&nbsp;ret&nbsp;=&nbsp;0;<br />&nbsp;
<br />@@&nbsp;-717,7&nbsp;+718,7&nbsp;@@&nbsp;zxdh_vlan_filter_table_init(struct&nbsp;rte_eth_dev&nbsp;*dev)<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}&nbsp;else&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;vlan_table.vlans[0]&nbsp;=&nbsp;0;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br />-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint32_t&nbsp;index&nbsp;=&nbsp;(vlan_group&nbsp;&lt;&lt;&nbsp;11)&nbsp;|&nbsp;hw-&gt;vport.vfid;<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint32_t&nbsp;index&nbsp;=&nbsp;(vlan_group&nbsp;&lt;&lt;&nbsp;11)&nbsp;|&nbsp;vfid;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ZXDH_DTB_ERAM_ENTRY_INFO_T&nbsp;entry_data&nbsp;=&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;.index&nbsp;=&nbsp;index,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;.p_data&nbsp;=&nbsp;(uint32_t&nbsp;*)&amp;vlan_table<br />@@&nbsp;-749,7&nbsp;+750,7&nbsp;@@&nbsp;zxdh_vlan_filter_table_set(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,&nbsp;uint16_t&nbsp;vlan_id,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;memset(&amp;vlan_table,&nbsp;0,&nbsp;sizeof(struct&nbsp;zxdh_vlan_filter_table));<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;int&nbsp;table_num&nbsp;=&nbsp;vlan_id&nbsp;/&nbsp;ZXDH_VLAN_FILTER_VLANID_STEP;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint32_t&nbsp;index&nbsp;=&nbsp;(table_num&nbsp;&lt;&lt;&nbsp;11)&nbsp;|&nbsp;vfid;<br />-&nbsp;&nbsp;&nbsp;&nbsp;uint16_t&nbsp;group&nbsp;=&nbsp;(vlan_id&nbsp;-&nbsp;table_num&nbsp;*&nbsp;ZXDH_VLAN_FILTER_VLANID_STEP)&nbsp;/&nbsp;8&nbsp;+&nbsp;1;<br />+&nbsp;&nbsp;&nbsp;&nbsp;uint16_t&nbsp;group&nbsp;=&nbsp;(vlan_id&nbsp;%&nbsp;ZXDH_VLAN_FILTER_VLANID_STEP)&nbsp;/&nbsp;8&nbsp;+&nbsp;1;<br />&nbsp;
<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint8_t&nbsp;val&nbsp;=&nbsp;sizeof(struct&nbsp;zxdh_vlan_filter_table)&nbsp;/&nbsp;sizeof(uint32_t);<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint8_t&nbsp;vlan_tbl_index&nbsp;=&nbsp;group&nbsp;/&nbsp;val;<br />@@&nbsp;-950,7&nbsp;+951,7&nbsp;@@&nbsp;zxdh_vlan_relate_vport(struct&nbsp;rte_eth_dev&nbsp;*dev,&nbsp;uint16_t&nbsp;vport,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;0;<br />&nbsp;}<br />&nbsp;
<br />-static&nbsp;int<br />+int<br />&nbsp;zxdh_set_port_vlan_attr(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_port_vlan_table&nbsp;*port_vlan)<br />&nbsp;{<br />@@&nbsp;-973,7&nbsp;+974,7&nbsp;@@&nbsp;zxdh_set_port_vlan_attr(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;ret;<br />&nbsp;}<br />&nbsp;
<br />-static&nbsp;int<br />+int<br />&nbsp;zxdh_get_port_vlan_attr(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_port_vlan_table&nbsp;*port_vlan)<br />&nbsp;{<br />@@&nbsp;-1045,3&nbsp;+1046,18&nbsp;@@&nbsp;int&nbsp;zxdh_set_vlan_offload(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,&nbsp;uint8_t&nbsp;type,&nbsp;uint<br />&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;set_vlan_config(hw,&nbsp;vport,&nbsp;type,&nbsp;enable);<br />&nbsp;}<br />+<br />+int&nbsp;zxdh_port_vlan_table_init(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport)<br />+{<br />+&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_port_vlan_table&nbsp;port_vlan&nbsp;=&nbsp;{0};<br />+&nbsp;&nbsp;&nbsp;&nbsp;int&nbsp;ret&nbsp;=&nbsp;0;<br />+<br />+&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(!hw-&gt;is_pf)<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;0;<br />+<br />+&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_set_port_vlan_attr(hw,&nbsp;vport,&nbsp;&amp;port_vlan);<br />+&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(ret)<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PMD_DRV_LOG(ERR,&nbsp;&quot;port&nbsp;vlan&nbsp;table&nbsp;init&nbsp;failed&quot;);<br />+<br />+&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;ret;<br />+}<br />diff&nbsp;--git&nbsp;a/drivers/net/zxdh/zxdh_tables.h&nbsp;b/drivers/net/zxdh/zxdh_tables.h<br />index&nbsp;cb34e38be8..3280ff1f89&nbsp;100644<br />---&nbsp;a/drivers/net/zxdh/zxdh_tables.h<br />+++&nbsp;b/drivers/net/zxdh/zxdh_tables.h<br />@@&nbsp;-362,7&nbsp;+362,7&nbsp;@@&nbsp;int&nbsp;zxdh_promisc_table_init(struct&nbsp;rte_eth_dev&nbsp;*dev);<br />&nbsp;int&nbsp;zxdh_promisc_table_uninit(struct&nbsp;rte_eth_dev&nbsp;*dev);<br />&nbsp;int&nbsp;zxdh_dev_unicast_table_set(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,&nbsp;bool&nbsp;enable);<br />&nbsp;int&nbsp;zxdh_dev_multicast_table_set(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,&nbsp;bool&nbsp;enable);<br />-int&nbsp;zxdh_vlan_filter_table_init(struct&nbsp;rte_eth_dev&nbsp;*dev);<br />+int&nbsp;zxdh_vlan_filter_table_init(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport);<br />&nbsp;int&nbsp;zxdh_vlan_filter_table_set(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint16_t&nbsp;vlan_id,&nbsp;uint8_t&nbsp;enable);<br />&nbsp;int&nbsp;zxdh_rss_table_set(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,&nbsp;struct&nbsp;zxdh_rss_reta&nbsp;*rss_reta);<br />@@&nbsp;-372,5&nbsp;+372,10&nbsp;@@&nbsp;int&nbsp;zxdh_set_panel_attr(struct&nbsp;rte_eth_dev&nbsp;*dev,&nbsp;struct&nbsp;zxdh_panel_table&nbsp;*panel_<br />&nbsp;int&nbsp;zxdh_dev_broadcast_set(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,&nbsp;bool&nbsp;enable);<br />&nbsp;int&nbsp;zxdh_set_vlan_filter(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,&nbsp;uint8_t&nbsp;enable);<br />&nbsp;int&nbsp;zxdh_set_vlan_offload(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,&nbsp;uint8_t&nbsp;type,&nbsp;uint8_t&nbsp;enable);<br />+int&nbsp;zxdh_set_port_vlan_attr(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_port_vlan_table&nbsp;*port_vlan);<br />+int&nbsp;zxdh_get_port_vlan_attr(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_port_vlan_table&nbsp;*port_vlan);<br />+int&nbsp;zxdh_port_vlan_table_init(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport);<br />&nbsp;
<br />&nbsp;#endif&nbsp;/*&nbsp;ZXDH_TABLES_H&nbsp;*/<br />--&nbsp;
<br />2.27.0<br />