Re: [Qemu-devel] [PATCH v6 04/22] hw/acpi/aml-build: Add aml_memory32_fixed() term

[Alex Bennée]

Shannon Zhao <address@hidden> writes:

> From: Shannon Zhao <address@hidden>
>
> 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 <address@hidden>
> Signed-off-by: Shannon Zhao <address@hidden>

Reviewed-by: Alex Bennée <address@hidden>

> ---
>  hw/acpi/aml-build.c         | 27 +++++++++++++++++++++++++++
>  include/hw/acpi/aml-build.h |  2 ++
>  2 files changed, 29 insertions(+)
>
> diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
> index 8d01959..61407b7 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)
> @@ -505,6 +506,32 @@ 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 
> */
> +
> +    /* Range base address */
> +    build_append_byte(var->buf, extract32(addr, 0, 8)); /* bits[7:0] */
> +    build_append_byte(var->buf, extract32(addr, 8, 8)); /* bits[15:8] */
> +    build_append_byte(var->buf, extract32(addr, 16, 8)); /* bits[23:16] */
> +    build_append_byte(var->buf, extract32(addr, 24, 8)); /* bits[31:24] */
> +
> +    /* Range length */
> +    build_append_byte(var->buf, extract32(size, 0, 8)); /* bits[7:0] */
> +    build_append_byte(var->buf, extract32(size, 8, 8)); /* bits[15:8] */
> +    build_append_byte(var->buf, extract32(size, 16, 8)); /* bits[23:16] */
> +    build_append_byte(var->buf, extract32(size, 24, 8)); /* bits[31:24] */
> +    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 1705001..154823b 100644
> --- a/include/hw/acpi/aml-build.h
> +++ b/include/hw/acpi/aml-build.h
> @@ -162,6 +162,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,

-- 
Alex Bennée