From nobody Sat May 18 14:01:50 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1674217860; cv=none; d=zohomail.com; s=zohoarc; b=kpcMTs/r6OKhOQdf7OTILpdW0AQw3up0AxNylTPxbH2Ul5fX+3b2svffsFUIuJdeOyfG/Ff0VbNh8nJSwmpWQf6q3kk7HSDLfSuWAT+zvptsV3Ilq2YykIMXYSfHJUAfvgnWDku1cuY7itSjX28H04A9YntoeDKZ/jz1XXRzkNQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674217860; 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=Y5K7GVk319HceZFwLFPBQxm2KAN+sqelChVQ5yqjTG4=; b=RA7fV9HnhAMvzXbKDNPRctgmEn9+tmKmd3iPyECmmyfVJMO2Hd7fn3sNPudOzu/LxTGvbrDfdJkelxIid/ZHpIIlhPQBeYTswQuWJiK76ildIrjDVcwc1rsUuRQWU45pcdFLMw79sJP4M5JVQxvrKhAbrGRKeLAVH+lO+57gPMk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16742178604167.588663946330371; Fri, 20 Jan 2023 04:31:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pIqVp-0001vX-QI; Fri, 20 Jan 2023 07:28:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pIqVj-0001PO-3K for qemu-devel@nongnu.org; Fri, 20 Jan 2023 07:28:47 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pIqVh-0000hp-CZ for qemu-devel@nongnu.org; Fri, 20 Jan 2023 07:28:46 -0500 Received: by mail-wr1-x42f.google.com with SMTP id z5so4712842wrt.6 for ; Fri, 20 Jan 2023 04:28:44 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id l7-20020a5d6747000000b002b57bae7174sm36386286wrw.5.2023.01.20.04.28.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Jan 2023 04:28:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Y5K7GVk319HceZFwLFPBQxm2KAN+sqelChVQ5yqjTG4=; b=x2B8LUiw2OU1kAfbDg55M2Oa9VuscQakN/yOnl34OC9zhLeFjNUFJTzUtjNqmfTpSg TQr+NZbUEEdFTV5o5FpTPxitmw+fS9q22QmUEIAosB2W2TIhjX7ZN6fEt4tKGfEFbPLW dWBSXNlAHmfymw7iisoECyMN0PB8pZE0uUwfGjXkzhDpPkJhvctA5Jk6Httb49XI5w04 w6q4WAX/Z6loBcU39gNoamDdN5KR67OgZ7iVku3K7lx2YL4wXmDUdxq3hltkekUlVCNg FgnQ4Y0a/iOp6FGTfOqTFjF4sYO9t5YAULCyja6vxXnz+Rvh/TaJaITGHRjgzNdXdQZg AdKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Y5K7GVk319HceZFwLFPBQxm2KAN+sqelChVQ5yqjTG4=; b=M8SVLHXEI3prg+ikkU2Sm7jPJ1P/cBtFQDrT/3o4kCwseJtiqYua7GrfCw2PwqUH1B pF06YwJ5rCzSL4MtBFx8v4VPzYqe2BMY0vgx5bR6N2F+JIFqLwsEuR2mS5pX/iAh09qh Co/YFukdfm63AlV0IhXxWxeuGr+sOhhmxZGwW/VoCxredkIjoIX90G0aMAtrD/UoDxP3 A+bIl6mGccN0+DD1y1hZ1OYfveO++Rzyi//8YMRitx895SkDynSMr9o/e0TK+OmT1mhn 9TiNIw0RMMEi9OQEfj3M+qIVxJDQT79jwUfBv1nDmrYhjmfDIGq63CEvk9jwntuKzTtu EFZg== X-Gm-Message-State: AFqh2kqLDz7N+BJJyiTDBkQLzTcge4bhx0nLD7OKMe43IZZhDzNhtbQh cMXsWz/G7E82xVkDfwTMDn+blnmaUu0lh/SC X-Google-Smtp-Source: AMrXdXuTtw4OEmH2G/b7KIhLYdOjM9xscDOG6vnc2VLvLTo3DWulmQaOfFf+kZGafuHBp1qmNUvsfw== X-Received: by 2002:adf:ffc3:0:b0:2bb:ede4:5dd4 with SMTP id x3-20020adfffc3000000b002bbede45dd4mr23298180wrs.34.1674217723825; Fri, 20 Jan 2023 04:28:43 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , qemu-arm@nongnu.org, Cleber Rosa , Beraldo Leal , Subbaraya Sundeep , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Wainer dos Santos Moschetta Subject: [PATCH 1/2] tests/avocado: Factor file_truncate() helper out Date: Fri, 20 Jan 2023 13:28:35 +0100 Message-Id: <20230120122836.81675-2-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230120122836.81675-1-philmd@linaro.org> References: <20230120122836.81675-1-philmd@linaro.org> 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::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1674217861580100007 Factor file_truncate() helper out of image_pow2ceil_expand() for reuse. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/avocado/boot_linux_console.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux= _console.py index 8c1d981586..49a4b22fe1 100644 --- a/tests/avocado/boot_linux_console.py +++ b/tests/avocado/boot_linux_console.py @@ -30,15 +30,19 @@ def pow2ceil(x): return 1 if x =3D=3D 0 else 2**(x - 1).bit_length() =20 +""" +Truncate file +""" +def file_truncate(path, size): + if size !=3D os.path.getsize(path): + with open(path, 'ab+') as fd: + fd.truncate(size) + """ Expand file size to next power of 2 """ def image_pow2ceil_expand(path): - size =3D os.path.getsize(path) - size_aligned =3D pow2ceil(size) - if size !=3D size_aligned: - with open(path, 'ab+') as fd: - fd.truncate(size_aligned) + file_truncate(path, pow2ceil(size)) =20 class LinuxKernelTest(QemuSystemTest): KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D0 ' --=20 2.38.1 From nobody Sat May 18 14:01:50 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1674217806; cv=none; d=zohomail.com; s=zohoarc; b=m9yiM+L1n4p22biyfPU+783lowc0jjcULXaFrDRKuDNY2CErAvjcutVHy3I+R8ogVricakvBP5pRmpH/F7LYJQOI5zDCTHneyXgqKcMc+3FVszwJJpKfAtescxJuXbbPXhe5WqFmTzO6SI3e6LvLZokE2stZhSB3a92OnJ3LGTE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674217806; 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=FGfd+s93OXmBs1xShD51Cu54C0TFiZYgj8zpzf2YW5Y=; b=CChIFm8POOZEZgACN+BCNmsF/KdwZCyEVwAF3vrx8QVNhIP6szdMTXO7t0B5pL5bOqMxEkE5GLqI9b5uTnpjYtAJacP2qH3DC+IMWzemaQVtjc18UwE3rSmNgILagY+zU3NEGu5Vu7yg1IH9offgF4cI1k7NG9VbxNM6Hb2Yk04= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674217806928797.2748003042262; Fri, 20 Jan 2023 04:30:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pIqVt-0002Uk-5j; Fri, 20 Jan 2023 07:28:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pIqVq-00027E-Ve for qemu-devel@nongnu.org; Fri, 20 Jan 2023 07:28:55 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pIqVp-0000iW-0e for qemu-devel@nongnu.org; Fri, 20 Jan 2023 07:28:54 -0500 Received: by mail-wm1-x32b.google.com with SMTP id o17-20020a05600c511100b003db021ef437so3546642wms.4 for ; Fri, 20 Jan 2023 04:28:52 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id d4-20020a05600c3ac400b003d9fa355387sm2082017wms.27.2023.01.20.04.28.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Jan 2023 04:28:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FGfd+s93OXmBs1xShD51Cu54C0TFiZYgj8zpzf2YW5Y=; b=WlXXHnZ2syaih3huXt3wIS3At7kWXRjAuMnWrQg6l5JkcRd/fBElkYKJwMbheAkPkd FBIPPwcMiJAfaODB3NnDzN4SaC/NqwpVOgch/WXQFGnYkwLxm1svaAf9It0AyvfQUmht zMsBROX71V+oJyQsgeu7HtJIORaE2y/nBaOJBKO0Jj3bJ72q4dv6kwX4rYCR62Ftrftp O56Jwpe2LRVdnFQ7MDBfqDL9laB5BXT5YsdgGmAzmg68zdc0bFVnqEwSL8vomV97lmzt r1xeGlisbwQvi5Jw4l6RyKM1t+hY6KTHCMZlnYP+Fh4uuo99dzGCjhPHrOSOWSR2pkRW 8cqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FGfd+s93OXmBs1xShD51Cu54C0TFiZYgj8zpzf2YW5Y=; b=0wxTKtLhr0pp00kGSEUDJniZR+Nt54U2hqQJMmSrtiQPQ9V4bWa2za2FEsEMaLO12p YYELXTPc4KxKgGCRmYPJvKDAbEhLcUR5Kaof37ERFVbhpuEOAy5pf4l0bm+9b4h5ilsj 369p73ftvjwNngHInIgYfq9z9nhoz2/03Awjmtn2b5D2H/fwT4qIk088SA/XX5N5laSF 48ajNxF+baeOePyTEVFdOj2R/BoCGL5AQU1UkYD5qb8akBwuTsCIH3xt650CU+m3ADW6 LuO+uyVPjp7gk1k9ulbYobj25AlhZ437WKooCCUix/yR6uIGna+rjeNH7b122GPNeWjk Pj2A== X-Gm-Message-State: AFqh2krxXwxlMkoputXcQpWs6+iFnfhmiythdsoOz8E0Ssg5Uwl5n1LR L3sQ+TIN6rsnGZh8UMBvarDFsDHgZVj0ulKA X-Google-Smtp-Source: AMrXdXs+Q/LthPS4L2eg9P0MMAoa2XVNiohFk0OThXKHebUiVpj/GJlNDjcGrn2wPc46ScCCUjJH2Q== X-Received: by 2002:a05:600c:210e:b0:3d9:ed30:6a73 with SMTP id u14-20020a05600c210e00b003d9ed306a73mr13892507wml.9.1674217728780; Fri, 20 Jan 2023 04:28:48 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , qemu-arm@nongnu.org, Cleber Rosa , Beraldo Leal , Subbaraya Sundeep , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Wainer dos Santos Moschetta Subject: [PATCH 2/2] tests/avocado: Truncate M2S-FG484 SOM SPI flash to 16MiB Date: Fri, 20 Jan 2023 13:28:36 +0100 Message-Id: <20230120122836.81675-3-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230120122836.81675-1-philmd@linaro.org> References: <20230120122836.81675-1-philmd@linaro.org> 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::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1674217807434100001 The M2S-FG484 SOM uses a 16 MiB SPI flash (Spansion S25FL128SDPBHICO). Since the test asset is bigger, truncate it to the correct size to avoid when running the test_arm_emcraft_sf2 test: qemu-system-arm: device requires 16777216 bytes, block backend provides 6= 7108864 bytes Add comment regarding the M2S-FG484 SOM hardware in hw/arm/msf2-som.c. Reported-by: C=C3=A9dric Le Goater Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: C=C3=A9dric Le Goater Tested-by: C=C3=A9dric Le Goater --- hw/arm/msf2-som.c | 5 ++++- tests/avocado/boot_linux_console.py | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c index a6df473ec9..7b3106c790 100644 --- a/hw/arm/msf2-som.c +++ b/hw/arm/msf2-som.c @@ -1,6 +1,9 @@ /* * SmartFusion2 SOM starter kit(from Emcraft) emulation. * + * M2S-FG484 SOM hardware architecture specification: + * https://www.emcraft.com/jdownloads/som/m2s/m2s-som-ha.pdf + * * Copyright (c) 2017 Subbaraya Sundeep * * Permission is hereby granted, free of charge, to any person obtaining a= copy @@ -87,7 +90,7 @@ static void emcraft_sf2_s2s010_init(MachineState *machine) =20 /* Attach SPI flash to SPI0 controller */ spi_bus =3D qdev_get_child_bus(dev, "spi0"); - spi_flash =3D qdev_new("s25sl12801"); + spi_flash =3D qdev_new("s25sl12801"); /* Spansion S25FL128SDPBHICO */ qdev_prop_set_uint8(spi_flash, "spansion-cr2nv", 1); if (dinfo) { qdev_prop_set_drive_err(spi_flash, "drive", diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux= _console.py index 49a4b22fe1..37600be4a2 100644 --- a/tests/avocado/boot_linux_console.py +++ b/tests/avocado/boot_linux_console.py @@ -399,6 +399,8 @@ def test_arm_emcraft_sf2(self): spi_hash =3D '65523a1835949b6f4553be96dec1b6a38fb05501' spi_path =3D self.fetch_asset(spi_url, asset_hash=3Dspi_hash) =20 + file_truncate(spi_path, 16 << 20) # Spansion S25FL128SDPBHICO is 1= 6 MiB + self.vm.set_console() kernel_command_line =3D self.KERNEL_COMMON_COMMAND_LINE self.vm.add_args('-kernel', uboot_path, --=20 2.38.1