From nobody Tue Feb 10 02:00:32 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612828800; cv=none; d=zohomail.com; s=zohoarc; b=fyyvawq49HKwzOLpilCEQgCvdC2nkfj6dDd6MWMxYDOuVKncPGYTCE5TVXE/zHzEcin9tN7mfJB59EFpqOspCa+QfQ5lMTGGp76r0SVfUbf0crnoK0ubxFNztlHLAP7uIHkfK7HBdp+SpvHI03wGP6xyeQHyDku1Nf5Na9YB06k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612828800; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=E6AhvOprotEcyk0EpvzWPIS/180W/g1rvea6ZAxNgao=; b=mJnmO1SeCjJocDFN/9GGT6fe48dFoJgZ1DGD5bnPYAyEKDym5y8tIfYylqb1uTTNi8DzsfbFIpMvPEgyhUg9qNt5Kjm8Wds4Gqpx4d/pbPOVAK7IRcKzXi5zrEPE/E5eCXWB9R428o6Y5K/lB4zi4uP3E1EpKGIgvVjN7QouT+M= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612828800784603.463950078829; Mon, 8 Feb 2021 16:00:00 -0800 (PST) Received: from localhost ([::1]:47902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9GRj-0001dB-My for importer@patchew.org; Mon, 08 Feb 2021 18:59:59 -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 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 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 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" IronPort-SDR: i7rp+8hcjmQmpxjEzPiX1+cUCy7vZ17vgtCOQv4dTghBRiULCLckt0nRnQ2IigQoP7sBvIiYAh ZzxRVaUjM4Mg== X-IronPort-AV: E=Sophos;i="5.81,163,1610438400"; d="scan'208";a="487608593" 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer=patchew.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 */) // _H= ID: 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 =3D VEND /* \_SB_.HPET.VEND */ - Local1 =3D PRD /* \_SB_.HPET.PRD_ */ - Local0 >>=3D 0x10 - If (((Local0 =3D=3D Zero) || (Local0 =3D=3D 0xFFFF))) - { - Return (Zero) - } - - If (((Local1 =3D=3D Zero) || (Local1 > 0x05F5E100))) - { - Return (Zero) - } - - Return (0x0F) - } - - Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings - { - Memory32Fixed (ReadOnly, - 0xFED00000, // Address Base - 0x00000400, // Address Length - ) - }) - } - } - Scope (_SB.PCI0) { Device (ISA) Reviewed-by: Philippe Mathieu-Daud=C3=A9 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); =20 - 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, =20 aml_append(dsdt, sb_scope); =20 - 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); --=20 2.17.1