Skip to contentSkip to conversation

thunderbolt: Handle bandwidth allocation mode enablement notification

PATCH In review Mika Westerberg 2 participants 5 messages Jan 24, 2023 – Jan 27, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 thunderbolt: Handle bandwidth allocation mode enablement notification

When the graphics side enables bandwidth allocation mode the DP IN adapter sends notification to the connection manager about this. Currently the handler misses this and tries to allocate 0 Mb/s that then makes the graphics side to think the request failed.

Fix this by properly handling the enablement notification.

Fixes 6ce3563520be ("thunderbolt: Add support for DisplayPort bandwidth allocation mode")
---
 drivers/thunderbolt/tb.c   | 10 +++++++---
 drivers/thunderbolt/usb4.c |  7 ++++---
 2 files changed, 11 insertions(+), 6 deletions(-)
drivers/thunderbolt/tb.c +7 -3
index 0b891d749a96..7bfbc9ca9ba4 100644
@@ -1756,11 +1756,15 @@ static void tb_handle_dp_bandwidth_request(struct work_struct *work)
 		goto unlock;
 	}
 
-	requested_bw = usb4_dp_port_requested_bw(in);
-	if (requested_bw < 0) {
-		tb_port_dbg(in, "no bandwidth request active\n");
+	ret = usb4_dp_port_requested_bw(in);
+	if (ret < 0) {
+		if (ret == -ENODATA)
+			tb_port_dbg(in, "no bandwidth request active\n");
+		else
+			tb_port_warn(in, "failed to read requested bandwidth\n");
 		goto unlock;
 	}
+	requested_bw = ret;
 
 	tb_port_dbg(in, "requested bandwidth %d Mb/s\n", requested_bw);
 
drivers/thunderbolt/usb4.c +4 -3
index 2a9266fb5c0f..1e5e9c147a31 100644
@@ -2732,7 +2732,8 @@ int usb4_dp_port_allocate_bw(struct tb_port *port, int bw)
  * Reads the DPCD (graphics driver) requested bandwidth and returns it
  * in Mb/s. Takes the programmed granularity into account. In case of
  * error returns negative errno. Specifically returns %-EOPNOTSUPP if
- * the adapter does not support bandwidth allocation mode.
+ * the adapter does not support bandwidth allocation mode, and %ENODATA
+ * if there is no active bandwidth request from the graphics driver.
  */
 int usb4_dp_port_requested_bw(struct tb_port *port)
 {
@@ -2750,10 +2751,10 @@ int usb4_dp_port_requested_bw(struct tb_port *port)
 	ret = tb_port_read(port, &val, TB_CFG_PORT,
 			   port->cap_adap + ADP_DP_CS_8, 1);
 	if (ret)
-		return 0;
+		return ret;
 
 	if (!(val & ADP_DP_CS_8_DR))
-		return 0;
+		return -ENODATA;
 
 	return (val & ADP_DP_CS_8_REQUESTED_BW_MASK) * granularity;
 }
Signature · 1 line
2.39.0
#1 lore raw

PATCH 2/2 thunderbolt: Add missing kernel-doc comment to tb_tunnel_maximum_bandwidth()

These were missing from the original commit so add them now. No functional changes.

---
 drivers/thunderbolt/tunnel.c | 10 ++++++++++
 drivers/thunderbolt/tunnel.h |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)
drivers/thunderbolt/tunnel.c +10 -0
index c406675a8966..8af9397f272e 100644
@@ -2081,6 +2081,16 @@ static bool tb_tunnel_is_active(const struct tb_tunnel *tunnel)
 	return true;
 }
 
+/**
+ * tb_tunnel_maximum_bandwidth() - Return maximum possible bandwidth
+ * @tunnel: Tunnel to check
+ * @max_up: Maximum upstream bandwidth in Mb/s
+ * @max_down: Maximum upstream bandwidth in Mb/s
+ *
+ * Returns maximum possible bandwidth this tunnel can go if not limited
+ * by other bandwidth clients. If the tunnel does not support this
+ * returns %-EOPNOTSUPP.
+ */
 int tb_tunnel_maximum_bandwidth(struct tb_tunnel *tunnel, int *max_up,
 				int *max_down)
 {
drivers/thunderbolt/tunnel.h +1 -1
index d7bbdf8c8186..bf690f7beeee 100644
@@ -29,7 +29,7 @@ enum tb_tunnel_type {
  * @init: Optional tunnel specific initialization
  * @deinit: Optional tunnel specific de-initialization
  * @activate: Optional tunnel specific activation/deactivation
- * @maximum_bandwidth:
+ * @maximum_bandwidth: Returns maximum possible bandwidth for this tunnel
  * @allocated_bandwidth: Return how much bandwidth is allocated for the tunnel
  * @alloc_bandwidth: Change tunnel bandwidth allocation
  * @consumed_bandwidth: Return how much bandwidth the tunnel consumes
Signature · 1 line
2.39.0
#2 lore raw

Re: [PATCH 2/2] thunderbolt: Add missing kernel-doc comment to tb_tunnel_maximum_bandwidth()

Quoted 5 lines · Mika Westerberg

+/**
+ * tb_tunnel_maximum_bandwidth() - Return maximum possible bandwidth
+ * @tunnel: Tunnel to check
+ * @max_up: Maximum upstream bandwidth in Mb/s
+ * @max_down: Maximum upstream bandwidth in Mb/s

                         ^^^^^^^^
			 downstream?

I'm sure you're just testing whether anyone is reading your patches ;)

#3 lore raw

Re: [PATCH 2/2] thunderbolt: Add missing kernel-doc comment to tb_tunnel_maximum_bandwidth()

Quoted 10 lines · Lukas Wunner
Quoted 5 lines · Mika Westerberg

+/**
+ * tb_tunnel_maximum_bandwidth() - Return maximum possible bandwidth
+ * @tunnel: Tunnel to check
+ * @max_up: Maximum upstream bandwidth in Mb/s
+ * @max_down: Maximum upstream bandwidth in Mb/s

                         ^^^^^^^^
			 downstream?

I'm sure you're just testing whether anyone is reading your patches ;)

Hehe, thanks for reading them ;-) Fixed it now.

#4 lore raw
In reply to Mika Westerberg
Quoted 9 lines · Mika Westerberg

When the graphics side enables bandwidth allocation mode the DP IN adapter sends notification to the connection manager about this. Currently the handler misses this and tries to allocate 0 Mb/s that then makes the graphics side to think the request failed.

Fix this by properly handling the enablement notification.

Fixes 6ce3563520be ("thunderbolt: Add support for DisplayPort bandwidth allocation mode")

Fixed the typo and applied both patches to thunderbolt.git/next.