linux-mips
[Top] [All Lists]

[PATCH 1/7] Alchemy: prioritize timer and usb irqs

To: Linux-MIPS <linux-mips@linux-mips.org>, Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH 1/7] Alchemy: prioritize timer and usb irqs
From: Manuel Lauss <manuel.lauss@googlemail.com>
Date: Sun, 7 Jun 2009 20:38:58 +0200
Cc: Manuel Lauss <manuel.lauss@gmail.com>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=rVB54Vpk6XCjLnHWe0JKDCydeMIjJH6/SBYEax/TLwU=; b=VwXhSQfpWH3S2VzZ3jZYgM8WPsCawXAkWrkIfDOqELi3yIpaGCzPkKVJv0NtjQzUr7 1AT9rpZb6tqua9zv3WjRyqoLM8BmQbpFxOoFbrIo5l6mrEphVldU9jeR5vcXdqM1q9JH fNNXyswxx7xGm724P1tvHS4ywb3cDG+IIs4oY=
Domainkey-signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=tsofx4j8douvvC72yW7edSSOJ7F0xCjPvmJX2fVe6iTWxPCboeTtOG/51Npd3QOcww lAY481aq2exGGyn6w9MDlyfqByGnIQ1lcPphmfgiMaVorUzKE2ZOQJ+61Q8TBS+PM9Qk QJc6U7NGyFByaBGV7YHWRsvLZDwHmfOpITgHw=
In-reply-to: <1244399944-29043-1-git-send-email-manuel.lauss@gmail.com>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <1244399944-29043-1-git-send-email-manuel.lauss@gmail.com>
Sender: linux-mips-bounce@linux-mips.org
MIPS IRQ0-3 are already processed in order;  to assure that the system
timer and usb device request (if it exists) are processed with
highest priority, assign the RTCMATCH2 and USB device irq to request0
of IC0 (=IRQ0) and all other IC0 sources to request1 (=IRQ1).

This makes (in theory at least) the USB device irq hack unnecessary.

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
---
 arch/mips/alchemy/common/irq.c |  275 +++++++++++++++++++---------------------
 1 files changed, 133 insertions(+), 142 deletions(-)

diff --git a/arch/mips/alchemy/common/irq.c b/arch/mips/alchemy/common/irq.c
index c88c821..6882de3 100644
--- a/arch/mips/alchemy/common/irq.c
+++ b/arch/mips/alchemy/common/irq.c
@@ -39,164 +39,168 @@
 
 static int au1x_ic_settype(unsigned int irq, unsigned int flow_type);
 
