From 3e68095ef9ba1bee90ce09344f3367f166e5a3d7 Mon Sep 17 00:00:00 2001 From: Roger Pau Monne Date: Fri, 23 Jun 2017 10:59:51 +0100 Subject: [PATCH] x86/vioapic: bind interrupts to PVH Dom0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Add the glue in order to bind the PVH Dom0 GSI from bare metal. This is done when Dom0 unmasks the vIO APIC pins, by fetching the current pin settings and setting up the PIRQ, which will then be bound to Dom0. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/vioapic.c | 60 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c index 2beba45047..72cae935ac 100644 --- a/xen/arch/x86/hvm/vioapic.c +++ b/xen/arch/x86/hvm/vioapic.c @@ -158,6 +158,52 @@ static int vioapic_read( return X86EMUL_OKAY; } +static int vioapic_hwdom_map_gsi(unsigned int gsi, unsigned int trig, + unsigned int pol) +{ + struct domain *currd = current->domain; + xen_domctl_bind_pt_irq_t pt_irq_bind = { + .irq_type = PT_IRQ_TYPE_PCI, + .machine_irq = gsi, + }; + int ret, pirq = gsi; + + ASSERT(is_hardware_domain(currd)); + + /* Interrupt has been unmasked, bind it now. */ + ret = mp_register_gsi(gsi, trig, pol); + if ( ret == -EEXIST ) + return 0; + if ( ret ) + { + gprintk(XENLOG_WARNING, "vioapic: error registering GSI %u: %d\n", + gsi, ret); + return ret; + } + + ret = allocate_and_map_gsi_pirq(currd, pirq, &pirq); + if ( ret ) + { + gprintk(XENLOG_WARNING, "vioapic: error mapping GSI %u: %d\n", + gsi, ret); + return ret; + } + + pcidevs_lock(); + ret = pt_irq_create_bind(currd, &pt_irq_bind); + if ( ret ) + { + gprintk(XENLOG_WARNING, "vioapic: error binding GSI %u: %d\n", + gsi, ret); + spin_lock(&currd->event_lock); + unmap_domain_pirq(currd, pirq); + spin_unlock(&currd->event_lock); + } + pcidevs_unlock(); + + return ret; +} + static void vioapic_write_redirent( struct hvm_vioapic *vioapic, unsigned int idx, int top_word, uint32_t val) @@ -190,6 +236,20 @@ static void vioapic_write_redirent( *pent = ent; + if ( is_hardware_domain(d) && unmasked ) + { + int ret; + + ret = vioapic_hwdom_map_gsi(gsi, ent.fields.trig_mode, + ent.fields.polarity); + if ( ret ) + { + /* Mask the entry again. */ + pent->fields.mask = 1; + unmasked = 0; + } + } + if ( gsi == 0 ) { vlapic_adjust_i8259_target(d); -- 2.30.2