* [PATCH RESEND V2 net-next 0/4] net: hns3: add support ethtool extended link state
@ 2021-08-16 2:15 Guangbin Huang
2021-08-16 2:15 ` [PATCH RESEND V2 net-next 1/4] docs: ethtool: Add two link extended substates of bad signal integrity Guangbin Huang
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Guangbin Huang @ 2021-08-16 2:15 UTC (permalink / raw)
To: davem, kuba, amitc, idosch, andrew
Cc: netdev, linux-kernel, lipeng321, huangguangbin2
This series adds support for ethtool extended link state in the HNS3
ethernet driver to add one additional information for user to know
why a link is not up.
change log:
V1 -> V2:
1. fix missing a P for "-EOPNOTSUP".
2. delete unnecessary error log of this feature is not supported by
devices of earlier version.
Guangbin Huang (4):
docs: ethtool: Add two link extended substates of bad signal integrity
ethtool: add two link extended substates of bad signal integrity
net: hns3: add header file hns3_ethtoo.h
net: hns3: add support ethtool extended link state
Documentation/networking/ethtool-netlink.rst | 8 +++
drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2 +
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 82 ++++++++++++++++++----
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.h | 31 ++++++++
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 3 +
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 24 +++++++
include/uapi/linux/ethtool.h | 2 +
7 files changed, 137 insertions(+), 15 deletions(-)
create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.h
--
2.8.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH RESEND V2 net-next 1/4] docs: ethtool: Add two link extended substates of bad signal integrity
2021-08-16 2:15 [PATCH RESEND V2 net-next 0/4] net: hns3: add support ethtool extended link state Guangbin Huang
@ 2021-08-16 2:15 ` Guangbin Huang
2021-08-16 2:15 ` [PATCH RESEND V2 net-next 2/4] ethtool: add " Guangbin Huang
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Guangbin Huang @ 2021-08-16 2:15 UTC (permalink / raw)
To: davem, kuba, amitc, idosch, andrew
Cc: netdev, linux-kernel, lipeng321, huangguangbin2
Add documentation for two bad signal integrity substates:
ETHTOOL_LINK_EXT_SUBSTATE_BSI_SERDES_REFERENCE_CLOCK_LOST
ETHTOOL_LINK_EXT_SUBSTATE_BSI_SERDES_ALOS.
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
Documentation/networking/ethtool-netlink.rst | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/Documentation/networking/ethtool-netlink.rst b/Documentation/networking/ethtool-netlink.rst
index c86628e6a235..c690bb37430d 100644
--- a/Documentation/networking/ethtool-netlink.rst
+++ b/Documentation/networking/ethtool-netlink.rst
@@ -595,6 +595,14 @@ Link extended substates:
that is not formally
supported, which led to
signal integrity issues
+
+ ``ETHTOOL_LINK_EXT_SUBSTATE_BSI_SERDES_REFERENCE_CLOCK_LOST`` The external clock signal for
+ SerDes is too weak or
+ unavailable.
+
+ ``ETHTOOL_LINK_EXT_SUBSTATE_BSI_SERDES_ALOS`` The received signal for
+ SerDes is too weak because
+ analog loss of signal.
================================================================= =============================
Cable issue substates:
--
2.8.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH RESEND V2 net-next 2/4] ethtool: add two link extended substates of bad signal integrity
2021-08-16 2:15 [PATCH RESEND V2 net-next 0/4] net: hns3: add support ethtool extended link state Guangbin Huang
2021-08-16 2:15 ` [PATCH RESEND V2 net-next 1/4] docs: ethtool: Add two link extended substates of bad signal integrity Guangbin Huang
@ 2021-08-16 2:15 ` Guangbin Huang
2021-08-16 2:15 ` [PATCH RESEND V2 net-next 3/4] net: hns3: add header file hns3_ethtoo.h Guangbin Huang
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Guangbin Huang @ 2021-08-16 2:15 UTC (permalink / raw)
To: davem, kuba, amitc, idosch, andrew
Cc: netdev, linux-kernel, lipeng321, huangguangbin2
ETHTOOL_LINK_EXT_SUBSTATE_BSI_SERDES_REFERENCE_CLOCK_LOST means the input
external clock signal for SerDes is too weak or lost.
ETHTOOL_LINK_EXT_SUBSTATE_BSI_SERDES_ALOS means the received signal for
SerDes is too weak because analog loss of signal.
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
include/uapi/linux/ethtool.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
index 67aa7134b301..b6db6590baf0 100644
--- a/include/uapi/linux/ethtool.h
+++ b/include/uapi/linux/ethtool.h
@@ -639,6 +639,8 @@ enum ethtool_link_ext_substate_link_logical_mismatch {
enum ethtool_link_ext_substate_bad_signal_integrity {
ETHTOOL_LINK_EXT_SUBSTATE_BSI_LARGE_NUMBER_OF_PHYSICAL_ERRORS = 1,
ETHTOOL_LINK_EXT_SUBSTATE_BSI_UNSUPPORTED_RATE,
+ ETHTOOL_LINK_EXT_SUBSTATE_BSI_SERDES_REFERENCE_CLOCK_LOST,
+ ETHTOOL_LINK_EXT_SUBSTATE_BSI_SERDES_ALOS,
};
/* More information in addition to ETHTOOL_LINK_EXT_STATE_CABLE_ISSUE. */
--
2.8.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH RESEND V2 net-next 3/4] net: hns3: add header file hns3_ethtoo.h
2021-08-16 2:15 [PATCH RESEND V2 net-next 0/4] net: hns3: add support ethtool extended link state Guangbin Huang
2021-08-16 2:15 ` [PATCH RESEND V2 net-next 1/4] docs: ethtool: Add two link extended substates of bad signal integrity Guangbin Huang
2021-08-16 2:15 ` [PATCH RESEND V2 net-next 2/4] ethtool: add " Guangbin Huang
@ 2021-08-16 2:15 ` Guangbin Huang
2021-08-16 2:15 ` [PATCH RESEND V2 net-next 4/4] net: hns3: add support ethtool extended link state Guangbin Huang
2021-08-17 0:20 ` [PATCH RESEND V2 net-next 0/4] " patchwork-bot+netdevbpf
4 siblings, 0 replies; 6+ messages in thread
From: Guangbin Huang @ 2021-08-16 2:15 UTC (permalink / raw)
To: davem, kuba, amitc, idosch, andrew
Cc: netdev, linux-kernel, lipeng321, huangguangbin2
Add a new file hns3_ethtool.h, and move struct type definitions from
hns3_ethtool.c to hns3_ethtool.h.
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 16 +-------------
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.h | 25 ++++++++++++++++++++++
2 files changed, 26 insertions(+), 15 deletions(-)
create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.h
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
index c8f09b07185e..167721b647ad 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
@@ -7,21 +7,7 @@
#include <linux/sfp.h>
#include "hns3_enet.h"
-
-struct hns3_stats {
- char stats_string[ETH_GSTRING_LEN];
- int stats_offset;
-};
-
-struct hns3_sfp_type {
- u8 type;
- u8 ext_type;
-};
-
-struct hns3_pflag_desc {
- char name[ETH_GSTRING_LEN];
- void (*handler)(struct net_device *netdev, bool enable);
-};
+#include "hns3_ethtool.h"
/* tqp related stats */
#define HNS3_TQP_STAT(_string, _member) { \
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.h b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.h
new file mode 100644
index 000000000000..2f186607c6e0
--- /dev/null
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.h
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+// Copyright (c) 2021 Hisilicon Limited.
+
+#ifndef __HNS3_ETHTOOL_H
+#define __HNS3_ETHTOOL_H
+
+#include <linux/ethtool.h>
+#include <linux/netdevice.h>
+
+struct hns3_stats {
+ char stats_string[ETH_GSTRING_LEN];
+ int stats_offset;
+};
+
+struct hns3_sfp_type {
+ u8 type;
+ u8 ext_type;
+};
+
+struct hns3_pflag_desc {
+ char name[ETH_GSTRING_LEN];
+ void (*handler)(struct net_device *netdev, bool enable);
+};
+
+#endif
--
2.8.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH RESEND V2 net-next 4/4] net: hns3: add support ethtool extended link state
2021-08-16 2:15 [PATCH RESEND V2 net-next 0/4] net: hns3: add support ethtool extended link state Guangbin Huang
` (2 preceding siblings ...)
2021-08-16 2:15 ` [PATCH RESEND V2 net-next 3/4] net: hns3: add header file hns3_ethtoo.h Guangbin Huang
@ 2021-08-16 2:15 ` Guangbin Huang
2021-08-17 0:20 ` [PATCH RESEND V2 net-next 0/4] " patchwork-bot+netdevbpf
4 siblings, 0 replies; 6+ messages in thread
From: Guangbin Huang @ 2021-08-16 2:15 UTC (permalink / raw)
To: davem, kuba, amitc, idosch, andrew
Cc: netdev, linux-kernel, lipeng321, huangguangbin2
In order to know the reason of link up failure, add supporting ethtool
extended link state. Driver reads the link status code from firmware if
in link down state and converts it to ethtool extended link state.
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2 +
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 66 ++++++++++++++++++++++
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.h | 6 ++
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 3 +
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 24 ++++++++
5 files changed, 101 insertions(+)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
index e0b7c3c44e7b..848bed866193 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
@@ -718,6 +718,8 @@ struct hnae3_ae_ops {
u32 nsec, u32 sec);
int (*get_ts_info)(struct hnae3_handle *handle,
struct ethtool_ts_info *info);
+ int (*get_link_diagnosis_info)(struct hnae3_handle *handle,
+ u32 *status_code);
};
struct hnae3_dcb_ops {
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
index 167721b647ad..835105015763 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
@@ -1711,6 +1711,71 @@ static int hns3_get_ts_info(struct net_device *netdev,
return ethtool_op_get_ts_info(netdev, info);
}
+static const struct hns3_ethtool_link_ext_state_mapping
+hns3_link_ext_state_map[] = {
+ {1, ETHTOOL_LINK_EXT_STATE_AUTONEG,
+ ETHTOOL_LINK_EXT_SUBSTATE_AN_NO_HCD},
+ {2, ETHTOOL_LINK_EXT_STATE_AUTONEG,
+ ETHTOOL_LINK_EXT_SUBSTATE_AN_ACK_NOT_RECEIVED},
+
+ {256, ETHTOOL_LINK_EXT_STATE_LINK_TRAINING_FAILURE,
+ ETHTOOL_LINK_EXT_SUBSTATE_LT_KR_LINK_INHIBIT_TIMEOUT},
+ {257, ETHTOOL_LINK_EXT_STATE_LINK_TRAINING_FAILURE,
+ ETHTOOL_LINK_EXT_SUBSTATE_LT_KR_LINK_PARTNER_DID_NOT_SET_RECEIVER_READY},
+ {512, ETHTOOL_LINK_EXT_STATE_LINK_TRAINING_FAILURE,
+ ETHTOOL_LINK_EXT_SUBSTATE_LT_REMOTE_FAULT},
+
+ {513, ETHTOOL_LINK_EXT_STATE_LINK_LOGICAL_MISMATCH,
+ ETHTOOL_LINK_EXT_SUBSTATE_LLM_PCS_DID_NOT_ACQUIRE_BLOCK_LOCK},
+ {514, ETHTOOL_LINK_EXT_STATE_LINK_LOGICAL_MISMATCH,
+ ETHTOOL_LINK_EXT_SUBSTATE_LLM_FC_FEC_IS_NOT_LOCKED},
+ {515, ETHTOOL_LINK_EXT_STATE_LINK_LOGICAL_MISMATCH,
+ ETHTOOL_LINK_EXT_SUBSTATE_LLM_RS_FEC_IS_NOT_LOCKED},
+
+ {768, ETHTOOL_LINK_EXT_STATE_BAD_SIGNAL_INTEGRITY,
+ ETHTOOL_LINK_EXT_SUBSTATE_BSI_LARGE_NUMBER_OF_PHYSICAL_ERRORS},
+ {769, ETHTOOL_LINK_EXT_STATE_BAD_SIGNAL_INTEGRITY,
+ ETHTOOL_LINK_EXT_SUBSTATE_BSI_SERDES_REFERENCE_CLOCK_LOST},
+ {770, ETHTOOL_LINK_EXT_STATE_BAD_SIGNAL_INTEGRITY,
+ ETHTOOL_LINK_EXT_SUBSTATE_BSI_SERDES_ALOS},
+
+ {1024, ETHTOOL_LINK_EXT_STATE_NO_CABLE, 0},
+ {1025, ETHTOOL_LINK_EXT_STATE_CABLE_ISSUE,
+ ETHTOOL_LINK_EXT_SUBSTATE_CI_UNSUPPORTED_CABLE},
+
+ {1026, ETHTOOL_LINK_EXT_STATE_EEPROM_ISSUE, 0},
+};
+
+static int hns3_get_link_ext_state(struct net_device *netdev,
+ struct ethtool_link_ext_state_info *info)
+{
+ const struct hns3_ethtool_link_ext_state_mapping *map;
+ struct hnae3_handle *h = hns3_get_handle(netdev);
+ u32 status_code, i;
+ int ret;
+
+ if (netif_carrier_ok(netdev))
+ return -ENODATA;
+
+ if (!h->ae_algo->ops->get_link_diagnosis_info)
+ return -EOPNOTSUPP;
+
+ ret = h->ae_algo->ops->get_link_diagnosis_info(h, &status_code);
+ if (ret)
+ return ret;
+
+ for (i = 0; i < ARRAY_SIZE(hns3_link_ext_state_map); i++) {
+ map = &hns3_link_ext_state_map[i];
+ if (map->status_code == status_code) {
+ info->link_ext_state = map->link_ext_state;
+ info->__link_ext_substate = map->link_ext_substate;
+ return 0;
+ }
+ }
+
+ return -ENODATA;
+}
+
static const struct ethtool_ops hns3vf_ethtool_ops = {
.supported_coalesce_params = HNS3_ETHTOOL_COALESCE,
.get_drvinfo = hns3_get_drvinfo,
@@ -1782,6 +1847,7 @@ static const struct ethtool_ops hns3_ethtool_ops = {
.get_tunable = hns3_get_tunable,
.set_tunable = hns3_set_tunable,
.reset = hns3_set_reset,
+ .get_link_ext_state = hns3_get_link_ext_state,
};
void hns3_ethtool_set_ops(struct net_device *netdev)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.h b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.h
index 2f186607c6e0..822d6fcbc73b 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.h
@@ -22,4 +22,10 @@ struct hns3_pflag_desc {
void (*handler)(struct net_device *netdev, bool enable);
};
+struct hns3_ethtool_link_ext_state_mapping {
+ u32 status_code;
+ enum ethtool_link_ext_state link_ext_state;
+ u8 link_ext_substate;
+};
+
#endif
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h
index 18bde77ef944..8e5be127909b 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h
@@ -316,6 +316,9 @@ enum hclge_opcode_type {
/* PHY command */
HCLGE_OPC_PHY_LINK_KSETTING = 0x7025,
HCLGE_OPC_PHY_REG = 0x7026,
+
+ /* Query link diagnosis info command */
+ HCLGE_OPC_QUERY_LINK_DIAGNOSIS = 0x702A,
};
#define HCLGE_TQP_REG_OFFSET 0x80000
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 9fd15287986f..8779a63d51b3 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -12843,6 +12843,29 @@ static int hclge_get_module_eeprom(struct hnae3_handle *handle, u32 offset,
return 0;
}
+static int hclge_get_link_diagnosis_info(struct hnae3_handle *handle,
+ u32 *status_code)
+{
+ struct hclge_vport *vport = hclge_get_vport(handle);
+ struct hclge_dev *hdev = vport->back;
+ struct hclge_desc desc;
+ int ret;
+
+ if (hdev->ae_dev->dev_version <= HNAE3_DEVICE_VERSION_V2)
+ return -EOPNOTSUPP;
+
+ hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_QUERY_LINK_DIAGNOSIS, true);
+ ret = hclge_cmd_send(&hdev->hw, &desc, 1);
+ if (ret) {
+ dev_err(&hdev->pdev->dev,
+ "failed to query link diagnosis info, ret = %d\n", ret);
+ return ret;
+ }
+
+ *status_code = le32_to_cpu(desc.data[0]);
+ return 0;
+}
+
static const struct hnae3_ae_ops hclge_ops = {
.init_ae_dev = hclge_init_ae_dev,
.uninit_ae_dev = hclge_uninit_ae_dev,
@@ -12943,6 +12966,7 @@ static const struct hnae3_ae_ops hclge_ops = {
.set_tx_hwts_info = hclge_ptp_set_tx_info,
.get_rx_hwts = hclge_ptp_get_rx_hwts,
.get_ts_info = hclge_ptp_get_ts_info,
+ .get_link_diagnosis_info = hclge_get_link_diagnosis_info,
};
static struct hnae3_ae_algo ae_algo = {
--
2.8.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH RESEND V2 net-next 0/4] net: hns3: add support ethtool extended link state
2021-08-16 2:15 [PATCH RESEND V2 net-next 0/4] net: hns3: add support ethtool extended link state Guangbin Huang
` (3 preceding siblings ...)
2021-08-16 2:15 ` [PATCH RESEND V2 net-next 4/4] net: hns3: add support ethtool extended link state Guangbin Huang
@ 2021-08-17 0:20 ` patchwork-bot+netdevbpf
4 siblings, 0 replies; 6+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-08-17 0:20 UTC (permalink / raw)
To: Guangbin Huang
Cc: davem, kuba, amitc, idosch, andrew, netdev, linux-kernel, lipeng321
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
On Mon, 16 Aug 2021 10:15:25 +0800 you wrote:
> This series adds support for ethtool extended link state in the HNS3
> ethernet driver to add one additional information for user to know
> why a link is not up.
>
> change log:
> V1 -> V2:
> 1. fix missing a P for "-EOPNOTSUP".
> 2. delete unnecessary error log of this feature is not supported by
> devices of earlier version.
>
> [...]
Here is the summary with links:
- [RESEND,V2,net-next,1/4] docs: ethtool: Add two link extended substates of bad signal integrity
https://git.kernel.org/netdev/net-next/c/958ab281eb3e
- [RESEND,V2,net-next,2/4] ethtool: add two link extended substates of bad signal integrity
https://git.kernel.org/netdev/net-next/c/5b4ecc3d4c4a
- [RESEND,V2,net-next,3/4] net: hns3: add header file hns3_ethtoo.h
https://git.kernel.org/netdev/net-next/c/edb40bbc17eb
- [RESEND,V2,net-next,4/4] net: hns3: add support ethtool extended link state
https://git.kernel.org/netdev/net-next/c/f5c2b9f0fc07
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-08-17 0:20 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-16 2:15 [PATCH RESEND V2 net-next 0/4] net: hns3: add support ethtool extended link state Guangbin Huang
2021-08-16 2:15 ` [PATCH RESEND V2 net-next 1/4] docs: ethtool: Add two link extended substates of bad signal integrity Guangbin Huang
2021-08-16 2:15 ` [PATCH RESEND V2 net-next 2/4] ethtool: add " Guangbin Huang
2021-08-16 2:15 ` [PATCH RESEND V2 net-next 3/4] net: hns3: add header file hns3_ethtoo.h Guangbin Huang
2021-08-16 2:15 ` [PATCH RESEND V2 net-next 4/4] net: hns3: add support ethtool extended link state Guangbin Huang
2021-08-17 0:20 ` [PATCH RESEND V2 net-next 0/4] " patchwork-bot+netdevbpf
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).