linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 11/36] thunderbolt: Set sleep bit when suspending switch
Date: Wed, 10 Apr 2019 16:36:28 +0300	[thread overview]
Message-ID: <20190410133653.88061-12-mika.westerberg@linux.intel.com> (raw)
In-Reply-To: <20190410133653.88061-1-mika.westerberg@linux.intel.com>

Thunderbolt 2 devices and beyond link controller needs to be notified
when a switch is going to be suspended by setting bit 31 in LC_SX_CTRL
register. Add this functionality to the software connection manager.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
 drivers/thunderbolt/lc.c      | 44 +++++++++++++++++++++++++++++++++++
 drivers/thunderbolt/switch.c  |  6 ++---
 drivers/thunderbolt/tb.h      |  1 +
 drivers/thunderbolt/tb_regs.h |  2 ++
 4 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/drivers/thunderbolt/lc.c b/drivers/thunderbolt/lc.c
index a5dddf176546..ae1e92611c3e 100644
--- a/drivers/thunderbolt/lc.c
+++ b/drivers/thunderbolt/lc.c
@@ -133,3 +133,47 @@ void tb_lc_unconfigure_link(struct tb_switch *sw)
 	tb_lc_configure_lane(up, false);
 	tb_lc_configure_lane(down, false);
 }
+
+/**
+ * tb_lc_set_sleep() - Inform LC that the switch is going to sleep
+ * @sw: Switch to set sleep
+ *
+ * Let the switch link controllers know that the switch is going to
+ * sleep.
+ */
+int tb_lc_set_sleep(struct tb_switch *sw)
+{
+	int start, size, nlc, ret, i;
+	u32 desc;
+
+	if (sw->generation < 2)
+		return 0;
+
+	ret = read_lc_desc(sw, &desc);
+	if (ret)
+		return ret;
+
+	/* Figure out number of link controllers */
+	nlc = desc & TB_LC_DESC_NLC_MASK;
+	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;
+
+	/* For each link controller set sleep bit */
+	for (i = 0; i < nlc; i++) {
+		unsigned int offset = sw->cap_lc + start + i * size;
+		u32 ctrl;
+
+		ret = tb_sw_read(sw, &ctrl, TB_CFG_SWITCH,
+				 offset + TB_LC_SX_CTRL, 1);
+		if (ret)
+			return ret;
+
+		ctrl |= TB_LC_SX_CTRL_SLP;
+		ret = tb_sw_write(sw, &ctrl, TB_CFG_SWITCH,
+				  offset + TB_LC_SX_CTRL, 1);
+		if (ret)
+			return ret;
+	}
+
+	return 0;
+}
diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c
index dd218dc4781b..b3f93ebe6e39 100644
--- a/drivers/thunderbolt/switch.c
+++ b/drivers/thunderbolt/switch.c
@@ -1586,10 +1586,8 @@ void tb_switch_suspend(struct tb_switch *sw)
 		if (!tb_is_upstream_port(&sw->ports[i]) && sw->ports[i].remote)
 			tb_switch_suspend(sw->ports[i].remote->sw);
 	}
-	/*
-	 * TODO: invoke tb_cfg_prepare_to_sleep here? does not seem to have any
-	 * effect?
-	 */
+
+	tb_lc_set_sleep(sw);
 }
 
 struct tb_sw_lookup {
diff --git a/drivers/thunderbolt/tb.h b/drivers/thunderbolt/tb.h
index 69e0534224d8..985a48a67a43 100644
--- a/drivers/thunderbolt/tb.h
+++ b/drivers/thunderbolt/tb.h
@@ -467,6 +467,7 @@ 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);
+int tb_lc_set_sleep(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 e0f867dad5cf..1ab6e0fb31c0 100644
--- a/drivers/thunderbolt/tb_regs.h
+++ b/drivers/thunderbolt/tb_regs.h
@@ -239,6 +239,7 @@ struct tb_regs_hop {
 
 /* Common link controller registers */
 #define TB_LC_DESC			0x02
+#define TB_LC_DESC_NLC_MASK		GENMASK(3, 0)
 #define TB_LC_DESC_SIZE_SHIFT		8
 #define TB_LC_DESC_SIZE_MASK		GENMASK(15, 8)
 #define TB_LC_DESC_PORT_SIZE_SHIFT	16
@@ -250,5 +251,6 @@ struct tb_regs_hop {
 #define TB_LC_SX_CTRL_L1C		BIT(16)
 #define TB_LC_SX_CTRL_L2C		BIT(20)
 #define TB_LC_SX_CTRL_UPSTREAM		BIT(30)
+#define TB_LC_SX_CTRL_SLP		BIT(31)
 
 #endif
-- 
2.20.1


  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 ` Mika Westerberg [this message]
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-12-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).