net/hinic/base: support two or more AEQS for chip

For device initialize, driver only supports four aeqs before,
and now driver can supports two or more aeqs from chip
config file.

Fixes: 611faa5f46cc ("fix various typos found by Lintian")
Cc: stable@dpdk.org
Signed-off-by: Guoyang Zhou <zhouguoyang@huawei.com>

diff --git a/drivers/net/hinic/base/hinic_pmd_eqs.c b/drivers/net/hinic/base/hinic_pmd_eqs.c
index 79e1b20..fecb653 100644 (file)
--- a/drivers/net/hinic/base/hinic_pmd_eqs.c
+++ b/drivers/net/hinic/base/hinic_pmd_eqs.c
@@ -470,10 +470,10 @@ int hinic_comm_aeqs_init(struct hinic_hwdev *hwdev)
        struct irq_info aeq_irqs[HINIC_MAX_AEQS];
 
        num_aeqs = HINIC_HWIF_NUM_AEQS(hwdev->hwif);
-       if (num_aeqs < HINIC_MAX_AEQS) {
-               PMD_DRV_LOG(ERR, "Warning: PMD need %d AEQs, Chip have %d",
-                       HINIC_MAX_AEQS, num_aeqs);
-               return HINIC_ERROR;
+       if (num_aeqs < HINIC_MIN_AEQS) {
+               PMD_DRV_LOG(ERR, "PMD need %d AEQs, Chip has %d\n",
+                               HINIC_MIN_AEQS, num_aeqs);
+               return -EINVAL;
        }
 
        memset(aeq_irqs, 0, sizeof(aeq_irqs));

diff --git a/drivers/net/hinic/base/hinic_pmd_eqs.h b/drivers/net/hinic/base/hinic_pmd_eqs.h
index 16046ec..5e6dc39 100644 (file)
--- a/drivers/net/hinic/base/hinic_pmd_eqs.h
+++ b/drivers/net/hinic/base/hinic_pmd_eqs.h
@@ -9,6 +9,10 @@
 
 #define HINIC_AEQN_START               0
 #define HINIC_MAX_AEQS                 4
+#define HINIC_MIN_AEQS                 2
+#define HINIC_AEQN_0                   0
+#define HINIC_AEQN_1                   1
+#define HINIC_AEQN_2                   2
 
 #define HINIC_EQ_MAX_PAGES             8
 

diff --git a/drivers/net/hinic/base/hinic_pmd_mbox.c b/drivers/net/hinic/base/hinic_pmd_mbox.c
index ab1106a..ff44c25 100644 (file)
--- a/drivers/net/hinic/base/hinic_pmd_mbox.c
+++ b/drivers/net/hinic/base/hinic_pmd_mbox.c
@@ -297,15 +297,52 @@ mbox_copy_send_data(struct hinic_send_mbox *mbox, void *seg, u16 seg_len)
                                mbox->data + MBOX_HEADER_SZ + i * sizeof(u32));
 }
 
