|
 |
8be556 |
From 70a822b469baa1383df12db562270591fcb6ec57 Mon Sep 17 00:00:00 2001
|
|
|
8be556 |
From: Andrew Jones <drjones@redhat.com>
|
|
|
8be556 |
Date: Tue, 16 Jun 2015 11:48:37 +0200
|
|
|
8be556 |
Subject: [PATCH 075/217] hw/acpi/aml-build: Add aml_dword_io() term
|
|
|
8be556 |
MIME-Version: 1.0
|
|
|
8be556 |
Content-Type: text/plain; charset=UTF-8
|
|
|
8be556 |
Content-Transfer-Encoding: 8bit
|
|
|
8be556 |
|
|
|
8be556 |
Message-id: <1434455325-23399-26-git-send-email-drjones@redhat.com>
|
|
|
8be556 |
Patchwork-id: 66258
|
|
|
8be556 |
O-Subject: [AArch64 RHEL-7.2 qemu-kvm-rhev PATCH 25/33] hw/acpi/aml-build: Add aml_dword_io() term
|
|
|
8be556 |
Bugzilla: 1231719
|
|
|
8be556 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
8be556 |
RH-Acked-by: Wei Huang <wei@redhat.com>
|
|
|
8be556 |
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
8be556 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
8be556 |
|
|
|
8be556 |
Author: Shannon Zhao <shannon.zhao@linaro.org>
|
|
|
8be556 |
|
|
|
8be556 |
Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
|
|
|
8be556 |
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
|
|
|
8be556 |
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
|
|
|
8be556 |
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
8be556 |
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
8be556 |
Message-id: 1432522520-8068-21-git-send-email-zhaoshenglong@huawei.com
|
|
|
8be556 |
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
|
8be556 |
(cherry picked from commit 616ef329adbb671be783a1dba96d881b9218ff80)
|
|
|
8be556 |
Signed-off-by: Andrew Jones <drjones@redhat.com>
|
|
|
8be556 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
8be556 |
---
|
|
|
8be556 |
hw/acpi/aml-build.c | 18 ++++++++++++++++++
|
|
|
8be556 |
include/hw/acpi/aml-build.h | 5 +++++
|
|
|
8be556 |
2 files changed, 23 insertions(+)
|
|
|
8be556 |
|
|
|
8be556 |
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
|
|
|
8be556 |
index 54d652d..439c24e 100644
|
|
|
8be556 |
--- a/hw/acpi/aml-build.c
|
|
|
8be556 |
+++ b/hw/acpi/aml-build.c
|
|
|
8be556 |
@@ -960,6 +960,24 @@ Aml *aml_word_io(AmlMinFixed min_fixed, AmlMaxFixed max_fixed,
|
|
|
8be556 |
}
|
|
|
8be556 |
|
|
|
8be556 |
/*
|
|
|
8be556 |
+ * ACPI 1.0b: 6.4.3.5.4 ASL Macros for DWORD Address Descriptor
|
|
|
8be556 |
+ *
|
|
|
8be556 |
+ * More verbose description at:
|
|
|
8be556 |
+ * ACPI 5.0: 19.5.33 DWordIO (DWord IO Resource Descriptor Macro)
|
|
|
8be556 |
+ */
|
|
|
8be556 |
+Aml *aml_dword_io(AmlMinFixed min_fixed, AmlMaxFixed max_fixed,
|
|
|
8be556 |
+ AmlDecode dec, AmlISARanges isa_ranges,
|
|
|
8be556 |
+ uint32_t addr_gran, uint32_t addr_min,
|
|
|
8be556 |
+ uint32_t addr_max, uint32_t addr_trans,
|
|
|
8be556 |
+ uint32_t len)
|
|
|
8be556 |
+
|
|
|
8be556 |
+{
|
|
|
8be556 |
+ return aml_dword_as_desc(AML_IO_RANGE, min_fixed, max_fixed, dec,
|
|
|
8be556 |
+ addr_gran, addr_min, addr_max, addr_trans, len,
|
|
|
8be556 |
+ isa_ranges);
|
|
|
8be556 |
+}
|
|
|
8be556 |
+
|
|
|
8be556 |
+/*
|
|
|
8be556 |
* ACPI 1.0b: 6.4.3.5.4 ASL Macros for DWORD Address Space Descriptor
|
|
|
8be556 |
*
|
|
|
8be556 |
* More verbose description at:
|
|
|
8be556 |
diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
|
|
|
8be556 |
index e02010d..5fce62c 100644
|
|
|
8be556 |
--- a/include/hw/acpi/aml-build.h
|
|
|
8be556 |
+++ b/include/hw/acpi/aml-build.h
|
|
|
8be556 |
@@ -236,6 +236,11 @@ Aml *aml_word_io(AmlMinFixed min_fixed, AmlMaxFixed max_fixed,
|
|
|
8be556 |
uint16_t addr_gran, uint16_t addr_min,
|
|
|
8be556 |
uint16_t addr_max, uint16_t addr_trans,
|
|
|
8be556 |
uint16_t len);
|
|
|
8be556 |
+Aml *aml_dword_io(AmlMinFixed min_fixed, AmlMaxFixed max_fixed,
|
|
|
8be556 |
+ AmlDecode dec, AmlISARanges isa_ranges,
|
|
|
8be556 |
+ uint32_t addr_gran, uint32_t addr_min,
|
|
|
8be556 |
+ uint32_t addr_max, uint32_t addr_trans,
|
|
|
8be556 |
+ uint32_t len);
|
|
|
8be556 |
Aml *aml_dword_memory(AmlDecode dec, AmlMinFixed min_fixed,
|
|
|
8be556 |
AmlMaxFixed max_fixed, AmlCacheable cacheable,
|
|
|
8be556 |
AmlReadAndWrite read_and_write,
|
|
|
8be556 |
--
|
|
|
8be556 |
1.8.3.1
|
|
|
8be556 |
|