From: Dongdong Liu <liudongdong3@huawei.com>
To: <dev@dpdk.org>, <ferruh.yigit@amd.com>, <thomas@monjalon.net>,
<andrew.rybchenko@oktetlabs.ru>
Cc: <stable@dpdk.org>, <liudongdong3@huawei.com>,
<haijie1@huawei.com>, Yisen Zhuang <yisen.zhuang@huawei.com>
Subject: [PATCH 6/7] net/hns3: add LLRS FEC mode support for 200G ports
Date: Sat, 8 Apr 2023 10:27:38 +0800 [thread overview]
Message-ID: <20230408022740.14522-7-liudongdong3@huawei.com> (raw)
In-Reply-To: <20230408022740.14522-1-liudongdong3@huawei.com>
From: Jie Hai <haijie1@huawei.com>
This patch supports the query and configuration of LLRS FEC mode.
Signed-off-by: Jie Hai <haijie1@huawei.com>
Signed-off-by: Dongdong Liu <liudongdong3@huawei.com>
---
drivers/net/hns3/hns3_cmd.c | 1 +
drivers/net/hns3/hns3_cmd.h | 2 ++
drivers/net/hns3/hns3_ethdev.c | 21 ++++++++++++---------
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/drivers/net/hns3/hns3_cmd.c b/drivers/net/hns3/hns3_cmd.c
index bdfc85f934..a574191ba9 100644
--- a/drivers/net/hns3/hns3_cmd.c
+++ b/drivers/net/hns3/hns3_cmd.c
@@ -637,6 +637,7 @@ hns3_firmware_compat_config(struct hns3_hw *hw, bool is_init)
if (is_init) {
hns3_set_bit(compat, HNS3_LINK_EVENT_REPORT_EN_B, 1);
hns3_set_bit(compat, HNS3_NCSI_ERROR_REPORT_EN_B, 0);
+ hns3_set_bit(compat, HNS3_LLRS_FEC_EN_B, 1);
if (hns3_dev_get_support(hw, COPPER))
hns3_set_bit(compat, HNS3_FIRMWARE_PHY_DRIVER_EN_B, 1);
}
diff --git a/drivers/net/hns3/hns3_cmd.h b/drivers/net/hns3/hns3_cmd.h
index eb394c9dec..a86f5116e4 100644
--- a/drivers/net/hns3/hns3_cmd.h
+++ b/drivers/net/hns3/hns3_cmd.h
@@ -665,6 +665,7 @@ enum hns3_promisc_type {
#define HNS3_LINK_EVENT_REPORT_EN_B 0
#define HNS3_NCSI_ERROR_REPORT_EN_B 1
#define HNS3_FIRMWARE_PHY_DRIVER_EN_B 2
+#define HNS3_LLRS_FEC_EN_B 5
struct hns3_firmware_compat_cmd {
uint32_t compat;
uint8_t rsv[20];
@@ -806,6 +807,7 @@ struct hns3_sfp_info_cmd {
#define HNS3_MAC_FEC_OFF 0
#define HNS3_MAC_FEC_BASER 1
#define HNS3_MAC_FEC_RS 2
+#define HNS3_MAC_FEC_LLRS 3
/* Configure FEC mode, opcode:0x031A */
struct hns3_config_fec_cmd {
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 80cdcc83bf..8f998947c6 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -47,11 +47,6 @@
#define HNS3_RESET_WAIT_MS 100
#define HNS3_RESET_WAIT_CNT 200
-/* FEC mode order defined in HNS3 hardware */
-#define HNS3_HW_FEC_MODE_NOFEC 0
-#define HNS3_HW_FEC_MODE_BASER 1
-#define HNS3_HW_FEC_MODE_RS 2
-
enum hns3_evt_cause {
HNS3_VECTOR0_EVENT_RST,
HNS3_VECTOR0_EVENT_MBX,
@@ -91,7 +86,8 @@ static const struct rte_eth_fec_capa speed_fec_capa_tbl[] = {
RTE_ETH_FEC_MODE_CAPA_MASK(RS) },
{ RTE_ETH_SPEED_NUM_200G, RTE_ETH_FEC_MODE_CAPA_MASK(AUTO) |
- RTE_ETH_FEC_MODE_CAPA_MASK(RS) }
+ RTE_ETH_FEC_MODE_CAPA_MASK(RS) |
+ RTE_ETH_FEC_MODE_CAPA_MASK(LLRS) }
};
static enum hns3_reset_level hns3_get_reset_level(struct hns3_adapter *hns,
@@ -6059,15 +6055,18 @@ hns3_fec_get_internal(struct hns3_hw *hw, uint32_t *fec_capa)
* to be converted.
*/
switch (resp->active_fec) {
- case HNS3_HW_FEC_MODE_NOFEC:
+ case HNS3_MAC_FEC_OFF:
tmp_fec_capa = RTE_ETH_FEC_MODE_CAPA_MASK(NOFEC);
break;
- case HNS3_HW_FEC_MODE_BASER:
+ case HNS3_MAC_FEC_BASER:
tmp_fec_capa = RTE_ETH_FEC_MODE_CAPA_MASK(BASER);
break;
- case HNS3_HW_FEC_MODE_RS:
+ case HNS3_MAC_FEC_RS:
tmp_fec_capa = RTE_ETH_FEC_MODE_CAPA_MASK(RS);
break;
+ case HNS3_MAC_FEC_LLRS:
+ tmp_fec_capa = RTE_ETH_FEC_MODE_CAPA_MASK(LLRS);
+ break;
default:
tmp_fec_capa = RTE_ETH_FEC_MODE_CAPA_MASK(NOFEC);
break;
@@ -6108,6 +6107,10 @@ hns3_set_fec_hw(struct hns3_hw *hw, uint32_t mode)
hns3_set_field(req->fec_mode, HNS3_MAC_CFG_FEC_MODE_M,
HNS3_MAC_CFG_FEC_MODE_S, HNS3_MAC_FEC_RS);
break;
+ case RTE_ETH_FEC_MODE_CAPA_MASK(LLRS):
+ hns3_set_field(req->fec_mode, HNS3_MAC_CFG_FEC_MODE_M,
+ HNS3_MAC_CFG_FEC_MODE_S, HNS3_MAC_FEC_LLRS);
+ break;
case RTE_ETH_FEC_MODE_CAPA_MASK(AUTO):
hns3_set_bit(req->fec_mode, HNS3_MAC_CFG_FEC_AUTO_EN_B, 1);
break;
--
2.22.0
next prev parent reply other threads:[~2023-04-08 2:30 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-08 2:27 [PATCH 0/7] add setting and querying of LLRS FEC mode Dongdong Liu
2023-04-08 2:27 ` [PATCH 1/7] net/hns3: fix fec mode for 200G ports Dongdong Liu
2023-04-08 2:27 ` [PATCH 2/7] net/hns3: fix fec mode check error Dongdong Liu
2023-04-08 2:27 ` [PATCH 3/7] net/hns3: fix missing FEC capability Dongdong Liu
2023-04-08 2:27 ` [PATCH 4/7] ethdev: introduce low latency RS FEC Dongdong Liu
2023-06-01 8:30 ` Ferruh Yigit
2023-04-08 2:27 ` [PATCH 5/7] app/testpmd: add setting and querying of LLRS FEC mode Dongdong Liu
2023-04-28 6:50 ` Singh, Aman Deep
2023-04-08 2:27 ` Dongdong Liu [this message]
2023-04-08 2:27 ` [PATCH 7/7] net/hns3: support getting current FEC capability from firmware Dongdong Liu
2023-06-01 8:30 ` [PATCH 0/7] add setting and querying of LLRS FEC mode Ferruh Yigit
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=20230408022740.14522-7-liudongdong3@huawei.com \
--to=liudongdong3@huawei.com \
--cc=andrew.rybchenko@oktetlabs.ru \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@amd.com \
--cc=haijie1@huawei.com \
--cc=stable@dpdk.org \
--cc=thomas@monjalon.net \
--cc=yisen.zhuang@huawei.com \
/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).