From: Stefano Stabellini Subject: [PATCH v8 6/7] xen/arm: use alt_instructions_, sdevice_, and more Date: Tue, 15 Jan 2019 15:35:57 -0800 Message-ID: <1547595358-16379-6-git-send-email-sstabellini@kernel.org> References: 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 1gjYG2-0003Iu-9X for xen-devel@lists.xenproject.org; Tue, 15 Jan 2019 23:36:34 +0000 In-Reply-To: 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.cooper3@citrix.com, julien.grall@arm.com, sstabellini@kernel.org, JBeulich@suse.com, Stefano Stabellini List-Id: xen-devel@lists.xenproject.org U3RhcnQgbWFraW5nIHVzZSBvZiB0aGUgZm9sbG93aW5nIGFybSBzcGVjaWZpYyB1aW50cHRyX3Qg dmFyaWFibGVzOgoKYWx0X2luc3RydWN0aW9uc18sIGFsdF9pbnN0cnVjdGlvbnNfZW5kXywgc2Rl dmljZV8sIGVkZXZpY2VfLAphc2RldmljZV8sIGFlZGV2aWNlXywgaW5pdF9iZWdpbl8sIGluaXRf ZW5kXywgc3BsYXRmb3JtXywgZXBsYXRmb3JtXywKClJlcGxhY2luZyB0aGUgY29ycmVzcG9uZGlu ZyBsaW5rZXIgc3ltYm9scy4gVGhlc2UgYXJlIGFsbCBhcm0gc3BlY2lmaWMKY2hhbmdlcy4gSXQg aXMgZG9uZSB0byBhdm9pZCBjb21wYXJpbmcgYW5kIHN1YnRyYWN0aW5nIHBvaW50ZXJzIHBvaW50 aW5nCnRvIGRpZmZlcmVudCBvYmplY3RzLgoKT25lIHRoaW5nIHRvIG5vdGUgaXMgdGhhdCBpZGVh bGx5IHdlIHdvdWxkIGF2b2lkIGNvbnZlcnRpbmcKYWx0X2luc3RydWN0aW9uc18gYW5kIGFsdF9p bnN0cnVjdGlvbnNfZW5kXyB0byBwb2ludGVycyBhcyBkb25lIGluCmFsdGVybmF0aXZlLmMgYmVj YXVzZSBpdCBjYW4gbGVhZCB0byBjb21wYXJpc2lvbnMvc3VidHJhY3Rpb25zIGJldHdlZW4KcG9p bnRlcnMgdG8gZGlmZmVyZW50IG9iamVjdHMuIEl0IGlzIG5vdCBkaWZmaWN1bHQgdG8gZml4IGJ5 IHJld29ya2luZwp0aGUgY29kZSBzbGlnaHRseSBidXQgb3V0IG9mIHNjb3BlIGZvciB0aGlzIHBh dGNoLgoKU2lnbmVkLW9mZi1ieTogU3RlZmFubyBTdGFiZWxsaW5pIDxzdGVmYW5vc0B4aWxpbngu Y29tPgotLS0KQ2hhbmdlcyBpbiB2ODoKLSByZW1vdmUgU1lNQk9MX0hJREUKLSB1c2UgbmV3IHN5 bWJvbCBuYW1lcwotIGNoYW5nZXMgYXJlIHNwbGl0IGRpZmZlcmVudGx5IGFjcm9zcyB0aGUgcGF0 Y2hlcwotLS0KIHhlbi9hcmNoL2FybS9hbHRlcm5hdGl2ZS5jIHwgIDYgKysrLS0tCiB4ZW4vYXJj aC9hcm0vZGV2aWNlLmMgICAgICB8IDE2ICsrKysrKysrKysrLS0tLS0KIHhlbi9hcmNoL2FybS9t bS5jICAgICAgICAgIHwgMjMgKysrKysrKysrKysrKy0tLS0tLS0tLS0KIHhlbi9hcmNoL2FybS9w bGF0Zm9ybS5jICAgIHwgIDggKysrKystLS0KIDQgZmlsZXMgY2hhbmdlZCwgMzIgaW5zZXJ0aW9u cygrKSwgMjEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gvYXJtL2FsdGVybmF0 aXZlLmMgYi94ZW4vYXJjaC9hcm0vYWx0ZXJuYXRpdmUuYwppbmRleCBiNzk1MzZkLi43YzNmMzJk IDEwMDY0NAotLS0gYS94ZW4vYXJjaC9hcm0vYWx0ZXJuYXRpdmUuYworKysgYi94ZW4vYXJjaC9h cm0vYWx0ZXJuYXRpdmUuYwpAQCAtMzgsNyArMzgsNyBAQAogI3VuZGVmIHZpcnRfdG9fbWZuCiAj ZGVmaW5lIHZpcnRfdG9fbWZuKHZhKSBfbWZuKF9fdmlydF90b19tZm4odmEpKQogCi1leHRlcm4g Y29uc3Qgc3RydWN0IGFsdF9pbnN0ciBfX2FsdF9pbnN0cnVjdGlvbnNbXSwgX19hbHRfaW5zdHJ1 Y3Rpb25zX2VuZFtdOworZXh0ZXJuIHVpbnRwdHJfdCBhbHRfaW5zdHJ1Y3Rpb25zXywgYWx0X2lu c3RydWN0aW9uc19lbmRfOwogCiBzdHJ1Y3QgYWx0X3JlZ2lvbiB7CiAgICAgY29uc3Qgc3RydWN0 IGFsdF9pbnN0ciAqYmVnaW47CkBAIC0yMDMsOCArMjAzLDggQEAgc3RhdGljIGludCBfX2FwcGx5 X2FsdGVybmF0aXZlc19tdWx0aV9zdG9wKHZvaWQgKnVudXNlZCkKICAgICAgICAgLyogUmUtbWFw cGluZyBYZW4gaXMgbm90IGV4cGVjdGVkIHRvIGZhaWwgZHVyaW5nIGJvb3QuICovCiAgICAgICAg IEJVR19PTigheGVubWFwKTsKIAotICAgICAgICByZWdpb24uYmVnaW4gPSBfX2FsdF9pbnN0cnVj dGlvbnM7Ci0gICAgICAgIHJlZ2lvbi5lbmQgPSBfX2FsdF9pbnN0cnVjdGlvbnNfZW5kOworICAg ICAgICByZWdpb24uYmVnaW4gPSAoY29uc3Qgc3RydWN0IGFsdF9pbnN0ciAqKWFsdF9pbnN0cnVj dGlvbnNfOworICAgICAgICByZWdpb24uZW5kID0gKGNvbnN0IHN0cnVjdCBhbHRfaW5zdHIgKilh bHRfaW5zdHJ1Y3Rpb25zX2VuZF87CiAKICAgICAgICAgcmV0ID0gX19hcHBseV9hbHRlcm5hdGl2 ZXMoJnJlZ2lvbiwgKHVpbnRwdHJfdCl4ZW5tYXAgLSBzdGFydF8pOwogICAgICAgICAvKiBUaGUg cGF0Y2hpbmcgaXMgbm90IGV4cGVjdGVkIHRvIGZhaWwgZHVyaW5nIGJvb3QuICovCmRpZmYgLS1n aXQgYS94ZW4vYXJjaC9hcm0vZGV2aWNlLmMgYi94ZW4vYXJjaC9hcm0vZGV2aWNlLmMKaW5kZXgg NzBjZDZjMS4uM2UyZDc1OSAxMDA2NDQKLS0tIGEveGVuL2FyY2gvYXJtL2RldmljZS5jCisrKyBi L3hlbi9hcmNoL2FybS9kZXZpY2UuYwpAQCAtMjIsOCArMjIsOCBAQAogI2luY2x1ZGUgPHhlbi9p bml0Lmg+CiAjaW5jbHVkZSA8eGVuL2xpYi5oPgogCi1leHRlcm4gY29uc3Qgc3RydWN0IGRldmlj ZV9kZXNjIF9zZGV2aWNlW10sIF9lZGV2aWNlW107Ci1leHRlcm4gY29uc3Qgc3RydWN0IGFjcGlf ZGV2aWNlX2Rlc2MgX2FzZGV2aWNlW10sIF9hZWRldmljZVtdOworZXh0ZXJuIHVpbnRwdHJfdCBz ZGV2aWNlXywgZWRldmljZV87CitleHRlcm4gdWludHB0cl90IGFzZGV2aWNlXywgYWVkZXZpY2Vf OwogCiBpbnQgX19pbml0IGRldmljZV9pbml0KHN0cnVjdCBkdF9kZXZpY2Vfbm9kZSAqZGV2LCBl bnVtIGRldmljZV9jbGFzcyBjbGFzcywKICAgICAgICAgICAgICAgICAgICAgICAgY29uc3Qgdm9p ZCAqZGF0YSkKQEAgLTM1LDcgKzM1LDkgQEAgaW50IF9faW5pdCBkZXZpY2VfaW5pdChzdHJ1Y3Qg ZHRfZGV2aWNlX25vZGUgKmRldiwgZW51bSBkZXZpY2VfY2xhc3MgY2xhc3MsCiAgICAgaWYgKCAh ZHRfZGV2aWNlX2lzX2F2YWlsYWJsZShkZXYpIHx8IGR0X2RldmljZV9mb3JfcGFzc3Rocm91Z2go ZGV2KSApCiAgICAgICAgIHJldHVybiAgLUVOT0RFVjsKIAotICAgIGZvciAoIGRlc2MgPSBfc2Rl dmljZTsgZGVzYyAhPSBfZWRldmljZTsgZGVzYysrICkKKyAgICBmb3IgKCBkZXNjID0gKHN0cnVj dCBkZXZpY2VfZGVzYyAqKXNkZXZpY2VfOworICAgICAgICAgICh1aW50cHRyX3QpZGVzYyAhPSBl ZGV2aWNlXzsKKyAgICAgICAgICBkZXNjKysgKQogICAgIHsKICAgICAgICAgaWYgKCBkZXNjLT5j bGFzcyAhPSBjbGFzcyApCiAgICAgICAgICAgICBjb250aW51ZTsKQEAgLTU2LDcgKzU4LDkgQEAg aW50IF9faW5pdCBhY3BpX2RldmljZV9pbml0KGVudW0gZGV2aWNlX2NsYXNzIGNsYXNzLCBjb25z dCB2b2lkICpkYXRhLCBpbnQgY2xhc3MKIHsKICAgICBjb25zdCBzdHJ1Y3QgYWNwaV9kZXZpY2Vf ZGVzYyAqZGVzYzsKIAotICAgIGZvciAoIGRlc2MgPSBfYXNkZXZpY2U7IGRlc2MgIT0gX2FlZGV2 aWNlOyBkZXNjKysgKQorICAgIGZvciAoIGRlc2MgPSAoc3RydWN0IGFjcGlfZGV2aWNlX2Rlc2Mg Kilhc2RldmljZV87CisgICAgICAgICAgKHVpbnRwdHJfdClkZXNjICE9IGFlZGV2aWNlXzsKKyAg ICAgICAgICBkZXNjKysgKQogICAgIHsKICAgICAgICAgaWYgKCAoIGRlc2MtPmNsYXNzICE9IGNs YXNzICkgfHwgKCBkZXNjLT5jbGFzc190eXBlICE9IGNsYXNzX3R5cGUgKSApCiAgICAgICAgICAg ICBjb250aW51ZTsKQEAgLTc1LDcgKzc5LDkgQEAgZW51bSBkZXZpY2VfY2xhc3MgZGV2aWNlX2dl dF9jbGFzcyhjb25zdCBzdHJ1Y3QgZHRfZGV2aWNlX25vZGUgKmRldikKIAogICAgIEFTU0VSVChk ZXYgIT0gTlVMTCk7CiAKLSAgICBmb3IgKCBkZXNjID0gX3NkZXZpY2U7IGRlc2MgIT0gX2VkZXZp Y2U7IGRlc2MrKyApCisgICAgZm9yICggZGVzYyA9IChzdHJ1Y3QgZGV2aWNlX2Rlc2MgKilzZGV2 aWNlXzsKKyAgICAgICAgICAodWludHB0cl90KWRlc2MgIT0gZWRldmljZV87CisgICAgICAgICAg ZGVzYysrICkKICAgICB7CiAgICAgICAgIGlmICggZHRfbWF0Y2hfbm9kZShkZXNjLT5kdF9tYXRj aCwgZGV2KSApCiAgICAgICAgICAgICByZXR1cm4gZGVzYy0+Y2xhc3M7CmRpZmYgLS1naXQgYS94 ZW4vYXJjaC9hcm0vbW0uYyBiL3hlbi9hcmNoL2FybS9tbS5jCmluZGV4IDAxYWUyY2MuLjljODBl MDMgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL2FybS9tbS5jCisrKyBiL3hlbi9hcmNoL2FybS9tbS5j CkBAIC0xNTcsNyArMTU3LDcgQEAgdW5zaWduZWQgbG9uZyBmcmFtZXRhYmxlX3ZpcnRfZW5kIF9f cmVhZF9tb3N0bHk7CiB1bnNpZ25lZCBsb25nIG1heF9wYWdlOwogdW5zaWduZWQgbG9uZyB0b3Rh bF9wYWdlczsKIAotZXh0ZXJuIGNoYXIgX19pbml0X2JlZ2luW10sIF9faW5pdF9lbmRbXTsKK2V4 dGVybiB1aW50cHRyX3QgaW5pdF9iZWdpbl8sIGluaXRfZW5kXzsKIAogLyogQ2hlY2tpbmcgVkEg bWVtb3J5IGxheW91dCBhbGlnbm1lbnQuICovCiBzdGF0aWMgaW5saW5lIHZvaWQgY2hlY2tfbWVt b3J5X2xheW91dF9hbGlnbm1lbnRfY29uc3RyYWludHModm9pZCkgewpAQCAtMTA3Myw3ICsxMDcz LDkgQEAgaW50IG1vZGlmeV94ZW5fbWFwcGluZ3ModW5zaWduZWQgbG9uZyBzLCB1bnNpZ25lZCBs b25nIGUsIHVuc2lnbmVkIGludCBmbGFncykKIH0KIAogZW51bSBtZyB7IG1nX2NsZWFyLCBtZ19y bywgbWdfcncsIG1nX3J4IH07Ci1zdGF0aWMgdm9pZCBzZXRfcHRlX2ZsYWdzX29uX3JhbmdlKGNv bnN0IGNoYXIgKnAsIHVuc2lnbmVkIGxvbmcgbCwgZW51bSBtZyBtZykKK3N0YXRpYyB2b2lkIHNl dF9wdGVfZmxhZ3Nfb25fcmFuZ2UoY29uc3QgdWludHB0cl90IHAsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcgbCwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgZW51bSBtZyBtZykKIHsKICAgICBscGFlX3QgcHRlOwogICAgIGludCBp OwpAQCAtMTA4NCw4ICsxMDg2LDggQEAgc3RhdGljIHZvaWQgc2V0X3B0ZV9mbGFnc19vbl9yYW5n ZShjb25zdCBjaGFyICpwLCB1bnNpZ25lZCBsb25nIGwsIGVudW0gbWcgbWcpCiAgICAgQVNTRVJU KCEoKHVuc2lnbmVkIGxvbmcpIHAgJiB+UEFHRV9NQVNLKSk7CiAgICAgQVNTRVJUKCEobCAmIH5Q QUdFX01BU0spKTsKIAotICAgIGZvciAoIGkgPSAocCAtIF9zdGFydCkgLyBQQUdFX1NJWkU7IAot ICAgICAgICAgIGkgPCAocCArIGwgLSBfc3RhcnQpIC8gUEFHRV9TSVpFOyAKKyAgICBmb3IgKCBp ID0gKHAgLSBzdGFydF8pIC8gUEFHRV9TSVpFOworICAgICAgICAgIGkgPCAocCArIGwgLSBzdGFy dF8pIC8gUEFHRV9TSVpFOwogICAgICAgICAgIGkrKyApCiAgICAgewogICAgICAgICBwdGUgPSB4 ZW5feGVubWFwW2ldOwpAQCAtMTEyMSwyNiArMTEyMywyNyBAQCBzdGF0aWMgdm9pZCBzZXRfcHRl X2ZsYWdzX29uX3JhbmdlKGNvbnN0IGNoYXIgKnAsIHVuc2lnbmVkIGxvbmcgbCwgZW51bSBtZyBt ZykKIC8qIFJlbGVhc2UgYWxsIF9faW5pdCBhbmQgX19pbml0ZGF0YSByYW5nZXMgdG8gYmUgcmV1 c2VkICovCiB2b2lkIGZyZWVfaW5pdF9tZW1vcnkodm9pZCkKIHsKLSAgICBwYWRkcl90IHBhID0g dmlydF90b19tYWRkcihfX2luaXRfYmVnaW4pOwotICAgIHVuc2lnbmVkIGxvbmcgbGVuID0gX19p bml0X2VuZCAtIF9faW5pdF9iZWdpbjsKKyAgICBwYWRkcl90IHBhID0gdmlydF90b19tYWRkcihp bml0X2JlZ2luXyk7CisgICAgdW5zaWduZWQgbG9uZyBsZW4gPSBpbml0X2VuZF8gLSBpbml0X2Jl Z2luXzsKICAgICB1aW50MzJfdCBpbnNuOwogICAgIHVuc2lnbmVkIGludCBpLCBuciA9IGxlbiAv IHNpemVvZihpbnNuKTsKICAgICB1aW50MzJfdCAqcDsKIAotICAgIHNldF9wdGVfZmxhZ3Nfb25f cmFuZ2UoX19pbml0X2JlZ2luLCBsZW4sIG1nX3J3KTsKKyAgICBzZXRfcHRlX2ZsYWdzX29uX3Jh bmdlKGluaXRfYmVnaW5fLCBsZW4sIG1nX3J3KTsKICNpZmRlZiBDT05GSUdfQVJNXzMyCiAgICAg LyogdWRmIGluc3RydWN0aW9uIGkuZSAoc2VlIEE4LjguMjQ3IGluIEFSTSBEREkgMDQwNkMuYykg Ki8KICAgICBpbnNuID0gMHhlN2YwMDBmMDsKICNlbHNlCiAgICAgaW5zbiA9IEFBUkNINjRfQlJF QUtfRkFVTFQ7CiAjZW5kaWYKLSAgICBwID0gKHVpbnQzMl90ICopX19pbml0X2JlZ2luOworICAg IHAgPSAodWludDMyX3QgKilpbml0X2JlZ2luXzsKICAgICBmb3IgKCBpID0gMDsgaSA8IG5yOyBp KysgKQogICAgICAgICAqKHAgKyBpKSA9IGluc247CiAKLSAgICBzZXRfcHRlX2ZsYWdzX29uX3Jh bmdlKF9faW5pdF9iZWdpbiwgbGVuLCBtZ19jbGVhcik7CisgICAgc2V0X3B0ZV9mbGFnc19vbl9y YW5nZShpbml0X2JlZ2luXywgbGVuLCBtZ19jbGVhcik7CiAgICAgaW5pdF9kb21oZWFwX3BhZ2Vz KHBhLCBwYSArIGxlbik7Ci0gICAgcHJpbnRrKCJGcmVlZCAlbGRrQiBpbml0IG1lbW9yeS5cbiIs IChsb25nKShfX2luaXRfZW5kLV9faW5pdF9iZWdpbik+PjEwKTsKKyAgICBwcmludGsoIkZyZWVk ICUiUFJJeFBUUiJrQiBpbml0IG1lbW9yeS5cbiIsCisgICAgICAgICAgIChpbml0X2VuZF8gLSBp bml0X2JlZ2luXykgPj4gMTApOwogfQogCiB2b2lkIGFyY2hfZHVtcF9zaGFyZWRfbWVtX2luZm8o dm9pZCkKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL2FybS9wbGF0Zm9ybS5jIGIveGVuL2FyY2gvYXJt L3BsYXRmb3JtLmMKaW5kZXggOGViMGI2ZS4uYTc5ZWI1MyAxMDA2NDQKLS0tIGEveGVuL2FyY2gv YXJtL3BsYXRmb3JtLmMKKysrIGIveGVuL2FyY2gvYXJtL3BsYXRmb3JtLmMKQEAgLTIyLDcgKzIy LDcgQEAKICNpbmNsdWRlIDx4ZW4vaW5pdC5oPgogI2luY2x1ZGUgPGFzbS9wc2NpLmg+CiAKLWV4 dGVybiBjb25zdCBzdHJ1Y3QgcGxhdGZvcm1fZGVzYyBfc3BsYXRmb3JtW10sIF9lcGxhdGZvcm1b XTsKK2V4dGVybiB1aW50cHRyX3Qgc3BsYXRmb3JtXywgZXBsYXRmb3JtXzsKIAogLyogUG9pbnRl ciB0byB0aGUgY3VycmVudCBwbGF0Zm9ybSBkZXNjcmlwdGlvbiAqLwogc3RhdGljIGNvbnN0IHN0 cnVjdCBwbGF0Zm9ybV9kZXNjICpwbGF0Zm9ybTsKQEAgLTUxLDE0ICs1MSwxNiBAQCB2b2lkIF9f aW5pdCBwbGF0Zm9ybV9pbml0KHZvaWQpCiAgICAgQVNTRVJUKHBsYXRmb3JtID09IE5VTEwpOwog CiAgICAgLyogTG9va2luZyBmb3IgdGhlIHBsYXRmb3JtIGRlc2NyaXB0aW9uICovCi0gICAgZm9y ICggcGxhdGZvcm0gPSBfc3BsYXRmb3JtOyBwbGF0Zm9ybSAhPSBfZXBsYXRmb3JtOyBwbGF0Zm9y bSsrICkKKyAgICBmb3IgKCBwbGF0Zm9ybSA9IChzdHJ1Y3QgcGxhdGZvcm1fZGVzYyAqKXNwbGF0 Zm9ybV87CisgICAgICAgICAgKHVpbnRwdHJfdClwbGF0Zm9ybSAhPSBlcGxhdGZvcm1fOworICAg ICAgICAgIHBsYXRmb3JtKysgKQogICAgIHsKICAgICAgICAgaWYgKCBwbGF0Zm9ybV9pc19jb21w YXRpYmxlKHBsYXRmb3JtKSApCiAgICAgICAgICAgICBicmVhazsKICAgICB9CiAKICAgICAvKiBX ZSBkb24ndCBoYXZlIHNwZWNpZmljIG9wZXJhdGlvbnMgZm9yIHRoaXMgcGxhdGZvcm0gKi8KLSAg ICBpZiAoIHBsYXRmb3JtID09IF9lcGxhdGZvcm0gKQorICAgIGlmICggKHVpbnRwdHJfdClwbGF0 Zm9ybSA9PSBlcGxhdGZvcm1fICkKICAgICB7CiAgICAgICAgIC8qIFRPRE86IGR1bXAgRFQgbWFj aGluZSBjb21wYXRpYmxlIG5vZGUgKi8KICAgICAgICAgcHJpbnRrKFhFTkxPR19JTkZPICJQbGF0 Zm9ybTogR2VuZXJpYyBTeXN0ZW1cbiIpOwotLSAKMS45LjEKCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1k ZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21h aWxtYW4vbGlzdGluZm8veGVuLWRldmVs