From: "Simon Arlott" <simon@fire.lp0.eu> To: "MIPS Mailing List" <linux-mips@linux-mips.org> Cc: "Jonas Gorski" <jogo@openwrt.org>, "devicetree@vger.kernel.org" <devicetree@vger.kernel.org>, "Ralf Baechle" <ralf@linux-mips.org>, "Thomas Gleixner" <tglx@linutronix.de>, "Jason Cooper" <jason@lakedaemon.net>, "Marc Zyngier" <marc.zyngier@arm.com>, "Kevin Cernekee" <cernekee@gmail.com>, "Florian Fainelli" <f.fainelli@gmail.com>, "Wim Van Sebroeck" <wim@iguana.be>, "Miguel Gaio" <miguel.gaio@efixo.com>, "Maxime Bizon" <mbizon@freebox.fr>, "Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>, linux-watchdog@vger.kernel.org, "Rob Herring" <robh+dt@kernel.org>, "Pawel Moll" <pawel.moll@arm.com>, "Mark Rutland" <mark.rutland@arm.com>, "Ian Campbell" <ijc+devicetree@hellion.org.uk>, "Kumar Gala" <galak@codeaurora.org> Subject: [PATCH (v3) 2/10] MIPS: bmips: Add bcm6345-l2-timer interrupt controller Date: Tue, 24 Nov 2015 22:10:05 -0000 [thread overview] Message-ID: <70d031ae4c3aa29888d77b64686c39e7e7eaae92@8b5064a13e22126c1b9329f0dc35b8915774b7c3.invalid> (raw) In-Reply-To: <565361AF.20400@simon.arlott.org.uk> Add the BCM6345/BCM6318 timer as an interrupt controller so that it can be used by the watchdog to warn that its timer will expire soon. Support for clocksource/clockevents is not implemented as the timer interrupt is not per CPU (except on the BCM6318) and the MIPS clock is better. This could be added later if required without changing the device tree binding. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> --- Fixed the offset of the count registers, they were writing off by one which caused it to set the watchdog timeout to 0. drivers/irqchip/Kconfig | 5 + drivers/irqchip/Makefile | 1 + drivers/irqchip/irq-bcm6345-l2-timer.c | 324 +++++++++++++++++++++++++++++++++ 3 files changed, 330 insertions(+) create mode 100644 drivers/irqchip/irq-bcm6345-l2-timer.c diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index d307bb3..21c3d9b 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -70,6 +70,11 @@ config BCM6345_L1_IRQ select GENERIC_IRQ_CHIP select IRQ_DOMAIN +config BCM6345_L2_TIMER_IRQ + bool + select GENERIC_IRQ_CHIP + select IRQ_DOMAIN + config BCM7038_L1_IRQ bool select GENERIC_IRQ_CHIP diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index ded59cf..2687dea 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -44,6 +44,7 @@ obj-$(CONFIG_XTENSA_MX) += irq-xtensa-mx.o obj-$(CONFIG_IRQ_CROSSBAR) += irq-crossbar.o obj-$(CONFIG_SOC_VF610) += irq-vf610-mscm-ir.o obj-$(CONFIG_BCM6345_L1_IRQ) += irq-bcm6345-l1.o +obj-$(CONFIG_BCM6345_L2_TIMER_IRQ) += irq-bcm6345-l2-timer.o obj-$(CONFIG_BCM7038_L1_IRQ) += irq-bcm7038-l1.o obj-$(CONFIG_BCM7120_L2_IRQ) += irq-bcm7120-l2.o obj-$(CONFIG_BRCMSTB_L2_IRQ) += irq-brcmstb-l2.o diff --git a/drivers/irqchip/irq-bcm6345-l2-timer.c b/drivers/irqchip/irq-bcm6345-l2-timer.c new file mode 100644 index 0000000..4e6f71b --- /dev/null +++ b/drivers/irqchip/irq-bcm6345-l2-timer.c @@ -0,0 +1,324 @@ +/* + * Copyright 2015 Simon Arlott + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Based on arch/mips/bcm63xx/timer.c: + * Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr> + * + * Registers for SoCs with 4 timers: BCM6345, BCM6328, BCM6362, BCM6816, + * BCM68220,BCM63168, BCM63268 + * 0x02: IRQ enable (u8) + * 0x03: IRQ status (u8) + * 0x04: Timer 0 control + * 0x08: Timer 1 control + * 0x0c: Timer 2 control + * 0x10: Timer 0 count + * 0x14: Timer 1 count + * 0x18: Timer 2 count + * 0x1c+: Watchdog registers + * + * Registers for SoCs with 5 timers: BCM6318 + * 0x00: IRQ enable (u32) + * 0x04: IRQ status (u32) + * 0x08: Timer 0 control + * 0x0c: Timer 1 control + * 0x10: Timer 2 control + * 0x14: Timer 3 control + * 0x18: Timer 0 count + * 0x1c: Timer 1 count + * 0x20: Timer 2 count + * 0x24: Timer 3 count + * 0x28+: Watchdog registers + */ + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +#include <linux/bitops.h> +#include <linux/interrupt.h> +#include <linux/irqreturn.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of_address.h> +#include <linux/of_irq.h> +#include <linux/of_platform.h> +#include <linux/slab.h> +#include <linux/spinlock.h> +#include <linux/string.h> +#include <linux/irqchip.h> +#include <linux/irqchip/chained_irq.h> + +#define REG_6345_IRQ_ENABLE 0x02 +#define REG_6345_IRQ_STATUS 0x03 +#define REG_6345_CONTROL_BASE 0x04 +#define REG_6345_COUNT_BASE 0x10 + +#define REG_6318_IRQ_ENABLE 0x00 +#define REG_6318_IRQ_STATUS 0x04 +#define REG_6318_CONTROL_BASE 0x08 +#define REG_6318_COUNT_BASE 0x18 + +#define NR_TIMERS_6345 4 +#define WDT_TIMER_ID_6345 (NR_TIMERS_6345 - 1) + +#define NR_TIMERS_6318 5 +#define WDT_TIMER_ID_6318 (NR_TIMERS_6318 - 1) + +/* Per-timer count register */ +#define COUNT_MASK (0x3fffffff) + +/* Per-timer control register */ +#define CONTROL_COUNTDOWN_MASK (0x3fffffff) +#define CONTROL_RSTCNTCLR_MASK (1 << 30) +#define CONTROL_ENABLE_MASK (1 << 31) + +enum bcm6345_timer_type { + TIMER_TYPE_6345, + TIMER_TYPE_6318, +}; + +struct bcm6345_timer { + raw_spinlock_t lock; + void __iomem *base; + unsigned int irq; + struct irq_domain *domain; + + enum bcm6345_timer_type type; + unsigned int nr_timers; + /* The watchdog timer has separate control/remaining registers + * and cannot be masked. + */ + int wdt_timer_id; +}; + +static inline u32 bcm6345_timer_read_int_status(struct bcm6345_timer *timer) +{ + if (timer->type == TIMER_TYPE_6318) + return __raw_readl(timer->base + REG_6318_IRQ_STATUS); + else + return __raw_readb(timer->base + REG_6345_IRQ_STATUS); +} + +static inline void bcm6345_timer_write_int_status(struct bcm6345_timer *timer, + u32 val) +{ + if (timer->type == TIMER_TYPE_6318) + __raw_writel(val, timer->base + REG_6318_IRQ_STATUS); + else + __raw_writeb(val, timer->base + REG_6345_IRQ_STATUS); +} + +static inline u32 bcm6345_timer_read_int_enable(struct bcm6345_timer *timer) +{ + if (timer->type == TIMER_TYPE_6318) + return __raw_readl(timer->base + REG_6318_IRQ_ENABLE); + else + return __raw_readb(timer->base + REG_6345_IRQ_ENABLE); +} + +static inline void bcm6345_timer_write_int_enable(struct bcm6345_timer *timer, + u32 val) +{ + if (timer->type == TIMER_TYPE_6318) + __raw_writel(val, timer->base + REG_6318_IRQ_ENABLE); + else + __raw_writeb(val, timer->base + REG_6345_IRQ_ENABLE); +} + +static inline void bcm6345_timer_write_control(struct bcm6345_timer *timer, + unsigned int id, u32 val) +{ + if (timer->type == TIMER_TYPE_6318) + __raw_writel(0, timer->base + REG_6318_CONTROL_BASE + id * 4); + else + __raw_writel(0, timer->base + REG_6345_CONTROL_BASE + id * 4); +} + +static inline void bcm6345_timer_write_count(struct bcm6345_timer *timer, + unsigned int id, u32 val) +{ + if (timer->type == TIMER_TYPE_6318) + __raw_writel(0, timer->base + REG_6318_COUNT_BASE + id * 4); + else + __raw_writel(0, timer->base + REG_6345_COUNT_BASE + id * 4); +} + +static inline void bcm6345_timer_stop(struct bcm6345_timer *timer, int id) +{ + bcm6345_timer_write_control(timer, id, 0); + bcm6345_timer_write_count(timer, id, 0); + bcm6345_timer_write_int_status(timer, BIT(id)); +} + +static void bcm6345_timer_interrupt(struct irq_desc *desc) +{ + struct bcm6345_timer *timer = irq_desc_get_handler_data(desc); + struct irq_chip *chip = irq_desc_get_chip(desc); + unsigned long pending; + irq_hw_number_t hwirq; + unsigned int irq; + + chained_irq_enter(chip, desc); + + pending = bcm6345_timer_read_int_status(timer); + pending &= bcm6345_timer_read_int_enable(timer) | + BIT(timer->wdt_timer_id); /* Watchdog can't be masked */ + + for_each_set_bit(hwirq, &pending, timer->nr_timers) { + irq = irq_linear_revmap(timer->domain, hwirq); + if (irq) + do_IRQ(irq); + else + spurious_interrupt(); + } + + chained_irq_exit(chip, desc); +} + +static void bcm6345_timer_unmask(struct irq_data *d) +{ + struct bcm6345_timer *timer = irq_data_get_irq_chip_data(d); + unsigned long flags; + u8 val; + + if (d->hwirq != timer->wdt_timer_id) { + raw_spin_lock_irqsave(&timer->lock, flags); + val = bcm6345_timer_read_int_enable(timer); + val |= BIT(d->hwirq); + bcm6345_timer_write_int_enable(timer, val); + raw_spin_unlock_irqrestore(&timer->lock, flags); + } +} + +static void bcm6345_timer_mask(struct irq_data *d) +{ + struct bcm6345_timer *timer = irq_data_get_irq_chip_data(d); + unsigned long flags; + u32 val; + + if (d->hwirq != timer->wdt_timer_id) { + raw_spin_lock_irqsave(&timer->lock, flags); + val = bcm6345_timer_read_int_enable(timer); + val &= ~BIT(d->hwirq); + bcm6345_timer_write_int_enable(timer, val); + raw_spin_unlock_irqrestore(&timer->lock, flags); + } +} + +static void bcm6345_timer_eoi(struct irq_data *d) +{ + struct bcm6345_timer *timer = irq_data_get_irq_chip_data(d); + + if (d->hwirq != timer->wdt_timer_id) + bcm6345_timer_write_int_status(timer, BIT(d->hwirq)); +} + +static struct irq_chip bcm6345_timer_chip = { + .name = "bcm6345-timer", + .irq_mask = bcm6345_timer_mask, + .irq_unmask = bcm6345_timer_unmask, + .irq_eoi = bcm6345_timer_eoi, +}; + +static int bcm6345_timer_map(struct irq_domain *d, unsigned int virq, + irq_hw_number_t hwirq) +{ + struct bcm6345_timer *timer = d->host_data; + + irq_set_chip_and_handler(virq, &bcm6345_timer_chip, + hwirq == timer->wdt_timer_id ? + handle_simple_irq : handle_fasteoi_irq); + irq_set_chip_data(virq, timer); + return 0; +} + +static const struct irq_domain_ops bcm6345_timer_domain_ops = { + .xlate = irq_domain_xlate_onecell, + .map = bcm6345_timer_map, +}; + +static int __init bcm63xx_timer_init(struct device_node *node, + enum bcm6345_timer_type type, unsigned int nr_timers, int wdt_timer_id) +{ + struct bcm6345_timer *timer; + int ret, i; + + timer = kzalloc(sizeof(*timer), GFP_KERNEL); + if (!timer) + return -ENOMEM; + + raw_spin_lock_init(&timer->lock); + timer->type = type; + timer->nr_timers = nr_timers; + timer->wdt_timer_id = wdt_timer_id; + + timer->irq = irq_of_parse_and_map(node, 0); + if (!timer->irq) { + pr_err("unable to map parent IRQ\n"); + ret = -EINVAL; + goto free_timer; + } + + timer->base = of_iomap(node, 0); + if (!timer->base) { + pr_err("unable to remap registers\n"); + ret = -ENOMEM; + goto free_timer; + } + + timer->domain = irq_domain_add_linear(node, timer->nr_timers, + &bcm6345_timer_domain_ops, timer); + if (!timer->domain) { + pr_err("unable to add IRQ domain"); + ret = -ENOMEM; + goto unmap_io; + } + + /* Mask all interrupts and stop all timers */ + bcm6345_timer_write_int_enable(timer, 0); + for (i = 0; i < timer->nr_timers; i++) + if (i != timer->wdt_timer_id) + bcm6345_timer_stop(timer, i); + + irq_set_chained_handler_and_data(timer->irq, + bcm6345_timer_interrupt, timer); + + if (timer->type == TIMER_TYPE_6318) + pr_info("registered BCM6318 L2 (timer) intc at MMIO 0x%p (irq = %d, IRQs: %d)\n", + timer->base, timer->irq, timer->nr_timers); + else + pr_info("registered BCM6345 L2 (timer) intc at MMIO 0x%p (irq = %d, IRQs: %d)\n", + timer->base, timer->irq, timer->nr_timers); + return 0; + +unmap_io: + iounmap(timer->base); +free_timer: + kfree(timer); + return ret; +} + +static int __init bcm6318_timer_init(struct device_node *node, + struct device_node *parent) +{ + return bcm63xx_timer_init(node, TIMER_TYPE_6318, + NR_TIMERS_6318, WDT_TIMER_ID_6318); +} + +static int __init bcm6345_timer_init(struct device_node *node, + struct device_node *parent) +{ + return bcm63xx_timer_init(node, TIMER_TYPE_6345, + NR_TIMERS_6345, WDT_TIMER_ID_6345); +} + +IRQCHIP_DECLARE(bcm6318_l2_timer, "brcm,bcm6318-timer", bcm6318_timer_init); +IRQCHIP_DECLARE(bcm6345_l2_timer, "brcm,bcm6345-timer", bcm6345_timer_init); -- 2.1.4 -- Simon Arlott
WARNING: multiple messages have this Message-ID (diff)
From: "Simon Arlott" <simon-A6De1vDTPLDsq35pWSNszA@public.gmane.org> To: MIPS Mailing List <linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org> Cc: Jonas Gorski <jogo-p3rKhJxN3npAfugRpC6u6w@public.gmane.org>, "devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>, Ralf Baechle <ralf-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org>, Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>, Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org>, Marc Zyngier <marc.zyngier-5wv7dgnIgG8@public.gmane.org>, Kevin Cernekee <cernekee-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, Florian Fainelli <f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, Wim Van Sebroeck <wim-IQzOog9fTRqzQB+pC5nmwQ@public.gmane.org>, Miguel Gaio <miguel.gaio-HH44TBFINEIAvxtiuMwx3w@public.gmane.org>, Maxime Bizon <mbizon-MmRyKUhfbQ9GWvitb5QawA@public.gmane.org>, Linux Kernel Mailing List <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>, linux-watchdog-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org>, Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>, Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org>, Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> Subject: [PATCH (v3) 2/10] MIPS: bmips: Add bcm6345-l2-timer interrupt controller Date: Tue, 24 Nov 2015 22:10:05 -0000 [thread overview] Message-ID: <70d031ae4c3aa29888d77b64686c39e7e7eaae92@8b5064a13e22126c1b9329f0dc35b8915774b7c3.invalid> (raw) In-Reply-To: <565361AF.20400-qdVf85lJwsCyrPCCpiK2c/XRex20P6io@public.gmane.org> Add the BCM6345/BCM6318 timer as an interrupt controller so that it can be used by the watchdog to warn that its timer will expire soon. Support for clocksource/clockevents is not implemented as the timer interrupt is not per CPU (except on the BCM6318) and the MIPS clock is better. This could be added later if required without changing the device tree binding. Signed-off-by: Simon Arlott <simon-A6De1vDTPLDsq35pWSNszA@public.gmane.org> --- Fixed the offset of the count registers, they were writing off by one which caused it to set the watchdog timeout to 0. drivers/irqchip/Kconfig | 5 + drivers/irqchip/Makefile | 1 + drivers/irqchip/irq-bcm6345-l2-timer.c | 324 +++++++++++++++++++++++++++++++++ 3 files changed, 330 insertions(+) create mode 100644 drivers/irqchip/irq-bcm6345-l2-timer.c diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index d307bb3..21c3d9b 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -70,6 +70,11 @@ config BCM6345_L1_IRQ select GENERIC_IRQ_CHIP select IRQ_DOMAIN +config BCM6345_L2_TIMER_IRQ + bool + select GENERIC_IRQ_CHIP + select IRQ_DOMAIN + config BCM7038_L1_IRQ bool select GENERIC_IRQ_CHIP diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index ded59cf..2687dea 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -44,6 +44,7 @@ obj-$(CONFIG_XTENSA_MX) += irq-xtensa-mx.o obj-$(CONFIG_IRQ_CROSSBAR) += irq-crossbar.o obj-$(CONFIG_SOC_VF610) += irq-vf610-mscm-ir.o obj-$(CONFIG_BCM6345_L1_IRQ) += irq-bcm6345-l1.o +obj-$(CONFIG_BCM6345_L2_TIMER_IRQ) += irq-bcm6345-l2-timer.o obj-$(CONFIG_BCM7038_L1_IRQ) += irq-bcm7038-l1.o obj-$(CONFIG_BCM7120_L2_IRQ) += irq-bcm7120-l2.o obj-$(CONFIG_BRCMSTB_L2_IRQ) += irq-brcmstb-l2.o diff --git a/drivers/irqchip/irq-bcm6345-l2-timer.c b/drivers/irqchip/irq-bcm6345-l2-timer.c new file mode 100644 index 0000000..4e6f71b --- /dev/null +++ b/drivers/irqchip/irq-bcm6345-l2-timer.c @@ -0,0 +1,324 @@ +/* + * Copyright 2015 Simon Arlott + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Based on arch/mips/bcm63xx/timer.c: + * Copyright (C) 2008 Maxime Bizon <mbizon-MmRyKUhfbQ9GWvitb5QawA@public.gmane.org> + * + * Registers for SoCs with 4 timers: BCM6345, BCM6328, BCM6362, BCM6816, + * BCM68220,BCM63168, BCM63268 + * 0x02: IRQ enable (u8) + * 0x03: IRQ status (u8) + * 0x04: Timer 0 control + * 0x08: Timer 1 control + * 0x0c: Timer 2 control + * 0x10: Timer 0 count + * 0x14: Timer 1 count + * 0x18: Timer 2 count + * 0x1c+: Watchdog registers + * + * Registers for SoCs with 5 timers: BCM6318 + * 0x00: IRQ enable (u32) + * 0x04: IRQ status (u32) + * 0x08: Timer 0 control + * 0x0c: Timer 1 control + * 0x10: Timer 2 control + * 0x14: Timer 3 control + * 0x18: Timer 0 count + * 0x1c: Timer 1 count + * 0x20: Timer 2 count + * 0x24: Timer 3 count + * 0x28+: Watchdog registers + */ + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +#include <linux/bitops.h> +#include <linux/interrupt.h> +#include <linux/irqreturn.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of_address.h> +#include <linux/of_irq.h> +#include <linux/of_platform.h> +#include <linux/slab.h> +#include <linux/spinlock.h> +#include <linux/string.h> +#include <linux/irqchip.h> +#include <linux/irqchip/chained_irq.h> + +#define REG_6345_IRQ_ENABLE 0x02 +#define REG_6345_IRQ_STATUS 0x03 +#define REG_6345_CONTROL_BASE 0x04 +#define REG_6345_COUNT_BASE 0x10 + +#define REG_6318_IRQ_ENABLE 0x00 +#define REG_6318_IRQ_STATUS 0x04 +#define REG_6318_CONTROL_BASE 0x08 +#define REG_6318_COUNT_BASE 0x18 + +#define NR_TIMERS_6345 4 +#define WDT_TIMER_ID_6345 (NR_TIMERS_6345 - 1) + +#define NR_TIMERS_6318 5 +#define WDT_TIMER_ID_6318 (NR_TIMERS_6318 - 1) + +/* Per-timer count register */ +#define COUNT_MASK (0x3fffffff) + +/* Per-timer control register */ +#define CONTROL_COUNTDOWN_MASK (0x3fffffff) +#define CONTROL_RSTCNTCLR_MASK (1 << 30) +#define CONTROL_ENABLE_MASK (1 << 31) + +enum bcm6345_timer_type { + TIMER_TYPE_6345, + TIMER_TYPE_6318, +}; + +struct bcm6345_timer { + raw_spinlock_t lock; + void __iomem *base; + unsigned int irq; + struct irq_domain *domain; + + enum bcm6345_timer_type type; + unsigned int nr_timers; + /* The watchdog timer has separate control/remaining registers + * and cannot be masked. + */ + int wdt_timer_id; +}; + +static inline u32 bcm6345_timer_read_int_status(struct bcm6345_timer *timer) +{ + if (timer->type == TIMER_TYPE_6318) + return __raw_readl(timer->base + REG_6318_IRQ_STATUS); + else + return __raw_readb(timer->base + REG_6345_IRQ_STATUS); +} + +static inline void bcm6345_timer_write_int_status(struct bcm6345_timer *timer, + u32 val) +{ + if (timer->type == TIMER_TYPE_6318) + __raw_writel(val, timer->base + REG_6318_IRQ_STATUS); + else + __raw_writeb(val, timer->base + REG_6345_IRQ_STATUS); +} + +static inline u32 bcm6345_timer_read_int_enable(struct bcm6345_timer *timer) +{ + if (timer->type == TIMER_TYPE_6318) + return __raw_readl(timer->base + REG_6318_IRQ_ENABLE); + else + return __raw_readb(timer->base + REG_6345_IRQ_ENABLE); +} + +static inline void bcm6345_timer_write_int_enable(struct bcm6345_timer *timer, + u32 val) +{ + if (timer->type == TIMER_TYPE_6318) + __raw_writel(val, timer->base + REG_6318_IRQ_ENABLE); + else + __raw_writeb(val, timer->base + REG_6345_IRQ_ENABLE); +} + +static inline void bcm6345_timer_write_control(struct bcm6345_timer *timer, + unsigned int id, u32 val) +{ + if (timer->type == TIMER_TYPE_6318) + __raw_writel(0, timer->base + REG_6318_CONTROL_BASE + id * 4); + else + __raw_writel(0, timer->base + REG_6345_CONTROL_BASE + id * 4); +} + +static inline void bcm6345_timer_write_count(struct bcm6345_timer *timer, + unsigned int id, u32 val) +{ + if (timer->type == TIMER_TYPE_6318) + __raw_writel(0, timer->base + REG_6318_COUNT_BASE + id * 4); + else + __raw_writel(0, timer->base + REG_6345_COUNT_BASE + id * 4); +} + +static inline void bcm6345_timer_stop(struct bcm6345_timer *timer, int id) +{ + bcm6345_timer_write_control(timer, id, 0); + bcm6345_timer_write_count(timer, id, 0); + bcm6345_timer_write_int_status(timer, BIT(id)); +} + +static void bcm6345_timer_interrupt(struct irq_desc *desc) +{ + struct bcm6345_timer *timer = irq_desc_get_handler_data(desc); + struct irq_chip *chip = irq_desc_get_chip(desc); + unsigned long pending; + irq_hw_number_t hwirq; + unsigned int irq; + + chained_irq_enter(chip, desc); + + pending = bcm6345_timer_read_int_status(timer); + pending &= bcm6345_timer_read_int_enable(timer) | + BIT(timer->wdt_timer_id); /* Watchdog can't be masked */ + + for_each_set_bit(hwirq, &pending, timer->nr_timers) { + irq = irq_linear_revmap(timer->domain, hwirq); + if (irq) + do_IRQ(irq); + else + spurious_interrupt(); + } + + chained_irq_exit(chip, desc); +} + +static void bcm6345_timer_unmask(struct irq_data *d) +{ + struct bcm6345_timer *timer = irq_data_get_irq_chip_data(d); + unsigned long flags; + u8 val; + + if (d->hwirq != timer->wdt_timer_id) { + raw_spin_lock_irqsave(&timer->lock, flags); + val = bcm6345_timer_read_int_enable(timer); + val |= BIT(d->hwirq); + bcm6345_timer_write_int_enable(timer, val); + raw_spin_unlock_irqrestore(&timer->lock, flags); + } +} + +static void bcm6345_timer_mask(struct irq_data *d) +{ + struct bcm6345_timer *timer = irq_data_get_irq_chip_data(d); + unsigned long flags; + u32 val; + + if (d->hwirq != timer->wdt_timer_id) { + raw_spin_lock_irqsave(&timer->lock, flags); + val = bcm6345_timer_read_int_enable(timer); + val &= ~BIT(d->hwirq); + bcm6345_timer_write_int_enable(timer, val); + raw_spin_unlock_irqrestore(&timer->lock, flags); + } +} + +static void bcm6345_timer_eoi(struct irq_data *d) +{ + struct bcm6345_timer *timer = irq_data_get_irq_chip_data(d); + + if (d->hwirq != timer->wdt_timer_id) + bcm6345_timer_write_int_status(timer, BIT(d->hwirq)); +} + +static struct irq_chip bcm6345_timer_chip = { + .name = "bcm6345-timer", + .irq_mask = bcm6345_timer_mask, + .irq_unmask = bcm6345_timer_unmask, + .irq_eoi = bcm6345_timer_eoi, +}; + +static int bcm6345_timer_map(struct irq_domain *d, unsigned int virq, + irq_hw_number_t hwirq) +{ + struct bcm6345_timer *timer = d->host_data; + + irq_set_chip_and_handler(virq, &bcm6345_timer_chip, + hwirq == timer->wdt_timer_id ? + handle_simple_irq : handle_fasteoi_irq); + irq_set_chip_data(virq, timer); + return 0; +} + +static const struct irq_domain_ops bcm6345_timer_domain_ops = { + .xlate = irq_domain_xlate_onecell, + .map = bcm6345_timer_map, +}; + +static int __init bcm63xx_timer_init(struct device_node *node, + enum bcm6345_timer_type type, unsigned int nr_timers, int wdt_timer_id) +{ + struct bcm6345_timer *timer; + int ret, i; + + timer = kzalloc(sizeof(*timer), GFP_KERNEL); + if (!timer) + return -ENOMEM; + + raw_spin_lock_init(&timer->lock); + timer->type = type; + timer->nr_timers = nr_timers; + timer->wdt_timer_id = wdt_timer_id; + + timer->irq = irq_of_parse_and_map(node, 0); + if (!timer->irq) { + pr_err("unable to map parent IRQ\n"); + ret = -EINVAL; + goto free_timer; + } + + timer->base = of_iomap(node, 0); + if (!timer->base) { + pr_err("unable to remap registers\n"); + ret = -ENOMEM; + goto free_timer; + } + + timer->domain = irq_domain_add_linear(node, timer->nr_timers, + &bcm6345_timer_domain_ops, timer); + if (!timer->domain) { + pr_err("unable to add IRQ domain"); + ret = -ENOMEM; + goto unmap_io; + } + + /* Mask all interrupts and stop all timers */ + bcm6345_timer_write_int_enable(timer, 0); + for (i = 0; i < timer->nr_timers; i++) + if (i != timer->wdt_timer_id) + bcm6345_timer_stop(timer, i); + + irq_set_chained_handler_and_data(timer->irq, + bcm6345_timer_interrupt, timer); + + if (timer->type == TIMER_TYPE_6318) + pr_info("registered BCM6318 L2 (timer) intc at MMIO 0x%p (irq = %d, IRQs: %d)\n", + timer->base, timer->irq, timer->nr_timers); + else + pr_info("registered BCM6345 L2 (timer) intc at MMIO 0x%p (irq = %d, IRQs: %d)\n", + timer->base, timer->irq, timer->nr_timers); + return 0; + +unmap_io: + iounmap(timer->base); +free_timer: + kfree(timer); + return ret; +} + +static int __init bcm6318_timer_init(struct device_node *node, + struct device_node *parent) +{ + return bcm63xx_timer_init(node, TIMER_TYPE_6318, + NR_TIMERS_6318, WDT_TIMER_ID_6318); +} + +static int __init bcm6345_timer_init(struct device_node *node, + struct device_node *parent) +{ + return bcm63xx_timer_init(node, TIMER_TYPE_6345, + NR_TIMERS_6345, WDT_TIMER_ID_6345); +} + +IRQCHIP_DECLARE(bcm6318_l2_timer, "brcm,bcm6318-timer", bcm6318_timer_init); +IRQCHIP_DECLARE(bcm6345_l2_timer, "brcm,bcm6345-timer", bcm6345_timer_init); -- 2.1.4 -- Simon Arlott -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2015-11-24 22:10 UTC|newest] Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-11-21 19:02 [PATCH 1/4] clocksource: Add brcm,bcm6345-timer device tree binding Simon Arlott 2015-11-21 19:02 ` Simon Arlott 2015-11-21 19:03 ` [PATCH 2/4] MIPS: bmips: Add bcm6345-l2-timer interrupt controller Simon Arlott 2015-11-21 19:04 ` [PATCH 3/4] watchdog: Add brcm,bcm6345-wdt device tree binding Simon Arlott 2015-11-22 22:13 ` Rob Herring 2015-11-22 22:13 ` Rob Herring 2015-11-21 19:05 ` [PATCH 4/4] MIPS: bmips: Convert bcm63xx_wdt to use WATCHDOG_CORE Simon Arlott 2015-11-21 19:05 ` Simon Arlott 2015-11-21 21:32 ` Guenter Roeck 2015-11-21 21:44 ` Simon Arlott 2015-11-21 21:44 ` Simon Arlott 2015-11-22 2:32 ` Guenter Roeck 2015-11-22 14:02 ` [PATCH 4/10] (Was: [PATCH 4/4]) " Simon Arlott 2015-11-22 14:05 ` [PATCH 4/10] watchdog: bcm63xx_wdt: Handle hardware interrupt and remove software timer Simon Arlott 2015-11-24 18:21 ` Guenter Roeck 2015-11-24 18:21 ` Guenter Roeck 2015-11-24 18:21 ` Guenter Roeck 2015-11-25 20:14 ` Jonas Gorski 2015-11-25 20:14 ` Jonas Gorski 2015-11-25 20:28 ` Simon Arlott 2015-11-25 20:28 ` Simon Arlott 2015-11-25 22:33 ` [PATCH (v2) " Simon Arlott 2015-11-25 22:33 ` Simon Arlott 2015-11-22 14:06 ` [PATCH 5/10] watchdog: bcm63xx_wdt: Use WATCHDOG_CORE Simon Arlott 2015-11-22 14:06 ` Simon Arlott 2015-11-25 2:44 ` Guenter Roeck 2015-11-25 2:44 ` Guenter Roeck 2015-11-25 13:02 ` Simon Arlott 2015-11-25 14:10 ` Guenter Roeck 2015-11-25 14:10 ` Guenter Roeck 2015-11-25 19:43 ` Simon Arlott 2015-11-25 19:43 ` Simon Arlott 2015-11-25 22:40 ` [PATCH (v3) 5/11] " Simon Arlott 2015-11-25 22:40 ` Simon Arlott 2015-11-22 14:07 ` [PATCH 6/10] watchdog: bcm63xx_wdt: Obtain watchdog clock HZ from "periph" clk Simon Arlott 2015-11-22 14:07 ` Simon Arlott 2015-11-23 15:02 ` Jonas Gorski 2015-11-23 15:02 ` Jonas Gorski 2015-11-23 18:19 ` Florian Fainelli 2015-11-23 18:19 ` Florian Fainelli 2015-11-23 19:00 ` Simon Arlott 2015-11-23 19:00 ` Simon Arlott 2015-11-24 22:12 ` [PATCH (v2) " Simon Arlott 2015-11-24 22:42 ` Florian Fainelli 2015-11-24 22:42 ` Florian Fainelli 2015-11-25 22:47 ` [PATCH (v3) 6/11] " Simon Arlott 2015-11-25 22:47 ` Simon Arlott 2015-11-22 14:09 ` [PATCH 7/10] watchdog: bcm63xx_wdt: Add get_timeleft function Simon Arlott 2015-11-22 14:09 ` Simon Arlott 2015-11-24 22:15 ` [PATCH (v2) " Simon Arlott 2015-11-24 22:15 ` Simon Arlott 2015-11-24 22:43 ` Florian Fainelli 2015-11-24 22:43 ` Florian Fainelli 2015-11-25 2:51 ` Guenter Roeck 2015-11-25 2:51 ` Guenter Roeck 2015-11-25 8:17 ` Simon Arlott 2015-11-25 8:17 ` Simon Arlott 2015-11-25 22:50 ` [PATCH (v3) 7/11] " Simon Arlott 2015-11-25 22:50 ` Simon Arlott 2015-11-25 22:54 ` [PATCH (v4) " Simon Arlott 2015-11-25 22:54 ` Simon Arlott 2015-11-25 22:57 ` [PATCH (v4) 8/11] watchdog: bcm63xx_wdt: Warn if the watchdog is currently running Simon Arlott 2015-11-25 22:57 ` Simon Arlott 2015-11-22 14:11 ` [PATCH 8/10] watchdog: bcm63xx_wdt: Remove dependency on mach-bcm63xx functions/defines Simon Arlott 2015-11-22 14:11 ` Simon Arlott 2015-11-22 14:12 ` [PATCH 9/10] watchdog: bcm63xx_wdt: Use bcm63xx_timer interrupt directly Simon Arlott 2015-11-22 14:12 ` Simon Arlott 2015-11-25 23:03 ` [PATCH (v2) 10/11] " Simon Arlott 2015-11-25 23:03 ` Simon Arlott 2015-11-22 14:14 ` [PATCH 10/10] watchdog: bcm63xx_wdt: Use brcm,bcm6345-wdt device tree binding Simon Arlott 2015-11-22 14:14 ` Simon Arlott 2015-11-25 23:09 ` [PATCH (v2) 11/11] " Simon Arlott 2015-11-25 23:09 ` Simon Arlott 2015-11-22 22:12 ` [PATCH 1/4] clocksource: Add brcm,bcm6345-timer " Rob Herring 2015-11-23 15:33 ` Jonas Gorski 2015-11-23 18:55 ` [PATCH (v2) 1/10] " Simon Arlott 2015-11-23 18:55 ` Simon Arlott 2015-11-23 18:57 ` [PATCH (v2) 2/10] MIPS: bmips: Add bcm6345-l2-timer interrupt controller Simon Arlott 2015-11-23 18:57 ` Simon Arlott 2015-11-24 22:10 ` Simon Arlott [this message] 2015-11-24 22:10 ` [PATCH (v3) " Simon Arlott 2015-11-24 22:36 ` Florian Fainelli 2015-11-24 22:36 ` Florian Fainelli 2015-11-26 22:32 ` [PATCH (v4) 2/11] " Simon Arlott 2015-11-27 8:37 ` Thomas Gleixner 2015-11-27 8:37 ` Thomas Gleixner 2015-11-28 12:26 ` [PATCH (v5) 3/11] " Simon Arlott 2015-11-28 12:26 ` Simon Arlott 2015-12-01 0:22 ` Guenter Roeck 2015-12-01 0:22 ` Guenter Roeck 2016-05-09 12:01 ` Álvaro Fernández Rojas 2016-05-09 13:06 ` Guenter Roeck 2016-05-09 13:06 ` Guenter Roeck 2016-05-11 6:40 ` [PATCH 2/4] " Álvaro Fernández Rojas 2015-11-25 3:05 ` [PATCH (v2) 1/10] clocksource: Add brcm,bcm6345-timer device tree binding Rob Herring
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=70d031ae4c3aa29888d77b64686c39e7e7eaae92@8b5064a13e22126c1b9329f0dc35b8915774b7c3.invalid \ --to=simon@fire.lp0.eu \ --cc=cernekee@gmail.com \ --cc=devicetree@vger.kernel.org \ --cc=f.fainelli@gmail.com \ --cc=galak@codeaurora.org \ --cc=ijc+devicetree@hellion.org.uk \ --cc=jason@lakedaemon.net \ --cc=jogo@openwrt.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mips@linux-mips.org \ --cc=linux-watchdog@vger.kernel.org \ --cc=marc.zyngier@arm.com \ --cc=mark.rutland@arm.com \ --cc=mbizon@freebox.fr \ --cc=miguel.gaio@efixo.com \ --cc=pawel.moll@arm.com \ --cc=ralf@linux-mips.org \ --cc=robh+dt@kernel.org \ --cc=tglx@linutronix.de \ --cc=wim@iguana.be \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.