Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1714714

[PATCH v2 12/12] irqchip/xtensa-mx: Report that effective affinity is a single target

Show all headers | View raw

The xtensa-mx driver only targets a single CPU at a time, even if
the notional affinity is wider. Let's inform the core code
about this.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
 drivers/irqchip/Kconfig         | 1 +
 drivers/irqchip/irq-xtensa-mx.c | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index bca9a88012f0..1139de9da21a 100644
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -223,6 +223,7 @@ config VERSATILE_FPGA_IRQ_NR
 config XTENSA_MX
 	bool
 	select IRQ_DOMAIN
+	select GENERIC_IRQ_EFFECTIVE_AFF_MASK
 
 config XILINX_INTC
 	bool
diff --git a/drivers/irqchip/irq-xtensa-mx.c b/drivers/irqchip/irq-xtensa-mx.c
index 72a391e01011..a15a9510c904 100644
--- a/drivers/irqchip/irq-xtensa-mx.c
+++ b/drivers/irqchip/irq-xtensa-mx.c
@@ -32,6 +32,7 @@ static int xtensa_mx_irq_map(struct irq_domain *d, unsigned int irq,
 		irq_set_status_flags(irq, IRQ_LEVEL);
 		return 0;
 	}
+	irqd_set_single_target(irq_desc_get_irq_data(irq_to_desc(irq)));
 	return xtensa_irq_map(d, irq, hw);
 }
 
@@ -121,9 +122,12 @@ static int xtensa_mx_irq_retrigger(struct irq_data *d)
 static int xtensa_mx_irq_set_affinity(struct irq_data *d,
 		const struct cpumask *dest, bool force)
 {
-	unsigned mask = 1u << cpumask_any_and(dest, cpu_online_mask);
+	int cpu = cpumask_any_and(dest, cpu_online_mask);
+	unsigned mask = 1u << cpu;
 
 	set_er(mask, MIROUT(d->hwirq - HW_IRQ_MX_BASE));
+	irq_data_update_effective_affinity(d, cpumask_of(cpu));
+
 	return 0;
 
 }
-- 
2.11.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 00/12] genirq/irqchip: Effective affinity fixups Marc Zyngier <marc.zyngier@arm.com> - 2017-08-18 10:40 +0200
  [PATCH v2 05/12] irqchip/gic-v3-its: Report that effective affinity is a single target Marc Zyngier <marc.zyngier@arm.com> - 2017-08-18 10:40 +0200
    [tip:irq/core] irqchip/gic-v3-its: Report that effective affinity  is a single target tip-bot for Marc Zyngier <tipbot@zytor.com> - 2017-08-18 11:10 +0200
  [PATCH v2 04/12] irqchip/gic-v3: Report that effective affinity is a single target Marc Zyngier <marc.zyngier@arm.com> - 2017-08-18 10:40 +0200
    [tip:irq/core] irqchip/gic-v3: Report that effective affinity is a  single target tip-bot for Marc Zyngier <tipbot@zytor.com> - 2017-08-18 11:10 +0200
  [PATCH v2 02/12] genirq/proc: Use the the accessor to report the effective affinity Marc Zyngier <marc.zyngier@arm.com> - 2017-08-18 10:40 +0200
    [tip:irq/core] genirq/proc: Use the the accessor to report the  effective affinity tip-bot for Marc Zyngier <tipbot@zytor.com> - 2017-08-18 11:10 +0200
  [PATCH v2 11/12] irqchip/mips-gic: Report that effective affinity is a single target Marc Zyngier <marc.zyngier@arm.com> - 2017-08-18 10:50 +0200
    [tip:irq/core] irqchip/mips-gic: Report that effective affinity is  a single target tip-bot for Marc Zyngier <tipbot@zytor.com> - 2017-08-18 11:10 +0200
  [PATCH v2 09/12] irqchip/metag-ext: Report that effective affinity is a single target Marc Zyngier <marc.zyngier@arm.com> - 2017-08-18 10:50 +0200
    [tip:irq/core] irqchip/metag-ext: Report that effective affinity is  a single target tip-bot for Marc Zyngier <tipbot@zytor.com> - 2017-08-18 11:10 +0200
  [PATCH v2 07/12] irqchip/bcm-6345-l1: Report that effective affinity is a single target Marc Zyngier <marc.zyngier@arm.com> - 2017-08-18 10:50 +0200
    [tip:irq/core] irqchip/bcm-6345-l1: Report that effective affinity  is a single target tip-bot for Marc Zyngier <tipbot@zytor.com> - 2017-08-18 11:10 +0200
  [PATCH v2 01/12] genirq: Restrict effective affinity to interrupts actually using it Marc Zyngier <marc.zyngier@arm.com> - 2017-08-18 10:50 +0200
    [tip:irq/core] genirq: Restrict effective affinity to interrupts  actually using it tip-bot for Marc Zyngier <tipbot@zytor.com> - 2017-08-18 11:10 +0200
  [PATCH v2 03/12] irqchip/gic: Report that effective affinity is a single target Marc Zyngier <marc.zyngier@arm.com> - 2017-08-18 10:50 +0200
    [tip:irq/core] irqchip/gic: Report that effective affinity is a  single target tip-bot for Marc Zyngier <tipbot@zytor.com> - 2017-08-18 11:10 +0200
  [PATCH v2 10/12] irqchip/hip04: Report that effective affinity is a single target Marc Zyngier <marc.zyngier@arm.com> - 2017-08-18 10:50 +0200
    [tip:irq/core] irqchip/hip04: Report that effective affinity is a  single target tip-bot for Marc Zyngier <tipbot@zytor.com> - 2017-08-18 11:10 +0200
  [PATCH v2 12/12] irqchip/xtensa-mx: Report that effective affinity is a single target Marc Zyngier <marc.zyngier@arm.com> - 2017-08-18 10:50 +0200
    [tip:irq/core] irqchip/xtensa-mx: Report that effective affinity is  a single target tip-bot for Marc Zyngier <tipbot@zytor.com> - 2017-08-18 11:10 +0200
  [PATCH v2 08/12] irqchip/bcm-7038-l1: Report that effective affinity is a single target Marc Zyngier <marc.zyngier@arm.com> - 2017-08-18 10:50 +0200
    [tip:irq/core] irqchip/bcm-7038-l1: Report that effective affinity  is a single target tip-bot for Marc Zyngier <tipbot@zytor.com> - 2017-08-18 11:10 +0200
  [PATCH v2 06/12] irqchip/armada-370-xp: Report that effective affinity is a single target Marc Zyngier <marc.zyngier@arm.com> - 2017-08-18 10:50 +0200
    [tip:irq/core] irqchip/armada-370-xp: Report that effective  affinity is a single target tip-bot for Marc Zyngier <tipbot@zytor.com> - 2017-08-18 11:10 +0200

csiph-web