| Message ID | 20240229015221.3668955-1-jthies@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4d0a5a9915793377c0fe1a8d78de6bcd92cea963 |
| Headers | show |
| Series | [v3,1/4] usb: typec: ucsi: Clean up UCSI_CABLE_PROP macros | expand |
On Thu, Feb 29, 2024 at 01:52:21AM +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@vger.kernel.org > Reviewed-by: Benson Leung <bleung@chromium.org> > Reviewed-by: Prashant Malani <pmalani@chromium.org> > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > Signed-off-by: Jameson Thies <jthies@google.com> > --- > Changes in v3: > - Fixed CC stable. I see two different copies of this patch on the list, which one is correct? And none of them are properly "threaded", so that our tools can't pick them up at once, can you use 'git send-email' to do this, or do replies by hand if you aren't using it, so that things will work properly on our end? Right now all of these look like individual changes :( thanks, greg k-h
Hi Greg, sorry about the confusing emails. The most recent "--no-thread" patch was intended to be the correct one. I'll resend the v3 series with proper threading. Thanks, Jameson
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;
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@vger.kernel.org Reviewed-by: Benson Leung <bleung@chromium.org> Reviewed-by: Prashant Malani <pmalani@chromium.org> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Jameson Thies <jthies@google.com> --- 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(-)