Merge tag 'qcom-drivers-fixes-for-7.0' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes

Qualcomm driver fixes for v7.0

Fix the length of the PD restart reason string in pd-mapper to avoid
QMI decoding errors, resulting in the notification being dropped.

Fix the newly introduce handling of TBT/USB4 notifications in pmic_glink
altmode driver, as it broke the handling of non-TBT/USB4 DisplayPort
unplug events.

* tag 'qcom-drivers-fixes-for-7.0' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
soc: qcom: pmic_glink_altmode: Fix TBT->SAFE->!TBT transition
soc: qcom: pmic_glink_altmode: Fix SVID=DP && unconnected edge case
soc: qcom: pd-mapper: Fix element length in servreg_loc_pfr_req_ei

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

Krzysztof Kozlowski 1 month ago 36b35ad8 7962fd93

+31 -13

4 changed files

expand all

drivers

soc

qcom

pdr_internal.h

pmic_glink_altmode.c

qcom_pdr_msg.c

include

linux

soc

qcom

pdr.h

+1 -1

drivers/soc/qcom/pdr_internal.h

··· 84 84 85 85 struct servreg_loc_pfr_req { 86 86 char service[SERVREG_NAME_LENGTH + 1]; 87 - char reason[257]; 87 + char reason[SERVREG_PFR_LENGTH + 1]; 88 88 }; 89 89 90 90 struct servreg_loc_pfr_resp {

+28 -11

drivers/soc/qcom/pmic_glink_altmode.c

··· 62 62 u8 orientation; 63 63 u8 mux_ctrl; 64 64 #define MUX_CTRL_STATE_NO_CONN 0 65 + #define MUX_CTRL_STATE_USB3_ONLY 1 66 + #define MUX_CTRL_STATE_DP4LN 2 67 + #define MUX_CTRL_STATE_USB3_DP 3 65 68 #define MUX_CTRL_STATE_TUNNELING 4 66 69 67 70 u8 res; ··· 353 350 354 351 typec_switch_set(alt_port->typec_switch, alt_port->orientation); 355 352 356 - if (alt_port->mux_ctrl == MUX_CTRL_STATE_NO_CONN) { 357 - pmic_glink_altmode_safe(altmode, alt_port); 358 - } else if (alt_port->svid == USB_TYPEC_TBT_SID) { 359 - pmic_glink_altmode_enable_tbt(altmode, alt_port); 360 - } else if (alt_port->svid == USB_TYPEC_DP_SID) { 361 - pmic_glink_altmode_enable_dp(altmode, alt_port, 362 - alt_port->mode, 363 - alt_port->hpd_state, 364 - alt_port->hpd_irq); 353 + /* 354 + * MUX_CTRL_STATE_DP4LN/USB3_DP may only be set if SVID=DP, but we need 355 + * to special-case the SVID=DP && mux_ctrl=NO_CONN case to deliver a 356 + * HPD notification 357 + */ 358 + if (alt_port->svid == USB_TYPEC_DP_SID) { 359 + if (alt_port->mux_ctrl == MUX_CTRL_STATE_NO_CONN) { 360 + pmic_glink_altmode_safe(altmode, alt_port); 361 + } else { 362 + pmic_glink_altmode_enable_dp(altmode, alt_port, 363 + alt_port->mode, 364 + alt_port->hpd_state, 365 + alt_port->hpd_irq); 366 + } 365 367 366 368 if (alt_port->hpd_state) 367 369 conn_status = connector_status_connected; ··· 375 367 376 368 drm_aux_hpd_bridge_notify(&alt_port->bridge->dev, conn_status); 377 369 } else if (alt_port->mux_ctrl == MUX_CTRL_STATE_TUNNELING) { 378 - pmic_glink_altmode_enable_usb4(altmode, alt_port); 379 - } else { 370 + if (alt_port->svid == USB_TYPEC_TBT_SID) 371 + pmic_glink_altmode_enable_tbt(altmode, alt_port); 372 + else 373 + pmic_glink_altmode_enable_usb4(altmode, alt_port); 374 + } else if (alt_port->mux_ctrl == MUX_CTRL_STATE_USB3_ONLY) { 380 375 pmic_glink_altmode_enable_usb(altmode, alt_port); 376 + } else if (alt_port->mux_ctrl == MUX_CTRL_STATE_NO_CONN) { 377 + pmic_glink_altmode_safe(altmode, alt_port); 378 + } else { 379 + dev_err(altmode->dev, "Got unknown mux_ctrl: %u on port %u, forcing safe mode\n", 380 + alt_port->mux_ctrl, alt_port->index); 381 + pmic_glink_altmode_safe(altmode, alt_port); 381 382 } 382 383 383 384 pmic_glink_altmode_request(altmode, ALTMODE_PAN_ACK, alt_port->index);

+1 -1

drivers/soc/qcom/qcom_pdr_msg.c

··· 325 325 }, 326 326 { 327 327 .data_type = QMI_STRING, 328 - .elem_len = SERVREG_NAME_LENGTH + 1, 328 + .elem_len = SERVREG_PFR_LENGTH + 1, 329 329 .elem_size = sizeof(char), 330 330 .array_type = VAR_LEN_ARRAY, 331 331 .tlv_type = 0x02,

include/linux/soc/qcom/pdr.h

··· 5 5 #include <linux/soc/qcom/qmi.h> 6 6 7 7 #define SERVREG_NAME_LENGTH 64 8 + #define SERVREG_PFR_LENGTH 256 8 9 9 10 struct pdr_service; 10 11 struct pdr_handle;

Configure Feed

Configure Feed