You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
412 lines
10 KiB
Diff
412 lines
10 KiB
Diff
From 4d3886359d6f6ac475e143d5f3e3b389542a0510 Mon Sep 17 00:00:00 2001
|
|
From: Jonas Gorski <jogo@openwrt.org>
|
|
Date: Sun, 30 Nov 2014 14:53:12 +0100
|
|
Subject: [PATCH 17/20] irqchip: add support for bcm6345-style l2 irq
|
|
controller
|
|
|
|
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|
---
|
|
.../interrupt-controller/brcm,bcm6345-l2-intc.txt | 25 ++
|
|
drivers/irqchip/Kconfig | 4 +
|
|
drivers/irqchip/Makefile | 1 +
|
|
drivers/irqchip/irq-bcm6345-l2.c | 320 ++++++++++++++++++++
|
|
include/linux/irqchip/irq-bcm6345-l2-intc.h | 16 +
|
|
5 files changed, 366 insertions(+)
|
|
create mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm6345-l2-intc.txt
|
|
create mode 100644 drivers/irqchip/irq-bcm6345-l2.c
|
|
create mode 100644 include/linux/irqchip/irq-bcm6345-l2-intc.h
|
|
|
|
--- /dev/null
|
|
+++ b/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm6345-l2-intc.txt
|
|
@@ -0,0 +1,25 @@
|
|
+Broadcom BCM6345 Level 2 interrupt controller
|
|
+
|
|
+Required properties:
|
|
+
|
|
+- compatible: should be "brcm,bcm6345-l2-intc"
|
|
+- reg: specifies the base physical address and size of the registers;
|
|
+ multiple regs may be specified, and must match the amount of parent interrupts
|
|
+- interrupt-controller: identifies the node as an interrupt controller
|
|
+- #interrupt-cells: specifies the number of cells needed to encode an interrupt
|
|
+ source, should be 1
|
|
+- interrupt-parent: specifies the phandle to the parent interrupt controller
|
|
+ this one is cascaded from
|
|
+- interrupts: specifies the interrupt line(s) in the interrupt-parent controller
|
|
+ node, valid values depend on the type of parent interrupt controller
|
|
+
|
|
+Example:
|
|
+
|
|
+periph_intc: interrupt-controller@f0406800 {
|
|
+ compatible = "brcm,bcm6345-l2-intc";
|
|
+ interrupt-parent = <&mips_intc>;
|
|
+ #interrupt-cells = <1>;
|
|
+ reg = <0x10000020 0x10> <0x10000030 0x10>;
|
|
+ interrupt-controller;
|
|
+ interrupts = <2>, <3>;
|
|
+};
|
|
--- a/drivers/irqchip/Kconfig
|
|
+++ b/drivers/irqchip/Kconfig
|
|
@@ -30,6 +30,10 @@ config ARM_VIC_NR
|
|
The maximum number of VICs available in the system, for
|
|
power management.
|
|
|
|
+config BCM6345_L2_IRQ
|
|
+ bool
|
|
+ select IRQ_DOMAIN
|
|
+
|
|
config DW_APB_ICTL
|
|
bool
|
|
select IRQ_DOMAIN
|
|
--- a/drivers/irqchip/Makefile
|
|
+++ b/drivers/irqchip/Makefile
|
|
@@ -6,6 +6,7 @@ obj-$(CONFIG_ARCH_MMP) += irq-mmp.o
|
|
obj-$(CONFIG_ARCH_MVEBU) += irq-armada-370-xp.o
|
|
obj-$(CONFIG_ARCH_MXS) += irq-mxs.o
|
|
obj-$(CONFIG_ARCH_S3C24XX) += irq-s3c24xx.o
|
|
+obj-$(CONFIG_BCM6345_L2_IRQ) += irq-bcm6345-l2.o
|
|
obj-$(CONFIG_DW_APB_ICTL) += irq-dw-apb-ictl.o
|
|
obj-$(CONFIG_METAG) += irq-metag-ext.o
|
|
obj-$(CONFIG_METAG_PERFCOUNTER_IRQS) += irq-metag.o
|
|
--- /dev/null
|
|
+++ b/drivers/irqchip/irq-bcm6345-l2.c
|
|
@@ -0,0 +1,320 @@
|
|
+/*
|
|
+ * This file is subject to the terms and conditions of the GNU General Public
|
|
+ * License. See the file "COPYING" in the main directory of this archive
|
|
+ * for more details.
|
|
+ *
|
|
+ * Copyright (C) 2014 Jonas Gorski <jogo@openwrt.org>
|
|
+ */
|
|
+
|
|
+#include <linux/ioport.h>
|
|
+#include <linux/irq.h>
|
|
+#include <linux/irqchip/chained_irq.h>
|
|
+#include <linux/irqchip/irq-bcm6345-l2-intc.h>
|
|
+#include <linux/kernel.h>
|
|
+#include <linux/of.h>
|
|
+#include <linux/of_irq.h>
|
|
+#include <linux/of_address.h>
|
|
+#include <linux/slab.h>
|
|
+#include <linux/spinlock.h>
|
|
+
|
|
+#ifdef CONFIG_BCM63XX
|
|
+#include <asm/mach-bcm63xx/bcm63xx_irq.h>
|
|
+
|
|
+#define VIRQ_BASE IRQ_INTERNAL_BASE
|
|
+#else
|
|
+#define VIRQ_BASE 0
|
|
+#endif
|
|
+
|
|
+#include "irqchip.h"
|
|
+
|
|
+#define MAX_WORDS 4
|
|
+#define MAX_PARENT_IRQS 2
|
|
+#define IRQS_PER_WORD 32
|
|
+
|
|
+struct intc_block {
|
|
+ int parent_irq;
|
|
+ void __iomem *base;
|
|
+ void __iomem *en_reg[MAX_WORDS];
|
|
+ void __iomem *status_reg[MAX_WORDS];
|
|
+ u32 mask_cache[MAX_WORDS];
|
|
+};
|
|
+
|
|
+struct intc_data {
|
|
+ struct irq_chip chip;
|
|
+ struct intc_block block[MAX_PARENT_IRQS];
|
|
+
|
|
+ int num_words;
|
|
+
|
|
+ struct irq_domain *domain;
|
|
+ spinlock_t lock;
|
|
+};
|
|
+
|
|
+static void bcm6345_l2_intc_irq_handle(unsigned int irq, struct irq_desc *desc)
|
|
+{
|
|
+ struct intc_data *data = irq_desc_get_handler_data(desc);
|
|
+ struct irq_chip *chip = irq_desc_get_chip(desc);
|
|
+ struct intc_block *block;
|
|
+ unsigned int idx;
|
|
+
|
|
+ chained_irq_enter(chip, desc);
|
|
+
|
|
+ for (idx = 0; idx < MAX_PARENT_IRQS; idx++)
|
|
+ if (irq == data->block[idx].parent_irq)
|
|
+ block = &data->block[idx];
|
|
+
|
|
+ for (idx = 0; idx < data->num_words; idx++) {
|
|
+ int base = idx * IRQS_PER_WORD;
|
|
+ unsigned long pending;
|
|
+ int hw_irq;
|
|
+
|
|
+ raw_spin_lock(data->lock);
|
|
+ pending = __raw_readl(block->en_reg[idx]) &
|
|
+ __raw_readl(block->status_reg[idx]);
|
|
+ raw_spin_unlock(data->lock);
|
|
+
|
|
+ for_each_set_bit(hw_irq, &pending, IRQS_PER_WORD) {
|
|
+ generic_handle_irq(irq_find_mapping(data->domain, base + hw_irq));
|
|
+ }
|
|
+ }
|
|
+
|
|
+ chained_irq_exit(chip, desc);
|
|
+}
|
|
+
|
|
+static void bcm6345_l2_intc_irq_mask(struct irq_data *data)
|
|
+{
|
|
+ unsigned int i, reg, bit;
|
|
+ struct intc_data *priv = data->domain->host_data;
|
|
+ irq_hw_number_t hwirq = irqd_to_hwirq(data);
|
|
+
|
|
+ reg = hwirq / IRQS_PER_WORD;
|
|
+ bit = hwirq % IRQS_PER_WORD;
|
|
+
|
|
+ raw_spin_lock(priv->lock);
|
|
+ for (i = 0; i < MAX_PARENT_IRQS; i++) {
|
|
+ struct intc_block *block = &priv->block[i];
|
|
+ u32 val;
|
|
+
|
|
+ if (!block->parent_irq)
|
|
+ break;
|
|
+
|
|
+ val = __raw_readl(block->en_reg[reg]);
|
|
+ __raw_writel(val & ~BIT(bit), block->en_reg[reg]);
|
|
+ }
|
|
+ raw_spin_unlock(priv->lock);
|
|
+}
|
|
+
|
|
+static void bcm6345_l2_intc_irq_unmask(struct irq_data *data)
|
|
+{
|
|
+ unsigned int i, reg, bit;
|
|
+ struct intc_data *priv = data->domain->host_data;
|
|
+ irq_hw_number_t hwirq = irqd_to_hwirq(data);
|
|
+
|
|
+ reg = hwirq / IRQS_PER_WORD;
|
|
+ bit = hwirq % IRQS_PER_WORD;
|
|
+
|
|
+ raw_spin_lock(priv->lock);
|
|
+ for (i = 0; i < MAX_PARENT_IRQS; i++) {
|
|
+ struct intc_block *block = &priv->block[i];
|
|
+ u32 val;
|
|
+
|
|
+ if (!block->parent_irq)
|
|
+ break;
|
|
+
|
|
+ val = __raw_readl(block->en_reg[reg]);
|
|
+
|
|
+ if (block->mask_cache[reg] & BIT(bit))
|
|
+ val |= BIT(bit);
|
|
+ else
|
|
+ val &= ~BIT(bit);
|
|
+
|
|
+ __raw_writel(val, block->en_reg[reg]);
|
|
+
|
|
+ }
|
|
+ raw_spin_unlock(priv->lock);
|
|
+}
|
|
+
|
|
+#ifdef CONFIG_SMP
|
|
+static int bcm6345_l2_intc_set_affinity(struct irq_data *data,
|
|
+ const struct cpumask *mask,
|
|
+ bool force)
|
|
+{
|
|
+ irq_hw_number_t hwirq = irqd_to_hwirq(data);
|
|
+ struct intc_data *priv = data->domain->host_data;
|
|
+ unsigned int i, reg, bit;
|
|
+ int cpu;
|
|
+
|
|
+ reg = hwirq / IRQS_PER_WORD;
|
|
+ bit = hwirq % IRQS_PER_WORD;
|
|
+
|
|
+ /* we could route to more than one cpu, but performance
|
|
+ suffers, so fix it to one.
|
|
+ */
|
|
+ cpu = cpumask_any_and(mask, cpu_online_mask);
|
|
+ if (cpu >= nr_cpu_ids)
|
|
+ return -EINVAL;
|
|
+
|
|
+ if (cpu >= MAX_PARENT_IRQS)
|
|
+ return -EINVAL;
|
|
+
|
|
+ if (!priv->block[cpu].parent_irq)
|
|
+ return -EINVAL;
|
|
+
|
|
+ raw_spin_lock(priv->lock);
|
|
+ for (i = 0; i < MAX_PARENT_IRQS; i++) {
|
|
+ if (i == cpu)
|
|
+ priv->block[i].mask_cache[reg] |= BIT(bit);
|
|
+ else
|
|
+ priv->block[i].mask_cache[reg] &= ~BIT(bit);
|
|
+ }
|
|
+ raw_spin_unlock(priv->lock);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+#endif
|
|
+
|
|
+static int bcm6345_l2_map(struct irq_domain *d, unsigned int irq,
|
|
+ irq_hw_number_t hw)
|
|
+{
|
|
+ struct intc_data *priv = d->host_data;
|
|
+
|
|
+ irq_set_chip_and_handler(irq, &priv->chip, handle_level_irq);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static const struct irq_domain_ops bcm6345_l2_domain_ops = {
|
|
+ .xlate = irq_domain_xlate_onecell,
|
|
+ .map = bcm6345_l2_map,
|
|
+};
|
|
+
|
|
+static int __init __bcm6345_l2_intc_init(struct device_node *node,
|
|
+ int num_blocks, int *irq,
|
|
+ void __iomem **base, int num_words)
|
|
+{
|
|
+ struct intc_data *data;
|
|
+ unsigned int i, w, status_offset;
|
|
+
|
|
+ data = kzalloc(sizeof(*data), GFP_KERNEL);
|
|
+ if (!data)
|
|
+ return -ENOMEM;
|
|
+
|
|
+ status_offset = num_words * sizeof(u32);
|
|
+
|
|
+ for (i = 0; i < num_blocks; i++) {
|
|
+ struct intc_block *block = &data->block[i];
|
|
+
|
|
+ block->parent_irq = irq[i];
|
|
+ block->base = base[i];
|
|
+
|
|
+ for (w = 0; w < num_words; w++) {
|
|
+ int word_offset = sizeof(u32) * ((num_words - w) - 1);
|
|
+
|
|
+ block->en_reg[w] = base[i] + word_offset;
|
|
+ block->status_reg[w] = base[i] + status_offset;
|
|
+ block->status_reg[w] += word_offset;
|
|
+
|
|
+ /* route all interrups to line 0 by default */
|
|
+ if (i == 0)
|
|
+ block->mask_cache[w] = 0xffffffff;
|
|
+ }
|
|
+
|
|
+ irq_set_handler_data(block->parent_irq, data);
|
|
+ irq_set_chained_handler(block->parent_irq,
|
|
+ bcm6345_l2_intc_irq_handle);
|
|
+ }
|
|
+
|
|
+ data->num_words = num_words;
|
|
+
|
|
+ data->chip.name = "bcm6345-l2-intc";
|
|
+ data->chip.irq_mask = bcm6345_l2_intc_irq_mask;
|
|
+ data->chip.irq_unmask = bcm6345_l2_intc_irq_unmask;
|
|
+
|
|
+#ifdef CONFIG_SMP
|
|
+ if (num_blocks > 1)
|
|
+ data->chip.set_affinity = bcm6345_l2_intc_set_affinity;
|
|
+#endif
|
|
+
|
|
+ data->domain = irq_domain_add_simple(node, IRQS_PER_WORD * num_words,
|
|
+ VIRQ_BASE, &bcm6345_l2_domain_ops,
|
|
+ data);
|
|
+ if (!data->domain) {
|
|
+ kfree(data);
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+void __init bcm6345_l2_intc_init(int num_blocks, int *irq, void __iomem **base,
|
|
+ int num_words)
|
|
+{
|
|
+ __bcm6345_l2_intc_init(NULL, num_blocks, irq, base, num_words);
|
|
+}
|
|
+
|
|
+#ifdef CONFIG_OF
|
|
+static int __init bcm6345_l2_intc_of_init(struct device_node *node,
|
|
+ struct device_node *parent)
|
|
+{
|
|
+ struct resource res;
|
|
+ int num_irqs, ret = -EINVAL;
|
|
+ int irqs[MAX_PARENT_IRQS] = { 0 };
|
|
+ void __iomem *bases[MAX_PARENT_IRQS] = { NULL };
|
|
+ int words = 0;
|
|
+ int i;
|
|
+
|
|
+ num_irqs = of_irq_count(node);
|
|
+
|
|
+ if (num_irqs < 1 || num_irqs > MAX_PARENT_IRQS)
|
|
+ return -EINVAL;
|
|
+
|
|
+ for (i = 0; i < num_irqs; i++) {
|
|
+ resource_size_t size;
|
|
+
|
|
+ irqs[i] = irq_of_parse_and_map(node, i);
|
|
+ if (!irqs[i])
|
|
+ goto out_unmap;
|
|
+
|
|
+ if (of_address_to_resource(node, i, &res)) {
|
|
+ goto out_unmap;
|
|
+ }
|
|
+
|
|
+ size = resource_size(&res);
|
|
+ switch (size) {
|
|
+ case 8:
|
|
+ case 16:
|
|
+ case 32:
|
|
+ size = size / 8;
|
|
+ break;
|
|
+ default:
|
|
+ goto out_unmap;
|
|
+ }
|
|
+
|
|
+ if (words && words != size) {
|
|
+ ret = -EINVAL;
|
|
+ goto out_unmap;
|
|
+ }
|
|
+ words = size;
|
|
+
|
|
+ bases[i] = of_iomap(node, i);
|
|
+ if (!bases[i]) {
|
|
+ ret = -ENOMEM;
|
|
+ goto out_unmap;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ ret = __bcm6345_l2_intc_init(node, num_irqs, irqs, bases, words);
|
|
+ if (!ret)
|
|
+ return 0;
|
|
+
|
|
+out_unmap:
|
|
+ for (i = 0; i < num_irqs; i++) {
|
|
+ iounmap(bases[i]);
|
|
+ irq_dispose_mapping(irqs[i]);
|
|
+ }
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+IRQCHIP_DECLARE(bcm6345_l2_intc, "brcm,bcm6345-l2-intc",
|
|
+ bcm6345_l2_intc_of_init);
|
|
+#endif
|
|
--- /dev/null
|
|
+++ b/include/linux/irqchip/irq-bcm6345-l2-intc.h
|
|
@@ -0,0 +1,16 @@
|
|
+/*
|
|
+ * This file is subject to the terms and conditions of the GNU General Public
|
|
+ * License. See the file "COPYING" in the main directory of this archive
|
|
+ * for more details.
|
|
+ *
|
|
+ * Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>
|
|
+ * Copyright (C) 2008 Nicolas Schichan <nschichan@freebox.fr>
|
|
+ */
|
|
+
|
|
+#ifndef __INCLUDE_LINUX_IRQCHIP_IRQ_BCM6345_L2_INTC_H
|
|
+#define __INCLUDE_LINUX_IRQCHIP_IRQ_BCM6345_L2_INTC_H
|
|
+
|
|
+void bcm6345_l2_intc_init(int num_blocks, int *irq, void __iomem **base,
|
|
+ int num_words);
|
|
+
|
|
+#endif /* __INCLUDE_LINUX_IRQCHIP_IRQ_BCM6345_L2_INTC_H */
|