net/hns3: query basic info for VF

There are some features of VF depend on PF, so it's necessary for VF
to know whether current PF supports. Therefore, the final capability
set of VF will be composed of the capability set of hardware and the
capability set of PF.

For compatibility reasons, the mailbox HNS3_MBX_GET_TCINFO has been
modified to obatin more basic information about the current PF, including
the communication interface version and current PF capabilities set.

Signed-off-by: Chengchang Tang <tangchengchang@huawei.com>
Signed-off-by: Min Hu (Connor) <humin29@huawei.com>

diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
index 87baa3c6c524aa20e2cb6574c1be777859616db7..a9a199a7e2a996091d0cd9d0f5f1c2523fd57e73 100644 (file)
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -488,6 +488,7 @@ struct hns3_hw {
        struct hns3_rx_missed_stats imissed_stats;
        uint64_t oerror_stats;
        uint32_t fw_version;
+       uint16_t pf_vf_if_version;  /* version of communication interface */
 
        uint16_t num_msi;
        uint16_t total_tqps_num;    /* total task queue pairs of this PF */

diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
index e582503f529b68d08a1c1f07af74d5305e864d09..dc95e719307cf2d69e98814f486cb730bb240c06 100644 (file)
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -1409,26 +1409,38 @@ hns3vf_get_queue_depth(struct hns3_hw *hw)
 }
 
 static int
-hns3vf_get_tc_info(struct hns3_hw *hw)
+hns3vf_get_num_tc(struct hns3_hw *hw)
 {
-       uint8_t resp_msg;
-       int ret;
+       uint8_t num_tc = 0;
        uint32_t i;
 
-       ret = hns3_send_mbx_msg(hw, HNS3_MBX_GET_TCINFO, 0, NULL, 0,
-                               true, &resp_msg, sizeof(resp_msg));
+       for (i = 0; i < HNS3_MAX_TC_NUM; i++) {
+               if (hw->hw_tc_map & BIT(i))
+                       num_tc++;
+       }
+       return num_tc;
+}
+
+static int
+hns3vf_get_basic_info(struct hns3_hw *hw)
+{
+       uint8_t resp_msg[HNS3_MBX_MAX_RESP_DATA_SIZE];
+       struct hns3_basic_info *basic_info;
+       int ret;
+
+       ret = hns3_send_mbx_msg(hw, HNS3_MBX_GET_BASIC_INFO, 0, NULL, 0,
+                               true, resp_msg, sizeof(resp_msg));
        if (ret) {
-               hns3_err(hw, "VF request to get TC info from PF failed %d",
-                        ret);
+               hns3_err(hw, "failed to get basic info from PF, ret = %d.",
+                               ret);
                return ret;
        }
 
-       hw->hw_tc_map = resp_msg;
+       basic_info = (struct hns3_basic_info *)resp_msg;
+       hw->hw_tc_map = basic_info->hw_tc_map;
+       hw->num_tc = hns3vf_get_num_tc(hw);
+       hw->pf_vf_if_version = basic_info->pf_vf_if_version;
 
-       for (i = 0; i < HNS3_MAX_TC_NUM; i++) {
-               if (hw->hw_tc_map & BIT(i))
-                       hw->num_tc++;
-       }
 
        return 0;
 }
@@ -1468,6 +1480,11 @@ hns3vf_get_configuration(struct hns3_hw *hw)
 
        hns3vf_get_push_lsc_cap(hw);
 
+       /* Get basic info from PF */
+       ret = hns3vf_get_basic_info(hw);
+       if (ret)
+               return ret;
+
        /* Get queue configuration from PF */
        ret = hns3vf_get_queue_info(hw);
        if (ret)
@@ -1483,12 +1500,7 @@ hns3vf_get_configuration(struct hns3_hw *hw)
        if (ret)
                return ret;
 
-       ret = hns3vf_get_port_base_vlan_filter_state(hw);
-       if (ret)
-               return ret;
-
-       /* Get tc configuration from PF */
-       return hns3vf_get_tc_info(hw);
+       return hns3vf_get_port_base_vlan_filter_state(hw);
 }
 
 static int

diff --git a/drivers/net/hns3/hns3_mbx.h b/drivers/net/hns3/hns3_mbx.h
index 86d32e654bd29a390d7a73b67a5693ceb4b8e2a6..f07dbe3e55c8d776c13743bdbc8a411f0549667f 100644 (file)
--- a/drivers/net/hns3/hns3_mbx.h
+++ b/drivers/net/hns3/hns3_mbx.h
@@ -18,7 +18,7 @@ enum HNS3_MBX_OPCODE {
        HNS3_MBX_API_NEGOTIATE,         /* (VF -> PF) negotiate API version */
        HNS3_MBX_GET_QINFO,             /* (VF -> PF) get queue config */
        HNS3_MBX_GET_QDEPTH,            /* (VF -> PF) get queue depth */
-       HNS3_MBX_GET_TCINFO,            /* (VF -> PF) get TC config */
+       HNS3_MBX_GET_BASIC_INFO,        /* (VF -> PF) get basic info */
        HNS3_MBX_GET_RETA,              /* (VF -> PF) get RETA */
        HNS3_MBX_GET_RSS_KEY,           /* (VF -> PF) get RSS key */
        HNS3_MBX_GET_MAC_ADDR,          /* (VF -> PF) get MAC addr */
@@ -47,6 +47,14 @@ enum HNS3_MBX_OPCODE {
        HNS3_MBX_PUSH_LINK_STATUS = 201, /* (IMP -> PF) get port link status */
 };
 
+struct hns3_basic_info {
+       uint8_t hw_tc_map;
+       uint8_t rsv;
+       uint16_t pf_vf_if_version;
+       /* capabilities of VF dependent on PF */
+       uint32_t caps;
+};
+
 /* below are per-VF mac-vlan subcodes */
 enum hns3_mbx_mac_vlan_subcode {
        HNS3_MBX_MAC_VLAN_UC_MODIFY = 0,        /* modify UC mac addr */