From nobody Fri May 17 07:55:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615406680; cv=none; d=zohomail.com; s=zohoarc; b=cgNAVRrQlYRkiBOmsjnis55RCNKu48kcIv45NbhUOaqv+atih29rIrVXfl/QjfkjTRC0LmUKH1EKchRamS75ZmqWmIiiPNnr+gV2q46cq3yiFMFZeWhUrKIQoTU7gcqWOb5Rz+1eTjnnA7zivccLgwAmFzGr9Wg/C5hFXeyg5eo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615406680; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kFj03blwbcM66TuxYye9XnlpLa3NkLZCnKGhAwTXsCo=; b=He7iNM+nnjF4cU9l1tX6pSoPiFbGqm0uxXr1bvvUFRC+LcpWhLEwUpxRg8iGSoTk0+916jUzCoKnfeQ78PfJVTB5cINktXCLI0XrvkVV2haSIK0NhoWAnoViffTqGcejUD6W1Zw4wCe+1SQXxNlmn3s02dWA+RX4/Y1BkF0DmOg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615406680000886.5241307047243; Wed, 10 Mar 2021 12:04:40 -0800 (PST) Received: from localhost ([::1]:50932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK54Q-0002n0-NV for importer@patchew.org; Wed, 10 Mar 2021 15:04:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK4yd-0006P0-Cl; Wed, 10 Mar 2021 14:58:39 -0500 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]:42894) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lK4ya-0001cf-8h; Wed, 10 Mar 2021 14:58:38 -0500 Received: by mail-ed1-x52a.google.com with SMTP id v13so29922614edw.9; Wed, 10 Mar 2021 11:58:35 -0800 (PST) Received: from tuf.home (2a02-a456-6be8-1-d8ed-76d3-94d3-2909.fixed6.kpn.net. [2a02:a456:6be8:1:d8ed:76d3:94d3:2909]) by smtp.gmail.com with ESMTPSA id h13sm133570edz.71.2021.03.10.11.58.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 11:58:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kFj03blwbcM66TuxYye9XnlpLa3NkLZCnKGhAwTXsCo=; b=NeoFOJ+MezDk1XdLouQhVpsczB9l3x0SATw+ZTXBerLkmZX4rhVRv8X6PtOSEm7UlD 6Uw6I/sbKF5V1y2YcHQscgPS3Lk1ek0mkpYI34RdZB2kXMYjyHRc9bXfQvXEj5/02tw1 HR9gZ6XxVJkX+++GrOSOaKaQtB+Ij0dmpNtS4qsJEPeU6pA+tFpU0D1qNQ5669tWSz0V xaP6+i5a1BbGFivk/ckMSCoIVjiEMwKUXe2KRQopU+nW7hXYS01kD/YpkDFxJWEZNiY1 ZkjmuVCoVAXsaQ1pfcO0LZQ2CNvWM6J52tRYEI87sxWuwjFy2oSNQt0yz/kJ2GSxR/IY Cd+A== 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=kFj03blwbcM66TuxYye9XnlpLa3NkLZCnKGhAwTXsCo=; b=X3ffPyyakZG/ae7G1PlPDG5dbz++9lv0N5hr7OP3QW5jWhVF6UyD57Q3sMA8YPdF8f 6cC8M0v5dwCi6htYYoT8iyzlwCXmDdIOlCnc+O4LULqn9MvZQtJgpxm5hble3L+PvpN7 WBquWE2anM+aW5q9eyr5LLFHHjH/WiiZRJjNWuO3IsV/NmdMHz8A1qcerxp9SuFUecvL 0XIoY2EfJPIuMb/TLc/50W4Bv2J8GWCbkjnNjgambTYglfbaquetAGsVyKvPsODnU2G6 5DTDMY6vbfzl5mWtqGN2C9S51HcLC664bjYHX4lrdyICISnBw1XPDlp30dvFHLN7dszZ uKgQ== X-Gm-Message-State: AOAM533FaLIdYjXT/UYPisSSnMzq/C1lj/WLA4B9bkq6fKayWTXA/G0U 7F0NwYStPrCquHL2KhoCNjyhtS/Ez0t3HA== X-Google-Smtp-Source: ABdhPJz7XURGxZg+7SEUP/FsHg4u8kqkOSdFCfQ5GXXYh0hW27mY8kmHyqaVyORO48rzEXNI749MlA== X-Received: by 2002:a50:cc4a:: with SMTP id n10mr5194201edi.371.1615406314537; Wed, 10 Mar 2021 11:58:34 -0800 (PST) From: Niek Linnenbank To: qemu-devel@nongnu.org Subject: [PATCH v4 1/5] hw/net/allwinner-sun8i-emac: traverse transmit queue using TX_CUR_DESC register value Date: Wed, 10 Mar 2021 20:58:16 +0100 Message-Id: <20210310195820.21950-2-nieklinnenbank@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210310195820.21950-1-nieklinnenbank@gmail.com> References: <20210310195820.21950-1-nieklinnenbank@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=nieklinnenbank@gmail.com; helo=mail-ed1-x52a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: peter.maydell@linaro.org, thuth@redhat.com, berrange@redhat.com, wrampazz@redhat.com, f4bug@amsat.org, b.galvani@gmail.com, Niek Linnenbank , qemu-arm@nongnu.org, Pavel.Dovgaluk@ispras.ru, crosa@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Currently the emulated EMAC for sun8i always traverses the transmit queue from the head when transferring packets. It searches for a list of consecut= ive descriptors whichs are flagged as ready for processing and transmits their = payloads accordingly. The controller stops processing once it finds a descriptor tha= t is not marked ready. While the above behaviour works in most situations, it is not the same as t= he actual EMAC in hardware. Actual hardware uses the TX_CUR_DESC register value to ke= ep track of the last position in the transmit queue and continues processing from th= at position when software triggers the start of DMA processing. The currently emulated = behaviour can lead to packet loss on transmit when software fills the transmit queue with= ready descriptors that overlap the tail of the circular list. This commit modifies the emulated EMAC for sun8i such that it processes the transmit queue using the TX_CUR_DESC register in the same way as hardwa= re. Signed-off-by: Niek Linnenbank Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/net/allwinner-sun8i-emac.c | 58 +++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/hw/net/allwinner-sun8i-emac.c b/hw/net/allwinner-sun8i-emac.c index 042768922c..e586c147e5 100644 --- a/hw/net/allwinner-sun8i-emac.c +++ b/hw/net/allwinner-sun8i-emac.c @@ -339,35 +339,40 @@ static void allwinner_sun8i_emac_update_irq(AwSun8iEm= acState *s) qemu_set_irq(s->irq, (s->int_sta & s->int_en) !=3D 0); } =20 -static uint32_t allwinner_sun8i_emac_next_desc(AwSun8iEmacState *s, - FrameDescriptor *desc, - size_t min_size) +static bool allwinner_sun8i_emac_desc_owned(FrameDescriptor *desc, + size_t min_buf_size) { - uint32_t paddr =3D desc->next; + return (desc->status & DESC_STATUS_CTL) && (min_buf_size =3D=3D 0 || + (desc->status2 & DESC_STATUS2_BUF_SIZE_MASK) >=3D min_buf_size); +} =20 - dma_memory_read(&s->dma_as, paddr, desc, sizeof(*desc)); +static void allwinner_sun8i_emac_get_desc(AwSun8iEmacState *s, + FrameDescriptor *desc, + uint32_t phys_addr) +{ + dma_memory_read(&s->dma_as, phys_addr, desc, sizeof(*desc)); +} =20 - if ((desc->status & DESC_STATUS_CTL) && - (desc->status2 & DESC_STATUS2_BUF_SIZE_MASK) >=3D min_size) { - return paddr; - } else { - return 0; - } +static uint32_t allwinner_sun8i_emac_next_desc(AwSun8iEmacState *s, + FrameDescriptor *desc) +{ + const uint32_t nxt =3D desc->next; + allwinner_sun8i_emac_get_desc(s, desc, nxt); + return nxt; } =20 -static uint32_t allwinner_sun8i_emac_get_desc(AwSun8iEmacState *s, - FrameDescriptor *desc, - uint32_t start_addr, - size_t min_size) +static uint32_t allwinner_sun8i_emac_find_desc(AwSun8iEmacState *s, + FrameDescriptor *desc, + uint32_t start_addr, + size_t min_size) { uint32_t desc_addr =3D start_addr; =20 /* Note that the list is a cycle. Last entry points back to the head. = */ while (desc_addr !=3D 0) { - dma_memory_read(&s->dma_as, desc_addr, desc, sizeof(*desc)); + allwinner_sun8i_emac_get_desc(s, desc, desc_addr); =20 - if ((desc->status & DESC_STATUS_CTL) && - (desc->status2 & DESC_STATUS2_BUF_SIZE_MASK) >=3D min_size) { + if (allwinner_sun8i_emac_desc_owned(desc, min_size)) { return desc_addr; } else if (desc->next =3D=3D start_addr) { break; @@ -383,14 +388,14 @@ static uint32_t allwinner_sun8i_emac_rx_desc(AwSun8iE= macState *s, FrameDescriptor *desc, size_t min_size) { - return allwinner_sun8i_emac_get_desc(s, desc, s->rx_desc_curr, min_siz= e); + return allwinner_sun8i_emac_find_desc(s, desc, s->rx_desc_curr, min_si= ze); } =20 static uint32_t allwinner_sun8i_emac_tx_desc(AwSun8iEmacState *s, - FrameDescriptor *desc, - size_t min_size) + FrameDescriptor *desc) { - return allwinner_sun8i_emac_get_desc(s, desc, s->tx_desc_head, min_siz= e); + allwinner_sun8i_emac_get_desc(s, desc, s->tx_desc_curr); + return s->tx_desc_curr; } =20 static void allwinner_sun8i_emac_flush_desc(AwSun8iEmacState *s, @@ -470,7 +475,8 @@ static ssize_t allwinner_sun8i_emac_receive(NetClientSt= ate *nc, bytes_left -=3D desc_bytes; =20 /* Move to the next descriptor */ - s->rx_desc_curr =3D allwinner_sun8i_emac_next_desc(s, &desc, 64); + s->rx_desc_curr =3D allwinner_sun8i_emac_find_desc(s, &desc, desc.= next, + AW_SUN8I_EMAC_MIN= _PKT_SZ); if (!s->rx_desc_curr) { /* Not enough buffer space available */ s->int_sta |=3D INT_STA_RX_BUF_UA; @@ -495,10 +501,10 @@ static void allwinner_sun8i_emac_transmit(AwSun8iEmac= State *s) size_t transmitted =3D 0; static uint8_t packet_buf[2048]; =20 - s->tx_desc_curr =3D allwinner_sun8i_emac_tx_desc(s, &desc, 0); + s->tx_desc_curr =3D allwinner_sun8i_emac_tx_desc(s, &desc); =20 /* Read all transmit descriptors */ - while (s->tx_desc_curr !=3D 0) { + while (allwinner_sun8i_emac_desc_owned(&desc, 0)) { =20 /* Read from physical memory into packet buffer */ bytes =3D desc.status2 & DESC_STATUS2_BUF_SIZE_MASK; @@ -524,7 +530,7 @@ static void allwinner_sun8i_emac_transmit(AwSun8iEmacSt= ate *s) packet_bytes =3D 0; transmitted++; } - s->tx_desc_curr =3D allwinner_sun8i_emac_next_desc(s, &desc, 0); + s->tx_desc_curr =3D allwinner_sun8i_emac_next_desc(s, &desc); } =20 /* Raise transmit completed interrupt */ --=20 2.25.1 From nobody Fri May 17 07:55:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615406496; cv=none; d=zohomail.com; s=zohoarc; b=ixvKqubouohiO/DKWpafYRTpCIIm6UrE83JROO8lmDLX5gvyAXrlgTUCmmU8KYLHkS9P8+KfMuQ9bLorC44oEWvmgRTinR467so+gc1l+LCfpu3idwangqNJauvcUWXiq/Cj6t7Ie6vDqKhKAogN17lmqxiZzqnd3PsV506z0Tg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615406496; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Of1z6geDv8kZk9LnBbpOQsAJfxsJJ8cv34uRwfRRCqs=; b=kqdhJyBM/gruXSHeOcdjhK+D1RCglk+VeS6WpEPfc56/wqyNrLvFD00XTeAX9e+Bhnq9MAy6mvjlOEcLy5FjvH61LejD+7gaaTWSMSQA224AbFuYj/sFSRVuZGDKiG0Xoux3NpEIh+bVVoZzTdxuwRADDeaO7uNAPXgcz8MQGaM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615406496565193.3494088288801; Wed, 10 Mar 2021 12:01:36 -0800 (PST) Received: from localhost ([::1]:44164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK51T-0008Gs-Fh for importer@patchew.org; Wed, 10 Mar 2021 15:01:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56014) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK4ye-0006QX-IN; Wed, 10 Mar 2021 14:58:40 -0500 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]:42672) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lK4yb-0001dY-80; Wed, 10 Mar 2021 14:58:40 -0500 Received: by mail-ej1-x636.google.com with SMTP id c10so41127853ejx.9; Wed, 10 Mar 2021 11:58:36 -0800 (PST) Received: from tuf.home (2a02-a456-6be8-1-d8ed-76d3-94d3-2909.fixed6.kpn.net. [2a02:a456:6be8:1:d8ed:76d3:94d3:2909]) by smtp.gmail.com with ESMTPSA id h13sm133570edz.71.2021.03.10.11.58.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 11:58:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Of1z6geDv8kZk9LnBbpOQsAJfxsJJ8cv34uRwfRRCqs=; b=uLO1oWwr4M2KPBRBm4/e2GWaSrNlNOMJy6j4Q+FWGiML36RS03hNkgZ9CpGS6OsqHU DNqRuA7TxnlYP2cW5XRmcDv72oIKWIyDEzpvGu8+yPPGHnp4baprYJq69BES9ygjzHq8 t3DmVlOy4UpGBC07p2WhDyU1M9UqYJFiEMTqVXVuRmii6um5dJyWotpIuGxE4dr/FJwY ED6Z1pjL/LZm0ZB7lVpgCSTuqKqMfQV+PcglrwohHavg4bNC9bQIMrD7kaqwWR9nZtDp DM2hWd51ncZld4cy6BkM4nZUWnudzYGf9Ob7E5Y+9nZGYYJ+P5NgMKPw7XsSfihN5uNU D1GA== 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=Of1z6geDv8kZk9LnBbpOQsAJfxsJJ8cv34uRwfRRCqs=; b=tZaptFQi8pE7sBlxPRMD7c6rFj2f/Mu6cIXmSXWhpXcJn6+d9G/h6bAI7VaXbGxbw0 Ho+YlCOFJS1NLPKC3VrzdVsDtxtaEOjr7BAAYoM98ILu2Inzq/Pfg4bAspPNmzvHA0pF zX+dKdUIENDnFs2ch8fM+2k68wHPQIPj2MCo/FrtnfU79xt7gYFJPor+oujbiQVtBY9Q xI+IhF1s2g60XSgtSsB0R3e/FZ19upJMMVI7chyIDRO7rcJg4Ng4+/4FZYzEwhkOWeRJ DIBZeFOUDvhkKVWrlB10z3wULnQoKNFtvYIEhmJwXmLQP/VCWHjV2Iiw7B+mdecvj3iA p+xQ== X-Gm-Message-State: AOAM533oh/j26+FsHfy5+OlUm4WK65/W+V18DinAIQiZ+ONyflc0nJHm L4OBqqQ0GEYW6WtPRZTTxw0z7/cP/dABew== X-Google-Smtp-Source: ABdhPJxqWhgn+938auNRsa3GKcEXVcXLOdCIp1XOfuEusHqnMOYQOiA+emhZCW+NYh7daXhqLIbKxw== X-Received: by 2002:a17:906:3856:: with SMTP id w22mr109769ejc.77.1615406315631; Wed, 10 Mar 2021 11:58:35 -0800 (PST) From: Niek Linnenbank To: qemu-devel@nongnu.org Subject: [PATCH v4 2/5] tests/acceptance/boot_linux_console: remove Armbian 19.11.3 bionic test for orangepi-pc machine Date: Wed, 10 Mar 2021 20:58:17 +0100 Message-Id: <20210310195820.21950-3-nieklinnenbank@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210310195820.21950-1-nieklinnenbank@gmail.com> References: <20210310195820.21950-1-nieklinnenbank@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::636; envelope-from=nieklinnenbank@gmail.com; helo=mail-ej1-x636.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: peter.maydell@linaro.org, thuth@redhat.com, berrange@redhat.com, wrampazz@redhat.com, f4bug@amsat.org, b.galvani@gmail.com, Niek Linnenbank , qemu-arm@nongnu.org, Pavel.Dovgaluk@ispras.ru, crosa@redhat.com, Willian Rampazzo , philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The image for Armbian 19.11.3 bionic has been removed from the armbian serv= er. Without the image as input the test arm_orangepi_bionic_19_11 cannot run. This commit removes the test completely and merges the code of the generic = function do_test_arm_orangepi_uboot_armbian back with the 20.08 test. Signed-off-by: Niek Linnenbank Reviewed-by: Willian Rampazzo --- tests/acceptance/boot_linux_console.py | 72 ++++++++------------------ 1 file changed, 23 insertions(+), 49 deletions(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index eb01286799..9fadea9958 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -802,7 +802,29 @@ def test_arm_orangepi_sd(self): # Wait for VM to shut down gracefully self.vm.wait() =20 - def do_test_arm_orangepi_uboot_armbian(self, 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=3Darch:arm + :avocado: tags=3Dmachine:orangepi-pc + :avocado: tags=3Ddevice: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 =3D ('https://dl.armbian.com/orangepipc/archive/' + 'Armbian_20.08.1_Orangepipc_bionic_current_5.8.5.img.= xz') + image_hash =3D ('b4d6775f5673486329e45a0586bf06b6' + 'dbe792199fd182ac6b9c7bb6c7d3e6dd') + image_path_xz =3D self.fetch_asset(image_url, asset_hash=3Dimage_h= ash, + algorithm=3D'sha256') + image_path =3D archive.extract(image_path_xz, self.workdir) + image_pow2ceil_expand(image_path) + self.vm.set_console() self.vm.add_args('-drive', 'file=3D' + image_path + ',if=3Dsd,form= at=3Draw', '-nic', 'user', @@ -828,54 +850,6 @@ def do_test_arm_orangepi_uboot_armbian(self, image_pat= h): 'to ') self.wait_for_console_pattern('Starting Load Kernel Modules...') =20 - @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=3Darch:arm - :avocado: tags=3Dmachine:orangepi-pc - :avocado: tags=3Ddevice:sd - """ - - # This test download a 196MB compressed image and expand it to 1GB - image_url =3D ('https://dl.armbian.com/orangepipc/archive/' - 'Armbian_19.11.3_Orangepipc_bionic_current_5.3.9.7z') - image_hash =3D '196a8ffb72b0123d92cea4a070894813d305c71e' - image_path_7z =3D self.fetch_asset(image_url, asset_hash=3Dimage_h= ash) - image_name =3D 'Armbian_19.11.3_Orangepipc_bionic_current_5.3.9.im= g' - image_path =3D 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('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=3Darch:arm - :avocado: tags=3Dmachine:orangepi-pc - :avocado: tags=3Ddevice: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 =3D ('https://dl.armbian.com/orangepipc/archive/' - 'Armbian_20.08.1_Orangepipc_bionic_current_5.8.5.img.= xz') - image_hash =3D ('b4d6775f5673486329e45a0586bf06b6' - 'dbe792199fd182ac6b9c7bb6c7d3e6dd') - image_path_xz =3D self.fetch_asset(image_url, asset_hash=3Dimage_h= ash, - algorithm=3D'sha256') - image_path =3D 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): """ --=20 2.25.1 From nobody Fri May 17 07:55:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615406493; cv=none; d=zohomail.com; s=zohoarc; b=iVKVt2yHctKaHC0SMNovplCa6nd1Dv95v93RxLedCEHGOUstE9dvj++u3r7pKIU1z+cMIJFvjoal1qVxENpCwnRqHoIkYg3XECCxkxC9muaSVR8BUmIYRyF1EHJ64TBEaX7Nnu1H3OMwn7T/o+O5nbahoa9FW6O09mkLKuTHTeI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615406493; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7+Rz9VtTzj18ZejGjRujsTac3478spKZatBuoAAa8Eg=; b=dSumVJ0NcWkZ4v0UAmNcdrNO9rAOttRQG0bEBn/xvNPaNE6bjdc8UqayN9t/4HdOdL1Cbj8DlTm7r4tTA9VVLAbYrhE8iP186noUKqNGxwtbt7v1BQv3T6QSptIrgaI4JlwlSQNpPgHP6JP8rtv8Qd+Tu3NZLG2E3rLRR4fEfLI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615406493583753.02732659362; Wed, 10 Mar 2021 12:01:33 -0800 (PST) Received: from localhost ([::1]:44026 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK51Q-0008D5-48 for importer@patchew.org; Wed, 10 Mar 2021 15:01:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56026) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK4ye-0006Ql-R6; Wed, 10 Mar 2021 14:58:42 -0500 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]:41809) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lK4yc-0001eC-Fp; Wed, 10 Mar 2021 14:58:40 -0500 Received: by mail-ed1-x534.google.com with SMTP id b7so29987046edz.8; Wed, 10 Mar 2021 11:58:37 -0800 (PST) Received: from tuf.home (2a02-a456-6be8-1-d8ed-76d3-94d3-2909.fixed6.kpn.net. [2a02:a456:6be8:1:d8ed:76d3:94d3:2909]) by smtp.gmail.com with ESMTPSA id h13sm133570edz.71.2021.03.10.11.58.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 11:58:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7+Rz9VtTzj18ZejGjRujsTac3478spKZatBuoAAa8Eg=; b=hd3dKjrSHCktVDN9LoDJzWPU2IjNkEeFaFoDrr4NkC8d3XmVfxfZZLrSa8jiulaIOB rwkewxRF++CmFQyo+hTkqf/P/zLPbKVAR6GEz+HwZj9Y3IxjPaYKddNf2tOvH/YO5i1w gRIPZt5LDg31YrMc+Juk1rGKQXD54u7NFqLUnh8l9EiYvygxD72yM5RE+JtCUJTebr7Q kZOne9UCzdXrnC3KFhofKI7GKRYrohdWxz5TH0/aAG3KWSLTyvGv8fUD1ysleP2lVcpa FN+OayVyb+6XgVdhktE0Rds7Vv8dZFNi0NDnO2yMJS+Hxoiv01/DThfIUcTHxIzZkpK5 zxSg== 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=7+Rz9VtTzj18ZejGjRujsTac3478spKZatBuoAAa8Eg=; b=jOKjlmnOtCD/IlD13/WljDOBGeWSYcPtlgwhVO8Vy9l+rSOZ69i4ouMXkehYXaTBHD uWZtHh/iy42bhVxIxEUkjW6pkFR8zHDGFyM+3k/Cu7Zg+j2S+5N4EwBawdLOhiVgJUiJ e/2GuuIlMXIy03lT6QuEqi0On6MBTjdXfrtQHoUnN0/UkYwpS7hKFjHm6Hga98rdNG9Y hB46dsDQnd/LfjBoP++Joppcq+el1InkqHYhvasYFFegxDHXZ1Q8Sh1D+UnWFSXmeXRO c1jx0N9SywtfB0ZXXxzBMaEtqICwu19g6dk/s84yKen9b/fgN+1zGUSA9CT7hWbwTdI0 b3Dw== X-Gm-Message-State: AOAM530PIDdrgOFYIkUwzbKqdmAxJIyo0VjUrrx5C7znThSdkTuhDGYt uVGLQMP+2BiICk7lHYIDj/e6eFxYwVGUAQ== X-Google-Smtp-Source: ABdhPJwV7cSq7b2YuBsZ5au6h5iwvVAgl6SSuUr97o+IJ2lbWVTJ786P3j9YUlSFQTlzu0XzBo794Q== X-Received: by 2002:a05:6402:57:: with SMTP id f23mr5021977edu.323.1615406316871; Wed, 10 Mar 2021 11:58:36 -0800 (PST) From: Niek Linnenbank To: qemu-devel@nongnu.org Subject: [PATCH v4 3/5] tests/acceptance/boot_linux_console: change URL for test_arm_orangepi_bionic_20_08 Date: Wed, 10 Mar 2021 20:58:18 +0100 Message-Id: <20210310195820.21950-4-nieklinnenbank@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210310195820.21950-1-nieklinnenbank@gmail.com> References: <20210310195820.21950-1-nieklinnenbank@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::534; envelope-from=nieklinnenbank@gmail.com; helo=mail-ed1-x534.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: peter.maydell@linaro.org, thuth@redhat.com, berrange@redhat.com, wrampazz@redhat.com, f4bug@amsat.org, b.galvani@gmail.com, Niek Linnenbank , qemu-arm@nongnu.org, Pavel.Dovgaluk@ispras.ru, crosa@redhat.com, Willian Rampazzo , philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Update the download URL of the Armbian 20.08 Bionic image for test_arm_orangepi_bionic_20_08 of the orangepi-pc machine. The archive.armbian.com URL contains more images and should keep stable for a longer period of time than dl.armbian.com. Signed-off-by: Niek Linnenbank Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo --- tests/acceptance/boot_linux_console.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index 9fadea9958..4a7a6830ca 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -816,7 +816,7 @@ def test_arm_orangepi_bionic_20_08(self): # to 1036 MiB, but the underlying filesystem is 1552 MiB... # As we expand it to 2 GiB we are safe. =20 - image_url =3D ('https://dl.armbian.com/orangepipc/archive/' + image_url =3D ('https://archive.armbian.com/orangepipc/archive/' 'Armbian_20.08.1_Orangepipc_bionic_current_5.8.5.img.= xz') image_hash =3D ('b4d6775f5673486329e45a0586bf06b6' 'dbe792199fd182ac6b9c7bb6c7d3e6dd') --=20 2.25.1 From nobody Fri May 17 07:55:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615406840; cv=none; d=zohomail.com; s=zohoarc; b=BQzG9fUTKl4a+vnuoFytKJWFS1Kg3pJv3HfwrJzgsFArkjA2g4ebUEDgJs0ShlRH5c0UoPDjqvFzfJTtGw8KJ8f2K6ydyXqw6DwPI+u8Fe5FeP3lamseJN1YPNbzMlBnpEeGuE/M6m06ljcV03OgUxk6ofwNw6+PIJj1MRYePoc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615406840; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GElvY6lQEKWnWHpKoAsaZHwYXhujdV8DzzBoh9QrUks=; b=cIhCrf7/7sy+rzoTRNGOv1GrYH2izcF2f5eN6lrhI30SF/32O0mLMQ6wCohAhvdbdENyfPeQLN03t7GpEJHxqn0rPaSmZGwcrupQuO5WIPqIq6COztPgWiIpV7cF3BDv1O1RVwk8uOwtpWuI5B2QLlGQHaGYCRIax1t44e/tyKE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615406840946544.294713192506; Wed, 10 Mar 2021 12:07:20 -0800 (PST) Received: from localhost ([::1]:54928 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK571-0004Xl-OZ for importer@patchew.org; Wed, 10 Mar 2021 15:07:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56052) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK4yj-0006SE-1r; Wed, 10 Mar 2021 14:58:45 -0500 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]:39056) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lK4yd-0001ei-CX; Wed, 10 Mar 2021 14:58:44 -0500 Received: by mail-ej1-x62b.google.com with SMTP id p7so29837000eju.6; Wed, 10 Mar 2021 11:58:38 -0800 (PST) Received: from tuf.home (2a02-a456-6be8-1-d8ed-76d3-94d3-2909.fixed6.kpn.net. [2a02:a456:6be8:1:d8ed:76d3:94d3:2909]) by smtp.gmail.com with ESMTPSA id h13sm133570edz.71.2021.03.10.11.58.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 11:58:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GElvY6lQEKWnWHpKoAsaZHwYXhujdV8DzzBoh9QrUks=; b=X/A8f7iodhx1eosJXsPDPyAzkEdUa/LHw6zRUedY5KSdorGxGJY3xaN1nAlw1vwBaw Xuo3gidvoukZnhtF69kV6oh/c5lHZ4a9CqDL+REEYnIp2amuQfLghH1pux8A/4obXiN1 +OIkqstmShJmBYvYTHcHTY92LKUPmkb4ryMoCyqaxugq0q5r0bnBVg2Lkm8KwLtZw31Q ZBxYDqi2u+FjzprfMMrga5dekIeqpJn2g+s1SCByTam0wQ+poYqHoaQu4guBUUkHaYX8 sCe7GCtm4+Ot5yVsyK3M6JqcLshNtY2r6l8GvrlTUCCEZWl0IBHQ87Px6cKYGpyXmxBQ CwzA== 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=GElvY6lQEKWnWHpKoAsaZHwYXhujdV8DzzBoh9QrUks=; b=X1u5hFs+88d/gxFu/h6SKAex7ehrvLGeVocKjPqcF+mjbKMg147x+Ow26pyKBxpobb HjSf698Nl87GDpUUSF+YUolK4fODKoTuPIK7ut1iCDf/ekBkC6p9KA+eMlLuRehesJx6 wcw0jaVXLTC314lhbGWjzwCQ3ktKOYOyRyRylMXNoUMmGNFKver2xtL++jTldhvkSRvk GEOg3NDLKszCGRwSyGcXSu6jU8OEvWJ7jgjqpP4TQHtpQADnUQXxsGwweHGvJKZU+wEi prAIycJdClq2bSLCc1QFbx2iHGOn2Z7cuaIoaZPaBr0PN013ULOZDzBBEIQP+qU2lp6v sy6A== X-Gm-Message-State: AOAM53319b40yWaiJJsaTP9x53CQ3VhhpoO4RIFlYnR9bqjKogRiHOjw zesAqA2lfE4k3J/4EpwgJumoyb79pxrAWQ== X-Google-Smtp-Source: ABdhPJxRk7KDqzuV28okIW4rkRoWQ080Lbb7YXbA3QiXWI+b8eCt8Rh4HPZCZdNkFSvaaERyDW+U4g== X-Received: by 2002:a17:907:7683:: with SMTP id jv3mr118520ejc.450.1615406317820; Wed, 10 Mar 2021 11:58:37 -0800 (PST) From: Niek Linnenbank To: qemu-devel@nongnu.org Subject: [PATCH v4 4/5] tests/acceptance: update sunxi kernel from armbian to 5.10.16 Date: Wed, 10 Mar 2021 20:58:19 +0100 Message-Id: <20210310195820.21950-5-nieklinnenbank@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210310195820.21950-1-nieklinnenbank@gmail.com> References: <20210310195820.21950-1-nieklinnenbank@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62b; envelope-from=nieklinnenbank@gmail.com; helo=mail-ej1-x62b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: peter.maydell@linaro.org, thuth@redhat.com, berrange@redhat.com, wrampazz@redhat.com, f4bug@amsat.org, b.galvani@gmail.com, Niek Linnenbank , qemu-arm@nongnu.org, Pavel.Dovgaluk@ispras.ru, crosa@redhat.com, Willian Rampazzo , philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The linux kernel 4.20.7 binary for sunxi has been removed from apt.armbian.= com: $ ARMBIAN_ARTIFACTS_CACHED=3Dyes AVOCADO_ALLOW_LARGE_STORAGE=3Dyes avocad= o --show=3Dapp,console run -t machine:orangepi-pc tests/acceptance/boot_lin= ux_console.py Fetching asset from tests/acceptance/boot_linux_console.py:BootLinuxConso= le.test_arm_orangepi ... (1/6) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_or= angepi: CANCEL: Missing asset https://apt.armbian.com/pool/main/l/linux-4.20.7-= sunxi/linux-image-dev-sunxi_5.75_armhf.deb (0.55 s) This commit updates the sunxi kernel to 5.10.16 for the acceptance tests of the orangepi-pc and cubieboard machines. Signed-off-by: Niek Linnenbank Reviewed-by: Willian Rampazzo --- tests/acceptance/boot_linux_console.py | 40 +++++++++++++------------- tests/acceptance/replay_kernel.py | 8 +++--- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index 4a7a6830ca..04a8b23352 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -515,12 +515,12 @@ def test_arm_cubieboard_initrd(self): :avocado: tags=3Dmachine:cubieboard """ deb_url =3D ('https://apt.armbian.com/pool/main/l/' - 'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.de= b') - deb_hash =3D '1334c29c44d984ffa05ed10de8c3361f33d78315' + 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_= armhf.deb') + deb_hash =3D '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinuz-4.20.7-sunxi') - dtb_path =3D '/usr/lib/linux-image-dev-sunxi/sun4i-a10-cubieboard.= dtb' + '/boot/vmlinuz-5.10.16-sunxi') + dtb_path =3D '/usr/lib/linux-image-current-sunxi/sun4i-a10-cubiebo= ard.dtb' dtb_path =3D self.extract_from_deb(deb_path, dtb_path) initrd_url =3D ('https://github.com/groeck/linux-build-test/raw/' '2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/' @@ -557,12 +557,12 @@ def test_arm_cubieboard_sata(self): :avocado: tags=3Dmachine:cubieboard """ deb_url =3D ('https://apt.armbian.com/pool/main/l/' - 'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.de= b') - deb_hash =3D '1334c29c44d984ffa05ed10de8c3361f33d78315' + 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_= armhf.deb') + deb_hash =3D '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinuz-4.20.7-sunxi') - dtb_path =3D '/usr/lib/linux-image-dev-sunxi/sun4i-a10-cubieboard.= dtb' + '/boot/vmlinuz-5.10.16-sunxi') + dtb_path =3D '/usr/lib/linux-image-current-sunxi/sun4i-a10-cubiebo= ard.dtb' dtb_path =3D self.extract_from_deb(deb_path, dtb_path) rootfs_url =3D ('https://github.com/groeck/linux-build-test/raw/' '2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/' @@ -686,12 +686,12 @@ def test_arm_orangepi(self): :avocado: tags=3Dmachine:orangepi-pc """ deb_url =3D ('https://apt.armbian.com/pool/main/l/' - 'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.de= b') - deb_hash =3D '1334c29c44d984ffa05ed10de8c3361f33d78315' + 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_= armhf.deb') + deb_hash =3D '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinuz-4.20.7-sunxi') - dtb_path =3D '/usr/lib/linux-image-dev-sunxi/sun8i-h3-orangepi-pc.= dtb' + '/boot/vmlinuz-5.10.16-sunxi') + dtb_path =3D '/usr/lib/linux-image-current-sunxi/sun8i-h3-orangepi= -pc.dtb' dtb_path =3D self.extract_from_deb(deb_path, dtb_path) =20 self.vm.set_console() @@ -713,12 +713,12 @@ def test_arm_orangepi_initrd(self): :avocado: tags=3Dmachine:orangepi-pc """ deb_url =3D ('https://apt.armbian.com/pool/main/l/' - 'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.de= b') - deb_hash =3D '1334c29c44d984ffa05ed10de8c3361f33d78315' + 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_= armhf.deb') + deb_hash =3D '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinuz-4.20.7-sunxi') - dtb_path =3D '/usr/lib/linux-image-dev-sunxi/sun8i-h3-orangepi-pc.= dtb' + '/boot/vmlinuz-5.10.16-sunxi') + dtb_path =3D '/usr/lib/linux-image-current-sunxi/sun8i-h3-orangepi= -pc.dtb' dtb_path =3D self.extract_from_deb(deb_path, dtb_path) initrd_url =3D ('https://github.com/groeck/linux-build-test/raw/' '2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/' @@ -758,12 +758,12 @@ def test_arm_orangepi_sd(self): :avocado: tags=3Ddevice:sd """ deb_url =3D ('https://apt.armbian.com/pool/main/l/' - 'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.de= b') - deb_hash =3D '1334c29c44d984ffa05ed10de8c3361f33d78315' + 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_= armhf.deb') + deb_hash =3D '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinuz-4.20.7-sunxi') - dtb_path =3D '/usr/lib/linux-image-dev-sunxi/sun8i-h3-orangepi-pc.= dtb' + '/boot/vmlinuz-5.10.16-sunxi') + dtb_path =3D '/usr/lib/linux-image-current-sunxi/sun8i-h3-orangepi= -pc.dtb' dtb_path =3D self.extract_from_deb(deb_path, dtb_path) rootfs_url =3D ('http://storage.kernelci.org/images/rootfs/buildro= ot/' 'kci-2019.02/armel/base/rootfs.ext2.xz') diff --git a/tests/acceptance/replay_kernel.py b/tests/acceptance/replay_ke= rnel.py index c1cb862468..8c68caae31 100644 --- a/tests/acceptance/replay_kernel.py +++ b/tests/acceptance/replay_kernel.py @@ -185,12 +185,12 @@ def test_arm_cubieboard_initrd(self): :avocado: tags=3Dmachine:cubieboard """ deb_url =3D ('https://apt.armbian.com/pool/main/l/' - 'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.de= b') - deb_hash =3D '1334c29c44d984ffa05ed10de8c3361f33d78315' + 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_= armhf.deb') + deb_hash =3D '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinuz-4.20.7-sunxi') - dtb_path =3D '/usr/lib/linux-image-dev-sunxi/sun4i-a10-cubieboard.= dtb' + '/boot/vmlinuz-5.10.16-sunxi') + dtb_path =3D '/usr/lib/linux-image-current-sunxi/sun4i-a10-cubiebo= ard.dtb' dtb_path =3D self.extract_from_deb(deb_path, dtb_path) initrd_url =3D ('https://github.com/groeck/linux-build-test/raw/' '2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/' --=20 2.25.1 From nobody Fri May 17 07:55:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615406692; cv=none; d=zohomail.com; s=zohoarc; b=Vo0EPdJWK5YYtl+Xx0wvhU+LUwqdCJ2JxR94z7zU4FgKAtxSqkTmADWK6cBP/4HxZxixLv39jsm0MkaI4SeYw/BXJL0AlM/14tYuZBJZU2l/ByLhiQIj9gjBgU7Sa13uPUG7gVl6136QHKOZbA5f+WoKmNgNxrufsh4XR2WoOU8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615406692; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=I5OcZ2uMrlpXu4COyyiFNZKnn1GKPKft8+tPd6y0XpA=; b=RgB4qP2wfQIx63igE7E1QBQPYHu/Z66WGHYHN2tYPUGLhWkVucfgyvilokT/N7zGvW5pbjA6HwT1A9v8dmCL4MlddwrcVc3AiKSHwvhUJyXzoON9Xj1v/ZdOn3qkFFlg7Cpp2KAS1jHrg2oEZWum7s6N1z7UFpZ6j1exUdZGMuo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615406692218974.0064225753324; Wed, 10 Mar 2021 12:04:52 -0800 (PST) Received: from localhost ([::1]:51456 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK54a-00031v-2r for importer@patchew.org; Wed, 10 Mar 2021 15:04:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK4yi-0006Ru-Ry; Wed, 10 Mar 2021 14:58:44 -0500 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]:39120) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lK4ye-0001ff-3E; Wed, 10 Mar 2021 14:58:44 -0500 Received: by mail-ed1-x52a.google.com with SMTP id h10so29991082edl.6; Wed, 10 Mar 2021 11:58:39 -0800 (PST) Received: from tuf.home (2a02-a456-6be8-1-d8ed-76d3-94d3-2909.fixed6.kpn.net. [2a02:a456:6be8:1:d8ed:76d3:94d3:2909]) by smtp.gmail.com with ESMTPSA id h13sm133570edz.71.2021.03.10.11.58.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 11:58:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I5OcZ2uMrlpXu4COyyiFNZKnn1GKPKft8+tPd6y0XpA=; b=fPY/VpHa2oeO14dIukTicykjnVRtgkTKqsHORKYxwtzSMi4eKzuueh+weifMeeC3FZ bTDkKbf40Muf94GsGlC+j7MOevhsx90ntPzbvr4lkCXX5DWv2AHfLrWoVoiaj3efYYDz ifR3wn33CiQJR7C8LGpRv084CTuutz/gIU29hpKIYWvi+aKVBdYnzzTz7XWVne9F5Tzd vVn6jSnCDtP1faW5V9REFbwIvvwLaGkx3emYj9H7Apa9AyJdg3j/kXoP23cCKdgUcDd9 5H/g3vD6YiI3wQGj+WKCQh05Ytiii9RnOl/dP6iNsDx8HNvVVIepw8wTmbCoewz2s37b w8Qw== 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=I5OcZ2uMrlpXu4COyyiFNZKnn1GKPKft8+tPd6y0XpA=; b=SYVP6Ky5wlVH0Xjg1pRYWfExbofK3mMqcyFOCSjLBe7+I4z5zERcmRicQp3MjKb8Hx lnsR4mzGWLTOGecCHj3m+cY1O5fVqw9JbXh29cAIOqPLHxcw5n1yX65Mk6WN+mE38PsK pjF/ElIS0AP7SrTcqwDSPRmgWg/y+TKWl1A3JuGyWlXZrCg4T0skj9QvYByHDsLKNqgd AP69O3opIF5O0yWfglh49bUbYDvbFD9VkAv5mA+CaTlwf130etMq/FbbxBySKosIN4hV wPtkKYye0nBaoQavOfhG7pcxCqgFujOBf+sLiMd1Ea5zFzFbg4PByZrW9fmJPMkm5y1E LCVA== X-Gm-Message-State: AOAM530LzijmmvjwCq9CkawVGtAMBx8dMoUTyKRhtHYnjSN+x5nWP1Yg eRU2ygJ6HKq/PvqITbLatYLwxlAvEmYFdA== X-Google-Smtp-Source: ABdhPJxjIxA0yD8wEUJBgPpPvq90bWR5+FE0UKc2mhThjOwY1qGuB4XB1cqrmsD+gW5OuHkE29PCHQ== X-Received: by 2002:a05:6402:10c8:: with SMTP id p8mr5092352edu.144.1615406318563; Wed, 10 Mar 2021 11:58:38 -0800 (PST) From: Niek Linnenbank To: qemu-devel@nongnu.org Subject: [PATCH v4 5/5] tests/acceptance: drop ARMBIAN_ARTIFACTS_CACHED condition for orangepi-pc, cubieboard tests Date: Wed, 10 Mar 2021 20:58:20 +0100 Message-Id: <20210310195820.21950-6-nieklinnenbank@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210310195820.21950-1-nieklinnenbank@gmail.com> References: <20210310195820.21950-1-nieklinnenbank@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=nieklinnenbank@gmail.com; helo=mail-ed1-x52a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: peter.maydell@linaro.org, thuth@redhat.com, berrange@redhat.com, wrampazz@redhat.com, f4bug@amsat.org, b.galvani@gmail.com, Niek Linnenbank , qemu-arm@nongnu.org, Pavel.Dovgaluk@ispras.ru, crosa@redhat.com, Willian Rampazzo , philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Previously the ARMBIAN_ARTIFACTS_CACHED pre-condition was added to allow ru= nning tests that have already existing armbian.com artifacts stored in the local = avocado cache, but do not have working URLs to download a fresh copy. At this time of writing the URLs for artifacts on the armbian.com server ar= e updated and working. Any future broken URLs will result in a skipped acceptance test, for exampl= e: (1/5) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_ora= ngepi: CANCEL: Missing asset https://apt.armbian.com/pool/main/l/linux-4.20.7-su= nxi/linux-image-dev-sunxi_5.75_armhf.deb (0.53 s) This commits removes the ARMBIAN_ARTIFACTS_CACHED pre-condition such that the acceptance tests for the orangepi-pc and cubieboard machines can run. Signed-off-by: Niek Linnenbank Reviewed-by: Willian Rampazzo --- tests/acceptance/boot_linux_console.py | 12 ------------ tests/acceptance/replay_kernel.py | 2 -- 2 files changed, 14 deletions(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index 04a8b23352..1ca32ecf25 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -507,8 +507,6 @@ def test_arm_exynos4210_initrd(self): self.wait_for_console_pattern('Boot successful.') # TODO user command, for now the uart is stuck =20 - @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'), - 'Test artifacts fetched from unreliable apt.armbian.com') def test_arm_cubieboard_initrd(self): """ :avocado: tags=3Darch:arm @@ -549,8 +547,6 @@ def test_arm_cubieboard_initrd(self): 'system-control@1c00000') # cubieboard's reboot is not functioning; omit reboot test. =20 - @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'), - 'Test artifacts fetched from unreliable apt.armbian.com') def test_arm_cubieboard_sata(self): """ :avocado: tags=3Darch:arm @@ -678,8 +674,6 @@ def test_arm_quanta_gsj_initrd(self): self.wait_for_console_pattern( 'Give root password for system maintenance') =20 - @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'), - 'Test artifacts fetched from unreliable apt.armbian.com') def test_arm_orangepi(self): """ :avocado: tags=3Darch:arm @@ -705,8 +699,6 @@ def test_arm_orangepi(self): console_pattern =3D 'Kernel command line: %s' % kernel_command_line self.wait_for_console_pattern(console_pattern) =20 - @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'), - 'Test artifacts fetched from unreliable apt.armbian.com') def test_arm_orangepi_initrd(self): """ :avocado: tags=3Darch:arm @@ -749,8 +741,6 @@ def test_arm_orangepi_initrd(self): # Wait for VM to shut down gracefully self.vm.wait() =20 - @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'), - 'Test artifacts fetched from unreliable apt.armbian.com') def test_arm_orangepi_sd(self): """ :avocado: tags=3Darch:arm @@ -802,8 +792,6 @@ def test_arm_orangepi_sd(self): # Wait for VM to shut down gracefully self.vm.wait() =20 - @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): """ diff --git a/tests/acceptance/replay_kernel.py b/tests/acceptance/replay_ke= rnel.py index 8c68caae31..71facdaa75 100644 --- a/tests/acceptance/replay_kernel.py +++ b/tests/acceptance/replay_kernel.py @@ -177,8 +177,6 @@ def test_arm_virt(self): self.run_rr(kernel_path, kernel_command_line, console_pattern, shi= ft=3D1) =20 @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') - @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'), - 'Test artifacts fetched from unreliable apt.armbian.com') def test_arm_cubieboard_initrd(self): """ :avocado: tags=3Darch:arm --=20 2.25.1