2023-06-13 08:17:11

by Neil Armstrong

Subject: [PATCH v3 2/8] soc: qcom: pmic_glink_altmode: handle safe mode when disconnect

On some Qcom SoCs, the Altmode event mode is set to 0xff when
the Type-C port is disconnected.

Handle this specific mode and translate it as the SAFE mode.

Signed-off-by: Neil Armstrong <[email protected]>
---
drivers/soc/qcom/pmic_glink_altmode.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/drivers/soc/qcom/pmic_glink_altmode.c b/drivers/soc/qcom/pmic_glink_altmode.c
index df48fbea4b68..007d308e2f15 100644
--- a/drivers/soc/qcom/pmic_glink_altmode.c
+++ b/drivers/soc/qcom/pmic_glink_altmode.c
@@ -173,6 +173,20 @@ static void pmic_glink_altmode_enable_usb(struct pmic_glink_altmode *altmode,
dev_err(altmode->dev, "failed to switch mux to USB\n");
}

+static void pmic_glink_altmode_safe(struct pmic_glink_altmode *altmode,
+ struct pmic_glink_altmode_port *port)
+{
+ int ret;
+
+ port->state.alt = NULL;
+ port->state.data = NULL;
+ port->state.mode = TYPEC_STATE_SAFE;
+
+ ret = typec_mux_set(port->typec_mux, &port->state);
+ if (ret)
+ dev_err(altmode->dev, "failed to switch mux to safe mode\n");
+}
+
static void pmic_glink_altmode_worker(struct work_struct *work)
{
struct pmic_glink_altmode_port *alt_port = work_to_altmode_port(work);
@@ -180,7 +194,9 @@ static void pmic_glink_altmode_worker(struct work_struct *work)

typec_switch_set(alt_port->typec_switch, alt_port->orientation);

- if (alt_port->svid == USB_TYPEC_DP_SID)
+ if (alt_port->svid == USB_TYPEC_DP_SID && alt_port->mode == 0xff)
+ pmic_glink_altmode_safe(altmode, alt_port);
+ else if (alt_port->svid == USB_TYPEC_DP_SID)
pmic_glink_altmode_enable_dp(altmode, alt_port, alt_port->mode,
alt_port->hpd_state, alt_port->hpd_irq);
else

--
2.34.1

2023-06-26 09:41:21

by Heikki Krogerus

Subject: Re: [PATCH v3 2/8] soc: qcom: pmic_glink_altmode: handle safe mode when disconnect

On Tue, Jun 13, 2023 at 09:55:55AM +0200, Neil Armstrong wrote:
> On some Qcom SoCs, the Altmode event mode is set to 0xff when
> the Type-C port is disconnected.
>
> Handle this specific mode and translate it as the SAFE mode.
>
> Signed-off-by: Neil Armstrong <[email protected]>

FWIW:

Acked-by: Heikki Krogerus <[email protected]>

> ---
> drivers/soc/qcom/pmic_glink_altmode.c | 18 +++++++++++++++++-
> 1 file changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/soc/qcom/pmic_glink_altmode.c b/drivers/soc/qcom/pmic_glink_altmode.c
> index df48fbea4b68..007d308e2f15 100644
> --- a/drivers/soc/qcom/pmic_glink_altmode.c
> +++ b/drivers/soc/qcom/pmic_glink_altmode.c
> @@ -173,6 +173,20 @@ static void pmic_glink_altmode_enable_usb(struct pmic_glink_altmode *altmode,
> dev_err(altmode->dev, "failed to switch mux to USB\n");
> }
>
> +static void pmic_glink_altmode_safe(struct pmic_glink_altmode *altmode,
> + struct pmic_glink_altmode_port *port)
> +{
> + int ret;
> +
> + port->state.alt = NULL;
> + port->state.data = NULL;
> + port->state.mode = TYPEC_STATE_SAFE;
> +
> + ret = typec_mux_set(port->typec_mux, &port->state);
> + if (ret)
> + dev_err(altmode->dev, "failed to switch mux to safe mode\n");
> +}
> +
> static void pmic_glink_altmode_worker(struct work_struct *work)
> {
> struct pmic_glink_altmode_port *alt_port = work_to_altmode_port(work);
> @@ -180,7 +194,9 @@ static void pmic_glink_altmode_worker(struct work_struct *work)
>
> typec_switch_set(alt_port->typec_switch, alt_port->orientation);
>
> - if (alt_port->svid == USB_TYPEC_DP_SID)
> + if (alt_port->svid == USB_TYPEC_DP_SID && alt_port->mode == 0xff)
> + pmic_glink_altmode_safe(altmode, alt_port);
> + else if (alt_port->svid == USB_TYPEC_DP_SID)
> pmic_glink_altmode_enable_dp(altmode, alt_port, alt_port->mode,
> alt_port->hpd_state, alt_port->hpd_irq);
> else
>
> --
> 2.34.1

--
heikki