From patchwork Thu May 14 09:19:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 48503 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 9B2B32121F for ; Thu, 14 May 2015 09:35:17 +0000 (UTC) Received: by wizk4 with SMTP id k4sf20107148wiz.2 for ; Thu, 14 May 2015 02:35:16 -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=GSg8XbDGorX4q8swCY1rH4iNxC2lqqsuUpxivfnChj8=; b=HUzbSLFIm1l5YWpH94WmHzM79VY5SmuEU4rVPmSxDLyIZBmSexjk51/YkjVT5p9M94 fbHZCpLUp5Xsr+XgVBnzecjkqWx/RkJKOgr+g35XLPVWVgUvdontnhgG6pIKIGPjdcjZ 2ZnTQMFZJ6XQy1I7lk0DGFdF8eQsYUm0p7q2J6M/nKI/iHpAxyPdSPFRU/ixmMoxs5VF viyEcZ1weNjc+p0APaLK1gdXHQdPnNwnWU4DpgMB/2b8EW8vyBCxRZW76VxIM5YHxUbE NBVGy+6nV+3lf4eYRVPeRuNCVD2QHXA3KRV4SjWbkkr/WW0ikgDEt6ISTdtKf1ceqi5s bfGw== X-Gm-Message-State: ALoCoQmIyTL3KFjQHAzzS/3md9puZ+/8GExWtTJsLe8QmylozOoK0AGgHVYLq1EZ8I9n7C5BRjLm X-Received: by 10.112.55.104 with SMTP id r8mr2431602lbp.18.1431596116953; Thu, 14 May 2015 02:35:16 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.232 with SMTP id p8ls389753laf.13.gmail; Thu, 14 May 2015 02:35:16 -0700 (PDT) X-Received: by 10.152.42.211 with SMTP id q19mr2572114lal.78.1431596116719; Thu, 14 May 2015 02:35:16 -0700 (PDT) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id o5si14117545lao.159.2015.05.14.02.35.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2015 02:35:16 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by lagv1 with SMTP id v1so59278695lag.3 for ; Thu, 14 May 2015 02:35:16 -0700 (PDT) X-Received: by 10.112.204.104 with SMTP id kx8mr2434665lbc.72.1431596116542; Thu, 14 May 2015 02:35:16 -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 hn6csp1121221lbb; Thu, 14 May 2015 02:35:15 -0700 (PDT) X-Received: by 10.55.20.141 with SMTP id 13mr6943924qku.30.1431596114959; Thu, 14 May 2015 02:35:14 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 75si22394941qgk.31.2015.05.14.02.35.14 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 14 May 2015 02:35:14 -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]:53382 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YspXu-00064x-5r for patch@linaro.org; Thu, 14 May 2015 05:35:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48457) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YspNi-0005bF-IP for qemu-devel@nongnu.org; Thu, 14 May 2015 05:24:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YspNh-0001Vd-G0 for qemu-devel@nongnu.org; Thu, 14 May 2015 05:24:42 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:32558) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YspNg-0001T1-Sk for qemu-devel@nongnu.org; Thu, 14 May 2015 05:24:41 -0400 Received: from 172.24.2.119 (EHLO szxeml430-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CLJ60795; Thu, 14 May 2015 17:21:15 +0800 (CST) Received: from HGHY1Z002260041.china.huawei.com (10.177.16.142) by szxeml430-hub.china.huawei.com (10.82.67.185) with Microsoft SMTP Server id 14.3.158.1; Thu, 14 May 2015 17:21:00 +0800 From: Shannon Zhao To: , , , , , , , , , , Date: Thu, 14 May 2015 17:19:33 +0800 Message-ID: <1431595182-7552-15-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1431595182-7552-1-git-send-email-zhaoshenglong@huawei.com> References: <1431595182-7552-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: 119.145.14.65 Cc: hangaohuai@huawei.com, zhaoshenglong@huawei.com, peter.huangpeng@huawei.com, shannon.zhao@linaro.org Subject: [Qemu-devel] [PATCH v7 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.51 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 | 46 +++++++++++++++++++++++++++++++++++++++++++++ include/hw/acpi/aml-build.h | 1 + 2 files changed, 47 insertions(+) diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 6197896..0e4d35f 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -956,6 +956,52 @@ Aml *aml_qword_memory(AmlDecode dec, AmlMinFixed min_fixed, addr_trans, len, flags); } +static uint8_t Hex2Byte(const char *src) +{ + int hi = Hex2Digit(*src++); + int lo = Hex2Digit(*src); + + g_assert(((hi >= 0) && (hi <= 15)) && ((lo >= 0) && (lo <= 15))); + return (hi << 4) | lo; +} + +/* + * 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); + + /* format: aabbccdd-eeff-gghh-iijj-kkllmmnnoopp */ + g_assert((strlen(uuid) == 36) && (uuid[8] == '-') && (uuid[13] == '-') + && (uuid[18] == '-') && (uuid[23] == '-')); + + build_append_byte(var->buf, Hex2Byte(uuid + 6)); /* dd - at offset 00 */ + build_append_byte(var->buf, Hex2Byte(uuid + 4)); /* cc - at offset 01 */ + build_append_byte(var->buf, Hex2Byte(uuid + 2)); /* bb - at offset 02 */ + build_append_byte(var->buf, Hex2Byte(uuid + 0)); /* aa - at offset 03 */ + + build_append_byte(var->buf, Hex2Byte(uuid + 11)); /* ff - at offset 04 */ + build_append_byte(var->buf, Hex2Byte(uuid + 9)); /* ee - at offset 05 */ + + build_append_byte(var->buf, Hex2Byte(uuid + 16)); /* hh - at offset 06 */ + build_append_byte(var->buf, Hex2Byte(uuid + 14)); /* gg - at offset 07 */ + + build_append_byte(var->buf, Hex2Byte(uuid + 19)); /* ii - at offset 08 */ + build_append_byte(var->buf, Hex2Byte(uuid + 21)); /* jj - at offset 09 */ + + build_append_byte(var->buf, Hex2Byte(uuid + 24)); /* kk - at offset 10 */ + build_append_byte(var->buf, Hex2Byte(uuid + 26)); /* ll - at offset 11 */ + build_append_byte(var->buf, Hex2Byte(uuid + 28)); /* mm - at offset 12 */ + build_append_byte(var->buf, Hex2Byte(uuid + 30)); /* nn - at offset 13 */ + build_append_byte(var->buf, Hex2Byte(uuid + 32)); /* oo - at offset 14 */ + build_append_byte(var->buf, Hex2Byte(uuid + 34)); /* 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 615f3c1..f5e764c 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -265,6 +265,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,