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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC5FEC433F5 for ; Fri, 6 May 2022 18:55:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1388819AbiEFS7g (ORCPT ); Fri, 6 May 2022 14:59:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239453AbiEFS7f (ORCPT ); Fri, 6 May 2022 14:59:35 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CC8820BEB; Fri, 6 May 2022 11:55:51 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DB9E062185; Fri, 6 May 2022 18:55:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D496BC385A9; Fri, 6 May 2022 18:55:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1651863350; bh=UhAfnAGyYCHxB1vBUp7V89kxjGB3UeRzniR2RreuUlQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=r+1rMliRFufQ7rLwSbN62U4D7ZlKAoJYzA4UdAjH0Z+ozLXlPYMWb08hAWMcyhcV6 nfDnc+5fPk9xs7Lr34w45BU4IdmV0K0sFudVVlZ76LUHrdNCMLnyqhJK/h0sCob5o4 tSfjt4C4r5Ub3sM0EGCeYr/MSDRBfG43t5VZuGMrvRM4AxUIRAx+7gYPhVGZjAvm5g 1g1QH2k0pCQM3TeZfdK3qpVXsDexH+w0gEP/diUADtPKujnz5LL8tp2tDCJ+lMjV5p lZVjZHon5zcpMJaMmgd2AaluSdnPdqs2bjR+4TdIk5uhTSDFIx8Q33n0vpDntj3qUn dAlX8bly3W6rA== Received: by pali.im (Postfix) id E15891141; Fri, 6 May 2022 20:55:46 +0200 (CEST) Date: Fri, 6 May 2022 20:55:46 +0200 From: Pali =?utf-8?B?Um9ow6Fy?= To: Marc Zyngier Cc: Thomas Gleixner , Rob Herring , Bjorn Helgaas , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Thomas Petazzoni , Lorenzo Pieralisi , Krzysztof =?utf-8?Q?Wilczy=C5=84ski?= , Marek =?utf-8?B?QmVow7pu?= , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 2/6] irqchip/armada-370-xp: Implement SoC Error interrupts Message-ID: <20220506185546.n5rl3chyyauy4bjt@pali> References: <20220506134029.21470-1-pali@kernel.org> <20220506134029.21470-3-pali@kernel.org> <87mtfu7ccd.wl-maz@kernel.org> <20220506183051.wimo7p4nuqfnl2aj@pali> <8735hmijlu.wl-maz@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <8735hmijlu.wl-maz@kernel.org> User-Agent: NeoMutt/20180716 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On Friday 06 May 2022 19:47:25 Marc Zyngier wrote: > On Fri, 06 May 2022 19:30:51 +0100, > Pali Rohár wrote: > > > > On Friday 06 May 2022 19:19:46 Marc Zyngier wrote: > > > On Fri, 06 May 2022 14:40:25 +0100, > > > Pali Rohár wrote: > > > > > > > > MPIC IRQ 4 is used as SoC Error Summary interrupt and provides access to > > > > another hierarchy of SoC Error interrupts. Implement a new IRQ chip and > > > > domain for accessing this IRQ hierarchy. > > > > > > > > Signed-off-by: Pali Rohár > > > > --- > > > > drivers/irqchip/irq-armada-370-xp.c | 213 +++++++++++++++++++++++++++- > > > > 1 file changed, 210 insertions(+), 3 deletions(-) > > > > > > > > diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c > > > > index ebd76ea1c69b..71578b65f5c8 100644 > > > > --- a/drivers/irqchip/irq-armada-370-xp.c > > > > +++ b/drivers/irqchip/irq-armada-370-xp.c > > > > @@ -117,6 +117,8 @@ > > > > /* Registers relative to main_int_base */ > > > > #define ARMADA_370_XP_INT_CONTROL (0x00) > > > > #define ARMADA_370_XP_SW_TRIG_INT_OFFS (0x04) > > > > +#define ARMADA_370_XP_INT_SOC_ERR_0_CAUSE_OFFS (0x20) > > > > +#define ARMADA_370_XP_INT_SOC_ERR_1_CAUSE_OFFS (0x24) > > > > #define ARMADA_370_XP_INT_SET_ENABLE_OFFS (0x30) > > > > #define ARMADA_370_XP_INT_CLEAR_ENABLE_OFFS (0x34) > > > > #define ARMADA_370_XP_INT_SOURCE_CTL(irq) (0x100 + irq*4) > > > > @@ -130,6 +132,8 @@ > > > > #define ARMADA_370_XP_CPU_INTACK_OFFS (0x44) > > > > #define ARMADA_370_XP_INT_SET_MASK_OFFS (0x48) > > > > #define ARMADA_370_XP_INT_CLEAR_MASK_OFFS (0x4C) > > > > +#define ARMADA_370_XP_INT_SOC_ERR_0_MASK_OFF (0x50) > > > > +#define ARMADA_370_XP_INT_SOC_ERR_1_MASK_OFF (0x54) > > > > #define ARMADA_370_XP_INT_FABRIC_MASK_OFFS (0x54) > > > > #define ARMADA_370_XP_INT_CAUSE_PERF(cpu) (1 << cpu) > > > > > > > > @@ -146,6 +150,8 @@ > > > > static void __iomem *per_cpu_int_base; > > > > static void __iomem *main_int_base; > > > > static struct irq_domain *armada_370_xp_mpic_domain; > > > > +static struct irq_domain *armada_370_xp_soc_err_domain; > > > > +static unsigned int soc_err_irq_num_regs; > > > > static u32 doorbell_mask_reg; > > > > static int parent_irq; > > > > #ifdef CONFIG_PCI_MSI > > > > @@ -156,6 +162,8 @@ static DEFINE_MUTEX(msi_used_lock); > > > > static phys_addr_t msi_doorbell_addr; > > > > #endif > > > > > > > > +static void armada_370_xp_soc_err_irq_unmask(struct irq_data *d); > > > > + > > > > static inline bool is_percpu_irq(irq_hw_number_t irq) > > > > { > > > > if (irq <= ARMADA_370_XP_MAX_PER_CPU_IRQS) > > > > @@ -509,6 +517,27 @@ static void armada_xp_mpic_reenable_percpu(void) > > > > armada_370_xp_irq_unmask(data); > > > > } > > > > > > > > + /* Re-enable per-CPU SoC Error interrupts that were enabled before suspend */ > > > > + for (irq = 0; irq < soc_err_irq_num_regs * 32; irq++) { > > > > + struct irq_data *data; > > > > + int virq; > > > > + > > > > + virq = irq_linear_revmap(armada_370_xp_soc_err_domain, irq); > > > > + if (virq == 0) > > > > + continue; > > > > + > > > > + data = irq_get_irq_data(virq); > > > > + > > > > + if (!irq_percpu_is_enabled(virq)) > > > > + continue; > > > > + > > > > + armada_370_xp_soc_err_irq_unmask(data); > > > > + } > > > > > > So you do this loop and all these lookups, both here and in the resume > > > function (duplicated code!) just to be able to call the unmask > > > function? This would be better served by two straight writes of the > > > mask register, which you'd conveniently save on suspend. > > > > > > Yes, you have only duplicated the existing logic. But surely there is > > > something better to do. > > > > Yes, I just used existing logic. > > > > I'm not rewriting driver or doing big refactor of it, as this is not in > > the scope of the PCIe AER interrupt support. > > Fair enough. By the same logic, I'm not taking any change to the > driver until it is put in a better shape. Your call. If you are maintainer of this code then it is expected from _you_ to move the current code into _better shape_ as you wrote and expect. And then show us exactly, how new changes in this driver should look like, in examples. > > > > + > > > > + /* Unmask summary SoC Error Interrupt */ > > > > + if (soc_err_irq_num_regs > 0) > > > > + writel(4, per_cpu_int_base + ARMADA_370_XP_INT_CLEAR_MASK_OFFS); > > > > + > > > > ipi_resume(); > > > > } > > > > > > > > @@ -546,8 +575,8 @@ static struct irq_chip armada_370_xp_irq_chip = { > > > > static int armada_370_xp_mpic_irq_map(struct irq_domain *h, > > > > unsigned int virq, irq_hw_number_t hw) > > > > { > > > > - /* IRQs 0 and 1 cannot be mapped, they are handled internally */ > > > > - if (hw <= 1) > > > > + /* IRQs 0, 1 and 4 cannot be mapped, they are handled internally */ > > > > + if (hw <= 1 || hw == 4) > > > > return -EINVAL; > > > > > > > > armada_370_xp_irq_mask(irq_get_irq_data(virq)); > > > > @@ -577,6 +606,99 @@ static const struct irq_domain_ops armada_370_xp_mpic_irq_ops = { > > > > .xlate = irq_domain_xlate_onecell, > > > > }; > > > > > > > > +static DEFINE_RAW_SPINLOCK(armada_370_xp_soc_err_lock); > > > > + > > > > +static void armada_370_xp_soc_err_irq_mask(struct irq_data *d) > > > > +{ > > > > + irq_hw_number_t hwirq = irqd_to_hwirq(d); > > > > + u32 reg, mask; > > > > + > > > > + reg = hwirq >= 32 ? ARMADA_370_XP_INT_SOC_ERR_1_MASK_OFF > > > > + : ARMADA_370_XP_INT_SOC_ERR_0_MASK_OFF; > > > > + > > > > + raw_spin_lock(&armada_370_xp_soc_err_lock); > > > > + mask = readl(per_cpu_int_base + reg); > > > > + mask &= ~BIT(hwirq % 32); > > > > + writel(mask, per_cpu_int_base + reg); > > > > + raw_spin_unlock(&armada_370_xp_soc_err_lock); > > > > +} > > > > + > > > > +static void armada_370_xp_soc_err_irq_unmask(struct irq_data *d) > > > > +{ > > > > + irq_hw_number_t hwirq = irqd_to_hwirq(d); > > > > + u32 reg, mask; > > > > + > > > > + reg = hwirq >= 32 ? ARMADA_370_XP_INT_SOC_ERR_1_MASK_OFF > > > > + : ARMADA_370_XP_INT_SOC_ERR_0_MASK_OFF; > > > > + > > > > + raw_spin_lock(&armada_370_xp_soc_err_lock); > > > > + mask = readl(per_cpu_int_base + reg); > > > > + mask |= BIT(hwirq % 32); > > > > + writel(mask, per_cpu_int_base + reg); > > > > + raw_spin_unlock(&armada_370_xp_soc_err_lock); > > > > +} > > > > + > > > > +static int armada_370_xp_soc_err_irq_mask_on_cpu(void *par) > > > > +{ > > > > + struct irq_data *d = par; > > > > + armada_370_xp_soc_err_irq_mask(d); > > > > + return 0; > > > > +} > > > > + > > > > +static int armada_370_xp_soc_err_irq_unmask_on_cpu(void *par) > > > > +{ > > > > + struct irq_data *d = par; > > > > + armada_370_xp_soc_err_irq_unmask(d); > > > > + return 0; > > > > +} > > > > + > > > > +static int armada_xp_soc_err_irq_set_affinity(struct irq_data *d, > > > > + const struct cpumask *mask, > > > > + bool force) > > > > +{ > > > > + unsigned int cpu; > > > > + > > > > + cpus_read_lock(); > > > > + > > > > + /* First disable IRQ on all cores */ > > > > + for_each_online_cpu(cpu) > > > > + smp_call_on_cpu(cpu, armada_370_xp_soc_err_irq_mask_on_cpu, d, true); > > > > + > > > > + /* Select a single core from the affinity mask which is online */ > > > > + cpu = cpumask_any_and(mask, cpu_online_mask); > > > > + smp_call_on_cpu(cpu, armada_370_xp_soc_err_irq_unmask_on_cpu, d, true); > > > > + > > > > + cpus_read_unlock(); > > > > + > > > > + irq_data_update_effective_affinity(d, cpumask_of(cpu)); > > > > + > > > > + return IRQ_SET_MASK_OK; > > > > +} > > > > > > Aren't these per-CPU interrupts anyway? What does it mean to set their > > > affinity? /me rolls eyes... > > > > Yes, they are per-CPU interrupts. But to mask or unmask particular > > interrupt for specific CPU is possible only from that CPU. CPU 0 just > > cannot move interrupt from CPU 0 to CPU 1. CPU 0 can only mask that > > interrupt and CPU 1 has to unmask it. > > And that's no different form other per-CPU interrupts that have the > exact same requirements. NAK to this sort of hacks. You forgot to mention in your previous email how to do it, right? So we are waiting...