Add VB test error func/num

firmware/lib/vboot_nvstorage.c

 /* Copyright (c) 2011 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.
  */
 
 /* Non-volatile storage routines.
  */
 
 #include "utility.h"
 #include "vboot_common.h"
@@ skipping 11 matching lines @@
 #define BOOT_OFFSET                  1
 #define BOOT_DEBUG_RESET_MODE           0x80
 #define BOOT_TRY_B_COUNT_MASK           0x0F
 
 #define RECOVERY_OFFSET              2
 #define LOCALIZATION_OFFSET          3
 
 #define FIRMWARE_FLAGS_OFFSET        5
 #define FIRMWARE_TRIED_FIRMWARE_B       0x80
 #define FIRMWARE_FW_VERIFIED_KERNEL_KEY 0x40
+#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
 
 
 /* Return CRC-8 of the data, using x^8 + x^2 + x + 1 polynomial.  A
  * table-based algorithm would be faster, but for only 15 bytes isn't
  * worth the code size. */
 static uint8_t Crc8(const uint8_t* data, int len) {
   unsigned crc = 0;
@@ skipping 85 matching lines @@
 
     case VBNV_TRIED_FIRMWARE_B:
       *dest = (raw[FIRMWARE_FLAGS_OFFSET] & FIRMWARE_TRIED_FIRMWARE_B ? 1 : 0);
       return 0;
 
     case VBNV_FW_VERIFIED_KERNEL_KEY:
       *dest = (raw[FIRMWARE_FLAGS_OFFSET] & FIRMWARE_FW_VERIFIED_KERNEL_KEY ?
                1 : 0);
       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;
+
     default:
       return 1;
   }
 }
 
 
 int VbNvSet(VbNvContext* context, VbNvParam param, uint32_t value) {
   uint8_t* raw = context->raw;
   uint32_t current;
 
@@ skipping 61 matching lines @@
         raw[FIRMWARE_FLAGS_OFFSET] &= ~FIRMWARE_TRIED_FIRMWARE_B;
       break;
 
     case VBNV_FW_VERIFIED_KERNEL_KEY:
       if (value)
         raw[FIRMWARE_FLAGS_OFFSET] |= FIRMWARE_FW_VERIFIED_KERNEL_KEY;
       else
         raw[FIRMWARE_FLAGS_OFFSET] &= ~FIRMWARE_FW_VERIFIED_KERNEL_KEY;
       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;
+
     default:
       return 1;
   }
 
   /* Need to regenerate CRC, since the value changed. */
   context->regenerate_crc = 1;
   return 0;
 }