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

Commit 223ac2f4 authored by Björn Steinbrink's avatar Björn Steinbrink Committed by Ingo Molnar
Browse files

x86, pci: fix off-by-one errors in some pirq warnings 

fix bogus pirq warnings reported in:

  http://bugzilla.kernel.org/show_bug.cgi?id=10366



safe to be backported to v2.6.25 and earlier.

Cc: stable@kernel.org
Signed-off-by: default avatarBjörn Steinbrink <B.Steinbrink@gmx.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 4b119e21

arch/x86/pci/irq.c

+6 −6
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static int pirq_ali_get(struct pci_dev *router, struct pci_dev *dev, int pirq) 
{

	static const unsigned char irqmap[16] = { 0, 9, 3, 10, 4, 5, 7, 6, 1, 11, 0, 12, 0, 14, 0, 15 };



	WARN_ON_ONCE(pirq >= 16);

	WARN_ON_ONCE(pirq > 16);

	return irqmap[read_config_nybble(router, 0x48, pirq-1)];

}
@@ -209,7 +209,7 @@ static int pirq_ali_set(struct pci_dev *router, struct pci_dev *dev, int pirq, i 
	static const unsigned char irqmap[16] = { 0, 8, 0, 2, 4, 5, 7, 6, 0, 1, 3, 9, 11, 0, 13, 15 };

	unsigned int val = irqmap[irq];



	WARN_ON_ONCE(pirq >= 16);

	WARN_ON_ONCE(pirq > 16);

	if (val) {

		write_config_nybble(router, 0x48, pirq-1, val);

		return 1;
@@ -260,7 +260,7 @@ static int pirq_via586_get(struct pci_dev *router, struct pci_dev *dev, int pirq 
{

	static const unsigned int pirqmap[5] = { 3, 2, 5, 1, 1 };



	WARN_ON_ONCE(pirq >= 5);

	WARN_ON_ONCE(pirq > 5);

	return read_config_nybble(router, 0x55, pirqmap[pirq-1]);

}
@@ -268,7 +268,7 @@ static int pirq_via586_set(struct pci_dev *router, struct pci_dev *dev, int pirq 
{

	static const unsigned int pirqmap[5] = { 3, 2, 5, 1, 1 };



	WARN_ON_ONCE(pirq >= 5);

	WARN_ON_ONCE(pirq > 5);

	write_config_nybble(router, 0x55, pirqmap[pirq-1], irq);

	return 1;

}
@@ -282,7 +282,7 @@ static int pirq_ite_get(struct pci_dev *router, struct pci_dev *dev, int pirq) 
{

	static const unsigned char pirqmap[4] = { 1, 0, 2, 3 };



	WARN_ON_ONCE(pirq >= 4);

	WARN_ON_ONCE(pirq > 4);

	return read_config_nybble(router,0x43, pirqmap[pirq-1]);

}
@@ -290,7 +290,7 @@ static int pirq_ite_set(struct pci_dev *router, struct pci_dev *dev, int pirq, i 
{

	static const unsigned char pirqmap[4] = { 1, 0, 2, 3 };



	WARN_ON_ONCE(pirq >= 4);

	WARN_ON_ONCE(pirq > 4);

	write_config_nybble(router, 0x43, pirqmap[pirq-1], irq);

	return 1;

}