{"id":811620,"url":"http://patchwork.ozlabs.org/api/1.2/patches/811620/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504880304-12069-5-git-send-email-mst@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/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":"<1504880304-12069-5-git-send-email-mst@redhat.com>","list_archive_url":null,"date":"2017-09-08T14:19:08","name":"[PULL,04/17] hw/acpi: Move acpi_set_pci_info to pcihp","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"37d8f46da6f107b44962dc5e23efe87ff473d75e","submitter":{"id":2235,"url":"http://patchwork.ozlabs.org/api/1.2/people/2235/?format=json","name":"Michael S. Tsirkin","email":"mst@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504880304-12069-5-git-send-email-mst@redhat.com/mbox/","series":[{"id":2227,"url":"http://patchwork.ozlabs.org/api/1.2/series/2227/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2227","date":"2017-09-08T14:18:52","name":"[PULL,01/17] vhost: Release memory references on cleanup","version":1,"mbox":"http://patchwork.ozlabs.org/series/2227/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811620/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811620/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=)","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=mst@redhat.com"],"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 3xpfbd6YvVz9rvt\n\tfor ;\n\tSat, 9 Sep 2017 00:19:57 +1000 (AEST)","from localhost ([::1]:45668 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dqK8R-0006aD-VH\n\tfor incoming@patchwork.ozlabs.org; Fri, 08 Sep 2017 10:19:55 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:48992)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dqK7l-0006YZ-V8\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 10:19:15 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dqK7k-0004sK-Js\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 10:19:13 -0400","from mx1.redhat.com ([209.132.183.28]:40068)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dqK7k-0004rT-9T\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 10:19:12 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 5E69AC047B68;\n\tFri, 8 Sep 2017 14:19:11 +0000 (UTC)","from redhat.com (ovpn-120-144.rdu2.redhat.com [10.10.120.144])\n\tby smtp.corp.redhat.com (Postfix) with SMTP id CCF8E619CA;\n\tFri, 8 Sep 2017 14:19:08 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 5E69AC047B68","Date":"Fri, 8 Sep 2017 17:19:08 +0300","From":"\"Michael S. Tsirkin\" ","To":"qemu-devel@nongnu.org","Message-ID":"<1504880304-12069-5-git-send-email-mst@redhat.com>","References":"<1504880304-12069-1-git-send-email-mst@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"<1504880304-12069-1-git-send-email-mst@redhat.com>","X-Mutt-Fcc":"=sent","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.12","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.31]);\n\tFri, 08 Sep 2017 14:19:11 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL 04/17] 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":"Peter Maydell ,\n\tEduardo Habkost ,\n\tSander Eikelenboom ,\n\tPaolo Bonzini ,\n\tAnthony PERARD ,\n\tIgor Mammedov , Richard Henderson ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Anthony PERARD \n\nHW 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 \nReviewed-by: Michael S. Tsirkin \nSigned-off-by: Michael S. Tsirkin \n---\n hw/acpi/pcihp.c | 38 ++++++++++++++++++++++++++++++++++++++\n hw/i386/acpi-build.c | 32 --------------------------------\n stubs/pci-host-piix.c | 6 ++++++\n stubs/Makefile.objs | 1 +\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 9db3c2e..7da51c0 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 98dd424..4d19d91 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/pci-host-piix.c b/stubs/pci-host-piix.c\nnew file mode 100644\nindex 0000000..6ed81b1\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+}\ndiff --git a/stubs/Makefile.objs b/stubs/Makefile.objs\nindex e69c217..4a33495 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\n","prefixes":["PULL","04/17"]}