From patchwork Fri Dec 30 15:21:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 89389 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp6491663qgi; Fri, 30 Dec 2016 07:38:02 -0800 (PST) X-Received: by 10.200.43.245 with SMTP id n50mr42192346qtn.224.1483112282240; Fri, 30 Dec 2016 07:38:02 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id e27si25066325qkj.174.2016.12.30.07.38.02 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 30 Dec 2016 07:38:02 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:40379 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cMzFp-0006ZY-LB for patch@linaro.org; Fri, 30 Dec 2016 10:38:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43397) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cMz0X-0002Pc-Ag for qemu-devel@nongnu.org; Fri, 30 Dec 2016 10:22:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cMz0W-0000J7-7p for qemu-devel@nongnu.org; Fri, 30 Dec 2016 10:22:13 -0500 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:35919) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cMz0W-0000Iu-2u for qemu-devel@nongnu.org; Fri, 30 Dec 2016 10:22:12 -0500 Received: by mail-pg0-x242.google.com with SMTP id n5so22380992pgh.3 for ; Fri, 30 Dec 2016 07:22:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=apM5Tsv++Ew7HimtxjyRLQlu3/UihQlmWiQMfJFIUF4=; b=rDiqVWKZ5yMzgK+WwxWxFa/YIB1WIcpTg/9LBi4jQt6J4Nah7C0O6ZdpkYfXBUVx5i 4RqArPpWgJ+469flpriv/sQJ6PAWcRyD5mZq39RjdCL46629lEUSu5HS1wOOhpQ//Mnn S3QaLHo+XhNXrcsiZFPU3+cees/8Nyqb9F5J2bUoXnpG5uLDBnXH2xAA33nov8L5Y/9H TuQGOsdPIsaGZu54yQ8zEGgdUNq1e3EZbneJjySoqyMDuav1CfCPnnbMKgtt1ULOlmrW xYVnGt3jd1GdbIRcj/2JeX33/j2XOnn5G3DWjKwR+R34IE3A3zu+/WGTosORcJkX8IWA FtuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=apM5Tsv++Ew7HimtxjyRLQlu3/UihQlmWiQMfJFIUF4=; b=IqD0oJR7HI41oDmwBiF8QDIE1ZNDV2IsnQSpL6My/fE/fV0TAjn84yJX3Vwnkz+Z8R 2BoSF+IrQHpR0bFKV3yqaScwjWdlHDrz1SVcaEyFm1ejkRGRkMna1rDYE2OuP8RdYnGk pTwyFUVfQ/Jj5Qrm6JLYAtcQY5Qub02DTxbMsmvOQkbi6IwBT7D7HGuhFPhbqPGLh8C5 29k3ee2cSKBDQ57lbdQQ0B+95vgowHN7j/bINcvFXBeh4/j4e5Git9VzhiTtMwzqcC0r kdjE/CrQEVzs0Ua4wbsHuQ8spytWh9j8fuYb0dUS6mB22oZX9VWQOr1viESJgz+zbl54 jnMg== X-Gm-Message-State: AIkVDXLhYhRDsDH+dCbppR3yQLYrwZiOE2xIMW8T7CEmEJeZhNtLTnvAnzpPblMLc8zsFw== X-Received: by 10.99.126.6 with SMTP id z6mr85785536pgc.182.1483111331311; Fri, 30 Dec 2016 07:22:11 -0800 (PST) Received: from serve.minyard.net (serve.minyard.net. [2001:470:b8f6:1b::1]) by smtp.gmail.com with ESMTPSA id q14sm113463500pfa.40.2016.12.30.07.22.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Dec 2016 07:22:08 -0800 (PST) Received: from t430.minyard.net (unknown [IPv6:2001:470:b8f6:1b:3850:e313:ed7:8ae4]) by serve.minyard.net (Postfix) with ESMTPA id 2C838A280; Fri, 30 Dec 2016 09:21:58 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id 945B1300096; Fri, 30 Dec 2016 09:21:53 -0600 (CST) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Fri, 30 Dec 2016 09:21:42 -0600 Message-Id: <1483111310-24808-12-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1483111310-24808-1-git-send-email-minyard@acm.org> References: <1483111310-24808-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c05::242 Subject: [Qemu-devel] [PATCH 11/19] acpi: Add i2c serial bus CRS handling X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Corey Minyard , minyard@acm.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Corey Minyard Signed-off-by: Corey Minyard --- hw/acpi/aml-build.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/hw/acpi/aml-build.h | 18 ++++++++++++++++++ 2 files changed, 58 insertions(+) -- 2.7.4 diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index b2a1e40..7b2673f 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -1607,3 +1607,43 @@ void build_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base, numamem->base_addr = cpu_to_le64(base); numamem->range_length = cpu_to_le64(len); } + +/* ACPI 5.0: 6.4.3.8.2 Serial Bus Connection Descriptors */ +static Aml *aml_serial_bus_device(uint8_t serial_bus_type, uint8_t flags, + uint16_t type_flags, + uint8_t revid, uint16_t data_length, + uint16_t resource_source_len) +{ + Aml *var = aml_alloc(); + uint16_t length = data_length + resource_source_len + 9; + + build_append_byte(var->buf, 0x8e); /* Serial Bus Connection Descriptor */ + build_append_int_noprefix(var->buf, length, sizeof(length)); + build_append_byte(var->buf, 1); /* Revision ID */ + build_append_byte(var->buf, 0); /* Resource Source Index */ + build_append_byte(var->buf, serial_bus_type); /* Serial Bus Type */ + build_append_byte(var->buf, flags); /* General Flags */ + build_append_int_noprefix(var->buf, type_flags, /* Type Specific Flags */ + sizeof(type_flags)); + build_append_byte(var->buf, revid); /* Type Specification Revision ID */ + build_append_int_noprefix(var->buf, data_length, sizeof(data_length)); + + return var; +} + +/* ACPI 5.0: 6.4.3.8.2.1 I2C Serial Bus Connection Resource Descriptor */ +Aml *aml_i2c_serial_bus_device(uint16_t address, const char *resource_source) +{ + uint16_t resource_source_len = strlen(resource_source) + 1; + Aml *var = aml_serial_bus_device(AML_SERIAL_BUS_TYPE_I2C, 0, 0, 1, + 6, resource_source_len); + + /* Connection Speed. Just set to 100K for now, it doesn't really matter. */ + build_append_int_noprefix(var->buf, 100000, 4); + build_append_int_noprefix(var->buf, address, sizeof(address)); + + /* This is a string, not a name, so just copy it directly in. */ + g_array_append_vals(var->buf, resource_source, resource_source_len); + + return var; +} diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index 559326c..27e23b1 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -213,6 +213,23 @@ struct AcpiBuildTables { BIOSLinker *linker; } AcpiBuildTables; +/* + * ACPI 5.0: 6.4.3.8.2 Serial Bus Connection Descriptors + * Serial Bus Type + */ +#define AML_SERIAL_BUS_TYPE_I2C 1 +#define AML_SERIAL_BUS_TYPE_SPI 2 +#define AML_SERIAL_BUS_TYPE_UART 3 + +/* + * ACPI 5.0: 6.4.3.8.2 Serial Bus Connection Descriptors + * General Flags + */ +/* Slave Mode */ +#define AML_SERIAL_BUS_FLAG_MASTER_DEVICE (1 << 0) +/* Consumer/Producer */ +#define AML_SERIAL_BUS_FLAG_CONSUME_ONLY (1 << 1) + /** * init_aml_allocator: * @@ -337,6 +354,7 @@ Aml *aml_qword_memory(AmlDecode dec, AmlMinFixed min_fixed, Aml *aml_dma(AmlDmaType typ, AmlDmaBusMaster bm, AmlTransferSize sz, uint8_t channel); Aml *aml_sleep(uint64_t msec); +Aml *aml_i2c_serial_bus_device(uint16_t address, const char *resource_source); /* Block AML object primitives */ Aml *aml_scope(const char *name_format, ...) GCC_FMT_ATTR(1, 2);