From e6a4d05173132a9b41154599eb5fdf6faa32e41f Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mar 30 2024 08:56:38 +0000 Subject: usb: typec: ucsi: Clean up UCSI_CABLE_PROP macros (git-fixes). --- diff --git a/patches.suse/usb-typec-ucsi-Clean-up-UCSI_CABLE_PROP-macros.patch b/patches.suse/usb-typec-ucsi-Clean-up-UCSI_CABLE_PROP-macros.patch new file mode 100644 index 0000000..2a622d7 --- /dev/null +++ b/patches.suse/usb-typec-ucsi-Clean-up-UCSI_CABLE_PROP-macros.patch @@ -0,0 +1,47 @@ +From 4d0a5a9915793377c0fe1a8d78de6bcd92cea963 Mon Sep 17 00:00:00 2001 +From: Jameson Thies +Date: Tue, 5 Mar 2024 02:58:01 +0000 +Subject: [PATCH] usb: typec: ucsi: Clean up UCSI_CABLE_PROP macros +Git-commit: 4d0a5a9915793377c0fe1a8d78de6bcd92cea963 +Patch-mainline: v6.9-rc1 +References: git-fixes + +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 +Reviewed-by: Prashant Malani +Reviewed-by: Dmitry Baryshkov +Signed-off-by: Jameson Thies +Link: https://lore.kernel.org/r/20240305025804.1290919-2-jthies@google.com +Signed-off-by: Greg Kroah-Hartman +Acked-by: Takashi Iwai + +--- + 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 7e35ffbe0a6f..469a2baf472e 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.43.0 + diff --git a/series.conf b/series.conf index a8a8322..1fe1424 100644 --- a/series.conf +++ b/series.conf @@ -45831,6 +45831,7 @@ patches.suse/RDMA-rtrs-clt-Check-strnlen-return-len-in-sysfs-mpat.patch patches.suse/usb-audio-v2-Correct-comments-for-struct-uac_clock_s.patch patches.suse/usb-xhci-Add-error-handling-in-xhci_map_urb_for_dma.patch + patches.suse/usb-typec-ucsi-Clean-up-UCSI_CABLE_PROP-macros.patch # jejb/scsi for-next patches.suse/scsi-lpfc-Initialize-status-local-variable-in-lpfc_s.patch