lkml.org 
[lkml]   [2024]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH net-next v4 06/17] net: ethtool: pse-pd: Expand pse commands with the PSE PoE interface
    Add PSE PoE interface support in the ethtool pse command.

    This patch is sponsored by Dent Project <dentproject@linuxfoundation.org>.

    Reviewed-by: Andrew Lunn <andrew@lunn.ch>
    Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
    ---

    Changes in v2:
    - Follow the "c33" PoE prefix naming change.

    Changes in v3:
    - Replace the pse_get_types() helper by pse_has_podl() and pse_has_c33().
    - Replace PoE to c33 in the netlink error log.
    - Fix documentation build warning.
    ---
    Documentation/networking/ethtool-netlink.rst | 20 ++++++++++
    net/ethtool/pse-pd.c | 60 +++++++++++++++++++++++-----
    2 files changed, 70 insertions(+), 10 deletions(-)

    diff --git a/Documentation/networking/ethtool-netlink.rst b/Documentation/networking/ethtool-netlink.rst
    index d583d9abf2f8..294187c3a3b0 100644
    --- a/Documentation/networking/ethtool-netlink.rst
    +++ b/Documentation/networking/ethtool-netlink.rst
    @@ -1717,6 +1717,10 @@ Kernel response contents:
    PSE functions
    ``ETHTOOL_A_PODL_PSE_PW_D_STATUS`` u32 power detection status of the
    PoDL PSE.
    + ``ETHTOOL_A_C33_PSE_ADMIN_STATE`` u32 Operational state of the PoE
    + PSE functions.
    + ``ETHTOOL_A_C33_PSE_PW_D_STATUS`` u32 power detection status of the
    + PoE PSE.
    ====================================== ====== =============================

    When set, the optional ``ETHTOOL_A_PODL_PSE_ADMIN_STATE`` attribute identifies
    @@ -1728,6 +1732,12 @@ aPoDLPSEAdminState. Possible values are:
    .. kernel-doc:: include/uapi/linux/ethtool.h
    :identifiers: ethtool_podl_pse_admin_state

    +The same goes for ``ETHTOOL_A_C33_PSE_ADMIN_STATE`` implementing
    +``IEEE 802.3-2022`` 30.9.1.1.2 aPSEAdminState.
    +
    +.. kernel-doc:: include/uapi/linux/ethtool.h
    + :identifiers: ethtool_c33_pse_admin_state
    +
    When set, the optional ``ETHTOOL_A_PODL_PSE_PW_D_STATUS`` attribute identifies
    the power detection status of the PoDL PSE. The status depend on internal PSE
    state machine and automatic PD classification support. This option is
    @@ -1737,6 +1747,12 @@ Possible values are:
    .. kernel-doc:: include/uapi/linux/ethtool.h
    :identifiers: ethtool_podl_pse_pw_d_status

    +The same goes for ``ETHTOOL_A_C33_PSE_ADMIN_PW_D_STATUS`` implementing
    +``IEEE 802.3-2022`` 30.9.1.1.5 aPSEPowerDetectionStatus.
    +
    +.. kernel-doc:: include/uapi/linux/ethtool.h
    + :identifiers: ethtool_c33_pse_pw_d_status
    +
    PSE_SET
    =======

    @@ -1747,6 +1763,7 @@ Request contents:
    ====================================== ====== =============================
    ``ETHTOOL_A_PSE_HEADER`` nested request header
    ``ETHTOOL_A_PODL_PSE_ADMIN_CONTROL`` u32 Control PoDL PSE Admin state
    + ``ETHTOOL_A_C33_PSE_ADMIN_CONTROL`` u32 Control PSE Admin state
    ====================================== ====== =============================

    When set, the optional ``ETHTOOL_A_PODL_PSE_ADMIN_CONTROL`` attribute is used
    @@ -1754,6 +1771,9 @@ to control PoDL PSE Admin functions. This option is implementing
    ``IEEE 802.3-2018`` 30.15.1.2.1 acPoDLPSEAdminControl. See
    ``ETHTOOL_A_PODL_PSE_ADMIN_STATE`` for supported values.

    +The same goes for ``ETHTOOL_A_C33_PSE_ADMIN_CONTROL`` implementing
    +``IEEE 802.3-2022`` 30.9.1.2.1 acPSEAdminControl.
    +
    RSS_GET
    =======

    diff --git a/net/ethtool/pse-pd.c b/net/ethtool/pse-pd.c
    index aef57a058f0d..a3bfc3d9644e 100644
    --- a/net/ethtool/pse-pd.c
    +++ b/net/ethtool/pse-pd.c
    @@ -82,6 +82,10 @@ static int pse_reply_size(const struct ethnl_req_info *req_base,
    len += nla_total_size(sizeof(u32)); /* _PODL_PSE_ADMIN_STATE */
    if (st->podl_pw_status > 0)
    len += nla_total_size(sizeof(u32)); /* _PODL_PSE_PW_D_STATUS */
    + if (st->c33_admin_state > 0)
    + len += nla_total_size(sizeof(u32)); /* _C33_PSE_ADMIN_STATE */
    + if (st->c33_pw_status > 0)
    + len += nla_total_size(sizeof(u32)); /* _C33_PSE_PW_D_STATUS */

    return len;
    }
    @@ -103,6 +107,16 @@ static int pse_fill_reply(struct sk_buff *skb,
    st->podl_pw_status))
    return -EMSGSIZE;

    + if (st->c33_admin_state > 0 &&
    + nla_put_u32(skb, ETHTOOL_A_C33_PSE_ADMIN_STATE,
    + st->c33_admin_state))
    + return -EMSGSIZE;
    +
    + if (st->c33_pw_status > 0 &&
    + nla_put_u32(skb, ETHTOOL_A_C33_PSE_PW_D_STATUS,
    + st->c33_pw_status))
    + return -EMSGSIZE;
    +
    return 0;
    }

    @@ -113,25 +127,18 @@ const struct nla_policy ethnl_pse_set_policy[ETHTOOL_A_PSE_MAX + 1] = {
    [ETHTOOL_A_PODL_PSE_ADMIN_CONTROL] =
    NLA_POLICY_RANGE(NLA_U32, ETHTOOL_PODL_PSE_ADMIN_STATE_DISABLED,
    ETHTOOL_PODL_PSE_ADMIN_STATE_ENABLED),
    + [ETHTOOL_A_C33_PSE_ADMIN_CONTROL] =
    + NLA_POLICY_RANGE(NLA_U32, ETHTOOL_C33_PSE_ADMIN_STATE_DISABLED,
    + ETHTOOL_C33_PSE_ADMIN_STATE_ENABLED),
    };

    static int
    ethnl_set_pse_validate(struct ethnl_req_info *req_info, struct genl_info *info)
    -{
    - return !!info->attrs[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL];
    -}
    -
    -static int
    -ethnl_set_pse(struct ethnl_req_info *req_info, struct genl_info *info)
    {
    struct net_device *dev = req_info->dev;
    - struct pse_control_config config = {};
    struct nlattr **tb = info->attrs;
    struct phy_device *phydev;

    - /* this values are already validated by the ethnl_pse_set_policy */
    - config.podl_admin_control = nla_get_u32(tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL]);
    -
    phydev = dev->phydev;
    if (!phydev) {
    NL_SET_ERR_MSG(info->extack, "No PHY is attached");
    @@ -143,6 +150,39 @@ ethnl_set_pse(struct ethnl_req_info *req_info, struct genl_info *info)
    return -EOPNOTSUPP;
    }

    + if (tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL] &&
    + !(pse_has_podl(phydev->psec))) {
    + NL_SET_ERR_MSG_ATTR(info->extack,
    + tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL],
    + "setting PoDL PSE admin control not supported");
    + return -EOPNOTSUPP;
    + }
    + if (tb[ETHTOOL_A_C33_PSE_ADMIN_CONTROL] &&
    + !(pse_has_c33(phydev->psec))) {
    + NL_SET_ERR_MSG_ATTR(info->extack,
    + tb[ETHTOOL_A_C33_PSE_ADMIN_CONTROL],
    + "setting C33 PSE admin control not supported");
    + return -EOPNOTSUPP;
    + }
    +
    + return 1;
    +}
    +
    +static int
    +ethnl_set_pse(struct ethnl_req_info *req_info, struct genl_info *info)
    +{
    + struct net_device *dev = req_info->dev;
    + struct pse_control_config config = {};
    + struct nlattr **tb = info->attrs;
    + struct phy_device *phydev;
    +
    + phydev = dev->phydev;
    + /* These values are already validated by the ethnl_pse_set_policy */
    + if (pse_has_podl(phydev->psec))
    + config.podl_admin_control = nla_get_u32(tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL]);
    + if (pse_has_c33(phydev->psec))
    + config.c33_admin_control = nla_get_u32(tb[ETHTOOL_A_C33_PSE_ADMIN_CONTROL]);
    +
    /* Return errno directly - PSE has no notification */
    return pse_ethtool_set_config(phydev->psec, info->extack, &config);
    }
    --
    2.25.1


    \
     
     \ /
      Last update: 2024-05-27 15:05    [W:6.125 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site