add&nbsp;support&nbsp;primary/secondary&nbsp;process,<br />and&nbsp;secondary&nbsp;process&nbsp;ops&nbsp;only&nbsp;support&nbsp;get&nbsp;stats/infos.<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;29&nbsp;++++++++++++++++--<br />&nbsp;drivers/net/zxdh/zxdh_ethdev.h&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;1&nbsp;+<br />&nbsp;drivers/net/zxdh/zxdh_ethdev_ops.c&nbsp;|&nbsp;49&nbsp;+++++++++++++++++++-----------<br />&nbsp;drivers/net/zxdh/zxdh_queue.h&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;1&nbsp;-<br />&nbsp;drivers/net/zxdh/zxdh_rxtx.c&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;2&nbsp;+-<br />&nbsp;5&nbsp;files&nbsp;changed,&nbsp;60&nbsp;insertions(+),&nbsp;22&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;823b1ffb5c..cd29162070&nbsp;100644<br />---&nbsp;a/drivers/net/zxdh/zxdh_ethdev.c<br />+++&nbsp;b/drivers/net/zxdh/zxdh_ethdev.c<br />@@&nbsp;-23,7&nbsp;+23,6&nbsp;@@&nbsp;struct&nbsp;zxdh_hw_internal&nbsp;zxdh_hw_internal[RTE_MAX_ETHPORTS];<br />&nbsp;struct&nbsp;zxdh_dev_nic_shared_data&nbsp;dev_nic_sd[ZXDH_SLOT_MAX];<br />&nbsp;static&nbsp;rte_spinlock_t&nbsp;zxdh_shared_data_lock&nbsp;=&nbsp;RTE_SPINLOCK_INITIALIZER;<br />&nbsp;struct&nbsp;zxdh_shared_data&nbsp;*zxdh_shared_data;<br />-struct&nbsp;zxdh_net_hdr_dl&nbsp;g_net_hdr_dl[RTE_MAX_ETHPORTS];<br />&nbsp;struct&nbsp;zxdh_mtr_res&nbsp;g_mtr_res;<br />&nbsp;
<br />&nbsp;#define&nbsp;ZXDH_INVALID_DTBQUE&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;0xFFFF<br />@@&nbsp;-409,7&nbsp;+408,7&nbsp;@@&nbsp;zxdh_configure_intr(struct&nbsp;rte_eth_dev&nbsp;*dev)<br />&nbsp;static&nbsp;void<br />&nbsp;zxdh_update_net_hdr_dl(struct&nbsp;zxdh_hw&nbsp;*hw)<br />&nbsp;{<br />-&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_net_hdr_dl&nbsp;*net_hdr_dl&nbsp;=&nbsp;&amp;g_net_hdr_dl[hw-&gt;port_id];<br />+&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_net_hdr_dl&nbsp;*net_hdr_dl&nbsp;=&nbsp;hw-&gt;net_hdr_dl;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;memset(net_hdr_dl,&nbsp;0,&nbsp;ZXDH_DL_NET_HDR_SIZE);<br />&nbsp;
<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(zxdh_tx_offload_enabled(hw))&nbsp;{<br />@@&nbsp;-1229,6&nbsp;+1228,9&nbsp;@@&nbsp;zxdh_priv_res_free(struct&nbsp;zxdh_hw&nbsp;*priv)<br />&nbsp;
<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;rte_free(priv-&gt;queue_conf);<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;priv-&gt;queue_conf&nbsp;=&nbsp;NULL;<br />+<br />+&nbsp;&nbsp;&nbsp;&nbsp;rte_free(priv-&gt;net_hdr_dl);<br />+&nbsp;&nbsp;&nbsp;&nbsp;priv-&gt;net_hdr_dl&nbsp;=&nbsp;NULL;<br />&nbsp;}<br />&nbsp;
<br />&nbsp;static&nbsp;int<br />@@&nbsp;-1555,6&nbsp;+1557,16&nbsp;@@&nbsp;static&nbsp;const&nbsp;struct&nbsp;eth_dev_ops&nbsp;zxdh_eth_dev_ops&nbsp;=&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;.flow_ops_get&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=&nbsp;zxdh_flow_ops_get,<br />&nbsp;};<br />&nbsp;
<br />+const&nbsp;struct&nbsp;eth_dev_ops&nbsp;zxdh_eth_dev_secondary_ops&nbsp;=&nbsp;{<br />+&nbsp;&nbsp;&nbsp;&nbsp;.dev_infos_get&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=&nbsp;zxdh_dev_infos_get,<br />+&nbsp;&nbsp;&nbsp;&nbsp;.stats_get&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=&nbsp;zxdh_dev_stats_get,<br />+&nbsp;&nbsp;&nbsp;&nbsp;.xstats_get&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=&nbsp;zxdh_dev_xstats_get,<br />+&nbsp;&nbsp;&nbsp;&nbsp;.xstats_get_names&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=&nbsp;zxdh_dev_xstats_get_names,<br />+&nbsp;&nbsp;&nbsp;&nbsp;.rxq_info_get&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=&nbsp;zxdh_rxq_info_get,<br />+&nbsp;&nbsp;&nbsp;&nbsp;.txq_info_get&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=&nbsp;zxdh_txq_info_get,<br />+&nbsp;&nbsp;&nbsp;&nbsp;.dev_supported_ptypes_get&nbsp;=&nbsp;zxdh_dev_supported_ptypes_get,<br />+};<br />+<br />&nbsp;static&nbsp;int32_t<br />&nbsp;zxdh_init_device(struct&nbsp;rte_eth_dev&nbsp;*eth_dev)<br />&nbsp;{<br />@@&nbsp;-2136,6&nbsp;+2148,13&nbsp;@@&nbsp;zxdh_priv_res_init(struct&nbsp;zxdh_hw&nbsp;*hw)<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;-ENOMEM;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br />&nbsp;
<br />+&nbsp;&nbsp;&nbsp;&nbsp;hw-&gt;net_hdr_dl&nbsp;=&nbsp;rte_zmalloc(&quot;zxdh_net_hdr_dl&quot;,&nbsp;sizeof(struct&nbsp;zxdh_net_hdr_dl),&nbsp;0);<br />+&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(hw-&gt;net_hdr_dl&nbsp;==&nbsp;NULL)&nbsp;{<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PMD_DRV_LOG(ERR,&nbsp;&quot;Failed&nbsp;to&nbsp;allocate&nbsp;%ld&nbsp;bytes&nbsp;store&nbsp;queue&nbsp;conf&quot;,<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;sizeof(struct&nbsp;zxdh_net_hdr_dl));<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;-ENOMEM;<br />+&nbsp;&nbsp;&nbsp;&nbsp;}<br />+<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;0;<br />&nbsp;}<br />&nbsp;
<br />@@&nbsp;-2173,6&nbsp;+2192,12&nbsp;@@&nbsp;zxdh_eth_dev_init(struct&nbsp;rte_eth_dev&nbsp;*eth_dev)<br />&nbsp;
<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;eth_dev-&gt;dev_ops&nbsp;=&nbsp;&amp;zxdh_eth_dev_ops;<br />&nbsp;
<br />+&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(rte_eal_process_type()&nbsp;==&nbsp;RTE_PROC_SECONDARY)&nbsp;{<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;eth_dev-&gt;dev_ops&nbsp;=&nbsp;&amp;zxdh_eth_dev_secondary_ops;<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ZXDH_VTPCI_OPS(hw)&nbsp;=&nbsp;&amp;zxdh_dev_pci_ops;<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;0;<br />+&nbsp;&nbsp;&nbsp;&nbsp;}<br />+<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/*&nbsp;Allocate&nbsp;memory&nbsp;for&nbsp;storing&nbsp;MAC&nbsp;addresses&nbsp;*/<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;eth_dev-&gt;data-&gt;mac_addrs&nbsp;=&nbsp;rte_zmalloc(&quot;zxdh_mac&quot;,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ZXDH_MAX_MAC_ADDRS&nbsp;*&nbsp;RTE_ETHER_ADDR_LEN,&nbsp;0);<br />diff&nbsp;--git&nbsp;a/drivers/net/zxdh/zxdh_ethdev.h&nbsp;b/drivers/net/zxdh/zxdh_ethdev.h<br />index&nbsp;81b385ecb8..41fa89d20c&nbsp;100644<br />---&nbsp;a/drivers/net/zxdh/zxdh_ethdev.h<br />+++&nbsp;b/drivers/net/zxdh/zxdh_ethdev.h<br />@@&nbsp;-120,6&nbsp;+120,7&nbsp;@@&nbsp;struct&nbsp;zxdh_hw&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_dev_nic_shared_data&nbsp;*dev_nic_sd;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;vfinfo&nbsp;*vfinfo;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_queue_conf&nbsp;*queue_conf;<br />+&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_net_hdr_dl&nbsp;*net_hdr_dl;<br />&nbsp;
<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint64_t&nbsp;bar_addr[ZXDH_NUM_BARS];<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint64_t&nbsp;host_features;<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;8fb315eeac..068dd21876&nbsp;100644<br />---&nbsp;a/drivers/net/zxdh/zxdh_ethdev_ops.c<br />+++&nbsp;b/drivers/net/zxdh/zxdh_ethdev_ops.c<br />@@&nbsp;-1802,22&nbsp;+1802,26&nbsp;@@&nbsp;zxdh_dev_stats_get(struct&nbsp;rte_eth_dev&nbsp;*dev,&nbsp;struct&nbsp;rte_eth_stats&nbsp;*stats,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_hw_mac_bytes&nbsp;mac_bytes&nbsp;=&nbsp;{0};<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint32_t&nbsp;i&nbsp;=&nbsp;0;<br />&nbsp;
<br />-&nbsp;&nbsp;&nbsp;&nbsp;zxdh_hw_vqm_stats_get(dev,&nbsp;ZXDH_VQM_DEV_STATS_GET,&nbsp;&nbsp;&amp;vqm_stats);<br />-&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(hw-&gt;is_pf)<br />-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;zxdh_hw_mac_stats_get(dev,&nbsp;&amp;mac_stats,&nbsp;&amp;mac_bytes);<br />+&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(rte_eal_process_type()&nbsp;==&nbsp;RTE_PROC_PRIMARY)&nbsp;{<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;zxdh_hw_vqm_stats_get(dev,&nbsp;ZXDH_VQM_DEV_STATS_GET,&nbsp;&nbsp;&amp;vqm_stats);<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(hw-&gt;is_pf)<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;zxdh_hw_mac_stats_get(dev,&nbsp;&amp;mac_stats,&nbsp;&amp;mac_bytes);<br />&nbsp;
<br />-&nbsp;&nbsp;&nbsp;&nbsp;zxdh_hw_np_stats_get(dev,&nbsp;&amp;np_stats);<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;zxdh_hw_np_stats_get(dev,&nbsp;&amp;np_stats);<br />&nbsp;
<br />-&nbsp;&nbsp;&nbsp;&nbsp;stats-&gt;ipackets&nbsp;=&nbsp;vqm_stats.rx_total;<br />-&nbsp;&nbsp;&nbsp;&nbsp;stats-&gt;opackets&nbsp;=&nbsp;vqm_stats.tx_total;<br />-&nbsp;&nbsp;&nbsp;&nbsp;stats-&gt;ibytes&nbsp;=&nbsp;vqm_stats.rx_bytes;<br />-&nbsp;&nbsp;&nbsp;&nbsp;stats-&gt;obytes&nbsp;=&nbsp;vqm_stats.tx_bytes;<br />-&nbsp;&nbsp;&nbsp;&nbsp;stats-&gt;imissed&nbsp;=&nbsp;vqm_stats.rx_drop&nbsp;+&nbsp;mac_stats.rx_drop;<br />-&nbsp;&nbsp;&nbsp;&nbsp;stats-&gt;ierrors&nbsp;=&nbsp;vqm_stats.rx_error&nbsp;+&nbsp;mac_stats.rx_error&nbsp;+&nbsp;np_stats.rx_mtu_drop_pkts;<br />-&nbsp;&nbsp;&nbsp;&nbsp;stats-&gt;oerrors&nbsp;=&nbsp;vqm_stats.tx_error&nbsp;+&nbsp;mac_stats.tx_error&nbsp;+&nbsp;np_stats.tx_mtu_drop_pkts;<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;stats-&gt;ipackets&nbsp;=&nbsp;vqm_stats.rx_total;<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;stats-&gt;opackets&nbsp;=&nbsp;vqm_stats.tx_total;<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;stats-&gt;ibytes&nbsp;=&nbsp;vqm_stats.rx_bytes;<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;stats-&gt;obytes&nbsp;=&nbsp;vqm_stats.tx_bytes;<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;stats-&gt;imissed&nbsp;=&nbsp;vqm_stats.rx_drop&nbsp;+&nbsp;mac_stats.rx_drop;<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;stats-&gt;ierrors&nbsp;=&nbsp;vqm_stats.rx_error&nbsp;+<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;mac_stats.rx_error&nbsp;+&nbsp;np_stats.rx_mtu_drop_pkts;<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;stats-&gt;oerrors&nbsp;=&nbsp;vqm_stats.tx_error&nbsp;+<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;mac_stats.tx_error&nbsp;+&nbsp;np_stats.tx_mtu_drop_pkts;<br />&nbsp;
<br />-&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(hw-&gt;i_mtr_en&nbsp;||&nbsp;hw-&gt;e_mtr_en)<br />-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;stats-&gt;imissed&nbsp;&nbsp;+=&nbsp;np_stats.rx_mtr_drop_pkts;<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(hw-&gt;i_mtr_en&nbsp;||&nbsp;hw-&gt;e_mtr_en)<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;stats-&gt;imissed&nbsp;&nbsp;+=&nbsp;np_stats.rx_mtr_drop_pkts;<br />+&nbsp;&nbsp;&nbsp;&nbsp;}<br />&nbsp;
<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;stats-&gt;rx_nombuf&nbsp;=&nbsp;dev-&gt;data-&gt;rx_mbuf_alloc_failed;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;for&nbsp;(i&nbsp;=&nbsp;0;&nbsp;(i&nbsp;&lt;&nbsp;dev-&gt;data-&gt;nb_rx_queues)&nbsp;&amp;&amp;&nbsp;(i&nbsp;&lt;&nbsp;RTE_ETHDEV_QUEUE_STAT_CNTRS);&nbsp;i++)&nbsp;{<br />@@&nbsp;-2093,14&nbsp;+2097,20&nbsp;@@&nbsp;zxdh_dev_xstats_get(struct&nbsp;rte_eth_dev&nbsp;*dev,&nbsp;struct&nbsp;rte_eth_xstat&nbsp;*xstats,&nbsp;uint3<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint32_t&nbsp;count&nbsp;=&nbsp;0;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint32_t&nbsp;t&nbsp;=&nbsp;0;<br />&nbsp;
<br />-&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(hw-&gt;is_pf)&nbsp;{<br />+&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(hw-&gt;is_pf)<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;nstats&nbsp;+=&nbsp;ZXDH_MAC_XSTATS&nbsp;+&nbsp;ZXDH_MAC_BYTES;<br />-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;zxdh_hw_mac_stats_get(dev,&nbsp;&amp;mac_stats,&nbsp;&amp;mac_bytes);<br />-&nbsp;&nbsp;&nbsp;&nbsp;}<br />+<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(n&nbsp;&lt;&nbsp;nstats)<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;nstats;<br />-&nbsp;&nbsp;&nbsp;&nbsp;zxdh_hw_vqm_stats_get(dev,&nbsp;ZXDH_VQM_DEV_STATS_GET,&nbsp;&nbsp;&amp;vqm_stats);<br />-&nbsp;&nbsp;&nbsp;&nbsp;zxdh_hw_np_stats_get(dev,&nbsp;&amp;np_stats);<br />+<br />+&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(rte_eal_process_type()&nbsp;==&nbsp;RTE_PROC_PRIMARY)&nbsp;{<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(hw-&gt;is_pf)<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;zxdh_hw_mac_stats_get(dev,&nbsp;&amp;mac_stats,&nbsp;&amp;mac_bytes);<br />+<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;zxdh_hw_vqm_stats_get(dev,&nbsp;ZXDH_VQM_DEV_STATS_GET,&nbsp;&nbsp;&amp;vqm_stats);<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;zxdh_hw_np_stats_get(dev,&nbsp;&amp;np_stats);<br />+&nbsp;&nbsp;&nbsp;&nbsp;}<br />+<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;for&nbsp;(i&nbsp;=&nbsp;0;&nbsp;i&nbsp;&lt;&nbsp;ZXDH_NP_XSTATS;&nbsp;i++)&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;xstats[count].value&nbsp;=&nbsp;*(uint64_t&nbsp;*)(((char&nbsp;*)&amp;np_stats)<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;&nbsp;+&nbsp;zxdh_np_stat_strings[i].offset);<br />@@&nbsp;-2235,6&nbsp;+2245,9&nbsp;@@&nbsp;zxdh_dev_fw_version_get(struct&nbsp;rte_eth_dev&nbsp;*dev,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;char&nbsp;fw_ver[ZXDH_FWVERS_LEN]&nbsp;=&nbsp;{0};<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint32_t&nbsp;ret&nbsp;=&nbsp;0;<br />&nbsp;
<br />+&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(rte_eal_process_type()&nbsp;!=&nbsp;RTE_PROC_PRIMARY)<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;-EPERM;<br />+<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;zxdh_agent_msg_build(hw,&nbsp;ZXDH_FLASH_FIR_VERSION_GET,&nbsp;&amp;msg_info);<br />&nbsp;
<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_send_msg_to_riscv(dev,&nbsp;&amp;msg_info,&nbsp;sizeof(struct&nbsp;zxdh_msg_info),<br />diff&nbsp;--git&nbsp;a/drivers/net/zxdh/zxdh_queue.h&nbsp;b/drivers/net/zxdh/zxdh_queue.h<br />index&nbsp;3c89687d45..1a0c8a0d90&nbsp;100644<br />---&nbsp;a/drivers/net/zxdh/zxdh_queue.h<br />+++&nbsp;b/drivers/net/zxdh/zxdh_queue.h<br />@@&nbsp;-410,7&nbsp;+410,6&nbsp;@@&nbsp;zxdh_queue_kick_prepare_packed(struct&nbsp;zxdh_virtqueue&nbsp;*vq)<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;(flags&nbsp;!=&nbsp;ZXDH_RING_EVENT_FLAGS_DISABLE);<br />&nbsp;}<br />&nbsp;
<br />-extern&nbsp;struct&nbsp;zxdh_net_hdr_dl&nbsp;g_net_hdr_dl[RTE_MAX_ETHPORTS];<br />&nbsp;
<br />&nbsp;struct&nbsp;rte_mbuf&nbsp;*zxdh_queue_detach_unused(struct&nbsp;zxdh_virtqueue&nbsp;*vq);<br />&nbsp;int32_t&nbsp;zxdh_free_queues(struct&nbsp;rte_eth_dev&nbsp;*dev);<br />diff&nbsp;--git&nbsp;a/drivers/net/zxdh/zxdh_rxtx.c&nbsp;b/drivers/net/zxdh/zxdh_rxtx.c<br />index&nbsp;6071f5ef93..3ccef8fd0b&nbsp;100644<br />---&nbsp;a/drivers/net/zxdh/zxdh_rxtx.c<br />+++&nbsp;b/drivers/net/zxdh/zxdh_rxtx.c<br />@@&nbsp;-256,7&nbsp;+256,7&nbsp;@@&nbsp;zxdh_xmit_fill_net_hdr(struct&nbsp;zxdh_virtqueue&nbsp;*vq,&nbsp;struct&nbsp;rte_mbuf&nbsp;*cookie,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_pi_hdr&nbsp;*pi_hdr&nbsp;=&nbsp;NULL;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_pd_hdr_dl&nbsp;*pd_hdr&nbsp;=&nbsp;NULL;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_hw&nbsp;*hw&nbsp;=&nbsp;vq-&gt;hw;<br />-&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_net_hdr_dl&nbsp;*net_hdr_dl&nbsp;=&nbsp;&amp;g_net_hdr_dl[hw-&gt;port_id];<br />+&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_net_hdr_dl&nbsp;*net_hdr_dl&nbsp;=&nbsp;hw-&gt;net_hdr_dl;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint8_t&nbsp;hdr_len&nbsp;=&nbsp;hw-&gt;dl_net_hdr_len;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint32_t&nbsp;ol_flag&nbsp;=&nbsp;0;<br />&nbsp;
<br />--&nbsp;
<br />2.27.0<br />