From patchwork Fri Aug 9 03:09:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haibo Xu X-Patchwork-Id: 1970782 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=BvzG73ZL; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Wg7hB6Ppwz1ydk for ; Fri, 9 Aug 2024 12:50:50 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1scFhT-0001rc-7P; Thu, 08 Aug 2024 22:49: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 1scFhS-0001qI-0E for qemu-devel@nongnu.org; Thu, 08 Aug 2024 22:49:54 -0400 Received: from mgamail.intel.com ([198.175.65.16]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1scFhQ-0000eY-4V for qemu-devel@nongnu.org; Thu, 08 Aug 2024 22:49:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723171793; x=1754707793; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=3q1zJZ//GoxBS56Kh0HsoS3aXx9B2oO/r+rdOoTazB8=; b=BvzG73ZLfy5gHw4QI1whmSWn3t/ewID2f0+UYY1vz/wUmEu0kCliEZ3k I8avOfiFAorHP8m58kil91/+1nZEDT+qdXOWWTlk4e1z8YsK5XlpV+aSE b7EYHTi/jSIbevr9rVeD12MoIFtUVlWbey22vhd93YELdVPOzo+/AoGUC 9ivSBNxBppG3fq9RdnIKCHZMlnxfK4hg3OktSITC8HECXmUoLd3RlE2gx icResjLoyjvKfRv0cWjXE95pdTBb70Nu9niRMG5uAJyK1BYw6jswrRSNv mcm5OpX9p5rCD9ezy0IT1VSPn1sYTOMV9NSmNylDA5P0V60FWE3W1NLGC A==; X-CSE-ConnectionGUID: ZiriOZsPS3KJajttaCT6fA== X-CSE-MsgGUID: 4YJFmr5dTrmslraFl2AfSQ== X-IronPort-AV: E=McAfee;i="6700,10204,11158"; a="21484098" X-IronPort-AV: E=Sophos;i="6.09,274,1716274800"; d="scan'208";a="21484098" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Aug 2024 19:49:47 -0700 X-CSE-ConnectionGUID: AtCkfp2HRO2j0WSk6sNaxw== X-CSE-MsgGUID: JiAVW4XNTt2MoWknobMJlA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,274,1716274800"; d="scan'208";a="62377619" Received: from haibo-optiplex-7090.sh.intel.com ([10.239.153.94]) by orviesa004.jf.intel.com with ESMTP; 08 Aug 2024 19:49:44 -0700 From: Haibo Xu To: sunilvl@ventanamicro.com, alistair.francis@wdc.com Cc: xiaobo55x@gmail.com, Haibo Xu , "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha , qemu-devel@nongnu.org Subject: [PATCH 1/3] tests/acpi: Add empty ACPI SRAT data file for RISC-V Date: Fri, 9 Aug 2024 11:09:47 +0800 Message-Id: <0e30216273f2f59916bc651350578d8e8bc3a75f.1723172696.git.haibo1.xu@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Received-SPF: pass client-ip=198.175.65.16; envelope-from=haibo1.xu@intel.com; helo=mgamail.intel.com X-Spam_score_int: -44 X-Spam_score: -4.5 X-Spam_bar: ---- X-Spam_report: (-4.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.141, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org As per process documented (steps 1-3) in bios-tables-test.c, add empty AML data file for RISC-V ACPI SRAT table and add the entry in bios-tables-test-allowed-diff.h. Signed-off-by: Haibo Xu Reviewed-by: Sunil V L Acked-by: Alistair Francis --- tests/data/acpi/riscv64/virt/SRAT.numamem | 0 tests/qtest/bios-tables-test-allowed-diff.h | 1 + 2 files changed, 1 insertion(+) create mode 100644 tests/data/acpi/riscv64/virt/SRAT.numamem diff --git a/tests/data/acpi/riscv64/virt/SRAT.numamem b/tests/data/acpi/riscv64/virt/SRAT.numamem new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index dfb8523c8b..a3e01d2eb7 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,2 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/riscv64/virt/SRAT.numamem", From patchwork Fri Aug 9 03:09:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haibo Xu X-Patchwork-Id: 1970780 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=e/Unk0m9; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Wg7h93dWwz1ydk for ; Fri, 9 Aug 2024 12:50:49 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1scFhU-0001wY-HO; Thu, 08 Aug 2024 22:49:56 -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 1scFhS-0001qJ-2a for qemu-devel@nongnu.org; Thu, 08 Aug 2024 22:49:54 -0400 Received: from mgamail.intel.com ([198.175.65.16]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1scFhQ-0000ec-4N for qemu-devel@nongnu.org; Thu, 08 Aug 2024 22:49:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723171793; x=1754707793; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Eg1txdz+0hc3DXwfbky73p7lGo01rRlG8pItxjq6qtc=; b=e/Unk0m9UaeCztFT73kSwI7n/leQjw1j5gZuv7dBz54QgbmtGjfUs2cK kBHYfW14+w4tEbF3ekA0JftPWDYxLeJ/EHBa4LA6N84ioe+3oG00gLMXm HwndW10zZlQekVBiV+T2M3MpNUAhb7tcXYNacLqVIjJwF71War2GqBU5I T4zJow/pJf7xEUK8hSr+iBOXYpuHHctQmA8sbIFrOqoDTHPCi5NNh3K79 7N5MbN2mS4ojgs+9Zw2GgMnbZYeCffEANcH6gIGt2ohRxkoimJwSYdiny tKDoi2Nt3BFnEoq60dM7R14S+uetx3surcbe51asyzHNmKC1iIf0WxMYX w==; X-CSE-ConnectionGUID: Lp3+FTyvSxWjOr9pe078jA== X-CSE-MsgGUID: Bd5En9xhQLiyFW3R//Olag== X-IronPort-AV: E=McAfee;i="6700,10204,11158"; a="21484103" X-IronPort-AV: E=Sophos;i="6.09,274,1716274800"; d="scan'208";a="21484103" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Aug 2024 19:49:49 -0700 X-CSE-ConnectionGUID: wTmXT3muRfC5XTyjVPkwVQ== X-CSE-MsgGUID: V2PtPF9yQ4a1JNDXX2LMkQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,274,1716274800"; d="scan'208";a="62377622" Received: from haibo-optiplex-7090.sh.intel.com ([10.239.153.94]) by orviesa004.jf.intel.com with ESMTP; 08 Aug 2024 19:49:46 -0700 From: Haibo Xu To: sunilvl@ventanamicro.com, alistair.francis@wdc.com Cc: xiaobo55x@gmail.com, Haibo Xu , "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha , qemu-devel@nongnu.org Subject: [PATCH 2/3] tests/qtest/bios-tables-test.c: Enable numamem testing for RISC-V Date: Fri, 9 Aug 2024 11:09:48 +0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: <0e30216273f2f59916bc651350578d8e8bc3a75f.1723172696.git.haibo1.xu@intel.com> References: <0e30216273f2f59916bc651350578d8e8bc3a75f.1723172696.git.haibo1.xu@intel.com> MIME-Version: 1.0 Received-SPF: pass client-ip=198.175.65.16; envelope-from=haibo1.xu@intel.com; helo=mgamail.intel.com X-Spam_score_int: -44 X-Spam_score: -4.5 X-Spam_bar: ---- X-Spam_report: (-4.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.141, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add ACPI SRAT table test case for RISC-V when NUMA was enabled. Signed-off-by: Haibo Xu Reviewed-by: Sunil V L Acked-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 36e5c0adde..e79f3a03df 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1706,6 +1706,32 @@ static void test_acpi_microvm_ioapic2_tcg(void) free_test_data(&data); } +static void test_acpi_riscv64_virt_tcg_numamem(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", + .cd = "tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2", + .ram_start = 0x80000000ULL, + .scan_len = 128ULL * 1024 * 1024, + }; + + data.variant = ".numamem"; + /* + * 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. + */ + test_acpi_one(" -cpu rva22s64" + " -object memory-backend-ram,id=ram0,size=128M" + " -numa node,memdev=ram0", + &data); + free_test_data(&data); +} + static void test_acpi_aarch64_virt_tcg_numamem(void) { test_data data = { @@ -2466,6 +2492,8 @@ int main(int argc, char *argv[]) } 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); + qtest_add_func("acpi/virt/numamem", + test_acpi_riscv64_virt_tcg_numamem); } } ret = g_test_run(); From patchwork Fri Aug 9 03:09:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haibo Xu X-Patchwork-Id: 1970781 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=S7r2TRR+; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Wg7h93v7sz1yfC for ; Fri, 9 Aug 2024 12:50:49 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1scFhV-0001zX-5M; Thu, 08 Aug 2024 22:49:57 -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 1scFhT-0001ro-8C for qemu-devel@nongnu.org; Thu, 08 Aug 2024 22:49:55 -0400 Received: from mgamail.intel.com ([198.175.65.16]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1scFhQ-0000eg-70 for qemu-devel@nongnu.org; Thu, 08 Aug 2024 22:49:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723171793; x=1754707793; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gTWPhn0Sazi3pvlcBT8v0Y9LZMTNHagz1l9t7zmUA4w=; b=S7r2TRR+LyOFCb1D1RL2U+4OM5M6TLAP3XFtdi36gq+LydjZcto8ZyhP +SgTDdvQPWJ+wW0/ngIU3HrH0gKpPN9QXij8JuegYOn2OEXQ4znNHsgdA JlfGTWACjlxfXsLZqRN6+ybrKKIwsw2Picsy9qpedgn7FQVGSYJ4ruERq XEoC9wNPrWHEZNWaYCuyYUy084x+rFh8gfIW3PUC/BhOeQXOw9Evp3WS6 +ooyRbaPdE0Es/jHfRDSn4YRwMk2UYP38aR7TwE41S3EgIx/elzdZc3MM apM+16PilyuxHVz32CboV3VzoqruCXhC82T4H5WEiWMHnpb6a6yh/aYlN A==; X-CSE-ConnectionGUID: 6p8CSJkkSGOFYWTWw6eCnQ== X-CSE-MsgGUID: Np4nnHlkR6+MCh0Ag+qLQA== X-IronPort-AV: E=McAfee;i="6700,10204,11158"; a="21484111" X-IronPort-AV: E=Sophos;i="6.09,274,1716274800"; d="scan'208";a="21484111" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Aug 2024 19:49:51 -0700 X-CSE-ConnectionGUID: +0VJB6rlTzG6Gc3IfuQM/g== X-CSE-MsgGUID: 9HKFxpuJR4meKQ75IyAEmA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,274,1716274800"; d="scan'208";a="62377627" Received: from haibo-optiplex-7090.sh.intel.com ([10.239.153.94]) by orviesa004.jf.intel.com with ESMTP; 08 Aug 2024 19:49:48 -0700 From: Haibo Xu To: sunilvl@ventanamicro.com, alistair.francis@wdc.com Cc: xiaobo55x@gmail.com, Haibo Xu , "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha , qemu-devel@nongnu.org Subject: [PATCH 3/3] tests/acpi: Add expected ACPI SRAT AML file for RISC-V Date: Fri, 9 Aug 2024 11:09:49 +0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: <0e30216273f2f59916bc651350578d8e8bc3a75f.1723172696.git.haibo1.xu@intel.com> References: <0e30216273f2f59916bc651350578d8e8bc3a75f.1723172696.git.haibo1.xu@intel.com> MIME-Version: 1.0 Received-SPF: pass client-ip=198.175.65.16; envelope-from=haibo1.xu@intel.com; helo=mgamail.intel.com X-Spam_score_int: -44 X-Spam_score: -4.5 X-Spam_bar: ---- X-Spam_report: (-4.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.141, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org As per the step 5 in the process documented in bios-tables-test.c, generate the expected ACPI SRAT AML data file for RISC-V using the rebuild-expected-aml.sh script and update the bios-tables-test-allowed-diff.h. This is a new file being added for the first time. Hence, iASL diff output is not added. Signed-off-by: Haibo Xu Reviewed-by: Sunil V L Acked-by: Alistair Francis --- tests/data/acpi/riscv64/virt/SRAT.numamem | Bin 0 -> 108 bytes tests/qtest/bios-tables-test-allowed-diff.h | 1 - 2 files changed, 1 deletion(-) diff --git a/tests/data/acpi/riscv64/virt/SRAT.numamem b/tests/data/acpi/riscv64/virt/SRAT.numamem index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2b6467364b7673c366c9abf948142eaf60c9311f 100644 GIT binary patch literal 108 zcmWFzatz5~U|?XDb@F%i2v%^42yj*a0!E-1hz+7a7zWryU@U|