From nobody Mon Feb 9 00:15:05 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=nutanix.com ARC-Seal: i=1; a=rsa-sha256; t=1589537257; cv=none; d=zohomail.com; s=zohoarc; b=CHithmSOPW4khIYjvoGXCeiL1Qx1U+mcK/+Cr8hQOrOy9q5vv7wNmWHYY3ocH98hMW1X9Nay8OKxHV2LWyNBvvW94H4qnjNGP1LhXBHVjiBcGyV0khkDXeuBfnKAt6rUFIqOvpxcfDZwh4msSDdzA/upLiMkx0ecjSx68RIrzBs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589537257; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=BjLTKJZEXVrOwBOXNjKUH6pt0qJQkhTNKCraKFYpfNg=; b=L4s9RX06fr+AAbaGIqxREMk7yk+2v13kVvdsLel0GKg3h5IZTJ6nQPOT7+uRuB1IOvj1d+P9vUzKzc0COKTJUJdTerZvgNQAQfcIOfAc28gEbl7euJBjTNIuaMRlBwXYZE+c8VyRKj/o1lfv+yRvLBU0YrXsgqo+IRl/Q/4djzw= 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 1589537257687480.11629890176096; Fri, 15 May 2020 03:07:37 -0700 (PDT) Received: from localhost ([::1]:59786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZXFg-0008Hv-Bd for importer@patchew.org; Fri, 15 May 2020 06:07:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44380) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZXEr-0007YI-B0 for qemu-devel@nongnu.org; Fri, 15 May 2020 06:06:46 -0400 Received: from [192.146.154.243] (port=3515 helo=mcp01.nutanix.com) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZXEq-0007js-Bt for qemu-devel@nongnu.org; Fri, 15 May 2020 06:06:45 -0400 Received: from ani-sinha1.localdomain (ani-sinha1.dev.nutanix.com [10.41.71.199]) by mcp01.nutanix.com (Postfix) with ESMTP id 540681026470; Fri, 15 May 2020 10:06:43 +0000 (UTC) Received: by ani-sinha1.localdomain (Postfix, from userid 16671) id 462156BCD; Fri, 15 May 2020 10:06:43 +0000 (UTC) From: Ani Sinha To: qemu-devel@nongnu.org Subject: [PATCH] Add a new PIIX option to control global PCI hot-plugging Date: Fri, 15 May 2020 10:06:35 +0000 Message-Id: <1589537195-31392-1-git-send-email-ani.sinha@nutanix.com> X-Mailer: git-send-email 1.8.3.1 X-Host-Lookup-Failed: Reverse DNS lookup failed for 192.146.154.243 (failed) 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: none client-ip=192.146.154.243; envelope-from=ani.sinha@ani-sinha1.localdomain; helo=mcp01.nutanix.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/15 06:06:43 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NO_DNS_FOR_FROM=0.001, RDNS_NONE=0.793, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ani Sinha , Eduardo Habkost , "Michael S. Tsirkin" , Aleksandar Markovic , Paolo Bonzini , ani@anisinha.ca, Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" A new option "acpi-pci-hotplug" is introduced for PIIX which will globally disable hot-plugging of both hot plugged and cold plugged PCI devices. This will prevent hot-plugging and hot un-plugging of devices from within Windows based guests using system tray. The patch has been tested on Windows 2016. Change-Id: I6a79f5c69dab2c06fc3578b098bf085fb8741ce6 Signed-off-by: Ani Sinha --- hw/acpi/piix4.c | 19 ++++++++++++------- hw/i386/acpi-build.c | 46 ++++++++++++++++++++++++++++++---------------- 2 files changed, 42 insertions(+), 23 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 964d6f5..1f86dd9 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -78,6 +78,7 @@ typedef struct PIIX4PMState { =20 AcpiPciHpState acpi_pci_hotplug; bool use_acpi_pci_hotplug; + bool use_acpi_hotplug_bridge; =20 uint8_t disable_s3; uint8_t disable_s4; @@ -207,13 +208,13 @@ static const VMStateDescription vmstate_pci_status = =3D { static bool vmstate_test_use_acpi_pci_hotplug(void *opaque, int version_id) { PIIX4PMState *s =3D opaque; - return s->use_acpi_pci_hotplug; + return s->use_acpi_hotplug_bridge; } =20 static bool vmstate_test_no_use_acpi_pci_hotplug(void *opaque, int version= _id) { PIIX4PMState *s =3D opaque; - return !s->use_acpi_pci_hotplug; + return !s->use_acpi_hotplug_bridge; } =20 static bool vmstate_test_use_memhp(void *opaque) @@ -505,8 +506,6 @@ static void piix4_pm_realize(PCIDevice *dev, Error **er= rp) =20 piix4_acpi_system_hot_add_init(pci_address_space_io(dev), pci_get_bus(dev), s); - qbus_set_hotplug_handler(BUS(pci_get_bus(dev)), OBJECT(s), &error_abor= t); - piix4_pm_add_propeties(s); } =20 @@ -528,7 +527,7 @@ I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t = smb_io_base, s->smi_irq =3D smi_irq; s->smm_enabled =3D smm_enabled; if (xen_enabled()) { - s->use_acpi_pci_hotplug =3D false; + s->use_acpi_hotplug_bridge =3D false; } =20 qdev_init_nofail(dev); @@ -593,8 +592,12 @@ static void piix4_acpi_system_hot_add_init(MemoryRegio= n *parent, memory_region_add_subregion(parent, GPE_BASE, &s->io_gpe); =20 acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent, - s->use_acpi_pci_hotplug); + s->use_acpi_hotplug_bridge); =20 + if (s->use_acpi_pci_hotplug) { + qbus_set_hotplug_handler(BUS(pci_get_bus(dev)), + OBJECT(s), &error_abort); + } s->cpu_hotplug_legacy =3D true; object_property_add_bool(OBJECT(s), "cpu-hotplug-legacy", piix4_get_cpu_hotplug_legacy, @@ -631,8 +634,10 @@ static Property piix4_pm_properties[] =3D { DEFINE_PROP_UINT8(ACPI_PM_PROP_S3_DISABLED, PIIX4PMState, disable_s3, = 0), DEFINE_PROP_UINT8(ACPI_PM_PROP_S4_DISABLED, PIIX4PMState, disable_s4, = 0), DEFINE_PROP_UINT8(ACPI_PM_PROP_S4_VAL, PIIX4PMState, s4_val, 2), - DEFINE_PROP_BOOL("acpi-pci-hotplug-with-bridge-support", PIIX4PMState, + DEFINE_PROP_BOOL("acpi-pci-hotplug", PIIX4PMState, use_acpi_pci_hotplug, true), + DEFINE_PROP_BOOL("acpi-pci-hotplug-with-bridge-support", PIIX4PMState, + use_acpi_hotplug_bridge, true), DEFINE_PROP_BOOL("memory-hotplug-support", PIIX4PMState, acpi_memory_hotplug.is_enabled, true), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 2e15f68..1737378 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -96,6 +96,7 @@ typedef struct AcpiPmInfo { bool s3_disabled; bool s4_disabled; bool pcihp_bridge_en; + bool acpi_pcihp_en; uint8_t s4_val; AcpiFadtData fadt; uint16_t cpu_hp_io_base; @@ -246,6 +247,9 @@ static void acpi_get_pm_info(MachineState *machine, Acp= iPmInfo *pm) pm->pcihp_bridge_en =3D object_property_get_bool(obj, "acpi-pci-hotplug-with-bridge-suppor= t", NULL); + pm->acpi_pcihp_en =3D + object_property_get_bool(obj, "acpi-pci-hotplug", + NULL); } =20 static void acpi_get_misc_info(AcpiMiscInfo *info) @@ -457,7 +461,8 @@ static void build_append_pcihp_notify_entry(Aml *method= , int slot) } =20 static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, - bool pcihp_bridge_en) + bool pcihp_bridge_en, + bool acpi_pcihp_en) { Aml *dev, *notify_method =3D NULL, *method; QObject *bsel; @@ -481,18 +486,25 @@ static void build_append_pci_bus_devices(Aml *parent_= scope, PCIBus *bus, bool bridge_in_acpi; =20 if (!pdev) { - if (bsel) { /* add hotplug slots for non present devices */ - dev =3D aml_device("S%.02X", PCI_DEVFN(slot, 0)); - aml_append(dev, aml_name_decl("_SUN", aml_int(slot))); - aml_append(dev, aml_name_decl("_ADR", aml_int(slot << 16))= ); - method =3D aml_method("_EJ0", 1, AML_NOTSERIALIZED); - aml_append(method, - aml_call2("PCEJ", aml_name("BSEL"), aml_name("_SUN")) - ); - aml_append(dev, method); - aml_append(parent_scope, dev); - - build_append_pcihp_notify_entry(notify_method, slot); + if (bsel) { + /* + * add hotplug slots for non present devices when + * acpi hotplug is enabled. + */ + if (acpi_pcihp_en) { + dev =3D aml_device("S%.02X", PCI_DEVFN(slot, 0)); + aml_append(dev, aml_name_decl("_SUN", aml_int(slot))); + aml_append(dev, aml_name_decl("_ADR", aml_int(slot << = 16))); + method =3D aml_method("_EJ0", 1, AML_NOTSERIALIZED); + aml_append(method, + aml_call2("PCEJ", aml_name("BSEL"), + aml_name("_SUN")) + ); + aml_append(dev, method); + aml_append(parent_scope, dev); + + build_append_pcihp_notify_entry(notify_method, slot); + } } continue; } @@ -539,7 +551,7 @@ static void build_append_pci_bus_devices(Aml *parent_sc= ope, PCIBus *bus, method =3D aml_method("_S3D", 0, AML_NOTSERIALIZED); aml_append(method, aml_return(aml_int(s3d))); aml_append(dev, method); - } else if (hotplug_enabled_dev) { + } else if (hotplug_enabled_dev && acpi_pcihp_en) { /* add _SUN/_EJ0 to make slot hotpluggable */ aml_append(dev, aml_name_decl("_SUN", aml_int(slot))); =20 @@ -559,7 +571,8 @@ static void build_append_pci_bus_devices(Aml *parent_sc= ope, PCIBus *bus, */ PCIBus *sec_bus =3D pci_bridge_get_sec_bus(PCI_BRIDGE(pdev)); =20 - build_append_pci_bus_devices(dev, sec_bus, pcihp_bridge_en); + build_append_pci_bus_devices(dev, sec_bus, pcihp_bridge_en, + acpi_pcihp_en); } /* slot descriptor has been composed, add it into parent context */ aml_append(parent_scope, dev); @@ -2197,7 +2210,8 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, if (bus) { Aml *scope =3D aml_scope("PCI0"); /* Scan all PCI buses. Generate tables to support hotplug. */ - build_append_pci_bus_devices(scope, bus, pm->pcihp_bridge_en); + build_append_pci_bus_devices(scope, bus, pm->pcihp_bridge_en, + pm->acpi_pcihp_en); =20 if (TPM_IS_TIS_ISA(tpm)) { if (misc->tpm_version =3D=3D TPM_VERSION_2_0) { --=20 1.9.4