From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: [PATCH 08/15] xen/arm: Rename lpae_valid to lpae_is_valid Date: Mon, 16 Jul 2018 18:27:05 +0100 Message-ID: <20180716172712.20294-9-julien.grall@arm.com> References: <20180716172712.20294-1-julien.grall@arm.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 1ff7HV-0006SY-8b for xen-devel@lists.xenproject.org; Mon, 16 Jul 2018 17:27:29 +0000 In-Reply-To: <20180716172712.20294-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.xenproject.org Cc: Julien Grall , sstabellini@kernel.org List-Id: xen-devel@lists.xenproject.org VGhpcyB3aWxsIGhlbHAgdG8ga2VlcCB0aGUgbmFtaW5nIGNvbnNpc3RlbnQgYWNjcm9zcyBhbGwg bHBhZSBoZWxwZXJzLgoKTm8gZnVuY3Rpb25hbCBjaGFuZ2UgaW50ZW5kZWQuCgpTaWduZWQtb2Zm LWJ5OiBKdWxpZW4gR3JhbGwgPGp1bGllbi5ncmFsbEBhcm0uY29tPgotLS0KIHhlbi9hcmNoL2Fy bS9ndWVzdF93YWxrLmMgIHwgIDIgKy0KIHhlbi9hcmNoL2FybS9tbS5jICAgICAgICAgIHwgIDYg KysrLS0tCiB4ZW4vYXJjaC9hcm0vcDJtLmMgICAgICAgICB8IDIwICsrKysrKysrKystLS0tLS0t LS0tCiB4ZW4vaW5jbHVkZS9hc20tYXJtL2xwYWUuaCB8ICA4ICsrKystLS0tCiA0IGZpbGVzIGNo YW5nZWQsIDE4IGluc2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hl bi9hcmNoL2FybS9ndWVzdF93YWxrLmMgYi94ZW4vYXJjaC9hcm0vZ3Vlc3Rfd2Fsay5jCmluZGV4 IDRkMWVhMGNkYzEuLmE3YzdlMDU2MDMgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL2FybS9ndWVzdF93 YWxrLmMKKysrIGIveGVuL2FyY2gvYXJtL2d1ZXN0X3dhbGsuYwpAQCAtNTQ2LDcgKzU0Niw3IEBA IHN0YXRpYyBpbnQgZ3Vlc3Rfd2Fsa19sZChjb25zdCBzdHJ1Y3QgdmNwdSAqdiwKICAgICAgICAg ICogLSBUaGUgUFRFIGlzIG5vdCB2YWxpZC4KICAgICAgICAgICogLSBJZiAobGV2ZWwgPCAzKSBh bmQgdGhlIFBURSBpcyB2YWxpZCwgd2UgZm91bmQgYSBibG9jayBkZXNjcmlwdG9yLgogICAgICAg ICAgKi8KLSAgICAgICAgaWYgKCBsZXZlbCA9PSAzIHx8ICFscGFlX3ZhbGlkKHB0ZSkgfHwgbHBh ZV9pc19zdXBlcnBhZ2UocHRlLCBsZXZlbCkgKQorICAgICAgICBpZiAoIGxldmVsID09IDMgfHwg IWxwYWVfaXNfdmFsaWQocHRlKSB8fCBscGFlX2lzX3N1cGVycGFnZShwdGUsIGxldmVsKSApCiAg ICAgICAgICAgICBicmVhazsKIAogICAgICAgICAvKgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gvYXJt L21tLmMgYi94ZW4vYXJjaC9hcm0vbW0uYwppbmRleCBiN2YyZGFiZDA1Li5kZTliOTY1ZDJmIDEw MDY0NAotLS0gYS94ZW4vYXJjaC9hcm0vbW0uYworKysgYi94ZW4vYXJjaC9hcm0vbW0uYwpAQCAt MTAwNSw3ICsxMDA1LDcgQEAgc3RhdGljIGludCBjcmVhdGVfeGVuX2VudHJpZXMoZW51bSB4ZW5t YXBfb3BlcmF0aW9uIG9wLAogICAgICAgICAgICAgfQogICAgICAgICB9CiAKLSAgICAgICAgQlVH X09OKCFscGFlX3ZhbGlkKCplbnRyeSkpOworICAgICAgICBCVUdfT04oIWxwYWVfaXNfdmFsaWQo KmVudHJ5KSk7CiAKICAgICAgICAgdGhpcmQgPSBfX21mbl90b192aXJ0KGVudHJ5LT5wdC5iYXNl KTsKICAgICAgICAgZW50cnkgPSAmdGhpcmRbdGhpcmRfdGFibGVfb2Zmc2V0KGFkZHIpXTsKQEAg LTEwMTMsNyArMTAxMyw3IEBAIHN0YXRpYyBpbnQgY3JlYXRlX3hlbl9lbnRyaWVzKGVudW0geGVu bWFwX29wZXJhdGlvbiBvcCwKICAgICAgICAgc3dpdGNoICggb3AgKSB7CiAgICAgICAgICAgICBj YXNlIElOU0VSVDoKICAgICAgICAgICAgIGNhc2UgUkVTRVJWRToKLSAgICAgICAgICAgICAgICBp ZiAoIGxwYWVfdmFsaWQoKmVudHJ5KSApCisgICAgICAgICAgICAgICAgaWYgKCBscGFlX2lzX3Zh bGlkKCplbnRyeSkgKQogICAgICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAgICAgcHJp bnRrKCIlczogdHJ5aW5nIHRvIHJlcGxhY2UgYW4gZXhpc3RpbmcgbWFwcGluZyBhZGRyPSVseCBt Zm49JSJQUklfbWZuIlxuIiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgIF9fZnVuY19fLCBh ZGRyLCBtZm5feChtZm4pKTsKQEAgLTEwMzAsNyArMTAzMCw3IEBAIHN0YXRpYyBpbnQgY3JlYXRl X3hlbl9lbnRyaWVzKGVudW0geGVubWFwX29wZXJhdGlvbiBvcCwKICAgICAgICAgICAgICAgICBi cmVhazsKICAgICAgICAgICAgIGNhc2UgTU9ESUZZOgogICAgICAgICAgICAgY2FzZSBSRU1PVkU6 Ci0gICAgICAgICAgICAgICAgaWYgKCAhbHBhZV92YWxpZCgqZW50cnkpICkKKyAgICAgICAgICAg ICAgICBpZiAoICFscGFlX2lzX3ZhbGlkKCplbnRyeSkgKQogICAgICAgICAgICAgICAgIHsKICAg ICAgICAgICAgICAgICAgICAgcHJpbnRrKCIlczogdHJ5aW5nIHRvICVzIGEgbm9uLWV4aXN0aW5n IG1hcHBpbmcgYWRkcj0lbHhcbiIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICBfX2Z1bmNf Xywgb3AgPT0gUkVNT1ZFID8gInJlbW92ZSIgOiAibW9kaWZ5IiwgYWRkcik7CmRpZmYgLS1naXQg YS94ZW4vYXJjaC9hcm0vcDJtLmMgYi94ZW4vYXJjaC9hcm0vcDJtLmMKaW5kZXggNzJhODRhMzNm ZC4uYTgwYWMzMDFjNSAxMDA2NDQKLS0tIGEveGVuL2FyY2gvYXJtL3AybS5jCisrKyBiL3hlbi9h cmNoL2FybS9wMm0uYwpAQCAtMjUwLDcgKzI1MCw3IEBAIHN0YXRpYyBpbnQgcDJtX25leHRfbGV2 ZWwoc3RydWN0IHAybV9kb21haW4gKnAybSwgYm9vbCByZWFkX29ubHksCiAKICAgICBlbnRyeSA9 ICp0YWJsZSArIG9mZnNldDsKIAotICAgIGlmICggIWxwYWVfdmFsaWQoKmVudHJ5KSApCisgICAg aWYgKCAhbHBhZV9pc192YWxpZCgqZW50cnkpICkKICAgICB7CiAgICAgICAgIGlmICggcmVhZF9v bmx5ICkKICAgICAgICAgICAgIHJldHVybiBHVUVTVF9UQUJMRV9NQVBfRkFJTEVEOwpAQCAtMzQy LDcgKzM0Miw3IEBAIG1mbl90IHAybV9nZXRfZW50cnkoc3RydWN0IHAybV9kb21haW4gKnAybSwg Z2ZuX3QgZ2ZuLAogCiAgICAgZW50cnkgPSB0YWJsZVtvZmZzZXRzW2xldmVsXV07CiAKLSAgICBp ZiAoIGxwYWVfdmFsaWQoZW50cnkpICkKKyAgICBpZiAoIGxwYWVfaXNfdmFsaWQoZW50cnkpICkK ICAgICB7CiAgICAgICAgICp0ID0gZW50cnkucDJtLnR5cGU7CiAKQEAgLTU0Niw3ICs1NDYsNyBA QCBzdGF0aWMgaW50IHAybV9jcmVhdGVfdGFibGUoc3RydWN0IHAybV9kb21haW4gKnAybSwgbHBh ZV90ICplbnRyeSkKICAgICBscGFlX3QgKnA7CiAgICAgbHBhZV90IHB0ZTsKIAotICAgIEFTU0VS VCghbHBhZV92YWxpZCgqZW50cnkpKTsKKyAgICBBU1NFUlQoIWxwYWVfaXNfdmFsaWQoKmVudHJ5 KSk7CiAKICAgICBwYWdlID0gYWxsb2NfZG9taGVhcF9wYWdlKE5VTEwsIDApOwogICAgIGlmICgg cGFnZSA9PSBOVUxMICkKQEAgLTYxMCw3ICs2MTAsNyBAQCBzdGF0aWMgaW50IHAybV9tZW1fYWNj ZXNzX3JhZGl4X3NldChzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCBnZm5fdCBnZm4sCiAgKi8KIHN0 YXRpYyB2b2lkIHAybV9wdXRfbDNfcGFnZShjb25zdCBscGFlX3QgcHRlKQogewotICAgIEFTU0VS VChscGFlX3ZhbGlkKHB0ZSkpOworICAgIEFTU0VSVChscGFlX2lzX3ZhbGlkKHB0ZSkpOwogCiAg ICAgLyoKICAgICAgKiBUT0RPOiBIYW5kbGUgb3RoZXIgcDJtIHR5cGVzCkBAIC02MzgsNyArNjM4 LDcgQEAgc3RhdGljIHZvaWQgcDJtX2ZyZWVfZW50cnkoc3RydWN0IHAybV9kb21haW4gKnAybSwK ICAgICBzdHJ1Y3QgcGFnZV9pbmZvICpwZzsKIAogICAgIC8qIE5vdGhpbmcgdG8gZG8gaWYgdGhl IGVudHJ5IGlzIGludmFsaWQuICovCi0gICAgaWYgKCAhbHBhZV92YWxpZChlbnRyeSkgKQorICAg IGlmICggIWxwYWVfaXNfdmFsaWQoZW50cnkpICkKICAgICAgICAgcmV0dXJuOwogCiAgICAgLyog Tm90aGluZyB0byBkbyBidXQgdXBkYXRpbmcgdGhlIHN0YXRzIGlmIHRoZSBlbnRyeSBpcyBhIHN1 cGVyLXBhZ2UuICovCkBAIC05MDgsMTIgKzkwOCwxMiBAQCBzdGF0aWMgaW50IF9fcDJtX3NldF9l bnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLAogICAgICAqIHNlcXVlbmNlIHdoZW4gdXBkYXRp bmcgdGhlIHRyYW5zbGF0aW9uIHRhYmxlIChENC43LjEgaW4gQVJNIERESQogICAgICAqIDA0ODdB LmopLgogICAgICAqLwotICAgIGlmICggbHBhZV92YWxpZChvcmlnX3B0ZSkgKQorICAgIGlmICgg bHBhZV9pc192YWxpZChvcmlnX3B0ZSkgKQogICAgICAgICBwMm1fcmVtb3ZlX3B0ZShlbnRyeSwg cDJtLT5jbGVhbl9wdGUpOwogCiAgICAgaWYgKCBtZm5fZXEoc21mbiwgSU5WQUxJRF9NRk4pICkK ICAgICAgICAgLyogRmx1c2ggY2FuIGJlIGRlZmVycmVkIGlmIHRoZSBlbnRyeSBpcyByZW1vdmVk ICovCi0gICAgICAgIHAybS0+bmVlZF9mbHVzaCB8PSAhIWxwYWVfdmFsaWQob3JpZ19wdGUpOwor ICAgICAgICBwMm0tPm5lZWRfZmx1c2ggfD0gISFscGFlX2lzX3ZhbGlkKG9yaWdfcHRlKTsKICAg ICBlbHNlCiAgICAgewogICAgICAgICBscGFlX3QgcHRlID0gbWZuX3RvX3AybV9lbnRyeShzbWZu LCB0LCBhKTsKQEAgLTkyOCw3ICs5MjgsNyBAQCBzdGF0aWMgaW50IF9fcDJtX3NldF9lbnRyeShz dHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLAogICAgICAgICAgKiBBbHRob3VnaCwgaXQgY291bGQgYmUg ZGVmZXJlZCB3aGVuIG9ubHkgdGhlIHBlcm1pc3Npb25zIGFyZQogICAgICAgICAgKiBjaGFuZ2Vk IChlLmcgaW4gY2FzZSBvZiBtZW1hY2Nlc3MpLgogICAgICAgICAgKi8KLSAgICAgICAgaWYgKCBs cGFlX3ZhbGlkKG9yaWdfcHRlKSApCisgICAgICAgIGlmICggbHBhZV9pc192YWxpZChvcmlnX3B0 ZSkgKQogICAgICAgICB7CiAgICAgICAgICAgICBpZiAoIGxpa2VseSghcDJtLT5tZW1fYWNjZXNz X2VuYWJsZWQpIHx8CiAgICAgICAgICAgICAgICAgIFAyTV9DTEVBUl9QRVJNKHB0ZSkgIT0gUDJN X0NMRUFSX1BFUk0ob3JpZ19wdGUpICkKQEAgLTk1MCwxMSArOTUwLDExIEBAIHN0YXRpYyBpbnQg X19wMm1fc2V0X2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sCiAgICAgICogRnJlZSB0aGUg ZW50cnkgb25seSBpZiB0aGUgb3JpZ2luYWwgcHRlIHdhcyB2YWxpZCBhbmQgdGhlIGJhc2UKICAg ICAgKiBpcyBkaWZmZXJlbnQgKHRvIGF2b2lkIGZyZWVpbmcgd2hlbiBwZXJtaXNzaW9uIGlzIGNo YW5nZWQpLgogICAgICAqLwotICAgIGlmICggbHBhZV92YWxpZChvcmlnX3B0ZSkgJiYgZW50cnkt PnAybS5iYXNlICE9IG9yaWdfcHRlLnAybS5iYXNlICkKKyAgICBpZiAoIGxwYWVfaXNfdmFsaWQo b3JpZ19wdGUpICYmIGVudHJ5LT5wMm0uYmFzZSAhPSBvcmlnX3B0ZS5wMm0uYmFzZSApCiAgICAg ICAgIHAybV9mcmVlX2VudHJ5KHAybSwgb3JpZ19wdGUsIGxldmVsKTsKIAogICAgIGlmICggbmVl ZF9pb21tdShwMm0tPmRvbWFpbikgJiYKLSAgICAgICAgIChscGFlX3ZhbGlkKG9yaWdfcHRlKSB8 fCBscGFlX3ZhbGlkKCplbnRyeSkpICkKKyAgICAgICAgIChscGFlX2lzX3ZhbGlkKG9yaWdfcHRl KSB8fCBscGFlX2lzX3ZhbGlkKCplbnRyeSkpICkKICAgICAgICAgcmMgPSBpb21tdV9pb3RsYl9m bHVzaChwMm0tPmRvbWFpbiwgZ2ZuX3goc2dmbiksIDFVTCA8PCBwYWdlX29yZGVyKTsKICAgICBl bHNlCiAgICAgICAgIHJjID0gMDsKZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL2FzbS1hcm0vbHBh ZS5oIGIveGVuL2luY2x1ZGUvYXNtLWFybS9scGFlLmgKaW5kZXggYzgwMzU2OWMyZC4uMWQ4NjAy MGQwNyAxMDA2NDQKLS0tIGEveGVuL2luY2x1ZGUvYXNtLWFybS9scGFlLmgKKysrIGIveGVuL2lu Y2x1ZGUvYXNtLWFybS9scGFlLmgKQEAgLTEyOCwxOSArMTI4LDE5IEBAIHR5cGVkZWYgdW5pb24g ewogICAgIGxwYWVfd2Fsa190IHdhbGs7CiB9IGxwYWVfdDsKIAotc3RhdGljIGlubGluZSBib29s IGxwYWVfdmFsaWQobHBhZV90IHB0ZSkKK3N0YXRpYyBpbmxpbmUgYm9vbCBscGFlX2lzX3ZhbGlk KGxwYWVfdCBwdGUpCiB7CiAgICAgcmV0dXJuIHB0ZS53YWxrLnZhbGlkOwogfQogCiBzdGF0aWMg aW5saW5lIGJvb2wgbHBhZV9pc190YWJsZShscGFlX3QgcHRlLCB1bnNpZ25lZCBpbnQgbGV2ZWwp CiB7Ci0gICAgcmV0dXJuIChsZXZlbCA8IDMpICYmIGxwYWVfdmFsaWQocHRlKSAmJiBwdGUud2Fs ay50YWJsZTsKKyAgICByZXR1cm4gKGxldmVsIDwgMykgJiYgbHBhZV9pc192YWxpZChwdGUpICYm IHB0ZS53YWxrLnRhYmxlOwogfQogCiBzdGF0aWMgaW5saW5lIGJvb2wgbHBhZV9pc19tYXBwaW5n KGxwYWVfdCBwdGUsIHVuc2lnbmVkIGludCBsZXZlbCkKIHsKLSAgICBpZiAoICFscGFlX3ZhbGlk KHB0ZSkgKQorICAgIGlmICggIWxwYWVfaXNfdmFsaWQocHRlKSApCiAgICAgICAgIHJldHVybiBm YWxzZTsKICAgICBlbHNlIGlmICggbGV2ZWwgPT0gMyApCiAgICAgICAgIHJldHVybiBwdGUud2Fs ay50YWJsZTsKQEAgLTE1NSw3ICsxNTUsNyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgbHBhZV9pc19z dXBlcnBhZ2UobHBhZV90IHB0ZSwgdW5zaWduZWQgaW50IGxldmVsKQogCiBzdGF0aWMgaW5saW5l IGJvb2wgbHBhZV9pc19wYWdlKGxwYWVfdCBwdGUsIHVuc2lnbmVkIGludCBsZXZlbCkKIHsKLSAg ICByZXR1cm4gKGxldmVsID09IDMpICYmIGxwYWVfdmFsaWQocHRlKSAmJiBwdGUud2Fsay50YWJs ZTsKKyAgICByZXR1cm4gKGxldmVsID09IDMpICYmIGxwYWVfaXNfdmFsaWQocHRlKSAmJiBwdGUu d2Fsay50YWJsZTsKIH0KIAogLyoKLS0gCjIuMTEuMAoKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVs QGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1h bi9saXN0aW5mby94ZW4tZGV2ZWw=