From patchwork Thu May 7 09:29:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 48096 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1A44920553 for ; Thu, 7 May 2015 09:38:01 +0000 (UTC) Received: by lbbqq2 with SMTP id qq2sf10662887lbb.0 for ; Thu, 07 May 2015 02:38:00 -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=15Wm26OMft0wSnwsuFnu0PGYi1A6Ah6E9pL82A375nc=; b=XFZQC1K/OAXjDV9amYk/7JhtYxp4dCMyOj1DI/EJsxrHfW5W+a2fH2k5eQDKcZvmzU vY3l7xlJ2IIp3c6sPISfU3yBMlIveZPCBRnDMhvTHSEOOUF6jsiRcmwEkrt/1Bwvmc8H C7tiwORZY9cOHWtMZLO33NqebsIvtiMpk5Rtxv2WetWEkT99cVZ6pqxbXFK7Vx3aXnNP xyYa0W+ckSfeUvnRXRzjULwKvDdPyWEZqKOtCxi74Ik600bt82KW6hUWEKXns1Nx9cV3 Z0xbgAr3Jv55VtgKBSzDf+P3M1ZUSgRzTzUuEUcDggxpnq5Yr1X8kFWxQrzADJCPabSl GrJA== X-Gm-Message-State: ALoCoQkCwYjNDvq4/H3E4JQ6anChvkKnscAWdv6g8okbJYl9ULZyJcWqu0CTk+lqt8+KiH4hMJSD X-Received: by 10.152.43.116 with SMTP id v20mr1737512lal.3.1430991480040; Thu, 07 May 2015 02:38:00 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.196 with SMTP id u4ls178831lau.6.gmail; Thu, 07 May 2015 02:37:59 -0700 (PDT) X-Received: by 10.153.8.167 with SMTP id dl7mr2354933lad.86.1430991479927; Thu, 07 May 2015 02:37:59 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com. [209.85.215.43]) by mx.google.com with ESMTPS id l3si920908lbc.147.2015.05.07.02.37.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 May 2015 02:37:59 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by layy10 with SMTP id y10so26416544lay.0 for ; Thu, 07 May 2015 02:37:59 -0700 (PDT) X-Received: by 10.113.10.134 with SMTP id ea6mr2304036lbd.29.1430991479827; Thu, 07 May 2015 02:37: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.67.65 with SMTP id l1csp3330625lbt; Thu, 7 May 2015 02:37:59 -0700 (PDT) X-Received: by 10.55.15.15 with SMTP id z15mr6183718qkg.21.1430991478586; Thu, 07 May 2015 02:37:58 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id z31si1465174qgd.1.2015.05.07.02.37.58 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 07 May 2015 02:37:58 -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]:49699 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YqIFh-0007bU-LL for patch@linaro.org; Thu, 07 May 2015 05:37:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56930) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YqIAK-0007rs-7a for qemu-devel@nongnu.org; Thu, 07 May 2015 05:32:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YqIAI-0001vT-Fo for qemu-devel@nongnu.org; Thu, 07 May 2015 05:32:24 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:42323) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YqIAH-0001uC-Nn for qemu-devel@nongnu.org; Thu, 07 May 2015 05:32:22 -0400 Received: from 172.24.2.119 (EHLO szxeml426-hub.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CNI17479; Thu, 07 May 2015 17:32:06 +0800 (CST) Received: from HGHY1Z002260041.china.huawei.com (10.177.16.142) by szxeml426-hub.china.huawei.com (10.82.67.181) with Microsoft SMTP Server id 14.3.158.1; Thu, 7 May 2015 17:31:40 +0800 From: Shannon Zhao To: , , , , , , , , , , Date: Thu, 7 May 2015 17:29:21 +0800 Message-ID: <1430990964-10528-20-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1430990964-10528-1-git-send-email-zhaoshenglong@huawei.com> References: <1430990964-10528-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 v6 19/22] 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.43 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 2e13510..67b7719 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -958,6 +958,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 9fc4057..5ff9c14 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,