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 13/28] thunderbolt: Add helper function to iterate from one port to another
Date: Wed, 6 Feb 2019 16:17:23 +0300 [thread overview]
Message-ID: <20190206131738.43696-14-mika.westerberg@linux.intel.com> (raw)
In-Reply-To: <20190206131738.43696-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_port_get_next() and a new macro
tb_for_each_port().
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
drivers/thunderbolt/switch.c | 60 ++++++++++++++++++++++++++++++++++++
drivers/thunderbolt/tb.h | 6 ++++
2 files changed, 66 insertions(+)
diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c
index 320f64ebe8b8..23b6bae8362e 100644
--- a/drivers/thunderbolt/switch.c
+++ b/drivers/thunderbolt/switch.c
@@ -683,6 +683,66 @@ void tb_port_release_out_hopid(struct tb_port *port, int hopid)
ida_simple_remove(&port->out_hopids, hopid);
}
+/**
+ * tb_port_get_next() - Return next port for given port
+ * @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 walk cannot be continued, returns %NULL.
+ *
+ * Domain tb->lock must be held when this function is called.
+ */
+struct tb_port *tb_port_get_next(struct tb_port *start, struct tb_port *end,
+ struct tb_port *prev)
+{
+ struct tb_port *port, *next;
+
+ if (!prev)
+ return start;
+
+ if (prev->sw == end->sw) {
+ if (prev != end)
+ return end;
+ return NULL;
+ }
+
+ /* Switch back to use primary links for walking */
+ if (prev->dual_link_port && prev->link_nr)
+ port = prev->dual_link_port;
+ else
+ port = prev;
+
+ if (start->sw->config.depth < end->sw->config.depth) {
+ if (port->remote &&
+ port->remote->sw->config.depth > port->sw->config.depth)
+ next = port->remote;
+ else
+ next = tb_port_at(tb_route(end->sw), port->sw);
+ } else if (start->sw->config.depth > end->sw->config.depth) {
+ if (tb_is_upstream_port(port))
+ next = port->remote;
+ else
+ next = tb_upstream_port(port->sw);
+ } else {
+ /* Must be the same switch then */
+ if (start->sw != end->sw)
+ return NULL;
+ return end;
+ }
+
+ /* If prev was dual link return another end of that link then */
+ if (next->dual_link_port && next->link_nr != prev->link_nr)
+ return 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 bfa1cee193fd..683725915ff7 100644
--- a/drivers/thunderbolt/tb.h
+++ b/drivers/thunderbolt/tb.h
@@ -447,6 +447,12 @@ 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_port_get_next(struct tb_port *start, struct tb_port *end,
+ struct tb_port *prev);
+
+#define tb_for_each_port(port, start, end) \
+ for (port = tb_port_get_next(start, end, NULL); port; \
+ port = tb_port_get_next(start, end, port))
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-02-06 13:21 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 ` Mika Westerberg [this message]
2019-02-07 14:33 ` [PATCH v2 13/28] thunderbolt: Add helper function to iterate from one port to another 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-14-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).