Commit fe8a0293 authored by Mika Westerberg's avatar Mika Westerberg
Browse files

thunderbolt: Use tb_tunnel_dbg() where possible to make logging more consistent 



This makes it easier to find out the tunnel in question. Also drop a
couple of lines that generate duplicate information.

Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent 6ed0b900

drivers/thunderbolt/tunnel.c

+30 −35
Original line number Diff line number Diff line
@@ -614,7 +614,8 @@ static int tb_dp_xchg_caps(struct tb_tunnel *tunnel) 


	in_rate = tb_dp_cap_get_rate(in_dp_cap);

	in_lanes = tb_dp_cap_get_lanes(in_dp_cap);

	tb_port_dbg(in, "maximum supported bandwidth %u Mb/s x%u = %u Mb/s\n",

	tb_tunnel_dbg(tunnel,

		      "DP IN maximum supported bandwidth %u Mb/s x%u = %u Mb/s\n",

		      in_rate, in_lanes, tb_dp_bandwidth(in_rate, in_lanes));



	/*
@@ -624,7 +625,8 @@ static int tb_dp_xchg_caps(struct tb_tunnel *tunnel) 
	out_rate = tb_dp_cap_get_rate(out_dp_cap);

	out_lanes = tb_dp_cap_get_lanes(out_dp_cap);

	bw = tb_dp_bandwidth(out_rate, out_lanes);

	tb_port_dbg(out, "maximum supported bandwidth %u Mb/s x%u = %u Mb/s\n",

	tb_tunnel_dbg(tunnel,

		      "DP OUT maximum supported bandwidth %u Mb/s x%u = %u Mb/s\n",

		      out_rate, out_lanes, bw);



	if (in->sw->config.depth < out->sw->config.depth)
@@ -639,12 +641,13 @@ static int tb_dp_xchg_caps(struct tb_tunnel *tunnel) 
					     out_rate, out_lanes, &new_rate,

					     &new_lanes);

		if (ret) {

			tb_port_info(out, "not enough bandwidth for DP tunnel\n");

			tb_tunnel_info(tunnel, "not enough bandwidth\n");

			return ret;

		}



		new_bw = tb_dp_bandwidth(new_rate, new_lanes);

		tb_port_dbg(out, "bandwidth reduced to %u Mb/s x%u = %u Mb/s\n",

		tb_tunnel_dbg(tunnel,

			      "bandwidth reduced to %u Mb/s x%u = %u Mb/s\n",

			      new_rate, new_lanes, new_bw);



		/*
@@ -662,7 +665,7 @@ static int tb_dp_xchg_caps(struct tb_tunnel *tunnel) 
	 */

	if (tb_route(out->sw) && tb_switch_is_titan_ridge(out->sw)) {

		out_dp_cap |= DP_COMMON_CAP_LTTPR_NS;

		tb_port_dbg(out, "disabling LTTPR\n");

		tb_tunnel_dbg(tunnel, "disabling LTTPR\n");

	}



	return tb_port_write(in, &out_dp_cap, TB_CFG_PORT,
@@ -712,8 +715,8 @@ static int tb_dp_bandwidth_alloc_mode_enable(struct tb_tunnel *tunnel) 
	lanes = min(in_lanes, out_lanes);

	tmp = tb_dp_bandwidth(rate, lanes);



	tb_port_dbg(in, "non-reduced bandwidth %u Mb/s x%u = %u Mb/s\n", rate,

		    lanes, tmp);

	tb_tunnel_dbg(tunnel, "non-reduced bandwidth %u Mb/s x%u = %u Mb/s\n",

		      rate, lanes, tmp);



	ret = usb4_dp_port_set_nrd(in, rate, lanes);

	if (ret)
@@ -728,7 +731,7 @@ static int tb_dp_bandwidth_alloc_mode_enable(struct tb_tunnel *tunnel) 
	rate = min(in_rate, out_rate);

	tmp = tb_dp_bandwidth(rate, lanes);



	tb_port_dbg(in,

	tb_tunnel_dbg(tunnel,

		      "maximum bandwidth through allocation mode %u Mb/s x%u = %u Mb/s\n",

		      rate, lanes, tmp);
@@ -736,7 +739,7 @@ static int tb_dp_bandwidth_alloc_mode_enable(struct tb_tunnel *tunnel) 
	     granularity *= 2)

		;



	tb_port_dbg(in, "granularity %d Mb/s\n", granularity);

	tb_tunnel_dbg(tunnel, "granularity %d Mb/s\n", granularity);



	/*

	 * Returns -EINVAL if granularity above is outside of the
@@ -756,7 +759,7 @@ static int tb_dp_bandwidth_alloc_mode_enable(struct tb_tunnel *tunnel) 
	else

		estimated_bw = tunnel->max_up;



	tb_port_dbg(in, "estimated bandwidth %d Mb/s\n", estimated_bw);

	tb_tunnel_dbg(tunnel, "estimated bandwidth %d Mb/s\n", estimated_bw);



	ret = usb4_dp_port_set_estimated_bandwidth(in, estimated_bw);

	if (ret)
@@ -767,7 +770,7 @@ static int tb_dp_bandwidth_alloc_mode_enable(struct tb_tunnel *tunnel) 
	if (ret)

		return ret;



	tb_port_dbg(in, "bandwidth allocation mode enabled\n");

	tb_tunnel_dbg(tunnel, "bandwidth allocation mode enabled\n");

	return 0;

}
@@ -788,7 +791,7 @@ static int tb_dp_init(struct tb_tunnel *tunnel) 
	if (!usb4_dp_port_bandwidth_mode_supported(in))

		return 0;



	tb_port_dbg(in, "bandwidth allocation mode supported\n");

	tb_tunnel_dbg(tunnel, "bandwidth allocation mode supported\n");



	ret = usb4_dp_port_set_cm_id(in, tb->index);

	if (ret)
@@ -805,7 +808,7 @@ static void tb_dp_deinit(struct tb_tunnel *tunnel) 
		return;

	if (usb4_dp_port_bandwidth_mode_enabled(in)) {

		usb4_dp_port_set_cm_bandwidth_mode_supported(in, false);

		tb_port_dbg(in, "bandwidth allocation mode disabled\n");

		tb_tunnel_dbg(tunnel, "bandwidth allocation mode disabled\n");

	}

}
@@ -921,9 +924,6 @@ static int tb_dp_bandwidth_mode_consumed_bandwidth(struct tb_tunnel *tunnel, 
	if (allocated_bw == max_bw)

		allocated_bw = ret;



	tb_port_dbg(in, "consumed bandwidth through allocation mode %d Mb/s\n",

		    allocated_bw);



	if (in->sw->config.depth < out->sw->config.depth) {

		*consumed_up = 0;

		*consumed_down = allocated_bw;
@@ -1006,9 +1006,6 @@ static int tb_dp_alloc_bandwidth(struct tb_tunnel *tunnel, int *alloc_up, 
	/* Now we can use BW mode registers to figure out the bandwidth */

	/* TODO: need to handle discovery too */

	tunnel->bw_mode = true;



	tb_port_dbg(in, "allocated bandwidth through allocation mode %d Mb/s\n",

		    tmp);

	return 0;

}
@@ -1035,8 +1032,7 @@ static int tb_dp_read_dprx(struct tb_tunnel *tunnel, u32 *rate, u32 *lanes, 
			*rate = tb_dp_cap_get_rate(val);

			*lanes = tb_dp_cap_get_lanes(val);



			tb_port_dbg(in, "consumed bandwidth through DPRX %d Mb/s\n",

				    tb_dp_bandwidth(*rate, *lanes));

			tb_tunnel_dbg(tunnel, "DPRX read done\n");

			return 0;

		}

		usleep_range(100, 150);
@@ -1073,9 +1069,6 @@ static int tb_dp_read_cap(struct tb_tunnel *tunnel, unsigned int cap, u32 *rate, 


	*rate = tb_dp_cap_get_rate(val);

	*lanes = tb_dp_cap_get_lanes(val);



	tb_port_dbg(in, "bandwidth from %#x capability %d Mb/s\n", cap,

		    tb_dp_bandwidth(*rate, *lanes));

	return 0;

}
@@ -1253,7 +1246,8 @@ static void tb_dp_dump(struct tb_tunnel *tunnel) 
	rate = tb_dp_cap_get_rate(dp_cap);

	lanes = tb_dp_cap_get_lanes(dp_cap);



	tb_port_dbg(in, "maximum supported bandwidth %u Mb/s x%u = %u Mb/s\n",

	tb_tunnel_dbg(tunnel,

		      "DP IN maximum supported bandwidth %u Mb/s x%u = %u Mb/s\n",

		      rate, lanes, tb_dp_bandwidth(rate, lanes));



	out = tunnel->dst_port;
@@ -1265,7 +1259,8 @@ static void tb_dp_dump(struct tb_tunnel *tunnel) 
	rate = tb_dp_cap_get_rate(dp_cap);

	lanes = tb_dp_cap_get_lanes(dp_cap);



	tb_port_dbg(out, "maximum supported bandwidth %u Mb/s x%u = %u Mb/s\n",

	tb_tunnel_dbg(tunnel,

		      "DP OUT maximum supported bandwidth %u Mb/s x%u = %u Mb/s\n",

		      rate, lanes, tb_dp_bandwidth(rate, lanes));



	if (tb_port_read(in, &dp_cap, TB_CFG_PORT,
@@ -1275,7 +1270,7 @@ static void tb_dp_dump(struct tb_tunnel *tunnel) 
	rate = tb_dp_cap_get_rate(dp_cap);

	lanes = tb_dp_cap_get_lanes(dp_cap);



	tb_port_dbg(in, "reduced bandwidth %u Mb/s x%u = %u Mb/s\n",

	tb_tunnel_dbg(tunnel, "reduced bandwidth %u Mb/s x%u = %u Mb/s\n",

		      rate, lanes, tb_dp_bandwidth(rate, lanes));

}