diff options
author | Joel Kitching <kitching@google.com> | 2019-04-30 16:18:41 +0800 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2019-05-14 20:13:17 -0700 |
commit | 552c1759b5d64e2843755e51ca5ea3961f2cfb7a (patch) | |
tree | 1fa008a949aebea6ed39420afd9f2c8ec10ed2f8 | |
parent | 52fa8c11f8e5217e17da74c04e8ad1e5aee9ff40 (diff) | |
download | vboot-552c1759b5d64e2843755e51ca5ea3961f2cfb7a.tar.gz |
vboot: deprecate Alt OS code
BUG=b:124141368, b:131663912
TEST=make clean && make runtests
BRANCH=none
Change-Id: I6aae5683b8306eede4388ff5ed6665e7769756dc
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1588026
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Ting Shen <phoenixshen@chromium.org>
-rw-r--r-- | firmware/2lib/2nvstorage.c | 22 | ||||
-rw-r--r-- | firmware/2lib/include/2nvstorage.h | 8 | ||||
-rw-r--r-- | firmware/2lib/include/2nvstorage_fields.h | 4 | ||||
-rw-r--r-- | firmware/include/vboot_api.h | 5 | ||||
-rw-r--r-- | firmware/include/vboot_struct.h | 4 | ||||
-rw-r--r-- | host/lib/crossystem.c | 13 | ||||
-rw-r--r-- | tests/vb2_nvstorage_tests.c | 2 |
7 files changed, 18 insertions, 40 deletions
diff --git a/firmware/2lib/2nvstorage.c b/firmware/2lib/2nvstorage.c index b4e99ece..b1669d09 100644 --- a/firmware/2lib/2nvstorage.c +++ b/firmware/2lib/2nvstorage.c @@ -222,15 +222,13 @@ uint32_t vb2_nv_get(struct vb2_context *ctx, enum vb2_nv_param param) | (p[VB2_NV_OFFS_FW_MAX_ROLLFORWARD3] << 16) | (p[VB2_NV_OFFS_FW_MAX_ROLLFORWARD4] << 24)); - case VB2_NV_ENABLE_ALT_OS_REQUEST: - return GETBIT(VB2_NV_OFFS_MISC, VB2_NV_MISC_ENABLE_ALT_OS); - - case VB2_NV_DISABLE_ALT_OS_REQUEST: - return GETBIT(VB2_NV_OFFS_MISC, VB2_NV_MISC_DISABLE_ALT_OS); - case VB2_NV_POST_EC_SYNC_DELAY: return GETBIT(VB2_NV_OFFS_MISC, VB2_NV_MISC_POST_EC_SYNC_DELAY); + + case VB2_NV_DEPRECATED_ENABLE_ALT_OS_REQUEST: + case VB2_NV_DEPRECATED_DISABLE_ALT_OS_REQUEST: + return 0; } /* @@ -437,17 +435,13 @@ void vb2_nv_set(struct vb2_context *ctx, p[VB2_NV_OFFS_FW_MAX_ROLLFORWARD4] = (uint8_t)(value >> 24); break; - case VB2_NV_ENABLE_ALT_OS_REQUEST: - SETBIT(VB2_NV_OFFS_MISC, VB2_NV_MISC_ENABLE_ALT_OS); - break; - - case VB2_NV_DISABLE_ALT_OS_REQUEST: - SETBIT(VB2_NV_OFFS_MISC, VB2_NV_MISC_DISABLE_ALT_OS); - break; - case VB2_NV_POST_EC_SYNC_DELAY: SETBIT(VB2_NV_OFFS_MISC, VB2_NV_MISC_POST_EC_SYNC_DELAY); break; + + case VB2_NV_DEPRECATED_ENABLE_ALT_OS_REQUEST: + case VB2_NV_DEPRECATED_DISABLE_ALT_OS_REQUEST: + return; } /* diff --git a/firmware/2lib/include/2nvstorage.h b/firmware/2lib/include/2nvstorage.h index 38904289..c9524a19 100644 --- a/firmware/2lib/include/2nvstorage.h +++ b/firmware/2lib/include/2nvstorage.h @@ -115,10 +115,10 @@ enum vb2_nv_param { * VB2_MAX_ROLLFORWARD_MAX_V1_DEFAULT for V1. */ VB2_NV_FW_MAX_ROLLFORWARD, - /* Enable AltOS Mode on next boot. */ - VB2_NV_ENABLE_ALT_OS_REQUEST, - /* Disable AltOS Mode on next boot. */ - VB2_NV_DISABLE_ALT_OS_REQUEST, + /* Deprecated: Enable AltOS Mode on next boot. */ + VB2_NV_DEPRECATED_ENABLE_ALT_OS_REQUEST, + /* Deprecated: Disable AltOS Mode on next boot. */ + VB2_NV_DEPRECATED_DISABLE_ALT_OS_REQUEST, /* * Add a short delay after EC software sync for any interaction * with EC-RW (persistent). Currently used on eve for programmatically diff --git a/firmware/2lib/include/2nvstorage_fields.h b/firmware/2lib/include/2nvstorage_fields.h index f9cd7dc3..f8e3693a 100644 --- a/firmware/2lib/include/2nvstorage_fields.h +++ b/firmware/2lib/include/2nvstorage_fields.h @@ -107,8 +107,8 @@ enum vb2_nv_offset { #define VB2_NV_MISC_BOOT_ON_AC_DETECT 0x02 #define VB2_NV_MISC_TRY_RO_SYNC 0x04 #define VB2_NV_MISC_BATTERY_CUTOFF 0x08 -#define VB2_NV_MISC_ENABLE_ALT_OS 0x10 -#define VB2_NV_MISC_DISABLE_ALT_OS 0x20 +#define VB2_NV_MISC_DEPRECATED_ENABLE_ALT_OS 0x10 +#define VB2_NV_MISC_DEPRECATED_DISABLE_ALT_OS 0x20 #define VB2_NV_MISC_POST_EC_SYNC_DELAY 0x40 #endif /* VBOOT_REFERENCE_VBOOT_2NVSTORAGE_FIELDS_H_ */ diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h index 66e26ef0..682e7fc5 100644 --- a/firmware/include/vboot_api.h +++ b/firmware/include/vboot_api.h @@ -139,7 +139,7 @@ enum VbErrorPredefined_t { /* Peripheral busy. Cannot upgrade firmware at present. */ VBERROR_PERIPHERAL_BUSY = 0x10030, /* Error reading or writing Alt OS flags to TPM */ - VBERROR_TPM_ALT_OS = 0x10031, + VBERROR_DEPRECATED_TPM_ALT_OS = 0x10031, /* Error writing VPD */ VBERROR_VPD_WRITE = 0x10032, @@ -682,8 +682,7 @@ enum VbScreenType_t { VB_SCREEN_LANGUAGES_MENU = 0x20f, /* Detachable Menu - Options */ VB_SCREEN_OPTIONS_MENU = 0x210, - /* Alt OS picker screen */ - VB_SCREEN_ALT_OS = 0x211, + /* REMOVED: Alt OS picker screen (0x211) */ /* Alt firmware picker screen (for keyboard UI) */ VB_SCREEN_ALT_FW_PICK = 0x212, /* Alt firmware menu screen (for detachable UI ) */ diff --git a/firmware/include/vboot_struct.h b/firmware/include/vboot_struct.h index a4c5bedd..9c8a3587 100644 --- a/firmware/include/vboot_struct.h +++ b/firmware/include/vboot_struct.h @@ -254,9 +254,9 @@ typedef struct VbKernelPreambleHeader { /* NvStorage uses 64-byte record, not 16-byte */ #define VBSD_NVDATA_V2 0x00100000 /* Confirm enabling Alt OS for this boot */ -#define VBSD_ALT_OS_CONFIRM_ENABLE 0x00200000 +#define VBSD_DEPRECATED_ALT_OS_CONFIRM_ENABLE 0x00200000 /* Show Alt OS picker screen for this boot */ -#define VBSD_ALT_OS_SHOW_PICKER 0x00400000 +#define VBSD_DEPRECATED_ALT_OS_SHOW_PICKER 0x00400000 /* * Supported flags by header version. It's ok to add new flags while keeping diff --git a/host/lib/crossystem.c b/host/lib/crossystem.c index 34ac9724..994d4796 100644 --- a/host/lib/crossystem.c +++ b/host/lib/crossystem.c @@ -570,17 +570,8 @@ int VbGetSystemPropertyInt(const char *name) } else { value = 0; } - } else if (!strcasecmp(name, "enable_alt_os_request")) { - value = vb2_get_nv_storage(VB2_NV_ENABLE_ALT_OS_REQUEST); - } else if (!strcasecmp(name, "disable_alt_os_request")) { - value = vb2_get_nv_storage(VB2_NV_DISABLE_ALT_OS_REQUEST); } else if (!strcasecmp(name, "post_ec_sync_delay")) { value = vb2_get_nv_storage(VB2_NV_POST_EC_SYNC_DELAY); - } else if (!strcasecmp(name, "alt_os_enabled")) { - /* TODO(b/117195332): Change this to read from a field - * dedicated to storing Alt OS state. */ - value = !!(GetVdatInt(VDAT_INT_FLAGS) - & VBSD_ALT_OS_SHOW_PICKER); } return value; @@ -739,10 +730,6 @@ int VbSetSystemPropertyInt(const char *name, int value) return vb2_set_nv_storage(VB2_NV_BATTERY_CUTOFF_REQUEST, value); } else if (!strcasecmp(name,"kernel_max_rollforward")) { return vb2_set_nv_storage(VB2_NV_KERNEL_MAX_ROLLFORWARD, value); - } else if (!strcasecmp(name, "enable_alt_os_request")) { - return vb2_set_nv_storage(VB2_NV_ENABLE_ALT_OS_REQUEST, value); - } else if (!strcasecmp(name, "disable_alt_os_request")) { - return vb2_set_nv_storage(VB2_NV_DISABLE_ALT_OS_REQUEST, value); } else if (!strcasecmp(name, "post_ec_sync_delay")) { return vb2_set_nv_storage(VB2_NV_POST_EC_SYNC_DELAY, value); } diff --git a/tests/vb2_nvstorage_tests.c b/tests/vb2_nvstorage_tests.c index c63dd30d..2dbc9950 100644 --- a/tests/vb2_nvstorage_tests.c +++ b/tests/vb2_nvstorage_tests.c @@ -62,8 +62,6 @@ static struct nv_field nvfields[] = { {VB2_NV_BATTERY_CUTOFF_REQUEST, 0, 1, 0, "battery cutoff request"}, {VB2_NV_KERNEL_MAX_ROLLFORWARD, 0, 0x12345678, 0xFEDCBA98, "kernel max rollforward"}, - {VB2_NV_ENABLE_ALT_OS_REQUEST, 0, 1, 0, "enable alt os request"}, - {VB2_NV_DISABLE_ALT_OS_REQUEST, 0, 1, 0, "disable alt os request"}, {VB2_NV_POST_EC_SYNC_DELAY, 0, 1, 0, "enable post-ec sync delay"}, {0, 0, 0, 0, NULL} }; |