From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shannon Zhao Subject: [PATCH v6 11/17] ARM: XEN: Move xen_early_init() before efi_init() Date: Thu, 17 Mar 2016 17:57:10 +0800 Message-ID: <1458208636-12960-12-git-send-email-zhaoshenglong@huawei.com> References: <1458208636-12960-1-git-send-email-zhaoshenglong@huawei.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1458208636-12960-1-git-send-email-zhaoshenglong@huawei.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: linux-arm-kernel@lists.infradead.org, ard.biesheuvel@linaro.org, stefano.stabellini@citrix.com, david.vrabel@citrix.com Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, linux-efi@vger.kernel.org, ian.campbell@citrix.com, catalin.marinas@arm.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, xen-devel@lists.xen.org, julien.grall@arm.com, shannon.zhao@linaro.org, peter.huangpeng@huawei.com List-Id: xen-devel@lists.xenproject.org RnJvbTogU2hhbm5vbiBaaGFvIDxzaGFubm9uLnpoYW9AbGluYXJvLm9yZz4KCk1vdmUgeGVuX2Vh cmx5X2luaXQoKSBiZWZvcmUgZWZpX2luaXQoKSwgdGhlbiB3aGVuIGNhbGxpbmcgZWZpX2luaXQo KQpjb3VsZCBpbml0aWFsaXplIFhlbiBzcGVjaWZpYyBVRUZJLgoKQ2hlY2sgaWYgaXQgcnVucyBv biBYZW4gaHlwZXJ2aXNvciB0aHJvdWdoIHRoZSBmbGF0IGR0cy4KClNpZ25lZC1vZmYtYnk6IFNo YW5ub24gWmhhbyA8c2hhbm5vbi56aGFvQGxpbmFyby5vcmc+ClJldmlld2VkLWJ5OiBTdGVmYW5v IFN0YWJlbGxpbmkgPHN0ZWZhbm8uc3RhYmVsbGluaUBldS5jaXRyaXguY29tPgotLS0KIGFyY2gv YXJtL3hlbi9lbmxpZ2h0ZW4uYyAgfCA1NiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrLS0tLS0tLS0tLS0tLQogYXJjaC9hcm02NC9rZXJuZWwvc2V0dXAuYyB8ICAyICstCiAyIGZp bGVzIGNoYW5nZWQsIDQyIGluc2VydGlvbnMoKyksIDE2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2FyY2gvYXJtL3hlbi9lbmxpZ2h0ZW4uYyBiL2FyY2gvYXJtL3hlbi9lbmxpZ2h0ZW4uYwpp bmRleCA2ODBhYWUwLi5jNDM2MTdmIDEwMDY0NAotLS0gYS9hcmNoL2FybS94ZW4vZW5saWdodGVu LmMKKysrIGIvYXJjaC9hcm0veGVuL2VubGlnaHRlbi5jCkBAIC0yMCw2ICsyMCw3IEBACiAjaW5j bHVkZSA8bGludXgvaXJxcmV0dXJuLmg+CiAjaW5jbHVkZSA8bGludXgvbW9kdWxlLmg+CiAjaW5j bHVkZSA8bGludXgvb2YuaD4KKyNpbmNsdWRlIDxsaW51eC9vZl9mZHQuaD4KICNpbmNsdWRlIDxs aW51eC9vZl9pcnEuaD4KICNpbmNsdWRlIDxsaW51eC9vZl9hZGRyZXNzLmg+CiAjaW5jbHVkZSA8 bGludXgvY3B1aWRsZS5oPgpAQCAtNTMsOCArNTQsNiBAQCBzdHJ1Y3QgeGVuX21lbW9yeV9yZWdp b24geGVuX2V4dHJhX21lbVtYRU5fRVhUUkFfTUVNX01BWF9SRUdJT05TXSBfX2luaXRkYXRhOwog CiBzdGF0aWMgX19yZWFkX21vc3RseSB1bnNpZ25lZCBpbnQgeGVuX2V2ZW50c19pcnE7CiAKLXN0 YXRpYyBfX2luaXRkYXRhIHN0cnVjdCBkZXZpY2Vfbm9kZSAqeGVuX25vZGU7Ci0KIGludCB4ZW5f cmVtYXBfZG9tYWluX2dmbl9hcnJheShzdHJ1Y3Qgdm1fYXJlYV9zdHJ1Y3QgKnZtYSwKIAkJCSAg ICAgICB1bnNpZ25lZCBsb25nIGFkZHIsCiAJCQkgICAgICAgeGVuX3Bmbl90ICpnZm4sIGludCBu ciwKQEAgLTIzOCw2ICsyMzcsMzMgQEAgc3RhdGljIGlycXJldHVybl90IHhlbl9hcm1fY2FsbGJh Y2soaW50IGlycSwgdm9pZCAqYXJnKQogCXJldHVybiBJUlFfSEFORExFRDsKIH0KIAorc3RhdGlj IF9faW5pdGRhdGEgc3RydWN0IHsKKwljb25zdCBjaGFyICpjb21wYXQ7CisJY29uc3QgY2hhciAq cHJlZml4OworCWNvbnN0IGNoYXIgKnZlcnNpb247CisJYm9vbCBmb3VuZDsKK30gaHlwZXJfbm9k ZSA9IHsieGVuLHhlbiIsICJ4ZW4seGVuLSIsIE5VTEwsIGZhbHNlfTsKKworc3RhdGljIGludCBf X2luaXQgZmR0X2ZpbmRfaHlwZXJfbm9kZSh1bnNpZ25lZCBsb25nIG5vZGUsIGNvbnN0IGNoYXIg KnVuYW1lLAorCQkJCSAgICAgIGludCBkZXB0aCwgdm9pZCAqZGF0YSkKK3sKKwljb25zdCB2b2lk ICpzID0gTlVMTDsKKwlpbnQgbGVuOworCisJaWYgKGRlcHRoICE9IDEgfHwgc3RyY21wKHVuYW1l LCAiaHlwZXJ2aXNvciIpICE9IDApCisJCXJldHVybiAwOworCisJaWYgKG9mX2ZsYXRfZHRfaXNf Y29tcGF0aWJsZShub2RlLCBoeXBlcl9ub2RlLmNvbXBhdCkpCisJCWh5cGVyX25vZGUuZm91bmQg PSB0cnVlOworCisJcyA9IG9mX2dldF9mbGF0X2R0X3Byb3Aobm9kZSwgImNvbXBhdGlibGUiLCAm bGVuKTsKKwlpZiAoc3RybGVuKGh5cGVyX25vZGUucHJlZml4KSArIDMgIDwgbGVuICYmCisJICAg ICFzdHJuY21wKGh5cGVyX25vZGUucHJlZml4LCBzLCBzdHJsZW4oaHlwZXJfbm9kZS5wcmVmaXgp KSkKKwkJaHlwZXJfbm9kZS52ZXJzaW9uID0gcyArIHN0cmxlbihoeXBlcl9ub2RlLnByZWZpeCk7 CisKKwlyZXR1cm4gMDsKK30KKwogLyoKICAqIHNlZSBEb2N1bWVudGF0aW9uL2RldmljZXRyZWUv YmluZGluZ3MvYXJtL3hlbi50eHQgZm9yIHRoZQogICogZG9jdW1lbnRhdGlvbiBvZiB0aGUgWGVu IERldmljZSBUcmVlIGZvcm1hdC4KQEAgLTI0NSwyNiArMjcxLDE4IEBAIHN0YXRpYyBpcnFyZXR1 cm5fdCB4ZW5fYXJtX2NhbGxiYWNrKGludCBpcnEsIHZvaWQgKmFyZykKICNkZWZpbmUgR1JBTlRf VEFCTEVfUEhZU0FERFIgMAogdm9pZCBfX2luaXQgeGVuX2Vhcmx5X2luaXQodm9pZCkKIHsKLQlp bnQgbGVuOwotCWNvbnN0IGNoYXIgKnMgPSBOVUxMOwotCWNvbnN0IGNoYXIgKnZlcnNpb24gPSBO VUxMOwotCWNvbnN0IGNoYXIgKnhlbl9wcmVmaXggPSAieGVuLHhlbi0iOwotCi0JeGVuX25vZGUg PSBvZl9maW5kX2NvbXBhdGlibGVfbm9kZShOVUxMLCBOVUxMLCAieGVuLHhlbiIpOwotCWlmICgh eGVuX25vZGUpIHsKKwlvZl9zY2FuX2ZsYXRfZHQoZmR0X2ZpbmRfaHlwZXJfbm9kZSwgTlVMTCk7 CisJaWYgKCFoeXBlcl9ub2RlLmZvdW5kKSB7CiAJCXByX2RlYnVnKCJObyBYZW4gc3VwcG9ydFxu Iik7CiAJCXJldHVybjsKIAl9Ci0JcyA9IG9mX2dldF9wcm9wZXJ0eSh4ZW5fbm9kZSwgImNvbXBh dGlibGUiLCAmbGVuKTsKLQlpZiAoc3RybGVuKHhlbl9wcmVmaXgpICsgMyAgPCBsZW4gJiYKLQkJ CSFzdHJuY21wKHhlbl9wcmVmaXgsIHMsIHN0cmxlbih4ZW5fcHJlZml4KSkpCi0JCXZlcnNpb24g PSBzICsgc3RybGVuKHhlbl9wcmVmaXgpOwotCWlmICh2ZXJzaW9uID09IE5VTEwpIHsKKworCWlm IChoeXBlcl9ub2RlLnZlcnNpb24gPT0gTlVMTCkgewogCQlwcl9kZWJ1ZygiWGVuIHZlcnNpb24g bm90IGZvdW5kXG4iKTsKIAkJcmV0dXJuOwogCX0KIAotCXByX2luZm8oIlhlbiAlcyBzdXBwb3J0 IGZvdW5kXG4iLCB2ZXJzaW9uKTsKKwlwcl9pbmZvKCJYZW4gJXMgc3VwcG9ydCBmb3VuZFxuIiwg aHlwZXJfbm9kZS52ZXJzaW9uKTsKIAogCXhlbl9kb21haW5fdHlwZSA9IFhFTl9IVk1fRE9NQUlO OwogCkBAIC0zMDUsNiArMzIzLDE0IEBAIHN0YXRpYyB2b2lkIF9faW5pdCB4ZW5fYWNwaV9ndWVz dF9pbml0KHZvaWQpCiAKIHN0YXRpYyB2b2lkIF9faW5pdCB4ZW5fZHRfZ3Vlc3RfaW5pdCh2b2lk KQogeworCXN0cnVjdCBkZXZpY2Vfbm9kZSAqeGVuX25vZGU7CisKKwl4ZW5fbm9kZSA9IG9mX2Zp bmRfY29tcGF0aWJsZV9ub2RlKE5VTEwsIE5VTEwsICJ4ZW4seGVuIik7CisJaWYgKCF4ZW5fbm9k ZSkgeworCQlwcl9lcnIoIlhlbiBzdXBwb3J0IHdhcyBkZXRlY3RlZCBiZWZvcmUsIGJ1dCBpdCBo YXMgZGlzYXBwZWFyZWRcbiIpOworCQlyZXR1cm47CisJfQorCiAJeGVuX2V2ZW50c19pcnEgPSBp cnFfb2ZfcGFyc2VfYW5kX21hcCh4ZW5fbm9kZSwgMCk7CiB9CiAKZGlmZiAtLWdpdCBhL2FyY2gv YXJtNjQva2VybmVsL3NldHVwLmMgYi9hcmNoL2FybTY0L2tlcm5lbC9zZXR1cC5jCmluZGV4IDQ1 MDk4N2QuLjZjZjUwNTEgMTAwNjQ0Ci0tLSBhL2FyY2gvYXJtNjQva2VybmVsL3NldHVwLmMKKysr IGIvYXJjaC9hcm02NC9rZXJuZWwvc2V0dXAuYwpAQCAtMzEzLDYgKzMxMyw3IEBAIHZvaWQgX19p bml0IHNldHVwX2FyY2goY2hhciAqKmNtZGxpbmVfcCkKIAkgKi8KIAlsb2NhbF9hc3luY19lbmFi bGUoKTsKIAorCXhlbl9lYXJseV9pbml0KCk7CiAJZWZpX2luaXQoKTsKIAlhcm02NF9tZW1ibG9j a19pbml0KCk7CiAKQEAgLTMzNCw3ICszMzUsNiBAQCB2b2lkIF9faW5pdCBzZXR1cF9hcmNoKGNo YXIgKipjbWRsaW5lX3ApCiAJfSBlbHNlIHsKIAkJcHNjaV9hY3BpX2luaXQoKTsKIAl9Ci0JeGVu X2Vhcmx5X2luaXQoKTsKIAogCWNwdV9yZWFkX2Jvb3RjcHVfb3BzKCk7CiAJc21wX2luaXRfY3B1 cygpOwotLSAKMi4wLjQKCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpo dHRwOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK