Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62efe699 authored by Mika Westerberg's avatar Mika Westerberg
Browse files

thunderbolt: Make rest of the logging to happen at debug level 



Now that the driver can handle every possible tunnel types there is no
point to log everything as info level so turn these to happen at debug
level instead.

While at it remove duplicated tunnel activation log message
(tb_tunnel_activate() calls tb_tunnel_restart() which print the same
message) and add one missing '\n' termination.

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

drivers/thunderbolt/ctl.c

+1 −1
Original line number Diff line number Diff line
@@ -720,7 +720,7 @@ int tb_cfg_error(struct tb_ctl *ctl, u64 route, u32 port, 
		.port = port,

		.error = error,

	};

	tb_ctl_info(ctl, "resetting error on %llx:%x.\n", route, port);

	tb_ctl_dbg(ctl, "resetting error on %llx:%x.\n", route, port);

	return tb_ctl_tx(ctl, &pkg, sizeof(pkg), TB_CFG_PKG_ERROR);

}

drivers/thunderbolt/icm.c

+1 −1
Original line number Diff line number Diff line
@@ -1568,7 +1568,7 @@ static int icm_firmware_start(struct tb *tb, struct tb_nhi *nhi) 
	if (val & REG_FW_STS_ICM_EN)

		return 0;



	dev_info(&nhi->pdev->dev, "starting ICM firmware\n");

	dev_dbg(&nhi->pdev->dev, "starting ICM firmware\n");



	ret = icm_firmware_reset(tb, nhi);

	if (ret)

drivers/thunderbolt/path.c

+3 −3
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ int tb_path_activate(struct tb_path *path) 
					    & out_mask;

		hop.unknown3 = 0;



		tb_port_info(path->hops[i].in_port, "Writing hop %d, index %d",

		tb_port_dbg(path->hops[i].in_port, "Writing hop %d, index %d\n",

			    i, path->hops[i].in_hop_index);

		tb_dump_hop(path->hops[i].in_port, &hop);

		res = tb_port_write(path->hops[i].in_port, &hop, TB_CFG_HOPS,
@@ -512,7 +512,7 @@ int tb_path_activate(struct tb_path *path) 
		}

	}

	path->activated = true;

	tb_info(path->tb, "path activation complete\n");

	tb_dbg(path->tb, "path activation complete\n");

	return 0;

err:

	tb_WARN(path->tb, "path activation failed\n");

drivers/thunderbolt/switch.c

+9 −10
Original line number Diff line number Diff line
@@ -493,23 +493,22 @@ int tb_wait_for_port(struct tb_port *port, bool wait_if_unplugged) 
		if (state < 0)

			return state;

		if (state == TB_PORT_DISABLED) {

			tb_port_info(port, "is disabled (state: 0)\n");

			tb_port_dbg(port, "is disabled (state: 0)\n");

			return 0;

		}

		if (state == TB_PORT_UNPLUGGED) {

			if (wait_if_unplugged) {

				/* used during resume */

				tb_port_info(port,

				tb_port_dbg(port,

					    "is unplugged (state: 7), retrying...\n");

				msleep(100);

				continue;

			}

			tb_port_info(port, "is unplugged (state: 7)\n");

			tb_port_dbg(port, "is unplugged (state: 7)\n");

			return 0;

		}

		if (state == TB_PORT_UP) {

			tb_port_info(port,

				     "is connected, link is up (state: 2)\n");

			tb_port_dbg(port, "is connected, link is up (state: 2)\n");

			return 1;

		}
@@ -517,7 +516,7 @@ int tb_wait_for_port(struct tb_port *port, bool wait_if_unplugged) 
		 * After plug-in the state is TB_PORT_CONNECTING. Give it some

		 * time.

		 */

		tb_port_info(port,

		tb_port_dbg(port,

			    "is connected, link is not up (state: %d), retrying...\n",

			    state);

		msleep(100);
@@ -585,7 +584,7 @@ int tb_port_set_initial_credits(struct tb_port *port, u32 credits) 
int tb_port_clear_counter(struct tb_port *port, int counter)

{

	u32 zero[3] = { 0, 0, 0 };

	tb_port_info(port, "clearing counter %d\n", counter);

	tb_port_dbg(port, "clearing counter %d\n", counter);

	return tb_port_write(port, zero, TB_CFG_COUNTERS, 3 * counter, 3);

}

drivers/thunderbolt/tb.c

+5 −6
Original line number Diff line number Diff line
@@ -556,18 +556,17 @@ static void tb_handle_hotplug(struct work_struct *work) 
		} else if (tb_port_is_dpout(port)) {

			tb_teardown_dp(tb, port);

		} else {

			tb_port_info(port,

			tb_port_dbg(port,

				   "got unplug event for disconnected port, ignoring\n");

		}

	} else if (port->remote) {

		tb_port_info(port,

			     "got plug event for connected port, ignoring\n");

		tb_port_dbg(port, "got plug event for connected port, ignoring\n");

	} else {

		if (tb_port_is_null(port)) {

			tb_port_info(port, "hotplug: scanning\n");

			tb_port_dbg(port, "hotplug: scanning\n");

			tb_scan_port(port);

			if (!port->remote)

				tb_port_info(port, "hotplug: no switch found\n");

				tb_port_dbg(port, "hotplug: no switch found\n");

		} else if (tb_port_is_dpout(port)) {

			tb_tunnel_dp(tb, port);

		}