net/hns3: fix packet type report in Rx

[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 0d03f50..305007a 100644 (file)
--- a/drivers/net/hns3/hns3_mbx.c
+++ b/drivers/net/hns3/hns3_mbx.c
@@ -23,6 +23,7 @@
 #include "hns3_regs.h"
 #include "hns3_logs.h"
 #include "hns3_intr.h"
+#include "hns3_rxtx.h"
 
 #define HNS3_CMD_CODE_OFFSET           2
 
@@ -219,6 +220,7 @@ hns3_mbx_handler(struct hns3_hw *hw)
        struct hns3_mac *mac = &hw->mac;
        enum hns3_reset_level reset_level;
        uint16_t *msg_q;
+       uint8_t opcode;
        uint32_t tail;
 
        tail = hw->arq.tail;
@@ -227,7 +229,8 @@ hns3_mbx_handler(struct hns3_hw *hw)
        while (tail != hw->arq.head) {
                msg_q = hw->arq.msg_q[hw->arq.head];
 
-               switch (msg_q[0]) {
+               opcode = msg_q[0] & 0xff;
+               switch (opcode) {
                case HNS3_MBX_LINK_STAT_CHANGE:
                        memcpy(&mac->link_speed, &msg_q[2],
                                   sizeof(mac->link_speed));
@@ -249,7 +252,7 @@ hns3_mbx_handler(struct hns3_hw *hw)
                        break;
                default:
                        hns3_err(hw, "Fetched unsupported(%d) message from arq",
-                                msg_q[0]);
+                                opcode);
                        break;
                }
 
@@ -324,6 +327,45 @@ hns3_handle_link_change_event(struct hns3_hw *hw,
        hns3_update_link_status(hw);
 }
 
+static void
+hns3_update_port_base_vlan_info(struct hns3_hw *hw,
+                               struct hns3_mbx_pf_to_vf_cmd *req)
+{
+#define PVID_STATE_OFFSET      1
+       uint16_t new_pvid_state = req->msg[PVID_STATE_OFFSET] ?
+               HNS3_PORT_BASE_VLAN_ENABLE : HNS3_PORT_BASE_VLAN_DISABLE;
+       /*
+        * Currently, hardware doesn't support more than two layers VLAN offload
+        * based on hns3 network engine, which would cause packets loss or wrong
+        * packets for these types of packets. If the hns3 PF kernel ethdev
+        * driver sets the PVID for VF device after initialization of the
+        * related VF device, the PF driver will notify VF driver to update the
+        * PVID configuration state. The VF driver will update the PVID
+        * configuration state immediately to ensure that the VLAN process in Tx
+        * and Rx is correct. But in the window period of this state transition,
+        * packets loss or packets with wrong VLAN may occur.
+        */
+       if (hw->port_base_vlan_cfg.state != new_pvid_state) {
+               hw->port_base_vlan_cfg.state = new_pvid_state;
+               hns3_update_all_queues_pvid_proc_en(hw);
+       }
+}
+
+static void
+hns3_handle_promisc_info(struct hns3_hw *hw, uint16_t promisc_en)
+{
+       if (!promisc_en) {
+               /*
+                * When promisc/allmulti mode is closed by the hns3 PF kernel
+                * ethdev driver for untrusted, modify VF's related status.
+                */
+               hns3_warn(hw, "Promisc mode will be closed by host for being "
+                             "untrusted.");
+               hw->data->promiscuous = 0;
+               hw->data->all_multicast = 0;
+       }
+}
+
 void
 hns3_dev_handle_mbx_msg(struct hns3_hw *hw)
 {
@@ -333,6 +375,7 @@ hns3_dev_handle_mbx_msg(struct hns3_hw *hw)
        struct hns3_cmd_desc *desc;
        uint32_t msg_data;
        uint16_t *msg_q;
+       uint8_t opcode;
        uint16_t flag;
        uint8_t *temp;
        int i;
@@ -343,12 +386,13 @@ hns3_dev_handle_mbx_msg(struct hns3_hw *hw)
 
                desc = &crq->desc[crq->next_to_use];
                req = (struct hns3_mbx_pf_to_vf_cmd *)desc->data;
+               opcode = req->msg[0] & 0xff;
 
                flag = rte_le_to_cpu_16(crq->desc[crq->next_to_use].flag);
                if (unlikely(!hns3_get_bit(flag, HNS3_CMDQ_RX_OUTVLD_B))) {
                        hns3_warn(hw,
                                  "dropped invalid mailbox message, code = %d",
-                                 req->msg[0]);
+                                 opcode);
 
                        /* dropping/not processing this invalid message */
                        crq->desc[crq->next_to_use].flag = 0;
@@ -356,7 +400,7 @@ hns3_dev_handle_mbx_msg(struct hns3_hw *hw)
                        continue;
                }
 
-               switch (req->msg[0]) {
+               switch (opcode) {
                case HNS3_MBX_PF_VF_RESP:
                        resp->resp_status = hns3_resp_to_errno(req->msg[3]);
 
@@ -380,6 +424,22 @@ hns3_dev_handle_mbx_msg(struct hns3_hw *hw)
                case HNS3_MBX_PUSH_LINK_STATUS:
                        hns3_handle_link_change_event(hw, req);
                        break;
+               case HNS3_MBX_PUSH_VLAN_INFO:
+                       /*
+                        * When the PVID configuration status of VF device is
+                        * changed by the hns3 PF kernel driver, VF driver will
+                        * receive this mailbox message from PF driver.
+                        */
+                       hns3_update_port_base_vlan_info(hw, req);
+                       break;
+               case HNS3_MBX_PUSH_PROMISC_INFO:
+                       /*
+                        * When the trust status of VF device changed by the
+                        * hns3 PF kernel driver, VF driver will receive this
+                        * mailbox message from PF driver.
+                        */
+                       hns3_handle_promisc_info(hw, req->msg[1]);
+                       break;
                default:
                        hns3_err(hw,
                                 "VF received unsupported(%d) mbx msg from PF",