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>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Christian Kellner <ckellner@redhat.com>,
Mario.Limonciello@dell.com, Joe Perches <joe@perches.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
netdev@vger.kernel.org
Subject: [PATCH v4 18/36] thunderbolt: Add helper function to iterate from one port to another
Date: Wed, 10 Apr 2019 16:36:35 +0300 [thread overview]
Message-ID: <20190410133653.88061-19-mika.westerberg@linux.intel.com> (raw)
In-Reply-To: <20190410133653.88061-1-mika.westerberg@linux.intel.com>
We need to be able to walk from one port to another when we are creating
paths where there are multiple switches between two ports. For this
reason introduce a new function tb_next_port_on_path().
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Lukas Wunner <lukas@wunner.de>
---
drivers/thunderbolt/switch.c | 54 ++++++++++++++++++++++++++++++++++++
drivers/thunderbolt/tb.h | 2 ++
2 files changed, 56 insertions(+)
diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c
index 6f98b3d6eb2a..ecd41f7b7649 100644
--- a/drivers/thunderbolt/switch.c
+++ b/drivers/thunderbolt/switch.c
@@ -676,6 +676,60 @@ void tb_port_release_out_hopid(struct tb_port *port, int hopid)
ida_simple_remove(&port->out_hopids, hopid);
}
+/**
+ * tb_next_port_on_path() - Return next port for given port on a path
+ * @start: Start port of the walk
+ * @end: End port of the walk
+ * @prev: Previous port (%NULL if this is the first)
+ *
+ * This function can be used to walk from one port to another if they
+ * are connected through zero or more switches. If the @prev is dual
+ * link port, the function follows that link and returns another end on
+ * that same link.
+ *
+ * If the @end port has been reached, return %NULL.
+ *
+ * Domain tb->lock must be held when this function is called.
+ */
+struct tb_port *tb_next_port_on_path(struct tb_port *start, struct tb_port *end,
+ struct tb_port *prev)
+{
+ struct tb_port *next;
+
+ if (!prev)
+ return start;
+
+ if (prev->sw == end->sw) {
+ if (prev == end)
+ return NULL;
+ return end;
+ }
+
+ if (start->sw->config.depth < end->sw->config.depth) {
+ if (prev->remote &&
+ prev->remote->sw->config.depth > prev->sw->config.depth)
+ next = prev->remote;
+ else
+ next = tb_port_at(tb_route(end->sw), prev->sw);
+ } else {
+ if (tb_is_upstream_port(prev)) {
+ next = prev->remote;
+ } else {
+ next = tb_upstream_port(prev->sw);
+ /*
+ * Keep the same link if prev and next are both
+ * dual link ports.
+ */
+ if (next->dual_link_port &&
+ next->link_nr != prev->link_nr) {
+ next = next->dual_link_port;
+ }
+ }
+ }
+
+ return next;
+}
+
/**
* tb_pci_port_enable() - Enable PCIe adapter port
* @port: PCIe port to enable
diff --git a/drivers/thunderbolt/tb.h b/drivers/thunderbolt/tb.h
index 43bc4f490021..11d5ab53ad36 100644
--- a/drivers/thunderbolt/tb.h
+++ b/drivers/thunderbolt/tb.h
@@ -495,6 +495,8 @@ int tb_port_alloc_in_hopid(struct tb_port *port, int hopid, int max_hopid);
void tb_port_release_in_hopid(struct tb_port *port, int hopid);
int tb_port_alloc_out_hopid(struct tb_port *port, int hopid, int max_hopid);
void tb_port_release_out_hopid(struct tb_port *port, int hopid);
+struct tb_port *tb_next_port_on_path(struct tb_port *start, struct tb_port *end,
+ struct tb_port *prev);
int tb_switch_find_vse_cap(struct tb_switch *sw, enum tb_switch_vse_cap vsec);
int tb_port_find_cap(struct tb_port *port, enum tb_port_cap cap);
--
2.20.1
next prev parent reply other threads:[~2019-04-10 13:41 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-10 13:36 [PATCH v4 00/36] thunderbolt: Software connection manager improvements Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 01/36] net: thunderbolt: Unregister ThunderboltIP protocol handler when suspending Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 02/36] thunderbolt: Remove unused work field in struct tb_switch Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 03/36] thunderbolt: Drop duplicated get_switch_at_route() Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 04/36] thunderbolt: Block reads and writes if switch is unplugged Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 06/36] thunderbolt: Do not allocate switch if depth is greater than 6 Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 07/36] thunderbolt: Enable TMU access when accessing port space on legacy devices Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 08/36] thunderbolt: Add dummy read after port capability list walk on Light Ridge Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 09/36] thunderbolt: Move LC specific functionality into a separate file Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 10/36] thunderbolt: Configure lanes when switch is initialized Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 11/36] thunderbolt: Set sleep bit when suspending switch Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 12/36] thunderbolt: Properly disable path Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 13/36] thunderbolt: Cache adapter specific capability offset into struct port Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 14/36] thunderbolt: Rename tunnel_pci to tunnel Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 15/36] thunderbolt: Generalize tunnel creation functionality Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 16/36] thunderbolt: Add functions for allocating and releasing HopIDs Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 17/36] thunderbolt: Assign remote for both ports in case of dual link Mika Westerberg
2019-04-10 13:36 ` Mika Westerberg [this message]
2019-04-10 13:36 ` [PATCH v4 19/36] thunderbolt: Extend tunnel creation to more than 2 adjacent switches Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 20/36] thunderbolt: Deactivate all paths before restarting them Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 21/36] thunderbolt: Discover preboot PCIe paths the boot firmware established Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 22/36] thunderbolt: Add support for full PCIe daisy chains Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 23/36] thunderbolt: Scan only valid NULL adapter ports in hotplug Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 24/36] thunderbolt: Generalize port finding routines to support all port types Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 25/36] thunderbolt: Rework NFC credits handling Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 26/36] thunderbolt: Add support for Display Port tunnels Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 27/36] thunderbolt: Do not tear down tunnels when driver is unloaded Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 28/36] thunderbolt: Run tb_xdp_handle_request() in system workqueue Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 29/36] thunderbolt: Add XDomain UUID exchange support Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 30/36] thunderbolt: Add support for DMA tunnels Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 31/36] thunderbolt: Make tb_switch_alloc() return ERR_PTR() Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 32/36] thunderbolt: Add support for XDomain connections Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 33/36] thunderbolt: Make __TB_[SW|PORT]_PRINT take const parameters Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 34/36] thunderbolt: Make rest of the logging to happen at debug level Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 35/36] thunderbolt: Reword output of tb_dump_hop() Mika Westerberg
2019-04-10 13:36 ` [PATCH v4 36/36] thunderbolt: Start firmware on Titan Ridge Apple systems Mika Westerberg
2019-04-18 8:26 ` [PATCH v4 00/36] thunderbolt: Software connection manager improvements Mika Westerberg
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=20190410133653.88061-19-mika.westerberg@linux.intel.com \
--to=mika.westerberg@linux.intel.com \
--cc=Mario.Limonciello@dell.com \
--cc=YehezkelShB@gmail.com \
--cc=andreas.noever@gmail.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=ckellner@redhat.com \
--cc=davem@davemloft.net \
--cc=joe@perches.com \
--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).