From patchwork Fri Mar 15 13:05:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil V L X-Patchwork-Id: 13593440 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 B3879C54E58 for ; Fri, 15 Mar 2024 13:06:42 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rl7Fy-0002mK-T6; Fri, 15 Mar 2024 09:05:55 -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 1rl7Fr-0002if-3A for qemu-devel@nongnu.org; Fri, 15 Mar 2024 09:05:48 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rl7Ff-0006FZ-4w for qemu-devel@nongnu.org; Fri, 15 Mar 2024 09:05:46 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1dbd32cff0bso15497015ad.0 for ; Fri, 15 Mar 2024 06:05:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1710507933; x=1711112733; 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=PkDt8GM6nQ3pKknMgJXpLHP0C4rfjUmHwI1ZOZTyda8=; b=Og4TRqs3p2gmWrajxrKotIosWBcuRAAIwMAfsiKStUU9192FIbh76gt+ebeLCHwa4B wAPvoUTQdO9ia1abqtXxdKKUYzSXJAFeXrQWavfdg/T4m2uQpJoQRTmSSZVToiESOdc1 IfABs+zj7V+7Ev0Lz1k0sU2WSCLGO7vXP89OwLxft31XCtb0F2AhrQgS4xwYjQ1bPMLr KySfNc/YKJ4yNpqJqFBQwnkvdaB9NN2hr0GB2Alv8iUw7lrqRMiX7D2urt/Pe3MfSWVZ rFAd6PcerCiT7NWOknhlISXJDe5CYyoa2FUMMrsN2VqJmdXIM4PwXfAEBPjzaJ3YmKld vK8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710507933; x=1711112733; 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=PkDt8GM6nQ3pKknMgJXpLHP0C4rfjUmHwI1ZOZTyda8=; b=DCylVzbOPI9D152Z4qeplUdowmfupAszBL7SYiP14ar4LZBFQenW2GnU6uskdkRSKE 5dvPgoKU5ZQyNWQyC0dcgrj0nv2k7MpKoB4y02bC1FjG+kbkaPp1qnTbFazWSd/+DoMj 3kV9YQE0lHpUUQo0HWWPq1ZmSbr/E1J1Rq3PutTI0V6oxXqzwOdqzvXIQiY+/lT2DVP5 0q1K1m9pRkfCwmwrBVGCgJYexxt3MGBBWKEc+N/EojUYFcwesM31oAzZXJFrviiAclrE +jQcRY6rKiRLend5TsUO0h381f/lJxMHbPKHS6tiGnJXYSpyB0CSyl9fDm8Fa4YE2q53 sOwA== X-Gm-Message-State: AOJu0YwFHyAZF8Rd6g2U6OICekBs1Ie309QVEH5gtKrjeDMFle8XGQzs ACrEywDQWW86QL9/VisgzWu8moMhrWV8rbmxm7fF+sRT8THT17Hqyv8ZXHVQJqwC7iQu2aH7Biv J X-Google-Smtp-Source: AGHT+IEIMC5cNvmcK/Y+GmDmj1IPVhWbnEaZoJ1dxOLBHywHX9QgZZbtjMEUZpCRXht7yQnwZ0APlw== X-Received: by 2002:a17:902:c401:b0:1dd:7de5:7ac4 with SMTP id k1-20020a170902c40100b001dd7de57ac4mr6697522plk.38.1710507932709; Fri, 15 Mar 2024 06:05:32 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.184.12]) by smtp.gmail.com with ESMTPSA id lh12-20020a170903290c00b001defd3e64d6sm182474plb.22.2024.03.15.06.05.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Mar 2024 06:05:32 -0700 (PDT) From: Sunil V L To: qemu-devel@nongnu.org, qemu-arm@nongnu.org, qemu-riscv@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , "Michael S . Tsirkin" , Igor Mammedov , Ani Sinha , Laurent Vivier , Daniel Henrique Barboza , Alistair Francis , Andrew Jones , Anup Patel , Haibo1 Xu , Sunil V L Subject: [PATCH 01/12] roms/edk2-build.py: Add --module support Date: Fri, 15 Mar 2024 18:35:08 +0530 Message-Id: <20240315130519.2378765-2-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240315130519.2378765-1-sunilvl@ventanamicro.com> References: <20240315130519.2378765-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=sunilvl@ventanamicro.com; helo=mail-pl1-x632.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, T_SCC_BODY_TEXT_LINE=-0.01 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org UefiTestToolsPkg which should use edk2-build.py needs --module parameter support. Add this optional parameter handling. Signed-off-by: Sunil V L --- roms/edk2-build.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/roms/edk2-build.py b/roms/edk2-build.py index e564765aaa..3bfe200929 100755 --- a/roms/edk2-build.py +++ b/roms/edk2-build.py @@ -192,6 +192,9 @@ def build_one(cfg, build, jobs = None, silent = False, nologs = False): cmdline += [ '-n', jobs ] for arch in b['arch'].split(): cmdline += [ '-a', arch ] + if 'module' in b: + for module in b['module'].split(): + cmdline += [ '-m', module ] if 'opts' in b: for name in b['opts'].split(): section = 'opts.' + name From patchwork Fri Mar 15 13:05:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil V L X-Patchwork-Id: 13593439 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 A1271C54E67 for ; Fri, 15 Mar 2024 13:06:42 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rl7Ft-0002kN-S2; Fri, 15 Mar 2024 09:05:50 -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 1rl7Fr-0002iy-VV for qemu-devel@nongnu.org; Fri, 15 Mar 2024 09:05:48 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rl7Fl-0006H0-RG for qemu-devel@nongnu.org; Fri, 15 Mar 2024 09:05:47 -0400 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-1dcab44747bso13864015ad.1 for ; Fri, 15 Mar 2024 06:05:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1710507938; x=1711112738; 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=XJnPsHFmkVMUnscQauDvD3T+tPj+dvrsErrOjqviBzw=; b=OC0REzmUwSB0rpJcWVZ9MnDz416DTkFBIs+MZjrtmU/1ac+rEQAznreadnMfIPwEWa jlVJgNRg/KaTGt/1YjxLAexMdOvNXDi3EDwRgSEO4oCAQs0T4uYQaSIraD59/xUjqGRJ AM4Uwy9X4c3Mly0G94f7Ci6lIcjWVPt2TgZtIoEEvjP43L+ngYydh4aJ3Q46zQNnf3Z9 0OJ0QkRAZ9j1BNSkFIrLB8Jh/iIUpFd93Z6DvFsLA4ScOKDtQtJLfCbpcfN0cMuON3t3 tn61EPGxEd6TxchkqleXnuMUAwO0meDNUfmu38PuhEhl+v9GxkdwJ0+x+eLOso0CsOzf x5UQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710507938; x=1711112738; 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=XJnPsHFmkVMUnscQauDvD3T+tPj+dvrsErrOjqviBzw=; b=w5/8Ccismm+hK5bny3jZaMnyVqBOp1FDiS8BAWDg5y8n1boM6crvUJ6+LXkHR6XmDB xEkAqRNqYaSST/bK63YU/SaQth5MPqGoNReH36Lt5XjinlyDvKY/7o4fF+2xDMLoIdAi DgK0PClnCLD2uDqISBKzKML6/ILnhVMyk2HChCAwDuTrtWWEkeoKkVQ0sbj5aSuDXuLV Cr2F2cC3fJW07VokjwzBHRun3CH+SkYarJFkW32/05o+sEr3iVzGvVr9NSUFavMqCBZ+ xN4EpTQqBGz37TbfNHFnBrOhOyvehmm/eAgAvXoZSWJGviv5zrWflXL5UdfL1H4iqXE5 HeSw== X-Gm-Message-State: AOJu0YybbtcKhF0Q1KUUaZHuHPOZlYNI0iVfI1u/UiDgfnwmzByQhqeS Q6i5yyYgW5n8V82CJTZpzAwklowkrHWip+2OzGp3ntGNRoJ3772MK3MH6nHsht2Iz/B7Kf7LFCN p X-Google-Smtp-Source: AGHT+IGR4CJNSJneoElRe2BYuJWBHbkINrQPradDMaBz000VqXmCj9c4UZ+6JL8N0B8aUL2A6RFy8Q== X-Received: by 2002:a17:903:503:b0:1dd:bdf6:3746 with SMTP id jn3-20020a170903050300b001ddbdf63746mr4177077plb.40.1710507937931; Fri, 15 Mar 2024 06:05:37 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.184.12]) by smtp.gmail.com with ESMTPSA id lh12-20020a170903290c00b001defd3e64d6sm182474plb.22.2024.03.15.06.05.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Mar 2024 06:05:37 -0700 (PDT) From: Sunil V L To: qemu-devel@nongnu.org, qemu-arm@nongnu.org, qemu-riscv@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , "Michael S . Tsirkin" , Igor Mammedov , Ani Sinha , Laurent Vivier , Daniel Henrique Barboza , Alistair Francis , Andrew Jones , Anup Patel , Haibo1 Xu , Sunil V L Subject: [PATCH 02/12] uefi-test-tools/UefiTestToolsPkg: Add RISC-V support Date: Fri, 15 Mar 2024 18:35:09 +0530 Message-Id: <20240315130519.2378765-3-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240315130519.2378765-1-sunilvl@ventanamicro.com> References: <20240315130519.2378765-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62b; envelope-from=sunilvl@ventanamicro.com; helo=mail-pl1-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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Enable building the test application for RISC-V with appropriate dependencies updated. Signed-off-by: Sunil V L Acked-by: Gerd Hoffmann --- tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc b/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc index c8511cd732..0902fd3c73 100644 --- a/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc +++ b/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc @@ -19,7 +19,7 @@ PLATFORM_VERSION = 0.1 PLATFORM_NAME = UefiTestTools SKUID_IDENTIFIER = DEFAULT - SUPPORTED_ARCHITECTURES = ARM|AARCH64|IA32|X64 + SUPPORTED_ARCHITECTURES = ARM|AARCH64|IA32|X64|RISCV64 BUILD_TARGETS = DEBUG [BuildOptions.IA32] @@ -60,6 +60,10 @@ [LibraryClasses.IA32, LibraryClasses.X64] BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf + RegisterFilterLib|MdePkg/Library/RegisterFilterLibNull/RegisterFilterLibNull.inf + +[LibraryClasses.RISCV64] + BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf [PcdsFixedAtBuild] gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F From patchwork Fri Mar 15 13:09:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil V L X-Patchwork-Id: 13593446 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 AA6DEC54E67 for ; Fri, 15 Mar 2024 13:11:40 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rl7Jo-0005xE-38; Fri, 15 Mar 2024 09:09:52 -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 1rl7Ja-0005eI-6Z for qemu-devel@nongnu.org; Fri, 15 Mar 2024 09:09:40 -0400 Received: from mail-pg1-x52c.google.com ([2607:f8b0:4864:20::52c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rl7JW-0007cq-L2 for qemu-devel@nongnu.org; Fri, 15 Mar 2024 09:09:37 -0400 Received: by mail-pg1-x52c.google.com with SMTP id 41be03b00d2f7-5dbd519bde6so1604038a12.1 for ; Fri, 15 Mar 2024 06:09:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1710508173; x=1711112973; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Y4vX0WH0NUhjpqoGC54S3e1oXOXXObwA9DbtQ2MGi0g=; b=dpbDMCxEvWES4UrjeR6mWrMh7ranEAo92ypKgzMniMXuMof1fy2xgtEXXgUtGaO9vJ bUVgFLoXqo7fa1+Nb1MWBpG124tquYFS1TgW4RWjt4osVWjf4zir+cxxnVlLxgzhoK+K RphAs5sWCEA1yyhEcZAV8+r2t+nDC7w2432TGLxnPpaCDjzvhkDtqeTNjc6h+tySquFv PW9vSoOkZ8HSEVOI/BQ/diyif5pYEwM31SCjsPjWP330qTHDQjSQKTM2RX1fbOzeLo7V 6MOE6LGJVA1i6SepTyN7nbvGxlC8Q72wMg/PYlXVjtCs5VZH3fnDMbPDyNdEK9W7XJGd bKYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710508173; x=1711112973; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Y4vX0WH0NUhjpqoGC54S3e1oXOXXObwA9DbtQ2MGi0g=; b=aEGQxzVQUvg5i3cshI++yHnraxdYFPEhGzJhH8rz8N+294c1Y+Ljm6d5If4f8ebfI8 mv3f41fIaqke97YBWeZj+nnc57lLH3Hbx44bSx5eMlPTHnTBci/HJ7v0YizWBlJO6dyz mp5bMHdAYH2cR1Fh9qDys+6llpYwO3dBbop88U9qDKoiVw7PMK57d3rK0ejeuH0f6Y/j HBzl2FuKfD7wx4w1ahiXg+qzYTZQDr0Mn2RM96agDi4qBVRD4j+aZjvqAjlWpsYN5d1P yI3UOMGztt4dcvRC/ZQZJKb9ptgnQu+YxFfWHInqZ8BWgLxNj7EMjslm6NqO9PyUe2yw Y56g== X-Gm-Message-State: AOJu0YzBah3NrL4WfmotDZSSyRg3EAdf8cpsBXYAlcwspgx5m2AahJrI e1zkriMGELATXxTx8yLHTNMdKscleC7Qn59ulDCyVKamgR7uuhZbLfuz33KSwPqqaSTUp7Vp7x0 f X-Google-Smtp-Source: AGHT+IHrOjBklu9HBEAjzciZt8OGddqy1g0WWGgBjLYwax43oKa2s5ys0rBE6kE14xLzlx8R1BE8Lw== X-Received: by 2002:a17:90a:ea0e:b0:29b:b15d:5353 with SMTP id w14-20020a17090aea0e00b0029bb15d5353mr4612835pjy.31.1710508172750; Fri, 15 Mar 2024 06:09:32 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.184.12]) by smtp.gmail.com with ESMTPSA id r3-20020a17090ad40300b0029c68206e2bsm2886663pju.0.2024.03.15.06.09.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Mar 2024 06:09:32 -0700 (PDT) From: Sunil V L To: qemu-devel@nongnu.org, qemu-arm@nongnu.org, qemu-riscv@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , "Michael S . Tsirkin" , Igor Mammedov , Ani Sinha , Laurent Vivier , Daniel Henrique Barboza , Alistair Francis , Andrew Jones , Anup Patel , Haibo1 Xu , Sunil V L Subject: [PATCH 03/12] uefi-test-tools: Add support for python based build script Date: Fri, 15 Mar 2024 18:39:15 +0530 Message-Id: <20240315130924.2378849-1-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52c; envelope-from=sunilvl@ventanamicro.com; helo=mail-pg1-x52c.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, T_SCC_BODY_TEXT_LINE=-0.01 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org edk2-funcs.sh which is used in this Makefile, was removed in the commit c28a2891f3 ("edk2: update build script"). It is replaced with a python based script. So, update the Makefile and add the configuration file as required to support the python based build script. Signed-off-by: Sunil V L --- tests/uefi-test-tools/Makefile | 18 +++---- tests/uefi-test-tools/uefi-test-build.config | 57 ++++++++++++++++++++ 2 files changed, 63 insertions(+), 12 deletions(-) create mode 100644 tests/uefi-test-tools/uefi-test-build.config diff --git a/tests/uefi-test-tools/Makefile b/tests/uefi-test-tools/Makefile index 0c003f2877..f94738b645 100644 --- a/tests/uefi-test-tools/Makefile +++ b/tests/uefi-test-tools/Makefile @@ -12,7 +12,7 @@ edk2_dir := ../../roms/edk2 images_dir := ../data/uefi-boot-images -emulation_targets := arm aarch64 i386 x86_64 +emulation_targets := arm aarch64 i386 x86_64 riscv64 uefi_binaries := bios-tables-test intermediate_suffixes := .efi .fat .iso.raw @@ -56,7 +56,8 @@ Build/%.iso.raw: Build/%.fat # stripped from, the argument. map_arm_to_uefi = $(subst arm,ARM,$(1)) map_aarch64_to_uefi = $(subst aarch64,AA64,$(call map_arm_to_uefi,$(1))) -map_i386_to_uefi = $(subst i386,IA32,$(call map_aarch64_to_uefi,$(1))) +map_riscv64_to_uefi = $(subst riscv64,RISCV64,$(call map_aarch64_to_uefi,$(1))) +map_i386_to_uefi = $(subst i386,IA32,$(call map_riscv64_to_uefi,$(1))) map_x86_64_to_uefi = $(subst x86_64,X64,$(call map_i386_to_uefi,$(1))) map_to_uefi = $(subst .,,$(call map_x86_64_to_uefi,$(1))) @@ -70,7 +71,7 @@ Build/%.fat: Build/%.efi uefi_bin_b=$$(stat --format=%s -- $<) && \ uefi_fat_kb=$$(( (uefi_bin_b * 11 / 10 + 1023) / 1024 )) && \ uefi_fat_kb=$$(( uefi_fat_kb >= 64 ? uefi_fat_kb : 64 )) && \ - mkdosfs -C $@ -n $(basename $(@F)) -- $$uefi_fat_kb + mkdosfs -C $@ -n "bios-test" -- $$uefi_fat_kb MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI/BOOT MTOOLS_SKIP_CHECK=1 mcopy -i $@ -- $< \ @@ -95,15 +96,8 @@ Build/%.fat: Build/%.efi # we must mark the recipe manually as recursive, by using the "+" indicator. # This way, when the inner "make" starts a parallel build of the target edk2 # module, it can communicate with the outer "make"'s job server. -Build/bios-tables-test.%.efi: build-edk2-tools - +./build.sh $(edk2_dir) BiosTablesTest $* $@ - -build-edk2-tools: - cd $(edk2_dir)/BaseTools && git submodule update --init --force - $(MAKE) -C $(edk2_dir)/BaseTools \ - PYTHON_COMMAND=$${EDK2_PYTHON_COMMAND:-python3} \ - EXTRA_OPTFLAGS='$(EDK2_BASETOOLS_OPTFLAGS)' \ - EXTRA_LDFLAGS='$(EDK2_BASETOOLS_LDFLAGS)' +Build/bios-tables-test.%.efi: + $(PYTHON) ../../roms/edk2-build.py --config uefi-test-build.config clean: rm -rf Build Conf log diff --git a/tests/uefi-test-tools/uefi-test-build.config b/tests/uefi-test-tools/uefi-test-build.config new file mode 100644 index 0000000000..4fb89f7db9 --- /dev/null +++ b/tests/uefi-test-tools/uefi-test-build.config @@ -0,0 +1,57 @@ +[global] +core = ../../roms/edk2 + +#################################################################################### +# arm + +[build.arm] +conf = UefiTestToolsPkg/UefiTestToolsPkg.dsc +plat = UefiTestTools +module = UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf +dest = ./Build +arch = ARM +cpy1 = ARM/BiosTablesTest.efi bios-tables-test.arm.efi + +#################################################################################### +# aarch64 + +[build.aarch64] +conf = UefiTestToolsPkg/UefiTestToolsPkg.dsc +plat = UefiTestTools +module = UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf +dest = ./Build +arch = AARCH64 +cpy1 = AARCH64/BiosTablesTest.efi bios-tables-test.aarch64.efi + +#################################################################################### +# riscv64 + +[build.riscv] +conf = UefiTestToolsPkg/UefiTestToolsPkg.dsc +plat = UefiTestTools +module = UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf +dest = ./Build +arch = RISCV64 +cpy1 = RISCV64/BiosTablesTest.efi bios-tables-test.riscv64.efi + +#################################################################################### +# ia32 + +[build.ia32] +conf = UefiTestToolsPkg/UefiTestToolsPkg.dsc +plat = UefiTestTools +module = UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf +dest = ./Build +arch = IA32 +cpy1 = IA32/BiosTablesTest.efi bios-tables-test.i386.efi + +#################################################################################### +# x64 + +[build.x64] +conf = UefiTestToolsPkg/UefiTestToolsPkg.dsc +plat = UefiTestTools +module = UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf +dest = ./Build +arch = X64 +cpy1 = X64/BiosTablesTest.efi bios-tables-test.x86_64.efi From patchwork Fri Mar 15 13:09:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil V L X-Patchwork-Id: 13593444 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 D6286C54E58 for ; Fri, 15 Mar 2024 13:11:30 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rl7KM-0006y7-LZ; Fri, 15 Mar 2024 09:10:29 -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 1rl7Jg-0005op-JO for qemu-devel@nongnu.org; Fri, 15 Mar 2024 09:09:45 -0400 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rl7Jc-0007f7-7s for qemu-devel@nongnu.org; Fri, 15 Mar 2024 09:09:44 -0400 Received: by mail-pg1-x52e.google.com with SMTP id 41be03b00d2f7-5e4b775e1d6so1595121a12.1 for ; Fri, 15 Mar 2024 06:09:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1710508178; x=1711112978; 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=oAQMCAkcf2yerNIBkpwIivKLp3a37CUphrsQcm2dnuc=; b=jqi07cllaHoVu5Py4dXSyQFVIOXVdw/umPtUtoGA2v12rvXsADTe8ZlElb+SGQO7/a qDmD4rBLUuqfI1TPDaJkAnxG2K9/N4NOL/sKvm4qURRj/EP6rZGn4U+n01WIuYmxIJKl SGXYiZdT7zTXyDlg09PoiNf5HAJg+Gvs5Qp2LvSINLZ1a1bOtp0BJYUIDUJLL01hie09 0T8fs2dmbfkpbv123kcnRu2XsQSmxAe0wOKosIqnKPh0MtiIZZKQScHDkD8mI/AFfTEe mC9o16A6SeaRqg+LVXhowSFSRj2XC7KprUM9hoVCjaRbGIWiCT8OuzPPENyYUpblZJPw VGAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710508178; x=1711112978; 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=oAQMCAkcf2yerNIBkpwIivKLp3a37CUphrsQcm2dnuc=; b=H6RkRi+Lc2L7BoVr7CSsT6chqZFY8ci5HgQlRgMTnObqVRoiNL1w5LozBpZGmHuDbp sZWRHYGiylD+mze+Ci3B1xkzwxsqL3n1ZBeQoEGplTJmwque1+Z09Nndck2gQD9NJXwO XUE8QQ23dP0ccjE3kWCBrlIZhNGml9INOxWmzwUXvMxC8Ym16Josfo/nMgZGutpI9281 QdR6cZn0mjEi00vQHkAfAF2X6NeN++9I29tsPDpeH10tG3vlmXbOjFssgLEB3/k1XC+o EgwbrWs9W4pmg3pME268eTPxzM8cu7Jq7PWQgw0Lal/c+whGoFCLz5kRiwIuXKn1Nhlv 33uA== X-Gm-Message-State: AOJu0Yz7QllUfiWPKGftbvDeRoJ2IpJUigI3aLhjxp33uP7InQ4+3RgV 4snpPJlhLciY509r9zKU0GeuJ1PI8p/vVdY1DTl3tFaCQl/WJP0ZzOXNyNCiM6s/2/4thokHrWF 5 X-Google-Smtp-Source: AGHT+IEQmoD2w5OZ7AB4AAv4HK54RgP0uDA+rAd17ns9hL8x/0L2a3OUoJvNzAsxRGElxc4yabgUXA== X-Received: by 2002:a17:90a:db0c:b0:29d:d860:ae59 with SMTP id g12-20020a17090adb0c00b0029dd860ae59mr6334494pjv.6.1710508178095; Fri, 15 Mar 2024 06:09:38 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.184.12]) by smtp.gmail.com with ESMTPSA id r3-20020a17090ad40300b0029c68206e2bsm2886663pju.0.2024.03.15.06.09.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Mar 2024 06:09:37 -0700 (PDT) From: Sunil V L To: qemu-devel@nongnu.org, qemu-arm@nongnu.org, qemu-riscv@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , "Michael S . Tsirkin" , Igor Mammedov , Ani Sinha , Laurent Vivier , Daniel Henrique Barboza , Alistair Francis , Andrew Jones , Anup Patel , Haibo1 Xu , Sunil V L Subject: [PATCH 04/12] tests/data/uefi-boot-images: Add RISC-V ISO image Date: Fri, 15 Mar 2024 18:39:16 +0530 Message-Id: <20240315130924.2378849-2-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240315130924.2378849-1-sunilvl@ventanamicro.com> References: <20240315130924.2378849-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52e; envelope-from=sunilvl@ventanamicro.com; helo=mail-pg1-x52e.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, T_SCC_BODY_TEXT_LINE=-0.01 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org To test ACPI tables, edk2 needs to be booted with a disk image having EFI partition. This image is created using UefiTestToolsPkg. Signed-off-by: Sunil V L --- .../bios-tables-test.riscv64.iso.qcow2 | Bin 0 -> 16896 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2 GIT binary patch literal 16896 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 X-Patchwork-Id: 13593467 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 5660FC54E69 for ; Fri, 15 Mar 2024 13:18:39 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rl7Jq-00065V-1W; Fri, 15 Mar 2024 09:09:54 -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 1rl7Jk-0005s8-KB for qemu-devel@nongnu.org; Fri, 15 Mar 2024 09:09:49 -0400 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rl7Jh-0007jJ-Kl for qemu-devel@nongnu.org; Fri, 15 Mar 2024 09:09:48 -0400 Received: by mail-pj1-x102c.google.com with SMTP id 98e67ed59e1d1-29c731ba369so1667909a91.3 for ; Fri, 15 Mar 2024 06:09:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1710508183; x=1711112983; 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=5sxhd0rb4V/HdCcNYSiwuf6DPCAi6g3IEdE6KnOG7L8=; b=WkMssXfpQ72/546c6pyY8+dYrdEaCQmvalRNFzut6jAw+LNz3bNan/gotAO3MPX7Nu GA64tUdLJeSuLtCzEfbg7Fz7FWvBgfRtiGiFTY9jHrGo38dxD759FsnBwUxca/CIoEVV UXH5udjMpKnkN6umtNiIwDldsISyHwZ96uAbwERajHP2372iSSUMwjoU7s/5w0tzY8N+ K2AcTob0iMtgk6gb3NbcXrg9AbkV76qxVTzbOu/t16c5YMJdVFqkab9cNZlos+BXCCA4 q4mLJg9L2q4Owvtg5C44ny82k7pRaLYG/T/sP4Pya9F2Rn7Mxpttr6iF4rl3yBdYTuFh z78A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710508183; x=1711112983; 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=5sxhd0rb4V/HdCcNYSiwuf6DPCAi6g3IEdE6KnOG7L8=; b=TnXREUlvEcBvTs/EqNYtImJcJgPTlnMjpmVy/dys715vhEdSeAwknAEFZtSJt3lMrk Cua+Wfqz18urMGSA4O5XOueyZ9o3ZdIaWHGCQthMe0CK0pUXYpDl/wifEtZDoP+FcN9i 3wDIuyIBi5NoHaUD0kLaPsNnWJssA/4H+iNPw2WwT71krqDNIJUEDnBiNuA752M5/i+6 49kPK9/vhyTXUdyWWvyQBTT33yUgw0CPSdTo67sWNC9Jy23gv2FkY58xmpP8MKjK43AT IWesC1eO973hyT6lZYYK482vBr2VEgK/SCpe/NddpVoLigG0I2Qwd6bUb1yv9BDCvHF3 oriA== X-Gm-Message-State: AOJu0YwZPTLNmIpGSs6m/1B4CevKsYgp11E8tG8AZ2EKS01cbUO0HQUg H4wJo7ebZ+PVBc86H+lAg5I5vp/KG7HNWAvXO24sOMGSmgy3ZnjFCtuDRxU6iBaRVAxdLufZLS6 m X-Google-Smtp-Source: AGHT+IHDcQxN1/MJNwNoSh49TDo40dWND/kk0IWkS9VF06tAR3byrXGl+IML3QcUiWglnJ3WuxuutA== X-Received: by 2002:a17:90a:e016:b0:29c:403b:ea2e with SMTP id u22-20020a17090ae01600b0029c403bea2emr4309258pjy.49.1710508183338; Fri, 15 Mar 2024 06:09:43 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.184.12]) by smtp.gmail.com with ESMTPSA id r3-20020a17090ad40300b0029c68206e2bsm2886663pju.0.2024.03.15.06.09.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Mar 2024 06:09:42 -0700 (PDT) From: Sunil V L To: qemu-devel@nongnu.org, qemu-arm@nongnu.org, qemu-riscv@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , "Michael S . Tsirkin" , Igor Mammedov , Ani Sinha , Laurent Vivier , Daniel Henrique Barboza , Alistair Francis , Andrew Jones , Anup Patel , Haibo1 Xu , Sunil V L Subject: [PATCH 05/12] qtest: bios-tables-test: Rename aarch64 tests with aarch64 in them Date: Fri, 15 Mar 2024 18:39:17 +0530 Message-Id: <20240315130924.2378849-3-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240315130924.2378849-1-sunilvl@ventanamicro.com> References: <20240315130924.2378849-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102c; envelope-from=sunilvl@ventanamicro.com; helo=mail-pj1-x102c.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, T_SCC_BODY_TEXT_LINE=-0.01 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Existing AARCH64 virt test functions do not have AARCH64 in their name. To add RISC-V virt related test cases, better to rename existing functions to indicate they are ARM only. Signed-off-by: Sunil V L Reviewed-by: Alistair Francis --- tests/qtest/bios-tables-test.c | 35 ++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 21811a1ab5..ea3ba1992b 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1557,7 +1557,7 @@ static void test_acpi_piix4_tcg_dimm_pxm(void) test_acpi_tcg_dimm_pxm(MACHINE_PC); } -static void test_acpi_virt_tcg_memhp(void) +static void test_acpi_aarch64_virt_tcg_memhp(void) { test_data data = { .machine = "virt", @@ -1650,7 +1650,7 @@ static void test_acpi_microvm_ioapic2_tcg(void) free_test_data(&data); } -static void test_acpi_virt_tcg_numamem(void) +static void test_acpi_aarch64_virt_tcg_numamem(void) { test_data data = { .machine = "virt", @@ -1672,7 +1672,7 @@ static void test_acpi_virt_tcg_numamem(void) } -static void test_acpi_virt_tcg_pxb(void) +static void test_acpi_aarch64_virt_tcg_pxb(void) { test_data data = { .machine = "virt", @@ -1745,7 +1745,7 @@ static void test_acpi_piix4_tcg_acpi_hmat(void) test_acpi_tcg_acpi_hmat(MACHINE_PC); } -static void test_acpi_virt_tcg_acpi_hmat(void) +static void test_acpi_aarch64_virt_tcg_acpi_hmat(void) { test_data data = { .machine = "virt", @@ -1901,7 +1901,7 @@ static void test_acpi_microvm_acpi_erst(void) } #endif /* CONFIG_POSIX */ -static void test_acpi_virt_tcg(void) +static void test_acpi_aarch64_virt_tcg(void) { test_data data = { .machine = "virt", @@ -1920,7 +1920,7 @@ static void test_acpi_virt_tcg(void) free_test_data(&data); } -static void test_acpi_virt_tcg_topology(void) +static void test_acpi_aarch64_virt_tcg_topology(void) { test_data data = { .machine = "virt", @@ -2003,7 +2003,7 @@ static void test_acpi_q35_cxl(void) } #endif /* CONFIG_POSIX */ -static void test_acpi_virt_viot(void) +static void test_acpi_aarch64_virt_viot(void) { test_data data = { .machine = "virt", @@ -2135,7 +2135,7 @@ static void test_acpi_microvm_oem_fields(void) g_free(args); } -static void test_acpi_virt_oem_fields(void) +static void test_acpi_aarch64_virt_oem_fields(void) { test_data data = { .machine = "virt", @@ -2301,16 +2301,19 @@ int main(int argc, char *argv[]) } } else if (strcmp(arch, "aarch64") == 0) { if (has_tcg && qtest_has_device("virtio-blk-pci")) { - qtest_add_func("acpi/virt", test_acpi_virt_tcg); + qtest_add_func("acpi/virt", test_acpi_aarch64_virt_tcg); qtest_add_func("acpi/virt/acpihmatvirt", - test_acpi_virt_tcg_acpi_hmat); - qtest_add_func("acpi/virt/topology", test_acpi_virt_tcg_topology); - qtest_add_func("acpi/virt/numamem", test_acpi_virt_tcg_numamem); - qtest_add_func("acpi/virt/memhp", test_acpi_virt_tcg_memhp); - qtest_add_func("acpi/virt/pxb", test_acpi_virt_tcg_pxb); - qtest_add_func("acpi/virt/oem-fields", test_acpi_virt_oem_fields); + test_acpi_aarch64_virt_tcg_acpi_hmat); + qtest_add_func("acpi/virt/topology", + test_acpi_aarch64_virt_tcg_topology); + qtest_add_func("acpi/virt/numamem", + test_acpi_aarch64_virt_tcg_numamem); + qtest_add_func("acpi/virt/memhp", test_acpi_aarch64_virt_tcg_memhp); + qtest_add_func("acpi/virt/pxb", test_acpi_aarch64_virt_tcg_pxb); + qtest_add_func("acpi/virt/oem-fields", + test_acpi_aarch64_virt_oem_fields); if (qtest_has_device("virtio-iommu-pci")) { - qtest_add_func("acpi/virt/viot", test_acpi_virt_viot); + qtest_add_func("acpi/virt/viot", test_acpi_aarch64_virt_viot); } } } From patchwork Fri Mar 15 13:09:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil V L X-Patchwork-Id: 13593473 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 DD069C54E58 for ; Fri, 15 Mar 2024 13:19:14 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rl7Kd-0007TD-SR; Fri, 15 Mar 2024 09:10:43 -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 1rl7Jp-00063y-H1 for qemu-devel@nongnu.org; Fri, 15 Mar 2024 09:09:53 -0400 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rl7Jn-0007l6-O9 for qemu-devel@nongnu.org; Fri, 15 Mar 2024 09:09:53 -0400 Received: by mail-pj1-x102b.google.com with SMTP id 98e67ed59e1d1-29c75e348afso1587681a91.2 for ; Fri, 15 Mar 2024 06:09:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1710508189; x=1711112989; 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=wghJI0ognSpNT0jNsCcfBxxvrERQMs64Ov5T2QzZ9+4=; b=K6anAFHr7efDz7d1ks7R6suPIs2Co4oZ+g/FshrMD32iBprGEtgKcOucYMTYAR789t JglnblDF6y7ahJpUe+mNCkO1L8QH21TZOExv2QXI7XG5pbGjhG9Fu3hQFBmiqKUPWs10 GypUDBmEsptnH3chSKmhn/MKQcdrYkem9j4AfciiWjhaicU2M/iN0BNEiTCILBpELsHT 3sxUH2C8bNYIkseid47XhOtkNDPbBgKEc0FBq04Lk+XDzfoQma1kX0WQ7MM1Ch/pRnqI WklioP1bvCCA4t8xpyftAy6IQCNfRYfRYJ+eOUj8PALc1OsfBWD2q8+edrEn8JbMlRA2 zdvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710508189; x=1711112989; 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=wghJI0ognSpNT0jNsCcfBxxvrERQMs64Ov5T2QzZ9+4=; b=OOzSYJ9pKwcDKFCseqm6BnQNVDPlCmzMGXfgMpxWqkWeHOCq1QkhDS4ViC/cvSMPBG tdMU/S2uPwcsxGTND4fnT1YwmoceYEkZ9fyXd8rjZ3SKAADJiFTRB7qQdqwNJV2KpKak 3ir9lPe99KVvJsBNzL5Rx0UvxhmQc1+ILkKN44pEjfGJtZF5EBuhcyvmBNQSDBTb/QTP wD9vXm3+em/UGzBdFi353efOfmwBhGE1dJaWsKU05no7REQ9BWCp7Z37XROP/1enQJe3 taJ5UOrtKSschIrJ3M2eWugI87RMeQjliVie9Bc8mYGOxnZAcniR0gUcSMTv4c3J+wvq JFYw== X-Gm-Message-State: AOJu0YwCf/pY2PweToI6u3eR31sibyZmYHR9rix0lWYzvBk2abEZ9iCW eVZGpvSDpPYMsYdB73ZHg5XYPlgpJBlGytkhCXMbKLHKUXGa0mJt5Yyc9vFMDZjHVHJbziw/e7b D X-Google-Smtp-Source: AGHT+IHtZP3R1LH2o6oB+Jei/hXFGCvm7DsDUt2+XkoQG3HYlR2QpWKbv3lcheKPXoBm3gaoubIX4w== X-Received: by 2002:a17:90a:9ec:b0:29c:4598:5783 with SMTP id 99-20020a17090a09ec00b0029c45985783mr4595223pjo.8.1710508188634; Fri, 15 Mar 2024 06:09:48 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.184.12]) by smtp.gmail.com with ESMTPSA id r3-20020a17090ad40300b0029c68206e2bsm2886663pju.0.2024.03.15.06.09.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Mar 2024 06:09:47 -0700 (PDT) From: Sunil V L To: qemu-devel@nongnu.org, qemu-arm@nongnu.org, qemu-riscv@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , "Michael S . Tsirkin" , Igor Mammedov , Ani Sinha , Laurent Vivier , Daniel Henrique Barboza , Alistair Francis , Andrew Jones , Anup Patel , Haibo1 Xu , Sunil V L Subject: [PATCH 06/12] tests/qtest/bios-tables-test.c: Add support for arch in path Date: Fri, 15 Mar 2024 18:39:18 +0530 Message-Id: <20240315130924.2378849-4-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240315130924.2378849-1-sunilvl@ventanamicro.com> References: <20240315130924.2378849-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102b; envelope-from=sunilvl@ventanamicro.com; helo=mail-pj1-x102b.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Since virt machine is common for multiple architectures, add "arch" in the path to search expected AML files. Since the AML files are still under old path, support both by searching with and without arch in the path. Signed-off-by: Sunil V L Reviewed-by: Alistair Francis --- tests/qtest/bios-tables-test.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index ea3ba1992b..c492438ced 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -78,6 +78,7 @@ typedef struct { bool tcg_only; const char *machine; + const char *arch; const char *machine_param; const char *variant; const char *uefi_fl1; @@ -262,8 +263,20 @@ static void dump_aml_files(test_data *data, bool rebuild) g_assert(exp_sdt->aml); if (rebuild) { - aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir, data->machine, + aml_file = g_strdup_printf("%s/%s/%s/%.4s%s", data_dir, + data->machine, data->arch, sdt->aml, ext); + + /* + * To keep test cases not failing when the DATA files are moved to + * ARCH under virt folder, add this check which can be removed once + * the DATA files are moved. + */ + if (!g_file_test(aml_file, G_FILE_TEST_EXISTS)) { + aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir, data->machine, + sdt->aml, ext); + } + if (!g_file_test(aml_file, G_FILE_TEST_EXISTS) && sdt->aml_len == exp_sdt->aml_len && !memcmp(sdt->aml, exp_sdt->aml, sdt->aml_len)) { @@ -398,8 +411,13 @@ static GArray *load_expected_aml(test_data *data) memset(&exp_sdt, 0, sizeof(exp_sdt)); try_again: - aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir, data->machine, - sdt->aml, ext); + aml_file = g_strdup_printf("%s/%s/%s/%.4s%s", data_dir, data->machine, + data->arch, sdt->aml, ext); + if (!g_file_test(aml_file, G_FILE_TEST_EXISTS)) { + aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir, data->machine, + sdt->aml, ext); + } + exp_sdt.aml_file = aml_file; if (verbosity_level >= 2) { fprintf(stderr, "Looking for expected file '%s'\n", aml_file); } @@ -1561,6 +1579,7 @@ static void test_acpi_aarch64_virt_tcg_memhp(void) { test_data data = { .machine = "virt", + .arch = "aarch64", .tcg_only = true, .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd", .uefi_fl2 = "pc-bios/edk2-arm-vars.fd", @@ -1654,6 +1673,7 @@ static void test_acpi_aarch64_virt_tcg_numamem(void) { test_data data = { .machine = "virt", + .arch = "aarch64", .tcg_only = true, .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd", .uefi_fl2 = "pc-bios/edk2-arm-vars.fd", @@ -1676,6 +1696,7 @@ static void test_acpi_aarch64_virt_tcg_pxb(void) { test_data data = { .machine = "virt", + .arch = "aarch64", .tcg_only = true, .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd", .uefi_fl2 = "pc-bios/edk2-arm-vars.fd", @@ -1749,6 +1770,7 @@ static void test_acpi_aarch64_virt_tcg_acpi_hmat(void) { test_data data = { .machine = "virt", + .arch = "aarch64", .tcg_only = true, .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd", .uefi_fl2 = "pc-bios/edk2-arm-vars.fd", @@ -1905,6 +1927,7 @@ static void test_acpi_aarch64_virt_tcg(void) { test_data data = { .machine = "virt", + .arch = "aarch64", .tcg_only = true, .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd", .uefi_fl2 = "pc-bios/edk2-arm-vars.fd", @@ -1924,6 +1947,7 @@ static void test_acpi_aarch64_virt_tcg_topology(void) { test_data data = { .machine = "virt", + .arch = "aarch64", .variant = ".topology", .tcg_only = true, .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd", @@ -2007,6 +2031,7 @@ static void test_acpi_aarch64_virt_viot(void) { test_data data = { .machine = "virt", + .arch = "aarch64", .tcg_only = true, .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd", .uefi_fl2 = "pc-bios/edk2-arm-vars.fd", @@ -2139,6 +2164,7 @@ static void test_acpi_aarch64_virt_oem_fields(void) { test_data data = { .machine = "virt", + .arch = "aarch64", .tcg_only = true, .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd", .uefi_fl2 = "pc-bios/edk2-arm-vars.fd", From patchwork Fri Mar 15 13:09:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil V L X-Patchwork-Id: 13593471 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 01955C54E69 for ; Fri, 15 Mar 2024 13:19:13 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rl7Kt-00086u-1K; Fri, 15 Mar 2024 09:10:59 -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 1rl7Jy-0006La-PS for qemu-devel@nongnu.org; Fri, 15 Mar 2024 09:10:03 -0400 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rl7Jw-0007qr-MJ for qemu-devel@nongnu.org; Fri, 15 Mar 2024 09:10:02 -0400 Received: by mail-pg1-x52a.google.com with SMTP id 41be03b00d2f7-5dbd519bde6so1604403a12.1 for ; Fri, 15 Mar 2024 06:10:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1710508194; x=1711112994; 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=eP7mFS+tC1O6LUU3KM5DOGQ8e+9ow7yRP/vkR8U6RW0=; b=kHFx1v+44WC2DwghQQHmDRutOk/1jga+Y2zpUaGC40RqAw8E0KecBJVul/DYiMDdUg +g7v0en9/587hd8LqVcRJTqZWv1B+0FRTn92wwj/0R2BokUWn2PZhAdPRvTcXIAmM9Fu oyfYuozq/9lDVuuNi9ygggV8fMFq3jshEe+oVmFGmUBUGlOG089ryfrYPSzfbQKXete7 DMqT0SC4njieMRQ7PjCFhQCL+ulZkcEA7b5gBSTbqILXTarTA9Clr9T24TsdNTJu2X76 8OnsgNSXdqSVHbkx9jXHoMhHnNQm9ZsHdO0FSNF+0TUIjLscqsmm0k6PQw06UJORIeOl Ld7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710508194; x=1711112994; 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=eP7mFS+tC1O6LUU3KM5DOGQ8e+9ow7yRP/vkR8U6RW0=; b=FHsg3OEBFEFLPFd8GF0bauaQWIvxosOCckHNWJRBIN9JzYrYw9ttdcFomqfTaDbXDY DWSmplty+rgBjwQwJPkrCb+xgMUFFFfo2VIWLm8bYjk5xUt3/nwEV3u6jPSskWwKKGgF qXl9bzzO1fvpV5RhGRX0GSO/LHfXTaK2roAuf4SNcYPj49x1CvK+jaZd29f+fC3KvjFf JHAsxz83D9xhBdauEM0LzJ9lLxBeV+dQwWEYvZETSktWdNXGUgPYyT0DNeQ6evqimN5D 6MUDHC5rMWT/XR0WMNPbQCVVxqj3Mf3T5dIXQjYwwIt7Mkwsn3u5ruVm/z7Zq5bbtFoz F6kA== X-Gm-Message-State: AOJu0YzC6veAH0CBu5wnQsnImBF/qAkL4ARz86LPqlo8KSUHnwUHfzDA Ba6OOxWfNZCT7zkHN0WGztvhYtWv9YSVcPqE7JE3I27ojYjiEuzI4creFn+3JA/r0bpl7ISB6GA L X-Google-Smtp-Source: AGHT+IHJUI5QIhAtaKpfx69OxdI7cz7/LP3XQ16nVgPvhbK8toooFbQMuYypeufIpKK8iP1iAevT/g== X-Received: by 2002:a17:90a:ce12:b0:29b:f2b1:6973 with SMTP id f18-20020a17090ace1200b0029bf2b16973mr4641926pju.20.1710508194137; Fri, 15 Mar 2024 06:09:54 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.184.12]) by smtp.gmail.com with ESMTPSA id r3-20020a17090ad40300b0029c68206e2bsm2886663pju.0.2024.03.15.06.09.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Mar 2024 06:09:53 -0700 (PDT) From: Sunil V L To: qemu-devel@nongnu.org, qemu-arm@nongnu.org, qemu-riscv@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , "Michael S . Tsirkin" , Igor Mammedov , Ani Sinha , Laurent Vivier , Daniel Henrique Barboza , Alistair Francis , Andrew Jones , Anup Patel , Haibo1 Xu , Sunil V L Subject: [PATCH 07/12] tests/data/acpi/virt: Move ACPI tables under aarch64 Date: Fri, 15 Mar 2024 18:39:19 +0530 Message-Id: <20240315130924.2378849-5-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240315130924.2378849-1-sunilvl@ventanamicro.com> References: <20240315130924.2378849-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52a; envelope-from=sunilvl@ventanamicro.com; helo=mail-pg1-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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Since virt is a common machine name across architectures like ARM64 and RISC-V, move existing ARM64 ACPI tables under aarch64 folder so that RISC-V tables can be added under riscv64 folder in future. Signed-off-by: Sunil V L Reviewed-by: Alistair Francis --- tests/data/acpi/virt/{ => aarch64}/APIC | Bin .../data/acpi/virt/{ => aarch64}/APIC.acpihmatvirt | Bin tests/data/acpi/virt/{ => aarch64}/APIC.topology | Bin tests/data/acpi/virt/{ => aarch64}/DBG2 | Bin tests/data/acpi/virt/{ => aarch64}/DSDT | Bin .../data/acpi/virt/{ => aarch64}/DSDT.acpihmatvirt | Bin tests/data/acpi/virt/{ => aarch64}/DSDT.memhp | Bin tests/data/acpi/virt/{ => aarch64}/DSDT.pxb | Bin tests/data/acpi/virt/{ => aarch64}/DSDT.topology | Bin tests/data/acpi/virt/{ => aarch64}/FACP | Bin tests/data/acpi/virt/{ => aarch64}/GTDT | Bin .../data/acpi/virt/{ => aarch64}/HMAT.acpihmatvirt | Bin tests/data/acpi/virt/{ => aarch64}/IORT | Bin tests/data/acpi/virt/{ => aarch64}/MCFG | Bin tests/data/acpi/virt/{ => aarch64}/NFIT.memhp | Bin tests/data/acpi/virt/{ => aarch64}/PPTT | Bin .../data/acpi/virt/{ => aarch64}/PPTT.acpihmatvirt | Bin tests/data/acpi/virt/{ => aarch64}/PPTT.topology | Bin tests/data/acpi/virt/{ => aarch64}/SLIT.memhp | Bin tests/data/acpi/virt/{ => aarch64}/SPCR | Bin .../data/acpi/virt/{ => aarch64}/SRAT.acpihmatvirt | Bin tests/data/acpi/virt/{ => aarch64}/SRAT.memhp | Bin tests/data/acpi/virt/{ => aarch64}/SRAT.numamem | Bin tests/data/acpi/virt/{ => aarch64}/SSDT.memhp | Bin tests/data/acpi/virt/{ => aarch64}/VIOT | Bin 25 files changed, 0 insertions(+), 0 deletions(-) rename tests/data/acpi/virt/{ => aarch64}/APIC (100%) rename tests/data/acpi/virt/{ => aarch64}/APIC.acpihmatvirt (100%) rename tests/data/acpi/virt/{ => aarch64}/APIC.topology (100%) rename tests/data/acpi/virt/{ => aarch64}/DBG2 (100%) rename tests/data/acpi/virt/{ => aarch64}/DSDT (100%) rename tests/data/acpi/virt/{ => aarch64}/DSDT.acpihmatvirt (100%) rename tests/data/acpi/virt/{ => aarch64}/DSDT.memhp (100%) rename tests/data/acpi/virt/{ => aarch64}/DSDT.pxb (100%) rename tests/data/acpi/virt/{ => aarch64}/DSDT.topology (100%) rename tests/data/acpi/virt/{ => aarch64}/FACP (100%) rename tests/data/acpi/virt/{ => aarch64}/GTDT (100%) rename tests/data/acpi/virt/{ => aarch64}/HMAT.acpihmatvirt (100%) rename tests/data/acpi/virt/{ => aarch64}/IORT (100%) rename tests/data/acpi/virt/{ => aarch64}/MCFG (100%) rename tests/data/acpi/virt/{ => aarch64}/NFIT.memhp (100%) rename tests/data/acpi/virt/{ => aarch64}/PPTT (100%) rename tests/data/acpi/virt/{ => aarch64}/PPTT.acpihmatvirt (100%) rename tests/data/acpi/virt/{ => aarch64}/PPTT.topology (100%) rename tests/data/acpi/virt/{ => aarch64}/SLIT.memhp (100%) rename tests/data/acpi/virt/{ => aarch64}/SPCR (100%) rename tests/data/acpi/virt/{ => aarch64}/SRAT.acpihmatvirt (100%) rename tests/data/acpi/virt/{ => aarch64}/SRAT.memhp (100%) rename tests/data/acpi/virt/{ => aarch64}/SRAT.numamem (100%) rename tests/data/acpi/virt/{ => aarch64}/SSDT.memhp (100%) rename tests/data/acpi/virt/{ => aarch64}/VIOT (100%) diff --git a/tests/data/acpi/virt/APIC b/tests/data/acpi/virt/aarch64/APIC similarity index 100% rename from tests/data/acpi/virt/APIC rename to tests/data/acpi/virt/aarch64/APIC diff --git a/tests/data/acpi/virt/APIC.acpihmatvirt b/tests/data/acpi/virt/aarch64/APIC.acpihmatvirt similarity index 100% rename from tests/data/acpi/virt/APIC.acpihmatvirt rename to tests/data/acpi/virt/aarch64/APIC.acpihmatvirt diff --git a/tests/data/acpi/virt/APIC.topology b/tests/data/acpi/virt/aarch64/APIC.topology similarity index 100% rename from tests/data/acpi/virt/APIC.topology rename to tests/data/acpi/virt/aarch64/APIC.topology diff --git a/tests/data/acpi/virt/DBG2 b/tests/data/acpi/virt/aarch64/DBG2 similarity index 100% rename from tests/data/acpi/virt/DBG2 rename to tests/data/acpi/virt/aarch64/DBG2 diff --git a/tests/data/acpi/virt/DSDT b/tests/data/acpi/virt/aarch64/DSDT similarity index 100% rename from tests/data/acpi/virt/DSDT rename to tests/data/acpi/virt/aarch64/DSDT diff --git a/tests/data/acpi/virt/DSDT.acpihmatvirt b/tests/data/acpi/virt/aarch64/DSDT.acpihmatvirt similarity index 100% rename from tests/data/acpi/virt/DSDT.acpihmatvirt rename to tests/data/acpi/virt/aarch64/DSDT.acpihmatvirt diff --git a/tests/data/acpi/virt/DSDT.memhp b/tests/data/acpi/virt/aarch64/DSDT.memhp similarity index 100% rename from tests/data/acpi/virt/DSDT.memhp rename to tests/data/acpi/virt/aarch64/DSDT.memhp diff --git a/tests/data/acpi/virt/DSDT.pxb b/tests/data/acpi/virt/aarch64/DSDT.pxb similarity index 100% rename from tests/data/acpi/virt/DSDT.pxb rename to tests/data/acpi/virt/aarch64/DSDT.pxb diff --git a/tests/data/acpi/virt/DSDT.topology b/tests/data/acpi/virt/aarch64/DSDT.topology similarity index 100% rename from tests/data/acpi/virt/DSDT.topology rename to tests/data/acpi/virt/aarch64/DSDT.topology diff --git a/tests/data/acpi/virt/FACP b/tests/data/acpi/virt/aarch64/FACP similarity index 100% rename from tests/data/acpi/virt/FACP rename to tests/data/acpi/virt/aarch64/FACP diff --git a/tests/data/acpi/virt/GTDT b/tests/data/acpi/virt/aarch64/GTDT similarity index 100% rename from tests/data/acpi/virt/GTDT rename to tests/data/acpi/virt/aarch64/GTDT diff --git a/tests/data/acpi/virt/HMAT.acpihmatvirt b/tests/data/acpi/virt/aarch64/HMAT.acpihmatvirt similarity index 100% rename from tests/data/acpi/virt/HMAT.acpihmatvirt rename to tests/data/acpi/virt/aarch64/HMAT.acpihmatvirt diff --git a/tests/data/acpi/virt/IORT b/tests/data/acpi/virt/aarch64/IORT similarity index 100% rename from tests/data/acpi/virt/IORT rename to tests/data/acpi/virt/aarch64/IORT diff --git a/tests/data/acpi/virt/MCFG b/tests/data/acpi/virt/aarch64/MCFG similarity index 100% rename from tests/data/acpi/virt/MCFG rename to tests/data/acpi/virt/aarch64/MCFG diff --git a/tests/data/acpi/virt/NFIT.memhp b/tests/data/acpi/virt/aarch64/NFIT.memhp similarity index 100% rename from tests/data/acpi/virt/NFIT.memhp rename to tests/data/acpi/virt/aarch64/NFIT.memhp diff --git a/tests/data/acpi/virt/PPTT b/tests/data/acpi/virt/aarch64/PPTT similarity index 100% rename from tests/data/acpi/virt/PPTT rename to tests/data/acpi/virt/aarch64/PPTT diff --git a/tests/data/acpi/virt/PPTT.acpihmatvirt b/tests/data/acpi/virt/aarch64/PPTT.acpihmatvirt similarity index 100% rename from tests/data/acpi/virt/PPTT.acpihmatvirt rename to tests/data/acpi/virt/aarch64/PPTT.acpihmatvirt diff --git a/tests/data/acpi/virt/PPTT.topology b/tests/data/acpi/virt/aarch64/PPTT.topology similarity index 100% rename from tests/data/acpi/virt/PPTT.topology rename to tests/data/acpi/virt/aarch64/PPTT.topology diff --git a/tests/data/acpi/virt/SLIT.memhp b/tests/data/acpi/virt/aarch64/SLIT.memhp similarity index 100% rename from tests/data/acpi/virt/SLIT.memhp rename to tests/data/acpi/virt/aarch64/SLIT.memhp diff --git a/tests/data/acpi/virt/SPCR b/tests/data/acpi/virt/aarch64/SPCR similarity index 100% rename from tests/data/acpi/virt/SPCR rename to tests/data/acpi/virt/aarch64/SPCR diff --git a/tests/data/acpi/virt/SRAT.acpihmatvirt b/tests/data/acpi/virt/aarch64/SRAT.acpihmatvirt similarity index 100% rename from tests/data/acpi/virt/SRAT.acpihmatvirt rename to tests/data/acpi/virt/aarch64/SRAT.acpihmatvirt diff --git a/tests/data/acpi/virt/SRAT.memhp b/tests/data/acpi/virt/aarch64/SRAT.memhp similarity index 100% rename from tests/data/acpi/virt/SRAT.memhp rename to tests/data/acpi/virt/aarch64/SRAT.memhp diff --git a/tests/data/acpi/virt/SRAT.numamem b/tests/data/acpi/virt/aarch64/SRAT.numamem similarity index 100% rename from tests/data/acpi/virt/SRAT.numamem rename to tests/data/acpi/virt/aarch64/SRAT.numamem diff --git a/tests/data/acpi/virt/SSDT.memhp b/tests/data/acpi/virt/aarch64/SSDT.memhp similarity index 100% rename from tests/data/acpi/virt/SSDT.memhp rename to tests/data/acpi/virt/aarch64/SSDT.memhp diff --git a/tests/data/acpi/virt/VIOT b/tests/data/acpi/virt/aarch64/VIOT similarity index 100% rename from tests/data/acpi/virt/VIOT rename to tests/data/acpi/virt/aarch64/VIOT From patchwork Fri Mar 15 13:09:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil V L X-Patchwork-Id: 13593449 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 70B6EC54E67 for ; Fri, 15 Mar 2024 13:11:53 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rl7Kw-0008SA-6U; Fri, 15 Mar 2024 09:11:02 -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 1rl7KA-0006Zr-VT for qemu-devel@nongnu.org; Fri, 15 Mar 2024 09:10:17 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0: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 1rl7Jy-0007r1-7n for qemu-devel@nongnu.org; Fri, 15 Mar 2024 09:10:14 -0400 Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-6e6cadfffdbso1802251b3a.3 for ; Fri, 15 Mar 2024 06:10:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1710508199; x=1711112999; 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=1JsmeTBVN2sRCxleZ76cGscd4q7biWqmkJjrGr36tu0=; b=J1hHEUgHdT/fkd/6o2o5/YBNg1J3S7NXyu6+3JGWWTwCsC7vRCY4g267jKxtcu+Zqe sgSIE/B2l20D+uMdwbgLkHP7iZ87BVTvhAPYifF/9MXBrseo/oqYwJKLOksWuHB+PrZb bujsDxSyniLtL6aPy873F+pnjmDJTI/5+Mm0FJ4E+3hnevFDk6th9xKZK6nhb2WmQsHR HzkW658MH5nDC9iP3tAV3ellrRuf2Zb8bhPqY6uZ2SSwCBIphnSvEjSofdCbkbE3Q8Vj P0ROV8t+YK0uviDgTYolCXIEmh+1u68cYqUJewnvycgx6pi+wSYwTVcDEyg24pWrKvua tRJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710508199; x=1711112999; 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=1JsmeTBVN2sRCxleZ76cGscd4q7biWqmkJjrGr36tu0=; b=E12dSCy73yDx9pI9R5gxFc9ctZnAgQZCte6F/BPi6gPxuOFv2B5JXD/5iKMSP/aeD7 fXjMGFYgXx0oHr2vibNA8yQf57O7/NJU/GRZ/CVLkPZ35Q7Zmx1DayyvplYQbeL4cQQf u9f3Bt8Z8hJg63ZJDbQ9nMrHrexZmJHiF6xgyQWVX09Gy+44zAk3e/HeFw7f9aWeGpdq oA4qTnkzYkMVdAmOCFNufOnvKIyPnH3eTfA2EAB/2xrxRTftQ83y2YVgUxoYLwMqkEwz WBQWMq8hnuQJYei43Nflq0gMnPZysSLzdBxHyG3jz7U89Sh1vAhXwIJFzSGveJ4ELs/i auCw== X-Gm-Message-State: AOJu0Yw3j2EVM4uTH4YLum9DXYMGNGhBBq5jU5IHbtw7bws/leeoVbmU 8dyMnUiMzsNiU1anc6XA1VcSbXdZItaxv0pYxMHcFkdf/+1AHjLCFxrFi9FNJkB2l0fSC6lvLyR e X-Google-Smtp-Source: AGHT+IGk16iw1tTDOrbRN0W0Q0R0/WrAWlPbsKTL77h7TeZzM7tVW8IWW3lVJMWpt3VB7fI3ZNjFdQ== X-Received: by 2002:a17:90b:3a48:b0:29d:dd0f:f853 with SMTP id oh8-20020a17090b3a4800b0029ddd0ff853mr3121079pjb.26.1710508199293; Fri, 15 Mar 2024 06:09:59 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.184.12]) by smtp.gmail.com with ESMTPSA id r3-20020a17090ad40300b0029c68206e2bsm2886663pju.0.2024.03.15.06.09.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Mar 2024 06:09:58 -0700 (PDT) From: Sunil V L To: qemu-devel@nongnu.org, qemu-arm@nongnu.org, qemu-riscv@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , "Michael S . Tsirkin" , Igor Mammedov , Ani Sinha , Laurent Vivier , Daniel Henrique Barboza , Alistair Francis , Andrew Jones , Anup Patel , Haibo1 Xu , Sunil V L Subject: [PATCH 08/12] meson.build: Add RISC-V to the edk2-target list Date: Fri, 15 Mar 2024 18:39:20 +0530 Message-Id: <20240315130924.2378849-6-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240315130924.2378849-1-sunilvl@ventanamicro.com> References: <20240315130924.2378849-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42f; envelope-from=sunilvl@ventanamicro.com; helo=mail-pf1-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, T_SCC_BODY_TEXT_LINE=-0.01 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org so that ACPI table test can be supported. Signed-off-by: Sunil V L Reviewed-by: Alistair Francis --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index b8ded80cbe..bf50688593 100644 --- a/meson.build +++ b/meson.build @@ -93,7 +93,7 @@ else iasl = find_program(get_option('iasl'), required: true) endif -edk2_targets = [ 'arm-softmmu', 'aarch64-softmmu', 'i386-softmmu', 'x86_64-softmmu' ] +edk2_targets = [ 'arm-softmmu', 'aarch64-softmmu', 'i386-softmmu', 'x86_64-softmmu', 'riscv64-softmmu' ] unpack_edk2_blobs = false foreach target : edk2_targets if target in target_dirs From patchwork Fri Mar 15 13:09:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil V L X-Patchwork-Id: 13593445 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 9DF17C54E58 for ; Fri, 15 Mar 2024 13:11:36 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rl7Kw-0008TV-8a; Fri, 15 Mar 2024 09:11:02 -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 1rl7KB-0006ac-Du for qemu-devel@nongnu.org; Fri, 15 Mar 2024 09:10:16 -0400 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rl7K4-0007vm-2T for qemu-devel@nongnu.org; Fri, 15 Mar 2024 09:10:15 -0400 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-6e6b22af648so2537719b3a.0 for ; Fri, 15 Mar 2024 06:10:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1710508204; x=1711113004; 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=Gri6e0kUQ2zYZ/hFnr3bQcljAuIiwyEyI/MJW064ldw=; b=WQ+oUlBMUTFP7uA5GKlAU9HLBHG2/mQJwYMcgh0qm9w7v3mWl9AKfDH6Seh/wbdDfn c8yFtRY86tvfn017oqaH2e9REatLrhKI48XWDO5YmwrMXwRDx5L8HHI7agoogUf0hQEH xBip0nAa8pgoLLf8eshcA2LwyHywr5XO9QbO6l43pRoZ2W0JU5G3i6XRvqQGHuuDxAlG lmKsOg6tbtcCmUAxxaysb22L3wrFO2NIkDRyAJotRJT0TN8l7T9Tcw6sbXL5tWOANaLF RKhQkJGSCS1qDKiDfXOgaxVEEkI1wkRMmXRQljoOkRVuGrmKlI1/nQaq6vN43La2s0WO p/Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710508204; x=1711113004; 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=Gri6e0kUQ2zYZ/hFnr3bQcljAuIiwyEyI/MJW064ldw=; b=JLMhY7v9N0WFr3r63tiX6oCnGwg0onE38sG9M/cawep77EDV2qVRBUO82TvoCgkOsY 0tcxVjmpYKSput0cNVYQt1CZfUSyF9rbGWB0S47vHVpWnOZvydJ6n+VsiF9PdjV4J1+1 0OdsgXXCWHn5riQbOE+Kt2aDVG7L9wVD0PqVpvpoDd8U/1JcnbPqy3+OHFg5Eg1u/OIm Feby/0KtpSi8AG9Ct3DJn+Milit/gG2BQB68xZeR9X6hPuMDNJuPkMQ3fs5CzVxltFCl ietGdWKZXxYd5o66LzsceMTWWfRCg0zqSIgTmRAAmwYk342Mm45HBvJ/JezRb3wWTwH7 j+Kg== X-Gm-Message-State: AOJu0Yzl4YH3iiTsNPMy9Z8kJEBTsWxNN4aqB5G5y4z9LfjABgN34mCH rAZaQ1zqynQYzwP7RKVmHglRrceMDyhkm/ERk7Nl/ETwfG6utJoPGYWTlyKU01TCK8n403URFeH q X-Google-Smtp-Source: AGHT+IHBXMQGkvp2BYHGXuu3UtKKT1FEzBUr0oVoOkzF2cunzVAJYffewH/cjG2yjN9xhsn4IBGPmQ== X-Received: by 2002:a17:90b:1bcc:b0:29b:a1de:32d3 with SMTP id oa12-20020a17090b1bcc00b0029ba1de32d3mr12532208pjb.17.1710508204543; Fri, 15 Mar 2024 06:10:04 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.184.12]) by smtp.gmail.com with ESMTPSA id r3-20020a17090ad40300b0029c68206e2bsm2886663pju.0.2024.03.15.06.09.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Mar 2024 06:10:03 -0700 (PDT) From: Sunil V L To: qemu-devel@nongnu.org, qemu-arm@nongnu.org, qemu-riscv@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , "Michael S . Tsirkin" , Igor Mammedov , Ani Sinha , Laurent Vivier , Daniel Henrique Barboza , Alistair Francis , Andrew Jones , Anup Patel , Haibo1 Xu , Sunil V L Subject: [PATCH 09/12] pc-bios/meson.build: Add support for RISC-V in unpack_edk2_blobs Date: Fri, 15 Mar 2024 18:39:21 +0530 Message-Id: <20240315130924.2378849-7-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240315130924.2378849-1-sunilvl@ventanamicro.com> References: <20240315130924.2378849-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42b; envelope-from=sunilvl@ventanamicro.com; helo=mail-pf1-x42b.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, T_SCC_BODY_TEXT_LINE=-0.01 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Update list of images supported in unpack_edk2_blobs to enable RISC-V ACPI table testing. Signed-off-by: Sunil V L Reviewed-by: Alistair Francis --- pc-bios/meson.build | 2 ++ tests/qtest/meson.build | 3 +++ 2 files changed, 5 insertions(+) diff --git a/pc-bios/meson.build b/pc-bios/meson.build index 0760612bea..8602b45b9b 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -4,6 +4,8 @@ if unpack_edk2_blobs 'edk2-aarch64-code.fd', 'edk2-arm-code.fd', 'edk2-arm-vars.fd', + 'edk2-riscv-code.fd', + 'edk2-riscv-vars.fd', 'edk2-i386-code.fd', 'edk2-i386-secure-code.fd', 'edk2-i386-vars.fd', diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 36c5c13a7b..dd19711d9f 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -252,6 +252,9 @@ qtests_s390x = \ qtests_riscv32 = \ (config_all_devices.has_key('CONFIG_SIFIVE_E_AON') ? ['sifive-e-aon-watchdog-test'] : []) +qtests_riscv64 = \ + (unpack_edk2_blobs ? ['bios-tables-test'] : []) + qos_test_ss = ss.source_set() qos_test_ss.add( 'ac97-test.c', From patchwork Fri Mar 15 13:09:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil V L X-Patchwork-Id: 13593460 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 80400C54E58 for ; Fri, 15 Mar 2024 13:15:37 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rl7Kx-0000BT-VV; Fri, 15 Mar 2024 09:11:04 -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 1rl7KI-0006nF-Mq for qemu-devel@nongnu.org; Fri, 15 Mar 2024 09:10:24 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rl7K9-0007xN-Jm for qemu-devel@nongnu.org; Fri, 15 Mar 2024 09:10:21 -0400 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-6da202aa138so1215674b3a.2 for ; Fri, 15 Mar 2024 06:10:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1710508210; x=1711113010; 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=rLrHBMIvFW4XmoCMhvXju7BN+IFOvSPPXpZv8Qzl0AE=; b=FjsiYhaOOz1Y7EjCrVxJQ8uoRJRuFGW3ZL8Re+AsfE2qaviapXbn/OCHLL/LMHr9Zs MJ4gr9jHzPUGKxlk8TUFjxoBomiNQODL5lSS0ZbA0r5RWEDPrwcJoW2nAPTrMTqBTmpN yWAwezYJTjAtFOMmz32fA92h20hHVxtp9pTpioE++K8r21zroZJhLra39CMZiHFvjrUQ H0ajtAEwui4kYNtG20sgttY92sSxFiyUcDjRm3sbqVA1JOGmMZVfiRE89s/W7MkdCUhP Ic0LEjvmxE38wPaNGLEEE5EjmxEGbuiKZSnwxg1jZKTbAq2iVDfUuwKuENb1tPszkYZI +Azg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710508210; x=1711113010; 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=rLrHBMIvFW4XmoCMhvXju7BN+IFOvSPPXpZv8Qzl0AE=; b=RikTG6tbTZlAXzbw/h0e3Zh5JtqUQbsTg/XhO+j61/uOefK+wAk+BqZ0JsG4AsNDk1 jemdYuPn+VgTvRc1TWwGvLSk2B4rsH+or7Kj073/EyBjXnznH75LiZPP0HIl4qaZTll+ 2AyiY834QcVTx/0uUaw1tpbuVCgqWR6uDk63L3qh7YOhWPcb7ZyXdLSMzUsWxzvx3Hv9 0mWOKNOytbnj66dAuIB4YDn9WNRPZalRcKtCTWM8j/RV7u5XMMyX1VB2tCHm6uNu0b/r rIxmJEwyP/ntrxSN0xtwf6JJ/qPP3obBn01TK7+CJp5Uk6rDnSwjZwgpeU2vzntbOr6o ardw== X-Gm-Message-State: AOJu0YzopkR/D/2olp4lbfeFnHec+7uRqyDMvnOf6zS3gfQJjZU2aqA4 /TPxrvcO09MD2c8J/QzrAulj+1QYAHm//Rxx4CaF6Sp63REP2ccYEwFepT79Pj9/pJP/W5h+Bpt E X-Google-Smtp-Source: AGHT+IHObHc0Ahl0qj6J7KZfwd1HADuvDQ77aHsslrh5XiW6wo7BFk+HQiUOclQqf2aCK83ZbRrP/w== X-Received: by 2002:a05:6a20:1591:b0:1a0:e187:87c4 with SMTP id h17-20020a056a20159100b001a0e18787c4mr3772557pzj.38.1710508209727; Fri, 15 Mar 2024 06:10:09 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.184.12]) by smtp.gmail.com with ESMTPSA id r3-20020a17090ad40300b0029c68206e2bsm2886663pju.0.2024.03.15.06.10.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Mar 2024 06:10:09 -0700 (PDT) From: Sunil V L To: qemu-devel@nongnu.org, qemu-arm@nongnu.org, qemu-riscv@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , "Michael S . Tsirkin" , Igor Mammedov , Ani Sinha , Laurent Vivier , Daniel Henrique Barboza , Alistair Francis , Andrew Jones , Anup Patel , Haibo1 Xu , Sunil V L Subject: [PATCH 10/12] tests/data/acpi/rebuild-expected-aml.sh: Add RISC-V Date: Fri, 15 Mar 2024 18:39:22 +0530 Message-Id: <20240315130924.2378849-8-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240315130924.2378849-1-sunilvl@ventanamicro.com> References: <20240315130924.2378849-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::429; envelope-from=sunilvl@ventanamicro.com; helo=mail-pf1-x429.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, T_SCC_BODY_TEXT_LINE=-0.01 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Update the list of supported architectures to include RISC-V. Signed-off-by: Sunil V L Reviewed-by: Alistair Francis --- tests/data/acpi/rebuild-expected-aml.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/data/acpi/rebuild-expected-aml.sh b/tests/data/acpi/rebuild-expected-aml.sh index dcf2e2f221..c1092fb8ba 100755 --- a/tests/data/acpi/rebuild-expected-aml.sh +++ b/tests/data/acpi/rebuild-expected-aml.sh @@ -12,7 +12,7 @@ # This work is licensed under the terms of the GNU GPLv2. # See the COPYING.LIB file in the top-level directory. -qemu_arches="x86_64 aarch64" +qemu_arches="x86_64 aarch64 riscv64" if [ ! -e "tests/qtest/bios-tables-test" ]; then echo "Test: bios-tables-test is required! Run make check before this script." @@ -36,7 +36,8 @@ fi if [ -z "$qemu_bins" ]; then echo "Only the following architectures are currently supported: $qemu_arches" echo "None of these configured!" - echo "To fix, run configure --target-list=x86_64-softmmu,aarch64-softmmu" + echo "To fix, run configure \ + --target-list=x86_64-softmmu,aarch64-softmmu,riscv64-softmmu" exit 1; fi From patchwork Fri Mar 15 13:09:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil V L X-Patchwork-Id: 13593472 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 27896C54E67 for ; Fri, 15 Mar 2024 13:19:14 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rl7L0-0000Fj-Ok; Fri, 15 Mar 2024 09:11:06 -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 1rl7KK-0006ns-6u for qemu-devel@nongnu.org; Fri, 15 Mar 2024 09:10:24 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rl7KE-0007zW-0V for qemu-devel@nongnu.org; Fri, 15 Mar 2024 09:10:23 -0400 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-6e6cadfffdbso1802716b3a.3 for ; Fri, 15 Mar 2024 06:10:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1710508215; x=1711113015; 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=KQl+6L0VcZgA50SWnKjH1hfXBn+0RZFkMJcMmqNHbzY=; b=U4fl/FuIfmhvfpd57CuEGSTBZPqomH+zH3R5OGh0AuCywg5JpaW2XO5EUpxzPiqf8y YfzTra2+FBMWVM4CTmILQ3FXSfh2BF57zTF7N2xYfTXxsL3xGOSxVPWLeQI1IP6JM9RF PkvpwAnKhA3pj8QhyIQZBCjMQ5zFRE2+N95l7lBSUcGmEJzTwNzu97XNF6Ch6GrHW8z5 jBlNwhj2pydouInDu6n9Dg4Dqn0ZL5CBwh8Z2Fp7nTcghiQ59KdDA5LCxA/nKkvWwAIM peH+ncEN+XsbbF4rKQsBqggbkKZnr8xaY9VXlqAzlenJplZon3SqXFIAE3pdIeUOe8Fw 9f3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710508215; x=1711113015; 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=KQl+6L0VcZgA50SWnKjH1hfXBn+0RZFkMJcMmqNHbzY=; b=H18cDdURfmup4/QhjwJFQvJuh2T/OVDqOyAS1cMHkVWSHlaFRyukPZspWoYvQlD1l1 rS1P2n60WiaQYwB6K5AJzzOlukddIILKdL/8BrauYpM0KCKg4Bdw+2bURdv9Nx4+JKm5 WYRHwiI/ABJ8gyCf+b22LaqIiROpdNc2VOnxIrLWP8ZbF9YEXyX5vGH7Z5PuXs7ngXEK Yq+zDbnK6ZnxF+6QQYhH3j7WmKJKkNh56R4jVUuxx5yM1AvzxbhoPIQmyqWjbeqKAtdT x3mY3H+n3Ri/WFF8Gp85sXM5WKWo+9/+Kp22Vx1mPo7sZdHRCIIaLiOL/uJI6QyAPHPh qGmw== X-Gm-Message-State: AOJu0Yzj8XzEmkritZlF7UBoc5dp2FT02r76CrvZ1TlzRcUzDPnZyhnR PT4IAbjgKCAclnnCd5ZAfbKSEsJpiiCLmLiLl1yPUUJYEtS+Fy1ZWbO/fWPX4V1Z1y616Leh0jB Y X-Google-Smtp-Source: AGHT+IEsZrFnzF0nSF1KB0XYo3jYzZt3uc4XUl0wYPF7n36Mll3laOGigFIGHPKuog3Ig9SRChTing== X-Received: by 2002:a05:6a20:8f24:b0:1a3:502d:cb1 with SMTP id b36-20020a056a208f2400b001a3502d0cb1mr1429088pzk.1.1710508214724; Fri, 15 Mar 2024 06:10:14 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.184.12]) by smtp.gmail.com with ESMTPSA id r3-20020a17090ad40300b0029c68206e2bsm2886663pju.0.2024.03.15.06.10.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Mar 2024 06:10:14 -0700 (PDT) From: Sunil V L To: qemu-devel@nongnu.org, qemu-arm@nongnu.org, qemu-riscv@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , "Michael S . Tsirkin" , Igor Mammedov , Ani Sinha , Laurent Vivier , Daniel Henrique Barboza , Alistair Francis , Andrew Jones , Anup Patel , Haibo1 Xu , Sunil V L Subject: [PATCH 11/12] tests/data/acpi/virt/riscv64: Add expected ACPI tables for RISC-V Date: Fri, 15 Mar 2024 18:39:23 +0530 Message-Id: <20240315130924.2378849-9-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240315130924.2378849-1-sunilvl@ventanamicro.com> References: <20240315130924.2378849-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::429; envelope-from=sunilvl@ventanamicro.com; helo=mail-pf1-x429.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, T_SCC_BODY_TEXT_LINE=-0.01 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Add expected ACPI tables for RISC-V so that bios-table-test can be enabled for RISC-V. Signed-off-by: Sunil V L --- tests/data/acpi/virt/riscv64/APIC | Bin 0 -> 116 bytes tests/data/acpi/virt/riscv64/BGRT | Bin 0 -> 56 bytes tests/data/acpi/virt/riscv64/DSDT | Bin 0 -> 3518 bytes tests/data/acpi/virt/riscv64/FACP | Bin 0 -> 276 bytes tests/data/acpi/virt/riscv64/MCFG | Bin 0 -> 60 bytes tests/data/acpi/virt/riscv64/RHCT | Bin 0 -> 314 bytes tests/data/acpi/virt/riscv64/RSDP | Bin 0 -> 36 bytes tests/data/acpi/virt/riscv64/SPCR | Bin 0 -> 80 bytes tests/data/acpi/virt/riscv64/XSDT | Bin 0 -> 84 bytes 9 files changed, 0 insertions(+), 0 deletions(-) create mode 100755 tests/data/acpi/virt/riscv64/APIC create mode 100755 tests/data/acpi/virt/riscv64/BGRT create mode 100755 tests/data/acpi/virt/riscv64/DSDT create mode 100755 tests/data/acpi/virt/riscv64/FACP create mode 100755 tests/data/acpi/virt/riscv64/MCFG create mode 100755 tests/data/acpi/virt/riscv64/RHCT create mode 100755 tests/data/acpi/virt/riscv64/RSDP create mode 100755 tests/data/acpi/virt/riscv64/SPCR create mode 100755 tests/data/acpi/virt/riscv64/XSDT GIT binary patch literal 84 zcmazDb_oe#U|?VrcJg=j2v%^42yj*a0!E-1h!zG)F&y~+AIN23*Z`#$KA4+^nhU|?XZ_Vf#J^-*wj@itNb0w$msh!zG)F#_2V3gY!3S{^7-3}gTR|5yhB literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/riscv64/DSDT b/tests/data/acpi/virt/riscv64/DSDT new file mode 100755 index 0000000000000000000000000000000000000000..0fb2d5e0e389541209b765d5092d0706f40298f6 GIT binary patch literal 3518 zcmZvf%WvaU6vnR;w@IBxlQexl(t(j!ppl%0(ryqeCJ*}oI`D?w!iChKA+$9t$orAn%(bn zN+n)t?0eh6a^of6TgGN7rRbcFh1Tyc_k%{iceZVNuIr}z+pT7)qm0&dr&dmZB`a{a^Ra*0&D5Eo1b;X8Qm}E3gQYkTOF1_DRa)WNl^t#{A^TNmZNji{btZCtt5&QPNDqU;E!+b zecnEQ^xc;~?0jvN=B?69B6sx0n@1-LMChb{iWO(USDtFAW3{YY{55g*p1P}!a8zWX z7lz;IPVBzpJS=7G%wV8y2Q62ba|`EHRm#%1lYm%>L=vK=N;x|_7+?*WxKL3R0`umY z&O>MhKe$y(1g;N2-TU8l!@sOMoiwl`i1tW@cj+o4-cu3BPCB-VhD+4MD9hIDroD&Pl#Oi8OIy2%- zNlr-4iRFXLXr|LTGn$gLp$V}cX!M^n3=p)tt`$vN>NG_kr`M{qil6Owag1ZPHY zW+W#h=gbPutl-Q_PDsv)?-Htwo@Y*Q<|HR1=gbSvyx`1BPDsup=eXpAX~8)yIHx5iBIp+lDoZy_3oRFMzUU1F}&UwiR$vGDU=Yrr|kera5b5U?E3eH8z3CTH^1m}|A zT#}rSoU5@qiM`L8Qmx@>rXnqyVu6bqy3;0 zSfN$e$O$X-aop-gjFlN1TJ2C(VM8aZsGs9rPsDhcG3gaHcG3%d9rt=N#>h-rEXOMpLn!a_)bcQwbVUYCt>d6Z~go(OKwiV=x$e6rJOWm8FJLZ)jL(gSOQ9 z(=101Q%{N90rg{iGreXyIPiUy_PU*2Ro)uw?+2cJexkhQVfAu5b@3W?^1b$-wSOuL z8($pWumAYmuXoN*92)^EIHqx|osu9QI;oM>2efl4w7)DozPM|Bh$~ecUA>%od=bT& z;R0PerC=JrI{7MZ#_1;2tCR9A{Hkc%mp4o`zpVZISFrki`_c5@?b)Ba_T|{c>*}hQ pv@F`;cR<_jYzAT_(hnb+|8pBtRxTSGr9{slF`>K_0A literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/riscv64/FACP b/tests/data/acpi/virt/riscv64/FACP new file mode 100755 index 0000000000000000000000000000000000000000..a5276b65ea8ce46cc9b40d96d98f0669c9089ed4 GIT binary patch literal 276 zcmZ>BbPf<`lE(^DK1@Wog4=(iq&1K z7;1J`gewX|OE=3Z>{xM3wM)ljIQKa+635YaZ7jrOeGc+eJEnks*|jl=GEUBVQ8WhX zK@GjINg;u`)Bd);9H literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/riscv64/RSDP b/tests/data/acpi/virt/riscv64/RSDP new file mode 100755 index 0000000000000000000000000000000000000000..55054f8730c389d0d7eba90c24a1dae6d1283b90 GIT binary patch literal 36 ncmWFvc2Nij2~zmyE!S15v<@85#X!<1dKp25F12;fdT`FDF9*%FmM4$c8~z`e;@#f G!2kgKJqrN< literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/riscv64/XSDT b/tests/data/acpi/virt/riscv64/XSDT new file mode 100755 index 0000000000000000000000000000000000000000..c69474889664d72d075419c0a1dcf1d82ec44268 From patchwork Fri Mar 15 13:09:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil V L X-Patchwork-Id: 13593453 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 6FF4CC54E67 for ; Fri, 15 Mar 2024 13:13:02 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rl7L9-0000fW-Pw; Fri, 15 Mar 2024 09:11:15 -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 1rl7KQ-00070o-D7 for qemu-devel@nongnu.org; Fri, 15 Mar 2024 09:10:30 -0400 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rl7KI-00081L-BL for qemu-devel@nongnu.org; Fri, 15 Mar 2024 09:10:29 -0400 Received: by mail-pj1-x1034.google.com with SMTP id 98e67ed59e1d1-29c71c6e20cso1745848a91.2 for ; Fri, 15 Mar 2024 06:10:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1710508220; x=1711113020; 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=nbTQO2KVoRaBqcKgnkMGplR/jUAxDF5U80st6L4ph7Q=; b=RJLAhd1ciGwCfaHXQbkYjJhG5vynmk3us1blbeJpdtRyeYPcDG+M7ciY3Gk6y8yBCU 0hSaHe3NvXum8ZJoD3KEKQO1iUiY21Rq5JIsrFUmaB+RBV1cjXW0gAjvQcX2dUPqU+B6 X89TwWd0M+A6fTIJZ/uNHpLiHdFhkDKhq54jdkB1r2xLAAv4R9nm3OELEVkuc6yfKwmH 8EDmpq+SG2RppdPotqRLyGYS2ISanCo1+U2g5I0GCwxGll3foL0NOKJK4uZ+NiJpDHTE Z9LWDScGWsVjL/eOaSA+s0Wh9rFL9ORrCGX4eXZ59zVS5+S4scUUN0L3Rj4WUNxy6kRP rhbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710508220; x=1711113020; 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=nbTQO2KVoRaBqcKgnkMGplR/jUAxDF5U80st6L4ph7Q=; b=FEUs04wsXuUT6x1yujyFanZI/aNbvrwPRS3dUqFLABaKi137UdKF+wYaTZ75oJ2r+D zLEr1GUhye+c2KrozVSEP7TNnjnV6PDV/4hG6ddaRbszlXQcOrY1G3KbQkAwsY/4ry4i kJm7hM/Zji30R67CgLWKucQnf3mNpcE18/9jh8L0/DD6Uh5tpcQObisNMB5bw//XF4F/ mn6vkgGm5AjMv2vE/J/zb8Ut8NOJ0hGS+Uw+juMp0QmGIjnxwxq4z/VGMhoaxYZ06vGN 7bLTm14L0WAyPp2qXhhE/jTO3O68lrSkGDMF+51DqON7aPfOV94X6UalVq/FNrmxr2Xr 3maQ== X-Gm-Message-State: AOJu0YyqnctQsyTzInySgMOqQbd75VmnlY1WhN6/y+oSxAwLi+Mat4Zj /aHc9koo5XBqT5KUaNyIlv9GhkGv/vtzv6mo9+GAyk/7LLqzAcaxnPa05b17jnW+YsHC55EnfF5 U X-Google-Smtp-Source: AGHT+IFbKFMKzp3PnsashRb8m5vhoqv9/1zNOpgtQHm6eK4uKz8EmZPd2f6gZpXqceUoCkcx3/NRxQ== X-Received: by 2002:a17:90a:be18:b0:29e:781:25dc with SMTP id a24-20020a17090abe1800b0029e078125dcmr383552pjs.19.1710508219750; Fri, 15 Mar 2024 06:10:19 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.184.12]) by smtp.gmail.com with ESMTPSA id r3-20020a17090ad40300b0029c68206e2bsm2886663pju.0.2024.03.15.06.10.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Mar 2024 06:10:19 -0700 (PDT) From: Sunil V L To: qemu-devel@nongnu.org, qemu-arm@nongnu.org, qemu-riscv@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , "Michael S . Tsirkin" , Igor Mammedov , Ani Sinha , Laurent Vivier , Daniel Henrique Barboza , Alistair Francis , Andrew Jones , Anup Patel , Haibo1 Xu , Sunil V L Subject: [PATCH 12/12] tests/qtest/bios-tables-test.c: Enable basic testing for RISC-V Date: Fri, 15 Mar 2024 18:39:24 +0530 Message-Id: <20240315130924.2378849-10-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240315130924.2378849-1-sunilvl@ventanamicro.com> References: <20240315130924.2378849-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1034; envelope-from=sunilvl@ventanamicro.com; helo=mail-pj1-x1034.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, T_SCC_BODY_TEXT_LINE=-0.01 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Add basic ACPI table testing for RISC-V. Signed-off-by: Sunil V L Reviewed-by: Alistair Francis --- tests/qtest/bios-tables-test.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index c492438ced..033acc8958 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1923,6 +1923,30 @@ static void test_acpi_microvm_acpi_erst(void) } #endif /* CONFIG_POSIX */ +static void test_acpi_riscv64_virt_tcg(void) +{ + test_data data = { + .machine = "virt", + .arch = "riscv64", + .tcg_only = true, + .uefi_fl1 = "pc-bios/edk2-riscv-code.fd", + .uefi_fl2 = "pc-bios/edk2-riscv-vars.fd", + .ram_start = 0x80000000ULL, + .scan_len = 128ULL * 1024 * 1024, + }; + + /* + * RHCT will have ISA string encoded. To reduce the effort + * of updating expected AML file for any new default ISA extension, + * use the profile rva22s64. Once profile is ratified, there may + * not be new extension possible. + */ + test_acpi_one("-cpu rva22s64 -device virtio-blk-device,drive=hd0 " + "-drive file=tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2,id=hd0", + &data); + free_test_data(&data); +} + static void test_acpi_aarch64_virt_tcg(void) { test_data data = { @@ -2342,6 +2366,10 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/virt/viot", test_acpi_aarch64_virt_viot); } } + } else if (strcmp(arch, "riscv64") == 0) { + if (has_tcg && qtest_has_device("virtio-blk-pci")) { + qtest_add_func("acpi/virt", test_acpi_riscv64_virt_tcg); + } } ret = g_test_run(); boot_sector_cleanup(disk);