DPDK patches and discussions
 help / color / mirror / Atom feed
From: Lijun Ou <oulijun@huawei.com>
To: <ferruh.yigit@intel.com>
Cc: <dev@dpdk.org>, <linuxarm@openeuler.org>
Subject: [dpdk-dev] [PATCH 07/17] net/hns3: encapsulate a port shaping interface
Date: Wed, 3 Feb 2021 15:46:12 +0800	[thread overview]
Message-ID: <1612338382-3253-8-git-send-email-oulijun@huawei.com> (raw)
In-Reply-To: <1612338382-3253-1-git-send-email-oulijun@huawei.com>

From: Huisong Li <lihuisong@huawei.com>

When rate of port changes, the rate limit of the port needs to
be updated. So it is necessary to encapsulate an interface that
configures the rate limit based on the rate.

Signed-off-by: Huisong Li <lihuisong@huawei.com>
Signed-off-by: Lijun Ou <oulijun@huawei.com>
---
 drivers/net/hns3/hns3_dcb.c    | 22 +++++++++++++++++-----
 drivers/net/hns3/hns3_dcb.h    |  2 +-
 drivers/net/hns3/hns3_ethdev.c | 10 +++-------
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/drivers/net/hns3/hns3_dcb.c b/drivers/net/hns3/hns3_dcb.c
index 5aa374c..4fe5956 100644
--- a/drivers/net/hns3/hns3_dcb.c
+++ b/drivers/net/hns3/hns3_dcb.c
@@ -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;
diff --git a/drivers/net/hns3/hns3_dcb.h b/drivers/net/hns3/hns3_dcb.h
index 8248434..0d25d3b 100644
--- a/drivers/net/hns3/hns3_dcb.h
+++ b/drivers/net/hns3/hns3_dcb.h
@@ -208,7 +208,7 @@ int hns3_queue_to_tc_mapping(struct hns3_hw *hw, uint16_t nb_rx_q,
 			     uint16_t nb_tx_q);
 
 int hns3_dcb_cfg_update(struct hns3_adapter *hns);
-int hns3_dcb_port_shaper_cfg(struct hns3_hw *hw);
+int hns3_port_shaper_update(struct hns3_hw *hw, uint32_t speed);
 int hns3_pg_shaper_rate_cfg(struct hns3_hw *hw, uint8_t pg_id, uint32_t rate);
 int hns3_pri_shaper_rate_cfg(struct hns3_hw *hw, uint8_t tc_no, uint32_t rate);
 uint8_t hns3_txq_mapped_tc_get(struct hns3_hw *hw, uint16_t txq_no);
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 3706e05..cf7d0aa 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -4363,7 +4363,6 @@ static int
 hns3_cfg_mac_speed_dup(struct hns3_hw *hw, uint32_t speed, uint8_t duplex)
 {
 	struct hns3_mac *mac = &hw->mac;
-	uint32_t cur_speed = mac->link_speed;
 	int ret;
 
 	duplex = hns3_check_speed_dup(duplex, speed);
@@ -4374,14 +4373,11 @@ hns3_cfg_mac_speed_dup(struct hns3_hw *hw, uint32_t speed, uint8_t duplex)
 	if (ret)
 		return ret;
 
-	mac->link_speed = speed;
-	ret = hns3_dcb_port_shaper_cfg(hw);
-	if (ret) {
-		hns3_err(hw, "failed to configure port shaper, ret = %d.", ret);
-		mac->link_speed = cur_speed;
+	ret = hns3_port_shaper_update(hw, speed);
+	if (ret)
 		return ret;
-	}
 
+	mac->link_speed = speed;
 	mac->link_duplex = duplex;
 
 	return 0;
-- 
2.7.4


  parent reply	other threads:[~2021-02-03  7:48 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-03  7:46 [dpdk-dev] [PATCH 00/17] bugfixes and small functionality for hns3 Lijun Ou
2021-02-03  7:46 ` [dpdk-dev] [PATCH 01/17] net/hns3: support module EEPROM dump Lijun Ou
2021-02-03  7:46 ` [dpdk-dev] [PATCH 02/17] net/hns3: add more registers to dump Lijun Ou
2021-02-03  7:46 ` [dpdk-dev] [PATCH 03/17] net/hns3: implement cleanup for Tx done Lijun Ou
2021-02-03  7:46 ` [dpdk-dev] [PATCH 04/17] net/hns3: add enhance stats function Lijun Ou
2021-02-03  7:46 ` [dpdk-dev] [PATCH 05/17] net/hns3: fix query order of link status and link info Lijun Ou
2021-02-03  7:46 ` [dpdk-dev] [PATCH 06/17] net/hns3: fix link status change from firmware Lijun Ou
2021-02-03  7:46 ` Lijun Ou [this message]
2021-02-03  7:46 ` [dpdk-dev] [PATCH 08/17] net/hns3: support PF on electrical net device Lijun Ou
2021-02-03  7:46 ` [dpdk-dev] [PATCH 09/17] net/hns3: fix RSS indirection table size Lijun Ou
2021-02-03  7:46 ` [dpdk-dev] [PATCH 10/17] net/hns3: constraint TM peak rate Lijun Ou
2021-02-03  7:46 ` [dpdk-dev] [PATCH 11/17] net/hns3: remove MPLS type from supported flow items Lijun Ou
2021-02-03  7:46 ` [dpdk-dev] [PATCH 12/17] net/hns3: fix stats flip overflow Lijun Ou
2021-02-03  7:46 ` [dpdk-dev] [PATCH 13/17] net/hns3: replace all atomic type with C11 atomic builtins Lijun Ou
2021-02-03  7:46 ` [dpdk-dev] [PATCH 14/17] net/hns3: fix FD rule residue in hardware when malloc fail Lijun Ou
2021-02-03  7:46 ` [dpdk-dev] [PATCH 15/17] net/hns3: fix cmdq cleared during firmware process Lijun Ou
2021-02-03  7:46 ` [dpdk-dev] [PATCH 16/17] net/hns3: fix VF reset after MBX failed Lijun Ou
2021-02-03  7:46 ` [dpdk-dev] [PATCH 17/17] net/hns3: add check for max pkt length of Rx Lijun Ou
2021-02-03  9:24 ` [dpdk-dev] [PATCH 00/17] bugfixes and small functionality for hns3 Ferruh Yigit
2021-02-03 11:05   ` oulijun
2021-02-03 11:46     ` Ferruh Yigit
2021-02-03 12:18       ` oulijun

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1612338382-3253-8-git-send-email-oulijun@huawei.com \
    --to=oulijun@huawei.com \
    --cc=dev@dpdk.org \
    --cc=ferruh.yigit@intel.com \
    --cc=linuxarm@openeuler.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).