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

usb: typec: qcom-pmic-typec: split HPD bridge alloc and registration

If a probe function returns -EPROBE_DEFER after creating another device
there is a change of ending up in a probe deferral loop, (see commit
fbc35b45f9f6 ("Add documentation on meaning of -EPROBE_DEFER"). In case
of the qcom-pmic-typec driver the tcpm_register_port() function looks up
external resources (USB role switch and inherently via called
typec_register_port() USB-C muxes, switches and retimers).

In order to prevent such probe-defer loops caused by qcom-pmic-typec
driver, use the API added by Johan Hovold and move HPD bridge
registration to the end of the probe function.

The devm_drm_dp_hpd_bridge_add() is called at the end of the probe
function after all TCPM start functions. This is done as a way to
overcome a different problem, the DRM subsystem can not properly cope
with the DRM bridges being destroyed once the bridge is attached. Having
this function call at the end of the probe function prevents possible
DRM bridge device creation followed by destruction in case one of the
TCPM start functions returns an error.

Reported-by: Caleb Connolly <caleb.connolly@linaro.org>
Acked-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Johan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20240424-qc-pmic-typec-hpd-split-v4-1-f7e10d147443@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Dmitry Baryshkov and committed by
Greg Kroah-Hartman
718b36a7 e7899ebb

+8 -2
+8 -2
drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c
··· 41 41 struct device_node *np = dev->of_node; 42 42 const struct pmic_typec_resources *res; 43 43 struct regmap *regmap; 44 - struct device *bridge_dev; 44 + struct auxiliary_device *bridge_dev; 45 45 u32 base; 46 46 int ret; 47 47 ··· 92 92 if (!tcpm->tcpc.fwnode) 93 93 return -EINVAL; 94 94 95 - bridge_dev = drm_dp_hpd_bridge_register(tcpm->dev, to_of_node(tcpm->tcpc.fwnode)); 95 + bridge_dev = devm_drm_dp_hpd_bridge_alloc(tcpm->dev, to_of_node(tcpm->tcpc.fwnode)); 96 96 if (IS_ERR(bridge_dev)) 97 97 return PTR_ERR(bridge_dev); 98 98 ··· 110 110 if (ret) 111 111 goto port_stop; 112 112 113 + ret = devm_drm_dp_hpd_bridge_add(tcpm->dev, bridge_dev); 114 + if (ret) 115 + goto pdphy_stop; 116 + 113 117 return 0; 114 118 119 + pdphy_stop: 120 + tcpm->pdphy_stop(tcpm); 115 121 port_stop: 116 122 tcpm->port_stop(tcpm); 117 123 port_unregister: