Commit e4629600 authored by Kory Maincent (Dent Project)'s avatar Kory Maincent (Dent Project) Committed by Jakub Kicinski
Browse files

net: ethtool: pse-pd: Expand C33 PSE status with class, power and extended state 



This update expands the status information provided by ethtool for PSE c33.
It includes details such as the detected class, current power delivered,
and extended state information.

Reviewed-by: default avatarOleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: default avatarKory Maincent <kory.maincent@bootlin.com>
Link: https://patch.msgid.link/20240704-feature_poe_power_cap-v6-1-320003204264@bootlin.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 73d4d645

Documentation/networking/ethtool-netlink.rst

+37 −0
Original line number Diff line number Diff line
@@ -1740,6 +1740,13 @@ Kernel response contents: 
                                                  PSE functions.

  ``ETHTOOL_A_C33_PSE_PW_D_STATUS``          u32  power detection status of the

                                                  PoE PSE.

  ``ETHTOOL_A_C33_PSE_PW_CLASS``             u32  power class of the PoE PSE.

  ``ETHTOOL_A_C33_PSE_ACTUAL_PW``            u32  actual power drawn on the

                                                  PoE PSE.

  ``ETHTOOL_A_C33_PSE_EXT_STATE``            u32  power extended state of the

                                                  PoE PSE.

  ``ETHTOOL_A_C33_PSE_EXT_SUBSTATE``         u32  power extended substatus of

                                                  the PoE PSE.

  ======================================  ======  =============================



When set, the optional ``ETHTOOL_A_PODL_PSE_ADMIN_STATE`` attribute identifies
@@ -1772,6 +1779,36 @@ The same goes for ``ETHTOOL_A_C33_PSE_ADMIN_PW_D_STATUS`` implementing 
.. kernel-doc:: include/uapi/linux/ethtool.h

    :identifiers: ethtool_c33_pse_pw_d_status



When set, the optional ``ETHTOOL_A_C33_PSE_PW_CLASS`` attribute identifies

the power class of the C33 PSE. It depends on the class negotiated between

the PSE and the PD. This option is corresponding to ``IEEE 802.3-2022``

30.9.1.1.8 aPSEPowerClassification.



When set, the optional ``ETHTOOL_A_C33_PSE_ACTUAL_PW`` attribute identifies

This option is corresponding to ``IEEE 802.3-2022`` 30.9.1.1.23 aPSEActualPower.

Actual power is reported in mW.



When set, the optional ``ETHTOOL_A_C33_PSE_EXT_STATE`` attribute identifies

the extended error state of the C33 PSE. Possible values are:



.. kernel-doc:: include/uapi/linux/ethtool.h

    :identifiers: ethtool_c33_pse_ext_state



When set, the optional ``ETHTOOL_A_C33_PSE_EXT_SUBSTATE`` attribute identifies

the extended error state of the C33 PSE. Possible values are:

Possible values are:



.. kernel-doc:: include/uapi/linux/ethtool.h

    :identifiers: ethtool_c33_pse_ext_substate_class_num_events

		  ethtool_c33_pse_ext_substate_error_condition

		  ethtool_c33_pse_ext_substate_mr_pse_enable

		  ethtool_c33_pse_ext_substate_option_detect_ted

		  ethtool_c33_pse_ext_substate_option_vport_lim

		  ethtool_c33_pse_ext_substate_ovld_detected

		  ethtool_c33_pse_ext_substate_pd_dll_power_type

		  ethtool_c33_pse_ext_substate_power_not_available

		  ethtool_c33_pse_ext_substate_short_detected



PSE_SET

=======

include/linux/ethtool.h

+15 −0
Original line number Diff line number Diff line
@@ -1273,4 +1273,19 @@ struct ethtool_forced_speed_map { 


void

ethtool_forced_speed_maps_init(struct ethtool_forced_speed_map *maps, u32 size);



/* C33 PSE extended state and substate. */

struct ethtool_c33_pse_ext_state_info {

	enum ethtool_c33_pse_ext_state c33_pse_ext_state;

	union {

		enum ethtool_c33_pse_ext_substate_error_condition error_condition;

		enum ethtool_c33_pse_ext_substate_mr_pse_enable mr_pse_enable;

		enum ethtool_c33_pse_ext_substate_option_detect_ted option_detect_ted;

		enum ethtool_c33_pse_ext_substate_option_vport_lim option_vport_lim;

		enum ethtool_c33_pse_ext_substate_ovld_detected ovld_detected;

		enum ethtool_c33_pse_ext_substate_power_not_available power_not_available;

		enum ethtool_c33_pse_ext_substate_short_detected short_detected;

		u32 __c33_pse_ext_substate;

	};

};

#endif /* _LINUX_ETHTOOL_H */

include/linux/pse-pd/pse.h

+8 −0
Original line number Diff line number Diff line
@@ -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_ext_state_info: extended state information 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;

	struct ethtool_c33_pse_ext_state_info c33_ext_state_info;

};



