From patchwork Wed Jun 26 11:12:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongqin Liu X-Patchwork-Id: 18128 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f72.google.com (mail-vb0-f72.google.com [209.85.212.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D14992390C for ; Wed, 26 Jun 2013 11:12:21 +0000 (UTC) Received: by mail-vb0-f72.google.com with SMTP id p12sf18153351vbe.7 for ; Wed, 26 Jun 2013 04:12:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-beenthere:x-forwarded-to:x-forwarded-for:delivered-to :mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state:x-original-sender :x-original-authentication-results:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=IBHfXQCCrmVasL8aXQapJc/TO8Jxiok81n/ojAZp35M=; b=UGZ1DK3093JiWvu5aHAzdDMjEXguimHVfkVY2TPKSZB3kYPli7veLo8cBp2QVymrJc ed2rL81rNKcCjTbv5OEgM7F2HyQYpZ6c8crqjhIjZt1/GH5hljGSGh+iryvwDT9fYJzM iVfhk39Y+AvmsosX5cDlXwf4ja/8uTSWGwv+xugXdIHz7UwDLxPQxNuf68KW8J98yHQL 2DbGCIS99WbOgVyWrzxE5PBNirnixfRdE4920lXU8Pb6+Gga+DMstwasOdQZpMajdCR0 4dxBUOn5eZzwqmyPi7jsjiA323Z+NhCOwhPKpcquXO4m2gRqWtTpdI2t6UcQnaAOUdvQ iZ4g== X-Received: by 10.236.163.193 with SMTP id a41mr1970015yhl.0.1372245141521; Wed, 26 Jun 2013 04:12:21 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.133.102 with SMTP id pb6ls353861qeb.80.gmail; Wed, 26 Jun 2013 04:12:21 -0700 (PDT) X-Received: by 10.58.249.236 with SMTP id yx12mr1531341vec.25.1372245141427; Wed, 26 Jun 2013 04:12:21 -0700 (PDT) Received: from mail-vb0-x231.google.com (mail-vb0-x231.google.com [2607:f8b0:400c:c02::231]) by mx.google.com with ESMTPS id vl1si7533403veb.132.2013.06.26.04.12.21 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Jun 2013 04:12:21 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::231 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c02::231; Received: by mail-vb0-f49.google.com with SMTP id 12so10352684vbf.8 for ; Wed, 26 Jun 2013 04:12:21 -0700 (PDT) X-Received: by 10.220.110.78 with SMTP id m14mr1494296vcp.53.1372245141258; Wed, 26 Jun 2013 04:12:21 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.165.8 with SMTP id yu8csp104078veb; Wed, 26 Jun 2013 04:12:20 -0700 (PDT) X-Received: by 10.194.58.239 with SMTP id u15mr2295221wjq.87.1372245140293; Wed, 26 Jun 2013 04:12:20 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id q16si2799869wie.62.2013.06.26.04.12.19 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 26 Jun 2013 04:12:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1Urne7-0004UO-NX for ; Wed, 26 Jun 2013 11:12:19 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id A62B6E04F4 for ; Wed, 26 Jun 2013 11:12:19 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-dispatcher X-Launchpad-Branch: ~linaro-validation/lava-dispatcher/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 631 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 631: merge the modification of network support for fast models Message-Id: <20130626111219.4750.30312.launchpad@ackee.canonical.com> Date: Wed, 26 Jun 2013 11:12:19 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: list X-Generated-By: Launchpad (canonical.com); Revision="16681"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 6d5810722f30a4c49676a68710cd372c6c3ed935 X-Gm-Message-State: ALoCoQnJLfTVO5PQqtRHGib/K0kh272wYjWk33iTu1lnxqsw6NyESFcmYqCnhqvc5a7hS9Ww+Qk3 X-Original-Sender: noreply@launchpad.net X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::231 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Merge authors: Yongqin Liu (liuyq0307) Related merge proposals: https://code.launchpad.net/~liuyq0307/lava-dispatcher/fastmodel-network-support/+merge/170498 proposed by: Yongqin Liu (liuyq0307) review: Approve - Yongqin Liu (liuyq0307) ------------------------------------------------------------ revno: 631 [merge] committer: Yongqin Liu branch nick: lava-dispatcher timestamp: Wed 2013-06-26 19:11:09 +0800 message: merge the modification of network support for fast models modified: lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-armv8.conf lava_dispatcher/device/fastmodel.py --- lp:lava-dispatcher https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk You are subscribed to branch lp:lava-dispatcher. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription === modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-armv8.conf' --- lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-armv8.conf 2013-06-19 16:22:43 +0000 +++ lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-armv8.conf 2013-06-25 10:50:02 +0000 @@ -7,11 +7,11 @@ # how long ubuntu takes to boot to prompt boot_linaro_timeout = 500 -# if you do dhcp on boot, adb will not work (asac) on fastmodels -enable_network_after_boot_android = 0 +#after enabled the network, we can set it to true +enable_network_after_boot_android = 1 -# we do usermode networking over the loopback -default_network_interface = lo +# change to use eth0 after we enabled the network +default_network_interface = eth0 bootloader_prompt = Start: @@ -50,6 +50,7 @@ sim_bin = /opt/arm/RTSMv8_VE/bin/model_shell64 sim_model = /opt/arm/RTSMv8_VE/models/Linux64_GCC-4.1/RTSM_VE_AEMv8A.so android_adb_port = 5555 +interfaceName = armv8_01 simulator_version_command = %(sim_bin)s --version | grep "Model Shell" | sed 's/Model Shell //' @@ -59,8 +60,6 @@ boot_options = motherboard.mmc.p_mmc_file - motherboard.hostbridge.userNetPorts - motherboard.hostbridge.userNetworking motherboard.smsc_91c111.enabled cluster.NUM_CORES cluster.cpu0.unpredictable_WPMASKANDBAS @@ -72,17 +71,18 @@ cluster.cpu3.unpredictable_WPMASKANDBAS cluster.cpu3.unpredictable_non-contigous_BAS cluster.take_ccfail_undef + motherboard.hostbridge.interfaceName + motherboard.smsc_91c111.mac_address + +[motherboard.smsc_91c111.mac_address] +default="auto" + +[motherboard.hostbridge.interfaceName] +default="%(interfaceName)s" [motherboard.mmc.p_mmc_file] default = {IMG} -[motherboard.hostbridge.userNetPorts] -default="%(android_adb_port)s=%(android_adb_port)s" - -[motherboard.hostbridge.userNetworking] -default = 1 -allowed = 0,1 - [motherboard.smsc_91c111.enabled] default = 1 allowed = 0,1 === modified file 'lava_dispatcher/device/fastmodel.py' --- lava_dispatcher/device/fastmodel.py 2013-06-18 23:22:13 +0000 +++ lava_dispatcher/device/fastmodel.py 2013-06-25 10:50:02 +0000 @@ -82,8 +82,9 @@ f.write('\n# LAVA CUSTOMIZATIONS\n') #make sure PS1 is what we expect it to be f.write('PS1="%s"\n' % self.ANDROID_TESTER_PS1) - # fast model usermode networking does not support ping - f.write('alias ping="echo LAVA-ping override 1 received"\n') + if not self.config.enable_network_after_boot_android: + # fast model usermode networking does not support ping + f.write('alias ping="echo LAVA-ping override 1 received"\n') self.deployment_data = Target.android_deployment_data