Received-SPF: pass (google.com: domain of linux-kernel+bounces-176415-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Sat, 11 May 2024 07:38:32 +0300
From: Mika Westerberg <mika.westerberg@linux.intel.com>
To: Esther Shimanovich <eshimanovich@chromium.org>
Cc: Lukas Wunner <lukas@wunner.de>,
	Mario Limonciello <mario.limonciello@amd.com>,
	Dmitry Torokhov <dmitry.torokhov@gmail.com>,
	Bjorn Helgaas <bhelgaas@google.com>, linux-pci@vger.kernel.org,
	linux-kernel@vger.kernel.org, Rajat Jain <rajatja@google.com>
Subject: Re: [PATCH v4] PCI: Relabel JHL6540 on Lenovo X1 Carbon 7,8
Message-ID: <20240511043832.GD4162345@black.fi.intel.com>
References: <7d68a112-0f48-46bf-9f6d-d99b88828761@amd.com>
 <20240423053312.GY112498@black.fi.intel.com>
 <7197b2ce-f815-48a1-a78e-9e139de796b7@amd.com>
 <20240424085608.GE112498@black.fi.intel.com>
 <CA+Y6NJFyi6e7ype6dTAjxsy5aC80NdVOt+Vg-a0O0y_JsfwSGg@mail.gmail.com>
 <Zi0VLrvUWH6P1_or@wunner.de>
 <CA+Y6NJE8hA+wt+auW1wJBWA6EGMc6CGpmdExr3475E_Yys-Zdw@mail.gmail.com>
 <ZjsKPSgV39SF0gdX@wunner.de>
 <20240510052616.GC4162345@black.fi.intel.com>
 <CA+Y6NJF2Ex6Rwxw0a5V1aMY2OH4=MP5KTtat9x9Ge7y-JBdapw@mail.gmail.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <CA+Y6NJF2Ex6Rwxw0a5V1aMY2OH4=MP5KTtat9x9Ge7y-JBdapw@mail.gmail.com>

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.