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: 474157 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id DAB9B140781 for ; Wed, 20 May 2015 14:29:16 +1000 (AEST) Received: from localhost ([::1]:49806 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yuvd5-00013U-47 for incoming@patchwork.ozlabs.org; Wed, 20 May 2015 00:29:15 -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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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,