[PATCH 1/2] PCI/VMD: Use the more reliable method for setting the AER

[PATCH 1/2] PCI/VMD: Use the more reliable method for setting the AER

[Jon Derrick]

Instead of relying on the domain being >= 0x10000, use the member of the
pci sysdata that identifies a VMD root port bus.
---
 drivers/pci/quirks.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index edc7f96..713035f 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -4438,8 +4438,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x443, quirk_intel_qat_vf_cap);
  */
 static void quirk_no_aersid(struct pci_dev *pdev)
 {
-	/* VMD Domain */
-	if (pdev->bus->sysdata && pci_domain_nr(pdev->bus) >= 0x10000)
+	if (is_vmd(pdev->bus))
 		pdev->bus->bus_flags |= PCI_BUS_FLAGS_NO_AERSID;
 }
 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2030, quirk_no_aersid);
-- 
1.8.3.1

[PATCH 2/2] PCI/Quirks: Imply that other users can use the no-aer-sid quirk

[Jon Derrick]

Move the comment explaining the quirk to the quirk markup, so that other
devices can use the quirk without it being confused with a VMD-specific
action.
---
 drivers/pci/quirks.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 713035f..cee6526 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -4430,17 +4430,18 @@ static void quirk_intel_qat_vf_cap(struct pci_dev *pdev)
 }
 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x443, quirk_intel_qat_vf_cap);
 
+static void quirk_no_aersid(struct pci_dev *pdev)
+{
+	if (is_vmd(pdev->bus))
+		pdev->bus->bus_flags |= PCI_BUS_FLAGS_NO_AERSID;
+}
+
 /*
  * VMD-enabled root ports will change the source ID for all messages
  * to the VMD device. Rather than doing device matching with the source
  * ID, the AER driver should traverse the child device tree, reading
  * AER registers to find the faulting device.
  */
-static void quirk_no_aersid(struct pci_dev *pdev)
-{
-	if (is_vmd(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);
-- 
1.8.3.1

Re: [PATCH 1/2] PCI/VMD: Use the more reliable method for setting the AER

[Keith Busch]

On Fri, Oct 07, 2016 at 11:26:28AM -0600, Jon Derrick wrote:
> Instead of relying on the domain being >= 0x10000, use the member of the
> pci sysdata that identifies a VMD root port bus.

'is_vmd' is only defined for x86. You'll need a '#define is_vmd' to
false in some arch generic place.


> ---
>  drivers/pci/quirks.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index edc7f96..713035f 100644
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -4438,8 +4438,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x443, quirk_intel_qat_vf_cap);
>   */
>  static void quirk_no_aersid(struct pci_dev *pdev)
>  {
> -	/* VMD Domain */
> -	if (pdev->bus->sysdata && pci_domain_nr(pdev->bus) >= 0x10000)
> +	if (is_vmd(pdev->bus))
>  		pdev->bus->bus_flags |= PCI_BUS_FLAGS_NO_AERSID;
>  }
>  DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2030, quirk_no_aersid);

Re: [PATCH 1/2] PCI/VMD: Use the more reliable method for setting the AER

[Jon Derrick]

On Fri, Oct 07, 2016 at 01:45:49PM -0400, Keith Busch wrote:
> On Fri, Oct 07, 2016 at 11:26:28AM -0600, Jon Derrick wrote:
> > Instead of relying on the domain being >= 0x10000, use the member of the
> > pci sysdata that identifies a VMD root port bus.
> 
> 'is_vmd' is only defined for x86. You'll need a '#define is_vmd' to
> false in some arch generic place.
Drats. Good catch. That's not as clean as I hoped it would be.
> 
> 
> > ---
> >  drivers/pci/quirks.c | 3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
> > 
> > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> > index edc7f96..713035f 100644
> > --- a/drivers/pci/quirks.c
> > +++ b/drivers/pci/quirks.c
> > @@ -4438,8 +4438,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x443, quirk_intel_qat_vf_cap);
> >   */
> >  static void quirk_no_aersid(struct pci_dev *pdev)
> >  {
> > -	/* VMD Domain */
> > -	if (pdev->bus->sysdata && pci_domain_nr(pdev->bus) >= 0x10000)
> > +	if (is_vmd(pdev->bus))
> >  		pdev->bus->bus_flags |= PCI_BUS_FLAGS_NO_AERSID;
> >  }
> >  DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2030, quirk_no_aersid);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html