From: "Łukasz Bartosik" <lb@semihalf.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Andreas Noever <andreas.noever@gmail.com>,
Michael Jamet <michael.jamet@intel.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Yehezkel Bernat <YehezkelShB@gmail.com>
Cc: linux-usb@vger.kernel.org, upstream@semihalf.com
Subject: [PATCH v2] thunderbolt: fix PCI device class after powering up
Date: Fri, 29 Jul 2022 11:40:22 +0200 [thread overview]
Message-ID: <20220729094022.186496-1-lb@semihalf.com> (raw)
A thunderbolt
lspci -d 8086:9a1b -vmmknn
Slot: 00:0d.2
Class: System peripheral [0880]
Vendor: Intel Corporation [8086]
Device: Tiger Lake-LP Thunderbolt 4 NHI #0 [9a1b]
presents itself with PCI class 0x088000 after Chromebook boots.
lspci -s 00:0d.2 -xxx
00:0d.2 System peripheral: Intel Corporation Tiger Lake-LP Thunderbolt 4
NHI #0 (rev 01)
00: 86 80 1b 9a 00 00 10 00 01 00 80 08 00 00 00 00
...
However after thunderbolt is powered up in nhi_probe()
its class changes to 0x0c0340
lspci -s 00:0d.2 -xxx
00:0d.2 System peripheral: Intel Corporation Tiger Lake-LP Thunderbolt 4
NHI #0 (rev 01)
00: 86 80 1b 9a 06 04 10 00 01 40 03 0c 00 00 00 00
...
which leaves pci_dev structure with old class value
cat /sys/bus/pci/devices/0000:00:0d.2/class
0x088000
This fix updates PCI device class in pci_dev structure after
thunderbolt is powered up.
Fixes: 3cdb9446a117 ("thunderbolt: Add support for Intel Ice Lake")
Signed-off-by: Łukasz Bartosik <lb@semihalf.com>
---
Changelog v1->v2
* Add restoration of PCI revision id
---
drivers/thunderbolt/nhi_ops.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/thunderbolt/nhi_ops.c b/drivers/thunderbolt/nhi_ops.c
index 96da07e88c52..7aba47e5b3bd 100644
--- a/drivers/thunderbolt/nhi_ops.c
+++ b/drivers/thunderbolt/nhi_ops.c
@@ -160,12 +160,18 @@ static int icl_nhi_suspend_noirq(struct tb_nhi *nhi, bool wakeup)
static int icl_nhi_resume(struct tb_nhi *nhi)
{
+ u32 class;
int ret;
ret = icl_nhi_force_power(nhi, true);
if (ret)
return ret;
+ /* Set device class & rev as it might have changed after powering up */
+ pci_read_config_dword(nhi->pdev, PCI_CLASS_REVISION, &class);
+ nhi->pdev->class = class >> 8;
+ nhi->pdev->revision = class & 0xff;
+
icl_nhi_set_ltr(nhi);
return 0;
}
--
2.37.1.455.g008518b4e5-goog
next reply other threads:[~2022-07-29 9:41 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-29 9:40 Łukasz Bartosik [this message]
2022-08-01 10:24 ` [PATCH v2] thunderbolt: fix PCI device class after powering up Mika Westerberg
2022-08-02 12:27 ` Łukasz Bartosik
2022-08-02 13:07 ` Mika Westerberg
2022-08-02 15:06 ` Łukasz Bartosik
2022-08-03 8:29 ` Mika Westerberg
2022-08-03 9:30 ` Łukasz Bartosik
2022-08-03 9:46 ` Mika Westerberg
2022-08-03 10:41 ` Łukasz Bartosik
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=20220729094022.186496-1-lb@semihalf.com \
--to=lb@semihalf.com \
--cc=YehezkelShB@gmail.com \
--cc=andreas.noever@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-usb@vger.kernel.org \
--cc=michael.jamet@intel.com \
--cc=mika.westerberg@linux.intel.com \
--cc=upstream@semihalf.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.