From mboxrd@z Thu Jan 1 00:00:00 1970 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=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 35E20C83009 for ; Tue, 28 Apr 2020 16:17:40 +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 F3EBF2054F for ; Tue, 28 Apr 2020 16:17:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="JTwQdgH5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F3EBF2054F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:37154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTSvT-0004m4-0J for qemu-devel@archiver.kernel.org; Tue, 28 Apr 2020 12:17:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59518) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTSss-0002hE-WE for qemu-devel@nongnu.org; Tue, 28 Apr 2020 12:16:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTSk8-0002Ie-C0 for qemu-devel@nongnu.org; Tue, 28 Apr 2020 12:09:58 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:53833 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jTSk7-00023y-Mk for qemu-devel@nongnu.org; Tue, 28 Apr 2020 12:05:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588089953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xYNZ7zYwovVqYsfLzXfDG8FCbD/YpLPcf/t1ZhtQFk0=; b=JTwQdgH5b4AStFKilmpqKCeo3p02qygKml3VJeE6McKL3igkQHYzZkKZZCojNcx1z2d9kP KphsXRhFWXI75XJXJgrxRLf3hvaQTmGP+Svud/VPefm2ZtKIk1QxIYbrETNqY5BNKQFJbG 5gODGfC8GqOpUgPUkXWAexJq88vEAeE= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-195-7nTxExK6PF65dSTB9wOJ_Q-1; Tue, 28 Apr 2020 12:05:52 -0400 X-MC-Unique: 7nTxExK6PF65dSTB9wOJ_Q-1 Received: by mail-wr1-f71.google.com with SMTP id m5so12503620wru.15 for ; Tue, 28 Apr 2020 09:05:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=Noxzj0/rOZFqgSGb8itTnhw85czapLK0gOkpNoJTDCI=; b=aho+mvby0+qnV/om3j5NFM5gV56wbgsGWuQRyKa6nHClAByorbn8ryQGGAwYs3n7Y3 X39IEjXg80c8UAceq+dDSztZjIvnMBOhzYDVoAgUBClZzgQh97iAxUayeIFxB6T15LAP poRCNz63ppkKBjgGM0a8Kw2OO6eO/o9nREoqZPCrNrR5UUN1fjhX+A2Do9hzr1NO9ftr PtS49g/Ti/T9Xk+4rxT7aVvotn7yHme6kq58LUqEnYI96iAAx2mDh8w/DIHcIsg3fg74 /KJtjT7SkeGaFJziENBx3E2dMoWBSvZ5Wy9E4F2oAiPdw2I9zTGqOAF1cU4dp+NN5rRY 4nTg== X-Gm-Message-State: AGi0PuYEUBv6OfOhBLp9vXS/iI7olRZ0zI2OPuvdJm/e7XPaZXIMjew2 WIHFFUTIpfcjSRfrfqpUV2IQZa99qpERhBuQp1o5KrQ4W86qhMynzI7T4OkfPVAVtbQwLzZgi6s /z4/Qy5xTraa8JRU= X-Received: by 2002:a5d:4fc6:: with SMTP id h6mr35938456wrw.277.1588089950929; Tue, 28 Apr 2020 09:05:50 -0700 (PDT) X-Google-Smtp-Source: APiQypJdjt8kHWhGyX7Zh/1M0WMeVcNJkVNGp8r5X0P8NJhAVa9Zr9BdET0x/qYpc5S59fvLAarI4Q== X-Received: by 2002:a5d:4fc6:: with SMTP id h6mr35938423wrw.277.1588089950612; Tue, 28 Apr 2020 09:05:50 -0700 (PDT) Received: from redhat.com (bzq-109-66-7-121.red.bezeqint.net. [109.66.7.121]) by smtp.gmail.com with ESMTPSA id p6sm25877857wrt.3.2020.04.28.09.05.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2020 09:05:49 -0700 (PDT) Date: Tue, 28 Apr 2020 12:05:47 -0400 From: "Michael S. Tsirkin" To: Ani Sinha Subject: Re: [PATCH V2] Add a new PIIX option to control PCI hot unplugging of devices on non-root buses Message-ID: <20200428120426-mutt-send-email-mst@kernel.org> References: <1588069012-211196-1-git-send-email-ani.sinha@nutanix.com> MIME-Version: 1.0 In-Reply-To: <1588069012-211196-1-git-send-email-ani.sinha@nutanix.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Received-SPF: pass client-ip=207.211.31.81; envelope-from=mst@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/28 04:11:46 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: Eduardo Habkost , qemu-devel@nongnu.org, Aleksandar Markovic , Paolo Bonzini , ani@anisinha.ca, Igor Mammedov , Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, Apr 28, 2020 at 10:16:52AM +0000, Ani Sinha wrote: > 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. >=20 > It has been tested on Windows guests. >=20 > Signed-off-by: Ani Sinha It's still a non starter until we find something similar for PCIE and SHPC. Do guests check command status? Can some unplug commands fail? > --- > hw/acpi/piix4.c | 3 +++ > hw/i386/acpi-build.c | 40 ++++++++++++++++++++++++++-------------- > 2 files changed, 29 insertions(+), 14 deletions(-) >=20 > 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", PIIX4PMStat= e, > 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, A= cpiPmInfo *pm) > pm->pcihp_bridge_en =3D > object_property_get_bool(obj, "acpi-pci-hotplug-with-bridge-supp= ort", > 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 *meth= od, 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 *paren= t_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 *paren= t_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_= scope, 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