diff mbox

PCI: Add new PCI id for Intel GPU interrupt quirk

Message ID 3185796.STv3LRO1j8@storm
State Accepted
Headers show

Commit Message

Thomas Jarosch April 7, 2014, 1:10 p.m. UTC 
After a CPU upgrade while keeping the same mainboard,
we faced "spurious interrupt" problems again.

It turned out that the new CPU also featured a
new GPU with a different PCI id.

-> Add this PCI id to the quirk table. Probably all other
Intel GPU PCI ids are affected, too, but I don't want
to add them without a test system.

Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
Tested-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
---
 drivers/pci/quirks.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Greg KH April 7, 2014, 4:58 p.m. UTC | #1 
On Mon, Apr 07, 2014 at 03:10:32PM +0200, Thomas Jarosch wrote:
> After a CPU upgrade while keeping the same mainboard,
> we faced "spurious interrupt" problems again.
> 
> It turned out that the new CPU also featured a
> new GPU with a different PCI id.
> 
> -> Add this PCI id to the quirk table. Probably all other
> Intel GPU PCI ids are affected, too, but I don't want
> to add them without a test system.
> 
> Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
> Tested-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
> ---
>  drivers/pci/quirks.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index e729206..0feb4a3 100644
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -2954,6 +2954,7 @@ static void disable_igfx_irq(struct pci_dev *dev)
>  }
>  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0102, disable_igfx_irq);
>  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
> +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq);
>  
>  /*
>   * PCI devices which are on Intel chips can skip the 10ms delay
> -- 
> 1.8.1.4

<formletter>

This is not the correct way to submit patches for inclusion in the
stable kernel tree.  Please read Documentation/stable_kernel_rules.txt
for how to do this properly.

</formletter>
--
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
Thomas Jarosch April 11, 2014, 1:42 p.m. UTC | #2 
Hi Greg,

On Monday, 7. April 2014 09:58:08 Greg KH wrote:
> On Mon, Apr 07, 2014 at 03:10:32PM +0200, Thomas Jarosch wrote:
> > After a CPU upgrade while keeping the same mainboard,
> > we faced "spurious interrupt" problems again.
> ..

> <formletter>
> 
> This is not the correct way to submit patches for inclusion in the
> stable kernel tree.  Please read Documentation/stable_kernel_rules.txt
> for how to do this properly.
> 
> </formletter>

sorry 'bout that :) 

I had on my mind I should CC: stable@ and then the patch will be picked up 
automatically once / if it gets applied to the normal git tree or lost
in space if it gets rejected. Guess that was wishful thinking :)

Have a nice weekend,
Thomas

--
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
Bjorn Helgaas April 25, 2014, 5:35 p.m. UTC | #3 
[+cc Daniel, Jani, intel-gfx, dri-devel, -cc stable]

On Mon, Apr 07, 2014 at 03:10:32PM +0200, Thomas Jarosch wrote:
> After a CPU upgrade while keeping the same mainboard,
> we faced "spurious interrupt" problems again.
> 
> It turned out that the new CPU also featured a
> new GPU with a different PCI id.
> 
> -> Add this PCI id to the quirk table. Probably all other
> Intel GPU PCI ids are affected, too, but I don't want
> to add them without a test system.

Daniel, Jani, et al, do we need a better solution to this?  Is there
a more general way to solve this than by tripping over affected machines
one-by-one?  Could this be done in the driver rather than in a quirk?

> Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
> Tested-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
> ---
>  drivers/pci/quirks.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index e729206..0feb4a3 100644
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -2954,6 +2954,7 @@ static void disable_igfx_irq(struct pci_dev *dev)
>  }
>  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0102, disable_igfx_irq);
>  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
> +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq);
>  
>  /*
>   * PCI devices which are on Intel chips can skip the 10ms delay
> -- 
> 1.8.1.4
> 
> --
> 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
--
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
Bjorn Helgaas April 25, 2014, 5:37 p.m. UTC | #4 
On Fri, Apr 25, 2014 at 11:35:21AM -0600, Bjorn Helgaas wrote:
> [+cc Daniel, Jani, intel-gfx, dri-devel, -cc stable]
> 
> On Mon, Apr 07, 2014 at 03:10:32PM +0200, Thomas Jarosch wrote:
> > After a CPU upgrade while keeping the same mainboard,
> > we faced "spurious interrupt" problems again.
> > 
> > It turned out that the new CPU also featured a
> > new GPU with a different PCI id.
> > 
> > -> Add this PCI id to the quirk table. Probably all other
> > Intel GPU PCI ids are affected, too, but I don't want
> > to add them without a test system.
> 
> Daniel, Jani, et al, do we need a better solution to this?  Is there
> a more general way to solve this than by tripping over affected machines
> one-by-one?  Could this be done in the driver rather than in a quirk?

I guess it can't be done in the driver because the problem happens even if
the driver isn't loaded, per f67fd55fa96f ("PCI: Add quirk for still
enabled interrupts on Intel Sandy Bridge GPUs").

> > Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
> > Tested-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
> > ---
> >  drivers/pci/quirks.c | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> > index e729206..0feb4a3 100644
> > --- a/drivers/pci/quirks.c
> > +++ b/drivers/pci/quirks.c
> > @@ -2954,6 +2954,7 @@ static void disable_igfx_irq(struct pci_dev *dev)
> >  }
> >  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0102, disable_igfx_irq);
> >  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
> > +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq);
> >  
> >  /*
> >   * PCI devices which are on Intel chips can skip the 10ms delay
> > -- 
> > 1.8.1.4
> > 
> > --
> > 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
--
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
Daniel Vetter April 25, 2014, 6:13 p.m. UTC | #5 
On Fri, Apr 25, 2014 at 11:37:18AM -0600, Bjorn Helgaas wrote:
> On Fri, Apr 25, 2014 at 11:35:21AM -0600, Bjorn Helgaas wrote:
> > [+cc Daniel, Jani, intel-gfx, dri-devel, -cc stable]
> > 
> > On Mon, Apr 07, 2014 at 03:10:32PM +0200, Thomas Jarosch wrote:
> > > After a CPU upgrade while keeping the same mainboard,
> > > we faced "spurious interrupt" problems again.
> > > 
> > > It turned out that the new CPU also featured a
> > > new GPU with a different PCI id.
> > > 
> > > -> Add this PCI id to the quirk table. Probably all other
> > > Intel GPU PCI ids are affected, too, but I don't want
> > > to add them without a test system.
> > 
> > Daniel, Jani, et al, do we need a better solution to this?  Is there
> > a more general way to solve this than by tripping over affected machines
> > one-by-one?  Could this be done in the driver rather than in a quirk?
> 
> I guess it can't be done in the driver because the problem happens even if
> the driver isn't loaded, per f67fd55fa96f ("PCI: Add quirk for still
> enabled interrupts on Intel Sandy Bridge GPUs").

Hm, this is new to me. The only thing wrt spurious interrupts I was aware
of is on g4x platforms which also fire legacy interrupts (but only for
some chip functions) when we use msi. See

commit 4e6b788c3f2388c519ab6ed7fe59f372c85d26e9
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Fri Feb 7 16:33:20 2014 +0100

    drm/i915: Disable dp aux irq on g4x

we simply opted to not enable those interrupts on g4x to keep things
quiet. For other platforms I'm not aware of any such issues.

I guess you could just match on all of them, but the master irq control
bit moves around a _lot_. We already have a differen early platform quirk
and for that exposed pci ids as macros in include/drm/i915_pciids.h
-Daniel

> 
> > > Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
> > > Tested-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
> > > ---
> > >  drivers/pci/quirks.c | 1 +
> > >  1 file changed, 1 insertion(+)
> > > 
> > > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> > > index e729206..0feb4a3 100644
> > > --- a/drivers/pci/quirks.c
> > > +++ b/drivers/pci/quirks.c
> > > @@ -2954,6 +2954,7 @@ static void disable_igfx_irq(struct pci_dev *dev)
> > >  }
> > >  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0102, disable_igfx_irq);
> > >  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
> > > +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq);
> > >  
> > >  /*
> > >   * PCI devices which are on Intel chips can skip the 10ms delay
> > > -- 
> > > 1.8.1.4
> > > 
> > > --
> > > 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
Bjorn Helgaas April 29, 2014, 11:35 p.m. UTC | #6 
On Mon, Apr 07, 2014 at 03:10:32PM +0200, Thomas Jarosch wrote:
> After a CPU upgrade while keeping the same mainboard,
> we faced "spurious interrupt" problems again.
> 
> It turned out that the new CPU also featured a
> new GPU with a different PCI id.
> 
> -> Add this PCI id to the quirk table. Probably all other
> Intel GPU PCI ids are affected, too, but I don't want
> to add them without a test system.
> 
> Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
> Tested-by: Thomas Jarosch <thomas.jarosch@intra2net.com>

I applied this to pci/misc for v3.16, with a stable tag for v3.4+, thanks!

> ---
>  drivers/pci/quirks.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index e729206..0feb4a3 100644
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -2954,6 +2954,7 @@ static void disable_igfx_irq(struct pci_dev *dev)
>  }
>  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0102, disable_igfx_irq);
>  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
> +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq);
>  
>  /*
>   * PCI devices which are on Intel chips can skip the 10ms delay
> -- 
> 1.8.1.4
> 
> --
> 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
--
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
diff mbox

Patch

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index e729206..0feb4a3 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -2954,6 +2954,7 @@  static void disable_igfx_irq(struct pci_dev *dev)
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0102, disable_igfx_irq);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq);
 
 /*
  * PCI devices which are on Intel chips can skip the 10ms delay