Skip to content

Commit e91b2b1

Browse files
committed
xen: dont fiddle with event channel masking in suspend/resume
Instead of fiddling with masking the event channels during suspend and resume handling let do the irq subsystem do its job. It will do the mask and unmask operations as needed. Signed-off-by: Juergen Gross <[email protected]> Acked-by: Thomas Gleixner <[email protected]> Reviewed-by: Boris Ostrovsky <[email protected]> Tested-by: Boris Ostrovsky <[email protected]> Signed-off-by: Juergen Gross <[email protected]>
1 parent 0399373 commit e91b2b1

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

drivers/xen/events/events_base.c

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -343,14 +343,6 @@ static void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu)
343343
info->cpu = cpu;
344344
}
345345

346-
static void xen_evtchn_mask_all(void)
347-
{
348-
unsigned int evtchn;
349-
350-
for (evtchn = 0; evtchn < xen_evtchn_nr_channels(); evtchn++)
351-
mask_evtchn(evtchn);
352-
}
353-
354346
/**
355347
* notify_remote_via_irq - send event to remote end of event channel via irq
356348
* @irq: irq of event channel to send event to
@@ -1573,7 +1565,6 @@ void xen_irq_resume(void)
15731565
struct irq_info *info;
15741566

15751567
/* New event-channel space is not 'live' yet. */
1576-
xen_evtchn_mask_all();
15771568
xen_evtchn_resume();
15781569

15791570
/* No IRQ <-> event-channel mappings. */
@@ -1681,6 +1672,7 @@ module_param(fifo_events, bool, 0);
16811672
void __init xen_init_IRQ(void)
16821673
{
16831674
int ret = -EINVAL;
1675+
unsigned int evtchn;
16841676

16851677
if (fifo_events)
16861678
ret = xen_evtchn_fifo_init();
@@ -1692,7 +1684,8 @@ void __init xen_init_IRQ(void)
16921684
BUG_ON(!evtchn_to_irq);
16931685

16941686
/* No event channels are 'live' right now. */
1695-
xen_evtchn_mask_all();
1687+
for (evtchn = 0; evtchn < xen_evtchn_nr_channels(); evtchn++)
1688+
mask_evtchn(evtchn);
16961689

16971690
pirq_needs_eoi = pirq_needs_eoi_flag;
16981691

0 commit comments

Comments
 (0)