From patchwork Tue Feb 17 02:08:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 440429 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48432140316 for ; Tue, 17 Feb 2015 13:14:10 +1100 (AEDT) Received: from localhost ([::1]:43460 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNXfs-0007dy-CF for incoming@patchwork.ozlabs.org; Mon, 16 Feb 2015 21:14:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38065) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNXcO-00012B-Qr for qemu-devel@nongnu.org; Mon, 16 Feb 2015 21:10:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YNXcK-000690-PY for qemu-devel@nongnu.org; Mon, 16 Feb 2015 21:10:32 -0500 Received: from szxga03-in.huawei.com ([119.145.14.66]:9953) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNXcK-00068K-7r for qemu-devel@nongnu.org; Mon, 16 Feb 2015 21:10:28 -0500 Received: from 172.24.2.119 (EHLO szxeml428-hub.china.huawei.com) ([172.24.2.119]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id BCA51711; Tue, 17 Feb 2015 10:10:15 +0800 (CST) Received: from HGHY1Z002260041.china.huawei.com (10.177.16.142) by szxeml428-hub.china.huawei.com (10.82.67.183) with Microsoft SMTP Server id 14.3.158.1; Tue, 17 Feb 2015 10:10:07 +0800 From: Shannon Zhao To: , , , , , , , , , Date: Tue, 17 Feb 2015 10:08:42 +0800 Message-ID: <1424138929-10044-5-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1424138929-10044-1-git-send-email-zhaoshenglong@huawei.com> References: <1424138929-10044-1-git-send-email-zhaoshenglong@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.16.142] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020201.54E2A307.00B3, ss=1, re=0.001, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: cfe7912e787b37a1ef82c599a05765a9 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.66 Cc: wanghaibin.wang@huawei.com, hangaohuai@huawei.com, peter.huangpeng@huawei.com Subject: [Qemu-devel] [RFC PATCH v3 04/11] hw/acpi/aml-build: Add aml_memory32_fixed() and aml_interrupt() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add aml_memory32_fixed() for describing device mmio region in resource template. Add aml_interrupt() for describing device interrupt in resource template. These can be used to generating DSDT table for ACPI on ARM. Signed-off-by: Shannon Zhao --- hw/acpi/aml-build.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/hw/acpi/aml-build.h | 2 ++ 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index f49e653..5e0c40b 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -538,6 +538,46 @@ 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(uint64_t addr, uint64_t size, uint8_t rw_flag) +{ + 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, rw_flag); /* Write status, 1 rw 0 ro */ + build_append_byte(var->buf, addr & 0xff); /* Range base address bits[7:0] */ + build_append_byte(var->buf, (addr >> 8) & 0xff); /* Range base address bits[15:8] */ + build_append_byte(var->buf, (addr >> 16) & 0xff); /* Range base address bits[23:16] */ + build_append_byte(var->buf, (addr >> 24) & 0xff); /* Range base address bits[31:24] */ + + build_append_byte(var->buf, size & 0xff); /* Range length bits[7:0] */ + build_append_byte(var->buf, (size >> 8) & 0xff); /* Range length bits[15:8] */ + build_append_byte(var->buf, (size >> 16) & 0xff); /* Range length bits[23:16] */ + build_append_byte(var->buf, (size >> 24) & 0xff); /* Range length bits[31:24] */ + return var; +} + +/* + * ACPI 1.0: 6.4.3.6 Interrupt (Interrupt Resource Descriptor Macro) + */ +Aml *aml_interrupt(uint8_t irq_flags, int irq) +{ + Aml *var = aml_alloc(); + build_append_byte(var->buf, 0x89); /* Extended irq descriptor */ + build_append_byte(var->buf, 6); /* Length, bits[7:0] minimum value = 6 */ + build_append_byte(var->buf, 0); /* Length, bits[15:8] minimum value = 0 */ + build_append_byte(var->buf, irq_flags); /* Interrupt Vector Information. */ + build_append_byte(var->buf, 0x01); /* Interrupt table length = 1 */ + build_append_byte(var->buf, irq & 0xff); /* Interrupt Number bits[7:0] */ + build_append_byte(var->buf, (irq >> 8) & 0xff); /* Interrupt Number bits[15:8] */ + build_append_byte(var->buf, (irq >> 16) & 0xff); /* Interrupt Number bits[23:16] */ + build_append_byte(var->buf, (irq >> 24) & 0xff); /* Interrupt Number 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 6296ea1..eb9ba0d 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(uint64_t addr, uint64_t size, uint8_t rw_flag); +Aml *aml_interrupt(uint8_t irq_flags, int irq); 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,