Hi David,
Just a note: it might have been better to sent this as v2, but given how
small this patch is, albeit Bjorn might be fine with taking it as-is.
> This patch fixes another FLR bug for the Starship/Matisse controller:
>
> AMD Starship/Matisse Cryptogrpahic Coprocessor PSPCPP
>
> This patch allows functions on the same Starship/Matisse device (such as
> USB controller,sound card) to properly pass through to a guest OS using
> vfio-pc. Without this patch, the virtual machine does not boot and
> eventually times out.
>
> Excerpt from lspci -nn showing crypto function on same device as USB and
> sound card (which are already listed in quirks.c):
>
> 0e:00.1 Encryption controller [1080]: Advanced Micro Devices, Inc. [AMD]
> Starship/Matisse Cryptographic Coprocessor PSPCPP [1022:1486]
> 0e:00.3 USB controller [0c03]: Advanced Micro Devices, Inc. [AMD]
> Matisse USB 3.0 Host Controller [1022:149c]
> 0e:00.4 Audio device [0403]: Advanced Micro Devices, Inc. [AMD]
> Starship/Matisse HD Audio Controller [1022:1487]
>
> Fix tested successfully on an Asus ROG STRIX X570-E GAMING motherboard
> with AMD Ryzen 9 3900X.
>
> Signed-off-by: David Jaundrew <david@xxxxxxxxxxxx>
> ---
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index 6d74386eadc2..0d19e7aa219a 100644
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -5208,6 +5208,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x443, quirk_intel_qat_vf_cap);
> /*
> * FLR may cause the following to devices to hang:
> *
> + * AMD Starship/Matisse Cryptographic Coprocessor PSPCPP 0x1486
> * AMD Starship/Matisse HD Audio Controller 0x1487
> * AMD Starship USB 3.0 Host Controller 0x148c
> * AMD Matisse USB 3.0 Host Controller 0x149c
> @@ -5219,6 +5220,7 @@ static void quirk_no_flr(struct pci_dev *dev)
> {
> dev->dev_flags |= PCI_DEV_FLAGS_NO_FLR_RESET;
> }
> +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x1486, quirk_no_flr);
> DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x1487, quirk_no_flr);
> DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x148c, quirk_no_flr);
> DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x149c, quirk_no_flr);
Thank you!
Reviewed-by: Krzysztof Wilczyński <kw@xxxxxxxxx>
Krzysztof
