Add EC hash in hardware_Components database

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 factory
 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 gbb_util
 from autotest_lib.client.common_lib import site_fmap
 from autotest_lib.client.common_lib import site_vblock
 
 
 class hardware_Components(test.test):
     version = 1
     _cids = [
         'data_display_geometry',
+        'hash_ec_firmware',
         'hash_ro_firmware',
         'part_id_audio_codec',
         'part_id_cpu',
         'part_id_display_panel',
         'part_id_embedded_controller',
         'part_id_ethernet',
         'part_id_flash_chip',
         'part_id_hwqual',
         'part_id_storage',
         'part_id_wireless',
@@ skipping 210 matching lines @@
           Returns a colon delimited string where the first section
           is the vendor id and the second section is the device id.
         """
         part_id = utils.read_one_line('/sys/class/net/wlan0/device/device')
         vendor_id = utils.read_one_line('/sys/class/net/wlan0/device/vendor')
         return "%s:%s" % (vendor_id.replace('0x',''), part_id.replace('0x',''))
 
 
     def get_closed_vendor_id_touchpad(self, vendor_name):
         """
-        Using closed-source method to derive the vendor information 
+        Using closed-source method to derive the vendor information
         given the vendor name.
         """
         part_id = ''
         if vendor_name.lower() == 'synaptics':
-            # Turn off raw mode in order to show touch pad as input 
+            # Turn off raw mode in order to show touch pad as input
             script_set_raw = '/opt/Synaptics/bin/synset'
             redirect_std_1_2 = '> /dev/null 2>&1'
             if not os.path.exists(script_set_raw):
                 return part_id
             cmd_disable_raw = ' '.join([script_set_raw, 'stop', \
                               redirect_std_1_2])
-            utils.system(cmd_disable_raw, ignore_status=True) 
+            utils.system(cmd_disable_raw, ignore_status=True)
 
             # Now we can capture touch pad input under /sys/class/input
             touchpad_input_path = '/sys/class/input/'
             input_dirs = os.listdir(touchpad_input_path)
             part_ids = []
             for input_dir in input_dirs:
-                if not input_dir.startswith('input'): 
+                if not input_dir.startswith('input'):
                     continue
                 fname = os.path.join(touchpad_input_path, input_dir, 'name')
                 input_id = utils.read_file(fname)
                 if input_id.startswith('SynPS'):
                     part_ids.append(input_id.strip())
             part_id = ",".join(part_ids)
 
             # Turn on raw mode again
             cmd_enable_raw = ' '.join([script_set_raw, 'start', \
                              redirect_std_1_2])
             utils.system(cmd_enable_raw)
         return part_id
 
 
     def get_vendor_id_touchpad(self):
         # First, try to use closed-source method to probe touch pad
         part_id = self.get_closed_vendor_id_touchpad('Synaptics')
-        if part_id != '': 
+        if part_id != '':
             return part_id
         # If the closed-source method above fails to find vendor infomation,
         # try an open-source method.
-        else:   
+        else:
             cmd_grep = 'grep -i Touchpad /proc/bus/input/devices | sed s/.\*=//'
             part_id = utils.system_output(cmd_grep).strip('"')
             return part_id
 
 
     def get_vendor_id_webcam(self):
         cmd = 'cat /sys/class/video4linux/video0/name'
         part_id = utils.system_output(cmd).strip()
         return part_id
 
 
     def get_hash_ro_firmware(self):
         """
-        Returns a hash of Read Only firmware parts,
+        Returns a hash of Read Only (BIOS) 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)
         # XXX Allowing the FMAP to override our default layout may be an exploit
@@ skipping 11 matching lines @@
         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_hash_ec_firmware(self):
+        """
+        Returns a hash of Embedded Controller firmware parts,
+        to confirm we have proper updated version of EC firmware.
+        """
+        flashrom = flashrom_util.FlashromUtility()
+        flashrom.initialize(flashrom.TARGET_EC)
+        # to bypass the 'skip verification' sections
+        image = flashrom.get_current_image()
+        hash_src = flashrom.get_verification_image(image)
+        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']
@@ skipping 92 matching lines @@
                 cids_need_to_be_record = ['part_id_hwqual']
                 for cid in cids_need_to_be_record:
                     factory.log_shared_data(cid, self._approved[cid][0])
                 return
 
         if only_cardreader_failed:
             all_failures = ('You may forget to insert an SD card.\n' +
                             all_failures)
 
         raise error.TestFail(repr(all_failures))