-/* per-processor fixed function irqs */
+/* per-processor fixed function irqs.
+ * Note on request assignments:  to ensure timer (rtcmatch2) and usb
+ * device interrupts are processed with highest priority, they are
+ * exclusively assigned to request 0 and all others to request 1.
+ */
 struct au1xxx_irqmap au1xxx_ic0_map[] __initdata = {
 
 #if defined(CONFIG_SOC_AU1000)
-       { AU1000_UART0_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_UART1_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_UART2_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_UART3_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_SSI0_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_SSI1_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_DMA_INT_BASE, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_DMA_INT_BASE+1, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_DMA_INT_BASE+2, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_DMA_INT_BASE+3, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_DMA_INT_BASE+4, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_DMA_INT_BASE+5, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_DMA_INT_BASE+6, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_DMA_INT_BASE+7, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_TOY_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1000_TOY_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1000_TOY_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 0 },
+       { AU1000_UART0_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_UART1_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_UART2_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_UART3_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_SSI0_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_SSI1_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_DMA_INT_BASE, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_DMA_INT_BASE+1, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_DMA_INT_BASE+2, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_DMA_INT_BASE+3, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_DMA_INT_BASE+4, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_DMA_INT_BASE+5, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_DMA_INT_BASE+6, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_DMA_INT_BASE+7, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_TOY_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1000_TOY_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1000_TOY_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 1 },
        { AU1000_TOY_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 1 },
-       { AU1000_RTC_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1000_RTC_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1000_RTC_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 0 },
+       { AU1000_RTC_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1000_RTC_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1000_RTC_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 1 },
        { AU1000_RTC_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1000_IRDA_TX_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_IRDA_RX_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
+       { AU1000_IRDA_TX_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_IRDA_RX_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
        { AU1000_USB_DEV_REQ_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_USB_DEV_SUS_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1000_USB_HOST_INT, IRQ_TYPE_LEVEL_LOW, 0 },
-       { AU1000_ACSYNC_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1000_MAC0_DMA_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_MAC1_DMA_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_AC97C_INT, IRQ_TYPE_EDGE_RISING, 0 },
+       { AU1000_USB_DEV_SUS_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1000_USB_HOST_INT, IRQ_TYPE_LEVEL_LOW, 1 },
+       { AU1000_ACSYNC_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1000_MAC0_DMA_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_MAC1_DMA_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_AC97C_INT, IRQ_TYPE_EDGE_RISING, 1 },
 
 #elif defined(CONFIG_SOC_AU1500)
 
-       { AU1500_UART0_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_PCI_INTA, IRQ_TYPE_LEVEL_LOW, 0 },
-       { AU1000_PCI_INTB, IRQ_TYPE_LEVEL_LOW, 0 },
-       { AU1500_UART3_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_PCI_INTC, IRQ_TYPE_LEVEL_LOW, 0 },
-       { AU1000_PCI_INTD, IRQ_TYPE_LEVEL_LOW, 0 },
-       { AU1000_DMA_INT_BASE, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_DMA_INT_BASE+1, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_DMA_INT_BASE+2, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_DMA_INT_BASE+3, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_DMA_INT_BASE+4, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_DMA_INT_BASE+5, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_DMA_INT_BASE+6, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_DMA_INT_BASE+7, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_TOY_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1000_TOY_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1000_TOY_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 0 },
+       { AU1500_UART0_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_PCI_INTA, IRQ_TYPE_LEVEL_LOW, 1 },
+       { AU1000_PCI_INTB, IRQ_TYPE_LEVEL_LOW, 1 },
+       { AU1500_UART3_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_PCI_INTC, IRQ_TYPE_LEVEL_LOW, 1 },
+       { AU1000_PCI_INTD, IRQ_TYPE_LEVEL_LOW, 1 },
+       { AU1000_DMA_INT_BASE, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_DMA_INT_BASE+1, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_DMA_INT_BASE+2, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_DMA_INT_BASE+3, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_DMA_INT_BASE+4, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_DMA_INT_BASE+5, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_DMA_INT_BASE+6, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_DMA_INT_BASE+7, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_TOY_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1000_TOY_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1000_TOY_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 1 },
        { AU1000_TOY_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 1 },
-       { AU1000_RTC_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1000_RTC_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1000_RTC_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 0 },
+       { AU1000_RTC_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1000_RTC_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1000_RTC_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 1 },
        { AU1000_RTC_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 0 },
        { AU1000_USB_DEV_REQ_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_USB_DEV_SUS_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1000_USB_HOST_INT, IRQ_TYPE_LEVEL_LOW, 0 },
-       { AU1000_ACSYNC_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1500_MAC0_DMA_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1500_MAC1_DMA_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_AC97C_INT, IRQ_TYPE_EDGE_RISING, 0 },
+       { AU1000_USB_DEV_SUS_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1000_USB_HOST_INT, IRQ_TYPE_LEVEL_LOW, 1 },
+       { AU1000_ACSYNC_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1500_MAC0_DMA_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1500_MAC1_DMA_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_AC97C_INT, IRQ_TYPE_EDGE_RISING, 1 },
 
 #elif defined(CONFIG_SOC_AU1100)
 
-       { AU1100_UART0_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1100_UART1_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1100_SD_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1100_UART3_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_SSI0_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_SSI1_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_DMA_INT_BASE, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_DMA_INT_BASE+1, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_DMA_INT_BASE+2, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_DMA_INT_BASE+3, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_DMA_INT_BASE+4, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_DMA_INT_BASE+5, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_DMA_INT_BASE+6, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_DMA_INT_BASE+7, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_TOY_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1000_TOY_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1000_TOY_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 0 },
+       { AU1100_UART0_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1100_UART1_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1100_SD_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1100_UART3_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_SSI0_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_SSI1_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_DMA_INT_BASE, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_DMA_INT_BASE+1, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_DMA_INT_BASE+2, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_DMA_INT_BASE+3, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_DMA_INT_BASE+4, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_DMA_INT_BASE+5, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_DMA_INT_BASE+6, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_DMA_INT_BASE+7, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_TOY_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1000_TOY_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1000_TOY_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 1 },
        { AU1000_TOY_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 1 },
-       { AU1000_RTC_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1000_RTC_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1000_RTC_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 0 },
+       { AU1000_RTC_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1000_RTC_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1000_RTC_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 1 },
        { AU1000_RTC_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1000_IRDA_TX_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_IRDA_RX_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
+       { AU1000_IRDA_TX_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_IRDA_RX_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
        { AU1000_USB_DEV_REQ_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_USB_DEV_SUS_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1000_USB_HOST_INT, IRQ_TYPE_LEVEL_LOW, 0 },
-       { AU1000_ACSYNC_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1100_MAC0_DMA_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1100_LCD_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_AC97C_INT, IRQ_TYPE_EDGE_RISING, 0 },
+       { AU1000_USB_DEV_SUS_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1000_USB_HOST_INT, IRQ_TYPE_LEVEL_LOW, 1 },
+       { AU1000_ACSYNC_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1100_MAC0_DMA_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1100_LCD_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_AC97C_INT, IRQ_TYPE_EDGE_RISING, 1 },
 
 #elif defined(CONFIG_SOC_AU1550)
 
-       { AU1550_UART0_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1550_PCI_INTA, IRQ_TYPE_LEVEL_LOW, 0 },
-       { AU1550_PCI_INTB, IRQ_TYPE_LEVEL_LOW, 0 },
-       { AU1550_DDMA_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1550_CRYPTO_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1550_PCI_INTC, IRQ_TYPE_LEVEL_LOW, 0 },
-       { AU1550_PCI_INTD, IRQ_TYPE_LEVEL_LOW, 0 },
-       { AU1550_PCI_RST_INT, IRQ_TYPE_LEVEL_LOW, 0 },
-       { AU1550_UART1_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1550_UART3_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1550_PSC0_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1550_PSC1_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1550_PSC2_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1550_PSC3_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_TOY_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1000_TOY_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1000_TOY_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 0 },
+       { AU1550_UART0_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1550_PCI_INTA, IRQ_TYPE_LEVEL_LOW, 1 },
+       { AU1550_PCI_INTB, IRQ_TYPE_LEVEL_LOW, 1 },
+       { AU1550_DDMA_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1550_CRYPTO_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1550_PCI_INTC, IRQ_TYPE_LEVEL_LOW, 1 },
+       { AU1550_PCI_INTD, IRQ_TYPE_LEVEL_LOW, 1 },
+       { AU1550_PCI_RST_INT, IRQ_TYPE_LEVEL_LOW, 1 },
+       { AU1550_UART1_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1550_UART3_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1550_PSC0_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1550_PSC1_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1550_PSC2_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1550_PSC3_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_TOY_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1000_TOY_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1000_TOY_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 1 },
        { AU1000_TOY_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 1 },
-       { AU1000_RTC_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1000_RTC_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1000_RTC_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 0 },
+       { AU1000_RTC_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1000_RTC_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1000_RTC_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 1 },
        { AU1000_RTC_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1550_NAND_INT, IRQ_TYPE_EDGE_RISING, 0 },
+       { AU1550_NAND_INT, IRQ_TYPE_EDGE_RISING, 1 },
        { AU1550_USB_DEV_REQ_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1550_USB_DEV_SUS_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1550_USB_HOST_INT, IRQ_TYPE_LEVEL_LOW, 0 },
-       { AU1550_MAC0_DMA_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1550_MAC1_DMA_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
+       { AU1550_USB_DEV_SUS_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1550_USB_HOST_INT, IRQ_TYPE_LEVEL_LOW, 1 },
+       { AU1550_MAC0_DMA_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1550_MAC1_DMA_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
 
 #elif defined(CONFIG_SOC_AU1200)
 
-       { AU1200_UART0_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1200_SWT_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1200_SD_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1200_DDMA_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1200_MAE_BE_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1200_UART1_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1200_MAE_FE_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1200_PSC0_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1200_PSC1_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1200_AES_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1200_CAMERA_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1000_TOY_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1000_TOY_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1000_TOY_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 0 },
+       { AU1200_UART0_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1200_SWT_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1200_SD_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1200_DDMA_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1200_MAE_BE_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1200_UART1_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1200_MAE_FE_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1200_PSC0_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1200_PSC1_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1200_AES_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1200_CAMERA_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1000_TOY_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1000_TOY_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1000_TOY_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 1 },
        { AU1000_TOY_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 1 },
-       { AU1000_RTC_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1000_RTC_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1000_RTC_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 0 },
+       { AU1000_RTC_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1000_RTC_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 1 },
+       { AU1000_RTC_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 1 },
        { AU1000_RTC_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 0 },
-       { AU1200_NAND_INT, IRQ_TYPE_EDGE_RISING, 0 },
+       { AU1200_NAND_INT, IRQ_TYPE_EDGE_RISING, 1 },
        { AU1200_USB_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1200_LCD_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
-       { AU1200_MAE_BOTH_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
+       { AU1200_LCD_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
+       { AU1200_MAE_BOTH_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
 
 #else
 #error "Error: Unknown Alchemy SOC"
@@ -486,7 +490,7 @@ static int au1x_ic_settype(unsigned int irq, unsigned int 
flow_type)
 asmlinkage void plat_irq_dispatch(void)
 {
        unsigned int pending = read_c0_status() & read_c0_cause();
-       unsigned long s, off, bit;
+       unsigned long s, off;
 
        if (pending & CAUSEF_IP7) {
                do_IRQ(MIPS_CPU_IRQ_BASE + 7);
@@ -506,25 +510,12 @@ asmlinkage void plat_irq_dispatch(void)
        } else
                goto spurious;
 
-       bit = 0;
        s = au_readl(s);
        if (unlikely(!s)) {
 spurious:
                spurious_interrupt();
                return;
        }
-#ifdef AU1000_USB_DEV_REQ_INT
-       /*
-        * Because of the tight timing of SETUP token to reply
-        * transactions, the USB devices-side packet complete
-        * interrupt needs the highest priority.
-        */
-       bit = 1 << (AU1000_USB_DEV_REQ_INT - AU1000_INTC0_INT_BASE);
-       if ((pending & CAUSEF_IP2) && (s & bit)) {
-               do_IRQ(AU1000_USB_DEV_REQ_INT);
-               return;
-       }
-#endif
        do_IRQ(__ffs(s) + off);
 }
 
-- 
1.6.3.1


<Prev in Thread] Current Thread [Next in Thread>