| Message ID | 3filrg6mbh6m3galir7ew5juakd25uvksimr7mqd7uc5td3xza@fdvxcewozqeh (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1fb2d2d25c9a4fd6951afdb48d18d9c24bf0db03 |
| Headers | show |
| Series | usb: typec: ucsi: Add new notification bits | expand |
On Wed, May 08, 2024 at 04:43:40PM +0100, Diogo Ivo wrote: > Newer UCSI versions defined additional notification bits that can be > enabled by the PPM. Add their definitions and convert all definitions > to BIT_ULL() as we now cross the 32-bit boundary. > > Signed-off-by: Diogo Ivo <diogo.ivo@tecnico.ulisboa.pt> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > drivers/usb/typec/ucsi/ucsi.h | 29 +++++++++++++++++------------ > 1 file changed, 17 insertions(+), 12 deletions(-) > > diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h > index c4d103db9d0f..e70cf5b15562 100644 > --- a/drivers/usb/typec/ucsi/ucsi.h > +++ b/drivers/usb/typec/ucsi/ucsi.h > @@ -124,18 +124,23 @@ void ucsi_connector_change(struct ucsi *ucsi, u8 num); > #define UCSI_ACK_COMMAND_COMPLETE BIT(17) > > /* SET_NOTIFICATION_ENABLE command bits */ > -#define UCSI_ENABLE_NTFY_CMD_COMPLETE BIT(16) > -#define UCSI_ENABLE_NTFY_EXT_PWR_SRC_CHANGE BIT(17) > -#define UCSI_ENABLE_NTFY_PWR_OPMODE_CHANGE BIT(18) > -#define UCSI_ENABLE_NTFY_CAP_CHANGE BIT(21) > -#define UCSI_ENABLE_NTFY_PWR_LEVEL_CHANGE BIT(22) > -#define UCSI_ENABLE_NTFY_PD_RESET_COMPLETE BIT(23) > -#define UCSI_ENABLE_NTFY_CAM_CHANGE BIT(24) > -#define UCSI_ENABLE_NTFY_BAT_STATUS_CHANGE BIT(25) > -#define UCSI_ENABLE_NTFY_PARTNER_CHANGE BIT(27) > -#define UCSI_ENABLE_NTFY_PWR_DIR_CHANGE BIT(28) > -#define UCSI_ENABLE_NTFY_CONNECTOR_CHANGE BIT(30) > -#define UCSI_ENABLE_NTFY_ERROR BIT(31) > +#define UCSI_ENABLE_NTFY_CMD_COMPLETE BIT_ULL(16) > +#define UCSI_ENABLE_NTFY_EXT_PWR_SRC_CHANGE BIT_ULL(17) > +#define UCSI_ENABLE_NTFY_PWR_OPMODE_CHANGE BIT_ULL(18) > +#define UCSI_ENABLE_NTFY_ATTENTION BIT_ULL(19) > +#define UCSI_ENABLE_NTFY_LPM_FW_UPDATE_REQ BIT_ULL(20) > +#define UCSI_ENABLE_NTFY_CAP_CHANGE BIT_ULL(21) > +#define UCSI_ENABLE_NTFY_PWR_LEVEL_CHANGE BIT_ULL(22) > +#define UCSI_ENABLE_NTFY_PD_RESET_COMPLETE BIT_ULL(23) > +#define UCSI_ENABLE_NTFY_CAM_CHANGE BIT_ULL(24) > +#define UCSI_ENABLE_NTFY_BAT_STATUS_CHANGE BIT_ULL(25) > +#define UCSI_ENABLE_NTFY_SECURITY_REQ_PARTNER BIT_ULL(26) > +#define UCSI_ENABLE_NTFY_PARTNER_CHANGE BIT_ULL(27) > +#define UCSI_ENABLE_NTFY_PWR_DIR_CHANGE BIT_ULL(28) > +#define UCSI_ENABLE_NTFY_SET_RETIMER_MODE BIT_ULL(29) > +#define UCSI_ENABLE_NTFY_CONNECTOR_CHANGE BIT_ULL(30) > +#define UCSI_ENABLE_NTFY_ERROR BIT_ULL(31) > +#define UCSI_ENABLE_NTFY_SINK_PATH_STS_CHANGE BIT_ULL(32) > #define UCSI_ENABLE_NTFY_ALL 0xdbe70000 > > /* SET_UOR command bits */ > -- > 2.45.0
diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h index c4d103db9d0f..e70cf5b15562 100644 --- a/drivers/usb/typec/ucsi/ucsi.h +++ b/drivers/usb/typec/ucsi/ucsi.h @@ -124,18 +124,23 @@ void ucsi_connector_change(struct ucsi *ucsi, u8 num); #define UCSI_ACK_COMMAND_COMPLETE BIT(17) /* SET_NOTIFICATION_ENABLE command bits */ -#define UCSI_ENABLE_NTFY_CMD_COMPLETE BIT(16) -#define UCSI_ENABLE_NTFY_EXT_PWR_SRC_CHANGE BIT(17) -#define UCSI_ENABLE_NTFY_PWR_OPMODE_CHANGE BIT(18) -#define UCSI_ENABLE_NTFY_CAP_CHANGE BIT(21) -#define UCSI_ENABLE_NTFY_PWR_LEVEL_CHANGE BIT(22) -#define UCSI_ENABLE_NTFY_PD_RESET_COMPLETE BIT(23) -#define UCSI_ENABLE_NTFY_CAM_CHANGE BIT(24) -#define UCSI_ENABLE_NTFY_BAT_STATUS_CHANGE BIT(25) -#define UCSI_ENABLE_NTFY_PARTNER_CHANGE BIT(27) -#define UCSI_ENABLE_NTFY_PWR_DIR_CHANGE BIT(28) -#define UCSI_ENABLE_NTFY_CONNECTOR_CHANGE BIT(30) -#define UCSI_ENABLE_NTFY_ERROR BIT(31) +#define UCSI_ENABLE_NTFY_CMD_COMPLETE BIT_ULL(16) +#define UCSI_ENABLE_NTFY_EXT_PWR_SRC_CHANGE BIT_ULL(17) +#define UCSI_ENABLE_NTFY_PWR_OPMODE_CHANGE BIT_ULL(18) +#define UCSI_ENABLE_NTFY_ATTENTION BIT_ULL(19) +#define UCSI_ENABLE_NTFY_LPM_FW_UPDATE_REQ BIT_ULL(20) +#define UCSI_ENABLE_NTFY_CAP_CHANGE BIT_ULL(21) +#define UCSI_ENABLE_NTFY_PWR_LEVEL_CHANGE BIT_ULL(22) +#define UCSI_ENABLE_NTFY_PD_RESET_COMPLETE BIT_ULL(23) +#define UCSI_ENABLE_NTFY_CAM_CHANGE BIT_ULL(24) +#define UCSI_ENABLE_NTFY_BAT_STATUS_CHANGE BIT_ULL(25) +#define UCSI_ENABLE_NTFY_SECURITY_REQ_PARTNER BIT_ULL(26) +#define UCSI_ENABLE_NTFY_PARTNER_CHANGE BIT_ULL(27) +#define UCSI_ENABLE_NTFY_PWR_DIR_CHANGE BIT_ULL(28) +#define UCSI_ENABLE_NTFY_SET_RETIMER_MODE BIT_ULL(29) +#define UCSI_ENABLE_NTFY_CONNECTOR_CHANGE BIT_ULL(30) +#define UCSI_ENABLE_NTFY_ERROR BIT_ULL(31) +#define UCSI_ENABLE_NTFY_SINK_PATH_STS_CHANGE BIT_ULL(32) #define UCSI_ENABLE_NTFY_ALL 0xdbe70000 /* SET_UOR command bits */
Newer UCSI versions defined additional notification bits that can be enabled by the PPM. Add their definitions and convert all definitions to BIT_ULL() as we now cross the 32-bit boundary. Signed-off-by: Diogo Ivo <diogo.ivo@tecnico.ulisboa.pt> --- drivers/usb/typec/ucsi/ucsi.h | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-)