| Message ID | 20200901094922.25514-2-ani@anisinha.ca |
|---|---|
| State | Superseded |
| Headers | show |
| Series | piix4: don't reserve hw resources when hotplug is off globally | expand |
Please provide comments for this patch. On Sep 1, 2020, 15:20 +0530, Ani Sinha <ani@anisinha.ca>, wrote: > When acpi hotplug is turned off for both root pci bus as well as for pci > bridges, we should not generate the related amls for DSDT table or initialize > related hw ports or reserve hw resources. This change makes sure all those > operations are turned off in the case acpi pci hotplug is off globally. > > Signed-off-by: Ani Sinha <ani@anisinha.ca> > --- > hw/acpi/piix4.c | 6 ++++-- > hw/i386/acpi-build.c | 10 ++++++++-- > 2 files changed, 12 insertions(+), 4 deletions(-) > > diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c > index e6163bb6ce..b70b1f98af 100644 > --- a/hw/acpi/piix4.c > +++ b/hw/acpi/piix4.c > @@ -596,8 +596,10 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent, > "acpi-gpe0", GPE_LEN); > memory_region_add_subregion(parent, GPE_BASE, &s->io_gpe); > > - acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent, > - s->use_acpi_hotplug_bridge); > + if (s->use_acpi_hotplug_bridge || s->use_acpi_root_pci_hotplug) { > + acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent, > + s->use_acpi_hotplug_bridge); > + } > > s->cpu_hotplug_legacy = true; > object_property_add_bool(OBJECT(s), "cpu-hotplug-legacy", > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index b7bcbbbb2a..5365b3d290 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -95,6 +95,7 @@ typedef struct AcpiPmInfo { > bool s3_disabled; > bool s4_disabled; > bool pcihp_bridge_en; > + bool pcihp_root_en; > uint8_t s4_val; > AcpiFadtData fadt; > uint16_t cpu_hp_io_base; > @@ -245,6 +246,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->pcihp_root_en = > + object_property_get_bool(obj, "acpi-root-pci-hotplug", > + NULL); > } > > static void acpi_get_misc_info(AcpiMiscInfo *info) > @@ -1504,7 +1508,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, > build_hpet_aml(dsdt); > build_piix4_isa_bridge(dsdt); > build_isa_devices_aml(dsdt); > - build_piix4_pci_hotplug(dsdt); > + if (pm->pcihp_bridge_en || pm->pcihp_root_en) { > + build_piix4_pci_hotplug(dsdt); > + } > build_piix4_pci0_int(dsdt); > } else { > sb_scope = aml_scope("_SB"); > @@ -1698,7 +1704,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, > crs_range_set_free(&crs_range_set); > > /* reserve PCIHP resources */ > - if (pm->pcihp_io_len) { > + if (pm->pcihp_io_len && (pm->pcihp_bridge_en || pm->pcihp_root_en)) { > dev = aml_device("PHPR"); > aml_append(dev, aml_name_decl("_HID", aml_string("PNP0A06"))); > aml_append(dev, > -- > 2.17.1 > <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title></title> </head> <body> <div name="messageBodySection"> <div dir="auto">Please provide comments for this patch.</div> </div> <div name="messageReplySection">On Sep 1, 2020, 15:20 +0530, Ani Sinha <ani@anisinha.ca>, wrote:<br /> <blockquote type="cite" style="border-left-color: grey; border-left-width: thin; border-left-style: solid; margin: 5px 5px;padding-left: 10px;">When acpi hotplug is turned off for both root pci bus as well as for pci<br /> bridges, we should not generate the related amls for DSDT table or initialize<br /> related hw ports or reserve hw resources. This change makes sure all those<br /> operations are turned off in the case acpi pci hotplug is off globally.<br /> <br /> Signed-off-by: Ani Sinha <ani@anisinha.ca><br /> ---<br /> hw/acpi/piix4.c | 6 ++++--<br /> hw/i386/acpi-build.c | 10 ++++++++--<br /> 2 files changed, 12 insertions(+), 4 deletions(-)<br /> <br /> diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c<br /> index e6163bb6ce..b70b1f98af 100644<br /> --- a/hw/acpi/piix4.c<br /> +++ b/hw/acpi/piix4.c<br /> @@ -596,8 +596,10 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent,<br /> "acpi-gpe0", GPE_LEN);<br /> memory_region_add_subregion(parent, GPE_BASE, &s->io_gpe);<br /> <br /> - acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent,<br /> - s->use_acpi_hotplug_bridge);<br /> + if (s->use_acpi_hotplug_bridge || s->use_acpi_root_pci_hotplug) {<br /> + acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent,<br /> + s->use_acpi_hotplug_bridge);<br /> + }<br /> <br /> s->cpu_hotplug_legacy = true;<br /> object_property_add_bool(OBJECT(s), "cpu-hotplug-legacy",<br /> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c<br /> index b7bcbbbb2a..5365b3d290 100644<br /> --- a/hw/i386/acpi-build.c<br /> +++ b/hw/i386/acpi-build.c<br /> @@ -95,6 +95,7 @@ typedef struct AcpiPmInfo {<br /> bool s3_disabled;<br /> bool s4_disabled;<br /> bool pcihp_bridge_en;<br /> + bool pcihp_root_en;<br /> uint8_t s4_val;<br /> AcpiFadtData fadt;<br /> uint16_t cpu_hp_io_base;<br /> @@ -245,6 +246,9 @@ static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm)<br /> pm->pcihp_bridge_en =<br /> object_property_get_bool(obj, "acpi-pci-hotplug-with-bridge-support",<br /> NULL);<br /> + pm->pcihp_root_en =<br /> + object_property_get_bool(obj, "acpi-root-pci-hotplug",<br /> + NULL);<br /> }<br /> <br /> static void acpi_get_misc_info(AcpiMiscInfo *info)<br /> @@ -1504,7 +1508,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,<br /> build_hpet_aml(dsdt);<br /> build_piix4_isa_bridge(dsdt);<br /> build_isa_devices_aml(dsdt);<br /> - build_piix4_pci_hotplug(dsdt);<br /> + if (pm->pcihp_bridge_en || pm->pcihp_root_en) {<br /> + build_piix4_pci_hotplug(dsdt);<br /> + }<br /> build_piix4_pci0_int(dsdt);<br /> } else {<br /> sb_scope = aml_scope("_SB");<br /> @@ -1698,7 +1704,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,<br /> crs_range_set_free(&crs_range_set);<br /> <br /> /* reserve PCIHP resources */<br /> - if (pm->pcihp_io_len) {<br /> + if (pm->pcihp_io_len && (pm->pcihp_bridge_en || pm->pcihp_root_en)) {<br /> dev = aml_device("PHPR");<br /> aml_append(dev, aml_name_decl("_HID", aml_string("PNP0A06")));<br /> aml_append(dev,<br /> --<br /> 2.17.1<br /> <br /></blockquote> </div> </body> </html>
On Tue, Sep 01, 2020 at 03:19:22PM +0530, Ani Sinha wrote: > When acpi hotplug is turned off for both root pci bus as well as for pci > bridges, we should not generate the related amls for DSDT table or initialize > related hw ports or reserve hw resources. This change makes sure all those > operations are turned off in the case acpi pci hotplug is off globally. > > Signed-off-by: Ani Sinha <ani@anisinha.ca> Queued. in the future pls do not reply to patch with a new version. Thanks! > --- > hw/acpi/piix4.c | 6 ++++-- > hw/i386/acpi-build.c | 10 ++++++++-- > 2 files changed, 12 insertions(+), 4 deletions(-) > > diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c > index e6163bb6ce..b70b1f98af 100644 > --- a/hw/acpi/piix4.c > +++ b/hw/acpi/piix4.c > @@ -596,8 +596,10 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent, > "acpi-gpe0", GPE_LEN); > memory_region_add_subregion(parent, GPE_BASE, &s->io_gpe); > > - acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent, > - s->use_acpi_hotplug_bridge); > + if (s->use_acpi_hotplug_bridge || s->use_acpi_root_pci_hotplug) { > + acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent, > + s->use_acpi_hotplug_bridge); > + } > > s->cpu_hotplug_legacy = true; > object_property_add_bool(OBJECT(s), "cpu-hotplug-legacy", > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index b7bcbbbb2a..5365b3d290 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -95,6 +95,7 @@ typedef struct AcpiPmInfo { > bool s3_disabled; > bool s4_disabled; > bool pcihp_bridge_en; > + bool pcihp_root_en; > uint8_t s4_val; > AcpiFadtData fadt; > uint16_t cpu_hp_io_base; > @@ -245,6 +246,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->pcihp_root_en = > + object_property_get_bool(obj, "acpi-root-pci-hotplug", > + NULL); > } > > static void acpi_get_misc_info(AcpiMiscInfo *info) > @@ -1504,7 +1508,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, > build_hpet_aml(dsdt); > build_piix4_isa_bridge(dsdt); > build_isa_devices_aml(dsdt); > - build_piix4_pci_hotplug(dsdt); > + if (pm->pcihp_bridge_en || pm->pcihp_root_en) { > + build_piix4_pci_hotplug(dsdt); > + } > build_piix4_pci0_int(dsdt); > } else { > sb_scope = aml_scope("_SB"); > @@ -1698,7 +1704,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, > crs_range_set_free(&crs_range_set); > > /* reserve PCIHP resources */ > - if (pm->pcihp_io_len) { > + if (pm->pcihp_io_len && (pm->pcihp_bridge_en || pm->pcihp_root_en)) { > dev = aml_device("PHPR"); > aml_append(dev, aml_name_decl("_HID", aml_string("PNP0A06"))); > aml_append(dev, > -- > 2.17.1
On Sep 8, 2020, 19:35 +0530, Michael S. Tsirkin <mst@redhat.com>, wrote: > On Tue, Sep 01, 2020 at 03:19:22PM +0530, Ani Sinha wrote: > > When acpi hotplug is turned off for both root pci bus as well as for pci > > bridges, we should not generate the related amls for DSDT table or initialize > > related hw ports or reserve hw resources. This change makes sure all those > > operations are turned off in the case acpi pci hotplug is off globally. > > > > Signed-off-by: Ani Sinha <ani@anisinha.ca> > > Queued. in the future pls do not reply to patch with a new version. What new version? This is the only version for this patch. You must be getting confused with some other patch I sent. I sent quite a few. > > Thanks! > > > --- > > hw/acpi/piix4.c | 6 ++++-- > > hw/i386/acpi-build.c | 10 ++++++++-- > > 2 files changed, 12 insertions(+), 4 deletions(-) > > > > diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c > > index e6163bb6ce..b70b1f98af 100644 > > --- a/hw/acpi/piix4.c > > +++ b/hw/acpi/piix4.c > > @@ -596,8 +596,10 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent, > > "acpi-gpe0", GPE_LEN); > > memory_region_add_subregion(parent, GPE_BASE, &s->io_gpe); > > > > - acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent, > > - s->use_acpi_hotplug_bridge); > > + if (s->use_acpi_hotplug_bridge || s->use_acpi_root_pci_hotplug) { > > + acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent, > > + s->use_acpi_hotplug_bridge); > > + } > > > > s->cpu_hotplug_legacy = true; > > object_property_add_bool(OBJECT(s), "cpu-hotplug-legacy", > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > > index b7bcbbbb2a..5365b3d290 100644 > > --- a/hw/i386/acpi-build.c > > +++ b/hw/i386/acpi-build.c > > @@ -95,6 +95,7 @@ typedef struct AcpiPmInfo { > > bool s3_disabled; > > bool s4_disabled; > > bool pcihp_bridge_en; > > + bool pcihp_root_en; > > uint8_t s4_val; > > AcpiFadtData fadt; > > uint16_t cpu_hp_io_base; > > @@ -245,6 +246,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->pcihp_root_en = > > + object_property_get_bool(obj, "acpi-root-pci-hotplug", > > + NULL); > > } > > > > static void acpi_get_misc_info(AcpiMiscInfo *info) > > @@ -1504,7 +1508,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, > > build_hpet_aml(dsdt); > > build_piix4_isa_bridge(dsdt); > > build_isa_devices_aml(dsdt); > > - build_piix4_pci_hotplug(dsdt); > > + if (pm->pcihp_bridge_en || pm->pcihp_root_en) { > > + build_piix4_pci_hotplug(dsdt); > > + } > > build_piix4_pci0_int(dsdt); > > } else { > > sb_scope = aml_scope("_SB"); > > @@ -1698,7 +1704,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, > > crs_range_set_free(&crs_range_set); > > > > /* reserve PCIHP resources */ > > - if (pm->pcihp_io_len) { > > + if (pm->pcihp_io_len && (pm->pcihp_bridge_en || pm->pcihp_root_en)) { > > dev = aml_device("PHPR"); > > aml_append(dev, aml_name_decl("_HID", aml_string("PNP0A06"))); > > aml_append(dev, > > -- > > 2.17.1 > <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title></title> </head> <body> <div name="messageReplySection"> <div dir="auto">On Sep 8, 2020, 19:35 +0530, Michael S. Tsirkin <mst@redhat.com>, wrote:</div> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">On Tue, Sep 01, 2020 at 03:19:22PM +0530, Ani Sinha wrote:</blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">When acpi hotplug is turned off for both root pci bus as well as for pci</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">bridges, we should not generate the related amls for DSDT table or initialize</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">related hw ports or reserve hw resources. This change makes sure all those</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">operations are turned off in the case acpi pci hotplug is off globally.</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;"><br /></blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">Signed-off-by: Ani Sinha <ani@anisinha.ca></blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;"><br /></blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">Queued. in the future pls do not reply to patch with a new version.</blockquote> <div dir="auto"><br /> What new version? This is the only version for this patch. <br /> <br /> You must be getting confused with some other patch I sent. I sent quite a few.<br /> <br /></div> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;"><br /></blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">Thanks!</blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;"><br /></blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">---</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">hw/acpi/piix4.c | 6 ++++--</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">hw/i386/acpi-build.c | 10 ++++++++--</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">2 files changed, 12 insertions(+), 4 deletions(-)</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;"><br /></blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">index e6163bb6ce..b70b1f98af 100644</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">--- a/hw/acpi/piix4.c</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">+++ b/hw/acpi/piix4.c</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">@@ -596,8 +596,10 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent,</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">"acpi-gpe0", GPE_LEN);</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">memory_region_add_subregion(parent, GPE_BASE, &s->io_gpe);</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;"><br /></blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">- acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent,</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">- s->use_acpi_hotplug_bridge);</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">+ if (s->use_acpi_hotplug_bridge || s->use_acpi_root_pci_hotplug) {</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">+ acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent,</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">+ s->use_acpi_hotplug_bridge);</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">+ }</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;"><br /></blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">s->cpu_hotplug_legacy = true;</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">object_property_add_bool(OBJECT(s), "cpu-hotplug-legacy",</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">index b7bcbbbb2a..5365b3d290 100644</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">--- a/hw/i386/acpi-build.c</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">+++ b/hw/i386/acpi-build.c</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">@@ -95,6 +95,7 @@ typedef struct AcpiPmInfo {</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">bool s3_disabled;</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">bool s4_disabled;</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">bool pcihp_bridge_en;</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">+ bool pcihp_root_en;</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">uint8_t s4_val;</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">AcpiFadtData fadt;</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">uint16_t cpu_hp_io_base;</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">@@ -245,6 +246,9 @@ static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm)</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">pm->pcihp_bridge_en =</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">object_property_get_bool(obj, "acpi-pci-hotplug-with-bridge-support",</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">NULL);</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">+ pm->pcihp_root_en =</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">+ object_property_get_bool(obj, "acpi-root-pci-hotplug",</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">+ NULL);</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">}</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;"><br /></blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">static void acpi_get_misc_info(AcpiMiscInfo *info)</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">@@ -1504,7 +1508,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">build_hpet_aml(dsdt);</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">build_piix4_isa_bridge(dsdt);</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">build_isa_devices_aml(dsdt);</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">- build_piix4_pci_hotplug(dsdt);</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">+ if (pm->pcihp_bridge_en || pm->pcihp_root_en) {</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">+ build_piix4_pci_hotplug(dsdt);</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">+ }</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">build_piix4_pci0_int(dsdt);</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">} else {</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">sb_scope = aml_scope("_SB");</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">@@ -1698,7 +1704,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">crs_range_set_free(&crs_range_set);</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;"><br /></blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">/* reserve PCIHP resources */</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">- if (pm->pcihp_io_len) {</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">+ if (pm->pcihp_io_len && (pm->pcihp_bridge_en || pm->pcihp_root_en)) {</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">dev = aml_device("PHPR");</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">aml_append(dev, aml_name_decl("_HID", aml_string("PNP0A06")));</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">aml_append(dev,</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">--</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid;"> <blockquote style="border-left-color: rgb(230, 126, 34); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;">2.17.1</blockquote> </blockquote> <blockquote style="border-left-color: rgb(26, 188, 156); margin: 0px; padding-left: 10px; border-left-width: thin; border-left-style: solid; padding-bottom: 5px; padding-top: 5px;"><br /></blockquote> </div> </body> </html>
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index e6163bb6ce..b70b1f98af 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -596,8 +596,10 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent, "acpi-gpe0", GPE_LEN); memory_region_add_subregion(parent, GPE_BASE, &s->io_gpe); - acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent, - s->use_acpi_hotplug_bridge); + if (s->use_acpi_hotplug_bridge || s->use_acpi_root_pci_hotplug) { + acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent, + s->use_acpi_hotplug_bridge); + } s->cpu_hotplug_legacy = true; object_property_add_bool(OBJECT(s), "cpu-hotplug-legacy", diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index b7bcbbbb2a..5365b3d290 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -95,6 +95,7 @@ typedef struct AcpiPmInfo { bool s3_disabled; bool s4_disabled; bool pcihp_bridge_en; + bool pcihp_root_en; uint8_t s4_val; AcpiFadtData fadt; uint16_t cpu_hp_io_base; @@ -245,6 +246,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->pcihp_root_en = + object_property_get_bool(obj, "acpi-root-pci-hotplug", + NULL); } static void acpi_get_misc_info(AcpiMiscInfo *info) @@ -1504,7 +1508,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, build_hpet_aml(dsdt); build_piix4_isa_bridge(dsdt); build_isa_devices_aml(dsdt); - build_piix4_pci_hotplug(dsdt); + if (pm->pcihp_bridge_en || pm->pcihp_root_en) { + build_piix4_pci_hotplug(dsdt); + } build_piix4_pci0_int(dsdt); } else { sb_scope = aml_scope("_SB"); @@ -1698,7 +1704,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, crs_range_set_free(&crs_range_set); /* reserve PCIHP resources */ - if (pm->pcihp_io_len) { + if (pm->pcihp_io_len && (pm->pcihp_bridge_en || pm->pcihp_root_en)) { dev = aml_device("PHPR"); aml_append(dev, aml_name_decl("_HID", aml_string("PNP0A06"))); aml_append(dev,
When acpi hotplug is turned off for both root pci bus as well as for pci bridges, we should not generate the related amls for DSDT table or initialize related hw ports or reserve hw resources. This change makes sure all those operations are turned off in the case acpi pci hotplug is off globally. Signed-off-by: Ani Sinha <ani@anisinha.ca> --- hw/acpi/piix4.c | 6 ++++-- hw/i386/acpi-build.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-)