[GIT PULL] x86/iommu change for v3.15

[GIT PULL] x86/iommu change for v3.15

[Ingo Molnar]

Linus,

Please pull the latest x86-iommu-for-linus git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-iommu-for-linus

   # HEAD: cbceb6904f9d99d068711903fc769b84cf036689 x86: Adjust irq remapping quirk for older revisions of 5500/5520 chipsets

We quirk a quirk.

 Thanks,

	Ingo

------------------>
Neil Horman (1):
      x86: Adjust irq remapping quirk for older revisions of 5500/5520 chipsets


 arch/x86/kernel/early-quirks.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index bc4a088..2237b36 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -208,7 +208,7 @@ static void __init intel_remapping_check(int num, int slot, int func)
 	 * and should be flagged as broken.  Additionally revisions 0x12
 	 * and 0x22 of device id 0x3405 has this problem.
 	 */
-	if (revision == 0x13)
+	if (revision < 0x13)
 		set_irq_remapping_broken();
 	else if ((device == 0x3405) &&
 	    ((revision == 0x12) ||

Re: [GIT PULL] x86/iommu change for v3.15

[Linus Torvalds]

On Mon, Mar 31, 2014 at 7:49 AM, Ingo Molnar <mingo@kernel.org> wrote:
> Neil Horman (1):
>       x86: Adjust irq remapping quirk for older revisions of 5500/5520 chipsets

Before I pull this, I want somebody to double-check it:

> -       if (revision == 0x13)
> +       if (revision < 0x13)
>                 set_irq_remapping_broken();

This change does *not* match the comment just above it. The comment
talks very much about revision 13.

So the comment should be fixed, and/or that "< 0x13" should perhaps be
"<= 0x13".

Because making it "less than" simply makes no sense in light of the
comment. Does revision 13 suddenly work? Was that where it was fixed?
If so, please fix the comment.

                Linus

Re: [GIT PULL] x86/iommu change for v3.15

[Thomas Gleixner]

On Mon, 31 Mar 2014, Linus Torvalds wrote:

> On Mon, Mar 31, 2014 at 7:49 AM, Ingo Molnar <mingo@kernel.org> wrote:
> > Neil Horman (1):
> >       x86: Adjust irq remapping quirk for older revisions of 5500/5520 chipsets
> 
> Before I pull this, I want somebody to double-check it:
> 
> > -       if (revision == 0x13)
> > +       if (revision < 0x13)
> >                 set_irq_remapping_broken();
> 
> This change does *not* match the comment just above it. The comment
> talks very much about revision 13.
> 
> So the comment should be fixed, and/or that "< 0x13" should perhaps be
> "<= 0x13".
> 
> Because making it "less than" simply makes no sense in light of the
> comment. Does revision 13 suddenly work? Was that where it was fixed?
> If so, please fix the comment.

That is my bad. I applied V1 of the patch instead of V2 which had the
<= 0x13 instead of < 0x13.

Please drop the pull request for now. I'll fix it up and we resubmit.

Thanks,

	tglx

Re: [GIT PULL] x86/iommu change for v3.15

[Neil Horman]

On Mon, Mar 31, 2014 at 09:45:43PM +0200, Thomas Gleixner wrote:
> On Mon, 31 Mar 2014, Linus Torvalds wrote:
> 
> > On Mon, Mar 31, 2014 at 7:49 AM, Ingo Molnar <mingo@kernel.org> wrote:
> > > Neil Horman (1):
> > >       x86: Adjust irq remapping quirk for older revisions of 5500/5520 chipsets
> > 
> > Before I pull this, I want somebody to double-check it:
> > 
> > > -       if (revision == 0x13)
> > > +       if (revision < 0x13)
> > >                 set_irq_remapping_broken();
> > 
> > This change does *not* match the comment just above it. The comment
> > talks very much about revision 13.
> > 
> > So the comment should be fixed, and/or that "< 0x13" should perhaps be
> > "<= 0x13".
> > 
> > Because making it "less than" simply makes no sense in light of the
> > comment. Does revision 13 suddenly work? Was that where it was fixed?
> > If so, please fix the comment.
> 
> That is my bad. I applied V1 of the patch instead of V2 which had the
> <= 0x13 instead of < 0x13.
> 
> Please drop the pull request for now. I'll fix it up and we resubmit.
> 
> Thanks,
> 
> 	tglx
> 
> 
What Thomas said.  That was caught and fixed already.  sorry for the noise.
Neil