net/hns3: fix flow control mode

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

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 0240d66..cd6b159 100644 (file)
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -2310,11 +2310,11 @@ hns3_bind_ring_with_vector(struct hns3_hw *hw, uint16_t vector_id, bool en,
        struct hns3_cmd_desc desc;
        struct hns3_ctrl_vector_chain_cmd *req =
                (struct hns3_ctrl_vector_chain_cmd *)desc.data;
-       enum hns3_cmd_status status;
        enum hns3_opcode_type op;
        uint16_t tqp_type_and_id = 0;
        uint16_t type;
        uint16_t gl;
+       int ret;
 
        op = en ? HNS3_OPC_ADD_RING_TO_VECTOR : HNS3_OPC_DEL_RING_TO_VECTOR;
        hns3_cmd_setup_basic_desc(&desc, op, false);
@@ -2337,11 +2337,11 @@ hns3_bind_ring_with_vector(struct hns3_hw *hw, uint16_t vector_id, bool en,
                       gl);
        req->tqp_type_and_id[0] = rte_cpu_to_le_16(tqp_type_and_id);
        req->int_cause_num = 1;
-       status = hns3_cmd_send(hw, &desc, 1);
-       if (status) {
-               hns3_err(hw, "%s TQP %u fail, vector_id is %u, status is %d.",
-                        en ? "Map" : "Unmap", queue_id, vector_id, status);
-               return status;
+       ret = hns3_cmd_send(hw, &desc, 1);
+       if (ret) {
+               hns3_err(hw, "%s TQP %u fail, vector_id = %u, ret = %d.",
+                        en ? "Map" : "Unmap", queue_id, vector_id, ret);
+               return ret;
        }
 
        return 0;
@@ -4612,7 +4612,10 @@ hns3_update_fiber_link_info(struct hns3_hw *hw)
 static void
 hns3_parse_copper_phy_params(struct hns3_cmd_desc *desc, struct hns3_mac *mac)
 {
+#define HNS3_PHY_SUPPORTED_SPEED_MASK   0x2f
+
        struct hns3_phy_params_bd0_cmd *req;
+       uint32_t supported;
 
        req = (struct hns3_phy_params_bd0_cmd *)desc[0].data;
        mac->link_speed = rte_le_to_cpu_32(req->speed);
@@ -4620,11 +4623,11 @@ hns3_parse_copper_phy_params(struct hns3_cmd_desc *desc, struct hns3_mac *mac)
                                           HNS3_PHY_DUPLEX_CFG_B);
        mac->link_autoneg = hns3_get_bit(req->autoneg,
                                           HNS3_PHY_AUTONEG_CFG_B);
-       mac->supported_capa = rte_le_to_cpu_32(req->supported);
        mac->advertising = rte_le_to_cpu_32(req->advertising);
        mac->lp_advertising = rte_le_to_cpu_32(req->lp_advertising);
-       mac->support_autoneg = !!(mac->supported_capa &
-                               HNS3_PHY_LINK_MODE_AUTONEG_BIT);
+       supported = rte_le_to_cpu_32(req->supported);
+       mac->supported_speed = supported & HNS3_PHY_SUPPORTED_SPEED_MASK;
+       mac->support_autoneg = !!(supported & HNS3_PHY_LINK_MODE_AUTONEG_BIT);
 }
 
 static int
@@ -4673,7 +4676,7 @@ hns3_update_copper_link_info(struct hns3_hw *hw)
        mac->link_speed = mac_info.link_speed;
        mac->link_duplex = mac_info.link_duplex;
        mac->link_autoneg = mac_info.link_autoneg;
-       mac->supported_capa = mac_info.supported_capa;
+       mac->supported_speed = mac_info.supported_speed;
        mac->advertising = mac_info.advertising;
        mac->lp_advertising = mac_info.lp_advertising;
        mac->support_autoneg = mac_info.support_autoneg;
@@ -5009,7 +5012,7 @@ hns3_init_pf(struct rte_eth_dev *eth_dev)
        ret = hns3_update_imissed_stats(hw, true);
        if (ret) {
                hns3_err(hw, "clear imissed stats failed, ret = %d", ret);
-               return ret;
+               goto err_cmd_init;
        }
 
        hns3_config_all_msix_error(hw, true);
@@ -5493,8 +5496,11 @@ hns3_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
 
        fc_conf->pause_time = pf->pause_time;
 
-       /* return fc current mode */
-       switch (hw->current_mode) {
+       /*
+        * If fc auto-negotiation is not supported, the configured fc mode
+        * from user is the current fc mode.
+        */
+       switch (hw->requested_fc_mode) {
        case HNS3_FC_FULL:
                fc_conf->mode = RTE_FC_FULL;
                break;
@@ -5518,19 +5524,19 @@ hns3_get_fc_mode(struct hns3_hw *hw, enum rte_eth_fc_mode mode)
 {
        switch (mode) {
        case RTE_FC_NONE:
-               hw->requested_mode = HNS3_FC_NONE;
+               hw->requested_fc_mode = HNS3_FC_NONE;
                break;
        case RTE_FC_RX_PAUSE:
-               hw->requested_mode = HNS3_FC_RX_PAUSE;
+               hw->requested_fc_mode = HNS3_FC_RX_PAUSE;
                break;
        case RTE_FC_TX_PAUSE:
-               hw->requested_mode = HNS3_FC_TX_PAUSE;
+               hw->requested_fc_mode = HNS3_FC_TX_PAUSE;
                break;
        case RTE_FC_FULL:
-               hw->requested_mode = HNS3_FC_FULL;
+               hw->requested_fc_mode = HNS3_FC_FULL;
                break;
        default:
-               hw->requested_mode = HNS3_FC_NONE;
+               hw->requested_fc_mode = HNS3_FC_NONE;
                hns3_warn(hw, "fc_mode(%u) exceeds member scope and is "
                          "configured to RTE_FC_NONE", mode);
                break;
@@ -5541,7 +5547,6 @@ static int
 hns3_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
 {
        struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-       struct hns3_pf *pf = HNS3_DEV_PRIVATE_TO_PF(dev->data->dev_private);
        int ret;
 
        if (fc_conf->high_water || fc_conf->low_water ||
@@ -5576,9 +5581,6 @@ hns3_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
        }
 
        hns3_get_fc_mode(hw, fc_conf->mode);
-       if (hw->requested_mode == hw->current_mode &&
-           pf->pause_time == fc_conf->pause_time)
-               return 0;
 
        rte_spinlock_lock(&hw->lock);
        ret = hns3_fc_enable(dev, fc_conf);
@@ -5592,8 +5594,6 @@ hns3_priority_flow_ctrl_set(struct rte_eth_dev *dev,
                            struct rte_eth_pfc_conf *pfc_conf)
 {
        struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-       struct hns3_pf *pf = HNS3_DEV_PRIVATE_TO_PF(dev->data->dev_private);
-       uint8_t priority;
        int ret;
 
        if (!hns3_dev_dcb_supported(hw)) {
@@ -5628,12 +5628,7 @@ hns3_priority_flow_ctrl_set(struct rte_eth_dev *dev,
                return -EOPNOTSUPP;
        }
 
-       priority = pfc_conf->priority;
        hns3_get_fc_mode(hw, pfc_conf->fc.mode);
-       if (hw->dcb_info.pfc_en & BIT(priority) &&
-           hw->requested_mode == hw->current_mode &&
-           pfc_conf->fc.pause_time == pf->pause_time)
-               return 0;
 
        rte_spinlock_lock(&hw->lock);
        ret = hns3_dcb_pfc_enable(dev, pfc_conf);
@@ -6433,11 +6428,16 @@ hns3_fec_set(struct rte_eth_dev *dev, uint32_t mode)
                return -EINVAL;
        }
 
+       rte_spinlock_lock(&hw->lock);
        ret = hns3_set_fec_hw(hw, mode);
-       if (ret)
+       if (ret) {
+               rte_spinlock_unlock(&hw->lock);
                return ret;
+       }
 
        pf->fec_mode = mode;
+       rte_spinlock_unlock(&hw->lock);
+
        return 0;
 }