Skip to content

Commit

Permalink
xen: dont fiddle with event channel masking in suspend/resume
Browse files Browse the repository at this point in the history
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 <jgross@suse.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Tested-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
  • Loading branch information
Juergen Gross committed Jul 27, 2017
1 parent 0399373 commit e91b2b1
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions drivers/xen/events/events_base.c
Original file line number Diff line number Diff line change
Expand Up @@ -343,14 +343,6 @@ static void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu)
info->cpu = cpu;
}

static void xen_evtchn_mask_all(void)
{
unsigned int evtchn;

for (evtchn = 0; evtchn < xen_evtchn_nr_channels(); evtchn++)
mask_evtchn(evtchn);
}

/**
* notify_remote_via_irq - send event to remote end of event channel via irq
* @irq: irq of event channel to send event to
Expand Down Expand Up @@ -1573,7 +1565,6 @@ void xen_irq_resume(void)
struct irq_info *info;

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

/* No IRQ <-> event-channel mappings. */
Expand Down Expand Up @@ -1681,6 +1672,7 @@ module_param(fifo_events, bool, 0);
void __init xen_init_IRQ(void)
{
int ret = -EINVAL;
unsigned int evtchn;

if (fifo_events)
ret = xen_evtchn_fifo_init();
Expand All @@ -1692,7 +1684,8 @@ void __init xen_init_IRQ(void)
BUG_ON(!evtchn_to_irq);

/* No event channels are 'live' right now. */
xen_evtchn_mask_all();
for (evtchn = 0; evtchn < xen_evtchn_nr_channels(); evtchn++)
mask_evtchn(evtchn);

pirq_needs_eoi = pirq_needs_eoi_flag;

Expand Down

0 comments on commit e91b2b1

Please sign in to comment.