| Message ID | 1432522520-8068-21-git-send-email-zhaoshenglong@huawei.com |
|---|---|
| State | New |
| Headers | show |
On Mon, May 25, 2015 at 10:55:16AM +0800, Shannon Zhao wrote: > From: Shannon Zhao <shannon.zhao@linaro.org> > > Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com> > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> > Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > Reviewed-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@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 2927be1..bd91981 100644 > --- a/hw/acpi/aml-build.c > +++ b/hw/acpi/aml-build.c > @@ -959,6 +959,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 ae62995..b81c838 100644 > --- a/include/hw/acpi/aml-build.h > +++ b/include/hw/acpi/aml-build.h > @@ -236,6 +236,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, AmlCacheable cacheable, > AmlReadAndWrite read_and_write, > -- > 2.0.4 >
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 2927be1..bd91981 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -959,6 +959,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 ae62995..b81c838 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -236,6 +236,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, AmlCacheable cacheable, AmlReadAndWrite read_and_write,