From patchwork Wed Apr 15 13:25:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 47187 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C01062121F for ; Wed, 15 Apr 2015 13:35:17 +0000 (UTC) Received: by lbbqq2 with SMTP id qq2sf9580606lbb.0 for ; Wed, 15 Apr 2015 06:35:16 -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=etMcOexngGV2O4gCoT87av6pIbe2GYHeCgpry4U+320=; b=WN5pbS65dlgCaihYrDrqjkSTr/+5rQERnGWLEbIL57GkvO+eFS+Td8Ro8qpoKSBklI 52pdWMbbr3EWTGNaqoXcZnbmLOgHFvBNWUwRAK778XGGldL82L+odwWy3MYYMfSMXPST jSPrOIXykMMrIhJ2BRGWPZT9Wbn4Yp4ZO07pOQKotdKzogfFAQ/RD6WIY6k7WZeQZWE/ +kTkK4sylIXYapLOlIjgS/s46jDVuuKntSGSr+8AxzgTIY7sZyf2Kg0U0Hqj+zm+zOST YkHUnWBjWXUErIQxTwpx3G2bRUNz58IcspfoPzzdEndBRLB9mjS3l9yvMyv9uwcvFTFT aZ1A== X-Gm-Message-State: ALoCoQmQz3BN7Ewk5SnGRuv30JZzUy/r7WINp610Xld5IYuRz2/Ggcd5PZK7yq+bDm+8Rx8TkPX2 X-Received: by 10.180.97.68 with SMTP id dy4mr4811233wib.0.1429104916563; Wed, 15 Apr 2015 06:35:16 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.228 with SMTP id v4ls178883lav.26.gmail; Wed, 15 Apr 2015 06:35:16 -0700 (PDT) X-Received: by 10.152.5.72 with SMTP id q8mr23564090laq.73.1429104916295; Wed, 15 Apr 2015 06:35:16 -0700 (PDT) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com. [209.85.217.177]) by mx.google.com with ESMTPS id ge10si3913926lbc.132.2015.04.15.06.35.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Apr 2015 06:35:16 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by lbcga7 with SMTP id ga7so34152441lbc.1 for ; Wed, 15 Apr 2015 06:35:16 -0700 (PDT) X-Received: by 10.112.125.167 with SMTP id mr7mr23955991lbb.106.1429104916169; Wed, 15 Apr 2015 06:35:16 -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.67.65 with SMTP id l1csp2517415lbt; Wed, 15 Apr 2015 06:35:15 -0700 (PDT) X-Received: by 10.194.91.129 with SMTP id ce1mr50666486wjb.53.1429104915299; Wed, 15 Apr 2015 06:35:15 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id zb2si8166930wjc.128.2015.04.15.06.35.14 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 15 Apr 2015 06:35:15 -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]:60542 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiNSd-00018O-P3 for patch@linaro.org; Wed, 15 Apr 2015 09:34:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45440) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiNQe-00071r-PD for qemu-devel@nongnu.org; Wed, 15 Apr 2015 09:32:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YiNQc-0006Vg-2J for qemu-devel@nongnu.org; Wed, 15 Apr 2015 09:32:32 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:60869) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiNQb-0006V5-Bh for qemu-devel@nongnu.org; Wed, 15 Apr 2015 09:32:30 -0400 Received: from 172.24.2.119 (EHLO szxeml427-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CJV19396; Wed, 15 Apr 2015 21:26:47 +0800 (CST) Received: from HGHY1Z002260041.china.huawei.com (10.177.16.142) by szxeml427-hub.china.huawei.com (10.82.67.182) with Microsoft SMTP Server id 14.3.158.1; Wed, 15 Apr 2015 21:26:37 +0800 From: Shannon Zhao To: , , , , , , , , , , Date: Wed, 15 Apr 2015 21:25:07 +0800 Message-ID: <1429104309-3844-19-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1429104309-3844-1-git-send-email-zhaoshenglong@huawei.com> References: <1429104309-3844-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, shannon.zhao@linaro.org, peter.huangpeng@huawei.com, zhaoshenglong@huawei.com Subject: [Qemu-devel] [PATCH v5 18/20] 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.217.177 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 eb5b44f..fe8fd17 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -947,6 +947,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 72c2396..ec38fc1 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -238,6 +238,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,