From patchwork Mon May 25 02:55:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 48937 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E12442121F for ; Mon, 25 May 2015 03:05:00 +0000 (UTC) Received: by wizk4 with SMTP id k4sf11050001wiz.2 for ; Sun, 24 May 2015 20:04:59 -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=oBRmBK7LfmlOptRgMNNhs+v1E/CnKThJGC4LmB9+gdU=; b=eTCDGER9wFu+w4M8WTnio1GfRLS5C7qg6/cXQXhF/q9XNeczrrxjM9ipxBXbEbneeN ElU8eKbEJ4XwisE92bAXA9TXidihssBWOd2hKcKLIfuXVtyplnJQxw91WI7xuxT35S8O TriN9rC1uZNOFx2QjqjcRB4viVOw+cN3RwMBU40kmK2UW/fZtf7EeG1KcQW8rWnOB1LY 6b+Z9tJwswYljuctVdhbO7iCvJScAPlWh2nXCoi5aP5qXiw71JitGoql2hNBXZNbYCsl yxnHYDeahyiMo71g2uBt7Oo9eE+FkiwtIlVUHBy8rTNw2OpS8hloPmA+8kBGwtQXp//W Me1w== X-Gm-Message-State: ALoCoQnVRUr1d2S/txulSEiWoqH6s43eIjZb3VyoU4DxubdQG4NKv+V/sbNiGyYu4Hdd+3rpv3gJ X-Received: by 10.194.202.229 with SMTP id kl5mr20153343wjc.3.1432523099542; Sun, 24 May 2015 20:04:59 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.203.227 with SMTP id kt3ls614264lac.18.gmail; Sun, 24 May 2015 20:04:59 -0700 (PDT) X-Received: by 10.152.179.195 with SMTP id di3mr8121379lac.15.1432523099403; Sun, 24 May 2015 20:04:59 -0700 (PDT) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id q6si7295658lby.85.2015.05.24.20.04.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 May 2015 20:04:59 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by lami4 with SMTP id i4so41831839lam.0 for ; Sun, 24 May 2015 20:04:59 -0700 (PDT) X-Received: by 10.152.37.228 with SMTP id b4mr16027743lak.117.1432523099122; Sun, 24 May 2015 20:04:59 -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 hn6csp1543023lbb; Sun, 24 May 2015 20:04:58 -0700 (PDT) X-Received: by 10.140.49.11 with SMTP id p11mr24789520qga.60.1432523097813; Sun, 24 May 2015 20:04:57 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 141si10109038qhs.55.2015.05.24.20.04.57 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 24 May 2015 20:04:57 -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]:41693 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YwihE-00024c-VV for patch@linaro.org; Sun, 24 May 2015 23:04:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48097) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YwiZg-0004Bh-Ii for qemu-devel@nongnu.org; Sun, 24 May 2015 22:57:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YwiZc-00016R-F2 for qemu-devel@nongnu.org; Sun, 24 May 2015 22:57:08 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:62171) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YwiZb-000168-Tp for qemu-devel@nongnu.org; Sun, 24 May 2015 22:57:04 -0400 Received: from 172.24.2.119 (EHLO szxeml428-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CLV56172; Mon, 25 May 2015 10:56:43 +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; Mon, 25 May 2015 10:56:33 +0800 From: Shannon Zhao To: , , , , , , , , , , Date: Mon, 25 May 2015 10:55:16 +0800 Message-ID: <1432522520-8068-21-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1432522520-8068-1-git-send-email-zhaoshenglong@huawei.com> References: <1432522520-8068-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: 119.145.14.65 Cc: hangaohuai@huawei.com, zhaoshenglong@huawei.com, peter.huangpeng@huawei.com, shannon.zhao@linaro.org Subject: [Qemu-devel] [PATCH v9 20/24] 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.54 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 Reviewed-by: Igor Mammedov --- 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,