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 26/28] thunderbolt: Add support for XDomain connections
Date: Wed, 6 Feb 2019 16:17:36 +0300 [thread overview]
Message-ID: <20190206131738.43696-27-mika.westerberg@linux.intel.com> (raw)
In-Reply-To: <20190206131738.43696-1-mika.westerberg@linux.intel.com>
Two domains (hosts) can be connected through a Thunderbolt cable and in
that case they can start software services such as networking over the
high-speed DMA paths. Now that we have all the basic building blocks in
place to create DMA tunnels over the Thunderbolt fabric we can add this
support to the software connection manager as well.
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
drivers/thunderbolt/switch.c | 29 ++++++--
drivers/thunderbolt/tb.c | 131 ++++++++++++++++++++++++++++++++++-
2 files changed, 153 insertions(+), 7 deletions(-)
diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c
index ba7dfce0b96f..79391c3d834e 100644
--- a/drivers/thunderbolt/switch.c
+++ b/drivers/thunderbolt/switch.c
@@ -1885,6 +1885,17 @@ int tb_switch_resume(struct tb_switch *sw)
if (tb_route(sw)) {
u64 uid;
+ /*
+ * Check first that we can still read the switch config
+ * space. It may be that there is now another domain
+ * connected.
+ */
+ err = tb_cfg_get_upstream_port(sw->tb->ctl, tb_route(sw));
+ if (err < 0) {
+ tb_sw_info(sw, "switch not present anymore\n");
+ return err;
+ }
+
err = tb_drom_read_uid_only(sw, &uid);
if (err) {
tb_sw_warn(sw, "uid read failed\n");
@@ -1916,13 +1927,23 @@ int tb_switch_resume(struct tb_switch *sw)
struct tb_port *port = &sw->ports[i];
if (tb_is_upstream_port(port))
continue;
- if (!port->remote)
+
+ if (!port->remote && !port->xdomain)
continue;
- if (tb_wait_for_port(port, true) <= 0
- || tb_switch_resume(port->remote->sw)) {
+
+ if (tb_wait_for_port(port, true) <= 0) {
tb_port_warn(port,
"lost during suspend, disconnecting\n");
- tb_sw_set_unplugged(port->remote->sw);
+ if (port->remote)
+ tb_sw_set_unplugged(port->remote->sw);
+ else if (port->xdomain)
+ port->xdomain->is_unplugged = true;
+ } else if (port->remote) {
+ if (tb_switch_resume(port->remote->sw)) {
+ tb_port_warn(port,
+ "lost during suspend, disconnecting\n");
+ tb_sw_set_unplugged(port->remote->sw);
+ }
}
}
return 0;
diff --git a/drivers/thunderbolt/tb.c b/drivers/thunderbolt/tb.c
index 65a206f01941..94dd1fd12967 100644
--- a/drivers/thunderbolt/tb.c
+++ b/drivers/thunderbolt/tb.c
@@ -111,6 +111,28 @@ static void tb_switch_authorize(struct work_struct *work)
mutex_unlock(&sw->tb->lock);
}
+static void tb_scan_xdomain(struct tb_port *port)
+{
+ struct tb_switch *sw = port->sw;
+ struct tb *tb = sw->tb;
+ struct tb_xdomain *xd;
+ u64 route;
+
+ route = tb_downstream_route(port);
+ xd = tb_xdomain_find_by_route(tb, route);
+ if (xd) {
+ tb_xdomain_put(xd);
+ return;
+ }
+
+ xd = tb_xdomain_alloc(tb, &sw->dev, route, tb->root_switch->uuid,
+ NULL);
+ if (xd) {
+ tb_port_at(route, sw)->xdomain = xd;
+ tb_xdomain_add(xd);
+ }
+}
+
static void tb_scan_port(struct tb_port *port);
/**
@@ -150,19 +172,36 @@ static void tb_scan_port(struct tb_port *port)
if (tb_wait_for_port(port, false) <= 0)
return;
if (port->remote) {
- tb_port_WARN(port, "port already has a remote!\n");
+ tb_port_dbg(port, "port already has a remote\n");
return;
}
sw = tb_switch_alloc(port->sw->tb, &port->sw->dev,
tb_downstream_route(port));
- if (IS_ERR(sw))
+ if (IS_ERR(sw)) {
+ /*
+ * If there is an error accessing the connected switch
+ * it may be connected to another domain. Also we allow
+ * the other domain to be connected to a max depth switch.
+ */
+ if (PTR_ERR(sw) == -EIO || PTR_ERR(sw) == -EADDRNOTAVAIL)
+ tb_scan_xdomain(port);
return;
+ }
if (tb_switch_configure(sw)) {
tb_switch_put(sw);
return;
}
+ /*
+ * If there was previously another domain connected remove it
+ * first.
+ */
+ if (port->xdomain) {
+ tb_xdomain_remove(port->xdomain);
+ port->xdomain = NULL;
+ }
+
/*
* Do not send uevents until we have discovered all existing
* tunnels and know which switches were authorized already by
@@ -377,6 +416,51 @@ static int tb_approve_switch(struct tb *tb, struct tb_switch *sw)
return tb_tunnel_pci(tb, sw);
}
+static int tb_approve_xdomain_paths(struct tb *tb, struct tb_xdomain *xd)
+{
+ struct tb_cm *tcm = tb_priv(tb);
+ struct tb_port *nhi_port, *dst_port;
+ struct tb_tunnel *tunnel;
+ struct tb_switch *sw;
+
+ sw = tb_to_switch(xd->dev.parent);
+ dst_port = tb_port_at(xd->route, sw);
+ nhi_port = tb_find_port(tb->root_switch, TB_TYPE_NHI);
+
+ tunnel = tb_tunnel_alloc_dma(tb, nhi_port, dst_port, xd->transmit_ring,
+ xd->transmit_path, xd->receive_ring,
+ xd->receive_path);
+ if (!tunnel)
+ return -ENOMEM;
+
+ if (tb_tunnel_activate(tunnel)) {
+ tb_port_info(nhi_port,
+ "DMA tunnel activation failed, aborting\n");
+ tb_tunnel_free(tunnel);
+ return -EIO;
+ }
+ list_add_tail(&tunnel->list, &tcm->tunnel_list);
+
+ return 0;
+}
+
+static int tb_disconnect_xdomain_paths(struct tb *tb, struct tb_xdomain *xd)
+{
+ struct tb_port *dst_port;
+ struct tb_switch *sw;
+
+ sw = tb_to_switch(xd->dev.parent);
+ dst_port = tb_port_at(xd->route, sw);
+
+ /*
+ * It is possible that the tunnel was already teared down (in
+ * case of cable disconnect) so it is fine if we cannot find it
+ * here anymore.
+ */
+ tb_free_tunnel(tb, TB_TUNNEL_DMA, NULL, dst_port);
+ return 0;
+}
+
/* hotplug handling */
/**
@@ -417,12 +501,16 @@ static void tb_handle_hotplug(struct work_struct *work)
}
if (ev->unplug) {
if (port->remote) {
- tb_port_info(port, "unplugged\n");
+ tb_port_dbg(port, "switch unplugged\n");
tb_sw_set_unplugged(port->remote->sw);
tb_free_invalid_tunnels(tb);
cancel_work_sync(&sw->work);
tb_switch_remove(port->remote->sw);
port->remote = NULL;
+ } else if (port->xdomain) {
+ tb_port_dbg(port, "xdomain unplugged\n");
+ tb_xdomain_remove(port->xdomain);
+ port->xdomain = NULL;
} else if (tb_port_is_dpout(port)) {
tb_teardown_dp(tb, port);
} else {
@@ -594,13 +682,50 @@ static int tb_resume_noirq(struct tb *tb)
return 0;
}
+static int tb_free_unplugged_xdomains(struct tb_switch *sw)
+{
+ int i, ret = 0;
+
+ for (i = 1; i <= sw->config.max_port_number; i++) {
+ struct tb_port *port = &sw->ports[i];
+
+ if (tb_is_upstream_port(port))
+ continue;
+ if (port->xdomain && port->xdomain->is_unplugged) {
+ tb_xdomain_remove(port->xdomain);
+ port->xdomain = NULL;
+ ret++;
+ } else if (port->remote) {
+ ret += tb_free_unplugged_xdomains(port->remote->sw);
+ }
+ }
+
+ return ret;
+}
+
+static void tb_complete(struct tb *tb)
+{
+ /*
+ * Release any unplugged XDomains and if there is a case where
+ * another domain is swapped in place of unplugged XDomain we
+ * need to run another rescan.
+ */
+ mutex_lock(&tb->lock);
+ if (tb_free_unplugged_xdomains(tb->root_switch))
+ tb_scan_switch(tb->root_switch);
+ mutex_unlock(&tb->lock);
+}
+
static const struct tb_cm_ops tb_cm_ops = {
.start = tb_start,
.stop = tb_stop,
.suspend_noirq = tb_suspend_noirq,
.resume_noirq = tb_resume_noirq,
+ .complete = tb_complete,
.handle_event = tb_handle_event,
.approve_switch = tb_approve_switch,
+ .approve_xdomain_paths = tb_approve_xdomain_paths,
+ .disconnect_xdomain_paths = tb_disconnect_xdomain_paths,
};
struct tb *tb_probe(struct tb_nhi *nhi)
--
2.20.1
next prev parent reply other threads:[~2019-02-06 13:19 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 ` Mika Westerberg [this message]
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-27-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