Commit 34c5def5 authored Sep 20, 2023 by Mika Westerberg

thunderbolt: Use tb_tunnel_xxx() log macros in tb.c



Now that the macros are available we can use them in tb.c. This makes
the log output more consistent.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>

parent d27bd2c3

drivers/thunderbolt/tb.c

+28 −22

Original line number	Diff line number	Diff line
		@@ -729,7 +729,7 @@ static void tb_reclaim_usb3_bandwidth(struct tb tb, struct tb_port src_port,
		if (!tunnel)
		return;

		tb_dbg(tb, "reclaiming unused bandwidth for USB3\n");
		tb_tunnel_dbg(tunnel, "reclaiming unused bandwidth\n");

		/*
		* Calculate available bandwidth for the first hop USB3 tunnel.
		@@ -738,12 +738,12 @@ static void tb_reclaim_usb3_bandwidth(struct tb tb, struct tb_port src_port,
		ret = tb_available_bandwidth(tb, tunnel->src_port, tunnel->dst_port,
		&available_up, &available_down);
		if (ret) {
		tb_warn(tb, "failed to calculate available bandwidth\n");
		tb_tunnel_warn(tunnel, "failed to calculate available bandwidth\n");
		return;
		}

		tb_dbg(tb, "available bandwidth for USB3 %d/%d Mb/s\n",
		available_up, available_down);
		tb_tunnel_dbg(tunnel, "available bandwidth %d/%d Mb/s\n", available_up,
		available_down);

		tb_tunnel_reclaim_available_bandwidth(tunnel, &available_up, &available_down);
		}
		@@ -1188,7 +1188,7 @@ tb_recalc_estimated_bandwidth_for_group(struct tb_bandwidth_group *group)
		ret = tb_release_unused_usb3_bandwidth(tb,
		first_tunnel->src_port, first_tunnel->dst_port);
		if (ret) {
		tb_port_warn(in,
		tb_tunnel_warn(tunnel,
		"failed to release unused bandwidth\n");
		break;
		}
		@@ -1198,7 +1198,7 @@ tb_recalc_estimated_bandwidth_for_group(struct tb_bandwidth_group *group)
		ret = tb_available_bandwidth(tb, in, out, &estimated_up,
		&estimated_down);
		if (ret) {
		tb_port_warn(in,
		tb_tunnel_warn(tunnel,
		"failed to re-calculate estimated bandwidth\n");
		break;
		}
		@@ -1209,7 +1209,8 @@ tb_recalc_estimated_bandwidth_for_group(struct tb_bandwidth_group *group)
		* - available bandwidth along the path
		* - bandwidth allocated for USB 3.x but not used.
		*/
		tb_port_dbg(in, "re-calculated estimated bandwidth %u/%u Mb/s\n",
		tb_tunnel_dbg(tunnel,
		"re-calculated estimated bandwidth %u/%u Mb/s\n",
		estimated_up, estimated_down);

		if (in->sw->config.depth < out->sw->config.depth)
		@@ -1218,7 +1219,8 @@ tb_recalc_estimated_bandwidth_for_group(struct tb_bandwidth_group *group)
		estimated_bw = estimated_up;

		if (usb4_dp_port_set_estimated_bandwidth(in, estimated_bw))
		tb_port_warn(in, "failed to update estimated bandwidth\n");
		tb_tunnel_warn(tunnel,
		"failed to update estimated bandwidth\n");
		}

		if (first_tunnel)
		@@ -1780,7 +1782,7 @@ static int tb_alloc_dp_bandwidth(struct tb_tunnel tunnel, int requested_up,
		in = tunnel->src_port;
		out = tunnel->dst_port;

		tb_port_dbg(in, "bandwidth allocated currently %d/%d Mb/s\n",
		tb_tunnel_dbg(tunnel, "bandwidth allocated currently %d/%d Mb/s\n",
		allocated_up, allocated_down);

		/*
		@@ -1822,12 +1824,13 @@ static int tb_alloc_dp_bandwidth(struct tb_tunnel tunnel, int requested_up,
		else if (requested_down_corrected < 0)
		requested_down_corrected = 0;

		tb_port_dbg(in, "corrected bandwidth request %d/%d Mb/s\n",
		tb_tunnel_dbg(tunnel, "corrected bandwidth request %d/%d Mb/s\n",
		requested_up_corrected, requested_down_corrected);

		if ((*requested_up >= 0 && requested_up_corrected > max_up_rounded) \|\|
		(*requested_down >= 0 && requested_down_corrected > max_down_rounded)) {
		tb_port_dbg(in, "bandwidth request too high (%d/%d Mb/s > %d/%d Mb/s)\n",
		tb_tunnel_dbg(tunnel,
		"bandwidth request too high (%d/%d Mb/s > %d/%d Mb/s)\n",
		requested_up_corrected, requested_down_corrected,
		max_up_rounded, max_down_rounded);
		return -ENOBUFS;
		@@ -1864,7 +1867,7 @@ static int tb_alloc_dp_bandwidth(struct tb_tunnel tunnel, int requested_up,
		if (ret)
		goto reclaim;

		tb_port_dbg(in, "bandwidth available for allocation %d/%d Mb/s\n",
		tb_tunnel_dbg(tunnel, "bandwidth available for allocation %d/%d Mb/s\n",
		available_up, available_down);

		if ((*requested_up >= 0 && available_up >= requested_up_corrected) \|\|
		@@ -1947,11 +1950,14 @@ static void tb_handle_dp_bandwidth_request(struct work_struct *work)
		ret = tb_alloc_dp_bandwidth(tunnel, &requested_up, &requested_down);
		if (ret) {
		if (ret == -ENOBUFS)
		tb_port_warn(in, "not enough bandwidth available\n");
		tb_tunnel_warn(tunnel,
		"not enough bandwidth available\n");
		else
		tb_port_warn(in, "failed to change bandwidth allocation\n");
		tb_tunnel_warn(tunnel,
		"failed to change bandwidth allocation\n");
		} else {
		tb_port_dbg(in, "bandwidth allocation changed to %d/%d Mb/s\n",
		tb_tunnel_dbg(tunnel,
		"bandwidth allocation changed to %d/%d Mb/s\n",
		requested_up, requested_down);

		/* Update other clients about the allocation change */