diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2016-07-13 13:01:13 -0500 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2016-07-15 08:30:31 +0200 |
| commit | 30b0c7adf0a5d77a8e902dbbf0ee68954bf28385 (patch) | |
| tree | cd13a5a401a9a4698aa3e7601f1fd91567a0269a /src/mainboard/google/chell | |
| parent | 95c4344a2092bd9fd5eca74d23d0c270628f66d2 (diff) | |
mainboards: align on using ACPI_Sx definitions
The mainboard_smi_sleep() function takes ACPI sleep values
of the form S3=3, S4=4, S5=5, etc. All the chipsets ensure
that whatever hardware PM1 control register values are used
the interface to the mainboard is the same. Move all the
SMI handlers in the mainboard directory to not open code
the literal values 3 and 5 for ACPI_S3 and ACPI_S5.
There were a few notable exceptions where the code was
attempting to use the hardware values and not the common
translated values. The few users of SLEEP_STATE_X were
updated to align with ACPI_SX as those defines are
already equal. The removal of SLEEP_STATE_X defines is
forthcoming in a subsequent patch.
BUG=chrome-os-partner:54977
Change-Id: I76592c9107778cce5995e5af764760453f54dc50
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/15664
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Diffstat (limited to 'src/mainboard/google/chell')
| -rw-r--r-- | src/mainboard/google/chell/romstage.c | 3 | ||||
| -rw-r--r-- | src/mainboard/google/chell/smihandler.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/mainboard/google/chell/romstage.c b/src/mainboard/google/chell/romstage.c index 65c095dd65..5360da683c 100644 --- a/src/mainboard/google/chell/romstage.c +++ b/src/mainboard/google/chell/romstage.c @@ -16,6 +16,7 @@ */ #include <string.h> +#include <arch/acpi.h> #include <ec/google/chromeec/ec.h> #include <soc/pei_data.h> #include <soc/pei_wrapper.h> @@ -25,7 +26,7 @@ void mainboard_romstage_entry(struct romstage_params *params) { /* Turn on keyboard backlight to indicate we are booting */ - if (params->power_state->prev_sleep_state != SLEEP_STATE_S3) + if (params->power_state->prev_sleep_state != ACPI_S3) google_chromeec_kbbacklight(25); /* Fill out PEI DATA */ diff --git a/src/mainboard/google/chell/smihandler.c b/src/mainboard/google/chell/smihandler.c index cd0cc19a35..ff98b367d5 100644 --- a/src/mainboard/google/chell/smihandler.c +++ b/src/mainboard/google/chell/smihandler.c @@ -14,6 +14,7 @@ * GNU General Public License for more details. */ +#include <arch/acpi.h> #include <arch/io.h> #include <console/console.h> #include <cpu/x86/smm.h> @@ -84,11 +85,11 @@ void mainboard_smi_gpi_handler(const struct gpi_status *sts) static void google_ec_smi_sleep(u8 slp_typ) { switch (slp_typ) { - case 3: + case ACPI_S3: /* Enable wake events */ google_chromeec_set_wake_mask(MAINBOARD_EC_S3_WAKE_EVENTS); break; - case 5: + case ACPI_S5: /* Enable wake events */ google_chromeec_set_wake_mask(MAINBOARD_EC_S5_WAKE_EVENTS); break; |