tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

tcpm: Parse and log AVS APDO

The USB PD specification introduced new Adjustable Voltage Supply (AVS)
types for both Standard Power Range (SPR) and Extended Power Range (EPR)
sources.

Add definitions to correctly parse and handle the new AVS APDO. Use
bitfield macros to add inline helper functions to extract voltage,
current, power, and peak current fields to parse and log the details
of the new EPR AVS and SPR AVS APDO.

Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
Reviewed-by: Amit Sunil Dhamne <amitsd@google.com>
Reviewed-by: Kyle Tso <kyletso@google.com>
Reviewed-by: RD Babiera <rdbabiera@google.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://patch.msgid.link/20251015043017.3382908-1-badhri@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Badhri Jagan Sridharan and committed by
Greg Kroah-Hartman f82890c9 8ad19469

+82 -2
+14 -1
drivers/usb/typec/tcpm/tcpm.c
··· 823 823 case PDO_TYPE_APDO: 824 824 if (pdo_apdo_type(pdo) == APDO_TYPE_PPS) 825 825 scnprintf(msg, sizeof(msg), 826 - "%u-%u mV, %u mA", 826 + "PPS %u-%u mV, %u mA", 827 827 pdo_pps_apdo_min_voltage(pdo), 828 828 pdo_pps_apdo_max_voltage(pdo), 829 829 pdo_pps_apdo_max_current(pdo)); 830 + else if (pdo_apdo_type(pdo) == APDO_TYPE_EPR_AVS) 831 + scnprintf(msg, sizeof(msg), 832 + "EPR AVS %u-%u mV %u W peak_current: %u", 833 + pdo_epr_avs_apdo_min_voltage_mv(pdo), 834 + pdo_epr_avs_apdo_max_voltage_mv(pdo), 835 + pdo_epr_avs_apdo_pdp_w(pdo), 836 + pdo_epr_avs_apdo_src_peak_current(pdo)); 837 + else if (pdo_apdo_type(pdo) == APDO_TYPE_SPR_AVS) 838 + scnprintf(msg, sizeof(msg), 839 + "SPR AVS 9-15 V: %u mA 15-20 V: %u mA peak_current: %u", 840 + pdo_spr_avs_apdo_9v_to_15v_max_current_ma(pdo), 841 + pdo_spr_avs_apdo_15v_to_20v_max_current_ma(pdo), 842 + pdo_spr_avs_apdo_src_peak_current(pdo)); 830 843 else 831 844 strcpy(msg, "undefined APDO"); 832 845 break;
+68 -1
include/linux/usb/pd.h
··· 6 6 #ifndef __LINUX_USB_PD_H 7 7 #define __LINUX_USB_PD_H 8 8 9 + #include <linux/bitfield.h> 9 10 #include <linux/kernel.h> 10 11 #include <linux/types.h> 11 12 #include <linux/usb/typec.h> ··· 272 271 273 272 enum pd_apdo_type { 274 273 APDO_TYPE_PPS = 0, 274 + APDO_TYPE_EPR_AVS = 1, 275 + APDO_TYPE_SPR_AVS = 2, 275 276 }; 276 277 277 - #define PDO_APDO_TYPE_SHIFT 28 /* Only valid value currently is 0x0 - PPS */ 278 + #define PDO_APDO_TYPE_SHIFT 28 278 279 #define PDO_APDO_TYPE_MASK 0x3 279 280 280 281 #define PDO_APDO_TYPE(t) ((t) << PDO_APDO_TYPE_SHIFT) ··· 299 296 (PDO_TYPE(PDO_TYPE_APDO) | PDO_APDO_TYPE(APDO_TYPE_PPS) | \ 300 297 PDO_PPS_APDO_MIN_VOLT(min_mv) | PDO_PPS_APDO_MAX_VOLT(max_mv) | \ 301 298 PDO_PPS_APDO_MAX_CURR(max_ma)) 299 + 300 + /* 301 + * Applicable only to EPR AVS APDO source cap as per 302 + * Table 6.15 EPR Adjustable Voltage Supply APDO – Source 303 + */ 304 + #define PDO_EPR_AVS_APDO_PEAK_CURRENT GENMASK(27, 26) 305 + 306 + /* 307 + * Applicable to both EPR AVS APDO source and sink cap as per 308 + * Table 6.15 EPR Adjustable Voltage Supply APDO – Source 309 + * Table 6.22 EPR Adjustable Voltage Supply APDO – Sink 310 + */ 311 + #define PDO_EPR_AVS_APDO_MAX_VOLT GENMASK(25, 17) /* 100mV unit */ 312 + #define PDO_EPR_AVS_APDO_MIN_VOLT GENMASK(15, 8) /* 100mV unit */ 313 + #define PDO_EPR_AVS_APDO_PDP GENMASK(7, 0) /* 1W unit */ 314 + 315 + /* 316 + * Applicable only SPR AVS APDO source cap as per 317 + * Table 6.14 SPR Adjustable Voltage Supply APDO – Source 318 + */ 319 + #define PDO_SPR_AVS_APDO_PEAK_CURRENT GENMASK(27, 26) 320 + 321 + /* 322 + * Applicable to both SPR AVS APDO source and sink cap as per 323 + * Table 6.14 SPR Adjustable Voltage Supply APDO – Source 324 + * Table 6.21 SPR Adjustable Voltage Supply APDO – Sink 325 + */ 326 + #define PDO_SPR_AVS_APDO_9V_TO_15V_MAX_CURR GENMASK(19, 10) /* 10mA unit */ 327 + #define PDO_SPR_AVS_APDO_15V_TO_20V_MAX_CURR GENMASK(9, 0) /* 10mA unit */ 302 328 303 329 static inline enum pd_pdo_type pdo_type(u32 pdo) 304 330 { ··· 380 348 { 381 349 return ((pdo >> PDO_PPS_APDO_MAX_CURR_SHIFT) & 382 350 PDO_PPS_APDO_CURR_MASK) * 50; 351 + } 352 + 353 + static inline unsigned int pdo_epr_avs_apdo_src_peak_current(u32 pdo) 354 + { 355 + return FIELD_GET(PDO_EPR_AVS_APDO_PEAK_CURRENT, pdo); 356 + } 357 + 358 + static inline unsigned int pdo_epr_avs_apdo_min_voltage_mv(u32 pdo) 359 + { 360 + return FIELD_GET(PDO_EPR_AVS_APDO_MIN_VOLT, pdo) * 100; 361 + } 362 + 363 + static inline unsigned int pdo_epr_avs_apdo_max_voltage_mv(u32 pdo) 364 + { 365 + return FIELD_GET(PDO_EPR_AVS_APDO_MIN_VOLT, pdo) * 100; 366 + } 367 + 368 + static inline unsigned int pdo_epr_avs_apdo_pdp_w(u32 pdo) 369 + { 370 + return FIELD_GET(PDO_EPR_AVS_APDO_PDP, pdo); 371 + } 372 + 373 + static inline unsigned int pdo_spr_avs_apdo_src_peak_current(u32 pdo) 374 + { 375 + return FIELD_GET(PDO_SPR_AVS_APDO_PEAK_CURRENT, pdo); 376 + } 377 + 378 + static inline unsigned int pdo_spr_avs_apdo_9v_to_15v_max_current_ma(u32 pdo) 379 + { 380 + return FIELD_GET(PDO_SPR_AVS_APDO_9V_TO_15V_MAX_CURR, pdo) * 10; 381 + } 382 + 383 + static inline unsigned int pdo_spr_avs_apdo_15v_to_20v_max_current_ma(u32 pdo) 384 + { 385 + return FIELD_GET(PDO_SPR_AVS_APDO_15V_TO_20V_MAX_CURR, pdo) * 10; 383 386 } 384 387 385 388 /* RDO: Request Data Object */