Add agent channel to access (np)network processor registers<br />that are not mapped by PCIE.<br /> <br />Signed-off-by: Bingbin Chen <chen.bingbin@zte.com.cn> <br />---<br /> drivers/net/zxdh/zxdh_np.c | 481 ++++++++++++++++++++++++++++++++++++-<br /> drivers/net/zxdh/zxdh_np.h |  77 ++++++<br /> 2 files changed, 557 insertions(+), 1 deletion(-)<br /> <br />diff --git a/drivers/net/zxdh/zxdh_np.c b/drivers/net/zxdh/zxdh_np.c<br />index 538e3829aa..bab8b23a68 100644<br />--- a/drivers/net/zxdh/zxdh_np.c<br />+++ b/drivers/net/zxdh/zxdh_np.c<br />@@ -13,6 +13,7 @@<br />  <br /> #include "zxdh_np.h" <br /> #include "zxdh_logs.h" <br />+#include "zxdh_msg.h" <br />  <br /> static ZXDH_DEV_MGR_T g_dev_mgr;<br /> static ZXDH_SDT_MGR_T g_sdt_mgr;<br />@@ -234,6 +235,21 @@ do {\<br />     } \<br /> } while (0)<br />  <br />+#define ZXDH_COMM_CHECK_DEV_RC_UNLOCK(dev_id, rc, becall, mutex)\<br />+do {\<br />+    uint32_t temp_rc = rc;\<br />+    if ((temp_rc) != ZXDH_OK) {\<br />+        PMD_DRV_LOG(ERR, "ZXDH %s:%d [ErrorCode:0x%x]!-- %s"\<br />+            "Call %s Fail!", __FILE__, __LINE__, temp_rc, __func__, becall);\<br />+        if (zxdh_np_comm_mutex_unlock(mutex) != 0) {   \<br />+            PMD_DRV_LOG(ERR, "File: [%s], Function:[%s], Line:%u mutex"\<br />+                "unlock failed!-->Return ERROR",\<br />+                __FILE__, __func__, __LINE__);\<br />+        }   \<br />+        RTE_ASSERT(0);\<br />+    } \<br />+} while (0)<br />+<br /> #define ZXDH_COMM_CHECK_POINT_NO_ASSERT(point)\<br /> do {\<br />     if ((point) == NULL) {\<br />@@ -330,6 +346,66 @@ zxdh_np_comm_convert32(uint32_t dw_data)<br /> #define ZXDH_DTB_QUEUE_INIT_FLAG_GET(DEV_ID, QUEUE_ID)       \<br />         (p_dpp_dtb_mgr[(DEV_ID)]->queue_info[(QUEUE_ID)].init_flag)<br />  <br />+static uint32_t<br />+zxdh_np_comm_mutex_create(ZXDH_MUTEX_T *p_mutex)<br />+{<br />+    int32_t rc = 0;<br />+<br />+    rc = pthread_mutex_init(&p_mutex->mutex, NULL);<br />+    if (rc != 0) {<br />+        PMD_DRV_LOG(ERR, "ErrCode[ 0x%x ]: Create mutex failed",<br />+            ZXDH_MUTEX_LOCK_INIT_FAIL);<br />+        return ZXDH_MUTEX_LOCK_INIT_FAIL;<br />+    }<br />+<br />+    return ZXDH_OK;<br />+}<br />+<br />+static uint32_t<br />+zxdh_np_comm_mutex_destroy(ZXDH_MUTEX_T *p_mutex)<br />+{<br />+    int32_t rc = 0;<br />+<br />+    rc = pthread_mutex_destroy(&p_mutex->mutex);<br />+    if (rc != 0) {<br />+        PMD_DRV_LOG(ERR, "ErrCode[ 0x%x ]: Destroy mutex fail",<br />+            ZXDH_MUTEX_LOCK_DESTROY_FAIL);<br />+        return ZXDH_MUTEX_LOCK_DESTROY_FAIL;<br />+    }<br />+<br />+    return ZXDH_OK;<br />+}<br />+<br />+static uint32_t<br />+zxdh_np_comm_mutex_lock(ZXDH_MUTEX_T *p_mutex)<br />+{<br />+    int32_t rc = 0;<br />+<br />+    rc = pthread_mutex_lock(&p_mutex->mutex);<br />+    if (rc != 0) {<br />+        PMD_DRV_LOG(ERR, "ErrCode[ 0x%x ]: Get mutex lock fail.",<br />+            ZXDH_MUTEX_LOCK_LOCK_FAIL);<br />+        return rc;<br />+    }<br />+<br />+    return rc;<br />+}<br />+<br />+static uint32_t<br />+zxdh_np_comm_mutex_unlock(ZXDH_MUTEX_T *p_mutex)<br />+{<br />+    int32_t rc = 0;<br />+<br />+    rc = pthread_mutex_unlock(&p_mutex->mutex);<br />+    if (rc != 0) {<br />+        PMD_DRV_LOG(ERR, "ErrCode[ 0x%x ]: Release mutex lock fail.",<br />+            ZXDH_MUTEX_LOCK_ULOCK_FAIL);<br />+        return ZXDH_MUTEX_LOCK_ULOCK_FAIL;<br />+    }<br />+<br />+    return rc;<br />+}<br />+<br /> static uint32_t<br /> zxdh_np_comm_is_big_endian(void)<br /> {<br />@@ -386,6 +462,83 @@ zxdh_np_dev_init(void)<br />     return 0;<br /> }<br />  <br />+static void<br />+zxdh_np_dev_vport_get(uint32_t dev_id, uint32_t *vport)<br />+{<br />+    ZXDH_DEV_MGR_T *p_dev_mgr = NULL;<br />+    ZXDH_DEV_CFG_T *p_dev_info = NULL;<br />+<br />+    p_dev_mgr = &g_dev_mgr;<br />+    p_dev_info = p_dev_mgr->p_dev_array[dev_id];<br />+    *vport = p_dev_info->vport;<br />+}<br />+<br />+static void<br />+zxdh_np_dev_agent_addr_get(uint32_t dev_id, uint64_t *agent_addr)<br />+{<br />+    ZXDH_DEV_MGR_T *p_dev_mgr = NULL;<br />+    ZXDH_DEV_CFG_T *p_dev_info = NULL;<br />+<br />+    p_dev_mgr = &g_dev_mgr;<br />+    p_dev_info = p_dev_mgr->p_dev_array[dev_id];<br />+    *agent_addr = p_dev_info->agent_addr;<br />+}<br />+<br />+static void<br />+zxdh_np_dev_fw_bar_msg_num_set(uint32_t dev_id, uint32_t bar_msg_num)<br />+{<br />+    ZXDH_DEV_MGR_T *p_dev_mgr = NULL;<br />+    ZXDH_DEV_CFG_T *p_dev_info = NULL;<br />+<br />+    p_dev_mgr = &g_dev_mgr;<br />+    p_dev_info = p_dev_mgr->p_dev_array[dev_id];<br />+    p_dev_info->fw_bar_msg_num = bar_msg_num;<br />+<br />+    PMD_DRV_LOG(INFO, "fw_bar_msg_num_set:fw support agent msg num = %u!", bar_msg_num);<br />+}<br />+<br />+static void<br />+zxdh_np_dev_fw_bar_msg_num_get(uint32_t dev_id, uint32_t *bar_msg_num)<br />+{<br />+    ZXDH_DEV_MGR_T *p_dev_mgr = NULL;<br />+    ZXDH_DEV_CFG_T *p_dev_info = NULL;<br />+<br />+    p_dev_mgr = &g_dev_mgr;<br />+    p_dev_info = p_dev_mgr->p_dev_array[dev_id];<br />+    *bar_msg_num = p_dev_info->fw_bar_msg_num;<br />+}<br />+<br />+static uint32_t<br />+zxdh_np_dev_opr_mutex_get(uint32_t dev_id, uint32_t type, ZXDH_MUTEX_T **p_mutex_out)<br />+{<br />+    ZXDH_DEV_MGR_T *p_dev_mgr = NULL;<br />+    ZXDH_DEV_CFG_T *p_dev_info = NULL;<br />+<br />+    p_dev_mgr = &g_dev_mgr;<br />+    p_dev_info = p_dev_mgr->p_dev_array[dev_id];<br />+<br />+    if (p_dev_info == NULL) {<br />+        PMD_DRV_LOG(ERR, "Get dev_info[ %d ] fail!", dev_id);<br />+        return ZXDH_DEV_TYPE_INVALID;<br />+    }<br />+<br />+    switch (type) {<br />+    case ZXDH_DEV_MUTEX_T_DTB:<br />+    {<br />+        *p_mutex_out = &p_dev_info->dtb_mutex;<br />+    }<br />+    break;<br />+<br />+    default:<br />+    {<br />+        PMD_DRV_LOG(ERR, "mutex type is invalid!");<br />+        return ZXDH_ERR;<br />+    }<br />+    }<br />+<br />+    return ZXDH_OK;<br />+}<br />+<br /> static uint32_t<br /> zxdh_np_dev_read_channel(uint32_t dev_id, uint32_t addr, uint32_t size, uint32_t *p_data)<br /> {<br />@@ -715,6 +868,7 @@ zxdh_np_dev_add(uint32_t  dev_id, ZXDH_DEV_TYPE_E dev_type,<br />         uint64_t  riscv_addr, uint64_t  dma_vir_addr,<br />         uint64_t  dma_phy_addr)<br /> {<br />+    uint32_t rtn = ZXDH_OK;<br />     ZXDH_DEV_CFG_T *p_dev_info = NULL;<br />     ZXDH_DEV_MGR_T *p_dev_mgr  = NULL;<br />  <br />@@ -751,7 +905,10 @@ zxdh_np_dev_add(uint32_t  dev_id, ZXDH_DEV_TYPE_E dev_type,<br />     p_dev_info->p_pcie_write_fun = zxdh_np_dev_pcie_default_write;<br />     p_dev_info->p_pcie_read_fun  = zxdh_np_dev_pcie_default_read;<br />  <br />-    return 0;<br />+    rtn = zxdh_np_comm_mutex_create(&p_dev_info->dtb_mutex);<br />+    ZXDH_COMM_CHECK_DEV_RC(dev_id, rtn, "zxdh_np_comm_mutex_create");<br />+<br />+    return rtn;<br /> }<br />  <br /> static uint32_t<br />@@ -843,6 +1000,277 @@ zxdh_np_ppu_parse_cls_bitmap(uint32_t dev_id,<br />     }<br /> }<br />  <br />+static void<br />+zxdh_np_agent_msg_prt(uint8_t type, uint32_t rtn)<br />+{<br />+    switch (rtn) {<br />+    case ZXDH_RC_CTRLCH_MSG_LEN_ZERO:<br />+    {<br />+        PMD_DRV_LOG(ERR, "type[%u]:msg len is zero!", type);<br />+        break;<br />+    }<br />+    case ZXDH_RC_CTRLCH_MSG_PRO_ERR:<br />+    {<br />+        PMD_DRV_LOG(ERR, "type[%u]:msg process error!", type);<br />+        break;<br />+    }<br />+    case ZXDH_RC_CTRLCH_MSG_TYPE_NOT_SUPPORT:<br />+    {<br />+        PMD_DRV_LOG(ERR, "type[%u]:fw not support the msg!", type);<br />+        break;<br />+    }<br />+    case ZXDH_RC_CTRLCH_MSG_OPER_NOT_SUPPORT:<br />+    {<br />+        PMD_DRV_LOG(ERR, "type[%u]:fw not support opr of the msg!", type);<br />+        break;<br />+    }<br />+    case ZXDH_RC_CTRLCH_MSG_DROP:<br />+    {<br />+        PMD_DRV_LOG(ERR, "type[%u]:fw not support,drop msg!", type);<br />+        break;<br />+    }<br />+    default:<br />+        break;<br />+    }<br />+}<br />+<br />+static uint32_t<br />+zxdh_np_agent_bar_msg_check(uint32_t dev_id, ZXDH_AGENT_CHANNEL_MSG_T *p_msg)<br />+{<br />+    uint8_t type = 0;<br />+    uint32_t bar_msg_num = 0;<br />+<br />+    type = *((uint8_t *)(p_msg->msg) + 1);<br />+    if (type != ZXDH_PCIE_BAR_MSG) {<br />+        zxdh_np_dev_fw_bar_msg_num_get(dev_id, &bar_msg_num);<br />+        if (type >= bar_msg_num) {<br />+            PMD_DRV_LOG(ERR, "type[%u] > fw_bar_msg_num[%u]!", type, bar_msg_num);<br />+            return ZXDH_RC_CTRLCH_MSG_TYPE_NOT_SUPPORT;<br />+        }<br />+    }<br />+<br />+    return ZXDH_OK;<br />+}<br />+<br />+static uint32_t<br />+zxdh_np_agent_channel_sync_send(uint32_t dev_id,<br />+                ZXDH_AGENT_CHANNEL_MSG_T *p_msg,<br />+                uint32_t *p_data,<br />+                uint32_t rep_len)<br />+{<br />+    uint32_t ret = ZXDH_OK;<br />+    uint32_t vport = 0;<br />+    struct zxdh_pci_bar_msg in = {0};<br />+    struct zxdh_msg_recviver_mem result = {0};<br />+    uint32_t *recv_buffer = NULL;<br />+    uint8_t *reply_ptr = NULL;<br />+    uint16_t reply_msg_len = 0;<br />+    uint64_t agent_addr = 0;<br />+<br />+    ret = zxdh_np_agent_bar_msg_check(dev_id, p_msg);<br />+    if (ret != ZXDH_OK) {<br />+        PMD_DRV_LOG(ERR, "zxdh_np_agent_bar_msg_check failed!");<br />+        return ret;<br />+    }<br />+<br />+    zxdh_np_dev_vport_get(dev_id, &vport);<br />+    zxdh_np_dev_agent_addr_get(dev_id, &agent_addr);<br />+<br />+    if (ZXDH_IS_PF(vport))<br />+        in.src = ZXDH_MSG_CHAN_END_PF;<br />+    else<br />+        in.src = ZXDH_MSG_CHAN_END_VF;<br />+<br />+    in.virt_addr = agent_addr;<br />+    in.payload_addr = p_msg->msg;<br />+    in.payload_len = p_msg->msg_len;<br />+    in.dst = ZXDH_MSG_CHAN_END_RISC;<br />+    in.module_id = ZXDH_BAR_MDOULE_NPSDK;<br />+<br />+    recv_buffer = (uint32_t *)rte_zmalloc(NULL, rep_len + ZXDH_CHANNEL_REPS_LEN, 0);<br />+    if (recv_buffer == NULL) {<br />+        PMD_DRV_LOG(ERR, "%s point null!", __func__);<br />+        return ZXDH_PAR_CHK_POINT_NULL;<br />+    }<br />+<br />+    result.buffer_len = rep_len + ZXDH_CHANNEL_REPS_LEN;<br />+    result.recv_buffer = recv_buffer;<br />+<br />+    ret = zxdh_bar_chan_sync_msg_send(&in, &result);<br />+    if (ret == ZXDH_BAR_MSG_OK) {<br />+        reply_ptr = (uint8_t *)(result.recv_buffer);<br />+        if (*reply_ptr == 0XFF) {<br />+            reply_msg_len = *(uint16_t *)(reply_ptr + 1);<br />+            rte_memcpy(p_data, reply_ptr + 4,<br />+                ((reply_msg_len > rep_len) ? rep_len : reply_msg_len));<br />+        } else {<br />+            PMD_DRV_LOG(ERR, "Message not replied");<br />+        }<br />+    } else {<br />+        PMD_DRV_LOG(ERR, "Error[0x%x], %s failed!", ret, __func__);<br />+    }<br />+<br />+    rte_free(recv_buffer);<br />+    return ret;<br />+}<br />+<br />+static uint32_t<br />+zxdh_np_agent_channel_reg_sync_send(uint32_t dev_id,<br />+    ZXDH_AGENT_CHANNEL_REG_MSG_T *p_msg, uint32_t *p_data, uint32_t rep_len)<br />+{<br />+    uint32_t ret = ZXDH_OK;<br />+    ZXDH_COMM_CHECK_DEV_POINT(dev_id, p_msg);<br />+    ZXDH_AGENT_CHANNEL_MSG_T agent_msg = {0};<br />+    agent_msg.msg = (void *)p_msg;<br />+    agent_msg.msg_len = sizeof(ZXDH_AGENT_CHANNEL_REG_MSG_T);<br />+<br />+    ret = zxdh_np_agent_channel_sync_send(dev_id, &agent_msg, p_data, rep_len);<br />+    if (ret != ZXDH_OK) {<br />+        PMD_DRV_LOG(ERR, "zxdh_np_agent_channel_sync_send failed");<br />+        return ZXDH_ERR;<br />+    }<br />+<br />+    ret = *p_data;<br />+    if (ret != ZXDH_OK) {<br />+        PMD_DRV_LOG(ERR, "zxdh_np_agent_channel_sync_send failed in buffer");<br />+        return ZXDH_ERR;<br />+    }<br />+<br />+    return ret;<br />+}<br />+<br />+static uint32_t<br />+zxdh_np_agent_channel_pcie_bar_request(uint32_t dev_id,<br />+                                    uint32_t *p_bar_msg_num)<br />+{<br />+    uint32_t rc = ZXDH_OK;<br />+    uint32_t rsp_buff[2] = {0};<br />+    uint32_t msg_result = 0;<br />+    uint32_t bar_msg_num = 0;<br />+    ZXDH_AGENT_PCIE_BAR_MSG_T msgcfg = {0};<br />+    ZXDH_AGENT_CHANNEL_MSG_T agent_msg = {0};<br />+<br />+    msgcfg.dev_id = 0;<br />+    msgcfg.type = ZXDH_PCIE_BAR_MSG;<br />+    msgcfg.oper = ZXDH_BAR_MSG_NUM_REQ;<br />+    agent_msg.msg = (void *)&msgcfg;<br />+    agent_msg.msg_len = sizeof(ZXDH_AGENT_PCIE_BAR_MSG_T);<br />+<br />+    rc = zxdh_np_agent_channel_sync_send(dev_id, &agent_msg, rsp_buff, sizeof(rsp_buff));<br />+    if (rc != ZXDH_OK) {<br />+        PMD_DRV_LOG(ERR, "zxdh_np_agent_channel_sync_send failed!");<br />+        return rc;<br />+    }<br />+<br />+    msg_result = rsp_buff[0];<br />+    bar_msg_num = rsp_buff[1];<br />+<br />+    zxdh_np_agent_msg_prt(msgcfg.type, msg_result);<br />+<br />+    *p_bar_msg_num = bar_msg_num;<br />+<br />+    return msg_result;<br />+}<br />+<br />+static uint32_t<br />+zxdh_np_agent_channel_reg_read(uint32_t dev_id,<br />+                            uint32_t reg_type,<br />+                            uint32_t reg_no,<br />+                            uint32_t reg_width,<br />+                            uint32_t addr,<br />+                            uint32_t *p_data)<br />+{<br />+    uint32_t ret = 0;<br />+    ZXDH_AGENT_CHANNEL_REG_MSG_T msgcfg = {0};<br />+<br />+    msgcfg.dev_id = 0;<br />+    msgcfg.type = ZXDH_REG_MSG;<br />+    msgcfg.subtype = reg_type;<br />+    msgcfg.oper = ZXDH_RD;<br />+    msgcfg.reg_no = reg_no;<br />+    msgcfg.addr = addr;<br />+    msgcfg.val_len = reg_width / 4;<br />+<br />+    uint32_t resp_len = reg_width + 4;<br />+    uint8_t *resp_buffer = (uint8_t *)rte_zmalloc(NULL, resp_len, 0);<br />+    if (resp_buffer == NULL) {<br />+        PMD_DRV_LOG(ERR, "%s point null!", __func__);<br />+        return ZXDH_PAR_CHK_POINT_NULL;<br />+    }<br />+<br />+    ret = zxdh_np_agent_channel_reg_sync_send(dev_id,<br />+        &msgcfg, (uint32_t *)resp_buffer, resp_len);<br />+    if (ret != ZXDH_OK) {<br />+        PMD_DRV_LOG(ERR, "dev id %d reg_no %d send agent read failed.", dev_id, reg_no);<br />+        rte_free(resp_buffer);<br />+        return ZXDH_ERR;<br />+    }<br />+<br />+    if (*((uint32_t *)resp_buffer) != ZXDH_OK) {<br />+        PMD_DRV_LOG(ERR, "dev id %d reg_no %d agent read resp err %d .",<br />+            dev_id, reg_no, *((uint32_t *)resp_buffer));<br />+        rte_free(resp_buffer);<br />+        return ZXDH_ERR;<br />+    }<br />+<br />+    rte_memcpy(p_data, resp_buffer + 4, reg_width);<br />+<br />+    rte_free(resp_buffer);<br />+<br />+    return ret;<br />+}<br />+<br />+static uint32_t<br />+zxdh_np_agent_channel_reg_write(uint32_t dev_id,<br />+                            uint32_t reg_type,<br />+                            uint32_t reg_no,<br />+                            uint32_t reg_width,<br />+                            uint32_t addr,<br />+                            uint32_t *p_data)<br />+{<br />+    uint32_t ret = ZXDH_OK;<br />+    ZXDH_AGENT_CHANNEL_REG_MSG_T msgcfg = {0};<br />+<br />+    msgcfg.dev_id = 0;<br />+    msgcfg.type = ZXDH_REG_MSG;<br />+    msgcfg.subtype = reg_type;<br />+    msgcfg.oper = ZXDH_WR;<br />+    msgcfg.reg_no = reg_no;<br />+    msgcfg.addr = addr;<br />+    msgcfg.val_len = reg_width / 4;<br />+<br />+    rte_memcpy(msgcfg.val, p_data, reg_width);<br />+<br />+    uint32_t resp_len = reg_width + 4;<br />+    uint8_t *resp_buffer = (uint8_t *)rte_zmalloc(NULL, resp_len, 0);<br />+    if (resp_buffer == NULL) {<br />+        PMD_DRV_LOG(ERR, "%s point null!", __func__);<br />+        return ZXDH_PAR_CHK_POINT_NULL;<br />+    }<br />+<br />+    ret = zxdh_np_agent_channel_reg_sync_send(dev_id,<br />+        &msgcfg, (uint32_t *)resp_buffer, resp_len);<br />+<br />+    if (ret != ZXDH_OK) {<br />+        PMD_DRV_LOG(ERR, "dev id %d reg_no %d send agent write failed.", dev_id, reg_no);<br />+        rte_free(resp_buffer);<br />+        return ZXDH_ERR;<br />+    }<br />+<br />+    if (*((uint32_t *)resp_buffer) != ZXDH_OK) {<br />+        PMD_DRV_LOG(ERR, "dev id %d reg_no %d agent write resp err %d .",<br />+            dev_id, reg_no, *((uint32_t *)resp_buffer));<br />+        rte_free(resp_buffer);<br />+        return ZXDH_ERR;<br />+    }<br />+<br />+    rte_memcpy(p_data, resp_buffer + 4, reg_width);<br />+<br />+    rte_free(resp_buffer);<br />+<br />+    return ret;<br />+}<br />+<br /> static ZXDH_DTB_MGR_T *<br /> zxdh_np_dtb_mgr_get(uint32_t dev_id)<br /> {<br />@@ -1053,6 +1481,30 @@ zxdh_np_np_sdk_version_compatible_check(uint32_t dev_id)<br />     return ZXDH_OK;<br /> }<br />  <br />+static uint32_t<br />+zxdh_np_pcie_bar_msg_num_get(uint32_t dev_id, uint32_t *p_bar_msg_num)<br />+{<br />+    uint32_t rc = ZXDH_OK;<br />+    ZXDH_MUTEX_T *p_dtb_mutex = NULL;<br />+    ZXDH_DEV_MUTEX_TYPE_E mutex = 0;<br />+<br />+    mutex = ZXDH_DEV_MUTEX_T_DTB;<br />+    rc = zxdh_np_dev_opr_mutex_get(dev_id, (uint32_t)mutex, &p_dtb_mutex);<br />+    ZXDH_COMM_CHECK_DEV_RC(dev_id, rc, "zxdh_np_dev_opr_mutex_get");<br />+<br />+    rc = zxdh_np_comm_mutex_lock(p_dtb_mutex);<br />+    ZXDH_COMM_CHECK_DEV_RC(dev_id, rc, "zxdh_np_comm_mutex_lock");<br />+<br />+    rc = zxdh_np_agent_channel_pcie_bar_request(dev_id, p_bar_msg_num);<br />+    ZXDH_COMM_CHECK_DEV_RC_UNLOCK(dev_id, rc,<br />+        "zxdh_np_agent_channel_pcie_bar_request", p_dtb_mutex);<br />+<br />+    rc = zxdh_np_comm_mutex_unlock(p_dtb_mutex);<br />+    ZXDH_COMM_CHECK_DEV_RC(dev_id, rc, "zxdh_np_comm_mutex_unlock");<br />+<br />+    return rc;<br />+}<br />+<br /> static ZXDH_RISCV_DTB_MGR *<br /> zxdh_np_riscv_dtb_queue_mgr_get(uint32_t dev_id)<br /> {<br />@@ -1171,17 +1623,27 @@ zxdh_np_reg_read(uint32_t dev_id, uint32_t reg_no,<br />     uint32_t i;<br />     uint32_t addr = 0;<br />     uint32_t reg_module = 0;<br />+    uint32_t reg_width = 0;<br />+    uint32_t reg_real_no = 0;<br />+    uint32_t reg_type = 0;<br />  <br />     p_reg_info = &g_dpp_reg_info[reg_no];<br />     p_field_info = p_reg_info->p_fields;<br />  <br />     reg_module = p_reg_info->module_no;<br />+    reg_type = p_reg_info->flags;<br />+    reg_width = p_reg_info->width;<br />+    reg_real_no = p_reg_info->reg_no;<br />  <br />     addr = zxdh_np_reg_get_reg_addr(reg_no, m_offset, n_offset);<br />  <br />     if (reg_module == DTB4K) {<br />         rc = p_reg_info->p_read_fun(dev_id, addr, p_buff);<br />         ZXDH_COMM_CHECK_DEV_RC(dev_id, rc, "p_reg_info->p_read_fun");<br />+    } else {<br />+        rc = zxdh_np_agent_channel_reg_read(dev_id,<br />+            reg_type, reg_real_no, reg_width, addr, p_buff);<br />+        ZXDH_COMM_CHECK_DEV_RC(dev_id, rc, "zxdh_np_agent_channel_reg_read");<br />     }<br />  <br />     if (!zxdh_np_comm_is_big_endian()) {<br />@@ -1314,11 +1776,17 @@ zxdh_np_reg_write(uint32_t dev_id, uint32_t reg_no,<br />     uint32_t i;<br />     uint32_t reg_module = 0;<br />     uint32_t addr = 0;<br />+    uint32_t reg_width = 0;<br />+    uint32_t reg_type = 0;<br />+    uint32_t reg_real_no = 0;<br />  <br />     p_reg_info = &g_dpp_reg_info[reg_no];<br />     p_field_info = p_reg_info->p_fields;<br />  <br />     reg_module = p_reg_info->module_no;<br />+    reg_width = p_reg_info->width;<br />+    reg_type = p_reg_info->flags;<br />+    reg_real_no = p_reg_info->reg_no;<br />  <br />     for (i = 0; i < p_reg_info->field_num; i++) {<br />         if (p_field_info[i].len <= 32) {<br />@@ -1353,6 +1821,10 @@ zxdh_np_reg_write(uint32_t dev_id, uint32_t reg_no,<br />     if (reg_module == DTB4K) {<br />         rc = p_reg_info->p_write_fun(dev_id, addr, p_buff);<br />         ZXDH_COMM_CHECK_DEV_RC(dev_id, rc, "p_reg_info->p_write_fun");<br />+    } else {<br />+        rc = zxdh_np_agent_channel_reg_write(dev_id,<br />+            reg_type, reg_real_no, reg_width, addr, p_buff);<br />+        ZXDH_COMM_CHECK_DEV_RC(dev_id, rc, "zxdh_np_agent_channel_reg_write");<br />     }<br />  <br />     return rc;<br />@@ -1515,6 +1987,7 @@ zxdh_np_dev_del(uint32_t dev_id)<br />     p_dev_info = p_dev_mgr->p_dev_array[dev_id];<br />  <br />     if (p_dev_info != NULL) {<br />+        zxdh_np_comm_mutex_destroy(&p_dev_info->dtb_mutex);<br />         rte_free(p_dev_info);<br />         p_dev_mgr->p_dev_array[dev_id] = NULL;<br />         p_dev_mgr->device_num--;<br />@@ -2698,6 +3171,7 @@ zxdh_np_host_init(uint32_t dev_id,<br />     ZXDH_SYS_INIT_CTRL_T sys_init_ctrl = {0};<br />     uint32_t rc;<br />     uint64_t agent_addr;<br />+    uint32_t bar_msg_num = 0;<br />  <br />     ZXDH_COMM_CHECK_POINT_NO_ASSERT(p_dev_init_ctrl);<br />  <br />@@ -2719,5 +3193,10 @@ zxdh_np_host_init(uint32_t dev_id,<br />     rc = zxdh_np_np_sdk_version_compatible_check(dev_id);<br />     ZXDH_COMM_CHECK_DEV_RC(dev_id, rc, "zxdh_np_np_sdk_version_compatible_check");<br />  <br />+    rc = zxdh_np_pcie_bar_msg_num_get(dev_id, &bar_msg_num);<br />+    ZXDH_COMM_CHECK_DEV_RC(dev_id, rc, "zxdh_np_pcie_bar_msg_num_get");<br />+<br />+    zxdh_np_dev_fw_bar_msg_num_set(dev_id, bar_msg_num);<br />+<br />     return 0;<br /> }<br />diff --git a/drivers/net/zxdh/zxdh_np.h b/drivers/net/zxdh/zxdh_np.h<br />index 1df85bd382..f454765f30 100644<br />--- a/drivers/net/zxdh/zxdh_np.h<br />+++ b/drivers/net/zxdh/zxdh_np.h<br />@@ -111,10 +111,17 @@<br />         (ZXDH_SE_SMMU0_ERAM_BLOCK_NUM * ZXDH_SE_SMMU0_ERAM_ADDR_NUM_PER_BLOCK)<br />  <br /> #define ZXDH_SE_OPR_RD                          (1)<br />+#define ZXDH_CHANNEL_REPS_LEN                   (4)<br />  <br /> #define ZXDH_NPSDK_COMPAT_ITEM_ID               (10)<br /> #define ZXDH_DPU_NO_DEBUG_PF_COMPAT_REG_OFFSET  (0x5400)<br />  <br />+#define ZXDH_VF_ACTIVE(VPORT)                   (((VPORT) & 0x0800) >> 11)<br />+#define ZXDH_EPID_BY(VPORT)                     (((VPORT) & 0x7000) >> 12)<br />+#define ZXDH_FUNC_NUM(VPORT)                    (((VPORT) & 0x0700) >> 8)<br />+#define ZXDH_VFUNC_NUM(VPORT)                   (((VPORT) & 0x00FF))<br />+#define ZXDH_IS_PF(VPORT)                       (!ZXDH_VF_ACTIVE(VPORT))<br />+<br /> /**errco code */<br /> #define ZXDH_RC_BASE                            (0x1000U)<br /> #define ZXDH_PARAMETER_CHK_BASE                 (ZXDH_RC_BASE            | 0x200)<br />@@ -127,6 +134,12 @@<br /> #define ZXDH_PAR_CHK_INVALID_DEV_ID             (ZXDH_PARAMETER_CHK_BASE | 0x007)<br /> #define ZXDH_PAR_CHK_INVALID_PARA               (ZXDH_PARAMETER_CHK_BASE | 0x008)<br />  <br />+#define ZXDH_MUTEX_LOCK_BASE                    (ZXDH_RC_BASE            | 0x300)<br />+#define ZXDH_MUTEX_LOCK_INIT_FAIL               (ZXDH_MUTEX_LOCK_BASE    | 0x001)<br />+#define ZXDH_MUTEX_LOCK_LOCK_FAIL               (ZXDH_MUTEX_LOCK_BASE    | 0x002)<br />+#define ZXDH_MUTEX_LOCK_ULOCK_FAIL              (ZXDH_MUTEX_LOCK_BASE    | 0X003)<br />+#define ZXDH_MUTEX_LOCK_DESTROY_FAIL            (ZXDH_MUTEX_LOCK_BASE    | 0X004)<br />+<br /> #define ZXDH_ERAM128_BADDR_MASK                 (0x3FFFF80)<br />  <br /> #define ZXDH_DTB_TABLE_MODE_ERAM                (0)<br />@@ -164,6 +177,13 @@<br /> #define ZXDH_RC_DTB_SEARCH_VPORT_QUEUE_ZERO     (ZXDH_RC_DTB_BASE | 0x17)<br /> #define ZXDH_RC_DTB_QUEUE_NOT_ENABLE            (ZXDH_RC_DTB_BASE | 0x18)<br />  <br />+#define ZXDH_RC_CTRLCH_BASE                     (0xf00)<br />+#define ZXDH_RC_CTRLCH_MSG_LEN_ZERO             (ZXDH_RC_CTRLCH_BASE | 0x0)<br />+#define ZXDH_RC_CTRLCH_MSG_PRO_ERR              (ZXDH_RC_CTRLCH_BASE | 0x1)<br />+#define ZXDH_RC_CTRLCH_MSG_TYPE_NOT_SUPPORT     (ZXDH_RC_CTRLCH_BASE | 0x2)<br />+#define ZXDH_RC_CTRLCH_MSG_OPER_NOT_SUPPORT     (ZXDH_RC_CTRLCH_BASE | 0x3)<br />+#define ZXDH_RC_CTRLCH_MSG_DROP                 (ZXDH_RC_CTRLCH_BASE | 0x4)<br />+<br /> typedef enum zxdh_module_base_addr_e {<br />     ZXDH_MODULE_SE_SMMU0_BASE_ADDR = 0x00000000,<br />     ZXDH_MODULE_DTB_ENQ_BASE_ADDR  = 0x00000000,<br />@@ -349,6 +369,7 @@ typedef struct dpp_dev_cfg_t {<br />     uint32_t access_type;<br />     uint32_t agent_flag;<br />     uint32_t vport;<br />+    uint32_t fw_bar_msg_num;<br />     uint64_t pcie_addr;<br />     uint64_t riscv_addr;<br />     uint64_t dma_vir_addr;<br />@@ -357,6 +378,7 @@ typedef struct dpp_dev_cfg_t {<br />     uint32_t init_flags[ZXDH_MODULE_INIT_MAX];<br />     ZXDH_DEV_WRITE_FUNC p_pcie_write_fun;<br />     ZXDH_DEV_READ_FUNC  p_pcie_read_fun;<br />+    ZXDH_MUTEX_T dtb_mutex;<br /> } ZXDH_DEV_CFG_T;<br />  <br /> typedef struct zxdh_dev_mngr_t {<br />@@ -631,6 +653,38 @@ typedef enum zxdh_stat_cnt_mode_e {<br />     ZXDH_STAT_MAX_MODE,<br /> } ZXDH_STAT_CNT_MODE_E;<br />  <br />+typedef enum zxdh_np_agent_msg_type_e {<br />+    ZXDH_REG_MSG = 0,<br />+    ZXDH_DTB_MSG,<br />+    ZXDH_TM_MSG,<br />+    ZXDH_PLCR_MSG,<br />+    ZXDH_PKTRX_IND_REG_RW_MSG,<br />+    ZXDH_PCIE_BAR_MSG,<br />+    ZXDH_RESET_MSG,<br />+    ZXDH_PXE_MSG,<br />+    ZXDH_TM_FLOW_SHAPE,<br />+    ZXDH_TM_TD,<br />+    ZXDH_TM_SE_SHAPE,<br />+    ZXDH_TM_PP_SHAPE,<br />+    ZXDH_PLCR_CAR_RATE,<br />+    ZXDH_PLCR_CAR_PKT_RATE,<br />+    ZXDH_PPU_THASH_RSK,<br />+    ZXDH_ACL_MSG,<br />+    ZXDH_STAT_MSG,<br />+    ZXDH_RES_MSG,<br />+    ZXDH_MSG_MAX<br />+} MSG_TYPE_E;<br />+typedef enum  zxdh_agent_pcie_bar_e {<br />+    ZXDH_BAR_MSG_NUM_REQ = 0,<br />+    ZXDH_PCIE_BAR_MAX<br />+} ZXDH_MSG_PCIE_BAR_E;<br />+<br />+typedef enum zxdh_agent_msg_oper_e {<br />+    ZXDH_WR = 0,<br />+    ZXDH_RD,<br />+    ZXDH_WR_RD_MAX<br />+} ZXDH_MSG_OPER_E;<br />+<br /> typedef struct __rte_aligned(2) zxdh_version_compatible_reg_t {<br />     uint8_t version_compatible_item;<br />     uint8_t major;<br />@@ -640,6 +694,29 @@ typedef struct __rte_aligned(2) zxdh_version_compatible_reg_t {<br />     uint8_t rsv[2];<br /> } ZXDH_VERSION_COMPATIBLE_REG_T;<br />  <br />+typedef struct __rte_aligned(2) zxdh_agent_channel_pcie_bar_msg_t {<br />+    uint8_t dev_id;<br />+    uint8_t type;<br />+    uint8_t oper;<br />+    uint8_t rsv;<br />+} ZXDH_AGENT_PCIE_BAR_MSG_T;<br />+<br />+typedef struct __rte_aligned(2) zxdh_agent_channel_reg_msg {<br />+    uint8_t dev_id;<br />+    uint8_t type;<br />+    uint8_t subtype;<br />+    uint8_t oper;<br />+    uint32_t reg_no;<br />+    uint32_t addr;<br />+    uint32_t val_len;<br />+    uint32_t val[32];<br />+} ZXDH_AGENT_CHANNEL_REG_MSG_T;<br />+<br />+typedef struct __rte_aligned(2) zxdh_agent_channel_msg_t {<br />+    uint32_t msg_len;<br />+    void *msg;<br />+} ZXDH_AGENT_CHANNEL_MSG_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 />--  <br />2.27.0<br />