b27def5172
Sync some patchs from upstreaming, includind some bugfixes, hns3 pmd flow rule priority feature, hns3 pmd outer VLAN flow match feature, and support dump reigser names and filter. This patch set is modified as follows: - net/hns3: fix cannot fully use hardware flow director table - net/hns3: fix error code for repeatedly create counter - net/hns3: support flow rule priority - common/nfp: use new kvargs process API - net/tap: use new kvargs process API - net/sfc: use new kvargs process API - kvargs: rework process API - net/hns3: fix variable type - net/hns3: fix pointer offset - net/hns3: fix error log - net/hns3: support filtering registers by module names - net/hns3: support reporting names of registers - net/hns3: refactor register dump - net/hns3: remove separators between register module - net/hns3: fix dump counter of registers - net/hns3: remove some basic address dump - telemetry: register command with private argument - ethdev: fix race on ports in telemetry endpoints - ethdev: add telemetry command for registers - ethdev: add report of register names and filter - net/hns3: support outer VLAN flow match - net/hns3: register VLAN flow match mode parameter - net/hns3: support general tunnel flow match - net/hns3: restrict tunnel flow rule to one header - net/hns3: remove ROH devices - net/hns3: dump queue head and tail pointer info - dmadev: fix potential null pointer access - net/hns3: verify reset type from firmware - ethdev: verify queue ID in Tx done cleanup Signed-off-by: Dengdui Huang <huangdengdui@huawei.com> (cherry picked from commit a1c828e1eb9cf716187d2a7656023e95bdce9b55)
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From 6f09fb9ce1bccd21cfa39f0a927f05d4c0a87b70 Mon Sep 17 00:00:00 2001
|
|
From: Jie Hai <haijie1@huawei.com>
|
|
Date: Wed, 23 Oct 2024 15:12:35 +0800
|
|
Subject: [PATCH] net/hns3: fix error log
|
|
|
|
[ upstream commit f58fd22240c27ea20cf41dd2aa15810712f518bf ]
|
|
|
|
If register number obtained from firmware is different from the
|
|
register list driver hold, an error log occurs. The incorrect
|
|
use of `&&` makes this log inaccurate, change it to `&`.
|
|
|
|
Fixes: 99d3bd8b85d3 ("net/hns3: support filtering registers by module names")
|
|
|
|
Signed-off-by: Jie Hai <haijie1@huawei.com>
|
|
---
|
|
drivers/net/hns3/hns3_regs.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c
|
|
index 8148a63..def775a 100644
|
|
--- a/drivers/net/hns3/hns3_regs.c
|
|
+++ b/drivers/net/hns3/hns3_regs.c
|
|
@@ -897,7 +897,7 @@ hns3_get_name_by_module(enum hns3_reg_modules module)
|
|
size_t i;
|
|
|
|
for (i = 0; i < RTE_DIM(hns3_module_name_map); i++) {
|
|
- if (hns3_module_name_map[i].module && HNS3_MODULE_MASK(module) != 0)
|
|
+ if ((hns3_module_name_map[i].module & HNS3_MODULE_MASK(module)) != 0)
|
|
return hns3_module_name_map[i].name;
|
|
}
|
|
return "unknown";
|
|
--
|
|
2.33.0
|
|
|