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: Mika Westerberg <mika.westerberg@linux.intel.com>

diff --git a/drivers/thunderbolt/ctl.c b/drivers/thunderbolt/ctl.c
index 73b386de4d15d8de8421eff6ceb7106a5ba2b078..2427d73be7319f65b7f8cd5f29f67f6a23bee570 100644 (file)
--- a/drivers/thunderbolt/ctl.c
+++ b/drivers/thunderbolt/ctl.c
@@ -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);
 }
 

diff --git a/drivers/thunderbolt/icm.c b/drivers/thunderbolt/icm.c
index d1f6ec89763c3e17a83cb687eddfbc287ec91d9e..597507bbd8ed71eaf8d2dafd8e50df09704856cd 100644 (file)
--- a/drivers/thunderbolt/icm.c
+++ b/drivers/thunderbolt/icm.c
@@ -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)

diff --git a/drivers/thunderbolt/path.c b/drivers/thunderbolt/path.c
index e4c22f53ef4dac1ec8932e010cde228915e385bd..273e0cae9a987fcd6686b018b64cc9c087da9b73 100644 (file)
--- a/drivers/thunderbolt/path.c
+++ b/drivers/thunderbolt/path.c
@@ -500,8 +500,8 @@ 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",
-                            i, path->hops[i].in_hop_index);
+               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,
                                    2 * path->hops[i].in_hop_index, 2);
@@ -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");

diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c
index a5345a6225bd43c76b912ff0796bb432f9b627b4..c1b016574fb4562319583dcb3710ef644def7629 100644 (file)
--- a/drivers/thunderbolt/switch.c
+++ b/drivers/thunderbolt/switch.c
@@ -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,
-                                            "is unplugged (state: 7), retrying...\n");
+                               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,9 +516,9 @@ 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,
-                            "is connected, link is not up (state: %d), retrying...\n",
-                            state);
+               tb_port_dbg(port,
+                           "is connected, link is not up (state: %d), retrying...\n",
+                           state);
                msleep(100);
        }
        tb_port_warn(port,
@@ -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);
 }
 

diff --git a/drivers/thunderbolt/tb.c b/drivers/thunderbolt/tb.c
index e39fc1e35e6b2748f9dc25b528d5d9df52066c47..1f7a9e1cc09c4993443efeb9ef3c7d8f28c719ad 100644 (file)
--- a/drivers/thunderbolt/tb.c
+++ b/drivers/thunderbolt/tb.c
@@ -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,
-                                    "got unplug event for disconnected port, ignoring\n");
+                       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);
                }

diff --git a/drivers/thunderbolt/tunnel.c b/drivers/thunderbolt/tunnel.c
index 9f9b26b12d0a8ec798e5a89a3aac2edfe8d790a8..31d0234837e45d74143d06ff2ac4bb9f28d6bc25 100644 (file)
--- a/drivers/thunderbolt/tunnel.c
+++ b/drivers/thunderbolt/tunnel.c
@@ -611,7 +611,7 @@ int tb_tunnel_restart(struct tb_tunnel *tunnel)
 {
        int res, i;
 
-       tb_tunnel_info(tunnel, "activating\n");
+       tb_tunnel_dbg(tunnel, "activating\n");
 
        /*
         * Make sure all paths are properly disabled before enabling
@@ -660,8 +660,6 @@ int tb_tunnel_activate(struct tb_tunnel *tunnel)
 {
        int i;
 
-       tb_tunnel_info(tunnel, "activating\n");
-
        for (i = 0; i < tunnel->npaths; i++) {
                if (tunnel->paths[i]->activated) {
                        tb_tunnel_WARN(tunnel,
@@ -681,7 +679,7 @@ void tb_tunnel_deactivate(struct tb_tunnel *tunnel)
 {
        int i;
 
-       tb_tunnel_info(tunnel, "deactivating\n");
+       tb_tunnel_dbg(tunnel, "deactivating\n");
 
        if (tunnel->activate)
                tunnel->activate(tunnel, false);