[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/15] acpi: Add i2c serial bus CRS handling
From: |
minyard |
Subject: |
[Qemu-devel] [PATCH 13/15] acpi: Add i2c serial bus CRS handling |
Date: |
Mon, 19 Aug 2019 15:17:03 -0500 |
From: Corey Minyard <address@hidden>
This will be required for getting IPMI SSIF (SMBus interface) into
the ACPI tables.
Cc: Michael S. Tsirkin <address@hidden>
Cc: Igor Mammedov <address@hidden>
Signed-off-by: Corey Minyard <address@hidden>
---
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 555c24f21d..a6ddd1db8f 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -1870,3 +1870,43 @@ build_hdr:
build_header(linker, tbl, (void *)(tbl->data + fadt_start),
"FACP", tbl->len - fadt_start, f->rev, oem_id, oem_table_id);
}
+
+/* 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 1a563ad756..ff9f9b8d7f 100644
--- a/include/hw/acpi/aml-build.h
+++ b/include/hw/acpi/aml-build.h
@@ -223,6 +223,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:
*
@@ -347,6 +364,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);
--
2.17.1
- [Qemu-devel] [PATCH 00/15] IPMI updates for 4.3, minyard, 2019/08/19
- [Qemu-devel] [PATCH 04/15] tests:ipmi: Fix IPMI BT tests, minyard, 2019/08/19
- [Qemu-devel] [PATCH 06/15] ipmi: Add a UUID device property, minyard, 2019/08/19
- [Qemu-devel] [PATCH 03/15] ipmi: Generate an interrupt on watchdog pretimeout expiry, minyard, 2019/08/19
- [Qemu-devel] [PATCH 10/15] smbios:ipmi: Ignore IPMI devices with no fwinfo function, minyard, 2019/08/19
- [Qemu-devel] [PATCH 02/15] ipmi: Fix the get watchdog command, minyard, 2019/08/19
- [Qemu-devel] [PATCH 01/15] ipmi: Fix watchdog NMI handling, minyard, 2019/08/19
- [Qemu-devel] [PATCH 13/15] acpi: Add i2c serial bus CRS handling,
minyard <=
- [Qemu-devel] [PATCH 05/15] qdev: Add a no default uuid property, minyard, 2019/08/19
- [Qemu-devel] [PATCH 07/15] ipmi: Split out KCS-specific code from ISA KCS code, minyard, 2019/08/19
- [Qemu-devel] [PATCH 11/15] ipmi: Add PCI IPMI interfaces, minyard, 2019/08/19
- [Qemu-devel] [PATCH 09/15] ipmi: Allow a size value to be passed for I/O space, minyard, 2019/08/19
- [Qemu-devel] [PATCH 15/15] pc: Add an SMB0 ACPI device to q35, minyard, 2019/08/19
- [Qemu-devel] [PATCH 14/15] ipmi: Fix SSIF ACPI handling to use the right CRS, minyard, 2019/08/19
- [Qemu-devel] [PATCH 08/15] ipmi: Split out BT-specific code from ISA BT code, minyard, 2019/08/19
- [Qemu-devel] [PATCH 12/15] ipmi: Add an SMBus IPMI interface, minyard, 2019/08/19