public inbox for linux-kernel@vger.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 19/19] thunderbolt: Prevent crash when ICM firmware is not running
Date: Mon, 19 Mar 2018 19:27:03 +0300	[thread overview]
Message-ID: <20180319162703.5331-20-mika.westerberg@linux.intel.com> (raw)
In-Reply-To: <20180319162703.5331-1-mika.westerberg@linux.intel.com>

On Lenovo ThinkPad Yoga 370 (and possibly some other Lenovo models as
well) the Thunderbolt host controller sometimes comes up in such way
that the ICM firmware is not running properly. This is most likely an
issue in BIOS/firmware but as side-effect driver crashes the kernel due
to NULL pointer dereference:

  BUG: unable to handle kernel NULL pointer dereference at 0000000000000980
  IP: pci_write_config_dword+0x5/0x20
  Call Trace:
   pcie2cio_write+0x3b/0x70 [thunderbolt]
   icm_driver_ready+0x168/0x260 [thunderbolt]
   ? tb_ctl_start+0x50/0x70 [thunderbolt]
   tb_domain_add+0x73/0xf0 [thunderbolt]
   nhi_probe+0x182/0x300 [thunderbolt]
   local_pci_probe+0x42/0xa0
   ? pci_match_device+0xd9/0x100
   pci_device_probe+0x146/0x1b0
   driver_probe_device+0x315/0x480
   ...

Instead of crashing update the driver to bail out gracefully if we
encounter such situation.

Fixes: f67cf491175a ("thunderbolt: Add support for Internal Connection Manager (ICM)")
Reported-by: Jordan Glover <Golden_Miller83@protonmail.ch>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: Yehezkel Bernat <yehezkel.bernat@intel.com>
Cc: stable@vger.kernel.org
---
 drivers/thunderbolt/icm.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/thunderbolt/icm.c b/drivers/thunderbolt/icm.c
index 6b1041677604..2d2ceda9aa26 100644
--- a/drivers/thunderbolt/icm.c
+++ b/drivers/thunderbolt/icm.c
@@ -1452,6 +1452,9 @@ static int icm_firmware_reset(struct tb *tb, struct tb_nhi *nhi)
 	struct icm *icm = tb_priv(tb);
 	u32 val;
 
+	if (!icm->upstream_port)
+		return -ENODEV;
+
 	/* Put ARC to wait for CIO reset event to happen */
 	val = ioread32(nhi->iobase + REG_FW_STS);
 	val |= REG_FW_STS_CIO_RESET_REQ;
-- 
2.16.2

  parent reply	other threads:[~2018-03-19 16:27 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 ` [PATCH 07/19] thunderbolt: Handle rejected Thunderbolt devices Mika Westerberg
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 ` Mika Westerberg [this message]
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-20-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox