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 08/28] thunderbolt: Properly disable path
Date: Wed, 6 Feb 2019 16:17:18 +0300 [thread overview]
Message-ID: <20190206131738.43696-9-mika.westerberg@linux.intel.com> (raw)
In-Reply-To: <20190206131738.43696-1-mika.westerberg@linux.intel.com>
We need to wait until all buffers have been drained before the path can
be considered disabled. Do this for every hop in a path. Also if the
switch is physically disconnected, do not bother disabling it anymore
(it is not present anyway).
This adds another bit field to struct tb_regs_hop even if we are trying
to get rid of them but we can clean them up another day.
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
drivers/thunderbolt/path.c | 44 ++++++++++++++++++++++++++++++++---
drivers/thunderbolt/tb_regs.h | 3 ++-
2 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/drivers/thunderbolt/path.c b/drivers/thunderbolt/path.c
index a11956522bac..48cb15ff4446 100644
--- a/drivers/thunderbolt/path.c
+++ b/drivers/thunderbolt/path.c
@@ -7,6 +7,8 @@
#include <linux/slab.h>
#include <linux/errno.h>
+#include <linux/delay.h>
+#include <linux/ktime.h>
#include "tb.h"
@@ -74,13 +76,49 @@ static void __tb_path_deallocate_nfc(struct tb_path *path, int first_hop)
}
}
+static int __tb_path_deactivate_hop(struct tb_port *port, int hop_index)
+{
+ struct tb_regs_hop hop;
+ ktime_t timeout;
+ int ret;
+
+ if (port->sw->is_unplugged)
+ return 0;
+
+ /* Disable the path */
+ ret = tb_port_read(port, &hop, TB_CFG_HOPS, 2 * hop_index, 2);
+ if (ret)
+ return ret;
+
+ hop.enable = 0;
+
+ ret = tb_port_write(port, &hop, TB_CFG_HOPS, 2 * hop_index, 2);
+ if (ret)
+ return ret;
+
+ /* Wait until it is drained */
+ timeout = ktime_add_ms(ktime_get(), 500);
+ do {
+ ret = tb_port_read(port, &hop, TB_CFG_HOPS, 2 * hop_index, 2);
+ if (ret)
+ return ret;
+
+ if (!hop.pending)
+ return 0;
+
+ usleep_range(10, 20);
+ } while (ktime_before(ktime_get(), timeout));
+
+ return -ETIMEDOUT;
+}
+
static void __tb_path_deactivate_hops(struct tb_path *path, int first_hop)
{
int i, res;
- struct tb_regs_hop hop = { };
+
for (i = first_hop; i < path->path_length; i++) {
- res = tb_port_write(path->hops[i].in_port, &hop, TB_CFG_HOPS,
- 2 * path->hops[i].in_hop_index, 2);
+ res = __tb_path_deactivate_hop(path->hops[i].in_port,
+ path->hops[i].in_hop_index);
if (res)
tb_port_warn(path->hops[i].in_port,
"hop deactivation failed for hop %d, index %d\n",
diff --git a/drivers/thunderbolt/tb_regs.h b/drivers/thunderbolt/tb_regs.h
index 1ab6e0fb31c0..82ac4ec8757f 100644
--- a/drivers/thunderbolt/tb_regs.h
+++ b/drivers/thunderbolt/tb_regs.h
@@ -234,7 +234,8 @@ struct tb_regs_hop {
bool egress_fc:1;
bool ingress_shared_buffer:1;
bool egress_shared_buffer:1;
- u32 unknown3:4; /* set to zero */
+ bool pending:1;
+ u32 unknown3:3; /* set to zero */
} __packed;
/* Common link controller registers */
--
2.20.1
next prev parent reply other threads:[~2019-02-06 13:22 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 ` Mika Westerberg [this message]
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 ` [PATCH v2 27/28] thunderbolt: Make rest of the logging to happen at debug level Mika Westerberg
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-9-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;
as well as URLs for NNTP newsgroup(s).