From patchwork Tue Sep 14 04:54:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ani Sinha X-Patchwork-Id: 1527735 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=anisinha-ca.20150623.gappssmtp.com header.i=@anisinha-ca.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=qegCo5zt; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) 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 ozlabs.org (Postfix) with ESMTPS id 4H7rcg16Dgz9sCD for ; Tue, 14 Sep 2021 14:54:59 +1000 (AEST) Received: from localhost ([::1]:47402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQ0TA-0000c3-TW for incoming@patchwork.ozlabs.org; Tue, 14 Sep 2021 00:54:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37366) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ0So-0000a1-4a for qemu-devel@nongnu.org; Tue, 14 Sep 2021 00:54:34 -0400 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]:42871) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQ0Sm-0006aZ-HD for qemu-devel@nongnu.org; Tue, 14 Sep 2021 00:54:33 -0400 Received: by mail-pl1-x629.google.com with SMTP id n4so7346656plh.9 for ; Mon, 13 Sep 2021 21:54:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=anisinha-ca.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QxK/zd8mRclYhMbLhjoUuX49tGs9BN4rwd7P7Hw9PiI=; b=qegCo5ztfghW1GzZPpqTDC90SwLAKmD7Iec/YTd7fI8HybTNYTwd2xhP2vJ7xhBw0T x4bnqWoZDkr3+ux1zynohiZJsapQ6qU9ZJHGCasuakewg5MFCWaXzcjxuY2bVjnW/fYQ iqNRbuhnK3HX7gTufPJEoRurfx3J6srWCLtdB2uf7nGB0Czjq39C4k72hvtrIK6U19sR TIhH3cGiXCR0hFFkDgLXvXW7PdR5ID4K/dQ/mrUDuLHKc7p63HDRVLxPJWzcbiVTq3IE WkCU6Ilnavlok4roI7v0Z+C7XIO5ifSI1VeJDX82ln61SF9/fU/WMi0rH+YE0mSrRKET FSKg== 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=QxK/zd8mRclYhMbLhjoUuX49tGs9BN4rwd7P7Hw9PiI=; b=NynF4NoyCiK3tvMIBlLKW1Aca5138MIFB9/MUSfmOu6pS7eiCpiVWtJW8tKGQ22zGG dQT9gnpZvJZ4wgMZlG+8XMlPoCebruh+mSQrKhRQgZcbDAJOnjL4xqCFUeIrPTyrL2SU ycf6nTkaKmb9MFO2Qfx3IgojoXQshbuU32OJEvCOzVqpf84weYYe+ztM0P23Pivf7E4j dEphJoY30ZhfhMLt66GWE+HfJy5jgvtz7A8TBQywKa2C0SOS6mInw9elzIVIdBScjnY/ 9UYBbbZ9vWRXBclU4cUQ1XnXBXTfZdFl4ch2KgjVOSahcBmZFFTFcW5KpeFQHmks0+oO 7MxA== X-Gm-Message-State: AOAM531qENIyLBH0G+C1MNsYnY61+9FdtPt0hZd0Dulk8385Pvv7w6Mv 2kj46xujRyQXY6vABtSWFYUMWbEzm3ulAg== X-Google-Smtp-Source: ABdhPJxJu2FsoefJdo/QvMIEQ9Div5zWW+WhzT1AuiuyPz1vIK6Xa2jLjloV50rssbXN48tvTfnQKA== X-Received: by 2002:a17:90b:1e43:: with SMTP id pi3mr3454719pjb.135.1631595270910; Mon, 13 Sep 2021 21:54:30 -0700 (PDT) Received: from anisinha-lenovo.ba.nuagenetworks.net ([203.163.239.215]) by smtp.googlemail.com with ESMTPSA id u24sm9262522pfm.27.2021.09.13.21.54.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 21:54:30 -0700 (PDT) From: Ani Sinha To: qemu-devel@nongnu.org Subject: [PATCH 1/3] bios-tables-test: allow changes in DSDT ACPI tables for q35 Date: Tue, 14 Sep 2021 10:24:08 +0530 Message-Id: <20210914045410.3380946-2-ani@anisinha.ca> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210914045410.3380946-1-ani@anisinha.ca> References: <20210914045410.3380946-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: "Michael S. Tsirkin" , jusual@redhat.com, Ani Sinha , Igor Mammedov , philmd@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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 Tue Sep 14 04:54:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ani Sinha X-Patchwork-Id: 1527737 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=anisinha-ca.20150623.gappssmtp.com header.i=@anisinha-ca.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=ZKAvFTzV; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) 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 ozlabs.org (Postfix) with ESMTPS id 4H7rgd2Zzrz9sCD for ; Tue, 14 Sep 2021 14:57:33 +1000 (AEST) Received: from localhost ([::1]:52902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQ0Vf-0004PF-3P for incoming@patchwork.ozlabs.org; Tue, 14 Sep 2021 00:57:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37384) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ0Sr-0000i3-Ui for qemu-devel@nongnu.org; Tue, 14 Sep 2021 00:54:37 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]:34416) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQ0Sp-0006dG-OW for qemu-devel@nongnu.org; Tue, 14 Sep 2021 00:54:37 -0400 Received: by mail-pf1-x42a.google.com with SMTP id g14so11014798pfm.1 for ; Mon, 13 Sep 2021 21:54:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=anisinha-ca.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=e6VbdlsttjIaO8LyvNx8lh2Zo+EJzWxGGdnLBJypLb4=; b=ZKAvFTzVsmXIlWRI8ZwFBL9+ADapLdwKq/K+iV1HtkMw8AsoWvHngcUSwIHpKkqjp+ wGBfumn0CkOH2BevjchvC12Z4TH5Rux5WNxHL3is+Kf/vpdjajsbUWvyItV9EnuMUmMN QloZftOTQtEWpWwwHGqldtQ7EXfNImhSEKRDdgwLYcZx5ScMPdEErwI35gii/CWP0bcA Wi3lPiSma7bjVu8V2Ruj0/Idt8xQMTX3EY+luDCXvkdvJWTx+gzKsk1YW6hsIXve11Vw 3Ew2XwCKC69cBVS2w7B1xqzhKkghpNdiTTQA6MEUo78wxbJO64wAv7TTQceI65zMUydr fyDg== 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=e6VbdlsttjIaO8LyvNx8lh2Zo+EJzWxGGdnLBJypLb4=; b=EDI5E8YN5jYWpJ1CPn9vKUu3wDfH97nTj8xqmp+hnzQ+pRqxASkVBOL0wPUbpq6FuR lu16L1qFlDWXq5K14uKXaNBrXKs5Ipu546CNf8Zd8G5dm361RTJsYA7jzHB8BhuIkVkw EtyGEx0PuvJ/cdOSRMpejgJdKn8S+6qufjmRdujLAm0E8XqiaWofGeEmCf2vtHYMjBBV BPcmPe4NZ598z3+WV5uWHzC4thfpW8R3V7JKuwPEmtUAvYey75tmNVL/C1DwZICf9xXK xPMlyCWHM5v5ARQkG3bUKSa8WkOpIM/7WC31zBubMJhcNgA+4VYoBcrF3qUydhylqogw PLeQ== X-Gm-Message-State: AOAM533J3nSVcYKYnEGc/bNPQpbuoUkOjRuX6gNXzwRYKR414sfY1e95 5Ec9w8SyEwKxNgdIXuwrTWfeHQVQb8NKqQ== X-Google-Smtp-Source: ABdhPJyX71xAmQVsp9TZoifBbZP6QwqLkTpkNjfNRhthbGH5foFgkwtAOZGTScqQAg52SGXirEfzPQ== X-Received: by 2002:a63:5c63:: with SMTP id n35mr14083488pgm.311.1631595274172; Mon, 13 Sep 2021 21:54:34 -0700 (PDT) Received: from anisinha-lenovo.ba.nuagenetworks.net ([203.163.239.215]) by smtp.googlemail.com with ESMTPSA id u24sm9262522pfm.27.2021.09.13.21.54.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 21:54:33 -0700 (PDT) From: Ani Sinha To: qemu-devel@nongnu.org Subject: [PATCH 2/3] hw/i386/acpi: fix conflicting IO address range for acpi pci hotplug in q35 Date: Tue, 14 Sep 2021 10:24:09 +0530 Message-Id: <20210914045410.3380946-3-ani@anisinha.ca> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210914045410.3380946-1-ani@anisinha.ca> References: <20210914045410.3380946-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=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: "Michael S. Tsirkin" , jusual@redhat.com, Ani Sinha , Igor Mammedov , philmd@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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 accomodate 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 accomodate 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 Tue Sep 14 04:54:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ani Sinha X-Patchwork-Id: 1527736 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=anisinha-ca.20150623.gappssmtp.com header.i=@anisinha-ca.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=uLZeYHiG; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) 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 ozlabs.org (Postfix) with ESMTPS id 4H7rgZ6WRKz9sCD for ; Tue, 14 Sep 2021 14:57:30 +1000 (AEST) Received: from localhost ([::1]:52628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQ0Vc-0004E5-MF for incoming@patchwork.ozlabs.org; Tue, 14 Sep 2021 00:57:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ0Sw-0000uD-Mo for qemu-devel@nongnu.org; Tue, 14 Sep 2021 00:54:42 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]:41645) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQ0St-0006gB-0z for qemu-devel@nongnu.org; Tue, 14 Sep 2021 00:54:42 -0400 Received: by mail-pl1-x636.google.com with SMTP id v2so3447024plp.8 for ; Mon, 13 Sep 2021 21:54:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=anisinha-ca.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3WaRS1m2WqhVjPlU6yS10/4QrF9NPERLHlPcVVLCzXo=; b=uLZeYHiGX7JeRSzzgBJLGyJha+xV3t53qo8ME777RqyhhrPqwngHWsdo2mEGymfAoZ bAGLeRVBCnHUgZipvBCF83ztA4VHFIxllEtmh3FFzN1gXPfu33GGLYg6fw1uWr8xlMLr lXxNNTU8t0X6vv63K6/8Qjspzk0Qo51zUuE5X6q8H+DE7xgwOCMNPoJKI9wS8ilYjfpN iSCQbBWqrJno1V6uqq6MzSt7o2i+nYowgYRfq0J9p2rbtpmMgNA2Tzjl6GkVaWSrcrZw t3kSuoJ7mW43P9xlvY5bJWCglVzJYDj4tuk4MawBBrxD9eWNooSaGczSXYBKJvliBf89 YH1Q== 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=3WaRS1m2WqhVjPlU6yS10/4QrF9NPERLHlPcVVLCzXo=; b=2ICXpI7g8K5EZ3M8lC+kiaUOuX2SdHFSYwZWCnDWp2JT0fLCWKwrIQgLtk6/2FBy6/ 9Do02jKZevLsfUAnX1u/yYsuQ9U33KQCER7lXrHC7/Ba7rXFa/ztFJWCLP4X3Val/2Ue hYKBUyrfDreA7WVd8NAxm9ZN3nijjNCTRMhkmyHPG/oH1hW43UV9r7KMvgXkYqONPv0A sogip1Aw1RxS2xN+obPJZakzWudQlqj/LqMuaGaaHHkv94iH/i8bxkuTU0Ab0aSFhejO r54wAxU7k7vCTSURX8nGhDD+ZOIExHXWLpR2ptNpEpTjFtsM14EFwcWsZ+MDROFoJ8GW wDdw== X-Gm-Message-State: AOAM533+OLPX8Fe1pykVwlzaa0XMVv46cp2niYiMN6+pHoPKBTZiRgnh DbXUXLfERJs3TArB7KbM4/C6o9mA8YB4mA== X-Google-Smtp-Source: ABdhPJwwkVv/Ndyo5fPPvq2QapvbVyFSMBmm7BkGpd2A9bB5XLPb4i925sgmsu7eGixRk9Q+mhGMXw== X-Received: by 2002:a17:90a:5583:: with SMTP id c3mr3317041pji.133.1631595277465; Mon, 13 Sep 2021 21:54:37 -0700 (PDT) Received: from anisinha-lenovo.ba.nuagenetworks.net ([203.163.239.215]) by smtp.googlemail.com with ESMTPSA id u24sm9262522pfm.27.2021.09.13.21.54.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 21:54:37 -0700 (PDT) From: Ani Sinha To: qemu-devel@nongnu.org Subject: [PATCH 3/3] bios-tables-test: Update ACPI DSDT table golden blobs for q35 Date: Tue, 14 Sep 2021 10:24:10 +0530 Message-Id: <20210914045410.3380946-4-ani@anisinha.ca> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210914045410.3380946-1-ani@anisinha.ca> References: <20210914045410.3380946-1-ani@anisinha.ca> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::636; envelope-from=ani@anisinha.ca; helo=mail-pl1-x636.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: "Michael S. Tsirkin" , jusual@redhat.com, Ani Sinha , Igor Mammedov , philmd@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We have modified the IO address range for ACPI pci hotplug in q35. See change: 36f98d0d4f ("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