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 10/36] thunderbolt: Configure lanes when switch is initialized
Date: Wed, 10 Apr 2019 16:36:27 +0300 [thread overview]
Message-ID: <20190410133653.88061-11-mika.westerberg@linux.intel.com> (raw)
In-Reply-To: <20190410133653.88061-1-mika.westerberg@linux.intel.com>
Thunderbolt 2 devices and beyond need to have additional bits set in
link controller specific registers. This includes two bits in LC_SX_CTRL
that tell the link controller which lane is connected and whether it is
upstream facing or not.
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
drivers/thunderbolt/lc.c | 114 ++++++++++++++++++++++++++++++++++
drivers/thunderbolt/switch.c | 9 +++
drivers/thunderbolt/tb.h | 2 +
drivers/thunderbolt/tb_regs.h | 11 ++++
4 files changed, 136 insertions(+)
diff --git a/drivers/thunderbolt/lc.c b/drivers/thunderbolt/lc.c
index 2134a55ed837..a5dddf176546 100644
--- a/drivers/thunderbolt/lc.c
+++ b/drivers/thunderbolt/lc.c
@@ -19,3 +19,117 @@ int tb_lc_read_uuid(struct tb_switch *sw, u32 *uuid)
return -EINVAL;
return tb_sw_read(sw, uuid, TB_CFG_SWITCH, sw->cap_lc + TB_LC_FUSE, 4);
}
+
+static int read_lc_desc(struct tb_switch *sw, u32 *desc)
+{
+ if (!sw->cap_lc)
+ return -EINVAL;
+ return tb_sw_read(sw, desc, TB_CFG_SWITCH, sw->cap_lc + TB_LC_DESC, 1);
+}
+
+static int find_port_lc_cap(struct tb_port *port)
+{
+ struct tb_switch *sw = port->sw;
+ int start, phys, ret, size;
+ u32 desc;
+
+ ret = read_lc_desc(sw, &desc);
+ if (ret)
+ return ret;
+
+ /* Start of port LC registers */
+ start = (desc & TB_LC_DESC_SIZE_MASK) >> TB_LC_DESC_SIZE_SHIFT;
+ size = (desc & TB_LC_DESC_PORT_SIZE_MASK) >> TB_LC_DESC_PORT_SIZE_SHIFT;
+ phys = tb_phy_port_from_link(port->port);
+
+ return sw->cap_lc + start + phys * size;
+}
+
+static int tb_lc_configure_lane(struct tb_port *port, bool configure)
+{
+ bool upstream = tb_is_upstream_port(port);
+ struct tb_switch *sw = port->sw;
+ u32 ctrl, lane;
+ int cap, ret;
+
+ if (sw->generation < 2)
+ return 0;
+
+ cap = find_port_lc_cap(port);
+ if (cap < 0)
+ return cap;
+
+ ret = tb_sw_read(sw, &ctrl, TB_CFG_SWITCH, cap + TB_LC_SX_CTRL, 1);
+ if (ret)
+ return ret;
+
+ /* Resolve correct lane */
+ if (port->port % 2)
+ lane = TB_LC_SX_CTRL_L1C;
+ else
+ lane = TB_LC_SX_CTRL_L2C;
+
+ if (configure) {
+ ctrl |= lane;
+ if (upstream)
+ ctrl |= TB_LC_SX_CTRL_UPSTREAM;
+ } else {
+ ctrl &= ~lane;
+ if (upstream)
+ ctrl &= ~TB_LC_SX_CTRL_UPSTREAM;
+ }
+
+ return tb_sw_write(sw, &ctrl, TB_CFG_SWITCH, cap + TB_LC_SX_CTRL, 1);
+}
+
+/**
+ * tb_lc_configure_link() - Let LC know about configured link
+ * @sw: Switch that is being added
+ *
+ * Informs LC of both parent switch and @sw that there is established
+ * link between the two.
+ */
+int tb_lc_configure_link(struct tb_switch *sw)
+{
+ struct tb_port *up, *down;
+ int ret;
+
+ if (!sw->config.enabled || !tb_route(sw))
+ return 0;
+
+ up = tb_upstream_port(sw);
+ down = tb_port_at(tb_route(sw), tb_to_switch(sw->dev.parent));
+
+ /* Configure parent link toward this switch */
+ ret = tb_lc_configure_lane(down, true);
+ if (ret)
+ return ret;
+
+ /* Configure upstream link from this switch to the parent */
+ ret = tb_lc_configure_lane(up, true);
+ if (ret)
+ tb_lc_configure_lane(down, false);
+
+ return ret;
+}
+
+/**
+ * tb_lc_unconfigure_link() - Let LC know about unconfigured link
+ * @sw: Switch to unconfigure
+ *
+ * Informs LC of both parent switch and @sw that the link between the
+ * two does not exist anymore.
+ */
+void tb_lc_unconfigure_link(struct tb_switch *sw)
+{
+ struct tb_port *up, *down;
+
+ if (sw->is_unplugged || !sw->config.enabled || !tb_route(sw))
+ return;
+
+ up = tb_upstream_port(sw);
+ down = tb_port_at(tb_route(sw), tb_to_switch(sw->dev.parent));
+
+ tb_lc_configure_lane(up, false);
+ tb_lc_configure_lane(down, false);
+}
diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c
index 63ff4c753d89..dd218dc4781b 100644
--- a/drivers/thunderbolt/switch.c
+++ b/drivers/thunderbolt/switch.c
@@ -1276,6 +1276,10 @@ int tb_switch_configure(struct tb_switch *sw)
if (ret)
return ret;
+ ret = tb_lc_configure_link(sw);
+ if (ret)
+ return ret;
+
return tb_plug_events_active(sw, true);
}
@@ -1486,6 +1490,7 @@ void tb_switch_remove(struct tb_switch *sw)
if (!sw->is_unplugged)
tb_plug_events_active(sw, false);
+ tb_lc_unconfigure_link(sw);
tb_switch_nvm_remove(sw);
@@ -1545,6 +1550,10 @@ int tb_switch_resume(struct tb_switch *sw)
if (err)
return err;
+ err = tb_lc_configure_link(sw);
+ if (err)
+ return err;
+
err = tb_plug_events_active(sw, true);
if (err)
return err;
diff --git a/drivers/thunderbolt/tb.h b/drivers/thunderbolt/tb.h
index e52d39b25266..69e0534224d8 100644
--- a/drivers/thunderbolt/tb.h
+++ b/drivers/thunderbolt/tb.h
@@ -465,6 +465,8 @@ int tb_drom_read(struct tb_switch *sw);
int tb_drom_read_uid_only(struct tb_switch *sw, u64 *uid);
int tb_lc_read_uuid(struct tb_switch *sw, u32 *uuid);
+int tb_lc_configure_link(struct tb_switch *sw);
+void tb_lc_unconfigure_link(struct tb_switch *sw);
static inline int tb_route_length(u64 route)
{
diff --git a/drivers/thunderbolt/tb_regs.h b/drivers/thunderbolt/tb_regs.h
index 4895ae9f0b40..e0f867dad5cf 100644
--- a/drivers/thunderbolt/tb_regs.h
+++ b/drivers/thunderbolt/tb_regs.h
@@ -238,6 +238,17 @@ struct tb_regs_hop {
} __packed;
/* Common link controller registers */
+#define TB_LC_DESC 0x02
+#define TB_LC_DESC_SIZE_SHIFT 8
+#define TB_LC_DESC_SIZE_MASK GENMASK(15, 8)
+#define TB_LC_DESC_PORT_SIZE_SHIFT 16
+#define TB_LC_DESC_PORT_SIZE_MASK GENMASK(27, 16)
#define TB_LC_FUSE 0x03
+/* Link controller registers */
+#define TB_LC_SX_CTRL 0x96
+#define TB_LC_SX_CTRL_L1C BIT(16)
+#define TB_LC_SX_CTRL_L2C BIT(20)
+#define TB_LC_SX_CTRL_UPSTREAM BIT(30)
+
#endif
--
2.20.1
next prev parent reply other threads:[~2019-04-10 13:42 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 ` Mika Westerberg [this message]
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 ` [PATCH v4 18/36] thunderbolt: Add helper function to iterate from one port to another Mika Westerberg
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-11-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.