[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH for-2.10 v3 2/3] hw/acpi: Move acpi_set_pci_info
From: |
Igor Mammedov |
Subject: |
Re: [Qemu-devel] [PATCH for-2.10 v3 2/3] hw/acpi: Move acpi_set_pci_info to pcihp |
Date: |
Fri, 18 Aug 2017 11:47:55 +0200 |
On Thu, 17 Aug 2017 17:23:46 +0100
Anthony PERARD <address@hidden> wrote:
> This means that the function will be call and the property
> acpi-pcihp-bsel will be set even if ACPI build is disable.
s/call/called/
s/disable/disabled/
Maybe something along this lines:
HW part of APCI PCI hotplug in QEMU depends on ACPI_PCIHP_PROP_BSEL
being set on a PCI bus that supports ACPI hotplug. It should work
regardless of source of ACPI tables (QEMU generator/legacy Seabios/Xen).
So move ACPI_PCIHP_PROP_BSEL initialization into HW ACPI impl. part
from QEMU's ACPI table generator.
>
> To do PCI passthrough with Xen, the property acpi-pcihp-bsel needs to be
> set, but this was done only when ACPI tables are built which is not
> needed for a Xen guest. The need for the property starts with commit
> "pc: pcihp: avoid adding ACPI_PCIHP_PROP_BSEL twice"
> (f0c9d64a68b776374ec4732424a3e27753ce37b6).
>
> Reported-by: Sander Eikelenboom <address@hidden>
> Signed-off-by: Anthony PERARD <address@hidden>
>
> ---
> Changes in V3:
> - move acpi_set_pci_info to pcihp instead
>
> Changes in V2:
> - check for acpi_enabled before calling acpi_set_pci_info.
> - set the property on the root bus only.
>
> This patch would be a canditade to backport to 2.9, along with
> "hw/acpi: Limit hotplug to root bus on legacy mode"
>
> CC: Stefano Stabellini <address@hidden>
> CC: Bruce Rogers <address@hidden>
> ---
> hw/acpi/pcihp.c | 31 +++++++++++++++++++++++++++++++
> hw/i386/acpi-build.c | 32 --------------------------------
> 2 files changed, 31 insertions(+), 32 deletions(-)
>
> diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c
> index 9db3c2eaf2..44e8842db8 100644
> --- a/hw/acpi/pcihp.c
> +++ b/hw/acpi/pcihp.c
> @@ -75,6 +75,36 @@ static int acpi_pcihp_get_bsel(PCIBus *bus)
> }
> }
>
> +/* Assign BSEL property to all buses. In the future, this can be changed
> + * to only assign to buses that support hotplug.
> + */
> +static void *acpi_set_bsel(PCIBus *bus, void *opaque)
> +{
> + unsigned *bsel_alloc = opaque;
> + unsigned *bus_bsel;
> +
> + if (qbus_is_hotpluggable(BUS(bus))) {
> + bus_bsel = g_malloc(sizeof *bus_bsel);
> +
> + *bus_bsel = (*bsel_alloc)++;
> + object_property_add_uint32_ptr(OBJECT(bus), ACPI_PCIHP_PROP_BSEL,
> + bus_bsel, &error_abort);
> + }
> +
> + return bsel_alloc;
> +}
> +
> +static void acpi_set_pci_info(void)
> +{
> + PCIBus *bus = find_i440fx(); /* TODO: Q35 support */
> + unsigned bsel_alloc = ACPI_PCIHP_BSEL_DEFAULT;
> +
> + if (bus) {
> + /* Scan all PCI buses. Set property to enable acpi based hotplug. */
> + pci_for_each_bus_depth_first(bus, acpi_set_bsel, NULL, &bsel_alloc);
> + }
> +}
> +
> static void acpi_pcihp_test_hotplug_bus(PCIBus *bus, void *opaque)
> {
> AcpiPciHpFind *find = opaque;
> @@ -177,6 +207,7 @@ static void acpi_pcihp_update(AcpiPciHpState *s)
>
> void acpi_pcihp_reset(AcpiPciHpState *s)
> {
> + acpi_set_pci_info();
> acpi_pcihp_update(s);
> }
>
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 98dd424678..4d19d91e1b 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -493,36 +493,6 @@ build_madt(GArray *table_data, BIOSLinker *linker,
> PCMachineState *pcms)
> table_data->len - madt_start, 1, NULL, NULL);
> }
>
> -/* Assign BSEL property to all buses. In the future, this can be changed
> - * to only assign to buses that support hotplug.
> - */
> -static void *acpi_set_bsel(PCIBus *bus, void *opaque)
> -{
> - unsigned *bsel_alloc = opaque;
> - unsigned *bus_bsel;
> -
> - if (qbus_is_hotpluggable(BUS(bus))) {
> - bus_bsel = g_malloc(sizeof *bus_bsel);
> -
> - *bus_bsel = (*bsel_alloc)++;
> - object_property_add_uint32_ptr(OBJECT(bus), ACPI_PCIHP_PROP_BSEL,
> - bus_bsel, &error_abort);
> - }
> -
> - return bsel_alloc;
> -}
> -
> -static void acpi_set_pci_info(void)
> -{
> - PCIBus *bus = find_i440fx(); /* TODO: Q35 support */
> - unsigned bsel_alloc = ACPI_PCIHP_BSEL_DEFAULT;
> -
> - if (bus) {
> - /* Scan all PCI buses. Set property to enable acpi based hotplug. */
> - pci_for_each_bus_depth_first(bus, acpi_set_bsel, NULL, &bsel_alloc);
> - }
> -}
> -
> static void build_append_pcihp_notify_entry(Aml *method, int slot)
> {
> Aml *if_ctx;
> @@ -2888,8 +2858,6 @@ void acpi_setup(void)
>
> build_state = g_malloc0(sizeof *build_state);
>
> - acpi_set_pci_info();
> -
> acpi_build_tables_init(&tables);
> acpi_build(&tables, MACHINE(pcms));
>
- [Qemu-devel] [PATCH for-2.10 v3 3/3] Revert "ACPI: don't call acpi_pcihp_device_plug_cb on xen", (continued)
- [Qemu-devel] [PATCH for-2.10 v3 3/3] Revert "ACPI: don't call acpi_pcihp_device_plug_cb on xen", Anthony PERARD, 2017/08/17
- [Qemu-devel] [PATCH for-2.10 v3 1/3] hw/acpi: Limit hotplug to root bus on legacy mode, Anthony PERARD, 2017/08/17
- [Qemu-devel] [PATCH for-2.10 v3 2/3] hw/acpi: Move acpi_set_pci_info to pcihp, Anthony PERARD, 2017/08/17
- Re: [Qemu-devel] [PATCH for-2.10 v3 2/3] hw/acpi: Move acpi_set_pci_info to pcihp, Michael S. Tsirkin, 2017/08/17
- Re: [Qemu-devel] [PATCH for-2.10 v3 2/3] hw/acpi: Move acpi_set_pci_info to pcihp, Igor Mammedov, 2017/08/18
- Re: [Qemu-devel] [PATCH for-2.10 v3 2/3] hw/acpi: Move acpi_set_pci_info to pcihp, Anthony PERARD, 2017/08/18
- Re: [Qemu-devel] [PATCH for-2.10 v3 2/3] hw/acpi: Move acpi_set_pci_info to pcihp, Igor Mammedov, 2017/08/18
- Re: [Qemu-devel] [PATCH for-2.10 v3 2/3] hw/acpi: Move acpi_set_pci_info to pcihp, Anthony PERARD, 2017/08/18
- Re: [Qemu-devel] [PATCH for-2.10 v3 2/3] hw/acpi: Move acpi_set_pci_info to pcihp, Michael S. Tsirkin, 2017/08/18
- Re: [Qemu-devel] [PATCH for-2.10 v3 2/3] hw/acpi: Move acpi_set_pci_info to pcihp, Michael S. Tsirkin, 2017/08/18
Re: [Qemu-devel] [PATCH for-2.10 v3 2/3] hw/acpi: Move acpi_set_pci_info to pcihp,
Igor Mammedov <=
Re: [Qemu-devel] [PATCH for-2.10 v3 0/3] Fix hotplug of PCI passthrought device on Xen, no-reply, 2017/08/17