Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7b862f6 authored by Chris Wedgwood's avatar Chris Wedgwood Committed by Linus Torvalds
Browse files

[PATCH] VIA quirk fixup, additional PCI IDs 



An earlier commit (75cf7456) changed an
overly-zealous PCI quirk to only poke those VIA devices that need it.
However, some PCI devices were not included in what I hope is now the full
list.  Consequently we're failing to run the quirk on all machines which need
it, causing IRQ routing failures.

This should I hope correct this.

Thanks to Masoud Sharbiani <masouds@masoud.ir> for pointing this out
and testing the fix.

Signed-off-by: default avatarChris Wedgwood <cw@f00f.org>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 73d58588

drivers/pci/quirks.c

+7 −0
Original line number Diff line number Diff line
@@ -634,6 +634,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4, quirk_vi 
 * non-x86 architectures (yes Via exists on PPC among other places),

 * we must mask the PCI_INTERRUPT_LINE value versus 0xf to get

 * interrupts delivered properly.

 *

 * Some of the on-chip devices are actually '586 devices' so they are

 * listed here.

 */

static void quirk_via_irq(struct pci_dev *dev)

{
@@ -648,6 +651,10 @@ static void quirk_via_irq(struct pci_dev *dev) 
		pci_write_config_byte(dev, PCI_INTERRUPT_LINE, new_irq);

	}

}

DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_0, quirk_via_irq);

DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, quirk_via_irq);

DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_2, quirk_via_irq);

DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_3, quirk_via_irq);

DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686, quirk_via_irq);

DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4, quirk_via_irq);

DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_5, quirk_via_irq);