From: Ali Saidi <alisaidi@amazon.com> To: Thomas Gleixner <tglx@linutronix.de>, Jason Cooper <jason@lakedaemon.net>, Marc Zyngier <maz@kernel.org>, <linux-kernel@vger.kernel.org> Cc: <linux-arm-kernel@lists.infradead.org>, <benh@amazon.com>, <dwmw@amazon.com>, <zeev@amazon.com>, <zorik@amazon.com>, <alisaidi@amazon.com> Subject: [PATCH] irqchip/gic-v3-its: Don't try to move a disabled irq Date: Fri, 29 May 2020 01:55:01 +0000 [thread overview] Message-ID: <20200529015501.15771-1-alisaidi@amazon.com> (raw) If an interrupt is disabled the ITS driver has sent a discard removing the DeviceID and EventID from the ITT. After this occurs it can't be moved to another collection with a MOVI and a command error occurs if attempted. Before issuing the MOVI command make sure that the IRQ isn't disabled and change the activate code to try and use the previous affinity. Signed-off-by: Ali Saidi <alisaidi@amazon.com> --- drivers/irqchip/irq-gic-v3-its.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 124251b0ccba..1235dd9a2fb2 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -1540,7 +1540,11 @@ static int its_set_affinity(struct irq_data *d, const struct cpumask *mask_val, /* don't set the affinity when the target cpu is same as current one */ if (cpu != its_dev->event_map.col_map[id]) { target_col = &its_dev->its->collections[cpu]; - its_send_movi(its_dev, target_col, id); + + /* If the IRQ is disabled a discard was sent so don't move */ + if (!irqd_irq_disabled(d)) + its_send_movi(its_dev, target_col, id); + its_dev->event_map.col_map[id] = cpu; irq_data_update_effective_affinity(d, cpumask_of(cpu)); } @@ -3439,8 +3443,16 @@ static int its_irq_domain_activate(struct irq_domain *domain, if (its_dev->its->numa_node >= 0) cpu_mask = cpumask_of_node(its_dev->its->numa_node); - /* Bind the LPI to the first possible CPU */ - cpu = cpumask_first_and(cpu_mask, cpu_online_mask); + /* If the cpu set to a different CPU that is still online use it */ + cpu = its_dev->event_map.col_map[event]; + + cpumask_and(cpu_mask, cpu_mask, cpu_online_mask); + + if (!cpumask_test_cpu(cpu, cpu_mask)) { + /* Bind the LPI to the first possible CPU */ + cpu = cpumask_first(cpu_mask); + } + if (cpu >= nr_cpu_ids) { if (its_dev->its->flags & ITS_FLAGS_WORKAROUND_CAVIUM_23144) return -EINVAL; -- 2.24.1.AMZN
WARNING: multiple messages have this Message-ID (diff)
From: Ali Saidi <alisaidi@amazon.com> To: Thomas Gleixner <tglx@linutronix.de>, Jason Cooper <jason@lakedaemon.net>, Marc Zyngier <maz@kernel.org>, <linux-kernel@vger.kernel.org> Cc: benh@amazon.com, zorik@amazon.com, zeev@amazon.com, linux-arm-kernel@lists.infradead.org, alisaidi@amazon.com, dwmw@amazon.com Subject: [PATCH] irqchip/gic-v3-its: Don't try to move a disabled irq Date: Fri, 29 May 2020 01:55:01 +0000 [thread overview] Message-ID: <20200529015501.15771-1-alisaidi@amazon.com> (raw) If an interrupt is disabled the ITS driver has sent a discard removing the DeviceID and EventID from the ITT. After this occurs it can't be moved to another collection with a MOVI and a command error occurs if attempted. Before issuing the MOVI command make sure that the IRQ isn't disabled and change the activate code to try and use the previous affinity. Signed-off-by: Ali Saidi <alisaidi@amazon.com> --- drivers/irqchip/irq-gic-v3-its.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 124251b0ccba..1235dd9a2fb2 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -1540,7 +1540,11 @@ static int its_set_affinity(struct irq_data *d, const struct cpumask *mask_val, /* don't set the affinity when the target cpu is same as current one */ if (cpu != its_dev->event_map.col_map[id]) { target_col = &its_dev->its->collections[cpu]; - its_send_movi(its_dev, target_col, id); + + /* If the IRQ is disabled a discard was sent so don't move */ + if (!irqd_irq_disabled(d)) + its_send_movi(its_dev, target_col, id); + its_dev->event_map.col_map[id] = cpu; irq_data_update_effective_affinity(d, cpumask_of(cpu)); } @@ -3439,8 +3443,16 @@ static int its_irq_domain_activate(struct irq_domain *domain, if (its_dev->its->numa_node >= 0) cpu_mask = cpumask_of_node(its_dev->its->numa_node); - /* Bind the LPI to the first possible CPU */ - cpu = cpumask_first_and(cpu_mask, cpu_online_mask); + /* If the cpu set to a different CPU that is still online use it */ + cpu = its_dev->event_map.col_map[event]; + + cpumask_and(cpu_mask, cpu_mask, cpu_online_mask); + + if (!cpumask_test_cpu(cpu, cpu_mask)) { + /* Bind the LPI to the first possible CPU */ + cpu = cpumask_first(cpu_mask); + } + if (cpu >= nr_cpu_ids) { if (its_dev->its->flags & ITS_FLAGS_WORKAROUND_CAVIUM_23144) return -EINVAL; -- 2.24.1.AMZN _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2020-05-29 1:56 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-05-29 1:55 Ali Saidi [this message] 2020-05-29 1:55 ` [PATCH] irqchip/gic-v3-its: Don't try to move a disabled irq Ali Saidi 2020-05-29 4:07 ` Zenghui Yu 2020-05-29 4:07 ` Zenghui Yu 2020-05-29 8:32 ` Marc Zyngier 2020-05-29 8:32 ` Marc Zyngier 2020-05-29 12:36 ` Saidi, Ali 2020-05-29 12:36 ` Saidi, Ali 2020-05-30 16:49 ` Marc Zyngier 2020-05-30 16:49 ` Marc Zyngier 2020-05-31 11:09 ` Marc Zyngier 2020-05-31 11:09 ` Marc Zyngier 2020-06-01 0:10 ` Saidi, Ali 2020-06-01 0:10 ` Saidi, Ali 2020-06-01 2:40 ` Herrenschmidt, Benjamin 2020-06-01 2:40 ` Herrenschmidt, Benjamin 2020-06-02 20:54 ` Thomas Gleixner 2020-06-02 20:54 ` Thomas Gleixner 2020-06-03 12:44 ` Marc Zyngier 2020-06-03 12:44 ` Marc Zyngier 2020-05-31 2:53 ` kbuild test robot 2020-05-31 2:53 ` kbuild test robot 2020-05-31 2:53 ` kbuild test robot 2020-07-17 21:34 ` [tip: irq/urgent] genirq/affinity: Handle affinity setting on inactive interrupts correctly tip-bot2 for Thomas Gleixner 2020-06-02 18:47 [PATCH] irqchip/gic-v3-its: Don't try to move a disabled irq Saidi, Ali 2020-06-03 15:16 ` Marc Zyngier 2020-06-03 15:16 ` Marc Zyngier 2020-06-03 22:14 ` Herrenschmidt, Benjamin 2020-06-03 22:14 ` Herrenschmidt, Benjamin 2020-06-08 13:48 ` Thomas Gleixner 2020-06-08 13:48 ` Thomas Gleixner 2020-06-08 21:59 ` Benjamin Herrenschmidt 2020-06-08 21:59 ` Benjamin Herrenschmidt 2020-06-08 23:36 ` Thomas Gleixner 2020-06-08 23:36 ` Thomas Gleixner 2020-06-11 17:44 Saidi, Ali
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=20200529015501.15771-1-alisaidi@amazon.com \ --to=alisaidi@amazon.com \ --cc=benh@amazon.com \ --cc=dwmw@amazon.com \ --cc=jason@lakedaemon.net \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=maz@kernel.org \ --cc=tglx@linutronix.de \ --cc=zeev@amazon.com \ --cc=zorik@amazon.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.