usb: typec: ucsi: ccg: move command quirks to ucsi_ccg_sync_control()

It is easier to keep all command-specific quirks in a single place. Move
them to ucsi_ccg_sync_control() as the code now allows us to return
modified messages data.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20250120-ucsi-merge-commands-v2-2-462a1ec22ecc@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c
index 02ac04a52239327475a3590734b77f3ac74bb589..47498ee6cca89a9cc3fee872703b8d27487ea7ae 100644 (file)
--- a/drivers/usb/typec/ucsi/ucsi_ccg.c
+++ b/drivers/usb/typec/ucsi/ucsi_ccg.c
@@ -222,7 +222,6 @@ struct ucsi_ccg {
        u16 fw_build;
        struct work_struct pm_work;
 
-       u64 last_cmd_sent;
        bool has_multiple_dp;
        struct ucsi_ccg_altmode orig[UCSI_MAX_ALTMODES];
        struct ucsi_ccg_altmode updated[UCSI_MAX_ALTMODES];
@@ -538,9 +537,10 @@ static void ucsi_ccg_update_set_new_cam_cmd(struct ucsi_ccg *uc,
  * first and then vdo=0x3
  */
 static void ucsi_ccg_nvidia_altmode(struct ucsi_ccg *uc,
-                                   struct ucsi_altmode *alt)
+                                   struct ucsi_altmode *alt,
+                                   u64 command)
 {
-       switch (UCSI_ALTMODE_OFFSET(uc->last_cmd_sent)) {
+       switch (UCSI_ALTMODE_OFFSET(command)) {
        case NVIDIA_FTB_DP_OFFSET:
                if (alt[0].mid == USB_TYPEC_NVIDIA_VLINK_DBG_VDO)
                        alt[0].mid = USB_TYPEC_NVIDIA_VLINK_DP_VDO |
@@ -578,37 +578,11 @@ static int ucsi_ccg_read_cci(struct ucsi *ucsi, u32 *cci)
 static int ucsi_ccg_read_message_in(struct ucsi *ucsi, void *val, size_t val_len)
 {
        struct ucsi_ccg *uc = ucsi_get_drvdata(ucsi);
-       struct ucsi_capability *cap;
-       struct ucsi_altmode *alt;
 
        spin_lock(&uc->op_lock);
        memcpy(val, uc->op_data.message_in, val_len);
        spin_unlock(&uc->op_lock);
 
-       switch (UCSI_COMMAND(uc->last_cmd_sent)) {
-       case UCSI_GET_CURRENT_CAM:
-               if (uc->has_multiple_dp)
-                       ucsi_ccg_update_get_current_cam_cmd(uc, (u8 *)val);
-               break;
-       case UCSI_GET_ALTERNATE_MODES:
-               if (UCSI_ALTMODE_RECIPIENT(uc->last_cmd_sent) ==
-                   UCSI_RECIPIENT_SOP) {
-                       alt = val;
-                       if (alt[0].svid == USB_TYPEC_NVIDIA_VLINK_SID)
-                               ucsi_ccg_nvidia_altmode(uc, alt);
-               }
-               break;
-       case UCSI_GET_CAPABILITY:
-               if (uc->fw_build == CCG_FW_BUILD_NVIDIA_TEGRA) {
-                       cap = val;
-                       cap->features &= ~UCSI_CAP_ALT_MODE_DETAILS;
-               }
-               break;
-       default:
-               break;
-       }
-       uc->last_cmd_sent = 0;
-
        return 0;
 }
 
@@ -639,11 +613,9 @@ static int ucsi_ccg_sync_control(struct ucsi *ucsi, u64 command, u32 *cci,
        mutex_lock(&uc->lock);
        pm_runtime_get_sync(uc->dev);
 
-       uc->last_cmd_sent = command;
-
-       if (UCSI_COMMAND(uc->last_cmd_sent) == UCSI_SET_NEW_CAM &&
+       if (UCSI_COMMAND(command) == UCSI_SET_NEW_CAM &&
            uc->has_multiple_dp) {
-               con_index = (uc->last_cmd_sent >> 16) &
+               con_index = (command >> 16) &
                        UCSI_CMD_CONNECTOR_MASK;
                if (con_index == 0) {
                        ret = -EINVAL;
@@ -655,6 +627,30 @@ static int ucsi_ccg_sync_control(struct ucsi *ucsi, u64 command, u32 *cci,
 
        ret = ucsi_sync_control_common(ucsi, command, cci, data, size);
 
+       switch (UCSI_COMMAND(command)) {
+       case UCSI_GET_CURRENT_CAM:
+               if (uc->has_multiple_dp)
+                       ucsi_ccg_update_get_current_cam_cmd(uc, (u8 *)data);
+               break;
+       case UCSI_GET_ALTERNATE_MODES:
+               if (UCSI_ALTMODE_RECIPIENT(command) == UCSI_RECIPIENT_SOP) {
+                       struct ucsi_altmode *alt = data;
+
+                       if (alt[0].svid == USB_TYPEC_NVIDIA_VLINK_SID)
+                               ucsi_ccg_nvidia_altmode(uc, alt, command);
+               }
+               break;
+       case UCSI_GET_CAPABILITY:
+               if (uc->fw_build == CCG_FW_BUILD_NVIDIA_TEGRA) {
+                       struct ucsi_capability *cap = data;
+
+                       cap->features &= ~UCSI_CAP_ALT_MODE_DETAILS;
+               }
+               break;
+       default:
+               break;
+       }
+
 err_put:
        pm_runtime_put_sync(uc->dev);
        mutex_unlock(&uc->lock);