From nobody Wed Nov 27 11:49:21 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1730982952; cv=none; d=zohomail.com; s=zohoarc; b=ENrgNi4rIyV2og7azdRdDhnvHAOxKPuaAwYjj1GMDeqpCgQSTPEAcM+91QPxtznKtIjzo3vGFT5jxl+Kl5Cv+SZg74Y21Gd1KsH3tAEkmXGHDNaeCmuRZUNOSJ33rD72X0/g4kc0BikAGO9GlrKpWjbX4TSv2dq8xtCAZQ31JEo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730982952; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=LA3rWo32YMD8fxbkH3PUe06/oVooYAOYZO+kn4+cfbg=; b=TTd4uvf2X/2tVTIG39FVF+TROYx6BuCmWg9xJF83ptmzLQ1P6qxYXV+AXW3DN6qYq25df+qPj7scl8jpwSaYpiAkBfvMm82hWpWssxDVayKXtURNiIL5WjvGXKISEbU5wgVRyEWPvsLswyKnTXbyi476YRWO4uSkwyhKytneaEU= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1730982952693455.6386336198591; Thu, 7 Nov 2024 04:35:52 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t91ja-00044S-2I; Thu, 07 Nov 2024 07:35:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t91jQ-0003v6-Ji for qemu-devel@nongnu.org; Thu, 07 Nov 2024 07:35:26 -0500 Received: from frasgout.his.huawei.com ([185.176.79.56]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t91jP-0001Wr-2N for qemu-devel@nongnu.org; Thu, 07 Nov 2024 07:35:24 -0500 Received: from mail.maildlp.com (unknown [172.18.186.231]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4XkhNy248nz6L75r; Thu, 7 Nov 2024 20:35:14 +0800 (CST) Received: from frapeml500008.china.huawei.com (unknown [7.182.85.71]) by mail.maildlp.com (Postfix) with ESMTPS id 3CBF9140A77; Thu, 7 Nov 2024 20:35:18 +0800 (CST) Received: from SecurePC-101-06.china.huawei.com (10.122.19.247) by frapeml500008.china.huawei.com (7.182.85.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Thu, 7 Nov 2024 13:35:17 +0100 To: "Michael S . Tsirkin" , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , CC: Subject: [PATCH 1/5] hw/acpi: Fix size of HID in build_append_srat_acpi_device_handle() Date: Thu, 7 Nov 2024 12:34:42 +0000 Message-ID: <20241107123446.902801-2-Jonathan.Cameron@huawei.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241107123446.902801-1-Jonathan.Cameron@huawei.com> References: <20241107123446.902801-1-Jonathan.Cameron@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.122.19.247] X-ClientProxiedBy: lhrpeml100011.china.huawei.com (7.191.174.247) To frapeml500008.china.huawei.com (7.182.85.71) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=185.176.79.56; envelope-from=jonathan.cameron@huawei.com; helo=frasgout.his.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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: , Reply-to: Jonathan Cameron From: Jonathan Cameron via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1730982953610116600 Content-Type: text/plain; charset="utf-8" The size should always be 8 so hard code that. By coincidience the incorrect use of sizeof(char *) is 8 on 64 bit hosts, but was caught by CI testing with i686 as the host. Reported-by: Michael S. Tsirkin Closes: https://lore.kernel.org/qemu-devel/20241104110025-mutt-send-email-m= st@kernel.org/ Signed-off-by: Jonathan Cameron Reviewed-by: Daniel P. Berrang=C3=A9 --- hw/acpi/aml-build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 6a76626177..72282b173e 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -1960,7 +1960,7 @@ static void build_append_srat_acpi_device_handle(GArr= ay *table_data, { assert(strlen(hid) =3D=3D 8); /* Device Handle - ACPI */ - for (int i =3D 0; i < sizeof(hid); i++) { + for (int i =3D 0; i < 8; i++) { build_append_int_noprefix(table_data, hid[i], 1); } build_append_int_noprefix(table_data, uid, 4); --=20 2.43.0 From nobody Wed Nov 27 11:49:21 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1730982974; cv=none; d=zohomail.com; s=zohoarc; b=TcUbWrtyVlx+EoG/OsjL0VhyMzwaApZAQTF7Sd7YakishwIbLHxJHY965V59nXS/Td7roxy44SoH3NtN3sXf467RbfKmOTd62qweQV7ri7YvW75LFSLhsQjkbFsYS66j8GtLujZGu+Sh3P29cEssRo8I5P/alWAokMRW8ZzFteg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730982974; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=7KF0Hr2AAa8vdWP1q74zWkr6O1/HSsnslDX/uNFhr1I=; b=NPfYG6GOl9gTGYCv4roI0jB5dd/WSZHWE/acDx1FrULu+0Z/AggCXz7MzmhQXt7MTVd0LLILUbP0cqAFe/Sp3VFIAKcvQJtWQIMIHsUyUCyUNypcgLFZPV6qwkyQKo18AR4C9WLq3z4SNaY2SqjVVPZjy0Za70nuM0l5fqxmzMo= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1730982974632628.9563497852079; Thu, 7 Nov 2024 04:36:14 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t91k7-0004dt-TO; Thu, 07 Nov 2024 07:36:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t91js-0004QE-48 for qemu-devel@nongnu.org; Thu, 07 Nov 2024 07:35:53 -0500 Received: from frasgout.his.huawei.com ([185.176.79.56]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t91jq-0001ah-Fk for qemu-devel@nongnu.org; Thu, 07 Nov 2024 07:35:51 -0500 Received: from mail.maildlp.com (unknown [172.18.186.31]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4XkhPY1HD8z6LDBD; Thu, 7 Nov 2024 20:35:45 +0800 (CST) Received: from frapeml500008.china.huawei.com (unknown [7.182.85.71]) by mail.maildlp.com (Postfix) with ESMTPS id 17AE61403A2; Thu, 7 Nov 2024 20:35:49 +0800 (CST) Received: from SecurePC-101-06.china.huawei.com (10.122.19.247) by frapeml500008.china.huawei.com (7.182.85.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Thu, 7 Nov 2024 13:35:48 +0100 To: "Michael S . Tsirkin" , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , CC: Subject: [PATCH 2/5] qapi/qom: Change Since entry for AcpiGenericPortProperties to 9.2 Date: Thu, 7 Nov 2024 12:34:43 +0000 Message-ID: <20241107123446.902801-3-Jonathan.Cameron@huawei.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241107123446.902801-1-Jonathan.Cameron@huawei.com> References: <20241107123446.902801-1-Jonathan.Cameron@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.122.19.247] X-ClientProxiedBy: lhrpeml100011.china.huawei.com (7.191.174.247) To frapeml500008.china.huawei.com (7.182.85.71) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=185.176.79.56; envelope-from=jonathan.cameron@huawei.com; helo=frasgout.his.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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: , Reply-to: Jonathan Cameron From: Jonathan Cameron via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1730982975540116600 This feature was only applied during the 9.2 cycle, so reflect that rather than 9.1. Reported-by: Daniel P. Berrang=C3=A9 Closes: https://lore.kernel.org/qemu-devel/ZyngEiwmYeZ-DvCy@redhat.com/ Signed-off-by: Jonathan Cameron Reviewed-by: Daniel P. Berrang=C3=A9 --- qapi/qom.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qapi/qom.json b/qapi/qom.json index a8beeabf1f..28ce24cd8d 100644 --- a/qapi/qom.json +++ b/qapi/qom.json @@ -877,7 +877,7 @@ # complex as there may be interleaving across multiple devices # and shared links in the path. # -# Since: 9.1 +# Since: 9.2 ## { 'struct': 'AcpiGenericPortProperties', 'data': { 'pci-bus': 'str', --=20 2.43.0 From nobody Wed Nov 27 11:49:21 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1730983014; cv=none; d=zohomail.com; s=zohoarc; b=NbhDnIskPTcuPH5pgLhn8w0qmbHfv0ACWLA2aPPfkJrGtHk3+NWrpfR/5inPhKHw4Iy3JVbGKeXoxqWSjREfdi3LfTXwdat2vo9LH+T/X3r3S7SDEvDcqMaW9kecSOrJ79zS+NjXnzal3pPXPOSfOPL2FMHV3QzsqYUXZY8ZUeI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730983014; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=R53bLFd0woxDsUUhWd+VIMQ1JhhEodsBwakHIuUESus=; b=MV9nqGKSlaB1MXPKdfyJxlxib2JolbgPIBuh5+K4zFai47kxjJWEqz/C44Llfq56knhuF/e97ACpDofMIf9YUXuw06BXrDsSq+xIe+bOncJrDWbczFrGHJwj3u7FWikSzmNDETUwnh90l/97lZZFJAJRaduFNCoqfXCEM4MrFqU= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1730983014604790.3297611528377; Thu, 7 Nov 2024 04:36:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t91kZ-0005Pt-2z; Thu, 07 Nov 2024 07:36:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t91kO-0005DW-HI for qemu-devel@nongnu.org; Thu, 07 Nov 2024 07:36:24 -0500 Received: from frasgout.his.huawei.com ([185.176.79.56]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t91kM-0001fB-SY for qemu-devel@nongnu.org; Thu, 07 Nov 2024 07:36:24 -0500 Received: from mail.maildlp.com (unknown [172.18.186.216]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4XkhQ81kvBz6LDCQ; Thu, 7 Nov 2024 20:36:16 +0800 (CST) Received: from frapeml500008.china.huawei.com (unknown [7.182.85.71]) by mail.maildlp.com (Postfix) with ESMTPS id 3180D140CB9; Thu, 7 Nov 2024 20:36:20 +0800 (CST) Received: from SecurePC-101-06.china.huawei.com (10.122.19.247) by frapeml500008.china.huawei.com (7.182.85.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Thu, 7 Nov 2024 13:36:19 +0100 To: "Michael S . Tsirkin" , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , CC: Subject: [PATCH 3/5] bios-tables-test: Allow for new acpihmat-generic-x test data. Date: Thu, 7 Nov 2024 12:34:44 +0000 Message-ID: <20241107123446.902801-4-Jonathan.Cameron@huawei.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241107123446.902801-1-Jonathan.Cameron@huawei.com> References: <20241107123446.902801-1-Jonathan.Cameron@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.122.19.247] X-ClientProxiedBy: lhrpeml100011.china.huawei.com (7.191.174.247) To frapeml500008.china.huawei.com (7.182.85.71) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=185.176.79.56; envelope-from=jonathan.cameron@huawei.com; helo=frasgout.his.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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: , Reply-to: Jonathan Cameron From: Jonathan Cameron via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1730983015784116600 Content-Type: text/plain; charset="utf-8" The test to be added exercises many corner cases of the SRAT and HMAT table generation. Signed-off-by: Jonathan Cameron --- tests/qtest/bios-tables-test-allowed-diff.h | 5 +++++ tests/data/acpi/x86/q35/APIC.acpihmat-generic-x | 0 tests/data/acpi/x86/q35/CEDT.acpihmat-generic-x | 0 tests/data/acpi/x86/q35/DSDT.acpihmat-generic-x | 0 tests/data/acpi/x86/q35/HMAT.acpihmat-generic-x | 0 tests/data/acpi/x86/q35/SRAT.acpihmat-generic-x | 0 6 files changed, 5 insertions(+) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index dfb8523c8b..3c0967078f 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,6 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/x86/q35/APIC.acpihmat-generic-x", +"tests/data/acpi/x86/q35/CEDT.acpihmat-generic-x", +"tests/data/acpi/x86/q35/DSDT.acpihmat-generic-x", +"tests/data/acpi/x86/q35/HMAT.acpihmat-generic-x", +"tests/data/acpi/x86/q35/SRAT.acpihmat-generic-x", diff --git a/tests/data/acpi/x86/q35/APIC.acpihmat-generic-x b/tests/data/a= cpi/x86/q35/APIC.acpihmat-generic-x new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/x86/q35/CEDT.acpihmat-generic-x b/tests/data/a= cpi/x86/q35/CEDT.acpihmat-generic-x new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/x86/q35/DSDT.acpihmat-generic-x b/tests/data/a= cpi/x86/q35/DSDT.acpihmat-generic-x new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/x86/q35/HMAT.acpihmat-generic-x b/tests/data/a= cpi/x86/q35/HMAT.acpihmat-generic-x new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/x86/q35/SRAT.acpihmat-generic-x b/tests/data/a= cpi/x86/q35/SRAT.acpihmat-generic-x new file mode 100644 index 0000000000..e69de29bb2 --=20 2.43.0 From nobody Wed Nov 27 11:49:21 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1730983043; cv=none; d=zohomail.com; s=zohoarc; b=ieMuNPsso9Ypsfkw3gkNHL886Zfvo9H+F74kxENo4OpehyJBRvHTUJDFB+RMbcZHnwdL071ZNc+zaWNnODf2CR5pPKZg3Glc0a3zWKPx2FrPOzwuJNhL0c3ysDgInoYUWaysOkIYqf+KZUbXaUthISaPgjN9g2uCt60d+A8H+BA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730983043; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=+gkIgd6pUYcteLok2gfa9wNuJprjQKrmYlzvU+FI8+k=; b=RI7a1MXrVopGaYxp88vWEjHT573SygFaT/U2JRZrYMLz+jxtwt9dMgw9Eh3zRf6npi1y0zu3BLtxifIUy/vI+aQiomHv+EP1rJeLD8U1Xiw4xMeyR72vcxa3qjXnDYI7AVw0zjBnyz4mRkUuBkE4AxXzOz1TyZIsZg3U6vfz3+U= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1730983043523507.3616280593134; Thu, 7 Nov 2024 04:37:23 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t91l0-00069e-TE; Thu, 07 Nov 2024 07:37:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t91kx-000622-JS for qemu-devel@nongnu.org; Thu, 07 Nov 2024 07:37:00 -0500 Received: from frasgout.his.huawei.com ([185.176.79.56]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t91kv-0001ki-MX for qemu-devel@nongnu.org; Thu, 07 Nov 2024 07:36:59 -0500 Received: from mail.maildlp.com (unknown [172.18.186.216]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4XkhMd5Cpxz6J6kW; Thu, 7 Nov 2024 20:34:05 +0800 (CST) Received: from frapeml500008.china.huawei.com (unknown [7.182.85.71]) by mail.maildlp.com (Postfix) with ESMTPS id 24029140CF4; Thu, 7 Nov 2024 20:36:56 +0800 (CST) Received: from SecurePC-101-06.china.huawei.com (10.122.19.247) by frapeml500008.china.huawei.com (7.182.85.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Thu, 7 Nov 2024 13:36:50 +0100 To: "Michael S . Tsirkin" , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , CC: Subject: [PATCH 4/5] bios-tables-test: Add complex SRAT / HMAT test for GI GP Date: Thu, 7 Nov 2024 12:34:45 +0000 Message-ID: <20241107123446.902801-5-Jonathan.Cameron@huawei.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241107123446.902801-1-Jonathan.Cameron@huawei.com> References: <20241107123446.902801-1-Jonathan.Cameron@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.122.19.247] X-ClientProxiedBy: lhrpeml100011.china.huawei.com (7.191.174.247) To frapeml500008.china.huawei.com (7.182.85.71) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=185.176.79.56; envelope-from=jonathan.cameron@huawei.com; helo=frasgout.his.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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: , Reply-to: Jonathan Cameron From: Jonathan Cameron via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1730983044240116600 Content-Type: text/plain; charset="utf-8" Add a test with 6 nodes to exercise most interesting corner cases of SRAT and HMAT generation including the new Generic Initiator and Generic Port Affinity structures. More details of the set up in the following patch adding the table data. Signed-off-by: Jonathan Cameron --- tests/qtest/bios-tables-test.c | 97 ++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index e79f3a03df..16d0ffbdf6 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1936,6 +1936,101 @@ static void test_acpi_q35_tcg_acpi_hmat_noinitiator= (void) free_test_data(&data); } =20 +/* Test intended to hit corner cases of SRAT and HMAT */ +static void test_acpi_q35_tcg_acpi_hmat_generic_x(void) +{ + test_data data =3D {}; + + data.machine =3D MACHINE_Q35; + data.arch =3D "x86"; + data.variant =3D ".acpihmat-generic-x"; + test_acpi_one(" -machine hmat=3Don,cxl=3Don" + " -smp 3,sockets=3D3" + " -m 128M,maxmem=3D384M,slots=3D2" + " -device pcie-root-port,chassis=3D1,id=3Dpci.1" + " -device pci-testdev,bus=3Dpci.1," + "multifunction=3Don,addr=3D00.0" + " -device pci-testdev,bus=3Dpci.1,addr=3D00.1" + " -device pci-testdev,bus=3Dpci.1,id=3Dgidev,addr=3D00.2" + " -device pxb-cxl,bus_nr=3D64,bus=3Dpcie.0,id=3Dcxl.1" + " -object memory-backend-ram,size=3D64M,id=3Dram0" + " -object memory-backend-ram,size=3D64M,id=3Dram1" + " -numa node,nodeid=3D0,cpus=3D0,memdev=3Dram0" + " -numa node,nodeid=3D1" + " -object acpi-generic-initiator,id=3Dgi0,pci-dev=3Dgide= v,node=3D1" + " -numa node,nodeid=3D2" + " -object acpi-generic-port,id=3Dgp0,pci-bus=3Dcxl.1,nod= e=3D2" + " -numa node,nodeid=3D3,cpus=3D1" + " -numa node,nodeid=3D4,memdev=3Dram1" + " -numa node,nodeid=3D5,cpus=3D2" + " -numa hmat-lb,initiator=3D0,target=3D0,hierarchy=3Dmem= ory," + "data-type=3Daccess-latency,latency=3D10" + " -numa hmat-lb,initiator=3D0,target=3D0,hierarchy=3Dmem= ory," + "data-type=3Daccess-bandwidth,bandwidth=3D800M" + " -numa hmat-lb,initiator=3D0,target=3D2,hierarchy=3Dmem= ory," + "data-type=3Daccess-latency,latency=3D100" + " -numa hmat-lb,initiator=3D0,target=3D2,hierarchy=3Dmem= ory," + "data-type=3Daccess-bandwidth,bandwidth=3D200M" + " -numa hmat-lb,initiator=3D0,target=3D4,hierarchy=3Dmem= ory," + "data-type=3Daccess-latency,latency=3D100" + " -numa hmat-lb,initiator=3D0,target=3D4,hierarchy=3Dmem= ory," + "data-type=3Daccess-bandwidth,bandwidth=3D200M" + " -numa hmat-lb,initiator=3D0,target=3D5,hierarchy=3Dmem= ory," + "data-type=3Daccess-latency,latency=3D200" + " -numa hmat-lb,initiator=3D0,target=3D5,hierarchy=3Dmem= ory," + "data-type=3Daccess-bandwidth,bandwidth=3D400M" + " -numa hmat-lb,initiator=3D1,target=3D0,hierarchy=3Dmem= ory," + "data-type=3Daccess-latency,latency=3D500" + " -numa hmat-lb,initiator=3D1,target=3D0,hierarchy=3Dmem= ory," + "data-type=3Daccess-bandwidth,bandwidth=3D100M" + " -numa hmat-lb,initiator=3D1,target=3D2,hierarchy=3Dmem= ory," + "data-type=3Daccess-latency,latency=3D50" + " -numa hmat-lb,initiator=3D1,target=3D2,hierarchy=3Dmem= ory," + "data-type=3Daccess-bandwidth,bandwidth=3D400M" + " -numa hmat-lb,initiator=3D1,target=3D4,hierarchy=3Dmem= ory," + "data-type=3Daccess-latency,latency=3D50" + " -numa hmat-lb,initiator=3D1,target=3D4,hierarchy=3Dmem= ory," + "data-type=3Daccess-bandwidth,bandwidth=3D800M" + " -numa hmat-lb,initiator=3D1,target=3D5,hierarchy=3Dmem= ory," + "data-type=3Daccess-latency,latency=3D500" + " -numa hmat-lb,initiator=3D1,target=3D5,hierarchy=3Dmem= ory," + "data-type=3Daccess-bandwidth,bandwidth=3D100M" + " -numa hmat-lb,initiator=3D3,target=3D0,hierarchy=3Dmem= ory," + "data-type=3Daccess-latency,latency=3D20" + " -numa hmat-lb,initiator=3D3,target=3D0,hierarchy=3Dmem= ory," + "data-type=3Daccess-bandwidth,bandwidth=3D400M" + " -numa hmat-lb,initiator=3D3,target=3D2,hierarchy=3Dmem= ory," + "data-type=3Daccess-latency,latency=3D80" + " -numa hmat-lb,initiator=3D3,target=3D2,hierarchy=3Dmem= ory," + "data-type=3Daccess-bandwidth,bandwidth=3D200M" + " -numa hmat-lb,initiator=3D3,target=3D4,hierarchy=3Dmem= ory," + "data-type=3Daccess-latency,latency=3D80" + " -numa hmat-lb,initiator=3D3,target=3D4,hierarchy=3Dmem= ory," + "data-type=3Daccess-bandwidth,bandwidth=3D200M" + " -numa hmat-lb,initiator=3D3,target=3D5,hierarchy=3Dmem= ory," + "data-type=3Daccess-latency,latency=3D20" + " -numa hmat-lb,initiator=3D3,target=3D5,hierarchy=3Dmem= ory," + "data-type=3Daccess-bandwidth,bandwidth=3D400M" + " -numa hmat-lb,initiator=3D5,target=3D0,hierarchy=3Dmem= ory," + "data-type=3Daccess-latency,latency=3D20" + " -numa hmat-lb,initiator=3D5,target=3D0,hierarchy=3Dmem= ory," + "data-type=3Daccess-bandwidth,bandwidth=3D400M" + " -numa hmat-lb,initiator=3D5,target=3D2,hierarchy=3Dmem= ory," + "data-type=3Daccess-latency,latency=3D80" + " -numa hmat-lb,initiator=3D5,target=3D4,hierarchy=3Dmem= ory," + "data-type=3Daccess-bandwidth,bandwidth=3D200M" + " -numa hmat-lb,initiator=3D5,target=3D4,hierarchy=3Dmem= ory," + "data-type=3Daccess-latency,latency=3D80" + " -numa hmat-lb,initiator=3D5,target=3D2,hierarchy=3Dmem= ory," + "data-type=3Daccess-bandwidth,bandwidth=3D200M" + " -numa hmat-lb,initiator=3D5,target=3D5,hierarchy=3Dmem= ory," + "data-type=3Daccess-latency,latency=3D10" + " -numa hmat-lb,initiator=3D5,target=3D5,hierarchy=3Dmem= ory," + "data-type=3Daccess-bandwidth,bandwidth=3D800M", + &data); + free_test_data(&data); +} + #ifdef CONFIG_POSIX static void test_acpi_erst(const char *machine, const char *arch) { @@ -2414,6 +2509,8 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/q35/nohpet", test_acpi_q35_tcg_nohpet); qtest_add_func("acpi/q35/acpihmat-noinitiator", test_acpi_q35_tcg_acpi_hmat_noinitiator); + qtest_add_func("acpi/q35/acpihmat-genericx", + test_acpi_q35_tcg_acpi_hmat_generic_x); =20 /* i386 does not support memory hotplug */ if (strcmp(arch, "i386")) { --=20 2.43.0 From nobody Wed Nov 27 11:49:21 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1730983059; cv=none; d=zohomail.com; s=zohoarc; b=fTdFGkP4ugyP0gqx8SpoyQ06N7WFq3/hwX/bjf0zcPLvxRIC+uNvE2FVBGo7T2oJ4CRp0cdMgxiLES8gY0e4xeu13PYfAY4HHi1wZNCi9Eg4g3MXgWlLzkpguAvCePPKH6gVMUhg0IIjBe8KTgNonKIzkHJSJapo1+uL3TvE7hQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730983059; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=FexpH1dXBj7IfVkQzvGNwoN5OA3kHTaRka89m6p7fUQ=; b=QqGBmr2u2mt2wIQyrjrcioULAv+eGLcmmqOSHOWeW04kgqNsf7O/hn2ElIK4Bu8bpMslDsDm4y5MBIHfgorKPSSxkBcvOA8PmfiG6uGKpPs3Won5nph0vi4/KNbtHIk+65NMhfIoRYjDHu12KPrSM+KXTmtDYYguNJGTEBxjPPE= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1730983059696609.5363056702878; Thu, 7 Nov 2024 04:37:39 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t91lR-0006nv-5t; Thu, 07 Nov 2024 07:37:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t91lP-0006bL-4j for qemu-devel@nongnu.org; Thu, 07 Nov 2024 07:37:27 -0500 Received: from frasgout.his.huawei.com ([185.176.79.56]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t91lL-0001mR-Db for qemu-devel@nongnu.org; Thu, 07 Nov 2024 07:37:26 -0500 Received: from mail.maildlp.com (unknown [172.18.186.216]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4XkhRL02w4z6LDB7; Thu, 7 Nov 2024 20:37:18 +0800 (CST) Received: from frapeml500008.china.huawei.com (unknown [7.182.85.71]) by mail.maildlp.com (Postfix) with ESMTPS id EA392140CB9; Thu, 7 Nov 2024 20:37:21 +0800 (CST) Received: from SecurePC-101-06.china.huawei.com (10.122.19.247) by frapeml500008.china.huawei.com (7.182.85.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Thu, 7 Nov 2024 13:37:21 +0100 To: "Michael S . Tsirkin" , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , CC: Subject: [PATCH 5/5] bios-tables-test: Add data for complex numa test (GI, GP etc) Date: Thu, 7 Nov 2024 12:34:46 +0000 Message-ID: <20241107123446.902801-6-Jonathan.Cameron@huawei.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241107123446.902801-1-Jonathan.Cameron@huawei.com> References: <20241107123446.902801-1-Jonathan.Cameron@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.122.19.247] X-ClientProxiedBy: lhrpeml100011.china.huawei.com (7.191.174.247) To frapeml500008.china.huawei.com (7.182.85.71) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=185.176.79.56; envelope-from=jonathan.cameron@huawei.com; helo=frasgout.his.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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: , Reply-to: Jonathan Cameron From: Jonathan Cameron via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1730983060178116600 Content-Type: text/plain; charset="utf-8" Given this is a new configuration, there are affects on APIC, CEDT and DSDT, but the key elements are in SRAT (plus related data in HMAT). The configuration has node to exercise many different combinations. 0) CPUs + Memory 1) GI only 2) GP only 3) CPUS only 4) Memory only 5) CPUs + HP memory GI node, GP Node, Memory only node, hotplug memory only node, latency and bandwidth such that in Linux Access0 (any initiator) and Access1 (CPU initiators only) given different answers. Following cropped to remove details of each entry. [000h 0000 004h] Signature : "SRAT" [System Resource A= ffinity Table] ... [030h 0048 001h] Subtable Type : 00 [Processor Local APIC/SAP= IC Affinity] ... [032h 0050 001h] Proximity Domain Low(8) : 00 [033h 0051 001h] Apic ID : 00 ... [040h 0064 001h] Subtable Type : 00 [Processor Local APIC/SAP= IC Affinity] ... [042h 0066 001h] Proximity Domain Low(8) : 03 [043h 0067 001h] Apic ID : 01 ... [050h 0080 001h] Subtable Type : 00 [Processor Local APIC/SAP= IC Affinity] ... [052h 0082 001h] Proximity Domain Low(8) : 05 [053h 0083 001h] Apic ID : 02 ... [060h 0096 001h] Subtable Type : 01 [Memory Affinity] ... [062h 0098 004h] Proximity Domain : 00000000 ... [068h 0104 008h] Base Address : 0000000000000000 [070h 0112 008h] Address Length : 00000000000A0000 ... [088h 0136 001h] Subtable Type : 01 [Memory Affinity] ... [08Ah 0138 004h] Proximity Domain : 00000000 ... [090h 0144 008h] Base Address : 0000000000100000 [098h 0152 008h] Address Length : 0000000003F00000 ... [0B0h 0176 001h] Subtable Type : 01 [Memory Affinity] ... [0B2h 0178 004h] Proximity Domain : 00000004 ... [0B8h 0184 008h] Base Address : 0000000004000000 [0C0h 0192 008h] Address Length : 0000000004000000 ... some zero length entries follow... [1A0h 0416 001h] Subtable Type : 05 [Generic Initiator Affini= ty] [1A1h 0417 001h] Length : 20 [1A2h 0418 001h] Reserved1 : 00 [1A3h 0419 001h] Device Handle Type : 01 [1A4h 0420 004h] Proximity Domain : 00000001 [1A8h 0424 010h] Device Handle : 00 00 01 02 00 00 00 00 00 0= 0 00 00 00 00 00 00 [1B8h 0440 004h] Flags (decoded below) : 00000001 Enabled : 1 Architectural Transactions : 0 [1BCh 0444 004h] Reserved2 : 00000000 [1C0h 0448 001h] Subtable Type : 06 [Generic Port Affinity] [1C1h 0449 001h] Length : 20 [1C2h 0450 001h] Reserved1 : 00 [1C3h 0451 001h] Device Handle Type : 00 [1C4h 0452 004h] Proximity Domain : 00000002 [1C8h 0456 010h] Device Handle : 41 43 50 49 30 30 31 36 40 0= 0 00 00 00 00 00 00 [1D8h 0472 004h] Flags (decoded below) : 00000001 Enabled : 1 Architectural Transactions : 0 [1DCh 0476 004h] Reserved2 : 00000000 [1E0h 0480 001h] Subtable Type : 01 [Memory Affinity] ... [1E2h 0482 004h] Proximity Domain : 00000005 ... [1E8h 0488 008h] Base Address : 0000000100000000 [1F0h 0496 008h] Address Length : 0000000090000000 Example block from HMAT: [0F0h 0240 002h] Structure Type : 0001 [System Locality Latenc= y and Bandwidth Information] [0F2h 0242 002h] Reserved : 0000 [0F4h 0244 004h] Length : 00000078 [0F8h 0248 001h] Flags (decoded below) : 00 Memory Hierarchy : 0 Use Minimum Transfer Size : 0 Non-sequential Transfers : 0 [0F9h 0249 001h] Data Type : 03 [0FAh 0250 001h] Minimum Transfer Size : 00 [0FBh 0251 001h] Reserved1 : 00 [0FCh 0252 004h] Initiator Proximity Domains # : 00000004 [100h 0256 004h] Target Proximity Domains # : 00000006 [104h 0260 004h] Reserved2 : 00000000 [108h 0264 008h] Entry Base Unit : 0000000000000004 [110h 0272 004h] Initiator Proximity Domain List : 00000000 [114h 0276 004h] Initiator Proximity Domain List : 00000001 [118h 0280 004h] Initiator Proximity Domain List : 00000003 [11Ch 0284 004h] Initiator Proximity Domain List : 00000005 [120h 0288 004h] Target Proximity Domain List : 00000000 [124h 0292 004h] Target Proximity Domain List : 00000001 [128h 0296 004h] Target Proximity Domain List : 00000002 [12Ch 0300 004h] Target Proximity Domain List : 00000003 [130h 0304 004h] Target Proximity Domain List : 00000004 [134h 0308 004h] Target Proximity Domain List : 00000005 [138h 0312 002h] Entry : 00C8 [13Ah 0314 002h] Entry : 0000 [13Ch 0316 002h] Entry : 0032 [13Eh 0318 002h] Entry : 0000 [140h 0320 002h] Entry : 0032 [142h 0322 002h] Entry : 0064 [144h 0324 002h] Entry : 0019 [146h 0326 002h] Entry : 0000 [148h 0328 002h] Entry : 0064 [14Ah 0330 002h] Entry : 0000 [14Ch 0332 002h] Entry : 00C8 [14Eh 0334 002h] Entry : 0019 [150h 0336 002h] Entry : 0064 [152h 0338 002h] Entry : 0000 [154h 0340 002h] Entry : 0032 [156h 0342 002h] Entry : 0000 [158h 0344 002h] Entry : 0032 [15Ah 0346 002h] Entry : 0064 [15Ch 0348 002h] Entry : 0064 [15Eh 0350 002h] Entry : 0000 [160h 0352 002h] Entry : 0032 [162h 0354 002h] Entry : 0000 [164h 0356 002h] Entry : 0032 [166h 0358 002h] Entry : 00C8 Note the zeros represent entries where the target node has no memory. These could be surpressed but it isn't 'wrong' to provide them and it is (probably) permissible under ACPI to hotplug memory into these nodes later. Signed-off-by: Jonathan Cameron --- Since v6: Rebased - required data update. --- tests/qtest/bios-tables-test-allowed-diff.h | 5 ----- tests/data/acpi/x86/q35/APIC.acpihmat-generic-x | Bin 0 -> 136 bytes tests/data/acpi/x86/q35/CEDT.acpihmat-generic-x | Bin 0 -> 68 bytes tests/data/acpi/x86/q35/DSDT.acpihmat-generic-x | Bin 0 -> 12599 bytes tests/data/acpi/x86/q35/HMAT.acpihmat-generic-x | Bin 0 -> 360 bytes tests/data/acpi/x86/q35/SRAT.acpihmat-generic-x | Bin 0 -> 520 bytes 6 files changed, 5 deletions(-) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index 3c0967078f..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,6 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/x86/q35/APIC.acpihmat-generic-x", -"tests/data/acpi/x86/q35/CEDT.acpihmat-generic-x", -"tests/data/acpi/x86/q35/DSDT.acpihmat-generic-x", -"tests/data/acpi/x86/q35/HMAT.acpihmat-generic-x", -"tests/data/acpi/x86/q35/SRAT.acpihmat-generic-x", diff --git a/tests/data/acpi/x86/q35/APIC.acpihmat-generic-x b/tests/data/a= cpi/x86/q35/APIC.acpihmat-generic-x index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..317ddb3fbed94e4f49a87976fdc= 7f23b1a6c3fdc 100644 GIT binary patch literal 136 zcmZ<^@O18AU|?WQaPoKd2v%^42yj*a0!E-1hz+6{7#{os(;N&85Soz@LNhUeXht58 ongjnpBoh}9gBTzdD=3DU!Z1+h3eVJt470*DwlH<-o3_8({j09efo0RR91 literal 0 HcmV?d00001 diff --git a/tests/data/acpi/x86/q35/CEDT.acpihmat-generic-x b/tests/data/a= cpi/x86/q35/CEDT.acpihmat-generic-x index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..31c9011663639b4a0f4816f3b2b= 06398f94682f7 100644 GIT binary patch literal 68 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 G8vh5ccNMh& literal 0 HcmV?d00001 diff --git a/tests/data/acpi/x86/q35/HMAT.acpihmat-generic-x b/tests/data/a= cpi/x86/q35/HMAT.acpihmat-generic-x index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0e5765f6ee4c07638c70647ae14= 5e968718b67cd 100644 GIT binary patch literal 360 zcmeb9bqvX1WME+Ock*}k2v%^42yj*a0-z8Bhz+7)Km*7?=3DEKC%X^=3DV)XaHgs5CaPU znNtB32dQC$vIW$k3?Kzk!wkf%P$3YX2`UEC0}=3D;`ae=3DW2gAr7W703dq;{anOBsL>h pJ=3Dk8L!N~R^yOS7uPXNsZ*=3DNL%!XOExQ-JsckOiV);t2K$1^{D&4*>uG literal 0 HcmV?d00001 diff --git a/tests/data/acpi/x86/q35/SRAT.acpihmat-generic-x b/tests/data/a= cpi/x86/q35/SRAT.acpihmat-generic-x index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..b45838adb7d304f8a36c38c90d8= 9f3629ec48353 100644 GIT binary patch literal 520 zcmWFzatz^MVqjn_cJg=3Dj2v%^42yj*a0!9V~1`r!WgD@Njp!1m-QRP{gkok-naGg*F z7hC|lI-mt$@PQeo5LF!uOc=3D(1(J1c3v=3D^ogl^*QsSQQwc;mZh&B?N$l37Y}~14zQr eIl$Avz|hPAsstv_sKE*qfydhfm;gM0fdT+OoeTj0 literal 0 HcmV?d00001 --=20 2.43.0