Fix dual UICs in 4xx PIC support

PATCH New Matt Porter 1 participant 1 message Jul 1, 2004

Share & tools

Matt Porter

author

2004-07-01 01:29 UTC #0 lore raw

PATCH 1/1 Fix dual UICs in 4xx PIC support

Fixes a case where we were not correctly acking the base cascade controller on PPC4xx. Patch from Pavel Bartusek <[email protected]>

Signed-off-by Matt Porter <[email protected]>

===== arch/ppc/syslib/ppc4xx_pic.c 1.10 vs edited =====

arch/ppc/syslib/ppc4xx_pic.c +7 -1

@@ -234,6 +234,9 @@
 	case 1:
 		mtdcr(DCRN_UIC_ER(UIC1), ppc_cached_irq_mask[word]);
 		mtdcr(DCRN_UIC_SR(UIC1), (1 << (31 - bit)));
+#if (NR_UICS == 2)
+		mtdcr(DCRN_UIC_SR(UIC0), (1 << (31 - UIC0_UIC1NC)));
+#endif
 #if (NR_UICS > 2)
 		mtdcr(DCRN_UIC_SR(UICB), UICB_UIC1NC);
 #endif

@@ -285,6 +288,9 @@
 			break;
 		case 1:
 			mtdcr(DCRN_UIC_SR(UIC1), 1 << (31 - bit));
+#if (NR_UICS == 2)
+			mtdcr(DCRN_UIC_SR(UIC0), (1 << (31 - UIC0_UIC1NC)));
+#endif
 #if (NR_UICS > 2)
 			mtdcr(DCRN_UIC_SR(UICB),  UICB_UIC1NC);
 #endif

@@ -423,7 +429,7 @@
 		       bit, sense);
 #endif
 		ppc_cached_sense_mask[word] |=
-		    (sense & IRQ_SENSE_MASK) << (31 - bit);
+		    (~sense & IRQ_SENSE_MASK) << (31 - bit);
 		ppc_cached_pol_mask[word] |=
 		    ((sense & IRQ_POLARITY_MASK) >> 1) << (31 - bit);
 		switch (word) {