On Thu, Mar 17, 2022 at 04:45:13PM +0100, Sebastian Krzyszkowiak wrote:
> From: Angus Ainslie <angus@xxxxxxxx>
>
> Don't immediately set the data role, only set it in response to the
> negotiated value notification from the tps6589x. Otherwise data role
> switch fails for DRP.
>
> We only use values cached from the IRQ instead of poking I2C all
> the time.
>
> The update is moved in a function that will become more useful in later
> commits.
>
> Fixes: 18a6c866bb19 ("usb: typec: tps6598x: Add USB role switching logic")
> Signed-off-by: Angus Ainslie <angus@xxxxxxxx>
> Signed-off-by: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@xxxxxxx>
Fixes tag but but no Cc: stable... tag?
Is there some reason why you don't have the stable tag, i.e. why
shouldn't this be added to the stable kernels?
> ---
> drivers/usb/typec/tipd/core.c | 23 +++++++++++++++++++----
> 1 file changed, 19 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
> index dfbba5ae9487..f387786ff95e 100644
> --- a/drivers/usb/typec/tipd/core.c
> +++ b/drivers/usb/typec/tipd/core.c
> @@ -94,6 +94,7 @@ struct tps6598x {
> struct power_supply_desc psy_desc;
> enum power_supply_usb_type usb_type;
>
> + u32 data_status;
> u16 pwr_status;
> };
>
> @@ -271,6 +272,15 @@ static int tps6598x_connect(struct tps6598x *tps, u32 status)
> return 0;
> }
>
> +static int
> +tps6598x_update_data_status(struct tps6598x *tps, u32 status)
> +{
> + tps6598x_set_data_role(tps, TPS_STATUS_TO_TYPEC_DATAROLE(status),
> + !!(tps->data_status & TPS_DATA_STATUS_DATA_CONNECTION));
> + trace_tps6598x_data_status(tps->data_status);
> + return 0;
> +}
> +
> static void tps6598x_disconnect(struct tps6598x *tps, u32 status)
> {
> if (!IS_ERR(tps->partner))
> @@ -370,8 +380,6 @@ static int tps6598x_dr_set(struct typec_port *port, enum typec_data_role role)
> goto out_unlock;
> }
>
> - tps6598x_set_data_role(tps, role, true);
> -
> out_unlock:
> mutex_unlock(&tps->lock);
>
> @@ -437,6 +445,7 @@ static bool tps6598x_read_data_status(struct tps6598x *tps)
> dev_err(tps->dev, "failed to read data status: %d\n", ret);
> return false;
> }
> + tps->data_status = data_status;
> trace_tps6598x_data_status(data_status);
>
> return true;
> @@ -497,10 +506,13 @@ static irqreturn_t cd321x_interrupt(int irq, void *data)
> if (!tps6598x_read_power_status(tps))
> goto err_clear_ints;
>
> - if (event & APPLE_CD_REG_INT_DATA_STATUS_UPDATE)
> + if (event & APPLE_CD_REG_INT_DATA_STATUS_UPDATE) {
> if (!tps6598x_read_data_status(tps))
> goto err_clear_ints;
>
> + tps6598x_update_data_status(tps, status);
> + }
> +
> /* Handle plug insert or removal */
> if (event & APPLE_CD_REG_INT_PLUG_EVENT)
> tps6598x_handle_plug_event(tps, status);
> @@ -544,10 +556,13 @@ static irqreturn_t tps6598x_interrupt(int irq, void *data)
> if (!tps6598x_read_power_status(tps))
> goto err_clear_ints;
>
> - if ((event1 | event2) & TPS_REG_INT_DATA_STATUS_UPDATE)
> + if ((event1 | event2) & TPS_REG_INT_DATA_STATUS_UPDATE) {
> if (!tps6598x_read_data_status(tps))
> goto err_clear_ints;
>
> + tps6598x_update_data_status(tps, status);
> + }
> +
> /* Handle plug insert or removal */
> if ((event1 | event2) & TPS_REG_INT_PLUG_EVENT)
> tps6598x_handle_plug_event(tps, status);
> --
> 2.35.1
--
heikki
