commit 7ea39e83c665bf54334142f95ac008203ba714a5
author Hung-Te Lin <hungte@chromium.org> Tue Jul 31 18:39:33 2012 +0800
committer Gerrit <chrome-bot@google.com> Tue Jul 31 09:20:39 2012 -0700
tree fa1adf014d5055e3a9317f30d98bc3448eeac1e5
parent a7e465afc0bb605204b64fb20139ac061e9a741c

gooftool: Apply new write protection range definition (WP_RO).

In future we should all trust WP_RO for the range to set write protection.

BUG=none
TEST=gooftool -v 4 write_protect # on Link, BIOS selected RO_SECTION and EC selected WP_RO.

Change-Id: I329fc2738077080ea86e03bff1f76c134a54a540
Reviewed-on: https://gerrit.chromium.org/gerrit/28796
Tested-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Jon Salz <jsalz@chromium.org>
Reviewed-by: Yung-Chieh Lo <yjlou%chromium.org@gtempaccount.com>
Commit-Ready: Hung-Te Lin <hungte@chromium.org>

py/gooftool/gooftool.py

diff --git a/py/gooftool/gooftool.py b/py/gooftool/gooftool.py
index 7c951ad..32b829e 100755
--- a/py/gooftool/gooftool.py
+++ b/py/gooftool/gooftool.py
@@ -456,32 +456,45 @@
 def EnableFwWp(options):  # pylint: disable=W0613
   """Enable then verify firmware write protection."""
 
-  def WriteProtect(fw_file_path, fw_type, section):
+  def CalculateLegacyRange(image, length, section_data):
+    ro_size = length / 2
+    ro_a = int(section_data[0] / ro_size)
+    ro_b = int((section_data[0] + section_data[1] - 1) / ro_size)
+    if ro_a != ro_b:
+      raise Error("%s firmware section %s has illegal size" %
+                  (fw_type, section))
+    ro_offset = ro_a * ro_size
+    return (ro_offset, ro_size)
+
+  def WriteProtect(fw_file_path, fw_type, legacy_section):
     """Calculate protection size, then invoke flashrom.
 
     Our supported chips only allow write protecting half their total
     size, so we parition the flash chipset space accordingly.
     """
     raw_image = open(fw_file_path, 'rb').read()
+    wp_section = 'WP_RO'
     image = crosfw.FirmwareImage(raw_image)
-    if not image.has_section(section):
-      raise Error('could not find %s firmware section %s' % (fw_type, section))
-    section_data = image.get_section_area(section)
-    protectable_size = len(raw_image) / 2
-    ro_a = int(section_data[0] / protectable_size)
-    ro_b = int((section_data[0] + section_data[1] - 1) / protectable_size)
-    if ro_a != ro_b:
-      raise Error("%s firmware section %s has illegal size" %
-                  (fw_type, section))
-    ro_offset = ro_a * protectable_size
-    logging.debug('write protecting %s', fw_type)
-    crosfw.Flashrom(fw_type).EnableWriteProtection(ro_offset, protectable_size)
+    if image.has_section(wp_section):
+      section_data = image.get_section_area(wp_section)
+      ro_offset = section_data[0]
+      ro_size = section_data[1]
+    elif image.has_section(legacy_section):
+      section_data = image.get_section_area(legacy_section)
+      (ro_offset, ro_size) = CalculateLegacyRange(
+          image, len(raw_image), section_data)
+    else:
+      raise Error('could not find %s firmware section %s or %s' %
+                  (fw_type, wp_section, legacy_section))
+
+    logging.debug('write protecting %s [off=%x size=%x]', fw_type,
+                  ro_offset, ro_size)
+    crosfw.Flashrom(fw_type).EnableWriteProtection(ro_offset, ro_size)
 
   WriteProtect(crosfw.LoadMainFirmware().GetFileName(), 'main', 'RO_SECTION')
   _event_log.Log('wp', fw='main')
   ec_fw_file = crosfw.LoadEcFirmware().GetFileName()
   if ec_fw_file is not None:
-    # TODO(hungte) Support WP_RO if that section exist.
     WriteProtect(ec_fw_file, 'ec', 'EC_RO')
     _event_log.Log('wp', fw='ec')
   else: