FogBugz #172871: Use hardware interrupt instead of virtual interrupt

Ley Foon Tan · Dinh Nguyen · commit 1a9dda19b98d · 2014-01-20T03:48:29.000-06:00
Fixed incorrect interrupt number when setting IENABLE register.
We should use hardware interrupt number instead of virtual interrupt
number.

Signed-off-by: Ley Foon Tan &lt;lftan@altera.com&gt;
diff --git a/arch/nios2/kernel/irq.c b/arch/nios2/kernel/irq.c
@@ -41,15 +41,15 @@ static void chip_unmask(struct irq_data *d)
 {
 	unsigned ien;
 	ien = RDCTL(CTL_IENABLE);
-	ien |= (1 << d->irq);
+	ien |= (1 << d->hwirq);
 	WRCTL(CTL_IENABLE, ien);
 }
 
 static void chip_mask(struct irq_data *d)
 {
 	unsigned ien;
 	ien = RDCTL(CTL_IENABLE);
-	ien &= ~(1 << d->irq);
+	ien &= ~(1 << d->hwirq);
 	WRCTL(CTL_IENABLE, ien);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -41,15 +41,15 @@ static void chip_unmask(struct irq_data *d)`
`41`	`41`	`{`
`42`	`42`	`unsigned ien;`
`43`	`43`	`ien = RDCTL(CTL_IENABLE);`
`44`		`- ien \|= (1 << d->irq);`
	`44`	`+ ien \|= (1 << d->hwirq);`
`45`	`45`	`WRCTL(CTL_IENABLE, ien);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`static void chip_mask(struct irq_data *d)`
`49`	`49`	`{`
`50`	`50`	`unsigned ien;`
`51`	`51`	`ien = RDCTL(CTL_IENABLE);`
`52`		`- ien &= ~(1 << d->irq);`
	`52`	`+ ien &= ~(1 << d->hwirq);`
`53`	`53`	`WRCTL(CTL_IENABLE, ien);`
`54`	`54`	`}`
`55`	`55`