/**

include/uapi/linux/ethtool.h

+191 −0
Original line number Diff line number Diff line
@@ -752,6 +752,197 @@ enum ethtool_module_power_mode { 
	ETHTOOL_MODULE_POWER_MODE_HIGH,

};



/**

 * enum ethtool_c33_pse_ext_state - groups of PSE extended states

 *      functions. IEEE 802.3-2022 33.2.4.4 Variables

 *

 * @ETHTOOL_C33_PSE_EXT_STATE_ERROR_CONDITION: Group of error_condition states

 * @ETHTOOL_C33_PSE_EXT_STATE_MR_MPS_VALID: Group of mr_mps_valid states

 * @ETHTOOL_C33_PSE_EXT_STATE_MR_PSE_ENABLE: Group of mr_pse_enable states

 * @ETHTOOL_C33_PSE_EXT_STATE_OPTION_DETECT_TED: Group of option_detect_ted

 *	states

 * @ETHTOOL_C33_PSE_EXT_STATE_OPTION_VPORT_LIM: Group of option_vport_lim states

 * @ETHTOOL_C33_PSE_EXT_STATE_OVLD_DETECTED: Group of ovld_detected states

 * @ETHTOOL_C33_PSE_EXT_STATE_PD_DLL_POWER_TYPE: Group of pd_dll_power_type

 *	states

 * @ETHTOOL_C33_PSE_EXT_STATE_POWER_NOT_AVAILABLE: Group of power_not_available

 *	states

 * @ETHTOOL_C33_PSE_EXT_STATE_SHORT_DETECTED: Group of short_detected states

 */

enum ethtool_c33_pse_ext_state {

	ETHTOOL_C33_PSE_EXT_STATE_ERROR_CONDITION = 1,

	ETHTOOL_C33_PSE_EXT_STATE_MR_MPS_VALID,

	ETHTOOL_C33_PSE_EXT_STATE_MR_PSE_ENABLE,

	ETHTOOL_C33_PSE_EXT_STATE_OPTION_DETECT_TED,

	ETHTOOL_C33_PSE_EXT_STATE_OPTION_VPORT_LIM,

	ETHTOOL_C33_PSE_EXT_STATE_OVLD_DETECTED,

	ETHTOOL_C33_PSE_EXT_STATE_PD_DLL_POWER_TYPE,

	ETHTOOL_C33_PSE_EXT_STATE_POWER_NOT_AVAILABLE,

	ETHTOOL_C33_PSE_EXT_STATE_SHORT_DETECTED,

};



/**

 * enum ethtool_c33_pse_ext_substate_mr_mps_valid - mr_mps_valid states

 *      functions. IEEE 802.3-2022 33.2.4.4 Variables

 *

 * @ETHTOOL_C33_PSE_EXT_SUBSTATE_MR_MPS_VALID_DETECTED_UNDERLOAD: Underload

 *	state

 * @ETHTOOL_C33_PSE_EXT_SUBSTATE_MR_MPS_VALID_CONNECTION_OPEN: Port is not

 *	connected

 *

 * The PSE monitors either the DC or AC Maintain Power Signature

 * (MPS, see 33.2.9.1). This variable indicates the presence or absence of

 * a valid MPS.

 */

enum ethtool_c33_pse_ext_substate_mr_mps_valid {

	ETHTOOL_C33_PSE_EXT_SUBSTATE_MR_MPS_VALID_DETECTED_UNDERLOAD = 1,

	ETHTOOL_C33_PSE_EXT_SUBSTATE_MR_MPS_VALID_CONNECTION_OPEN,

};



/**

 * enum ethtool_c33_pse_ext_substate_error_condition - error_condition states

 *      functions. IEEE 802.3-2022 33.2.4.4 Variables

 *

 * @ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_NON_EXISTING_PORT: Non-existing

 *	port number

 * @ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_UNDEFINED_PORT: Undefined port

 * @ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_INTERNAL_HW_FAULT: Internal

 *	hardware fault

 * @ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_COMM_ERROR_AFTER_FORCE_ON:

 *	Communication error after force on

 * @ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_UNKNOWN_PORT_STATUS: Unknown

 *	port status

 * @ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_HOST_CRASH_TURN_OFF: Host

 *	crash turn off

 * @ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_HOST_CRASH_FORCE_SHUTDOWN:

 *	Host crash force shutdown

 * @ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_CONFIG_CHANGE: Configuration

 *	change

 * @ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_DETECTED_OVER_TEMP: Over

 *	temperature detected

 *

 * error_condition is a variable indicating the status of

 * implementation-specific fault conditions or optionally other system faults

 * that prevent the PSE from meeting the specifications in Table 33–11 and that

 * require the PSE not to source power. These error conditions are different

 * from those monitored by the state diagrams in Figure 33–10.

 */

enum ethtool_c33_pse_ext_substate_error_condition {

	ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_NON_EXISTING_PORT = 1,

	ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_UNDEFINED_PORT,

	ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_INTERNAL_HW_FAULT,

	ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_COMM_ERROR_AFTER_FORCE_ON,

	ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_UNKNOWN_PORT_STATUS,

	ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_HOST_CRASH_TURN_OFF,

	ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_HOST_CRASH_FORCE_SHUTDOWN,

	ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_CONFIG_CHANGE,

	ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_DETECTED_OVER_TEMP,

};



/**

 * enum ethtool_c33_pse_ext_substate_mr_pse_enable - mr_pse_enable states

 *      functions. IEEE 802.3-2022 33.2.4.4 Variables

 *

 * @ETHTOOL_C33_PSE_EXT_SUBSTATE_MR_PSE_ENABLE_DISABLE_PIN_ACTIVE: Disable

 *	pin active

 *

 * mr_pse_enable is control variable that selects PSE operation and test

 * functions.

 */

enum ethtool_c33_pse_ext_substate_mr_pse_enable {

	ETHTOOL_C33_PSE_EXT_SUBSTATE_MR_PSE_ENABLE_DISABLE_PIN_ACTIVE = 1,

};



/**

 * enum ethtool_c33_pse_ext_substate_option_detect_ted - option_detect_ted

 *	states functions. IEEE 802.3-2022 33.2.4.4 Variables

 *

 * @ETHTOOL_C33_PSE_EXT_SUBSTATE_OPTION_DETECT_TED_DET_IN_PROCESS: Detection

 *	in process

 * @ETHTOOL_C33_PSE_EXT_SUBSTATE_OPTION_DETECT_TED_CONNECTION_CHECK_ERROR:

 *	Connection check error

 *

 * option_detect_ted is a variable indicating if detection can be performed

 * by the PSE during the ted_timer interval.

 */

enum ethtool_c33_pse_ext_substate_option_detect_ted {

	ETHTOOL_C33_PSE_EXT_SUBSTATE_OPTION_DETECT_TED_DET_IN_PROCESS = 1,

	ETHTOOL_C33_PSE_EXT_SUBSTATE_OPTION_DETECT_TED_CONNECTION_CHECK_ERROR,

};



/**

 * enum ethtool_c33_pse_ext_substate_option_vport_lim - option_vport_lim states

 *      functions. IEEE 802.3-2022 33.2.4.4 Variables

 *

 * @ETHTOOL_C33_PSE_EXT_SUBSTATE_OPTION_VPORT_LIM_HIGH_VOLTAGE: Main supply

 *	voltage is high

 * @ETHTOOL_C33_PSE_EXT_SUBSTATE_OPTION_VPORT_LIM_LOW_VOLTAGE: Main supply

 *	voltage is low

 * @ETHTOOL_C33_PSE_EXT_SUBSTATE_OPTION_VPORT_LIM_VOLTAGE_INJECTION: Voltage

 *	injection into the port

 *

 * option_vport_lim is an optional variable indicates if VPSE is out of the

 * operating range during normal operating state.

 */

enum ethtool_c33_pse_ext_substate_option_vport_lim {

	ETHTOOL_C33_PSE_EXT_SUBSTATE_OPTION_VPORT_LIM_HIGH_VOLTAGE = 1,

