commit ecee04f3f654112c1bfb0060c61f36c45167b6b9
author Marco Chen <marcochen@chromium.org> Fri Feb 15 22:24:24 2019 +0800
committer Frank Huang <frankbozar@chromium.org> Sun Oct 20 15:42:44 2019 +0000
tree d103f0dda454e64fdd73feab6f90cfeefb63ffa0
parent fc7142dab752e9d099843a6e9f6c3551d1d51dcb

finalize: support FPMCU entropy initialization.

Add `FpmcuInitializeEntropy` step to gooftool and update corresponding
command line arguments.

BUG=b:118779289, b:141172626
TEST=manual test on DUT.

Change-Id: Ib5767c43ea251a2298f4cb44596285153739c972
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/factory/+/1868795
Reviewed-by: Frank Huang <frankbozar@chromium.org>
Tested-by: Frank Huang <frankbozar@chromium.org>
Tested-by: Philip Chen <philipchen@chromium.org>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>

py/gooftool/commands.py

diff --git a/py/gooftool/commands.py b/py/gooftool/commands.py
index 969d1a1..b31833e 100755
--- a/py/gooftool/commands.py
+++ b/py/gooftool/commands.py
@@ -244,6 +244,14 @@
     '--no_generate_mfg_date', action='store_false', dest='generate_mfg_date',
     help='Do not generate manufacturing date nor write mfg_date into VPD.')
 
+_has_fpmcu_cmd_arg = CmdArg(
+    '--has_fpmcu', action='store_true', default=None,
+    help='Force execution of fpmcu related commands.')
+
+_no_fpmcu_cmd_arg = CmdArg(
+    '--no_fpmcu', action='store_false', default=None, dest='has_fpmcu',
+    help='Skip fpmcu related commands.')
+
 
 @Command(
     'verify_ec_key',
@@ -730,7 +738,9 @@
          _rlz_embargo_end_date_offset_cmd_arg,
          _waive_list_cmd_arg,
          _skip_list_cmd_arg,
-         _no_generate_mfg_date_cmd_arg)
+         _no_generate_mfg_date_cmd_arg,
+         _has_fpmcu_cmd_arg,
+         _no_fpmcu_cmd_arg)
 def Finalize(options):
   """Verify system readiness and trigger transition into release state.
 
@@ -742,6 +752,7 @@
   - Clears all factory-friendly flags from the GBB
   - Removes factory-specific entries from RW_VPD (factory.*)
   - Enables firmware write protection (cannot rollback after this)
+  - Initialize Fpmcu entropy
   - Uploads system logs & reports
   - Wipes the testing kernel, rootfs, and stateful partition
   """
@@ -767,6 +778,7 @@
     event_log.Log('wp', fw='both', status='skipped')
   else:
     EnableFwWp(options)
+  FpmcuInitializeEntropy(options)
   LogSystemDetails(options)
   UploadReport(options)
 
@@ -828,6 +840,22 @@
     raise Error('File does not exist: %s' % options.file)
 
 
+@Command('fpmcu_initialize_entropy',
+         _has_fpmcu_cmd_arg,
+         _no_fpmcu_cmd_arg)
+def FpmcuInitializeEntropy(options):
+  """Initialze entropy of FPMCU."""
+  fpmcu_exists = os.path.exists('/dev/cros_fp')
+  if options.has_fpmcu is None:
+    options.has_fpmcu = fpmcu_exists
+  if options.has_fpmcu:
+    if not fpmcu_exists:
+      raise Error('FPS not found on device.')
+    GetGooftool(options).FpmcuInitializeEntropy()
+  elif fpmcu_exists:
+    logging.warning('FPS found. Entropy initialization skipped.')
+
+
 def main():
   """Run sub-command specified by the command line args."""