net/hns3: fix log on flow director clear

[dpdk.git] / drivers / net / hns3 / hns3_mbx.c

diff --git a/drivers/net/hns3/hns3_mbx.c b/drivers/net/hns3/hns3_mbx.c
index c5b0856..31ab130 100644 (file)
--- a/drivers/net/hns3/hns3_mbx.c
+++ b/drivers/net/hns3/hns3_mbx.c
@@ -61,13 +61,12 @@ static int
 hns3_get_mbx_resp(struct hns3_hw *hw, uint16_t code, uint16_t subcode,
                  uint8_t *resp_data, uint16_t resp_len)
 {
-#define HNS3_MAX_RETRY_MS      500
+#define HNS3_MAX_RETRY_US      500000
 #define HNS3_WAIT_RESP_US      100
        struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw);
        struct hns3_mbx_resp_status *mbx_resp;
+       uint32_t wait_time = 0;
        bool received;
-       uint64_t now;
-       uint64_t end;
 
        if (resp_len > HNS3_MBX_MAX_RESP_DATA_SIZE) {
                hns3_err(hw, "VF mbx response len(=%u) exceeds maximum(=%d)",
@@ -75,9 +74,7 @@ hns3_get_mbx_resp(struct hns3_hw *hw, uint16_t code, uint16_t subcode,
                return -EINVAL;
        }
 
-       now = get_timeofday_ms();
-       end = now + HNS3_MAX_RETRY_MS;
-       while (now < end) {
+       while (wait_time < HNS3_MAX_RETRY_US) {
                if (__atomic_load_n(&hw->reset.disable_cmd, __ATOMIC_RELAXED)) {
                        hns3_err(hw, "Don't wait for mbx respone because of "
                                 "disable_cmd");
@@ -103,10 +100,10 @@ hns3_get_mbx_resp(struct hns3_hw *hw, uint16_t code, uint16_t subcode,
                if (received)
                        break;
 
-               now = get_timeofday_ms();
+               wait_time += HNS3_WAIT_RESP_US;
        }
        hw->mbx_resp.req_msg_data = 0;
-       if (now >= end) {
+       if (wait_time >= HNS3_MAX_RETRY_US) {
                hns3_mbx_proc_timeout(hw, code, subcode);
                return -ETIME;
        }
@@ -350,7 +347,7 @@ hns3_link_fail_parse(struct hns3_hw *hw, uint8_t link_fail_code)
 
 static void
 hns3pf_handle_link_change_event(struct hns3_hw *hw,
-                             struct hns3_mbx_pf_to_vf_cmd *req)
+                               struct hns3_mbx_vf_to_pf_cmd *req)
 {
 #define LINK_STATUS_OFFSET     1
 #define LINK_FAIL_CODE_OFFSET  2
@@ -441,16 +438,19 @@ scan_next:
 void
 hns3_dev_handle_mbx_msg(struct hns3_hw *hw)
 {
+       struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw);
        struct hns3_cmq_ring *crq = &hw->cmq.crq;
        struct hns3_mbx_pf_to_vf_cmd *req;
        struct hns3_cmd_desc *desc;
+       bool handle_out;
        uint8_t opcode;
        uint16_t flag;
 
        rte_spinlock_lock(&hw->cmq.crq.lock);
 
-       if (rte_eal_process_type() != RTE_PROC_PRIMARY ||
-           !rte_thread_is_intr()) {
+       handle_out = (rte_eal_process_type() != RTE_PROC_PRIMARY ||
+                     !rte_thread_is_intr()) && hns->is_vf;
+       if (handle_out) {
                /*
                 * Currently, any threads in the primary and secondary processes
                 * could send mailbox sync request, so it will need to process
@@ -494,7 +494,8 @@ hns3_dev_handle_mbx_msg(struct hns3_hw *hw)
                        continue;
                }
 
-               if (desc->opcode == 0) {
+               handle_out = hns->is_vf && desc->opcode == 0;
+               if (handle_out) {
                        /* Message already processed by other thread */
                        crq->desc[crq->next_to_use].flag = 0;
                        hns3_mbx_ring_ptr_move_crq(crq);
@@ -512,7 +513,14 @@ hns3_dev_handle_mbx_msg(struct hns3_hw *hw)
                        hns3_handle_asserting_reset(hw, req);
                        break;
                case HNS3_MBX_PUSH_LINK_STATUS:
-                       hns3pf_handle_link_change_event(hw, req);
+                       /*
+                        * This message is reported by the firmware and is
+                        * reported in 'struct hns3_mbx_vf_to_pf_cmd' format.
+                        * Therefore, we should cast the req variable to
+                        * 'struct hns3_mbx_vf_to_pf_cmd' and then process it.
+                        */
+                       hns3pf_handle_link_change_event(hw,
+                               (struct hns3_mbx_vf_to_pf_cmd *)req);
                        break;
                case HNS3_MBX_PUSH_VLAN_INFO:
                        /*
@@ -531,8 +539,7 @@ hns3_dev_handle_mbx_msg(struct hns3_hw *hw)
                        hns3_handle_promisc_info(hw, req->msg[1]);
                        break;
                default:
-                       hns3_err(hw,
-                                "VF received unsupported(%u) mbx msg from PF",
+                       hns3_err(hw, "received unsupported(%u) mbx msg",
                                 req->msg[0]);
                        break;
                }