From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: [for-4.8][PATCH v2 13/23] xen/arm: p2m: Replace all usage of __p2m_lookup with p2m_get_entry Date: Thu, 15 Sep 2016 12:28:29 +0100 Message-ID: <1473938919-31976-14-git-send-email-julien.grall@arm.com> References: <1473938919-31976-1-git-send-email-julien.grall@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1473938919-31976-1-git-send-email-julien.grall@arm.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xen.org Cc: proskurin@sec.in.tum.de, Julien Grall , sstabellini@kernel.org, steve.capper@arm.com, wei.chen@linaro.org List-Id: xen-devel@lists.xenproject.org X19wMm1fbG9va3VwIGlzIGp1c3QgYSB3cmFwcGVyIHRvIHAybV9nZXRfZW50cnkuCgpTaWduZWQt b2ZmLWJ5OiBKdWxpZW4gR3JhbGwgPGp1bGllbi5ncmFsbEBhcm0uY29tPgpBY2tlZC1ieTogU3Rl ZmFubyBTdGFiZWxsaW5pIDxzc3RhYmVsbGluaUBrZXJuZWwub3JnPgoKLS0tCiAgICBJdCBtaWdo dCBiZSBwb3NzaWJsZSB0byByZXdvcmsgdGhlIG1lbWFjY2VzcyBjb2RlIHRvIHRha2UgYWR2YW50 YWdlCiAgICBvZiBhbGwgdGhlIHBhcmFtZXRlcnMuIEkgd2lsbCBkZWZlciB0aGlzIHRvIHRoZSBt ZW1hY2Nlc3MgZm9sa3MuCgogICAgQ2hhbmdlcyBpbiB2MjoKICAgICAgICAtIEFkZCBTdGVmYW5v J3MgYWNrZWQtYnkKLS0tCiB4ZW4vYXJjaC9hcm0vcDJtLmMgfCAxOCArKysrLS0tLS0tLS0tLS0t LS0KIDEgZmlsZSBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDE0IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL3hlbi9hcmNoL2FybS9wMm0uYyBiL3hlbi9hcmNoL2FybS9wMm0uYwppbmRleCA2 ZTU2Yjk3Li5kZGVlMjU4IDEwMDY0NAotLS0gYS94ZW4vYXJjaC9hcm0vcDJtLmMKKysrIGIveGVu L2FyY2gvYXJtL3AybS5jCkBAIC00MDIsMjQgKzQwMiwxMyBAQCBvdXQ6CiAgICAgcmV0dXJuIG1m bjsKIH0KIAotLyoKLSAqIExvb2t1cCB0aGUgTUZOIGNvcnJlc3BvbmRpbmcgdG8gYSBkb21haW4n cyBHRk4uCi0gKgotICogVGhlcmUgYXJlIG5vIHByb2Nlc3NvciBmdW5jdGlvbnMgdG8gZG8gYSBz dGFnZSAyIG9ubHkgbG9va3VwIHRoZXJlZm9yZSB3ZQotICogZG8gYSBhIHNvZnR3YXJlIHdhbGsu Ci0gKi8KLXN0YXRpYyBtZm5fdCBfX3AybV9sb29rdXAoc3RydWN0IGRvbWFpbiAqZCwgZ2ZuX3Qg Z2ZuLCBwMm1fdHlwZV90ICp0KQotewotICAgIHJldHVybiBwMm1fZ2V0X2VudHJ5KCZkLT5hcmNo LnAybSwgZ2ZuLCB0LCBOVUxMLCBOVUxMKTsKLX0KLQogbWZuX3QgcDJtX2xvb2t1cChzdHJ1Y3Qg ZG9tYWluICpkLCBnZm5fdCBnZm4sIHAybV90eXBlX3QgKnQpCiB7CiAgICAgbWZuX3QgcmV0Owog ICAgIHN0cnVjdCBwMm1fZG9tYWluICpwMm0gPSAmZC0+YXJjaC5wMm07CiAKICAgICBwMm1fcmVh ZF9sb2NrKHAybSk7Ci0gICAgcmV0ID0gX19wMm1fbG9va3VwKGQsIGdmbiwgdCk7CisgICAgcmV0 ID0gcDJtX2dldF9lbnRyeShwMm0sIGdmbiwgdCwgTlVMTCwgTlVMTCk7CiAgICAgcDJtX3JlYWRf dW5sb2NrKHAybSk7CiAKICAgICByZXR1cm4gcmV0OwpAQCAtNjkxLDcgKzY4MCw3IEBAIHN0YXRp YyBpbnQgX19wMm1fZ2V0X21lbV9hY2Nlc3Moc3RydWN0IGRvbWFpbiAqZCwgZ2ZuX3QgZ2ZuLAog ICAgICAgICAgKiBObyBzZXR0aW5nIHdhcyBmb3VuZCBpbiB0aGUgUmFkaXggdHJlZS4gQ2hlY2sg aWYgdGhlCiAgICAgICAgICAqIGVudHJ5IGV4aXN0cyBpbiB0aGUgcGFnZS10YWJsZXMuCiAgICAg ICAgICAqLwotICAgICAgICBtZm5fdCBtZm4gPSBfX3AybV9sb29rdXAoZCwgZ2ZuLCBOVUxMKTsK KyAgICAgICAgbWZuX3QgbWZuID0gcDJtX2dldF9lbnRyeShwMm0sIGdmbiwgTlVMTCwgTlVMTCwg TlVMTCk7CiAKICAgICAgICAgaWYgKCBtZm5fZXEobWZuLCBJTlZBTElEX01GTikgKQogICAgICAg ICAgICAgcmV0dXJuIC1FU1JDSDsKQEAgLTE2MTEsNiArMTYwMCw3IEBAIHAybV9tZW1fYWNjZXNz X2NoZWNrX2FuZF9nZXRfcGFnZSh2YWRkcl90IGd2YSwgdW5zaWduZWQgbG9uZyBmbGFnKQogICAg IHhlbm1lbV9hY2Nlc3NfdCB4bWE7CiAgICAgcDJtX3R5cGVfdCB0OwogICAgIHN0cnVjdCBwYWdl X2luZm8gKnBhZ2UgPSBOVUxMOworICAgIHN0cnVjdCBwMm1fZG9tYWluICpwMm0gPSAmY3VycmVu dC0+ZG9tYWluLT5hcmNoLnAybTsKIAogICAgIHJjID0gZ3ZhX3RvX2lwYShndmEsICZpcGEsIGZs YWcpOwogICAgIGlmICggcmMgPCAwICkKQEAgLTE2NzEsNyArMTY2MSw3IEBAIHAybV9tZW1fYWNj ZXNzX2NoZWNrX2FuZF9nZXRfcGFnZSh2YWRkcl90IGd2YSwgdW5zaWduZWQgbG9uZyBmbGFnKQog ICAgICAqIFdlIGhhZCBhIG1lbV9hY2Nlc3MgcGVybWlzc2lvbiBsaW1pdGluZyB0aGUgYWNjZXNz LCBidXQgdGhlIHBhZ2UgdHlwZQogICAgICAqIGNvdWxkIGFsc28gYmUgbGltaXRpbmcsIHNvIHdl IG5lZWQgdG8gY2hlY2sgdGhhdCBhcyB3ZWxsLgogICAgICAqLwotICAgIG1mbiA9IF9fcDJtX2xv b2t1cChjdXJyZW50LT5kb21haW4sIGdmbiwgJnQpOworICAgIG1mbiA9IHAybV9nZXRfZW50cnko cDJtLCBnZm4sICZ0LCBOVUxMLCBOVUxMKTsKICAgICBpZiAoIG1mbl9lcShtZm4sIElOVkFMSURf TUZOKSApCiAgICAgICAgIGdvdG8gZXJyOwogCi0tIAoxLjkuMQoKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVu LWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=