From nobody Tue Sep 16 02:22:10 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 229B8C678D7 for ; Mon, 9 Jan 2023 17:01:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237455AbjAIRAt (ORCPT ); Mon, 9 Jan 2023 12:00:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237468AbjAIRAR (ORCPT ); Mon, 9 Jan 2023 12:00:17 -0500 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 578BB10FFE; Mon, 9 Jan 2023 09:00:15 -0800 (PST) Received: by mail-ej1-x633.google.com with SMTP id az20so2667064ejc.1; Mon, 09 Jan 2023 09:00:15 -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=G+g2oiB8hBmHKK/9VB8V5x7k3LgCXg/f7UEmyK5AYaQ=; b=cfrwNlRWg7V9NjNYM8QijXMStWw8zNd+xspKnXW5AiYq/dgLbtdFOEl9DND3uW473I oiJCW3gKI+CmaSxTSBdnF7UOU4cF0gOPBjvaGvqCMQNmlxduaVcSYBgPxERd/XKm5epk MgvXZUfTqFxwZQhkepIgPfsE85nwbfRJT1BlTA62ucm6Ax4QorYu80OHxFCx4jpYOCHh yzQN6tWCbeVoCN1fQrpXioddMACJp6yPtblwIKyjtGjV1zj+wTwWN9aVrK5b7vD8364S l0cLqiuXPOwpmZM4Ta/07WD/mlyU5Mv2zUbTkViXXWjz8UMN7/adW1qgZiOxbCI/i60T SU7A== 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=G+g2oiB8hBmHKK/9VB8V5x7k3LgCXg/f7UEmyK5AYaQ=; b=VXa1VaREyMRv5cS2d6kXgOKjHpR7zbqTrr1VyGc7EaGpaQsFQAdhsUmacdu48hqAVj /hDbyq/hhpdQeiirSA0x/t0Fj+QfUsMZ7MNQQr9vwVSCSxUndSKr2b3i5WSyO+V2KUf4 2S4zh7hsaUKLcKaTf8U5Akh0twDdgrvxudFH/IpI78ZxZGS6v5OlwdGCIOGY8NnsRre+ aahN1xKcwTJJQqib6rSD7o8hhSNoRkxEYbBeAJ8hQPvYEYHe+AmzyMIL38tqjpVeKPTA rRFPNjO8OKmuDlLFsosuhPuJ2RgD+ybZWDXU7Kr4Ez49E8pv3PK53YJGTvGJWAjaEU41 QNhA== X-Gm-Message-State: AFqh2kpliNcMzjBqRjCy9Fiygaqb0hPEm/MvWnbP7oYRxGmVcdzlGqMt MMgHu9dSLq4epIu085gCj1A= X-Google-Smtp-Source: AMrXdXvYGGh8zqGEMcco8Rwe2eG2RbbHM/P4XZY/qLCBDxTKAhnxIRixzEUfgpkbhAl3WK1UJeHivg== X-Received: by 2002:a17:906:92c4:b0:82d:e2a6:4b1e with SMTP id d4-20020a17090692c400b0082de2a64b1emr65935089ejx.47.1673283613813; Mon, 09 Jan 2023 09:00:13 -0800 (PST) Received: from gvm01 ([91.199.164.40]) by smtp.gmail.com with ESMTPSA id qw25-20020a1709066a1900b007ae1e528390sm3905878ejc.163.2023.01.09.09.00.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 09:00:13 -0800 (PST) Date: Mon, 9 Jan 2023 18:00:10 +0100 From: Piergiorgio Beruto To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Oleksij Rempel , mailhol.vincent@wanadoo.fr, sudheer.mogilappagari@intel.com, sbhatta@marvell.com, linux-doc@vger.kernel.org, wangjie125@huawei.com, corbet@lwn.net, lkp@intel.com, gal@nvidia.com, gustavoars@kernel.org, bagasdotme@gmail.com Subject: [PATCH v4 net-next 3/5] drivers/net/phy: add connection between ethtool and phylib for PLCA Message-ID: <231f9bd7697c0700af37b8a2292bc1a21dd6fef0.1673282912.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 the required connection between netlink ethtool and phylib to resolve PLCA get/set config and get status messages. Signed-off-by: Piergiorgio Beruto Reviewed-by: Andrew Lunn --- drivers/net/phy/phy.c | 192 +++++++++++++++++++++++++++++++++++ drivers/net/phy/phy_device.c | 3 + include/linux/phy.h | 7 ++ 3 files changed, 202 insertions(+) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index e5b6cb1a77f9..3378ca4f49b6 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -543,6 +543,198 @@ int phy_ethtool_get_stats(struct phy_device *phydev, } EXPORT_SYMBOL(phy_ethtool_get_stats); =20 +/** + * phy_ethtool_get_plca_cfg - Get PLCA RS configuration + * @phydev: the phy_device struct + * @plca_cfg: where to store the retrieved configuration + * + * Retrieve the PLCA configuration from the PHY. Return 0 on success or a + * negative value if an error occurred. + */ +int phy_ethtool_get_plca_cfg(struct phy_device *phydev, + struct phy_plca_cfg *plca_cfg) +{ + int ret; + + if (!phydev->drv) { + ret =3D -EIO; + goto out; + } + + if (!phydev->drv->get_plca_cfg) { + ret =3D -EOPNOTSUPP; + goto out; + } + + mutex_lock(&phydev->lock); + ret =3D phydev->drv->get_plca_cfg(phydev, plca_cfg); + + mutex_unlock(&phydev->lock); +out: + return ret; +} + +/** + * plca_check_valid - Check PLCA configuration before enabling + * @phydev: the phy_device struct + * @plca_cfg: current PLCA configuration + * @extack: extack for reporting useful error messages + * + * Checks whether the PLCA and PHY configuration are consistent and it is = safe + * to enable PLCA. Returns 0 on success or a negative value if the PLCA or= PHY + * configuration is not consistent. + */ +static int plca_check_valid(struct phy_device *phydev, + const struct phy_plca_cfg *plca_cfg, + struct netlink_ext_ack *extack) +{ + int ret =3D 0; + + if (!linkmode_test_bit(ETHTOOL_LINK_MODE_10baseT1S_P2MP_Half_BIT, + phydev->advertising)) { + ret =3D -EOPNOTSUPP; + NL_SET_ERR_MSG(extack, + "Point to Multi-Point mode is not enabled"); + } else if (plca_cfg->node_id >=3D 255) { + NL_SET_ERR_MSG(extack, "PLCA node ID is not set"); + ret =3D -EINVAL; + } + + return ret; +} + +/** + * phy_ethtool_set_plca_cfg - Set PLCA RS configuration + * @phydev: the phy_device struct + * @plca_cfg: new PLCA configuration to apply + * @extack: extack for reporting useful error messages + * + * Sets the PLCA configuration in the PHY. Return 0 on success or a + * negative value if an error occurred. + */ +int phy_ethtool_set_plca_cfg(struct phy_device *phydev, + const struct phy_plca_cfg *plca_cfg, + struct netlink_ext_ack *extack) +{ + struct phy_plca_cfg *curr_plca_cfg; + int ret; + + if (!phydev->drv) { + ret =3D -EIO; + goto out; + } + + if (!phydev->drv->set_plca_cfg || + !phydev->drv->get_plca_cfg) { + ret =3D -EOPNOTSUPP; + goto out; + } + + curr_plca_cfg =3D kmalloc(sizeof(*curr_plca_cfg), GFP_KERNEL); + if (!curr_plca_cfg) { + ret =3D -ENOMEM; + goto out; + } + + mutex_lock(&phydev->lock); + + ret =3D phydev->drv->get_plca_cfg(phydev, curr_plca_cfg); + if (ret) + goto out_drv; + + if (curr_plca_cfg->enabled < 0 && plca_cfg->enabled >=3D 0) { + NL_SET_ERR_MSG(extack, + "PHY does not support changing the PLCA 'enable' attribute"); + ret =3D -EINVAL; + goto out_drv; + } + + if (curr_plca_cfg->node_id < 0 && plca_cfg->node_id >=3D 0) { + NL_SET_ERR_MSG(extack, + "PHY does not support changing the PLCA 'local node ID' attribut= e"); + ret =3D -EINVAL; + goto out_drv; + } + + if (curr_plca_cfg->node_cnt < 0 && plca_cfg->node_cnt >=3D 0) { + NL_SET_ERR_MSG(extack, + "PHY does not support changing the PLCA 'node count' attribute"); + ret =3D -EINVAL; + goto out_drv; + } + + if (curr_plca_cfg->to_tmr < 0 && plca_cfg->to_tmr >=3D 0) { + NL_SET_ERR_MSG(extack, + "PHY does not support changing the PLCA 'TO timer' attribute"); + ret =3D -EINVAL; + goto out_drv; + } + + if (curr_plca_cfg->burst_cnt < 0 && plca_cfg->burst_cnt >=3D 0) { + NL_SET_ERR_MSG(extack, + "PHY does not support changing the PLCA 'burst count' attribute"= ); + ret =3D -EINVAL; + goto out_drv; + } + + if (curr_plca_cfg->burst_tmr < 0 && plca_cfg->burst_tmr >=3D 0) { + NL_SET_ERR_MSG(extack, + "PHY does not support changing the PLCA 'burst timer' attribute"= ); + ret =3D -EINVAL; + goto out_drv; + } + + // if enabling PLCA, perform a few sanity checks + if (plca_cfg->enabled > 0) { + // allow setting node_id concurrently with enabled + if (plca_cfg->node_id >=3D 0) + curr_plca_cfg->node_id =3D plca_cfg->node_id; + + ret =3D plca_check_valid(phydev, curr_plca_cfg, extack); + if (ret) + goto out_drv; + } + + ret =3D phydev->drv->set_plca_cfg(phydev, plca_cfg); + +out_drv: + kfree(curr_plca_cfg); + mutex_unlock(&phydev->lock); +out: + return ret; +} + +/** + * phy_ethtool_get_plca_status - Get PLCA RS status information + * @phydev: the phy_device struct + * @plca_st: where to store the retrieved status information + * + * Retrieve the PLCA status information from the PHY. Return 0 on success = or a + * negative value if an error occurred. + */ +int phy_ethtool_get_plca_status(struct phy_device *phydev, + struct phy_plca_status *plca_st) +{ + int ret; + + if (!phydev->drv) { + ret =3D -EIO; + goto out; + } + + if (!phydev->drv->get_plca_status) { + ret =3D -EOPNOTSUPP; + goto out; + } + + mutex_lock(&phydev->lock); + ret =3D phydev->drv->get_plca_status(phydev, plca_st); + + mutex_unlock(&phydev->lock); +out: + return ret; +} + /** * phy_start_cable_test - Start a cable test * diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 8e48b3cec5e7..44bd06be9691 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -3276,6 +3276,9 @@ static const struct ethtool_phy_ops phy_ethtool_phy_o= ps =3D { .get_sset_count =3D phy_ethtool_get_sset_count, .get_strings =3D phy_ethtool_get_strings, .get_stats =3D phy_ethtool_get_stats, + .get_plca_cfg =3D phy_ethtool_get_plca_cfg, + .set_plca_cfg =3D phy_ethtool_set_plca_cfg, + .get_plca_status =3D phy_ethtool_get_plca_status, .start_cable_test =3D phy_start_cable_test, .start_cable_test_tdr =3D phy_start_cable_test_tdr, }; diff --git a/include/linux/phy.h b/include/linux/phy.h index 1e87d3f05209..bcaf1dfd0687 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -1846,6 +1846,13 @@ int phy_ethtool_get_strings(struct phy_device *phyde= v, u8 *data); int phy_ethtool_get_sset_count(struct phy_device *phydev); int phy_ethtool_get_stats(struct phy_device *phydev, struct ethtool_stats *stats, u64 *data); +int phy_ethtool_get_plca_cfg(struct phy_device *phydev, + struct phy_plca_cfg *plca_cfg); +int phy_ethtool_set_plca_cfg(struct phy_device *phydev, + const struct phy_plca_cfg *plca_cfg, + struct netlink_ext_ack *extack); +int phy_ethtool_get_plca_status(struct phy_device *phydev, + struct phy_plca_status *plca_st); =20 static inline int phy_package_read(struct phy_device *phydev, u32 regnum) { --=20 2.37.4