cr50: complete support of the new NVMEM structure

This patch eliminates unnecessary legacy nvmem.c and nvmem_vars.c code
and brings the code base to the state where the new NVMEM layout is
fully functional.

BRANCH=cr50, cr50-mp
BUG=b:69907320, b:129710256
CQ-DEPEND=CL:1450278
TEST=the following tests pass:
   - test cases in ./test/nvmem.c

   - TCG suite (passes on par with the existing Cr50 code with the
     reduced code footprint TPM2 library)

   - Chrome OS device migrates from legacy to new implementation with
     user account maintained.

   - Chrome OS user account is maintained over AP and H1 reboots and
     deep sleep cycles.

Change-Id: If4bc2dd125873a79dbe0e268eb32100a8b8b352d
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1496607
Reviewed-by: Andrey Pronin <apronin@chromium.org>

1 files changed, 9 insertions, 9 deletions

diff --git a/include/nvmem.h b/include/nvmem.h
index 341a7c083d..f48c9cd9c4 100644
--- a/include/nvmem.h
+++ b/include/nvmem.h
@@ -178,15 +178,6 @@ int nvmem_move(uint32_t src_offset, uint32_t dest_offset, uint32_t size,
 int nvmem_commit(void);
 
 /*
- * Clear out a user's data across all partitions.
- *
- * @param user:   The user who's data should be cleared.
- * @return        EC_SUCCESS if the user's data across all partitions was
- *                cleared.  Error othrwise.
- */
-int nvmem_erase_user_data(enum nvmem_users user);
-
-/*
  * Temporarily stopping NVMEM commits could be beneficial. One use case is
  * when TPM operations need to be sped up.
  *
@@ -206,6 +197,15 @@ void nvmem_disable_commits(void);
 int nvmem_enable_commits(void);
 
 /*
+ * Function to retrieve the base address of the nvmem cache of the appropriate
+ * user. After migration there is only one user and one base address, this
+ * function will be eliminated.
+ *
+ * @return pointer to the base address.
+ */
+void *nvmem_cache_base(enum nvmem_users user);
+
+/*
  * Clear all NVMEM cache in SRAM.
  */
 void nvmem_clear_cache(void);