|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v6 03/12] pvh/acpi: Install handlers for ACPI-related PVH IO accesses
PVH guests will have ACPI accesses emulated by the hypervisor as
opposed to QEMU (as is the case for HVM guests). This patch installs
handler for accesses to PM1A, GPE0 (which is added to struct
hvm_hw_acpi) and VCPU map. Logic for the handler will be provided
by a later patch.
Whether or not the handler needs to be installed is decided based
on the value of XEN_X86_EMU_ACPI_FF flag which indicates whether
emulation is implemented in QEMU.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
---
Changes in v6:
* Drop ifdef guards in include/public/arch-x86/hvm/save.h
xen/arch/x86/hvm/acpi.c | 31 +++++++++++++++++++++++++++++++
xen/arch/x86/hvm/hvm.c | 2 ++
xen/include/asm-x86/domain.h | 2 ++
xen/include/asm-x86/hvm/domain.h | 1 +
xen/include/public/arch-x86/hvm/save.h | 21 +++++++++++++++++++--
xen/include/public/arch-x86/xen.h | 4 +++-
6 files changed, 58 insertions(+), 3 deletions(-)
diff --git a/xen/arch/x86/hvm/acpi.c b/xen/arch/x86/hvm/acpi.c
index 04901c1..15a9a0e 100644
--- a/xen/arch/x86/hvm/acpi.c
+++ b/xen/arch/x86/hvm/acpi.c
@@ -6,6 +6,7 @@
#include <xen/lib.h>
#include <xen/sched.h>
+#include <public/arch-x86/xen.h>
int hvm_acpi_domctl_access(struct domain *d,
const struct xen_domctl_acpi_access *access)
@@ -13,6 +14,36 @@ int hvm_acpi_domctl_access(struct domain *d,
return -ENOSYS;
}
+static int acpi_cpumap_guest_access(int dir, unsigned int port,
+ unsigned int bytes, uint32_t *val)
+{
+ return X86EMUL_UNHANDLEABLE;
+}
+
+static int acpi_guest_access(int dir, unsigned int port,
+ unsigned int bytes, uint32_t *val)
+{
+ return X86EMUL_UNHANDLEABLE;
+}
+
+void hvm_acpi_init(struct domain *d)
+{
+ if ( has_acpi_dm_ff(d) )
+ return;
+
+ register_portio_handler(d, XEN_ACPI_CPU_MAP,
+ XEN_ACPI_CPU_MAP_LEN, acpi_cpumap_guest_access);
+
+ register_portio_handler(d, ACPI_GPE0_BLK_ADDRESS_V1,
+ sizeof(d->arch.hvm_domain.acpi.gpe0_sts) +
+ sizeof(d->arch.hvm_domain.acpi.gpe0_en),
+ acpi_guest_access);
+ register_portio_handler(d, ACPI_PM1A_EVT_BLK_ADDRESS_V1,
+ sizeof(d->arch.hvm_domain.acpi.pm1a_sts) +
+ sizeof(d->arch.hvm_domain.acpi.pm1a_en),
+ acpi_guest_access);
+}
+
/*
* Local variables:
* mode: C
diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 708f474..d0dd9fc 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -667,6 +667,8 @@ int hvm_domain_initialise(struct domain *d)
hvm_ioreq_init(d);
+ hvm_acpi_init(d);
+
if ( is_pvh_domain(d) )
{
register_portio_handler(d, 0, 0x10003, handle_pvh_io);
diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h
index 95762cf..233233a 100644
--- a/xen/include/asm-x86/domain.h
+++ b/xen/include/asm-x86/domain.h
@@ -426,6 +426,8 @@ struct arch_domain
#define has_vvga(d) (!!((d)->arch.emulation_flags & XEN_X86_EMU_VGA))
#define has_viommu(d) (!!((d)->arch.emulation_flags & XEN_X86_EMU_IOMMU))
#define has_vpit(d) (!!((d)->arch.emulation_flags & XEN_X86_EMU_PIT))
+#define has_acpi_dm_ff(d) (!!((d)->arch.emulation_flags & \
+ XEN_X86_EMU_ACPI_DM_FF))
#define has_arch_pdevs(d) (!list_empty(&(d)->arch.pdev_list))
diff --git a/xen/include/asm-x86/hvm/domain.h b/xen/include/asm-x86/hvm/domain.h
index 52f934a..07815b6 100644
--- a/xen/include/asm-x86/hvm/domain.h
+++ b/xen/include/asm-x86/hvm/domain.h
@@ -166,6 +166,7 @@ struct hvm_domain {
#define hap_enabled(d) ((d)->arch.hvm_domain.hap_enabled)
+void hvm_acpi_init(struct domain *d);
int hvm_acpi_domctl_access(struct domain *d,
const struct xen_domctl_acpi_access *access);
diff --git a/xen/include/public/arch-x86/hvm/save.h
b/xen/include/public/arch-x86/hvm/save.h
index ee0a3f7..f47fd21 100644
--- a/xen/include/public/arch-x86/hvm/save.h
+++ b/xen/include/public/arch-x86/hvm/save.h
@@ -529,14 +529,31 @@ DECLARE_HVM_SAVE_TYPE(HPET, 12, struct hvm_hw_hpet);
/*
* PM timer
*/
-
struct hvm_hw_pmtimer {
uint32_t tmr_val; /* PM_TMR_BLK.TMR_VAL: 32bit free-running counter */
uint16_t pm1a_sts; /* PM1a_EVT_BLK.PM1a_STS: status register */
uint16_t pm1a_en; /* PM1a_EVT_BLK.PM1a_EN: enable register */
+ uint16_t gpe0_sts;
+ uint16_t gpe0_en;
+};
+
+struct hvm_hw_pmtimer_compat {
+ uint32_t tmr_val;
+ uint16_t pm1a_sts;
+ uint16_t pm1a_en;
};
-DECLARE_HVM_SAVE_TYPE(PMTIMER, 13, struct hvm_hw_pmtimer);
+static inline int _hvm_hw_fix_pmtimer(void *h, uint32_t size)
+{
+ struct hvm_hw_pmtimer *acpi = (struct hvm_hw_pmtimer *)h;
+
+ if ( size == sizeof(struct hvm_hw_pmtimer_compat) )
+ acpi->gpe0_sts = acpi->gpe0_en = 0;
+ return 0;
+}
+
+DECLARE_HVM_SAVE_TYPE_COMPAT(PMTIMER, 13, struct hvm_hw_pmtimer, \
+ struct hvm_hw_pmtimer_compat,
_hvm_hw_fix_pmtimer);
/*
* MTRR MSRs
diff --git a/xen/include/public/arch-x86/xen.h
b/xen/include/public/arch-x86/xen.h
index 12f719d..2565acd 100644
--- a/xen/include/public/arch-x86/xen.h
+++ b/xen/include/public/arch-x86/xen.h
@@ -283,12 +283,14 @@ struct xen_arch_domainconfig {
#define XEN_X86_EMU_IOMMU (1U<<_XEN_X86_EMU_IOMMU)
#define _XEN_X86_EMU_PIT 8
#define XEN_X86_EMU_PIT (1U<<_XEN_X86_EMU_PIT)
+#define _XEN_X86_EMU_ACPI_DM_FF 9
+#define XEN_X86_EMU_ACPI_DM_FF (1U<<_XEN_X86_EMU_ACPI_DM_FF)
#define XEN_X86_EMU_ALL (XEN_X86_EMU_LAPIC | XEN_X86_EMU_HPET | \
XEN_X86_EMU_PM | XEN_X86_EMU_RTC | \
XEN_X86_EMU_IOAPIC | XEN_X86_EMU_PIC | \
XEN_X86_EMU_VGA | XEN_X86_EMU_IOMMU | \
- XEN_X86_EMU_PIT)
+ XEN_X86_EMU_PIT | XEN_X86_EMU_ACPI_DM_FF)
uint32_t emulation_flags;
};
--
2.7.4
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |