net/hns3: fix mailbox error message

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

diff --git a/drivers/net/hns3/hns3_dcb.c b/drivers/net/hns3/hns3_dcb.c
index 7fc6ac9..30e59e8 100644 (file)
--- a/drivers/net/hns3/hns3_dcb.c
+++ b/drivers/net/hns3/hns3_dcb.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2018-2019 Hisilicon Limited.
+ * Copyright(c) 2018-2021 HiSilicon Limited.
  */
 
 #include <rte_io.h>
@@ -330,8 +330,8 @@ hns3_dcb_get_shapping_para(uint8_t ir_b, uint8_t ir_u, uint8_t ir_s,
        return shapping_para;
 }
 
-int
-hns3_dcb_port_shaper_cfg(struct hns3_hw *hw)
+static int
+hns3_dcb_port_shaper_cfg(struct hns3_hw *hw, uint32_t speed)
 {
        struct hns3_port_shapping_cmd *shap_cfg_cmd;
        struct hns3_shaper_parameter shaper_parameter;
@@ -340,7 +340,7 @@ hns3_dcb_port_shaper_cfg(struct hns3_hw *hw)
        struct hns3_cmd_desc desc;
        int ret;
 
-       ret = hns3_shaper_para_calc(hw, hw->mac.link_speed,
+       ret = hns3_shaper_para_calc(hw, speed,
                                    HNS3_SHAPER_LVL_PORT, &shaper_parameter);
        if (ret) {
                hns3_err(hw, "calculate shaper parameter failed: %d", ret);
@@ -366,12 +366,24 @@ hns3_dcb_port_shaper_cfg(struct hns3_hw *hw)
         * depends on the firmware version. But driver still needs to
         * calculate it and configure to firmware for better compatibility.
         */
-       shap_cfg_cmd->port_rate = rte_cpu_to_le_32(hw->mac.link_speed);
+       shap_cfg_cmd->port_rate = rte_cpu_to_le_32(speed);
        hns3_set_bit(shap_cfg_cmd->flag, HNS3_TM_RATE_VLD_B, 1);
 
        return hns3_cmd_send(hw, &desc, 1);
 }
 
+int
+hns3_port_shaper_update(struct hns3_hw *hw, uint32_t speed)
+{
+       int ret;
+
+       ret = hns3_dcb_port_shaper_cfg(hw, speed);
+       if (ret)
+               hns3_err(hw, "configure port shappering failed: ret = %d", ret);
+
+       return ret;
+}
+
 static int
 hns3_dcb_pg_shapping_cfg(struct hns3_hw *hw, enum hns3_shap_bucket bucket,
                         uint8_t pg_id, uint32_t shapping_para, uint32_t rate)
@@ -961,7 +973,7 @@ hns3_dcb_shaper_cfg(struct hns3_hw *hw)
 {
        int ret;
 
-       ret = hns3_dcb_port_shaper_cfg(hw);
+       ret = hns3_dcb_port_shaper_cfg(hw, hw->mac.link_speed);
        if (ret) {
                hns3_err(hw, "config port shaper failed: %d", ret);
                return ret;
@@ -1226,7 +1238,7 @@ hns3_qs_bp_cfg(struct hns3_hw *hw, uint8_t tc, uint8_t grp_id, uint32_t bit_map)
 static void
 hns3_get_rx_tx_en_status(struct hns3_hw *hw, bool *tx_en, bool *rx_en)
 {
-       switch (hw->current_mode) {
+       switch (hw->requested_fc_mode) {
        case HNS3_FC_NONE:
                *tx_en = false;
                *rx_en = false;
@@ -1403,7 +1415,7 @@ hns3_dcb_cfg_validate(struct hns3_adapter *hns, uint8_t *tc, bool *changed)
         * We ensure that dcb information can be reconfigured
         * after the hns3_priority_flow_ctrl_set function called.
         */
-       if (hw->current_mode != HNS3_FC_FULL)
+       if (hw->requested_fc_mode != HNS3_FC_FULL)
                *changed = true;
        pfc_en = RTE_LEN2MASK((uint8_t)dcb_rx_conf->nb_tcs, uint8_t);
        if (hw->dcb_info.pfc_en != pfc_en)
@@ -1517,7 +1529,7 @@ hns3_dcb_hw_configure(struct hns3_adapter *hns)
        struct hns3_pf *pf = &hns->pf;
        struct hns3_hw *hw = &hns->hw;
        enum hns3_fc_status fc_status = hw->current_fc_status;
-       enum hns3_fc_mode current_mode = hw->current_mode;
+       enum hns3_fc_mode requested_fc_mode = hw->requested_fc_mode;
        uint8_t hw_pfc_map = hw->dcb_info.hw_pfc_map;
        int ret, status;
 
@@ -1547,7 +1559,7 @@ hns3_dcb_hw_configure(struct hns3_adapter *hns)
                        return ret;
 
                hw->current_fc_status = HNS3_FC_STATUS_PFC;
-               hw->current_mode = HNS3_FC_FULL;
+               hw->requested_fc_mode = HNS3_FC_FULL;
                ret = hns3_dcb_pause_setup_hw(hw);
                if (ret) {
                        hns3_err(hw, "setup pfc failed! ret = %d", ret);
@@ -1568,7 +1580,7 @@ hns3_dcb_hw_configure(struct hns3_adapter *hns)
        return 0;
 
 pfc_setup_fail:
-       hw->current_mode = current_mode;
+       hw->requested_fc_mode = requested_fc_mode;
        hw->current_fc_status = fc_status;
        hw->dcb_info.hw_pfc_map = hw_pfc_map;
        status = hns3_buffer_alloc(hw);
@@ -1647,8 +1659,7 @@ hns3_dcb_init(struct hns3_hw *hw)
         * will be changed.
         */
        if (hw->adapter_state == HNS3_NIC_UNINITIALIZED) {
-               hw->requested_mode = HNS3_FC_NONE;
-               hw->current_mode = hw->requested_mode;
+               hw->requested_fc_mode = HNS3_FC_NONE;
                pf->pause_time = HNS3_DEFAULT_PAUSE_TRANS_TIME;
                hw->current_fc_status = HNS3_FC_STATUS_NONE;
 
@@ -1749,7 +1760,6 @@ hns3_dcb_pfc_enable(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);
        enum hns3_fc_status fc_status = hw->current_fc_status;
-       enum hns3_fc_mode current_mode = hw->current_mode;
        uint8_t hw_pfc_map = hw->dcb_info.hw_pfc_map;
        uint8_t pfc_en = hw->dcb_info.pfc_en;
        uint8_t priority = pfc_conf->priority;
@@ -1757,7 +1767,6 @@ hns3_dcb_pfc_enable(struct rte_eth_dev *dev, struct rte_eth_pfc_conf *pfc_conf)
        int ret, status;
 
        pf->pause_time = pfc_conf->fc.pause_time;
-       hw->current_mode = hw->requested_mode;
        hw->current_fc_status = HNS3_FC_STATUS_PFC;
        hw->dcb_info.pfc_en |= BIT(priority);
        hw->dcb_info.hw_pfc_map =
@@ -1768,7 +1777,7 @@ hns3_dcb_pfc_enable(struct rte_eth_dev *dev, struct rte_eth_pfc_conf *pfc_conf)
 
        /*
         * The flow control mode of all UPs will be changed based on
-        * current_mode coming from user.
+        * requested_fc_mode coming from user.
         */
        ret = hns3_dcb_pause_setup_hw(hw);
        if (ret) {
@@ -1779,7 +1788,6 @@ hns3_dcb_pfc_enable(struct rte_eth_dev *dev, struct rte_eth_pfc_conf *pfc_conf)
        return 0;
 
 pfc_setup_fail:
-       hw->current_mode = current_mode;
        hw->current_fc_status = fc_status;
        pf->pause_time = pause_time;
        hw->dcb_info.pfc_en = pfc_en;
@@ -1803,18 +1811,16 @@ hns3_fc_enable(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);
        enum hns3_fc_status fc_status = hw->current_fc_status;
-       enum hns3_fc_mode current_mode = hw->current_mode;
        uint16_t pause_time = pf->pause_time;
        int ret;
 
        pf->pause_time = fc_conf->pause_time;
-       hw->current_mode = hw->requested_mode;
 
        /*
         * In fact, current_fc_status is HNS3_FC_STATUS_NONE when mode
         * of flow control is configured to be HNS3_FC_NONE.
         */
-       if (hw->current_mode == HNS3_FC_NONE)
+       if (hw->requested_fc_mode == HNS3_FC_NONE)
                hw->current_fc_status = HNS3_FC_STATUS_NONE;
        else
                hw->current_fc_status = HNS3_FC_STATUS_MAC_PAUSE;
@@ -1828,7 +1834,6 @@ hns3_fc_enable(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
        return 0;
 
 setup_fc_fail:
-       hw->current_mode = current_mode;
        hw->current_fc_status = fc_status;
        pf->pause_time = pause_time;