From patchwork Tue Feb 16 01:04:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 12089279 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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 21884C433DB for ; Tue, 16 Feb 2021 01:08:16 +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 90B0964DDA for ; Tue, 16 Feb 2021 01:08:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 90B0964DDA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBoqc-0003Ul-6V for qemu-devel@archiver.kernel.org; Mon, 15 Feb 2021 20:08:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34042) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBopH-0001uB-HZ for qemu-devel@nongnu.org; Mon, 15 Feb 2021 20:06:51 -0500 Received: from mga07.intel.com ([134.134.136.100]:13610) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBopF-0004gD-6j for qemu-devel@nongnu.org; Mon, 15 Feb 2021 20:06:51 -0500 IronPort-SDR: y6pTCZN1jbHDAI9Yd+8UGWLG/CB1xLwj3pfR6O6XzMmJT/c6+TrmbbT1VnUa/4pehFqq5CuVR/ vtJcnEZB8ulw== X-IronPort-AV: E=McAfee;i="6000,8403,9896"; a="246849234" X-IronPort-AV: E=Sophos;i="5.81,182,1610438400"; d="scan'208";a="246849234" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2021 17:06:43 -0800 IronPort-SDR: gt7zEGVogzx3oVs8AdZL9B/q9rgSF4Hm8Ah54GonVRy9RqoSd9u0kMAEexHeKlOjTx8vfArbAO VO//kx8f8V0g== X-IronPort-AV: E=Sophos;i="5.81,182,1610438400"; d="scan'208";a="591695474" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2021 17:06:42 -0800 From: isaku.yamahata@gmail.com To: qemu-devel@nongnu.org, imammedo@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com Subject: [PATCH v4 01/10] checkpatch: don't emit warning on newly created acpi data files Date: Mon, 15 Feb 2021 17:04:06 -0800 Message-Id: <6b90a62af91fb54e2db207490f3a6948bfe691ee.1613436967.git.isaku.yamahata@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Received-SPF: pass client-ip=134.134.136.100; envelope-from=isaku.yamahata@intel.com; helo=mga07.intel.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NML_ADSP_CUSTOM_MED=0.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: isaku.yamahata@intel.com, isaku.yamahata@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Isaku Yamahata Newly created acpi data files(tests/data/acpi/) cause false positive warning. If file names are acpi expected file, don't emit warning. Fixes: e625ba2a41 ("checkpatch: fix acpi check with multiple file name") Signed-off-by: Isaku Yamahata --- scripts/checkpatch.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index e47ad878d8..40c9cc7def 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1530,7 +1530,9 @@ sub process { ($line =~ /^(?:new|deleted) file mode\s*\d+\s*$/ || $line =~ /^rename (?:from|to) [\w\/\.\-]+\s*$/ || ($line =~ /\{\s*([\w\/\.\-]*)\s*\=\>\s*([\w\/\.\-]*)\s*\}/ && - (defined($1) || defined($2))))) { + (defined($1) || defined($2)))) && + !(($realfile ne '') && + ($realfile eq $acpi_testexpected))) { $reported_maintainer_file = 1; WARN("added, moved or deleted file(s), does MAINTAINERS need updating?\n" . $herecurr); } From patchwork Tue Feb 16 01:04:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 12089291 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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 EB511C433E0 for ; Tue, 16 Feb 2021 01:10:28 +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 805F864DDA for ; Tue, 16 Feb 2021 01:10:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 805F864DDA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBosl-00075e-Dl for qemu-devel@archiver.kernel.org; Mon, 15 Feb 2021 20:10:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34070) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBopJ-0001ui-Ie for qemu-devel@nongnu.org; Mon, 15 Feb 2021 20:06:57 -0500 Received: from mga07.intel.com ([134.134.136.100]:13610) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBopH-0004gD-Vd for qemu-devel@nongnu.org; Mon, 15 Feb 2021 20:06:53 -0500 IronPort-SDR: GL092iyNz/R1PAXj7Nfupox9KBPX18Ns9e1sLRRw47bQO3v23Ze0/EneyCajDcY4FyJbmzUykI llCTlcW5qiQQ== X-IronPort-AV: E=McAfee;i="6000,8403,9896"; a="246849235" X-IronPort-AV: E=Sophos;i="5.81,182,1610438400"; d="scan'208";a="246849235" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2021 17:06:43 -0800 IronPort-SDR: PzRwath51thamdFF9+gO1KccGsY9D0o3pqhfaIykYIfiw0607bhmFaGRFeEb9WGSsg44Wgw12u KiK6PL2JUX5A== X-IronPort-AV: E=Sophos;i="5.81,182,1610438400"; d="scan'208";a="591695477" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2021 17:06:43 -0800 From: isaku.yamahata@gmail.com To: qemu-devel@nongnu.org, imammedo@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com Subject: [PATCH v4 02/10] qtest: update tests/qtest/bios-tables-test-allowed-diff.h Date: Mon, 15 Feb 2021 17:04:07 -0800 Message-Id: <851f03fe8308aaf4e9c571f4ab2e2b987f1aadb7.1613436967.git.isaku.yamahata@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Received-SPF: pass client-ip=134.134.136.100; envelope-from=isaku.yamahata@intel.com; helo=mga07.intel.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NML_ADSP_CUSTOM_MED=0.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: isaku.yamahata@intel.com, isaku.yamahata@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Isaku Yamahata The following tests will modify acpi tables. prepare qtests to allow acpi table change. add new tables for new tests. - tests/data/acpi/pc/DSDT.nohpet - tests/data/acpi/pc/FACP.nosmm - tests/data/acpi/q35/DSDT.nohpet - tests/data/acpi/q35/FACP.nosmm Acked-by: Igor Mammedov Signed-off-by: Isaku Yamahata --- tests/data/acpi/pc/DSDT.nohpet | 0 tests/data/acpi/pc/FACP.nosmm | 0 tests/data/acpi/q35/DSDT.nohpet | 0 tests/data/acpi/q35/FACP.nosmm | 0 tests/qtest/bios-tables-test-allowed-diff.h | 14 ++++++++++++++ 5 files changed, 14 insertions(+) create mode 100644 tests/data/acpi/pc/DSDT.nohpet create mode 100644 tests/data/acpi/pc/FACP.nosmm create mode 100644 tests/data/acpi/q35/DSDT.nohpet create mode 100644 tests/data/acpi/q35/FACP.nosmm diff --git a/tests/data/acpi/pc/DSDT.nohpet b/tests/data/acpi/pc/DSDT.nohpet new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/pc/FACP.nosmm b/tests/data/acpi/pc/FACP.nosmm new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/q35/DSDT.nohpet b/tests/data/acpi/q35/DSDT.nohpet new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/q35/FACP.nosmm b/tests/data/acpi/q35/FACP.nosmm 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..95592459c5 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,15 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/pc/FACP.nosmm", +"tests/data/acpi/pc/DSDT.nohpet", +"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/FACP.nosmm", +"tests/data/acpi/q35/DSDT.nohpet", +"tests/data/acpi/q35/DSDT.dimmpxm", +"tests/data/acpi/q35/DSDT.acpihmat", From patchwork Tue Feb 16 01:04:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 12089311 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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 99914C433DB for ; Tue, 16 Feb 2021 01:16:04 +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 EC1BF64DBA for ; Tue, 16 Feb 2021 01:16:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EC1BF64DBA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:39414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBoyA-0002s4-T7 for qemu-devel@archiver.kernel.org; Mon, 15 Feb 2021 20:16:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBopS-0001xI-08 for qemu-devel@nongnu.org; Mon, 15 Feb 2021 20:07:04 -0500 Received: from mga07.intel.com ([134.134.136.100]:13624) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBopQ-0004kI-62 for qemu-devel@nongnu.org; Mon, 15 Feb 2021 20:07:01 -0500 IronPort-SDR: UDICC/reJ26878yK/50EjsSK7SoRM/uuPzB/IYzMn3Dy00MVYKZBMjiGh9UI+ixzksV/PvBtRN LOkdRe3ivZuw== X-IronPort-AV: E=McAfee;i="6000,8403,9896"; a="246849236" X-IronPort-AV: E=Sophos;i="5.81,182,1610438400"; d="scan'208";a="246849236" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2021 17:06:43 -0800 IronPort-SDR: Be+FgN3/n+jTaaZX9+fnTE6kDBd06SVUfrkxIbs4+8FNB5huhfEAtHN0UrA1C5gMDHrC2BYozA nAqJb+DnE6hg== X-IronPort-AV: E=Sophos;i="5.81,182,1610438400"; d="scan'208";a="591695481" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2021 17:06:43 -0800 From: isaku.yamahata@gmail.com To: qemu-devel@nongnu.org, imammedo@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com Subject: [PATCH v4 03/10] ich9, piix4: add properoty, smm-compat, to keep compatibility of SMM Date: Mon, 15 Feb 2021 17:04:08 -0800 Message-Id: <0868535e8cc04534e2f2f95fbaca50afa18d0a0a.1613436967.git.isaku.yamahata@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Received-SPF: pass client-ip=134.134.136.100; envelope-from=isaku.yamahata@intel.com; helo=mga07.intel.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NML_ADSP_CUSTOM_MED=0.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: isaku.yamahata@intel.com, isaku.yamahata@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Isaku Yamahata The following patch will introduce incompatible behavior of SMM. Introduce a property to keep the old behavior for compatibility. To enable smm compat, use "-global ICH9-LPC.smm-compat=on" or "-global PIIX4.smm-compat=on" Suggested-by: Igor Mammedov Signed-off-by: Isaku Yamahata --- hw/acpi/piix4.c | 2 ++ hw/core/machine.c | 5 ++++- hw/isa/lpc_ich9.c | 1 + include/hw/acpi/ich9.h | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 669be5bbf6..30dd9b2309 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -74,6 +74,7 @@ struct PIIX4PMState { qemu_irq irq; qemu_irq smi_irq; int smm_enabled; + bool smm_compat; Notifier machine_ready; Notifier powerdown_notifier; @@ -642,6 +643,7 @@ static Property piix4_pm_properties[] = { use_acpi_root_pci_hotplug, true), DEFINE_PROP_BOOL("memory-hotplug-support", PIIX4PMState, acpi_memory_hotplug.is_enabled, true), + DEFINE_PROP_BOOL("smm-compat", PIIX4PMState, smm_compat, false), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/core/machine.c b/hw/core/machine.c index de3b8f1b31..870c9201df 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -33,7 +33,10 @@ #include "migration/global_state.h" #include "migration/vmstate.h" -GlobalProperty hw_compat_5_2[] = {}; +GlobalProperty hw_compat_5_2[] = { + { "ICH9-LPC", "smm-compat", "on"}, + { "PIIX4_PM", "smm-compat", "on"}, +}; const size_t hw_compat_5_2_len = G_N_ELEMENTS(hw_compat_5_2); GlobalProperty hw_compat_5_1[] = { diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index d3145bf014..3963b73520 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -775,6 +775,7 @@ static const VMStateDescription vmstate_ich9_lpc = { static Property ich9_lpc_properties[] = { DEFINE_PROP_BOOL("noreboot", ICH9LPCState, pin_strap.spkr_hi, true), + DEFINE_PROP_BOOL("smm-compat", ICH9LPCState, pm.smm_compat, false), DEFINE_PROP_BIT64("x-smi-broadcast", ICH9LPCState, smi_host_features, ICH9_LPC_SMI_F_BROADCAST_BIT, true), DEFINE_PROP_BIT64("x-smi-cpu-hotplug", ICH9LPCState, smi_host_features, diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h index 54571c77e0..df519e40b5 100644 --- a/include/hw/acpi/ich9.h +++ b/include/hw/acpi/ich9.h @@ -59,6 +59,7 @@ typedef struct ICH9LPCPMRegs { uint8_t disable_s4; uint8_t s4_val; uint8_t smm_enabled; + bool smm_compat; bool enable_tco; TCOIORegs tco_regs; } ICH9LPCPMRegs; From patchwork Tue Feb 16 01:04:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 12089309 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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 451B4C433DB for ; Tue, 16 Feb 2021 01:14:18 +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 A2DF664DBA for ; Tue, 16 Feb 2021 01:14:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A2DF664DBA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:37260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBowS-0001sH-Hm for qemu-devel@archiver.kernel.org; Mon, 15 Feb 2021 20:14:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBopM-0001uz-8p for qemu-devel@nongnu.org; Mon, 15 Feb 2021 20:06:58 -0500 Received: from mga07.intel.com ([134.134.136.100]:13610) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBopJ-0004gD-Vp for qemu-devel@nongnu.org; Mon, 15 Feb 2021 20:06:55 -0500 IronPort-SDR: bAhO1JtJRbDDd2NH5xYX82j0t9eUGj5WTO5m2yxPoCLyWJhH0m862e89U9IU25pBLmVigQL6sC zNzmZKY3Nu/w== X-IronPort-AV: E=McAfee;i="6000,8403,9896"; a="246849237" X-IronPort-AV: E=Sophos;i="5.81,182,1610438400"; d="scan'208";a="246849237" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2021 17:06:43 -0800 IronPort-SDR: JdMrqQlNN9AMHNEV+Xy3OMIuwO/Z7LEN8hzn0O+cXTxjrqceoFDg2t5vJ8kUkgsC/cT4Mhquh9 vurpong7Oj/w== X-IronPort-AV: E=Sophos;i="5.81,182,1610438400"; d="scan'208";a="591695484" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2021 17:06:43 -0800 From: isaku.yamahata@gmail.com To: qemu-devel@nongnu.org, imammedo@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com Subject: [PATCH v4 04/10] acpi/core: always set SCI_EN when SMM isn't supported Date: Mon, 15 Feb 2021 17:04:09 -0800 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Received-SPF: pass client-ip=134.134.136.100; envelope-from=isaku.yamahata@intel.com; helo=mga07.intel.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NML_ADSP_CUSTOM_MED=0.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: isaku.yamahata@intel.com, isaku.yamahata@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Isaku Yamahata If SMM is not supported, ACPI fixed hardware doesn't support legacy-mode. ACPI-only platform. Where SCI_EN in PM1_CNT register is always set. The bit tells OS legacy mode(SCI_EN cleared) or ACPI mode(SCI_EN set). With the next patch (setting fadt.smi_cmd = 0 when smm isn't enabled), guest Linux tries to switch to ACPI mode, finds smi_cmd = 0, and then fails to initialize acpi subsystem. This patch proactively fixes it. This patch changes guest ABI. To keep compatibility, use "x-smm-compat-5" introduced by earlier patch. If the property is true, disable new behavior. ACPI spec 4.8.10.1 PM1 Event Grouping PM1 Eanble Registers > For ACPI-only platforms (where SCI_EN is always set) Signed-off-by: Isaku Yamahata Reviewed-by: Igor Mammedov --- hw/acpi/core.c | 11 ++++++++++- hw/acpi/ich9.c | 2 +- hw/acpi/piix4.c | 3 ++- hw/isa/vt82c686.c | 2 +- include/hw/acpi/acpi.h | 4 +++- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/hw/acpi/core.c b/hw/acpi/core.c index 7170bff657..1e004d0078 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -579,6 +579,10 @@ void acpi_pm1_cnt_update(ACPIREGS *ar, bool sci_enable, bool sci_disable) { /* ACPI specs 3.0, 4.7.2.5 */ + if (ar->pm1.cnt.acpi_only) { + return; + } + if (sci_enable) { ar->pm1.cnt.cnt |= ACPI_BITMASK_SCI_ENABLE; } else if (sci_disable) { @@ -608,11 +612,13 @@ static const MemoryRegionOps acpi_pm_cnt_ops = { }; void acpi_pm1_cnt_init(ACPIREGS *ar, MemoryRegion *parent, - bool disable_s3, bool disable_s4, uint8_t s4_val) + bool disable_s3, bool disable_s4, uint8_t s4_val, + bool acpi_only) { FWCfgState *fw_cfg; ar->pm1.cnt.s4_val = s4_val; + ar->pm1.cnt.acpi_only = acpi_only; ar->wakeup.notify = acpi_notify_wakeup; qemu_register_wakeup_notifier(&ar->wakeup); @@ -638,6 +644,9 @@ void acpi_pm1_cnt_init(ACPIREGS *ar, MemoryRegion *parent, void acpi_pm1_cnt_reset(ACPIREGS *ar) { ar->pm1.cnt.cnt = 0; + if (ar->pm1.cnt.acpi_only) { + ar->pm1.cnt.cnt |= ACPI_BITMASK_SCI_ENABLE; + } } /* ACPI GPE */ diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index 5ff4e01c36..853447cf9d 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -282,7 +282,7 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, acpi_pm_tmr_init(&pm->acpi_regs, ich9_pm_update_sci_fn, &pm->io); acpi_pm1_evt_init(&pm->acpi_regs, ich9_pm_update_sci_fn, &pm->io); acpi_pm1_cnt_init(&pm->acpi_regs, &pm->io, pm->disable_s3, pm->disable_s4, - pm->s4_val); + pm->s4_val, !pm->smm_compat && !smm_enabled); acpi_gpe_init(&pm->acpi_regs, ICH9_PMIO_GPE0_LEN); memory_region_init_io(&pm->io_gpe, OBJECT(lpc_pci), &ich9_gpe_ops, pm, diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 30dd9b2309..1efc0ded9f 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -497,7 +497,8 @@ static void piix4_pm_realize(PCIDevice *dev, Error **errp) acpi_pm_tmr_init(&s->ar, pm_tmr_timer, &s->io); acpi_pm1_evt_init(&s->ar, pm_tmr_timer, &s->io); - acpi_pm1_cnt_init(&s->ar, &s->io, s->disable_s3, s->disable_s4, s->s4_val); + acpi_pm1_cnt_init(&s->ar, &s->io, s->disable_s3, s->disable_s4, s->s4_val, + !s->smm_compat && !s->smm_enabled); acpi_gpe_init(&s->ar, GPE_LEN); s->powerdown_notifier.notify = piix4_pm_powerdown_req; diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index a6f5a0843d..071b64b497 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -240,7 +240,7 @@ static void vt82c686b_pm_realize(PCIDevice *dev, Error **errp) acpi_pm_tmr_init(&s->ar, pm_tmr_timer, &s->io); acpi_pm1_evt_init(&s->ar, pm_tmr_timer, &s->io); - acpi_pm1_cnt_init(&s->ar, &s->io, false, false, 2); + acpi_pm1_cnt_init(&s->ar, &s->io, false, false, 2, false); } static Property via_pm_properties[] = { diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h index 22b0b65bb2..9e8a76f2e2 100644 --- a/include/hw/acpi/acpi.h +++ b/include/hw/acpi/acpi.h @@ -128,6 +128,7 @@ struct ACPIPM1CNT { MemoryRegion io; uint16_t cnt; uint8_t s4_val; + bool acpi_only; }; struct ACPIGPE { @@ -163,7 +164,8 @@ void acpi_pm1_evt_init(ACPIREGS *ar, acpi_update_sci_fn update_sci, /* PM1a_CNT: piix and ich9 don't implement PM1b CNT. */ void acpi_pm1_cnt_init(ACPIREGS *ar, MemoryRegion *parent, - bool disable_s3, bool disable_s4, uint8_t s4_val); + bool disable_s3, bool disable_s4, uint8_t s4_val, + bool acpi_only); void acpi_pm1_cnt_update(ACPIREGS *ar, bool sci_enable, bool sci_disable); void acpi_pm1_cnt_reset(ACPIREGS *ar); From patchwork Tue Feb 16 01:04:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 12089283 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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 DDD7DC433E6 for ; Tue, 16 Feb 2021 01:08:17 +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 3C83864DBA for ; Tue, 16 Feb 2021 01:08:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3C83864DBA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBoqe-0003aL-1R for qemu-devel@archiver.kernel.org; Mon, 15 Feb 2021 20:08:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBopP-0001vB-VD for qemu-devel@nongnu.org; Mon, 15 Feb 2021 20:07:01 -0500 Received: from mga07.intel.com ([134.134.136.100]:13620) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBopO-0004jm-E2 for qemu-devel@nongnu.org; Mon, 15 Feb 2021 20:06:59 -0500 IronPort-SDR: nZ+0Q/YWEBGKUKE8HDw3Cw/XqzKShs0xCldEwuYEwgcCuQzGsnFfcuyyNQFsS8qn2Ci1Dwt/ve CFtkqAttPhug== X-IronPort-AV: E=McAfee;i="6000,8403,9896"; a="246849238" X-IronPort-AV: E=Sophos;i="5.81,182,1610438400"; d="scan'208";a="246849238" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2021 17:06:43 -0800 IronPort-SDR: +q4yynGrRxpOxEp/f4Xz1xNtqg8H2f9PRSW3ozemc5qPcs3FrhqXVu7cNV9ioDtwp2KmTIgbA3 6QCEwXpbZkqQ== X-IronPort-AV: E=Sophos;i="5.81,182,1610438400"; d="scan'208";a="591695489" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2021 17:06:43 -0800 From: isaku.yamahata@gmail.com To: qemu-devel@nongnu.org, imammedo@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com Subject: [PATCH v4 05/10] acpi: set fadt.smi_cmd to zero when SMM is not supported Date: Mon, 15 Feb 2021 17:04:10 -0800 Message-Id: <16074d361886c5c9846e92fc84d07883d8b28b1f.1613436967.git.isaku.yamahata@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Received-SPF: pass client-ip=134.134.136.100; envelope-from=isaku.yamahata@intel.com; helo=mga07.intel.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NML_ADSP_CUSTOM_MED=0.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: isaku.yamahata@intel.com, isaku.yamahata@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Isaku Yamahata From table 5.9 SMI_CMD of ACPI spec > This field is reserved and must be zero on system > that does not support System Management mode. When smm is not enabled, set it to zero to comform to the spec. When -machine smm=off is passed, the change to FACP is as follows. @@ -1,46 +1,46 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20180105 (64-bit version) * Copyright (c) 2000 - 2018 Intel Corporation * - * Disassembly of tests/data/acpi/q35/FACP, Fri Feb 5 16:57:04 2021 + * Disassembly of /tmp/aml-1OQYX0, Fri Feb 5 16:57:04 2021 * * ACPI Data Table [FACP] * * Format: [HexOffset DecimalOffset ByteLength] FieldName : FieldValue */ [000h 0000 4] Signature : "FACP" [Fixed ACPI Description Table (FADT)] [004h 0004 4] Table Length : 000000F4 [008h 0008 1] Revision : 03 -[009h 0009 1] Checksum : 1F +[009h 0009 1] Checksum : D6 [00Ah 0010 6] Oem ID : "BOCHS " [010h 0016 8] Oem Table ID : "BXPCFACP" [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001 [024h 0036 4] FACS Address : 00000000 [028h 0040 4] DSDT Address : 00000000 [02Ch 0044 1] Model : 01 [02Dh 0045 1] PM Profile : 00 [Unspecified] [02Eh 0046 2] SCI Interrupt : 0009 -[030h 0048 4] SMI Command Port : 000000B2 -[034h 0052 1] ACPI Enable Value : 02 -[035h 0053 1] ACPI Disable Value : 03 +[030h 0048 4] SMI Command Port : 00000000 +[034h 0052 1] ACPI Enable Value : 00 +[035h 0053 1] ACPI Disable Value : 00 [036h 0054 1] S4BIOS Command : 00 [037h 0055 1] P-State Control : 00 [038h 0056 4] PM1A Event Block Address : 00000600 [03Ch 0060 4] PM1B Event Block Address : 00000000 [040h 0064 4] PM1A Control Block Address : 00000604 [044h 0068 4] PM1B Control Block Address : 00000000 [048h 0072 4] PM2 Control Block Address : 00000000 [04Ch 0076 4] PM Timer Block Address : 00000608 [050h 0080 4] GPE0 Block Address : 00000620 [054h 0084 4] GPE1 Block Address : 00000000 [058h 0088 1] PM1 Event Block Length : 04 [059h 0089 1] PM1 Control Block Length : 02 [05Ah 0090 1] PM2 Control Block Length : 00 [05Bh 0091 1] PM Timer Block Length : 04 [05Ch 0092 1] GPE0 Block Length : 10 [05Dh 0093 1] GPE1 Block Length : 00 Reviewed-by: Igor Mammedov Signed-off-by: Isaku Yamahata --- hw/i386/acpi-build.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index f56d699c7f..e3386ae674 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -139,6 +139,14 @@ const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio = { static void init_common_fadt_data(MachineState *ms, Object *o, AcpiFadtData *data) { + X86MachineState *x86ms = X86_MACHINE(ms); + /* + * "ICH9-LPC" or "PIIX4_PM" has "smm-compat" property to keep the old + * behavior for compatibility irrelevant to smm_enabled, which doesn't + * comforms to ACPI spec. + */ + bool smm_enabled = object_property_get_bool(o, "smm-compat", NULL) ? + true : x86_machine_is_smm_enabled(x86ms); uint32_t io = object_property_get_uint(o, ACPI_PM_PROP_PM_IO_BASE, NULL); AmlAddressSpace as = AML_AS_SYSTEM_IO; AcpiFadtData fadt = { @@ -159,12 +167,16 @@ static void init_common_fadt_data(MachineState *ms, Object *o, .rtc_century = RTC_CENTURY, .plvl2_lat = 0xfff /* C2 state not supported */, .plvl3_lat = 0xfff /* C3 state not supported */, - .smi_cmd = ACPI_PORT_SMI_CMD, + .smi_cmd = smm_enabled ? ACPI_PORT_SMI_CMD : 0, .sci_int = object_property_get_uint(o, ACPI_PM_PROP_SCI_INT, NULL), .acpi_enable_cmd = - object_property_get_uint(o, ACPI_PM_PROP_ACPI_ENABLE_CMD, NULL), + smm_enabled ? + object_property_get_uint(o, ACPI_PM_PROP_ACPI_ENABLE_CMD, NULL) : + 0, .acpi_disable_cmd = - object_property_get_uint(o, ACPI_PM_PROP_ACPI_DISABLE_CMD, NULL), + smm_enabled ? + object_property_get_uint(o, ACPI_PM_PROP_ACPI_DISABLE_CMD, NULL) : + 0, .pm1a_evt = { .space_id = as, .bit_width = 4 * 8, .address = io }, .pm1a_cnt = { .space_id = as, .bit_width = 2 * 8, .address = io + 0x04 }, From patchwork Tue Feb 16 01:04:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 12089293 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=-10.9 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, URIBL_BLOCKED,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 4054EC433DB for ; Tue, 16 Feb 2021 01:10:29 +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 CCDA964DBA for ; Tue, 16 Feb 2021 01:10:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CCDA964DBA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57886 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBosl-000759-Pk for qemu-devel@archiver.kernel.org; Mon, 15 Feb 2021 20:10:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34128) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBopP-0001vA-Pc for qemu-devel@nongnu.org; Mon, 15 Feb 2021 20:07:01 -0500 Received: from mga07.intel.com ([134.134.136.100]:13624) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBopM-0004kI-BZ for qemu-devel@nongnu.org; Mon, 15 Feb 2021 20:06:59 -0500 IronPort-SDR: JK1DB5+qKgM6+0wwdbEXn7dY9TNW27i6SddiuAFpROyCt8H7S9TK1t+2VWVNXyU2/ME7oaCAwV N0skEe6PFzcw== X-IronPort-AV: E=McAfee;i="6000,8403,9896"; a="246849239" X-IronPort-AV: E=Sophos;i="5.81,182,1610438400"; d="scan'208";a="246849239" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2021 17:06:43 -0800 IronPort-SDR: Bvx499PYwpB6W013p/mPT8h8KEXazys9opF1FRix+oCxPEzJ34Mf3bXTq2op45OaoI/N2Vr5sY XR5MrXrr0WWA== X-IronPort-AV: E=Sophos;i="5.81,182,1610438400"; d="scan'208";a="591695493" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2021 17:06:43 -0800 From: isaku.yamahata@gmail.com To: qemu-devel@nongnu.org, imammedo@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com Subject: [PATCH v4 06/10] acpi: add test case for smm unsupported -machine smm=off Date: Mon, 15 Feb 2021 17:04:11 -0800 Message-Id: <78445b2a2c79fe6cb5ae3fd75e8dea43f0982e99.1613436967.git.isaku.yamahata@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Received-SPF: pass client-ip=134.134.136.100; envelope-from=isaku.yamahata@intel.com; helo=mga07.intel.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NML_ADSP_CUSTOM_MED=0.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: isaku.yamahata@intel.com, isaku.yamahata@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Isaku Yamahata Reviewed-by: Igor Mammedov Signed-off-by: Isaku Yamahata --- tests/qtest/bios-tables-test.c | 76 ++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 669202fc95..592c074ec7 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -957,6 +957,39 @@ static void test_acpi_piix4_tcg_memhp(void) free_test_data(&data); } +static void test_acpi_piix4_tcg_nosmm(void) +{ + test_data data; + + memset(&data, 0, sizeof(data)); + data.machine = MACHINE_PC; + data.variant = ".nosmm"; + test_acpi_one("-machine smm=off", &data); + free_test_data(&data); +} + +static void test_acpi_piix4_tcg_smm_compat(void) +{ + test_data data; + + memset(&data, 0, sizeof(data)); + data.machine = MACHINE_PC; + data.variant = ".smm-compat"; + test_acpi_one("-global PIIX4_PM.smm-compat=on", &data); + free_test_data(&data); +} + +static void test_acpi_piix4_tcg_smm_compat_nosmm(void) +{ + test_data data; + + memset(&data, 0, sizeof(data)); + data.machine = MACHINE_PC; + data.variant = ".smm-compat-nosmm"; + test_acpi_one("-global PIIX4_PM.smm-compat=on -machine smm=off", &data); + free_test_data(&data); +} + static void test_acpi_q35_tcg_numamem(void) { test_data data; @@ -969,6 +1002,39 @@ static void test_acpi_q35_tcg_numamem(void) free_test_data(&data); } +static void test_acpi_q35_tcg_nosmm(void) +{ + test_data data; + + memset(&data, 0, sizeof(data)); + data.machine = MACHINE_Q35; + data.variant = ".nosmm"; + test_acpi_one("-machine smm=off", &data); + free_test_data(&data); +} + +static void test_acpi_q35_tcg_smm_compat(void) +{ + test_data data; + + memset(&data, 0, sizeof(data)); + data.machine = MACHINE_Q35; + data.variant = ".smm-compat"; + test_acpi_one("-global ICH9-LPC.smm-compat=on", &data); + free_test_data(&data); +} + +static void test_acpi_q35_tcg_smm_compat_nosmm(void) +{ + test_data data; + + memset(&data, 0, sizeof(data)); + data.machine = MACHINE_Q35; + data.variant = ".smm-compat-nosmm"; + test_acpi_one("-global ICH9-LPC.smm-compat=on -machine smm=off", &data); + free_test_data(&data); +} + static void test_acpi_piix4_tcg_numamem(void) { test_data data; @@ -1325,6 +1391,16 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/q35/memhp", test_acpi_q35_tcg_memhp); qtest_add_func("acpi/piix4/numamem", test_acpi_piix4_tcg_numamem); qtest_add_func("acpi/q35/numamem", test_acpi_q35_tcg_numamem); + qtest_add_func("acpi/piix4/nosmm", test_acpi_piix4_tcg_nosmm); + qtest_add_func("acpi/piix4/smm-compat", + test_acpi_piix4_tcg_smm_compat); + qtest_add_func("acpi/piix4/smm-compat-nosmm", + test_acpi_piix4_tcg_smm_compat_nosmm); + qtest_add_func("acpi/q35/nosmm", test_acpi_q35_tcg_nosmm); + qtest_add_func("acpi/q35/smm-compat", + test_acpi_q35_tcg_smm_compat); + qtest_add_func("acpi/q35/smm-compat-nosmm", + test_acpi_q35_tcg_smm_compat_nosmm); qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_dimm_pxm); qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm); qtest_add_func("acpi/piix4/acpihmat", test_acpi_piix4_tcg_acpi_hmat); From patchwork Tue Feb 16 01:04:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 12089285 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=-18.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 EA833C433E9 for ; Tue, 16 Feb 2021 01:08:17 +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 827AC64DDA for ; Tue, 16 Feb 2021 01:08:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 827AC64DDA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49368 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBoqe-0003ch-GJ for qemu-devel@archiver.kernel.org; Mon, 15 Feb 2021 20:08:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBopM-0001v0-9D for qemu-devel@nongnu.org; Mon, 15 Feb 2021 20:06:59 -0500 Received: from mga07.intel.com ([134.134.136.100]:13620) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBopJ-0004jm-7J for qemu-devel@nongnu.org; Mon, 15 Feb 2021 20:06:54 -0500 IronPort-SDR: mvardJ+3Vt4xTo/0HRwJ7azRBI7PMlk4Hx+WX6qxTnrOoVe7ArJEYvXGn+ec8SDyPqPl/EHs/U brD5J16xXe+g== X-IronPort-AV: E=McAfee;i="6000,8403,9896"; a="246849240" X-IronPort-AV: E=Sophos;i="5.81,182,1610438400"; d="scan'208";a="246849240" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2021 17:06:44 -0800 IronPort-SDR: WzzymFXuoVSJwldtdIEk8a/S13A1mxUbdM6K1NvfFxJDKMpsQlUP4x0Ql0RcJSGqk1FUWsqHU4 0Cyhe4RWGCMQ== X-IronPort-AV: E=Sophos;i="5.81,182,1610438400"; d="scan'208";a="591695496" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2021 17:06:43 -0800 From: isaku.yamahata@gmail.com To: qemu-devel@nongnu.org, imammedo@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com Subject: [PATCH v4 07/10] hw/i386: declare ACPI mother board resource for MMCONFIG region Date: Mon, 15 Feb 2021 17:04:12 -0800 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Received-SPF: pass client-ip=134.134.136.100; envelope-from=isaku.yamahata@intel.com; helo=mga07.intel.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NML_ADSP_CUSTOM_MED=0.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: isaku.yamahata@intel.com, isaku.yamahata@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Isaku Yamahata Declare PNP0C01 device to reserve MMCONFIG region to conform to the spec better and play nice with guest BIOSes/OSes. According to PCI Firmware Specification[0], MMCONFIG region must be reserved by declaring a motherboard resource. It's optional to reserve the region in memory map by Int 15 E820h or EFIGetMemoryMap. Guest Linux checks if the MMCFG region is reserved by bios memory map or ACPI resource. If it's not reserved, Linux falls back to legacy PCI configuration access. TDVF [1] [2] doesn't reserve MMCONFIG the region in memory map. On the other hand OVMF reserves it in memory map without declaring a motherboard resource. With memory map reservation, linux guest uses MMCONFIG region. However it doesn't comply to PCI Firmware specification. [0] PCI Firmware specification Revision 3.2 4.1.2 MCFG Table Description table 4-2 NOTE 2 If the operating system does not natively comprehend reserving the MMCFG region, The MMCFG region must e reserved by firmware. ... For most systems, the mortheroard resource would appear at the root of the ACPI namespace (under \_SB)... The resource can optionally be returned in Int15 E820h or EFIGetMemoryMap as reserved memory but must always be reported through ACPI as a motherboard resource [1] TDX: Intel Trust Domain Extension https://software.intel.com/content/www/us/en/develop/articles/intel-trust-domain-extensions.html [2] TDX Virtual Firmware https://github.com/tianocore/edk2-staging/tree/TDVF The change to DSDT is as follows. @@ -68,32 +68,51 @@ If ((CDW3 != Local0)) { CDW1 |= 0x10 } CDW3 = Local0 } Else { CDW1 |= 0x04 } Return (Arg3) } } + + Device (DRAC) + { + Name (_HID, "PNP0C01" /* System Board */) // _HID: Hardware ID + Name (RBUF, ResourceTemplate () + { + DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, NonCacheable, ReadWrite, + 0x00000000, // Granularity + 0xB0000000, // Range Minimum + 0xB0000000, // Range Maximum + 0x00000000, // Translation Offset + 0x10000000, // Length + ,, , AddressRangeMemory, TypeStatic) + }) + Method (_CRS, 0, Serialized) // _CRS: Current Resource Settings + { + Return (RBUF) /* \_SB_.DRAC.RBUF */ + } + } } Scope (_SB) { Device (HPET) { Name (_HID, EisaId ("PNP0103") /* HPET System Timer */) // _HID: Hardware ID Name (_UID, Zero) // _UID: Unique ID OperationRegion (HPTM, SystemMemory, 0xFED00000, 0x0400) Field (HPTM, DWordAcc, Lock, Preserve) { VEND, 32, PRD, 32 } Method (_STA, 0, NotSerialized) // _STA: Status Signed-off-by: Isaku Yamahata --- hw/i386/acpi-build.c | 55 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index e3386ae674..30326f69b3 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1072,6 +1072,55 @@ static void build_q35_pci0_int(Aml *table) aml_append(table, sb_scope); } +static Aml *build_q35_dram_controller(AcpiMcfgInfo *mcfg) +{ + Aml *dev; + Aml *rbuf; + Aml *resource_template; + Aml *rbuf_name; + Aml *crs; + + /* DRAM controller */ + dev = aml_device("DRAC"); + aml_append(dev, aml_name_decl("_HID", aml_string("PNP0C01"))); + + resource_template = aml_resource_template(); + if (mcfg->base + mcfg->size - 1 >= (1ULL << 32)) { + aml_append(resource_template, + aml_qword_memory(AML_POS_DECODE, + AML_MIN_FIXED, + AML_MAX_FIXED, + AML_NON_CACHEABLE, + AML_READ_WRITE, + 0x0000000000000000, + mcfg->base, + mcfg->base, + 0x0000000000000000, + mcfg->size)); + } else { + aml_append(resource_template, + aml_dword_memory(AML_POS_DECODE, + AML_MIN_FIXED, + AML_MAX_FIXED, + AML_NON_CACHEABLE, + AML_READ_WRITE, + 0x0000000000000000, + mcfg->base, + mcfg->base, + 0x0000000000000000, + mcfg->size)); + } + rbuf = aml_name_decl("RBUF", resource_template); + aml_append(dev, rbuf); + + crs = aml_method("_CRS", 0, AML_SERIALIZED); + rbuf_name = aml_name("RBUF"); + aml_append(crs, aml_return(rbuf_name)); + aml_append(dev, crs); + + return dev; +} + static void build_q35_isa_bridge(Aml *table) { Aml *dev; @@ -1218,6 +1267,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(machine); X86MachineState *x86ms = X86_MACHINE(machine); AcpiMcfgInfo mcfg; + bool mcfg_valid = !!acpi_get_mcfg(&mcfg); uint32_t nr_mem = machine->ram_slots; int root_bus_limit = 0xFF; PCIBus *bus = NULL; @@ -1256,6 +1306,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, aml_append(dev, aml_name_decl("_UID", aml_int(0))); aml_append(dev, build_q35_osc_method()); aml_append(sb_scope, dev); + if (mcfg_valid) { + aml_append(sb_scope, build_q35_dram_controller(&mcfg)); + } if (pm->smi_on_cpuhp) { /* reserve SMI block resources, IO ports 0xB2, 0xB3 */ @@ -1386,7 +1439,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, * the PCI0._CRS. Add mmconfig to the set so it will be excluded * too. */ - if (acpi_get_mcfg(&mcfg)) { + if (mcfg_valid) { crs_range_insert(crs_range_set.mem_ranges, mcfg.base, mcfg.base + mcfg.size - 1); } From patchwork Tue Feb 16 01:04:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 12089281 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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 F095BC433E0 for ; Tue, 16 Feb 2021 01:08:16 +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 6EF8264DDA for ; Tue, 16 Feb 2021 01:08:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6EF8264DDA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBoqd-0003XW-D6 for qemu-devel@archiver.kernel.org; Mon, 15 Feb 2021 20:08:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBopO-0001v8-Hz for qemu-devel@nongnu.org; Mon, 15 Feb 2021 20:07:01 -0500 Received: from mga06.intel.com ([134.134.136.31]:34397) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBopK-0004h7-8P for qemu-devel@nongnu.org; Mon, 15 Feb 2021 20:06:57 -0500 IronPort-SDR: 7eXJVnpv1ei9oNO5Fr44lSwQhir1ozoYrKoNXGU6f4C/Bx3TGBGeqrHObOU4VpZEFCp7+bmAoD mDkMWyye0RXQ== X-IronPort-AV: E=McAfee;i="6000,8403,9896"; a="244264045" X-IronPort-AV: E=Sophos;i="5.81,182,1610438400"; d="scan'208";a="244264045" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2021 17:06:44 -0800 IronPort-SDR: 7iKf84HnHsuCpC/xFoD5Ofr6s+gfZoczi1TszA8w3hVCozdJTHd679Ss1GAZaIsuSMJgOlD1Nx bQU3ZpwY+Pew== X-IronPort-AV: E=Sophos;i="5.81,182,1610438400"; d="scan'208";a="591695499" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2021 17:06:43 -0800 From: isaku.yamahata@gmail.com To: qemu-devel@nongnu.org, imammedo@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com Subject: [PATCH v4 08/10] i386: acpi: Don't build HPET ACPI entry if HPET is disabled Date: Mon, 15 Feb 2021 17:04:13 -0800 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=134.134.136.31; envelope-from=isaku.yamahata@intel.com; helo=mga06.intel.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NML_ADSP_CUSTOM_MED=0.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: isaku.yamahata@intel.com, Sean Christopherson , isaku.yamahata@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Sean Christopherson Omit HPET AML if the HPET is disabled, QEMU is not emulating it and the guest may get confused by seeing HPET in the ACPI tables without a "physical" device present. The change of DSDT when -no-hpet is as follows. @@ -141,47 +141,6 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS " } } - Scope (_SB) - { - Device (HPET) - { - Name (_HID, EisaId ("PNP0103") /* HPET System Timer */) // _HID: Hardware ID - Name (_UID, Zero) // _UID: Unique ID - OperationRegion (HPTM, SystemMemory, 0xFED00000, 0x0400) - Field (HPTM, DWordAcc, Lock, Preserve) - { - VEND, 32, - PRD, 32 - } - - Method (_STA, 0, NotSerialized) // _STA: Status - { - Local0 = VEND /* \_SB_.HPET.VEND */ - Local1 = PRD /* \_SB_.HPET.PRD_ */ - Local0 >>= 0x10 - If (((Local0 == Zero) || (Local0 == 0xFFFF))) - { - Return (Zero) - } - - If (((Local1 == Zero) || (Local1 > 0x05F5E100))) - { - Return (Zero) - } - - Return (0x0F) - } - - Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings - { - Memory32Fixed (ReadOnly, - 0xFED00000, // Address Base - 0x00000400, // Address Length - ) - }) - } - } - Scope (_SB.PCI0) { Device (ISA) Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Igor Mammedov Signed-off-by: Sean Christopherson --- hw/i386/acpi-build.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 30326f69b3..aaff9a406d 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1290,7 +1290,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, aml_append(sb_scope, dev); aml_append(dsdt, sb_scope); - build_hpet_aml(dsdt); + if (misc->has_hpet) { + build_hpet_aml(dsdt); + } build_piix4_isa_bridge(dsdt); build_isa_devices_aml(dsdt); if (pm->pcihp_bridge_en || pm->pcihp_root_en) { @@ -1337,7 +1339,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, aml_append(dsdt, sb_scope); - build_hpet_aml(dsdt); + if (misc->has_hpet) { + build_hpet_aml(dsdt); + } build_q35_isa_bridge(dsdt); build_isa_devices_aml(dsdt); build_q35_pci0_int(dsdt); From patchwork Tue Feb 16 01:04:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 12089289 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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 47F12C433E6 for ; Tue, 16 Feb 2021 01:10:27 +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 D0A3064DDA for ; Tue, 16 Feb 2021 01:10:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D0A3064DDA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBosj-0006zN-Qa for qemu-devel@archiver.kernel.org; Mon, 15 Feb 2021 20:10:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34146) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBopQ-0001vG-V6 for qemu-devel@nongnu.org; Mon, 15 Feb 2021 20:07:01 -0500 Received: from mga07.intel.com ([134.134.136.100]:13610) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBopO-0004gD-EY for qemu-devel@nongnu.org; Mon, 15 Feb 2021 20:07:00 -0500 IronPort-SDR: GNhhQM8D85ikE65AIuyP6gVCNisKC3sntouwhE4FY/vndit9UUYZFil7777JErASE0cMnO1cQj ngZbR+S1g5MA== X-IronPort-AV: E=McAfee;i="6000,8403,9896"; a="246849241" X-IronPort-AV: E=Sophos;i="5.81,182,1610438400"; d="scan'208";a="246849241" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2021 17:06:44 -0800 IronPort-SDR: vdLihsVIKiV5B2Fi3ZgpNpB+y8peo179SxM0flzVAQ/30XIWuartwuRX71a9bpiNchk0Otzp7A cwbaW3EJViCg== X-IronPort-AV: E=Sophos;i="5.81,182,1610438400"; d="scan'208";a="591695502" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2021 17:06:43 -0800 From: isaku.yamahata@gmail.com To: qemu-devel@nongnu.org, imammedo@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com Subject: [PATCH v4 09/10] acpi: add test case for -no-hpet Date: Mon, 15 Feb 2021 17:04:14 -0800 Message-Id: <008c2985ae1becad2a02d3dbdb1eb516e23aac7a.1613436967.git.isaku.yamahata@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Received-SPF: pass client-ip=134.134.136.100; envelope-from=isaku.yamahata@intel.com; helo=mga07.intel.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NML_ADSP_CUSTOM_MED=0.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: isaku.yamahata@intel.com, isaku.yamahata@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Isaku Yamahata Reviewed-by: Igor Mammedov Signed-off-by: Isaku Yamahata --- tests/qtest/bios-tables-test.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 592c074ec7..3fb7ed0c46 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -990,6 +990,17 @@ static void test_acpi_piix4_tcg_smm_compat_nosmm(void) free_test_data(&data); } +static void test_acpi_piix4_tcg_nohpet(void) +{ + test_data data; + + memset(&data, 0, sizeof(data)); + data.machine = MACHINE_PC; + data.variant = ".nohpet"; + test_acpi_one("-no-hpet", &data); + free_test_data(&data); +} + static void test_acpi_q35_tcg_numamem(void) { test_data data; @@ -1035,6 +1046,17 @@ static void test_acpi_q35_tcg_smm_compat_nosmm(void) free_test_data(&data); } +static void test_acpi_q35_tcg_nohpet(void) +{ + test_data data; + + memset(&data, 0, sizeof(data)); + data.machine = MACHINE_Q35; + data.variant = ".nohpet"; + test_acpi_one("-no-hpet", &data); + free_test_data(&data); +} + static void test_acpi_piix4_tcg_numamem(void) { test_data data; @@ -1396,11 +1418,13 @@ int main(int argc, char *argv[]) test_acpi_piix4_tcg_smm_compat); qtest_add_func("acpi/piix4/smm-compat-nosmm", test_acpi_piix4_tcg_smm_compat_nosmm); + qtest_add_func("acpi/piix4/nohpet", test_acpi_piix4_tcg_nohpet); qtest_add_func("acpi/q35/nosmm", test_acpi_q35_tcg_nosmm); qtest_add_func("acpi/q35/smm-compat", test_acpi_q35_tcg_smm_compat); qtest_add_func("acpi/q35/smm-compat-nosmm", test_acpi_q35_tcg_smm_compat_nosmm); + qtest_add_func("acpi/q35/nohpet", test_acpi_q35_tcg_nohpet); qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_dimm_pxm); qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm); qtest_add_func("acpi/piix4/acpihmat", test_acpi_piix4_tcg_acpi_hmat); From patchwork Tue Feb 16 01:04:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 12089307 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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 6176BC433E6 for ; Tue, 16 Feb 2021 01:12: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 E7C6A64DBA for ; Tue, 16 Feb 2021 01:12:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E7C6A64DBA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBouZ-0000wk-Ci for qemu-devel@archiver.kernel.org; Mon, 15 Feb 2021 20:12:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBopJ-0001uh-H3 for qemu-devel@nongnu.org; Mon, 15 Feb 2021 20:06:57 -0500 Received: from mga06.intel.com ([134.134.136.31]:34397) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBopF-0004h7-Qr for qemu-devel@nongnu.org; Mon, 15 Feb 2021 20:06:53 -0500 IronPort-SDR: 3gcBrMm4L0sJwWeRxOinUIgAjOcxO159p7/JqjQxwmiOT3s0MT/rg/OZWCxji54bPtmRScPSsu MGrzp6k68gUQ== X-IronPort-AV: E=McAfee;i="6000,8403,9896"; a="244264046" X-IronPort-AV: E=Sophos;i="5.81,182,1610438400"; d="scan'208";a="244264046" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2021 17:06:44 -0800 IronPort-SDR: rD05ELY3IGfiN3U9G46WTSIr81QrQNZk1Js4CnmSETWWlnLE7lcEXPdAbFda5vSgx02e/7oSBz IyInSqRCwTZg== X-IronPort-AV: E=Sophos;i="5.81,182,1610438400"; d="scan'208";a="591695505" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2021 17:06:44 -0800 From: isaku.yamahata@gmail.com To: qemu-devel@nongnu.org, imammedo@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com Subject: [PATCH v4 10/10] qtest/acpi/bios-tables-test: update acpi tables Date: Mon, 15 Feb 2021 17:04:15 -0800 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Received-SPF: pass client-ip=134.134.136.31; envelope-from=isaku.yamahata@intel.com; helo=mga06.intel.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NML_ADSP_CUSTOM_MED=0.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: isaku.yamahata@intel.com, isaku.yamahata@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Isaku Yamahata update golden master acpi tables and empty bios-tables-test-allowed-diff.h. Signed-off-by: Isaku Yamahata --- tests/data/acpi/pc/DSDT.nohpet | Bin 0 -> 4923 bytes tests/data/acpi/pc/FACP.nosmm | Bin 0 -> 116 bytes tests/data/acpi/q35/DSDT | Bin 7801 -> 7872 bytes tests/data/acpi/q35/DSDT.acpihmat | Bin 9126 -> 9197 bytes tests/data/acpi/q35/DSDT.bridge | Bin 7819 -> 7890 bytes tests/data/acpi/q35/DSDT.cphp | Bin 8265 -> 8336 bytes tests/data/acpi/q35/DSDT.dimmpxm | Bin 9455 -> 9526 bytes tests/data/acpi/q35/DSDT.ipmibt | Bin 7876 -> 7947 bytes tests/data/acpi/q35/DSDT.memhp | Bin 9160 -> 9231 bytes tests/data/acpi/q35/DSDT.mmio64 | Bin 8932 -> 9003 bytes tests/data/acpi/q35/DSDT.nohpet | Bin 0 -> 7730 bytes tests/data/acpi/q35/DSDT.numamem | Bin 7807 -> 7878 bytes tests/data/acpi/q35/DSDT.tis | Bin 8407 -> 8478 bytes tests/data/acpi/q35/FACP.nosmm | Bin 0 -> 244 bytes tests/qtest/bios-tables-test-allowed-diff.h | 14 -------------- 15 files changed, 14 deletions(-) diff --git a/tests/data/acpi/pc/DSDT.nohpet b/tests/data/acpi/pc/DSDT.nohpet index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..302deb595c79da7eb8da87baad16a21326e02430 100644 GIT binary patch literal 4923 zcmb7IQEwZ^5uW88<>QjHj?~$5tRyBByJ^xQCMjEX5TFpbM@qCr>dd2(7AJtD$e>gZ zzy~J+q6$H222d0~6%bVPp%09qyjnk@{R#aE`3)%$>#6L_9hagh9*_{w@n+`RZ)SF9 zXO}WL)G+{{cly>#>NYrCGrwAA(U8iVXHoARA9>CAy_w%y zW&h|j{@!SO`E7$WUD$b{pX@ZGj6?k9uh%?0vDS6Ni|4J3$sWviTWSbjsSgK@_ag-0Rh z9g+qEw?jsEpX~w-cituSDd?4DsseqTQ^go2uUpj`xXDnr;X?C8K629JUH30d9)cbB z;AwLQxB{)de%wM(Lv)sfnU_V@9TltWPBxWz*wO@63RMj8Qa z_v`%~u0wP%fTK2md(cFGM{Ndf`>4@`z2<4dd3O7*LeWy$Qb9AT`Z%rOBSViYJ(e_M zuJjmZwI4a)-42}c$SIE+%caMn8bLrcow&-Q-_1b8E0%qDPC6dOXQ>}O>0r(sdOsz# z)7!X$X<{+@dn1OMg0`B5b7d#4^SSS?LPQB;m2v!w;@>_Pv$TESl!Bn}j6~fm+3+>J z^RB0vr9D6hQT62cx?Q!|^Nt^dOYTWO^q!yaj%E0Zy=TU}XFTs2jBng~#+dFsglInJlT8N`t%EMn6Nh1hfO8U`6`1mIAbyFu~<}I7dhiG=h<&b$U#b2g$fg; zip@l|{4v9ZkfukGfg(iN#D0?`q$2FXMhf9(u9h-l^-`szxj;%>fTeA(RbfDWknx9feS5{wO^RY z<2G}#i!rZzZp8j}++ZgyR5jezq)RX1NhK~yfBs}ri_6mbp&!BaIzTr+xYO*|f+y9q z?r!UdVx-oIQGNfQfBzE9s|;Me7FXO$6N5$^x7VUuNkR3mB}BLbEn0HSt>t8td1z8g(9b572%Q?8^UXu5Y24-b!R>){ zt({VJ;|?h2YKbVPro!!rj1>8KVR-s-61^~bSSy_W^C%7>y#3*4Ko7jXoyX2& zOhY}3DWrOZ=JVJ{j^o)2@ZWFe0em~1Yl8uuYxD_$XOWjIZ7}%P|9s28e}4YEi!r{A zV1vQnuM+NSp-bO%F%&9JfqyZKTNNvv!zu6^AnC_CpMO(}`gwVs@5i$r&zMRik5p^T zs`?Z8Itfn2lrDOi3tqxYX5hW-y=`=FFV&MXD#MuZ{a!t(sd(4KTO>;N$wI;FA6-ng z)BB+Ki75I3JT8>CuvoH$#tZa##Cli{Q?J$w?zVU9DnIeoDvzxI(}>#Xw0~Pi;e9(Z z6mWGyU?5w@gj4S&D_@rA#p%6gXCC4}d#f`1Er3H5Fp_m@_jC&+2V^E_mS_ozhZz2B zK&ToBm8@Y24F^G&Br6_YKI=>%RI*-?&?`aEdy*9|_dcr@2$if635^6n?@LxLp*#>O zS#cTt0HQ(AWyuueD8p=8x1R1bto)`Wy6 zf}kHt)}(|c1EG=?e=z#7&ILhpk`=dr4>bazlJ%N|UJHWeCF^wwy&edatn(5&9|RSW z^@fDr2!u-3Hzf3pAgC!>Z%XLRK&WJ0kkEx7XhE{RDWPu$LM7{468csUv?y8Mme98Y zp_28Mgx;D4HP#l)k1MrMKX%Z;bM}yW-L5C-C}219g%kX_?0A|S+PHP39WN3nU)Xh$aT7>;%9AhbDDe;)LY2U$ceN#pKHW0oy2@ AJpcdz literal 0 HcmV?d00001 diff --git a/tests/data/acpi/pc/FACP.nosmm b/tests/data/acpi/pc/FACP.nosmm index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3cb7d75ea796e0579177c863f16e2aefdc8bed65 100644 GIT binary patch literal 116 zcmZ>BbPgzCU|?W0aq@Te2v%^42yk`-iZKGkKx_~V1B?uuFeU>78-&RMr9nInAp603 bs5lb?3k#6>pZ`BUM1+CC2*_C4z`y_i8aE69 literal 0 HcmV?d00001 diff --git a/tests/data/acpi/q35/DSDT b/tests/data/acpi/q35/DSDT index d25cd7072932886d6967f4023faac1e1fa6e836c..abff765d8e3941a408e6bc703c0b61ec46feccae 100644 GIT binary patch delta 101 zcmexqbHJ9%CDiG?fOqnlh=T!I{(IpRG$U3dfh0t}oD3>i3r soI>3M<+)_q#TgiQ7#Sd71CRn?5D=(j5aEt@4hrU20#dtKiZNam0McOk(iG?dSCo;y%0sxek35@^% diff --git a/tests/data/acpi/q35/DSDT.acpihmat b/tests/data/acpi/q35/DSDT.acpihmat index 722e06af83abcde203a2b96a8ec81fd3bab9fc98..5a1d554ee31e64731b42e483e945e5999b79d45a 100644 GIT binary patch delta 101 zcmZ4H{??t#CDn~$xCA*mbHsaiy6^`01sFIR7&34K sIfc3j%5%xIi!(6rFfu^E1|S8(ARti5Ai^E*92Cs41f+Je6l0GP03F2^od5s; delta 29 lcmaFszRaD=CDvPGsy+0sxbG37r4{ diff --git a/tests/data/acpi/q35/DSDT.bridge b/tests/data/acpi/q35/DSDT.bridge index 06bac139d668ddfc7914e258b471a303c9dbd192..184f07c664496c37ffe1475a86358b3c0d702d68 100644 GIT binary patch delta 101 zcmeCSy=2Sf66_LkNsfVmasEWER3<0>iG?fOqnlh=T!I{(IpRG$U3dfh0t}oD3>i3r soI>3M<+)_q#TgiQ7#Sd71CRn?5D=(j5aEt@4hrU20#dtKim^}@0O;@)?*IS* delta 29 kcmca)+ilC`66_MvEyuvX*guggmC2iHV&TfoiHwD^0EVOp?*IS* diff --git a/tests/data/acpi/q35/DSDT.cphp b/tests/data/acpi/q35/DSDT.cphp index 2b933ac482e6883efccbd7d6c96089602f2c0b4d..8e164c4a1cc46f552c834601c356d345287c9750 100644 GIT binary patch delta 101 zcmX@iG?fOqnlh=T!I{(IpRG$U3dfh0t}oD3>i3r soI>3M<+)_q#TgiQ7#Sd71CRn?5D=(j5aEt@4hrU20#dtKicw!40Kp9vJpcdz delta 29 kcmbQ>c+!E(CDk(iG?dSCo*1D1^|JV&O{n=q6Vdmmo)Hj(87G7v2EB00UM7ZOfgMvAhfYff5Vq7H)0DAcp?*IS* delta 29 lcmeCSJ7UY_66_LkM2>-hQEMVsDw8+Y#KM)E6B$>@0sw=v2=4#@ diff --git a/tests/data/acpi/q35/DSDT.memhp b/tests/data/acpi/q35/DSDT.memhp index 9a802e4c67022386442976d5cb997ea3fc57b58f..4e588f184a6be20a156d195e0ed28e5b56d129a1 100644 GIT binary patch delta 101 zcmX@%-tWQX66_Mfufo8<_k(iG?dSCo-;60sxYY3EKbw diff --git a/tests/data/acpi/q35/DSDT.mmio64 b/tests/data/acpi/q35/DSDT.mmio64 index 948c2dc7264c31932b490ca00691a7c4d9aefdb0..d76e8136998c5b3a25bac21da7070a47fcfbde4e 100644 GIT binary patch delta 101 zcmaFjy4sD)CDiG?fOqnlh=T!I{(IpRG$U3dfh0t}oD3>i3r soI>3M<+)_q#TgiQ7#Sd71CRn?5D=(j5aEt@4hrU20#dtKit&^p0M2d|`Tzg` delta 29 lcmZ4O_QaLTCDvPGmf#2mqEa3Hks4 diff --git a/tests/data/acpi/q35/DSDT.nohpet b/tests/data/acpi/q35/DSDT.nohpet index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3a98616f729cda2f1984e94a3dbd2bde02aa620a 100644 GIT binary patch literal 7730 zcmb7JTW=f38J*=tS}m8-lAP8+nSQF52J=tgm=x&Z}{lAKnK3uF;n zKnx>*tpJVVhoXq!ppUYl0C{Vl`da^k_N@l`5Bl1N_^IsqzS)syND7Dqh}<)K&U|xb zFK0O$gh6}h4I!+5l-K=wxKRF0(+|*Q2_a~kzP(0jOLQIv(6_=FMGXvpY^QmNbEfKp6+Z%pFZyG2qNw8M2n?-`BpGzx1mw zZ{91t_~pNT`{a(30$~Z?HomV#^wE3JbLM+T-WP|rtxrhK`xcL;zc}RGvdyDCQIA@l zxw476T0FkfIjE$9R>|i&vCuwsjEpvBv$9(`f@n{Sx!+B6BD*e z&J<><73R)6=W13@^n_*AtXtw1zON+2ebG61b9H_5L^U;SsB9;Fg~r!8SXybe7ggUW zIo+1Q^_*)YS4m-C@mTZSR@*-rO$K#n@Z5DI zB4OEAgmquo&4ynU1-FZDE7~LE{qa4EX2bLU!zW6!)o$jO?>@|DQki~VtgJ0pgxt2U zT@`tk+MNVIO@SmpUF5SVx8KKslDrs^3dBjdk9D9bNJ{k2+ypDZjS(poH6d6DDk}j= ziP11O$x1bXq#&iDCZ!ToRsxbzRY|c@jUdHJMNLVi8a$xxGi~@xvrJ|_&H6Nb+T(Z?Yx)G#eP#`xS;J@6^a-f@oHTq+8a^jYpMbj0 zDZ}TK;d9FL38?$@44OOOZ&z#{iXZi%xedZ0HdBbPk^a-f@oHl$;8$PE^ zpMbj0g5k4Z_$-({0d=3}44>x=pXW@UfV$5a!{?0QbH?-usQW}v;p|iQp;^P{tmzX_ z_j%s%dEW4O-t-Bm`@F!)QhX=8z{+xbv%4Ub{%c6eAm+{)$~i+hXDR`8Hy|n15u7(_&Kou7 z&6%1V#~P(=}-lE=3&OOQ&9&q7g2Jqb`i6<-KY z$yEWWQ7J$r^&~(6F&Y)1k{ctcsRyW}o&+c$M#NkMsN}{d_Q+HUP)Su#_lW?N-Let^ zs!=IG0aYqefC4I?2vEsoB?45VQh-V-*Q5XiR6Y@)lFLd2s79p#l~h(zfC4I?2vEso zB?45VQh-V-D=9z$)$v4tN-irApc<6|R8m<<0Sc&mB0wdVl?YIcN&zaVtfT-1R6Y@) zlFLd2s79p#l~h(zfC4I?2vEsoB?45VQh-V-D=9z$l}`ky3aES{KqZ%z2vChm0V=7iqyPm}J`tdj%Sr^OMx_9iR8~@e z0xF*fP|0N_0#u_?fJ!PWDL?_0PXwssvJwHRQ7J$rm6a5rfXXKVRB~B~0M)1zppwc; z3Q$1h69Fo@tVDonR0>c@WhDhDpz?_Tm0VULKs71_sHC!z0u)gBM1TTm0ScrCD4-so zfLefRN(88;qyW{F6rh?C0jenxpqi2bR8vxbYDxsCrbK{hN(xX-Ndc-U5uln90jen} zKs6-=sHQ}K0;!{m00qJkx~V+H334an45GmpO1+NUTC;4o=}^U#%CjXu;)w( z+QJ}OSX)>b$1_4n{ib)ZP(Vv4HijMMW}NBIC&fe(=_YXh7Pu4R=Xn8(G3}B#rXgT7 zr9!S7G(zzSZ95OSWr}{V6T@#Yp6!OM(0Z~LkAccldtALdP#voS-@1BPt6t{nWsFa+ zUM`HTUhW*Ml6SdMgXN^yyOTIWd0#82Lt7U zQ_2T%`O0AV)EUZGwDJ`$Ul}N0Ii-9hE?*ripFTtRs#d$>s-D*P`-Xj`8vv{=vFpZ-jn6k%>$1WxZLI9 zo7q+v<4Yc2bX~{Y4PM4h&g>4)8bjU5wvpWpU6*;YJ3N34btl_Kb~kjLVU3fnGi3}< zB}3iGwvpWpT{i`@J3Oikbtl_Kb~kh#oHM(_^UF|ovTbB{L+AC3*&QBghPsn&BfA?q zPiM{U@T4=;ooq9^^Db(O+Ed|b8B6(Cws(_Q)b`eI$Tj}Dv-NsOyVMV6|aUz?t zesgo7{^7mo_xrzF_~`w+AMSs&`~F?gvHa%Ba(uRC9j9i!bYHrbi)CwM62da`(skU< zqaP3`i3Pt|S+o4cT4?#L)n8kF<=rBER4tM8{nfzkJjxR@>4%k-1<-?1djV_BjkSgy z32MYye{GBXU_f$^*^=LE6pM>R8isr^kuK!?cJ;l)k#o2w{@@pj#oLAYn2#Y$biT87 zHKo?>$tW4<_oKbRW)zD=?`ZCDa0gk4oT*;t`$KzHmXCXd)il{UTOn((EA%k3|3Y=f z5B)X!6dSg`R=Jr^^dqqwS+|}C`NLaQByL4kFB03&SKL1x_N=G7XzE3~gC*JUU?UF7 z(d^T~RvebyuZ|`Tx1B!9d=-t_fAr?i%+Ya=b|2Fix5fT8M)mAxM{f_&_{_lJ+jWxB z(8ORTbo;yX;;NF8Z?34r9kEM?9Nu<2i=)jA^@Z{5?~I=2)d_z+Y`dpS^XRi>sDDge zbbG|yL{4I`m8c&KHe#Abj;{0RJ9JLt`o|wG51iNbF`eDG0#-}yT*k2lRvYL!v@nU6 za_tP65qq~kC|tzFQ)^bbmEw|!uXwtU=$!Hjw1=wCARCuMFyxim~KzbweZpQiB zLKv^; z?0&!h7r94#ZR~l`@BjUOa?gt!PkxNodU0>EjVwdkhkN6XFuh9iQ?MvsW%66X5-iI5 z8?|dUHu-ujBV(9vYzt!xV;0`Wc|Y8OB)rzmkEJZs!}j%V-cC6Q2dig5Z_^&C?)~ER z)O8Nts^0Wv;AA%{tD87}OT@-&LcNNY_R@6w^s1>Xey4UrzKqO-#iD!}2^T*Ki|frXjcc^=e@rVFY5)KL literal 0 HcmV?d00001 diff --git a/tests/data/acpi/q35/DSDT.numamem b/tests/data/acpi/q35/DSDT.numamem index 44ec1b0af400da6d298284aa959aa38add7e6dd5..13f09ff3d8c566fdf4f9c7a604e92184ac1aee2f 100644 GIT binary patch delta 101 zcmexwbIg{@CDdHGn~$xCA*mbHsaiy6^`01sFIR7&34K sIfc3j%5%xIi!(6rFfu^E1|S8(ARti5Ai^E*92Cs41f+Je6l1C^023M(PXGV_ delta 29 lcmX?R``?DkCDk(iG?dSCo-nW0sxU=2~Pk3 diff --git a/tests/data/acpi/q35/DSDT.tis b/tests/data/acpi/q35/DSDT.tis index 30da3ec27958881801dacc954a343321ba26a2ae..e15073068895a3b601b49267806b55a904b8dbff 100644 GIT binary patch delta 101 zcmccaIM0d8CDiG?fOqnlh=T!I{(IpRG$U3dfh0t}oD3>i3r soI>3M<+)_q#TgiQ7#Sd71CRn?5D=(j5aEt@4hrU20#dtKigB+z0Lo1jvPGsCG4*-+D3FQC) diff --git a/tests/data/acpi/q35/FACP.nosmm b/tests/data/acpi/q35/FACP.nosmm index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..891450367cbd1aca397d296831ebeb5cc0788f0f 100644 GIT binary patch literal 244 zcmZ>BbPo8!z`($K&B@={BUr&HBEZ=VD8>jB1F=Cg3@|cq!k7#UY!D_3lm_uQfNTYr zI1>Yl08s2d|9^gnN(KfaAY*9@0|O%m1H(@qh$vhVrU*zgDgX&2bAdcCU<4Y7Y#&S< TnPyagxC11{*nn^khz|n*0A~&X 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 95592459c5..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,15 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/pc/FACP.nosmm", -"tests/data/acpi/pc/DSDT.nohpet", -"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/FACP.nosmm", -"tests/data/acpi/q35/DSDT.nohpet", -"tests/data/acpi/q35/DSDT.dimmpxm", -"tests/data/acpi/q35/DSDT.acpihmat",