From patchwork Tue Nov 17 00:28:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 324546 Delivered-To: patch@linaro.org Received: by 2002:a17:906:d156:0:0:0:0 with SMTP id br22csp4493298ejb; Mon, 16 Nov 2020 16:32:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJwO/rEsfeFLTYcTtH9zLcTSaz1cMI7uTxnIq9wdrV57btBPifc0sIlO2ct3mPwXRMYR/YKE X-Received: by 2002:aa7:cc0e:: with SMTP id q14mr17539020edt.326.1605573130247; Mon, 16 Nov 2020 16:32:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605573130; cv=none; d=google.com; s=arc-20160816; b=kUtNaWEPYb7GV65VVh7WQzrJc4+4qUfJDheR6QJl/BgCjTDEJhz2MFeWD6sZvW3SDv i3eyBIkEmOGqq6PFMDHyyR8pk33rrH0Uh+DywDcS1DO9e+pVDDylJXZe0GAihsuSl+uC ns9xpyMe8ka7wkugGrbhTX0apwYM+SvFYsw4Bl4Tx9IpwT6NBzOVO911n3iV1QpZLrVq ws7zWDgFQMsJEP+g/xvWw4ryzNySkEQYOXOHe1x+qmwntwzhVX7x/K9xNCI8aN+k57mQ +HkA+banWR+hNPRc9CUWIrhCHr6Y0rakBm9yc2C261gq0rEhiPasTGHtwmxYpXLd8zpD UD5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1V5zlCoZ1xTo6TQ0f5yeAmrzEUbapMfNgI1FhlifC0A=; b=CppuBgZ5xZXlTmnZVBoZsQfZwo14+cb5MdSUdAle4aHPQscHqjfB3+8USJI4pPu6ta xtIR9tKzucxBwLhcF/BzqSQdRmpe4kXtRJd5BIVdJxY0HRHZxwW4VvjUb/MMFAPpiXo1 g2Gj4vCqPx/FPTfDLDOYRaoDF0LGjcy4kIjP+1An0812b/J8uIdNnous6XV1i53aaX7J 4FPqevnOb/0Otu6/2sGzKpHgf5xtvNCQz4lHeZ0s3ixoq7MmpKCfRx+6zwmgqlnhbcJ4 kY8xeZ2Bg+Vj2LuVQktmtfR1Ob3OkFysLiXxumtDSkPqeb/vtZqcxjlJ+8bplkuLVsK/ zNhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="EPmX/Ot3"; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id ob22si245741ejb.735.2020.11.16.16.32.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 16:32:10 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="EPmX/Ot3"; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5D720825AC; Tue, 17 Nov 2020 01:30:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="EPmX/Ot3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1A4CD825AE; Tue, 17 Nov 2020 01:29:39 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,T_SPF_HELO_TEMPERROR,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id ED79682588 for ; Tue, 17 Nov 2020 01:29:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=takahiro.akashi@linaro.org Received: by mail-pg1-x535.google.com with SMTP id f18so14719219pgi.8 for ; Mon, 16 Nov 2020 16:29:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1V5zlCoZ1xTo6TQ0f5yeAmrzEUbapMfNgI1FhlifC0A=; b=EPmX/Ot32ecOr3Oabucy4Kc6g19CdUT85SOjCl5A5IcsZW8F/hPc3fBEsojevNuLgN xzz3I2/tmZorrnx9JqhIIEqpB5vy9Cf1RcJ0IePt9UMpz5IkJtMt7cNRfB8MsAc0bqGD wBTwWzySoRtUiKZYUb6bGD1WjAlO3ReYIlsPZcWNBEGH5XiJOXqbeFOvowRDw0/WHs12 rxFk6rMn4JLzzk7VTb62/qibfBoTfyOL485H/7+i4gZ/jiH7LZUTV2xR29fKW8Y5S033 HUGhPBjX9uJ5Q6PMnaB7F+eRyYI45wl7kacMvMFb2MTDVTR9/oHv7oloJ3xTPb7CJPYa g3Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1V5zlCoZ1xTo6TQ0f5yeAmrzEUbapMfNgI1FhlifC0A=; b=o4/cdfvnmMf1IzdFnRpnakY4OE37x1XU59GwvBBKk0oqAbgRWUKcsCRuX0vYUB63P3 NNMmDxujCZmnhKhKCl6eFZEm103UCgxLITA1XBxr2uvVTo1+oNVG0n04N9No7rRcQHw+ IIDzlbBD9I6SawwCHEE6V6SAAZb19Z70qdQDId/YySgOtUwzFEp7x50AI6h+8zEILQtD v0cGdAOim268lyefIIL2//ZBHVUUbsgJ97cQRWP6DS01IynQQFLCbtSai9Pzy2gU66Z7 lepEDXEqfU7bxHnhVjKXpl7sqqrGgrH96JwbG5DJoyjOvyy6RDn6LmqkA0fXUvX+PMjz qApA== X-Gm-Message-State: AOAM530yg46gDd5rcBPpRFRqUAXmjKjzHaHnE6u6mDVGrmvJeFoUedxS 2oJYUor8O0r15axVN12bD59+Hw== X-Received: by 2002:aa7:8744:0:b029:18b:a9e1:803d with SMTP id g4-20020aa787440000b029018ba9e1803dmr15586963pfo.50.1605572951469; Mon, 16 Nov 2020 16:29:11 -0800 (PST) Received: from localhost.localdomain (p784a5642.tkyea130.ap.so-net.ne.jp. [120.74.86.66]) by smtp.gmail.com with ESMTPSA id t64sm20116506pfd.36.2020.11.16.16.29.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 16:29:10 -0800 (PST) From: AKASHI Takahiro To: xypron.glpk@gmx.de, agraf@csgraf.de Cc: sughosh.ganu@linaro.org, u-boot@lists.denx.de, AKASHI Takahiro Subject: [PATCH v9 10/11] test/py: efi_capsule: test for raw image capsule Date: Tue, 17 Nov 2020 09:28:04 +0900 Message-Id: <20201117002805.13902-11-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201117002805.13902-1-takahiro.akashi@linaro.org> References: <20201117002805.13902-1-takahiro.akashi@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean The test can run on sandbox build and it attempts to execute a firmware update via a capsule-on-disk, using a raw image capsule, CONFIG_EFI_CAPSULE_RAW. To run this test successfully, you need configure U-Boot specifically; See test_capsule_firmware.py for requirements, and hence it won't run on Travis CI, at least, for now. Signed-off-by: AKASHI Takahiro --- test/py/tests/test_efi_capsule/conftest.py | 3 + .../test_efi_capsule/test_capsule_firmware.py | 63 +++++++++++++++++++ 2 files changed, 66 insertions(+) -- 2.28.0 diff --git a/test/py/tests/test_efi_capsule/conftest.py b/test/py/tests/test_efi_capsule/conftest.py index 147266189912..e037bd20560d 100644 --- a/test/py/tests/test_efi_capsule/conftest.py +++ b/test/py/tests/test_efi_capsule/conftest.py @@ -53,6 +53,9 @@ def efi_capsule_data(request, u_boot_config): check_call('cd %s; %s/tools/mkeficapsule --fit uboot_bin_env.itb --version 1 --index 1 Test01' % (data_dir, u_boot_config.build_dir), shell=True) + check_call('cd %s; %s/tools/mkeficapsule --raw u-boot.bin.new --version 1 --index 1 Test02' % + (data_dir, u_boot_config.build_dir), + shell=True) # Create a disk image with EFI system partition check_call('virt-make-fs --partition=gpt --size=+1M --type=vfat %s %s' % diff --git a/test/py/tests/test_efi_capsule/test_capsule_firmware.py b/test/py/tests/test_efi_capsule/test_capsule_firmware.py index d8e27707fd79..f006fa95d650 100644 --- a/test/py/tests/test_efi_capsule/test_capsule_firmware.py +++ b/test/py/tests/test_efi_capsule/test_capsule_firmware.py @@ -15,6 +15,7 @@ from capsule_defs import * @pytest.mark.boardspec('sandbox') @pytest.mark.buildconfigspec('efi_capsule_firmware_fit') +@pytest.mark.buildconfigspec('efi_capsule_firmware_raw') @pytest.mark.buildconfigspec('efi_capsule_on_disk') @pytest.mark.buildconfigspec('dfu') @pytest.mark.buildconfigspec('dfu_sf') @@ -176,3 +177,65 @@ class TestEfiCapsuleFirmwareFit(object): 'sf read 4000000 150000 10', 'md.b 4000000 10']) assert 'u-boot-env:New' in ''.join(output) + + def test_efi_capsule_fw3( + self, u_boot_config, u_boot_console, efi_capsule_data): + """ + Test Case 3 - Update U-Boot on SPI Flash, raw image format + 0x100000-0x150000: U-Boot binary (but dummy) + """ + disk_img = efi_capsule_data + with u_boot_console.log.section('Test Case 3-a, before reboot'): + output = u_boot_console.run_command_list([ + 'host bind 0 %s' % disk_img, + 'efidebug boot add 1 TEST host 0:1 /helloworld.efi ""', + 'efidebug boot order 1', + 'env set -e -nv -bs -rt OsIndications =0x0000000000000004', + 'env set dfu_alt_info "sf 0:0=u-boot-bin raw 0x100000 0x50000;u-boot-env raw 0x150000 0x200000"', + 'env save']) + + # initialize content + output = u_boot_console.run_command_list([ + 'sf probe 0:0', + 'fatload host 0:1 4000000 %s/u-boot.bin.old' % CAPSULE_DATA_DIR, + 'sf write 4000000 100000 10', + 'sf read 5000000 100000 10', + 'md.b 5000000 10']) + assert 'Old' in ''.join(output) + + # place a capsule file + output = u_boot_console.run_command_list([ + 'fatload host 0:1 4000000 %s/Test02' % CAPSULE_DATA_DIR, + 'fatwrite host 0:1 4000000 %s/Test02 $filesize' % CAPSULE_INSTALL_DIR, + 'fatls host 0:1 %s' % CAPSULE_INSTALL_DIR]) + assert 'Test02' in ''.join(output) + + # reboot + u_boot_console.restart_uboot() + + capsule_early = u_boot_config.buildconfig.get( + 'config_efi_capsule_on_disk_early') + with u_boot_console.log.section('Test Case 3-b, after reboot'): + if not capsule_early: + # make sure that dfu_alt_info exists even persistent variables + # are not available. + output = u_boot_console.run_command_list([ + 'env set dfu_alt_info "sf 0:0=u-boot-bin raw 0x100000 0x50000;u-boot-env raw 0x150000 0x200000"', + 'host bind 0 %s' % disk_img, + 'fatls host 0:1 %s' % CAPSULE_INSTALL_DIR]) + assert 'Test02' in ''.join(output) + + # need to run uefi command to initiate capsule handling + output = u_boot_console.run_command( + 'env print -e -all Capsule0000') + + output = u_boot_console.run_command_list([ + 'host bind 0 %s' % disk_img, + 'fatls host 0:1 %s' % CAPSULE_INSTALL_DIR]) + assert 'Test02' not in ''.join(output) + + output = u_boot_console.run_command_list([ + 'sf probe 0:0', + 'sf read 4000000 100000 10', + 'md.b 4000000 10']) + assert 'u-boot:New' in ''.join(output)