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>,
	Mika Westerberg <mika.westerberg@linux.intel.com>,
	Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	netdev@vger.kernel.org
Subject: [PATCH 20/28] thunderbolt: Rework NFC credits handling
Date: Tue, 29 Jan 2019 18:01:35 +0300	[thread overview]
Message-ID: <20190129150143.12681-21-mika.westerberg@linux.intel.com> (raw)
In-Reply-To: <20190129150143.12681-1-mika.westerberg@linux.intel.com>

NFC (non flow control) credits is actually 20-bit field so update
tb_port_add_nfc_credits() to handle this properly. This allows us to set
NFC credits for Display Port path in subsequent patches.

Also make sure the function does not update the hardware if the
underlying switch is already unplugged.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
 drivers/thunderbolt/switch.c  | 20 +++++++++++++-------
 drivers/thunderbolt/tb_regs.h |  3 +++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c
index de69ada9a2f7..42681431eb7e 100644
--- a/drivers/thunderbolt/switch.c
+++ b/drivers/thunderbolt/switch.c
@@ -544,14 +544,20 @@ int tb_wait_for_port(struct tb_port *port, bool wait_if_unplugged)
  */
 int tb_port_add_nfc_credits(struct tb_port *port, int credits)
 {
-	if (credits == 0)
+	u32 nfc_credits;
+
+	if (credits == 0 || port->sw->is_unplugged)
 		return 0;
-	tb_port_info(port,
-		     "adding %#x NFC credits (%#x -> %#x)",
-		     credits,
-		     port->config.nfc_credits,
-		     port->config.nfc_credits + credits);
-	port->config.nfc_credits += credits;
+
+	nfc_credits = port->config.nfc_credits & TB_PORT_NFC_CREDITS_MASK;
+	nfc_credits += credits;
+
+	tb_port_dbg(port, "adding %d NFC credits to %lu",
+		    credits, port->config.nfc_credits & TB_PORT_NFC_CREDITS_MASK);
+
+	port->config.nfc_credits &= ~TB_PORT_NFC_CREDITS_MASK;
+	port->config.nfc_credits |= nfc_credits;
+
 	return tb_port_write(port, &port->config.nfc_credits,
 			     TB_CFG_PORT, 4, 1);
 }
diff --git a/drivers/thunderbolt/tb_regs.h b/drivers/thunderbolt/tb_regs.h
index 75e935acade5..74c0f4a5606d 100644
--- a/drivers/thunderbolt/tb_regs.h
+++ b/drivers/thunderbolt/tb_regs.h
@@ -211,6 +211,9 @@ struct tb_regs_port_header {
 
 } __packed;
 
+/* DWORD 4 */
+#define TB_PORT_NFC_CREDITS_MASK	GENMASK(19, 0)
+
 /* PCIe adapter registers */
 
 #define TB_PCI_EN			BIT(31)
-- 
2.20.1


  parent reply	other threads:[~2019-01-29 15:04 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-29 15:01 [PATCH 00/28] thunderbolt: Software connection manager improvements Mika Westerberg
2019-01-29 15:01 ` [PATCH 01/28] net: thunderbolt: Unregister ThunderboltIP protocol handler when suspending Mika Westerberg
2019-01-29 18:10   ` David Miller
2019-01-29 15:01 ` [PATCH 02/28] thunderbolt: Do not allocate switch if depth is greater than 6 Mika Westerberg
2019-01-29 15:01 ` [PATCH 03/28] thunderbolt: Enable TMU access when accessing port space on legacy devices Mika Westerberg
2019-01-29 21:58   ` Lukas Wunner
2019-01-30  9:37     ` Mika Westerberg
2019-01-31  8:26       ` Lukas Wunner
2019-01-31  8:53         ` Mika Westerberg
2019-01-29 15:01 ` [PATCH 04/28] thunderbolt: Add dummy read after port capability list walk on Light Ridge Mika Westerberg
2019-01-29 15:01 ` [PATCH 05/28] thunderbolt: Move LC specific functionality into a separate file Mika Westerberg
2019-01-29 15:01 ` [PATCH 06/28] thunderbolt: Configure lanes when switch is initialized Mika Westerberg
2019-01-29 15:01 ` [PATCH 07/28] thunderbolt: Set sleep bit when suspending switch Mika Westerberg
2019-01-29 15:01 ` [PATCH 08/28] thunderbolt: Properly disable path Mika Westerberg
2019-01-29 15:01 ` [PATCH 09/28] thunderbolt: Cache adapter specific capability offset into struct port Mika Westerberg
2019-01-31  9:23   ` Lukas Wunner
2019-01-31  9:37     ` Mika Westerberg
2019-01-29 15:01 ` [PATCH 10/28] thunderbolt: Rename tunnel_pci to tunnel Mika Westerberg
2019-01-29 15:01 ` [PATCH 11/28] thunderbolt: Generalize tunnel creation functionality Mika Westerberg
2019-01-29 15:01 ` [PATCH 12/28] thunderbolt: Add functions for allocating and releasing hop IDs Mika Westerberg
2019-01-29 15:01 ` [PATCH 13/28] thunderbolt: Add helper function to iterate from one port to another Mika Westerberg
2019-01-29 15:01 ` [PATCH 14/28] thunderbolt: Extend tunnel creation to more than 2 adjacent switches Mika Westerberg
2019-01-29 15:01 ` [PATCH 15/28] thunderbolt: Deactivate all paths before restarting them Mika Westerberg
2019-01-29 15:01 ` [PATCH 16/28] thunderbolt: Discover preboot PCIe paths the boot firmware established Mika Westerberg
2019-01-29 15:01 ` [PATCH 17/28] thunderbolt: Add support for full PCIe daisy chains Mika Westerberg
2019-01-29 15:01 ` [PATCH 18/28] thunderbolt: Scan only valid NULL adapter ports in hotplug Mika Westerberg
2019-01-29 15:01 ` [PATCH 19/28] thunderbolt: Generalize port finding routines to support all port types Mika Westerberg
2019-01-29 15:01 ` Mika Westerberg [this message]
2019-01-29 15:01 ` [PATCH 21/28] thunderbolt: Add support for Display Port tunnels Mika Westerberg
2019-01-29 15:01 ` [PATCH 22/28] thunderbolt: Run tb_xdp_handle_request() in system workqueue Mika Westerberg
2019-01-29 15:01 ` [PATCH 23/28] thunderbolt: Add XDomain UUID exchange support Mika Westerberg
2019-01-29 15:01 ` [PATCH 24/28] thunderbolt: Add support for DMA tunnels Mika Westerberg
2019-01-29 15:01 ` [PATCH 25/28] thunderbolt: Make tb_switch_alloc() return ERR_PTR() Mika Westerberg
2019-01-29 15:01 ` [PATCH 26/28] thunderbolt: Add support for XDomain connections Mika Westerberg
2019-01-29 15:01 ` [PATCH 27/28] thunderbolt: Make rest of the logging to happen at debug level Mika Westerberg
2019-01-29 15:01 ` [PATCH 28/28] thunderbolt: Start firmware on Titan Ridge Apple systems 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=20190129150143.12681-21-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).