From: Roger Pau Monne Subject: [PATCH for-4.12 v3 2/8] x86/pvh: reorder PVH dom0 iommu initialization Date: Fri, 15 Feb 2019 15:18:31 +0100 Message-ID: <20190215141837.1420-3-roger.pau@citrix.com> References: <20190215141837.1420-1-roger.pau@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gueKi-00015r-CS for xen-devel@lists.xenproject.org; Fri, 15 Feb 2019 14:19:16 +0000 In-Reply-To: <20190215141837.1420-1-roger.pau@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Andrew Cooper , Wei Liu , Jan Beulich , Roger Pau Monne List-Id: xen-devel@lists.xenproject.org U28gdGhhdCB0aGUgaW9tbXUgaXMgaW5pdGlhbGl6ZWQgYmVmb3JlIHBvcHVsYXRpbmcgdGhlIHAy bSwgYW5kCmVudHJpZXMgYWRkZWQgZ2V0IHRoZSBjb3JyZXNwb25kaW5nIGlvbW11IHBhZ2UgdGFi bGUgZW50cmllcyBpZgpyZXF1aXJlZC4gVGhpcyByZXF1aXJlcyBzcGxpdHRpbmcgdGhlIGN1cnJl bnQgcHZoX3NldHVwX3AybSBpbnRvIHR3bwpkaWZmZXJlbnQgZnVuY3Rpb25zLiBPbmUgdGhhdCBj cmFmdHMgZG9tMCBwaHlzbWFwIGFuZCBzZXRzIHRoZSBwYWdpbmcKYWxsb2NhdGlvbiwgYW5kIGFu b3RoZXIgb25lIHRoYXQgYWN0dWFsbHkgcG9wdWxhdGVzIHRoZSBwMm0gd2l0aCBSQU0KcmVnaW9u cy4KCk5vdGUgdGhhdCB0aGlzIGFsbG93cyB0byByZW1vdmUgdGhlIHNwZWNpYWwgY2FzaW5nIGRv bmUgZm9yIHRoZSBsb3cKMU1CIGluIGh3ZG9tX2lvbW11X21hcC4KClNpZ25lZC1vZmYtYnk6IFJv Z2VyIFBhdSBNb25uw6kgPHJvZ2VyLnBhdUBjaXRyaXguY29tPgpSZXZpZXdlZC1ieTogSmFuIEJl dWxpY2ggPGpiZXVsaWNoQHN1c2UuY29tPgotLS0KQ2M6IEphbiBCZXVsaWNoIDxqYmV1bGljaEBz dXNlLmNvbT4KQ2M6IEFuZHJldyBDb29wZXIgPGFuZHJldy5jb29wZXIzQGNpdHJpeC5jb20+CkNj OiBXZWkgTGl1IDx3ZWkubGl1MkBjaXRyaXguY29tPgotLS0KQ2hhbmdlcyBzaW5jZSB2MToKIC0g TmV3IGluIHRoaXMgdmVyc2lvbi4KLS0tClRoZSBwcmV2aW91cyBmbG93LCB3aGVyZSB0aGUgaW9t bXUgd2FzIGVuYWJsZWQgYWZ0ZXIgaGF2aW5nIHBvcHVsYXRlZAp0aGUgcDJtIHdhcyB1c2VkIHRv IHdvcmthcm91bmQgYW4gaXNzdWUgb24gYW4gb2xkIHByZS1IYXN3ZWxsIEludGVsCmJveC4gSSBu byBsb25nZXIgaGF2ZSB0aGF0IGJveCwgYW5kIHdoZW4gSSB0ZXN0ZWQgUFZIIGRvbTAgb24gaXQg d2FzCmJlZm9yZSB0aGUgaW9tbXUgbWFwLXJlc2VydmVkIGZpeGVzLgoKSWYgaGFyZHdhcmUgbmVl ZGluZyB0aGUgaW9tbXUgcGFnZSB0YWJsZXMgdG8gY29udGFpbiBSQU0gcmVnaW9ucyBpcwpmb3Vu ZCBJJ20gaGFwcHkgdG8gd29yayBvbiBvdGhlciBzb2x1dGlvbnMsIGxpa2UgcGVyZm9ybWluZyB0 aGUgc2V0dXAKb2YgdGhlIGlvbW11IGF0IHRoZSBzdGFydCBvZiBkb20wX2NvbnN0cnVjdF9wdmgg YnV0IG9ubHkgZW5hYmxpbmcgaXQKd2hlbiBkb20wIHAybSBpcyBmdWxseSBwb3B1bGF0ZWQuCi0t LQogeGVuL2FyY2gveDg2L2h2bS9kb20wX2J1aWxkLmMgICAgICAgfCAzNSArKysrKysrKysrKysr KysrKysrLS0tLS0tLS0tLQogeGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gveDg2L2lvbW11LmMgfCAg NyArLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMjQgaW5zZXJ0aW9ucygrKSwgMTggZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L2h2bS9kb20wX2J1aWxkLmMgYi94ZW4vYXJj aC94ODYvaHZtL2RvbTBfYnVpbGQuYwppbmRleCBhNTcxZDE1YzEzLi5hYTU5OWYwOWVmIDEwMDY0 NAotLS0gYS94ZW4vYXJjaC94ODYvaHZtL2RvbTBfYnVpbGQuYworKysgYi94ZW4vYXJjaC94ODYv aHZtL2RvbTBfYnVpbGQuYwpAQCAtNDA5LDE0ICs0MDksMTAgQEAgc3RhdGljIF9faW5pdCB2b2lk IHB2aF9zZXR1cF9lODIwKHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGxvbmcgbnJfcGFnZXMp CiAgICAgQVNTRVJUKGN1cl9wYWdlcyA9PSBucl9wYWdlcyk7CiB9CiAKLXN0YXRpYyBpbnQgX19p bml0IHB2aF9zZXR1cF9wMm0oc3RydWN0IGRvbWFpbiAqZCkKK3N0YXRpYyB2b2lkIF9faW5pdCBw dmhfaW5pdF9wMm0oc3RydWN0IGRvbWFpbiAqZCkKIHsKLSAgICBzdHJ1Y3QgdmNwdSAqdiA9IGQt PnZjcHVbMF07CiAgICAgdW5zaWduZWQgbG9uZyBucl9wYWdlcyA9IGRvbTBfY29tcHV0ZV9ucl9w YWdlcyhkLCBOVUxMLCAwKTsKLSAgICB1bnNpZ25lZCBpbnQgaTsKLSAgICBpbnQgcmM7CiAgICAg Ym9vbCBwcmVlbXB0ZWQ7Ci0jZGVmaW5lIE1CMV9QQUdFUyBQRk5fRE9XTihNQigxKSkKIAogICAg IHB2aF9zZXR1cF9lODIwKGQsIG5yX3BhZ2VzKTsKICAgICBkbyB7CkBAIC00MjUsNiArNDIxLDE0 IEBAIHN0YXRpYyBpbnQgX19pbml0IHB2aF9zZXR1cF9wMm0oc3RydWN0IGRvbWFpbiAqZCkKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICZwcmVlbXB0ZWQpOwogICAgICAgICBwcm9jZXNz X3BlbmRpbmdfc29mdGlycXMoKTsKICAgICB9IHdoaWxlICggcHJlZW1wdGVkICk7Cit9CisKK3N0 YXRpYyBpbnQgX19pbml0IHB2aF9wb3B1bGF0ZV9wMm0oc3RydWN0IGRvbWFpbiAqZCkKK3sKKyAg ICBzdHJ1Y3QgdmNwdSAqdiA9IGQtPnZjcHVbMF07CisgICAgdW5zaWduZWQgaW50IGk7CisgICAg aW50IHJjOworI2RlZmluZSBNQjFfUEFHRVMgUEZOX0RPV04oTUIoMSkpCiAKICAgICAvKgogICAg ICAqIE1lbW9yeSBiZWxvdyAxTUIgaXMgaWRlbnRpdHkgbWFwcGVkIGluaXRpYWxseS4gUkFNIHJl Z2lvbnMgYXJlCkBAIC0xMTM0LDEzICsxMTM4LDYgQEAgaW50IF9faW5pdCBkb20wX2NvbnN0cnVj dF9wdmgoc3RydWN0IGRvbWFpbiAqZCwgY29uc3QgbW9kdWxlX3QgKmltYWdlLAogCiAgICAgcHJp bnRrKFhFTkxPR19JTkZPICIqKiogQnVpbGRpbmcgYSBQVkggRG9tJWQgKioqXG4iLCBkLT5kb21h aW5faWQpOwogCi0gICAgcmMgPSBwdmhfc2V0dXBfcDJtKGQpOwotICAgIGlmICggcmMgKQotICAg IHsKLSAgICAgICAgcHJpbnRrKCJGYWlsZWQgdG8gc2V0dXAgRG9tMCBwaHlzaWNhbCBtZW1vcnkg bWFwXG4iKTsKLSAgICAgICAgcmV0dXJuIHJjOwotICAgIH0KLQogICAgIC8qCiAgICAgICogTkI6 IE1NQ0ZHIGluaXRpYWxpemF0aW9uIG5lZWRzIHRvIGJlIHBlcmZvcm1lZCBiZWZvcmUgaW9tbXUK ICAgICAgKiBpbml0aWFsaXphdGlvbiBzbyB0aGUgaW9tbXUgY29kZSBjYW4gZmV0Y2ggdGhlIE1N Q0ZHIHJlZ2lvbnMgdXNlZCBieSB0aGUKQEAgLTExNDgsOCArMTE0NSwyMiBAQCBpbnQgX19pbml0 IGRvbTBfY29uc3RydWN0X3B2aChzdHJ1Y3QgZG9tYWluICpkLCBjb25zdCBtb2R1bGVfdCAqaW1h Z2UsCiAgICAgICovCiAgICAgcHZoX3NldHVwX21tY2ZnKGQpOwogCisgICAgLyoKKyAgICAgKiBD cmFmdCBkb20wIHBoeXNpY2FsIG1lbW9yeSBtYXAgYW5kIHNldCB0aGUgcGFnaW5nIGFsbG9jYXRp b24uIFRoaXMgbXVzdAorICAgICAqIGJlIGRvbmUgYmVmb3JlIHRoZSBpb21tdSBpbml0aWFsaXpp b24sIHNpbmNlIGlvbW11IGluaXRpYWxpemF0aW9uIGNvZGUKKyAgICAgKiB3aWxsIGxpa2VseSBh ZGQgbWFwcGluZ3MgcmVxdWlyZWQgYnkgZGV2aWNlcyB0byB0aGUgcDJtIChpZTogUk1SUnMpLgor ICAgICAqLworICAgIHB2aF9pbml0X3AybShkKTsKKwogICAgIGlvbW11X2h3ZG9tX2luaXQoZCk7 CiAKKyAgICByYyA9IHB2aF9wb3B1bGF0ZV9wMm0oZCk7CisgICAgaWYgKCByYyApCisgICAgewor ICAgICAgICBwcmludGsoIkZhaWxlZCB0byBzZXR1cCBEb20wIHBoeXNpY2FsIG1lbW9yeSBtYXBc biIpOworICAgICAgICByZXR1cm4gcmM7CisgICAgfQorCiAgICAgcmMgPSBwdmhfbG9hZF9rZXJu ZWwoZCwgaW1hZ2UsIGltYWdlX2hlYWRyb29tLCBpbml0cmQsIGJvb3RzdHJhcF9tYXAoaW1hZ2Up LAogICAgICAgICAgICAgICAgICAgICAgICAgIGNtZGxpbmUsICZlbnRyeSwgJnN0YXJ0X2luZm8p OwogICAgIGlmICggcmMgKQpkaWZmIC0tZ2l0IGEveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gveDg2 L2lvbW11LmMgYi94ZW4vZHJpdmVycy9wYXNzdGhyb3VnaC94ODYvaW9tbXUuYwppbmRleCBhODhl ZjliMTg5Li40MmIxYTFiYmMzIDEwMDY0NAotLS0gYS94ZW4vZHJpdmVycy9wYXNzdGhyb3VnaC94 ODYvaW9tbXUuYworKysgYi94ZW4vZHJpdmVycy9wYXNzdGhyb3VnaC94ODYvaW9tbXUuYwpAQCAt MTUxLDEyICsxNTEsNyBAQCBzdGF0aWMgYm9vbCBfX2h3ZG9tX2luaXQgaHdkb21faW9tbXVfbWFw KGNvbnN0IHN0cnVjdCBkb21haW4gKmQsCiAgICAgICogaW5jbHVzaXZlIG1hcHBpbmcgYWRkaXRp b25hbGx5IG1hcHMgaW4gZXZlcnkgcGZuIHVwIHRvIDRHQiBleGNlcHQgdGhvc2UKICAgICAgKiB0 aGF0IGZhbGwgaW4gdW51c2FibGUgcmFuZ2VzIGZvciBQViBEb20wLgogICAgICAqLwotICAgIGlm ICggKHBmbiA+IG1heF9wZm4gJiYgIW1mbl92YWxpZChtZm4pKSB8fCB4ZW5faW5fcmFuZ2UocGZu KSB8fAotICAgICAgICAgLyoKLSAgICAgICAgICAqIElnbm9yZSBhbnkgYWRkcmVzcyBiZWxvdyAx TUIsIHRoYXQncyBhbHJlYWR5IGlkZW50aXR5IG1hcHBlZCBieSB0aGUKLSAgICAgICAgICAqIERv bTAgYnVpbGRlciBmb3IgSFZNLgotICAgICAgICAgICovCi0gICAgICAgICAoIWQtPmRvbWFpbl9p ZCAmJiBpc19odm1fZG9tYWluKGQpICYmIHBmbiA8IFBGTl9ET1dOKE1CKDEpKSkgKQorICAgIGlm ICggKHBmbiA+IG1heF9wZm4gJiYgIW1mbl92YWxpZChtZm4pKSB8fCB4ZW5faW5fcmFuZ2UocGZu KSApCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIHN3aXRjaCAoIHR5cGUgPSBwYWdlX2dl dF9yYW1fdHlwZShtZm4pICkKLS0gCjIuMTcuMiAoQXBwbGUgR2l0LTExMykKCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBs aXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2pl Y3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs