patch-2.4.22 linux-2.4.22/arch/sparc64/kernel/pci_sabre.c

• Lines: 25
• Date: 2003-08-25 04:44:40.000000000 -0700
• Orig file: linux-2.4.21/arch/sparc64/kernel/pci_sabre.c
• Orig date: 2002-08-02 17:39:43.000000000 -0700

diff -urN linux-2.4.21/arch/sparc64/kernel/pci_sabre.c linux-2.4.22/arch/sparc64/kernel/pci_sabre.c
@@ -1543,6 +1543,7 @@
 	u32 busrange[2];
 	u32 vdma[2];
 	u32 upa_portid, dma_mask;
+	u64 clear_irq;
 	int bus;
 
 	hummingbird_p = 0;
@@ -1619,6 +1620,16 @@
 	printk("PCI: Found SABRE, main regs at %016lx, wsync at %016lx\n",
 	       p->controller_regs, pci_dma_wsync);
 
+	/* Clear interrupts */
+
+	/* PCI first */
+	for (clear_irq = SABRE_ICLR_A_SLOT0; clear_irq < SABRE_ICLR_B_SLOT0 + 0x80; clear_irq += 8)
+		sabre_write(p->controller_regs + clear_irq, 0x0UL);
+
+	/* Then OBIO */
+	for (clear_irq = SABRE_ICLR_SCSI; clear_irq < SABRE_ICLR_SCSI + 0x80; clear_irq += 8)
+		sabre_write(p->controller_regs + clear_irq, 0x0UL);
+
 	/* Error interrupts are enabled later after the bus scan. */
 	sabre_write(p->controller_regs + SABRE_PCICTRL,
 		    (SABRE_PCICTRL_MRLEN   | SABRE_PCICTRL_SERR |