@@ -274,16 +274,20 @@ static void dp_altmode_work(struct work_struct *work)
header = DP_HEADER(dp, svdm_version, DP_CMD_STATUS_UPDATE);
vdo = 1;
ret = typec_altmode_vdm(dp->alt, header, &vdo, 2);
- if (ret)
+ if (ret) {
dev_err(&dp->alt->dev,
"unable to send Status Update command (%d)\n",
ret);
+ typec_mode_selection_altmode_complete(dp->alt, ret);
+ }
break;
case DP_STATE_CONFIGURE:
ret = dp_altmode_configure_vdm(dp, dp->data.conf);
- if (ret)
+ if (ret) {
dev_err(&dp->alt->dev,
"unable to send Configure command (%d)\n", ret);
+ typec_mode_selection_altmode_complete(dp->alt, ret);
+ }
break;
case DP_STATE_CONFIGURE_PRIME:
ret = dp_altmode_configure_vdm_cable(dp, dp->data_prime.conf);
@@ -397,6 +401,9 @@ static int dp_altmode_vdm(struct typec_altmode *alt,
dp->data.conf = 0;
ret = dp_altmode_configured(dp);
break;
+ case DP_CMD_STATUS_UPDATE:
+ ret = *(int *)vdo;
+ break;
default:
break;
}
@@ -407,6 +414,8 @@ static int dp_altmode_vdm(struct typec_altmode *alt,
if (dp->state != DP_STATE_IDLE)
schedule_work(&dp->work);
+ else if (ret || cmd == DP_CMD_CONFIGURE)
+ typec_mode_selection_altmode_complete(dp->alt, ret);
err_unlock:
mutex_unlock(&dp->lock);
@@ -242,6 +242,9 @@ static int tbt_altmode_vdm(struct typec_altmode *alt,
else if (tbt->plug[TYPEC_PLUG_SOP_P])
tbt->state = TBT_STATE_SOP_P_EXIT;
break;
+ case TBT_CMD_STATUS_UPDATE:
+ typec_mode_selection_altmode_complete(alt, 0);
+ break;
}
break;
case CMDT_RSP_NAK:
@@ -249,6 +252,9 @@ static int tbt_altmode_vdm(struct typec_altmode *alt,
case CMD_ENTER_MODE:
dev_warn(&alt->dev, "Enter Mode refused\n");
break;
+ case TBT_CMD_STATUS_UPDATE:
+ typec_mode_selection_altmode_complete(alt, *(int *)vdo);
+ break;
default:
break;
}
@@ -24,6 +24,9 @@ struct typec_thunderbolt_data {
u32 enter_vdo;
};
+/* TBT3 alt mode specific commands */
+#define TBT_CMD_STATUS_UPDATE VDO_CMD_VENDOR(0)
+
/* TBT3 Device Discover Mode VDO bits */
#define TBT_MODE BIT(0)
#define TBT_ADAPTER(_vdo_) FIELD_GET(BIT(16), _vdo_)
The Type-C mode selection logic requires feedback on the result of an alternate mode entry attempt. Call the `typec_mode_selection_altmode_complete()` callback to provide this final success or failure status. Signed-off-by: Andrei Kuchynski <akuchynski@chromium.org> --- drivers/usb/typec/altmodes/displayport.c | 13 +++++++++++-- drivers/usb/typec/altmodes/thunderbolt.c | 6 ++++++ include/linux/usb/typec_tbt.h | 3 +++ 3 files changed, 20 insertions(+), 2 deletions(-)