Merge branch 'for-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu

[linux-2.6-microblaze.git] / drivers / platform / chrome / cros_ec_typec.c

diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c
index d3df171..27c068c 100644 (file)
--- a/drivers/platform/chrome/cros_ec_typec.c
+++ b/drivers/platform/chrome/cros_ec_typec.c
@@ -58,6 +58,7 @@ struct cros_typec_port {
        /* Variables keeping track of switch state. */
        struct typec_mux_state state;
        uint8_t mux_flags;
+       uint8_t role;
 
        /* Port alt modes. */
        struct typec_altmode p_altmode[CROS_EC_ALTMODE_MAX];
@@ -486,6 +487,11 @@ static int cros_typec_enable_dp(struct cros_typec_data *typec,
                return -ENOTSUPP;
        }
 
+       if (!pd_ctrl->dp_mode) {
+               dev_err(typec->dev, "No valid DP mode provided.\n");
+               return -EINVAL;
+       }
+
        /* Status VDO. */
        dp_data.status = DP_STATUS_ENABLED;
        if (port->mux_flags & USB_PD_MUX_HPD_IRQ)
@@ -905,6 +911,19 @@ static void cros_typec_handle_status(struct cros_typec_data *typec, int port_num
                return;
        }
 
+       /* If we got a hard reset, unregister everything and return. */
+       if (resp.events & PD_STATUS_EVENT_HARD_RESET) {
+               cros_typec_remove_partner(typec, port_num);
+               cros_typec_remove_cable(typec, port_num);
+
+               ret = cros_typec_send_clear_event(typec, port_num,
+                                                 PD_STATUS_EVENT_HARD_RESET);
+               if (ret < 0)
+                       dev_warn(typec->dev,
+                                "Failed hard reset event clear, port: %d\n", port_num);
+               return;
+       }
+
        /* Handle any events appropriately. */
        if (resp.events & PD_STATUS_EVENT_SOP_DISC_DONE && !typec->ports[port_num]->sop_disc_done) {
                u16 sop_revision;
@@ -995,10 +1014,12 @@ static int cros_typec_port_update(struct cros_typec_data *typec, int port_num)
        }
 
        /* No change needs to be made, let's exit early. */
-       if (typec->ports[port_num]->mux_flags == mux_resp.flags)
+       if (typec->ports[port_num]->mux_flags == mux_resp.flags &&
+           typec->ports[port_num]->role == resp.role)
                return 0;
 
        typec->ports[port_num]->mux_flags = mux_resp.flags;
+       typec->ports[port_num]->role = resp.role;
        ret = cros_typec_configure_mux(typec, port_num, mux_resp.flags, &resp);
        if (ret)
                dev_warn(typec->dev, "Configure muxes failed, err = %d\n", ret);