github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 04:23:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

usb: typec: ucsi: UCSI2.0 Get Error Status changes

Browse Source 
Add support for UCSI 2.0 Get Error Status command to add connector
number field to the command structure.

Connector number field is extracted from the previous UCSI command
which has failed and is used to get the failure reason/Error using
Get Error Status command.

Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Pooja Katiyar <pooja.katiyar@intel.com>
Link: https://lore.kernel.org/r/20240624213359.1270018-1-pooja.katiyar@intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Pooja Katiyar 2024-06-24 14:33:59 -07:00 committed by Greg Kroah-Hartman
parent d58a767107
commit fe1b01a82f
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/usb/typec/ucsi/ucsi.c
View File

@ -65,8 +65,9 @@ static int ucsi_acknowledge(struct ucsi *ucsi, bool conn_ack)
static int ucsi_exec_command(struct ucsi *ucsi, u64 command);
static int ucsi_read_error(struct ucsi *ucsi)
static int ucsi_read_error(struct ucsi *ucsi, u8 connector_num)
{
u64 command;
u16 error;
int ret;
@ -75,7 +76,8 @@ static int ucsi_read_error(struct ucsi *ucsi)
if (ret)
return ret;
ret = ucsi_exec_command(ucsi, UCSI_GET_ERROR_STATUS);
command = UCSI_GET_ERROR_STATUS | UCSI_CONNECTOR_NUMBER(connector_num);
ret = ucsi_exec_command(ucsi, command);
if (ret < 0)
return ret;
@ -134,9 +136,30 @@ static int ucsi_read_error(struct ucsi *ucsi)
static int ucsi_exec_command(struct ucsi *ucsi, u64 cmd)
{
u8 connector_num;
u32 cci;
int ret;
if (ucsi->version > UCSI_VERSION_1_2) {
switch (UCSI_COMMAND(cmd)) {
case UCSI_GET_ALTERNATE_MODES:
connector_num = UCSI_GET_ALTMODE_GET_CONNECTOR_NUMBER(cmd);
break;
case UCSI_PPM_RESET:
case UCSI_CANCEL:
case UCSI_ACK_CC_CI:
case UCSI_SET_NOTIFICATION_ENABLE:
case UCSI_GET_CAPABILITY:
connector_num = 0;
break;
default:
connector_num = UCSI_DEFAULT_GET_CONNECTOR_NUMBER(cmd);
break;
}
} else {
connector_num = 0;
}
ret = ucsi->ops->sync_write(ucsi, UCSI_CONTROL, &cmd, sizeof(cmd));
if (ret)
return ret;
@ -166,7 +189,7 @@ static int ucsi_exec_command(struct ucsi *ucsi, u64 cmd)
return -EIO;
}
return ucsi_read_error(ucsi);
return ucsi_read_error(ucsi, connector_num);
}
if (cmd == UCSI_CANCEL && cci & UCSI_CCI_CANCEL_COMPLETE) {

3
drivers/usb/typec/ucsi/ucsi.h
View File

@ -116,6 +116,9 @@ void ucsi_connector_change(struct ucsi *ucsi, u8 num);
#define UCSI_CONNECTOR_NUMBER(_num_) ((u64)(_num_) << 16)
#define UCSI_COMMAND(_cmd_) ((_cmd_) & 0xff)
#define UCSI_GET_ALTMODE_GET_CONNECTOR_NUMBER(_cmd_) (((_cmd_) >> 24) & GENMASK(6, 0))
#define UCSI_DEFAULT_GET_CONNECTOR_NUMBER(_cmd_) (((_cmd_) >> 16) & GENMASK(6, 0))
/* CONNECTOR_RESET command bits */
#define UCSI_CONNECTOR_RESET_HARD BIT(23) /* Deprecated in v1.1 */