From nobody Sat May 18 08:26:30 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653500289339929.930504151257; Wed, 25 May 2022 10:38:09 -0700 (PDT) Received: from localhost ([::1]:37172 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ntuxU-0004ft-Ag for importer2@patchew.org; Wed, 25 May 2022 13:38:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntusL-0005J5-7h for qemu-devel@nongnu.org; Wed, 25 May 2022 13:32:49 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:52670) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntusI-0002Fa-Ov for qemu-devel@nongnu.org; Wed, 25 May 2022 13:32:48 -0400 Received: from [2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nturD-0006Pu-VR; Wed, 25 May 2022 18:31:43 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To: Cc:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=X4b0jdgOJfgZEh31zO+z6gVMRnPFvOJcfyknX+J9Cl4=; b=Z0sb1o+sTntLQ593LkrgtWKKqV g2GNOeViPOTALNKpk3w9R/bOedwqXk4SRF1biKRfZDz2UNcQ4/x/Kzujpk/ryZnxoRGew8/yAGm/A VTc4kSU6tBGgX6MrphvZCI9itLVGWO6kz3ZSXN1qHTe1VvpLGN+a/vxfV5o41LbDVv08jDONWXGij 8zKz3fqjXKTRidKHnQgCMsRm+qOZ77XPYfSIB2xs7JaYwCiuaLAbon6StFMpHNrjcAGFjvaGCmnbP Qc2SnU3GpwJypYIVVyNeD7c3s9Ek90gluqKfYwERyQS09NPeD85qdTRwwFHsfS41CyyanRK1jL61c 9ZriXedj+FuGsD3/0ww6vDYrmH0+1pDGZFy14md83tGNnrWSn/Nr0cogRqrJs/j2/cdzEO5pTWzM0 iexlNMP//oWB7YTPnhYqbo5EBkfa9s9wCzouqwt7bnxi0+eDkdbzAm8XvyKqkCIWPdwa6oqBoK0l5 rit3XbI0u4BPX+tMHMRoSPtQXcc/3hhrorQMh8h7mPcArMObsCOW9ugZyfeP8Mph+xsbcm65Lsovh VelpW3tfoL1cRBqbFtTkGPff5yTFQer0buaXC+CWm6Sh1SY2I3bb1r/VeoyF90do7tV1olR9XAFgx hLw5GfrRT5luOFkVe4wRAXHhHPkDY22C85HtSHYZY=; From: Mark Cave-Ayland To: mst@redhat.com, imammedo@redhat.com, ani@anisinha.ca, jean-philippe@linaro.org, qemu-devel@nongnu.org Date: Wed, 25 May 2022 18:32:27 +0100 Message-Id: <20220525173232.31429-2-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220525173232.31429-1-mark.cave-ayland@ilande.co.uk> References: <20220525173232.31429-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v3 1/6] hw/acpi/viot: rename build_pci_range_node() to enumerate_pci_host_bridges() X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk 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, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1653500291043100001 This is in preparation for separating out the VIOT ACPI table build from the PCI host bridge numeration. Signed-off-by: Mark Cave-Ayland Reviewed-by: Ani Sinha Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Jean-Philippe Brucker --- hw/acpi/viot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/acpi/viot.c b/hw/acpi/viot.c index c1af75206e..a41daded71 100644 --- a/hw/acpi/viot.c +++ b/hw/acpi/viot.c @@ -17,7 +17,7 @@ struct viot_pci_ranges { }; =20 /* Build PCI range for a given PCI host bridge */ -static int build_pci_range_node(Object *obj, void *opaque) +static int enumerate_pci_host_bridges(Object *obj, void *opaque) { struct viot_pci_ranges *pci_ranges =3D opaque; GArray *blob =3D pci_ranges->blob; @@ -78,7 +78,7 @@ void build_viot(MachineState *ms, GArray *table_data, BIO= SLinker *linker, }; =20 /* Build the list of PCI ranges that this viommu manages */ - object_child_foreach_recursive(OBJECT(ms), build_pci_range_node, + object_child_foreach_recursive(OBJECT(ms), enumerate_pci_host_bridges, &pci_ranges); =20 /* ACPI table header */ --=20 2.20.1 From nobody Sat May 18 08:26:30 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653500626856933.9073882593887; Wed, 25 May 2022 10:43:46 -0700 (PDT) Received: from localhost ([::1]:42256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ntv2v-00004x-Mw for importer2@patchew.org; Wed, 25 May 2022 13:43:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54884) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntusQ-0005Ob-Fu for qemu-devel@nongnu.org; Wed, 25 May 2022 13:32:55 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:52680) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntusN-0002Gn-DK for qemu-devel@nongnu.org; Wed, 25 May 2022 13:32:52 -0400 Received: from [2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nturH-0006Pu-Ui; Wed, 25 May 2022 18:31:48 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To: Cc:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=1AlXwSipa/QydQbhCNvAwQqBiE+wqLc0gwT8RKCGB+o=; b=LECDagfIxujjqgEaGHqDQJk+uL BuCpimx+5s8JW5N264NnlmTXSgUZ91zYlyL/z0Q+eYSTlT0ZnnBlTPdxS9SaIuM6RygRK0oaIBI3B a24+UIgmAwEAFmJjEpWFTFtvS/wuPotw16TRDQgTE/wEqC1qwpQqSW9kttYL2tL12koUCHrXCm7T+ 0inf3fkb+a8wfBcMWVNHe1XjYVPTzkbMJ3l6RaY7OjRy1nAA1OWV+Ynnn2QOlkC3ycjZ8tdiwQ1/N rCtgWH5wYDBm69u/cjUcfuzAbtgLtnHKaUNs/k1tIPcaZukVSh+0wmq4SGBAzGk5azqGGROxmnteO tVhaVBgTM5ueI1N7UbplJW9RwEhJ5InQTIKkD7jM0VuA7d6ftUxlgSIMjTjGqiiDyLb7I2MJyRo/I Ey/RbTUmSDLWpIK+aSGeGIBSmTbTL47fnPg4eRlmZAGDphzPA3TQABix3k+GTuHGNUzCerZ6Wq6KS 2g6xOi+gv5p1/i0bDof4p5UwMSCYF3PaMKuAddYr0sIUwYDVwt1lp2KZer7Bc/Wn11EDcbabPZTOU EBHGee/AE5w47VPcNZYXlEtO2loDcBl3iN3OoCOw39ENyJ3zSI0N2QqLrE5sHMEKMd/4yWSu8Pw9R 6L2PKW3HwL44oNIOmPOo/KVxnaCskPvQzZLGN0WUY=; From: Mark Cave-Ayland To: mst@redhat.com, imammedo@redhat.com, ani@anisinha.ca, jean-philippe@linaro.org, qemu-devel@nongnu.org Date: Wed, 25 May 2022 18:32:28 +0100 Message-Id: <20220525173232.31429-3-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220525173232.31429-1-mark.cave-ayland@ilande.co.uk> References: <20220525173232.31429-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v3 2/6] hw/acpi/viot: move the individual PCI host bridge entry generation to a new function X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk 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, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1653500627246100001 Instead of generating each table entry inline, move the individual PCI host= bridge table entry generation to a separate build_pci_host_range() function. Signed-off-by: Mark Cave-Ayland Reviewed-by: Ani Sinha Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Jean-Philippe Brucker --- hw/acpi/viot.c | 48 +++++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/hw/acpi/viot.c b/hw/acpi/viot.c index a41daded71..5dafcbf5ef 100644 --- a/hw/acpi/viot.c +++ b/hw/acpi/viot.c @@ -16,6 +16,31 @@ struct viot_pci_ranges { uint16_t output_node; }; =20 +static void build_pci_host_range(GArray *table_data, int min_bus, int max_= bus, + uint16_t output_node) +{ + /* Type */ + build_append_int_noprefix(table_data, 1 /* PCI range */, 1); + /* Reserved */ + build_append_int_noprefix(table_data, 0, 1); + /* Length */ + build_append_int_noprefix(table_data, 24, 2); + /* Endpoint start */ + build_append_int_noprefix(table_data, PCI_BUILD_BDF(min_bus, 0), 4); + /* PCI Segment start */ + build_append_int_noprefix(table_data, 0, 2); + /* PCI Segment end */ + build_append_int_noprefix(table_data, 0, 2); + /* PCI BDF start */ + build_append_int_noprefix(table_data, PCI_BUILD_BDF(min_bus, 0), 2); + /* PCI BDF end */ + build_append_int_noprefix(table_data, PCI_BUILD_BDF(max_bus, 0xff), 2); + /* Output node */ + build_append_int_noprefix(table_data, output_node, 2); + /* Reserved */ + build_append_int_noprefix(table_data, 0, 6); +} + /* Build PCI range for a given PCI host bridge */ static int enumerate_pci_host_bridges(Object *obj, void *opaque) { @@ -30,27 +55,8 @@ static int enumerate_pci_host_bridges(Object *obj, void = *opaque) =20 pci_bus_range(bus, &min_bus, &max_bus); =20 - /* Type */ - build_append_int_noprefix(blob, 1 /* PCI range */, 1); - /* Reserved */ - build_append_int_noprefix(blob, 0, 1); - /* Length */ - build_append_int_noprefix(blob, 24, 2); - /* Endpoint start */ - build_append_int_noprefix(blob, PCI_BUILD_BDF(min_bus, 0), 4); - /* PCI Segment start */ - build_append_int_noprefix(blob, 0, 2); - /* PCI Segment end */ - build_append_int_noprefix(blob, 0, 2); - /* PCI BDF start */ - build_append_int_noprefix(blob, PCI_BUILD_BDF(min_bus, 0), 2); - /* PCI BDF end */ - build_append_int_noprefix(blob, PCI_BUILD_BDF(max_bus, 0xff), = 2); - /* Output node */ - build_append_int_noprefix(blob, pci_ranges->output_node, 2); - /* Reserved */ - build_append_int_noprefix(blob, 0, 6); - + build_pci_host_range(blob, min_bus, max_bus, + pci_ranges->output_node); pci_ranges->count++; } } --=20 2.20.1 From nobody Sat May 18 08:26:30 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653500144010482.4839831352381; Wed, 25 May 2022 10:35:44 -0700 (PDT) Received: from localhost ([::1]:57892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ntuv7-0007ue-Tp for importer2@patchew.org; Wed, 25 May 2022 13:35:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntusT-0005Pi-Lg for qemu-devel@nongnu.org; Wed, 25 May 2022 13:32:57 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:52690) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntusR-0002HC-H7 for qemu-devel@nongnu.org; Wed, 25 May 2022 13:32:56 -0400 Received: from [2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nturM-0006Pu-6c; Wed, 25 May 2022 18:31:52 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To: Cc:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=DCbE5pO9eTCFvrQ72Q+rerHjd3AdfK5v4mgVoKVeQG8=; b=LpP9+rjXVTTfns7fXgqsMe6ECu /m1MZGLRgnD+op4eI6KV3hvo1QdtT08PjQsry6umuxuAvHbgJYwWBGnjCnyGz7wILoLom2jnTMJFN WTE6pETnjP0wrJyNuYU2Ynol8h5ty5NqU7jlZ5RDWGQiRWGswtPP29cDKXOsR3wbAfY81gZ+K8uK3 u41ohS7TaiGbKFtvTTwIiLkWk1pG7hb9hsz/dtilH6EuS9+myqgYnSySuTlsrDSB33k2O0egDLblV 9zje9hbTA6zWDOjm1RipB8tRLmeEIryVIUUP7fjCgApftZK/0+SzLGazLsgsSYrYOy60Ik7PTVORv vLB2HzXU4784MF4I8M/040G9egHI82P6x1kyIJXpBKgW2YB85Qq+TJom9N2of2+rkeI4u2S95n9Oz ciE13busv8HuZ9bL2xNHqhtvq131QIQ7wyKkrtV/4xRx1mAj/6wmT+ZfvhQHXSg/5nFRNA3/Db7Qr oWTwE8W4y1mdjfiTunsFhdiMK30FybWqqq+6gGqpih87EnTF1LRXh/wklQ5gfKmOh2Du5N/BBOlcv xTyRqkV105J5lcBFTRXmYsIAImVCqxiRV1nwI9k8PtTReWPVketRGAORQys5tTpWMBUDET18O6s0L 8UUnnwjNkuJaJpAbKzEHOfkHgA5f1R9qm7DvzMQPU=; From: Mark Cave-Ayland To: mst@redhat.com, imammedo@redhat.com, ani@anisinha.ca, jean-philippe@linaro.org, qemu-devel@nongnu.org Date: Wed, 25 May 2022 18:32:29 +0100 Message-Id: <20220525173232.31429-4-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220525173232.31429-1-mark.cave-ayland@ilande.co.uk> References: <20220525173232.31429-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v3 3/6] hw/acpi/viot: build array of PCI host bridges before generating VIOT ACPI table X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk 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, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1653500144220100001 Perform the generation of the VIOT ACPI table in 2 separate passes: the fir= st pass enumerates all of the PCI host bridges and adds the min_bus and max_bus inf= ormation to an array. Once this is done the VIOT table header is generated using the size of the = array to calculate the node count, which means it is no longer necessary to use a sub-array to hold the PCI host bridge range information along with viommu_o= ff. Finally the PCI host bridge array is iterated again to add the required ent= ries to the final VIOT ACPI table. Signed-off-by: Mark Cave-Ayland Reviewed-by: Ani Sinha Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Jean-Philippe Brucker --- hw/acpi/viot.c | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/hw/acpi/viot.c b/hw/acpi/viot.c index 5dafcbf5ef..c32bbdd180 100644 --- a/hw/acpi/viot.c +++ b/hw/acpi/viot.c @@ -10,10 +10,9 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" =20 -struct viot_pci_ranges { - GArray *blob; - size_t count; - uint16_t output_node; +struct viot_pci_host_range { + int min_bus; + int max_bus; }; =20 static void build_pci_host_range(GArray *table_data, int min_bus, int max_= bus, @@ -44,8 +43,7 @@ static void build_pci_host_range(GArray *table_data, int = min_bus, int max_bus, /* Build PCI range for a given PCI host bridge */ static int enumerate_pci_host_bridges(Object *obj, void *opaque) { - struct viot_pci_ranges *pci_ranges =3D opaque; - GArray *blob =3D pci_ranges->blob; + GArray *pci_host_ranges =3D opaque; =20 if (object_dynamic_cast(obj, TYPE_PCI_HOST_BRIDGE)) { PCIBus *bus =3D PCI_HOST_BRIDGE(obj)->bus; @@ -55,9 +53,11 @@ static int enumerate_pci_host_bridges(Object *obj, void = *opaque) =20 pci_bus_range(bus, &min_bus, &max_bus); =20 - build_pci_host_range(blob, min_bus, max_bus, - pci_ranges->output_node); - pci_ranges->count++; + const struct viot_pci_host_range pci_host_range =3D { + .min_bus =3D min_bus, + .max_bus =3D max_bus, + }; + g_array_append_val(pci_host_ranges, pci_host_range); } } =20 @@ -78,19 +78,19 @@ void build_viot(MachineState *ms, GArray *table_data, B= IOSLinker *linker, int viommu_off =3D 48; AcpiTable table =3D { .sig =3D "VIOT", .rev =3D 0, .oem_id =3D oem_id, .oem_table_id =3D oem_table_id= }; - struct viot_pci_ranges pci_ranges =3D { - .output_node =3D viommu_off, - .blob =3D g_array_new(false, true /* clear */, 1), - }; + GArray *pci_host_ranges =3D g_array_new(false, true, + sizeof(struct viot_pci_host_ran= ge)); + struct viot_pci_host_range *pci_host_range; + int i; =20 /* Build the list of PCI ranges that this viommu manages */ object_child_foreach_recursive(OBJECT(ms), enumerate_pci_host_bridges, - &pci_ranges); + pci_host_ranges); =20 /* ACPI table header */ acpi_table_begin(&table, table_data); /* Node count */ - build_append_int_noprefix(table_data, pci_ranges.count + 1, 2); + build_append_int_noprefix(table_data, pci_host_ranges->len + 1, 2); /* Node offset */ build_append_int_noprefix(table_data, viommu_off, 2); /* Reserved */ @@ -111,9 +111,15 @@ void build_viot(MachineState *ms, GArray *table_data, = BIOSLinker *linker, build_append_int_noprefix(table_data, 0, 8); =20 /* PCI ranges found above */ - g_array_append_vals(table_data, pci_ranges.blob->data, - pci_ranges.blob->len); - g_array_free(pci_ranges.blob, true); + for (i =3D 0; i < pci_host_ranges->len; i++) { + pci_host_range =3D &g_array_index(pci_host_ranges, + struct viot_pci_host_range, i); + + build_pci_host_range(table_data, pci_host_range->min_bus, + pci_host_range->max_bus, viommu_off); + } + + g_array_free(pci_host_ranges, true); =20 acpi_table_end(linker, &table); } --=20 2.20.1 From nobody Sat May 18 08:26:30 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653500304667173.06430790057527; Wed, 25 May 2022 10:38:24 -0700 (PDT) Received: from localhost ([::1]:37894 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ntuxj-0005Dv-LD for importer2@patchew.org; Wed, 25 May 2022 13:38:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntusj-0005ih-Tr for qemu-devel@nongnu.org; Wed, 25 May 2022 13:33:13 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:52700) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntusV-0002HY-Jy for qemu-devel@nongnu.org; Wed, 25 May 2022 13:33:13 -0400 Received: from [2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nturQ-0006Pu-FW; Wed, 25 May 2022 18:31:56 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To: Cc:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=cOsyLI4BQpqmY3oYM63LD8HIF/HgPjxlPtwW+9QdcEw=; b=oP+qLiR4+9PyJ3sOuobnNLfvF8 1Ml3rhhKeCaMkRUTUiZrUQrdHmuShADLEEmsFvXHo7j4SEa9KlsAjAt+FiZiWjQePz17lbgjMDyn2 OsuW6y1eJUJGI8ohE8586OO5zd6aIIgdprRBeWH+gC7MVY8cRAJxjxCKRfPtZ7MdPr33UVD3zA147 SUhhzBbwpZDJvKzpkyqaj51PDrJGZYhDPejV4wXIqHBc7AXJEdWCXh+GJNnnqTSw/BqzH/Tdh4qms Uy86QBFFFeszGnThz4Rm0AZgj4C+qelkyzvRBs+s3dd4eHWFF/UCCVCE4B9abcrtHKft1lv7RV2r1 IIYwmvfkwMLjVROW+TTU/P6VzKBg65iQMvsoYdArX+5wVhtBaZCSR5uo72x9NedHhiQuZaBA/HNFc 19mupk79Nd4/WwM90b9rH8jzXx3awh2959jROH2deCZHLWxfXdTX5RSVu35w9bgbmeeS1zOzPxPwU gYtVD0m97vLOJ5l91c+HAmnhCj5forPGwlNv9JXTrkKt/WjT6g+WN+jG1RazCPkwOVNdPVdXv/3z9 pFFENNl1uigxayAUY826GgeO7LyV+05a1clqnEkcnt3gLyycENN8xtcjiRllN61EPHFlBJdxiMhEE DuAeInFYQt5dwDMJ/7URh5n4wxUih5lK5tjQWtbbM=; From: Mark Cave-Ayland To: mst@redhat.com, imammedo@redhat.com, ani@anisinha.ca, jean-philippe@linaro.org, qemu-devel@nongnu.org Date: Wed, 25 May 2022 18:32:30 +0100 Message-Id: <20220525173232.31429-5-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220525173232.31429-1-mark.cave-ayland@ilande.co.uk> References: <20220525173232.31429-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v3 4/6] tests/acpi: virt: allow VIOT acpi table changes X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1653500305201100001 Signed-off-by: Mark Cave-Ayland Acked-by: Ani Sinha Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Jean-Philippe Brucker --- tests/qtest/bios-tables-test-allowed-diff.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index dfb8523c8b..8367ffe1d4 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/virt/VIOT", --=20 2.20.1 From nobody Sat May 18 08:26:30 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653500150292264.5931625616605; Wed, 25 May 2022 10:35:50 -0700 (PDT) Received: from localhost ([::1]:58534 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ntuvF-0008LM-3t for importer2@patchew.org; Wed, 25 May 2022 13:35:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54978) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntusf-0005Zr-1D for qemu-devel@nongnu.org; Wed, 25 May 2022 13:33:09 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:52710) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntusa-0002Hs-5S for qemu-devel@nongnu.org; Wed, 25 May 2022 13:33:08 -0400 Received: from [2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nturU-0006Pu-Mz; Wed, 25 May 2022 18:32:00 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To: Cc:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=VCTEhaR5vc7EUlIw1/VvwApCMPqBUHdTqrcUFmisNaA=; b=abOBjKgK8oEyOkE1kS6R5r/f+E 3kM8GzOhQ/LBeUdHDnBzlP4adAJ7y9cmd38ll1hfOJ3/BKMAcEyUyZPBJAHdnKP7zxHh0FcCVR5q1 XfwcCzhCuFi/Qa/lRd0zX/Tlvw8kad+yt4H5dLaPus5AWez9OgvMuDkvY50D/5iqp3RvBoUz268pu pnMQvzERYBfuESAFn3zVr3kdAiV2Ms6GR9HHAF0Ss/k6NwdgkhHhUvusChZzvimoZyB1uJxiqzJae dfU/VCXXhsNGLnARNErpKPHaflELqnd0GCBWxsNk6IYHZn4KKGQsLdOd4LaKrTZMeEFIZG+n54dHQ qheUm5QPFsqPZLxyquwUOmhjWk5w7zoFcsApBjgZfAidaGnZW+0tJUx04v9C7MUczLOeinI+orrla YyoVLDSWNgwkOEIJBrNF2V1ezwJIMYEba3e14rO8z3k+uR9wpBSg/A1/eorFU8GqUZyqjQrKAcqCj owHtRCYuTwlW+N3ZBdwzRY6/Ou4WY5N3c+q1k3L/QlfPGJjSzMFsQ+zgCanz0QR8WJzjQ4yGXcEFk yiP9+h3Bjfz/9YHtY5XpLI5XOSqzqlmZydUQlCejE7Zbjno88qvBXSTmoBZtlM8cMJsSLdbVgvGep mQi1YDPbzf0QXbpGPnrk1HygS//4It045KYYudggI=; From: Mark Cave-Ayland To: mst@redhat.com, imammedo@redhat.com, ani@anisinha.ca, jean-philippe@linaro.org, qemu-devel@nongnu.org Date: Wed, 25 May 2022 18:32:31 +0100 Message-Id: <20220525173232.31429-6-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220525173232.31429-1-mark.cave-ayland@ilande.co.uk> References: <20220525173232.31429-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v3 5/6] hw/acpi/viot: sort VIOT ACPI table entries by PCI host bridge min_bus X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk 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, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1653500152283100003 This ensures that the VIOT ACPI table output is always stable for a given P= CI topology by ensuring that entries are ordered according to min_bus. Signed-off-by: Mark Cave-Ayland Reviewed-by: Ani Sinha Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Jean-Philippe Brucker --- hw/acpi/viot.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/hw/acpi/viot.c b/hw/acpi/viot.c index c32bbdd180..4e0bf69067 100644 --- a/hw/acpi/viot.c +++ b/hw/acpi/viot.c @@ -64,6 +64,20 @@ static int enumerate_pci_host_bridges(Object *obj, void = *opaque) return 0; } =20 +static gint pci_host_range_compare(gconstpointer a, gconstpointer b) +{ + struct viot_pci_host_range *range_a =3D (struct viot_pci_host_range *)= a; + struct viot_pci_host_range *range_b =3D (struct viot_pci_host_range *)= b; + + if (range_a->min_bus < range_b->min_bus) { + return -1; + } else if (range_a->min_bus > range_b->min_bus) { + return 1; + } else { + return 0; + } +} + /* * Generate a VIOT table with one PCI-based virtio-iommu that manages PCI * endpoints. @@ -87,6 +101,9 @@ void build_viot(MachineState *ms, GArray *table_data, BI= OSLinker *linker, object_child_foreach_recursive(OBJECT(ms), enumerate_pci_host_bridges, pci_host_ranges); =20 + /* Sort the pci host ranges by min_bus */ + g_array_sort(pci_host_ranges, pci_host_range_compare); + /* ACPI table header */ acpi_table_begin(&table, table_data); /* Node count */ --=20 2.20.1 From nobody Sat May 18 08:26:30 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653500148732228.8736704125813; Wed, 25 May 2022 10:35:48 -0700 (PDT) Received: from localhost ([::1]:58376 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ntuvD-0008Ex-Mc for importer2@patchew.org; Wed, 25 May 2022 13:35:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55014) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntusg-0005cg-Kg for qemu-devel@nongnu.org; Wed, 25 May 2022 13:33:10 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:52718) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntusd-0002Ib-Qo for qemu-devel@nongnu.org; Wed, 25 May 2022 13:33:10 -0400 Received: from [2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nturY-0006Pu-VD; Wed, 25 May 2022 18:32:05 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To: Cc:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=woKDVkigAV02NSwbOVwI5aZKhHJTbOMMluSz0lsTcDc=; b=Pa2p4v13CKhozGQwss87N5RXrf gHCeE0W/fZcP9X83MnDqtgfPBA5sj3Z73V9mWRcpEW6QOHDWaVeUARPeznEpL/arMphmewpYmL6R4 GlvJY3/47LyKqLL+YPjNxTupe4AbAOCQsKFpl7TiQxitwQ94EFRqmMaZWNPfih4YFvRWAmvR74v1K 26a9VNYnhGBTiJbb8/PDBd6Zedd35yBS/KEcKfeK4ROC0e2o0XVV3a2c5lNZS58wr/WdmqR7dIuKl 60HgPkJYaslY9UHdBBd6//S6E2ZdDJyKd/66jM0suB+CXK5iLwzLwB8iHVmcB91lw4TNuWtCeHTPC yZ/ZK+wXPlRRExeaLsMZ49UknPncWUCorgZpf4DP9/FeBVMbl+ArKFPAtRTgSBdsgUj96WP2Nu0O3 +DPeA0Ca60ZVbDaF5iNtmG01VXf5SajR8bi9XuTSSOzL4IqOaDo15lhvyko07BJs40s2IVL7PMd+G Djpu0mSqN8ez4lZ4BSmIYWFDbUjd9GzN0nPS928+BPR3UyG/txLsJzAnR4SrzBOYjisyG9M8zARVB 1sm30mtxG8d/t9vgu+fXR9aqWmWmX0HsoSC0GHJMBmia41NAnly9kvXOacL4lxKkZzKn/MM0X2nFA Lb0MCPr1VcmFkmBlmQtKLAlLN+40Y/PtR3IVdnmhU=; From: Mark Cave-Ayland To: mst@redhat.com, imammedo@redhat.com, ani@anisinha.ca, jean-philippe@linaro.org, qemu-devel@nongnu.org Date: Wed, 25 May 2022 18:32:32 +0100 Message-Id: <20220525173232.31429-7-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220525173232.31429-1-mark.cave-ayland@ilande.co.uk> References: <20220525173232.31429-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v3 6/6] tests/acpi: virt: update golden masters for VIOT X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk 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, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1653500150294100001 Differences between disassembled ASL files for VIOT: +++ /tmp/asl-V69GM1.dsl 2022-05-18 10:22:27.239796759 +0100 @@ -36,11 +36,11 @@ [041h 0065 1] Reserved : 00 [042h 0066 2] Length : 0018 -[044h 0068 4] Endpoint start : 00003000 +[044h 0068 4] Endpoint start : 00001000 [048h 0072 2] PCI Segment start : 0000 [04Ah 0074 2] PCI Segment end : 0000 -[04Ch 0076 2] PCI BDF start : 3000 -[04Eh 0078 2] PCI BDF end : 30FF +[04Ch 0076 2] PCI BDF start : 1000 +[04Eh 0078 2] PCI BDF end : 10FF [050h 0080 2] Output node : 0030 [052h 0082 6] Reserved : 000000000000 @@ -48,11 +48,11 @@ [059h 0089 1] Reserved : 00 [05Ah 0090 2] Length : 0018 -[05Ch 0092 4] Endpoint start : 00001000 +[05Ch 0092 4] Endpoint start : 00003000 [060h 0096 2] PCI Segment start : 0000 [062h 0098 2] PCI Segment end : 0000 -[064h 0100 2] PCI BDF start : 1000 -[066h 0102 2] PCI BDF end : 10FF +[064h 0100 2] PCI BDF start : 3000 +[066h 0102 2] PCI BDF end : 30FF [068h 0104 2] Output node : 0030 [06Ah 0106 6] Reserved : 000000000000 @@ -62,6 +62,6 @@ 0010: 42 58 50 43 20 20 20 20 01 00 00 00 42 58 50 43 // BXPC ....= BXPC 0020: 01 00 00 00 03 00 30 00 00 00 00 00 00 00 00 00 // ......0.....= .... 0030: 03 00 10 00 00 00 10 00 00 00 00 00 00 00 00 00 // ............= .... - 0040: 01 00 18 00 00 30 00 00 00 00 00 00 00 30 FF 30 // .....0......= .0.0 - 0050: 30 00 00 00 00 00 00 00 01 00 18 00 00 10 00 00 // 0...........= .... - 0060: 00 00 00 00 00 10 FF 10 30 00 00 00 00 00 00 00 // ........0...= .... + 0040: 01 00 18 00 00 10 00 00 00 00 00 00 00 10 FF 10 // ............= .... + 0050: 30 00 00 00 00 00 00 00 01 00 18 00 00 30 00 00 // 0...........= .0.. + 0060: 00 00 00 00 00 30 FF 30 30 00 00 00 00 00 00 00 // .....0.00...= .... Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Jean-Philippe Brucker --- tests/data/acpi/q35/VIOT.viot | Bin 112 -> 112 bytes tests/qtest/bios-tables-test-allowed-diff.h | 1 - 2 files changed, 1 deletion(-) diff --git a/tests/data/acpi/q35/VIOT.viot b/tests/data/acpi/q35/VIOT.viot index 9b179266ccbf84f1c250ee646812d17e27987764..275c78fbe8e93190321d957c91c= 3f17551f865d4 100644 GIT binary patch delta 10 RcmXRYnBY1wR(PU=3D1OOI`1E2r^ delta 10 RcmXRYnBY1wR(PU=3D1OOI`1E2r^ diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index 8367ffe1d4..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,2 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/virt/VIOT", --=20 2.20.1