Skip to content

Commit b6d739e

Browse files
committed
Merge branch 'x86-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 iommu quirk fix from Thomas Gleixner: "A quirk for the iommu quirk to include silicon which was assumed not to be out in the wild. This time with the correct logic applied" * 'x86-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86: Adjust irq remapping quirk for older revisions of 5500/5520 chipsets
2 parents 99f7b02 + 6f8a1b3 commit b6d739e

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

arch/x86/kernel/early-quirks.c

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -203,18 +203,15 @@ static void __init intel_remapping_check(int num, int slot, int func)
203203
revision = read_pci_config_byte(num, slot, func, PCI_REVISION_ID);
204204

205205
/*
206-
* Revision 13 of all triggering devices id in this quirk have
207-
* a problem draining interrupts when irq remapping is enabled,
208-
* and should be flagged as broken. Additionally revisions 0x12
209-
* and 0x22 of device id 0x3405 has this problem.
206+
* Revision <= 13 of all triggering devices id in this quirk
207+
* have a problem draining interrupts when irq remapping is
208+
* enabled, and should be flagged as broken. Additionally
209+
* revision 0x22 of device id 0x3405 has this problem.
210210
*/
211-
if (revision == 0x13)
211+
if (revision <= 0x13)
212212
set_irq_remapping_broken();
213-
else if ((device == 0x3405) &&
214-
((revision == 0x12) ||
215-
(revision == 0x22)))
213+
else if (device == 0x3405 && revision == 0x22)
216214
set_irq_remapping_broken();
217-
218215
}
219216

220217
/*

0 commit comments

Comments
 (0)