From patchwork Wed Apr 15 13:25:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 47180 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CD5D121550 for ; Wed, 15 Apr 2015 13:30:22 +0000 (UTC) Received: by labgx2 with SMTP id gx2sf10061702lab.1 for ; Wed, 15 Apr 2015 06:30:21 -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: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=P02Qfn7nGuUZvTo+asv9X1sbfieO84/wTj0oDt3OcMM=; b=NEprS6+fNSgmOI81c8B9CCtiFzHmrMqguxnkPRV8Pneufq5U7E4pHLixUAwk5jzi1L 9eqgy8S1CrvTcH80LxJtmNtIH2LURrmMvbFgwdWaapE+fDtas46bF/G4iUPkSqziyxDl naOQwDKkDfvN3lE4Efly0BHDDrSG/s6PY1pif1DnRci3tt4dJecIgD8/diysAndtaVaX 3ZiI2WflxDt6SK36JllrKl1gYxpAzm3SRHLZW4aAhx6GQl3R1FI8CGlhZUTGP69Zna7h aLWWak84wNPnGn3AYupdcIAFuz63tcR8X58WdN+Gq7Ij6WYDXdhP4xwisE1F0jXPm/ic oQOw== X-Gm-Message-State: ALoCoQlwwKIpf072YVkela5bQH6Fe/WC758MmTjrX/ZiuZ3BXloT2fnFal1lOFE8ZAktC32eRTaQ X-Received: by 10.194.71.227 with SMTP id y3mr5331996wju.3.1429104621869; Wed, 15 Apr 2015 06:30:21 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.88.3 with SMTP id bc3ls201000lab.22.gmail; Wed, 15 Apr 2015 06:30:21 -0700 (PDT) X-Received: by 10.112.161.66 with SMTP id xq2mr23882776lbb.103.1429104621719; Wed, 15 Apr 2015 06:30:21 -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 ac10si3903645lbc.134.2015.04.15.06.30.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Apr 2015 06:30:21 -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 lagv1 with SMTP id v1so32691453lag.3 for ; Wed, 15 Apr 2015 06:30:21 -0700 (PDT) X-Received: by 10.152.116.11 with SMTP id js11mr23927129lab.106.1429104621629; Wed, 15 Apr 2015 06:30:21 -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 l1csp2514365lbt; Wed, 15 Apr 2015 06:30:20 -0700 (PDT) X-Received: by 10.55.41.170 with SMTP id p42mr52021196qkp.106.1429104619884; Wed, 15 Apr 2015 06:30:19 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id j189si4591901qhc.132.2015.04.15.06.30.19 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 15 Apr 2015 06:30:19 -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]:60498 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiNOU-0002SL-Pb for patch@linaro.org; Wed, 15 Apr 2015 09:30:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44050) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiNLQ-0006JU-7o for qemu-devel@nongnu.org; Wed, 15 Apr 2015 09:27:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YiNLO-0004wf-MK for qemu-devel@nongnu.org; Wed, 15 Apr 2015 09:27:08 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:41923) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiNLN-0004uE-IJ for qemu-devel@nongnu.org; Wed, 15 Apr 2015 09:27:06 -0400 Received: from 172.24.2.119 (EHLO szxeml427-hub.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CME19612; Wed, 15 Apr 2015 21:26:43 +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:33 +0800 From: Shannon Zhao To: , , , , , , , , , , Date: Wed, 15 Apr 2015 21:25:03 +0800 Message-ID: <1429104309-3844-15-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: 58.251.152.64 Cc: hangaohuai@huawei.com, shannon.zhao@linaro.org, peter.huangpeng@huawei.com, zhaoshenglong@huawei.com Subject: [Qemu-devel] [PATCH v5 14/20] hw/acpi/aml-build: Add aml_or() 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 Add aml_or() term and expose build_append_int_noprefix as it wiil be used by creating a buffer. Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao --- hw/acpi/aml-build.c | 12 +++++++++++- include/hw/acpi/aml-build.h | 2 ++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 316d5a5..cd4ffe2 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -242,7 +242,7 @@ static void build_extop_package(GArray *package, uint8_t op) build_prepend_byte(package, 0x5B); /* ExtOpPrefix */ } -static void build_append_int_noprefix(GArray *table, uint64_t value, int size) +void build_append_int_noprefix(GArray *table, uint64_t value, int size) { int i; @@ -456,6 +456,16 @@ Aml *aml_and(Aml *arg1, Aml *arg2) return var; } +/* ACPI 1.0b: 16.2.5.4 Type 2 Opcodes Encoding: DefOr */ +Aml *aml_or(Aml *arg1, Aml *arg2) +{ + Aml *var = aml_opcode(0x7D /* OrOp */); + aml_append(var, arg1); + aml_append(var, arg2); + build_append_byte(var->buf, 0x00 /* NullNameOp */); + return var; +} + /* ACPI 1.0b: 16.2.5.3 Type 1 Opcodes Encoding: DefNotify */ Aml *aml_notify(Aml *arg1, Aml *arg2) { diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index b41fd0c..61c1a03 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -202,6 +202,7 @@ Aml *aml_int(const uint64_t val); Aml *aml_arg(int pos); Aml *aml_store(Aml *val, Aml *target); Aml *aml_and(Aml *arg1, Aml *arg2); +Aml *aml_or(Aml *arg1, Aml *arg2); Aml *aml_notify(Aml *arg1, Aml *arg2); Aml *aml_call1(const char *method, Aml *arg1); Aml *aml_call2(const char *method, Aml *arg1, Aml *arg2); @@ -260,6 +261,7 @@ Aml *aml_resource_template(void); Aml *aml_field(const char *name, AmlFieldFlags flags); Aml *aml_varpackage(uint32_t num_elements); Aml *aml_touuid(const char *uuid); +void build_append_int_noprefix(GArray *table, uint64_t value, int size); void build_header(GArray *linker, GArray *table_data,