diff options
| author | Bill XIE <persmule@hardenedlinux.org> | 2020-02-24 23:08:35 +0800 |
|---|---|---|
| committer | Philipp Deppenwiese <zaolin.daisuki@gmail.com> | 2020-03-31 10:38:07 +0000 |
| commit | 516c0a53384188f00b5df139b0840567dc8b8298 (patch) | |
| tree | 787842ee7a72df3211f3497eb2a2ec370b7c8c13 /src/soc/intel | |
| parent | bad08c2c29210530e584436a562a1c03a68eb693 (diff) | |
security/vboot: relocate and rename vboot_platform_is_resuming()
After measured boot is decoupled from verified boot in CB:35077,
vboot_platform_is_resuming() is never vboot-specific, thus it is
renamed to platform_is_resuming() and declared in bootmode.h.
Change-Id: I29b5b88af0576c34c10cfbd99659a5cdc0c75842
Signed-off-by: Bill XIE <persmule@hardenedlinux.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39103
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'src/soc/intel')
| -rw-r--r-- | src/soc/intel/baytrail/pmutil.c | 4 | ||||
| -rw-r--r-- | src/soc/intel/braswell/pmutil.c | 4 | ||||
| -rw-r--r-- | src/soc/intel/broadwell/pmutil.c | 4 | ||||
| -rw-r--r-- | src/soc/intel/common/block/pmc/pmclib.c | 6 |
4 files changed, 10 insertions, 8 deletions
diff --git a/src/soc/intel/baytrail/pmutil.c b/src/soc/intel/baytrail/pmutil.c index 9e032cebfb..f0abcee7d8 100644 --- a/src/soc/intel/baytrail/pmutil.c +++ b/src/soc/intel/baytrail/pmutil.c @@ -15,6 +15,7 @@ #include <stdint.h> #include <arch/acpi.h> #include <arch/io.h> +#include <bootmode.h> #include <device/device.h> #include <device/mmio.h> #include <device/pci.h> @@ -27,7 +28,6 @@ #include <soc/pci_devs.h> #include <soc/pmc.h> #include <security/vboot/vbnv.h> -#include <security/vboot/vboot_common.h> #if defined(__SIMPLE_DEVICE__) @@ -387,7 +387,7 @@ int vbnv_cmos_failed(void) return rtc_failure(); } -int vboot_platform_is_resuming(void) +int platform_is_resuming(void) { if (!(inw(ACPI_BASE_ADDRESS + PM1_STS) & WAK_STS)) return 0; diff --git a/src/soc/intel/braswell/pmutil.c b/src/soc/intel/braswell/pmutil.c index 9c5079f8ed..016c45cccc 100644 --- a/src/soc/intel/braswell/pmutil.c +++ b/src/soc/intel/braswell/pmutil.c @@ -15,6 +15,7 @@ #include <arch/acpi.h> #include <arch/io.h> #include <assert.h> +#include <bootmode.h> #include <device/device.h> #include <device/mmio.h> #include <device/pci.h> @@ -26,7 +27,6 @@ #include <soc/pm.h> #include <stdint.h> #include <security/vboot/vbnv.h> -#include <security/vboot/vboot_common.h> #if defined(__SIMPLE_DEVICE__) @@ -380,7 +380,7 @@ int vbnv_cmos_failed(void) return rtc_failure(); } -int vboot_platform_is_resuming(void) +int platform_is_resuming(void) { if (!(inw(ACPI_BASE_ADDRESS + PM1_STS) & WAK_STS)) return 0; diff --git a/src/soc/intel/broadwell/pmutil.c b/src/soc/intel/broadwell/pmutil.c index 172d8cda20..b170ff27d7 100644 --- a/src/soc/intel/broadwell/pmutil.c +++ b/src/soc/intel/broadwell/pmutil.c @@ -19,6 +19,7 @@ #include <arch/acpi.h> #include <arch/io.h> +#include <bootmode.h> #include <device/pci_ops.h> #include <device/device.h> #include <device/pci.h> @@ -30,7 +31,6 @@ #include <soc/pm.h> #include <soc/gpio.h> #include <security/vboot/vbnv.h> -#include <security/vboot/vboot_common.h> /* Print status bits with descriptive names */ static void print_status_bits(u32 status, const char *bit_names[]) @@ -450,7 +450,7 @@ int acpi_sci_irq(void) return sci_irq; } -int vboot_platform_is_resuming(void) +int platform_is_resuming(void) { if (!(inw(ACPI_BASE_ADDRESS + PM1_STS) & WAK_STS)) return 0; diff --git a/src/soc/intel/common/block/pmc/pmclib.c b/src/soc/intel/common/block/pmc/pmclib.c index d03348adec..47a4ed9f78 100644 --- a/src/soc/intel/common/block/pmc/pmclib.c +++ b/src/soc/intel/common/block/pmc/pmclib.c @@ -13,6 +13,7 @@ */ #include <arch/io.h> +#include <bootmode.h> #include <device/mmio.h> #include <cbmem.h> #include <console/console.h> @@ -21,11 +22,12 @@ #include <intelblocks/gpio.h> #include <intelblocks/tco.h> #include <option.h> +#include <pc80/mc146818rtc.h> +#include <security/vboot/vboot_common.h> #include <soc/pm.h> #include <stdint.h> #include <string.h> #include <timer.h> -#include <security/vboot/vboot_common.h> static struct chipset_power_state power_state; @@ -440,7 +442,7 @@ void pmc_global_reset_enable(bool enable) } #endif // CONFIG_PMC_GLOBAL_RESET_ENABLE_LOCK -int vboot_platform_is_resuming(void) +int platform_is_resuming(void) { if (!(inw(ACPI_BASE_ADDRESS + PM1_STS) & WAK_STS)) return 0; |