D56422.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D56422.diff
View Options

	diff --git a/sys/powerpc/include/openpicreg.h b/sys/powerpc/include/openpicreg.h
	--- a/sys/powerpc/include/openpicreg.h
	+++ b/sys/powerpc/include/openpicreg.h
	@@ -112,7 +112,7 @@
	#define OPENPIC_ACTIVITY 0x40000000
	#define OPENPIC_PRIORITY_MASK 0x000f0000
	#define OPENPIC_PRIORITY_SHIFT 16
	-#define OPENPIC_VECTOR_MASK 0x000000ff
	+#define OPENPIC_VECTOR_MASK 0x0000ffff

	/* interrupt destination cpu */
	#ifndef OPENPIC_IDEST
	diff --git a/sys/powerpc/include/openpicvar.h b/sys/powerpc/include/openpicvar.h
	--- a/sys/powerpc/include/openpicvar.h
	+++ b/sys/powerpc/include/openpicvar.h
	@@ -32,7 +32,7 @@

	#define OPENPIC_DEVSTR "OpenPIC Interrupt Controller"

	-#define OPENPIC_IRQMAX 256 /* h/w allows more */
	+#define OPENPIC_IRQMAX 512 /* h/w allows more */

	#define OPENPIC_QUIRK_SINGLE_BIND 1 /* Bind interrupts to only 1 CPU */
	#define OPENPIC_QUIRK_HIDDEN_IRQS 2 /* May have IRQs beyond FRR[NIRQ] */
	diff --git a/sys/powerpc/powerpc/openpic.c b/sys/powerpc/powerpc/openpic.c
	--- a/sys/powerpc/powerpc/openpic.c
	+++ b/sys/powerpc/powerpc/openpic.c
	@@ -295,7 +295,7 @@
	while (1) {
	vector = openpic_read(sc, OPENPIC_PCPU_IACK(cpuid));
	vector &= OPENPIC_VECTOR_MASK;
	- if (vector == 255)
	+ if (vector == OPENPIC_VECTOR_MASK)
	break;
	powerpc_dispatch_intr(vector, tf);
	}