aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Gross <jgross@suse.com>2021-04-12 08:28:45 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-04-16 11:49:31 +0200
commitd9ab90118cf9e7ea83d614b94225ad0cfe5face9 (patch)
treeca61f371468951a1db484026911e3d208324ceb9
parent61de25de1ac8baf4e9e3e3386412656b35345121 (diff)
downloadlinux-yocto-d9ab90118cf9e7ea83d614b94225ad0cfe5face9.tar.gz
linux-yocto-d9ab90118cf9e7ea83d614b94225ad0cfe5face9.tar.bz2
linux-yocto-d9ab90118cf9e7ea83d614b94225ad0cfe5face9.zip
xen/events: fix setting irq affinity
The backport of upstream patch 25da4618af240fbec61 ("xen/events: don't unmask an event channel when an eoi is pending") introduced a regression for stable kernels 5.10 and older: setting IRQ affinity for IRQs related to interdomain events would no longer work, as moving the IRQ to its new cpu was not included in the irq_ack callback for those events. Fix that by adding the needed call. Note that kernels 5.11 and later don't need the explicit moving of the IRQ to the target cpu in the irq_ack callback, due to a rework of the affinity setting in kernel 5.11. Signed-off-by: Juergen Gross <jgross@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/xen/events/events_base.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
index 8c577f0ae2bb..b370144682ed 100644
--- a/drivers/xen/events/events_base.c
+++ b/drivers/xen/events/events_base.c
@@ -1782,7 +1782,7 @@ static void lateeoi_ack_dynirq(struct irq_data *data)
if (VALID_EVTCHN(evtchn)) {
do_mask(info, EVT_MASK_REASON_EOI_PENDING);
- event_handler_exit(info);
+ ack_dynirq(data);
}
}
@@ -1793,7 +1793,7 @@ static void lateeoi_mask_ack_dynirq(struct irq_data *data)
if (VALID_EVTCHN(evtchn)) {
do_mask(info, EVT_MASK_REASON_EXPLICIT);
- event_handler_exit(info);
+ ack_dynirq(data);
}
}