From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6E84C54FD0 for ; Wed, 25 Mar 2020 11:26:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7E74220772 for ; Wed, 25 Mar 2020 11:26:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=crapouillou.net header.i=@crapouillou.net header.b="nj9JIoQ4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727440AbgCYL0U (ORCPT ); Wed, 25 Mar 2020 07:26:20 -0400 Received: from outils.crapouillou.net ([89.234.176.41]:47660 "EHLO crapouillou.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727082AbgCYL0U (ORCPT ); Wed, 25 Mar 2020 07:26:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1585135575; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vxToi3KTDzFJBN1BtzBBWc1h5r29Fizq0kChEo/QN34=; b=nj9JIoQ48/+TrFjPOPi5gGRB2uVE++5Na+KwJdpekcF/14qnsel6Lm9T5TdXHN8qyNWRlH IPfpe6YRwY4DR4l6JANh/GtXeqpw2fgBw4Bq3kz0AwcKlNnkCOv3h+k9MhoynTUZRd+4Qi VBT5sg7ZTqTpD17BQYz0DVfRxQyFfug= Date: Wed, 25 Mar 2020 12:25:58 +0100 From: Paul Cercueil Subject: Re: [PATCH v7 01/12] irqchip: Add driver for Loongson I/O Local Interrupt Controller To: Jiaxun Yang Cc: linux-mips@vger.kernel.org, Huacai Chen , Marc Zyngier , Thomas Gleixner , Jason Cooper , Rob Herring , Mark Rutland , Thomas Bogendoerfer , Jonathan Corbet , John Crispin , Matthias Brugger , Jean Delvare , "David S. Miller" , Mauro Carvalho Chehab , Jonathan Cameron , Greg Kroah-Hartman , Andy Shevchenko , Geert Uytterhoeven , Krzysztof Kozlowski , Miquel Raynal , Andi Kleen , "H. Nikolaus Schaller" , "Eric W. Biederman" , Tiezhu Yang , Yinglu Yang , Allison Randal , Bartlomiej Zolnierkiewicz , Paul Burton , Manuel Lauss , Serge Semin , Matt Redfearn , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-ide@vger.kernel.org Message-Id: In-Reply-To: <20200325022916.106641-2-jiaxun.yang@flygoat.com> References: <20200325022916.106641-1-jiaxun.yang@flygoat.com> <20200325022916.106641-2-jiaxun.yang@flygoat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Hi Jiaxun, Le mer. 25 mars 2020 =E0 10:28, Jiaxun Yang a=20 =E9crit : > This controller appeared on Loongson family of chips as the primary > package interrupt source. >=20 > Signed-off-by: Jiaxun Yang > Co-developed-by: Huacai Chen > Signed-off-by: Huacai Chen > Reviewed-by: Marc Zyngier > --- > v4-v5: > Resolve suggestions from maz: > - Remove DT validation > - Simplify unnucessary functions & variables > --- > drivers/irqchip/Kconfig | 9 + > drivers/irqchip/Makefile | 1 + > drivers/irqchip/irq-loongson-liointc.c | 261=20 > +++++++++++++++++++++++++ > 3 files changed, 271 insertions(+) > create mode 100644 drivers/irqchip/irq-loongson-liointc.c >=20 > diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig > index 6d397732138d..c609eaa319d2 100644 > --- a/drivers/irqchip/Kconfig > +++ b/drivers/irqchip/Kconfig > @@ -513,4 +513,13 @@ config EXYNOS_IRQ_COMBINER > Say yes here to add support for the IRQ combiner devices embedded > in Samsung Exynos chips. >=20 > +config LOONGSON_LIOINTC > + bool "Loongson Local I/O Interrupt Controller" > + depends on MACH_LOONGSON64 > + default y > + select IRQ_DOMAIN > + select GENERIC_IRQ_CHIP > + help > + Support for the Loongson Local I/O Interrupt Controller. > + > endmenu > diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile > index eae0d78cbf22..5e7678efdfe6 100644 > --- a/drivers/irqchip/Makefile > +++ b/drivers/irqchip/Makefile > @@ -105,3 +105,4 @@ obj-$(CONFIG_MADERA_IRQ) +=3D irq-madera.o > obj-$(CONFIG_LS1X_IRQ) +=3D irq-ls1x.o > obj-$(CONFIG_TI_SCI_INTR_IRQCHIP) +=3D irq-ti-sci-intr.o > obj-$(CONFIG_TI_SCI_INTA_IRQCHIP) +=3D irq-ti-sci-inta.o > +obj-$(CONFIG_LOONGSON_LIOINTC) +=3D irq-loongson-liointc.o > diff --git a/drivers/irqchip/irq-loongson-liointc.c=20 > b/drivers/irqchip/irq-loongson-liointc.c > new file mode 100644 > index 000000000000..18de2c09ece4 > --- /dev/null > +++ b/drivers/irqchip/irq-loongson-liointc.c > @@ -0,0 +1,261 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (C) 2020, Jiaxun Yang > + * Loongson Local IO Interrupt Controller support > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include > + > +#define LIOINTC_CHIP_IRQ 32 > +#define LIOINTC_NUM_PARENT 4 > + > +#define LIOINTC_INTC_CHIP_START 0x20 > + > +#define LIOINTC_REG_INTC_STATUS (LIOINTC_INTC_CHIP_START + 0x20) > +#define LIOINTC_REG_INTC_EN_STATUS (LIOINTC_INTC_CHIP_START + 0x04) > +#define LIOINTC_REG_INTC_ENABLE (LIOINTC_INTC_CHIP_START + 0x08) > +#define LIOINTC_REG_INTC_DISABLE (LIOINTC_INTC_CHIP_START + 0x0c) > +#define LIOINTC_REG_INTC_POL (LIOINTC_INTC_CHIP_START + 0x10) > +#define LIOINTC_REG_INTC_EDGE (LIOINTC_INTC_CHIP_START + 0x14) > + > +#define LIOINTC_SHIFT_INTx 4 > + > +struct liointc_handler_data { > + struct liointc_priv *priv; > + u32 parent_int_map; > +}; > + > +struct liointc_priv { > + struct irq_chip_generic *gc; > + struct liointc_handler_data handler[LIOINTC_NUM_PARENT]; > + u8 map_cache[LIOINTC_CHIP_IRQ]; > +}; > + > +static void liointc_chained_handle_irq(struct irq_desc *desc) > +{ > + struct liointc_handler_data *handler =3D=20 > irq_desc_get_handler_data(desc); > + struct irq_chip *chip =3D irq_desc_get_chip(desc); > + struct irq_chip_generic *gc =3D handler->priv->gc; > + u32 pending; > + > + chained_irq_enter(chip, desc); > + > + pending =3D readl(gc->reg_base + LIOINTC_REG_INTC_STATUS); > + > + if (!pending) > + spurious_interrupt(); > + > + while (pending) { > + int bit =3D __ffs(pending); > + > + generic_handle_irq(irq_find_mapping(gc->domain, bit)); > + pending &=3D ~BIT(bit); > + } Consider using the for_each_set_bit() macro from . See drivers/irqchip/irq-ingenic-tcu.c for instance. > + > + chained_irq_exit(chip, desc); > +} > + > +static void liointc_set_bit(struct irq_chip_generic *gc, > + unsigned int offset, > + u32 mask, bool set) > +{ > + if (set) > + writel(readl(gc->reg_base + offset) | mask, > + gc->reg_base + offset); > + else > + writel(readl(gc->reg_base + offset) & ~mask, > + gc->reg_base + offset); > +} > + > +static int liointc_set_type(struct irq_data *data, unsigned int type) > +{ > + struct irq_chip_generic *gc =3D irq_data_get_irq_chip_data(data); > + u32 mask =3D data->mask; > + unsigned long flags; > + > + irq_gc_lock_irqsave(gc, flags); > + switch (type) { > + case IRQ_TYPE_LEVEL_HIGH: > + liointc_set_bit(gc, LIOINTC_REG_INTC_EDGE, mask, false); > + liointc_set_bit(gc, LIOINTC_REG_INTC_POL, mask, true); > + break; > + case IRQ_TYPE_LEVEL_LOW: > + liointc_set_bit(gc, LIOINTC_REG_INTC_EDGE, mask, false); > + liointc_set_bit(gc, LIOINTC_REG_INTC_POL, mask, false); > + break; > + case IRQ_TYPE_EDGE_RISING: > + liointc_set_bit(gc, LIOINTC_REG_INTC_EDGE, mask, true); > + liointc_set_bit(gc, LIOINTC_REG_INTC_POL, mask, true); > + break; > + case IRQ_TYPE_EDGE_FALLING: > + liointc_set_bit(gc, LIOINTC_REG_INTC_EDGE, mask, true); > + liointc_set_bit(gc, LIOINTC_REG_INTC_POL, mask, false); > + break; > + default: > + return -EINVAL; > + } > + irq_gc_unlock_irqrestore(gc, flags); > + > + irqd_set_trigger_type(data, type); > + return 0; > +} > + > +static void liointc_resume(struct irq_chip_generic *gc) > +{ > + struct liointc_priv *priv =3D gc->private; > + unsigned long flags; > + int i; > + > + irq_gc_lock_irqsave(gc, flags); > + /* Disable all at first */ > + writel(0xffffffff, gc->reg_base + LIOINTC_REG_INTC_DISABLE); > + /* Revert map cache */ > + for (i =3D 0; i < LIOINTC_CHIP_IRQ; i++) > + writeb(priv->map_cache[i], gc->reg_base + i); > + /* Revert mask cache */ > + writel(~gc->mask_cache, gc->reg_base + LIOINTC_REG_INTC_ENABLE); > + irq_gc_unlock_irqrestore(gc, flags); > +} > + > +static const char * const parent_names[] =3D {"int0", "int1", "int2",=20 > "int3"}; > + > +int __init liointc_of_init(struct device_node *node, > + struct device_node *parent) > +{ > + struct irq_chip_generic *gc; > + struct irq_domain *domain; > + struct irq_chip_type *ct; > + struct liointc_priv *priv; > + void __iomem *base; > + u32 of_parent_int_map[LIOINTC_NUM_PARENT]; > + int parent_irq[LIOINTC_NUM_PARENT]; > + bool have_parent =3D FALSE; > + int sz, i, err =3D 0; > + > + priv =3D kzalloc(sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + base =3D of_iomap(node, 0); > + if (!base) { > + err =3D -ENODEV; > + goto out_free_priv; > + } > + > + for (i =3D 0; i < LIOINTC_NUM_PARENT; i++) { > + parent_irq[i] =3D of_irq_get_byname(node, parent_names[i]); > + if (parent_irq[i] > 0) > + have_parent =3D TRUE; > + } > + if (!have_parent) { > + err =3D -ENODEV; > + goto out_iounmap; > + } > + > + sz =3D of_property_read_variable_u32_array(node, > + "loongson,parent_int_map", > + &of_parent_int_map[0], > + LIOINTC_NUM_PARENT, > + LIOINTC_NUM_PARENT); > + if (sz < 4) { > + pr_err("loongson-liointc: No parent_int_map\n"); > + err =3D -ENODEV; > + goto out_iounmap; > + } > + > + for (i =3D 0; i < LIOINTC_NUM_PARENT; i++) > + priv->handler[i].parent_int_map =3D of_parent_int_map[i]; > + > + /* Setup IRQ domain */ > + domain =3D irq_domain_add_linear(node, 32, > + &irq_generic_chip_ops, priv); > + if (!domain) { > + pr_err("loongson-liointc: cannot add IRQ domain\n"); > + err =3D -EINVAL; > + goto out_iounmap; > + } > + > + err =3D irq_alloc_domain_generic_chips(domain, 32, 1, > + node->full_name, handle_level_irq, > + IRQ_NOPROBE, 0, 0); > + if (err) { > + pr_err("loongson-liointc: unable to register IRQ domain\n"); > + goto out_free_domain; > + } > + > + > + /* Disable all IRQs */ > + writel(0xffffffff, base + LIOINTC_REG_INTC_DISABLE); > + /* Set to level triggered */ > + writel(0x0, base + LIOINTC_REG_INTC_EDGE); > + > + /* Generate parent INT part of map cache */ > + for (i =3D 0; i < LIOINTC_NUM_PARENT; i++) { > + u32 pending =3D priv->handler[i].parent_int_map; > + > + while (pending) { > + int bit =3D __ffs(pending); > + > + priv->map_cache[bit] =3D BIT(i) << LIOINTC_SHIFT_INTx; > + pending &=3D ~BIT(bit); > + } Same here. -Paul > + } > + > + for (i =3D 0; i < LIOINTC_CHIP_IRQ; i++) { > + /* Generate core part of map cache */ > + priv->map_cache[i] |=3D BIT(loongson_sysconf.boot_cpu_id); > + writeb(priv->map_cache[i], base + i); > + } > + > + gc =3D irq_get_domain_generic_chip(domain, 0); > + gc->private =3D priv; > + gc->reg_base =3D base; > + gc->domain =3D domain; > + gc->resume =3D liointc_resume; > + > + ct =3D gc->chip_types; > + ct->regs.enable =3D LIOINTC_REG_INTC_ENABLE; > + ct->regs.disable =3D LIOINTC_REG_INTC_DISABLE; > + ct->chip.irq_unmask =3D irq_gc_unmask_enable_reg; > + ct->chip.irq_mask =3D irq_gc_mask_disable_reg; > + ct->chip.irq_mask_ack =3D irq_gc_mask_disable_reg; > + ct->chip.irq_set_type =3D liointc_set_type; > + > + gc->mask_cache =3D 0xffffffff; > + priv->gc =3D gc; > + > + for (i =3D 0; i < LIOINTC_NUM_PARENT; i++) { > + if (parent_irq[i] <=3D 0) > + continue; > + > + priv->handler[i].priv =3D priv; > + irq_set_chained_handler_and_data(parent_irq[i], > + liointc_chained_handle_irq, &priv->handler[i]); > + } > + > + return 0; > + > +out_free_domain: > + irq_domain_remove(domain); > +out_iounmap: > + iounmap(base); > +out_free_priv: > + kfree(priv); > + > + return err; > +} > + > +IRQCHIP_DECLARE(loongson_liointc_1_0, "loongson,liointc-1.0",=20 > liointc_of_init); > +IRQCHIP_DECLARE(loongson_liointc_1_0a, "loongson,liointc-1.0a",=20 > liointc_of_init); > -- > 2.26.0.rc2 >=20 >=20