UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

usb: typec: ucsi: New error codes 

Adding new error codes to the driver that were introduced in
UCSI specification v1.1.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Tested-by: Ajay Gupta <ajayg@nvidia.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20191104142435.29960-18-heikki.krogerus@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Heikki Krogerus 2019-11-04 17:24:34 +03:00 committed by Greg Kroah-Hartman
parent 3cf657f079
commit e716bb38ed
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,18 +86,33 @@ static int ucsi_read_error(struct ucsi *ucsi)
case UCSI_ERROR_DEAD_BATTERY:
dev_warn(ucsi->dev, "Dead battery condition!\n");
return -EPERM;
/* The following mean a bug in this driver */
case UCSI_ERROR_INVALID_CON_NUM:
case UCSI_ERROR_UNREGONIZED_CMD:
case UCSI_ERROR_INVALID_CMD_ARGUMENT:
dev_err(ucsi->dev, "possible UCSI driver bug (0x%x)\n", error);
dev_err(ucsi->dev, "possible UCSI driver bug %u\n", error);
return -EINVAL;
case UCSI_ERROR_OVERCURRENT:
dev_warn(ucsi->dev, "Overcurrent condition\n");
break;
case UCSI_ERROR_PARTNER_REJECTED_SWAP:
dev_warn(ucsi->dev, "Partner rejected swap\n");
break;
case UCSI_ERROR_HARD_RESET:
dev_warn(ucsi->dev, "Hard reset occurred\n");
break;
case UCSI_ERROR_PPM_POLICY_CONFLICT:
dev_warn(ucsi->dev, "PPM Policy conflict\n");
break;
case UCSI_ERROR_SWAP_REJECTED:
dev_warn(ucsi->dev, "Swap rejected\n");
break;
case UCSI_ERROR_UNDEFINED:
default:
dev_err(ucsi->dev, "%s: error without status\n", __func__);
return -EIO;
dev_err(ucsi->dev, "unknown error %u\n", error);
break;
}
return 0;
return -EIO;
}
static int ucsi_exec_command(struct ucsi *ucsi, u64 cmd)

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

@ -133,6 +133,12 @@ void ucsi_connector_change(struct ucsi *ucsi, u8 num);
#define UCSI_ERROR_CC_COMMUNICATION_ERR BIT(4)
#define UCSI_ERROR_DEAD_BATTERY BIT(5)
#define UCSI_ERROR_CONTRACT_NEGOTIATION_FAIL BIT(6)
#define UCSI_ERROR_OVERCURRENT BIT(7)
#define UCSI_ERROR_UNDEFINED BIT(8)
#define UCSI_ERROR_PARTNER_REJECTED_SWAP BIT(9)
#define UCSI_ERROR_HARD_RESET BIT(10)
#define UCSI_ERROR_PPM_POLICY_CONFLICT BIT(11)
#define UCSI_ERROR_SWAP_REJECTED BIT(12)
/* Data structure filled by PPM in response to GET_CAPABILITY command. */
struct ucsi_capability {