Re: [Xen-devel] [PATCH v4 10/16] libxl/arm: Construct ACPI FADT table
Hi Shannon, On 16/08/2016 06:25, Shannon Zhao wrote: From: Shannon ZhaoSigned-off-by: Shannon Zhao --- tools/libxl/libxl_arm_acpi.c | 23 +++ 1 file changed, 23 insertions(+) diff --git a/tools/libxl/libxl_arm_acpi.c b/tools/libxl/libxl_arm_acpi.c index 75dfcc2..cb1c9df 100644 --- a/tools/libxl/libxl_arm_acpi.c +++ b/tools/libxl/libxl_arm_acpi.c @@ -286,6 +286,25 @@ out: return rc; } +static void make_acpi_fadt(libxl__gc *gc, struct xc_dom_image *dom, + struct acpitable acpitables[]) +{ +uint64_t offset = acpitables[FADT].addr - GUEST_ACPI_BASE; +struct acpi_table_fadt *fadt = (void *)dom->acpi_modules[0].data + offset; + +/* Hardware Reduced = 1 and use PSCI 0.2+ and with HVC */ +fadt->flags = ACPI_FADT_HW_REDUCED; +fadt->arm_boot_flags = (ACPI_FADT_PSCI_COMPLIANT) | ACPI_FADT_PSCI_USE_HVC; NIT: The () are not necessary for ACPI_FADT_PSCI_COMPLIANT + +/* ACPI v5.1 (fadt->revision.fadt->minor_revision) */ +fadt->minor_revision = 0x1; +fadt->dsdt = acpitables[DSDT].addr; + +make_acpi_header(>header, "FACP", acpitables[FADT].size, 5); +calculate_checksum(fadt, offsetof(struct acpi_table_header, checksum), + acpitables[FADT].size); +} + int libxl__prepare_acpi(libxl__gc *gc, libxl_domain_build_info *info, libxl__domain_build_state *state, struct xc_dom_image *dom) @@ -318,6 +337,10 @@ int libxl__prepare_acpi(libxl__gc *gc, libxl_domain_build_info *info, make_acpi_xsdt(gc, dom, acpitables); make_acpi_gtdt(gc, dom, acpitables); rc = make_acpi_madt(gc, dom, info->max_vcpus, xc_config, acpitables); +if (rc) +goto out; + +make_acpi_fadt(gc, dom, acpitables); out: return rc; Regards, -- Julien Grall ___ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel
[Xen-devel] [PATCH v4 10/16] libxl/arm: Construct ACPI FADT table
From: Shannon ZhaoSigned-off-by: Shannon Zhao --- tools/libxl/libxl_arm_acpi.c | 23 +++ 1 file changed, 23 insertions(+) diff --git a/tools/libxl/libxl_arm_acpi.c b/tools/libxl/libxl_arm_acpi.c index 75dfcc2..cb1c9df 100644 --- a/tools/libxl/libxl_arm_acpi.c +++ b/tools/libxl/libxl_arm_acpi.c @@ -286,6 +286,25 @@ out: return rc; } +static void make_acpi_fadt(libxl__gc *gc, struct xc_dom_image *dom, + struct acpitable acpitables[]) +{ +uint64_t offset = acpitables[FADT].addr - GUEST_ACPI_BASE; +struct acpi_table_fadt *fadt = (void *)dom->acpi_modules[0].data + offset; + +/* Hardware Reduced = 1 and use PSCI 0.2+ and with HVC */ +fadt->flags = ACPI_FADT_HW_REDUCED; +fadt->arm_boot_flags = (ACPI_FADT_PSCI_COMPLIANT) | ACPI_FADT_PSCI_USE_HVC; + +/* ACPI v5.1 (fadt->revision.fadt->minor_revision) */ +fadt->minor_revision = 0x1; +fadt->dsdt = acpitables[DSDT].addr; + +make_acpi_header(>header, "FACP", acpitables[FADT].size, 5); +calculate_checksum(fadt, offsetof(struct acpi_table_header, checksum), + acpitables[FADT].size); +} + int libxl__prepare_acpi(libxl__gc *gc, libxl_domain_build_info *info, libxl__domain_build_state *state, struct xc_dom_image *dom) @@ -318,6 +337,10 @@ int libxl__prepare_acpi(libxl__gc *gc, libxl_domain_build_info *info, make_acpi_xsdt(gc, dom, acpitables); make_acpi_gtdt(gc, dom, acpitables); rc = make_acpi_madt(gc, dom, info->max_vcpus, xc_config, acpitables); +if (rc) +goto out; + +make_acpi_fadt(gc, dom, acpitables); out: return rc; -- 2.0.4 ___ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel