Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 29C9AC87FD2 for ; Fri, 8 Aug 2025 13:52:59 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ukNVt-0003iZ-DY; Fri, 08 Aug 2025 09:52:05 -0400 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 1ukNVM-0003ZN-OR for qemu-riscv@nongnu.org; Fri, 08 Aug 2025 09:51:36 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ukNVJ-0002Hu-3K for qemu-riscv@nongnu.org; Fri, 08 Aug 2025 09:51:32 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-455fdfb5d04so11414845e9.2 for ; Fri, 08 Aug 2025 06:51:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1754661087; x=1755265887; darn=nongnu.org; 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=5l7n3D9ctZbGZm4ngX5c30d2jXCKAPPPYSiErk+U9JA=; b=ta3vhjwLZFf5A9TsOptl2/6EW7gKCzTL5GqybHhKJ4r/ip2yf8KuNanoQMKmLeeSld qYnqANjQnZdhgYjv80OIZwsZ0DqSar+caYJ5uoGS0N18oMvP14es9hI0kyWRg43qZqql 9Q7ZjqmwItiMh9oY21Weta5xm/Ker7R2aoTJ/AMk2/5OwBDXHGCGvDY3w+BIBu6/1gCy P8BOBH2mGPpx/zaGnEvelVJr03q6ytCZwIHfIsepnd1gfq9Z8uxEESUcpPNaKj5JsjVR DrFM3i813kJf/uXqmxiW26Cpqty15n/P6x+89tcSSli1onjjxqI+mSVFCgXBlg0DbixR wkyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754661087; x=1755265887; 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=5l7n3D9ctZbGZm4ngX5c30d2jXCKAPPPYSiErk+U9JA=; b=RZwH56erblP8/FhG3L/WkVfX07Ps3rwmOGLNynEob34N3PdXNsnhKvdpJP+mXmjx9v YZodHOQ12d9666Kfb8M33NKmXu18xRFWysoiILw6sLjZOn2W1dTBcnKBbGhv84ZiFwHd em9zCQ6FHbIa/O2v3hyS34OHjxFzlIbpcnFwjfsC9iKuNApZwZ7uZJDUdxBdEGL27Qr9 N+jeaypNB802r4fy57S321RxUkC+tUPbrbknxA83S7e5+83jncMcuh10+mE9hesIqowP MQG31uDB1z5nbxStNgKoYdrCWBIhMDfoS/CE9hxjexkV/kLaZwSs7vH5OVA3t2XwXQ58 j/zA== X-Forwarded-Encrypted: i=1; AJvYcCWHhX7m9K9fcQmxrVw0NCDOIiCXOW0laacVdqiKLRyWqyzTcKqJtOzWa/3MGe4m9pl8NKt1itSMQEN2@nongnu.org X-Gm-Message-State: AOJu0YzjOQV1e82kIlJnyB4jRLfnTO3baVRwdqfdd4j8xop4k1zubOeQ veHyCAY/kt/Xys3WjkkkUfZnopAqMaDFrpQC1LtVc2VlQd7jex49YckXRTJQ7qx7LjM= X-Gm-Gg: ASbGncsb8Hs08pDes8YSKqwl/GVgc5wWLhmhXI52olMCsti+ALqlXYyR2x4ccd5Awgw Eivtn9RfZGF+EJB2lV48ubTX4lOXDNZXVm2EFmZeVQXvIpebOtB4jPGRfJwugJ6AiVjjtye15fh gvuUgUhifEG7q4TmuR7AuwV1hr+7W5DkD6tq7PX3GydzF/KABdTWcM8U2n17PhMmyBfqR+mg+sG mAqBxCxyALkww+6BgLiHnsUGVswUr/KZfYDRJaO6ureNzoHAuyTyVMklVaRoC66tdMKvgj+QKpF dk7IpnmipvpFDpLhHtjwi/pZ5lQLkLZKcUH6gTk96wTFwmLYtS+v4z+uIa4Tazrg/NMEGmssEJV N10Lfy98s+m2RjCcl5QidtCjitQDTzSo8MRmVEhOQtWefGAfqkc8AEWcJ3X078rNS7gSUZGO3 X-Google-Smtp-Source: AGHT+IHjP+LfvGq0+GFppwTBcfZwQeILlxu//QZAS1Vn2mW1Idvjp5FeSBKD1eY8d2GZM727Rjua+g== X-Received: by 2002:a05:600c:4449:b0:459:dfde:332e with SMTP id 5b1f17b1804b1-459f4f1447cmr25906755e9.29.1754661087139; Fri, 08 Aug 2025 06:51:27 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b8e9464f46sm16174067f8f.19.2025.08.08.06.51.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 08 Aug 2025 06:51:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Guenter Roeck , qemu-riscv@nongnu.org, Liu Zhiwei , Bin Meng , Daniel Henrique Barboza , Alistair Francis , Weiwei Li , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Palmer Dabbelt , qemu-block@nongnu.org Subject: [PATCH-for-10.1 2/2] tests/functional: Test SPI-SD adapter without SD card connected Date: Fri, 8 Aug 2025 15:51:15 +0200 Message-ID: <20250808135115.77310-3-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250808135115.77310-1-philmd@linaro.org> References: <20250808135115.77310-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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-riscv@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-riscv-bounces+qemu-riscv=archiver.kernel.org@nongnu.org Sender: qemu-riscv-bounces+qemu-riscv=archiver.kernel.org@nongnu.org SPI-SD adapter should be usable, even without any SD card wired. Refactor test_riscv64_sifive_u_mmc_spi() to make it more generic and add another test, inspired by this report: https://lore.kernel.org/qemu-devel/5b2dc427-f0db-4332-a997-fe0c82415acd@roeck-us.net/ Inspired-by: Guenter Roeck Signed-off-by: Philippe Mathieu-Daudé --- tests/functional/test_riscv64_sifive_u.py | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/tests/functional/test_riscv64_sifive_u.py b/tests/functional/test_riscv64_sifive_u.py index dc4cb8a4a96..f7ab1abfd56 100755 --- a/tests/functional/test_riscv64_sifive_u.py +++ b/tests/functional/test_riscv64_sifive_u.py @@ -27,25 +27,37 @@ class SifiveU(LinuxKernelTest): 'rootfs.ext2.gz'), 'b6ed95610310b7956f9bf20c4c9c0c05fea647900df441da9dfe767d24e8b28b') - def test_riscv64_sifive_u_mmc_spi(self): + def do_test_riscv64_sifive_u_mmc_spi(self, connect_card): self.set_machine('sifive_u') kernel_path = self.ASSET_KERNEL.fetch() rootfs_path = self.uncompress(self.ASSET_ROOTFS) self.vm.set_console() kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + - 'root=/dev/mmcblk0 rootwait ' 'earlycon=sbi console=ttySIF0 ' - 'panic=-1 noreboot') + 'root=/dev/mmcblk0 ') self.vm.add_args('-kernel', kernel_path, - '-drive', f'file={rootfs_path},if=sd,format=raw', '-append', kernel_command_line, '-no-reboot') + if connect_card: + self.vm.add_args('-drive', f'file={rootfs_path},if=sd,format=raw') + kernel_command_line += 'panic=-1 noreboot rootwait ' + pattern = 'Boot successful.' + else: + kernel_command_line += 'panic=0 noreboot ' + pattern = 'Cannot open root device "mmcblk0" or unknown-block(0,0)' + self.vm.launch() - self.wait_for_console_pattern('Boot successful.') + self.wait_for_console_pattern(pattern) os.remove(rootfs_path) + def _test_riscv64_sifive_u_nommc_spi(self): + self.do_test_riscv64_sifive_u_mmc_spi(False) + + def test_riscv64_sifive_u_mmc_spi(self): + self.do_test_riscv64_sifive_u_mmc_spi(True) + if __name__ == '__main__': LinuxKernelTest.main() -- 2.49.0