summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorElyes HAOUAS <ehaouas@noos.fr>2019-04-16 08:12:10 +0200
committerPatrick Georgi <pgeorgi@google.com>2019-04-23 10:06:35 +0000
commit34564ed154b6734cc51bf05d61b45d9a74cdc2b5 (patch)
tree064c5680530d37c6bd7d56bb1091af6631562db4 /src/arch
parentda9302a2c42038594ed0127b8887c7d984cd65e1 (diff)
downloadcoreboot-34564ed154b6734cc51bf05d61b45d9a74cdc2b5.tar.xz
ACPI: Clarify serial bus revision and specific revision
Serial bus revision [Byte 3] and serial bus specific revision [Byte 9] are not the same. Change-Id: I366f62e6aa0e9c0dfbc1ec17adeebc42a0e777eb Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr> Reviewed-on: https://review.coreboot.org/c/coreboot/+/32329 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Lijian Zhao <lijian.zhao@intel.com>
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/x86/acpi_device.c8
-rw-r--r--src/arch/x86/include/arch/acpi_device.h9
2 files changed, 10 insertions, 7 deletions
diff --git a/src/arch/x86/acpi_device.c b/src/arch/x86/acpi_device.c
index c57ba48094..5d8777f37f 100644
--- a/src/arch/x86/acpi_device.c
+++ b/src/arch/x86/acpi_device.c
@@ -377,7 +377,7 @@ void acpi_device_write_i2c(const struct acpi_i2c *i2c)
desc_length = acpi_device_write_zero_len();
/* Byte 3: Revision ID */
- acpigen_emit_byte(ACPI_SERIAL_BUS_REVISION_ID);
+ acpigen_emit_byte(ACPI_I2C_SERIAL_BUS_REVISION_ID);
/* Byte 4: Resource Source Index is Reserved */
acpigen_emit_byte(0);
@@ -401,7 +401,7 @@ void acpi_device_write_i2c(const struct acpi_i2c *i2c)
acpigen_emit_word(i2c->mode_10bit);
/* Byte 9: Type Specific Revision ID */
- acpigen_emit_byte(ACPI_SERIAL_BUS_REVISION_ID);
+ acpigen_emit_byte(ACPI_I2C_TYPE_SPECIFIC_REVISION_ID);
/* Byte 10-11: I2C Type Data Length */
type_length = acpi_device_write_zero_len();
@@ -435,7 +435,7 @@ void acpi_device_write_spi(const struct acpi_spi *spi)
desc_length = acpi_device_write_zero_len();
/* Byte 3: Revision ID */
- acpigen_emit_byte(ACPI_SERIAL_BUS_REVISION_ID);
+ acpigen_emit_byte(ACPI_SPI_SERIAL_BUS_REVISION_ID);
/* Byte 4: Resource Source Index is Reserved */
acpigen_emit_byte(0);
@@ -464,7 +464,7 @@ void acpi_device_write_spi(const struct acpi_spi *spi)
acpigen_emit_word(flags);
/* Byte 9: Type Specific Revision ID */
- acpigen_emit_byte(ACPI_SERIAL_BUS_REVISION_ID);
+ acpigen_emit_byte(ACPI_SPI_TYPE_SPECIFIC_REVISION_ID);
/* Byte 10-11: SPI Type Data Length */
type_length = acpi_device_write_zero_len();
diff --git a/src/arch/x86/include/arch/acpi_device.h b/src/arch/x86/include/arch/acpi_device.h
index d26f330695..35695467cb 100644
--- a/src/arch/x86/include/arch/acpi_device.h
+++ b/src/arch/x86/include/arch/acpi_device.h
@@ -309,9 +309,12 @@ void acpi_device_write_gpio(const struct acpi_gpio *gpio);
* ACPI Descriptors for Serial Bus interfaces
*/
-#define ACPI_SERIAL_BUS_TYPE_I2C 1
-#define ACPI_SERIAL_BUS_TYPE_SPI 2
-#define ACPI_SERIAL_BUS_REVISION_ID 1
+#define ACPI_SERIAL_BUS_TYPE_I2C 1
+#define ACPI_SERIAL_BUS_TYPE_SPI 2
+#define ACPI_I2C_SERIAL_BUS_REVISION_ID 1 /* TODO: upgrade to 2 */
+#define ACPI_I2C_TYPE_SPECIFIC_REVISION_ID 1
+#define ACPI_SPI_SERIAL_BUS_REVISION_ID 1
+#define ACPI_SPI_TYPE_SPECIFIC_REVISION_ID 1
/*
* ACPI I2C Bus