From patchwork Thu Sep 16 13:28:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ani Sinha X-Patchwork-Id: 12499057 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.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 CB22CC433F5 for ; Thu, 16 Sep 2021 13:32:03 +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 917B660F12 for ; Thu, 16 Sep 2021 13:32:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 917B660F12 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]:36442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQrUg-0007j8-Oe for qemu-devel@archiver.kernel.org; Thu, 16 Sep 2021 09:32:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQrRx-000520-EK for qemu-devel@nongnu.org; Thu, 16 Sep 2021 09:29:13 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]:41532) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQrRw-0007d7-1I for qemu-devel@nongnu.org; Thu, 16 Sep 2021 09:29:13 -0400 Received: by mail-pf1-x42a.google.com with SMTP id x7so5852049pfa.8 for ; Thu, 16 Sep 2021 06:29:11 -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=a/nPhJuP95RL5fMCHVyTOvgO3IX+H7wE9bjcTGUL250=; b=MXLlOiNs5ylwbG7mzwLpDNH5O1BN16VX0GhTyCLO38iE2ipwcWlrhIQX9t0oYpZCep zgzYjRsGjMNV6gl10CyxukilZgl8/4b4WuSRuhzkj31IfpI6Bcylhoawapfmq5y1WnYI p70G67bI2eKUvxG40g2X8HKrUjFAutVmyVHF2/fvwkaNmqqXTthy9Ewv3XG+nqsJqRRG HIERc2MrlmLcYOF4o2IXhk4Q+Kqk9GdDF0+6CgK+Wue5xDthaOG1YcFWwT35I7iRVJsv U73TN5hPfp1P9v7uAOqzmT4f3CMn8hnB/qzQE7XrXbKNS+WS3NlelU9gjTKV9FdDJGIc 3OfA== 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=a/nPhJuP95RL5fMCHVyTOvgO3IX+H7wE9bjcTGUL250=; b=BKwgpxAVoQv9zqRW+z+qh1U2PfaO50KTYrf73qZfImldPgoo7V+cUKl5pmlEyJvwrb AA+PmkXeI0rKDmFm4ygQsTNgQ97hbZbZbYcJwtLt+5vO5GbZ1SxKFQOZVUBk86BYa7Oc vak+i6JKKCFxwGyRkMpJPweZH+tqg6+EvoMYX8ksy8EmJLKzgnntDpiCXZ/hTEXJph7d iRpwUOvQGMb/jMA5bGFhqU6yYoKrDt6PKDbyuZeHsg+up93P1Osap3gTrBKNN2CCZsdu K639q9SOXcoggG3+ViaUJG6kykQ611mBGkhUkVGfmIf43KCiEEU40XJYElPt7YN+zW66 oRUg== X-Gm-Message-State: AOAM531MT+TzTQmcsqsb8EljIDDpGGGxYHlSWhjecRfXfko2blIkJRmh OnbWiISBckRiAaEEKMEuU4QlLktUL5Cvmg== X-Google-Smtp-Source: ABdhPJwb4+Z0hmzXxZVTEjlP3X7du/g//2jAll7yim9Nm81KYelTdrilo4MFEafbou18/mQVBiyPbQ== X-Received: by 2002:aa7:8e91:0:b0:43e:1dd:812b with SMTP id a17-20020aa78e91000000b0043e01dd812bmr5110764pfr.35.1631798949492; Thu, 16 Sep 2021 06:29:09 -0700 (PDT) Received: from anisinha-lenovo.ba.nuagenetworks.net ([203.163.233.134]) by smtp.googlemail.com with ESMTPSA id w67sm3458272pfb.99.2021.09.16.06.29.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 06:29:09 -0700 (PDT) From: Ani Sinha To: qemu-devel@nongnu.org, qemu-stable@nongnu.org Subject: [PATCH v2 1/3] bios-tables-test: allow changes in DSDT ACPI tables for q35 Date: Thu, 16 Sep 2021 18:58:36 +0530 Message-Id: <20210916132838.3469580-2-ani@anisinha.ca> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916132838.3469580-1-ani@anisinha.ca> References: <20210916132838.3469580-1-ani@anisinha.ca> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::42a; envelope-from=ani@anisinha.ca; helo=mail-pf1-x42a.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=unavailable 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 , philmd@redhat.com, "Michael S. Tsirkin" , jusual@redhat.com, Igor Mammedov Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We are going to commit a change to fix IO address range allocated for acpi pci hotplug in q35. This affects DSDT tables. This change allows DSDT table modification so that unit tests are not broken. Signed-off-by: Ani Sinha Acked-by: Igor Mammedov --- tests/qtest/bios-tables-test-allowed-diff.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index dfb8523c8b..a02b88305c 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,12 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/q35/DSDT", +"tests/data/acpi/q35/DSDT.tis", +"tests/data/acpi/q35/DSDT.bridge", +"tests/data/acpi/q35/DSDT.mmio64", +"tests/data/acpi/q35/DSDT.ipmibt", +"tests/data/acpi/q35/DSDT.cphp", +"tests/data/acpi/q35/DSDT.memhp", +"tests/data/acpi/q35/DSDT.numamem", +"tests/data/acpi/q35/DSDT.nohpet", +"tests/data/acpi/q35/DSDT.dimmpxm", +"tests/data/acpi/q35/DSDT.acpihmat", From patchwork Thu Sep 16 13:28:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ani Sinha X-Patchwork-Id: 12499067 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=-21.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,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 97B5AC433EF for ; Thu, 16 Sep 2021 13:37:24 +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 0153361241 for ; Thu, 16 Sep 2021 13:37:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 0153361241 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]:46294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQrZr-0006Af-07 for qemu-devel@archiver.kernel.org; Thu, 16 Sep 2021 09:37:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60310) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQrS0-00058j-C7 for qemu-devel@nongnu.org; Thu, 16 Sep 2021 09:29:16 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]:40476) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQrRy-0007fR-Jg for qemu-devel@nongnu.org; Thu, 16 Sep 2021 09:29:16 -0400 Received: by mail-pf1-x431.google.com with SMTP id y8so5865980pfa.7 for ; Thu, 16 Sep 2021 06:29:14 -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=+iszYVUB0DKqhl5sOh/2W/mwXnntZoka/E6VSQbFFN0=; b=GnqwDdqLHOnH0ttjLSRHLqWS5hNXf/HDh7UDdV6Fdxcy0jTFnFHNvfX62Tp+haJzbM ZfzZJg1iaLodQXENQCeTNb3PYNG3P7B+tTDp3/rWKlhivapAdxmqLUm7k4MZ+NPtMwu7 28GcBM01m7asZ6o+O/VY2ectc7nqV5nvvmkI6I543ScJH2uULdfhnEaojGs7I6b8EJvL 2dujiaN2D56DOPo6UvKED+edOAW55xnhw24stUMw4J0ANJV41CMBwSkg2N9oqvdYolxB STawYpXkinviZlLVjQC+KyvfmNUuy2B1r6Lm4A2L57wrJKIxJfProKtNKjeqk5HqMSLw LFWQ== 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=+iszYVUB0DKqhl5sOh/2W/mwXnntZoka/E6VSQbFFN0=; b=cUSnoPs6FLuSnW5QvYRP/l9whQWNIqiIaTTf1HPLRhTqPbSkQ2CfVYuZpOrSzIHSvy bwNZh8ILTqdBgvU0ljS3j3jrIXOlMOBM3saIkpr6FneDoMqpl4BOsmw2VGgWAzalYYjU cQjnRF55hLjWsa0bKmblL+2v3KSxd8j2Kgovwow9hK2zLZ8J1nBM47UGkaAEHTbufYlr MvrGkAYGiL6CNRdBqCLEPUGncOCDrROsMVqlGquigVvFSbaezrmqDTzZIbguGC7tNxIm 4Se8euxgg4PIECHI3XzBras0Rzu8UNqVHRaqBisaQef3lQCDYD3I+OcrKxzZgVqkrlGI p9og== X-Gm-Message-State: AOAM5318YMPL1IaCBmChh3RGPBJe3g7Aiup4c+Iz852FVQtUH8yHuadV DZ6otUOa1a8k39r2CgD0eR9H5T1kQTgObQ== X-Google-Smtp-Source: ABdhPJxrIfm8cQjNiUv6tN8+6bn2TntVjCKVTfW4HZTTuoFDwykxaoOgiAAIrAe32JGVm9jLA3N6Cg== X-Received: by 2002:a62:7f48:0:b0:43e:7d:a4b1 with SMTP id a69-20020a627f48000000b0043e007da4b1mr5094602pfd.16.1631798952904; Thu, 16 Sep 2021 06:29:12 -0700 (PDT) Received: from anisinha-lenovo.ba.nuagenetworks.net ([203.163.233.134]) by smtp.googlemail.com with ESMTPSA id w67sm3458272pfb.99.2021.09.16.06.29.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 06:29:12 -0700 (PDT) From: Ani Sinha To: qemu-devel@nongnu.org, qemu-stable@nongnu.org Subject: [PATCH v2 2/3] hw/i386/acpi: fix conflicting IO address range for acpi pci hotplug in q35 Date: Thu, 16 Sep 2021 18:58:37 +0530 Message-Id: <20210916132838.3469580-3-ani@anisinha.ca> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916132838.3469580-1-ani@anisinha.ca> References: <20210916132838.3469580-1-ani@anisinha.ca> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::431; envelope-from=ani@anisinha.ca; helo=mail-pf1-x431.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=unavailable 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: "Michael S. Tsirkin" , jusual@redhat.com, Ani Sinha , Igor Mammedov , philmd@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Change caf108bc58790 ("hw/i386/acpi-build: Add ACPI PCI hot-plug methods to Q35") selects an IO address range for acpi based PCI hotplug for q35 arbitrarily. It starts at address 0x0cc4 and ends at 0x0cdb. At the time when the patch was written but the final version of the patch was not yet pushed upstream, this address range was free and did not conflict with any other IO address ranges. However, with the following change, this address range was no longer conflict free as in this change, the IO address range (value of ACPI_PCIHP_SIZE) was incremented by four bytes: b32bd763a1ca92 ("pci: introduce acpi-index property for PCI device") This can be seen from the output of QMP command 'info mtree' : 0000000000000600-0000000000000603 (prio 0, i/o): acpi-evt 0000000000000604-0000000000000605 (prio 0, i/o): acpi-cnt 0000000000000608-000000000000060b (prio 0, i/o): acpi-tmr 0000000000000620-000000000000062f (prio 0, i/o): acpi-gpe0 0000000000000630-0000000000000637 (prio 0, i/o): acpi-smi 0000000000000cc4-0000000000000cdb (prio 0, i/o): acpi-pci-hotplug 0000000000000cd8-0000000000000ce3 (prio 0, i/o): acpi-cpu-hotplug It shows that there is a region of conflict between IO regions of acpi pci hotplug and acpi cpu hotplug. Unfortunately, the change caf108bc58790 did not update the IO address range appropriately before it was pushed upstream to accommodate the increased length of the IO address space introduced in change b32bd763a1ca92. Due to this bug, windows guests complain 'This device cannot find enough free resources it can use' in the device manager panel for extended IO buses. This issue also breaks the correct functioning of pci hotplug as the following shows that the IO space for pci hotplug has been truncated: (qemu) info mtree -f FlatView #0 AS "I/O", root: io Root memory region: io 0000000000000cc4-0000000000000cd7 (prio 0, i/o): acpi-pci-hotplug 0000000000000cd8-0000000000000cf7 (prio 0, i/o): acpi-cpu-hotplug Therefore, in this fix, we adjust the IO address range for the acpi pci hotplug so that it does not conflict with cpu hotplug and there is no truncation of IO spaces. The starting IO address of PCI hotplug region has been decremented by four bytes in order to accommodate four byte increment in the IO address space introduced by change b32bd763a1ca92 ("pci: introduce acpi-index property for PCI device") After fixing, the following are the corrected IO ranges: 0000000000000600-0000000000000603 (prio 0, i/o): acpi-evt 0000000000000604-0000000000000605 (prio 0, i/o): acpi-cnt 0000000000000608-000000000000060b (prio 0, i/o): acpi-tmr 0000000000000620-000000000000062f (prio 0, i/o): acpi-gpe0 0000000000000630-0000000000000637 (prio 0, i/o): acpi-smi 0000000000000cc0-0000000000000cd7 (prio 0, i/o): acpi-pci-hotplug 0000000000000cd8-0000000000000ce3 (prio 0, i/o): acpi-cpu-hotplug This change has been tested using a Windows Server 2019 guest VM. Windows no longer complains after this change. Fixes: caf108bc58790 ("hw/i386/acpi-build: Add ACPI PCI hot-plug methods to Q35") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/561 Signed-off-by: Ani Sinha Reviewed-by: Igor Mammedov Reviewed-by: Julia Suvorova --- include/hw/acpi/ich9.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h index a329ce43ab..f04f1791bd 100644 --- a/include/hw/acpi/ich9.h +++ b/include/hw/acpi/ich9.h @@ -29,7 +29,7 @@ #include "hw/acpi/acpi_dev_interface.h" #include "hw/acpi/tco.h" -#define ACPI_PCIHP_ADDR_ICH9 0x0cc4 +#define ACPI_PCIHP_ADDR_ICH9 0x0cc0 typedef struct ICH9LPCPMRegs { /* From patchwork Thu Sep 16 13:28:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ani Sinha X-Patchwork-Id: 12499087 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.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 17F80C433F5 for ; Thu, 16 Sep 2021 13:40:35 +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 ADCF061244 for ; Thu, 16 Sep 2021 13:40:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org ADCF061244 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]:52968 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQrcu-0002Q1-87 for qemu-devel@archiver.kernel.org; Thu, 16 Sep 2021 09:40:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQrS6-0005Nr-39 for qemu-devel@nongnu.org; Thu, 16 Sep 2021 09:29:22 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]:43927) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQrS2-0007hc-LP for qemu-devel@nongnu.org; Thu, 16 Sep 2021 09:29:21 -0400 Received: by mail-pf1-x42d.google.com with SMTP id c1so2980248pfp.10 for ; Thu, 16 Sep 2021 06:29:18 -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=Jw3hy0CK2SjmQ2J8uDE5OdqRAyAYgDija0tjMaT78GQ=; b=BJUVZeab9HJ++AZYWEMY5mKcX6kUYMoPTReYe7MNc55RJSsTPrMBc1WWtepxTHAEOZ E6TdfedUudU98lZyRKrOaxUBKS2QVFaZNtwS+sKRggSF3abt5BC0nhovqmVWMR5rwz/I cU00bzKS6J6EcP57ZzdZCNjEm3TX7M0fP1VIo6Bz/U6xEmi60RIFRGBTICav9rlJGcRm +XUY+ULPwJn7Ie6r+MoIdie+p6cgixVqQBpY1RP3JUjoh7+mvHTH2rNK53rpaZ379Ii9 39GyuvTm2jPtMNwuxTR618Ab2UB0ttKsQey038prvWc8QaFPrg4mAgf79fOXNt18jGYq Py8Q== 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=Jw3hy0CK2SjmQ2J8uDE5OdqRAyAYgDija0tjMaT78GQ=; b=z/JIsGzwAKjB5TXyNprz0axdMjd1cx4ATzDZwrT+SMCDLgKEOCMFr1wQSJ0ZKfTAY3 VoS2RSHDTPzCuzCOMHjA48Y3CvSQkdjnL6qdIXb2WQISpL2kv7kaWW3K52jaGNQ8l50M NlbzpF1MWTMLigDAc8KpndcIvPoTrIxeqj1A9ONvHYVNwG0n4u7+lo+67LzayTGktLfX BYyTM3JYnN8bYzLPrfow1sQuYz0gzOhNcjkg8y9SN8mPtUOwnZVG/6nap71QhiQrKn+8 L1cy7DUQ0CD6urvm2TQxxGsGALyp9vtEUX1sG38Nf2dDkTwynuke6WbACkRHnjvhricI HjvA== X-Gm-Message-State: AOAM531w3OVEvYK1AosaDM5kvepY6XHiLN6ppB+QNEl3QtIXOb4tHU8S cGCOn9W9IbI4PMANxk23IR4BNwmSpERsUQ== X-Google-Smtp-Source: ABdhPJzuxSbvc5/hbqBJgli3ni74LocjmzAlONe2J82T7Qra1f7wFOIoQV3975/CGWerNNaFBHdjzw== X-Received: by 2002:a62:dd94:0:b0:442:bb03:9663 with SMTP id w142-20020a62dd94000000b00442bb039663mr2417514pff.0.1631798956113; Thu, 16 Sep 2021 06:29:16 -0700 (PDT) Received: from anisinha-lenovo.ba.nuagenetworks.net ([203.163.233.134]) by smtp.googlemail.com with ESMTPSA id w67sm3458272pfb.99.2021.09.16.06.29.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 06:29:15 -0700 (PDT) From: Ani Sinha To: qemu-devel@nongnu.org, qemu-stable@nongnu.org Subject: [PATCH v2 3/3] bios-tables-test: Update ACPI DSDT table golden blobs for q35 Date: Thu, 16 Sep 2021 18:58:38 +0530 Message-Id: <20210916132838.3469580-4-ani@anisinha.ca> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916132838.3469580-1-ani@anisinha.ca> References: <20210916132838.3469580-1-ani@anisinha.ca> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::42d; envelope-from=ani@anisinha.ca; helo=mail-pf1-x42d.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 , philmd@redhat.com, "Michael S. Tsirkin" , jusual@redhat.com, Igor Mammedov Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We have modified the IO address range for ACPI pci hotplug in q35. See change: 5adcc9e39e6a5 ("hw/i386/acpi: fix conflicting IO address range for acpi pci hotplug in q35") The ACPI DSDT table golden blobs must be regenrated in order to make the unit tests pass. This change updates the golden ACPI DSDT table blobs. Following is the ASL diff between the blobs: @@ -1,30 +1,30 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20190509 (64-bit version) * Copyright (c) 2000 - 2019 Intel Corporation * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/q35/DSDT, Tue Sep 14 09:04:06 2021 + * Disassembly of /tmp/aml-52DP90, Tue Sep 14 09:04:06 2021 * * Original Table Header: * Signature "DSDT" * Length 0x00002061 (8289) * Revision 0x01 **** 32-bit table (V1), no 64-bit math support - * Checksum 0xE5 + * Checksum 0xF9 * OEM ID "BOCHS " * OEM Table ID "BXPC " * OEM Revision 0x00000001 (1) * Compiler ID "BXPC" * Compiler Version 0x00000001 (1) */ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001) { Scope (\) { OperationRegion (DBG, SystemIO, 0x0402, One) Field (DBG, ByteAcc, NoLock, Preserve) { DBGB, 8 } @@ -226,46 +226,46 @@ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings { IO (Decode16, 0x0070, // Range Minimum 0x0070, // Range Maximum 0x01, // Alignment 0x08, // Length ) IRQNoFlags () {8} }) } } Scope (_SB.PCI0) { - OperationRegion (PCST, SystemIO, 0x0CC4, 0x08) + OperationRegion (PCST, SystemIO, 0x0CC0, 0x08) Field (PCST, DWordAcc, NoLock, WriteAsZeros) { PCIU, 32, PCID, 32 } - OperationRegion (SEJ, SystemIO, 0x0CCC, 0x04) + OperationRegion (SEJ, SystemIO, 0x0CC8, 0x04) Field (SEJ, DWordAcc, NoLock, WriteAsZeros) { B0EJ, 32 } - OperationRegion (BNMR, SystemIO, 0x0CD4, 0x08) + OperationRegion (BNMR, SystemIO, 0x0CD0, 0x08) Field (BNMR, DWordAcc, NoLock, WriteAsZeros) { BNUM, 32, PIDX, 32 } Mutex (BLCK, 0x00) Method (PCEJ, 2, NotSerialized) { Acquire (BLCK, 0xFFFF) BNUM = Arg0 B0EJ = (One << Arg1) Release (BLCK) Return (Zero) } @@ -3185,34 +3185,34 @@ 0x0620, // Range Minimum 0x0620, // Range Maximum 0x01, // Alignment 0x10, // Length ) }) } Device (PHPR) { Name (_HID, "PNP0A06" /* Generic Container Device */) // _HID: Hardware ID Name (_UID, "PCI Hotplug resources") // _UID: Unique ID Name (_STA, 0x0B) // _STA: Status Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings { IO (Decode16, - 0x0CC4, // Range Minimum - 0x0CC4, // Range Maximum + 0x0CC0, // Range Minimum + 0x0CC0, // Range Maximum 0x01, // Alignment 0x18, // Length ) }) } } Scope (\) { Name (_S3, Package (0x04) // _S3_: S3 System State { One, One, Zero, Zero }) Signed-off-by: Ani Sinha Acked-by: Igor Mammedov --- tests/data/acpi/q35/DSDT | Bin 8289 -> 8289 bytes tests/data/acpi/q35/DSDT.acpihmat | Bin 9614 -> 9614 bytes tests/data/acpi/q35/DSDT.bridge | Bin 11003 -> 11003 bytes tests/data/acpi/q35/DSDT.cphp | Bin 8753 -> 8753 bytes tests/data/acpi/q35/DSDT.dimmpxm | Bin 9943 -> 9943 bytes tests/data/acpi/q35/DSDT.ipmibt | Bin 8364 -> 8364 bytes tests/data/acpi/q35/DSDT.memhp | Bin 9648 -> 9648 bytes tests/data/acpi/q35/DSDT.mmio64 | Bin 9419 -> 9419 bytes tests/data/acpi/q35/DSDT.nohpet | Bin 8147 -> 8147 bytes tests/data/acpi/q35/DSDT.numamem | Bin 8295 -> 8295 bytes tests/data/acpi/q35/DSDT.tis | Bin 8894 -> 8894 bytes tests/qtest/bios-tables-test-allowed-diff.h | 11 ----------- 12 files changed, 11 deletions(-) diff --git a/tests/data/acpi/q35/DSDT b/tests/data/acpi/q35/DSDT index 842533f53e6db40935c3cdecd1d182edba6c17d4..281fc82c03b2562d2e6b7caec0d817b034a47138 100644 GIT binary patch delta 65 zcmaFp@X&$FCD+tn9LO9j!+e0}z~trfy8v~b6W9O% delta 65 zcmaFp@X&$FCD+to9LO9j!+eD2$mHeny8v@q6W9O% diff --git a/tests/data/acpi/q35/DSDT.acpihmat b/tests/data/acpi/q35/DSDT.acpihmat index 8d00f2ea0dd78f962e136273d68cb0c568e43c27..8c1e05a11a328ec1cc6f86e36e52c28f41f9744e 100644 GIT binary patch delta 65 zcmeD4?(^ny33dtTQ)OUa+_sU6pPBK%WGQA@sS`Y0EYXeJ!LDBM&Q1odUJB6-PJX^Y VjNBJC2QoJ(G9TbMF!_qgE&x%Q6Po}4 delta 65 zcmeD4?(^ny33dtTQ)OUaT(pskpPBK+tn9LO9j!+e0}z~<%hA>06yixa5; delta 66 zcmewz`a6`%CDF$oF?J&tKQrTj$x_U+QYU!0SfU%bgI&Giot+F^y%eGwocw%) V7`ZQO4rErAV?MxhU~;+QE&wzZ5?TNN delta 65 zcmdn!veAXhCDF$o(Q_jgKQrTz$x_U+QfGL$SfU%bgI&Giot+F^y%eGwocw%) V7`d-(4rErAV?M%jWOBLUE&wso5?TNN diff --git a/tests/data/acpi/q35/DSDT.dimmpxm b/tests/data/acpi/q35/DSDT.dimmpxm index b062e30117f955c7a2ac9629a0512324bbd28bf2..fe5820d93d057ef09a001662369b15afbc5b87e2 100644 GIT binary patch delta 65 zcmccad)=4ICD+tn9LRi9iTMD}fyuIJy8v+to9LRi9iTMc6k;$@Zy8v&d6QKYA diff --git a/tests/data/acpi/q35/DSDT.ipmibt b/tests/data/acpi/q35/DSDT.ipmibt index 1c5737692f56fc678e685a4ad0bb1df38d487a14..631741065860fd5036aa303904dabd1d2839f9c6 100644 GIT binary patch delta 89 zcmZ4ExWnjRFDA!6D88&YqzPK*B{Kx*^!rE1r@2 p1P>QWbR##2IIZ=^79R1njRFDA!6D88&YqzPK*B{Kx*^!rE1r@2 p3=bDebR##2IIZ=^79R1+tn9LO9g!+e0}z~r^^y8vk#6QBS9 delta 65 zcmaFv@Z5pRCDxg*6QBS9 diff --git a/tests/data/acpi/q35/DSDT.tis b/tests/data/acpi/q35/DSDT.tis index d1433e3c14570bbd17b029a9aec6bc53134c3b7d..c92d4d29c79352a60974ea9f665d0b9a410a4bac 100644 GIT binary patch delta 66 zcmdnzy3du%CD