From: Jason Cooper <jason@lakedaemon.net>
To: Rich Felker <dalias@libc.org>
Cc: linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org,
Marc Zyngier <marc.zyngier@arm.com>,
Thomas Gleixner <tglx@linutronix.de>
Subject: Re: [PATCH v3 08/12] irqchip: add J-Core AIC driver
Date: Fri, 15 Jul 2016 16:19:17 +0000 [thread overview]
Message-ID: <20160715161917.GG31509@io.lakedaemon.net> (raw)
In-Reply-To: <05a5be0a4f1471272dcdd2259e4d97642ee43759.1464148904.git.dalias@libc.org>
Hi Rich,
On Wed, May 25, 2016 at 05:43:03AM +0000, Rich Felker wrote:
> There are two versions of the J-Core interrupt controller in use, aic1
> which generates interrupts with programmable priorities, but only
> supports 8 irq lines and maps them to cpu traps in the range 17 to 24,
> and aic2 which uses traps in the range 64-127 and supports up to 128
> irqs, with priorities dependent on the interrupt number. The Linux
> driver does not make use of priorities anyway.
>
> For simplicity, there is no aic1-specific logic in the driver beyond
> setting the priority register, which is necessary for interrupts to
> work at all. Eventually aic1 will likely be phased out, but it's
> currently in use in deployments and all released bitstream binaries.
>
> Signed-off-by: Rich Felker <dalias@libc.org>
> ---
>
> This version fixes a missing "static" reported in the previous
> version of the patch. I missed Marc Zyngier's reply to the v2 when
> preparing the v3 patch series, but I'm still not sure exactly what, if
> any, changes should come out of that discussion, and they'll probably
> mostly in the area of comments or changelog.
>
> drivers/irqchip/Kconfig | 6 +++
> drivers/irqchip/Makefile | 1 +
> drivers/irqchip/irq-jcore-aic.c | 95 +++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 102 insertions(+)
> create mode 100644 drivers/irqchip/irq-jcore-aic.c
Thanks for the ping, this slipped off my plate while getting back up to
speed... :-/
> diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
> index 3e12479..3cb37d6 100644
> --- a/drivers/irqchip/Kconfig
> +++ b/drivers/irqchip/Kconfig
> @@ -149,6 +149,12 @@ config PIC32_EVIC
> select GENERIC_IRQ_CHIP
> select IRQ_DOMAIN
>
> +config JCORE_AIC
> + bool "J-Core integrated AIC"
> + select IRQ_DOMAIN
> + help
> + Support for the J-Core integrated AIC.
> +
> config RENESAS_INTC_IRQPIN
> bool
> select IRQ_DOMAIN
> diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile
> index b03cfcb..5a1f1bf 100644
> --- a/drivers/irqchip/Makefile
> +++ b/drivers/irqchip/Makefile
> @@ -37,6 +37,7 @@ obj-$(CONFIG_I8259) += irq-i8259.o
> obj-$(CONFIG_IMGPDC_IRQ) += irq-imgpdc.o
> obj-$(CONFIG_IRQ_MIPS_CPU) += irq-mips-cpu.o
> obj-$(CONFIG_SIRF_IRQ) += irq-sirfsoc.o
> +obj-$(CONFIG_JCORE_AIC) += irq-jcore-aic.o
> obj-$(CONFIG_RENESAS_INTC_IRQPIN) += irq-renesas-intc-irqpin.o
> obj-$(CONFIG_RENESAS_IRQC) += irq-renesas-irqc.o
> obj-$(CONFIG_VERSATILE_FPGA_IRQ) += irq-versatile-fpga.o
> diff --git a/drivers/irqchip/irq-jcore-aic.c b/drivers/irqchip/irq-jcore-aic.c
> new file mode 100644
> index 0000000..1348cdb
> --- /dev/null
> +++ b/drivers/irqchip/irq-jcore-aic.c
> @@ -0,0 +1,95 @@
> +/*
> + * J-Core SoC AIC driver
> + *
> + * Copyright (C) 2015-2016 Smart Energy Instruments, Inc.
> + *
> + * 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.
> + */
> +
> +#include <linux/irq.h>
> +#include <linux/io.h>
> +#include <linux/irqchip.h>
> +#include <linux/irqdomain.h>
> +#include <linux/module.h>
> +#include <linux/cpu.h>
> +#include <linux/of.h>
> +#include <linux/of_address.h>
> +#include <linux/of_irq.h>
> +
> +#define AIC1_INTPRI 8
> +
> +static struct aic_data {
> + unsigned char __iomem *base;
void __iomem *base;
> + u32 cpu_offset;
> + struct irq_chip chip;
> + struct irq_domain *domain;
> + struct notifier_block nb;
> +} aic_data;
> +
> +static int aic_irqdomain_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hwirq)
> +{
> + struct aic_data *aic = d->host_data;
> +
> + irq_set_chip_data(irq, aic);
> + irq_set_chip_and_handler(irq, &aic->chip, handle_simple_irq);
> + irq_set_probe(irq);
> +
> + return 0;
> +}
> +
> +static const struct irq_domain_ops aic_irqdomain_ops = {
> + .map = aic_irqdomain_map,
> + .xlate = irq_domain_xlate_onecell,
> +};
> +
> +static void noop(struct irq_data *data)
> +{
> +}
> +
> +static void aic1_localenable(struct aic_data *aic)
> +{
> + unsigned cpu = smp_processor_id();
> + pr_info("Local AIC enable on cpu %u\n", cpu);
> + writel(0xffffffff, aic->base + cpu * aic->cpu_offset + AIC1_INTPRI);
> +}
> +
> +static int aic1_cpu_notify(struct notifier_block *self, unsigned long action, void *hcpu)
> +{
> + switch (action & ~CPU_TASKS_FROZEN) {
> + case CPU_STARTING:
> + aic1_localenable(container_of(self, struct aic_data, nb));
> + break;
> + }
> + return NOTIFY_OK;
> +}
Please take a look at the series posted by Anna-Maria Gleixner for
recent changes to the cpu hp state machine.
https://lkml.kernel.org/r/20160713153333.416260485@linutronix.de
> +
> +int __init aic_irq_of_init(struct device_node *node, struct device_node *parent)
> +{
> + struct aic_data *aic = &aic_data;
> +
> + aic->base = of_iomap(node, 0);
> + of_property_read_u32(node, "cpu-offset", &aic->cpu_offset);
> +
> + pr_info("Initializing J-Core AIC at %p\n", aic->base);
> +
> + if (of_device_is_compatible(node, "jcore,aic1")) {
> + /* For aic1, need to enabled zero-priority-by-default irqs */
> + aic->nb.notifier_call = aic1_cpu_notify;
> + register_cpu_notifier(&aic->nb);
> + aic1_localenable(aic);
> + }
> +
> + aic->chip.name = node->name;
> + aic->chip.irq_mask = noop;
> + aic->chip.irq_unmask = noop;
> +
> + aic->domain = irq_domain_add_linear(node, 128, &aic_irqdomain_ops, aic);
> + irq_create_strict_mappings(aic->domain, 16, 16, 112);
> +
> + return 0;
> +}
> +
> +IRQCHIP_DECLARE(jcore_aic2, "jcore,aic2", aic_irq_of_init);
> +IRQCHIP_DECLARE(jcore_aic1, "jcore,aic1", aic_irq_of_init);
thx,
Jason.
next prev parent reply other threads:[~2016-07-15 16:19 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-25 5:43 [PATCH v3 00/12] J-core J2 cpu and SoC peripherals support Rich Felker
2016-05-25 5:43 ` [PATCH v3 01/12] of: add vendor prefix for J-Core Rich Felker
2016-05-25 13:18 ` Rob Herring
2016-07-27 5:31 ` Rich Felker
2016-08-04 22:27 ` Rich Felker
2016-08-30 21:13 ` Rob Herring
2016-05-25 5:43 ` [PATCH v3 12/12] sh: add device tree source for J2 FPGA on Mimas v2 board Rich Felker
2016-05-25 10:33 ` Mark Rutland
2016-05-25 23:15 ` Rich Felker
2016-05-26 10:39 ` Mark Rutland
2016-05-25 5:43 ` [PATCH v3 02/12] of: add J-Core cpu bindings Rich Felker
2016-05-25 10:22 ` Mark Rutland
2016-05-25 23:04 ` Rich Felker
2016-05-26 7:54 ` Geert Uytterhoeven
2016-05-26 10:38 ` Mark Rutland
2016-05-26 15:33 ` Rich Felker
2016-05-27 9:13 ` Mark Rutland
2016-05-26 21:44 ` Rob Landley
2016-05-27 11:51 ` Afzal Mohammed
2016-05-25 5:43 ` [PATCH v3 09/12] clocksource: add J-Core timer/clocksource driver Rich Felker
2016-05-25 5:43 ` [PATCH v3 03/12] of: add J-Core interrupt controller bindings Rich Felker
2016-05-25 10:25 ` Mark Rutland
2016-05-25 23:08 ` Rich Felker
2016-05-25 5:43 ` [PATCH v3 11/12] sh: add defconfig for J-Core J2 Rich Felker
2016-05-25 5:43 ` [PATCH v3 07/12] sh: add AT_HWCAP flag for J-Core cas.l instruction Rich Felker
2016-05-25 5:43 ` [PATCH v3 10/12] spi: add driver for J-Core SPI controller Rich Felker
2016-05-25 10:17 ` Mark Brown
2016-05-27 1:16 ` Rich Felker
2016-05-27 11:27 ` Mark Brown
2016-05-25 5:43 ` [PATCH v3 04/12] of: add J-Core timer bindings Rich Felker
2016-06-01 13:58 ` Rob Herring
2016-06-01 17:53 ` Rich Felker
2016-06-01 21:53 ` Rich Felker
2016-06-01 22:36 ` Rob Herring
2016-06-02 1:34 ` Rich Felker
2016-06-02 22:44 ` Rob Herring
2016-06-23 21:16 ` Rich Felker
2016-07-14 22:18 ` Rich Felker
2016-05-25 5:43 ` [PATCH v3 05/12] of: add J-Core SPI master bindings Rich Felker
2016-05-25 19:04 ` Rob Herring
2016-05-25 5:43 ` [PATCH v3 06/12] sh: add support for J-Core J2 processor Rich Felker
2016-05-25 5:43 ` [PATCH v3 08/12] irqchip: add J-Core AIC driver Rich Felker
2016-07-15 1:27 ` Rich Felker
2016-07-15 18:19 ` Rich Felker
2016-07-15 15:35 ` Paul Gortmaker
2016-07-15 15:41 ` Rich Felker
2016-07-15 16:19 ` Jason Cooper [this message]
2016-07-15 17:02 ` Rich Felker
2016-05-25 7:22 ` [PATCH v3 00/12] J-core J2 cpu and SoC peripherals support Geert Uytterhoeven
2016-05-25 9:54 ` Mark Brown
2016-05-25 22:24 ` Rich Felker
2016-05-26 0:42 ` Mark Brown
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=20160715161917.GG31509@io.lakedaemon.net \
--to=jason@lakedaemon.net \
--cc=dalias@libc.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=tglx@linutronix.de \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).