From patchwork Mon Sep 20 07:00:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ani Sinha X-Patchwork-Id: 12504675 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 820BBC433F5 for ; Mon, 20 Sep 2021 07:04:12 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3893C610A3 for ; Mon, 20 Sep 2021 07:04:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3893C610A3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=anisinha.ca Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:53156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mSDLX-0002vU-G7 for qemu-devel@archiver.kernel.org; Mon, 20 Sep 2021 03:04:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36420) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mSDIs-0005AO-KX for qemu-devel@nongnu.org; Mon, 20 Sep 2021 03:01:26 -0400 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]:40572) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mSDIq-0004ff-SS for qemu-devel@nongnu.org; Mon, 20 Sep 2021 03:01:26 -0400 Received: by mail-pl1-x629.google.com with SMTP id n18so10398769plp.7 for ; Mon, 20 Sep 2021 00:01:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=anisinha-ca.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MpTwyC6LmhLimBWu/X6COjcvXv9MrWnGiSjZi/aYcAs=; b=M55ze9OeTazEw4ASqnGTh3ZPWVfgwaYajC7/G5GT2PPhmZCzFaX9D3k2JLbRPXkk58 fTxIL3ewQjrj1BabWRJicijgH0Ukh5bBhkRYrmMwmnF1TBFxbQ+fv2OxvJN4884oDjEt m8J3KADH8lkPnI3YlHCVk3q4ezccqgfz1zp63zlqAGpRGP3buST1YcU0eeoDWYPLVhJT VyY1Fmus/HMh9hImS2wmTWJfkJrCDezeJRf+Z1z5CM9umjx75kFpqENbCTGdxZ+zrssl 1sAM9TlSbO83/IpEKCFrk0inqdldn0esqolMtnyoMJiRL+sqZfgIFy+NatR7tA177S6u YNCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MpTwyC6LmhLimBWu/X6COjcvXv9MrWnGiSjZi/aYcAs=; b=seuoV4g9GrOc9Q4kBObZ44m5EwvCrZK13ZzqN5k1qKApRCKe2tzln1gtJOdjssegr4 JOEO+TlcXI+SNVaRWfKq91514X+Kv4PGKP07kL8U5Bqp4diKsSZyyvM24ZoE3hKzueqQ kiScLJ8/DvdBTnbYu8lCG/p0pkPKLUg553soF3vQ9q7Ahdny6XzaUY1DpOIkqqazvRYV 4xWtmCS1G9VTzai4l/7ZhRXmzWT/lmsD8x8oJvdReJ7OomUOcXd3Eojinz1gHpRw90bL 2MlOK5ZZZEGTxU6qPORKKob3XnZbiJyEdQ1U/60XzdggUsQCHYXwYiPn3frYESUZF+vk 2c3w== X-Gm-Message-State: AOAM530QTyGTrbeWQIIHaOuTBpFVq7yBfnZgf5rBxKF64wbE4+I91xs8 KbgzcIBlLRC6pfDL1diobzCSZp9imgNLLw== X-Google-Smtp-Source: ABdhPJy4GS+rY2rjkWqYhHy45LBRujpOJkYYX5T0wNltOmiOgvL95auhUQREq60v7WdM4TuoJVz2mA== X-Received: by 2002:a17:90b:4901:: with SMTP id kr1mr28024972pjb.80.1632121282826; Mon, 20 Sep 2021 00:01:22 -0700 (PDT) Received: from anisinha-lenovo.ba.nuagenetworks.net ([115.96.109.20]) by smtp.googlemail.com with ESMTPSA id o20sm12897901pfd.188.2021.09.20.00.01.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 00:01:22 -0700 (PDT) From: Ani Sinha To: qemu-devel@nongnu.org Subject: [PATCH v3 1/3] tests/acpi/bios-tables-test: add and allow changes to a new q35 DSDT table blob Date: Mon, 20 Sep 2021 12:30:45 +0530 Message-Id: <20210920070047.3937292-2-ani@anisinha.ca> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210920070047.3937292-1-ani@anisinha.ca> References: <20210920070047.3937292-1-ani@anisinha.ca> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::629; envelope-from=ani@anisinha.ca; helo=mail-pl1-x629.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ani Sinha , imammedo@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We are adding a new unit test to cover the acpi hotplug support in q35 for multi-function bridges. This test uses a new table DSDT.multi-bridge. We need to allow changes in DSDT acpi table for addition of this new unit test. Signed-off-by: Ani Sinha --- tests/data/acpi/q35/DSDT.multi-bridge | 0 tests/qtest/bios-tables-test-allowed-diff.h | 1 + 2 files changed, 1 insertion(+) create mode 100644 tests/data/acpi/q35/DSDT.multi-bridge diff --git a/tests/data/acpi/q35/DSDT.multi-bridge b/tests/data/acpi/q35/DSDT.multi-bridge 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..dabc024f53 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/q35/DSDT.multi-bridge", From patchwork Mon Sep 20 07:00:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ani Sinha X-Patchwork-Id: 12504655 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F21DC433F5 for ; Mon, 20 Sep 2021 07:02:50 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 114D460F46 for ; Mon, 20 Sep 2021 07:02:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 114D460F46 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=anisinha.ca Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:48176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mSDKD-00080E-7C for qemu-devel@archiver.kernel.org; Mon, 20 Sep 2021 03:02:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mSDIv-0005G2-7F for qemu-devel@nongnu.org; Mon, 20 Sep 2021 03:01:29 -0400 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]:56305) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mSDIt-0004hx-0A for qemu-devel@nongnu.org; Mon, 20 Sep 2021 03:01:28 -0400 Received: by mail-pj1-x1033.google.com with SMTP id t20so11265710pju.5 for ; Mon, 20 Sep 2021 00:01:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=anisinha-ca.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ukvYbyvQxNBGBSYlEotz3ASU1rMqrJHd68qZpJMK8HY=; b=gCwVL4wJ6UVbKZa0259W8LrHjIQJqM2op/5/Ea3HznlVbcmnetovDLNCpioZ0JJXda KOI6tubx4Vn+H2d28AAGxNg3zk5N6c/15nYoAUjIehHCmM/6W2l1s3BLPNfTnn0KLuwt x8DXKEc+Lh9mvWcf+ZNvo+81dZ60apYsazLR13gYQLRQnKx2Vk5x8ews1jO2kK3yzdxE HNV1CEMYHXvrHO6+KfMC+UFmxH0c83LmAcJ0Ln9GGnE3sZfSTO2jTj4oSq/GmTda5vhM 2WBMJPXziuYt/dbjIhLdQ8GpkuQyAucpVbmsntJ7YeVAbKy5iu0slTzsfAsM2eMbuISm 7hOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ukvYbyvQxNBGBSYlEotz3ASU1rMqrJHd68qZpJMK8HY=; b=cu3XxSzLKFMm/2lVvkxf2llyT3q4Bc/ebwS/Oll1dCboMyl8xt8WAJYykr+1TzHY5l zjglQ3lKDvvsSnyBFwKpeD/ooODiNtYSJbBfKn+a32J/GbLG6hXCYE5IahX9ViHi7TS1 nDwzsUSFY+tiirpqMzGWcFWtzmqk8Mosz1G7Z2lDhRTGVdFG+NgqKML33j02GYmoC8kU CpPd9RyjK+bWJ1ad6s6i3cuLRYRsrVgXbda+ZGjxnrSfh2uY41TjkRsv3UAZjv6TrMVa B/a4Md4awYwZ5hTAIwp8K2cMRD762MhN2nME27Bk7iOz5Ujn+NhbHurZrOq3g1Kjymci 7F8Q== X-Gm-Message-State: AOAM530VMLe+FDrZ04CwGXGVQs6t3gOMq/HaF5dwZYy5hGUitT2lMKJH ZNRq70/1Osc3Jf3jn6pqkOLgmdOSxjqDDQ== X-Google-Smtp-Source: ABdhPJyhGTilNg2rBS4gaw9yYTdY1l5YFY/4js47PeWNmEaO2oR3cAqeTpB/bV42LmHvr9yrlRHW8w== X-Received: by 2002:a17:90b:4f49:: with SMTP id pj9mr36352010pjb.188.1632121285434; Mon, 20 Sep 2021 00:01:25 -0700 (PDT) Received: from anisinha-lenovo.ba.nuagenetworks.net ([115.96.109.20]) by smtp.googlemail.com with ESMTPSA id o20sm12897901pfd.188.2021.09.20.00.01.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 00:01:24 -0700 (PDT) From: Ani Sinha To: qemu-devel@nongnu.org Subject: [PATCH v3 2/3] tests/acpi/pcihp: add unit tests for hotplug on multifunction bridges for q35 Date: Mon, 20 Sep 2021 12:30:46 +0530 Message-Id: <20210920070047.3937292-3-ani@anisinha.ca> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210920070047.3937292-1-ani@anisinha.ca> References: <20210920070047.3937292-1-ani@anisinha.ca> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::1033; envelope-from=ani@anisinha.ca; helo=mail-pj1-x1033.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ani Sinha , imammedo@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" commit d7346e614f4ec ("acpi: x86: pcihp: add support hotplug on multifunction bridges") added ACPI hotplug descriptions for cold plugged bridges for functions other than 0. For all other devices, the ACPI hotplug descriptions are limited to function 0 only. This change adds unit tests for this feature. This test adds the following devices to qemu and then checks the changes introduced in the DSDT table due to the addition of the following devices: (a) a multifunction bridge device (b) a bridge device with function 1 (c) a non-bridge device with function 2 In the DSDT table, we should see AML hotplug descriptions for (a) and (b). For (a) we should find a hotplug AML description for function 0. The following diff compares the DSDT table AML with the new unit test before and after the change d7346e614f4ec is introduced. In other words, this diff reflects the changes that occurs in the DSDT table due to the change d7346e614f4ec . @@ -5,13 +5,13 @@ * * Disassembling to symbolic ASL+ operators * - * Disassembly of /tmp/aml-7A7890, Sat Sep 18 13:13:29 2021 + * Disassembly of /tmp/aml-PE4S90, Sat Sep 18 13:08:54 2021 * * Original Table Header: * Signature "DSDT" - * Length 0x0000206A (8298) + * Length 0x000020F3 (8435) * Revision 0x01 **** 32-bit table (V1), no 64-bit math support - * Checksum 0x59 + * Checksum 0x1B * OEM ID "BOCHS " * OEM Table ID "BXPC " * OEM Revision 0x00000001 (1) @@ -20,28 +20,6 @@ */ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001) { - /* - * iASL Warning: There was 1 external control method found during - * disassembly, but only 0 were resolved (1 unresolved). Additional - * ACPI tables may be required to properly disassemble the code. This - * resulting disassembler output file may not compile because the - * disassembler did not know how many arguments to assign to the - * unresolved methods. Note: SSDTs can be dynamically loaded at - * runtime and may or may not be available via the host OS. - * - * In addition, the -fe option can be used to specify a file containing - * control method external declarations with the associated method - * argument counts. Each line of the file must be of the form: - * External (, MethodObj, ) - * Invocation: - * iasl -fe refs.txt -d dsdt.aml - * - * The following methods were unresolved and many not compile properly - * because the disassembler had to guess at the number of arguments - * required for each: - */ - External (_SB_.PCI0.S09_.PCNT, MethodObj) // Warning: Unknown method, guessing 1 arguments - Scope (\) { OperationRegion (DBG, SystemIO, 0x0402, One) @@ -3280,9 +3258,45 @@ } } + Device (S09) + { + Name (_ADR, 0x00010001) // _ADR: Address + Name (BSEL, Zero) + Device (S00) + { + Name (_SUN, Zero) // _SUN: Slot User Number + Name (_ADR, Zero) // _ADR: Address + Method (_EJ0, 1, NotSerialized) // _EJx: Eject Device, x=0-9 + { + PCEJ (BSEL, _SUN) + } + + Method (_DSM, 4, Serialized) // _DSM: Device-Specific Method + { + Return (PDSM (Arg0, Arg1, Arg2, Arg3, BSEL, _SUN)) + } + } + + Method (DVNT, 2, NotSerialized) + { + If ((Arg0 & One)) + { + Notify (S00, Arg1) + } + } + + Method (PCNT, 0, NotSerialized) + { + BNUM = Zero + DVNT (PCIU, One) + DVNT (PCID, 0x03) + } + } + Method (PCNT, 0, NotSerialized) { - ^S09.PCNT (^S08.PCNT ()) + ^S09.PCNT () + ^S08.PCNT () } } } Signed-off-by: Ani Sinha --- tests/qtest/bios-tables-test.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 4f11d03055..d4cd77ea02 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -859,6 +859,23 @@ static void test_acpi_q35_tcg_bridge(void) free_test_data(&data); } +static void test_acpi_q35_multif_bridge(void) +{ + test_data data = { + .machine = MACHINE_Q35, + .variant = ".multi-bridge", + }; + test_acpi_one("-nodefaults -device pcie-root-port,id=pcie-root-port-0," + "multifunction=on," + "port=0x0,chassis=1,addr=0x1,bus=pcie.0 " + "-device pcie-root-port,id=pcie-root-port-1," + "port=0x1,chassis=2,addr=0x1.0x1,bus=pcie.0 " + "-device virtio-balloon,id=balloon0," + "bus=pcie.0,addr=0x1.0x2", + &data); + free_test_data(&data); +} + static void test_acpi_q35_tcg_mmio64(void) { test_data data = { @@ -1534,6 +1551,7 @@ int main(int argc, char *argv[]) test_acpi_piix4_no_acpi_pci_hotplug); qtest_add_func("acpi/q35", test_acpi_q35_tcg); qtest_add_func("acpi/q35/bridge", test_acpi_q35_tcg_bridge); + qtest_add_func("acpi/q35/multif-bridge", test_acpi_q35_multif_bridge); qtest_add_func("acpi/q35/mmio64", test_acpi_q35_tcg_mmio64); qtest_add_func("acpi/piix4/ipmi", test_acpi_piix4_tcg_ipmi); qtest_add_func("acpi/q35/ipmi", test_acpi_q35_tcg_ipmi); From patchwork Mon Sep 20 07:00:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ani Sinha X-Patchwork-Id: 12504657 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, LOTS_OF_MONEY,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13D4BC433EF for ; Mon, 20 Sep 2021 07:03:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B1B3F60F46 for ; Mon, 20 Sep 2021 07:02:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B1B3F60F46 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=anisinha.ca Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:48704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mSDKM-0008LM-Te for qemu-devel@archiver.kernel.org; Mon, 20 Sep 2021 03:02:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36478) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mSDJ1-0005Wr-Lk for qemu-devel@nongnu.org; Mon, 20 Sep 2021 03:01:35 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]:44854) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mSDIv-0004kA-NH for qemu-devel@nongnu.org; Mon, 20 Sep 2021 03:01:35 -0400 Received: by mail-pj1-x1031.google.com with SMTP id nn5-20020a17090b38c500b0019af1c4b31fso11919925pjb.3 for ; Mon, 20 Sep 2021 00:01:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=anisinha-ca.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QNdQrHirsbAlYE0D9B9QpCHnXDgDihE3SYTFQNccfaE=; b=1CWgVIAlwDQL7jibwTNX8uclC9t8jHIzHPs9jCkNcbySuKdcc7MWUP5VHRGUBewRve BfdMVkvhNeeWqDDMcZPr2qKlAbCPb9pF3ya44Qvjm2OGW2DITJkw9noIejNdnRFXnPfj 75bKSPyB2K1onnKpDn5j5z4AWtemYTXmxsb3JxVa4DHTET7wu6gTPajWKezpdQynpV7T yllpyQGTPz9xYE/Yu0wukU9AHL9gJVk6xDKzsmHWnqjxFp4GmaaZ3OmJKjcQMJThfc+f WC95eYH9XOvCQKyk65mr1/6HOM63t1uYLAuXFPjWre/GK/vX+td7XeaQweFqEdZcXd30 EudA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QNdQrHirsbAlYE0D9B9QpCHnXDgDihE3SYTFQNccfaE=; b=5RtX9R6HI7j7lsqNcXsLs8iLIFzJsLzLDuua1OsOt0WURnLP2abSFCZJZ02vIDPUVB 40XuhUAkOgoEUznH53jTl5ouwscoOzCZU4KotpQmBuXodQABwfbWCnopeEo9NTdfPn3n OWLa2EjXQB6+1iN6ldlBKR04PuTstfhxb/UM8IzsD1Ag7Rqg3kOaSW2x34Oq/zoDhi4Z /i7juC5C7pygQWvz0+GihPJGXh38OQYIKibNMoynB0IplzmdEwRRNHn7Xqvge51fSavK j2B5f78iOJPbaqQme4OVECFJfgojxDZEhrntrB5Ya0RxunmRPYtdECrO9YZfrjJ7+WT3 li1g== X-Gm-Message-State: AOAM530303+ge8YlRAJMVWubMmESwWw/6EaO4yfXp90vVOR7gLKVkr+P ZaIgF4e+/eUnlZr584qS8vkyx2lfdfbZzg== X-Google-Smtp-Source: ABdhPJwqeL/j4JHLNxDPIWfAXHgpJFQjjpGKAfUEW6QXW/+rmdb7VTqlIsoePcKk58TKqCPUuMF2yg== X-Received: by 2002:a17:90b:1bc6:: with SMTP id oa6mr1105885pjb.58.1632121288079; Mon, 20 Sep 2021 00:01:28 -0700 (PDT) Received: from anisinha-lenovo.ba.nuagenetworks.net ([115.96.109.20]) by smtp.googlemail.com with ESMTPSA id o20sm12897901pfd.188.2021.09.20.00.01.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 00:01:27 -0700 (PDT) From: Ani Sinha To: qemu-devel@nongnu.org Subject: [PATCH v3 3/3] tests/acpi/bios-tables-test: update DSDT blob for multifunction bridge test Date: Mon, 20 Sep 2021 12:30:47 +0530 Message-Id: <20210920070047.3937292-4-ani@anisinha.ca> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210920070047.3937292-1-ani@anisinha.ca> References: <20210920070047.3937292-1-ani@anisinha.ca> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::1031; envelope-from=ani@anisinha.ca; helo=mail-pj1-x1031.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, LOTS_OF_MONEY=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ani Sinha , imammedo@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We added a new unit test for testing acpi hotplug on multifunction bridges in q35 machines. Here, we update the DSDT table gloden master blob for this unit test. Following is the ASL diff between the original DSDT table and the modified DSDT table due to the unit test: @@ -5,13 +5,13 @@ * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/q35/DSDT, Mon Sep 20 12:22:11 2021 + * Disassembly of tests/data/acpi/q35/DSDT.multi-bridge, Mon Sep 20 12:22:31 2021 * * Original Table Header: * Signature "DSDT" - * Length 0x00002061 (8289) + * Length 0x000020F3 (8435) * Revision 0x01 **** 32-bit table (V1), no 64-bit math support - * Checksum 0xE5 + * Checksum 0x1B * OEM ID "BOCHS " * OEM Table ID "BXPC " * OEM Revision 0x00000001 (1) @@ -184,42 +184,6 @@ }) } - Device (LPT1) - { - Name (_HID, EisaId ("PNP0400") /* Standard LPT Parallel Port */) // _HID: Hardware ID - Name (_UID, One) // _UID: Unique ID - Name (_STA, 0x0F) // _STA: Status - Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings - { - IO (Decode16, - 0x0378, // Range Minimum - 0x0378, // Range Maximum - 0x08, // Alignment - 0x08, // Length - ) - IRQNoFlags () - {7} - }) - } - - Device (COM1) - { - Name (_HID, EisaId ("PNP0501") /* 16550A-compatible COM Serial Port */) // _HID: Hardware ID - Name (_UID, One) // _UID: Unique ID - Name (_STA, 0x0F) // _STA: Status - Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings - { - IO (Decode16, - 0x03F8, // Range Minimum - 0x03F8, // Range Maximum - 0x00, // Alignment - 0x08, // Length - ) - IRQNoFlags () - {4} - }) - } - Device (RTC) { Name (_HID, EisaId ("PNP0B00") /* AT Real-Time Clock */) // _HID: Hardware ID @@ -3262,24 +3226,77 @@ Device (S08) { Name (_ADR, 0x00010000) // _ADR: Address - Method (_S1D, 0, NotSerialized) // _S1D: S1 Device State + Name (BSEL, One) + Device (S00) { - Return (Zero) + Name (_SUN, Zero) // _SUN: Slot User Number + Name (_ADR, Zero) // _ADR: Address + Method (_EJ0, 1, NotSerialized) // _EJx: Eject Device, x=0-9 + { + PCEJ (BSEL, _SUN) + } + + Method (_DSM, 4, Serialized) // _DSM: Device-Specific Method + { + Return (PDSM (Arg0, Arg1, Arg2, Arg3, BSEL, _SUN)) + } } - Method (_S2D, 0, NotSerialized) // _S2D: S2 Device State + Method (DVNT, 2, NotSerialized) { - Return (Zero) + If ((Arg0 & One)) + { + Notify (S00, Arg1) + } } - Method (_S3D, 0, NotSerialized) // _S3D: S3 Device State + Method (PCNT, 0, NotSerialized) { - Return (Zero) + BNUM = One + DVNT (PCIU, One) + DVNT (PCID, 0x03) + } + } + + Device (S09) + { + Name (_ADR, 0x00010001) // _ADR: Address + Name (BSEL, Zero) + Device (S00) + { + Name (_SUN, Zero) // _SUN: Slot User Number + Name (_ADR, Zero) // _ADR: Address + Method (_EJ0, 1, NotSerialized) // _EJx: Eject Device, x=0-9 + { + PCEJ (BSEL, _SUN) + } + + Method (_DSM, 4, Serialized) // _DSM: Device-Specific Method + { + Return (PDSM (Arg0, Arg1, Arg2, Arg3, BSEL, _SUN)) + } + } + + Method (DVNT, 2, NotSerialized) + { + If ((Arg0 & One)) + { + Notify (S00, Arg1) + } + } + + Method (PCNT, 0, NotSerialized) + { + BNUM = Zero + DVNT (PCIU, One) + DVNT (PCID, 0x03) } } Method (PCNT, 0, NotSerialized) { + ^S09.PCNT () + ^S08.PCNT () } } } Signed-off-by: Ani Sinha --- tests/data/acpi/q35/DSDT.multi-bridge | Bin 0 -> 8435 bytes tests/qtest/bios-tables-test-allowed-diff.h | 1 - 2 files changed, 1 deletion(-) diff --git a/tests/data/acpi/q35/DSDT.multi-bridge b/tests/data/acpi/q35/DSDT.multi-bridge index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a6565acc5cc390826f4ac23585912f9cf1d9acb9 100644 GIT binary patch literal 8435 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 literal 0 HcmV?d00001 diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index dabc024f53..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/q35/DSDT.multi-bridge",