From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48419) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dgBbI-0005Hj-Or for qemu-devel@nongnu.org; Fri, 11 Aug 2017 11:11:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dgBbE-0000hs-NO for qemu-devel@nongnu.org; Fri, 11 Aug 2017 11:11:48 -0400 Received: from smtp.citrix.com ([66.165.176.89]:27106) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1dgBbE-0000gJ-GD for qemu-devel@nongnu.org; Fri, 11 Aug 2017 11:11:44 -0400 From: Anthony PERARD Date: Fri, 11 Aug 2017 16:11:37 +0100 Message-ID: <20170811151138.29405-2-anthony.perard@citrix.com> In-Reply-To: <20170811151138.29405-1-anthony.perard@citrix.com> References: <20170811151138.29405-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH for-2.10 1/2] hw/acpi: Call acpi_set_pci_info when no ACPI tables needed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony PERARD , xen-devel@lists.xenproject.org, Stefano Stabellini , Bruce Rogers , "Michael S. Tsirkin" , Igor Mammedov , Paolo Bonzini , Richard Henderson , Eduardo Habkost 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). Set pci info before checking for the needs to build ACPI tables. Reported-by: Sander Eikelenboom Tested-by: Sander Eikelenboom Signed-off-by: Anthony PERARD --- In this patch rather than always calling acpi_set_pci_info() when acpi_setup() is called, we could check first for acpi_enabled? (which is true for Xen.) This patch would be a canditade to backport to 2.9. CC: Stefano Stabellini CC: Bruce Rogers --- hw/i386/acpi-build.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 98dd424678..e1b7797408 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2871,6 +2871,8 @@ void acpi_setup(void) AcpiBuildState *build_state; Object *vmgenid_dev; + acpi_set_pci_info(); + if (!pcms->fw_cfg) { ACPI_BUILD_DPRINTF("No fw cfg. Bailing out.\n"); return; @@ -2888,8 +2890,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)); -- Anthony PERARD From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anthony PERARD Subject: [PATCH for-2.10 1/2] hw/acpi: Call acpi_set_pci_info when no ACPI tables needed Date: Fri, 11 Aug 2017 16:11:37 +0100 Message-ID: <20170811151138.29405-2-anthony.perard@citrix.com> References: <20170811151138.29405-1-anthony.perard@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dgBbD-0003pB-0X for xen-devel@lists.xenproject.org; Fri, 11 Aug 2017 15:11:43 +0000 In-Reply-To: <20170811151138.29405-1-anthony.perard@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: qemu-devel@nongnu.org Cc: Stefano Stabellini , Eduardo Habkost , "Michael S. Tsirkin" , Bruce Rogers , Paolo Bonzini , Igor Mammedov , Anthony PERARD , xen-devel@lists.xenproject.org, Richard Henderson List-Id: xen-devel@lists.xenproject.org VG8gZG8gUENJIHBhc3N0aHJvdWdoIHdpdGggWGVuLCB0aGUgcHJvcGVydHkgYWNwaS1wY2locC1i c2VsIG5lZWRzIHRvIGJlCnNldCwgYnV0IHRoaXMgd2FzIGRvbmUgb25seSB3aGVuIEFDUEkgdGFi bGVzIGFyZSBidWlsdCB3aGljaCBpcyBub3QKbmVlZGVkIGZvciBhIFhlbiBndWVzdC4gVGhlIG5l ZWQgZm9yIHRoZSBwcm9wZXJ0eSBzdGFydHMgd2l0aCBjb21taXQKInBjOiBwY2locDogYXZvaWQg YWRkaW5nIEFDUElfUENJSFBfUFJPUF9CU0VMIHR3aWNlIgooZjBjOWQ2NGE2OGI3NzYzNzRlYzQ3 MzI0MjRhM2UyNzc1M2NlMzdiNikuCgpTZXQgcGNpIGluZm8gYmVmb3JlIGNoZWNraW5nIGZvciB0 aGUgbmVlZHMgdG8gYnVpbGQgQUNQSSB0YWJsZXMuCgpSZXBvcnRlZC1ieTogU2FuZGVyIEVpa2Vs ZW5ib29tIDxsaW51eEBlaWtlbGVuYm9vbS5pdD4KVGVzdGVkLWJ5OiBTYW5kZXIgRWlrZWxlbmJv b20gPGxpbnV4QGVpa2VsZW5ib29tLml0PgpTaWduZWQtb2ZmLWJ5OiBBbnRob255IFBFUkFSRCA8 YW50aG9ueS5wZXJhcmRAY2l0cml4LmNvbT4KCi0tLQpJbiB0aGlzIHBhdGNoIHJhdGhlciB0aGFu IGFsd2F5cyBjYWxsaW5nIGFjcGlfc2V0X3BjaV9pbmZvKCkgd2hlbgphY3BpX3NldHVwKCkgaXMg Y2FsbGVkLCB3ZSBjb3VsZCBjaGVjayBmaXJzdCBmb3IgYWNwaV9lbmFibGVkPyAod2hpY2ggaXMK dHJ1ZSBmb3IgWGVuLikKClRoaXMgcGF0Y2ggd291bGQgYmUgYSBjYW5kaXRhZGUgdG8gYmFja3Bv cnQgdG8gMi45LgoKQ0M6IFN0ZWZhbm8gU3RhYmVsbGluaSA8c3N0YWJlbGxpbmlAa2VybmVsLm9y Zz4KQ0M6IEJydWNlIFJvZ2VycyA8YnJvZ2Vyc0BzdXNlLmNvbT4KLS0tCiBody9pMzg2L2FjcGkt YnVpbGQuYyB8IDQgKystLQogMSBmaWxlIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgMiBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ody9pMzg2L2FjcGktYnVpbGQuYyBiL2h3L2kzODYvYWNw aS1idWlsZC5jCmluZGV4IDk4ZGQ0MjQ2NzguLmUxYjc3OTc0MDggMTAwNjQ0Ci0tLSBhL2h3L2kz ODYvYWNwaS1idWlsZC5jCisrKyBiL2h3L2kzODYvYWNwaS1idWlsZC5jCkBAIC0yODcxLDYgKzI4 NzEsOCBAQCB2b2lkIGFjcGlfc2V0dXAodm9pZCkKICAgICBBY3BpQnVpbGRTdGF0ZSAqYnVpbGRf c3RhdGU7CiAgICAgT2JqZWN0ICp2bWdlbmlkX2RldjsKIAorICAgIGFjcGlfc2V0X3BjaV9pbmZv KCk7CisKICAgICBpZiAoIXBjbXMtPmZ3X2NmZykgewogICAgICAgICBBQ1BJX0JVSUxEX0RQUklO VEYoIk5vIGZ3IGNmZy4gQmFpbGluZyBvdXQuXG4iKTsKICAgICAgICAgcmV0dXJuOwpAQCAtMjg4 OCw4ICsyODkwLDYgQEAgdm9pZCBhY3BpX3NldHVwKHZvaWQpCiAKICAgICBidWlsZF9zdGF0ZSA9 IGdfbWFsbG9jMChzaXplb2YgKmJ1aWxkX3N0YXRlKTsKIAotICAgIGFjcGlfc2V0X3BjaV9pbmZv KCk7Ci0KICAgICBhY3BpX2J1aWxkX3RhYmxlc19pbml0KCZ0YWJsZXMpOwogICAgIGFjcGlfYnVp bGQoJnRhYmxlcywgTUFDSElORShwY21zKSk7CiAKLS0gCkFudGhvbnkgUEVSQVJECgoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxp bmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVu LWRldmVsCg==