From patchwork Fri Apr 3 10:03:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 46755 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D9ED3216D1 for ; Fri, 3 Apr 2015 10:14:07 +0000 (UTC) Received: by wgiv13 with SMTP id v13sf10322384wgi.3 for ; Fri, 03 Apr 2015 03:14:07 -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=q0EwJ8gn94t/l5j4/VNjVMso+eZYCeoGKCLEqp1h8k0=; b=j7h50ekRHdjMFTOPgEUEuwqD24HmcC22Sk2daoDyawX7IJV3irGWYzugMfueKUun3f C71iuzEyciT72dO3q2STvP2zGO5H2aTGIH7lNDmn+O/PR/el06PxKQHkcvY4GHJkH0yY dc5RliWGkN7d76+ZP/8FPFi1XP++puUC2umKaqgu3DogSC/sg7MZBpyaasWYZXsxsrJO q4/SznfE3kTVsPGVPZ9t/EM4L0U+IpCTfs+NEHF74qiAkrwtlMylbzOuJ0g+C0lYoIow d97ngbQ/UC9wdJUS5jB5ZEyGtSC0R0HVc/2/L9zNuWgjYTZBYgDEgnjxCtzE/Jg2Hj6D Whkg== X-Gm-Message-State: ALoCoQmdWSgiX+7a2XZgEhGLl2aAsANjIe9Y7YxQmQV79yYLr3NQZ5WQVwx5hoQ8aAI3yBF3MWVj X-Received: by 10.112.201.232 with SMTP id kd8mr449036lbc.16.1428056047158; Fri, 03 Apr 2015 03:14:07 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.179.131 with SMTP id dg3ls309574lac.74.gmail; Fri, 03 Apr 2015 03:14:07 -0700 (PDT) X-Received: by 10.152.87.233 with SMTP id bb9mr1548725lab.30.1428056047049; Fri, 03 Apr 2015 03:14:07 -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 w6si6327744lae.164.2015.04.03.03.14.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Apr 2015 03:14:06 -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 lahf3 with SMTP id f3so76700107lah.2 for ; Fri, 03 Apr 2015 03:14:06 -0700 (PDT) X-Received: by 10.112.218.5 with SMTP id pc5mr1618687lbc.32.1428056046764; Fri, 03 Apr 2015 03:14:06 -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.57.201 with SMTP id k9csp1861580lbq; Fri, 3 Apr 2015 03:14:06 -0700 (PDT) X-Received: by 10.55.56.73 with SMTP id f70mr2932968qka.16.1428056045611; Fri, 03 Apr 2015 03:14:05 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id c50si7446558qgf.105.2015.04.03.03.14.05 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 03 Apr 2015 03:14:05 -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]:33355 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydyc0-0006VR-N0 for patch@linaro.org; Fri, 03 Apr 2015 06:14:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38492) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdyUu-0002c7-6K for qemu-devel@nongnu.org; Fri, 03 Apr 2015 06:06:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdyUt-0006y4-88 for qemu-devel@nongnu.org; Fri, 03 Apr 2015 06:06:44 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:9724) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdyUs-0006u9-MS for qemu-devel@nongnu.org; Fri, 03 Apr 2015 06:06:43 -0400 Received: from 172.24.2.119 (EHLO szxeml425-hub.china.huawei.com) ([172.24.2.119]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id BDZ47801; Fri, 03 Apr 2015 18:05:59 +0800 (CST) Received: from HGHY1Z002260041.china.huawei.com (10.177.16.142) by szxeml425-hub.china.huawei.com (10.82.67.180) with Microsoft SMTP Server id 14.3.158.1; Fri, 3 Apr 2015 18:05:49 +0800 From: Shannon Zhao To: , , , , , , , , , , Date: Fri, 3 Apr 2015 18:03:45 +0800 Message-ID: <1428055432-12120-14-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1428055432-12120-1-git-send-email-zhaoshenglong@huawei.com> References: <1428055432-12120-1-git-send-email-zhaoshenglong@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.16.142] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020206.551E6608.0030, ss=1, re=0.001, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 8cb5f662819b6bd6019c95bbfe9171cf X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.66 Cc: hangaohuai@huawei.com, shannon.zhao@linaro.org, peter.huangpeng@huawei.com, zhaoshenglong@huawei.com Subject: [Qemu-devel] [PATCH v4 13/20] hw/acpi/aml-build: Add ToUUID macro 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 ToUUID macro, this is useful for generating PCIe ACPI table. Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao --- hw/acpi/aml-build.c | 23 +++++++++++++++++++++++ include/hw/acpi/aml-build.h | 2 ++ 2 files changed, 25 insertions(+) diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index bd1713c..5a94fc9 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -933,6 +933,29 @@ Aml *aml_qword_memory(AmlDecode dec, AmlMinFixed min_fixed, addr_trans, len, flags); } +/* + * ACPI 3.0: 17.5.124 ToUUID (Convert String to UUID Macro) + * e.g. UUID: E5C937D0-3553-4d7a-9117-EA4D19C3434D + * call aml_touuid(0xE5C937D0, 0x3553, 0x4d7a, 0x9117, 0xEA4D19C3434D); + */ +Aml *aml_touuid(int32_t val1, int16_t val2, int16_t val3, + int16_t val4, int64_t val5) +{ + int i; + Aml *UUID = aml_buffer(); + + build_append_int_noprefix(UUID->buf, val1, 4); + build_append_int_noprefix(UUID->buf, val2, 2); + build_append_int_noprefix(UUID->buf, val3, 2); + build_append_int_noprefix(UUID->buf, (val4 >> 8) & 0xFF, 1); + build_append_int_noprefix(UUID->buf, val4 & 0xFF, 1); + for (i = 40; i >= 0; i -= 8) { + build_append_int_noprefix(UUID->buf, (val5 >> i) & 0xFF, 1); + } + + return UUID; +} + void build_header(GArray *linker, GArray *table_data, AcpiTableHeader *h, const char *sig, int len, uint8_t rev) diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index 315c729..942d986 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -209,6 +209,8 @@ Aml *aml_buffer(void); Aml *aml_resource_template(void); Aml *aml_field(const char *name, AmlFieldFlags flags); Aml *aml_varpackage(uint32_t num_elements); +Aml *aml_touuid(int32_t val1, int16_t val2, int16_t val3, + int16_t val4, int64_t val5); void build_header(GArray *linker, GArray *table_data,