Re: [PATCH v4] PCI: Relabel JHL6540 on Lenovo X1 Carbon 7,8

Mika Westerberg
2024-05-11T04:38:36Z

Hi,

On Fri, May 10, 2024 at 11:44:12AM -0400, Esther Shimanovich wrote:
> Thank you Lukas and Mika!
> This is very useful and helpful!
> I am setting up two alternative builds with both of your suggested
> approaches and will test on devices once I get back into the office,
> hopefully around next week.
>
> > + /*
> > + * Any integrated Thunderbolt 3/4 PCIe root ports from Intel
> > + * before Alder Lake do not have the above device property so we
> > + * use their PCI IDs instead. All these are tunneled. This list
> > + * is not expected to grow.
> > + */
> > + if (pdev->vendor == PCI_VENDOR_ID_INTEL) {
> > + switch (pdev->device) {
> > + /* Ice Lake Thunderbolt 3 PCIe Root Ports */
> > + case 0x8a1d:
> > + case 0x8a1f:
> > + case 0x8a21:
> > + case 0x8a23:
> > + /* Tiger Lake-LP Thunderbolt 4 PCIe Root Ports */
> > + case 0x9a23:
> > + case 0x9a25:
> > + case 0x9a27:
> > + case 0x9a29:
> > + /* Tiger Lake-H Thunderbolt 4 PCIe Root Ports */
> > + case 0x9a2b:
> > + case 0x9a2d:
> > + case 0x9a2f:
> > + case 0x9a31:
> > + return true;
> > + }
> > + }
> > +
>
> Something I noticed is that the list of root ports you have there does
> not include [8086:02b4] or [8086:9db4], the Comet Lake and
> Whiskey/Cannon Point root ports that I saw on the laptops I tested on.
> Those laptops do not have the usb4-host-interface property. This makes
> me think that the patch won't work as is.

They are not integrated Thunderbolt PCIe root ports.

They should be "matched" with the second "rule" that looks for a
discrete controller directly behind an ExternalFacing PCIe root port.