X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fhns3%2Fhns3_mbx.c;h=245652e2ed02a3e57cf054abe702e67b6635b961;hb=3d491e5531a1d631f464ab31e139132d0e531198;hp=eb202dd60e5fd0ec37811f1891f563d41d1ab8e4;hpb=d566bfcff0c7bfe167f6c520d4fd5b0104130af6;p=dpdk.git diff --git a/drivers/net/hns3/hns3_mbx.c b/drivers/net/hns3/hns3_mbx.c index eb202dd60e..245652e2ed 100644 --- a/drivers/net/hns3/hns3_mbx.c +++ b/drivers/net/hns3/hns3_mbx.c @@ -61,8 +61,9 @@ 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_US 500000 #define HNS3_WAIT_RESP_US 100 +#define US_PER_MS 1000 + uint32_t mbx_time_limit; struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw); struct hns3_mbx_resp_status *mbx_resp; uint32_t wait_time = 0; @@ -74,7 +75,8 @@ hns3_get_mbx_resp(struct hns3_hw *hw, uint16_t code, uint16_t subcode, return -EINVAL; } - while (wait_time < HNS3_MAX_RETRY_US) { + mbx_time_limit = (uint32_t)hns->mbx_time_limit_ms * US_PER_MS; + while (wait_time < mbx_time_limit) { if (__atomic_load_n(&hw->reset.disable_cmd, __ATOMIC_RELAXED)) { hns3_err(hw, "Don't wait for mbx respone because of " "disable_cmd"); @@ -103,7 +105,7 @@ hns3_get_mbx_resp(struct hns3_hw *hw, uint16_t code, uint16_t subcode, wait_time += HNS3_WAIT_RESP_US; } hw->mbx_resp.req_msg_data = 0; - if (wait_time >= HNS3_MAX_RETRY_US) { + if (wait_time >= mbx_time_limit) { hns3_mbx_proc_timeout(hw, code, subcode); return -ETIME; } @@ -347,7 +349,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 @@ -433,21 +435,27 @@ hns3_handle_mbx_msg_out_intr(struct hns3_hw *hw) scan_next: next_to_use = (next_to_use + 1) % hw->cmq.crq.desc_num; } + + crq->next_to_use = next_to_use; + hns3_write_dev(hw, HNS3_CMDQ_RX_HEAD_REG, crq->next_to_use); } 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 @@ -491,7 +499,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); @@ -509,7 +518,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: /* @@ -528,9 +544,8 @@ 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", - req->msg[0]); + hns3_err(hw, "received unsupported(%u) mbx msg", + opcode); break; }