+static int mbox_msg_ack_aeqn(struct hinic_hwdev *hwdev)
+{
+       u16 aeq_num = HINIC_HWIF_NUM_AEQS(hwdev->hwif);
+       int msg_ack_aeqn;
+
+       if (aeq_num >= HINIC_MAX_AEQS - 1) {
+               msg_ack_aeqn = HINIC_AEQN_2;
+       } else if (aeq_num == HINIC_MIN_AEQS) {
+               /* This is used for ovs */
+               msg_ack_aeqn = HINIC_AEQN_1;
+       } else {
+               PMD_DRV_LOG(ERR, "Warning: Invalid aeq num: %d\n", aeq_num);
+               msg_ack_aeqn = -1;
+       }
+
+       return msg_ack_aeqn;
+}
+
+static u16 mbox_msg_dst_aeqn(struct hinic_hwdev *hwdev,
+                       enum hinic_hwif_direction_type seq_dir)
+{
+       u16 dst_aeqn;
+
+       if (seq_dir == HINIC_HWIF_DIRECT_SEND)
+               dst_aeqn = HINIC_AEQN_0;
+       else
+               dst_aeqn = mbox_msg_ack_aeqn(hwdev);
+
+       return dst_aeqn;
+}
+
+static int mbox_seg_ack_aeqn(struct hinic_hwdev *hwdev)
+{
+       return mbox_msg_ack_aeqn(hwdev);
+}
+
 static void write_mbox_msg_attr(struct hinic_mbox_func_to_func *func_to_func,
-                       u16 dst_func, u16 dst_aeqn,
+                       u16 dst_func, u16 dst_aeqn, u16 seg_ack_aeqn,
                        __rte_unused u16 seg_len, int poll)
 {
        u32 mbox_int, mbox_ctrl;
 
        mbox_int = HINIC_MBOX_INT_SET(dst_func, DST_FUNC) |
                HINIC_MBOX_INT_SET(dst_aeqn, DST_AEQN) |
-               HINIC_MBOX_INT_SET(HINIC_MBOX_RSP_AEQN, SRC_RESP_AEQN) |
+               /* N/A in polling mode */
+               HINIC_MBOX_INT_SET(seg_ack_aeqn, SRC_RESP_AEQN) |
                HINIC_MBOX_INT_SET(NO_DMA_ATTRIBUTE_VAL, STAT_DMA) |
                HINIC_MBOX_INT_SET(ALIGN(MBOX_SIZE, MBOX_SEG_LEN_ALIGN) >> 2,
                                        TX_SIZE) |
@@ -551,19 +588,21 @@ static int send_mbox_seg(struct hinic_mbox_func_to_func *func_to_func,
        struct hinic_send_mbox *send_mbox = &func_to_func->send_mbox;
        struct hinic_hwdev *hwdev = func_to_func->hwdev;
        u16 seq_dir = HINIC_MBOX_HEADER_GET(header, DIRECTION);
-       u16 dst_aeqn = (seq_dir == HINIC_HWIF_DIRECT_SEND) ?
-                               HINIC_MBOX_RECV_AEQN : HINIC_MBOX_RSP_AEQN;
+       u16 dst_aeqn, seg_ack_aeqn;
        u16 err_code, wb_status = 0;
        u32 cnt = 0;
 
+       dst_aeqn = mbox_msg_dst_aeqn(hwdev, seq_dir);
+       seg_ack_aeqn = mbox_seg_ack_aeqn(hwdev);
+
        clear_mbox_status(send_mbox);
 
        mbox_copy_header(send_mbox, &header);
 
        mbox_copy_send_data(send_mbox, seg, seg_len);
 
-       write_mbox_msg_attr(func_to_func, dst_func, dst_aeqn, seg_len,
-                           MBOX_SEND_MSG_POLL);
+       write_mbox_msg_attr(func_to_func, dst_func, dst_aeqn, seg_ack_aeqn,
+                               seg_len, MBOX_SEND_MSG_POLL);
 
        rte_wmb();
 
@@ -697,7 +736,7 @@ static int hinic_mbox_to_func(struct hinic_mbox_func_to_func *func_to_func,
                goto send_err;
 
        time = msecs_to_jiffies(timeout ? timeout : HINIC_MBOX_COMP_TIME_MS);
-       err = hinic_aeq_poll_msg(func_to_func->rsp_aeq, time, NULL);
+       err = hinic_aeq_poll_msg(func_to_func->ack_aeq, time, NULL);
        if (err) {
                set_mbox_to_func_event(func_to_func, EVENT_TIMEOUT);
                PMD_DRV_LOG(ERR, "Send mailbox message time out");
@@ -920,13 +959,16 @@ void hinic_comm_func_to_func_free(struct hinic_hwdev *hwdev)
 int hinic_comm_func_to_func_init(struct hinic_hwdev *hwdev)
 {
        int rc;
+       u16 msg_ack_aeqn;
 
        rc = hinic_func_to_func_init(hwdev);
        if (rc)
                return rc;
 
-       hwdev->func_to_func->rsp_aeq = &hwdev->aeqs->aeq[HINIC_MBOX_RSP_AEQN];
-       hwdev->func_to_func->recv_aeq = &hwdev->aeqs->aeq[HINIC_MBOX_RECV_AEQN];
+       msg_ack_aeqn = mbox_msg_ack_aeqn(hwdev);
+
+       hwdev->func_to_func->ack_aeq = &hwdev->aeqs->aeq[msg_ack_aeqn];
+       hwdev->func_to_func->recv_aeq = &hwdev->aeqs->aeq[HINIC_AEQN_0];
 
        return 0;
 }

diff --git a/drivers/net/hinic/base/hinic_pmd_mbox.h b/drivers/net/hinic/base/hinic_pmd_mbox.h
index bf7b490..dc08b99 100644 (file)
--- a/drivers/net/hinic/base/hinic_pmd_mbox.h
+++ b/drivers/net/hinic/base/hinic_pmd_mbox.h
@@ -5,9 +5,6 @@
 #ifndef _HINIC_PMD_MBOX_H_
 #define _HINIC_PMD_MBOX_H_
 
-#define HINIC_MBOX_RECV_AEQN           0
-#define HINIC_MBOX_RSP_AEQN            2
-
 #define HINIC_MBOX_PF_SEND_ERR         0x1
 #define HINIC_MBOX_PF_BUSY_ACTIVE_FW   0x2
 #define HINIC_MBOX_VF_CMD_ERROR                0x3
@@ -69,7 +66,7 @@ struct hinic_mbox_func_to_func {
        struct hinic_recv_mbox mbox_resp[HINIC_MAX_FUNCTIONS];
        struct hinic_recv_mbox mbox_send[HINIC_MAX_FUNCTIONS];
 
-       struct hinic_eq *rsp_aeq;
+       struct hinic_eq *ack_aeq;
        struct hinic_eq *recv_aeq;
 
        u8 send_msg_id;