On Thu, May 14, 2015 at 05:19:23PM +0800, Shannon Zhao wrote:
> From: Shannon Zhao <shannon.z...@linaro.org>
>
> Add aml_memory32_fixed() for describing device mmio region in resource
> template. These can be used to generating DSDT table for ACPI on ARM.
>
> Signed-off-by: Shannon Zhao <zhaoshengl...@huawei.com>
> Signed-off-by: Shannon Zhao <shannon.z...@linaro.org>
> Reviewed-by: Alex Bennée <alex.ben...@linaro.org>
Reviewed-by: Michael S. Tsirkin <m...@redhat.com>
> ---
> hw/acpi/aml-build.c | 25 +++++++++++++++++++++++++
> include/hw/acpi/aml-build.h | 2 ++
> 2 files changed, 27 insertions(+)
>
> diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
> index 77ce00b..ce68d27 100644
> --- a/hw/acpi/aml-build.c
> +++ b/hw/acpi/aml-build.c
> @@ -26,6 +26,7 @@
> #include <string.h>
> #include "hw/acpi/aml-build.h"
> #include "qemu/bswap.h"
> +#include "qemu/bitops.h"
> #include "hw/acpi/bios-linker-loader.h"
>
> static GArray *build_alloc_array(void)
> @@ -48,6 +49,14 @@ static void build_append_byte(GArray *array, uint8_t val)
> g_array_append_val(array, val);
> }
>
> +static void build_append_uint32(GArray *array, uint32_t val)
> +{
> + build_append_byte(array, extract32(val, 0, 8));
> + build_append_byte(array, extract32(val, 8, 8));
> + build_append_byte(array, extract32(val, 16, 8));
> + build_append_byte(array, extract32(val, 24, 8));
> +}
> +
> static void build_append_array(GArray *array, GArray *val)
> {
> g_array_append_vals(array, val->data, val->len);
> @@ -505,6 +514,22 @@ Aml *aml_call4(const char *method, Aml *arg1, Aml *arg2,
> Aml *arg3, Aml *arg4)
> return var;
> }
>
> +/*
> + * ACPI 1.0: 6.4.3.4 Memory32Fixed (Memory Resource Descriptor Macro)
> + */
> +Aml *aml_memory32_fixed(uint32_t addr, uint32_t size,
> + AmlReadAndWrite read_and_write)
> +{
> + Aml *var = aml_alloc();
> + build_append_byte(var->buf, 0x86); /* Memory32Fixed Resource Descriptor
> */
> + build_append_byte(var->buf, 9); /* Length, bits[7:0] value = 9 */
> + build_append_byte(var->buf, 0); /* Length, bits[15:8] value = 0 */
> + build_append_byte(var->buf, read_and_write); /* Write status, 1 rw 0 ro
> */
> + build_append_uint32(var->buf, addr); /* Range base address */
> + build_append_uint32(var->buf, size); /* Range length */
> + return var;
> +}
> +
> /* ACPI 1.0b: 6.4.2.5 I/O Port Descriptor */
> Aml *aml_io(AmlIODecode dec, uint16_t min_base, uint16_t max_base,
> uint8_t aln, uint8_t len)
> diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
> index 3947201..b1413a3 100644
> --- a/include/hw/acpi/aml-build.h
> +++ b/include/hw/acpi/aml-build.h
> @@ -168,6 +168,8 @@ Aml *aml_call1(const char *method, Aml *arg1);
> Aml *aml_call2(const char *method, Aml *arg1, Aml *arg2);
> Aml *aml_call3(const char *method, Aml *arg1, Aml *arg2, Aml *arg3);
> Aml *aml_call4(const char *method, Aml *arg1, Aml *arg2, Aml *arg3, Aml
> *arg4);
> +Aml *aml_memory32_fixed(uint32_t addr, uint32_t size,
> + AmlReadAndWrite read_and_write);
> Aml *aml_io(AmlIODecode dec, uint16_t min_base, uint16_t max_base,
> uint8_t aln, uint8_t len);
> Aml *aml_operation_region(const char *name, AmlRegionSpace rs,
> --
> 2.1.0
>
