diff options
| author | Joel Kitching <kitching@google.com> | 2020-03-09 15:11:55 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-03-11 08:42:32 +0000 |
| commit | 46ff62c31c1d815196fa990e613e1e6e229f8ce2 (patch) | |
| tree | eea2b911df6317d161d725d53e4673778d9d5c7a | |
| parent | bb6c23472a0fd0565b3991331b63a4ed319d7872 (diff) | |
| download | vboot-46ff62c31c1d815196fa990e613e1e6e229f8ce2.tar.gz | |
vboot: stop reading from ACPI for wpsw_boot
Stop reading wpsw_boot value from ACPI as fallback for
wpsw_cur. wpsw_cur is available on all non-EOL'd devices.
BUG=b:124141368, chromium:950273, chromium:1059670
TEST=make clean && make runtests
BRANCH=none
Change-Id: I9c6f21b9f341a61e85db3e6e45b553b1ab4293e3
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2094807
Reviewed-by: Julius Werner <jwerner@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
| -rw-r--r-- | host/arch/x86/lib/crossystem_arch.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/host/arch/x86/lib/crossystem_arch.c b/host/arch/x86/lib/crossystem_arch.c index 9213ccea..a57fcde5 100644 --- a/host/arch/x86/lib/crossystem_arch.c +++ b/host/arch/x86/lib/crossystem_arch.c @@ -56,7 +56,6 @@ #define CHSW_RECOVERY_BOOT 0x00000002 #define CHSW_RECOVERY_EC_BOOT 0x00000004 #define CHSW_DEV_BOOT 0x00000020 -#define CHSW_WP_BOOT 0x00000200 /* CMOS reboot field bitflags */ #define CMOSRF_RECOVERY 0x80 #define CMOSRF_DEBUG_RESET 0x40 @@ -803,9 +802,6 @@ int VbGetArchPropertyInt(const char* name) value = ReadGpio(GPIO_SIGNAL_TYPE_RECOVERY); } else if (!strcasecmp(name,"wpsw_cur")) { value = ReadGpio(GPIO_SIGNAL_TYPE_WP); - /* Use "write-protect at boot" as a fallback value. */ - if (value == -1) - value = ReadFileBit(ACPI_CHSW_PATH, CHSW_WP_BOOT); } else if (!strcasecmp(name,"recoverysw_ec_boot")) { value = ReadFileBit(ACPI_CHSW_PATH, CHSW_RECOVERY_EC_BOOT); } else if (!strcasecmp(name,"phase_enforcement")) { |