From patchwork Mon Feb 8 21:57:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 12076883 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 E9A99C433E0 for ; Mon, 8 Feb 2021 23:55:11 +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 68E5764E76 for ; Mon, 8 Feb 2021 23:55:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 68E5764E76 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]:37752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9GN4-0005mB-HL for qemu-devel@archiver.kernel.org; Mon, 08 Feb 2021 18:55:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9EYs-0006hW-Ax for qemu-devel@nongnu.org; Mon, 08 Feb 2021 16:59:14 -0500 Received: from mga02.intel.com ([134.134.136.20]:59483) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9EYq-0005Gb-SA for qemu-devel@nongnu.org; Mon, 08 Feb 2021 16:59:14 -0500 IronPort-SDR: 7CZMYqfDSLe4W9Q08zEmGWodA80ZbVN1/QVGPnGCAI6e2I8Y0hjFJUwP38AStZjBt6GAZAPCb4 0PgnQLS8OJ9Q== X-IronPort-AV: E=McAfee;i="6000,8403,9889"; a="168911421" X-IronPort-AV: E=Sophos;i="5.81,163,1610438400"; d="scan'208";a="168911421" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2021 13:59:04 -0800 IronPort-SDR: oegboYgrOT+Buf/lHCjU8lq1V7hsBq5rYcwmBqQVoUTGhyU1TqVAfqNEgpJddERFSSIBDCu3dD 2rXJ9q6Swe8w== X-IronPort-AV: E=Sophos;i="5.81,163,1610438400"; d="scan'208";a="487608574" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2021 13:59:04 -0800 From: isaku.yamahata@gmail.com To: qemu-devel@nongnu.org, imammedo@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com, philmd@redhat.com Subject: [PATCH v2 1/9] checkpatch: don't emit warning on newly created acpi data files Date: Mon, 8 Feb 2021 13:57:20 -0800 Message-Id: <6b90a62af91fb54e2db207490f3a6948bfe691ee.1612821109.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.20; envelope-from=isaku.yamahata@intel.com; helo=mga02.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.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NML_ADSP_CUSTOM_MED=0.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 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 Mon Feb 8 21:57:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 12076917 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 30153C433DB for ; Tue, 9 Feb 2021 00:53:54 +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 B265561606 for ; Tue, 9 Feb 2021 00:53:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B265561606 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]:56918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9HHq-0002yJ-Q0 for qemu-devel@archiver.kernel.org; Mon, 08 Feb 2021 19:53:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47192) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9EYr-0006gg-7S for qemu-devel@nongnu.org; Mon, 08 Feb 2021 16:59:13 -0500 Received: from mga02.intel.com ([134.134.136.20]:59480) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9EYp-0005DL-N8 for qemu-devel@nongnu.org; Mon, 08 Feb 2021 16:59:12 -0500 IronPort-SDR: zLM0oB6zN1AWX2MqjGCaQBs+FVLDU7Igvgn7NW+qw0pVu6SsTO5kOgLdVeVhBVwwBtNsyMZFm5 brgl+YDzlWNA== X-IronPort-AV: E=McAfee;i="6000,8403,9889"; a="168911422" X-IronPort-AV: E=Sophos;i="5.81,163,1610438400"; d="scan'208";a="168911422" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2021 13:59:05 -0800 IronPort-SDR: +/NB0bfhmQ6OfwJ6puWKZ6FhtMdTM1caX2pKUBTfPixYceQKM1A/tpV+oNKVqEc90UvgAqLyK9 ekOUCOAn2Ydw== X-IronPort-AV: E=Sophos;i="5.81,163,1610438400"; d="scan'208";a="487608577" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2021 13:59:04 -0800 From: isaku.yamahata@gmail.com To: qemu-devel@nongnu.org, imammedo@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com, philmd@redhat.com Subject: [PATCH v2 2/9] qtest: update tests/qtest/bios-tables-test-allowed-diff.h Date: Mon, 8 Feb 2021 13:57:21 -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.20; envelope-from=isaku.yamahata@intel.com; helo=mga02.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.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NML_ADSP_CUSTOM_MED=0.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 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/q35/DSDT.nosmm - tests/data/acpi/q35/FACP.nosmm - tests/data/acpi/q35/DSDT.nohpet Signed-off-by: Isaku Yamahata Acked-by: Igor Mammedov --- tests/data/acpi/q35/DSDT.nohpet | 0 tests/data/acpi/q35/DSDT.nosmm | 0 tests/data/acpi/q35/FACP.nosmm | 0 tests/qtest/bios-tables-test-allowed-diff.h | 13 +++++++++++++ 4 files changed, 13 insertions(+) create mode 100644 tests/data/acpi/q35/DSDT.nohpet create mode 100644 tests/data/acpi/q35/DSDT.nosmm create mode 100644 tests/data/acpi/q35/FACP.nosmm 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/DSDT.nosmm b/tests/data/acpi/q35/DSDT.nosmm 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..b79ac495c2 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,14 @@ /* 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.ipmibt", +"tests/data/acpi/q35/DSDT.cphp", +"tests/data/acpi/q35/DSDT.memhp", +"tests/data/acpi/q35/DSDT.numamem", +"tests/data/acpi/q35/DSDT.dimmpxm", +"tests/data/acpi/q35/DSDT.acpihmat", +"tests/data/acpi/q35/DSDT.mmio64", +"tests/data/acpi/q35/DSDT.nosmm", +"tests/data/acpi/q35/FACP.nosmm", +"tests/data/acpi/q35/DSDT.nohpet", From patchwork Mon Feb 8 21:57:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 12076887 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 C093FC433E0 for ; Mon, 8 Feb 2021 23:57:32 +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 5828464E5D for ; Mon, 8 Feb 2021 23:57:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5828464E5D 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]:43064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9GPL-00081p-BU for qemu-devel@archiver.kernel.org; Mon, 08 Feb 2021 18:57:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9EYp-0006ds-BN for qemu-devel@nongnu.org; Mon, 08 Feb 2021 16:59:11 -0500 Received: from mga02.intel.com ([134.134.136.20]:59480) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9EYm-0005DL-Ss for qemu-devel@nongnu.org; Mon, 08 Feb 2021 16:59:11 -0500 IronPort-SDR: pfulXf8KXVYCE+ye9xwk8w8yW5J/BihfTfoEX1ootrUDjyAwqKqgrwMK1d2FOJaiUgP0h1G7ed xKnT0aRGiKTg== X-IronPort-AV: E=McAfee;i="6000,8403,9889"; a="168911423" X-IronPort-AV: E=Sophos;i="5.81,163,1610438400"; d="scan'208";a="168911423" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2021 13:59:05 -0800 IronPort-SDR: shXO/DgnABvV9fUsGEKEo0ROQXPuoZseXNiPGYIIvPqRier4rEk/NogNVpUOndqxeiC9yDQ4Nl 5yB5xO07UITg== X-IronPort-AV: E=Sophos;i="5.81,163,1610438400"; d="scan'208";a="487608580" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2021 13:59:04 -0800 From: isaku.yamahata@gmail.com To: qemu-devel@nongnu.org, imammedo@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com, philmd@redhat.com Subject: [PATCH v2 3/9] acpi/core: always set SCI_EN when SMM isn't supported Date: Mon, 8 Feb 2021 13:57:22 -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.20; envelope-from=isaku.yamahata@intel.com; helo=mga02.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.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NML_ADSP_CUSTOM_MED=0.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 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). 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 --- 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..1a34d7f621 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, !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 669be5bbf6..0cddf91de5 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -496,7 +496,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_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 Mon Feb 8 21:57:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 12076919 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 647ECC433E0 for ; Tue, 9 Feb 2021 00:55:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EDCC764E77 for ; Tue, 9 Feb 2021 00:54:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EDCC764E77 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]:59076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9HIx-0003rD-1b for qemu-devel@archiver.kernel.org; Mon, 08 Feb 2021 19:54:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47234) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9EYt-0006kL-NK for qemu-devel@nongnu.org; Mon, 08 Feb 2021 16:59:15 -0500 Received: from mga02.intel.com ([134.134.136.20]:59480) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9EYr-0005DL-Jn for qemu-devel@nongnu.org; Mon, 08 Feb 2021 16:59:15 -0500 IronPort-SDR: xQ645V5CzfmO/ZmCeJmCPqJ9q3Np9Y79qDtOsB/OpiFQaJ+UCa9SJauSG6vHblg4G7giQvxWE2 TZRVVswQGehw== X-IronPort-AV: E=McAfee;i="6000,8403,9889"; a="168911424" X-IronPort-AV: E=Sophos;i="5.81,163,1610438400"; d="scan'208";a="168911424" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2021 13:59:05 -0800 IronPort-SDR: pGu1zOyLiDMujLMM5VrrC4IwiFSPUfxa5D4ErVkKRkrFhAqmXo/Eiq+u+icdDtyABLE1gIbr4i tFsW7+w3An3g== X-IronPort-AV: E=Sophos;i="5.81,163,1610438400"; d="scan'208";a="487608583" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2021 13:59:05 -0800 From: isaku.yamahata@gmail.com To: qemu-devel@nongnu.org, imammedo@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com, philmd@redhat.com Subject: [PATCH v2 4/9] acpi: set fadt.smi_cmd to zero when SMM is not supported Date: Mon, 8 Feb 2021 13:57:23 -0800 Message-Id: <8156558747a6db89a4e8e015ab0b1e9bea07b27f.1612821109.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.20; envelope-from=isaku.yamahata@intel.com; helo=mga02.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.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NML_ADSP_CUSTOM_MED=0.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 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 Signed-off-by: Isaku Yamahata Reviewed-by: Igor Mammedov --- hw/i386/acpi-build.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index f56d699c7f..c2f11d95d8 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -139,6 +139,8 @@ const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio = { static void init_common_fadt_data(MachineState *ms, Object *o, AcpiFadtData *data) { + X86MachineState *x86ms = X86_MACHINE(ms); + bool smm_enabled = 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 +161,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 Mon Feb 8 21:57:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 12076943 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 317F0C433DB for ; Tue, 9 Feb 2021 00:56:58 +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 CCBA064E82 for ; Tue, 9 Feb 2021 00:56:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CCBA064E82 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]:33240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9HKq-0004xM-Th for qemu-devel@archiver.kernel.org; Mon, 08 Feb 2021 19:56:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47246) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9EYu-0006lL-BC for qemu-devel@nongnu.org; Mon, 08 Feb 2021 16:59:16 -0500 Received: from mga02.intel.com ([134.134.136.20]:59487) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9EYs-0005HW-Ki for qemu-devel@nongnu.org; Mon, 08 Feb 2021 16:59:16 -0500 IronPort-SDR: 8D4gvlMWD9655lTO+d5vT/8uH9wBa1R97jt/WT9wI5zQn5MSUEcD0A3PuW36vBJ33nh97BB4Yd CLD2FD+kftjA== X-IronPort-AV: E=McAfee;i="6000,8403,9889"; a="168911426" X-IronPort-AV: E=Sophos;i="5.81,163,1610438400"; d="scan'208";a="168911426" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2021 13:59:05 -0800 IronPort-SDR: cfErv9VxKimd7glGyxYezVKvokrLg6HJVvKWC+vvLv4D3OtVMS7qaqPx3+TbtiG8KosHGKstHO c9OBf1VfOR7g== X-IronPort-AV: E=Sophos;i="5.81,163,1610438400"; d="scan'208";a="487608586" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2021 13:59:05 -0800 From: isaku.yamahata@gmail.com To: qemu-devel@nongnu.org, imammedo@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com, philmd@redhat.com Subject: [PATCH v2 5/9] acpi: add test case for smm unsupported -machine smm=off Date: Mon, 8 Feb 2021 13:57:24 -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.20; envelope-from=isaku.yamahata@intel.com; helo=mga02.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.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NML_ADSP_CUSTOM_MED=0.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Isaku Yamahata Signed-off-by: Isaku Yamahata Reviewed-by: Igor Mammedov --- tests/qtest/bios-tables-test.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 669202fc95..096d15db68 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -969,6 +969,17 @@ 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_piix4_tcg_numamem(void) { test_data data; @@ -1325,6 +1336,7 @@ 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/q35/nosmm", test_acpi_q35_tcg_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 Mon Feb 8 21:57:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 12076945 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 C7595C433DB for ; Tue, 9 Feb 2021 00:58:33 +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 3F92B64E82 for ; Tue, 9 Feb 2021 00:58:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3F92B64E82 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]:36054 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9HMO-0006BM-A9 for qemu-devel@archiver.kernel.org; Mon, 08 Feb 2021 19:58:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9EYv-0006o0-7a for qemu-devel@nongnu.org; Mon, 08 Feb 2021 16:59:17 -0500 Received: from mga02.intel.com ([134.134.136.20]:59483) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9EYs-0005Gb-Ta for qemu-devel@nongnu.org; Mon, 08 Feb 2021 16:59:16 -0500 IronPort-SDR: JZIRuT+AaMALZ9VAbxwpp/lwRfZkjlmWsCd91JktPr3jGbGb2ZEurgItZaf5PRMtc6b7Cx56fj 3i1ajVchCisw== X-IronPort-AV: E=McAfee;i="6000,8403,9889"; a="168911427" X-IronPort-AV: E=Sophos;i="5.81,163,1610438400"; d="scan'208";a="168911427" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2021 13:59:05 -0800 IronPort-SDR: GVzXEEGt1TwctjpA4tv2d6ARhRIZ1cKa0cCcX6pS35pefIxvD4DvxueSA8h32UR/rVuG8873zD KfJ4tCPetl2w== X-IronPort-AV: E=Sophos;i="5.81,163,1610438400"; d="scan'208";a="487608589" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2021 13:59:05 -0800 From: isaku.yamahata@gmail.com To: qemu-devel@nongnu.org, imammedo@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com, philmd@redhat.com Subject: [PATCH v2 6/9] hw/i386: declare ACPI mother board resource for MMCONFIG region Date: Mon, 8 Feb 2021 13:57:25 -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.20; envelope-from=isaku.yamahata@intel.com; helo=mga02.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.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NML_ADSP_CUSTOM_MED=0.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 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, 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. If guest BIOS doesn't reserve the region in memory map without the reservation by mother board resource, guest linux abandons to use MMCFG. TDVF [0] [1] 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] TDX: Intel Trust Domain Extension https://software.intel.com/content/www/us/en/develop/articles/intel-trust-domain-extensions.html [1] TDX Virtual Firmware https://github.com/tianocore/edk2-staging/tree/TDVF The change to DSDT is as follows. @@ -68,32 +68,90 @@ If ((CDW3 != Local0)) { CDW1 |= 0x10 } CDW3 = Local0 } Else { CDW1 |= 0x04 } Return (Arg3) } } + + Device (DRAC) + { + Name (_HID, "PNP0C01" /* System Board */) // _HID: Hardware ID + OperationRegion (DRR0, PCI_Config, 0x60, 0x08) + Field (DRR0, DWordAcc, NoLock, Preserve) + { + PEBL, 32, + PEBH, 32 + } + + Name (RBUF, ResourceTemplate () + { + QWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, NonCacheable, ReadWrite, + 0x0000000000000000, // Granularity + 0x0000000000000000, // Range Minimum + 0x0000000000000000, // Range Maximum + 0x0000000000000000, // Translation Offset + 0x0000000000000000, // Length + ,, _Y00, AddressRangeMemory, TypeStatic) + }) + Method (_CRS, 0, Serialized) // _CRS: Current Resource Settings + { + CreateDWordField (RBUF, \_SB.DRAC._Y00._MIN, MINL) // _MIN: Minimum Base Address + CreateDWordField (RBUF, 0x12, MINH) + CreateDWordField (RBUF, \_SB.DRAC._Y00._MAX, MAXL) // _MAX: Maximum Base Address + CreateDWordField (RBUF, 0x1A, MAXH) + CreateQWordField (RBUF, \_SB.DRAC._Y00._LEN, _LEN) // _LEN: Length + Local0 = PEBL /* \_SB_.DRAC.PEBL */ + Local1 = (Local0 & One) + Local2 = (Local0 & 0x06) + Local3 = (Local0 & 0xFFFFFFF8) + Local4 = PEBH /* \_SB_.DRAC.PEBH */ + If ((Local1 == One)) + { + MINL = Local3 + MINH = Local4 + MAXL = Local3 + MAXH = Local4 + If ((Local2 == Zero)) + { + _LEN = 0x10000000 + } + + If ((Local2 == 0x02)) + { + _LEN = 0x08000000 + } + + If ((Local2 == 0x04)) + { + _LEN = 0x04000000 + } + } + + 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 Acked-by: Jiewen Yao --- hw/i386/acpi-build.c | 172 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index c2f11d95d8..bcb1f65c1d 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1066,6 +1066,177 @@ static void build_q35_pci0_int(Aml *table) aml_append(table, sb_scope); } +static Aml *build_q35_dram_controller(void) +{ + /* + * DSDT is created with revision 1 which means 32bit integer. + * When the method of _CRS is called to determine MMCONFIG region, + * only port io is allowed to access PCI configuration space. + * It means qword access isn't allowed. + * + * Device(DRAC) + * { + * Name(_HID, EisaId("PNP0C01")) + * OperationRegion(DRR0, PCI_Config, 0x0000000000000060, 0x8) + * Field(DRR0, DWordAcc, Lock, Preserve) + * { + * PEBL, 4, + * PEBH, 4 + * } + * Name(RBUF, ResourceTemplate() + * { + * QWordMemory(ResourceConsumer, + * PosDecode, + * MinFixed, + * MaxFixed, + * NonCacheable, + * ReadWrite, + * 0x0000000000000000, // Granularity + * 0x0000000000000000, // Range Minimum + * 0x0000000000000000, // Range Maxium + * 0x0000000000000000, // Translation Offset, + * 0x0000000000000000, // Length, + * ,, + * _MCF, + * AddressRangeMemory, + * TypeStatic + * ) + * }) + * Method(_CRS, 0x0, NotSerialized) + * { + * CreateDWordField(RBUF, DRAC._MCF._MIN, MINL) + * CreateDWordField(RBUF, DRAC._MCF._MIN + 4, MINH) + * CreateDWordField(RBUF, DRAC._MCF._MAX, MAXL) + * CreateDWordField(RBUF, DRAC._MCF._MAX + 4, MAXH) + * CreateQWordField(RBUF, DRAC._MCF._LEN, _LEN) + * + * Local0 = PEBL + * Local1 = Local0 & 0x1 // PCIEXBAR PCIEBAREN + * Local2 = Local0 & 0x6 // PCIEXBAR LENGTH + * Local3 = Local0 & ~0x7 // PCIEXBAR base address low 32bit + * Local4 = PEBH // PCIEXBAR base address high 32bit + * If (Local1 == 1) { + * MINL = Local3 + * MINH = Local4 + * MAXL = Local3 + * MAXH = Local4 + * + * If (Local2 == 0) { + * _LEN = 256 * 1024 * 1024 + * } + * If (Local2 == 0x2) { + * _LEN = 128 * 1024 * 1024 + * } + * If (Local2 == 0x4) { + * _LEN = 64 * 1024 * 1024 + * } + * } + * return (RBUF) + * } + * } + */ + + Aml *dev; + Aml *field; + Aml *rbuf; + Aml *resource_template; + Aml *crs; + + /* DRAM controller */ + dev = aml_device("DRAC"); + + aml_append(dev, aml_name_decl("_HID", aml_string("PNP0C01"))); + /* 5.1.6 PCIEXBAR: Bus 0:Device 0:Function 0:offset 0x60 */ + aml_append(dev, aml_operation_region("DRR0", AML_PCI_CONFIG, + aml_int(0x0000000000000060), 0x8)); + field = aml_field("DRR0", AML_DWORD_ACC, AML_NOLOCK, AML_PRESERVE); + aml_append(field, aml_named_field("PEBL", 32)); + aml_append(field, aml_named_field("PEBH", 32)); + aml_append(dev, field); + + resource_template = aml_resource_template(); + aml_append(resource_template, aml_qword_memory(AML_POS_DECODE, + AML_MIN_FIXED, + AML_MAX_FIXED, + AML_NON_CACHEABLE, + AML_READ_WRITE, + 0x0000000000000000, + 0x0000000000000000, + 0x0000000000000000, + 0x0000000000000000, + 0x0000000000000000)); + rbuf = aml_name_decl("RBUF", resource_template); + aml_append(dev, rbuf); + + crs = aml_method("_CRS", 0, AML_SERIALIZED); + { + Aml *rbuf_name; + Aml *local0; + Aml *local1; + Aml *local2; + Aml *local3; + Aml *local4; + Aml *ifc; + + rbuf_name = aml_name("RBUF"); + aml_append(crs, aml_create_dword_field(rbuf_name, + aml_int(14), "MINL")); + aml_append(crs, aml_create_dword_field(rbuf_name, + aml_int(14 + 4), "MINH")); + aml_append(crs, aml_create_dword_field(rbuf_name, + aml_int(22), "MAXL")); + aml_append(crs, aml_create_dword_field(rbuf_name, + aml_int(22 + 4), "MAXH")); + aml_append(crs, aml_create_qword_field(rbuf_name, + aml_int(38), "_LEN")); + + local0 = aml_local(0); + aml_append(crs, aml_store(aml_name("PEBL"), local0)); + local1 = aml_local(1); + aml_append(crs, aml_and(local0, aml_int(0x1), local1)); + local2 = aml_local(2); + aml_append(crs, aml_and(local0, aml_int(0x6), local2)); + local3 = aml_local(3); + aml_append(crs, aml_and(local0, aml_int((uint32_t)~0x7), local3)); + local4 = aml_local(4); + aml_append(crs, aml_store(aml_name("PEBH"), local4)); + + ifc = aml_if(aml_equal(local1, aml_int(0x1))); + { + Aml *_len; + Aml *ifc0; + Aml *ifc2; + Aml *ifc4; + + aml_append(ifc, aml_store(local3, aml_name("MINL"))); + aml_append(ifc, aml_store(local4, aml_name("MINH"))); + aml_append(ifc, aml_store(local3, aml_name("MAXL"))); + aml_append(ifc, aml_store(local4, aml_name("MAXH"))); + + _len = aml_name("_LEN"); + ifc0 = aml_if(aml_equal(local2, aml_int(0x0))); + aml_append(ifc0, + aml_store(aml_int(256 * 1024 * 1024), _len)); + aml_append(ifc, ifc0); + + ifc2 = aml_if(aml_equal(local2, aml_int(0x2))); + aml_append(ifc2, + aml_store(aml_int(128 * 1024 * 1024), _len)); + aml_append(ifc, ifc2); + + ifc4 = aml_if(aml_equal(local2, aml_int(0x4))); + aml_append(ifc4, + aml_store(aml_int(64 * 1024 * 1024), _len)); + aml_append(ifc, ifc4); + } + aml_append(crs, ifc); + aml_append(crs, aml_return(rbuf_name)); + } + aml_append(dev, crs); + + return dev; +} + static void build_q35_isa_bridge(Aml *table) { Aml *dev; @@ -1250,6 +1421,7 @@ 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); + aml_append(sb_scope, build_q35_dram_controller()); if (pm->smi_on_cpuhp) { /* reserve SMI block resources, IO ports 0xB2, 0xB3 */ From patchwork Mon Feb 8 21:57:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 12076889 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 A4514C433E0 for ; Mon, 8 Feb 2021 23:59:58 +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 2498164E5D for ; Mon, 8 Feb 2021 23:59:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2498164E5D 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]:47902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9GRh-0001dB-0p for qemu-devel@archiver.kernel.org; Mon, 08 Feb 2021 18:59:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9EYw-0006qw-D1 for qemu-devel@nongnu.org; Mon, 08 Feb 2021 16:59:19 -0500 Received: from mga02.intel.com ([134.134.136.20]:59480) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9EYu-0005DL-9R for qemu-devel@nongnu.org; Mon, 08 Feb 2021 16:59:18 -0500 IronPort-SDR: HTXVzKdyeA2nCT/MvcctWL0wANQdolDPUV9n0+OVzir7MBPwNufUG2+XP4u/WXarqnwlOuAcD8 4WksXC1/XlLw== X-IronPort-AV: E=McAfee;i="6000,8403,9889"; a="168911429" X-IronPort-AV: E=Sophos;i="5.81,163,1610438400"; d="scan'208";a="168911429" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2021 13:59:05 -0800 IronPort-SDR: i7rp+8hcjmQmpxjEzPiX1+cUCy7vZ17vgtCOQv4dTghBRiULCLckt0nRnQ2IigQoP7sBvIiYAh ZzxRVaUjM4Mg== X-IronPort-AV: E=Sophos;i="5.81,163,1610438400"; d="scan'208";a="487608593" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2021 13:59:05 -0800 From: isaku.yamahata@gmail.com To: qemu-devel@nongnu.org, imammedo@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com, philmd@redhat.com Subject: [PATCH v2 7/9] i386: acpi: Don't build HPET ACPI entry if HPET is disabled Date: Mon, 8 Feb 2021 13:57:26 -0800 Message-Id: <4d380b7f97149f82da91f967a419ff3f3a2bc1a4.1612821109.git.isaku.yamahata@intel.com> 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.20; envelope-from=isaku.yamahata@intel.com; helo=mga02.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.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NML_ADSP_CUSTOM_MED=0.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: Sean Christopherson 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é Signed-off-by: Sean Christopherson Reviewed-by: Igor Mammedov --- 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 bcb1f65c1d..73ec0b6d32 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1405,7 +1405,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) { @@ -1450,7 +1452,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 Mon Feb 8 21:57:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 12076891 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,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 6B956C433E0 for ; Tue, 9 Feb 2021 00:02: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 D13B564E9A for ; Tue, 9 Feb 2021 00:02:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D13B564E9A 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]:52780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9GTi-0003jA-Ie for qemu-devel@archiver.kernel.org; Mon, 08 Feb 2021 19:02:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47316) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9EYw-0006rG-IR for qemu-devel@nongnu.org; Mon, 08 Feb 2021 16:59:19 -0500 Received: from mga02.intel.com ([134.134.136.20]:59487) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9EYu-0005HW-Np for qemu-devel@nongnu.org; Mon, 08 Feb 2021 16:59:18 -0500 IronPort-SDR: ot3wzsNFpEtzV3YKJW7obKUe+4L6osBOBYXMIY2qBagTpUnL76QAstprjRqY3DeRA3Nx9sJhSS xeBM8Rjvbkug== X-IronPort-AV: E=McAfee;i="6000,8403,9889"; a="168911430" X-IronPort-AV: E=Sophos;i="5.81,163,1610438400"; d="scan'208";a="168911430" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2021 13:59:05 -0800 IronPort-SDR: SCDwBlEGdymRAU8iR1ZkpEOpT4HtFRJuAA54SvnQXBKBJ+D5vqsk0z5S+7W5unwOnnGn5wY+7O BbBCQ9RrvVDg== X-IronPort-AV: E=Sophos;i="5.81,163,1610438400"; d="scan'208";a="487608596" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2021 13:59:05 -0800 From: isaku.yamahata@gmail.com To: qemu-devel@nongnu.org, imammedo@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com, philmd@redhat.com Subject: [PATCH v2 8/9] acpi: add test case for -no-hpet Date: Mon, 8 Feb 2021 13:57:27 -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.20; envelope-from=isaku.yamahata@intel.com; helo=mga02.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.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NML_ADSP_CUSTOM_MED=0.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Isaku Yamahata Signed-off-by: Isaku Yamahata Reviewed-by: Igor Mammedov --- tests/qtest/bios-tables-test.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 096d15db68..72c8765baf 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -980,6 +980,17 @@ static void test_acpi_q35_tcg_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; @@ -1337,6 +1348,7 @@ int main(int argc, char *argv[]) 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/q35/nosmm", test_acpi_q35_tcg_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 Mon Feb 8 21:57:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 12076771 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 EB5ECC433E0 for ; Mon, 8 Feb 2021 23:31:51 +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 7D97764E25 for ; Mon, 8 Feb 2021 23:31:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7D97764E25 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]:54146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9G0U-0002JR-JE for qemu-devel@archiver.kernel.org; Mon, 08 Feb 2021 18:31:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47332) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9EYy-0006rZ-5E for qemu-devel@nongnu.org; Mon, 08 Feb 2021 16:59:20 -0500 Received: from mga02.intel.com ([134.134.136.20]:59483) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9EYv-0005Gb-I1 for qemu-devel@nongnu.org; Mon, 08 Feb 2021 16:59:19 -0500 IronPort-SDR: lk3+klBcURCvRy+E2WDPQcNN1frxipPb25Je/hsoYyzv28cR7JtqCAb3K3UdIfX2yRUw/lij5c GUplX6tBT5dQ== X-IronPort-AV: E=McAfee;i="6000,8403,9889"; a="168911431" X-IronPort-AV: E=Sophos;i="5.81,163,1610438400"; d="scan'208";a="168911431" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2021 13:59:05 -0800 IronPort-SDR: TL78RxaTybZwuTzwY9IwgOiJPxoboR8GQ3sQti/RPDHal4NeVuZG3VQuOGeVAokzV6qg2tt3K3 ef82cKGYuaaw== X-IronPort-AV: E=Sophos;i="5.81,163,1610438400"; d="scan'208";a="487608599" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2021 13:59:05 -0800 From: isaku.yamahata@gmail.com To: qemu-devel@nongnu.org, imammedo@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com, philmd@redhat.com Subject: [PATCH v2 9/9] qtest/acpi/bios-tables-test: update acpi tables Date: Mon, 8 Feb 2021 13:57:28 -0800 Message-Id: <04b1f15b0069942a8c5888576f77182f700ba87b.1612821109.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.20; envelope-from=isaku.yamahata@intel.com; helo=mga02.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.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NML_ADSP_CUSTOM_MED=0.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 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/q35/DSDT | Bin 7801 -> 8083 bytes tests/data/acpi/q35/DSDT.acpihmat | Bin 9126 -> 9408 bytes tests/data/acpi/q35/DSDT.bridge | Bin 7819 -> 8101 bytes tests/data/acpi/q35/DSDT.cphp | Bin 8265 -> 8547 bytes tests/data/acpi/q35/DSDT.dimmpxm | Bin 9455 -> 9737 bytes tests/data/acpi/q35/DSDT.ipmibt | Bin 7876 -> 8158 bytes tests/data/acpi/q35/DSDT.memhp | Bin 9160 -> 9442 bytes tests/data/acpi/q35/DSDT.mmio64 | Bin 8932 -> 9214 bytes tests/data/acpi/q35/DSDT.nohpet | Bin 0 -> 7941 bytes tests/data/acpi/q35/DSDT.nosmm | Bin 0 -> 8083 bytes tests/data/acpi/q35/DSDT.numamem | Bin 7807 -> 8089 bytes tests/data/acpi/q35/DSDT.tis | Bin 8407 -> 8689 bytes tests/data/acpi/q35/FACP.nosmm | Bin 0 -> 244 bytes tests/qtest/bios-tables-test-allowed-diff.h | 13 ------------- 14 files changed, 13 deletions(-) diff --git a/tests/data/acpi/q35/DSDT b/tests/data/acpi/q35/DSDT index d25cd7072932886d6967f4023faac1e1fa6e836c..00c60fca65ec37200fc0a17db2d6eb895a1553d2 100644 GIT binary patch delta 314 zcmexqGufWYCDly0x&%2obHsaiy6^`01sFIR7&1gR zxC8|mFmWYtaYQ!?fY{6du1-D*K*B?TBgiS#P0*Ojpi7&9frpWSNKnZj;>#8992Csa z1u}q(&)3t>ryjx<062P;;K_i^7;G3MpP{0FpssPBO1^knfxR`)^ Y83qOpxBv@S0Skz~1Z3-GDaLqN09%VpH2?qr delta 29 lcmbPi|I>!cCDk(iG?dSn=r-80sxN%2{r%# diff --git a/tests/data/acpi/q35/DSDT.acpihmat b/tests/data/acpi/q35/DSDT.acpihmat index 722e06af83abcde203a2b96a8ec81fd3bab9fc98..47547fa043d102578f6613cb7f19009a1ee5a868 100644 GIT binary patch delta 314 zcmZ4He!!EWxW9LM!R3=xMiG?fcqnkVgU4k5)IpRG$U3dfh0t}oD3>l&u zT!MlOn79(SIHDT`Ky2m!S0^6@AmO3F5#$u=CTPrM(5215z{AKuB&cK%@#Ttl4hrVz z0vW)?=j-X`Qx9Pa0ofi9rkJl|gb#!%1!Q{kgB7dA`?&fQfZUK!oxqq_oxsJGRGq-{ zvHeu>f0sxKZ2}S?_ diff --git a/tests/data/acpi/q35/DSDT.bridge b/tests/data/acpi/q35/DSDT.bridge index 06bac139d668ddfc7914e258b471a303c9dbd192..ab0d94da7d3dce23d18d5868760f5fd5ac6f7958 100644 GIT binary patch delta 314 zcmeCSU24ze66_MPRGxu>F?AwWDwC_s#KM*J(M=wLEzsX_;STN2L*F< zfehf{^Y!%esfVzIfNT#4Q_R;f!Uw{X0x~`N!HU)5eO&ztKyFB=PGC%|PT*oos!rhf z@&Et-WRS2&$^svj$%%{w$skh;Qb6Vb*+8R!Y@jI%_$DVY6z~9@DgZKR0srJAE+!yf YhJk?tF2Dj-zyjhg0ol4)im^}@0EnAQmjD0& delta 29 kcmZ2#-)+m~66_MvEyuvX*guggmC2iHV&TfoCQOC00D%$+m;e9( diff --git a/tests/data/acpi/q35/DSDT.cphp b/tests/data/acpi/q35/DSDT.cphp index 2b933ac482e6883efccbd7d6c96089602f2c0b4d..19f75894abfc33762dc4e2b973f17bb9e989e82e 100644 GIT binary patch delta 314 zcmX@<@YspVCDzsX_;STN2L*F< zfehf{^Y!%esfVzIfNT#4Q_R;f!Uw{X0x~`N!HU)5eO&ztKyFB=PGC%|PT*oos!rhf z@&Et-WRS2&$^svj$%%{w$skh;Qb6Vb*+8R!Y@jI%_$DVY6z~9@DgZKR0srJAE+!yf YhJk?tF2Dj-zyjhg0ol4)icw!40Gy{wWB>pF delta 29 kcmaFtbkc##CDzsX_;STN2L*F< zfehf{^Y!%esfVzIfNT#4Q_R;f!Uw{X0x~`N!HU)5eO&ztKyFB=PGC%|PT*oos!rhf z@&Et-WRS2&$^svj$%%{w$skh;Qb6Vb*+8R!Y@jI%_$DVY6z~9@DgZKR0srJAE+!yf YhJk?tF2Dj-zyjhg0ol4)it(y40RE&*V*mgE delta 29 lcmeD5dGE>P66_N4UWI{yQEehuDw8+Y#KM)EO_;7K0|1Tx31k2O diff --git a/tests/data/acpi/q35/DSDT.ipmibt b/tests/data/acpi/q35/DSDT.ipmibt index a8f868e23c25688ab1c0371016c071f23e9d732f..57c32c31a3fd40f5df01f743f062a5dcaa9b8231 100644 GIT binary patch delta 314 zcmX?Nd(WQBCDl&u zT!MlOn79(SIHDT`Ky2m!S0^6@AmO3F5#$u=CTPrM(5215z{AKuB&cK%@#Ttl4hrVz z0vW)?=j-X`Qx9Pa0ofi9rkJl|gb#!%1!Q{kgB7dA`?&fQfZUK!oxqq_oxsJGRGq-{ zk(iG?dSn=q}C1pthN2^RnW diff --git a/tests/data/acpi/q35/DSDT.memhp b/tests/data/acpi/q35/DSDT.memhp index 9a802e4c67022386442976d5cb997ea3fc57b58f..ae63519a139cf287cd6a1484c8298d17ee8c70dd 100644 GIT binary patch delta 314 zcmX@%{>YQdCDly0x&%2obHsaiy6^`01sFIR7&1gR zxC8|mFmWYtaYQ!?fY{6du1-D*K*B?TBgiS#P0*Ojpi7&9frpWSNKnZj;>#8992Csa z1u}q(&)3t>ryjx<062P;;K_i^7;G3MpP{0FpssPBO1^knfxR`)^ Y83qOpxBv@S0Skz~1Z3-GDaLh50PUPj0ssI2 delta 29 lcmaFldBUB`CDvHep()1OS^~3IhND diff --git a/tests/data/acpi/q35/DSDT.mmio64 b/tests/data/acpi/q35/DSDT.mmio64 index 948c2dc7264c31932b490ca00691a7c4d9aefdb0..689ff7d5a75bb3a1f98b81e6c0e5748528e3720e 100644 GIT binary patch delta 314 zcmaFj`p=!qCDl&u zT!MlOn79(SIHDT`Ky2m!S0^6@AmO3F5#$u=CTPrM(5215z{AKuB&cK%@#Ttl4hrVz z0vW)?=j-X`Qx9Pa0ofi9rkJl|gb#!%1!Q{kgB7dA`?&fQfZUK!oxqq_oxsJGRGq-{ zvHeouY2mqe~3L*di diff --git a/tests/data/acpi/q35/DSDT.nohpet b/tests/data/acpi/q35/DSDT.nohpet index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..73a7826f92a3ac99855c1d1ff1e9d72104e13e3a 100644 GIT binary patch literal 7941 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 biyt>L?@552Yzc&5b2%?gxUr%dtJL^E0NhP# literal 0 HcmV?d00001 diff --git a/tests/data/acpi/q35/DSDT.nosmm b/tests/data/acpi/q35/DSDT.nosmm index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..00c60fca65ec37200fc0a17db2d6eb895a1553d2 100644 GIT binary patch literal 8083 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 axRH5V0!*?c5Q2@RKpgPKvf5aojsFAO`F3gm literal 0 HcmV?d00001 diff --git a/tests/data/acpi/q35/DSDT.numamem b/tests/data/acpi/q35/DSDT.numamem index 44ec1b0af400da6d298284aa959aa38add7e6dd5..d1f45e46a95a98f720a5d8774c3e7a4cedb6adc5 100644 GIT binary patch delta 314 zcmexwGt-{SCDl&u zT!MlOn79(SIHDT`Ky2m!S0^6@AmO3F5#$u=CTPrM(5215z{AKuB&cK%@#Ttl4hrVz z0vW)?=j-X`Qx9Pa0ofi9rkJl|gb#!%1!Q{kgB7dA`?&fQfZUK!oxqq_oxsJGRGq-{ zk(iG?dSn=qxy0sxE82>1X1 diff --git a/tests/data/acpi/q35/DSDT.tis b/tests/data/acpi/q35/DSDT.tis index 30da3ec27958881801dacc954a343321ba26a2ae..eb66aff05a8a88aab07eda12a18e4bb4e3f11e5f 100644 GIT binary patch delta 314 zcmcca_|cimCDly0x&%2obHsaiy6^`01sFIR7&1gR zxC8|mFmWYtaYQ!?fY{6du1-D*K*B?TBgiS#P0*Ojpi7&9frpWSNKnZj;>#8992Csa z1u}q(&)3t>ryjx<062P;;K_i^7;G3MpP{0FpssPBO1^knfxR`)^ Y83qOpxBv@S0Skz~1Z3-GDaO6>0PK`a3;+NC delta 29 lcmez9eBF`DCDvHeuQ;4*;Bz3Jm}N 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 b79ac495c2..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,14 +1 @@ /* 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.ipmibt", -"tests/data/acpi/q35/DSDT.cphp", -"tests/data/acpi/q35/DSDT.memhp", -"tests/data/acpi/q35/DSDT.numamem", -"tests/data/acpi/q35/DSDT.dimmpxm", -"tests/data/acpi/q35/DSDT.acpihmat", -"tests/data/acpi/q35/DSDT.mmio64", -"tests/data/acpi/q35/DSDT.nosmm", -"tests/data/acpi/q35/FACP.nosmm", -"tests/data/acpi/q35/DSDT.nohpet",