Re: [PATCH] PCI: Create device links for AMD integrated USB xHCI and UCSI controllers

[Bjorn Helgaas <helgaas@kernel.org>]

On Wed, Sep 15, 2021 at 04:39:36PM +0000, Deucher, Alexander wrote:
> [Public]
> 
> > -----Original Message-----
> > From: Bjorn Helgaas <helgaas@kernel.org>
> > Sent: Tuesday, September 14, 2021 11:29 AM
> > To: Quan, Evan <Evan.Quan@amd.com>
> > Cc: linux-pci@vger.kernel.org; bhelgaas@google.com; Deucher, Alexander
> > <Alexander.Deucher@amd.com>; stable@vger.kernel.org
> > Subject: Re: [PATCH] PCI: Create device links for AMD integrated USB xHCI
> > and UCSI controllers
> > 
> > On Fri, Sep 03, 2021 at 02:33:11PM +0800, Evan Quan wrote:
> > > Latest AMD GPUs have built-in USB xHCI and UCSI controllers. Add
> > > device link support for them.
> > >
> > > Cc: stable@vger.kernel.org
> > > Signed-off-by: Evan Quan <evan.quan@amd.com>
> > 
> > Applied to pci/pm for v5.16, thanks!
> 
> Any chance we can get this applied for 5.15/stable?  This fixes
> runtime pm problems on GPU boards with integrated USB.
> https://gitlab.freedesktop.org/drm/amd/-/issues/1704

Thanks for the link.  It's always nice to have a clue about what
problems a quirk fixes.

I added the link to the commit log and moved the whole thing to
for-linus for v5.15.

> Thanks,
> 
> Alex
> 
> > 
> > > ---
> > >  drivers/pci/quirks.c | 9 +++++++--
> > >  1 file changed, 7 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index
> > > dea10d62d5b9..f0c5dd3406a1 100644
> > > --- a/drivers/pci/quirks.c
> > > +++ b/drivers/pci/quirks.c
> > > @@ -5338,7 +5338,7 @@
> > DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,
> > >  			      PCI_CLASS_MULTIMEDIA_HD_AUDIO, 8,
> > quirk_gpu_hda);
> > >
> > >  /*
> > > - * Create device link for NVIDIA GPU with integrated USB xHCI Host
> > > + * Create device link for GPUs with integrated USB xHCI Host
> > >   * controller to VGA.
> > >   */
> > >  static void quirk_gpu_usb(struct pci_dev *usb) @@ -5347,9 +5347,11 @@
> > > static void quirk_gpu_usb(struct pci_dev *usb)  }
> > > DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_NVIDIA,
> > PCI_ANY_ID,
> > >  			      PCI_CLASS_SERIAL_USB, 8, quirk_gpu_usb);
> > > +DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_ATI, PCI_ANY_ID,
> > > +			      PCI_CLASS_SERIAL_USB, 8, quirk_gpu_usb);
> > >
> > >  /*
> > > - * Create device link for NVIDIA GPU with integrated Type-C UCSI
> > > controller
> > > + * Create device link for GPUs with integrated Type-C UCSI controller
> > >   * to VGA. Currently there is no class code defined for UCSI device over PCI
> > >   * so using UNKNOWN class for now and it will be updated when UCSI
> > >   * over PCI gets a class code.
> > > @@ -5362,6 +5364,9 @@ static void quirk_gpu_usb_typec_ucsi(struct
> > > pci_dev *ucsi)
> > DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,
> > >  			      PCI_CLASS_SERIAL_UNKNOWN, 8,
> > >  			      quirk_gpu_usb_typec_ucsi);
> > > +DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_ATI, PCI_ANY_ID,
> > > +			      PCI_CLASS_SERIAL_UNKNOWN, 8,
> > > +			      quirk_gpu_usb_typec_ucsi);
> > >
> > >  /*
> > >   * Enable the NVIDIA GPU integrated HDA controller if the BIOS left
> > > it
> > > --
> > > 2.29.0
> > >