| Message ID | 1471343113-10652-8-git-send-email-zhaoshenglong@huawei.com |
|---|---|
| State | Superseded |
| Headers | show |
Hi Shannon, On 16/08/2016 06:25, Shannon Zhao wrote: > From: Shannon Zhao <shannon.zhao@linaro.org> > > Construct GTDT table with the interrupt information of timers. > > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> > --- > tools/libxl/libxl_arm_acpi.c | 29 +++++++++++++++++++++++++++++ > 1 file changed, 29 insertions(+) > > diff --git a/tools/libxl/libxl_arm_acpi.c b/tools/libxl/libxl_arm_acpi.c > index 8cd1d9b..28fb6fe 100644 > --- a/tools/libxl/libxl_arm_acpi.c > +++ b/tools/libxl/libxl_arm_acpi.c > @@ -24,10 +24,18 @@ typedef uint8_t u8; > typedef uint16_t u16; > typedef uint32_t u32; > typedef uint64_t u64; > +typedef int64_t s64; > > #include <acpi/acconfig.h> > #include <acpi/actbl.h> > > +#include <asm-generic/bitsperlong.h> > +#define ACPI_MACHINE_WIDTH __BITS_PER_LONG > +#define COMPILER_DEPENDENT_INT64 int64_t > +#define COMPILER_DEPENDENT_UINT64 uint64_t > + > +#include <acpi/actypes.h> > + > _hidden > extern const unsigned char dsdt_anycpu_arm[]; > _hidden > @@ -175,6 +183,26 @@ static void make_acpi_xsdt(libxl__gc *gc, struct xc_dom_image *dom, > acpitables[XSDT].size); > } > > +static void make_acpi_gtdt(libxl__gc *gc, struct xc_dom_image *dom, > + struct acpitable acpitables[]) > +{ > + uint64_t offset = acpitables[GTDT].addr - GUEST_ACPI_BASE; > + struct acpi_table_gtdt *gtdt = (void *)dom->acpi_modules[0].data + offset; > + > + gtdt->non_secure_el1_interrupt = GUEST_TIMER_PHYS_NS_PPI; > + gtdt->non_secure_el1_flags = > + (ACPI_LEVEL_SENSITIVE << ACPI_GTDT_INTERRUPT_MODE) > + |(ACPI_ACTIVE_LOW << ACPI_GTDT_INTERRUPT_POLARITY); > + gtdt->virtual_timer_interrupt = GUEST_TIMER_VIRT_PPI; > + gtdt->virtual_timer_flags = > + (ACPI_LEVEL_SENSITIVE << ACPI_GTDT_INTERRUPT_MODE) > + |(ACPI_ACTIVE_LOW << ACPI_GTDT_INTERRUPT_POLARITY); > + I don't see any setting for the field counter_block_address. From the ACPI spec, the field should be 0xFFFFFFFFFFFFFFFF when the counter control block is not available. > + make_acpi_header(>dt->header, "GTDT", acpitables[GTDT].size, 2); > + calculate_checksum(gtdt, offsetof(struct acpi_table_header, checksum), > + acpitables[GTDT].size); > +} > + > int libxl__prepare_acpi(libxl__gc *gc, libxl_domain_build_info *info, > libxl__domain_build_state *state, > struct xc_dom_image *dom) > @@ -205,6 +233,7 @@ int libxl__prepare_acpi(libxl__gc *gc, libxl_domain_build_info *info, > > make_acpi_rsdp(gc, dom, acpitables); > make_acpi_xsdt(gc, dom, acpitables); > + make_acpi_gtdt(gc, dom, acpitables); > > out: > return rc; > Regards,
diff --git a/tools/libxl/libxl_arm_acpi.c b/tools/libxl/libxl_arm_acpi.c index 8cd1d9b..28fb6fe 100644 --- a/tools/libxl/libxl_arm_acpi.c +++ b/tools/libxl/libxl_arm_acpi.c @@ -24,10 +24,18 @@ typedef uint8_t u8; typedef uint16_t u16; typedef uint32_t u32; typedef uint64_t u64; +typedef int64_t s64; #include <acpi/acconfig.h> #include <acpi/actbl.h> +#include <asm-generic/bitsperlong.h> +#define ACPI_MACHINE_WIDTH __BITS_PER_LONG +#define COMPILER_DEPENDENT_INT64 int64_t +#define COMPILER_DEPENDENT_UINT64 uint64_t + +#include <acpi/actypes.h> + _hidden extern const unsigned char dsdt_anycpu_arm[]; _hidden @@ -175,6 +183,26 @@ static void make_acpi_xsdt(libxl__gc *gc, struct xc_dom_image *dom, acpitables[XSDT].size); } +static void make_acpi_gtdt(libxl__gc *gc, struct xc_dom_image *dom, + struct acpitable acpitables[]) +{ + uint64_t offset = acpitables[GTDT].addr - GUEST_ACPI_BASE; + struct acpi_table_gtdt *gtdt = (void *)dom->acpi_modules[0].data + offset; + + gtdt->non_secure_el1_interrupt = GUEST_TIMER_PHYS_NS_PPI; + gtdt->non_secure_el1_flags = + (ACPI_LEVEL_SENSITIVE << ACPI_GTDT_INTERRUPT_MODE) + |(ACPI_ACTIVE_LOW << ACPI_GTDT_INTERRUPT_POLARITY); + gtdt->virtual_timer_interrupt = GUEST_TIMER_VIRT_PPI; + gtdt->virtual_timer_flags = + (ACPI_LEVEL_SENSITIVE << ACPI_GTDT_INTERRUPT_MODE) + |(ACPI_ACTIVE_LOW << ACPI_GTDT_INTERRUPT_POLARITY); + + make_acpi_header(>dt->header, "GTDT", acpitables[GTDT].size, 2); + calculate_checksum(gtdt, offsetof(struct acpi_table_header, checksum), + acpitables[GTDT].size); +} + int libxl__prepare_acpi(libxl__gc *gc, libxl_domain_build_info *info, libxl__domain_build_state *state, struct xc_dom_image *dom) @@ -205,6 +233,7 @@ int libxl__prepare_acpi(libxl__gc *gc, libxl_domain_build_info *info, make_acpi_rsdp(gc, dom, acpitables); make_acpi_xsdt(gc, dom, acpitables); + make_acpi_gtdt(gc, dom, acpitables); out: return rc;