forked from luck/tmp_suning_uos_patched
genirq: Provide IRQCHIP_AFFINITY_PRE_STARTUP
commit 826da771291fc25a428e871f9e7fb465e390f852 upstream.
X86 IO/APIC and MSI interrupts (when used without interrupts remapping)
require that the affinity setup on startup is done before the interrupt is
enabled for the first time as the non-remapped operation mode cannot safely
migrate enabled interrupts from arbitrary contexts. Provide a new irq chip
flag which allows affected hardware to request this.
This has to be opt-in because there have been reports in the past that some
interrupt chips cannot handle affinity setting before startup.
Fixes: 1840475676
("genirq: Expose default irq affinity mask (take 3)")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Marc Zyngier <maz@kernel.org>
Reviewed-by: Marc Zyngier <maz@kernel.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20210729222542.779791738@linutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
2a28b52306
commit
4e52a4fe6f
|
@ -567,6 +567,7 @@ struct irq_chip {
|
||||||
* IRQCHIP_SUPPORTS_NMI: Chip can deliver NMIs, only for root irqchips
|
* IRQCHIP_SUPPORTS_NMI: Chip can deliver NMIs, only for root irqchips
|
||||||
* IRQCHIP_ENABLE_WAKEUP_ON_SUSPEND: Invokes __enable_irq()/__disable_irq() for wake irqs
|
* IRQCHIP_ENABLE_WAKEUP_ON_SUSPEND: Invokes __enable_irq()/__disable_irq() for wake irqs
|
||||||
* in the suspend path if they are in disabled state
|
* in the suspend path if they are in disabled state
|
||||||
|
* IRQCHIP_AFFINITY_PRE_STARTUP: Default affinity update before startup
|
||||||
*/
|
*/
|
||||||
enum {
|
enum {
|
||||||
IRQCHIP_SET_TYPE_MASKED = (1 << 0),
|
IRQCHIP_SET_TYPE_MASKED = (1 << 0),
|
||||||
|
@ -579,6 +580,7 @@ enum {
|
||||||
IRQCHIP_SUPPORTS_LEVEL_MSI = (1 << 7),
|
IRQCHIP_SUPPORTS_LEVEL_MSI = (1 << 7),
|
||||||
IRQCHIP_SUPPORTS_NMI = (1 << 8),
|
IRQCHIP_SUPPORTS_NMI = (1 << 8),
|
||||||
IRQCHIP_ENABLE_WAKEUP_ON_SUSPEND = (1 << 9),
|
IRQCHIP_ENABLE_WAKEUP_ON_SUSPEND = (1 << 9),
|
||||||
|
IRQCHIP_AFFINITY_PRE_STARTUP = (1 << 10),
|
||||||
};
|
};
|
||||||
|
|
||||||
#include <linux/irqdesc.h>
|
#include <linux/irqdesc.h>
|
||||||
|
|
|
@ -265,8 +265,11 @@ int irq_startup(struct irq_desc *desc, bool resend, bool force)
|
||||||
} else {
|
} else {
|
||||||
switch (__irq_startup_managed(desc, aff, force)) {
|
switch (__irq_startup_managed(desc, aff, force)) {
|
||||||
case IRQ_STARTUP_NORMAL:
|
case IRQ_STARTUP_NORMAL:
|
||||||
|
if (d->chip->flags & IRQCHIP_AFFINITY_PRE_STARTUP)
|
||||||
|
irq_setup_affinity(desc);
|
||||||
ret = __irq_startup(desc);
|
ret = __irq_startup(desc);
|
||||||
irq_setup_affinity(desc);
|
if (!(d->chip->flags & IRQCHIP_AFFINITY_PRE_STARTUP))
|
||||||
|
irq_setup_affinity(desc);
|
||||||
break;
|
break;
|
||||||
case IRQ_STARTUP_MANAGED:
|
case IRQ_STARTUP_MANAGED:
|
||||||
irq_do_set_affinity(d, aff, false);
|
irq_do_set_affinity(d, aff, false);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user