{"id":810610,"url":"http://patchwork.ozlabs.org/api/patches/810610/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906134033.13348-3-anthony.perard@citrix.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170906134033.13348-3-anthony.perard@citrix.com>","list_archive_url":null,"date":"2017-09-06T13:40:32","name":"[v4,2/3] hw/acpi: Move acpi_set_pci_info to pcihp","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"e78da0ee9b5ec320bb512a8255c98e277383b5e3","submitter":{"id":4759,"url":"http://patchwork.ozlabs.org/api/people/4759/?format=json","name":"Anthony PERARD","email":"anthony.perard@citrix.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906134033.13348-3-anthony.perard@citrix.com/mbox/","series":[{"id":1811,"url":"http://patchwork.ozlabs.org/api/series/1811/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1811","date":"2017-09-06T13:40:32","name":"Fix hotplug of PCI passthrought device on Xen","version":4,"mbox":"http://patchwork.ozlabs.org/series/1811/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810610/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810610/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xnPrT1w9fz9t3Z\n\tfor ;\n\tWed, 6 Sep 2017 23:41:45 +1000 (AEST)","from localhost ([::1]:36205 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dpaaN-0004Xn-6Z\n\tfor incoming@patchwork.ozlabs.org; Wed, 06 Sep 2017 09:41:43 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:42488)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from )\n\tid 1dpaZd-0004Vs-29\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 09:40:58 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from )\n\tid 1dpaZY-0004kR-St\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 09:40:57 -0400","from smtp02.citrix.com ([66.165.176.63]:16701)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71)\n\t(envelope-from )\n\tid 1dpaZY-0004jg-Kp\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 09:40:52 -0400"],"X-IronPort-AV":"E=Sophos;i=\"5.41,484,1498521600\"; d=\"scan'208\";a=\"446782198\"","From":"Anthony PERARD ","To":"","Date":"Wed, 6 Sep 2017 14:40:32 +0100","Message-ID":"<20170906134033.13348-3-anthony.perard@citrix.com>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<20170906134033.13348-1-anthony.perard@citrix.com>","References":"<20170906134033.13348-1-anthony.perard@citrix.com>","MIME-Version":"1.0","Content-Type":"text/plain","X-detected-operating-system":"by eggs.gnu.org: Genre and OS details not\n\trecognized.","X-Received-From":"66.165.176.63","Subject":"[Qemu-devel] [PATCH v4 2/3] hw/acpi: Move acpi_set_pci_info to pcihp","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Eduardo Habkost ,\n\t\"Michael S. Tsirkin\" ,\n\tPaolo Bonzini , \n\tIgor Mammedov ,\n\tAnthony PERARD ,\n\txen-devel@lists.xenproject.org, Richard Henderson ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"HW part of ACPI PCI hotplug in QEMU depends on ACPI_PCIHP_PROP_BSEL\nbeing set on a PCI bus that supports ACPI hotplug. It should work\nregardless of the source of ACPI tables (QEMU generator/legacy SeaBIOS/Xen).\nSo move ACPI_PCIHP_PROP_BSEL initialization into HW ACPI implementation\npart from QEMU's ACPI table generator.\n\nTo do PCI passthrough with Xen, the property ACPI_PCIHP_PROP_BSEL needs\nto be set, but this was done only when ACPI tables are built which is\nnot needed for a Xen guest. The need for the property starts with commit\n\"pc: pcihp: avoid adding ACPI_PCIHP_PROP_BSEL twice\"\n(f0c9d64a68b776374ec4732424a3e27753ce37b6).\n\nAdding find_i440fx into stubs so that mips-softmmu target can be built.\n\nReported-by: Sander Eikelenboom \nSigned-off-by: Anthony PERARD \n\n---\nChanges in V4:\n - call acpi_set_pci_info only once\n - Add a stub of find_i440fx (for mips_softmmu target)\n\nChanges in V3:\n - move acpi_set_pci_info to pcihp instead\n\nChanges in V2:\n - check for acpi_enabled before calling acpi_set_pci_info.\n - set the property on the root bus only.\n---\n hw/acpi/pcihp.c | 38 ++++++++++++++++++++++++++++++++++++++\n hw/i386/acpi-build.c | 32 --------------------------------\n stubs/Makefile.objs | 1 +\n stubs/pci-host-piix.c | 6 ++++++\n 4 files changed, 45 insertions(+), 32 deletions(-)\n create mode 100644 stubs/pci-host-piix.c","diff":"diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c\nindex 9db3c2eaf2..7da51c0569 100644\n--- a/hw/acpi/pcihp.c\n+++ b/hw/acpi/pcihp.c\n@@ -75,6 +75,43 @@ static int acpi_pcihp_get_bsel(PCIBus *bus)\n }\n }\n \n+/* Assign BSEL property to all buses. In the future, this can be changed\n+ * to only assign to buses that support hotplug.\n+ */\n+static void *acpi_set_bsel(PCIBus *bus, void *opaque)\n+{\n+ unsigned *bsel_alloc = opaque;\n+ unsigned *bus_bsel;\n+\n+ if (qbus_is_hotpluggable(BUS(bus))) {\n+ bus_bsel = g_malloc(sizeof *bus_bsel);\n+\n+ *bus_bsel = (*bsel_alloc)++;\n+ object_property_add_uint32_ptr(OBJECT(bus), ACPI_PCIHP_PROP_BSEL,\n+ bus_bsel, &error_abort);\n+ }\n+\n+ return bsel_alloc;\n+}\n+\n+static void acpi_set_pci_info(void)\n+{\n+ static bool bsel_is_set;\n+ PCIBus *bus;\n+ unsigned bsel_alloc = ACPI_PCIHP_BSEL_DEFAULT;\n+\n+ if (bsel_is_set) {\n+ return;\n+ }\n+ bsel_is_set = true;\n+\n+ bus = find_i440fx(); /* TODO: Q35 support */\n+ if (bus) {\n+ /* Scan all PCI buses. Set property to enable acpi based hotplug. */\n+ pci_for_each_bus_depth_first(bus, acpi_set_bsel, NULL, &bsel_alloc);\n+ }\n+}\n+\n static void acpi_pcihp_test_hotplug_bus(PCIBus *bus, void *opaque)\n {\n AcpiPciHpFind *find = opaque;\n@@ -177,6 +214,7 @@ static void acpi_pcihp_update(AcpiPciHpState *s)\n \n void acpi_pcihp_reset(AcpiPciHpState *s)\n {\n+ acpi_set_pci_info();\n acpi_pcihp_update(s);\n }\n \ndiff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c\nindex 98dd424678..4d19d91e1b 100644\n--- a/hw/i386/acpi-build.c\n+++ b/hw/i386/acpi-build.c\n@@ -493,36 +493,6 @@ build_madt(GArray *table_data, BIOSLinker *linker, PCMachineState *pcms)\n table_data->len - madt_start, 1, NULL, NULL);\n }\n \n-/* Assign BSEL property to all buses. In the future, this can be changed\n- * to only assign to buses that support hotplug.\n- */\n-static void *acpi_set_bsel(PCIBus *bus, void *opaque)\n-{\n- unsigned *bsel_alloc = opaque;\n- unsigned *bus_bsel;\n-\n- if (qbus_is_hotpluggable(BUS(bus))) {\n- bus_bsel = g_malloc(sizeof *bus_bsel);\n-\n- *bus_bsel = (*bsel_alloc)++;\n- object_property_add_uint32_ptr(OBJECT(bus), ACPI_PCIHP_PROP_BSEL,\n- bus_bsel, &error_abort);\n- }\n-\n- return bsel_alloc;\n-}\n-\n-static void acpi_set_pci_info(void)\n-{\n- PCIBus *bus = find_i440fx(); /* TODO: Q35 support */\n- unsigned bsel_alloc = ACPI_PCIHP_BSEL_DEFAULT;\n-\n- if (bus) {\n- /* Scan all PCI buses. Set property to enable acpi based hotplug. */\n- pci_for_each_bus_depth_first(bus, acpi_set_bsel, NULL, &bsel_alloc);\n- }\n-}\n-\n static void build_append_pcihp_notify_entry(Aml *method, int slot)\n {\n Aml *if_ctx;\n@@ -2888,8 +2858,6 @@ void acpi_setup(void)\n \n build_state = g_malloc0(sizeof *build_state);\n \n- acpi_set_pci_info();\n-\n acpi_build_tables_init(&tables);\n acpi_build(&tables, MACHINE(pcms));\n \ndiff --git a/stubs/Makefile.objs b/stubs/Makefile.objs\nindex e69c217aff..4a33495911 100644\n--- a/stubs/Makefile.objs\n+++ b/stubs/Makefile.objs\n@@ -40,3 +40,4 @@ stub-obj-y += pc_madt_cpu_entry.o\n stub-obj-y += vmgenid.o\n stub-obj-y += xen-common.o\n stub-obj-y += xen-hvm.o\n+stub-obj-y += pci-host-piix.o\ndiff --git a/stubs/pci-host-piix.c b/stubs/pci-host-piix.c\nnew file mode 100644\nindex 0000000000..6ed81b1f21\n--- /dev/null\n+++ b/stubs/pci-host-piix.c\n@@ -0,0 +1,6 @@\n+#include \"qemu/osdep.h\"\n+#include \"hw/i386/pc.h\"\n+PCIBus *find_i440fx(void)\n+{\n+ return NULL;\n+}\n","prefixes":["v4","2/3"]}