History

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.

Kory Maincent (Dent Project) committed 2 years ago

Commit e4629601 parent 73d4d646 files · +286 −1Browse files

Showing the changes to include/uapi (2 of 6 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/ethtool.h +191 −0
  2. include/uapi/linux/ethtool_netlink.h +4 −0
include/uapi/linux/ethtool.h+191−0
@@ -752,6 +752,197 @@ enum ethtool_module_power_mode { · 751 unmodified lines
752752 ETHTOOL_MODULE_POWER_MODE_HIGH,
753753 };
754754
755+/**
756+ * enum ethtool_c33_pse_ext_state - groups of PSE extended states
757+ * functions. IEEE 802.3-2022 33.2.4.4 Variables
758+ *
759+ * @ETHTOOL_C33_PSE_EXT_STATE_ERROR_CONDITION: Group of error_condition states
760+ * @ETHTOOL_C33_PSE_EXT_STATE_MR_MPS_VALID: Group of mr_mps_valid states
761+ * @ETHTOOL_C33_PSE_EXT_STATE_MR_PSE_ENABLE: Group of mr_pse_enable states
762+ * @ETHTOOL_C33_PSE_EXT_STATE_OPTION_DETECT_TED: Group of option_detect_ted
763+ * states
764+ * @ETHTOOL_C33_PSE_EXT_STATE_OPTION_VPORT_LIM: Group of option_vport_lim states
765+ * @ETHTOOL_C33_PSE_EXT_STATE_OVLD_DETECTED: Group of ovld_detected states
766+ * @ETHTOOL_C33_PSE_EXT_STATE_PD_DLL_POWER_TYPE: Group of pd_dll_power_type
767+ * states
768+ * @ETHTOOL_C33_PSE_EXT_STATE_POWER_NOT_AVAILABLE: Group of power_not_available
769+ * states
770+ * @ETHTOOL_C33_PSE_EXT_STATE_SHORT_DETECTED: Group of short_detected states
771+ */
772+enum ethtool_c33_pse_ext_state {
773+ ETHTOOL_C33_PSE_EXT_STATE_ERROR_CONDITION = 1,
774+ ETHTOOL_C33_PSE_EXT_STATE_MR_MPS_VALID,
775+ ETHTOOL_C33_PSE_EXT_STATE_MR_PSE_ENABLE,
776+ ETHTOOL_C33_PSE_EXT_STATE_OPTION_DETECT_TED,
777+ ETHTOOL_C33_PSE_EXT_STATE_OPTION_VPORT_LIM,
778+ ETHTOOL_C33_PSE_EXT_STATE_OVLD_DETECTED,
779+ ETHTOOL_C33_PSE_EXT_STATE_PD_DLL_POWER_TYPE,
780+ ETHTOOL_C33_PSE_EXT_STATE_POWER_NOT_AVAILABLE,
781+ ETHTOOL_C33_PSE_EXT_STATE_SHORT_DETECTED,
782+};
783+
784+/**
785+ * enum ethtool_c33_pse_ext_substate_mr_mps_valid - mr_mps_valid states
786+ * functions. IEEE 802.3-2022 33.2.4.4 Variables
787+ *
788+ * @ETHTOOL_C33_PSE_EXT_SUBSTATE_MR_MPS_VALID_DETECTED_UNDERLOAD: Underload
789+ * state
790+ * @ETHTOOL_C33_PSE_EXT_SUBSTATE_MR_MPS_VALID_CONNECTION_OPEN: Port is not
791+ * connected
792+ *
793+ * The PSE monitors either the DC or AC Maintain Power Signature
794+ * (MPS, see 33.2.9.1). This variable indicates the presence or absence of
795+ * a valid MPS.
796+ */
797+enum ethtool_c33_pse_ext_substate_mr_mps_valid {
798+ ETHTOOL_C33_PSE_EXT_SUBSTATE_MR_MPS_VALID_DETECTED_UNDERLOAD = 1,
799+ ETHTOOL_C33_PSE_EXT_SUBSTATE_MR_MPS_VALID_CONNECTION_OPEN,
800+};
801+
802+/**
803+ * enum ethtool_c33_pse_ext_substate_error_condition - error_condition states
804+ * functions. IEEE 802.3-2022 33.2.4.4 Variables
805+ *
806+ * @ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_NON_EXISTING_PORT: Non-existing
807+ * port number
808+ * @ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_UNDEFINED_PORT: Undefined port
809+ * @ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_INTERNAL_HW_FAULT: Internal
810+ * hardware fault
811+ * @ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_COMM_ERROR_AFTER_FORCE_ON:
812+ * Communication error after force on
813+ * @ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_UNKNOWN_PORT_STATUS: Unknown
814+ * port status
815+ * @ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_HOST_CRASH_TURN_OFF: Host
816+ * crash turn off
817+ * @ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_HOST_CRASH_FORCE_SHUTDOWN:
818+ * Host crash force shutdown
819+ * @ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_CONFIG_CHANGE: Configuration
820+ * change
821+ * @ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_DETECTED_OVER_TEMP: Over
822+ * temperature detected
823+ *
824+ * error_condition is a variable indicating the status of
825+ * implementation-specific fault conditions or optionally other system faults
826+ * that prevent the PSE from meeting the specifications in Table 33–11 and that
827+ * require the PSE not to source power. These error conditions are different
828+ * from those monitored by the state diagrams in Figure 33–10.
829+ */
830+enum ethtool_c33_pse_ext_substate_error_condition {
831+ ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_NON_EXISTING_PORT = 1,
832+ ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_UNDEFINED_PORT,
833+ ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_INTERNAL_HW_FAULT,
834+ ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_COMM_ERROR_AFTER_FORCE_ON,
835+ ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_UNKNOWN_PORT_STATUS,
836+ ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_HOST_CRASH_TURN_OFF,
837+ ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_HOST_CRASH_FORCE_SHUTDOWN,
838+ ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_CONFIG_CHANGE,
839+ ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_DETECTED_OVER_TEMP,
840+};
841+
842+/**
843+ * enum ethtool_c33_pse_ext_substate_mr_pse_enable - mr_pse_enable states
844+ * functions. IEEE 802.3-2022 33.2.4.4 Variables
845+ *
846+ * @ETHTOOL_C33_PSE_EXT_SUBSTATE_MR_PSE_ENABLE_DISABLE_PIN_ACTIVE: Disable
847+ * pin active
848+ *
849+ * mr_pse_enable is control variable that selects PSE operation and test
850+ * functions.
851+ */
852+enum ethtool_c33_pse_ext_substate_mr_pse_enable {
853+ ETHTOOL_C33_PSE_EXT_SUBSTATE_MR_PSE_ENABLE_DISABLE_PIN_ACTIVE = 1,
854+};
855+
856+/**
857+ * enum ethtool_c33_pse_ext_substate_option_detect_ted - option_detect_ted
858+ * states functions. IEEE 802.3-2022 33.2.4.4 Variables
859+ *
860+ * @ETHTOOL_C33_PSE_EXT_SUBSTATE_OPTION_DETECT_TED_DET_IN_PROCESS: Detection
861+ * in process
862+ * @ETHTOOL_C33_PSE_EXT_SUBSTATE_OPTION_DETECT_TED_CONNECTION_CHECK_ERROR:
863+ * Connection check error
864+ *
865+ * option_detect_ted is a variable indicating if detection can be performed
866+ * by the PSE during the ted_timer interval.
867+ */
868+enum ethtool_c33_pse_ext_substate_option_detect_ted {
869+ ETHTOOL_C33_PSE_EXT_SUBSTATE_OPTION_DETECT_TED_DET_IN_PROCESS = 1,
870+ ETHTOOL_C33_PSE_EXT_SUBSTATE_OPTION_DETECT_TED_CONNECTION_CHECK_ERROR,
871+};
872+
873+/**
874+ * enum ethtool_c33_pse_ext_substate_option_vport_lim - option_vport_lim states
875+ * functions. IEEE 802.3-2022 33.2.4.4 Variables
876+ *
877+ * @ETHTOOL_C33_PSE_EXT_SUBSTATE_OPTION_VPORT_LIM_HIGH_VOLTAGE: Main supply
878+ * voltage is high
879+ * @ETHTOOL_C33_PSE_EXT_SUBSTATE_OPTION_VPORT_LIM_LOW_VOLTAGE: Main supply
880+ * voltage is low
881+ * @ETHTOOL_C33_PSE_EXT_SUBSTATE_OPTION_VPORT_LIM_VOLTAGE_INJECTION: Voltage
882+ * injection into the port
883+ *
884+ * option_vport_lim is an optional variable indicates if VPSE is out of the
885+ * operating range during normal operating state.
886+ */
887+enum ethtool_c33_pse_ext_substate_option_vport_lim {
888+ ETHTOOL_C33_PSE_EXT_SUBSTATE_OPTION_VPORT_LIM_HIGH_VOLTAGE = 1,
889+ ETHTOOL_C33_PSE_EXT_SUBSTATE_OPTION_VPORT_LIM_LOW_VOLTAGE,
890+ ETHTOOL_C33_PSE_EXT_SUBSTATE_OPTION_VPORT_LIM_VOLTAGE_INJECTION,
891+};
892+
893+/**
894+ * enum ethtool_c33_pse_ext_substate_ovld_detected - ovld_detected states
895+ * functions. IEEE 802.3-2022 33.2.4.4 Variables
896+ *
897+ * @ETHTOOL_C33_PSE_EXT_SUBSTATE_OVLD_DETECTED_OVERLOAD: Overload state
898+ *
899+ * ovld_detected is a variable indicating if the PSE output current has been
900+ * in an overload condition (see 33.2.7.6) for at least TCUT of a one-second
901+ * sliding time.
902+ */
903+enum ethtool_c33_pse_ext_substate_ovld_detected {
904+ ETHTOOL_C33_PSE_EXT_SUBSTATE_OVLD_DETECTED_OVERLOAD = 1,
905+};
906+
907+/**
908+ * enum ethtool_c33_pse_ext_substate_power_not_available - power_not_available
909+ * states functions. IEEE 802.3-2022 33.2.4.4 Variables
910+ *
911+ * @ETHTOOL_C33_PSE_EXT_SUBSTATE_POWER_NOT_AVAILABLE_BUDGET_EXCEEDED: Power
912+ * budget exceeded for the controller
913+ * @ETHTOOL_C33_PSE_EXT_SUBSTATE_POWER_NOT_AVAILABLE_PORT_PW_LIMIT_EXCEEDS_CONTROLLER_BUDGET:
914+ * Configured port power limit exceeded controller power budget
915+ * @ETHTOOL_C33_PSE_EXT_SUBSTATE_POWER_NOT_AVAILABLE_PD_REQUEST_EXCEEDS_PORT_LIMIT:
916+ * Power request from PD exceeds port limit
917+ * @ETHTOOL_C33_PSE_EXT_SUBSTATE_POWER_NOT_AVAILABLE_HW_PW_LIMIT: Power
918+ * denied due to Hardware power limit
919+ *
920+ * power_not_available is a variable that is asserted in an
921+ * implementation-dependent manner when the PSE is no longer capable of
922+ * sourcing sufficient power to support the attached PD. Sufficient power
923+ * is defined by classification; see 33.2.6.
924+ */
925+enum ethtool_c33_pse_ext_substate_power_not_available {
926+ ETHTOOL_C33_PSE_EXT_SUBSTATE_POWER_NOT_AVAILABLE_BUDGET_EXCEEDED = 1,
927+ ETHTOOL_C33_PSE_EXT_SUBSTATE_POWER_NOT_AVAILABLE_PORT_PW_LIMIT_EXCEEDS_CONTROLLER_BUDGET,
928+ ETHTOOL_C33_PSE_EXT_SUBSTATE_POWER_NOT_AVAILABLE_PD_REQUEST_EXCEEDS_PORT_LIMIT,
929+ ETHTOOL_C33_PSE_EXT_SUBSTATE_POWER_NOT_AVAILABLE_HW_PW_LIMIT,
930+};
931+
932+/**
933+ * enum ethtool_c33_pse_ext_substate_short_detected - short_detected states
934+ * functions. IEEE 802.3-2022 33.2.4.4 Variables
935+ *
936+ * @ETHTOOL_C33_PSE_EXT_SUBSTATE_SHORT_DETECTED_SHORT_CONDITION: Short
937+ * condition was detected
938+ *
939+ * short_detected is a variable indicating if the PSE output current has been
940+ * in a short circuit condition for TLIM within a sliding window (see 33.2.7.7).
941+ */
942+enum ethtool_c33_pse_ext_substate_short_detected {
943+ ETHTOOL_C33_PSE_EXT_SUBSTATE_SHORT_DETECTED_SHORT_CONDITION = 1,
944+};
945+
755946 /**
756947 * enum ethtool_pse_types - Types of PSE controller.
757948 * @ETHTOOL_PSE_UNKNOWN: Type of PSE controller is unknown
include/uapi/linux/ethtool_netlink.h+4−0
@@ -939,6 +939,10 @@ enum { · 938 unmodified lines
939939 ETHTOOL_A_C33_PSE_ADMIN_STATE, /* u32 */
940940 ETHTOOL_A_C33_PSE_ADMIN_CONTROL, /* u32 */
941941 ETHTOOL_A_C33_PSE_PW_D_STATUS, /* u32 */
942+ ETHTOOL_A_C33_PSE_PW_CLASS, /* u32 */
943+ ETHTOOL_A_C33_PSE_ACTUAL_PW, /* u32 */
944+ ETHTOOL_A_C33_PSE_EXT_STATE, /* u32 */
945+ ETHTOOL_A_C33_PSE_EXT_SUBSTATE, /* u32 */
942946
943947 /* add new constants above here */
944948 __ETHTOOL_A_PSE_CNT,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t