provided link info update, set link up /down,<br />and link intr.<br /> <br />Signed-off-by: Junlong Wang <wang.junlong1@zte.com.cn> <br />---<br /> doc/guides/nics/features/zxdh.ini  |   2 +<br /> doc/guides/nics/zxdh.rst           |   3 +<br /> drivers/net/zxdh/meson.build       |   1 +<br /> drivers/net/zxdh/zxdh_ethdev.c     |  21 ++++<br /> drivers/net/zxdh/zxdh_ethdev.h     |   2 +<br /> drivers/net/zxdh/zxdh_ethdev_ops.c | 166 ++++++++++++++++++++++++++++<br /> drivers/net/zxdh/zxdh_ethdev_ops.h |  14 +++<br /> drivers/net/zxdh/zxdh_msg.c        |  60 ++++++++++<br /> drivers/net/zxdh/zxdh_msg.h        |  40 +++++++<br /> drivers/net/zxdh/zxdh_np.c         | 172 ++++++++++++++++++++++++++++-<br /> drivers/net/zxdh/zxdh_np.h         |  20 ++++<br /> drivers/net/zxdh/zxdh_tables.c     |  15 +++<br /> drivers/net/zxdh/zxdh_tables.h     |   6 +-<br /> 13 files changed, 514 insertions(+), 8 deletions(-)<br /> create mode 100644 drivers/net/zxdh/zxdh_ethdev_ops.c<br /> create mode 100644 drivers/net/zxdh/zxdh_ethdev_ops.h<br /> <br />diff --git a/doc/guides/nics/features/zxdh.ini b/doc/guides/nics/features/zxdh.ini<br />index bb44e93fad..7da3aaced1 100644<br />--- a/doc/guides/nics/features/zxdh.ini<br />+++ b/doc/guides/nics/features/zxdh.ini<br />@@ -10,3 +10,5 @@ ARMv8                = Y<br /> SR-IOV               = Y<br /> Multiprocess aware   = Y<br /> Scattered Rx         = Y<br />+Link status          = Y<br />+Link status event    = Y<br />diff --git a/doc/guides/nics/zxdh.rst b/doc/guides/nics/zxdh.rst<br />index f42db9c1f1..fdbc3b3923 100644<br />--- a/doc/guides/nics/zxdh.rst<br />+++ b/doc/guides/nics/zxdh.rst<br />@@ -21,6 +21,9 @@ Features of the ZXDH PMD are:<br /> - Multiple queues for TX and RX<br /> - SR-IOV VF<br /> - Scattered and gather for TX and RX<br />+- Link Auto-negotiation<br />+- Link state information<br />+- Set Link down or up<br />  <br />  <br /> Driver compilation and testing<br />diff --git a/drivers/net/zxdh/meson.build b/drivers/net/zxdh/meson.build<br />index 20b2cf484a..48f8f5e1ee 100644<br />--- a/drivers/net/zxdh/meson.build<br />+++ b/drivers/net/zxdh/meson.build<br />@@ -22,4 +22,5 @@ sources = files(<br />         'zxdh_np.c',<br />         'zxdh_tables.c',<br />         'zxdh_rxtx.c',<br />+        'zxdh_ethdev_ops.c',<br /> )<br />diff --git a/drivers/net/zxdh/zxdh_ethdev.c b/drivers/net/zxdh/zxdh_ethdev.c<br />index bc4d2a937b..4fe5d8c23b 100644<br />--- a/drivers/net/zxdh/zxdh_ethdev.c<br />+++ b/drivers/net/zxdh/zxdh_ethdev.c<br />@@ -16,6 +16,7 @@<br /> #include "zxdh_np.h" <br /> #include "zxdh_tables.h" <br /> #include "zxdh_rxtx.h" <br />+#include "zxdh_ethdev_ops.h" <br />  <br /> struct zxdh_hw_internal zxdh_hw_internal[RTE_MAX_ETHPORTS];<br /> struct zxdh_shared_data *zxdh_shared_data;<br />@@ -105,9 +106,16 @@ static void<br /> zxdh_devconf_intr_handler(void *param)<br /> {<br />     struct rte_eth_dev *dev = param;<br />+    struct zxdh_hw *hw = dev->data->dev_private;<br />+<br />+    uint8_t isr = zxdh_pci_isr(hw);<br />  <br />     if (zxdh_intr_unmask(dev) < 0)<br />         PMD_DRV_LOG(ERR, "interrupt enable failed");<br />+    if (isr & ZXDH_PCI_ISR_CONFIG) {<br />+        if (zxdh_dev_link_update(dev, 0) == 0)<br />+            rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL);<br />+    }<br /> }<br />  <br />  <br />@@ -914,6 +922,13 @@ zxdh_dev_stop(struct rte_eth_dev *dev)<br />         PMD_DRV_LOG(ERR, "intr disable failed");<br />         return ret;<br />     }<br />+<br />+    ret = zxdh_dev_set_link_down(dev);<br />+    if (ret) {<br />+        PMD_DRV_LOG(ERR, "set port %s link down failed!", dev->device->name);<br />+        return ret;<br />+    }<br />+<br />     for (i = 0; i < dev->data->nb_rx_queues; i++)<br />         dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;<br />     for (i = 0; i < dev->data->nb_tx_queues; i++)<br />@@ -1012,6 +1027,9 @@ zxdh_dev_start(struct rte_eth_dev *dev)<br />         vq = hw->vqs[logic_qidx];<br />         zxdh_queue_notify(vq);<br />     }<br />+<br />+    zxdh_dev_set_link_up(dev);<br />+<br />     for (i = 0; i < dev->data->nb_rx_queues; i++)<br />         dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;<br />     for (i = 0; i < dev->data->nb_tx_queues; i++)<br />@@ -1031,6 +1049,9 @@ static const struct eth_dev_ops zxdh_eth_dev_ops = {<br />     .tx_queue_setup             = zxdh_dev_tx_queue_setup,<br />     .rx_queue_intr_enable     = zxdh_dev_rx_queue_intr_enable,<br />     .rx_queue_intr_disable     = zxdh_dev_rx_queue_intr_disable,<br />+    .link_update             = zxdh_dev_link_update,<br />+    .dev_set_link_up         = zxdh_dev_set_link_up,<br />+    .dev_set_link_down         = zxdh_dev_set_link_down,<br /> };<br />  <br /> static int32_t<br />diff --git a/drivers/net/zxdh/zxdh_ethdev.h b/drivers/net/zxdh/zxdh_ethdev.h<br />index b1f398b28e..c0b719062c 100644<br />--- a/drivers/net/zxdh/zxdh_ethdev.h<br />+++ b/drivers/net/zxdh/zxdh_ethdev.h<br />@@ -72,6 +72,7 @@ struct zxdh_hw {<br />     uint64_t guest_features;<br />     uint32_t max_queue_pairs;<br />     uint32_t speed;<br />+    uint32_t speed_mode;<br />     uint32_t notify_off_multiplier;<br />     uint16_t *notify_base;<br />     uint16_t pcie_id;<br />@@ -93,6 +94,7 @@ struct zxdh_hw {<br />     uint8_t panel_id;<br />     uint8_t has_tx_offload;<br />     uint8_t has_rx_offload;<br />+    uint8_t admin_status;<br /> };<br />  <br /> struct zxdh_dtb_shared_data {<br />diff --git a/drivers/net/zxdh/zxdh_ethdev_ops.c b/drivers/net/zxdh/zxdh_ethdev_ops.c<br />new file mode 100644<br />index 0000000000..5a0af98cc0<br />--- /dev/null<br />+++ b/drivers/net/zxdh/zxdh_ethdev_ops.c<br />@@ -0,0 +1,166 @@<br />+/* SPDX-License-Identifier: BSD-3-Clause<br />+ * Copyright(c) 2024 ZTE Corporation<br />+ */<br />+<br />+#include "zxdh_ethdev.h" <br />+#include "zxdh_pci.h" <br />+#include "zxdh_msg.h" <br />+#include "zxdh_ethdev_ops.h" <br />+#include "zxdh_tables.h" <br />+#include "zxdh_logs.h" <br />+<br />+static int32_t zxdh_config_port_status(struct rte_eth_dev *dev, uint16_t link_status)<br />+{<br />+    struct zxdh_hw *hw = dev->data->dev_private;<br />+    struct zxdh_port_attr_table port_attr = {0};<br />+    struct zxdh_msg_info msg_info = {0};<br />+    int32_t ret = 0;<br />+<br />+    if (hw->is_pf) {<br />+        ret = zxdh_get_port_attr(hw->vfid, &port_attr);<br />+        if (ret) {<br />+            PMD_DRV_LOG(ERR, "write port_attr failed");<br />+            return -1;<br />+        }<br />+        port_attr.is_up = link_status;<br />+<br />+        ret = zxdh_set_port_attr(hw->vfid, &port_attr);<br />+        if (ret) {<br />+            PMD_DRV_LOG(ERR, "write port_attr failed");<br />+            return -1;<br />+        }<br />+    } else {<br />+        struct zxdh_port_attr_set_msg *port_attr_msg = &msg_info.data.port_attr_msg;<br />+<br />+        zxdh_msg_head_build(hw, ZXDH_PORT_ATTRS_SET, &msg_info);<br />+        port_attr_msg->mode = ZXDH_PORT_ATTR_IS_UP_FLAG;<br />+        port_attr_msg->value = link_status;<br />+        ret = zxdh_vf_send_msg_to_pf(dev, &msg_info, sizeof(msg_info), NULL, 0);<br />+        if (ret) {<br />+            PMD_DRV_LOG(ERR, "Failed to send msg: port 0x%x msg type %d",<br />+                hw->vport.vport, ZXDH_PORT_ATTR_IS_UP_FLAG);<br />+            return ret;<br />+        }<br />+    }<br />+    return ret;<br />+}<br />+<br />+static int32_t<br />+zxdh_link_info_get(struct rte_eth_dev *dev, struct rte_eth_link *link)<br />+{<br />+    struct zxdh_hw *hw = dev->data->dev_private;<br />+    struct zxdh_msg_info msg_info = {0};<br />+    struct zxdh_msg_reply_info reply_info = {0};<br />+    uint16_t status = 0;<br />+    int32_t ret = 0;<br />+<br />+    if (zxdh_pci_with_feature(hw, ZXDH_NET_F_STATUS))<br />+        zxdh_pci_read_dev_config(hw, offsetof(struct zxdh_net_config, status),<br />+                    &status, sizeof(status));<br />+<br />+    link->link_status = status;<br />+<br />+    if (status == RTE_ETH_LINK_DOWN) {<br />+        link->link_speed = RTE_ETH_SPEED_NUM_UNKNOWN;<br />+        link->link_duplex = RTE_ETH_LINK_FULL_DUPLEX;<br />+    } else {<br />+        zxdh_agent_msg_build(hw, ZXDH_MAC_LINK_GET, &msg_info);<br />+<br />+        ret = zxdh_send_msg_to_riscv(dev, &msg_info, sizeof(struct zxdh_msg_info),<br />+                &reply_info, sizeof(struct zxdh_msg_reply_info),<br />+                ZXDH_BAR_MODULE_MAC);<br />+        if (ret) {<br />+            PMD_DRV_LOG(ERR, "Failed to send msg: port 0x%x msg type %d",<br />+                    hw->vport.vport, ZXDH_MAC_LINK_GET);<br />+            return -1;<br />+        }<br />+        link->link_speed = reply_info.reply_body.link_msg.speed;<br />+        hw->speed_mode = reply_info.reply_body.link_msg.speed_modes;<br />+        if ((reply_info.reply_body.link_msg.duplex & RTE_ETH_LINK_FULL_DUPLEX) ==<br />+                RTE_ETH_LINK_FULL_DUPLEX)<br />+            link->link_duplex = RTE_ETH_LINK_FULL_DUPLEX;<br />+        else<br />+            link->link_duplex = RTE_ETH_LINK_HALF_DUPLEX;<br />+    }<br />+    hw->speed = link->link_speed;<br />+<br />+    return 0;<br />+}<br />+<br />+static int zxdh_set_link_status(struct rte_eth_dev *dev, uint8_t link_status)<br />+{<br />+    uint16_t curr_link_status = dev->data->dev_link.link_status;<br />+<br />+    struct rte_eth_link link;<br />+    struct zxdh_hw *hw = dev->data->dev_private;<br />+    int32_t ret = 0;<br />+<br />+    if (link_status == curr_link_status) {<br />+        PMD_DRV_LOG(DEBUG, "curr_link_status %u", curr_link_status);<br />+        return 0;<br />+    }<br />+<br />+    hw->admin_status = link_status;<br />+    ret = zxdh_link_info_get(dev, &link);<br />+    if (ret != 0) {<br />+        PMD_DRV_LOG(ERR, "Failed to get link status from hw");<br />+        return ret;<br />+    }<br />+    dev->data->dev_link.link_status = hw->admin_status & link.link_status;<br />+<br />+    if (dev->data->dev_link.link_status == RTE_ETH_LINK_UP) {<br />+        dev->data->dev_link.link_speed = link.link_speed;<br />+        dev->data->dev_link.link_duplex = link.link_duplex;<br />+    } else {<br />+        dev->data->dev_link.link_speed = RTE_ETH_SPEED_NUM_UNKNOWN;<br />+        dev->data->dev_link.link_duplex = RTE_ETH_LINK_FULL_DUPLEX;<br />+    }<br />+    return zxdh_config_port_status(dev, dev->data->dev_link.link_status);<br />+}<br />+<br />+int zxdh_dev_set_link_up(struct rte_eth_dev *dev)<br />+{<br />+    int ret = zxdh_set_link_status(dev, RTE_ETH_LINK_UP);<br />+<br />+    if (ret)<br />+        PMD_DRV_LOG(ERR, "Set link up failed, code:%d", ret);<br />+<br />+    return ret;<br />+}<br />+<br />+int32_t zxdh_dev_link_update(struct rte_eth_dev *dev, int32_t wait_to_complete __rte_unused)<br />+{<br />+    struct rte_eth_link link;<br />+    struct zxdh_hw *hw = dev->data->dev_private;<br />+    int32_t ret = 0;<br />+<br />+    memset(&link, 0, sizeof(link));<br />+    link.link_duplex = hw->duplex;<br />+    link.link_speed  = hw->speed;<br />+    link.link_autoneg = RTE_ETH_LINK_AUTONEG;<br />+<br />+    ret = zxdh_link_info_get(dev, &link);<br />+    if (ret != 0) {<br />+        PMD_DRV_LOG(ERR, " Failed to get link status from hw");<br />+        return ret;<br />+    }<br />+    link.link_status &= hw->admin_status;<br />+    if (link.link_status == RTE_ETH_LINK_DOWN)<br />+        link.link_speed  = RTE_ETH_SPEED_NUM_UNKNOWN;<br />+<br />+    ret = zxdh_config_port_status(dev, link.link_status);<br />+    if (ret != 0) {<br />+        PMD_DRV_LOG(ERR, "set port attr %d failed.", link.link_status);<br />+        return ret;<br />+    }<br />+    return rte_eth_linkstatus_set(dev, &link);<br />+}<br />+<br />+int zxdh_dev_set_link_down(struct rte_eth_dev *dev)<br />+{<br />+    int ret = zxdh_set_link_status(dev, RTE_ETH_LINK_DOWN);<br />+<br />+    if (ret)<br />+        PMD_DRV_LOG(ERR, "Set link down failed");<br />+    return ret;<br />+}<br />diff --git a/drivers/net/zxdh/zxdh_ethdev_ops.h b/drivers/net/zxdh/zxdh_ethdev_ops.h<br />new file mode 100644<br />index 0000000000..c6d6ca56fd<br />--- /dev/null<br />+++ b/drivers/net/zxdh/zxdh_ethdev_ops.h<br />@@ -0,0 +1,14 @@<br />+/* SPDX-License-Identifier: BSD-3-Clause<br />+ * Copyright(c) 2024 ZTE Corporation<br />+ */<br />+<br />+#ifndef ZXDH_ETHDEV_OPS_H<br />+#define ZXDH_ETHDEV_OPS_H<br />+<br />+#include "zxdh_ethdev.h" <br />+<br />+int zxdh_dev_set_link_up(struct rte_eth_dev *dev);<br />+int zxdh_dev_set_link_down(struct rte_eth_dev *dev);<br />+int32_t zxdh_dev_link_update(struct rte_eth_dev *dev, int32_t wait_to_complete __rte_unused);<br />+<br />+#endif /* ZXDH_ETHDEV_OPS_H */<br />diff --git a/drivers/net/zxdh/zxdh_msg.c b/drivers/net/zxdh/zxdh_msg.c<br />index aa2e10fd45..a6e19bbdd8 100644<br />--- a/drivers/net/zxdh/zxdh_msg.c<br />+++ b/drivers/net/zxdh/zxdh_msg.c<br />@@ -1134,6 +1134,54 @@ int zxdh_vf_send_msg_to_pf(struct rte_eth_dev *dev,  void *msg_req,<br />     return 0;<br /> }<br />  <br />+int32_t zxdh_send_msg_to_riscv(struct rte_eth_dev *dev, void *msg_req,<br />+            uint16_t msg_req_len, void *reply, uint16_t reply_len,<br />+            enum ZXDH_BAR_MODULE_ID module_id)<br />+{<br />+    struct zxdh_hw *hw = dev->data->dev_private;<br />+    struct zxdh_msg_recviver_mem result = {0};<br />+    struct zxdh_msg_reply_info reply_info = {0};<br />+<br />+    if (reply) {<br />+        RTE_ASSERT(reply_len < sizeof(zxdh_msg_reply_info));<br />+        result.recv_buffer  = reply;<br />+        result.buffer_len = reply_len;<br />+    } else {<br />+        result.recv_buffer = &reply_info;<br />+        result.buffer_len = sizeof(reply_info);<br />+    }<br />+    struct zxdh_msg_reply_head *reply_head =<br />+                &(((struct zxdh_msg_reply_info *)result.recv_buffer)->reply_head);<br />+    struct zxdh_msg_reply_body *reply_body =<br />+                &(((struct zxdh_msg_reply_info *)result.recv_buffer)->reply_body);<br />+<br />+    struct zxdh_pci_bar_msg in = {<br />+        .payload_addr = &msg_req,<br />+        .payload_len = msg_req_len,<br />+        .virt_addr = (uint64_t)(hw->bar_addr[ZXDH_BAR0_INDEX] + ZXDH_CTRLCH_OFFSET),<br />+        .src = hw->is_pf ? ZXDH_MSG_CHAN_END_PF : ZXDH_MSG_CHAN_END_VF,<br />+        .dst = ZXDH_MSG_CHAN_END_RISC,<br />+        .module_id = module_id,<br />+        .src_pcieid = hw->pcie_id,<br />+    };<br />+<br />+    if (zxdh_bar_chan_sync_msg_send(&in, &result) != ZXDH_BAR_MSG_OK) {<br />+        PMD_MSG_LOG(ERR, "Failed to send sync messages or receive response");<br />+        return -1;<br />+    }<br />+    if (reply_head->flag != ZXDH_MSG_REPS_OK) {<br />+        PMD_MSG_LOG(ERR, "vf[%d] get pf reply failed: reply_head flag : 0x%x(0xff is OK).replylen %d",<br />+                hw->vport.vfid, reply_head->flag, reply_head->reps_len);<br />+        return -1;<br />+    }<br />+    if (reply_body->flag != ZXDH_REPS_SUCC) {<br />+        PMD_MSG_LOG(ERR, "vf[%d] msg processing failed", hw->vfid);<br />+        return -1;<br />+    }<br />+<br />+    return 0;<br />+}<br />+<br /> void zxdh_msg_head_build(struct zxdh_hw *hw, enum zxdh_msg_type type,<br />         struct zxdh_msg_info *msg_info)<br /> {<br />@@ -1144,3 +1192,15 @@ void zxdh_msg_head_build(struct zxdh_hw *hw, enum zxdh_msg_type type,<br />     msghead->vf_id    = hw->vport.vfid;<br />     msghead->pcieid   = hw->pcie_id;<br /> }<br />+<br />+void zxdh_agent_msg_build(struct zxdh_hw *hw, enum zxdh_agent_msg_type type,<br />+        struct zxdh_msg_info *msg_info)<br />+{<br />+    struct zxdh_agent_msg_head *agent_head = &msg_info->agent_msg_head;<br />+<br />+    agent_head->msg_type = type;<br />+    agent_head->panel_id = hw->panel_id;<br />+    agent_head->phyport = hw->phyport;<br />+    agent_head->vf_id = hw->vfid;<br />+    agent_head->pcie_id = hw->pcie_id;<br />+}<br />diff --git a/drivers/net/zxdh/zxdh_msg.h b/drivers/net/zxdh/zxdh_msg.h<br />index 5f7deb5e6a..9f1e6eed4c 100644<br />--- a/drivers/net/zxdh/zxdh_msg.h<br />+++ b/drivers/net/zxdh/zxdh_msg.h<br />@@ -164,11 +164,18 @@ enum pciebar_layout_type {<br />     ZXDH_URI_MAX,<br /> };<br />  <br />+/* riscv msg opcodes */<br />+enum zxdh_agent_msg_type {<br />+    ZXDH_MAC_LINK_GET = 14,<br />+};<br />+<br /> enum zxdh_msg_type {<br />     ZXDH_NULL = 0,<br />     ZXDH_VF_PORT_INIT = 1,<br />     ZXDH_VF_PORT_UNINIT = 2,<br />  <br />+    ZXDH_PORT_ATTRS_SET = 25,<br />+<br />     ZXDH_MSG_TYPE_END,<br /> };<br />  <br />@@ -272,10 +279,20 @@ enum zxdh_reps_flag {<br />     ZXDH_REPS_SUCC = 0xaa,<br /> };<br />  <br />+struct __rte_packed_begin zxdh_link_info_msg {<br />+    uint8_t autoneg;<br />+    uint8_t link_state;<br />+    uint8_t blink_enable;<br />+    uint8_t duplex;<br />+    uint32_t speed_modes;<br />+    uint32_t speed;<br />+} __rte_packed_end;<br />+<br /> struct __rte_packed_begin zxdh_msg_reply_body {<br />     enum zxdh_reps_flag flag;<br />     union __rte_packed_begin {<br />         uint8_t reply_data[ZXDH_MSG_REPLY_BODY_MAX_LEN - sizeof(enum zxdh_reps_flag)];<br />+        struct zxdh_link_info_msg link_msg;<br />     } __rte_packed_end;<br /> } __rte_packed_end;<br />  <br />@@ -298,14 +315,32 @@ struct __rte_packed_begin zxdh_msg_head {<br />     uint16_t pcieid;<br /> } __rte_packed_end;<br />  <br />+struct __rte_packed_begin zxdh_port_attr_set_msg {<br />+    uint32_t mode;<br />+    uint32_t value;<br />+    uint8_t allmulti_follow;<br />+} __rte_packed_end;<br />+<br />+struct __rte_packed_begin zxdh_agent_msg_head {<br />+    enum zxdh_agent_msg_type msg_type;<br />+    uint8_t panel_id;<br />+    uint8_t phyport;<br />+    uint8_t rsv;<br />+    uint16_t vf_id;<br />+    uint16_t pcie_id;<br />+} __rte_packed_end;<br />+<br /> struct __rte_packed_begin zxdh_msg_info {<br />     union {<br />         uint8_t head_len[ZXDH_MSG_HEAD_LEN];<br />         struct zxdh_msg_head msg_head;<br />+        struct zxdh_agent_msg_head agent_msg_head;<br />     };<br />     union __rte_packed_begin {<br />         uint8_t datainfo[ZXDH_MSG_REQ_BODY_MAX_LEN];<br />         struct zxdh_vf_init_msg vf_init_msg;<br />+        struct zxdh_port_attr_set_msg port_attr_msg;<br />+        struct zxdh_link_info_msg link_msg;<br />     } __rte_packed_end data;<br /> } __rte_packed_end;<br />  <br />@@ -326,5 +361,10 @@ void zxdh_msg_head_build(struct zxdh_hw *hw, enum zxdh_msg_type type,<br />         struct zxdh_msg_info *msg_info);<br /> int zxdh_vf_send_msg_to_pf(struct rte_eth_dev *dev,  void *msg_req,<br />             uint16_t msg_req_len, void *reply, uint16_t reply_len);<br />+void zxdh_agent_msg_build(struct zxdh_hw *hw, enum zxdh_agent_msg_type type,<br />+        struct zxdh_msg_info *msg_info);<br />+int32_t zxdh_send_msg_to_riscv(struct rte_eth_dev *dev, void *msg_req,<br />+            uint16_t msg_req_len, void *reply, uint16_t reply_len,<br />+            enum ZXDH_BAR_MODULE_ID module_id);<br />  <br /> #endif /* ZXDH_MSG_H */<br />diff --git a/drivers/net/zxdh/zxdh_np.c b/drivers/net/zxdh/zxdh_np.c<br />index 99a7dc11b4..1f06539263 100644<br />--- a/drivers/net/zxdh/zxdh_np.c<br />+++ b/drivers/net/zxdh/zxdh_np.c<br />@@ -36,6 +36,10 @@ ZXDH_SDT_TBL_DATA_T g_sdt_info[ZXDH_DEV_CHANNEL_MAX][ZXDH_DEV_SDT_ID_MAX];<br /> #define ZXDH_COMM_GET_BIT_MASK(_inttype_, _bitqnt_)\<br />     ((_inttype_)(((_bitqnt_) < 32)))<br />  <br />+#define ZXDH_COMM_UINT32_GET_BITS(_uidst_, _uisrc_, _uistartpos_, _uilen_)\<br />+    ((_uidst_) = (((_uisrc_) >> (_uistartpos_)) & \<br />+    (ZXDH_COMM_GET_BIT_MASK(uint32_t, (_uilen_)))))<br />+<br /> #define ZXDH_REG_DATA_MAX      (128)<br />  <br /> #define ZXDH_COMM_CHECK_DEV_POINT(dev_id, point)\<br />@@ -1456,15 +1460,11 @@ zxdh_np_dtb_table_entry_write(uint32_t dev_id,<br />     return rc;<br /> }<br />  <br />-static uint32_t<br />+static void<br /> zxdh_np_sdt_tbl_data_get(uint32_t dev_id, uint32_t sdt_no, ZXDH_SDT_TBL_DATA_T *p_sdt_data)<br /> {<br />-    uint32_t rc   = 0;<br />-<br />     p_sdt_data->data_high32 = g_sdt_info[dev_id][sdt_no].data_high32;<br />     p_sdt_data->data_low32  = g_sdt_info[dev_id][sdt_no].data_low32;<br />-<br />-    return rc;<br /> }<br />  <br /> int<br />@@ -1507,7 +1507,7 @@ zxdh_np_dtb_table_entry_delete(uint32_t dev_id,<br />         pentry = delete_entries + entry_index;<br />  <br />         sdt_no = pentry->sdt_no;<br />-        rc = zxdh_np_sdt_tbl_data_get(dev_id, sdt_no, &sdt_tbl);<br />+        zxdh_np_sdt_tbl_data_get(dev_id, sdt_no, &sdt_tbl);<br />         switch (tbl_type) {<br />         case ZXDH_SDT_TBLT_ERAM:<br />         {<br />@@ -1557,3 +1557,163 @@ zxdh_np_dtb_table_entry_delete(uint32_t dev_id,<br />     rte_free(p_data_buff_ex);<br />     return 0;<br /> }<br />+<br />+static uint32_t<br />+zxdh_np_sdt_tbl_data_parser(uint32_t sdt_hig32, uint32_t sdt_low32, void *p_sdt_info)<br />+{<br />+    uint32_t tbl_type = 0;<br />+    uint32_t clutch_en = 0;<br />+<br />+    ZXDH_SDTTBL_ERAM_T *p_sdt_eram = NULL;<br />+    ZXDH_SDTTBL_PORTTBL_T *p_sdt_porttbl = NULL;<br />+<br />+    ZXDH_COMM_UINT32_GET_BITS(tbl_type, sdt_hig32,<br />+        ZXDH_SDT_H_TBL_TYPE_BT_POS, ZXDH_SDT_H_TBL_TYPE_BT_LEN);<br />+    ZXDH_COMM_UINT32_GET_BITS(clutch_en, sdt_low32, 0, 1);<br />+<br />+    switch (tbl_type) {<br />+    case ZXDH_SDT_TBLT_ERAM:<br />+    {<br />+        p_sdt_eram = (ZXDH_SDTTBL_ERAM_T *)p_sdt_info;<br />+        p_sdt_eram->table_type = tbl_type;<br />+        p_sdt_eram->eram_clutch_en = clutch_en;<br />+        break;<br />+    }<br />+<br />+    case ZXDH_SDT_TBLT_PORTTBL:<br />+    {<br />+        p_sdt_porttbl = (ZXDH_SDTTBL_PORTTBL_T *)p_sdt_info;<br />+        p_sdt_porttbl->table_type = tbl_type;<br />+        p_sdt_porttbl->porttbl_clutch_en = clutch_en;<br />+        break;<br />+    }<br />+    default:<br />+    {<br />+        PMD_DRV_LOG(ERR, "SDT table_type[ %d ] is invalid!", tbl_type);<br />+        return 1;<br />+    }<br />+    }<br />+<br />+    return 0;<br />+}<br />+<br />+static uint32_t<br />+zxdh_np_soft_sdt_tbl_get(uint32_t dev_id, uint32_t sdt_no, void *p_sdt_info)<br />+{<br />+    ZXDH_SDT_TBL_DATA_T sdt_tbl = {0};<br />+    uint32_t rc;<br />+<br />+    zxdh_np_sdt_tbl_data_get(dev_id, sdt_no, &sdt_tbl);<br />+<br />+    rc = zxdh_np_sdt_tbl_data_parser(sdt_tbl.data_high32, sdt_tbl.data_low32, p_sdt_info);<br />+    if (rc != 0)<br />+        PMD_DRV_LOG(ERR, "dpp sdt [%d] tbl_data_parser error.", sdt_no);<br />+<br />+    return rc;<br />+}<br />+<br />+static void<br />+zxdh_np_eram_index_cal(uint32_t eram_mode, uint32_t index,<br />+        uint32_t *p_row_index, uint32_t *p_col_index)<br />+{<br />+    uint32_t row_index = 0;<br />+    uint32_t col_index = 0;<br />+<br />+    switch (eram_mode) {<br />+    case ZXDH_ERAM128_TBL_128b:<br />+    {<br />+        row_index = index;<br />+        break;<br />+    }<br />+    case ZXDH_ERAM128_TBL_64b:<br />+    {<br />+        row_index = (index >> 1);<br />+        col_index = index & 0x1;<br />+        break;<br />+    }<br />+    case ZXDH_ERAM128_TBL_1b:<br />+    {<br />+        row_index = (index >> 7);<br />+        col_index = index & 0x7F;<br />+        break;<br />+    }<br />+    }<br />+    *p_row_index = row_index;<br />+    *p_col_index = col_index;<br />+}<br />+<br />+static uint32_t<br />+zxdh_np_dtb_eram_data_get(uint32_t dev_id, uint32_t queue_id, uint32_t sdt_no,<br />+        ZXDH_DTB_ERAM_ENTRY_INFO_T *p_dump_eram_entry)<br />+{<br />+    uint32_t index = p_dump_eram_entry->index;<br />+    uint32_t *p_data = p_dump_eram_entry->p_data;<br />+    ZXDH_SDTTBL_ERAM_T sdt_eram_info = {0};<br />+    uint32_t temp_data[4] = {0};<br />+    uint32_t row_index = 0;<br />+    uint32_t col_index = 0;<br />+    uint32_t rd_mode;<br />+    uint32_t rc;<br />+<br />+    rc = zxdh_np_soft_sdt_tbl_get(queue_id, sdt_no, &sdt_eram_info);<br />+    ZXDH_COMM_CHECK_DEV_RC(dev_id, rc, "dpp_soft_sdt_tbl_get");<br />+    rd_mode = sdt_eram_info.eram_mode;<br />+<br />+    zxdh_np_eram_index_cal(rd_mode, index, &row_index, &col_index);<br />+<br />+    switch (rd_mode) {<br />+    case ZXDH_ERAM128_TBL_128b:<br />+    {<br />+        memcpy(p_data, temp_data, (128 / 8));<br />+        break;<br />+    }<br />+    case ZXDH_ERAM128_TBL_64b:<br />+    {<br />+        memcpy(p_data, temp_data + ((1 - col_index) << 1), (64 / 8));<br />+        break;<br />+    }<br />+    case ZXDH_ERAM128_TBL_1b:<br />+    {<br />+        ZXDH_COMM_UINT32_GET_BITS(p_data[0], *(temp_data +<br />+            (3 - col_index / 32)), (col_index % 32), 1);<br />+        break;<br />+    }<br />+    }<br />+    return rc;<br />+}<br />+<br />+int<br />+zxdh_np_dtb_table_entry_get(uint32_t dev_id,<br />+         uint32_t queue_id,<br />+         ZXDH_DTB_USER_ENTRY_T *get_entry,<br />+         uint32_t srh_mode)<br />+{<br />+    ZXDH_SDT_TBL_DATA_T sdt_tbl = {0};<br />+    uint32_t tbl_type = 0;<br />+    uint32_t rc;<br />+    uint32_t sdt_no;<br />+<br />+    sdt_no = get_entry->sdt_no;<br />+    zxdh_np_sdt_tbl_data_get(srh_mode, sdt_no, &sdt_tbl);<br />+<br />+    ZXDH_COMM_UINT32_GET_BITS(tbl_type, sdt_tbl.data_high32,<br />+            ZXDH_SDT_H_TBL_TYPE_BT_POS, ZXDH_SDT_H_TBL_TYPE_BT_LEN);<br />+    switch (tbl_type) {<br />+    case ZXDH_SDT_TBLT_ERAM:<br />+    {<br />+        rc = zxdh_np_dtb_eram_data_get(dev_id,<br />+                queue_id,<br />+                sdt_no,<br />+                (ZXDH_DTB_ERAM_ENTRY_INFO_T *)get_entry->p_entry_data);<br />+        ZXDH_COMM_CHECK_RC_NO_ASSERT(rc, "dpp_dtb_eram_data_get");<br />+        break;<br />+    }<br />+    default:<br />+    {<br />+        PMD_DRV_LOG(ERR, "SDT table_type[ %d ] is invalid!", tbl_type);<br />+        return 1;<br />+    }<br />+    }<br />+<br />+    return 0;<br />+}<br />diff --git a/drivers/net/zxdh/zxdh_np.h b/drivers/net/zxdh/zxdh_np.h<br />index 42a652dd6b..ac3931ba65 100644<br />--- a/drivers/net/zxdh/zxdh_np.h<br />+++ b/drivers/net/zxdh/zxdh_np.h<br />@@ -514,11 +514,31 @@ typedef struct zxdh_sdt_tbl_data_t {<br />     uint32_t data_low32;<br /> } ZXDH_SDT_TBL_DATA_T;<br />  <br />+typedef struct zxdh_sdt_tbl_etcam_t {<br />+    uint32_t table_type;<br />+    uint32_t etcam_id;<br />+    uint32_t etcam_key_mode;<br />+    uint32_t etcam_table_id;<br />+    uint32_t no_as_rsp_mode;<br />+    uint32_t as_en;<br />+    uint32_t as_eram_baddr;<br />+    uint32_t as_rsp_mode;<br />+    uint32_t etcam_table_depth;<br />+    uint32_t etcam_clutch_en;<br />+} ZXDH_SDTTBL_ETCAM_T;<br />+<br />+typedef struct zxdh_sdt_tbl_porttbl_t {<br />+    uint32_t table_type;<br />+    uint32_t porttbl_clutch_en;<br />+} ZXDH_SDTTBL_PORTTBL_T;<br />+<br /> int zxdh_np_host_init(uint32_t dev_id, ZXDH_DEV_INIT_CTRL_T *p_dev_init_ctrl);<br /> int zxdh_np_online_uninit(uint32_t dev_id, char *port_name, uint32_t queue_id);<br /> int zxdh_np_dtb_table_entry_write(uint32_t dev_id, uint32_t queue_id,<br />             uint32_t entrynum, ZXDH_DTB_USER_ENTRY_T *down_entries);<br /> int zxdh_np_dtb_table_entry_delete(uint32_t dev_id, uint32_t queue_id,<br />              uint32_t entrynum, ZXDH_DTB_USER_ENTRY_T *delete_entries);<br />+int zxdh_np_dtb_table_entry_get(uint32_t dev_id, uint32_t queue_id,<br />+            ZXDH_DTB_USER_ENTRY_T *get_entry, uint32_t srh_mode);<br />  <br /> #endif /* ZXDH_NP_H */<br />diff --git a/drivers/net/zxdh/zxdh_tables.c b/drivers/net/zxdh/zxdh_tables.c<br />index 9fd184e612..db0132ce3f 100644<br />--- a/drivers/net/zxdh/zxdh_tables.c<br />+++ b/drivers/net/zxdh/zxdh_tables.c<br />@@ -134,3 +134,18 @@ int zxdh_panel_table_init(struct rte_eth_dev *dev)<br />  <br />     return ret;<br /> }<br />+<br />+int<br />+zxdh_get_port_attr(uint16_t vfid, struct zxdh_port_attr_table *port_attr)<br />+{<br />+    int ret;<br />+<br />+    ZXDH_DTB_ERAM_ENTRY_INFO_T entry = {vfid, (uint32_t *)port_attr};<br />+    ZXDH_DTB_USER_ENTRY_T user_entry_get = {ZXDH_SDT_VPORT_ATT_TABLE, &entry};<br />+<br />+    ret = zxdh_np_dtb_table_entry_get(ZXDH_DEVICE_NO, g_dtb_data.queueid, &user_entry_get, 1);<br />+    if (ret != 0)<br />+        PMD_DRV_LOG(ERR, "get port_attr vfid:%d failed, ret:%d ", vfid, ret);<br />+<br />+    return ret;<br />+}<br />diff --git a/drivers/net/zxdh/zxdh_tables.h b/drivers/net/zxdh/zxdh_tables.h<br />index 5e9b36faee..8676a8b375 100644<br />--- a/drivers/net/zxdh/zxdh_tables.h<br />+++ b/drivers/net/zxdh/zxdh_tables.h<br />@@ -7,9 +7,10 @@<br />  <br /> #include <stdint.h> <br />  <br />-extern struct zxdh_dtb_shared_data g_dtb_data;<br />-<br /> #define ZXDH_DEVICE_NO                    0<br />+#define ZXDH_PORT_ATTR_IS_UP_FLAG         35<br />+<br />+extern struct zxdh_dtb_shared_data g_dtb_data;<br />  <br /> struct zxdh_port_attr_table {<br /> #if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN<br />@@ -145,5 +146,6 @@ int zxdh_port_attr_init(struct rte_eth_dev *dev);<br /> int zxdh_panel_table_init(struct rte_eth_dev *dev);<br /> int zxdh_set_port_attr(uint16_t vfid, struct zxdh_port_attr_table *port_attr);<br /> int zxdh_port_attr_uninit(struct rte_eth_dev *dev);<br />+int zxdh_get_port_attr(uint16_t vfid, struct zxdh_port_attr_table *port_attr);<br />  <br /> #endif /* ZXDH_TABLES_H */<br />--  <br />2.27.0<br />