Patrick Georgi merged this change.

View Change

Approvals:
  build bot (Jenkins): Verified
  Lijian Zhao: Looks good to me, approved

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>
---
M src/arch/x86/acpi_device.c
M src/arch/x86/include/arch/acpi_device.h
2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/arch/x86/acpi_device.c b/src/arch/x86/acpi_device.c
index c57ba48..5d8777f 100644
--- a/src/arch/x86/acpi_device.c
+++ b/src/arch/x86/acpi_device.c
@@ -377,7 +377,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 d26f330..3569546 100644
--- a/src/arch/x86/include/arch/acpi_device.h
+++ b/src/arch/x86/include/arch/acpi_device.h
@@ -309,9 +309,12 @@
  * 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

To view, visit change 32329. To unsubscribe, or for help writing mail filters, visit settings.