788 lines
27 KiB
Diff
788 lines
27 KiB
Diff
From 2de748113445fa1321d5c04ea5a7cd8daf506b3a Mon Sep 17 00:00:00 2001
|
|
From: Danielle Ratson <danieller@nvidia.com>
|
|
Date: Tue, 2 Feb 2021 20:06:06 +0200
|
|
Subject: [PATCH 223/283] ethtool: Extend link modes settings uAPI with lanes
|
|
|
|
mainline inclusion
|
|
from mainline-v5.12-rc1-dontuse
|
|
commit 012ce4dd3102a0f4d80167de343e9d44b257c1b8
|
|
category: feature
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8EN49
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=012ce4dd3102a0f4d80167de343e9d44b257c1b8
|
|
|
|
--------------------------------
|
|
|
|
Currently, when auto negotiation is on, the user can advertise all the
|
|
linkmodes which correspond to a specific speed, but does not have a
|
|
similar selector for the number of lanes. This is significant when a
|
|
specific speed can be achieved using different number of lanes. For
|
|
example, 2x50 or 4x25.
|
|
|
|
Add 'ETHTOOL_A_LINKMODES_LANES' attribute and expand 'struct
|
|
ethtool_link_settings' with lanes field in order to implement a new
|
|
lanes-selector that will enable the user to advertise a specific number
|
|
of lanes as well.
|
|
|
|
When auto negotiation is off, lanes parameter can be forced only if the
|
|
driver supports it. Add a capability bit in 'struct ethtool_ops' that
|
|
allows ethtool know if the driver can handle the lanes parameter when
|
|
auto negotiation is off, so if it does not, an error message will be
|
|
returned when trying to set lanes.
|
|
|
|
Example:
|
|
|
|
$ ethtool -s swp1 lanes 4
|
|
$ ethtool swp1
|
|
Settings for swp1:
|
|
Supported ports: [ FIBRE ]
|
|
Supported link modes: 1000baseKX/Full
|
|
10000baseKR/Full
|
|
40000baseCR4/Full
|
|
40000baseSR4/Full
|
|
40000baseLR4/Full
|
|
25000baseCR/Full
|
|
25000baseSR/Full
|
|
50000baseCR2/Full
|
|
100000baseSR4/Full
|
|
100000baseCR4/Full
|
|
Supported pause frame use: Symmetric Receive-only
|
|
Supports auto-negotiation: Yes
|
|
Supported FEC modes: Not reported
|
|
Advertised link modes: 40000baseCR4/Full
|
|
40000baseSR4/Full
|
|
40000baseLR4/Full
|
|
100000baseSR4/Full
|
|
100000baseCR4/Full
|
|
Advertised pause frame use: No
|
|
Advertised auto-negotiation: Yes
|
|
Advertised FEC modes: Not reported
|
|
Speed: Unknown!
|
|
Duplex: Unknown! (255)
|
|
Auto-negotiation: on
|
|
Port: Direct Attach Copper
|
|
PHYAD: 0
|
|
Transceiver: internal
|
|
Link detected: no
|
|
|
|
Signed-off-by: Danielle Ratson <danieller@nvidia.com>
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
Signed-off-by: Xiaodong Li <lixiaodong67@huawei.com>
|
|
|
|
Conflicts:
|
|
Documentation/networking/ethtool-netlink.rst
|
|
include/linux/ethtool.h
|
|
include/uapi/linux/ethtool_netlink.h
|
|
net/ethtool/linkmodes.c
|
|
net/ethtool/netlink.h
|
|
---
|
|
Documentation/networking/ethtool-netlink.rst | 26 +
|
|
include/linux/ethtool.h | 7 +-
|
|
include/net/netlink.h | 6 +
|
|
include/uapi/linux/ethtool.h | 17 +
|
|
include/uapi/linux/ethtool_netlink.h | 3 +
|
|
net/ethtool/Makefile | 2 +-
|
|
net/ethtool/linkmodes.c | 512 +++++++++++++++++++
|
|
net/ethtool/netlink.h | 2 +
|
|
8 files changed, 573 insertions(+), 2 deletions(-)
|
|
create mode 100644 net/ethtool/linkmodes.c
|
|
|
|
diff --git a/Documentation/networking/ethtool-netlink.rst b/Documentation/networking/ethtool-netlink.rst
|
|
index 1cf07b28382d..18109dfc26e7 100644
|
|
--- a/Documentation/networking/ethtool-netlink.rst
|
|
+++ b/Documentation/networking/ethtool-netlink.rst
|
|
@@ -218,6 +218,32 @@ an ``ACT_REPLY`` message. Performing an action also triggers a notification
|
|
|
|
Later sections describe the format and semantics of these messages.
|
|
|
|
+LINKMODES_SET
|
|
+=============
|
|
+
|
|
+Request contents:
|
|
+
|
|
+ ========================================== ====== ==========================
|
|
+ ``ETHTOOL_A_LINKMODES_HEADER`` nested request header
|
|
+ ``ETHTOOL_A_LINKMODES_AUTONEG`` u8 autonegotiation status
|
|
+ ``ETHTOOL_A_LINKMODES_OURS`` bitset advertised link modes
|
|
+ ``ETHTOOL_A_LINKMODES_PEER`` bitset partner link modes
|
|
+ ``ETHTOOL_A_LINKMODES_SPEED`` u32 link speed (Mb/s)
|
|
+ ``ETHTOOL_A_LINKMODES_DUPLEX`` u8 duplex mode
|
|
+ ``ETHTOOL_A_LINKMODES_MASTER_SLAVE_CFG`` u8 Master/slave port mode
|
|
+ ``ETHTOOL_A_LINKMODES_LANES`` u32 lanes
|
|
+ ========================================== ====== ==========================
|
|
+
|
|
+``ETHTOOL_A_LINKMODES_OURS`` bit set allows setting advertised link modes. If
|
|
+autonegotiation is on (either set now or kept from before), advertised modes
|
|
+are not changed (no ``ETHTOOL_A_LINKMODES_OURS`` attribute) and at least one
|
|
+of speed, duplex and lanes is specified, kernel adjusts advertised modes to all
|
|
+supported modes matching speed, duplex, lanes or all (whatever is specified).
|
|
+This autoselection is done on ethtool side with ioctl interface, netlink
|
|
+interface is supposed to allow requesting changes without knowing what exactly
|
|
+kernel supports.
|
|
+
|
|
+
|
|
RINGS_GET
|
|
=========
|
|
|
|
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
|
|
index c51da6a2c1de..1b0afcdaf34e 100644
|
|
--- a/include/linux/ethtool.h
|
|
+++ b/include/linux/ethtool.h
|
|
@@ -130,9 +130,10 @@ static inline u32 ethtool_rxfh_indir_default(u32 index, u32 n_rx_rings)
|
|
return index % n_rx_rings;
|
|
}
|
|
|
|
-/* number of link mode bits/ulongs handled internally by kernel */
|
|
+#ifdef __GENKSYMS__
|
|
#define __ETHTOOL_LINK_MODE_MASK_NBITS \
|
|
(__ETHTOOL_LINK_MODE_LAST + 1)
|
|
+#endif
|
|
|
|
/* declare a link mode bitmap */
|
|
#define __ETHTOOL_DECLARE_LINK_MODE_MASK(name) \
|
|
@@ -148,6 +149,7 @@ struct ethtool_link_ksettings {
|
|
__ETHTOOL_DECLARE_LINK_MODE_MASK(advertising);
|
|
__ETHTOOL_DECLARE_LINK_MODE_MASK(lp_advertising);
|
|
} link_modes;
|
|
+ u32 lanes;
|
|
};
|
|
|
|
/**
|
|
@@ -249,6 +251,8 @@ bool ethtool_convert_link_mode_to_legacy_u32(u32 *legacy_u32,
|
|
(ETHTOOL_COALESCE_USE_ADAPTIVE_RX | ETHTOOL_COALESCE_USE_ADAPTIVE_TX)
|
|
/**
|
|
* struct ethtool_ops - optional netdev operations
|
|
+ * @cap_link_lanes_supported: indicates if the driver supports lanes
|
|
+ * parameter.
|
|
* @supported_coalesce_params: supported types of interrupt coalescing.
|
|
* @supported_ring_params: supported ring params.
|
|
* @get_drvinfo: Report driver/device information. Should only set the
|
|
@@ -392,6 +396,7 @@ bool ethtool_convert_link_mode_to_legacy_u32(u32 *legacy_u32,
|
|
*/
|
|
struct ethtool_ops {
|
|
#ifndef __GENKSYMS__
|
|
+ u32 cap_link_lanes_supported:1;
|
|
u32 supported_coalesce_params;
|
|
u32 supported_ring_params;
|
|
#endif
|
|
diff --git a/include/net/netlink.h b/include/net/netlink.h
|
|
index f30598d66eec..849a0ef9f695 100644
|
|
--- a/include/net/netlink.h
|
|
+++ b/include/net/netlink.h
|
|
@@ -272,6 +272,12 @@ struct nla_policy {
|
|
tp == NLA_MSECS || \
|
|
tp == NLA_BINARY) + tp)
|
|
|
|
+#define NLA_POLICY_RANGE(tp, _min, _max) { \
|
|
+ .type = NLA_ENSURE_INT_OR_BINARY_TYPE(tp), \
|
|
+ .validation_type = NLA_VALIDATE_RANGE, \
|
|
+ .min = _min, \
|
|
+ .max = _max \
|
|
+}
|
|
|
|
#define NLA_POLICY_MIN(tp, _min) { \
|
|
.type = NLA_ENSURE_INT_OR_BINARY_TYPE(tp), \
|
|
diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
|
|
index da4258a5f8c2..4f19dca5fcfa 100644
|
|
--- a/include/uapi/linux/ethtool.h
|
|
+++ b/include/uapi/linux/ethtool.h
|
|
@@ -1629,9 +1629,12 @@ enum ethtool_link_mode_bit_indices {
|
|
* macro for bits > 31. The only way to use indices > 31 is to
|
|
* use the new ETHTOOL_GLINKSETTINGS/ETHTOOL_SLINKSETTINGS API.
|
|
*/
|
|
+#ifndef __GENKSYMS__
|
|
__ETHTOOL_LINK_MODE_MASK_NBITS,
|
|
+#else
|
|
__ETHTOOL_LINK_MODE_LAST
|
|
= ETHTOOL_LINK_MODE_FEC_BASER_BIT,
|
|
+#endif
|
|
};
|
|
|
|
#define __ETHTOOL_LINK_MODE_LEGACY_MASK(base_name) \
|
|
@@ -1739,6 +1742,8 @@ enum ethtool_link_mode_bit_indices {
|
|
#define SPEED_50000 50000
|
|
#define SPEED_56000 56000
|
|
#define SPEED_100000 100000
|
|
+#define SPEED_200000 200000
|
|
+#define SPEED_400000 400000
|
|
|
|
#define SPEED_UNKNOWN -1
|
|
|
|
@@ -1764,6 +1769,18 @@ static inline int ethtool_validate_duplex(__u8 duplex)
|
|
return 0;
|
|
}
|
|
|
|
+#define MASTER_SLAVE_CFG_UNSUPPORTED 0
|
|
+#define MASTER_SLAVE_CFG_UNKNOWN 1
|
|
+#define MASTER_SLAVE_CFG_MASTER_PREFERRED 2
|
|
+#define MASTER_SLAVE_CFG_SLAVE_PREFERRED 3
|
|
+#define MASTER_SLAVE_CFG_MASTER_FORCE 4
|
|
+#define MASTER_SLAVE_CFG_SLAVE_FORCE 5
|
|
+#define MASTER_SLAVE_STATE_UNSUPPORTED 0
|
|
+#define MASTER_SLAVE_STATE_UNKNOWN 1
|
|
+#define MASTER_SLAVE_STATE_MASTER 2
|
|
+#define MASTER_SLAVE_STATE_SLAVE 3
|
|
+#define MASTER_SLAVE_STATE_ERR 4
|
|
+
|
|
/* Which connector port. */
|
|
#define PORT_TP 0x00
|
|
#define PORT_AUI 0x01
|
|
diff --git a/include/uapi/linux/ethtool_netlink.h b/include/uapi/linux/ethtool_netlink.h
|
|
index 4eed3507a005..0c03f091574f 100644
|
|
--- a/include/uapi/linux/ethtool_netlink.h
|
|
+++ b/include/uapi/linux/ethtool_netlink.h
|
|
@@ -197,6 +197,9 @@ enum {
|
|
ETHTOOL_A_LINKMODES_PEER, /* bitset */
|
|
ETHTOOL_A_LINKMODES_SPEED, /* u32 */
|
|
ETHTOOL_A_LINKMODES_DUPLEX, /* u8 */
|
|
+ ETHTOOL_A_LINKMODES_MASTER_SLAVE_CFG, /* u8 */
|
|
+ ETHTOOL_A_LINKMODES_MASTER_SLAVE_STATE, /* u8 */
|
|
+ ETHTOOL_A_LINKMODES_LANES, /* u32 */
|
|
|
|
/* add new constants above here */
|
|
__ETHTOOL_A_LINKMODES_CNT,
|
|
diff --git a/net/ethtool/Makefile b/net/ethtool/Makefile
|
|
index 6f1cdf8a57b3..685d55945c99 100644
|
|
--- a/net/ethtool/Makefile
|
|
+++ b/net/ethtool/Makefile
|
|
@@ -4,4 +4,4 @@ obj-y += ioctl.o common.o
|
|
|
|
obj-$(CONFIG_ETHTOOL_NETLINK) += ethtool_nl.o
|
|
|
|
-ethtool_nl-y := netlink.o rings.o
|
|
+ethtool_nl-y := netlink.o rings.o linkmodes.o
|
|
diff --git a/net/ethtool/linkmodes.c b/net/ethtool/linkmodes.c
|
|
new file mode 100644
|
|
index 000000000000..b632e14d6c27
|
|
--- /dev/null
|
|
+++ b/net/ethtool/linkmodes.c
|
|
@@ -0,0 +1,512 @@
|
|
+// SPDX-License-Identifier: GPL-2.0-only
|
|
+
|
|
+#include "netlink.h"
|
|
+#include "common.h"
|
|
+#include "bitset.h"
|
|
+
|
|
+struct linkmodes_req_info {
|
|
+ struct ethnl_req_info base;
|
|
+};
|
|
+
|
|
+struct linkmodes_reply_data {
|
|
+ struct ethnl_reply_data base;
|
|
+ struct ethtool_link_ksettings ksettings;
|
|
+ struct ethtool_link_settings *lsettings;
|
|
+ bool peer_empty;
|
|
+};
|
|
+
|
|
+#define LINKMODES_REPDATA(__reply_base) \
|
|
+ container_of(__reply_base, struct linkmodes_reply_data, base)
|
|
+
|
|
+const struct nla_policy ethnl_linkmodes_get_policy[] = {
|
|
+ [ETHTOOL_A_LINKMODES_HEADER] =
|
|
+ NLA_POLICY_NESTED(ethnl_header_policy),
|
|
+};
|
|
+
|
|
+static int linkmodes_prepare_data(const struct ethnl_req_info *req_base,
|
|
+ struct ethnl_reply_data *reply_base,
|
|
+ struct genl_info *info)
|
|
+{
|
|
+ struct linkmodes_reply_data *data = LINKMODES_REPDATA(reply_base);
|
|
+ struct net_device *dev = reply_base->dev;
|
|
+ int ret;
|
|
+
|
|
+ data->lsettings = &data->ksettings.base;
|
|
+
|
|
+ ret = ethnl_ops_begin(dev);
|
|
+ if (ret < 0)
|
|
+ return ret;
|
|
+
|
|
+ ret = __ethtool_get_link_ksettings(dev, &data->ksettings);
|
|
+ if (ret < 0 && info) {
|
|
+ GENL_SET_ERR_MSG(info, "failed to retrieve link settings");
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
+ data->peer_empty =
|
|
+ bitmap_empty(data->ksettings.link_modes.lp_advertising,
|
|
+ __ETHTOOL_LINK_MODE_MASK_NBITS);
|
|
+
|
|
+out:
|
|
+ ethnl_ops_complete(dev);
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+static int linkmodes_reply_size(const struct ethnl_req_info *req_base,
|
|
+ const struct ethnl_reply_data *reply_base)
|
|
+{
|
|
+ const struct linkmodes_reply_data *data = LINKMODES_REPDATA(reply_base);
|
|
+ const struct ethtool_link_ksettings *ksettings = &data->ksettings;
|
|
+ const struct ethtool_link_settings *lsettings = &ksettings->base;
|
|
+ bool compact = req_base->flags & ETHTOOL_FLAG_COMPACT_BITSETS;
|
|
+ int len, ret;
|
|
+
|
|
+ len = nla_total_size(sizeof(u8)) /* LINKMODES_AUTONEG */
|
|
+ + nla_total_size(sizeof(u32)) /* LINKMODES_SPEED */
|
|
+ + nla_total_size(sizeof(u8)) /* LINKMODES_DUPLEX */
|
|
+ + 0;
|
|
+ ret = ethnl_bitset_size(ksettings->link_modes.advertising,
|
|
+ ksettings->link_modes.supported,
|
|
+ __ETHTOOL_LINK_MODE_MASK_NBITS,
|
|
+ link_mode_names, compact);
|
|
+ if (ret < 0)
|
|
+ return ret;
|
|
+ len += ret;
|
|
+ if (!data->peer_empty) {
|
|
+ ret = ethnl_bitset_size(ksettings->link_modes.lp_advertising,
|
|
+ NULL, __ETHTOOL_LINK_MODE_MASK_NBITS,
|
|
+ link_mode_names, compact);
|
|
+ if (ret < 0)
|
|
+ return ret;
|
|
+ len += ret;
|
|
+ }
|
|
+
|
|
+ if (lsettings->master_slave_cfg != MASTER_SLAVE_CFG_UNSUPPORTED)
|
|
+ len += nla_total_size(sizeof(u8));
|
|
+
|
|
+ if (lsettings->master_slave_state != MASTER_SLAVE_STATE_UNSUPPORTED)
|
|
+ len += nla_total_size(sizeof(u8));
|
|
+
|
|
+ return len;
|
|
+}
|
|
+
|
|
+static int linkmodes_fill_reply(struct sk_buff *skb,
|
|
+ const struct ethnl_req_info *req_base,
|
|
+ const struct ethnl_reply_data *reply_base)
|
|
+{
|
|
+ const struct linkmodes_reply_data *data = LINKMODES_REPDATA(reply_base);
|
|
+ const struct ethtool_link_ksettings *ksettings = &data->ksettings;
|
|
+ const struct ethtool_link_settings *lsettings = &ksettings->base;
|
|
+ bool compact = req_base->flags & ETHTOOL_FLAG_COMPACT_BITSETS;
|
|
+ int ret;
|
|
+
|
|
+ if (nla_put_u8(skb, ETHTOOL_A_LINKMODES_AUTONEG, lsettings->autoneg))
|
|
+ return -EMSGSIZE;
|
|
+
|
|
+ ret = ethnl_put_bitset(skb, ETHTOOL_A_LINKMODES_OURS,
|
|
+ ksettings->link_modes.advertising,
|
|
+ ksettings->link_modes.supported,
|
|
+ __ETHTOOL_LINK_MODE_MASK_NBITS, link_mode_names,
|
|
+ compact);
|
|
+ if (ret < 0)
|
|
+ return -EMSGSIZE;
|
|
+ if (!data->peer_empty) {
|
|
+ ret = ethnl_put_bitset(skb, ETHTOOL_A_LINKMODES_PEER,
|
|
+ ksettings->link_modes.lp_advertising,
|
|
+ NULL, __ETHTOOL_LINK_MODE_MASK_NBITS,
|
|
+ link_mode_names, compact);
|
|
+ if (ret < 0)
|
|
+ return -EMSGSIZE;
|
|
+ }
|
|
+
|
|
+ if (nla_put_u32(skb, ETHTOOL_A_LINKMODES_SPEED, lsettings->speed) ||
|
|
+ nla_put_u8(skb, ETHTOOL_A_LINKMODES_DUPLEX, lsettings->duplex))
|
|
+ return -EMSGSIZE;
|
|
+
|
|
+ if (lsettings->master_slave_cfg != MASTER_SLAVE_CFG_UNSUPPORTED &&
|
|
+ nla_put_u8(skb, ETHTOOL_A_LINKMODES_MASTER_SLAVE_CFG,
|
|
+ lsettings->master_slave_cfg))
|
|
+ return -EMSGSIZE;
|
|
+
|
|
+ if (lsettings->master_slave_state != MASTER_SLAVE_STATE_UNSUPPORTED &&
|
|
+ nla_put_u8(skb, ETHTOOL_A_LINKMODES_MASTER_SLAVE_STATE,
|
|
+ lsettings->master_slave_state))
|
|
+ return -EMSGSIZE;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+const struct ethnl_request_ops ethnl_linkmodes_request_ops = {
|
|
+ .request_cmd = ETHTOOL_MSG_LINKMODES_GET,
|
|
+ .reply_cmd = ETHTOOL_MSG_LINKMODES_GET_REPLY,
|
|
+ .hdr_attr = ETHTOOL_A_LINKMODES_HEADER,
|
|
+ .req_info_size = sizeof(struct linkmodes_req_info),
|
|
+ .reply_data_size = sizeof(struct linkmodes_reply_data),
|
|
+
|
|
+ .prepare_data = linkmodes_prepare_data,
|
|
+ .reply_size = linkmodes_reply_size,
|
|
+ .fill_reply = linkmodes_fill_reply,
|
|
+};
|
|
+
|
|
+/* LINKMODES_SET */
|
|
+
|
|
+struct link_mode_info {
|
|
+ int speed;
|
|
+ u8 lanes;
|
|
+ u8 duplex;
|
|
+};
|
|
+
|
|
+#define __LINK_MODE_LANES_CR 1
|
|
+#define __LINK_MODE_LANES_CR2 2
|
|
+#define __LINK_MODE_LANES_CR4 4
|
|
+#define __LINK_MODE_LANES_CR8 8
|
|
+#define __LINK_MODE_LANES_DR 1
|
|
+#define __LINK_MODE_LANES_DR2 2
|
|
+#define __LINK_MODE_LANES_DR4 4
|
|
+#define __LINK_MODE_LANES_DR8 8
|
|
+#define __LINK_MODE_LANES_KR 1
|
|
+#define __LINK_MODE_LANES_KR2 2
|
|
+#define __LINK_MODE_LANES_KR4 4
|
|
+#define __LINK_MODE_LANES_KR8 8
|
|
+#define __LINK_MODE_LANES_SR 1
|
|
+#define __LINK_MODE_LANES_SR2 2
|
|
+#define __LINK_MODE_LANES_SR4 4
|
|
+#define __LINK_MODE_LANES_SR8 8
|
|
+#define __LINK_MODE_LANES_ER 1
|
|
+#define __LINK_MODE_LANES_KX 1
|
|
+#define __LINK_MODE_LANES_KX4 4
|
|
+#define __LINK_MODE_LANES_LR 1
|
|
+#define __LINK_MODE_LANES_LR4 4
|
|
+#define __LINK_MODE_LANES_LR4_ER4 4
|
|
+#define __LINK_MODE_LANES_LR_ER_FR 1
|
|
+#define __LINK_MODE_LANES_LR2_ER2_FR2 2
|
|
+#define __LINK_MODE_LANES_LR4_ER4_FR4 4
|
|
+#define __LINK_MODE_LANES_LR8_ER8_FR8 8
|
|
+#define __LINK_MODE_LANES_LRM 1
|
|
+#define __LINK_MODE_LANES_MLD2 2
|
|
+#define __LINK_MODE_LANES_T 1
|
|
+#define __LINK_MODE_LANES_T1 1
|
|
+#define __LINK_MODE_LANES_X 1
|
|
+#define __LINK_MODE_LANES_FX 1
|
|
+
|
|
+#define __DEFINE_LINK_MODE_PARAMS(_speed, _type, _duplex) \
|
|
+ [ETHTOOL_LINK_MODE(_speed, _type, _duplex)] = { \
|
|
+ .speed = SPEED_ ## _speed, \
|
|
+ .lanes = __LINK_MODE_LANES_ ## _type, \
|
|
+ .duplex = __DUPLEX_ ## _duplex \
|
|
+ }
|
|
+#define __DUPLEX_Half DUPLEX_HALF
|
|
+#define __DUPLEX_Full DUPLEX_FULL
|
|
+#define __DEFINE_SPECIAL_MODE_PARAMS(_mode) \
|
|
+ [ETHTOOL_LINK_MODE_ ## _mode ## _BIT] = { \
|
|
+ .speed = SPEED_UNKNOWN, \
|
|
+ .lanes = 0, \
|
|
+ .duplex = DUPLEX_UNKNOWN, \
|
|
+ }
|
|
+
|
|
+static const struct link_mode_info link_mode_params[] = {
|
|
+ __DEFINE_LINK_MODE_PARAMS(10, T, Half),
|
|
+ __DEFINE_LINK_MODE_PARAMS(10, T, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(100, T, Half),
|
|
+ __DEFINE_LINK_MODE_PARAMS(100, T, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(1000, T, Half),
|
|
+ __DEFINE_LINK_MODE_PARAMS(1000, T, Full),
|
|
+ __DEFINE_SPECIAL_MODE_PARAMS(Autoneg),
|
|
+ __DEFINE_SPECIAL_MODE_PARAMS(TP),
|
|
+ __DEFINE_SPECIAL_MODE_PARAMS(AUI),
|
|
+ __DEFINE_SPECIAL_MODE_PARAMS(MII),
|
|
+ __DEFINE_SPECIAL_MODE_PARAMS(FIBRE),
|
|
+ __DEFINE_SPECIAL_MODE_PARAMS(BNC),
|
|
+ __DEFINE_LINK_MODE_PARAMS(10000, T, Full),
|
|
+ __DEFINE_SPECIAL_MODE_PARAMS(Pause),
|
|
+ __DEFINE_SPECIAL_MODE_PARAMS(Asym_Pause),
|
|
+ __DEFINE_LINK_MODE_PARAMS(2500, X, Full),
|
|
+ __DEFINE_SPECIAL_MODE_PARAMS(Backplane),
|
|
+ __DEFINE_LINK_MODE_PARAMS(1000, KX, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(10000, KX4, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(10000, KR, Full),
|
|
+ [ETHTOOL_LINK_MODE_10000baseR_FEC_BIT] = {
|
|
+ .speed = SPEED_10000,
|
|
+ .duplex = DUPLEX_FULL,
|
|
+ },
|
|
+ __DEFINE_LINK_MODE_PARAMS(20000, MLD2, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(20000, KR2, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(40000, KR4, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(40000, CR4, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(40000, SR4, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(40000, LR4, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(56000, KR4, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(56000, CR4, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(56000, SR4, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(56000, LR4, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(25000, CR, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(25000, KR, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(25000, SR, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(50000, CR2, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(50000, KR2, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(100000, KR4, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(100000, SR4, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(100000, CR4, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(100000, LR4_ER4, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(50000, SR2, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(1000, X, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(10000, CR, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(10000, SR, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(10000, LR, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(10000, LRM, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(10000, ER, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(2500, T, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(5000, T, Full),
|
|
+ __DEFINE_SPECIAL_MODE_PARAMS(FEC_NONE),
|
|
+ __DEFINE_SPECIAL_MODE_PARAMS(FEC_RS),
|
|
+ __DEFINE_SPECIAL_MODE_PARAMS(FEC_BASER),
|
|
+ __DEFINE_LINK_MODE_PARAMS(50000, KR, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(50000, SR, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(50000, CR, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(50000, LR_ER_FR, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(50000, DR, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(100000, KR2, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(100000, SR2, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(100000, CR2, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(100000, LR2_ER2_FR2, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(100000, DR2, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(200000, KR4, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(200000, SR4, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(200000, LR4_ER4_FR4, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(200000, DR4, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(200000, CR4, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(100, T1, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(1000, T1, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(400000, KR8, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(400000, SR8, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(400000, LR8_ER8_FR8, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(400000, DR8, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(400000, CR8, Full),
|
|
+ __DEFINE_SPECIAL_MODE_PARAMS(FEC_LLRS),
|
|
+ __DEFINE_LINK_MODE_PARAMS(100000, KR, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(100000, SR, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(100000, LR_ER_FR, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(100000, DR, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(100000, CR, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(200000, KR2, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(200000, SR2, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(200000, LR2_ER2_FR2, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(200000, DR2, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(200000, CR2, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(400000, KR4, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(400000, SR4, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(400000, LR4_ER4_FR4, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(400000, DR4, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(400000, CR4, Full),
|
|
+ __DEFINE_LINK_MODE_PARAMS(100, FX, Half),
|
|
+ __DEFINE_LINK_MODE_PARAMS(100, FX, Full),
|
|
+};
|
|
+
|
|
+const struct nla_policy ethnl_linkmodes_set_policy[] = {
|
|
+ [ETHTOOL_A_LINKMODES_HEADER] =
|
|
+ NLA_POLICY_NESTED(ethnl_header_policy),
|
|
+ [ETHTOOL_A_LINKMODES_AUTONEG] = { .type = NLA_U8 },
|
|
+ [ETHTOOL_A_LINKMODES_OURS] = { .type = NLA_NESTED },
|
|
+ [ETHTOOL_A_LINKMODES_SPEED] = { .type = NLA_U32 },
|
|
+ [ETHTOOL_A_LINKMODES_DUPLEX] = { .type = NLA_U8 },
|
|
+ [ETHTOOL_A_LINKMODES_MASTER_SLAVE_CFG] = { .type = NLA_U8 },
|
|
+ [ETHTOOL_A_LINKMODES_LANES] =
|
|
+ NLA_POLICY_RANGE(NLA_U32, 1, 8),
|
|
+};
|
|
+
|
|
+/* Set advertised link modes to all supported modes matching requested speed,
|
|
+ * lanes and duplex values. Called when autonegotiation is on, speed, lanes or
|
|
+ * duplex is requested but no link mode change. This is done in userspace with
|
|
+ * ioctl() interface, move it into kernel for netlink.
|
|
+ * Returns true if advertised modes bitmap was modified.
|
|
+ */
|
|
+static bool ethnl_auto_linkmodes(struct ethtool_link_ksettings *ksettings,
|
|
+ bool req_speed, bool req_lanes,
|
|
+ bool req_duplex)
|
|
+{
|
|
+ unsigned long *advertising = ksettings->link_modes.advertising;
|
|
+ unsigned long *supported = ksettings->link_modes.supported;
|
|
+ DECLARE_BITMAP(old_adv, __ETHTOOL_LINK_MODE_MASK_NBITS);
|
|
+ unsigned int i;
|
|
+
|
|
+ BUILD_BUG_ON(ARRAY_SIZE(link_mode_params) !=
|
|
+ __ETHTOOL_LINK_MODE_MASK_NBITS);
|
|
+
|
|
+ bitmap_copy(old_adv, advertising, __ETHTOOL_LINK_MODE_MASK_NBITS);
|
|
+
|
|
+ for (i = 0; i < __ETHTOOL_LINK_MODE_MASK_NBITS; i++) {
|
|
+ const struct link_mode_info *info = &link_mode_params[i];
|
|
+
|
|
+ if (info->speed == SPEED_UNKNOWN)
|
|
+ continue;
|
|
+ if (test_bit(i, supported) &&
|
|
+ (!req_speed || info->speed == ksettings->base.speed) &&
|
|
+ (!req_lanes || info->lanes == ksettings->lanes) &&
|
|
+ (!req_duplex || info->duplex == ksettings->base.duplex))
|
|
+ set_bit(i, advertising);
|
|
+ else
|
|
+ clear_bit(i, advertising);
|
|
+ }
|
|
+
|
|
+ return !bitmap_equal(old_adv, advertising,
|
|
+ __ETHTOOL_LINK_MODE_MASK_NBITS);
|
|
+}
|
|
+
|
|
+static bool ethnl_validate_master_slave_cfg(u8 cfg)
|
|
+{
|
|
+ switch (cfg) {
|
|
+ case MASTER_SLAVE_CFG_MASTER_PREFERRED:
|
|
+ case MASTER_SLAVE_CFG_SLAVE_PREFERRED:
|
|
+ case MASTER_SLAVE_CFG_MASTER_FORCE:
|
|
+ case MASTER_SLAVE_CFG_SLAVE_FORCE:
|
|
+ return true;
|
|
+ }
|
|
+
|
|
+ return false;
|
|
+}
|
|
+
|
|
+static int ethnl_check_linkmodes(struct genl_info *info, struct nlattr **tb)
|
|
+{
|
|
+ const struct nlattr *master_slave_cfg, *lanes_cfg;
|
|
+
|
|
+ master_slave_cfg = tb[ETHTOOL_A_LINKMODES_MASTER_SLAVE_CFG];
|
|
+ if (master_slave_cfg &&
|
|
+ !ethnl_validate_master_slave_cfg(nla_get_u8(master_slave_cfg))) {
|
|
+ NL_SET_ERR_MSG_ATTR(info->extack, master_slave_cfg,
|
|
+ "master/slave value is invalid");
|
|
+ return -EOPNOTSUPP;
|
|
+ }
|
|
+
|
|
+ lanes_cfg = tb[ETHTOOL_A_LINKMODES_LANES];
|
|
+ if (lanes_cfg && !is_power_of_2(nla_get_u32(lanes_cfg))) {
|
|
+ NL_SET_ERR_MSG_ATTR(info->extack, lanes_cfg,
|
|
+ "lanes value is invalid");
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int ethnl_update_linkmodes(struct genl_info *info, struct nlattr **tb,
|
|
+ struct ethtool_link_ksettings *ksettings,
|
|
+ bool *mod, const struct net_device *dev)
|
|
+{
|
|
+ struct ethtool_link_settings *lsettings = &ksettings->base;
|
|
+ bool req_speed, req_lanes, req_duplex;
|
|
+ const struct nlattr *master_slave_cfg, *lanes_cfg;
|
|
+ int ret;
|
|
+
|
|
+ master_slave_cfg = tb[ETHTOOL_A_LINKMODES_MASTER_SLAVE_CFG];
|
|
+ if (master_slave_cfg) {
|
|
+ if (lsettings->master_slave_cfg == MASTER_SLAVE_CFG_UNSUPPORTED) {
|
|
+ NL_SET_ERR_MSG_ATTR(info->extack, master_slave_cfg,
|
|
+ "master/slave configuration not supported by device");
|
|
+ return -EOPNOTSUPP;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ *mod = false;
|
|
+ req_speed = tb[ETHTOOL_A_LINKMODES_SPEED];
|
|
+ req_lanes = tb[ETHTOOL_A_LINKMODES_LANES];
|
|
+ req_duplex = tb[ETHTOOL_A_LINKMODES_DUPLEX];
|
|
+
|
|
+ ethnl_update_u8(&lsettings->autoneg, tb[ETHTOOL_A_LINKMODES_AUTONEG],
|
|
+ mod);
|
|
+
|
|
+ lanes_cfg = tb[ETHTOOL_A_LINKMODES_LANES];
|
|
+ if (lanes_cfg) {
|
|
+ /* If autoneg is off and lanes parameter is
|
|
+ * not supported by the driver,
|
|
+ * return an error.
|
|
+ */
|
|
+ if (!lsettings->autoneg &&
|
|
+ !dev->ethtool_ops->cap_link_lanes_supported) {
|
|
+ NL_SET_ERR_MSG_ATTR(info->extack, lanes_cfg,
|
|
+ "lanes configuration not supported by device");
|
|
+ return -EOPNOTSUPP;
|
|
+ }
|
|
+ } else if (!lsettings->autoneg) {
|
|
+ /* If autoneg is off and lanes parameter is
|
|
+ * not passed from user,
|
|
+ * set the lanes parameter to 0.
|
|
+ */
|
|
+ ksettings->lanes = 0;
|
|
+ }
|
|
+
|
|
+ ret = ethnl_update_bitset(ksettings->link_modes.advertising,
|
|
+ __ETHTOOL_LINK_MODE_MASK_NBITS,
|
|
+ tb[ETHTOOL_A_LINKMODES_OURS], link_mode_names,
|
|
+ info->extack, mod);
|
|
+ if (ret < 0)
|
|
+ return ret;
|
|
+ ethnl_update_u32(&lsettings->speed, tb[ETHTOOL_A_LINKMODES_SPEED],
|
|
+ mod);
|
|
+ ethnl_update_u32(&ksettings->lanes, lanes_cfg, mod);
|
|
+ ethnl_update_u8(&lsettings->duplex, tb[ETHTOOL_A_LINKMODES_DUPLEX],
|
|
+ mod);
|
|
+ ethnl_update_u8(&lsettings->master_slave_cfg, master_slave_cfg, mod);
|
|
+
|
|
+ if (!tb[ETHTOOL_A_LINKMODES_OURS] && lsettings->autoneg &&
|
|
+ (req_speed || req_lanes || req_duplex) &&
|
|
+ ethnl_auto_linkmodes(ksettings, req_speed, req_lanes, req_duplex))
|
|
+ *mod = true;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+int ethnl_set_linkmodes(struct sk_buff *skb, struct genl_info *info)
|
|
+{
|
|
+ struct ethtool_link_ksettings ksettings = {};
|
|
+ struct ethnl_req_info req_info = {};
|
|
+ struct nlattr **tb = info->attrs;
|
|
+ struct net_device *dev;
|
|
+ bool mod = false;
|
|
+ int ret;
|
|
+
|
|
+ ret = ethnl_check_linkmodes(info, tb);
|
|
+ if (ret < 0)
|
|
+ return ret;
|
|
+
|
|
+ ret = ethnl_parse_header_dev_get(&req_info,
|
|
+ tb[ETHTOOL_A_LINKMODES_HEADER],
|
|
+ genl_info_net(info), info->extack,
|
|
+ true);
|
|
+ if (ret < 0)
|
|
+ return ret;
|
|
+ dev = req_info.dev;
|
|
+ ret = -EOPNOTSUPP;
|
|
+ if (!dev->ethtool_ops->get_link_ksettings ||
|
|
+ !dev->ethtool_ops->set_link_ksettings)
|
|
+ goto out_dev;
|
|
+
|
|
+ rtnl_lock();
|
|
+ ret = ethnl_ops_begin(dev);
|
|
+ if (ret < 0)
|
|
+ goto out_rtnl;
|
|
+
|
|
+ ret = __ethtool_get_link_ksettings(dev, &ksettings);
|
|
+ if (ret < 0) {
|
|
+ GENL_SET_ERR_MSG(info, "failed to retrieve link settings");
|
|
+ goto out_ops;
|
|
+ }
|
|
+
|
|
+ ret = ethnl_update_linkmodes(info, tb, &ksettings, &mod, dev);
|
|
+ if (ret < 0)
|
|
+ goto out_ops;
|
|
+
|
|
+ if (mod) {
|
|
+ ret = dev->ethtool_ops->set_link_ksettings(dev, &ksettings);
|
|
+ if (ret < 0)
|
|
+ GENL_SET_ERR_MSG(info, "link settings update failed");
|
|
+ else
|
|
+ ethtool_notify(dev, ETHTOOL_MSG_LINKMODES_NTF, NULL);
|
|
+ }
|
|
+
|
|
+out_ops:
|
|
+ ethnl_ops_complete(dev);
|
|
+out_rtnl:
|
|
+ rtnl_unlock();
|
|
+out_dev:
|
|
+ dev_put(dev);
|
|
+ return ret;
|
|
+}
|
|
diff --git a/net/ethtool/netlink.h b/net/ethtool/netlink.h
|
|
index bc2b83877e01..bf71eaf2ace8 100644
|
|
--- a/net/ethtool/netlink.h
|
|
+++ b/net/ethtool/netlink.h
|
|
@@ -338,6 +338,8 @@ extern const struct nla_policy ethnl_strset_get_policy[ETHTOOL_A_STRSET_COUNTS_O
|
|
extern const struct nla_policy ethnl_linkinfo_get_policy[ETHTOOL_A_LINKINFO_HEADER + 1];
|
|
extern const struct nla_policy ethnl_linkinfo_set_policy[ETHTOOL_A_LINKINFO_TP_MDIX_CTRL + 1];
|
|
extern const struct nla_policy ethnl_linkmodes_get_policy[ETHTOOL_A_LINKMODES_HEADER + 1];
|
|
+extern const struct nla_policy
|
|
+ ethnl_linkmodes_set_policy[ETHTOOL_A_LINKMODES_LANES + 1];
|
|
extern const struct nla_policy ethnl_linkstate_get_policy[ETHTOOL_A_LINKSTATE_HEADER + 1];
|
|
extern const struct nla_policy ethnl_debug_get_policy[ETHTOOL_A_DEBUG_HEADER + 1];
|
|
extern const struct nla_policy ethnl_debug_set_policy[ETHTOOL_A_DEBUG_MSGMASK + 1];
|
|
--
|
|
2.34.1
|
|
|