summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorElyes HAOUAS <ehaouas@noos.fr>2019-03-03 12:49:56 +0100
committerNico Huber <nico.h@gmx.de>2019-03-04 13:16:29 +0000
commit8ee161daab28a8c9bcd19418d968bb95fc47a190 (patch)
treee49f75a3f221d2962fc7ed42badd098b8904debb /src/arch
parent44206e38bf6e3ddd6a628ceab0c2c982ca6660b3 (diff)
arch/x86/acpi: Remove obsolete acpi_gen_regaddr resv field
Since ACPI v2.c, this field is access_size. Currently, coreboot is using ACPI v3,so we can drop '.resv' field. Change-Id: I7b3b930861669bb05cdc8e81f6502476a0568fe0 Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr> Reviewed-on: https://review.coreboot.org/c/31701 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/x86/acpigen.c16
-rw-r--r--src/arch/x86/include/arch/acpi.h5
2 files changed, 8 insertions, 13 deletions
diff --git a/src/arch/x86/acpigen.c b/src/arch/x86/acpigen.c
index 0eacf05d8e..3f9f99422d 100644
--- a/src/arch/x86/acpigen.c
+++ b/src/arch/x86/acpigen.c
@@ -580,14 +580,12 @@ void acpigen_write_empty_PTC(void)
})
*/
acpi_addr_t addr = {
- .space_id = ACPI_ADDRESS_SPACE_FIXED,
- .bit_width = 0,
- .bit_offset = 0,
- {
- .resv = 0
- },
- .addrl = 0,
- .addrh = 0,
+ .space_id = ACPI_ADDRESS_SPACE_FIXED,
+ .bit_width = 0,
+ .bit_offset = 0,
+ .access_size = 0,
+ .addrl = 0,
+ .addrh = 0,
};
acpigen_write_name("_PTC");
@@ -845,7 +843,7 @@ static void acpigen_write_register(const acpi_addr_t *addr)
acpigen_emit_byte(addr->space_id); /* Address Space ID */
acpigen_emit_byte(addr->bit_width); /* Register Bit Width */
acpigen_emit_byte(addr->bit_offset); /* Register Bit Offset */
- acpigen_emit_byte(addr->resv); /* Register Access Size */
+ acpigen_emit_byte(addr->access_size); /* Register Access Size */
acpigen_emit_dword(addr->addrl); /* Register Address Low */
acpigen_emit_dword(addr->addrh); /* Register Address High */
}
diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h
index b3a5ce796a..63f3045ee0 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -103,10 +103,7 @@ typedef struct acpi_gen_regaddr {
u8 space_id; /* Address space ID */
u8 bit_width; /* Register size in bits */
u8 bit_offset; /* Register bit offset */
- union {
- u8 resv; /* Reserved in ACPI 2.0 - 2.0b */
- u8 access_size; /* Access size since ACPI 2.0c */
- };
+ u8 access_size; /* Access size since ACPI 2.0c */
u32 addrl; /* Register address, low 32 bits */
u32 addrh; /* Register address, high 32 bits */
} __packed acpi_addr_t;