Re: [PATCH 2/8] net: ethtool: pse-pd: Expand C33 PSE status with class, power and status message

[Donald Hunter]

Kory Maincent <kory.maincent@xxxxxxxxxxx> writes:

> From: "Kory Maincent (Dent Project)" <kory.maincent@xxxxxxxxxxx>
>
> This update expands the status information provided by ethtool for PSE c33.
> It includes details such as the detected class, current power delivered,
> and a detailed status message.
>
> Signed-off-by: Kory Maincent <kory.maincent@xxxxxxxxxxx>
> ---
>  include/linux/pse-pd/pse.h           |  8 ++++++++
>  include/uapi/linux/ethtool_netlink.h |  3 +++
>  net/ethtool/pse-pd.c                 | 22 ++++++++++++++++++++++
>  3 files changed, 33 insertions(+)
>
> diff --git a/include/linux/pse-pd/pse.h b/include/linux/pse-pd/pse.h
> index 6eec24ffa866..04219ca20d60 100644
> --- a/include/linux/pse-pd/pse.h
> +++ b/include/linux/pse-pd/pse.h
> @@ -36,12 +36,20 @@ struct pse_control_config {
>   *	functions. IEEE 802.3-2022 30.9.1.1.2 aPSEAdminState
>   * @c33_pw_status: power detection status of the PSE.
>   *	IEEE 802.3-2022 30.9.1.1.5 aPSEPowerDetectionStatus:
> + * @c33_pw_class: detected class of a powered PD
> + *	IEEE 802.3-2022 30.9.1.1.8 aPSEPowerClassification
> + * @c33_actual_pw: power currently delivered by the PSE in mW
> + *	IEEE 802.3-2022 30.9.1.1.23 aPSEActualPower
> + * @c33_pw_status_msg: detailed power detection status of the PSE
>   */
>  struct pse_control_status {
>  	enum ethtool_podl_pse_admin_state podl_admin_state;
>  	enum ethtool_podl_pse_pw_d_status podl_pw_status;
>  	enum ethtool_c33_pse_admin_state c33_admin_state;
>  	enum ethtool_c33_pse_pw_d_status c33_pw_status;
> +	u32 c33_pw_class;
> +	u32 c33_actual_pw;
> +	const char *c33_pw_status_msg;
>  };
>  
>  /**
> diff --git a/include/uapi/linux/ethtool_netlink.h b/include/uapi/linux/ethtool_netlink.h
> index b49b804b9495..c3f288b737e6 100644
> --- a/include/uapi/linux/ethtool_netlink.h
> +++ b/include/uapi/linux/ethtool_netlink.h
> @@ -915,6 +915,9 @@ enum {
>  	ETHTOOL_A_C33_PSE_ADMIN_STATE,		/* u32 */
>  	ETHTOOL_A_C33_PSE_ADMIN_CONTROL,	/* u32 */
>  	ETHTOOL_A_C33_PSE_PW_D_STATUS,		/* u32 */
> +	ETHTOOL_A_C33_PSE_PW_STATUS_MSG,	/* binary */

It looks like the type is 'string' ?

> +	ETHTOOL_A_C33_PSE_PW_CLASS,		/* u32 */
> +	ETHTOOL_A_C33_PSE_ACTUAL_PW,		/* u32 */
>  
>  	/* add new constants above here */
>  	__ETHTOOL_A_PSE_CNT,
> diff --git a/net/ethtool/pse-pd.c b/net/ethtool/pse-pd.c
> index 2c981d443f27..faddc14efbea 100644
> --- a/net/ethtool/pse-pd.c
> +++ b/net/ethtool/pse-pd.c
> @@ -86,6 +86,13 @@ static int pse_reply_size(const struct ethnl_req_info *req_base,
>  		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 */
> +	if (st->c33_pw_class > 0)
> +		len += nla_total_size(sizeof(u32)); /* _C33_PSE_PW_CLASS */
> +	if (st->c33_actual_pw > 0)
> +		len += nla_total_size(sizeof(u32)); /* _C33_PSE_ACTUAL_PW */
> +	if (st->c33_pw_status_msg)
> +		/* _C33_PSE_PW_STATUS_MSG */
> +		len += nla_total_size(strlen(st->c33_pw_status_msg) + 1);
>  
>  	return len;
>  }
> @@ -117,6 +124,21 @@ static int pse_fill_reply(struct sk_buff *skb,
>  			st->c33_pw_status))
>  		return -EMSGSIZE;
>  
> +	if (st->c33_pw_class > 0 &&
> +	    nla_put_u32(skb, ETHTOOL_A_C33_PSE_PW_CLASS,
> +			st->c33_pw_class))
> +		return -EMSGSIZE;
> +
> +	if (st->c33_actual_pw > 0 &&
> +	    nla_put_u32(skb, ETHTOOL_A_C33_PSE_ACTUAL_PW,
> +			st->c33_actual_pw))
> +		return -EMSGSIZE;
> +
> +	if (st->c33_pw_status_msg &&
> +	    nla_put_string(skb, ETHTOOL_A_C33_PSE_PW_STATUS_MSG,
> +			   st->c33_pw_status_msg))
> +		return -EMSGSIZE;
> +
>  	return 0;
>  }