From: Mika Westerberg <mika.westerberg@linux.intel.com>
To: linux-kernel@vger.kernel.org
Cc: Michael Jamet <michael.jamet@intel.com>,
Yehezkel Bernat <YehezkelShB@gmail.com>,
Andreas Noever <andreas.noever@gmail.com>,
Lukas Wunner <lukas@wunner.de>,
"David S . Miller" <davem@davemloft.net>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
netdev@vger.kernel.org
Subject: [PATCH v2 27/28] thunderbolt: Make rest of the logging to happen at debug level
Date: Wed, 6 Feb 2019 16:17:37 +0300 [thread overview]
Message-ID: <20190206131738.43696-28-mika.westerberg@linux.intel.com> (raw)
In-Reply-To: <20190206131738.43696-1-mika.westerberg@linux.intel.com>
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).
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
drivers/thunderbolt/ctl.c | 2 +-
drivers/thunderbolt/icm.c | 2 +-
drivers/thunderbolt/path.c | 30 +++++++++++++++---------------
drivers/thunderbolt/switch.c | 19 +++++++++----------
drivers/thunderbolt/tb.c | 11 +++++------
drivers/thunderbolt/tunnel.c | 10 ++++------
6 files changed, 35 insertions(+), 39 deletions(-)
diff --git a/drivers/thunderbolt/ctl.c b/drivers/thunderbolt/ctl.c
index 73b386de4d15..2427d73be731 100644
--- 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 e28a4255d56a..c44906fac2a4 100644
--- a/drivers/thunderbolt/icm.c
+++ b/drivers/thunderbolt/icm.c
@@ -1559,7 +1559,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 afdb667fcc0d..1aefdef403ef 100644
--- a/drivers/thunderbolt/path.c
+++ b/drivers/thunderbolt/path.c
@@ -354,12 +354,12 @@ void tb_path_deactivate(struct tb_path *path)
tb_WARN(path->tb, "trying to deactivate an inactive path\n");
return;
}
- tb_info(path->tb,
- "deactivating path from %llx:%x to %llx:%x\n",
- tb_route(path->hops[0].in_port->sw),
- path->hops[0].in_port->port,
- tb_route(path->hops[path->path_length - 1].out_port->sw),
- path->hops[path->path_length - 1].out_port->port);
+ tb_dbg(path->tb,
+ "deactivating path from %llx:%x to %llx:%x\n",
+ tb_route(path->hops[0].in_port->sw),
+ path->hops[0].in_port->port,
+ tb_route(path->hops[path->path_length - 1].out_port->sw),
+ path->hops[path->path_length - 1].out_port->port);
__tb_path_deactivate_hops(path, 0);
__tb_path_deallocate_nfc(path, 0);
path->activated = false;
@@ -382,12 +382,12 @@ int tb_path_activate(struct tb_path *path)
return -EINVAL;
}
- tb_info(path->tb,
- "activating path from %llx:%x to %llx:%x\n",
- tb_route(path->hops[0].in_port->sw),
- path->hops[0].in_port->port,
- tb_route(path->hops[path->path_length - 1].out_port->sw),
- path->hops[path->path_length - 1].out_port->port);
+ tb_dbg(path->tb,
+ "activating path from %llx:%x to %llx:%x\n",
+ tb_route(path->hops[0].in_port->sw),
+ path->hops[0].in_port->port,
+ tb_route(path->hops[path->path_length - 1].out_port->sw),
+ path->hops[path->path_length - 1].out_port->port);
/* Clear counters. */
for (i = path->path_length - 1; i >= 0; i--) {
@@ -438,8 +438,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",
+ 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);
@@ -450,7 +450,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 79391c3d834e..2b84b770b8d2 100644
--- a/drivers/thunderbolt/switch.c
+++ b/drivers/thunderbolt/switch.c
@@ -500,23 +500,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;
}
@@ -524,9 +523,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,
@@ -592,7 +591,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 94dd1fd12967..3fda11d45a03 100644
--- a/drivers/thunderbolt/tb.c
+++ b/drivers/thunderbolt/tb.c
@@ -514,18 +514,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 f10a0a15b873..daacd700df6d 100644
--- a/drivers/thunderbolt/tunnel.c
+++ b/drivers/thunderbolt/tunnel.c
@@ -47,8 +47,8 @@ static const char * const tb_tunnel_names[] = { "PCI", "DP", "DMA" };
__TB_TUNNEL_PRINT(tb_WARN, tunnel, fmt, ##arg)
#define tb_tunnel_warn(tunnel, fmt, arg...) \
__TB_TUNNEL_PRINT(tb_warn, tunnel, fmt, ##arg)
-#define tb_tunnel_info(tunnel, fmt, arg...) \
- __TB_TUNNEL_PRINT(tb_info, tunnel, fmt, ##arg)
+#define tb_tunnel_dbg(tunnel, fmt, arg...) \
+ __TB_TUNNEL_PRINT(tb_dbg, tunnel, fmt, ##arg)
static struct tb_tunnel *tb_tunnel_alloc(struct tb *tb, size_t npaths,
enum tb_tunnel_type type)
@@ -610,7 +610,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 enable them again */
for (i = 0; i < tunnel->npaths; i++) {
@@ -650,8 +650,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,
@@ -671,7 +669,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);
--
2.20.1
next prev parent reply other threads:[~2019-02-06 13:18 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-06 13:17 [PATCH v2 00/28] thunderbolt: Software connection manager improvements Mika Westerberg
2019-02-06 13:17 ` [PATCH v2 01/28] net: thunderbolt: Unregister ThunderboltIP protocol handler when suspending Mika Westerberg
2019-02-06 13:17 ` [PATCH v2 02/28] thunderbolt: Do not allocate switch if depth is greater than 6 Mika Westerberg
2019-02-06 13:17 ` [PATCH v2 03/28] thunderbolt: Enable TMU access when accessing port space on legacy devices Mika Westerberg
2019-02-06 13:17 ` [PATCH v2 04/28] thunderbolt: Add dummy read after port capability list walk on Light Ridge Mika Westerberg
2019-02-06 13:17 ` [PATCH v2 05/28] thunderbolt: Move LC specific functionality into a separate file Mika Westerberg
2019-02-06 13:17 ` [PATCH v2 06/28] thunderbolt: Configure lanes when switch is initialized Mika Westerberg
2019-02-06 13:17 ` [PATCH v2 07/28] thunderbolt: Set sleep bit when suspending switch Mika Westerberg
2019-02-06 13:17 ` [PATCH v2 08/28] thunderbolt: Properly disable path Mika Westerberg
2019-02-06 13:17 ` [PATCH v2 09/28] thunderbolt: Cache adapter specific capability offset into struct port Mika Westerberg
2019-02-06 13:17 ` [PATCH v2 10/28] thunderbolt: Rename tunnel_pci to tunnel Mika Westerberg
2019-02-06 13:17 ` [PATCH v2 11/28] thunderbolt: Generalize tunnel creation functionality Mika Westerberg
2019-02-06 13:17 ` [PATCH v2 12/28] thunderbolt: Add functions for allocating and releasing hop IDs Mika Westerberg
2019-02-10 12:13 ` Lukas Wunner
2019-02-11 8:30 ` Mika Westerberg
2019-02-12 12:43 ` Lukas Wunner
2019-02-12 12:51 ` Mika Westerberg
2019-02-12 12:59 ` Lukas Wunner
2019-02-12 13:02 ` Mika Westerberg
2019-02-06 13:17 ` [PATCH v2 13/28] thunderbolt: Add helper function to iterate from one port to another Mika Westerberg
2019-02-07 14:33 ` Andy Shevchenko
2019-02-11 6:16 ` Lukas Wunner
2019-02-11 9:54 ` Mika Westerberg
2019-02-12 13:55 ` Lukas Wunner
2019-02-12 19:03 ` Mika Westerberg
2019-02-06 13:17 ` [PATCH v2 14/28] thunderbolt: Extend tunnel creation to more than 2 adjacent switches Mika Westerberg
2019-02-10 15:33 ` Lukas Wunner
2019-02-11 8:45 ` Mika Westerberg
2019-02-12 12:54 ` Lukas Wunner
2019-02-06 13:17 ` [PATCH v2 15/28] thunderbolt: Deactivate all paths before restarting them Mika Westerberg
2019-02-11 6:35 ` Lukas Wunner
2019-02-11 8:52 ` Mika Westerberg
2019-02-06 13:17 ` [PATCH v2 16/28] thunderbolt: Discover preboot PCIe paths the boot firmware established Mika Westerberg
2019-02-12 17:49 ` Lukas Wunner
2019-02-12 18:34 ` Mika Westerberg
2019-02-12 19:42 ` Lukas Wunner
2019-02-13 8:30 ` Mika Westerberg
2019-02-06 13:17 ` [PATCH v2 17/28] thunderbolt: Add support for full PCIe daisy chains Mika Westerberg
2019-03-24 11:31 ` Lukas Wunner
2019-03-25 9:57 ` Mika Westerberg
2019-03-25 11:16 ` Lukas Wunner
2019-03-25 11:22 ` Mika Westerberg
2019-02-06 13:17 ` [PATCH v2 18/28] thunderbolt: Scan only valid NULL adapter ports in hotplug Mika Westerberg
2019-02-12 14:04 ` Lukas Wunner
2019-02-12 18:46 ` Mika Westerberg
2019-02-06 13:17 ` [PATCH v2 19/28] thunderbolt: Generalize port finding routines to support all port types Mika Westerberg
2019-02-06 13:17 ` [PATCH v2 20/28] thunderbolt: Rework NFC credits handling Mika Westerberg
2019-02-06 13:17 ` [PATCH v2 21/28] thunderbolt: Add support for Display Port tunnels Mika Westerberg
2019-02-07 14:28 ` Andy Shevchenko
2019-02-06 13:17 ` [PATCH v2 22/28] thunderbolt: Run tb_xdp_handle_request() in system workqueue Mika Westerberg
2019-02-06 13:17 ` [PATCH v2 23/28] thunderbolt: Add XDomain UUID exchange support Mika Westerberg
2019-02-06 13:17 ` [PATCH v2 24/28] thunderbolt: Add support for DMA tunnels Mika Westerberg
2019-02-06 13:17 ` [PATCH v2 25/28] thunderbolt: Make tb_switch_alloc() return ERR_PTR() Mika Westerberg
2019-02-06 13:17 ` [PATCH v2 26/28] thunderbolt: Add support for XDomain connections Mika Westerberg
2019-02-06 13:17 ` Mika Westerberg [this message]
2019-02-06 13:17 ` [PATCH v2 28/28] thunderbolt: Start firmware on Titan Ridge Apple systems Mika Westerberg
2019-02-07 14:22 ` [PATCH v2 00/28] thunderbolt: Software connection manager improvements Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190206131738.43696-28-mika.westerberg@linux.intel.com \
--to=mika.westerberg@linux.intel.com \
--cc=YehezkelShB@gmail.com \
--cc=andreas.noever@gmail.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=lukas@wunner.de \
--cc=michael.jamet@intel.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome