Merge lp:~doanac/lava-dispatcher/uefi-from-prak into lp:lava-dispatcher

[Andy Doan]

These are the changes from Prakash for UEFI booting in Origen. I've made them into a proper branch so we can discuss the changes.

[Andy Doan (doanac)]

Hey Guys,

I turned this into a proper merge proposal on LP so we have a way to
discuss the changes. My comments are below, basically - I'm pretty sure
we can dramatically simplify this to be a very small change (my guess
<15 lines of code).

On 11/30/2012 09:54 AM, Andy Doan wrote:
> === modified file 'lava_dispatcher/actions/boot_control.py'
> --- lava_dispatcher/actions/boot_control.py 2012-11-20 21:22:17 +0000
> +++ lava_dispatcher/actions/boot_control.py 2012-11-30 15:53:29 +0000
> @@ -70,6 +70,28 @@
> finally:
> self.context.test_data.add_result("boot_image", status)
>
> +### UEFI
> +
> +class cmd_boot_linaro_uefi_image(BaseAction):
> + """ Call client code to boot to the master image
> + """
> +
> + parameters_schema = _boot_schema
> +
> + def run(self,options=[]):
> + client = self.client
> + client.target_device.boot_options = options
> + status = 'pass'
> + try:
> + client.boot_linaro_uefi_image()
> + except:
> + logging.exception("boot_linaro_image failed")
> + status = 'fail'
> + raise CriticalError("Failed to boot uefi test image.")
> + finally:
> + self.context.test_data.add_result("boot_uefi_image",status)
> +
> +### UEFI

I don't think this is needed. See my comments for the deploy logic in
master.py below.

> === modified file 'lava_dispatcher/actions/deploy.py'
> --- lava_dispatcher/actions/deploy.py 2012-11-20 13:34:19 +0000
> +++ lava_dispatcher/actions/deploy.py 2012-11-30 15:53:29 +0000
> @@ -91,6 +91,20 @@
> def run(self, boot, system, data, rootfstype='ext4'):
> self.client.deploy_linaro_android(boot, system, data, rootfstype)
>
> +## UEFI ##
> +class cmd_deploy_linaro_uefi_image(BaseAction):
> + parameters_schema = {
> + 'type': 'object',
> + 'properties' : {
> + 'hwpack': {'type':'string','optional': True},
> + 'rootfs' : {'type':'string','optional': True},
> + },
> + 'additionalProperties': False,
> + }
> +
> + def run(self, hwpack, rootfs):
> + self.client.deploy_linaro_uefi(hwpack,rootfs)
> +## UEFI ##

I don't think this is needed. See my comments for the deploy logic in
master.py below.

> === modified file 'lava_dispatcher/client/base.py'
> --- lava_dispatcher/client/base.py 2012-11-29 08:54:47 +0000
> +++ lava_dispatcher/client/base.py 2012-11-30 15:53:29 +0000
> @@ -402,6 +402,20 @@
> self.setup_proxy(TESTER_PS1_PATTERN)
> logging.info("System is in test image now")
>
> +### UEFI
> + def boot_linaro_uefi_image(self):
> + """
> + Reboot the system to the uefi test image
> + """
> + logging.info("Boot the uefi test image")
> +
> + self._boot_linaro_uefi_image()
> +
> + wait_for_prompt(self.proc,'/bin/sh', timeout=300)
> + logging.info("System is in test image now")
> +
> +### UEFI
> +

I don't think this is needed. See my comments for the deploy logic in
master.py below.

> === modified file 'lava_dispatcher/client/targetdevice.py'
> --- lava_dispatcher/client/targetdevice.py 2012-11-21 22:07:45 +0000
> +++ lava_dis...

Unmerged revisions

474. By Andy Doan on 2012-11-30

uefi support changes from prakash

=== modified file 'lava_dispatcher/actions/boot_control.py'
--- lava_dispatcher/actions/boot_control.py	2012-11-20 21:22:17 +0000
+++ lava_dispatcher/actions/boot_control.py	2012-11-30 15:53:29 +0000
@@ -70,6 +70,28 @@
         finally:
             self.context.test_data.add_result("boot_image", status)
 
+### UEFI
+
+class cmd_boot_linaro_uefi_image(BaseAction):
+    """ Call client code to boot to the master image
+    """
+
+    parameters_schema = _boot_schema
+    
+    def run(self,options=[]):
+        client = self.client
+        client.target_device.boot_options = options
+        status = 'pass'
+        try:
+            client.boot_linaro_uefi_image()
+        except:
+            logging.exception("boot_linaro_image failed")
+            status = 'fail'
+            raise CriticalError("Failed to boot uefi test image.") 
+        finally:
+            self.context.test_data.add_result("boot_uefi_image",status)
+  
+### UEFI
 
 class cmd_boot_master_image(BaseAction):
     """ Call client code to boot to the master image
 
=== modified file 'lava_dispatcher/actions/deploy.py'
--- lava_dispatcher/actions/deploy.py	2012-11-20 13:34:19 +0000
+++ lava_dispatcher/actions/deploy.py	2012-11-30 15:53:29 +0000
@@ -91,6 +91,20 @@
     def run(self, boot, system, data, rootfstype='ext4'):
         self.client.deploy_linaro_android(boot, system, data, rootfstype)
 
+## UEFI ##
+class cmd_deploy_linaro_uefi_image(BaseAction):
+    parameters_schema = {
+        'type': 'object',
+        'properties' : {
+            'hwpack': {'type':'string','optional': True},
+            'rootfs' : {'type':'string','optional': True},
+            },
+        'additionalProperties': False,
+        }
+
+    def run(self, hwpack, rootfs):
+        self.client.deploy_linaro_uefi(hwpack,rootfs)
+## UEFI ##
 
 class cmd_dummy_deploy(BaseAction):
 
 
=== modified file 'lava_dispatcher/client/base.py'
--- lava_dispatcher/client/base.py	2012-11-29 08:54:47 +0000
+++ lava_dispatcher/client/base.py	2012-11-30 15:53:29 +0000
@@ -402,6 +402,20 @@
         self.setup_proxy(TESTER_PS1_PATTERN)
         logging.info("System is in test image now")
 
+### UEFI
+    def boot_linaro_uefi_image(self):
+        """
+        Reboot the system to the uefi test image
+        """
+        logging.info("Boot the uefi test image")
+        
+        self._boot_linaro_uefi_image()
+        
+        wait_for_prompt(self.proc,'/bin/sh', timeout=300)
+        logging.info("System is in test image now")
+        
+### UEFI
+
     def get_www_scratch_dir(self):
         """ returns a temporary directory available for downloads that gets
         deleted when the process exits """
 
=== modified file 'lava_dispatcher/client/targetdevice.py'
--- lava_dispatcher/client/targetdevice.py	2012-11-21 22:07:45 +0000
+++ lava_dispatcher/client/targetdevice.py	2012-11-30 15:53:29 +0000
@@ -50,6 +50,10 @@
     def deploy_linaro_android(self, boot, system, data, rootfstype='ext4'):
         self.target_device.deploy_android(boot, system, data)
 
+## UEFI ##
+    def deploy_linaro_uefi(self,hwpack,rootfs):
+        self.target_device.deploy_uefi(hwpack,rootfs)
+## UEFI ##
     def deploy_linaro(self, hwpack=None, rootfs=None, image=None,
                       rootfstype='ext3', bootloader='u_boot'):
         if image is None:
@@ -68,6 +72,11 @@
     def _boot_linaro_image(self):
         self.proc = self.target_device.power_on()
 
+### UEFI
+    def _boot_linaro_uefi_image(self):
+        self.proc = self.target_device.uefi_power_on()
+        
+### UEFI
     def _boot_linaro_android_image(self):
         """Booting android or ubuntu style images don't differ much"""
 
 
=== modified file 'lava_dispatcher/config.py'
--- lava_dispatcher/config.py	2012-11-30 01:54:29 +0000
+++ lava_dispatcher/config.py	2012-11-30 15:53:29 +0000
@@ -73,6 +73,7 @@
     simulator_version_command = schema.StringOption()
     simulator_command = schema.StringOption()
     simulator_axf_files = schema.ListOption()
+    boot_cmds_uefi = schema.StringOption(fatal=True)  ### UEFI
 
 class OptionDescriptor(object):
     def __init__(self, name):
 
=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf'
--- lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf	2012-11-30 01:54:29 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf	2012-11-30 15:53:29 +0000
@@ -34,6 +34,11 @@
 # XXX should be called # boot_oe_test_image_commands ?
 boot_cmds_oe =
 
+
+### UEFI
+boot_cmds_uefi =
+### UEFI
+
 # The device type.  Settings in device-types/${DEVICE_TYPE}.conf
 # override settings in this file, but are overridden by the
 # devices/${DEVICE}.conf file.
 
=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/origen.conf'
--- lava_dispatcher/default-config/lava-dispatcher/device-types/origen.conf	2012-06-29 08:42:13 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/device-types/origen.conf	2012-11-30 15:53:29 +0000
@@ -24,6 +24,11 @@
     setenv bootargs "'console=ttySAC2,115200n8 rootwait ro init=/init androidboot.console=ttySAC2'",
     boot
 
+
+boot_cmds_uefi = mmc init,
+    fatload mmc 0:5 0x43e00000 ORIGENBOARD_EFI.fd,
+    go 0x43e00000
+
 bootloader_prompt = #
 
 lmc_dev_arg = origen
 
=== modified file 'lava_dispatcher/device/fastmodel.py'
--- lava_dispatcher/device/fastmodel.py	2012-11-22 02:14:51 +0000
+++ lava_dispatcher/device/fastmodel.py	2012-11-30 15:53:29 +0000
@@ -97,6 +97,7 @@
             if not self._axf:
                 raise RuntimeError('No AXF found, %r' % os.listdir(subdir))
 
+
     def deploy_android(self, boot, system, data):
         logging.info("Deploying Android on %s" % self.config.hostname)
 
@@ -114,6 +115,13 @@
 
         self._customize_android()
 
+## UEFI ##
+    def deploy_uefi(self,bootfs,rootfs):
+        logging.info("[UEFI fast_model.py: deploy_uefi]: %s"  % self.bootfs)
+        logging.info("[UEFI fast_model.py: deploy_uefi]: %s"  % self.rootfs)
+
+## UEFI ##
+
     def deploy_linaro(self, hwpack=None, rootfs=None, bootloader='u_boot'):
         hwpack = download_image(hwpack, self.context, decompress=False)
         rootfs = download_image(rootfs, self.context, decompress=False)
 
=== modified file 'lava_dispatcher/device/master.py'
--- lava_dispatcher/device/master.py	2012-11-30 01:57:34 +0000
+++ lava_dispatcher/device/master.py	2012-11-30 15:53:29 +0000
@@ -70,6 +70,7 @@
         Target.android_deployment_data['boot_cmds'] = 'boot_cmds_android'
         Target.ubuntu_deployment_data['boot_cmds'] = 'boot_cmds'
         Target.oe_deployment_data['boot_cmds'] = 'boot_cmds_oe'
+        Target.uefi_deployment_data['boot_cmds'] = 'boot_cmds_uefi'
 
         # used for tarballcache logic to get proper boot_cmds
         Target.ubuntu_deployment_data['data_type'] = 'ubuntu'
@@ -78,6 +79,7 @@
             'android': Target.android_deployment_data,
             'oe': Target.oe_deployment_data,
             'ubuntu': Target.ubuntu_deployment_data,
+            'uefi': Target.uefi_deployment_data,
             }
 
         self.master_ip = None
@@ -92,6 +94,12 @@
         self._boot_linaro_image()
         return self.proc
 
+### UEFI
+    def uefi_power_on(self):
+        self._boot_linaro_uefi_image()
+        return self.proc
+### UEFI
+
     def power_off(self, proc):
         # we always leave master image devices powered on
         pass
@@ -104,6 +112,97 @@
 
         self._deploy_tarballs(boot_tgz, root_tgz)
 
+## UEFI ##
+    def deploy_uefi(self,hwpack,rootfs):
+        logging.info("[UEFI master.py: deploy_uefi]: %s"  % hwpack)
+        logging.info("[UEFI master.py: deploy_uefi]: %s"  % rootfs)
+        self.boot_master_image()
+
+        self._deploy_uefi_tarballs(hwpack,rootfs)
+
+
+
+    def _deploy_uefi_bootfs(self,session, hwpack, timeout = 1,num_retry = 5):
+        logging.info("[UEFI master.py: deploy_uefi_bootfs")
+        session.run('udevadm trigger')
+        session.run('mkdir -p /mnt/boot')
+        session.run('mount /dev/disk/by-label/testboot /mnt/boot')
+        num_retry = 5
+        while num_retry > 0:
+            try:
+                logging.info('Hwpack %s'% hwpack)
+                session.run('wget --no-check-certificate --no-proxy --connect-timeout=30 -S --progress=dot -e dotbytes=2M %s'
+                     % (hwpack),timeout=-1)
+                session.run('tar --no-same-owner -xvf boot.tgz -C /mnt/boot/')
+                session.run('sudo rm -rf boot.tgz')
+                session.run('sudo umount /mnt/boot/')
+                return
+            except (OperationFailed, pexpect.TIMEOUT):
+                logging.warning(("transfering %s failed. %d retry left."
+                    % (hwpack, num_retry - 1)))
+
+            if num_retry > 1:
+                # send CTRL C in case wget still hasn't exited.
+                self.proc.sendcontrol("c")
+                self.proc.sendline(
+                    "echo 'retry left %s time(s)'" % (num_retry - 1))
+                # And wait a little while.
+                sleep_time = 60
+                logging.info("Wait %d second before retry" % sleep_time)
+                time.sleep(sleep_time)
+            num_retry = num_retry - 1
+
+        raise RuntimeError('Deploying bootfs %s on target failed' % hwpack)
+
+    def _deploy_uefi_rootfs(self,session, rootfs, timeout = 1,num_retry = 5):  
+        logging.info("[UEFI master.py: deploy_uefi_rootfs")
+        session.run('udevadm trigger')
+        session.run('mkdir -p /mnt/root')
+        session.run('mount /dev/disk/by-label/testrootfs /mnt/root')
+        num_retry = 5
+        while num_retry > 0:
+            try:
+                logging.info('Hwpack %s' % rootfs)
+                session.run('wget --no-check-certificate --no-proxy --connect-timeout=30 -S --progress=dot -e dotbytes=2M %s'
+                     % (rootfs),timeout=-1)
+                session.run('tar --no-same-owner -xvf root.tgz -C /mnt/root/')
+                session.run('sudo rm -rf root.tgz')
+                session.run('sudo umount /mnt/root/')
+                
+                return
+            except (OperationFailed, pexpect.TIMEOUT):
+                logging.warning(("transfering %s failed. %d retry left."
+                    % (rootfs, num_retry - 1)))
+
+            if num_retry > 1:
+                # send CTRL C in case wget still hasn't exited.
+                self.proc.sendcontrol("c")
+                self.proc.sendline(
+                    "echo 'retry left %s time(s)'" % (num_retry - 1))
+                # And wait a little while.
+                sleep_time = 60
+                logging.info("Wait %d second before retry" % sleep_time)
+                time.sleep(sleep_time)
+            num_retry = num_retry - 1
+
+        raise RuntimeError('Deploying bootfs %s on target failed' % rootfs)
+
+    def _deploy_uefi_tarballs(self,hwpack,rootfs):
+        logging.info("[UEFI master.py: _deploy_uefi_tarball]:")
+        with self._as_master() as master:
+            self._format_testpartition(master, 'ext3')
+            try:
+                self._deploy_uefi_rootfs(master, rootfs)
+                self._deploy_uefi_bootfs(master, hwpack)
+            except:
+                logging.error("Deployment failed")
+                tb = traceback.format_exc()
+                self.sio.write(tb)
+                raise CriticalError("Deployment failed")
+
+        self.deployment_data = Target.uefi_deployment_data 
+
+## UEFI ##
     def deploy_android(self, boot, system, userdata):
         self.boot_master_image()
 
@@ -459,14 +558,30 @@
             raise Exception("Faile to enter uboot")
         self.proc.sendline(self.config.interrupt_boot_command)
 
+
     def _boot_linaro_image(self):
         boot_cmds = self.deployment_data['boot_cmds']
         options = boot_options.as_dict(self)
         if 'boot_cmds' in options:
             boot_cmds = options['boot_cmds'].value
-
-        boot_cmds = getattr(self.config, boot_cmds)
-        self._boot(string_to_list(boot_cmds.encode('ascii')))
+        loggin.info (self.config)
+        boot_cmds = getattr(self.config, boot_cmds)
+        self._boot(string_to_list(boot_cmds.encode('ascii')))
+
+### UEFI 
+    def _boot_linaro_uefi_image(self):
+        self.deployment_data = Target.uefi_deployment_data
+        boot_cmds = self.deployment_data['boot_cmds']
+        options = boot_options.as_dict(self)
+        if 'boot_cmds' in options:
+            boot_cmds = options['boot_cmds'].value
+    
+        boot_cmds = getattr(self.config, boot_cmds)
+        self._boot(string_to_list(boot_cmds.encode('ascii')))
+
+ 
+### UEFI 
+
 
     def _boot(self, boot_cmds):
         try:
@@ -481,7 +596,6 @@
             self.proc.expect(self.config.bootloader_prompt, timeout=300)
             self.proc.sendline(boot_cmds[line])
 
-
 target_class = MasterImageTarget
 
 
 
=== modified file 'lava_dispatcher/device/target.py'
--- lava_dispatcher/device/target.py	2012-11-15 21:23:20 +0000
+++ lava_dispatcher/device/target.py	2012-11-30 15:53:29 +0000
@@ -62,6 +62,9 @@
         'TESTER_PS1_PATTERN': "linaro-test \[rc=(\d+)\]# ",
         'TESTER_PS1_INCLUDES_RC': True,
     }
+    uefi_deployment_data = {
+        'TESTER_PS1_INCLUDES_RC': True,
+    }
 
     def __init__(self, context, device_config):
         self.context = context