Add flashrom memory layout detection by FMAP (using fmap_decode)

client/site_tests/hardware_Components/hardware_Components.py

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import glob, hashlib, logging, os, pprint, re, sys
 from autotest_lib.client.bin import test, utils
 from autotest_lib.client.common_lib import error
 from autotest_lib.client.common_lib import flashrom_util
 from autotest_lib.client.common_lib import site_vblock
 
@@ skipping 221 matching lines @@
         Returns a hash of Read Only firmware parts,
         to confirm we have proper keys / boot code / recovery image installed.
         """
         # hash_ro_list: RO section to be hashed
         hash_ro_list = ['FV_BSTUB', 'FV_GBB', 'FVDEV']
         flashrom = flashrom_util.flashrom_util()
         if not flashrom.select_bios_flashrom():
             raise error.TestError('Cannot select BIOS flashrom')
         base_img = flashrom.read_whole()
         flashrom_size = len(base_img)
-        layout = flashrom.detect_chromeos_bios_layout(flashrom_size)
+        # XXX we can NOT trust base image here for layout, otherwise firmware
+        # can provide fake (non-used) GBB/BSTUB in garbage area.
+        layout = flashrom.detect_chromeos_bios_layout(flashrom_size, None)
         if not layout:
             raise error.TestError('Cannot detect ChromeOS flashrom laout')
         hash_src = ''
         for section in hash_ro_list:
             src = flashrom.get_section(base_img, layout, section)
             if not src:
                 raise error.TestError('Cannot get section [%s] from flashrom' %
                                       section)
             hash_src = hash_src + src
         if not hash_src:
             raise error.TestError('Invalid hash source from flashrom.')
         return hashlib.sha256(hash_src).hexdigest()
 
 
     def get_version_rw_firmware(self):
         """
         Returns the version of Read-Write (writable) firmware from VBOOT
         section. If A/B has different version, that means this system
         needs a reboot + firmwar update so return value is a "error report"
         in the form "A=x, B=y".
         """
         versions = [None, None]
         section_names = ['VBOOTA', 'VBOOTB']
         flashrom = flashrom_util.flashrom_util()
         if not flashrom.select_bios_flashrom():
             raise error.TestError('Cannot select BIOS flashrom')
         base_img = flashrom.read_whole()
         flashrom_size = len(base_img)
-        layout = flashrom.detect_chromeos_bios_layout(flashrom_size)
+        # we can trust base image for layout, since it's only RW.
+        layout = flashrom.detect_chromeos_bios_layout(flashrom_size, base_imge)
         if not layout:
             raise error.TestError('Cannot detect ChromeOS flashrom laout')
         for index, name in enumerate(section_names):
             data = flashrom.get_section(base_img, layout, name)
             block = site_vblock.unpack_verification_block(data)
             ver = block['VbFirmwarePreambleHeader']['firmware_version']
             versions[index] = ver
         # we embed error reports in return value.
         assert len(versions) == 2
         if versions[0] != versions[1]:
@@ skipping 59 matching lines @@
             if self._failures:
                 all_failures += 'Approved DB: %s' % db
                 all_failures += self.pformat(self._failures)
             else:
                 # If one of DBs is matched, record the hwqual_id and exit.
                 self.write_test_keyval(
                     {'hwqual_id': self._approved['part_id_hwqual'][0]})
                 return
 
         raise error.TestFail(all_failures)