From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: [PATCH v2 12/15] xen/arm64: Kill PSCI_GET_VERSION as a variant-2 workaround Date: Thu, 8 Feb 2018 19:22:00 +0000 Message-ID: <20180208192203.9556-13-julien.grall@arm.com> References: <20180208192203.9556-1-julien.grall@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180208192203.9556-1-julien.grall@arm.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xen.org Cc: Julien Grall , sstabellini@kernel.org, volodymyr_babchuk@epam.com, andre.przywara@linaro.org List-Id: xen-devel@lists.xenproject.org Tm93IHRoYXQgd2UndmUgc3RhbmRhcmRpc2VkIG9uIFNNQ0NDIHYxLjEgdG8gcGVyZm9ybSB0aGUg YnJhbmNoCnByZWRpY3Rpb24gaW52YWxpZGF0aW9uLCBsZXQncyBkcm9wIHRoZSBwcmV2aW91cyBi YW5kLWFpZC4gSWYgdmVuZG9ycwpoYXZlbid0IHVwZGF0ZWQgdGhlaXIgZmlybXdhcmUgdG8gZG8g U01DQ0MgMS4xLCB0aGV5IGhhdmVuJ3QgdXBkYXRlZApQU0NJIGVpdGhlciwgc28gd2UgZG9uJ3Qg bG9vc2UgYW55dGhpbmcuCgpUaGlzIGlzIGFsaWduZWQgd2l0aCB0aGUgTGludXggY29tbWl0IDNh MGEzOTdmZjVmZi4KClNpZ25lZC1vZmYtYnk6IEp1bGllbiBHcmFsbCA8anVsaWVuLmdyYWxsQGFy bS5jb20+CgotLS0KICAgIE5vdGUgdGhhdCB0aGUgcGF0Y2ggaXMgaW4gYXJtNjQvZm9yLW5leHQv Y29yZSBhbmQgc2hvdWxkIGJlIG1lcmdlZAogICAgaW4gbWFzdGVyIHNvb24uCgogICAgQ2hhbmdl cyBpbiB2MjoKICAgICAgICAtIFBhdGNoIGFkZGVkCi0tLQogeGVuL2FyY2gvYXJtL2FybTY0L2Jw aS5TIHwgMjUgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogeGVuL2FyY2gvYXJtL2NwdWVycmF0YS5j IHwgNTQgKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAy IGZpbGVzIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDYwIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL3hlbi9hcmNoL2FybS9hcm02NC9icGkuUyBiL3hlbi9hcmNoL2FybS9hcm02NC9icGku UwppbmRleCBlZjIzN2RlN2JkLi42MjcwYjEwYzRmIDEwMDY0NAotLS0gYS94ZW4vYXJjaC9hcm0v YXJtNjQvYnBpLlMKKysrIGIveGVuL2FyY2gvYXJtL2FybTY0L2JwaS5TCkBAIC01OCwzMSArNTgs NiBAQCBFTlRSWShfX2JwX2hhcmRlbl9oeXBfdmVjc19zdGFydCkKICAgICAuZW5kcgogRU5UUlko X19icF9oYXJkZW5faHlwX3ZlY3NfZW5kKQogCi1FTlRSWShfX3BzY2lfaHlwX2JwX2ludmFsX3N0 YXJ0KQotICAgIHN1YiAgICAgc3AsIHNwLCAjKDggKiAxOCkKLSAgICBzdHAgICAgIHgxNiwgeDE3 LCBbc3AsICMoMTYgKiAwKV0KLSAgICBzdHAgICAgIHgxNCwgeDE1LCBbc3AsICMoMTYgKiAxKV0K LSAgICBzdHAgICAgIHgxMiwgeDEzLCBbc3AsICMoMTYgKiAyKV0KLSAgICBzdHAgICAgIHgxMCwg eDExLCBbc3AsICMoMTYgKiAzKV0KLSAgICBzdHAgICAgIHg4LCB4OSwgW3NwLCAjKDE2ICogNCld Ci0gICAgc3RwICAgICB4NiwgeDcsIFtzcCwgIygxNiAqIDUpXQotICAgIHN0cCAgICAgeDQsIHg1 LCBbc3AsICMoMTYgKiA2KV0KLSAgICBzdHAgICAgIHgyLCB4MywgW3NwLCAjKDE2ICogNyldCi0g ICAgc3RwICAgICB4MCwgeDEsIFtzcCwgIygxNiAqIDgpXQotICAgIG1vdiAgICAgeDAsICMweDg0 MDAwMDAwCi0gICAgc21jICAgICAjMAotICAgIGxkcCAgICAgeDE2LCB4MTcsIFtzcCwgIygxNiAq IDApXQotICAgIGxkcCAgICAgeDE0LCB4MTUsIFtzcCwgIygxNiAqIDEpXQotICAgIGxkcCAgICAg eDEyLCB4MTMsIFtzcCwgIygxNiAqIDIpXQotICAgIGxkcCAgICAgeDEwLCB4MTEsIFtzcCwgIygx NiAqIDMpXQotICAgIGxkcCAgICAgeDgsIHg5LCBbc3AsICMoMTYgKiA0KV0KLSAgICBsZHAgICAg IHg2LCB4NywgW3NwLCAjKDE2ICogNSldCi0gICAgbGRwICAgICB4NCwgeDUsIFtzcCwgIygxNiAq IDYpXQotICAgIGxkcCAgICAgeDIsIHgzLCBbc3AsICMoMTYgKiA3KV0KLSAgICBsZHAgICAgIHgw LCB4MSwgW3NwLCAjKDE2ICogOCldCi0gICAgYWRkICAgICBzcCwgc3AsICMoOCAqIDE4KQotRU5U UlkoX19wc2NpX2h5cF9icF9pbnZhbF9lbmQpCi0KIEVOVFJZKF9fc21jY2Nfd29ya2Fyb3VuZF8x X3NtY19zdGFydCkKICAgICBzdWIgICAgIHNwLCBzcCwgIyg4ICogNCkKICAgICBzdHAgICAgIHgy LCB4MywgW3NwLCAjKDggKiAwKV0KZGlmZiAtLWdpdCBhL3hlbi9hcmNoL2FybS9jcHVlcnJhdGEu YyBiL3hlbi9hcmNoL2FybS9jcHVlcnJhdGEuYwppbmRleCA2NTU3NTc3YmNiLi5hZjQ1MzcxMGU0 IDEwMDY0NAotLS0gYS94ZW4vYXJjaC9hcm0vY3B1ZXJyYXRhLmMKKysrIGIveGVuL2FyY2gvYXJt L2NwdWVycmF0YS5jCkBAIC0xNDksMTAgKzE0OSwxMSBAQCBpbnN0YWxsX2JwX2hhcmRlbmluZ192 ZWMoY29uc3Qgc3RydWN0IGFybV9jcHVfY2FwYWJpbGl0aWVzICplbnRyeSwKIAogZXh0ZXJuIGNo YXIgX19zbWNjY193b3JrYXJvdW5kXzFfc21jX3N0YXJ0W10sIF9fc21jY2Nfd29ya2Fyb3VuZF8x X3NtY19lbmRbXTsKIAotc3RhdGljIGJvb2wKLWNoZWNrX3NtY2NjX2FyY2hfd29ya2Fyb3VuZF8x KGNvbnN0IHN0cnVjdCBhcm1fY3B1X2NhcGFiaWxpdGllcyAqZW50cnkpCitzdGF0aWMgaW50IGVu YWJsZV9zbWNjY19hcmNoX3dvcmthcm91bmRfMSh2b2lkICpkYXRhKQogewogICAgIHN0cnVjdCBh cm1fc21jY2NfcmVzIHJlczsKKyAgICBzdGF0aWMgYm9vbCB3YXJuZWQgPSBmYWxzZTsKKyAgICBj b25zdCBzdHJ1Y3QgYXJtX2NwdV9jYXBhYmlsaXRpZXMgKmVudHJ5ID0gZGF0YTsKIAogICAgIC8q CiAgICAgICogRW5hYmxlIGNhbGxiYWNrcyBhcmUgY2FsbGVkIG9uIGV2ZXJ5IENQVSBiYXNlZCBv biB0aGUKQEAgLTE2MCw0NyArMTYxLDMwIEBAIGNoZWNrX3NtY2NjX2FyY2hfd29ya2Fyb3VuZF8x KGNvbnN0IHN0cnVjdCBhcm1fY3B1X2NhcGFiaWxpdGllcyAqZW50cnkpCiAgICAgICogZW50cnku CiAgICAgICovCiAgICAgaWYgKCAhZW50cnktPm1hdGNoZXMoZW50cnkpICkKLSAgICAgICAgcmV0 dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gMDsKIAogICAgIGlmICggc21jY2NfdmVyIDwgU01D Q0NfVkVSU0lPTigxLCAxKSApCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgZ290byB3 YXJuOwogCiAgICAgYXJtX3NtY2NjXzFfMV9zbWMoQVJNX1NNQ0NDX0FSQ0hfRkVBVFVSRVNfRklE LAogICAgICAgICAgICAgICAgICAgICAgIEFSTV9TTUNDQ19BUkNIX1dPUktBUk9VTkRfMV9GSUQs ICZyZXMpOwogICAgIGlmICggcmVzLmEwICE9IEFSTV9TTUNDQ19TVUNDRVNTICkKLSAgICAgICAg cmV0dXJuIGZhbHNlOwotCi0gICAgcmV0dXJuIGluc3RhbGxfYnBfaGFyZGVuaW5nX3ZlYyhlbnRy eSxfX3NtY2NjX3dvcmthcm91bmRfMV9zbWNfc3RhcnQsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBfX3NtY2NjX3dvcmthcm91bmRfMV9zbWNfZW5kLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgImNhbGwgQVJNX1NNQ0NDX0FSQ0hfV09SS0FST1VORF8x Iik7Ci19CisgICAgICAgIGdvdG8gd2FybjsKIAotZXh0ZXJuIGNoYXIgX19wc2NpX2h5cF9icF9p bnZhbF9zdGFydFtdLCBfX3BzY2lfaHlwX2JwX2ludmFsX2VuZFtdOworICAgIHJldHVybiAhaW5z dGFsbF9icF9oYXJkZW5pbmdfdmVjKGVudHJ5LF9fc21jY2Nfd29ya2Fyb3VuZF8xX3NtY19zdGFy dCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBfX3NtY2NjX3dvcmthcm91 bmRfMV9zbWNfZW5kLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJjYWxs IEFSTV9TTUNDQ19BUkNIX1dPUktBUk9VTkRfMSIpOwogCi1zdGF0aWMgaW50IGVuYWJsZV9wc2Np X2JwX2hhcmRlbmluZyh2b2lkICpkYXRhKQotewotICAgIGJvb2wgcmV0ID0gdHJ1ZTsKLSAgICBz dGF0aWMgYm9vbCB3YXJuZWQgPSBmYWxzZTsKLQotICAgIGlmICggY2hlY2tfc21jY2NfYXJjaF93 b3JrYXJvdW5kXzEoZGF0YSkgKQotICAgICAgICByZXR1cm4gMDsKLSAgICAvKgotICAgICAqIFRo ZSBtaXRpZ2F0aW9uIGlzIHVzaW5nIFBTQ0kgdmVyc2lvbiBmdW5jdGlvbiB0byBpbnZhbGlkYXRl IHRoZQotICAgICAqIGJyYW5jaCBwcmVkaWN0b3IuIFRoaXMgZnVuY3Rpb24gaXMgb25seSBhdmFp bGFibGUgd2l0aCBQU0NJIDAuMgotICAgICAqIGFuZCBsYXRlci4KLSAgICAgKi8KLSAgICBlbHNl IGlmICggcHNjaV92ZXIgPj0gUFNDSV9WRVJTSU9OKDAsIDIpICkKLSAgICAgICAgcmV0ID0gaW5z dGFsbF9icF9oYXJkZW5pbmdfdmVjKGRhdGEsIF9fcHNjaV9oeXBfYnBfaW52YWxfc3RhcnQsCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBfX3BzY2lfaHlwX2JwX2ludmFs X2VuZCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJjYWxsIFBTQ0kg Z2V0IHZlcnNpb24iKTsKLSAgICBlbHNlIGlmICggIXdhcm5lZCApCit3YXJuOgorICAgIGlmICgg IXdhcm5lZCApCiAgICAgewogICAgICAgICBBU1NFUlQoc3lzdGVtX3N0YXRlIDwgU1lTX1NUQVRF X2FjdGl2ZSk7Ci0gICAgICAgIHdhcm5pbmdfYWRkKCJQU0NJIDAuMiBvciBsYXRlciBpcyByZXF1 aXJlZCBmb3IgdGhlIGJyYW5jaCBwcmVkaWN0b3IgaGFyZGVuaW5nLlxuIik7Ci0gICAgICAgIHdh cm5lZCA9IHRydWU7CisgICAgICAgIHdhcm5pbmdfYWRkKCJObyBzdXBwb3J0IGZvciBBUk1fU01D Q0NfQVJDSF9XT1JLQVJPVU5EXzEuXG4iCisgICAgICAgICAgICAgICAgICAgICJQbGVhc2UgdXBk YXRlIHlvdXIgZmlybXdhcmUuXG4iKTsKKyAgICAgICAgd2FybmVkID0gZmFsc2U7CiAgICAgfQog Ci0gICAgcmV0dXJuICFyZXQ7CisgICAgcmV0dXJuIDA7CiB9CiAKICNlbmRpZiAvKiBDT05GSUdf QVJNNjRfSEFSREVOX0JSQU5DSF9QUkVESUNUT1IgKi8KQEAgLTMxNiwyMiArMzAwLDIyIEBAIHN0 YXRpYyBjb25zdCBzdHJ1Y3QgYXJtX2NwdV9jYXBhYmlsaXRpZXMgYXJtX2VycmF0YVtdID0gewog ICAgIHsKICAgICAgICAgLmNhcGFiaWxpdHkgPSBBUk1fSEFSREVOX0JSQU5DSF9QUkVESUNUT1Is CiAgICAgICAgIE1JRFJfQUxMX1ZFUlNJT05TKE1JRFJfQ09SVEVYX0E1NyksCi0gICAgICAgIC5l bmFibGUgPSBlbmFibGVfcHNjaV9icF9oYXJkZW5pbmcsCisgICAgICAgIC5lbmFibGUgPSBlbmFi bGVfc21jY2NfYXJjaF93b3JrYXJvdW5kXzEsCiAgICAgfSwKICAgICB7CiAgICAgICAgIC5jYXBh YmlsaXR5ID0gQVJNX0hBUkRFTl9CUkFOQ0hfUFJFRElDVE9SLAogICAgICAgICBNSURSX0FMTF9W RVJTSU9OUyhNSURSX0NPUlRFWF9BNzIpLAotICAgICAgICAuZW5hYmxlID0gZW5hYmxlX3BzY2lf YnBfaGFyZGVuaW5nLAorICAgICAgICAuZW5hYmxlID0gZW5hYmxlX3NtY2NjX2FyY2hfd29ya2Fy b3VuZF8xLAogICAgIH0sCiAgICAgewogICAgICAgICAuY2FwYWJpbGl0eSA9IEFSTV9IQVJERU5f QlJBTkNIX1BSRURJQ1RPUiwKICAgICAgICAgTUlEUl9BTExfVkVSU0lPTlMoTUlEUl9DT1JURVhf QTczKSwKLSAgICAgICAgLmVuYWJsZSA9IGVuYWJsZV9wc2NpX2JwX2hhcmRlbmluZywKKyAgICAg ICAgLmVuYWJsZSA9IGVuYWJsZV9zbWNjY19hcmNoX3dvcmthcm91bmRfMSwKICAgICB9LAogICAg IHsKICAgICAgICAgLmNhcGFiaWxpdHkgPSBBUk1fSEFSREVOX0JSQU5DSF9QUkVESUNUT1IsCiAg ICAgICAgIE1JRFJfQUxMX1ZFUlNJT05TKE1JRFJfQ09SVEVYX0E3NSksCi0gICAgICAgIC5lbmFi bGUgPSBlbmFibGVfcHNjaV9icF9oYXJkZW5pbmcsCisgICAgICAgIC5lbmFibGUgPSBlbmFibGVf c21jY2NfYXJjaF93b3JrYXJvdW5kXzEsCiAgICAgfSwKICNlbmRpZgogI2lmZGVmIENPTkZJR19B Uk0zMl9IQVJERU5fQlJBTkNIX1BSRURJQ1RPUgotLSAKMi4xMS4wCgoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApY ZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9y Zy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==