Some of the drivers emulate or handle some of the commands in the
platform-specific way. The code ends up being split between several
callbacks, which complicates emulation.
In preparation to reworking such drivers, move read_cci() and
read_message_in() calls into ucsi_sync_control_common().
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
drivers/usb/typec/ucsi/ucsi.c | 19 +++++++++++--------
drivers/usb/typec/ucsi/ucsi.h | 6 ++++--
drivers/usb/typec/ucsi/ucsi_acpi.c | 5 +++--
drivers/usb/typec/ucsi/ucsi_ccg.c | 5 +++--
4 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
index fcf499cc9458c0d12015a7e36e5f1ac448c3a431..559390a07a4e427c9b520dffaac905277d071638 100644
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -55,7 +55,8 @@ 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)
+int ucsi_sync_control_common(struct ucsi *ucsi, u64 command, u32 *cci,
+ void *data, size_t size)
{
bool ack = UCSI_COMMAND(command) == UCSI_ACK_CC_CI;
int ret;
@@ -80,6 +81,13 @@ int ucsi_sync_control_common(struct ucsi *ucsi, u64 command)
else
clear_bit(COMMAND_PENDING, &ucsi->flags);
+ if (!ret && cci)
+ ret = ucsi->ops->read_cci(ucsi, cci);
+
+ if (!ret && data &&
+ (*cci & UCSI_CCI_COMMAND_COMPLETE))
+ ret = ucsi->ops->read_message_in(ucsi, data, size);
+
return ret;
}
EXPORT_SYMBOL_GPL(ucsi_sync_control_common);
@@ -95,7 +103,7 @@ static int ucsi_acknowledge(struct ucsi *ucsi, bool conn_ack)
ctrl |= UCSI_ACK_CONNECTOR_CHANGE;
}
- return ucsi->ops->sync_control(ucsi, ctrl);
+ return ucsi->ops->sync_control(ucsi, ctrl, NULL, NULL, 0);
}
static int ucsi_run_command(struct ucsi *ucsi, u64 command, u32 *cci,
@@ -108,9 +116,7 @@ static int ucsi_run_command(struct ucsi *ucsi, u64 command, u32 *cci,
if (size > UCSI_MAX_DATA_LENGTH(ucsi))
return -EINVAL;
- ret = ucsi->ops->sync_control(ucsi, command);
- if (ucsi->ops->read_cci(ucsi, cci))
- return -EIO;
+ ret = ucsi->ops->sync_control(ucsi, command, cci, data, size);
if (*cci & UCSI_CCI_BUSY)
return ucsi_run_command(ucsi, UCSI_CANCEL, cci, NULL, 0, false) ?: -EBUSY;
@@ -127,9 +133,6 @@ static int ucsi_run_command(struct ucsi *ucsi, u64 command, u32 *cci,
else
err = 0;
- if (!err && data && UCSI_CCI_LENGTH(*cci))
- err = ucsi->ops->read_message_in(ucsi, data, size);
-
/*
* Don't ACK connection change if there was an error.
*/
diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h
index 5ff369c24a2fc445e8559201d563c31d83b2c876..9ffc8debd7d77d118db042f2749cf429a848f8df 100644
--- a/drivers/usb/typec/ucsi/ucsi.h
+++ b/drivers/usb/typec/ucsi/ucsi.h
@@ -76,7 +76,8 @@ struct ucsi_operations {
int (*read_version)(struct ucsi *ucsi, u16 *version);
int (*read_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);
+ int (*sync_control)(struct ucsi *ucsi, u64 command, u32 *cci,
+ void *data, size_t size);
int (*async_control)(struct ucsi *ucsi, u64 command);
bool (*update_altmodes)(struct ucsi *ucsi, struct ucsi_altmode *orig,
struct ucsi_altmode *updated);
@@ -528,7 +529,8 @@ 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);
+int ucsi_sync_control_common(struct ucsi *ucsi, u64 command, u32 *cci,
+ void *data, size_t size);
#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 5c55155519634d95b6e544632f869c2867093617..8b02082201ec5b85031472563b8b8d1eea6134de 100644
--- a/drivers/usb/typec/ucsi/ucsi_acpi.c
+++ b/drivers/usb/typec/ucsi/ucsi_acpi.c
@@ -122,12 +122,13 @@ static int ucsi_gram_read_message_in(struct ucsi *ucsi, void *val, size_t val_le
return ret;
}
-static int ucsi_gram_sync_control(struct ucsi *ucsi, u64 command)
+static int ucsi_gram_sync_control(struct ucsi *ucsi, u64 command, u32 *cci,
+ void *data, size_t size)
{
struct ucsi_acpi *ua = ucsi_get_drvdata(ucsi);
int ret;
- ret = ucsi_sync_control_common(ucsi, command);
+ ret = ucsi_sync_control_common(ucsi, command, cci, data, size);
if (ret < 0)
return ret;
diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c
index 740171f24ef9fae9abdb52d7995abe692e0a7623..02ac04a52239327475a3590734b77f3ac74bb589 100644
--- a/drivers/usb/typec/ucsi/ucsi_ccg.c
+++ b/drivers/usb/typec/ucsi/ucsi_ccg.c
@@ -628,7 +628,8 @@ 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)
+static int ucsi_ccg_sync_control(struct ucsi *ucsi, u64 command, u32 *cci,
+ void *data, size_t size)
{
struct ucsi_ccg *uc = ucsi_get_drvdata(ucsi);
struct ucsi_connector *con;
@@ -652,7 +653,7 @@ static int ucsi_ccg_sync_control(struct ucsi *ucsi, u64 command)
ucsi_ccg_update_set_new_cam_cmd(uc, con, &command);
}
- ret = ucsi_sync_control_common(ucsi, command);
+ ret = ucsi_sync_control_common(ucsi, command, cci, data, size);
err_put:
pm_runtime_put_sync(uc->dev);
--
2.39.5Hi Dmitry,
kernel test robot noticed the following build errors:
[auto build test ERROR on e7bb221a638962d487231ac45a6699fb9bb8f9fa]
url: https://github.com/intel-lab-lkp/linux/commits/Dmitry-Baryshkov/usb-typec-ucsi-return-CCI-and-message-from-sync_control-callback/20250117-185213
base: e7bb221a638962d487231ac45a6699fb9bb8f9fa
patch link: https://lore.kernel.org/r/20250117-ucsi-merge-commands-v1-1-e20c19934d59%40linaro.org
patch subject: [PATCH 1/3] usb: typec: ucsi: return CCI and message from sync_control callback
config: i386-buildonly-randconfig-004-20250118 (https://download.01.org/0day-ci/archive/20250118/202501181516.o8Ibdo7z-lkp@intel.com/config)
compiler: gcc-11 (Debian 11.3.0-12) 11.3.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250118/202501181516.o8Ibdo7z-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202501181516.o8Ibdo7z-lkp@intel.com/
All errors (new ones prefixed by >>):
drivers/usb/typec/ucsi/cros_ec_ucsi.c: In function 'cros_ucsi_sync_control':
>> drivers/usb/typec/ucsi/cros_ec_ucsi.c:113:15: error: too few arguments to function 'ucsi_sync_control_common'
113 | ret = ucsi_sync_control_common(ucsi, cmd);
| ^~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/usb/typec/ucsi/cros_ec_ucsi.c:20:
drivers/usb/typec/ucsi/ucsi.h:532:5: note: declared here
532 | int ucsi_sync_control_common(struct ucsi *ucsi, u64 command, u32 *cci,
| ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/usb/typec/ucsi/cros_ec_ucsi.c: At top level:
>> drivers/usb/typec/ucsi/cros_ec_ucsi.c:141:25: error: initialization of 'int (*)(struct ucsi *, u64, u32 *, void *, size_t)' {aka 'int (*)(struct ucsi *, long long unsigned int, unsigned int *, void *, unsigned int)'} from incompatible pointer type 'int (*)(struct ucsi *, u64)' {aka 'int (*)(struct ucsi *, long long unsigned int)'} [-Werror=incompatible-pointer-types]
141 | .sync_control = cros_ucsi_sync_control,
| ^~~~~~~~~~~~~~~~~~~~~~
drivers/usb/typec/ucsi/cros_ec_ucsi.c:141:25: note: (near initialization for 'cros_ucsi_ops.sync_control')
cc1: some warnings being treated as errors
vim +/ucsi_sync_control_common +113 drivers/usb/typec/ucsi/cros_ec_ucsi.c
f1a2241778d962 Pavan Holla 2024-12-31 107
f1a2241778d962 Pavan Holla 2024-12-31 108 static int cros_ucsi_sync_control(struct ucsi *ucsi, u64 cmd)
f1a2241778d962 Pavan Holla 2024-12-31 109 {
f1a2241778d962 Pavan Holla 2024-12-31 110 struct cros_ucsi_data *udata = ucsi_get_drvdata(ucsi);
f1a2241778d962 Pavan Holla 2024-12-31 111 int ret;
f1a2241778d962 Pavan Holla 2024-12-31 112
f1a2241778d962 Pavan Holla 2024-12-31 @113 ret = ucsi_sync_control_common(ucsi, cmd);
f1a2241778d962 Pavan Holla 2024-12-31 114 switch (ret) {
f1a2241778d962 Pavan Holla 2024-12-31 115 case -EBUSY:
f1a2241778d962 Pavan Holla 2024-12-31 116 /* EC may return -EBUSY if CCI.busy is set.
f1a2241778d962 Pavan Holla 2024-12-31 117 * Convert this to a timeout.
f1a2241778d962 Pavan Holla 2024-12-31 118 */
f1a2241778d962 Pavan Holla 2024-12-31 119 case -ETIMEDOUT:
f1a2241778d962 Pavan Holla 2024-12-31 120 /* Schedule recovery attempt when we timeout
f1a2241778d962 Pavan Holla 2024-12-31 121 * or tried to send a command while still busy.
f1a2241778d962 Pavan Holla 2024-12-31 122 */
f1a2241778d962 Pavan Holla 2024-12-31 123 cancel_delayed_work_sync(&udata->write_tmo);
f1a2241778d962 Pavan Holla 2024-12-31 124 schedule_delayed_work(&udata->write_tmo,
f1a2241778d962 Pavan Holla 2024-12-31 125 msecs_to_jiffies(WRITE_TMO_MS));
f1a2241778d962 Pavan Holla 2024-12-31 126 break;
f1a2241778d962 Pavan Holla 2024-12-31 127 case 0:
f1a2241778d962 Pavan Holla 2024-12-31 128 /* Successful write. Cancel any pending recovery work. */
f1a2241778d962 Pavan Holla 2024-12-31 129 cancel_delayed_work_sync(&udata->write_tmo);
f1a2241778d962 Pavan Holla 2024-12-31 130 break;
f1a2241778d962 Pavan Holla 2024-12-31 131 }
f1a2241778d962 Pavan Holla 2024-12-31 132
f1a2241778d962 Pavan Holla 2024-12-31 133 return ret;
f1a2241778d962 Pavan Holla 2024-12-31 134 }
f1a2241778d962 Pavan Holla 2024-12-31 135
a181c8ef0b745c Stephen Boyd 2025-01-09 136 static const struct ucsi_operations cros_ucsi_ops = {
f1a2241778d962 Pavan Holla 2024-12-31 137 .read_version = cros_ucsi_read_version,
f1a2241778d962 Pavan Holla 2024-12-31 138 .read_cci = cros_ucsi_read_cci,
f1a2241778d962 Pavan Holla 2024-12-31 139 .read_message_in = cros_ucsi_read_message_in,
f1a2241778d962 Pavan Holla 2024-12-31 140 .async_control = cros_ucsi_async_control,
f1a2241778d962 Pavan Holla 2024-12-31 @141 .sync_control = cros_ucsi_sync_control,
f1a2241778d962 Pavan Holla 2024-12-31 142 };
f1a2241778d962 Pavan Holla 2024-12-31 143
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
© 2016 - 2026 Red Hat, Inc.