From nobody Wed Sep 17 15:44:56 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE272C3DA6E for ; Sat, 17 Dec 2022 00:52:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229475AbiLQAwE (ORCPT ); Fri, 16 Dec 2022 19:52:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230031AbiLQAv0 (ORCPT ); Fri, 16 Dec 2022 19:51:26 -0500 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33C9F67D98; Fri, 16 Dec 2022 16:50:25 -0800 (PST) Received: by mail-ej1-x632.google.com with SMTP id fc4so9787651ejc.12; Fri, 16 Dec 2022 16:50:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=Xq4dzQl9OuBQ7d1dc6U7JIoqgeHWEMyw11N7wDetnOA=; b=fT+YXK7LJm7bC4grRK3q8ZQe5wqgJNiAuAxv8jUP+uhbeGYyrXhlrVy9zE0ETTbrZZ bUUN1cVwaDNn2GXpSI37W2sc6ecl3xJiiK+vzhWCgHzAipbKhYQYNv4o2Vc+bM/ZGYYN ZHsXYg9Wab50N3VYtPxAmHXftTdIUo8tE+/GIflpiWAzv264qVLr8LUUhF7R2TlKS/LS PjsVs67Fb0MCUvPBtvpVPiFWZDGcn21n1kAqBXQdgO1pJs1Um3PgdmE99/8Y+wvHoIYn IHuR+bKsCO6wdZRBxhgdmWAMELE1pQCPRHIXcervcHvz3G2ozpUy41F3HeM12ESzBrId DcCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Xq4dzQl9OuBQ7d1dc6U7JIoqgeHWEMyw11N7wDetnOA=; b=RdPCPE1np7uvLCBIK4RLoAUqRshiEtHpA7gwIUfwAWp+eCdFuiEwlmeIqzrlklMFLO 58PwRrOqz2J/JSt6XB6Op0LLmjqWnViXFANie7HiNtaLCLiQiUWGRQgxnjMEiNRHDipJ Rotn5gyfjVMV0DJwCZhnPhM/7I20h5R6G4ekeY4bx3UNEMUaQLXrO3ZABPlf9vRwWbIK vP3ARpS0Rhj+iRi8YreF2OcGIXKkglUb1Un6/tZHC5sPAmGOS67HqPdjJMtkfWvaNlq4 CpE2oqNhjRnnf0n0ZDuFtWj53FHIn5om+Toj2cY+cdKLekzsLoKzg0HVdzY7/CY+O5sB 6QCA== X-Gm-Message-State: ANoB5pkhU5EWlbNeWBWyvschiINmtInVrTzISIGBCuGWX7Wa4fFlxoGc FZk8Ukt5WDLakdKwZvTuFUM= X-Google-Smtp-Source: AA0mqf4TN8E13XlAXjWWDz8BJ+v5UQx5vrycrQo9bY5dCI+MzGyO/FZ9fFac5W0vP7hTUjqQgcXTww== X-Received: by 2002:a17:906:298c:b0:7c1:9eb:845b with SMTP id x12-20020a170906298c00b007c109eb845bmr28641130eje.16.1671238223618; Fri, 16 Dec 2022 16:50:23 -0800 (PST) Received: from gvm01 (net-2-45-26-236.cust.vodafonedsl.it. [2.45.26.236]) by smtp.gmail.com with ESMTPSA id 25-20020a170906309900b007c53090d511sm1396499ejv.192.2022.12.16.16.50.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Dec 2022 16:50:23 -0800 (PST) Date: Sat, 17 Dec 2022 01:50:21 +0100 From: Piergiorgio Beruto To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Michal Kubecek Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Oleksij Rempel Subject: [PATCH v4 ethtool-next 1/2] update UAPI header copies Message-ID: <8eb8d565bf8b2d7e6ebf7cccb7719f8c543cb44d.1671236216.git.piergiorgio.beruto@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Update to kernel commit 5518b1e55dcd. Signed-off-by: Piergiorgio Beruto --- uapi/linux/ethtool.h | 3 +++ uapi/linux/ethtool_netlink.h | 39 ++++++++++++++++++++++++++++++++++++ uapi/linux/net_tstamp.h | 3 ++- 3 files changed, 44 insertions(+), 1 deletion(-) diff --git a/uapi/linux/ethtool.h b/uapi/linux/ethtool.h index d1748702bddc..78bf6fad9e02 100644 --- a/uapi/linux/ethtool.h +++ b/uapi/linux/ethtool.h @@ -1739,6 +1739,9 @@ enum ethtool_link_mode_bit_indices { ETHTOOL_LINK_MODE_800000baseDR8_2_Full_BIT =3D 96, ETHTOOL_LINK_MODE_800000baseSR8_Full_BIT =3D 97, ETHTOOL_LINK_MODE_800000baseVR8_Full_BIT =3D 98, + ETHTOOL_LINK_MODE_10baseT1S_Full_BIT =3D 99, + ETHTOOL_LINK_MODE_10baseT1S_Half_BIT =3D 100, + ETHTOOL_LINK_MODE_10baseT1S_P2MP_Half_BIT =3D 101, =20 /* must be last entry */ __ETHTOOL_LINK_MODE_MASK_NBITS diff --git a/uapi/linux/ethtool_netlink.h b/uapi/linux/ethtool_netlink.h index d581c43d592d..a6d899cd7f3a 100644 --- a/uapi/linux/ethtool_netlink.h +++ b/uapi/linux/ethtool_netlink.h @@ -51,6 +51,10 @@ enum { ETHTOOL_MSG_MODULE_SET, ETHTOOL_MSG_PSE_GET, ETHTOOL_MSG_PSE_SET, + ETHTOOL_MSG_RSS_GET, + ETHTOOL_MSG_PLCA_GET_CFG, + ETHTOOL_MSG_PLCA_SET_CFG, + ETHTOOL_MSG_PLCA_GET_STATUS, =20 /* add new constants above here */ __ETHTOOL_MSG_USER_CNT, @@ -97,6 +101,10 @@ enum { ETHTOOL_MSG_MODULE_GET_REPLY, ETHTOOL_MSG_MODULE_NTF, ETHTOOL_MSG_PSE_GET_REPLY, + ETHTOOL_MSG_RSS_GET_REPLY, + ETHTOOL_MSG_PLCA_GET_CFG_REPLY, + ETHTOOL_MSG_PLCA_GET_STATUS_REPLY, + ETHTOOL_MSG_PLCA_NTF, =20 /* add new constants above here */ __ETHTOOL_MSG_KERNEL_CNT, @@ -880,6 +888,37 @@ enum { ETHTOOL_A_PSE_MAX =3D (__ETHTOOL_A_PSE_CNT - 1) }; =20 +enum { + ETHTOOL_A_RSS_UNSPEC, + ETHTOOL_A_RSS_HEADER, + ETHTOOL_A_RSS_CONTEXT, /* u32 */ + ETHTOOL_A_RSS_HFUNC, /* u32 */ + ETHTOOL_A_RSS_INDIR, /* binary */ + ETHTOOL_A_RSS_HKEY, /* binary */ + + __ETHTOOL_A_RSS_CNT, + ETHTOOL_A_RSS_MAX =3D (__ETHTOOL_A_RSS_CNT - 1), +}; + +/* PLCA */ + +enum { + ETHTOOL_A_PLCA_UNSPEC, + ETHTOOL_A_PLCA_HEADER, /* nest - _A_HEADER_* */ + ETHTOOL_A_PLCA_VERSION, /* u16 */ + ETHTOOL_A_PLCA_ENABLED, /* u8 */ + ETHTOOL_A_PLCA_STATUS, /* u8 */ + ETHTOOL_A_PLCA_NODE_CNT, /* u32 */ + ETHTOOL_A_PLCA_NODE_ID, /* u32 */ + ETHTOOL_A_PLCA_TO_TMR, /* u32 */ + ETHTOOL_A_PLCA_BURST_CNT, /* u32 */ + ETHTOOL_A_PLCA_BURST_TMR, /* u32 */ + + /* add new constants above here */ + __ETHTOOL_A_PLCA_CNT, + ETHTOOL_A_PLCA_MAX =3D (__ETHTOOL_A_PLCA_CNT - 1) +}; + /* generic netlink info */ #define ETHTOOL_GENL_NAME "ethtool" #define ETHTOOL_GENL_VERSION 1 diff --git a/uapi/linux/net_tstamp.h b/uapi/linux/net_tstamp.h index 55501e5e7ac8..a2c66b3d7f0f 100644 --- a/uapi/linux/net_tstamp.h +++ b/uapi/linux/net_tstamp.h @@ -31,8 +31,9 @@ enum { SOF_TIMESTAMPING_OPT_PKTINFO =3D (1<<13), SOF_TIMESTAMPING_OPT_TX_SWHW =3D (1<<14), SOF_TIMESTAMPING_BIND_PHC =3D (1 << 15), + SOF_TIMESTAMPING_OPT_ID_TCP =3D (1 << 16), =20 - SOF_TIMESTAMPING_LAST =3D SOF_TIMESTAMPING_BIND_PHC, + SOF_TIMESTAMPING_LAST =3D SOF_TIMESTAMPING_OPT_ID_TCP, SOF_TIMESTAMPING_MASK =3D (SOF_TIMESTAMPING_LAST - 1) | SOF_TIMESTAMPING_LAST }; --=20 2.37.4 From nobody Wed Sep 17 15:44:56 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C9DBC4332F for ; Sat, 17 Dec 2022 00:52:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230131AbiLQAwW (ORCPT ); Fri, 16 Dec 2022 19:52:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229948AbiLQAve (ORCPT ); Fri, 16 Dec 2022 19:51:34 -0500 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20102DDB; Fri, 16 Dec 2022 16:50:42 -0800 (PST) Received: by mail-ed1-x536.google.com with SMTP id a16so5837958edb.9; Fri, 16 Dec 2022 16:50:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=S0skL65OaO9gjbkjvlPH5KjvN9AR9I2NEJv0ewBhF0s=; b=HACALePnQgwM9kIMhvd61ExKv806V+P6dqzb5XF9iqoh05XKL0pTQ99ayThM3VKY6F KKHuY+Z1ie4Rri/8NFmIcM9mclmqJ3qLwjhNm+/Mn3w5sxq+lpdYwL1HTR1VRMXihZgl Ov56YJESouLvDdHMu29BkWj+diKliJXEXwJ3z8wp+Ovtr4pELHMdyWruFk8mSwPZQGsS bK6/sj49bKavvvkvv9d7UkJLcX5M1XcyMPN2x0uc/v46kGxvjpKsjyTG6ccxTlA7humx HVFv3td4oY3ZRqe6wE/g6K7+2dWi/CuPpfujS2+9gno1Own/j3vhOikkyLTeaxdl9N3G jsig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=S0skL65OaO9gjbkjvlPH5KjvN9AR9I2NEJv0ewBhF0s=; b=4uDhqAI+D664Cqnf9QOmCKfxhi2MuwMgfGafuNmRqqEp64M2FmEBPi1+O2noYjQq7y uCBzESn7e5ossGe3zaCa46RSh0dDR/4iFCUFD5HMz1h6CIQneJHmSeWIAuuPJLiwDPIR F04tyRtv6rVItWS3BnO7Nv8DnUb6mOp1Ojs426Qa3LqL016H9EGmXw/liUAIrIWakETN GNX2lQj2l2p0ntVr8bwE9tWRr/Owj+45Pay9V5c0/QKDo6qOvAr9GdGpBt+BxMJKfZ2b 8u8Fm1OOS4B1lOjdgkFoHfXpdN405xCvBjSQqgPrb/OOeHBvbnMzjmAQiPIW+mDZB5Rx m1+w== X-Gm-Message-State: ANoB5pleFKEf7JD5Ewvuay/VptUMzUDGEq98QIqGjssiLU4a6ubwZSOH t3zJ0Sqh1dS9FekTLPjUXUg= X-Google-Smtp-Source: AA0mqf5cplFdyLfoxVBrt9WBfwmU3SGbWmbo41fqCEcgMMaaIYDa8xsYo5Omuthkl3mF8N2zeuKBvg== X-Received: by 2002:aa7:cf0c:0:b0:470:410a:8ea7 with SMTP id a12-20020aa7cf0c000000b00470410a8ea7mr27866246edy.18.1671238241105; Fri, 16 Dec 2022 16:50:41 -0800 (PST) Received: from gvm01 (net-2-45-26-236.cust.vodafonedsl.it. [2.45.26.236]) by smtp.gmail.com with ESMTPSA id b4-20020aa7d484000000b0046267f8150csm1419543edr.19.2022.12.16.16.50.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Dec 2022 16:50:40 -0800 (PST) Date: Sat, 17 Dec 2022 01:50:39 +0100 From: Piergiorgio Beruto To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Michal Kubecek Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Oleksij Rempel Subject: [PATCH v4 ethtool-next 2/2] add support for IEEE 802.3cg-2019 Clause 148 - PLCA RS Message-ID: <1ddabd3850c3f3aea4b2ce840a053f0e917803ba.1671236216.git.piergiorgio.beruto@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This patch adds support for the Physical Layer Collision Avoidance Reconciliation Sublayer which was introduced in the IEEE 802.3 standard by the 802.3cg working group in 2019. The ethtool interface has been extended as follows: - show if the device supports PLCA when ethtool is invoked without FLAGS - additionally show what PLCA version is supported - show the current PLCA status - add FLAGS for getting and setting the PLCA configuration Signed-off-by: Piergiorgio Beruto --- Makefile.am | 1 + ethtool.c | 21 ++++ netlink/extapi.h | 6 + netlink/plca.c | 295 +++++++++++++++++++++++++++++++++++++++++++++ netlink/settings.c | 86 ++++++++++++- 5 files changed, 407 insertions(+), 2 deletions(-) create mode 100644 netlink/plca.c diff --git a/Makefile.am b/Makefile.am index fcc912edd7e4..b184b8ceb28a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,6 +41,7 @@ ethtool_SOURCES +=3D \ netlink/desc-ethtool.c netlink/desc-genlctrl.c \ netlink/module-eeprom.c netlink/module.c \ netlink/desc-rtnl.c netlink/cable_test.c netlink/tunnels.c \ + netlink/plca.c \ uapi/linux/ethtool_netlink.h \ uapi/linux/netlink.h uapi/linux/genetlink.h \ uapi/linux/rtnetlink.h uapi/linux/if_link.h diff --git a/ethtool.c b/ethtool.c index 3207e49137c4..d23406f54a37 100644 --- a/ethtool.c +++ b/ethtool.c @@ -6075,6 +6075,27 @@ static const struct option args[] =3D { .help =3D "Set transceiver module settings", .xhelp =3D " [ power-mode-policy high|auto ]\n" }, + { + .opts =3D "--get-plca-cfg", + .nlfunc =3D nl_plca_get_cfg, + .help =3D "Get PLCA configuration", + }, + { + .opts =3D "--set-plca-cfg", + .nlfunc =3D nl_plca_set_cfg, + .help =3D "Set PLCA configuration", + .xhelp =3D " [ enable on|off ]\n" + " [ node-id N ]\n" + " [ node-cnt N ]\n" + " [ to-tmr N ]\n" + " [ burst-cnt N ]\n" + " [ burst-tmr N ]\n" + }, + { + .opts =3D "--get-plca-status", + .nlfunc =3D nl_plca_get_status, + .help =3D "Get PLCA status information", + }, { .opts =3D "-h|--help", .no_dev =3D true, diff --git a/netlink/extapi.h b/netlink/extapi.h index 1bb580a889a8..0add156e644a 100644 --- a/netlink/extapi.h +++ b/netlink/extapi.h @@ -47,6 +47,9 @@ int nl_gmodule(struct cmd_context *ctx); int nl_smodule(struct cmd_context *ctx); int nl_monitor(struct cmd_context *ctx); int nl_getmodule(struct cmd_context *ctx); +int nl_plca_get_cfg(struct cmd_context *ctx); +int nl_plca_set_cfg(struct cmd_context *ctx); +int nl_plca_get_status(struct cmd_context *ctx); =20 void nl_monitor_usage(void); =20 @@ -114,6 +117,9 @@ nl_get_eeprom_page(struct cmd_context *ctx __maybe_unus= ed, #define nl_getmodule NULL #define nl_gmodule NULL #define nl_smodule NULL +#define nl_get_plca_cfg NULL +#define nl_set_plca_cfg NULL +#define nl_get_plca_status NULL =20 #endif /* ETHTOOL_ENABLE_NETLINK */ =20 diff --git a/netlink/plca.c b/netlink/plca.c new file mode 100644 index 000000000000..f7d7bdbc5c84 --- /dev/null +++ b/netlink/plca.c @@ -0,0 +1,295 @@ +/* + * plca.c - netlink implementation of plca command + * + * Implementation of "ethtool --show-plca " and + * "ethtool --set-plca ..." + */ + +#include +#include +#include + +#include "../internal.h" +#include "../common.h" +#include "netlink.h" +#include "bitset.h" +#include "parser.h" + +/* PLCA_GET_CFG */ + +int plca_get_cfg_reply_cb(const struct nlmsghdr *nlhdr, void *data) +{ + const struct nlattr *tb[ETHTOOL_A_PLCA_MAX + 1] =3D {}; + DECLARE_ATTR_TB_INFO(tb); + struct nl_context *nlctx =3D data; + bool silent; + int idv, val; + int err_ret; + int ret; + + silent =3D nlctx->is_dump || nlctx->is_monitor; + err_ret =3D silent ? MNL_CB_OK : MNL_CB_ERROR; + ret =3D mnl_attr_parse(nlhdr, GENL_HDRLEN, attr_cb, &tb_info); + if (ret < 0) + return err_ret; + + nlctx->devname =3D get_dev_name(tb[ETHTOOL_A_PLCA_HEADER]); + if (!dev_ok(nlctx)) + return err_ret; + + if (silent) + putchar('\n'); + + printf("PLCA settings for %s:\n", nlctx->devname); + + // check if PLCA is enabled + printf("\tEnabled: "); + + if (!tb[ETHTOOL_A_PLCA_ENABLED]) { + printf("not supported"); + } else { + val =3D mnl_attr_get_u8(tb[ETHTOOL_A_PLCA_ENABLED]); + printf(val ? "Yes" : "No"); + } + putchar('\n'); + + // get node ID + printf("\tlocal node ID: "); + + if (!tb[ETHTOOL_A_PLCA_NODE_ID]) { + printf("not supported"); + } else { + idv =3D mnl_attr_get_u32(tb[ETHTOOL_A_PLCA_NODE_ID]); + printf("%u (%s)", idv, + idv =3D=3D 0 ? "coordinator" : + idv =3D=3D 255 ? "unconfigured" : "follower"); + } + putchar('\n'); + + // get node count + printf("\tNode count: "); + if (!tb[ETHTOOL_A_PLCA_NODE_CNT]) { + printf("not supported"); + } else { + val =3D mnl_attr_get_u32(tb[ETHTOOL_A_PLCA_NODE_CNT]); + printf("%u", val); + + // The node count is ignored by follower nodes. However, it can + // be pre-set to enable fast coordinator role switchover. + // Therefore, on a follower node we still wanto to show it, + // indicating it is not currently used. + if (tb[ETHTOOL_A_PLCA_NODE_ID] && idv !=3D 0) + printf(" (ignored)"); + } + putchar('\n'); + + // get TO timer (transmit opportunity timer) + printf("\tTO timer: "); + if (!tb[ETHTOOL_A_PLCA_TO_TMR]) { + printf("not supported"); + } else { + val =3D mnl_attr_get_u32(tb[ETHTOOL_A_PLCA_TO_TMR]); + printf("%u BT", val); + } + putchar('\n'); + + // get burst count + printf("\tBurst count: "); + if (!tb[ETHTOOL_A_PLCA_BURST_CNT]) { + printf("not supported"); + } else { + val =3D mnl_attr_get_u32(tb[ETHTOOL_A_PLCA_BURST_CNT]); + printf("%u (%s)", val, + val > 0 ? "enabled" : "disabled"); + } + putchar('\n'); + + // get burst timer + printf("\tBurst timer: "); + if (!tb[ETHTOOL_A_PLCA_BURST_TMR]) { + printf("not supported"); + } else { + val =3D mnl_attr_get_u32(tb[ETHTOOL_A_PLCA_BURST_TMR]); + printf("%u BT", val); + } + putchar('\n'); + + return MNL_CB_OK; +} + + +int nl_plca_get_cfg(struct cmd_context *ctx) +{ + struct nl_context *nlctx =3D ctx->nlctx; + struct nl_socket *nlsk =3D nlctx->ethnl_socket; + int ret; + + if (netlink_cmd_check(ctx, ETHTOOL_MSG_PLCA_GET_CFG, true)) + return -EOPNOTSUPP; + + if (ctx->argc > 0) { + fprintf(stderr, "ethtool: unexpected parameter '%s'\n", + *ctx->argp); + return 1; + } + + ret =3D nlsock_prep_get_request(nlsk, ETHTOOL_MSG_PLCA_GET_CFG, + ETHTOOL_A_PLCA_HEADER, 0); + + if (ret < 0) + return ret; + + return nlsock_send_get_request(nlsk, plca_get_cfg_reply_cb); +} + +/* PLCA_SET_CFG */ + +static const struct param_parser set_plca_params[] =3D { + { + .arg =3D "enable", + .type =3D ETHTOOL_A_PLCA_ENABLED, + .handler =3D nl_parse_u8bool, + .min_argc =3D 1, + }, + { + .arg =3D "node-id", + .type =3D ETHTOOL_A_PLCA_NODE_ID, + .handler =3D nl_parse_direct_u32, + .min_argc =3D 1, + }, + { + .arg =3D "node-cnt", + .type =3D ETHTOOL_A_PLCA_NODE_CNT, + .handler =3D nl_parse_direct_u32, + .min_argc =3D 1, + }, + { + .arg =3D "to-tmr", + .type =3D ETHTOOL_A_PLCA_TO_TMR, + .handler =3D nl_parse_direct_u32, + .min_argc =3D 1, + }, + { + .arg =3D "burst-cnt", + .type =3D ETHTOOL_A_PLCA_BURST_CNT, + .handler =3D nl_parse_direct_u32, + .min_argc =3D 1, + }, + { + .arg =3D "burst-tmr", + .type =3D ETHTOOL_A_PLCA_BURST_TMR, + .handler =3D nl_parse_direct_u32, + .min_argc =3D 1, + }, + {} +}; + +int nl_plca_set_cfg(struct cmd_context *ctx) +{ + struct nl_context *nlctx =3D ctx->nlctx; + struct nl_msg_buff *msgbuff; + struct nl_socket *nlsk; + int ret; + + if (netlink_cmd_check(ctx, ETHTOOL_MSG_PLCA_SET_CFG, false)) + return -EOPNOTSUPP; + if (!ctx->argc) { + fprintf(stderr, + "ethtool (--set-plca-cfg): parameters missing\n"); + return 1; + } + + nlctx->cmd =3D "--set-plca-cfg"; + nlctx->argp =3D ctx->argp; + nlctx->argc =3D ctx->argc; + nlctx->devname =3D ctx->devname; + nlsk =3D nlctx->ethnl_socket; + msgbuff =3D &nlsk->msgbuff; + + ret =3D msg_init(nlctx, msgbuff, ETHTOOL_MSG_PLCA_SET_CFG, + NLM_F_REQUEST | NLM_F_ACK); + if (ret < 0) + return 2; + if (ethnla_fill_header(msgbuff, ETHTOOL_A_PLCA_HEADER, + ctx->devname, 0)) + return -EMSGSIZE; + + ret =3D nl_parser(nlctx, set_plca_params, NULL, PARSER_GROUP_NONE, NULL); + if (ret < 0) + return 1; + + ret =3D nlsock_sendmsg(nlsk, NULL); + if (ret < 0) + return 76; + ret =3D nlsock_process_reply(nlsk, nomsg_reply_cb, nlctx); + if (ret =3D=3D 0) + return 0; + else + return nlctx->exit_code ?: 76; +} + +/* PLCA_GET_STATUS */ + +int plca_get_status_reply_cb(const struct nlmsghdr *nlhdr, void *data) +{ + const struct nlattr *tb[ETHTOOL_A_PLCA_MAX + 1] =3D {}; + DECLARE_ATTR_TB_INFO(tb); + struct nl_context *nlctx =3D data; + bool silent; + int err_ret; + int ret; + u8 val; + + silent =3D nlctx->is_dump || nlctx->is_monitor; + err_ret =3D silent ? MNL_CB_OK : MNL_CB_ERROR; + ret =3D mnl_attr_parse(nlhdr, GENL_HDRLEN, attr_cb, &tb_info); + if (ret < 0) + return err_ret; + + nlctx->devname =3D get_dev_name(tb[ETHTOOL_A_PLCA_HEADER]); + if (!dev_ok(nlctx)) + return err_ret; + + if (silent) + putchar('\n'); + + printf("PLCA status of %s:\n", nlctx->devname); + + // check whether the Open Alliance TC14 standard memory map is supported + printf("\tStatus: "); + + if (!tb[ETHTOOL_A_PLCA_STATUS]) { + printf("not supported"); + } else { + val =3D mnl_attr_get_u8(tb[ETHTOOL_A_PLCA_STATUS]); + printf(val ? "on" : "off"); + } + putchar('\n'); + + return MNL_CB_OK; +} + + +int nl_plca_get_status(struct cmd_context *ctx) +{ + struct nl_context *nlctx =3D ctx->nlctx; + struct nl_socket *nlsk =3D nlctx->ethnl_socket; + int ret; + + if (netlink_cmd_check(ctx, ETHTOOL_MSG_PLCA_GET_STATUS, true)) + return -EOPNOTSUPP; + + if (ctx->argc > 0) { + fprintf(stderr, "ethtool: unexpected parameter '%s'\n", + *ctx->argp); + return 1; + } + + ret =3D nlsock_prep_get_request(nlsk, ETHTOOL_MSG_PLCA_GET_STATUS, + ETHTOOL_A_PLCA_HEADER, 0); + + if (ret < 0) + return ret; + + return nlsock_send_get_request(nlsk, plca_get_status_reply_cb); +} diff --git a/netlink/settings.c b/netlink/settings.c index 14ad0b46e102..2f4081b89713 100644 --- a/netlink/settings.c +++ b/netlink/settings.c @@ -166,6 +166,9 @@ static const struct link_mode_info link_modes[] =3D { [ETHTOOL_LINK_MODE_100baseFX_Half_BIT] =3D __HALF_DUPLEX(100), [ETHTOOL_LINK_MODE_100baseFX_Full_BIT] =3D __REAL(100), [ETHTOOL_LINK_MODE_10baseT1L_Full_BIT] =3D __REAL(10), + [ETHTOOL_LINK_MODE_10baseT1S_Full_BIT] =3D __REAL(10), + [ETHTOOL_LINK_MODE_10baseT1S_Half_BIT] =3D __REAL(10), + [ETHTOOL_LINK_MODE_10baseT1S_P2MP_Half_BIT] =3D __REAL(10), }; const unsigned int link_modes_count =3D ARRAY_SIZE(link_modes); =20 @@ -890,6 +893,70 @@ int debug_reply_cb(const struct nlmsghdr *nlhdr, void = *data) return MNL_CB_OK; } =20 +int plca_cfg_reply_cb(const struct nlmsghdr *nlhdr, void *data) +{ + const struct nlattr *tb[ETHTOOL_A_PLCA_MAX + 1] =3D {}; + DECLARE_ATTR_TB_INFO(tb); + struct nl_context *nlctx =3D data; + int ret; + + if (nlctx->is_dump || nlctx->is_monitor) + nlctx->no_banner =3D false; + ret =3D mnl_attr_parse(nlhdr, GENL_HDRLEN, attr_cb, &tb_info); + if (ret < 0) + return ret; + nlctx->devname =3D get_dev_name(tb[ETHTOOL_A_PLCA_HEADER]); + if (!dev_ok(nlctx)) + return MNL_CB_OK; + + print_banner(nlctx); + printf("\tPLCA support: "); + + if (tb[ETHTOOL_A_PLCA_VERSION]) { + uint16_t val =3D mnl_attr_get_u16(tb[ETHTOOL_A_PLCA_VERSION]); + + printf("OPEN Alliance v%u.%u", + (unsigned int)((val >> 4) & 0xF), + (unsigned int)(val & 0xF)); + } else + printf("non-standard"); + + printf("\n"); + + return MNL_CB_OK; +} + +int plca_status_reply_cb(const struct nlmsghdr *nlhdr, void *data) +{ + const struct nlattr *tb[ETHTOOL_A_PLCA_MAX + 1] =3D {}; + DECLARE_ATTR_TB_INFO(tb); + struct nl_context *nlctx =3D data; + int ret; + + if (nlctx->is_dump || nlctx->is_monitor) + nlctx->no_banner =3D false; + ret =3D mnl_attr_parse(nlhdr, GENL_HDRLEN, attr_cb, &tb_info); + if (ret < 0) + return ret; + nlctx->devname =3D get_dev_name(tb[ETHTOOL_A_PLCA_HEADER]); + if (!dev_ok(nlctx)) + return MNL_CB_OK; + + print_banner(nlctx); + printf("\tPLCA status: "); + + if (tb[ETHTOOL_A_PLCA_STATUS]) { + uint8_t val =3D mnl_attr_get_u8(tb[ETHTOOL_A_PLCA_STATUS]); + + printf(val ? "up" : "down"); + } else + printf("unknown"); + + printf("\n"); + + return MNL_CB_OK; +} + static int gset_request(struct nl_context *nlctx, uint8_t msg_type, uint16_t hdr_attr, mnl_cb_t cb) { @@ -914,7 +981,10 @@ int nl_gset(struct cmd_context *ctx) netlink_cmd_check(ctx, ETHTOOL_MSG_LINKINFO_GET, true) || netlink_cmd_check(ctx, ETHTOOL_MSG_WOL_GET, true) || netlink_cmd_check(ctx, ETHTOOL_MSG_DEBUG_GET, true) || - netlink_cmd_check(ctx, ETHTOOL_MSG_LINKSTATE_GET, true)) + netlink_cmd_check(ctx, ETHTOOL_MSG_LINKSTATE_GET, true) || + netlink_cmd_check(ctx, ETHTOOL_MSG_LINKSTATE_GET, true) || + netlink_cmd_check(ctx, ETHTOOL_MSG_PLCA_GET_CFG, true) || + netlink_cmd_check(ctx, ETHTOOL_MSG_PLCA_GET_STATUS, true)) return -EOPNOTSUPP; =20 nlctx->suppress_nlerr =3D 1; @@ -934,6 +1004,12 @@ int nl_gset(struct cmd_context *ctx) if (ret =3D=3D -ENODEV) return ret; =20 + ret =3D gset_request(nlctx, ETHTOOL_MSG_PLCA_GET_CFG, + ETHTOOL_A_PLCA_HEADER, plca_cfg_reply_cb); + + if (ret =3D=3D -ENODEV) + return ret; + ret =3D gset_request(nlctx, ETHTOOL_MSG_DEBUG_GET, ETHTOOL_A_DEBUG_HEADER, debug_reply_cb); if (ret =3D=3D -ENODEV) @@ -941,6 +1017,13 @@ int nl_gset(struct cmd_context *ctx) =20 ret =3D gset_request(nlctx, ETHTOOL_MSG_LINKSTATE_GET, ETHTOOL_A_LINKSTATE_HEADER, linkstate_reply_cb); + + if (ret =3D=3D -ENODEV) + return ret; + + + ret =3D gset_request(nlctx, ETHTOOL_MSG_PLCA_GET_STATUS, + ETHTOOL_A_PLCA_HEADER, plca_status_reply_cb); if (ret =3D=3D -ENODEV) return ret; =20 @@ -949,7 +1032,6 @@ int nl_gset(struct cmd_context *ctx) return 75; } =20 - return 0; } =20 --=20 2.37.4