Commit 73473b30 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'thunderbolt-for-v6.9-rc1' of... 

Merge tag 'thunderbolt-for-v6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-next

Mika writes:

thunderbolt: Changes for v6.9 merge window

This includes following USB4/Thunderbolt changes for the v6.9 merge
window:

  - Reset the topology also for USB4 v1 routers on driver load
  - DisplayPort tunneling and bandwidth allocation mode improvements
  - Tracepoint support for the control channel
  - Couple of minor fixes and cleanups.

All these have been in linux-next with no reported issues.

* tag 'thunderbolt-for-v6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt: (23 commits)
  thunderbolt: Constify the struct device_type usage
  thunderbolt: Add trace events support for the control channel
  thunderbolt: Keep the domain powered when USB4 port is in redrive mode
  thunderbolt: Improve DisplayPort tunnel setup process to be more robust
  thunderbolt: Calculate DisplayPort tunnel bandwidth after DPRX capabilities read
  thunderbolt: Reserve released DisplayPort bandwidth for a group for 10 seconds
  thunderbolt: Introduce tb_tunnel_direction_downstream()
  thunderbolt: Re-order bandwidth group functions
  thunderbolt: Fail the failed bandwidth request properly
  thunderbolt: Log an error if DPTX request is not cleared
  thunderbolt: Handle bandwidth allocation mode disable request
  thunderbolt: Re-calculate estimated bandwidth when allocation mode is enabled
  thunderbolt: Use DP_LOCAL_CAP for maximum bandwidth calculation
  thunderbolt: Correct typo in host_reset parameter
  thunderbolt: Skip discovery also in USB4 v2 host
  thunderbolt: Reset only non-USB4 host routers in resume
  thunderbolt: Remove usage of the deprecated ida_simple_xx() API
  thunderbolt: Fix rollback in tb_port_lane_bonding_enable() for lane 1
  thunderbolt: Fix XDomain rx_lanes_show and tx_lanes_show
  thunderbolt: Reset topology created by the boot firmware
  ...
parents a560a567 b8a73083

drivers/thunderbolt/Makefile

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

ccflags-y := -I$(src)

obj-${CONFIG_USB4} := thunderbolt.o

thunderbolt-objs := nhi.o nhi_ops.o ctl.o tb.o switch.o cap.o path.o tunnel.o eeprom.o

thunderbolt-objs += domain.o dma_port.o icm.o property.o xdomain.o lc.o tmu.o usb4.o

drivers/thunderbolt/ctl.c

+17 −2
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 


#include "ctl.h"



#define CREATE_TRACE_POINTS

#include "trace.h"



#define TB_CTL_RX_PKG_COUNT	10

#define TB_CTL_RETRIES		4
@@ -32,6 +34,7 @@ 
 * @timeout_msec: Default timeout for non-raw control messages

 * @callback: Callback called when hotplug message is received

 * @callback_data: Data passed to @callback

 * @index: Domain number. This will be output with the trace record.

 */

struct tb_ctl {

	struct tb_nhi *nhi;
@@ -47,6 +50,8 @@ struct tb_ctl { 
	int timeout_msec;

	event_cb callback;

	void *callback_data;



	int index;

};
@@ -369,6 +374,9 @@ static int tb_ctl_tx(struct tb_ctl *ctl, const void *data, size_t len, 
	pkg->frame.size = len + 4;

	pkg->frame.sof = type;

	pkg->frame.eof = type;



	trace_tb_tx(ctl->index, type, data, len);



	cpu_to_be32_array(pkg->buffer, data, len / 4);

	*(__be32 *) (pkg->buffer + len) = tb_crc(pkg->buffer, len);
@@ -384,6 +392,7 @@ static int tb_ctl_tx(struct tb_ctl *ctl, const void *data, size_t len, 
static bool tb_ctl_handle_event(struct tb_ctl *ctl, enum tb_cfg_pkg_type type,

				struct ctl_pkg *pkg, size_t size)

{

	trace_tb_event(ctl->index, type, pkg->buffer, size);

	return ctl->callback(ctl->callback_data, type, pkg->buffer, size);

}
@@ -489,6 +498,9 @@ static void tb_ctl_rx_callback(struct tb_ring *ring, struct ring_frame *frame, 
	 * triggered from messing with the active requests.

	 */

	req = tb_cfg_request_find(pkg->ctl, pkg);



	trace_tb_rx(pkg->ctl->index, frame->eof, pkg->buffer, frame->size, !req);



	if (req) {

		if (req->copy(req, pkg))

			schedule_work(&req->work);
@@ -614,6 +626,7 @@ struct tb_cfg_result tb_cfg_request_sync(struct tb_ctl *ctl, 
/**

 * tb_ctl_alloc() - allocate a control channel

 * @nhi: Pointer to NHI

 * @index: Domain number

 * @timeout_msec: Default timeout used with non-raw control messages

 * @cb: Callback called for plug events

 * @cb_data: Data passed to @cb
@@ -622,14 +635,16 @@ struct tb_cfg_result tb_cfg_request_sync(struct tb_ctl *ctl, 
 *

 * Return: Returns a pointer on success or NULL on failure.

 */

struct tb_ctl *tb_ctl_alloc(struct tb_nhi *nhi, int timeout_msec, event_cb cb,

			    void *cb_data)

struct tb_ctl *tb_ctl_alloc(struct tb_nhi *nhi, int index, int timeout_msec,

			    event_cb cb, void *cb_data)

{

	int i;

	struct tb_ctl *ctl = kzalloc(sizeof(*ctl), GFP_KERNEL);

	if (!ctl)

		return NULL;



	ctl->nhi = nhi;

	ctl->index = index;

	ctl->timeout_msec = timeout_msec;

	ctl->callback = cb;

	ctl->callback_data = cb_data;

drivers/thunderbolt/ctl.h

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ struct tb_ctl; 
typedef bool (*event_cb)(void *data, enum tb_cfg_pkg_type type,

			 const void *buf, size_t size);



struct tb_ctl *tb_ctl_alloc(struct tb_nhi *nhi, int timeout_msec, event_cb cb,

			    void *cb_data);

struct tb_ctl *tb_ctl_alloc(struct tb_nhi *nhi, int index, int timeout_msec,

			    event_cb cb, void *cb_data);

void tb_ctl_start(struct tb_ctl *ctl);

void tb_ctl_stop(struct tb_ctl *ctl);

void tb_ctl_free(struct tb_ctl *ctl);

drivers/thunderbolt/domain.c

+12 −7
Original line number Diff line number Diff line
@@ -321,12 +321,12 @@ static void tb_domain_release(struct device *dev) 


	tb_ctl_free(tb->ctl);

	destroy_workqueue(tb->wq);

	ida_simple_remove(&tb_domain_ida, tb->index);

	ida_free(&tb_domain_ida, tb->index);

	mutex_destroy(&tb->lock);

	kfree(tb);

}



struct device_type tb_domain_type = {

const struct device_type tb_domain_type = {

	.name = "thunderbolt_domain",

	.release = tb_domain_release,

};
@@ -389,7 +389,7 @@ struct tb *tb_domain_alloc(struct tb_nhi *nhi, int timeout_msec, size_t privsize 
	tb->nhi = nhi;

	mutex_init(&tb->lock);



	tb->index = ida_simple_get(&tb_domain_ida, 0, 0, GFP_KERNEL);

	tb->index = ida_alloc(&tb_domain_ida, GFP_KERNEL);

	if (tb->index < 0)

		goto err_free;
@@ -397,7 +397,7 @@ struct tb *tb_domain_alloc(struct tb_nhi *nhi, int timeout_msec, size_t privsize 
	if (!tb->wq)

		goto err_remove_ida;



	tb->ctl = tb_ctl_alloc(nhi, timeout_msec, tb_domain_event_cb, tb);

	tb->ctl = tb_ctl_alloc(nhi, tb->index, timeout_msec, tb_domain_event_cb, tb);

	if (!tb->ctl)

		goto err_destroy_wq;
@@ -413,7 +413,7 @@ struct tb *tb_domain_alloc(struct tb_nhi *nhi, int timeout_msec, size_t privsize 
err_destroy_wq:

	destroy_workqueue(tb->wq);

err_remove_ida:

	ida_simple_remove(&tb_domain_ida, tb->index);

	ida_free(&tb_domain_ida, tb->index);

err_free:

	kfree(tb);
@@ -423,6 +423,7 @@ struct tb *tb_domain_alloc(struct tb_nhi *nhi, int timeout_msec, size_t privsize 
/**

 * tb_domain_add() - Add domain to the system

 * @tb: Domain to add

 * @reset: Issue reset to the host router

 *

 * Starts the domain and adds it to the system. Hotplugging devices will

 * work after this has been returned successfully. In order to remove
@@ -431,7 +432,7 @@ struct tb *tb_domain_alloc(struct tb_nhi *nhi, int timeout_msec, size_t privsize 
 *

 * Return: %0 in case of success and negative errno in case of error

 */

int tb_domain_add(struct tb *tb)

int tb_domain_add(struct tb *tb, bool reset)

{

	int ret;
@@ -460,7 +461,7 @@ int tb_domain_add(struct tb *tb) 


	/* Start the domain */

	if (tb->cm_ops->start) {

		ret = tb->cm_ops->start(tb);

		ret = tb->cm_ops->start(tb, reset);

		if (ret)

			goto err_domain_del;

	}
@@ -505,6 +506,10 @@ void tb_domain_remove(struct tb *tb) 
	mutex_unlock(&tb->lock);



	flush_workqueue(tb->wq);



	if (tb->cm_ops->deinit)

		tb->cm_ops->deinit(tb);



	device_unregister(&tb->dev);

}

drivers/thunderbolt/icm.c

+1 −1
Original line number Diff line number Diff line
@@ -2144,7 +2144,7 @@ static int icm_runtime_resume(struct tb *tb) 
	return 0;

}



static int icm_start(struct tb *tb)

static int icm_start(struct tb *tb, bool not_used)

{

	struct icm *icm = tb_priv(tb);

	int ret;