mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-13 03:37:32 +02:00
240 lines
6.9 KiB
Diff
240 lines
6.9 KiB
Diff
|
From 5d0de52f8e36916485a61b820916b71b5d918e6f Mon Sep 17 00:00:00 2001
|
||
|
From: Gabor Juhos <juhosg@openwrt.org>
|
||
|
Date: Sun, 24 Jun 2012 13:44:23 +0200
|
||
|
Subject: [PATCH 19/34] MIPS: ath79: add IRQ handling code for the QCA955X SoCs
|
||
|
|
||
|
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||
|
---
|
||
|
arch/mips/ath79/irq.c | 110 ++++++++++++++++++++++--
|
||
|
arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 32 +++++++
|
||
|
arch/mips/include/asm/mach-ath79/irq.h | 9 ++-
|
||
|
3 files changed, 142 insertions(+), 9 deletions(-)
|
||
|
|
||
|
--- a/arch/mips/ath79/irq.c
|
||
|
+++ b/arch/mips/ath79/irq.c
|
||
|
@@ -130,7 +130,10 @@ static void __init ath79_misc_irq_init(v
|
||
|
|
||
|
if (soc_is_ar71xx() || soc_is_ar913x())
|
||
|
ath79_misc_irq_chip.irq_mask_ack = ar71xx_misc_irq_mask;
|
||
|
- else if (soc_is_ar724x() || soc_is_ar933x() || soc_is_ar934x())
|
||
|
+ else if (soc_is_ar724x() ||
|
||
|
+ soc_is_ar933x() ||
|
||
|
+ soc_is_ar934x() ||
|
||
|
+ soc_is_qca955x())
|
||
|
ath79_misc_irq_chip.irq_ack = ar724x_misc_irq_ack;
|
||
|
else
|
||
|
BUG();
|
||
|
@@ -177,6 +180,88 @@ static void ar934x_ip2_irq_init(void)
|
||
|
irq_set_chained_handler(ATH79_CPU_IRQ_IP2, ar934x_ip2_irq_dispatch);
|
||
|
}
|
||
|
|
||
|
+static void qca955x_ip2_irq_dispatch(unsigned int irq, struct irq_desc *desc)
|
||
|
+{
|
||
|
+ u32 status;
|
||
|
+
|
||
|
+ disable_irq_nosync(irq);
|
||
|
+
|
||
|
+ status = ath79_reset_rr(QCA955X_RESET_REG_EXT_INT_STATUS);
|
||
|
+ status &= QCA955X_EXT_INT_PCIE_RC1_ALL | QCA955X_EXT_INT_WMAC_ALL;
|
||
|
+
|
||
|
+ if (status == 0) {
|
||
|
+ spurious_interrupt();
|
||
|
+ goto enable;
|
||
|
+ }
|
||
|
+
|
||
|
+ if (status & QCA955X_EXT_INT_PCIE_RC1_ALL) {
|
||
|
+ /* TODO: flush DDR? */
|
||
|
+ generic_handle_irq(ATH79_IP2_IRQ(0));
|
||
|
+ }
|
||
|
+
|
||
|
+ if (status & QCA955X_EXT_INT_WMAC_ALL) {
|
||
|
+ /* TODO: flsuh DDR? */
|
||
|
+ generic_handle_irq(ATH79_IP2_IRQ(1));
|
||
|
+ }
|
||
|
+
|
||
|
+enable:
|
||
|
+ enable_irq(irq);
|
||
|
+}
|
||
|
+
|
||
|
+static void qca955x_ip3_irq_dispatch(unsigned int irq, struct irq_desc *desc)
|
||
|
+{
|
||
|
+ u32 status;
|
||
|
+
|
||
|
+ disable_irq_nosync(irq);
|
||
|
+
|
||
|
+ status = ath79_reset_rr(QCA955X_RESET_REG_EXT_INT_STATUS);
|
||
|
+ status &= QCA955X_EXT_INT_PCIE_RC2_ALL |
|
||
|
+ QCA955X_EXT_INT_USB1 |
|
||
|
+ QCA955X_EXT_INT_USB2;
|
||
|
+
|
||
|
+ if (status == 0) {
|
||
|
+ spurious_interrupt();
|
||
|
+ goto enable;
|
||
|
+ }
|
||
|
+
|
||
|
+ if (status & QCA955X_EXT_INT_USB1) {
|
||
|
+ /* TODO: flush DDR? */
|
||
|
+ generic_handle_irq(ATH79_IP3_IRQ(0));
|
||
|
+ }
|
||
|
+
|
||
|
+ if (status & QCA955X_EXT_INT_USB2) {
|
||
|
+ /* TODO: flsuh DDR? */
|
||
|
+ generic_handle_irq(ATH79_IP3_IRQ(1));
|
||
|
+ }
|
||
|
+
|
||
|
+ if (status & QCA955X_EXT_INT_PCIE_RC2_ALL) {
|
||
|
+ /* TODO: flush DDR? */
|
||
|
+ generic_handle_irq(ATH79_IP3_IRQ(2));
|
||
|
+ }
|
||
|
+
|
||
|
+enable:
|
||
|
+ enable_irq(irq);
|
||
|
+}
|
||
|
+
|
||
|
+static void qca955x_irq_init(void)
|
||
|
+{
|
||
|
+ int i;
|
||
|
+
|
||
|
+ for (i = ATH79_IP2_IRQ_BASE;
|
||
|
+ i < ATH79_IP2_IRQ_BASE + ATH79_IP2_IRQ_COUNT; i++)
|
||
|
+ irq_set_chip_and_handler(i, &dummy_irq_chip,
|
||
|
+ handle_level_irq);
|
||
|
+
|
||
|
+ irq_set_chained_handler(ATH79_CPU_IRQ_IP2, qca955x_ip2_irq_dispatch);
|
||
|
+
|
||
|
+ for (i = ATH79_IP3_IRQ_BASE;
|
||
|
+ i < ATH79_IP3_IRQ_BASE + ATH79_IP3_IRQ_COUNT; i++)
|
||
|
+ irq_set_chip_and_handler(i, &dummy_irq_chip,
|
||
|
+ handle_level_irq);
|
||
|
+
|
||
|
+ irq_set_chained_handler(ATH79_CPU_IRQ_IP3, qca955x_ip3_irq_dispatch);
|
||
|
+}
|
||
|
+
|
||
|
asmlinkage void plat_irq_dispatch(void)
|
||
|
{
|
||
|
unsigned long pending;
|
||
|
@@ -212,6 +297,17 @@ asmlinkage void plat_irq_dispatch(void)
|
||
|
* Issue a flush in the handlers to ensure that the driver sees
|
||
|
* the update.
|
||
|
*/
|
||
|
+
|
||
|
+static void ath79_default_ip2_handler(void)
|
||
|
+{
|
||
|
+ do_IRQ(ATH79_CPU_IRQ_IP2);
|
||
|
+}
|
||
|
+
|
||
|
+static void ath79_default_ip3_handler(void)
|
||
|
+{
|
||
|
+ do_IRQ(ATH79_CPU_IRQ_USB);
|
||
|
+}
|
||
|
+
|
||
|
static void ar71xx_ip2_handler(void)
|
||
|
{
|
||
|
ath79_ddr_wb_flush(AR71XX_DDR_REG_FLUSH_PCI);
|
||
|
@@ -236,11 +332,6 @@ static void ar933x_ip2_handler(void)
|
||
|
do_IRQ(ATH79_CPU_IRQ_IP2);
|
||
|
}
|
||
|
|
||
|
-static void ar934x_ip2_handler(void)
|
||
|
-{
|
||
|
- do_IRQ(ATH79_CPU_IRQ_IP2);
|
||
|
-}
|
||
|
-
|
||
|
static void ar71xx_ip3_handler(void)
|
||
|
{
|
||
|
ath79_ddr_wb_flush(AR71XX_DDR_REG_FLUSH_USB);
|
||
|
@@ -286,8 +377,11 @@ void __init arch_init_irq(void)
|
||
|
ath79_ip2_handler = ar933x_ip2_handler;
|
||
|
ath79_ip3_handler = ar933x_ip3_handler;
|
||
|
} else if (soc_is_ar934x()) {
|
||
|
- ath79_ip2_handler = ar934x_ip2_handler;
|
||
|
+ ath79_ip2_handler = ath79_default_ip2_handler;
|
||
|
ath79_ip3_handler = ar934x_ip3_handler;
|
||
|
+ } else if (soc_is_qca955x()) {
|
||
|
+ ath79_ip2_handler = ath79_default_ip2_handler;
|
||
|
+ ath79_ip3_handler = ath79_default_ip3_handler;
|
||
|
} else {
|
||
|
BUG();
|
||
|
}
|
||
|
@@ -298,4 +392,6 @@ void __init arch_init_irq(void)
|
||
|
|
||
|
if (soc_is_ar934x())
|
||
|
ar934x_ip2_irq_init();
|
||
|
+ else if (soc_is_qca955x())
|
||
|
+ qca955x_irq_init();
|
||
|
}
|
||
|
--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
|
||
|
+++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
|
||
|
@@ -300,6 +300,7 @@
|
||
|
#define AR934X_RESET_REG_PCIE_WMAC_INT_STATUS 0xac
|
||
|
|
||
|
#define QCA955X_RESET_REG_BOOTSTRAP 0xb0
|
||
|
+#define QCA955X_RESET_REG_EXT_INT_STATUS 0xac
|
||
|
|
||
|
#define MISC_INT_ETHSW BIT(12)
|
||
|
#define MISC_INT_TIMER4 BIT(10)
|
||
|
@@ -398,6 +399,37 @@
|
||
|
AR934X_PCIE_WMAC_INT_PCIE_RC1 | AR934X_PCIE_WMAC_INT_PCIE_RC2 | \
|
||
|
AR934X_PCIE_WMAC_INT_PCIE_RC3)
|
||
|
|
||
|
+#define QCA955X_EXT_INT_WMAC_MISC BIT(0)
|
||
|
+#define QCA955X_EXT_INT_WMAC_TX BIT(1)
|
||
|
+#define QCA955X_EXT_INT_WMAC_RXLP BIT(2)
|
||
|
+#define QCA955X_EXT_INT_WMAC_RXHP BIT(3)
|
||
|
+#define QCA955X_EXT_INT_PCIE_RC1 BIT(4)
|
||
|
+#define QCA955X_EXT_INT_PCIE_RC1_INT0 BIT(5)
|
||
|
+#define QCA955X_EXT_INT_PCIE_RC1_INT1 BIT(6)
|
||
|
+#define QCA955X_EXT_INT_PCIE_RC1_INT2 BIT(7)
|
||
|
+#define QCA955X_EXT_INT_PCIE_RC1_INT3 BIT(8)
|
||
|
+#define QCA955X_EXT_INT_PCIE_RC2 BIT(12)
|
||
|
+#define QCA955X_EXT_INT_PCIE_RC2_INT0 BIT(13)
|
||
|
+#define QCA955X_EXT_INT_PCIE_RC2_INT1 BIT(14)
|
||
|
+#define QCA955X_EXT_INT_PCIE_RC2_INT2 BIT(15)
|
||
|
+#define QCA955X_EXT_INT_PCIE_RC2_INT3 BIT(16)
|
||
|
+#define QCA955X_EXT_INT_USB1 BIT(24)
|
||
|
+#define QCA955X_EXT_INT_USB2 BIT(28)
|
||
|
+
|
||
|
+#define QCA955X_EXT_INT_WMAC_ALL \
|
||
|
+ (QCA955X_EXT_INT_WMAC_MISC | QCA955X_EXT_INT_WMAC_TX | \
|
||
|
+ QCA955X_EXT_INT_WMAC_RXLP | QCA955X_EXT_INT_WMAC_RXHP)
|
||
|
+
|
||
|
+#define QCA955X_EXT_INT_PCIE_RC1_ALL \
|
||
|
+ (QCA955X_EXT_INT_PCIE_RC1 | QCA955X_EXT_INT_PCIE_RC1_INT0 | \
|
||
|
+ QCA955X_EXT_INT_PCIE_RC1_INT1 | QCA955X_EXT_INT_PCIE_RC1_INT2 | \
|
||
|
+ QCA955X_EXT_INT_PCIE_RC1_INT3)
|
||
|
+
|
||
|
+#define QCA955X_EXT_INT_PCIE_RC2_ALL \
|
||
|
+ (QCA955X_EXT_INT_PCIE_RC2 | QCA955X_EXT_INT_PCIE_RC2_INT0 | \
|
||
|
+ QCA955X_EXT_INT_PCIE_RC2_INT1 | QCA955X_EXT_INT_PCIE_RC2_INT2 | \
|
||
|
+ QCA955X_EXT_INT_PCIE_RC2_INT3)
|
||
|
+
|
||
|
#define REV_ID_MAJOR_MASK 0xfff0
|
||
|
#define REV_ID_MAJOR_AR71XX 0x00a0
|
||
|
#define REV_ID_MAJOR_AR913X 0x00b0
|
||
|
--- a/arch/mips/include/asm/mach-ath79/irq.h
|
||
|
+++ b/arch/mips/include/asm/mach-ath79/irq.h
|
||
|
@@ -10,7 +10,7 @@
|
||
|
#define __ASM_MACH_ATH79_IRQ_H
|
||
|
|
||
|
#define MIPS_CPU_IRQ_BASE 0
|
||
|
-#define NR_IRQS 48
|
||
|
+#define NR_IRQS 51
|
||
|
|
||
|
#define ATH79_MISC_IRQ_BASE 8
|
||
|
#define ATH79_MISC_IRQ_COUNT 32
|
||
|
@@ -23,8 +23,13 @@
|
||
|
#define ATH79_IP2_IRQ_COUNT 2
|
||
|
#define ATH79_IP2_IRQ(_x) (ATH79_IP2_IRQ_BASE + (_x))
|
||
|
|
||
|
+#define ATH79_IP3_IRQ_BASE (ATH79_IP2_IRQ_BASE + ATH79_IP2_IRQ_COUNT)
|
||
|
+#define ATH79_IP3_IRQ_COUNT 3
|
||
|
+#define ATH79_IP3_IRQ(_x) (ATH79_IP3_IRQ_BASE + (_x))
|
||
|
+
|
||
|
#define ATH79_CPU_IRQ_IP2 (MIPS_CPU_IRQ_BASE + 2)
|
||
|
-#define ATH79_CPU_IRQ_USB (MIPS_CPU_IRQ_BASE + 3)
|
||
|
+#define ATH79_CPU_IRQ_IP3 (MIPS_CPU_IRQ_BASE + 3)
|
||
|
+#define ATH79_CPU_IRQ_USB ATH79_CPU_IRQ_IP3
|
||
|
#define ATH79_CPU_IRQ_GE0 (MIPS_CPU_IRQ_BASE + 4)
|
||
|
#define ATH79_CPU_IRQ_GE1 (MIPS_CPU_IRQ_BASE + 5)
|
||
|
#define ATH79_CPU_IRQ_MISC (MIPS_CPU_IRQ_BASE + 6)
|