Commit 132da018 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'thunderbolt-for-v5.12-rc4' of... 

Merge tag 'thunderbolt-for-v5.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus

Mika writes:

thunderbolt: Fixes for v5.12-rc4

This includes a fix to initialize HopID IDAs earlier to make sure
tb_switch_release() always works, and another fix that increases runtime
PM reference count on DisplayPort tunnel discovery.

* tag 'thunderbolt-for-v5.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt:
  thunderbolt: Increase runtime PM reference count on DP tunnel discovery
  thunderbolt: Initialize HopID IDAs in tb_switch_alloc()
parents 1e28eed1 c94732bd

drivers/thunderbolt/switch.c

+8 −10
Original line number Diff line number Diff line
@@ -768,12 +768,6 @@ static int tb_init_port(struct tb_port *port) 


	tb_dump_port(port->sw->tb, &port->config);



	/* Control port does not need HopID allocation */

	if (port->port) {

		ida_init(&port->in_hopids);

		ida_init(&port->out_hopids);

	}



	INIT_LIST_HEAD(&port->list);

	return 0;
@@ -1842,11 +1836,9 @@ static void tb_switch_release(struct device *dev) 
	dma_port_free(sw->dma_port);



	tb_switch_for_each_port(sw, port) {

		if (!port->disabled) {

		ida_destroy(&port->in_hopids);

		ida_destroy(&port->out_hopids);

	}

	}



	kfree(sw->uuid);

	kfree(sw->device_name);
@@ -2025,6 +2017,12 @@ struct tb_switch *tb_switch_alloc(struct tb *tb, struct device *parent, 
		/* minimum setup for tb_find_cap and tb_drom_read to work */

		sw->ports[i].sw = sw;

		sw->ports[i].port = i;



		/* Control port does not need HopID allocation */

		if (i) {

			ida_init(&sw->ports[i].in_hopids);

			ida_init(&sw->ports[i].out_hopids);

		}

	}



	ret = tb_switch_find_vse_cap(sw, TB_VSE_CAP_PLUG_EVENTS);

drivers/thunderbolt/tb.c

+4 −0
Original line number Diff line number Diff line
@@ -138,6 +138,10 @@ static void tb_discover_tunnels(struct tb_switch *sw) 
				parent->boot = true;

				parent = tb_switch_parent(parent);

			}

		} else if (tb_tunnel_is_dp(tunnel)) {

			/* Keep the domain from powering down */

			pm_runtime_get_sync(&tunnel->src_port->sw->dev);

			pm_runtime_get_sync(&tunnel->dst_port->sw->dev);

		}



		list_add_tail(&tunnel->list, &tcm->tunnel_list);