| Message ID | 20240608114529.23060-1-johan+linaro@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ad3dd9592b2a1d2f9e6ffeedfd81602f91f1ba09 |
| Headers | show |
| Series | soc: qcom: pmic_glink: disable UCSI on sc8280xp | expand |
On Sat, Jun 08, 2024 at 01:45:29PM +0200, Johan Hovold wrote: > Disconnecting an external display triggers a hypervisor reset on the > Lenovo ThinkPad X13s since 6.10-rc1 which enabled UCSI. Disable it again > until the regression has been fixed properly. > > Fixes: 3f91a0bf4a0b ("soc: qcom: pmic_glink: reenable UCSI on sc8280xp") > Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > drivers/soc/qcom/pmic_glink.c | 4 ++++ > 1 file changed, 4 insertions(+) > > > Dmitry reported off-list that his X13s was crashing when he disconnected > an external display and I tracked it down to the enablement of UCSI in > 6.10-rc1. > > I have not had time to debug this further, but I'm flagging this as a > regression and sending an effective so that we have a fall back in case > this is not fixed in timely manner. > > Note that this likely affects other Qualcomm SoCs as well. > > Johan > > > #regzbot introduced: 3f91a0bf4a0b > > > > diff --git a/drivers/soc/qcom/pmic_glink.c b/drivers/soc/qcom/pmic_glink.c > index 40fb09d69014..65279243072c 100644 > --- a/drivers/soc/qcom/pmic_glink.c > +++ b/drivers/soc/qcom/pmic_glink.c > @@ -348,11 +348,15 @@ static void pmic_glink_remove(struct platform_device *pdev) > mutex_unlock(&__pmic_glink_lock); > } > > +static const unsigned long pmic_glink_sc8280xp_client_mask = BIT(PMIC_GLINK_CLIENT_BATT) | > + BIT(PMIC_GLINK_CLIENT_ALTMODE); > + > static const unsigned long pmic_glink_sm8450_client_mask = BIT(PMIC_GLINK_CLIENT_BATT) | > BIT(PMIC_GLINK_CLIENT_ALTMODE) | > BIT(PMIC_GLINK_CLIENT_UCSI); > > static const struct of_device_id pmic_glink_of_match[] = { > + { .compatible = "qcom,sc8280xp-pmic-glink", .data = &pmic_glink_sc8280xp_client_mask }, > { .compatible = "qcom,pmic-glink", .data = &pmic_glink_sm8450_client_mask }, > {} > }; > -- > 2.44.1
On Sat, 08 Jun 2024 13:45:29 +0200, Johan Hovold wrote: > Disconnecting an external display triggers a hypervisor reset on the > Lenovo ThinkPad X13s since 6.10-rc1 which enabled UCSI. Disable it again > until the regression has been fixed properly. > > Applied, thanks! [1/1] soc: qcom: pmic_glink: disable UCSI on sc8280xp commit: ad3dd9592b2a1d2f9e6ffeedfd81602f91f1ba09 Best regards,
diff --git a/drivers/soc/qcom/pmic_glink.c b/drivers/soc/qcom/pmic_glink.c index 40fb09d69014..65279243072c 100644 --- a/drivers/soc/qcom/pmic_glink.c +++ b/drivers/soc/qcom/pmic_glink.c @@ -348,11 +348,15 @@ static void pmic_glink_remove(struct platform_device *pdev) mutex_unlock(&__pmic_glink_lock); } +static const unsigned long pmic_glink_sc8280xp_client_mask = BIT(PMIC_GLINK_CLIENT_BATT) | + BIT(PMIC_GLINK_CLIENT_ALTMODE); + static const unsigned long pmic_glink_sm8450_client_mask = BIT(PMIC_GLINK_CLIENT_BATT) | BIT(PMIC_GLINK_CLIENT_ALTMODE) | BIT(PMIC_GLINK_CLIENT_UCSI); static const struct of_device_id pmic_glink_of_match[] = { + { .compatible = "qcom,sc8280xp-pmic-glink", .data = &pmic_glink_sc8280xp_client_mask }, { .compatible = "qcom,pmic-glink", .data = &pmic_glink_sm8450_client_mask }, {} };
Disconnecting an external display triggers a hypervisor reset on the Lenovo ThinkPad X13s since 6.10-rc1 which enabled UCSI. Disable it again until the regression has been fixed properly. Fixes: 3f91a0bf4a0b ("soc: qcom: pmic_glink: reenable UCSI on sc8280xp") Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- drivers/soc/qcom/pmic_glink.c | 4 ++++ 1 file changed, 4 insertions(+) Dmitry reported off-list that his X13s was crashing when he disconnected an external display and I tracked it down to the enablement of UCSI in 6.10-rc1. I have not had time to debug this further, but I'm flagging this as a regression and sending an effective so that we have a fall back in case this is not fixed in timely manner. Note that this likely affects other Qualcomm SoCs as well. Johan #regzbot introduced: 3f91a0bf4a0b