diff options
| author | Bin Meng <bmeng.cn@gmail.com> | 2017-04-21 14:24:42 (GMT) |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2017-05-17 09:11:46 (GMT) |
| commit | b208d1915f1bdba93678b51b87ae214d9e2ca7a3 (patch) | |
| tree | f515afa2d71b7780f69c239dcae56f15595c1740 | |
| parent | bffd798136deb4622059b5aeb33c375fad554ac7 (diff) | |
| download | u-boot-b208d1915f1bdba93678b51b87ae214d9e2ca7a3.tar.xz | |
x86: apci: Change PM1_CNT register access to RMW
In enter_acpi_mode() PM1_CNT register is changed to PM1_CNT_SCI_EN
directly without preserving its previous value. Update to change
the register access to read-modify-write (RMW).
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Stefan Roese <sr@denx.de>
| -rw-r--r-- | arch/x86/lib/acpi_table.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c index f118345..8be8120 100644 --- a/arch/x86/lib/acpi_table.c +++ b/arch/x86/lib/acpi_table.c @@ -306,6 +306,8 @@ static void acpi_create_mcfg(struct acpi_mcfg *mcfg) static void enter_acpi_mode(int pm1_cnt) { + u16 val = inw(pm1_cnt); + /* * PM1_CNT register bit0 selects the power management event to be * either an SCI or SMI interrupt. When this bit is set, then power @@ -320,7 +322,7 @@ static void enter_acpi_mode(int pm1_cnt) * system, and expose ourselves to OSPM as working under ACPI mode * already, turn this bit on. */ - outw(PM1_CNT_SCI_EN, pm1_cnt); + outw(val | PM1_CNT_SCI_EN, pm1_cnt); } /* |