Some video BIOS require a PIT in order to work properly, hence classic
PV dom0 gets partial access to the physical PIT as long as it's not in
use by Xen.
Since PVH dom0 is built on top of HVM support, there's already an
emulated PIT implementation available for use. Tweak the emulated PIT
code so it injects interrupts directly into the vIO-APIC if the legacy
PIC (i8259) is disabled. Make sure the GSI used matches the ISA IRQ 0
in the likely case there's an interrupt overwrite in the MADT ACPI
table.
Finally prevent the passthrough of the GSI that belongs to the PIT,
since interrupts will be generated by the emulated PIT instead of the
physical one.
Signed-off-by: Roger Pau Monné <roger....@citrix.com>
---
xen/arch/x86/domain.c | 5 +++--
xen/arch/x86/emul-i8254.c | 12 +++++++++---
xen/arch/x86/hvm/vioapic.c | 9 ++++++++-
3 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index fee6c3931a..dc0b4c2284 100644
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -512,7 +512,8 @@ static bool emulation_flags_ok(const struct domain *d,
uint32_t emflags)
if ( is_hvm_domain(d) )
{
if ( is_hardware_domain(d) &&
- emflags != (X86_EMU_VPCI | X86_EMU_LAPIC | X86_EMU_IOAPIC) )
+ emflags != (X86_EMU_VPCI | X86_EMU_LAPIC | X86_EMU_IOAPIC |
+ X86_EMU_PIT) )
return false;
if ( !is_hardware_domain(d) &&
emflags != (X86_EMU_ALL & ~X86_EMU_VPCI) &&
@@ -578,7 +579,7 @@ int arch_domain_create(struct domain *d,
emflags = config->arch.emulation_flags;
- if ( is_hardware_domain(d) && is_pv_domain(d) )
+ if ( is_hardware_domain(d) )
emflags |= XEN_X86_EMU_PIT;
if ( emflags & ~XEN_X86_EMU_ALL )
diff --git a/xen/arch/x86/emul-i8254.c b/xen/arch/x86/emul-i8254.c
index 73be4188ad..5aef0fe852 100644
--- a/xen/arch/x86/emul-i8254.c
+++ b/xen/arch/x86/emul-i8254.c
@@ -168,6 +168,7 @@ static void pit_load_count(PITState *pit, int channel, int
val)
u32 period;
struct hvm_hw_pit_channel *s = &pit->hw.channels[channel];
struct vcpu *v = vpit_vcpu(pit);
+ const struct domain *d = v ? v->domain : NULL;
ASSERT(spin_is_locked(&pit->lock));
@@ -190,14 +191,18 @@ static void pit_load_count(PITState *pit, int channel,
int val)
case 3:
/* Periodic timer. */
TRACE_2D(TRC_HVM_EMUL_PIT_START_TIMER, period, period);
- create_periodic_time(v, &pit->pt0, period, period, 0, pit_time_fired,
+ create_periodic_time(v, &pit->pt0, period, period,
+ has_vpic(d) ? 0 : hvm_isa_irq_to_gsi(d, 0),
+ pit_time_fired,
&pit->count_load_time[channel], false);
break;
case 1:
case 4:
/* One-shot timer. */
TRACE_2D(TRC_HVM_EMUL_PIT_START_TIMER, period, 0);
- create_periodic_time(v, &pit->pt0, period, 0, 0, pit_time_fired,
+ create_periodic_time(v, &pit->pt0, period, 0,
+ has_vpic(d) ? 0 : hvm_isa_irq_to_gsi(d, 0),
+ pit_time_fired,
&pit->count_load_time[channel], false);
break;
default:
@@ -455,7 +460,8 @@ void pit_reset(struct domain *d)
{
TRACE_0D(TRC_HVM_EMUL_PIT_STOP_TIMER);
destroy_periodic_time(&pit->pt0);
- pit->pt0.source = PTSRC_isa;
+ ASSERT(has_vpic(d) || has_vioapic(d));
+ pit->pt0.source = has_vpic(d) ? PTSRC_isa : PTSRC_ioapic;
}
spin_lock(&pit->lock);
diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c
index 34bec715b7..8b95e4412f 100644
--- a/xen/arch/x86/hvm/vioapic.c
+++ b/xen/arch/x86/hvm/vioapic.c
@@ -268,7 +268,14 @@ static void vioapic_write_redirent(
spin_unlock(&d->arch.hvm.irq_lock);
- if ( is_hardware_domain(d) && unmasked )
+ if ( is_hardware_domain(d) && unmasked &&
+ /*
+ * A PVH dom0 can have an emulated PIT that should respect any
+ * interrupt overwrites found in the ACPI MADT table, so we need to
+ * check to which GSI the ISA IRQ 0 is mapped in order to prevent
+ * identity mapping it.
+ */
+ (!has_vpit(d) || gsi != hvm_isa_irq_to_gsi(d, 0)) )
{
/*
* NB: don't call vioapic_hwdom_map_gsi while holding hvm.irq_lock
--
2.26.2
