ucsi driver changes for v5.8
Subsystems (2)
Heikki Krogerus
maintainercover ucsi driver changes for v5.8
Hi Greg,
Here are the ucsi driver changes I've collected so far. On top of the usual driver improvements, there is a patch from Abhilash where a USB type power supply (so the power supply class) is registered for each port.
Let me know if you want me to change anything.
thanks,
K V, Abhilash (5):
usb: typec: ucsi: Workaround for missed op_mode change
usb: typec: ucsi: replace magic numbers
usb: typec: ucsi: Correct bit-mask for CCI
usb: typec: ucsi: save power data objects in PD mode
usb: typec: ucsi: register with power_supply class
Mayank Rana (1):
usb: typec: ucsi: set USB data role when partner type is power
cable/ufp
drivers/usb/typec/ucsi/Makefile | 4 + drivers/usb/typec/ucsi/psy.c | 241 ++++++++++++++++++++++++++++++++ drivers/usb/typec/ucsi/trace.c | 10 +- drivers/usb/typec/ucsi/ucsi.c | 41 +++++- drivers/usb/typec/ucsi/ucsi.h | 26 +++- 5 files changed, 315 insertions(+), 7 deletions(-) create mode 100644 drivers/usb/typec/ucsi/psy.c
Signature · 1 line
2.26.1
Heikki Krogerus
maintainerPATCH 1/6 usb: typec: ucsi: set USB data role when partner type is power cable/ufp
From: Mayank Rana <[email protected]>
Currently UCSI framework doesn't update USB data role when partner type is reported as power cable or power cable with ufp connected. This results into no USB host mode functionality. This is valid usecase where user wants to use legacy type c power cable with type a female connector to attach different USB devices like mouse, thumb drive etc. Hence update USB data role as host when partner type is reported as power cable or power cable with ufp connected.
--- drivers/usb/typec/ucsi/ucsi.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/usb/typec/ucsi/ucsi.c +6 -0
@@ -566,6 +566,8 @@ static void ucsi_partner_change(struct ucsi_connector *con)switch (UCSI_CONSTAT_PARTNER_TYPE (con->status.flags)) {case UCSI_CONSTAT_PARTNER_TYPE_UFP : +case UCSI_CONSTAT_PARTNER_TYPE_CABLE : +case UCSI_CONSTAT_PARTNER_TYPE_CABLE_AND_UFP :typec_set_data_role (con->port,TYPEC_HOST );break ;case UCSI_CONSTAT_PARTNER_TYPE_DFP :
@@ -627,6 +629,8 @@ static void ucsi_handle_connector_change(struct work_struct *work)switch (UCSI_CONSTAT_PARTNER_TYPE (con->status.flags)) {case UCSI_CONSTAT_PARTNER_TYPE_UFP : +case UCSI_CONSTAT_PARTNER_TYPE_CABLE : +case UCSI_CONSTAT_PARTNER_TYPE_CABLE_AND_UFP :typec_set_data_role (con->port,TYPEC_HOST );break ;case UCSI_CONSTAT_PARTNER_TYPE_DFP :
@@ -927,6 +931,8 @@ static int ucsi_register_port(struct ucsi *ucsi, int index)switch (UCSI_CONSTAT_PARTNER_TYPE (con->status.flags)) {case UCSI_CONSTAT_PARTNER_TYPE_UFP : +case UCSI_CONSTAT_PARTNER_TYPE_CABLE : +case UCSI_CONSTAT_PARTNER_TYPE_CABLE_AND_UFP :typec_set_data_role (con->port,TYPEC_HOST );break ;case UCSI_CONSTAT_PARTNER_TYPE_DFP :
Signature · 1 line
2.26.1
Heikki Krogerus
maintainerPATCH 2/6 usb: typec: ucsi: Workaround for missed op_mode change
In reply to Heikki KrogerusFrom: "K V, Abhilash" <[email protected]>
EC firmware on Dell XPS & Latitude series does not set "Power Operation Mode Change" bit in "Connector Status change" field of MESSAGE IN Data while transitioning from type-C current to PD mode.
Instead the "Negotiated Power Level Change" bit is set when the "Power Operation Mode" field shows the correct mode (i.e. PD).
This patch adds a check for this bit also, to trigger an update of power operation mode in class driver, while handling GET_CONNECTOR_STATUS command.
--- drivers/usb/typec/ucsi/ucsi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/typec/ucsi/ucsi.c +2 -1
@@ -613,7 +613,8 @@ static void ucsi_handle_connector_change(struct work_struct *work) role = !!(con->status.flags &UCSI_CONSTAT_PWR_DIR ); -if (con->status.change &UCSI_CONSTAT_POWER_OPMODE_CHANGE ) +if (con->status.change &UCSI_CONSTAT_POWER_OPMODE_CHANGE || + con->status.change &UCSI_CONSTAT_POWER_LEVEL_CHANGE )ucsi_pwr_opmode_change (con);if (con->status.change &UCSI_CONSTAT_POWER_DIR_CHANGE ) {
Signature · 1 line
2.26.1
Heikki Krogerus
maintainerPATCH 3/6 usb: typec: ucsi: replace magic numbers
In reply to Heikki KrogerusFrom: "K V, Abhilash" <[email protected]>
Replace magic numbers with macros in trace.h.
--- drivers/usb/typec/ucsi/trace.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/usb/typec/ucsi/trace.c +5 -5
@@ -35,16 +35,16 @@ const char *ucsi_cmd_str(u64 raw_cmd)const char *ucsi_cci_str (u32 cci) { -if (cci &GENMASK (7 ,0 )) { -if (cci &BIT (29 )) +if (UCSI_CCI_CONNECTOR (cci)) { +if (cci &UCSI_CCI_ACK_COMPLETE )return "Event pending (ACK completed)" ; -if (cci &BIT (31 )) +if (cci &UCSI_CCI_COMMAND_COMPLETE )return "Event pending (command completed)" ;return "Connector Change" ; } -if (cci &BIT (29 )) +if (cci &UCSI_CCI_ACK_COMPLETE )return "ACK completed" ; -if (cci &BIT (31 )) +if (cci &UCSI_CCI_COMMAND_COMPLETE )return "Command completed" ;return "" ;
Signature · 1 line
2.26.1
Heikki Krogerus
maintainerPATCH 4/6 usb: typec: ucsi: Correct bit-mask for CCI
In reply to Heikki KrogerusFrom: "K V, Abhilash" <[email protected]>
Bit 0 is reserved in CCI (Command Status & Connector Change Indicator) register. So, change bit-mask for connector number field to 7..1 instead of 7..0.
There would be no functional change since we were anyways right-shifing by 1 bit.
--- drivers/usb/typec/ucsi/ucsi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/typec/ucsi/ucsi.h +1 -1
@@ -21,7 +21,7 @@ struct ucsi_altmode;#define UCSI_MESSAGE_OUT 32/* Command Status and Connector Change Indication (CCI) bits */ -#define UCSI_CCI_CONNECTOR (_c_) (((_c_) & GENMASK(7, 0)) >> 1) +#define UCSI_CCI_CONNECTOR (_c_) (((_c_) & GENMASK(7, 1)) >> 1)#define UCSI_CCI_LENGTH (_c_) (((_c_) & GENMASK(15, 8)) >> 8)#define UCSI_CCI_NOT_SUPPORTED BIT(25)#define UCSI_CCI_CANCEL_COMPLETE BIT(26)
Signature · 1 line
2.26.1
Heikki Krogerus
maintainerPATCH 5/6 usb: typec: ucsi: save power data objects in PD mode
In reply to Heikki KrogerusFrom: "K V, Abhilash" <[email protected]>
When connected to a PD-capable power-source, read & save all partner power data objects (PDOs) by using GET_PDOS UCSI command. Also, save the current power contract in request data object (RDO) for that connector.
--- drivers/usb/typec/ucsi/ucsi.c | 26 ++++++++++++++++++++++++++ drivers/usb/typec/ucsi/ucsi.h | 9 +++++++++ 2 files changed, 35 insertions(+)
drivers/usb/typec/ucsi/ucsi.c +26 -0
@@ -492,19 +492,45 @@ static void ucsi_unregister_altmodes(struct ucsi_connector *con, u8 recipient) } } +static void ucsi_get_pdos (struct ucsi_connector *con,int is_partner) +{ +struct ucsi *ucsi = con->ucsi; +u64 command; +int ret; + + command =UCSI_COMMAND (UCSI_GET_PDOS ) |UCSI_CONNECTOR_NUMBER (con->num); + command |=UCSI_GET_PDOS_PARTNER_PDO (is_partner); + command |=UCSI_GET_PDOS_NUM_PDOS (UCSI_MAX_PDOS -1 ); + command |=UCSI_GET_PDOS_SRC_PDOS ; + ret =ucsi_run_command (ucsi, command, con->src_pdos, +sizeof (con->src_pdos)); +if (ret <0 ) { +dev_err (ucsi->dev,"UCSI_GET_PDOS failed (%d)\n" , ret); +return ; + } + con->num_pdos = ret /sizeof (u32);/* number of bytes to 32-bit PDOs */ +if (ret ==0 ) +dev_warn (ucsi->dev,"UCSI_GET_PDOS returned 0 bytes\n" ); +} +static void ucsi_pwr_opmode_change (struct ucsi_connector *con) {switch (UCSI_CONSTAT_PWR_OPMODE (con->status.flags)) {case UCSI_CONSTAT_PWR_OPMODE_PD : + con->rdo = con->status.request_data_obj;typec_set_pwr_opmode (con->port,TYPEC_PWR_MODE_PD ); +ucsi_get_pdos (con,1 );break ;case UCSI_CONSTAT_PWR_OPMODE_TYPEC1_5 : + con->rdo =0 ;typec_set_pwr_opmode (con->port,TYPEC_PWR_MODE_1_5A );break ;case UCSI_CONSTAT_PWR_OPMODE_TYPEC3_0 : + con->rdo =0 ;typec_set_pwr_opmode (con->port,TYPEC_PWR_MODE_3_0A );break ;default : + con->rdo =0 ;typec_set_pwr_opmode (con->port,TYPEC_PWR_MODE_USB );break ; }
drivers/usb/typec/ucsi/ucsi.h +9 -0
@@ -130,6 +130,11 @@ void ucsi_connector_change(struct ucsi *ucsi, u8 num);#define UCSI_GET_ALTMODE_OFFSET (_r_) ((u64)(_r_) << 32)#define UCSI_GET_ALTMODE_NUM_ALTMODES (_r_) ((u64)(_r_) << 40) +/* GET_PDOS command bits */ +#define UCSI_GET_PDOS_PARTNER_PDO (_r_) ((u64)(_r_) << 23) +#define UCSI_GET_PDOS_NUM_PDOS (_r_) ((u64)(_r_) << 32) +#define UCSI_GET_PDOS_SRC_PDOS ((u64)1 << 34) +/* -------------------------------------------------------------------------- */ /* Error information returned by PPM in response to GET_ERROR_STATUS command. */
@@ -294,6 +299,7 @@ struct ucsi {#define UCSI_MAX_SVID 5#define UCSI_MAX_ALTMODES (UCSI_MAX_SVID * 6) +#define UCSI_MAX_PDOS (4)struct ucsi_connector {int num;
@@ -313,6 +319,9 @@ struct ucsi_connector {struct ucsi_connector_status status;struct ucsi_connector_capability cap; +u32 rdo; +u32 src_pdos[UCSI_MAX_PDOS ]; +int num_pdos; }; int ucsi_send_command(struct ucsi *ucsi, u64 command,
Signature · 1 line
2.26.1
Heikki Krogerus
maintainerPATCH 6/6 usb: typec: ucsi: register with power_supply class
In reply to Heikki KrogerusFrom: "K V, Abhilash" <[email protected]>
With this change the UCSI device will show up in /sys/class/power_supply/. The following values are exported:
- online
- usb_type
- voltage_min
- voltage_max
- voltage_now
- current_max
- current_now
Once a PD-capable type-C power source is connected to the system, GET_PDOS UCSI command is used to query all source capabilities. Request data object (RDO) is used to get current values.
--- drivers/usb/typec/ucsi/Makefile | 4 + drivers/usb/typec/ucsi/psy.c | 241 ++++++++++++++++++++++++++++++++ drivers/usb/typec/ucsi/ucsi.c | 6 + drivers/usb/typec/ucsi/ucsi.h | 15 ++ 4 files changed, 266 insertions(+) create mode 100644 drivers/usb/typec/ucsi/psy.c
drivers/usb/typec/ucsi/Makefile +4 -0
@@ -7,6 +7,10 @@ typec_ucsi-y := ucsi.o typec_ucsi-$(CONFIG_TRACING) += trace.o +ifneq ($(CONFIG_POWER_SUPPLY),) + typec_ucsi-y += psy.o +endif + ifneq ($(CONFIG_TYPEC_DP_ALTMODE),) typec_ucsi-y += displayport.o endif
drivers/usb/typec/ucsi/psy.c new file +241 -0
241 lines not on this page · raw message
drivers/usb/typec/ucsi/ucsi.c +6 -0
@@ -936,6 +936,10 @@ static int ucsi_register_port(struct ucsi *ucsi, int index) cap->driver_data = con; cap->ops = &ucsi_ops; + ret =ucsi_register_port_psy (con); +if (ret) +return ret; +/* Register the connector */ con->port =typec_register_port (ucsi->dev, cap);if (IS_ERR (con->port))
@@ -1062,6 +1066,7 @@ int ucsi_init(struct ucsi *ucsi)for (con = ucsi->connector; con->port; con++) {ucsi_unregister_partner (con);ucsi_unregister_altmodes (con,UCSI_RECIPIENT_CON ); +ucsi_unregister_port_psy (con);typec_unregister_port (con->port); con->port =NULL ; }
@@ -1185,6 +1190,7 @@ void ucsi_unregister(struct ucsi *ucsi)ucsi_unregister_partner (&ucsi->connector[i]);ucsi_unregister_altmodes (&ucsi->connector[i],UCSI_RECIPIENT_CON ); +ucsi_unregister_port_psy (&ucsi->connector[i]);typec_unregister_port (ucsi->connector[i].port); }
drivers/usb/typec/ucsi/ucsi.h +15 -0
@@ -5,6 +5,7 @@#include <linux/bitops.h> #include <linux/device.h> +#include <linux/power_supply.h> #include <linux/types.h> #include <linux/usb/typec.h>
@@ -301,6 +302,10 @@ struct ucsi {#define UCSI_MAX_ALTMODES (UCSI_MAX_SVID * 6)#define UCSI_MAX_PDOS (4) +#define UCSI_TYPEC_VSAFE5V 5000 +#define UCSI_TYPEC_1_5_CURRENT 1500 +#define UCSI_TYPEC_3_0_CURRENT 3000 +struct ucsi_connector {int num;
@@ -319,6 +324,8 @@ struct ucsi_connector {struct ucsi_connector_status status;struct ucsi_connector_capability cap; +struct power_supply *psy; +struct power_supply_desc psy_desc;u32 rdo;u32 src_pdos[UCSI_MAX_PDOS ];int num_pdos;
@@ -330,6 +337,14 @@ int ucsi_send_command(struct ucsi *ucsi, u64 command,void ucsi_altmode_update_active (struct ucsi_connector *con);int ucsi_resume (struct ucsi *ucsi); +#if IS_ENABLED (CONFIG_POWER_SUPPLY ) +int ucsi_register_port_psy (struct ucsi_connector *con); +void ucsi_unregister_port_psy (struct ucsi_connector *con); +#else +static inline int ucsi_register_port (struct ucsi_connector *con) {return 0 ; } +static inline void ucsi_unregister_port_psy (struct ucsi_connector *con) { } +#endif /* CONFIG_POWER_SUPPLY */ +#if IS_ENABLED (CONFIG_TYPEC_DP_ALTMODE )struct typec_altmode * ucsi_register_displayport(struct ucsi_connector *con,
Signature · 1 line
2.26.1