diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2017-08-18 04:39:23 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-08-18 04:54:42 -0400 |
| commit | 79a0d4d8f1ae9568a952c8e5928ee81b30c8df11 (patch) | |
| tree | 750738cdaf7b0061735f3f14aa2809d946fc3593 | |
| parent | 64b5aaad3c743be4f866cfe1ef2c903582e389a3 (diff) | |
irqchip/hip04: Report that effective affinity is a single target
The HIP04 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>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: Kevin Cernekee <cernekee@gmail.com>
Cc: Wei Xu <xuwei5@hisilicon.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Cc: Matt Redfearn <matt.redfearn@imgtec.com>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Link: http://lkml.kernel.org/r/20170818083925.10108-11-marc.zyngier@arm.com
| -rw-r--r-- | arch/arm/mach-hisi/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/irqchip/irq-hip04.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-hisi/Kconfig b/arch/arm/mach-hisi/Kconfig index a3b091a4d344..65a048fa08ec 100644 --- a/arch/arm/mach-hisi/Kconfig +++ b/arch/arm/mach-hisi/Kconfig | |||
| @@ -39,6 +39,7 @@ config ARCH_HIP04 | |||
| 39 | select HAVE_ARM_ARCH_TIMER | 39 | select HAVE_ARM_ARCH_TIMER |
| 40 | select MCPM if SMP | 40 | select MCPM if SMP |
| 41 | select MCPM_QUAD_CLUSTER if SMP | 41 | select MCPM_QUAD_CLUSTER if SMP |
| 42 | select GENERIC_IRQ_EFFECTIVE_AFF_MASK | ||
| 42 | help | 43 | help |
| 43 | Support for Hisilicon HiP04 SoC family | 44 | Support for Hisilicon HiP04 SoC family |
| 44 | 45 | ||
diff --git a/drivers/irqchip/irq-hip04.c b/drivers/irqchip/irq-hip04.c index c1b4ee955dbe..5b4fd2f4e5f8 100644 --- a/drivers/irqchip/irq-hip04.c +++ b/drivers/irqchip/irq-hip04.c | |||
| @@ -165,6 +165,8 @@ static int hip04_irq_set_affinity(struct irq_data *d, | |||
| 165 | writel_relaxed(val | bit, reg); | 165 | writel_relaxed(val | bit, reg); |
| 166 | raw_spin_unlock(&irq_controller_lock); | 166 | raw_spin_unlock(&irq_controller_lock); |
| 167 | 167 | ||
| 168 | irq_data_update_effective_affinity(d, cpumask_of(cpu)); | ||
| 169 | |||
| 168 | return IRQ_SET_MASK_OK; | 170 | return IRQ_SET_MASK_OK; |
| 169 | } | 171 | } |
| 170 | #endif | 172 | #endif |
| @@ -312,6 +314,7 @@ static int hip04_irq_domain_map(struct irq_domain *d, unsigned int irq, | |||
| 312 | irq_set_chip_and_handler(irq, &hip04_irq_chip, | 314 | irq_set_chip_and_handler(irq, &hip04_irq_chip, |
| 313 | handle_fasteoi_irq); | 315 | handle_fasteoi_irq); |
| 314 | irq_set_probe(irq); | 316 | irq_set_probe(irq); |
| 317 | irqd_set_single_target(irq_desc_get_irq_data(irq_to_desc(irq))); | ||
| 315 | } | 318 | } |
| 316 | irq_set_chip_data(irq, d->host_data); | 319 | irq_set_chip_data(irq, d->host_data); |
| 317 | return 0; | 320 | return 0; |
