On Thu, 7 May 2015 17:29:21 +0800
Shannon Zhao <zhaoshengl...@huawei.com> wrote:
> From: Shannon Zhao <shannon.z...@linaro.org>
>
> 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: Igor Mammedov <imamm...@redhat.com>
> ---
> hw/acpi/aml-build.c | 18 ++++++++++++++++++
> include/hw/acpi/aml-build.h | 5 +++++
> 2 files changed, 23 insertions(+)
>
> diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
> index 2e13510..67b7719 100644
> --- a/hw/acpi/aml-build.c
> +++ b/hw/acpi/aml-build.c
> @@ -958,6 +958,24 @@ Aml *aml_word_io(AmlMinFixed min_fixed, AmlMaxFixed
> max_fixed,
> }
>
> /*
> + * ACPI 1.0b: 6.4.3.5.4 ASL Macros for DWORD Address Descriptor
> + *
> + * More verbose description at:
> + * ACPI 5.0: 19.5.33 DWordIO (DWord IO Resource Descriptor Macro)
> + */
> +Aml *aml_dword_io(AmlMinFixed min_fixed, AmlMaxFixed max_fixed,
> + AmlDecode dec, AmlISARanges isa_ranges,
> + uint32_t addr_gran, uint32_t addr_min,
> + uint32_t addr_max, uint32_t addr_trans,
> + uint32_t len)
> +
> +{
> + return aml_dword_as_desc(aml_io_range, min_fixed, max_fixed, dec,
> + addr_gran, addr_min, addr_max, addr_trans, len,
> + isa_ranges);
> +}
> +
> +/*
> * ACPI 1.0b: 6.4.3.5.4 ASL Macros for DWORD Address Space Descriptor
> *
> * More verbose description at:
> diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
> index 9fc4057..5ff9c14 100644
> --- a/include/hw/acpi/aml-build.h
> +++ b/include/hw/acpi/aml-build.h
> @@ -238,6 +238,11 @@ Aml *aml_word_io(AmlMinFixed min_fixed, AmlMaxFixed
> max_fixed,
> uint16_t addr_gran, uint16_t addr_min,
> uint16_t addr_max, uint16_t addr_trans,
> uint16_t len);
> +Aml *aml_dword_io(AmlMinFixed min_fixed, AmlMaxFixed max_fixed,
> + AmlDecode dec, AmlISARanges isa_ranges,
> + uint32_t addr_gran, uint32_t addr_min,
> + uint32_t addr_max, uint32_t addr_trans,
> + uint32_t len);
> Aml *aml_dword_memory(AmlDecode dec, AmlMinFixed min_fixed,
> AmlMaxFixed max_fixed, AmlCacheble cacheable,
> AmlReadAndWrite read_and_write,
