summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Bendebury <vbendeb@chromium.org>2020-05-18 10:59:52 -0700
committerCommit Bot <commit-bot@chromium.org>2020-05-29 21:49:57 +0000
commitbb8e0b8b09a80e838aaf96f86bfbbace3ecd0a4f (patch)
treef2945e6439769de2f26a965b3d13c45fa84c00d8
parentfb3eb55a5bb8f619ada8b46f5a219ff239fe215c (diff)
downloadchrome-ec-bb8e0b8b09a80e838aaf96f86bfbbace3ecd0a4f.tar.gz
ap_ro_integrity_check: move error codes enum into the .h file
This is a no-op change which will make it easier to have gsctool report sensible errors in case attempts to erase AP RO hash space fail. BUG=b:153764696 TEST='make buildall -j' succeeds Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Change-Id: Iad396a52439ac7e4377f1dc983f00e976fabd8ad Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2207791 Reviewed-by: Namyoon Woo <namyoon@chromium.org>
-rw-r--r--common/ap_ro_integrity_check.c12
-rw-r--r--include/tpm_vendor_cmds.h15
2 files changed, 15 insertions, 12 deletions
diff --git a/common/ap_ro_integrity_check.c b/common/ap_ro_integrity_check.c
index 2732052dd8..afcf5f8d19 100644
--- a/common/ap_ro_integrity_check.c
+++ b/common/ap_ro_integrity_check.c
@@ -70,18 +70,6 @@ struct ap_ro_check {
static const struct ap_ro_check *p_chk =
(const struct ap_ro_check *)AP_RO_DATA_SPACE_ADDR;
-/* Errors recognized and returned by the vendor command handler. */
-enum ap_ro_check_vc_errors {
- ARCVE_TOO_SHORT = 1,
- ARCVE_BAD_PAYLOAD_SIZE = 2,
- ARCVE_BAD_OFFSET = 3,
- ARCVE_BAD_RANGE_SIZE = 4,
- ARCVE_ALREADY_PROGRAMMED = 5,
- ARCVE_FLASH_WRITE_FAILED = 6,
- ARCVE_BID_PROGRAMMED = 7,
- ARCVE_FLASH_ERASE_FAILED = 8,
-};
-
static int ap_ro_erase_hash(void)
{
int rv;
diff --git a/include/tpm_vendor_cmds.h b/include/tpm_vendor_cmds.h
index 637ec05fe9..ca6f0f0497 100644
--- a/include/tpm_vendor_cmds.h
+++ b/include/tpm_vendor_cmds.h
@@ -241,6 +241,21 @@ enum vendor_cc_spi_hash_request_flags {
SPI_HASH_FLAG_EC_GANG = BIT(0),
};
+/*
+ * Errors recognized and returned by the VENDOR_CC_SEED_AP_RO_CHECK vendor
+ * command handler.
+ */
+enum ap_ro_check_vc_errors {
+ ARCVE_TOO_SHORT = 1,
+ ARCVE_BAD_PAYLOAD_SIZE = 2,
+ ARCVE_BAD_OFFSET = 3,
+ ARCVE_BAD_RANGE_SIZE = 4,
+ ARCVE_ALREADY_PROGRAMMED = 5,
+ ARCVE_FLASH_WRITE_FAILED = 6,
+ ARCVE_BID_PROGRAMMED = 7,
+ ARCVE_FLASH_ERASE_FAILED = 8,
+};
+
/* Structure for VENDOR_CC_SPI_HASH request which follows tpm_header */
struct vendor_cc_spi_hash_request {
uint8_t subcmd; /* See vendor_cc_spi_hash_request_subcmd */