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=-8.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_2 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 CF5C2C55186 for ; Thu, 23 Apr 2020 14:41:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A5C3C214AF for ; Thu, 23 Apr 2020 14:41:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587652901; bh=i7E1E13y/sI75liZlGDDHbV01+gQqnOKWBaq0rnbb6U=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=AwwGrjKzAY4WQslzGhdcOPjhaJLe+4v6cXhXynzmQn/lz5HoJFKGHlSRdwdVaMENs nI2PdG9hKrgGiczq4iirmFCdCh1gvU377Pw3zP6qv9iLYeb56dM2o9ELGEnUE8P1fF lP0+kzN0iVGUOL08yxzoo4ecv+IANAoxZm7umJ4w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728348AbgDWOll (ORCPT ); Thu, 23 Apr 2020 10:41:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:48218 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726323AbgDWOlk (ORCPT ); Thu, 23 Apr 2020 10:41:40 -0400 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 12ABD20728; Thu, 23 Apr 2020 14:41:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587652899; bh=i7E1E13y/sI75liZlGDDHbV01+gQqnOKWBaq0rnbb6U=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=Y7cVaKl/PIYAOcVHRCCPCX6pVYNWjFTk2GvuRycwHlMu5eBAolbUpCRe3V2Rd9pLf zwdUAep/+eaXPUXW3qDGOeL3lCWVeE0/WtTijatE8FovExMEFupTle7pnihcnAmw0j 3wEi1+GXreR54RsbmEOO98sO0tIyq8XptDlTQ6AY= Received: from 78.163-31-62.static.virginmediabusiness.co.uk ([62.31.163.78] helo=why) by disco-boy.misterjones.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jRd2n-005nW2-77; Thu, 23 Apr 2020 15:41:37 +0100 Date: Thu, 23 Apr 2020 15:41:35 +0100 From: Marc Zyngier To: Jiaxun Yang Cc: linux-mips@vger.kernel.org, Thomas Gleixner , Jason Cooper , Rob Herring , Huacai Chen , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Subject: Re: [PATCH 5/6] irqchip: Add Loongson PCH MSI controller Message-ID: <20200423154135.38b0ec25@why> In-Reply-To: <20200422142428.1249684-6-jiaxun.yang@flygoat.com> References: <20200422142428.1249684-1-jiaxun.yang@flygoat.com> <20200422142428.1249684-6-jiaxun.yang@flygoat.com> Organization: Approximate X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 62.31.163.78 X-SA-Exim-Rcpt-To: jiaxun.yang@flygoat.com, linux-mips@vger.kernel.org, tglx@linutronix.de, jason@lakedaemon.net, robh+dt@kernel.org, chenhc@lemote.com, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 22 Apr 2020 22:24:25 +0800 Jiaxun Yang wrote: > This controller appears on Loongson-7A family of PCH to transform > interrupts from PCI MSI into HyperTransport vectorized interrrupts > and send them to procrssor's HT vector controller. > > Signed-off-by: Jiaxun Yang > --- > drivers/irqchip/Kconfig | 10 + > drivers/irqchip/Makefile | 1 + > drivers/irqchip/irq-loongson-pch-msi.c | 265 +++++++++++++++++++++++++ > 3 files changed, 276 insertions(+) > create mode 100644 drivers/irqchip/irq-loongson-pch-msi.c > > diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig > index 4ab7a9b1a5c2..9f2935418f33 100644 > --- a/drivers/irqchip/Kconfig > +++ b/drivers/irqchip/Kconfig > @@ -548,4 +548,14 @@ config LOONGSON_PCH_PIC > help > Support for the Loongson PCH PIC Controller. > > +config LOONGSON_PCH_MSI > + bool "Loongson PCH PIC Controller" > + depends on MACH_LOONGSON64 || COMPILE_TEST > + depends on PCI > + default MACH_LOONGSON64 > + select IRQ_DOMAIN_HIERARCHY > + select PCI_MSI > + help > + Support for the Loongson PCH MSI Controller. > + > endmenu > diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile > index acc72331cec8..3a4ce283189a 100644 > --- a/drivers/irqchip/Makefile > +++ b/drivers/irqchip/Makefile > @@ -109,3 +109,4 @@ obj-$(CONFIG_LOONGSON_LIOINTC) += irq-loongson-liointc.o > obj-$(CONFIG_LOONGSON_HTPIC) += irq-loongson-htpic.o > obj-$(CONFIG_LOONGSON_HTVEC) += irq-loongson-htvec.o > obj-$(CONFIG_LOONGSON_PCH_PIC) += irq-loongson-pch-pic.o > +obj-$(CONFIG_LOONGSON_PCH_MSI) += irq-loongson-pch-msi.o > diff --git a/drivers/irqchip/irq-loongson-pch-msi.c b/drivers/irqchip/irq-loongson-pch-msi.c > new file mode 100644 > index 000000000000..4bb00f2ce86a > --- /dev/null > +++ b/drivers/irqchip/irq-loongson-pch-msi.c > @@ -0,0 +1,265 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (C) 2020, Jiaxun Yang > + * Loongson PCH MSI support > + */ > + > +#define pr_fmt(fmt) "pch-msi: " fmt > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +struct pch_msi_data { > + spinlock_t msi_map_lock; > + phys_addr_t addr; addr isn't very descriptive. use something like "doorbell", or anything that shows that this is where the endpoint write to to generate a MSI. > + u32 irq_first; /* The vectoe number that MSIs start */ > + u32 num_irqs; /* The number of vector for MSIs */ > + unsigned long *msi_map; > +}; > + > +static void pch_msi_mask_msi_irq(struct irq_data *d) > +{ > + pci_msi_mask_irq(d); > + irq_chip_mask_parent(d); > +} > + > +static void pch_msi_unmask_msi_irq(struct irq_data *d) > +{ > + pci_msi_unmask_irq(d); > + irq_chip_unmask_parent(d); > +} > + > +static struct irq_chip pch_msi_irq_chip = { > + .name = "PCH MSI", > + .irq_mask = pch_msi_mask_msi_irq, > + .irq_unmask = pch_msi_unmask_msi_irq, > + .irq_set_affinity = irq_chip_set_affinity_parent, Same remark as the previous driver. > +}; > + > +static int pch_msi_allocate_hwirq(struct pch_msi_data *priv, int num_req) > +{ > + int first; > + > + spin_lock(&priv->msi_map_lock); > + > + first = bitmap_find_next_zero_area(priv->msi_map, priv->num_irqs, 0, > + num_req, 0); This doesn't work for Multi-MSI, where the base of the MSI vectors must be naturally aligned to the number of vectors. See bitmap_find_free_region() and co. > + if (first >= priv->num_irqs) { > + spin_unlock(&priv->msi_map_lock); > + return -ENOSPC; > + } > + > + bitmap_set(priv->msi_map, first, num_req); > + > + spin_unlock(&priv->msi_map_lock); > + > + return priv->irq_first + first; > +} > + > +static void pch_msi_free_hwirq(struct pch_msi_data *priv, > + int hwirq, int num_req) > +{ > + int first = hwirq - priv->irq_first; > + > + spin_lock(&priv->msi_map_lock); > + > + bitmap_clear(priv->msi_map, first, num_req); See bitmap_release_region() in relation to the above. > + > + spin_unlock(&priv->msi_map_lock); > +} > + > +static void pch_msi_compose_msi_msg(struct irq_data *data, > + struct msi_msg *msg) > +{ > + struct pch_msi_data *priv = irq_data_get_irq_chip_data(data); > + phys_addr_t msg_addr = priv->addr; > + > + msg->address_hi = upper_32_bits(msg_addr); > + msg->address_lo = lower_32_bits(msg_addr); > + msg->data = data->hwirq; > +} > + > +static struct msi_domain_info pch_msi_domain_info = { > + .flags = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS | > + MSI_FLAG_MULTI_PCI_MSI | MSI_FLAG_PCI_MSIX, > + .chip = &pch_msi_irq_chip, > +}; > + > +static struct irq_chip middle_irq_chip = { > + .name = "PCH MSI Middle", > + .irq_mask = irq_chip_mask_parent, > + .irq_unmask = irq_chip_unmask_parent, > + .irq_set_affinity = irq_chip_set_affinity_parent, again. > + .irq_compose_msi_msg = pch_msi_compose_msi_msg, > +}; > + > +static int pch_msi_parent_domain_alloc(struct irq_domain *domain, > + unsigned int virq, int hwirq) > +{ > + struct irq_fwspec fwspec; > + int ret; > + > + if (!is_of_node(domain->parent->fwnode)) > + return -EINVAL; How can that happen? > + > + fwspec.fwnode = domain->parent->fwnode; > + fwspec.param_count = 1; > + fwspec.param[0] = hwirq; > + > + ret = irq_domain_alloc_irqs_parent(domain, virq, 1, &fwspec); > + if (ret) > + return ret; > + > + irq_domain_set_info(domain, virq, hwirq, > + &middle_irq_chip, NULL, > + handle_simple_irq, NULL, NULL); No, this should at least be handle_edge_irq. More importantly, you should use the flow set by the underlying irqchip, and not provide your own. > + irq_set_probe(virq); Probe? what does it mean for MSIs? I also don't see how you tell the underlying irqchip that the MSI is edge triggered. > + > + return 0; > +} > + > +static int pch_msi_middle_domain_alloc(struct irq_domain *domain, > + unsigned int virq, > + unsigned int nr_irqs, void *args) > +{ > + struct pch_msi_data *priv = domain->host_data; > + int hwirq, err, i; > + > + hwirq = pch_msi_allocate_hwirq(priv, nr_irqs); > + if (hwirq < 0) > + return hwirq; > + > + for (i = 0; i < nr_irqs; i++) { > + err = pch_msi_parent_domain_alloc(domain, virq + i, hwirq + i); > + if (err) > + goto err_hwirq; > + > + irq_domain_set_hwirq_and_chip(domain, virq + i, hwirq + i, > + &middle_irq_chip, priv); > + } > + > + return 0; > +err_hwirq: > + while (--i >= 0) > + irq_domain_free_irqs_parent(domain, virq, i); > + > + pch_msi_free_hwirq(priv, hwirq, nr_irqs); > + return err; > +} > + > +static void pch_msi_middle_domain_free(struct irq_domain *domain, > + unsigned int virq, > + unsigned int nr_irqs) > +{ > + struct irq_data *d = irq_domain_get_irq_data(domain, virq); > + struct pch_msi_data *priv = irq_data_get_irq_chip_data(d); > + > + irq_domain_free_irqs_parent(domain, virq, nr_irqs); > + pch_msi_free_hwirq(priv, d->hwirq, nr_irqs); > +} > + > +static const struct irq_domain_ops pch_msi_middle_domain_ops = { > + .alloc = pch_msi_middle_domain_alloc, > + .free = pch_msi_middle_domain_free, > +}; > + > +static int pch_msi_init_domains(struct pch_msi_data *priv, > + struct device_node *node, > + struct device_node *parent) > +{ > + struct irq_domain *middle_domain, *msi_domain, *parent_domain; > + > + parent_domain = irq_find_host(parent); > + if (!parent_domain) { > + pr_err("Failed to find the parent domain\n"); > + return -ENXIO; > + } > + > + middle_domain = irq_domain_add_tree(NULL, > + &pch_msi_middle_domain_ops, > + priv); You don't really need a tree, unless your interrupt space is huge and very sparse. Given that the DT example says 64, I would go with a linear domain if that number is realistic. > + if (!middle_domain) { > + pr_err("Failed to create the MSI middle domain\n"); > + return -ENOMEM; > + } > + > + middle_domain->parent = parent_domain; > + > + msi_domain = pci_msi_create_irq_domain(of_node_to_fwnode(node), > + &pch_msi_domain_info, > + middle_domain); > + if (!msi_domain) { > + pr_err("Failed to create MSI domain\n"); > + irq_domain_remove(middle_domain); > + return -ENOMEM; > + } > + > + return 0; > +} > + > +static int pch_msi_init(struct device_node *node, > + struct device_node *parent) > +{ > + struct pch_msi_data *priv; > + struct resource res; > + int ret; > + > + priv = kzalloc(sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + spin_lock_init(&priv->msi_map_lock); > + > + ret = of_address_to_resource(node, 0, &res); > + if (ret) { > + pr_err("Failed to allocate resource\n"); > + goto err_priv; > + } > + > + priv->addr = res.start; > + > + if (of_property_read_u32(node, "loongson,msi-base-vec", > + &priv->irq_first)) { > + pr_err("Unable to parse MSI vec base\n"); > + ret = -EINVAL; > + goto err_priv; > + } > + > + if (of_property_read_u32(node, "loongson,msi-num-vecs", > + &priv->num_irqs)) { > + pr_err("Unable to parse MSI vec number\n"); > + ret = -EINVAL; > + goto err_priv; > + } > + > + priv->msi_map = kcalloc(BITS_TO_LONGS(priv->num_irqs), > + sizeof(*priv->msi_map), > + GFP_KERNEL); > + if (!priv->msi_map) { > + ret = -ENOMEM; > + goto err_priv; > + } > + > + pr_debug("Registering %d MSIs, starting at %d\n", > + priv->num_irqs, priv->irq_first); > + > + ret = pch_msi_init_domains(priv, node, parent); > + if (ret) > + goto err_map; > + > + return 0; > + > +err_map: > + kfree(priv->msi_map); > +err_priv: > + kfree(priv); > + return ret; > +} > + > +IRQCHIP_DECLARE(pch_msi, "loongson,pch-msi-1.0", pch_msi_init); Thanks, M. -- Jazz is not dead. It just smells funny...