From patchwork Thu May 14 09:19:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 48486 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BFC592121F for ; Thu, 14 May 2015 09:24:36 +0000 (UTC) Received: by wgin8 with SMTP id n8sf17179538wgi.0 for ; Thu, 14 May 2015 02:24:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding:cc :subject:precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=eIlbSM1wOv3ZHZ10fYc4RnmFSwppsy8DaMIvj5frELY=; b=nCOTOTIaEvbR0/o1wahQNW/50E7zan0NQVLdEK8GP/ydYybW6s9RjTD6lwoXIfrwYg pr5fClTmqAZ34XfY8Jbx59FDQVwXBKcQmt+IZt9v+hMNo/B9WAgE6bW21K3PVyJjzn+U EffxW1wOFz2lno37TXbaB/SduJhE9wInccCELhDIKfi/JxVukoOvFaA+XKfVeIHGEy6k /nw6t5FQ2YjSB7uLJ9CTXW9EZybuwiEWa9N/KpN2gR+KVUmqGK8u3VRbgurXeqy+dVwj MOUPrtJQWgQb+ywCUmKAbVAcZMvqyzMlhj3sZN44UyguhmJkGdYI5um4ra1LK97Tx5Sy +X9g== X-Gm-Message-State: ALoCoQn29QDeVAjQcppxTVw4rKgKgSmlSGKgNXsCLjM64RBBLVSyS7zxIFEIzpfbMZDtTtM/GJv/ X-Received: by 10.152.87.140 with SMTP id ay12mr2431440lab.8.1431595476059; Thu, 14 May 2015 02:24:36 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.7.101 with SMTP id i5ls313778laa.58.gmail; Thu, 14 May 2015 02:24:35 -0700 (PDT) X-Received: by 10.112.171.101 with SMTP id at5mr2506007lbc.66.1431595475826; Thu, 14 May 2015 02:24:35 -0700 (PDT) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id jn4si14131612lbc.49.2015.05.14.02.24.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2015 02:24:35 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by layy10 with SMTP id y10so59006580lay.0 for ; Thu, 14 May 2015 02:24:35 -0700 (PDT) X-Received: by 10.153.6.36 with SMTP id cr4mr2504839lad.56.1431595475480; Thu, 14 May 2015 02:24:35 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1114128lbb; Thu, 14 May 2015 02:24:34 -0700 (PDT) X-Received: by 10.140.23.35 with SMTP id 32mr4039355qgo.106.1431595474138; Thu, 14 May 2015 02:24:34 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id y98si22339922qgd.100.2015.05.14.02.24.33 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 14 May 2015 02:24:34 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:53262 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YspNY-0004Z9-Uz for patch@linaro.org; Thu, 14 May 2015 05:24:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46237) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YspKh-00008j-P0 for qemu-devel@nongnu.org; Thu, 14 May 2015 05:21:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YspKd-0004zS-FW for qemu-devel@nongnu.org; Thu, 14 May 2015 05:21:35 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:31064) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YspKc-0004sb-Bb for qemu-devel@nongnu.org; Thu, 14 May 2015 05:21:31 -0400 Received: from 172.24.2.119 (EHLO szxeml430-hub.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CNT05323; Thu, 14 May 2015 17:21:16 +0800 (CST) Received: from HGHY1Z002260041.china.huawei.com (10.177.16.142) by szxeml430-hub.china.huawei.com (10.82.67.185) with Microsoft SMTP Server id 14.3.158.1; Thu, 14 May 2015 17:21:06 +0800 From: Shannon Zhao To: , , , , , , , , , , Date: Thu, 14 May 2015 17:19:38 +0800 Message-ID: <1431595182-7552-20-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1431595182-7552-1-git-send-email-zhaoshenglong@huawei.com> References: <1431595182-7552-1-git-send-email-zhaoshenglong@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.16.142] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 58.251.152.64 Cc: hangaohuai@huawei.com, zhaoshenglong@huawei.com, peter.huangpeng@huawei.com, shannon.zhao@linaro.org Subject: [Qemu-devel] [PATCH v7 19/23] hw/acpi/aml-build: Add aml_dword_io() term 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Shannon Zhao Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao Reviewed-by: Alex Bennée --- 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 de8593c..238d6a3 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -953,6 +953,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 37ec525..2fea838 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -244,6 +244,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,