From patchwork Wed May 20 04:19:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 48783 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EA9D82121F for ; Wed, 20 May 2015 04:29:27 +0000 (UTC) Received: by wizk4 with SMTP id k4sf15006551wiz.2 for ; Tue, 19 May 2015 21:29:27 -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=7tF4YZuhY+qkB/foJ2ivAsgu2644EyKnDUjhWVSYCkc=; b=VQtN+6HxFGrckJSoEzHaFGiJb6JgDo9CVDyvzSpCzhmOWpdsIxJq4dhc8VuzwlZyiG rZJteALT2A8DAlZhBUhABO9kVuvR+7YEi7qMW9/tgyEilABxWYWyegC+BJoez+nSPnIs ONYZRN4sibXlQL8qZ+oGvcCZjLaM7pKljspq+8OKcMwxtJdeh0BwQzQuFjzL92rE/KGP 24nQvsqMG2bs7Dg0fwJgkL+Jc5zb9cSEDWuAb42QFlUdOu2FWjkOE/gV51/OiUm66Fua pEdcyhQ5E47fwL0vyQLzt/+Y9AruNTUt0IGleTuzOK8ySTUISyojSIEl/g/11ak/V7K7 J3Yw== X-Gm-Message-State: ALoCoQl18yusMp+N/AXeBbx+FmqgPBxrdqW5teRc1fw9hudfARqQBieWlK+I2WB6cSNggZ9/v6+N X-Received: by 10.180.89.231 with SMTP id br7mr865279wib.0.1432096167186; Tue, 19 May 2015 21:29:27 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.28.231 with SMTP id e7ls130856lah.38.gmail; Tue, 19 May 2015 21:29:27 -0700 (PDT) X-Received: by 10.152.43.168 with SMTP id x8mr3899858lal.79.1432096167044; Tue, 19 May 2015 21:29:27 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id k9si10407862lak.13.2015.05.19.21.29.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 May 2015 21:29:26 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by lagv1 with SMTP id v1so55783626lag.3 for ; Tue, 19 May 2015 21:29:26 -0700 (PDT) X-Received: by 10.113.10.134 with SMTP id ea6mr23953630lbd.29.1432096166592; Tue, 19 May 2015 21:29:26 -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 hn6csp1255058lbb; Tue, 19 May 2015 21:29:25 -0700 (PDT) X-Received: by 10.229.84.198 with SMTP id k6mr42439286qcl.16.1432096165188; Tue, 19 May 2015 21:29:25 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o80si14416602qkh.68.2015.05.19.21.29.24 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 19 May 2015 21:29:25 -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]:49806 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YuvdE-00013U-9u for patch@linaro.org; Wed, 20 May 2015 00:29:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41343) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yuvcp-0000n2-Uc for qemu-devel@nongnu.org; Wed, 20 May 2015 00:29:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yuvcl-0003YG-TR for qemu-devel@nongnu.org; Wed, 20 May 2015 00:28:59 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:40101) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yuvcl-0003XY-3C for qemu-devel@nongnu.org; Wed, 20 May 2015 00:28:55 -0400 Received: from 172.24.2.119 (EHLO szxeml432-hub.china.huawei.com) ([172.24.2.119]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id BGH44623; Wed, 20 May 2015 12:20:22 +0800 (CST) Received: from HGHY1Z002260041.china.huawei.com (10.177.16.142) by szxeml432-hub.china.huawei.com (10.82.67.209) with Microsoft SMTP Server id 14.3.158.1; Wed, 20 May 2015 12:20:12 +0800 From: Shannon Zhao To: , , , , , , , , , , Date: Wed, 20 May 2015 12:19:55 +0800 Message-ID: <1432095595-12968-1-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1431595182-7552-15-git-send-email-zhaoshenglong@huawei.com> References: <1431595182-7552-15-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.0A020204.555C0B88.0024, ss=1, re=0.000, 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: bdf334ffe1db0912d18a853addcc3999 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, zhaoshenglong@huawei.com, peter.huangpeng@huawei.com, shannon.zhao@linaro.org Subject: [Qemu-devel] [RESEND PATCH 14/23] 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.44 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 Reviewed-by: Igor Mammedov --- hw/acpi/aml-build.c | 112 ++++++++++++++++++++++++++++++++++++++++++++ include/hw/acpi/aml-build.h | 1 + 2 files changed, 113 insertions(+) diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 7fcc44e..bdcbad2 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -28,6 +28,8 @@ #include "qemu/bswap.h" #include "qemu/bitops.h" #include "hw/acpi/bios-linker-loader.h" +#include "qapi/error.h" +#include "qemu-common.h" static GArray *build_alloc_array(void) { @@ -955,6 +957,116 @@ Aml *aml_qword_memory(AmlDecode dec, AmlMinFixed min_fixed, addr_trans, len, flags); } +static void String2Byte(const char *str, uint8_t *byte_list) +{ + unsigned long long val; + char *end; + const char *start = str; + int i, j = 0; + Error *err = NULL; + + if (strlen(str) != 36) { + error_setg(&err, "Length of UUID string is not 36"); + goto error; + } + + val = strtoull(start, &end, 16); + if ((end - start) != 8) { + error_setg(&err, "Length of first part of UUID string is not 8"); + goto error; + } + for (i = 3; i >= 0; i--) { + byte_list[j] = extract32(val, (8 * i), 8); + j++; + } + start = end + 1; + + val = strtoull(start, &end, 16); + if ((end - start) != 4) { + error_setg(&err, "Length of second part of UUID string is not 4"); + goto error; + } + for (i = 1; i >= 0; i--) { + byte_list[j] = extract32(val, (8 * i), 8); + j++; + } + start = end + 1; + + val = strtoull(start, &end, 16); + if ((end - start) != 4) { + error_setg(&err, "Length of third part of UUID string is not 4"); + goto error; + } + for (i = 1; i >= 0; i--) { + byte_list[j] = extract32(val, (8 * i), 8); + j++; + } + start = end + 1; + + val = strtoull(start, &end, 16); + if ((end - start) != 4) { + error_setg(&err, "Length of fourth part of UUID string is not 4"); + goto error; + } + for (i = 1; i >= 0; i--) { + byte_list[j] = extract32(val, (8 * i), 8); + j++; + } + start = end + 1; + + val = strtoull(start, &end, 16); + if ((end - start) != 12) { + error_setg(&err, "Length of fifth part of UUID string is not 12"); + goto error; + } + for (i = 5; i >= 0; i--) { + byte_list[j] = extract64(val, (8 * i), 8); + j++; + } + + return; + +error: + error_report_err(err); + exit(1); +} + +/* + * ACPI 3.0: 17.5.124 ToUUID (Convert String to UUID Macro) + * e.g. UUID: aabbccdd-eeff-gghh-iijj-kkllmmnnoopp + * call aml_touuid("aabbccdd-eeff-gghh-iijj-kkllmmnnoopp"); + */ +Aml *aml_touuid(const char *uuid) +{ + Aml *var = aml_bundle(0x11 /* BufferOp */, AML_BUFFER); + uint8_t byte_list[16]; + + String2Byte(uuid, byte_list); + + build_append_byte(var->buf, byte_list[3]); /* dd - at offset 00 */ + build_append_byte(var->buf, byte_list[2]); /* cc - at offset 01 */ + build_append_byte(var->buf, byte_list[1]); /* bb - at offset 02 */ + build_append_byte(var->buf, byte_list[0]); /* aa - at offset 03 */ + + build_append_byte(var->buf, byte_list[5]); /* ff - at offset 04 */ + build_append_byte(var->buf, byte_list[4]); /* ee - at offset 05 */ + + build_append_byte(var->buf, byte_list[7]); /* hh - at offset 06 */ + build_append_byte(var->buf, byte_list[6]); /* gg - at offset 07 */ + + build_append_byte(var->buf, byte_list[8]); /* ii - at offset 08 */ + build_append_byte(var->buf, byte_list[9]); /* jj - at offset 09 */ + + build_append_byte(var->buf, byte_list[10]); /* kk - at offset 10 */ + build_append_byte(var->buf, byte_list[11]); /* ll - at offset 11 */ + build_append_byte(var->buf, byte_list[12]); /* mm - at offset 12 */ + build_append_byte(var->buf, byte_list[13]); /* nn - at offset 13 */ + build_append_byte(var->buf, byte_list[14]); /* oo - at offset 14 */ + build_append_byte(var->buf, byte_list[15]); /* pp - at offset 15 */ + + return var; +} + 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 fac70ea..a873b46 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -257,6 +257,7 @@ Aml *aml_buffer(int buffer_size, uint8_t *byte_list); Aml *aml_resource_template(void); Aml *aml_field(const char *name, AmlAccessType type, AmlUpdateRule rule); Aml *aml_varpackage(uint32_t num_elements); +Aml *aml_touuid(const char *uuid); void build_header(GArray *linker, GArray *table_data,