usb: typec: tcpm: fix tcpm unregister port but leave a pending timer

[linux-block.git] / drivers / usb / typec / tcpm / tcpm.c

diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
index 7f2f3ff1b39112e72b683873c2a031fdb155c644..59d4fa2443f2b44449c53a8cb4ccd250e0664189 100644 (file)
--- a/drivers/usb/typec/tcpm/tcpm.c
+++ b/drivers/usb/typec/tcpm/tcpm.c
@@ -324,6 +324,7 @@ struct tcpm_port {
 
        bool attached;
        bool connected;
+       bool registered;
        bool pd_supported;
        enum typec_port_type port_type;
 
@@ -4110,11 +4111,7 @@ static void run_state_machine(struct tcpm_port *port)
                                       tcpm_try_src(port) ? SRC_TRY
                                                          : SNK_ATTACHED,
                                       0);
-               else
-                       /* Wait for VBUS, but not forever */
-                       tcpm_set_state(port, PORT_RESET, PD_T_PS_SOURCE_ON);
                break;
-
        case SRC_TRY:
                port->try_src_count++;
                tcpm_set_cc(port, tcpm_rp_cc(port));
@@ -6295,7 +6292,8 @@ static enum hrtimer_restart state_machine_timer_handler(struct hrtimer *timer)
 {
        struct tcpm_port *port = container_of(timer, struct tcpm_port, state_machine_timer);
 
-       kthread_queue_work(port->wq, &port->state_machine);
+       if (port->registered)
+               kthread_queue_work(port->wq, &port->state_machine);
        return HRTIMER_NORESTART;
 }
 
@@ -6303,7 +6301,8 @@ static enum hrtimer_restart vdm_state_machine_timer_handler(struct hrtimer *time
 {
        struct tcpm_port *port = container_of(timer, struct tcpm_port, vdm_state_machine_timer);
 
-       kthread_queue_work(port->wq, &port->vdm_state_machine);
+       if (port->registered)
+               kthread_queue_work(port->wq, &port->vdm_state_machine);
        return HRTIMER_NORESTART;
 }
 
@@ -6311,7 +6310,8 @@ static enum hrtimer_restart enable_frs_timer_handler(struct hrtimer *timer)
 {
        struct tcpm_port *port = container_of(timer, struct tcpm_port, enable_frs_timer);
 
-       kthread_queue_work(port->wq, &port->enable_frs);
+       if (port->registered)
+               kthread_queue_work(port->wq, &port->enable_frs);
        return HRTIMER_NORESTART;
 }
 
@@ -6319,7 +6319,8 @@ static enum hrtimer_restart send_discover_timer_handler(struct hrtimer *timer)
 {
        struct tcpm_port *port = container_of(timer, struct tcpm_port, send_discover_timer);
 
-       kthread_queue_work(port->wq, &port->send_discover_work);
+       if (port->registered)
+               kthread_queue_work(port->wq, &port->send_discover_work);
        return HRTIMER_NORESTART;
 }
 
@@ -6407,6 +6408,7 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
        typec_port_register_altmodes(port->typec_port,
                                     &tcpm_altmode_ops, port,
                                     port->port_altmode, ALTMODE_DISCOVERY_MAX);
+       port->registered = true;
 
        mutex_lock(&port->lock);
        tcpm_init(port);
@@ -6428,6 +6430,9 @@ void tcpm_unregister_port(struct tcpm_port *port)
 {
        int i;
 
+       port->registered = false;
+       kthread_destroy_worker(port->wq);
+
        hrtimer_cancel(&port->send_discover_timer);
        hrtimer_cancel(&port->enable_frs_timer);
        hrtimer_cancel(&port->vdm_state_machine_timer);
@@ -6439,7 +6444,6 @@ void tcpm_unregister_port(struct tcpm_port *port)
        typec_unregister_port(port->typec_port);
        usb_role_switch_put(port->role_sw);
        tcpm_debugfs_exit(port);
-       kthread_destroy_worker(port->wq);
 }
 EXPORT_SYMBOL_GPL(tcpm_unregister_port);