* [PATCH] x86/PCI: Apply VMD's AERSID fixup generically
@ 2018-09-07 19:22 Jon Derrick
2018-10-02 21:24 ` Bjorn Helgaas
0 siblings, 1 reply; 2+ messages in thread
From: Jon Derrick @ 2018-09-07 19:22 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: Thomas Gleixner, Lorenzo Pieralisi, linux-pci, Keith Busch, Jon Derrick
A root port device-id changed between simulation and production. Rather
than match device-ids which may not be future-proof if left
unmaintained, match all root ports which exist in a VMD-domain
Signed-off-by: Jon Derrick <jonathan.derrick@intel.com>
---
arch/x86/pci/fixup.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c
index 13f4485..30a5111 100644
--- a/arch/x86/pci/fixup.c
+++ b/arch/x86/pci/fixup.c
@@ -629,17 +629,11 @@ static void quirk_apple_mbp_poweroff(struct pci_dev *pdev)
static void quirk_no_aersid(struct pci_dev *pdev)
{
/* VMD Domain */
- if (is_vmd(pdev->bus))
+ if (is_vmd(pdev->bus) && pci_is_root_bus(pdev->bus))
pdev->bus->bus_flags |= PCI_BUS_FLAGS_NO_AERSID;
}
-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2030, quirk_no_aersid);
-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2031, quirk_no_aersid);
-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2032, quirk_no_aersid);
-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2033, quirk_no_aersid);
-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x334a, quirk_no_aersid);
-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x334b, quirk_no_aersid);
-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x334c, quirk_no_aersid);
-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x334d, quirk_no_aersid);
+DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_INTEL, PCI_ANY_ID,
+ PCI_CLASS_BRIDGE_PCI, 8, quirk_no_aersid);
#ifdef CONFIG_PHYS_ADDR_T_64BIT
--
1.8.3.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] x86/PCI: Apply VMD's AERSID fixup generically
2018-09-07 19:22 [PATCH] x86/PCI: Apply VMD's AERSID fixup generically Jon Derrick
@ 2018-10-02 21:24 ` Bjorn Helgaas
0 siblings, 0 replies; 2+ messages in thread
From: Bjorn Helgaas @ 2018-10-02 21:24 UTC (permalink / raw)
To: Jon Derrick; +Cc: Thomas Gleixner, Lorenzo Pieralisi, linux-pci, Keith Busch
On Fri, Sep 07, 2018 at 01:22:30PM -0600, Jon Derrick wrote:
> A root port device-id changed between simulation and production. Rather
> than match device-ids which may not be future-proof if left
> unmaintained, match all root ports which exist in a VMD-domain
>
> Signed-off-by: Jon Derrick <jonathan.derrick@intel.com>
I applied this on pci/host-vmd for v4.20, thanks!
> ---
> arch/x86/pci/fixup.c | 12 +++---------
> 1 file changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c
> index 13f4485..30a5111 100644
> --- a/arch/x86/pci/fixup.c
> +++ b/arch/x86/pci/fixup.c
> @@ -629,17 +629,11 @@ static void quirk_apple_mbp_poweroff(struct pci_dev *pdev)
> static void quirk_no_aersid(struct pci_dev *pdev)
> {
> /* VMD Domain */
> - if (is_vmd(pdev->bus))
> + if (is_vmd(pdev->bus) && pci_is_root_bus(pdev->bus))
> pdev->bus->bus_flags |= PCI_BUS_FLAGS_NO_AERSID;
> }
> -DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2030, quirk_no_aersid);
> -DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2031, quirk_no_aersid);
> -DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2032, quirk_no_aersid);
> -DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2033, quirk_no_aersid);
> -DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x334a, quirk_no_aersid);
> -DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x334b, quirk_no_aersid);
> -DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x334c, quirk_no_aersid);
> -DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x334d, quirk_no_aersid);
> +DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_INTEL, PCI_ANY_ID,
> + PCI_CLASS_BRIDGE_PCI, 8, quirk_no_aersid);
>
> #ifdef CONFIG_PHYS_ADDR_T_64BIT
>
> --
> 1.8.3.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-10-02 21:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-07 19:22 [PATCH] x86/PCI: Apply VMD's AERSID fixup generically Jon Derrick
2018-10-02 21:24 ` Bjorn Helgaas
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.