summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNamyoon Woo <namyoon@chromium.org>2020-02-19 15:48:20 -0800
committerCommit Bot <commit-bot@chromium.org>2020-02-22 01:46:40 +0000
commit58cb77591678b700ed0716ee446843c077057de5 (patch)
treeaa24d67c89d8b5adab0c7f839bae74f34b4b3e9a
parent5a8a856b0a942d3b982ef28324a924db3c7d9f40 (diff)
downloadchrome-ec-stabilize-volteer-12931.B-cr50_stab.tar.gz
capitalize enum tpm_read_rv and tpm_write_rvstabilize-volteer-12931.B-cr50_stab
This patch fixes a coding style violation in enum name. BUG=none BRANCH=cr50 TEST=none Change-Id: I53eb8aa0905ecfc841a4fe7a738df74d571e321b Signed-off-by: Namyoon Woo <namyoon@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2065493
-rw-r--r--board/cr50/ec_efs.c2
-rw-r--r--board/cr50/tpm_nvmem_ops.c18
-rw-r--r--board/cr50/tpm_nvmem_ops.h12
-rw-r--r--board/cr50/u2f.c10
-rw-r--r--board/cr50/wp.c8
5 files changed, 25 insertions, 25 deletions
diff --git a/board/cr50/ec_efs.c b/board/cr50/ec_efs.c
index 3b9856544f..5d5ca623e1 100644
--- a/board/cr50/ec_efs.c
+++ b/board/cr50/ec_efs.c
@@ -61,7 +61,7 @@ static int load_ec_hash_(uint8_t * const ec_hash)
uint8_t crc;
if (read_tpm_nvmem(KERNEL_NV_INDEX, secdata_size,
- (void *)&secdata) != tpm_read_success)
+ (void *)&secdata) != TPM_READ_SUCCESS)
return EC_ERROR_VBOOT_DATA_UNDERSIZED;
/*
diff --git a/board/cr50/tpm_nvmem_ops.c b/board/cr50/tpm_nvmem_ops.c
index 9c29834756..23a8ead1cf 100644
--- a/board/cr50/tpm_nvmem_ops.c
+++ b/board/cr50/tpm_nvmem_ops.c
@@ -28,7 +28,7 @@ enum tpm_read_rv read_tpm_nvmem(uint16_t obj_index,
handle_addr = NvEarlyStageFindHandle(object_handle);
if (!handle_addr) {
CPRINTF("%s: object at 0x%x not found\n", __func__, obj_index);
- return tpm_read_not_found;
+ return TPM_READ_NOT_FOUND;
}
/* Get properties of this index as stored in nvmem. */
@@ -47,14 +47,14 @@ enum tpm_read_rv read_tpm_nvmem(uint16_t obj_index,
if (obj_size > nvIndex.publicArea.dataSize) {
CPRINTF("%s: object at 0x%x is smaller than %d\n",
__func__, obj_index, obj_size);
- return tpm_read_too_small;
+ return TPM_READ_TOO_SMALL;
}
/* Perform the read. */
NvReadIndexData(object_handle, &nvIndex, handle_addr, 0, obj_size,
obj_value);
- return tpm_read_success;
+ return TPM_READ_SUCCESS;
}
enum tpm_read_rv read_tpm_nvmem_hidden(uint16_t object_index,
@@ -64,9 +64,9 @@ enum tpm_read_rv read_tpm_nvmem_hidden(uint16_t object_index,
if (NvGetHiddenObject(HR_HIDDEN | object_index,
object_size,
obj_value) == TPM_RC_SUCCESS) {
- return tpm_read_success;
+ return TPM_READ_SUCCESS;
} else {
- return tpm_read_not_found;
+ return TPM_READ_NOT_FOUND;
}
}
@@ -75,7 +75,7 @@ enum tpm_write_rv write_tpm_nvmem_hidden(uint16_t object_index,
void *obj_value,
int commit)
{
- enum tpm_write_rv ret = tpm_write_fail;
+ enum tpm_write_rv ret = TPM_WRITE_FAIL;
uint32_t handle = object_index | HR_HIDDEN;
@@ -83,15 +83,15 @@ enum tpm_write_rv write_tpm_nvmem_hidden(uint16_t object_index,
NvAddHiddenObject(handle,
object_size,
obj_value) == TPM_RC_SUCCESS) {
- ret = tpm_write_created;
+ ret = TPM_WRITE_CREATED;
} else if (NvWriteHiddenObject(handle,
object_size,
obj_value) == TPM_RC_SUCCESS) {
- ret = tpm_write_updated;
+ ret = TPM_WRITE_UPDATED;
}
if (commit && !NvCommit())
- ret = tpm_write_fail;
+ ret = TPM_WRITE_FAIL;
return ret;
}
diff --git a/board/cr50/tpm_nvmem_ops.h b/board/cr50/tpm_nvmem_ops.h
index d12eb1bb5f..2476b62b0f 100644
--- a/board/cr50/tpm_nvmem_ops.h
+++ b/board/cr50/tpm_nvmem_ops.h
@@ -8,15 +8,15 @@
#define __EC_BOARD_CR50_TPM_NVMEM_OPS_H
enum tpm_read_rv {
- tpm_read_success,
- tpm_read_not_found,
- tpm_read_too_small
+ TPM_READ_SUCCESS,
+ TPM_READ_NOT_FOUND,
+ TPM_READ_TOO_SMALL,
};
enum tpm_write_rv {
- tpm_write_created,
- tpm_write_updated,
- tpm_write_fail
+ TPM_WRITE_CREATED,
+ TPM_WRITE_UPDATED,
+ TPM_WRITE_FAIL,
};
enum tpm_nv_hidden_object {
diff --git a/board/cr50/u2f.c b/board/cr50/u2f.c
index b99722e48f..b9ad2de20a 100644
--- a/board/cr50/u2f.c
+++ b/board/cr50/u2f.c
@@ -87,7 +87,7 @@ static int load_state(struct u2f_state *state)
}
if (read_tpm_nvmem_hidden(TPM_HIDDEN_U2F_KEK, sizeof(state->salt_kek),
- state->salt_kek) == tpm_read_not_found) {
+ state->salt_kek) == TPM_READ_NOT_FOUND) {
/*
* Not found means that we have not used u2f before,
* or not used it with updated fw that resets kek seed
@@ -114,13 +114,13 @@ static int load_state(struct u2f_state *state)
if (write_tpm_nvmem_hidden(TPM_HIDDEN_U2F_KEK,
sizeof(state->salt_kek),
state->salt_kek,
- 1 /* commit */) != tpm_write_created)
+ 1 /* commit */) != TPM_WRITE_CREATED)
return 0;
}
if (read_tpm_nvmem_hidden(TPM_HIDDEN_U2F_KH_SALT,
sizeof(state->salt_kh),
- state->salt_kh) == tpm_read_not_found) {
+ state->salt_kh) == TPM_READ_NOT_FOUND) {
/*
* We have never used u2f before - generate
* new seed.
@@ -131,7 +131,7 @@ static int load_state(struct u2f_state *state)
if (write_tpm_nvmem_hidden(TPM_HIDDEN_U2F_KH_SALT,
sizeof(state->salt_kh),
state->salt_kh,
- 1 /* commit */) != tpm_write_created)
+ 1 /* commit */) != TPM_WRITE_CREATED)
return 0;
}
@@ -285,7 +285,7 @@ int u2f_gen_kek_seed(int commit)
return EC_ERROR_HW_INTERNAL;
if (write_tpm_nvmem_hidden(TPM_HIDDEN_U2F_KEK, sizeof(state->salt_kek),
- state->salt_kek, commit) == tpm_write_fail)
+ state->salt_kek, commit) == TPM_WRITE_FAIL)
return EC_ERROR_UNKNOWN;
return EC_SUCCESS;
diff --git a/board/cr50/wp.c b/board/cr50/wp.c
index 8e9be0edeb..55c7edcdc4 100644
--- a/board/cr50/wp.c
+++ b/board/cr50/wp.c
@@ -446,11 +446,11 @@ int board_fwmp_allows_unlock(void)
allows_unlock = 0;
break;
- case tpm_read_not_found:
+ case TPM_READ_NOT_FOUND:
allows_unlock = 1;
break;
- case tpm_read_success:
+ case TPM_READ_SUCCESS:
allows_unlock = !lock_enforced(&fwmp);
break;
}
@@ -465,7 +465,7 @@ int board_fwmp_fips_mode_enabled(void)
{
struct RollbackSpaceFirmware fw;
- if (tpm_read_success ==
+ if (TPM_READ_SUCCESS ==
read_tpm_nvmem(FIRMWARE_NV_INDEX, sizeof(fw), &fw)) {
return !!(fw.flags & FWMP_DEV_FIPS_MODE);
}
@@ -478,7 +478,7 @@ int board_vboot_dev_mode_enabled(void)
{
struct RollbackSpaceFirmware fw;
- if (tpm_read_success ==
+ if (TPM_READ_SUCCESS ==
read_tpm_nvmem(FIRMWARE_NV_INDEX, sizeof(fw), &fw)) {
return !!(fw.flags & FIRMWARE_FLAG_DEV_MODE);
}