OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xen: Provide a variant of xen_poll_irq with timeout. 

The 'xen_poll_irq_timeout' provides a method to pass in
the poll timeout for IRQs if requested. We also export
those two poll functions as Xen PCI fronted uses them.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
This commit is contained in:
Konrad Rzeszutek Wilk 2009-11-05 16:33:09 -05:00
parent 3a69e9165a
commit d9a8814f27
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/xen/events.c
View File

@ -1139,7 +1139,7 @@ void xen_clear_irq_pending(int irq)
if (VALID_EVTCHN(evtchn)) if (VALID_EVTCHN(evtchn))
clear_evtchn(evtchn); clear_evtchn(evtchn);
} }
EXPORT_SYMBOL(xen_clear_irq_pending);
void xen_set_irq_pending(int irq) void xen_set_irq_pending(int irq)
{ {
int evtchn = evtchn_from_irq(irq); int evtchn = evtchn_from_irq(irq);
@ -1159,9 +1159,9 @@ bool xen_test_irq_pending(int irq)
return ret; return ret;
} }
/* Poll waiting for an irq to become pending. In the usual case, the /* Poll waiting for an irq to become pending with timeout. In the usual case,
irq will be disabled so it won't deliver an interrupt. */ * the irq will be disabled so it won't deliver an interrupt. */
void xen_poll_irq(int irq) void xen_poll_irq_timeout(int irq, u64 timeout)
{ {
evtchn_port_t evtchn = evtchn_from_irq(irq); evtchn_port_t evtchn = evtchn_from_irq(irq);
@ -1169,13 +1169,20 @@ void xen_poll_irq(int irq)
struct sched_poll poll; struct sched_poll poll;
poll.nr_ports = 1; poll.nr_ports = 1;
poll.timeout = 0; poll.timeout = timeout;
set_xen_guest_handle(poll.ports, &evtchn); set_xen_guest_handle(poll.ports, &evtchn);
if (HYPERVISOR_sched_op(SCHEDOP_poll, &poll) != 0) if (HYPERVISOR_sched_op(SCHEDOP_poll, &poll) != 0)
BUG(); BUG();
} }
} }
EXPORT_SYMBOL(xen_poll_irq_timeout);
/* Poll waiting for an irq to become pending. In the usual case, the
* irq will be disabled so it won't deliver an interrupt. */
void xen_poll_irq(int irq)
{
xen_poll_irq_timeout(irq, 0 /* no timeout */);
}
void xen_irq_resume(void) void xen_irq_resume(void)
{ {

4
include/xen/events.h
View File

@ -53,6 +53,10 @@ bool xen_test_irq_pending(int irq);
irq will be disabled so it won't deliver an interrupt. */ irq will be disabled so it won't deliver an interrupt. */
void xen_poll_irq(int irq); void xen_poll_irq(int irq);
/* Poll waiting for an irq to become pending with a timeout. In the usual case,
* the irq will be disabled so it won't deliver an interrupt. */
void xen_poll_irq_timeout(int irq, u64 timeout);
/* Determine the IRQ which is bound to an event channel */ /* Determine the IRQ which is bound to an event channel */
unsigned irq_from_evtchn(unsigned int evtchn); unsigned irq_from_evtchn(unsigned int evtchn);