diff options
Diffstat (limited to 'drivers/xen/events.c')
-rw-r--r-- | drivers/xen/events.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/xen/events.c b/drivers/xen/events.c index 4e0f868517be..cd504092299b 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c | |||
@@ -97,6 +97,7 @@ struct irq_info | |||
97 | } u; | 97 | } u; |
98 | }; | 98 | }; |
99 | #define PIRQ_NEEDS_EOI (1 << 0) | 99 | #define PIRQ_NEEDS_EOI (1 << 0) |
100 | #define PIRQ_SHAREABLE (1 << 1) | ||
100 | 101 | ||
101 | static struct irq_info *irq_info; | 102 | static struct irq_info *irq_info; |
102 | 103 | ||
@@ -445,6 +446,7 @@ static unsigned int startup_pirq(unsigned int irq) | |||
445 | struct evtchn_bind_pirq bind_pirq; | 446 | struct evtchn_bind_pirq bind_pirq; |
446 | struct irq_info *info = info_for_irq(irq); | 447 | struct irq_info *info = info_for_irq(irq); |
447 | int evtchn = evtchn_from_irq(irq); | 448 | int evtchn = evtchn_from_irq(irq); |
449 | int rc; | ||
448 | 450 | ||
449 | BUG_ON(info->type != IRQT_PIRQ); | 451 | BUG_ON(info->type != IRQT_PIRQ); |
450 | 452 | ||
@@ -453,8 +455,10 @@ static unsigned int startup_pirq(unsigned int irq) | |||
453 | 455 | ||
454 | bind_pirq.pirq = irq; | 456 | bind_pirq.pirq = irq; |
455 | /* NB. We are happy to share unless we are probing. */ | 457 | /* NB. We are happy to share unless we are probing. */ |
456 | bind_pirq.flags = probing_irq(irq) ? 0 : BIND_PIRQ__WILL_SHARE; | 458 | bind_pirq.flags = info->u.pirq.flags & PIRQ_SHAREABLE ? |
457 | if (HYPERVISOR_event_channel_op(EVTCHNOP_bind_pirq, &bind_pirq) != 0) { | 459 | BIND_PIRQ__WILL_SHARE : 0; |
460 | rc = HYPERVISOR_event_channel_op(EVTCHNOP_bind_pirq, &bind_pirq); | ||
461 | if (rc != 0) { | ||
458 | if (!probing_irq(irq)) | 462 | if (!probing_irq(irq)) |
459 | printk(KERN_INFO "Failed to obtain physical IRQ %d\n", | 463 | printk(KERN_INFO "Failed to obtain physical IRQ %d\n", |
460 | irq); | 464 | irq); |
@@ -564,7 +568,7 @@ static int find_irq_by_gsi(unsigned gsi) | |||
564 | * event channel until the irq actually started up. Return an | 568 | * event channel until the irq actually started up. Return an |
565 | * existing irq if we've already got one for the gsi. | 569 | * existing irq if we've already got one for the gsi. |
566 | */ | 570 | */ |
567 | int xen_allocate_pirq(unsigned gsi, char *name) | 571 | int xen_allocate_pirq(unsigned gsi, int shareable, char *name) |
568 | { | 572 | { |
569 | int irq; | 573 | int irq; |
570 | struct physdev_irq irq_op; | 574 | struct physdev_irq irq_op; |
@@ -596,6 +600,7 @@ int xen_allocate_pirq(unsigned gsi, char *name) | |||
596 | } | 600 | } |
597 | 601 | ||
598 | irq_info[irq] = mk_pirq_info(0, gsi, irq_op.vector); | 602 | irq_info[irq] = mk_pirq_info(0, gsi, irq_op.vector); |
603 | irq_info[irq].u.pirq.flags |= shareable ? PIRQ_SHAREABLE : 0; | ||
599 | 604 | ||
600 | out: | 605 | out: |
601 | spin_unlock(&irq_mapping_update_lock); | 606 | spin_unlock(&irq_mapping_update_lock); |