Re: [PATCH 2/2] usb: typec: tipd: Fix initialization sequence for cd321x

[Heikki Krogerus]

Hi,

On Thu, Nov 18, 2021 at 12:14:50AM +0900, Hector Martin wrote:
> The power state switch needs to happen first, as that
> kickstarts the firmware into normal mode.
> 
> Signed-off-by: Hector Martin <marcan@xxxxxxxxx>

Reviewed-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>

Please resend these with the appropriate Fixes tag included.

> ---
>  drivers/usb/typec/tipd/core.c | 33 ++++++++++++++++-----------------
>  1 file changed, 16 insertions(+), 17 deletions(-)
> 
> diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
> index 4da5a0b2aed2..6d27a5b5e3ca 100644
> --- a/drivers/usb/typec/tipd/core.c
> +++ b/drivers/usb/typec/tipd/core.c
> @@ -707,6 +707,7 @@ static int tps6598x_probe(struct i2c_client *client)
>  	u32 conf;
>  	u32 vid;
>  	int ret;
> +	u64 mask1;
>  
>  	tps = devm_kzalloc(&client->dev, sizeof(*tps), GFP_KERNEL);
>  	if (!tps)
> @@ -730,11 +731,6 @@ static int tps6598x_probe(struct i2c_client *client)
>  	if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
>  		tps->i2c_protocol = true;
>  
> -	/* Make sure the controller has application firmware running */
> -	ret = tps6598x_check_mode(tps);
> -	if (ret)
> -		return ret;
> -
>  	if (np && of_device_is_compatible(np, "apple,cd321x")) {
>  		/* Switch CD321X chips to the correct system power state */
>  		ret = cd321x_switch_power_state(tps, TPS_SYSTEM_POWER_STATE_S0);
> @@ -742,24 +738,27 @@ static int tps6598x_probe(struct i2c_client *client)
>  			return ret;
>  
>  		/* CD321X chips have all interrupts masked initially */
> -		ret = tps6598x_write64(tps, TPS_REG_INT_MASK1,
> -					APPLE_CD_REG_INT_POWER_STATUS_UPDATE |
> -					APPLE_CD_REG_INT_DATA_STATUS_UPDATE |
> -					APPLE_CD_REG_INT_PLUG_EVENT);
> -		if (ret)
> -			return ret;
> +		mask1 = APPLE_CD_REG_INT_POWER_STATUS_UPDATE |
> +			APPLE_CD_REG_INT_DATA_STATUS_UPDATE |
> +			APPLE_CD_REG_INT_PLUG_EVENT;
>  
>  		irq_handler = cd321x_interrupt;
>  	} else {
>  		/* Enable power status, data status and plug event interrupts */
> -		ret = tps6598x_write64(tps, TPS_REG_INT_MASK1,
> -				       TPS_REG_INT_POWER_STATUS_UPDATE |
> -				       TPS_REG_INT_DATA_STATUS_UPDATE |
> -				       TPS_REG_INT_PLUG_EVENT);
> -		if (ret)
> -			return ret;
> +		mask1 = TPS_REG_INT_POWER_STATUS_UPDATE |
> +			TPS_REG_INT_DATA_STATUS_UPDATE |
> +			TPS_REG_INT_PLUG_EVENT;
>  	}
>  
> +	/* Make sure the controller has application firmware running */
> +	ret = tps6598x_check_mode(tps);
> +	if (ret)
> +		return ret;
> +
> +	ret = tps6598x_write64(tps, TPS_REG_INT_MASK1, mask1);
> +	if (ret)
> +		return ret;
> +
>  	ret = tps6598x_read32(tps, TPS_REG_STATUS, &status);
>  	if (ret < 0)
>  		return ret;
> -- 
> 2.33.0

thanks,

-- 
heikki