From mboxrd@z Thu Jan 1 00:00:00 1970 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 Content-Transfer-Encoding: 8bit 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", -- 2.25.1