90 lines
3.2 KiB
Diff
90 lines
3.2 KiB
Diff
From cfcca4d7c0378e05efb0d33a5f9e5af32e76194c Mon Sep 17 00:00:00 2001
|
|
From: Peng Li <lipeng321@huawei.com>
|
|
Date: Sat, 24 Jul 2021 15:43:23 +0800
|
|
Subject: [PATCH 040/283] net: hns3: remove the shaper param magic number
|
|
|
|
mainline inclusion
|
|
from mainline-v5.12-rc1-dontuse
|
|
commit 9d2a1cea6997ecd4f05833dfffb9907ffaa41bf5
|
|
category: feature
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8EMQV
|
|
CVE: NA
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9d2a1cea6997ecd4f05833dfffb9907ffaa41bf5
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
To make the code more readable, this patch adds a definition for
|
|
the magic number 126 used for the default shaper param ir_b, and
|
|
rename macro DIVISOR_IR_B_126.
|
|
|
|
No functional change.
|
|
|
|
Signed-off-by: Peng Li <lipeng321@huawei.com>
|
|
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Reviewed-by: Yongxin Li <liyongxin1@huawei.com>
|
|
Signed-off-by: Junxin Chen <chenjunxin1@huawei.com>
|
|
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
|
|
Signed-off-by: Xiaodong Li <lixiaodong67@huawei.com>
|
|
---
|
|
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 14 ++++++++------
|
|
1 file changed, 8 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c
|
|
index b3564e38eba0..14e8a93bdc31 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c
|
|
@@ -42,8 +42,9 @@ enum hclge_shaper_level {
|
|
static int hclge_shaper_para_calc(u32 ir, u8 shaper_level,
|
|
struct hclge_shaper_ir_para *ir_para)
|
|
{
|
|
+#define DEFAULT_SHAPER_IR_B 126
|
|
#define DIVISOR_CLK (1000 * 8)
|
|
-#define DIVISOR_IR_B_126 (126 * DIVISOR_CLK)
|
|
+#define DEFAULT_DIVISOR_IR_B (DEFAULT_SHAPER_IR_B * DIVISOR_CLK)
|
|
|
|
static const u16 tick_array[HCLGE_SHAPER_LVL_CNT] = {
|
|
6 * 256, /* Prioriy level */
|
|
@@ -70,10 +71,10 @@ static int hclge_shaper_para_calc(u32 ir, u8 shaper_level,
|
|
* ir_calc = ---------------- * 1000
|
|
* tick * 1
|
|
*/
|
|
- ir_calc = (DIVISOR_IR_B_126 + (tick >> 1) - 1) / tick;
|
|
+ ir_calc = (DEFAULT_DIVISOR_IR_B + (tick >> 1) - 1) / tick;
|
|
|
|
if (ir_calc == ir) {
|
|
- ir_para->ir_b = 126;
|
|
+ ir_para->ir_b = DEFAULT_SHAPER_IR_B;
|
|
ir_para->ir_u = 0;
|
|
ir_para->ir_s = 0;
|
|
|
|
@@ -82,7 +83,8 @@ static int hclge_shaper_para_calc(u32 ir, u8 shaper_level,
|
|
/* Increasing the denominator to select ir_s value */
|
|
while (ir_calc >= ir && ir) {
|
|
ir_s_calc++;
|
|
- ir_calc = DIVISOR_IR_B_126 / (tick * (1 << ir_s_calc));
|
|
+ ir_calc = DEFAULT_DIVISOR_IR_B /
|
|
+ (tick * (1 << ir_s_calc));
|
|
}
|
|
ir_para->ir_b = (ir * tick * (1 << ir_s_calc) +
|
|
(DIVISOR_CLK >> 1)) / DIVISOR_CLK;
|
|
@@ -93,12 +95,12 @@ static int hclge_shaper_para_calc(u32 ir, u8 shaper_level,
|
|
|
|
while (ir_calc < ir) {
|
|
ir_u_calc++;
|
|
- numerator = DIVISOR_IR_B_126 * (1 << ir_u_calc);
|
|
+ numerator = DEFAULT_DIVISOR_IR_B * (1 << ir_u_calc);
|
|
ir_calc = (numerator + (tick >> 1)) / tick;
|
|
}
|
|
|
|
if (ir_calc == ir) {
|
|
- ir_para->ir_b = 126;
|
|
+ ir_para->ir_b = DEFAULT_SHAPER_IR_B;
|
|
} else {
|
|
u32 denominator = DIVISOR_CLK * (1 << --ir_u_calc);
|
|
ir_para->ir_b = (ir * tick + (denominator >> 1)) /
|
|
--
|
|
2.34.1
|
|
|