	ETHTOOL_C33_PSE_EXT_SUBSTATE_OPTION_VPORT_LIM_LOW_VOLTAGE,

	ETHTOOL_C33_PSE_EXT_SUBSTATE_OPTION_VPORT_LIM_VOLTAGE_INJECTION,

};



/**

 * enum ethtool_c33_pse_ext_substate_ovld_detected - ovld_detected states

 *      functions. IEEE 802.3-2022 33.2.4.4 Variables

 *

 * @ETHTOOL_C33_PSE_EXT_SUBSTATE_OVLD_DETECTED_OVERLOAD: Overload state

 *

 * ovld_detected is a variable indicating if the PSE output current has been

 * in an overload condition (see 33.2.7.6) for at least TCUT of a one-second

 * sliding time.

 */

enum ethtool_c33_pse_ext_substate_ovld_detected {

	ETHTOOL_C33_PSE_EXT_SUBSTATE_OVLD_DETECTED_OVERLOAD = 1,

};



/**

 * enum ethtool_c33_pse_ext_substate_power_not_available - power_not_available

 *	states functions. IEEE 802.3-2022 33.2.4.4 Variables

 *

 * @ETHTOOL_C33_PSE_EXT_SUBSTATE_POWER_NOT_AVAILABLE_BUDGET_EXCEEDED: Power

 *	budget exceeded for the controller

 * @ETHTOOL_C33_PSE_EXT_SUBSTATE_POWER_NOT_AVAILABLE_PORT_PW_LIMIT_EXCEEDS_CONTROLLER_BUDGET:

 *	Configured port power limit exceeded controller power budget

 * @ETHTOOL_C33_PSE_EXT_SUBSTATE_POWER_NOT_AVAILABLE_PD_REQUEST_EXCEEDS_PORT_LIMIT:

 *	Power request from PD exceeds port limit

 * @ETHTOOL_C33_PSE_EXT_SUBSTATE_POWER_NOT_AVAILABLE_HW_PW_LIMIT: Power

 *	denied due to Hardware power limit

 *

 * power_not_available is a variable that is asserted in an

 * implementation-dependent manner when the PSE is no longer capable of

 * sourcing sufficient power to support the attached PD. Sufficient power

 * is defined by classification; see 33.2.6.

 */

enum ethtool_c33_pse_ext_substate_power_not_available {

	ETHTOOL_C33_PSE_EXT_SUBSTATE_POWER_NOT_AVAILABLE_BUDGET_EXCEEDED =  1,

	ETHTOOL_C33_PSE_EXT_SUBSTATE_POWER_NOT_AVAILABLE_PORT_PW_LIMIT_EXCEEDS_CONTROLLER_BUDGET,

	ETHTOOL_C33_PSE_EXT_SUBSTATE_POWER_NOT_AVAILABLE_PD_REQUEST_EXCEEDS_PORT_LIMIT,

	ETHTOOL_C33_PSE_EXT_SUBSTATE_POWER_NOT_AVAILABLE_HW_PW_LIMIT,

};



/**

 * enum ethtool_c33_pse_ext_substate_short_detected - short_detected states

 *      functions. IEEE 802.3-2022 33.2.4.4 Variables

 *

 * @ETHTOOL_C33_PSE_EXT_SUBSTATE_SHORT_DETECTED_SHORT_CONDITION: Short

 *	condition was detected

 *

 * short_detected is a variable indicating if the PSE output current has been

 * in a short circuit condition for TLIM within a sliding window (see 33.2.7.7).

 */

enum ethtool_c33_pse_ext_substate_short_detected {

	ETHTOOL_C33_PSE_EXT_SUBSTATE_SHORT_DETECTED_SHORT_CONDITION = 1,

};



/**

 * enum ethtool_pse_types - Types of PSE controller.

 * @ETHTOOL_PSE_UNKNOWN: Type of PSE controller is unknown

include/uapi/linux/ethtool_netlink.h

+4 −0
Original line number Diff line number Diff line
@@ -939,6 +939,10 @@ 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_CLASS,		/* u32 */

	ETHTOOL_A_C33_PSE_ACTUAL_PW,		/* u32 */

	ETHTOOL_A_C33_PSE_EXT_STATE,		/* u32 */

	ETHTOOL_A_C33_PSE_EXT_SUBSTATE,		/* u32 */



	/* add new constants above here */

	__ETHTOOL_A_PSE_CNT,