From: "Michael S. Tsirkin" <mst@redhat.com>
To: Ani Sinha <ani.sinha@nutanix.com>
Cc: "Eduardo Habkost" <ehabkost@redhat.com>,
qemu-devel@nongnu.org,
"Aleksandar Markovic" <aleksandar.qemu.devel@gmail.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
ani@anisinha.ca, "Igor Mammedov" <imammedo@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Aurelien Jarno" <aurelien@aurel32.net>,
"Richard Henderson" <rth@twiddle.net>
Subject: Re: [PATCH V2] Add a new PIIX option to control PCI hot unplugging of devices on non-root buses
Date: Tue, 28 Apr 2020 12:05:47 -0400 [thread overview]
Message-ID: <20200428120426-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <1588069012-211196-1-git-send-email-ani.sinha@nutanix.com>
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.
>
> It has been tested on Windows guests.
>
> Signed-off-by: Ani Sinha <ani.sinha@nutanix.com>
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(-)
>
> 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 {
>
> AcpiPciHpState acpi_pci_hotplug;
> bool use_acpi_pci_hotplug;
> + bool use_acpi_unplug;
>
> uint8_t disable_s3;
> uint8_t disable_s4;
> @@ -633,6 +634,8 @@ static Property piix4_pm_properties[] = {
> 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, AcpiPmInfo *pm)
> pm->pcihp_bridge_en =
> object_property_get_bool(obj, "acpi-pci-hotplug-with-bridge-support",
> NULL);
> + pm->pcihup_bridge_en =
> + object_property_get_bool(obj, "acpi-pci-hotunplug-enable-bridge",
> + NULL);
> }
>
> static void acpi_get_misc_info(AcpiMiscInfo *info)
> @@ -451,7 +455,8 @@ static void build_append_pcihp_notify_entry(Aml *method, int slot)
> }
>
> 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 = NULL, *method;
> QObject *bsel;
> @@ -479,11 +484,14 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
> dev = 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 = 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 = 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);
> @@ -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)));
>
> - method = 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 = 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 = pci_bridge_get_sec_bus(PCI_BRIDGE(pdev));
>
> - 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 = 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);
>
> if (TPM_IS_TIS_ISA(tpm)) {
> if (misc->tpm_version == TPM_VERSION_2_0) {
> --
> 1.9.4
next prev parent reply other threads:[~2020-04-28 16:17 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-28 10:16 [PATCH V2] Add a new PIIX option to control PCI hot unplugging of devices on non-root buses Ani Sinha
2020-04-28 10:20 ` Ani Sinha
2020-04-28 16:05 ` Michael S. Tsirkin [this message]
2020-04-28 16:09 ` Ani Sinha
2020-04-28 16:21 ` Michael S. Tsirkin
2020-04-28 16:40 ` Ani Sinha
2020-04-28 20:45 ` Michael S. Tsirkin
2020-04-29 0:58 ` Ani Sinha
2020-04-29 5:28 ` Michael S. Tsirkin
2020-04-29 5:59 ` Ani Sinha
2020-04-29 6:11 ` Ani Sinha
2020-04-29 6:52 ` Michael S. Tsirkin
2020-04-29 6:54 ` Ani Sinha
2020-04-29 6:57 ` Michael S. Tsirkin
2020-04-29 7:02 ` Ani Sinha
2020-04-29 7:38 ` Michael S. Tsirkin
2020-04-29 7:43 ` Ani Sinha
2020-04-29 8:09 ` Michael S. Tsirkin
2020-04-29 8:14 ` Ani Sinha
2020-04-29 8:56 ` Michael S. Tsirkin
2020-04-29 9:14 ` Ani Sinha
2020-04-29 9:18 ` Ani Sinha
2020-04-29 10:15 ` Michael S. Tsirkin
2020-04-29 10:20 ` Ani Sinha
2020-04-29 10:30 ` Michael S. Tsirkin
2020-04-29 10:37 ` Ani Sinha
2020-04-30 17:12 ` Ani Sinha
2020-04-28 16:28 ` Daniel P. Berrangé
2020-04-28 16:30 ` Michael S. Tsirkin
2020-04-28 16:33 ` Daniel P. Berrangé
2020-04-28 20:44 ` Michael S. Tsirkin
2020-05-11 18:53 ` Igor Mammedov
2020-05-12 5:26 ` Ani Sinha
2020-05-13 19:43 ` Igor Mammedov
2020-05-15 12:13 ` Ani Sinha
2020-05-20 9:43 ` Igor Mammedow
2020-05-20 9:47 ` Michael S. Tsirkin
2020-05-20 9:56 ` Igor Mammedow
2020-05-20 10:06 ` Daniel P. Berrangé
2020-05-20 11:29 ` Michael S. Tsirkin
2020-05-20 11:42 ` Daniel P. Berrangé
2020-05-20 11:44 ` Michael S. Tsirkin
2020-05-20 10:28 ` Michael S. Tsirkin
2020-05-20 11:05 ` Igor Mammedow
2020-05-20 11:23 ` Michael S. Tsirkin
2020-05-20 12:20 ` Igor Mammedow
2020-05-20 16:13 ` Michael S. Tsirkin
2020-05-21 7:32 ` Igor Mammedow
2020-05-21 10:07 ` Michael S. Tsirkin
2020-05-21 13:23 ` Igor Mammedov
2020-05-21 15:40 ` Laine Stump
2020-05-26 5:32 ` Ani Sinha
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200428120426-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--cc=aleksandar.qemu.devel@gmail.com \
--cc=ani.sinha@nutanix.com \
--cc=ani@anisinha.ca \
--cc=aurelien@aurel32.net \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).