diff options
author | Randall Spangler <rspangler@chromium.org> | 2012-06-08 12:30:17 -0700 |
---|---|---|
committer | Gerrit <chrome-bot@google.com> | 2012-06-11 10:43:32 -0700 |
commit | c0e3742996a84d3c503cfa002b09a0831bcb2c32 (patch) | |
tree | 232ef3a8e633f9cec480775bdceae2e1868b9475 /firmware | |
parent | 71b126ba46c3b2fda3007dc0dd24a9f74adab604 (diff) | |
download | vboot-c0e3742996a84d3c503cfa002b09a0831bcb2c32.tar.gz |
Remove unused test fields from VbNvStorage
Confirmed via codesearch that these fields are not used outside of
vboot_reference itself, and the only use inside vboot_reference is one
test which checked that the test error generation itself worked.
BUG=chromium-os:31668
TEST=make && make runtests
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Change-Id: Ic393e126ca2853f7aaff19ffd6fcdbdb1c47689f
Reviewed-on: https://gerrit.chromium.org/gerrit/24895
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/include/vboot_nvstorage.h | 14 | ||||
-rw-r--r-- | firmware/lib/vboot_firmware.c | 19 | ||||
-rw-r--r-- | firmware/lib/vboot_kernel.c | 20 | ||||
-rw-r--r-- | firmware/lib/vboot_nvstorage.c | 27 |
4 files changed, 4 insertions, 76 deletions
diff --git a/firmware/include/vboot_nvstorage.h b/firmware/include/vboot_nvstorage.h index 79141761..4259d400 100644 --- a/firmware/include/vboot_nvstorage.h +++ b/firmware/include/vboot_nvstorage.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved. * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -47,11 +47,6 @@ typedef enum VbNvParam { VBNV_LOCALIZATION_INDEX, /* Field reserved for kernel/user-mode use; 32-bit value. */ VBNV_KERNEL_FIELD, - /* Verified boot API function which should generate a test error, if - * error number (below) is non-zero. */ - VBNV_TEST_ERROR_FUNC, - /* Verified boot API error to generate for the function, if non-zero. */ - VBNV_TEST_ERROR_NUM, /* Allow booting from USB in developer mode. 0=no, 1=yes. */ VBNV_DEV_BOOT_USB, /* Only boot Google-signed images in developer mode. 0=no, 1=yes. */ @@ -130,13 +125,6 @@ typedef enum VbNvParam { #define VBNV_RECOVERY_US_UNSPECIFIED 0xFF -/* Function codes for VBNV_TEST_ERROR_FUNC */ -#define VBNV_TEST_ERROR_LOAD_FIRMWARE_SETUP 1 -#define VBNV_TEST_ERROR_LOAD_FIRMWARE 2 -#define VBNV_TEST_ERROR_LOAD_KERNEL 3 -#define VBNV_TEST_ERROR_S3_RESUME 4 - - /* Initialize the NV storage library. This must be called before any * other functions in this library. Returns 0 if success, non-zero if * error. diff --git a/firmware/lib/vboot_firmware.c b/firmware/lib/vboot_firmware.c index 2bc66526..3f9f64fc 100644 --- a/firmware/lib/vboot_firmware.c +++ b/firmware/lib/vboot_firmware.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved. * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * @@ -42,7 +42,6 @@ int LoadFirmware(VbCommonParams* cparams, VbSelectFirmwareParams* fparams, uint32_t try_b_count; uint32_t lowest_version = 0xFFFFFFFF; - uint32_t test_err = 0; int good_index = -1; int is_dev; int index; @@ -56,22 +55,6 @@ int LoadFirmware(VbCommonParams* cparams, VbSelectFirmwareParams* fparams, VBDEBUG(("LoadFirmware started...\n")); - /* Handle test errors */ - VbNvGet(vnc, VBNV_TEST_ERROR_FUNC, &test_err); - if (VBNV_TEST_ERROR_LOAD_FIRMWARE == test_err) { - /* Get error code */ - VbNvGet(vnc, VBNV_TEST_ERROR_NUM, &test_err); - /* Clear test params so we don't repeat the error */ - VbNvSet(vnc, VBNV_TEST_ERROR_FUNC, 0); - VbNvSet(vnc, VBNV_TEST_ERROR_NUM, 0); - /* All error codes currently map to simulated error */ - if (test_err) { - recovery = VBNV_RECOVERY_RO_TEST_LF; - retval = VBERROR_SIMULATED; - goto LoadFirmwareExit; - } - } - /* Must have a root key from the GBB */ if (!gbb) { VBDEBUG(("No GBB\n")); diff --git a/firmware/lib/vboot_kernel.c b/firmware/lib/vboot_kernel.c index 9573e6ec..1dffc7b3 100644 --- a/firmware/lib/vboot_kernel.c +++ b/firmware/lib/vboot_kernel.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved. * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * @@ -139,7 +139,6 @@ VbError_t LoadKernel(LoadKernelParams* params) { uint32_t lowest_version = LOWEST_TPM_VERSION; int rec_switch, dev_switch; BootMode boot_mode; - uint32_t test_err = 0; uint32_t require_official_os = 0; VbError_t retval = VBERROR_UNKNOWN; @@ -184,23 +183,6 @@ VbError_t LoadKernel(LoadKernelParams* params) { shcall->sector_count = params->ending_lba + 1; shared->lk_call_count++; - /* Handle test errors */ - VbNvGet(vnc, VBNV_TEST_ERROR_FUNC, &test_err); - if (VBNV_TEST_ERROR_LOAD_KERNEL == test_err) { - /* Get error code */ - VbNvGet(vnc, VBNV_TEST_ERROR_NUM, &test_err); - shcall->test_error_num = (uint8_t)test_err; - /* Clear test params so we don't repeat the error */ - VbNvSet(vnc, VBNV_TEST_ERROR_FUNC, 0); - VbNvSet(vnc, VBNV_TEST_ERROR_NUM, 0); - /* All error codes currently map to simulated error */ - if (test_err) { - recovery = VBNV_RECOVERY_RW_TEST_LK; - retval = VBERROR_SIMULATED; - goto LoadKernelExit; - } - } - /* Initialization */ blba = params->bytes_per_lba; kbuf_sectors = KBUF_SIZE / blba; diff --git a/firmware/lib/vboot_nvstorage.c b/firmware/lib/vboot_nvstorage.c index de4fa3b0..79a28d7b 100644 --- a/firmware/lib/vboot_nvstorage.c +++ b/firmware/lib/vboot_nvstorage.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved. * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -32,11 +32,6 @@ #define DEV_BOOT_USB_MASK 0x01 #define DEV_BOOT_SIGNED_ONLY_MASK 0x02 -#define FIRMWARE_FLAGS_OFFSET 5 -#define FIRMWARE_TEST_ERR_FUNC_MASK 0x38 -#define FIRMWARE_TEST_ERR_FUNC_SHIFT 3 -#define FIRMWARE_TEST_ERR_NUM_MASK 0x07 - #define KERNEL_FIELD_OFFSET 11 #define CRC_OFFSET 15 @@ -112,15 +107,6 @@ int VbNvGet(VbNvContext* context, VbNvParam param, uint32_t* dest) { | (raw[KERNEL_FIELD_OFFSET + 3] << 24)); return 0; - case VBNV_TEST_ERROR_FUNC: - *dest = (raw[FIRMWARE_FLAGS_OFFSET] & FIRMWARE_TEST_ERR_FUNC_MASK) - >> FIRMWARE_TEST_ERR_FUNC_SHIFT; - return 0; - - case VBNV_TEST_ERROR_NUM: - *dest = raw[FIRMWARE_FLAGS_OFFSET] & FIRMWARE_TEST_ERR_NUM_MASK; - return 0; - case VBNV_DEV_BOOT_USB: *dest = (raw[DEV_FLAGS_OFFSET] & DEV_BOOT_USB_MASK ? 1 : 0); return 0; @@ -200,17 +186,6 @@ int VbNvSet(VbNvContext* context, VbNvParam param, uint32_t value) { raw[KERNEL_FIELD_OFFSET + 3] = (uint8_t)(value >> 24); break; - case VBNV_TEST_ERROR_FUNC: - raw[FIRMWARE_FLAGS_OFFSET] &= ~FIRMWARE_TEST_ERR_FUNC_MASK; - raw[FIRMWARE_FLAGS_OFFSET] |= (value << FIRMWARE_TEST_ERR_FUNC_SHIFT) - & FIRMWARE_TEST_ERR_FUNC_MASK; - break; - - case VBNV_TEST_ERROR_NUM: - raw[FIRMWARE_FLAGS_OFFSET] &= ~FIRMWARE_TEST_ERR_NUM_MASK; - raw[FIRMWARE_FLAGS_OFFSET] |= (value & FIRMWARE_TEST_ERR_NUM_MASK); - break; - case VBNV_DEV_BOOT_USB: if (value) raw[DEV_FLAGS_OFFSET] |= DEV_BOOT_USB_MASK; |