All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mika Westerberg <mika.westerberg@linux.intel.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Andreas Noever <andreas.noever@gmail.com>,
	Michael Jamet <michael.jamet@intel.com>,
	Yehezkel Bernat <yehezkel.bernat@intel.com>,
	Mika Westerberg <mika.westerberg@linux.intel.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH 07/19] thunderbolt: Handle rejected Thunderbolt devices
Date: Mon, 19 Mar 2018 19:26:51 +0300	[thread overview]
Message-ID: <20180319162703.5331-8-mika.westerberg@linux.intel.com> (raw)
In-Reply-To: <20180319162703.5331-1-mika.westerberg@linux.intel.com>

The ICM firmware rejects devices if the maximum topology limit is
exceeded (more than 6 devices are connected). If that happens just log a
message to the kernel message buffer and bail out.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
 drivers/thunderbolt/icm.c     | 6 ++++++
 drivers/thunderbolt/tb_msgs.h | 1 +
 2 files changed, 7 insertions(+)

diff --git a/drivers/thunderbolt/icm.c b/drivers/thunderbolt/icm.c
index 611d28e8e5f2..6d7f8262f864 100644
--- a/drivers/thunderbolt/icm.c
+++ b/drivers/thunderbolt/icm.c
@@ -410,6 +410,12 @@ icm_fr_device_connected(struct tb *tb, const struct icm_pkg_header *hdr)
 		ICM_LINK_INFO_DEPTH_SHIFT;
 	authorized = pkg->link_info & ICM_LINK_INFO_APPROVED;
 
+	if (pkg->link_info & ICM_LINK_INFO_REJECTED) {
+		tb_info(tb, "switch at %u.%u was rejected by ICM firmware because topology limit exceeded\n",
+			link, depth);
+		return;
+	}
+
 	ret = icm->get_route(tb, link, depth, &route);
 	if (ret) {
 		tb_err(tb, "failed to find route string for switch at %u.%u\n",
diff --git a/drivers/thunderbolt/tb_msgs.h b/drivers/thunderbolt/tb_msgs.h
index b0a092baa605..476bc04cac6c 100644
--- a/drivers/thunderbolt/tb_msgs.h
+++ b/drivers/thunderbolt/tb_msgs.h
@@ -176,6 +176,7 @@ struct icm_fr_event_device_connected {
 #define ICM_LINK_INFO_DEPTH_SHIFT	4
 #define ICM_LINK_INFO_DEPTH_MASK	GENMASK(7, 4)
 #define ICM_LINK_INFO_APPROVED		BIT(8)
+#define ICM_LINK_INFO_REJECTED		BIT(9)
 
 struct icm_fr_pkg_approve_device {
 	struct icm_pkg_header hdr;
-- 
2.16.2

  parent reply	other threads:[~2018-03-19 16:26 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-19 16:26 [PATCH 00/19] thunderbolt: Changes for v4.17 merge window Mika Westerberg
2018-03-19 16:26 ` [PATCH 01/19] thunderbolt: Resume control channel after hibernation image is created Mika Westerberg
2018-03-19 16:26 ` [PATCH 02/19] thunderbolt: Serialize PCIe tunnel creation with PCI rescan Mika Westerberg
2018-03-19 16:26 ` [PATCH 03/19] thunderbolt: Handle connecting device in place of host properly Mika Westerberg
2018-03-19 16:26 ` [PATCH 04/19] thunderbolt: Do not overwrite error code when domain adding fails Mika Westerberg
2018-03-19 16:26 ` [PATCH 05/19] thunderbolt: Wait a bit longer for root switch config space Mika Westerberg
2018-03-19 16:26 ` [PATCH 06/19] thunderbolt: Wait a bit longer for ICM to authenticate the active NVM Mika Westerberg
2018-03-19 16:26 ` Mika Westerberg [this message]
2018-03-19 16:26 ` [PATCH 08/19] thunderbolt: Factor common ICM add and update operations out Mika Westerberg
2018-03-19 16:26 ` [PATCH 09/19] thunderbolt: Correct function name in kernel-doc comment Mika Westerberg
2018-03-19 16:26 ` [PATCH 10/19] thunderbolt: Add tb_switch_get() Mika Westerberg
2018-03-19 16:26 ` [PATCH 11/19] thunderbolt: Add tb_switch_find_by_route() Mika Westerberg
2018-03-19 16:26 ` [PATCH 12/19] thunderbolt: Add tb_xdomain_find_by_route() Mika Westerberg
2018-03-19 16:26 ` [PATCH 13/19] thunderbolt: Add constant for approval timeout Mika Westerberg
2018-03-19 16:26 ` [PATCH 14/19] thunderbolt: Move driver ready handling to struct icm Mika Westerberg
2018-03-19 16:26 ` [PATCH 15/19] thunderbolt: Add 'boot' attribute for devices Mika Westerberg
2018-03-19 16:27 ` [PATCH 16/19] thunderbolt: Add support for preboot ACL Mika Westerberg
2018-03-19 16:27 ` [PATCH 17/19] thunderbolt: Introduce USB only (SL4) security level Mika Westerberg
2018-03-19 16:27 ` [PATCH 18/19] thunderbolt: Add support for Intel Titan Ridge Mika Westerberg
2018-03-19 16:27 ` [PATCH 19/19] thunderbolt: Prevent crash when ICM firmware is not running Mika Westerberg
2018-03-20  8:12 ` [PATCH 00/19] thunderbolt: Changes for v4.17 merge window Greg Kroah-Hartman

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=20180319162703.5331-8-mika.westerberg@linux.intel.com \
    --to=mika.westerberg@linux.intel.com \
    --cc=andreas.noever@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=michael.jamet@intel.com \
    --cc=yehezkel.bernat@intel.com \
    /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.