From nobody Fri May 17 08:24:58 2024 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=1588069952; cv=none; d=zohomail.com; s=zohoarc; b=lERCFNBdsVnQZ8jgJATPnVeOLAiFoOzouXDlN1rEGvavBXB8Ypk2qOf0J1Ff6lKSnEfdYbtTWkEWkNFShvC/sxq+uZnOXcf2F6S/x+Y0V+Vv71EU+3EEqdKnNJ0dH3yMp30IzWOEGLu16MOL3qhXXthg2oa7IA1JdVB2wxDHA1c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588069952; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=rDMZSxuf81iDqwNLDcJYw0o/EAJb7WqL5kCKW04zDtk=; b=iBfK5J1/B9t5g5ZfmXdXn/Tvsks+5GyHOoqphXYe+Az+MZbg62S2OxyVbVvAaxPSVSq/sGMwQbMgBjdqgVXSW0roTk4As97gPQrCVzXwgBHcDdWkAO7IdVtuyuvwP5FrpaWV2C+uYwWfG1DZNAc2wGJceB4n0VJFpDdbpZcZDbY= 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 158806995205550.9790532421971; Tue, 28 Apr 2020 03:32:32 -0700 (PDT) Received: from localhost ([::1]:52058 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTNXR-0007mf-VE for importer@patchew.org; Tue, 28 Apr 2020 06:32:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43880) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTNUQ-0006V1-Tm for qemu-devel@nongnu.org; Tue, 28 Apr 2020 06:31:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTNSD-0006Tx-OA for qemu-devel@nongnu.org; Tue, 28 Apr 2020 06:29:22 -0400 Received: from [192.146.154.243] (port=57668 helo=mcp01.nutanix.com) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTNSC-0006TI-N3 for qemu-devel@nongnu.org; Tue, 28 Apr 2020 06:27:05 -0400 Received: from ani-sinha1.localdomain (ani-sinha1.dev.nutanix.com [10.41.71.199]) by mcp01.nutanix.com (Postfix) with ESMTP id 78D191009CA8; Tue, 28 Apr 2020 10:17:09 +0000 (UTC) Received: by ani-sinha1.localdomain (Postfix, from userid 16671) id 6B51A2034E2; Tue, 28 Apr 2020 10:17:09 +0000 (UTC) From: Ani Sinha To: qemu-devel@nongnu.org Subject: [PATCH V2] Add a new PIIX option to control PCI hot unplugging of devices on non-root buses Date: Tue, 28 Apr 2020 10:16:52 +0000 Message-Id: <1588069012-211196-1-git-send-email-ani.sinha@nutanix.com> X-Mailer: git-send-email 1.8.3.1 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/04/28 06:17:09 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Received-From: 192.146.154.243 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 "use_acpi_unplug" is introduced for PIIX which will selectively only disable hot unplugging of both hot plugged and cold plugged PCI devices on non-root PCI buses. This will prevent hot unplugging of devices from Windows based guests from system tray but will not prevent devices from being hot plugged into the guest. It has been tested on Windows guests. Signed-off-by: Ani Sinha --- hw/acpi/piix4.c | 3 +++ hw/i386/acpi-build.c | 40 ++++++++++++++++++++++++++-------------- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 964d6f5..59fa707 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_unplug; =20 uint8_t disable_s3; uint8_t disable_s4; @@ -633,6 +634,8 @@ static Property piix4_pm_properties[] =3D { DEFINE_PROP_UINT8(ACPI_PM_PROP_S4_VAL, PIIX4PMState, s4_val, 2), DEFINE_PROP_BOOL("acpi-pci-hotplug-with-bridge-support", PIIX4PMState, use_acpi_pci_hotplug, true), + DEFINE_PROP_BOOL("acpi-pci-hotunplug-enable-bridge", PIIX4PMState, + use_acpi_unplug, 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 23c77ee..71b3ac3 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 pcihup_bridge_en; uint8_t s4_val; AcpiFadtData fadt; uint16_t cpu_hp_io_base; @@ -240,6 +241,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->pcihup_bridge_en =3D + object_property_get_bool(obj, "acpi-pci-hotunplug-enable-bridge", + NULL); } =20 static void acpi_get_misc_info(AcpiMiscInfo *info) @@ -451,7 +455,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 pcihup_bridge_en) { Aml *dev, *notify_method =3D NULL, *method; QObject *bsel; @@ -479,11 +484,14 @@ static void build_append_pci_bus_devices(Aml *parent_= scope, PCIBus *bus, 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); + if (pcihup_bridge_en || pci_bus_is_root(bus)) { + 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); =20 build_append_pcihp_notify_entry(notify_method, slot); @@ -537,12 +545,14 @@ static void build_append_pci_bus_devices(Aml *parent_= scope, PCIBus *bus, /* add _SUN/_EJ0 to make slot hotpluggable */ aml_append(dev, aml_name_decl("_SUN", aml_int(slot))); =20 - method =3D aml_method("_EJ0", 1, AML_NOTSERIALIZED); - aml_append(method, - aml_call2("PCEJ", aml_name("BSEL"), aml_name("_SUN")) - ); - aml_append(dev, method); - + if (pcihup_bridge_en || pci_bus_is_root(bus)) { + method =3D aml_method("_EJ0", 1, AML_NOTSERIALIZED); + aml_append(method, + aml_call2("PCEJ", aml_name("BSEL"), + aml_name("_SUN")) + ); + aml_append(dev, method); + } if (bsel) { build_append_pcihp_notify_entry(notify_method, slot); } @@ -553,7 +563,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, + pcihup_bridge_en); } /* slot descriptor has been composed, add it into parent context */ aml_append(parent_scope, dev); @@ -2196,7 +2207,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->pcihup_bridge_en); =20 if (TPM_IS_TIS_ISA(tpm)) { if (misc->tpm_version =3D=3D TPM_VERSION_2_0) { --=20 1.9.4