From patchwork Wed Jun 1 16:26:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 628758 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 3rKbTX3YH9z9t6D for ; Thu, 2 Jun 2016 02:31:28 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=a3GZVFyH; dkim-atps=neutral Received: from localhost ([::1]:43052 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b893G-0008Uw-Ib for incoming@patchwork.ozlabs.org; Wed, 01 Jun 2016 12:31:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49579) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b88zF-0005Rv-E6 for qemu-devel@nongnu.org; Wed, 01 Jun 2016 12:27:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b88z7-00057o-6G for qemu-devel@nongnu.org; Wed, 01 Jun 2016 12:27:16 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:36298) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b88z6-00057Q-SO for qemu-devel@nongnu.org; Wed, 01 Jun 2016 12:27:09 -0400 Received: by mail-pf0-x243.google.com with SMTP id 62so4442962pfd.3 for ; Wed, 01 Jun 2016 09:27:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=GDR9kGex03I/KVelBAxPQ6FhHN/dEqWzTRiPgiuRd8Y=; b=a3GZVFyHZjRus0RRN2TfSuNQ/sMemUDMuHNhMQT7QSxLTBaOd8ieh8Btx8qnQssp9J C5KxwshGZFLr4NHTSiLVNbUNY2EGboFMOBA8/Ac3Y1zV5uiMVTTr1vZtAeCRl5BCRXVt QHEYr+7SFKb97XPk1lJ2OfuQ4i7tlnu/CUguLUOfRaocYBXsTvX5O+0ib0mGN4Fwd5FQ qWU+re63H8SwM3rQV7n2WCBTdWk5hB9tDDs5Rogf1eaW4Rl0ruM/BGXYYX0Uebf5SL/v 8t7Luc+ZBSt9L40svIbKzEjssSuibK5C30UTZLqloxz8w1t3oxbjpX7AcnOuW5PWvAXS DVGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=GDR9kGex03I/KVelBAxPQ6FhHN/dEqWzTRiPgiuRd8Y=; b=cS6sPAfn8ULmTofg+7dc27o6IAK2q/l3W4cbb7hXQZxrkTUM/dJB6FvOpT+986o9Bg tb6YCGB+VPbH1RPIqV2CatQYqEQRgJ7Bqbjl8arlh/59DJlPSWkZOpBoih5WdAEyxc0n /OVTm9NT2lbtZ4lnZfKcZUs9lEf5f1fJ3KIoWf4hv85yWWffSj+NaP86Rbcy1PhsQSMz YP2MxalBF4vCpZQnRcUNlvKs45FPZudzdgQ9k5MHmYPBQwVn5vfGK2bkZlOzZ1HUNegh 7qO8eqLLJfaZfqKOfBwRMKeB0PuG6y9qxUoZ6YHHHfXmgPzCY12CoioBXNTQr18nWhcm 2KOQ== X-Gm-Message-State: ALyK8tIH5I0oXBxaGvgkHO2Ijjx5/+1C9SQ0UKOjtkrk1kqf74Rbjae7wcclfC9PTKziJA== X-Received: by 10.98.89.213 with SMTP id k82mr10155509pfj.99.1464798428150; Wed, 01 Jun 2016 09:27:08 -0700 (PDT) Received: from serve.minyard.net ([108.19.215.157]) by smtp.gmail.com with ESMTPSA id hw10sm63905933pac.15.2016.06.01.09.27.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Jun 2016 09:27:06 -0700 (PDT) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id A5E611529; Wed, 1 Jun 2016 11:27:04 -0500 (CDT) Received: by t430.minyard.net (Postfix, from userid 1000) id 4564E300523; Wed, 1 Jun 2016 11:27:03 -0500 (CDT) From: minyard@acm.org To: Igor Mammedov , "Michael S . Tsirkin" , Paolo Bonzini , qemu-devel@nongnu.org, minyard@acm.org, cminyard@mvista.com Date: Wed, 1 Jun 2016 11:26:57 -0500 Message-Id: <1464798420-12018-5-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1464798420-12018-1-git-send-email-minyard@acm.org> References: <1464798420-12018-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:c00::243 Subject: [Qemu-devel] [PATCH v2 4/7] 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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(+) diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index cedb74e..cd5569e 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -1574,3 +1574,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 7eb51c7..c8904e4 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -213,6 +213,23 @@ struct AcpiBuildTables { GArray *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: * @@ -334,6 +351,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);