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

Commit c458033c authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

ACPI: PCI: use 1-based encoding for _PRT quirks 



Use the PCI INTx pin encoding (1=INTA, 2=INTB, etc) for _PRT quirks.
Then we can simply compare "entry->pin == quirk->pin".

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent e64e9db5

drivers/acpi/pci_irq.c

+6 −4
Original line number Diff line number Diff line
@@ -145,19 +145,21 @@ struct prt_quirk { 
	char			*actual_source;

};



#define PCI_INTX_PIN(c)		(c - 'A' + 1)



/*

 * These systems have incorrect _PRT entries.  The BIOS claims the PCI

 * interrupt at the listed segment/bus/device/pin is connected to the first

 * link device, but it is actually connected to the second.

 */

static struct prt_quirk prt_quirks[] = {

	{ medion_md9580, 0, 0, 9, 'A',

	{ medion_md9580, 0, 0, 9, PCI_INTX_PIN('A'),

		"\\_SB_.PCI0.ISA_.LNKA",

		"\\_SB_.PCI0.ISA_.LNKB"},

	{ dell_optiplex, 0, 0, 0xd, 'A',

	{ dell_optiplex, 0, 0, 0xd, PCI_INTX_PIN('A'),

		"\\_SB_.LNKB",

		"\\_SB_.LNKA"},

	{ hp_t5710, 0, 0, 1, 'A',

	{ hp_t5710, 0, 0, 1, PCI_INTX_PIN('A'),

		"\\_SB_.PCI0.LNK1",

		"\\_SB_.PCI0.LNK3"},

};
@@ -179,7 +181,7 @@ do_prt_fixups(struct acpi_prt_entry *entry, struct acpi_pci_routing_table *prt) 
		    entry->id.segment == quirk->segment &&

		    entry->id.bus == quirk->bus &&

		    entry->id.device == quirk->device &&

		    pin_name(entry->pin) == quirk->pin &&

		    entry->pin == quirk->pin &&

		    !strcmp(prt->source, quirk->source) &&

		    strlen(prt->source) >= strlen(quirk->actual_source)) {

			printk(KERN_WARNING PREFIX "firmware reports "