usb: typec: ucsi: Update UCSI structure to have message in and message out fields

Update UCSI structure by adding fields for incoming and outgoing
messages. Update .sync_control function and other related functions
to use these new fields within the UCSI structure, instead of handling
them as separate parameters.

Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Pooja Katiyar <pooja.katiyar@intel.com>
Link: https://patch.msgid.link/214b0a90c3220db33084ab714f4f33a004f70a41.1761773881.git.pooja.katiyar@intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/typec/ucsi/cros_ec_ucsi.c b/drivers/usb/typec/ucsi/cros_ec_ucsi.c
index eed2a7d0ebc634723d05004f6a5ea378a75b25d1..d753f2188e2573d09a6dcebd9f7b385d30105759 100644 (file)
--- a/drivers/usb/typec/ucsi/cros_ec_ucsi.c
+++ b/drivers/usb/typec/ucsi/cros_ec_ucsi.c
@@ -105,13 +105,12 @@ static int cros_ucsi_async_control(struct ucsi *ucsi, u64 cmd)
        return 0;
 }
 
-static int cros_ucsi_sync_control(struct ucsi *ucsi, u64 cmd, u32 *cci,
-                                 void *data, size_t size)
+static int cros_ucsi_sync_control(struct ucsi *ucsi, u64 cmd, u32 *cci)
 {
        struct cros_ucsi_data *udata = ucsi_get_drvdata(ucsi);
        int ret;
 
-       ret = ucsi_sync_control_common(ucsi, cmd, cci, data, size);
+       ret = ucsi_sync_control_common(ucsi, cmd, cci);
        switch (ret) {
        case -EBUSY:
                /* EC may return -EBUSY if CCI.busy is set.

diff --git a/drivers/usb/typec/ucsi/debugfs.c b/drivers/usb/typec/ucsi/debugfs.c
index f3684ab787fe66b7cfeeb5bbf56c74d23c9a0c3f..924f9302755344306c6272b85fdc357a71bb390e 100644 (file)
--- a/drivers/usb/typec/ucsi/debugfs.c
+++ b/drivers/usb/typec/ucsi/debugfs.c
@@ -37,7 +37,8 @@ static int ucsi_cmd(void *data, u64 val)
        case UCSI_SET_USB:
        case UCSI_SET_POWER_LEVEL:
        case UCSI_READ_POWER_LEVEL:
-               ret = ucsi_send_command(ucsi, val, NULL, 0);
+               ucsi->message_in_size = 0;
+               ret = ucsi_send_command(ucsi, val);
                break;
        case UCSI_GET_CAPABILITY:
        case UCSI_GET_CONNECTOR_CAPABILITY:
@@ -52,9 +53,9 @@ static int ucsi_cmd(void *data, u64 val)
        case UCSI_GET_ATTENTION_VDO:
        case UCSI_GET_CAM_CS:
        case UCSI_GET_LPM_PPM_INFO:
-               ret = ucsi_send_command(ucsi, val,
-                                       &ucsi->debugfs->response,
-                                       sizeof(ucsi->debugfs->response));
+               ucsi->message_in_size = sizeof(ucsi->debugfs->response);
+               ret = ucsi_send_command(ucsi, val);
+               memcpy(&ucsi->debugfs->response, ucsi->message_in, sizeof(ucsi->debugfs->response));
                break;
        default:
                ret = -EOPNOTSUPP;

diff --git a/drivers/usb/typec/ucsi/displayport.c b/drivers/usb/typec/ucsi/displayport.c
index 8aae80b457d74dce41e3ec1d1e2e92a5ee3bd575..a09b4900ec7646ba95e0c17f421bbf67f71ba6a5 100644 (file)
--- a/drivers/usb/typec/ucsi/displayport.c
+++ b/drivers/usb/typec/ucsi/displayport.c
@@ -67,11 +67,14 @@ static int ucsi_displayport_enter(struct typec_altmode *alt, u32 *vdo)
        }
 
        command = UCSI_GET_CURRENT_CAM | UCSI_CONNECTOR_NUMBER(dp->con->num);
-       ret = ucsi_send_command(ucsi, command, &cur, sizeof(cur));
+       ucsi->message_in_size = sizeof(cur);
+       ret = ucsi_send_command(ucsi, command);
        if (ret < 0) {
                if (ucsi->version > 0x0100)
                        goto err_unlock;
                cur = 0xff;
+       } else {
+               memcpy(&cur, ucsi->message_in, ucsi->message_in_size);
        }
 
        if (cur != 0xff) {
@@ -126,7 +129,8 @@ static int ucsi_displayport_exit(struct typec_altmode *alt)
        }
 
        command = UCSI_CMD_SET_NEW_CAM(dp->con->num, 0, dp->offset, 0);
-       ret = ucsi_send_command(dp->con->ucsi, command, NULL, 0);
+       dp->con->ucsi->message_in_size = 0;
+       ret = ucsi_send_command(dp->con->ucsi, command);
        if (ret < 0)
                goto out_unlock;
 
@@ -193,7 +197,8 @@ static int ucsi_displayport_configure(struct ucsi_dp *dp)
 
        command = UCSI_CMD_SET_NEW_CAM(dp->con->num, 1, dp->offset, pins);
 
-       return ucsi_send_command(dp->con->ucsi, command, NULL, 0);
+       dp->con->ucsi->message_in_size = 0;
+       return ucsi_send_command(dp->con->ucsi, command);
 }
 
 static int ucsi_displayport_vdm(struct typec_altmode *alt,

diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
index a7b388dc7fa0fa8adf8426dca97983cad096f420..8195407131501c1b2cdc087ed8e00f1cb1eae86d 100644 (file)
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -55,8 +55,7 @@ void ucsi_notify_common(struct ucsi *ucsi, u32 cci)
 }
 EXPORT_SYMBOL_GPL(ucsi_notify_common);
 
-int ucsi_sync_control_common(struct ucsi *ucsi, u64 command, u32 *cci,
-                            void *data, size_t size)
+int ucsi_sync_control_common(struct ucsi *ucsi, u64 command, u32 *cci)
 {
        bool ack = UCSI_COMMAND(command) == UCSI_ACK_CC_CI;
        int ret;
@@ -84,9 +83,10 @@ out_clear_bit:
        if (!ret && cci)
                ret = ucsi->ops->read_cci(ucsi, cci);
 
-       if (!ret && data &&
+       if (!ret && ucsi->message_in_size > 0 &&
            (*cci & UCSI_CCI_COMMAND_COMPLETE))
-               ret = ucsi->ops->read_message_in(ucsi, data, size);
+               ret = ucsi->ops->read_message_in(ucsi, ucsi->message_in,
+                                                ucsi->message_in_size);
 
        return ret;
 }
@@ -103,23 +103,25 @@ static int ucsi_acknowledge(struct ucsi *ucsi, bool conn_ack)
                ctrl |= UCSI_ACK_CONNECTOR_CHANGE;
        }
 
-       return ucsi->ops->sync_control(ucsi, ctrl, NULL, NULL, 0);
+       ucsi->message_in_size = 0;
+       return ucsi->ops->sync_control(ucsi, ctrl, NULL);
 }
 
-static int ucsi_run_command(struct ucsi *ucsi, u64 command, u32 *cci,
-                           void *data, size_t size, bool conn_ack)
+static int ucsi_run_command(struct ucsi *ucsi, u64 command, u32 *cci, bool conn_ack)
 {
        int ret, err;
 
        *cci = 0;
 
-       if (size > UCSI_MAX_DATA_LENGTH(ucsi))
+       if (ucsi->message_in_size > UCSI_MAX_DATA_LENGTH(ucsi))
                return -EINVAL;
 
-       ret = ucsi->ops->sync_control(ucsi, command, cci, data, size);
+       ret = ucsi->ops->sync_control(ucsi, command, cci);
 
-       if (*cci & UCSI_CCI_BUSY)
-               return ucsi_run_command(ucsi, UCSI_CANCEL, cci, NULL, 0, false) ?: -EBUSY;
+       if (*cci & UCSI_CCI_BUSY) {
+               ucsi->message_in_size = 0;
+               return ucsi_run_command(ucsi, UCSI_CANCEL, cci, false) ?: -EBUSY;
+       }
        if (ret)
                return ret;
 
@@ -151,10 +153,13 @@ static int ucsi_read_error(struct ucsi *ucsi, u8 connector_num)
        int ret;
 
        command = UCSI_GET_ERROR_STATUS | UCSI_CONNECTOR_NUMBER(connector_num);
-       ret = ucsi_run_command(ucsi, command, &cci, &error, sizeof(error), false);
+       ucsi->message_in_size = sizeof(error);
+       ret = ucsi_run_command(ucsi, command, &cci, false);
        if (ret < 0)
                return ret;
 
+       memcpy(&error, ucsi->message_in, sizeof(error));
+
        switch (error) {
        case UCSI_ERROR_INCOMPATIBLE_PARTNER:
                return -EOPNOTSUPP;
@@ -200,8 +205,7 @@ static int ucsi_read_error(struct ucsi *ucsi, u8 connector_num)
        return -EIO;
 }
 
-static int ucsi_send_command_common(struct ucsi *ucsi, u64 cmd,
-                                   void *data, size_t size, bool conn_ack)
+static int ucsi_send_command_common(struct ucsi *ucsi, u64 cmd, bool conn_ack)
 {
        u8 connector_num;
        u32 cci;
@@ -229,7 +233,7 @@ static int ucsi_send_command_common(struct ucsi *ucsi, u64 cmd,
 
        mutex_lock(&ucsi->ppm_lock);
 
-       ret = ucsi_run_command(ucsi, cmd, &cci, data, size, conn_ack);
+       ret = ucsi_run_command(ucsi, cmd, &cci, conn_ack);
 
        if (cci & UCSI_CCI_ERROR)
                ret = ucsi_read_error(ucsi, connector_num);
@@ -238,10 +242,9 @@ static int ucsi_send_command_common(struct ucsi *ucsi, u64 cmd,
        return ret;
 }
 
-int ucsi_send_command(struct ucsi *ucsi, u64 command,
-                     void *data, size_t size)
+int ucsi_send_command(struct ucsi *ucsi, u64 command)
 {
-       return ucsi_send_command_common(ucsi, command, data, size, false);
+       return ucsi_send_command_common(ucsi, command, false);
 }
 EXPORT_SYMBOL_GPL(ucsi_send_command);
 
@@ -319,7 +322,8 @@ void ucsi_altmode_update_active(struct ucsi_connector *con)
        int i;
 
        command = UCSI_GET_CURRENT_CAM | UCSI_CONNECTOR_NUMBER(con->num);
-       ret = ucsi_send_command(con->ucsi, command, &cur, sizeof(cur));
+       con->ucsi->message_in_size = sizeof(cur);
+       ret = ucsi_send_command(con->ucsi, command);
        if (ret < 0) {
                if (con->ucsi->version > 0x0100) {
                        dev_err(con->ucsi->dev,
@@ -327,6 +331,8 @@ void ucsi_altmode_update_active(struct ucsi_connector *con)
                        return;
                }
                cur = 0xff;
+       } else {
+               memcpy(&cur, con->ucsi->message_in, sizeof(cur));
        }
 
        if (cur < UCSI_MAX_ALTMODES)
@@ -510,7 +516,8 @@ ucsi_register_altmodes_nvidia(struct ucsi_connector *con, u8 recipient)
                command |= UCSI_GET_ALTMODE_RECIPIENT(recipient);
                command |= UCSI_GET_ALTMODE_CONNECTOR_NUMBER(con->num);
                command |= UCSI_GET_ALTMODE_OFFSET(i);
-               len = ucsi_send_command(con->ucsi, command, &alt, sizeof(alt));
+               ucsi->message_in_size = sizeof(alt);
+               len = ucsi_send_command(con->ucsi, command);
                /*
                 * We are collecting all altmodes first and then registering.
                 * Some type-C device will return zero length data beyond last
@@ -519,6 +526,8 @@ ucsi_register_altmodes_nvidia(struct ucsi_connector *con, u8 recipient)
                if (len < 0)
                        return len;
 
+               memcpy(&alt, ucsi->message_in, sizeof(alt));
+
                /* We got all altmodes, now break out and register them */
                if (!len || !alt.svid)
                        break;
@@ -586,12 +595,15 @@ static int ucsi_register_altmodes(struct ucsi_connector *con, u8 recipient)
                command |= UCSI_GET_ALTMODE_RECIPIENT(recipient);
                command |= UCSI_GET_ALTMODE_CONNECTOR_NUMBER(con->num);
                command |= UCSI_GET_ALTMODE_OFFSET(i);
-               len = ucsi_send_command(con->ucsi, command, alt, sizeof(alt));
+               con->ucsi->message_in_size = sizeof(alt);
+               len = ucsi_send_command(con->ucsi, command);
                if (len == -EBUSY)
                        continue;
                if (len <= 0)
                        return len;
 
+               memcpy(&alt, con->ucsi->message_in, sizeof(alt));
+
                /*
                 * This code is requesting one alt mode at a time, but some PPMs
                 * may still return two. If that happens both alt modes need be
@@ -659,7 +671,9 @@ static int ucsi_get_connector_status(struct ucsi_connector *con, bool conn_ack)
                          UCSI_MAX_DATA_LENGTH(con->ucsi));
        int ret;
 
-       ret = ucsi_send_command_common(con->ucsi, command, &con->status, size, conn_ack);
+       con->ucsi->message_in_size = size;
+       ret = ucsi_send_command_common(con->ucsi, command, conn_ack);
+       memcpy(&con->status, con->ucsi->message_in, size);
 
        return ret < 0 ? ret : 0;
 }
@@ -682,8 +696,9 @@ static int ucsi_read_pdos(struct ucsi_connector *con,
        command |= UCSI_GET_PDOS_PDO_OFFSET(offset);
        command |= UCSI_GET_PDOS_NUM_PDOS(num_pdos - 1);
        command |= is_source(role) ? UCSI_GET_PDOS_SRC_PDOS : 0;
-       ret = ucsi_send_command(ucsi, command, pdos + offset,
-                               num_pdos * sizeof(u32));
+       ucsi->message_in_size = num_pdos * sizeof(u32);
+       ret = ucsi_send_command(ucsi, command);
+       memcpy(pdos + offset, ucsi->message_in, num_pdos * sizeof(u32));
        if (ret < 0 && ret != -ETIMEDOUT)
                dev_err(ucsi->dev, "UCSI_GET_PDOS failed (%d)\n", ret);
 
@@ -770,7 +785,9 @@ static int ucsi_get_pd_message(struct ucsi_connector *con, u8 recipient,
                command |= UCSI_GET_PD_MESSAGE_BYTES(len);
                command |= UCSI_GET_PD_MESSAGE_TYPE(type);
 
-               ret = ucsi_send_command(con->ucsi, command, data + offset, len);
+               con->ucsi->message_in_size = len;
+               ret = ucsi_send_command(con->ucsi, command);
+               memcpy(data + offset, con->ucsi->message_in, len);
                if (ret < 0)
                        return ret;
        }
@@ -935,7 +952,9 @@ static int ucsi_register_cable(struct ucsi_connector *con)
        int ret;
 
        command = UCSI_GET_CABLE_PROPERTY | UCSI_CONNECTOR_NUMBER(con->num);
-       ret = ucsi_send_command(con->ucsi, command, &cable_prop, sizeof(cable_prop));
+       con->ucsi->message_in_size = sizeof(cable_prop);
+       ret = ucsi_send_command(con->ucsi, command);
+       memcpy(&cable_prop, con->ucsi->message_in, sizeof(cable_prop));
        if (ret < 0) {
                dev_err(con->ucsi->dev, "GET_CABLE_PROPERTY failed (%d)\n", ret);
                return ret;
@@ -996,7 +1015,9 @@ static int ucsi_check_connector_capability(struct ucsi_connector *con)
                return 0;
 
        command = UCSI_GET_CONNECTOR_CAPABILITY | UCSI_CONNECTOR_NUMBER(con->num);
-       ret = ucsi_send_command(con->ucsi, command, &con->cap, sizeof(con->cap));
+       con->ucsi->message_in_size = sizeof(con->cap);
+       ret = ucsi_send_command(con->ucsi, command);
+       memcpy(&con->cap, con->ucsi->message_in, sizeof(con->cap));
        if (ret < 0) {
                dev_err(con->ucsi->dev, "GET_CONNECTOR_CAPABILITY failed (%d)\n", ret);
                return ret;
@@ -1380,7 +1401,8 @@ static int ucsi_reset_connector(struct ucsi_connector *con, bool hard)
        else if (con->ucsi->version >= UCSI_VERSION_2_0)
                command |= hard ? 0 : UCSI_CONNECTOR_RESET_DATA_VER_2_0;
 
-       return ucsi_send_command(con->ucsi, command, NULL, 0);
+       con->ucsi->message_in_size = 0;
+       return ucsi_send_command(con->ucsi, command);
 }
 
 static int ucsi_reset_ppm(struct ucsi *ucsi)
@@ -1461,7 +1483,8 @@ static int ucsi_role_cmd(struct ucsi_connector *con, u64 command)
 {
        int ret;
 
-       ret = ucsi_send_command(con->ucsi, command, NULL, 0);
+       con->ucsi->message_in_size = 0;
+       ret = ucsi_send_command(con->ucsi, command);
        if (ret == -ETIMEDOUT) {
                u64 c;
 
@@ -1469,7 +1492,8 @@ static int ucsi_role_cmd(struct ucsi_connector *con, u64 command)
                ucsi_reset_ppm(con->ucsi);
 
                c = UCSI_SET_NOTIFICATION_ENABLE | con->ucsi->ntfy;
-               ucsi_send_command(con->ucsi, c, NULL, 0);
+               con->ucsi->message_in_size = 0;
+               ucsi_send_command(con->ucsi, c);
 
                ucsi_reset_connector(con, true);
        }
@@ -1622,10 +1646,13 @@ static int ucsi_register_port(struct ucsi *ucsi, struct ucsi_connector *con)
        /* Get connector capability */
        command = UCSI_GET_CONNECTOR_CAPABILITY;
        command |= UCSI_CONNECTOR_NUMBER(con->num);
-       ret = ucsi_send_command(ucsi, command, &con->cap, sizeof(con->cap));
+       ucsi->message_in_size = sizeof(con->cap);
+       ret = ucsi_send_command(ucsi, command);
        if (ret < 0)
                goto out_unlock;
 
+       memcpy(&con->cap, ucsi->message_in, sizeof(con->cap));
+
        if (UCSI_CONCAP(con, OPMODE_DRP))
                cap->data = TYPEC_PORT_DRD;
        else if (UCSI_CONCAP(con, OPMODE_DFP))
@@ -1822,17 +1849,20 @@ static int ucsi_init(struct ucsi *ucsi)
        /* Enable basic notifications */
        ntfy = UCSI_ENABLE_NTFY_CMD_COMPLETE | UCSI_ENABLE_NTFY_ERROR;
        command = UCSI_SET_NOTIFICATION_ENABLE | ntfy;
-       ret = ucsi_send_command(ucsi, command, NULL, 0);
+       ucsi->message_in_size = 0;
+       ret = ucsi_send_command(ucsi, command);
        if (ret < 0)
                goto err_reset;
 
        /* Get PPM capabilities */
        command = UCSI_GET_CAPABILITY;
-       ret = ucsi_send_command(ucsi, command, &ucsi->cap,
-                               BITS_TO_BYTES(UCSI_GET_CAPABILITY_SIZE));
+       ucsi->message_in_size = BITS_TO_BYTES(UCSI_GET_CAPABILITY_SIZE);
+       ret = ucsi_send_command(ucsi, command);
        if (ret < 0)
                goto err_reset;
 
+       memcpy(&ucsi->cap, ucsi->message_in, BITS_TO_BYTES(UCSI_GET_CAPABILITY_SIZE));
+
        if (!ucsi->cap.num_connectors) {
                ret = -ENODEV;
                goto err_reset;
@@ -1862,7 +1892,8 @@ static int ucsi_init(struct ucsi *ucsi)
        /* Enable all supported notifications */
        ntfy = ucsi_get_supported_notifications(ucsi);
        command = UCSI_SET_NOTIFICATION_ENABLE | ntfy;
-       ret = ucsi_send_command(ucsi, command, NULL, 0);
+       ucsi->message_in_size = 0;
+       ret = ucsi_send_command(ucsi, command);
        if (ret < 0)
                goto err_unregister;
 
@@ -1913,7 +1944,8 @@ static void ucsi_resume_work(struct work_struct *work)
 
        /* Restore UCSI notification enable mask after system resume */
        command = UCSI_SET_NOTIFICATION_ENABLE | ucsi->ntfy;
-       ret = ucsi_send_command(ucsi, command, NULL, 0);
+       ucsi->message_in_size = 0;
+       ret = ucsi_send_command(ucsi, command);
        if (ret < 0) {
                dev_err(ucsi->dev, "failed to re-enable notifications (%d)\n", ret);
                return;

diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h
index 410389ef173ab9fd625d9446f792f630860cb7e5..479bf1f69c72b94ba0e34e624c2b0257cf4d9225 100644 (file)
--- a/drivers/usb/typec/ucsi/ucsi.h
+++ b/drivers/usb/typec/ucsi/ucsi.h
@@ -29,6 +29,10 @@ struct dentry;
 #define UCSI_MESSAGE_OUT               32
 #define UCSIv2_MESSAGE_OUT             272
 
+/* Define maximum lengths for message buffers */
+#define UCSI_MAX_MESSAGE_IN_LENGTH     256
+#define UCSI_MAX_MESSAGE_OUT_LENGTH    256
+
 /* UCSI versions */
 #define UCSI_VERSION_1_0       0x0100
 #define UCSI_VERSION_1_1       0x0110
@@ -80,8 +84,7 @@ struct ucsi_operations {
        int (*read_cci)(struct ucsi *ucsi, u32 *cci);
        int (*poll_cci)(struct ucsi *ucsi, u32 *cci);
        int (*read_message_in)(struct ucsi *ucsi, void *val, size_t val_len);
-       int (*sync_control)(struct ucsi *ucsi, u64 command, u32 *cci,
-                           void *data, size_t size);
+       int (*sync_control)(struct ucsi *ucsi, u64 command, u32 *cci);
        int (*async_control)(struct ucsi *ucsi, u64 command);
        bool (*update_altmodes)(struct ucsi *ucsi, u8 recipient,
                                struct ucsi_altmode *orig,
@@ -493,6 +496,12 @@ struct ucsi {
        unsigned long quirks;
 #define UCSI_NO_PARTNER_PDOS   BIT(0)  /* Don't read partner's PDOs */
 #define UCSI_DELAY_DEVICE_PDOS BIT(1)  /* Reading PDOs fails until the parter is in PD mode */
+
+       /* Fixed-size buffers for incoming and outgoing messages */
+       u8 message_in[UCSI_MAX_MESSAGE_IN_LENGTH];
+       size_t message_in_size;
+       u8 message_out[UCSI_MAX_MESSAGE_OUT_LENGTH];
+       size_t message_out_size;
 };
 
 #define UCSI_MAX_DATA_LENGTH(u) (((u)->version < UCSI_VERSION_2_0) ? 0x10 : 0xff)
@@ -555,15 +564,13 @@ struct ucsi_connector {
        struct usb_pd_identity cable_identity;
 };
 
-int ucsi_send_command(struct ucsi *ucsi, u64 command,
-                     void *retval, size_t size);
+int ucsi_send_command(struct ucsi *ucsi, u64 command);
 
 void ucsi_altmode_update_active(struct ucsi_connector *con);
 int ucsi_resume(struct ucsi *ucsi);
 
 void ucsi_notify_common(struct ucsi *ucsi, u32 cci);
-int ucsi_sync_control_common(struct ucsi *ucsi, u64 command, u32 *cci,
-                            void *data, size_t size);
+int ucsi_sync_control_common(struct ucsi *ucsi, u64 command, u32 *cci);
 
 #if IS_ENABLED(CONFIG_POWER_SUPPLY)
 int ucsi_register_port_psy(struct ucsi_connector *con);

diff --git a/drivers/usb/typec/ucsi/ucsi_acpi.c b/drivers/usb/typec/ucsi/ucsi_acpi.c
index 6b92f296e98509a146e847f9a4000a2f6bbe175b..f1d1f6917b0984679af9c8bac0f0660d54d8c0be 100644 (file)
--- a/drivers/usb/typec/ucsi/ucsi_acpi.c
+++ b/drivers/usb/typec/ucsi/ucsi_acpi.c
@@ -105,15 +105,14 @@ static const struct ucsi_operations ucsi_acpi_ops = {
        .async_control = ucsi_acpi_async_control
 };
 
-static int ucsi_gram_sync_control(struct ucsi *ucsi, u64 command, u32 *cci,
-                                 void *val, size_t len)
+static int ucsi_gram_sync_control(struct ucsi *ucsi, u64 command, u32 *cci)
 {
        u16 bogus_change = UCSI_CONSTAT_POWER_LEVEL_CHANGE |
                           UCSI_CONSTAT_PDOS_CHANGE;
        struct ucsi_acpi *ua = ucsi_get_drvdata(ucsi);
        int ret;
 
-       ret = ucsi_sync_control_common(ucsi, command, cci, val, len);
+       ret = ucsi_sync_control_common(ucsi, command, cci);
        if (ret < 0)
                return ret;
 
@@ -125,8 +124,8 @@ static int ucsi_gram_sync_control(struct ucsi *ucsi, u64 command, u32 *cci,
        if (UCSI_COMMAND(ua->cmd) == UCSI_GET_CONNECTOR_STATUS &&
            ua->check_bogus_event) {
                /* Clear the bogus change */
-               if (*(u16 *)val == bogus_change)
-                       *(u16 *)val = 0;
+               if (*(u16 *)ucsi->message_in == bogus_change)
+                       *(u16 *)ucsi->message_in = 0;
 
                ua->check_bogus_event = false;
        }

diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c
index d83a0051c737336af2543fc2f6d53a131ffe9583..ead1b2a25c791e7809d938739e255ddcc4267679 100644 (file)
--- a/drivers/usb/typec/ucsi/ucsi_ccg.c
+++ b/drivers/usb/typec/ucsi/ucsi_ccg.c
@@ -606,8 +606,7 @@ static int ucsi_ccg_async_control(struct ucsi *ucsi, u64 command)
        return ccg_write(uc, reg, (u8 *)&command, sizeof(command));
 }
 
-static int ucsi_ccg_sync_control(struct ucsi *ucsi, u64 command, u32 *cci,
-                                void *data, size_t size)
+static int ucsi_ccg_sync_control(struct ucsi *ucsi, u64 command, u32 *cci)
 {
        struct ucsi_ccg *uc = ucsi_get_drvdata(ucsi);
        struct ucsi_connector *con;
@@ -629,16 +628,16 @@ static int ucsi_ccg_sync_control(struct ucsi *ucsi, u64 command, u32 *cci,
                ucsi_ccg_update_set_new_cam_cmd(uc, con, &command);
        }
 
-       ret = ucsi_sync_control_common(ucsi, command, cci, data, size);
+       ret = ucsi_sync_control_common(ucsi, command, cci);
 
        switch (UCSI_COMMAND(command)) {
        case UCSI_GET_CURRENT_CAM:
                if (uc->has_multiple_dp)
-                       ucsi_ccg_update_get_current_cam_cmd(uc, (u8 *)data);
+                       ucsi_ccg_update_get_current_cam_cmd(uc, (u8 *)ucsi->message_in);
                break;
        case UCSI_GET_ALTERNATE_MODES:
                if (UCSI_ALTMODE_RECIPIENT(command) == UCSI_RECIPIENT_SOP) {
-                       struct ucsi_altmode *alt = data;
+                       struct ucsi_altmode *alt = (struct ucsi_altmode *)ucsi->message_in;
 
                        if (alt[0].svid == USB_TYPEC_NVIDIA_VLINK_SID)
                                ucsi_ccg_nvidia_altmode(uc, alt, command);
@@ -646,7 +645,7 @@ static int ucsi_ccg_sync_control(struct ucsi *ucsi, u64 command, u32 *cci,
                break;
        case UCSI_GET_CAPABILITY:
                if (uc->fw_build == CCG_FW_BUILD_NVIDIA_TEGRA) {
-                       struct ucsi_capability *cap = data;
+                       struct ucsi_capability *cap = (struct ucsi_capability *)ucsi->message_in;
 
                        cap->features &= ~UCSI_CAP_ALT_MODE_DETAILS;
                }

diff --git a/drivers/usb/typec/ucsi/ucsi_yoga_c630.c b/drivers/usb/typec/ucsi/ucsi_yoga_c630.c
index 0187c1c4b21abc7b5429526ebb4538c28b2e2e77..299081444caa9075006b148560f2e565e4d5ef51 100644 (file)
--- a/drivers/usb/typec/ucsi/ucsi_yoga_c630.c
+++ b/drivers/usb/typec/ucsi/ucsi_yoga_c630.c
@@ -88,8 +88,7 @@ static int yoga_c630_ucsi_async_control(struct ucsi *ucsi, u64 command)
 
 static int yoga_c630_ucsi_sync_control(struct ucsi *ucsi,
                                       u64 command,
-                                      u32 *cci,
-                                      void *data, size_t size)
+                                      u32 *cci)
 {
        int ret;
 
@@ -107,8 +106,8 @@ static int yoga_c630_ucsi_sync_control(struct ucsi *ucsi,
                };
 
                dev_dbg(ucsi->dev, "faking DP altmode for con1\n");
-               memset(data, 0, size);
-               memcpy(data, &alt, min(sizeof(alt), size));
+               memset(ucsi->message_in, 0, ucsi->message_in_size);
+               memcpy(ucsi->message_in, &alt, min(sizeof(alt), ucsi->message_in_size));
                *cci = UCSI_CCI_COMMAND_COMPLETE | UCSI_SET_CCI_LENGTH(sizeof(alt));
                return 0;
        }
@@ -121,18 +120,18 @@ static int yoga_c630_ucsi_sync_control(struct ucsi *ucsi,
        if (UCSI_COMMAND(command) == UCSI_GET_ALTERNATE_MODES &&
            UCSI_GET_ALTMODE_GET_CONNECTOR_NUMBER(command) == 2) {
                dev_dbg(ucsi->dev, "ignoring altmodes for con2\n");
-               memset(data, 0, size);
+               memset(ucsi->message_in, 0, ucsi->message_in_size);
                *cci = UCSI_CCI_COMMAND_COMPLETE;
                return 0;
        }
 
-       ret = ucsi_sync_control_common(ucsi, command, cci, data, size);
+       ret = ucsi_sync_control_common(ucsi, command, cci);
        if (ret < 0)
                return ret;
 
        /* UCSI_GET_CURRENT_CAM is off-by-one on all ports */
-       if (UCSI_COMMAND(command) == UCSI_GET_CURRENT_CAM && data)
-               ((u8 *)data)[0]--;
+       if (UCSI_COMMAND(command) == UCSI_GET_CURRENT_CAM && ucsi->message_in_size > 0)
+               ucsi->message_in[0]--;
 
        return ret;
 }