From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57200) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dgDZy-0002mI-MB for qemu-devel@nongnu.org; Fri, 11 Aug 2017 13:18:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dgDZv-000705-Gu for qemu-devel@nongnu.org; Fri, 11 Aug 2017 13:18:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56306) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dgDZv-0006zV-B2 for qemu-devel@nongnu.org; Fri, 11 Aug 2017 13:18:31 -0400 Date: Fri, 11 Aug 2017 20:18:28 +0300 From: "Michael S. Tsirkin" Message-ID: <20170811201006-mutt-send-email-mst@kernel.org> References: <20170811151138.29405-1-anthony.perard@citrix.com> <20170811151138.29405-2-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170811151138.29405-2-anthony.perard@citrix.com> Subject: Re: [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: Anthony PERARD Cc: qemu-devel@nongnu.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Bruce Rogers , Igor Mammedov , Paolo Bonzini , Richard Henderson , Eduardo Habkost On Fri, Aug 11, 2017 at 04:11:37PM +0100, Anthony PERARD wrote: > 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 I am worried that Xen will come to depend on specific assignment of bsel which isn't guaranteed. Thoughts on how to avoid that? > > --- > 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.) Yes, please change it like this. Also, please add a comment explainging what it does. Thanks! > > 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: "Michael S. Tsirkin" Subject: Re: [PATCH for-2.10 1/2] hw/acpi: Call acpi_set_pci_info when no ACPI tables needed Date: Fri, 11 Aug 2017 20:18:28 +0300 Message-ID: <20170811201006-mutt-send-email-mst@kernel.org> References: <20170811151138.29405-1-anthony.perard@citrix.com> <20170811151138.29405-2-anthony.perard@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dgDZx-0006xA-8p for xen-devel@lists.xenproject.org; Fri, 11 Aug 2017 17:18:33 +0000 Content-Disposition: inline In-Reply-To: <20170811151138.29405-2-anthony.perard@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Anthony PERARD Cc: Stefano Stabellini , Eduardo Habkost , qemu-devel@nongnu.org, Bruce Rogers , Paolo Bonzini , Igor Mammedov , xen-devel@lists.xenproject.org, Richard Henderson List-Id: xen-devel@lists.xenproject.org T24gRnJpLCBBdWcgMTEsIDIwMTcgYXQgMDQ6MTE6MzdQTSArMDEwMCwgQW50aG9ueSBQRVJBUkQg d3JvdGU6Cj4gVG8gZG8gUENJIHBhc3N0aHJvdWdoIHdpdGggWGVuLCB0aGUgcHJvcGVydHkgYWNw aS1wY2locC1ic2VsIG5lZWRzIHRvIGJlCj4gc2V0LCBidXQgdGhpcyB3YXMgZG9uZSBvbmx5IHdo ZW4gQUNQSSB0YWJsZXMgYXJlIGJ1aWx0IHdoaWNoIGlzIG5vdAo+IG5lZWRlZCBmb3IgYSBYZW4g Z3Vlc3QuIFRoZSBuZWVkIGZvciB0aGUgcHJvcGVydHkgc3RhcnRzIHdpdGggY29tbWl0Cj4gInBj OiBwY2locDogYXZvaWQgYWRkaW5nIEFDUElfUENJSFBfUFJPUF9CU0VMIHR3aWNlIgo+IChmMGM5 ZDY0YTY4Yjc3NjM3NGVjNDczMjQyNGEzZTI3NzUzY2UzN2I2KS4KPiAKPiBTZXQgcGNpIGluZm8g YmVmb3JlIGNoZWNraW5nIGZvciB0aGUgbmVlZHMgdG8gYnVpbGQgQUNQSSB0YWJsZXMuCj4gCj4g UmVwb3J0ZWQtYnk6IFNhbmRlciBFaWtlbGVuYm9vbSA8bGludXhAZWlrZWxlbmJvb20uaXQ+Cj4g VGVzdGVkLWJ5OiBTYW5kZXIgRWlrZWxlbmJvb20gPGxpbnV4QGVpa2VsZW5ib29tLml0Pgo+IFNp Z25lZC1vZmYtYnk6IEFudGhvbnkgUEVSQVJEIDxhbnRob255LnBlcmFyZEBjaXRyaXguY29tPgoK SSBhbSB3b3JyaWVkIHRoYXQgWGVuIHdpbGwgY29tZSB0byBkZXBlbmQgb24gc3BlY2lmaWMKYXNz aWdubWVudCBvZiBic2VsIHdoaWNoIGlzbid0IGd1YXJhbnRlZWQuIFRob3VnaHRzIG9uCmhvdyB0 byBhdm9pZCB0aGF0PwoKCgo+IAo+IC0tLQo+IEluIHRoaXMgcGF0Y2ggcmF0aGVyIHRoYW4gYWx3 YXlzIGNhbGxpbmcgYWNwaV9zZXRfcGNpX2luZm8oKSB3aGVuCj4gYWNwaV9zZXR1cCgpIGlzIGNh bGxlZCwgd2UgY291bGQgY2hlY2sgZmlyc3QgZm9yIGFjcGlfZW5hYmxlZD8gKHdoaWNoIGlzCj4g dHJ1ZSBmb3IgWGVuLikKClllcywgcGxlYXNlIGNoYW5nZSBpdCBsaWtlIHRoaXMuIEFsc28sIHBs ZWFzZSBhZGQKYSBjb21tZW50IGV4cGxhaW5naW5nIHdoYXQgaXQgZG9lcy4KCgpUaGFua3MhCgo+ IAo+IFRoaXMgcGF0Y2ggd291bGQgYmUgYSBjYW5kaXRhZGUgdG8gYmFja3BvcnQgdG8gMi45Lgo+ IAo+IENDOiBTdGVmYW5vIFN0YWJlbGxpbmkgPHNzdGFiZWxsaW5pQGtlcm5lbC5vcmc+Cj4gQ0M6 IEJydWNlIFJvZ2VycyA8YnJvZ2Vyc0BzdXNlLmNvbT4KPiAtLS0KPiAgaHcvaTM4Ni9hY3BpLWJ1 aWxkLmMgfCA0ICsrLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgMiBkZWxl dGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvaHcvaTM4Ni9hY3BpLWJ1aWxkLmMgYi9ody9pMzg2 L2FjcGktYnVpbGQuYwo+IGluZGV4IDk4ZGQ0MjQ2NzguLmUxYjc3OTc0MDggMTAwNjQ0Cj4gLS0t IGEvaHcvaTM4Ni9hY3BpLWJ1aWxkLmMKPiArKysgYi9ody9pMzg2L2FjcGktYnVpbGQuYwo+IEBA IC0yODcxLDYgKzI4NzEsOCBAQCB2b2lkIGFjcGlfc2V0dXAodm9pZCkKPiAgICAgIEFjcGlCdWls ZFN0YXRlICpidWlsZF9zdGF0ZTsKPiAgICAgIE9iamVjdCAqdm1nZW5pZF9kZXY7Cj4gIAo+ICsg ICAgYWNwaV9zZXRfcGNpX2luZm8oKTsKPiArCj4gICAgICBpZiAoIXBjbXMtPmZ3X2NmZykgewo+ ICAgICAgICAgIEFDUElfQlVJTERfRFBSSU5URigiTm8gZncgY2ZnLiBCYWlsaW5nIG91dC5cbiIp Owo+ICAgICAgICAgIHJldHVybjsKPiBAQCAtMjg4OCw4ICsyODkwLDYgQEAgdm9pZCBhY3BpX3Nl dHVwKHZvaWQpCj4gIAo+ICAgICAgYnVpbGRfc3RhdGUgPSBnX21hbGxvYzAoc2l6ZW9mICpidWls ZF9zdGF0ZSk7Cj4gIAo+IC0gICAgYWNwaV9zZXRfcGNpX2luZm8oKTsKPiAtCj4gICAgICBhY3Bp X2J1aWxkX3RhYmxlc19pbml0KCZ0YWJsZXMpOwo+ICAgICAgYWNwaV9idWlsZCgmdGFibGVzLCBN QUNISU5FKHBjbXMpKTsKPiAgCj4gLS0gCj4gQW50aG9ueSBQRVJBUkQKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QK WGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=