On Fri, May 24, 2024 at 11:58:21AM +0100, Diogo Ivo wrote:
> UCSI version 2.0 and above define new PPM notifications. Update the
> logic to determine which notifications to enable taking into account
> these changes.
>
> Signed-off-by: Diogo Ivo <diogo.ivo@xxxxxxxxxxxxxxxxxx>
Reviewed-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
> ---
> drivers/usb/typec/ucsi/ucsi.c | 19 ++++++++++++++++++-
> 1 file changed, 18 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
> index cb52e7b0a2c5..0cc1c49da4a0 100644
> --- a/drivers/usb/typec/ucsi/ucsi.c
> +++ b/drivers/usb/typec/ucsi/ucsi.c
> @@ -1664,7 +1664,7 @@ static int ucsi_register_port(struct ucsi *ucsi, struct ucsi_connector *con)
>
> static u64 ucsi_get_supported_notifications(struct ucsi *ucsi)
> {
> - u8 features = ucsi->cap.features;
> + u16 features = ucsi->cap.features;
> u64 ntfy = UCSI_ENABLE_NTFY_ALL;
>
> if (!(features & UCSI_CAP_ALT_MODE_DETAILS))
> @@ -1680,6 +1680,23 @@ static u64 ucsi_get_supported_notifications(struct ucsi *ucsi)
> if (!(features & UCSI_CAP_PD_RESET))
> ntfy &= ~UCSI_ENABLE_NTFY_PD_RESET_COMPLETE;
>
> + if (ucsi->version <= UCSI_VERSION_1_2)
> + return ntfy;
> +
> + ntfy |= UCSI_ENABLE_NTFY_SINK_PATH_STS_CHANGE;
> +
> + if (features & UCSI_CAP_GET_ATTENTION_VDO)
> + ntfy |= UCSI_ENABLE_NTFY_ATTENTION;
> +
> + if (features & UCSI_CAP_FW_UPDATE_REQUEST)
> + ntfy |= UCSI_ENABLE_NTFY_LPM_FW_UPDATE_REQ;
> +
> + if (features & UCSI_CAP_SECURITY_REQUEST)
> + ntfy |= UCSI_ENABLE_NTFY_SECURITY_REQ_PARTNER;
> +
> + if (features & UCSI_CAP_SET_RETIMER_MODE)
> + ntfy |= UCSI_ENABLE_NTFY_SET_RETIMER_MODE;
> +
> return ntfy;
> }
>
> --
> 2.45.1
--
heikki
