diff options
| author | Jakub Czapiga <jacz@semihalf.com> | 2021-02-19 11:44:22 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2021-03-22 11:21:55 +0000 |
| commit | 61fcb7e9654634cfe0c8a7bf56581fb54d943bd8 (patch) | |
| tree | b65b1a743c85294bc37e1ca7fe8160eeab741073 /src/soc | |
| parent | 7f4c30c1d5c16539faf564d38ebbc695bca8836a (diff) | |
acpi/acpigen.h: Add more intuitive AML package closing functions
Until now every AML package had to be closed using acpigen_pop_len().
This commit introduces set of package closing functions corresponding
with their opening function names. For example acpigen_write_if()
opens if-statement package, acpigen_write_if_end() closes it.
Now acpigen_write_else() closes previously opened acpigen_write_if(),
so acpigen_pop_len() is not required before it.
Signed-off-by: Jakub Czapiga <jacz@semihalf.com>
Change-Id: Icfdc3804cd93bde049cd11dec98758b3a639eafd
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50910
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Lance Zhao
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/amd/common/block/graphics/graphics.c | 2 | ||||
| -rw-r--r-- | src/soc/amd/picasso/pcie_gpp.c | 1 | ||||
| -rw-r--r-- | src/soc/amd/picasso/root_complex.c | 2 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/acpi.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/apollolake/acpi.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/common/block/pcie/rtd3/rtd3.c | 1 |
6 files changed, 0 insertions, 10 deletions
diff --git a/src/soc/amd/common/block/graphics/graphics.c b/src/soc/amd/common/block/graphics/graphics.c index 942a8034af..82b437b155 100644 --- a/src/soc/amd/common/block/graphics/graphics.c +++ b/src/soc/amd/common/block/graphics/graphics.c @@ -76,7 +76,6 @@ static void generate_atif(const struct device *dev) /* Return (Buffer (0x0C) { ... } */ acpigen_write_return_byte_buffer((uint8_t *)(void *)&verify_output, sizeof(verify_output)); - acpigen_pop_len(); /* if (LEqual(Local0, 0) */ /* ElseIf ((Local0 == 0x10)) */ acpigen_write_else(); @@ -92,7 +91,6 @@ static void generate_atif(const struct device *dev) /* Return (Buffer (0x0A) { ... } */ acpigen_write_return_byte_buffer((uint8_t *)(void *)&brightness_out, sizeof(brightness_out)); - acpigen_pop_len(); /* if (LEqual(Local2, ATIF_QBTC_REQUEST_LCD1) */ /* Else */ acpigen_write_else(); /* Return (Buffer (0x0A) */ diff --git a/src/soc/amd/picasso/pcie_gpp.c b/src/soc/amd/picasso/pcie_gpp.c index baa9fa3d29..582e1287b7 100644 --- a/src/soc/amd/picasso/pcie_gpp.c +++ b/src/soc/amd/picasso/pcie_gpp.c @@ -149,7 +149,6 @@ static void acpigen_write_PRT(const struct device *dev) acpigen_pop_len(); } acpigen_pop_len(); /* Package - APIC Routing */ - acpigen_pop_len(); /* End If */ /* Else */ acpigen_write_else(); diff --git a/src/soc/amd/picasso/root_complex.c b/src/soc/amd/picasso/root_complex.c index c954701f74..292ee20af8 100644 --- a/src/soc/amd/picasso/root_complex.c +++ b/src/soc/amd/picasso/root_complex.c @@ -228,8 +228,6 @@ static void acipgen_dptci(void) dptc_call_alib("TABB", (uint8_t *)(void *)&tablet_mode_input, sizeof(tablet_mode_input)); - acpigen_pop_len(); /* If */ - /* Else */ acpigen_write_else(); diff --git a/src/soc/amd/stoneyridge/acpi.c b/src/soc/amd/stoneyridge/acpi.c index 8b97ace47e..de79ec36be 100644 --- a/src/soc/amd/stoneyridge/acpi.c +++ b/src/soc/amd/stoneyridge/acpi.c @@ -187,8 +187,6 @@ static int acpigen_soc_get_gpio_val(unsigned int gpio_num, uint32_t mask) /* Store (One, Local0) */ acpigen_write_store_ops(ONE_OP, LOCAL0_OP); - acpigen_pop_len(); /* If */ - /* Else */ acpigen_write_else(); diff --git a/src/soc/intel/apollolake/acpi.c b/src/soc/intel/apollolake/acpi.c index 219ea95f4a..34f760ff42 100644 --- a/src/soc/intel/apollolake/acpi.c +++ b/src/soc/intel/apollolake/acpi.c @@ -255,8 +255,6 @@ static int acpigen_soc_get_gpio_val(unsigned int gpio_num, uint32_t mask) /* Store (One, Local0) */ acpigen_write_store_ops(ONE_OP, LOCAL0_OP); - acpigen_pop_len(); /* If */ - /* Else */ acpigen_write_else(); diff --git a/src/soc/intel/common/block/pcie/rtd3/rtd3.c b/src/soc/intel/common/block/pcie/rtd3/rtd3.c index be412e7967..5a04333499 100644 --- a/src/soc/intel/common/block/pcie/rtd3/rtd3.c +++ b/src/soc/intel/common/block/pcie/rtd3/rtd3.c @@ -158,7 +158,6 @@ pcie_rtd3_acpi_method_status(int pcie_rp, acpigen_write_if_lequal_op_op(LOCAL0_OP, LOCAL1_OP); acpigen_write_return_op(ZERO_OP); - acpigen_pop_len(); /* If */ acpigen_write_else(); acpigen_write_return_op(ONE_OP); acpigen_pop_len(); /* Else */ |