| Message ID | 20241025124515.14066-4-svarbanov@suse.de (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Add PCIe support for bcm2712 | expand |
On Fri, Oct 25 2024 at 15:45, Stanimir Varbanov wrote: > Add an interrupt controller driver for MSI-X Interrupt Peripheral (MIP) > hardware block found in bcm2712. The interrupt controller is used to > handle MSI-X interrupts from peripherials behind PCIe endpoints like > RP1 south bridge found in RPi5. > > There are two MIPs on bcm2712, the first has 64 consecutive SPIs > assigned to 64 output vectors, and the second has 17 SPIs, but only > 8 of them are consecutive starting at the 8th output vector. This starts to converge nicely. Just a few remaining nitpicks. > +static int mip_alloc_hwirq(struct mip_priv *mip, unsigned int nr_irqs, > + unsigned int *hwirq) > +{ > + int bit; > + > + spin_lock(&mip->lock); > + bit = bitmap_find_free_region(mip->bitmap, mip->num_msis, > + ilog2(nr_irqs)); > + spin_unlock(&mip->lock); This should be scoped_guard(spinlock, &mip->lock) bit = bitmap_find_free_region(mip->bitmap, mip->num_msis, ilog2(nr_irqs)); > + if (bit < 0) > + return bit; > + > + if (hwirq) > + *hwirq = bit; But what's the point of this conditional? The only call site hands in a valid pointer, no? > + return 0; And therefore the whole thing can be simplified to: static int mip_alloc_hwirq(struct mip_priv *mip, unsigned int nr_irqs) { guard(spinlock)(&mip_lock); return bitmap_find_free_region(mip->bitmap, mip->num_msis, ilog2(nr_irqs)); } and the callsite becomes: irq = mip_alloc_hwirq(mip, nr_irqs); if (irq < 0) return irq; Hmm? > +} > + > +static void mip_free_hwirq(struct mip_priv *mip, unsigned int hwirq, > + unsigned int nr_irqs) > +{ > + spin_lock(&mip->lock); guard(spinlock)(&mip->lock); > + bitmap_release_region(mip->bitmap, hwirq, ilog2(nr_irqs)); > + spin_unlock(&mip->lock); > +} > + ret = irq_domain_alloc_irqs_parent(domain, virq, nr_irqs, &fwspec); > + if (ret) { > + mip_free_hwirq(mip, irq, nr_irqs); > + return ret; goto err_free_hwirq; ? > + } > + > + for (i = 0; i < nr_irqs; i++) { > + irqd = irq_domain_get_irq_data(domain->parent, virq + i); > + irqd->chip->irq_set_type(irqd, IRQ_TYPE_EDGE_RISING); > + > + ret = irq_domain_set_hwirq_and_chip(domain, virq + i, hwirq + i, > + &mip_middle_irq_chip, mip); > + if (ret) > + goto err_free; > + > + irqd = irq_get_irq_data(virq + i); > + irqd_set_single_target(irqd); > + irqd_set_affinity_on_activate(irqd); > + } > + > + return 0; > + > +err_free: > + irq_domain_free_irqs_parent(domain, virq, nr_irqs); > + mip_free_hwirq(mip, irq, nr_irqs); > + return ret; > +} > + > +static int __init mip_of_msi_init(struct device_node *node, > + struct device_node *parent) No line break required here. > +{ > + struct platform_device *pdev; > + struct mip_priv *mip; > + int ret; > + > + pdev = of_find_device_by_node(node); > + of_node_put(node); > + if (!pdev) > + return -EPROBE_DEFER; > + > + mip = kzalloc(sizeof(*mip), GFP_KERNEL); > + if (!mip) > + return -ENOMEM; > + > + spin_lock_init(&mip->lock); > + mip->dev = &pdev->dev; > + > + ret = mip_parse_dt(mip, node); > + if (ret) > + goto err_priv; > + > + mip->base = of_iomap(node, 0); > + if (!mip->base) { > + ret = -ENXIO; > + goto err_priv; > + } > + > + mip->bitmap = bitmap_zalloc(mip->num_msis, GFP_KERNEL); > + if (!mip->bitmap) { > + ret = -ENOMEM; > + goto err_base; > + } > + > + /* > + * All MSI-X masked in for the host, masked out for the > + * VPU, and edge-triggered. > + */ > + writel(0, mip->base + MIP_INT_MASKL_HOST); > + writel(0, mip->base + MIP_INT_MASKH_HOST); > + writel(~0, mip->base + MIP_INT_MASKL_VPU); > + writel(~0, mip->base + MIP_INT_MASKH_VPU); > + writel(~0, mip->base + MIP_INT_CFGL_HOST); > + writel(~0, mip->base + MIP_INT_CFGH_HOST); What undoes that in case mpi_init_domains() fails? Or is it harmless? I really have no idea what masked in and masked out means here. > + dev_dbg(&pdev->dev, > + "MIP: MSI-X count: %u, base: %u, offset: %u, msg_addr: %llx\n", Please move the string up. You have 100 characters width available. > + mip->num_msis, mip->msi_base, mip->msi_offset, mip->msg_addr); Thanks, tglx
Hi Thomas, Thank you for the review! On 10/28/24 22:06, Thomas Gleixner wrote: > On Fri, Oct 25 2024 at 15:45, Stanimir Varbanov wrote: > >> Add an interrupt controller driver for MSI-X Interrupt Peripheral (MIP) >> hardware block found in bcm2712. The interrupt controller is used to >> handle MSI-X interrupts from peripherials behind PCIe endpoints like >> RP1 south bridge found in RPi5. >> >> There are two MIPs on bcm2712, the first has 64 consecutive SPIs >> assigned to 64 output vectors, and the second has 17 SPIs, but only >> 8 of them are consecutive starting at the 8th output vector. > > This starts to converge nicely. Just a few remaining nitpicks. > >> +static int mip_alloc_hwirq(struct mip_priv *mip, unsigned int nr_irqs, >> + unsigned int *hwirq) >> +{ >> + int bit; >> + >> + spin_lock(&mip->lock); >> + bit = bitmap_find_free_region(mip->bitmap, mip->num_msis, >> + ilog2(nr_irqs)); >> + spin_unlock(&mip->lock); > > This should be > > scoped_guard(spinlock, &mip->lock) > bit = bitmap_find_free_region(mip->bitmap, mip->num_msis, ilog2(nr_irqs)); > >> + if (bit < 0) >> + return bit; >> + >> + if (hwirq) >> + *hwirq = bit; > > But what's the point of this conditional? The only call site hands in a > valid pointer, no? > >> + return 0; > > And therefore the whole thing can be simplified to: > > static int mip_alloc_hwirq(struct mip_priv *mip, unsigned int nr_irqs) > { > guard(spinlock)(&mip_lock); > return bitmap_find_free_region(mip->bitmap, mip->num_msis, ilog2(nr_irqs)); > } > > and the callsite becomes: > > irq = mip_alloc_hwirq(mip, nr_irqs); > if (irq < 0) > return irq; > Hmm? > >> +} >> + >> +static void mip_free_hwirq(struct mip_priv *mip, unsigned int hwirq, >> + unsigned int nr_irqs) >> +{ >> + spin_lock(&mip->lock); > > guard(spinlock)(&mip->lock); Will address the above comments in next version. > >> + bitmap_release_region(mip->bitmap, hwirq, ilog2(nr_irqs)); >> + spin_unlock(&mip->lock); >> +} > >> + ret = irq_domain_alloc_irqs_parent(domain, virq, nr_irqs, &fwspec); >> + if (ret) { >> + mip_free_hwirq(mip, irq, nr_irqs); >> + return ret; > > goto err_free_hwirq; ? > >> + } >> + >> + for (i = 0; i < nr_irqs; i++) { >> + irqd = irq_domain_get_irq_data(domain->parent, virq + i); >> + irqd->chip->irq_set_type(irqd, IRQ_TYPE_EDGE_RISING); >> + >> + ret = irq_domain_set_hwirq_and_chip(domain, virq + i, hwirq + i, >> + &mip_middle_irq_chip, mip); >> + if (ret) >> + goto err_free; >> + >> + irqd = irq_get_irq_data(virq + i); >> + irqd_set_single_target(irqd); >> + irqd_set_affinity_on_activate(irqd); >> + } >> + >> + return 0; >> + >> +err_free: >> + irq_domain_free_irqs_parent(domain, virq, nr_irqs); >> + mip_free_hwirq(mip, irq, nr_irqs); >> + return ret; >> +} >> + >> +static int __init mip_of_msi_init(struct device_node *node, >> + struct device_node *parent) > > No line break required here. OK. > >> +{ >> + struct platform_device *pdev; >> + struct mip_priv *mip; >> + int ret; >> + >> + pdev = of_find_device_by_node(node); >> + of_node_put(node); >> + if (!pdev) >> + return -EPROBE_DEFER; >> + >> + mip = kzalloc(sizeof(*mip), GFP_KERNEL); >> + if (!mip) >> + return -ENOMEM; >> + >> + spin_lock_init(&mip->lock); >> + mip->dev = &pdev->dev; >> + >> + ret = mip_parse_dt(mip, node); >> + if (ret) >> + goto err_priv; >> + >> + mip->base = of_iomap(node, 0); >> + if (!mip->base) { >> + ret = -ENXIO; >> + goto err_priv; >> + } >> + >> + mip->bitmap = bitmap_zalloc(mip->num_msis, GFP_KERNEL); >> + if (!mip->bitmap) { >> + ret = -ENOMEM; >> + goto err_base; >> + } >> + >> + /* >> + * All MSI-X masked in for the host, masked out for the >> + * VPU, and edge-triggered. >> + */ >> + writel(0, mip->base + MIP_INT_MASKL_HOST); >> + writel(0, mip->base + MIP_INT_MASKH_HOST); >> + writel(~0, mip->base + MIP_INT_MASKL_VPU); >> + writel(~0, mip->base + MIP_INT_MASKH_VPU); >> + writel(~0, mip->base + MIP_INT_CFGL_HOST); >> + writel(~0, mip->base + MIP_INT_CFGH_HOST); > > What undoes that in case mpi_init_domains() fails? Or is it harmless? I > really have no idea what masked in and masked out means here. It should be harmless, but I could move registers initialization in mip_init_domains() and fix the comments. > >> + dev_dbg(&pdev->dev, >> + "MIP: MSI-X count: %u, base: %u, offset: %u, msg_addr: %llx\n", > > Please move the string up. You have 100 characters width available. OK. > >> + mip->num_msis, mip->msi_base, mip->msi_offset, mip->msg_addr); > > Thanks, > > tglx regards, ~Stan
diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index 341cd9ca5a05..c9bd0a4f6871 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -116,6 +116,22 @@ config I8259 bool select IRQ_DOMAIN +config BCM2712_MIP + tristate "Broadcom BCM2712 MSI-X Interrupt Peripheral support" + depends on ARCH_BRCMSTB || COMPILE_TEST + default m if ARCH_BRCMSTB + depends on ARM_GIC + select GENERIC_IRQ_CHIP + select IRQ_DOMAIN_HIERARCHY + select GENERIC_MSI_IRQ + select IRQ_MSI_LIB + help + Enable support for the Broadcom BCM2712 MSI-X target peripheral + (MIP) needed by brcmstb PCIe to handle MSI-X interrupts on + Raspberry Pi 5. + + If unsure say n. + config BCM6345_L1_IRQ bool select GENERIC_IRQ_CHIP diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index e3679ec2b9f7..a11307b1b610 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -62,6 +62,7 @@ obj-$(CONFIG_XTENSA_MX) += irq-xtensa-mx.o obj-$(CONFIG_XILINX_INTC) += irq-xilinx-intc.o obj-$(CONFIG_IRQ_CROSSBAR) += irq-crossbar.o obj-$(CONFIG_SOC_VF610) += irq-vf610-mscm-ir.o +obj-$(CONFIG_BCM2712_MIP) += irq-bcm2712-mip.o obj-$(CONFIG_BCM6345_L1_IRQ) += irq-bcm6345-l1.o obj-$(CONFIG_BCM7038_L1_IRQ) += irq-bcm7038-l1.o obj-$(CONFIG_BCM7120_L2_IRQ) += irq-bcm7120-l2.o diff --git a/drivers/irqchip/irq-bcm2712-mip.c b/drivers/irqchip/irq-bcm2712-mip.c new file mode 100644 index 000000000000..fd73f2d41279 --- /dev/null +++ b/drivers/irqchip/irq-bcm2712-mip.c @@ -0,0 +1,310 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2024 Raspberry Pi Ltd., All Rights Reserved. + * Copyright (c) 2024 SUSE + */ + +#include <linux/bitmap.h> +#include <linux/irqchip.h> +#include <linux/irqdomain.h> +#include <linux/msi.h> +#include <linux/of_address.h> +#include <linux/of_platform.h> + +#include "irq-msi-lib.h" + +#define MIP_INT_RAISE 0x00 +#define MIP_INT_CLEAR 0x10 +#define MIP_INT_CFGL_HOST 0x20 +#define MIP_INT_CFGH_HOST 0x30 +#define MIP_INT_MASKL_HOST 0x40 +#define MIP_INT_MASKH_HOST 0x50 +#define MIP_INT_MASKL_VPU 0x60 +#define MIP_INT_MASKH_VPU 0x70 +#define MIP_INT_STATUSL_HOST 0x80 +#define MIP_INT_STATUSH_HOST 0x90 +#define MIP_INT_STATUSL_VPU 0xa0 +#define MIP_INT_STATUSH_VPU 0xb0 + +/** + * struct mip_priv - MSI-X interrupt controller data + * @lock: Used to protect bitmap alloc/free + * @base: Base address of MMIO area + * @msg_addr: PCIe MSI-X address + * @msi_base: MSI base + * @num_msis: Count of MSIs + * @msi_offset: MSI offset + * @bitmap: A bitmap for hwirqs + * @parent: Parent domain (GIC) + * @dev: A device pointer + */ +struct mip_priv { + spinlock_t lock; + void __iomem *base; + u64 msg_addr; + u32 msi_base; + u32 num_msis; + u32 msi_offset; + unsigned long *bitmap; + struct irq_domain *parent; + struct device *dev; +}; + +static void mip_compose_msi_msg(struct irq_data *d, struct msi_msg *msg) +{ + struct mip_priv *mip = irq_data_get_irq_chip_data(d); + + msg->address_hi = upper_32_bits(mip->msg_addr); + msg->address_lo = lower_32_bits(mip->msg_addr); + msg->data = d->hwirq; +} + +static struct irq_chip mip_middle_irq_chip = { + .name = "MIP", + .irq_mask = irq_chip_mask_parent, + .irq_unmask = irq_chip_unmask_parent, + .irq_eoi = irq_chip_eoi_parent, + .irq_set_affinity = irq_chip_set_affinity_parent, + .irq_set_type = irq_chip_set_type_parent, + .irq_compose_msi_msg = mip_compose_msi_msg, +}; + +static int mip_alloc_hwirq(struct mip_priv *mip, unsigned int nr_irqs, + unsigned int *hwirq) +{ + int bit; + + spin_lock(&mip->lock); + bit = bitmap_find_free_region(mip->bitmap, mip->num_msis, + ilog2(nr_irqs)); + spin_unlock(&mip->lock); + + if (bit < 0) + return bit; + + if (hwirq) + *hwirq = bit; + + return 0; +} + +static void mip_free_hwirq(struct mip_priv *mip, unsigned int hwirq, + unsigned int nr_irqs) +{ + spin_lock(&mip->lock); + bitmap_release_region(mip->bitmap, hwirq, ilog2(nr_irqs)); + spin_unlock(&mip->lock); +} + +static int mip_middle_domain_alloc(struct irq_domain *domain, unsigned int virq, + unsigned int nr_irqs, void *arg) +{ + struct mip_priv *mip = domain->host_data; + struct irq_fwspec fwspec = {0}; + unsigned int hwirq, irq, i; + struct irq_data *irqd; + int ret; + + ret = mip_alloc_hwirq(mip, nr_irqs, &irq); + if (ret < 0) + return ret; + + hwirq = irq + mip->msi_offset; + + fwspec.fwnode = domain->parent->fwnode; + fwspec.param_count = 3; + fwspec.param[0] = 0; + fwspec.param[1] = hwirq + mip->msi_base; + fwspec.param[2] = IRQ_TYPE_EDGE_RISING; + + ret = irq_domain_alloc_irqs_parent(domain, virq, nr_irqs, &fwspec); + if (ret) { + mip_free_hwirq(mip, irq, nr_irqs); + return ret; + } + + for (i = 0; i < nr_irqs; i++) { + irqd = irq_domain_get_irq_data(domain->parent, virq + i); + irqd->chip->irq_set_type(irqd, IRQ_TYPE_EDGE_RISING); + + ret = irq_domain_set_hwirq_and_chip(domain, virq + i, hwirq + i, + &mip_middle_irq_chip, mip); + if (ret) + goto err_free; + + irqd = irq_get_irq_data(virq + i); + irqd_set_single_target(irqd); + irqd_set_affinity_on_activate(irqd); + } + + return 0; + +err_free: + irq_domain_free_irqs_parent(domain, virq, nr_irqs); + mip_free_hwirq(mip, irq, nr_irqs); + return ret; +} + +static void mip_middle_domain_free(struct irq_domain *domain, unsigned int virq, + unsigned int nr_irqs) +{ + struct irq_data *irqd = irq_domain_get_irq_data(domain, virq); + struct mip_priv *mip; + unsigned int hwirq; + + if (!irqd) + return; + + mip = irq_data_get_irq_chip_data(irqd); + hwirq = irqd_to_hwirq(irqd); + irq_domain_free_irqs_parent(domain, virq, nr_irqs); + mip_free_hwirq(mip, hwirq - mip->msi_offset, nr_irqs); +} + +static const struct irq_domain_ops mip_middle_domain_ops = { + .select = msi_lib_irq_domain_select, + .alloc = mip_middle_domain_alloc, + .free = mip_middle_domain_free, +}; + +#define MIP_MSI_FLAGS_REQUIRED (MSI_FLAG_USE_DEF_DOM_OPS | \ + MSI_FLAG_USE_DEF_CHIP_OPS | \ + MSI_FLAG_PCI_MSI_MASK_PARENT) + +#define MIP_MSI_FLAGS_SUPPORTED (MSI_GENERIC_FLAGS_MASK | \ + MSI_FLAG_MULTI_PCI_MSI | \ + MSI_FLAG_PCI_MSIX) + +static const struct msi_parent_ops mip_msi_parent_ops = { + .supported_flags = MIP_MSI_FLAGS_SUPPORTED, + .required_flags = MIP_MSI_FLAGS_REQUIRED, + .bus_select_token = DOMAIN_BUS_GENERIC_MSI, + .bus_select_mask = MATCH_PCI_MSI, + .prefix = "MIP-MSI-", + .init_dev_msi_info = msi_lib_init_dev_msi_info, +}; + +static int mip_init_domains(struct mip_priv *mip, struct device_node *np) +{ + struct irq_domain *middle; + + middle = irq_domain_add_hierarchy(mip->parent, 0, mip->num_msis, np, + &mip_middle_domain_ops, mip); + if (!middle) + return -ENOMEM; + + irq_domain_update_bus_token(middle, DOMAIN_BUS_GENERIC_MSI); + middle->dev = mip->dev; + middle->flags |= IRQ_DOMAIN_FLAG_MSI_PARENT; + middle->msi_parent_ops = &mip_msi_parent_ops; + + return 0; +} + +static int mip_parse_dt(struct mip_priv *mip, struct device_node *np) +{ + struct of_phandle_args args; + u64 size; + int ret; + + ret = of_property_read_u32(np, "brcm,msi-offset", &mip->msi_offset); + if (ret) + mip->msi_offset = 0; + + ret = of_parse_phandle_with_args(np, "msi-ranges", "#interrupt-cells", + 0, &args); + if (ret) + return ret; + + ret = of_property_read_u32_index(np, "msi-ranges", args.args_count + 1, + &mip->num_msis); + if (ret) + goto err_put; + + ret = of_property_read_reg(np, 1, &mip->msg_addr, &size); + if (ret) + goto err_put; + + mip->msi_base = args.args[1]; + + mip->parent = irq_find_host(args.np); + if (!mip->parent) + ret = -EINVAL; + +err_put: + of_node_put(args.np); + return ret; +} + +static int __init mip_of_msi_init(struct device_node *node, + struct device_node *parent) +{ + struct platform_device *pdev; + struct mip_priv *mip; + int ret; + + pdev = of_find_device_by_node(node); + of_node_put(node); + if (!pdev) + return -EPROBE_DEFER; + + mip = kzalloc(sizeof(*mip), GFP_KERNEL); + if (!mip) + return -ENOMEM; + + spin_lock_init(&mip->lock); + mip->dev = &pdev->dev; + + ret = mip_parse_dt(mip, node); + if (ret) + goto err_priv; + + mip->base = of_iomap(node, 0); + if (!mip->base) { + ret = -ENXIO; + goto err_priv; + } + + mip->bitmap = bitmap_zalloc(mip->num_msis, GFP_KERNEL); + if (!mip->bitmap) { + ret = -ENOMEM; + goto err_base; + } + + /* + * All MSI-X masked in for the host, masked out for the + * VPU, and edge-triggered. + */ + writel(0, mip->base + MIP_INT_MASKL_HOST); + writel(0, mip->base + MIP_INT_MASKH_HOST); + writel(~0, mip->base + MIP_INT_MASKL_VPU); + writel(~0, mip->base + MIP_INT_MASKH_VPU); + writel(~0, mip->base + MIP_INT_CFGL_HOST); + writel(~0, mip->base + MIP_INT_CFGH_HOST); + + ret = mip_init_domains(mip, node); + if (ret) + goto err_map; + + dev_dbg(&pdev->dev, + "MIP: MSI-X count: %u, base: %u, offset: %u, msg_addr: %llx\n", + mip->num_msis, mip->msi_base, mip->msi_offset, mip->msg_addr); + + return 0; + +err_map: + bitmap_free(mip->bitmap); +err_base: + iounmap(mip->base); +err_priv: + kfree(mip); + return ret; +} + +IRQCHIP_PLATFORM_DRIVER_BEGIN(mip_msi) +IRQCHIP_MATCH("brcm,bcm2712-mip", mip_of_msi_init) +IRQCHIP_PLATFORM_DRIVER_END(mip_msi) +MODULE_DESCRIPTION("Broadcom BCM2712 MSI interrupt controller"); +MODULE_AUTHOR("Phil Elwell <phil@raspberrypi.com>"); +MODULE_AUTHOR("Stanimir Varbanov <svarbanov@suse.de>"); +MODULE_LICENSE("GPL");
Add an interrupt controller driver for MSI-X Interrupt Peripheral (MIP) hardware block found in bcm2712. The interrupt controller is used to handle MSI-X interrupts from peripherials behind PCIe endpoints like RP1 south bridge found in RPi5. There are two MIPs on bcm2712, the first has 64 consecutive SPIs assigned to 64 output vectors, and the second has 17 SPIs, but only 8 of them are consecutive starting at the 8th output vector. Signed-off-by: Stanimir Varbanov <svarbanov@suse.de> --- v3 -> v4: - Addressed the comments for wrongly used PCI/MSI flags (Thomas) drivers/irqchip/Kconfig | 16 ++ drivers/irqchip/Makefile | 1 + drivers/irqchip/irq-bcm2712-mip.c | 310 ++++++++++++++++++++++++++++++ 3 files changed, 327 insertions(+) create mode 100644 drivers/irqchip/irq-bcm2712-mip.c