diff options
| author | Kevin Chiu <Kevin.Chiu@quantatw.com> | 2018-07-03 19:13:34 +0800 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2018-07-03 14:19:34 +0000 |
| commit | d837e660074e0621d63f59515f933c209441b653 (patch) | |
| tree | 85e25e8d74bc0dc8d443eeaf85da1125e5868bdb | |
| parent | 0be6cee817d69fa32230405bc1eb70b6505ab88a (diff) | |
soc/amd/stoneyridge: correct GPIO emission error in ACPI
It can not emit byte data without BytePrefix.
design to:
Or (Local5, GPIO_PIN_OUT, Local5)
error due to GPIO_PIN_OUT is 0x40 but 0x40 encoding means
nothing in AML spec.
so it will include next emitted string in Or:
Or (Local5, Local5, \_SB.GPW2)
fix:
Store (0x40, Local0)
Or (Local5, Local0, Local5)
BUG=b:110962003
BRANCH=master
TEST=emerge-grunt coreboot
extract SSDT then check ACPI syntax is correct
Change-Id: I7a0704112b77105826de87b14a38ed2f665224d5
Signed-off-by: Kevin Chiu <Kevin.Chiu@quantatw.com>
Reviewed-on: https://review.coreboot.org/27306
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
| -rw-r--r-- | src/soc/amd/stoneyridge/acpi.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/soc/amd/stoneyridge/acpi.c b/src/soc/amd/stoneyridge/acpi.c index 8130b79c2c..5f9e792df7 100644 --- a/src/soc/amd/stoneyridge/acpi.c +++ b/src/soc/amd/stoneyridge/acpi.c @@ -357,14 +357,19 @@ static int acpigen_soc_set_gpio_val(unsigned int gpio_num, uint32_t val) } uintptr_t addr = (uintptr_t) gpio_get_address(gpio_num); + /* Store (0x40, Local0) */ + acpigen_write_store(); + acpigen_write_integer(GPIO_PIN_OUT); + acpigen_emit_byte(LOCAL0_OP); + acpigen_soc_get_gpio_in_local5(addr); if (val) { /* Or (Local5, GPIO_PIN_OUT, Local5) */ - acpigen_write_or(LOCAL5_OP, GPIO_PIN_OUT, LOCAL5_OP); + acpigen_write_or(LOCAL5_OP, LOCAL0_OP, LOCAL5_OP); } else { /* Not (GPIO_PIN_OUT, Local6) */ - acpigen_write_not(GPIO_PIN_OUT, LOCAL6_OP); + acpigen_write_not(LOCAL0_OP, LOCAL6_OP); /* And (Local5, Local6, Local5) */ acpigen_write_and(LOCAL5_OP, LOCAL6_OP, LOCAL5_OP); |