From patchwork Fri Oct 23 13:18:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 302186 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B8286C4363A for ; Fri, 23 Oct 2020 13:20:23 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 30CB9207FF for ; Fri, 23 Oct 2020 13:20:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="rELaVH3q" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 30CB9207FF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:39642 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVwzW-0000rf-3w for qemu-devel@archiver.kernel.org; Fri, 23 Oct 2020 09:20:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVwxZ-0007ee-MM; Fri, 23 Oct 2020 09:18:21 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:35911) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kVwxY-0000cM-4S; Fri, 23 Oct 2020 09:18:21 -0400 Received: by mail-wr1-x442.google.com with SMTP id x7so1807760wrl.3; Fri, 23 Oct 2020 06:18:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wLnfUB1E+Omdt6l8atwBLe1J9aeiH1JFkUJl824leKI=; b=rELaVH3qb1SPVUH7QdK6VyjOZYzYMe412z748/q63NvGwmgEyWHB2eyIfRprk9vWi3 H1qpi1yBxzAVxC35uV/x2M2FiONYJU/zvmkNQx3I2MfTlwhl88ofo45gkT8OLGaloRp8 ubRHQZVzFUMrq+H3Xw1D4OCKIlkkLVmet4jpFjSz1p5sTEFOBUPkUIQZOfdcNepBGHMY M8LSt4UMCpnSkmvZgw9ynD69op84C6JqkN+UqGk/AQHepEacZ4qFT8JcKiOgBCojACD7 a3AZa6y6r5dxc55jBTvpsh/E2sysb/kAQMmRQyXh1OypdjfTZ7Gth8cmoliMm5penrJ8 RAfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=wLnfUB1E+Omdt6l8atwBLe1J9aeiH1JFkUJl824leKI=; b=rqT00kT7n5NcSW+pGh2nNINCPWvCLWV3AtILew3DgKcyFgGblnAXNSpsDvf2Q78Qck O2EYBlomrHAL6TH1D11nSApU+qhpVyMd7ow+AxbwQMS3qOPUf/gVidjdh2XJIxun7euz ypXNyfGVI104EBKNPieBAcCBjIMTApG6jifRix44ZqJ97jdDOqh5t1N8RSP9lhRZ1+vh Glhsbo9FSVdCAyRcurudsMAJk9WBAgUDx6MxozP4qf2u1pdznLIGYKmdfhm79uKD7iMv o5XoR4u3kaguOd0NfHivSViDfDH0wYVPsWsVrV0M2Bm2Rjra2qpm8ssOP0kw1lmr8h1w 824g== X-Gm-Message-State: AOAM532cd4y3eBpA0IZuOpc1wz3kUm+paTxf6IBv8iz6o0nlsWRO2kl9 7NLTCdxJ2Eg0OM8u0mltsPaOTr5AWDU= X-Google-Smtp-Source: ABdhPJziDLnHcrCPbzpxoMFk7/9rzIXvgrr93Hb+ODjvg0SdExy0vvgi1q5SyW9HX3vdl/ppi5o+GQ== X-Received: by 2002:adf:8562:: with SMTP id 89mr2536311wrh.214.1603459096308; Fri, 23 Oct 2020 06:18:16 -0700 (PDT) Received: from localhost.localdomain (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id e11sm3110359wrj.75.2020.10.23.06.18.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Oct 2020 06:18:15 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH 1/4] Revert "hw/sd: Fix incorrect populated function switch status data structure" Date: Fri, 23 Oct 2020 15:18:05 +0200 Message-Id: <20201023131808.3198005-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201023131808.3198005-1-f4bug@amsat.org> References: <20201023131808.3198005-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-block@nongnu.org, Sai Pavan Boddu , Bin Meng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Michael Roth , Niek Linnenbank , Cleber Rosa , Bin Meng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This reverts commit b638627c723a8d0d2bb73489bc6bf9ff09b8d53a. Currently booting U-Boot on the Orange Pi PC we get: console: U-Boot SPL 2020.04-armbian (Sep 02 2020 - 10:16:13 +0200) ... console: Autoboot in 1 seconds, press to stop console: => console: => setenv extraargs 'printk.time=0 console=ttyS0,115200 loglevel=7 nosmp systemd.default_timeout_start_sec=9000 systemd.mask=armbian-zram-config.service systemd.mask=armbian-ramlog.service' console: => boot console: unable to select a mode console: Device 0: unknown device console: BOOTP broadcast 1 console: DHCP client bound to address 10.0.2.15 (12 ms) console: *** Warning: no boot file name; using '0A00020F.img' console: Using ethernet@1c30000 device console: TFTP from server 10.0.2.2; our IP address is 10.0.2.15 console: Filename '0A00020F.img'. console: Load address: 0x42000000 console: Loading: * console: TFTP error: 'Access violation' (2) console: Not retrying... console: missing environment variable: pxeuuid console: missing environment variable: bootfile ... With commit b638627c723 reverted: console: U-Boot SPL 2020.04-armbian (Sep 02 2020 - 10:16:13 +0200) ... console: Autoboot in 1 seconds, press to stop console: => console: => setenv extraargs 'printk.time=0 console=ttyS0,115200 loglevel=7 nosmp systemd.default_timeout_start_sec=9000 systemd.mask=armbian-zram-config.service systemd.mask=armbian-ramlog.service' console: => boot console: switch to partitions #0, OK console: mmc0 is current device console: Scanning mmc 0:1... console: Found U-Boot script /boot/boot.scr console: 3967 bytes read in 16 ms (241.2 KiB/s) console: ## Executing script at 43100000 console: U-boot loaded from SD console: Boot script loaded from mmc console: 153 bytes read in 10 ms (14.6 KiB/s) console: 11185760 bytes read in 6698 ms (1.6 MiB/s) console: 7788240 bytes read in 2966 ms (2.5 MiB/s) console: Found mainline kernel configuration console: 32121 bytes read in 50 ms (627 KiB/s) console: 4185 bytes read in 23 ms (176.8 KiB/s) console: Applying kernel provided DT fixup script (sun8i-h3-fixup.scr) console: ## Executing script at 45000000 console: ## Loading init Ramdisk from Legacy Image at 43300000 ... console: Image Name: uInitrd console: Image Type: ARM Linux RAMDisk Image (gzip compressed) console: Data Size: 11185696 Bytes = 10.7 MiB console: Load Address: 00000000 console: Entry Point: 00000000 console: Verifying Checksum ... OK console: ## Flattened Device Tree blob at 43000000 console: Booting using the fdt blob at 0x43000000 console: Loading Ramdisk to 49555000, end 49fffe20 ... OK console: Loading Device Tree to 494e4000, end 49554fff ... OK console: Starting kernel ... console: Uncompressing Linux... done, booting the kernel. Fixes: b638627c723 ("hw/sd: Fix incorrect populated function switch status data structure") Reported-by: Michael Roth Signed-off-by: Philippe Mathieu-Daudé Tested-by: Niek Linnenbank Reviewed-by: Niek Linnenbank Reported-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
--- hw/sd/sd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index c3febed2434..c17197785bc 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -823,12 +823,11 @@ static void sd_function_switch(SDState *sd, uint32_t arg) sd->data[11] = 0x43; sd->data[12] = 0x80; /* Supported group 1 functions */ sd->data[13] = 0x03; - for (i = 0; i < 6; i ++) { new_func = (arg >> (i * 4)) & 0x0f; if (mode && new_func != 0x0f) sd->function_group[i] = new_func; - sd->data[16 - (i >> 1)] |= new_func << ((i % 2) * 4); + sd->data[14 + (i >> 1)] = new_func << ((i * 4) & 4); } memset(&sd->data[17], 0, 47); stw_be_p(sd->data + 64, sd_crc16(sd->data, 64)); From patchwork Fri Oct 23 13:18:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 270571 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9AF36C4363A for ; Fri, 23 Oct 2020 13:21:18 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 050FB20878 for ; Fri, 23 Oct 2020 13:21:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="amGjUqjW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 050FB20878 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVx0O-00028l-U2 for qemu-devel@archiver.kernel.org; Fri, 23 Oct 2020 09:21:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVwxe-0007oi-Ch; Fri, 23 Oct 2020 09:18:26 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:53505) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kVwxb-0000cb-A2; Fri, 23 Oct 2020 09:18:26 -0400 Received: by mail-wm1-x344.google.com with SMTP id d78so1428272wmd.3; Fri, 23 Oct 2020 06:18:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fU7Y32HpDHj3PStO+v0DuDWQ0XGm+AsKTwdd8p4UUQQ=; b=amGjUqjWwAU4MXDxBhfNkrUDOap6ERkQkjBiq0/mPykDeDRRx/EMSUdV4KkwiPP0+j wJtJMsrSrjFNPzdP4JUGIO/RKiA/+9vUV6f7ftKtOhhsOO71WM5dmu3ekX9flxwlnkA8 33VhCnQzMBdf7fe1U6gUxeZJiEiwBuO0PbIsEyDgrKQm6Y6dFBqW/T1qfujcumQbgaNK XJZH/48TgUokE0FFOZR5euID0CwxqHpVbm01+hO5QubZ7101VUhxPHJO2p5kNiYZiWxL i3cczi8JnsxM5XPecW4haj4hz+VpuYjCD9LoVtN8L7KeHNfTtJng+Gm5bjx2cq2F6BU8 03yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=fU7Y32HpDHj3PStO+v0DuDWQ0XGm+AsKTwdd8p4UUQQ=; b=XvFjWuDGqLjBU+kv6dE8b1CtY+kjV0vdr/WXKEK9gx/VNyKAzLo4UtwzrbaE5QgY2W YsYpyd6cAKPZlHsIggqU+n5uA76Rqst9FkT6lU62Pet/tj8s8f8+JEn61M+WbbI1lWGr jCbGCy+ebL+5n+N6dBDV7KgPpHy86PnuXrTt5HyJH2Yu8SOv841YHqgER0i12lNP+AFd 8gCRVa54b/EbJo6d6pwUfHjUr1wDBeVcs1qpxfOL2cTZBM/tdctXdvdwIAZ2o0rPnM0A IFOQWSu3Mkq1hEhKkMNrx8mLyRdbKoaltGvmfYAvyZdoq64K2RQzx7pZks2zGFuk6l1S Ng7g== X-Gm-Message-State: AOAM531vBbmyYbhVNdrPwcSgpcziuVc0YbOiK0LgxhM/1drQX7w8u/kr TtTQ8x8ivCILDr2rckn/Da7GRBLrot8= X-Google-Smtp-Source: ABdhPJyhggCQSJ8SrWYXVKwzOdii3WIc2tlpnrlyd9It3uXy1K0FXFNay8t8XIOcsXRAR5NdQbKhTA== X-Received: by 2002:a7b:c349:: with SMTP id l9mr2262445wmj.148.1603459101252; Fri, 23 Oct 2020 06:18:21 -0700 (PDT) Received: from localhost.localdomain (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id c18sm3059900wmk.36.2020.10.23.06.18.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Oct 2020 06:18:20 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH 2/4] tests/acceptance: Allow running Orange Pi test using cached artifacts Date: Fri, 23 Oct 2020 15:18:06 +0200 Message-Id: <20201023131808.3198005-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201023131808.3198005-1-f4bug@amsat.org> References: <20201023131808.3198005-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::344; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x344.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-block@nongnu.org, Sai Pavan Boddu , Bin Meng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Michael Roth , Niek Linnenbank , Cleber Rosa , Bin Meng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Unfortunately the Armbian 19.11.3 image has been removed from the dl.armbian.com file server. Developers having the artifact cached can still run the test. Allow them to, until we find a proper solution to share binaries with the whole community. This avoids (when file manually added to cache): BootLinuxConsole.test_arm_orangepi_bionic_19_11: CANCEL: Missing asset https://dl.armbian.com/orangepipc/archive/Armbian_19.11.3_Orangepipc_bionic_current_5.3.9.7z (1.06 s) Reported-by: Bin Meng Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Niek Linnenbank --- tests/acceptance/boot_linux_console.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index 0118ed59156..032ac85978c 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -780,6 +780,8 @@ def test_arm_orangepi_sd(self): # Wait for VM to shut down gracefully self.vm.wait() + @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'), + 'Test artifacts fetched from unreliable dl.armbian.com') @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited') @skipUnless(P7ZIP_AVAILABLE, '7z not installed') def test_arm_orangepi_bionic(self): From patchwork Fri Oct 23 13:18:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 302185 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1EC5AC4363A for ; Fri, 23 Oct 2020 13:22:12 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 75056207FF for ; Fri, 23 Oct 2020 13:22:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KjL/Lq+J" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 75056207FF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVx1G-0003bt-DW for qemu-devel@archiver.kernel.org; Fri, 23 Oct 2020 09:22:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVwxh-0007th-Mt; Fri, 23 Oct 2020 09:18:30 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:39195) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kVwxg-0000d6-4T; Fri, 23 Oct 2020 09:18:29 -0400 Received: by mail-wr1-x441.google.com with SMTP id y12so1793510wrp.6; Fri, 23 Oct 2020 06:18:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5pHoldkIUZ8/kD1SNq5odZMH1XKMIeTmSn/5M9yZycY=; b=KjL/Lq+JyrkRxn8SLyd/KYUNuDVy6ZqgOYORNhPuu7NTw4hIkI3sv6h8DtcyHv+gq1 lUZLaMN0yr8hythLpB0lsQaCRJLTXjuiiSZmebCC+5ZmWaHO4Wzc4CTUPYzrwZFSWxHK XvqQt92SRKBFdTqzcJsiEzMrW+sEaHWRxZI3EcY4dJ4C0M0RZAL1b3UB0J3DinqfFDTI VtdM4gP73Lsyb9xo/KiJuW8aHEY/KhATzyxqVy/cPe4/8he1XDKV+0Eopiunqiy2qe1v MtQ18DH9UjdRB1LzJmfseRfbGGKv5oIN3EZGJ9zhcroUzJVUaluvB3oYf9zf2A7OfFpM m94Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=5pHoldkIUZ8/kD1SNq5odZMH1XKMIeTmSn/5M9yZycY=; b=NrlIUbMCHoDIUpDfYihHVhmca39no4s7b8bUZ9jwOsZyPEYvKaSa/fGv8oZ2AJn0HQ GkOlD7+Im0XnFvAGZZW89SpNeQLz0dE40v/apRzEc4nFkth4uSvfjObeF9+YC275h3a4 re/+lNk9vBSR/kcwWJJokct6wZCoCYbyK/JF5xredXcairElHppKy0488fA8jTeFmLvn YtNu/vs72cAzG/4LdM3kKn2wZOKgopcv/amcnuXx1MZmL+Pgb8pyLosLfVuT0yDpBM8B URAk3e5cx3W9PxPvw2xxJSO0S2uahfkczNcHTShMpIGnUlVaaky5sz0r2O/1PnPyX1jp SXUg== X-Gm-Message-State: AOAM531IgxN3nNW8MH7VB91wjuk62AQMfTdD6/eRpcWXBQWJE3kLCNSD ukYTZJ0zSnF+t56f3CQL7GPhDiTMckg= X-Google-Smtp-Source: ABdhPJy6K78D42cyoc386bS+yF/g88RmQ7gXxUlI1YhUBcjof4RS4bGl2hZS78ODJ05PpY3pnnWuTw== X-Received: by 2002:adf:f903:: with SMTP id b3mr2661348wrr.142.1603459105999; Fri, 23 Oct 2020 06:18:25 -0700 (PDT) Received: from localhost.localdomain (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id s19sm3568367wmc.0.2020.10.23.06.18.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Oct 2020 06:18:25 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH 3/4] tests/acceptance: Extract do_test_arm_orangepi_armbian_uboot() method Date: Fri, 23 Oct 2020 15:18:07 +0200 Message-Id: <20201023131808.3198005-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201023131808.3198005-1-f4bug@amsat.org> References: <20201023131808.3198005-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::441; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-block@nongnu.org, Sai Pavan Boddu , Bin Meng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Michael Roth , Niek Linnenbank , Cleber Rosa , Bin Meng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" As we want to reuse the same U-Boot test for multiple Armbian releases, extract the common part as do_test_arm_orangepi_armbian_uboot(). Signed-off-by: Philippe Mathieu-Daudé --- tests/acceptance/boot_linux_console.py | 45 ++++++++++++++------------ 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index 032ac85978c..803b4512a26 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -780,27 +780,7 @@ def test_arm_orangepi_sd(self): # Wait for VM to shut down gracefully self.vm.wait() - @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'), - 'Test artifacts fetched from unreliable dl.armbian.com') - @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited') - @skipUnless(P7ZIP_AVAILABLE, '7z not installed') - def test_arm_orangepi_bionic(self): - """ - :avocado: tags=arch:arm - :avocado: tags=machine:orangepi-pc - :avocado: tags=device:sd - """ - - # This test download a 196MB compressed image and expand it to 1GB - image_url = ('https://dl.armbian.com/orangepipc/archive/' - 'Armbian_19.11.3_Orangepipc_bionic_current_5.3.9.7z') - image_hash = '196a8ffb72b0123d92cea4a070894813d305c71e' - image_path_7z = self.fetch_asset(image_url, asset_hash=image_hash) - image_name = 'Armbian_19.11.3_Orangepipc_bionic_current_5.3.9.img' - image_path = os.path.join(self.workdir, image_name) - process.run("7z e -o%s %s" % (self.workdir, image_path_7z)) - image_pow2ceil_expand(image_path) - + def do_test_arm_orangepi_uboot_armbian(self, image_path): self.vm.set_console() self.vm.add_args('-drive', 'file=' + image_path + ',if=sd,format=raw', '-nic', 'user', @@ -826,6 +806,29 @@ def test_arm_orangepi_bionic(self): 'to ') self.wait_for_console_pattern('Starting Load Kernel Modules...') + @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'), + 'Test artifacts fetched from unreliable apt.armbian.com') + @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited') + @skipUnless(P7ZIP_AVAILABLE, '7z not installed') + def test_arm_orangepi_bionic_19_11(self): + """ + :avocado: tags=arch:arm + :avocado: tags=machine:orangepi-pc + :avocado: tags=device:sd + """ + + # This test download a 196MB compressed image and expand it to 1GB + image_url = ('https://dl.armbian.com/orangepipc/archive/' + 'Armbian_19.11.3_Orangepipc_bionic_current_5.3.9.7z') + image_hash = '196a8ffb72b0123d92cea4a070894813d305c71e' + image_path_7z = self.fetch_asset(image_url, asset_hash=image_hash) + image_name = 'Armbian_19.11.3_Orangepipc_bionic_current_5.3.9.img' + image_path = os.path.join(self.workdir, image_name) + process.run("7z e -o%s %s" % (self.workdir, image_path_7z)) + image_pow2ceil_expand(image_path) + + self.do_test_arm_orangepi_uboot_armbian(image_path) + @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited') def test_arm_orangepi_uboot_netbsd9(self): """ From patchwork Fri Oct 23 13:18:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 270570 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75EFAC388F9 for ; Fri, 23 Oct 2020 13:22:49 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D421D208FE for ; Fri, 23 Oct 2020 13:22:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="igjiop1D" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D421D208FE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVx1r-0004KF-RF for qemu-devel@archiver.kernel.org; Fri, 23 Oct 2020 09:22:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53046) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVwxn-0007v2-Bd; Fri, 23 Oct 2020 09:18:37 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:53023) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kVwxk-0000dU-Ku; Fri, 23 Oct 2020 09:18:35 -0400 Received: by mail-wm1-x32f.google.com with SMTP id c194so1433105wme.2; Fri, 23 Oct 2020 06:18:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NAtjWtYoVyZRwhuRPKYlYZP7QUZVObU61H901gwMQTo=; b=igjiop1DHYiLLyTIYTvlp7ePWdx7ZeYD/0vK7Y7rXMes7AfJluzdh51pTKQTe9/w5V 0Z6G9OD7AMz+HA7pqvMn676bvOzzdl0qdNb9I158pEMJrtEKk4JxbyhUgvrxWWFbHCjS Galkb4zSALtk1m2U0O0cBvrzfOPjyHOjGIudqjKd4Ra4XQYvaXYn1TBI6a5pZMLrrrwd UCuarYazfJ1CeZwAoMsuWQ/u6jIiK49Ziej68JCnNm/p7+f0cYIsdGhVzTpDPV77aoAO QC3/D2cA9eZ0RLpZoYJ+SBqrrO+S/yTMLGk7Q/YZ2jlR9DPkGy27380oMxfvgYTGIZ6N i0lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=NAtjWtYoVyZRwhuRPKYlYZP7QUZVObU61H901gwMQTo=; b=CvegJw72fTrCY3O5T4X+ckV8p6EaB17FyZgNS4kpPEnV6j0xEzfe7ZBycptW7KIZPy F8fShBXYbb/zgK44dW8/gRfTOakEi/7THSr4jD/X4Th0JO/6d/8Akk1PLSIjzwtDkI4Q O3mIJo4bU0tCF9/m3y+R5VbMaX1EG4jFs9NYV4Jwh5GH9liVi+r6Rz+gg//niN1Unnss fH0jwJtAsTZyt2rxqvlPrQb45TDtlQrp0fLegaVDeiN/zV/gWgCH0UYmjjfjWXtfpdIg mIvaERY1PVKMKHU2xFIZRj3dP7inHjdFz1hMzHcQazvmQJLqtST9KFEX8yUqiX+avvOR 8KIw== X-Gm-Message-State: AOAM531QgYMfLZyQPe4dpX872+RbVNXrxjNMX6u9j215eqQ5WAQUK+NK DjUr79lLs3gr6ryE5i4N7/qQeo9pfQg= X-Google-Smtp-Source: ABdhPJybMTkRjGlW9gyzWtbr7fUQVH7Vasqas7ZEblD5+KSOATGQXmz3BSN74GRCLOVpWpbFXMzi5A== X-Received: by 2002:a1c:39c2:: with SMTP id g185mr1902838wma.28.1603459110827; Fri, 23 Oct 2020 06:18:30 -0700 (PDT) Received: from localhost.localdomain (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id c18sm3332334wrt.10.2020.10.23.06.18.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Oct 2020 06:18:30 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH 4/4] tests/acceptance: Test U-Boot/Linux from Armbian 20.08 on Orange Pi PC Date: Fri, 23 Oct 2020 15:18:08 +0200 Message-Id: <20201023131808.3198005-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201023131808.3198005-1-f4bug@amsat.org> References: <20201023131808.3198005-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-block@nongnu.org, Sai Pavan Boddu , Bin Meng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Michael Roth , Niek Linnenbank , Cleber Rosa , Bin Meng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Test U-Boot and Linux on the recent Armbian release 20.08. Suggested-by: Cleber Rosa Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
--- tests/acceptance/boot_linux_console.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index 803b4512a26..b604cfe7dab 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -829,6 +829,31 @@ def test_arm_orangepi_bionic_19_11(self): self.do_test_arm_orangepi_uboot_armbian(image_path) + @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'), + 'Test artifacts fetched from unreliable apt.armbian.com') + @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited') + def test_arm_orangepi_bionic_20_08(self): + """ + :avocado: tags=arch:arm + :avocado: tags=machine:orangepi-pc + :avocado: tags=device:sd + """ + + # This test download a 275 MiB compressed image and expand it + # to 1036 MiB, but the underlying filesystem is 1552 MiB... + # As we expand it to 2 GiB we are safe. + + image_url = ('https://dl.armbian.com/orangepipc/archive/' + 'Armbian_20.08.1_Orangepipc_bionic_current_5.8.5.img.xz') + image_hash = ('b4d6775f5673486329e45a0586bf06b6' + 'dbe792199fd182ac6b9c7bb6c7d3e6dd') + image_path_xz = self.fetch_asset(image_url, asset_hash=image_hash, + algorithm='sha256') + image_path = archive.extract(image_path_xz, self.workdir) + image_pow2ceil_expand(image_path) + + self.do_test_arm_orangepi_uboot_armbian(image_path) + @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited') def test_arm_orangepi_uboot_netbsd9(self): """