On Tue, Mar 05, 2024 at 02:58:01AM +0000, Jameson Thies wrote:
> Clean up UCSI_CABLE_PROP macros by fixing a bitmask shifting error for
> plug type and updating the modal support macro for consistent naming.
>
> Fixes: 3cf657f07918 ("usb: typec: ucsi: Remove all bit-fields")
> Cc: stable@xxxxxxxxxxxxxxx
> Reviewed-by: Benson Leung <bleung@xxxxxxxxxxxx>
> Reviewed-by: Prashant Malani <pmalani@xxxxxxxxxxxx>
> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> Signed-off-by: Jameson Thies <jthies@xxxxxxxxxx>
Reviewed-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
> ---
> Changes in v4:
> - None.
>
> Changes in v3:
> - Fixed CC stable.
>
> Changes in v2:
> - Tested on usb-testing branch merged with chromeOS 6.8-rc2 kernel.
>
> drivers/usb/typec/ucsi/ucsi.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h
> index 7e35ffbe0a6f2..469a2baf472e4 100644
> --- a/drivers/usb/typec/ucsi/ucsi.h
> +++ b/drivers/usb/typec/ucsi/ucsi.h
> @@ -259,12 +259,12 @@ struct ucsi_cable_property {
> #define UCSI_CABLE_PROP_FLAG_VBUS_IN_CABLE BIT(0)
> #define UCSI_CABLE_PROP_FLAG_ACTIVE_CABLE BIT(1)
> #define UCSI_CABLE_PROP_FLAG_DIRECTIONALITY BIT(2)
> -#define UCSI_CABLE_PROP_FLAG_PLUG_TYPE(_f_) ((_f_) & GENMASK(3, 0))
> +#define UCSI_CABLE_PROP_FLAG_PLUG_TYPE(_f_) (((_f_) & GENMASK(4, 3)) >> 3)
> #define UCSI_CABLE_PROPERTY_PLUG_TYPE_A 0
> #define UCSI_CABLE_PROPERTY_PLUG_TYPE_B 1
> #define UCSI_CABLE_PROPERTY_PLUG_TYPE_C 2
> #define UCSI_CABLE_PROPERTY_PLUG_OTHER 3
> -#define UCSI_CABLE_PROP_MODE_SUPPORT BIT(5)
> +#define UCSI_CABLE_PROP_FLAG_MODE_SUPPORT BIT(5)
> u8 latency;
> } __packed;
>
> --
> 2.44.0.rc1.240.g4c46232300-goog
--
heikki
