From: Michel Thierry Subject: [PATCH v4 23/24] drm/i915/bdw: Dynamic page table allocations Date: Thu, 22 Jan 2015 17:01:45 +0000 Message-ID: <1421946106-7921-24-git-send-email-michel.thierry@intel.com> References: <1418922621-25818-1-git-send-email-michel.thierry@intel.com> <1421946106-7921-1-git-send-email-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 6EA90720A9 for ; Thu, 22 Jan 2015 09:01:48 -0800 (PST) In-Reply-To: <1421946106-7921-1-git-send-email-michel.thierry@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQmVuIFdpZGF3c2t5IDxiZW5qYW1pbi53aWRhd3NreUBpbnRlbC5jb20+CgpUaGlzIGZp bmlzaGVzIG9mZiB0aGUgZHluYW1pYyBwYWdlIHRhYmxlcyBhbGxvY2F0aW9ucywgaW4gdGhlIGxl Z2FjeSAzCmxldmVsIHN0eWxlIHRoYXQgYWxyZWFkeSBleGlzdHMuIE1vc3QgZXZlcnl0aGluZyBo YXMgYWxyZWFkeSBiZWVuIHNldHVwCnRvIHRoaXMgcG9pbnQsIHRoZSBwYXRjaCBmaW5pc2hlcyBv ZmYgdGhlIGVuYWJsaW5nIGJ5IHNldHRpbmcgdGhlCmFwcHJvcHJpYXRlIGZ1bmN0aW9uIHBvaW50 ZXJzLgoKdjI6IFVwZGF0ZSBhbGlhc2luZy90cnVlIHBwZ3R0IGFsbG9jYXRlL3RlYXJkb3duL2Ns ZWFyIGZ1bmN0aW9ucyBmb3IKZ2VuIDYgJiA3LgoKdjM6IFJlYmFzZS4KCnY0OiBSZW1vdmUgQlVH KCkgZnJvbSBwcGd0dF91bmJpbmRfdm1hLCBidXQga2VlcCBjaGVja2luZyB0aGF0IGVpdGhlcgp0 ZWFyZG93bl92YV9yYW5nZSBvciBjbGVhcl9yYW5nZSBmdW5jdGlvbnMgZXhpc3QgKERhbmllbCku Cgp2NTogU2ltaWxhciB0byBnZW42LCBpbiBpbml0LCBnZW44X3BwZ3R0X2NsZWFyX3JhbmdlIGNh bGwgaXMgb25seSBuZWVkZWQKZm9yIGFsaWFzaW5nIHBwZ3R0LiBab21iaWUgdHJhY2tpbmcgd2Fz IG9yaWdpbmFsbHkgYWRkZWQgZm9yIHRlYXJkb3duCmZ1bmN0aW9uIGFuZCBpcyBubyBsb25nZXIg cmVxdWlyZWQuCgpDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVsQGZmd2xsLmNoPgpTaWduZWQtb2Zm LWJ5OiBCZW4gV2lkYXdza3kgPGJlbkBid2lkYXdzay5uZXQ+ClNpZ25lZC1vZmYtYnk6IE1pY2hl bCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20+ICh2MispCi0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgfCAyOTUgKysrKysrKysrKysrKysrKysrKysrKysr KysrKystLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjQyIGluc2VydGlvbnMoKyksIDUzIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggNjYyYjlkOC4uZjNk N2UyNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTYwOSw3ICs2MDksNyBA QCBzdGF0aWMgdm9pZCBnZW44X3BwZ3R0X2luc2VydF9lbnRyaWVzKHN0cnVjdCBpOTE1X2FkZHJl c3Nfc3BhY2UgKnZtLAogCX0KIH0KIAotc3RhdGljIHZvaWQgX19nZW44X2RvX21hcF9wdChnZW44 X3BwZ3R0X3BkZV90ICpwZGUsCitzdGF0aWMgdm9pZCBfX2dlbjhfZG9fbWFwX3B0KGdlbjhfcHBn dHRfcGRlX3QgKiBjb25zdCBwZGUsCiAJCQkgICAgIHN0cnVjdCBpOTE1X3BhZ2VfdGFibGVfZW50 cnkgKnB0LAogCQkJICAgICBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewpAQCAtNjI2LDcgKzYy Niw3IEBAIHN0YXRpYyB2b2lkIGdlbjhfbWFwX3BhZ2V0YWJsZV9yYW5nZShzdHJ1Y3QgaTkxNV9w YWdlX2RpcmVjdG9yeV9lbnRyeSAqcGQsCiAJCQkJICAgICB1aW50NjRfdCBsZW5ndGgsCiAJCQkJ ICAgICBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewotCWdlbjhfcHBndHRfcGRlX3QgKnBhZ2Vf ZGlyZWN0b3J5ID0ga21hcF9hdG9taWMocGQtPnBhZ2UpOworCWdlbjhfcHBndHRfcGRlX3QgKiBj b25zdCBwYWdlX2RpcmVjdG9yeSA9IGttYXBfYXRvbWljKHBkLT5wYWdlKTsKIAlzdHJ1Y3QgaTkx NV9wYWdlX3RhYmxlX2VudHJ5ICpwdDsKIAl1aW50NjRfdCB0ZW1wLCBwZGU7CiAKQEAgLTcxMCw2 NyArNzEwLDE3MyBAQCBzdGF0aWMgdm9pZCBnZW44X3BwZ3R0X2NsZWFudXAoc3RydWN0IGk5MTVf YWRkcmVzc19zcGFjZSAqdm0pCiAJZ2VuOF9wcGd0dF9mcmVlKHBwZ3R0KTsKIH0KIAotc3RhdGlj IGludCBnZW44X3BwZ3R0X2FsbG9jX3BhZ2V0YWJzKHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5 X2VudHJ5ICpwZCwKKy8qKgorICogZ2VuOF9wcGd0dF9hbGxvY19wYWdldGFicygpIC0gQWxsb2Nh dGUgcGFnZSB0YWJsZXMgZm9yIFZBIHJhbmdlLgorICogQHBwZ3R0OglNYXN0ZXIgcHBndHQgc3Ry dWN0dXJlLgorICogQHBkOgkJUGFnZSBkaXJlY3RvcnkgZm9yIHRoaXMgYWRkcmVzcyByYW5nZS4K KyAqIEBzdGFydDoJU3RhcnRpbmcgdmlydHVhbCBhZGRyZXNzIHRvIGJlZ2luIGFsbG9jYXRpb25z LgorICogQGxlbmd0aAlTaXplIG9mIHRoZSBhbGxvY2F0aW9ucy4KKyAqIEBuZXdfcHRzOglCaXRt YXAgc2V0IGJ5IGZ1bmN0aW9uIHdpdGggbmV3IGFsbG9jYXRpb25zLiBMaWtlbHkgdXNlZCBieSB0 aGUKKyAqCQljYWxsZXIgdG8gZnJlZSBvbiBlcnJvci4KKyAqCisgKiBBbGxvY2F0ZSB0aGUgcmVx dWlyZWQgbnVtYmVyIG9mIHBhZ2UgdGFibGVzLiBFeHRyZW1lbHkgc2ltaWxhciB0bworICogZ2Vu OF9wcGd0dF9hbGxvY19wYWdlX2RpcmVjdG9yaWVzKCkuIFRoZSBtYWluIGRpZmZlcmVuY2UgaXMg aGVyZSB3ZSBhcmUgbGltaXRlZCBieQorICogdGhlIHBhZ2UgZGlyZWN0b3J5IGJvdW5kYXJ5IChp bnN0ZWFkIG9mIHRoZSBwYWdlIGRpcmVjdG9yeSBwb2ludGVyKS4gVGhhdAorICogYm91bmRhcnkg aXMgMUdCIHZpcnR1YWwuIFRoZXJlZm9yZSwgdW5saWtlIGdlbjhfcHBndHRfYWxsb2NfcGFnZV9k aXJlY3RvcmllcygpLCBpdCBpcworICogcG9zc2libGUsIGFuZCBsaWtlbHkgdGhhdCB0aGUgY2Fs bGVyIHdpbGwgbmVlZCB0byB1c2UgbXVsdGlwbGUgY2FsbHMgb2YgdGhpcworICogZnVuY3Rpb24g dG8gYWNoaWV2ZSB0aGUgYXBwcm9wcmlhdGUgYWxsb2NhdGlvbi4KKyAqCisgKiBSZXR1cm46IDAg aWYgc3VjY2VzczsgbmVnYXRpdmUgZXJyb3IgY29kZSBvdGhlcndpc2UuCisgKi8KK3N0YXRpYyBp bnQgZ2VuOF9wcGd0dF9hbGxvY19wYWdldGFicyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQs CisJCQkJICAgICBzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9lbnRyeSAqcGQsCiAJCQkJICAg ICB1aW50NjRfdCBzdGFydCwKIAkJCQkgICAgIHVpbnQ2NF90IGxlbmd0aCwKLQkJCQkgICAgIHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCisJCQkJICAgICB1bnNpZ25lZCBsb25nICpuZXdfcHRzKQog ewotCXN0cnVjdCBpOTE1X3BhZ2VfdGFibGVfZW50cnkgKnVudXNlZDsKKwlzdHJ1Y3QgaTkxNV9w YWdlX3RhYmxlX2VudHJ5ICpwdDsKIAl1aW50NjRfdCB0ZW1wOwogCXVpbnQzMl90IHBkZTsKIAot CWdlbjhfZm9yX2VhY2hfcGRlKHVudXNlZCwgcGQsIHN0YXJ0LCBsZW5ndGgsIHRlbXAsIHBkZSkg ewotCQlCVUdfT04odW51c2VkKTsKLQkJcGQtPnBhZ2VfdGFibGVzW3BkZV0gPSBhbGxvY19wdF9z aW5nbGUoZGV2KTsKLQkJaWYgKElTX0VSUihwZC0+cGFnZV90YWJsZXNbcGRlXSkpCisJZ2VuOF9m b3JfZWFjaF9wZGUocHQsIHBkLCBzdGFydCwgbGVuZ3RoLCB0ZW1wLCBwZGUpIHsKKwkJLyogRG9u J3QgcmVhbGxvY2F0ZSBwYWdlIHRhYmxlcyAqLworCQlpZiAocHQpIHsKKwkJCS8qIFNjcmF0Y2gg aXMgbmV2ZXIgYWxsb2NhdGVkIHRoaXMgd2F5ICovCisJCQlXQVJOX09OKHB0LT5zY3JhdGNoKTsK KwkJCWNvbnRpbnVlOworCQl9CisKKwkJcHQgPSBhbGxvY19wdF9zaW5nbGUocHBndHQtPmJhc2Uu ZGV2KTsKKwkJaWYgKElTX0VSUihwdCkpCiAJCQlnb3RvIHVud2luZF9vdXQ7CisKKwkJcGQtPnBh Z2VfdGFibGVzW3BkZV0gPSBwdDsKKwkJc2V0X2JpdChwZGUsIG5ld19wdHMpOwogCX0KIAogCXJl dHVybiAwOwogCiB1bndpbmRfb3V0OgotCXdoaWxlIChwZGUtLSkKLQkJdW5tYXBfYW5kX2ZyZWVf cHQocGQtPnBhZ2VfdGFibGVzW3BkZV0sIGRldik7CisJZm9yX2VhY2hfc2V0X2JpdChwZGUsIG5l d19wdHMsIEdFTjhfUERFU19QRVJfUEFHRSkKKwkJdW5tYXBfYW5kX2ZyZWVfcHQocGQtPnBhZ2Vf dGFibGVzW3BkZV0sIHBwZ3R0LT5iYXNlLmRldik7CiAKIAlyZXR1cm4gLUVOT01FTTsKIH0KIAot LyogYml0bWFwIG9mIG5ldyBwYWdlX2RpcmVjdG9yaWVzICovCi1zdGF0aWMgaW50IGdlbjhfcHBn dHRfYWxsb2NfcGFnZV9kaXJlY3RvcmllcyhzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2lu dGVyX2VudHJ5ICpwZHAsCisvKioKKyAqIGdlbjhfcHBndHRfYWxsb2NfcGFnZV9kaXJlY3Rvcmll cygpIC0gQWxsb2NhdGUgcGFnZSBkaXJlY3RvcmllcyBmb3IgVkEgcmFuZ2UuCisgKiBAcHBndHQ6 CU1hc3RlciBwcGd0dCBzdHJ1Y3R1cmUuCisgKiBAcGRwOglQYWdlIGRpcmVjdG9yeSBwb2ludGVy IGZvciB0aGlzIGFkZHJlc3MgcmFuZ2UuCisgKiBAc3RhcnQ6CVN0YXJ0aW5nIHZpcnR1YWwgYWRk cmVzcyB0byBiZWdpbiBhbGxvY2F0aW9ucy4KKyAqIEBsZW5ndGgJU2l6ZSBvZiB0aGUgYWxsb2Nh dGlvbnMuCisgKiBAbmV3X3BkcwlCaXRtYXAgc2V0IGJ5IGZ1bmN0aW9uIHdpdGggbmV3IGFsbG9j YXRpb25zLiBMaWtlbHkgdXNlZCBieSB0aGUKKyAqCQljYWxsZXIgdG8gZnJlZSBvbiBlcnJvci4K KyAqCisgKiBBbGxvY2F0ZSB0aGUgcmVxdWlyZWQgbnVtYmVyIG9mIHBhZ2UgZGlyZWN0b3JpZXMg c3RhcnRpbmcgYXQgdGhlIHBkZSBpbmRleCBvZgorICogQHN0YXJ0LCBhbmQgZW5kaW5nIGF0IHRo ZSBwZGUgaW5kZXggQHN0YXJ0ICsgQGxlbmd0aC4gVGhpcyBmdW5jdGlvbiB3aWxsIHNraXAKKyAq IG92ZXIgYWxyZWFkeSBhbGxvY2F0ZWQgcGFnZSBkaXJlY3RvcmllcyB3aXRoaW4gdGhlIHJhbmdl LCBhbmQgb25seSBhbGxvY2F0ZQorICogbmV3IG9uZXMsIHNldHRpbmcgdGhlIGFwcHJvcHJpYXRl IHBvaW50ZXIgd2l0aGluIHRoZSBwZHAgYXMgd2VsbCBhcyB0aGUKKyAqIGNvcnJlY3QgcG9zaXRp b24gaW4gdGhlIGJpdG1hcCBAbmV3X3Bkcy4KKyAqCisgKiBUaGUgZnVuY3Rpb24gd2lsbCBvbmx5 IGFsbG9jYXRlIHRoZSBwYWdlcyB3aXRoaW4gdGhlIHJhbmdlIGZvciBhIGdpdmUgcGFnZQorICog ZGlyZWN0b3J5IHBvaW50ZXIuIEluIG90aGVyIHdvcmRzLCBpZiBAc3RhcnQgKyBAbGVuZ3RoIHN0 cmFkZGxlcyBhIHZpcnR1YWxseQorICogYWRkcmVzc2VkIFBEUCBib3VuZGFyeSAoNTEyR0IgZm9y IDRrIHBhZ2VzKSwgdGhlcmUgd2lsbCBiZSBtb3JlIGFsbG9jYXRpb25zCisgKiByZXF1aXJlZCBi eSB0aGUgY2FsbGVyLCBUaGlzIGlzIG5vdCBjdXJyZW50bHkgcG9zc2libGUsIGFuZCB0aGUgQlVH IGluIHRoZQorICogY29kZSB3aWxsIHByZXZlbnQgaXQuCisgKgorICogUmV0dXJuOiAwIGlmIHN1 Y2Nlc3M7IG5lZ2F0aXZlIGVycm9yIGNvZGUgb3RoZXJ3aXNlLgorICovCitzdGF0aWMgaW50IGdl bjhfcHBndHRfYWxsb2NfcGFnZV9kaXJlY3RvcmllcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBn dHQsCisJCQkJICAgICBzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVyX2VudHJ5ICpw ZHAsCiAJCQkJICAgICB1aW50NjRfdCBzdGFydCwKIAkJCQkgICAgIHVpbnQ2NF90IGxlbmd0aCwK LQkJCQkgICAgIHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCisJCQkJICAgICB1bnNpZ25lZCBsb25n ICpuZXdfcGRzKQogewotCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X2VudHJ5ICp1bnVzZWQ7 CisJc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfZW50cnkgKnBkOwogCXVpbnQ2NF90IHRlbXA7 CiAJdWludDMyX3QgcGRwZTsKIAorCUJVR19PTighYml0bWFwX2VtcHR5KG5ld19wZHMsIEdFTjhf TEVHQUNZX1BEUEVTKSk7CisKIAkvKiBGSVhNRTogUFBHVFQgY29udGFpbmVyX29mIHdvbid0IHdv cmsgZm9yIDY0YiAqLwogCUJVR19PTigoc3RhcnQgKyBsZW5ndGgpID4gMHg4MDAwMDAwMDBVTEwp OwogCi0JZ2VuOF9mb3JfZWFjaF9wZHBlKHVudXNlZCwgcGRwLCBzdGFydCwgbGVuZ3RoLCB0ZW1w LCBwZHBlKSB7Ci0JCUJVR19PTih1bnVzZWQpOwotCQlwZHAtPnBhZ2VfZGlyZWN0b3J5W3BkcGVd ID0gYWxsb2NfcGRfc2luZ2xlKGRldik7CisJZ2VuOF9mb3JfZWFjaF9wZHBlKHBkLCBwZHAsIHN0 YXJ0LCBsZW5ndGgsIHRlbXAsIHBkcGUpIHsKKwkJaWYgKHBkKQorCQkJY29udGludWU7CiAKLQkJ aWYgKElTX0VSUihwZHAtPnBhZ2VfZGlyZWN0b3J5W3BkcGVdKSkKKwkJcGQgPSBhbGxvY19wZF9z aW5nbGUocHBndHQtPmJhc2UuZGV2KTsKKwkJaWYgKElTX0VSUihwZCkpCiAJCQlnb3RvIHVud2lu ZF9vdXQ7CisKKwkJcGRwLT5wYWdlX2RpcmVjdG9yeVtwZHBlXSA9IHBkOworCQlzZXRfYml0KHBk cGUsIG5ld19wZHMpOwogCX0KIAogCXJldHVybiAwOwogCiB1bndpbmRfb3V0OgotCXdoaWxlIChw ZHBlLS0pCi0JCXVubWFwX2FuZF9mcmVlX3BkKHBkcC0+cGFnZV9kaXJlY3RvcnlbcGRwZV0sIGRl dik7CisJZm9yX2VhY2hfc2V0X2JpdChwZHBlLCBuZXdfcGRzLCBHRU44X0xFR0FDWV9QRFBFUykK KwkJdW5tYXBfYW5kX2ZyZWVfcGQocGRwLT5wYWdlX2RpcmVjdG9yeVtwZHBlXSwgcHBndHQtPmJh c2UuZGV2KTsKIAogCXJldHVybiAtRU5PTUVNOwogfQogCitzdGF0aWMgaW5saW5lIHZvaWQKK2Zy ZWVfZ2VuOF90ZW1wX2JpdG1hcHModW5zaWduZWQgbG9uZyAqbmV3X3BkcywgdW5zaWduZWQgbG9u ZyAqKm5ld19wdHMpCit7CisJaW50IGk7CisKKwlmb3IgKGkgPSAwOyBpIDwgR0VOOF9MRUdBQ1lf UERQRVM7IGkrKykKKwkJa2ZyZWUobmV3X3B0c1tpXSk7CisJa2ZyZWUobmV3X3B0cyk7CisJa2Zy ZWUobmV3X3Bkcyk7Cit9CisKKy8qIEZpbGxzIGluIHRoZSBwYWdlIGRpcmVjdG9yeSBiaXRtYXAs IGFudCB0aGUgYXJyYXkgb2YgcGFnZSB0YWJsZXMgYml0bWFwLiBCb3RoCisgKiBvZiB0aGVzZSBh cmUgYmFzZWQgb24gdGhlIG51bWJlciBvZiBQRFBFcyBpbiB0aGUgc3lzdGVtLgorICovCitpbnQg X19tdXN0X2NoZWNrIGFsbG9jX2dlbjhfdGVtcF9iaXRtYXBzKHVuc2lnbmVkIGxvbmcgKipuZXdf cGRzLAorCQkJCQkgdW5zaWduZWQgbG9uZyAqKipuZXdfcHRzKQoreworCWludCBpOworCXVuc2ln bmVkIGxvbmcgKnBkczsKKwl1bnNpZ25lZCBsb25nICoqcHRzOworCisJcGRzID0ga2NhbGxvYyhC SVRTX1RPX0xPTkdTKEdFTjhfTEVHQUNZX1BEUEVTKSwgc2l6ZW9mKHVuc2lnbmVkIGxvbmcpLCBH RlBfS0VSTkVMKTsKKwlpZiAoIXBkcykKKwkJcmV0dXJuIC1FTk9NRU07CisKKwlwdHMgPSBrY2Fs bG9jKEdFTjhfUERFU19QRVJfUEFHRSwgc2l6ZW9mKHVuc2lnbmVkIGxvbmcgKiksIEdGUF9LRVJO RUwpOworCWlmICghcHRzKSB7CisJCWtmcmVlKHBkcyk7CisJCXJldHVybiAtRU5PTUVNOworCX0K KworCWZvciAoaSA9IDA7IGkgPCBHRU44X0xFR0FDWV9QRFBFUzsgaSsrKSB7CisJCXB0c1tpXSA9 IGtjYWxsb2MoQklUU19UT19MT05HUyhHRU44X1BERVNfUEVSX1BBR0UpLAorCQkJCSBzaXplb2Yo dW5zaWduZWQgbG9uZyksIEdGUF9LRVJORUwpOworCQlpZiAoIXB0c1tpXSkKKwkJCWdvdG8gZXJy X291dDsKKwl9CisKKwkqbmV3X3BkcyA9IHBkczsKKwkqbmV3X3B0cyA9ICh1bnNpZ25lZCBsb25n ICoqKXB0czsKKworCXJldHVybiAwOworCitlcnJfb3V0OgorCWZyZWVfZ2VuOF90ZW1wX2JpdG1h cHMocGRzLCBwdHMpOworCXJldHVybiAtRU5PTUVNOworfQorCiBzdGF0aWMgaW50IGdlbjhfYWxs b2NfdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJCQkgICAgICAgdWlu dDY0X3Qgc3RhcnQsCiAJCQkgICAgICAgdWludDY0X3QgbGVuZ3RoKQogewogCXN0cnVjdCBpOTE1 X2h3X3BwZ3R0ICpwcGd0dCA9CiAJCWNvbnRhaW5lcl9vZih2bSwgc3RydWN0IGk5MTVfaHdfcHBn dHQsIGJhc2UpOworCXVuc2lnbmVkIGxvbmcgKm5ld19wYWdlX2RpcnMsICoqbmV3X3BhZ2VfdGFi bGVzOwogCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X2VudHJ5ICpwZDsKIAljb25zdCB1aW50 NjRfdCBvcmlnX3N0YXJ0ID0gc3RhcnQ7CiAJY29uc3QgdWludDY0X3Qgb3JpZ19sZW5ndGggPSBs ZW5ndGg7CkBAIC03NzgsNDQgKzg4NCw5NiBAQCBzdGF0aWMgaW50IGdlbjhfYWxsb2NfdmFfcmFu Z2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJdWludDMyX3QgcGRwZTsKIAlpbnQg cmV0OwogCi0JLyogRG8gdGhlIGFsbG9jYXRpb25zIGZpcnN0IHNvIHdlIGNhbiBlYXNpbHkgYmFp bCBvdXQgKi8KLQlyZXQgPSBnZW44X3BwZ3R0X2FsbG9jX3BhZ2VfZGlyZWN0b3JpZXMoJnBwZ3R0 LT5wZHAsIHN0YXJ0LCBsZW5ndGgsCi0JCQkJCXBwZ3R0LT5iYXNlLmRldik7CisjaWZuZGVmIENP TkZJR182NEJJVAorCS8qIERpc2FsbG93IDY0YiBhZGRyZXNzIG9uIDMyYiBwbGF0Zm9ybXMuIE5v dGhpbmcgaXMgd3Jvbmcgd2l0aCBkb2luZworCSAqIHRoaXMgaW4gaGFyZHdhcmUsIGJ1dCBhIGxv dCBvZiB0aGUgZHJtIGNvZGUgaXMgbm90IHByZXBhcmVkIHRvIGhhbmRsZQorCSAqIDY0YiBvZmZz ZXQgb24gMzJiIHBsYXRmb3Jtcy4KKwkgKiBUaGlzIHdpbGwgYmUgYWRkcmVzc2VkIHdoZW4gNDhi IFBQR1RUIGlzIGFkZGVkICovCisJaWYgKHN0YXJ0ICsgbGVuZ3RoID4gMHgxMDAwMDAwMDBVTEwp CisJCXJldHVybiAtRTJCSUc7CisjZW5kaWYKKworCS8qIFdyYXAgaXMgbmV2ZXIgb2theSBzaW5j ZSB3ZSBjYW4gb25seSByZXByZXNlbnQgNDhiLCBhbmQgd2UgZG9uJ3QKKwkgKiBhY3R1YWxseSB1 c2UgdGhlIG90aGVyIHNpZGUgb2YgdGhlIGNhbm9uaWNhbCBhZGRyZXNzIHNwYWNlLgorCSAqLwor CWlmIChXQVJOX09OKHN0YXJ0ICsgbGVuZ3RoIDwgc3RhcnQpKQorCQlyZXR1cm4gLUVSQU5HRTsK KworCXJldCA9IGFsbG9jX2dlbjhfdGVtcF9iaXRtYXBzKCZuZXdfcGFnZV9kaXJzLCAmbmV3X3Bh Z2VfdGFibGVzKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCisJLyogRG8gdGhlIGFsbG9j YXRpb25zIGZpcnN0IHNvIHdlIGNhbiBlYXNpbHkgYmFpbCBvdXQgKi8KKwlyZXQgPSBnZW44X3Bw Z3R0X2FsbG9jX3BhZ2VfZGlyZWN0b3JpZXMocHBndHQsICZwcGd0dC0+cGRwLCBzdGFydCwgbGVu Z3RoLAorCQkJCQluZXdfcGFnZV9kaXJzKTsKKwlpZiAocmV0KSB7CisJCWZyZWVfZ2VuOF90ZW1w X2JpdG1hcHMobmV3X3BhZ2VfZGlycywgbmV3X3BhZ2VfdGFibGVzKTsKKwkJcmV0dXJuIHJldDsK Kwl9CisKKwkvKiBGb3IgZXZlcnkgcGFnZSBkaXJlY3RvcnkgcmVmZXJlbmNlZCwgYWxsb2NhdGUg cGFnZSB0YWJsZXMgKi8KIAlnZW44X2Zvcl9lYWNoX3BkcGUocGQsICZwcGd0dC0+cGRwLCBzdGFy dCwgbGVuZ3RoLCB0ZW1wLCBwZHBlKSB7Ci0JCXJldCA9IGdlbjhfcHBndHRfYWxsb2NfcGFnZXRh YnMocGQsIHN0YXJ0LCBsZW5ndGgsCi0JCQkJCQlwcGd0dC0+YmFzZS5kZXYpOworCQliaXRtYXBf emVybyhuZXdfcGFnZV90YWJsZXNbcGRwZV0sIEdFTjhfUERFU19QRVJfUEFHRSk7CisJCXJldCA9 IGdlbjhfcHBndHRfYWxsb2NfcGFnZXRhYnMocHBndHQsIHBkLCBzdGFydCwgbGVuZ3RoLAorCQkJ CQkJbmV3X3BhZ2VfdGFibGVzW3BkcGVdKTsKIAkJaWYgKHJldCkKIAkJCWdvdG8gZXJyX291dDsK IAl9CiAKLQkvKiBOb3cgbWFyayBldmVyeXRoaW5nIHdlJ3ZlIHRvdWNoZWQgYXMgdXNlZC4gVGhp cyBkb2Vzbid0IGFsbG93IGZvcgotCSAqIHJvYnVzdCBlcnJvciBjaGVja2luZywgYnV0IGl0IG1h a2VzIHRoZSBjb2RlIGEgaGVsbCBvZiBhIGxvdCBzaW1wbGVyLgotCSAqLwogCXN0YXJ0ID0gb3Jp Z19zdGFydDsKIAlsZW5ndGggPSBvcmlnX2xlbmd0aDsKIAorCS8qIEFsbG9jYXRpb25zIGhhdmUg Y29tcGxldGVkIHN1Y2Nlc3NmdWxseSwgc28gc2V0IHRoZSBiaXRtYXBzLCBhbmQgZG8KKwkgKiB0 aGUgbWFwcGluZ3MuICovCiAJZ2VuOF9mb3JfZWFjaF9wZHBlKHBkLCAmcHBndHQtPnBkcCwgc3Rh cnQsIGxlbmd0aCwgdGVtcCwgcGRwZSkgeworCQlnZW44X3BwZ3R0X3BkZV90ICpjb25zdCBwYWdl X2RpcmVjdG9yeSA9IGttYXBfYXRvbWljKHBkLT5wYWdlKTsKIAkJc3RydWN0IGk5MTVfcGFnZV90 YWJsZV9lbnRyeSAqcHQ7CiAJCXVpbnQ2NF90IHBkX2xlbiA9IGdlbjhfY2xhbXBfcGQoc3RhcnQs IGxlbmd0aCk7CiAJCXVpbnQ2NF90IHBkX3N0YXJ0ID0gc3RhcnQ7CiAJCXVpbnQzMl90IHBkZTsK IAotCQlnZW44X2Zvcl9lYWNoX3BkZShwdCwgJnBwZ3R0LT5wZCwgcGRfc3RhcnQsIHBkX2xlbiwg dGVtcCwgcGRlKSB7Ci0JCQliaXRtYXBfc2V0KHBkLT5wYWdlX3RhYmxlc1twZGVdLT51c2VkX3B0 ZXMsCi0JCQkJICAgZ2VuOF9wdGVfaW5kZXgoc3RhcnQpLAotCQkJCSAgIGdlbjhfcHRlX2NvdW50 KHN0YXJ0LCBsZW5ndGgpKTsKKwkJLyogRXZlcnkgcGQgc2hvdWxkIGJlIGFsbG9jYXRlZCwgd2Ug anVzdCBkaWQgdGhhdCBhYm92ZS4gKi8KKwkJQlVHX09OKCFwZCk7CisKKwkJZ2VuOF9mb3JfZWFj aF9wZGUocHQsIHBkLCBwZF9zdGFydCwgcGRfbGVuLCB0ZW1wLCBwZGUpIHsKKwkJCS8qIFNhbWUg cmVhc29uaW5nIGFzIHBkICovCisJCQlCVUdfT04oIXB0KTsKKwkJCUJVR19PTighcGRfbGVuKTsK KwkJCUJVR19PTighZ2VuOF9wdGVfY291bnQocGRfc3RhcnQsIHBkX2xlbikpOworCisJCQkvKiBT ZXQgb3VyIHVzZWQgcHRlcyB3aXRoaW4gdGhlIHBhZ2UgdGFibGUgKi8KKwkJCWJpdG1hcF9zZXQo cHQtPnVzZWRfcHRlcywKKwkJCQkgICBnZW44X3B0ZV9pbmRleChwZF9zdGFydCksCisJCQkJICAg Z2VuOF9wdGVfY291bnQocGRfc3RhcnQsIHBkX2xlbikpOworCisJCQkvKiBPdXIgcGRlIGlzIG5v dyBwb2ludGluZyB0byB0aGUgcGFnZXRhYmxlLCBwdCAqLwogCQkJc2V0X2JpdChwZGUsIHBkLT51 c2VkX3BkZXMpOworCisJCQkvKiBNYXAgdGhlIFBERSB0byB0aGUgcGFnZSB0YWJsZSAqLworCQkJ X19nZW44X2RvX21hcF9wdChwYWdlX2RpcmVjdG9yeSArIHBkZSwgcHQsIHZtLT5kZXYpOworCisJ CQkvKiBOQjogV2UgaGF2ZW4ndCB5ZXQgbWFwcGVkIHB0ZXMgdG8gcGFnZXMuIEF0IHRoaXMKKwkJ CSAqIHBvaW50IHdlJ3JlIHN0aWxsIHJlbHlpbmcgb24gaW5zZXJ0X2VudHJpZXMoKSAqLwogCQl9 CisKKwkJaWYgKCFIQVNfTExDKHZtLT5kZXYpKQorCQkJZHJtX2NsZmx1c2hfdmlydF9yYW5nZShw YWdlX2RpcmVjdG9yeSwgUEFHRV9TSVpFKTsKKworCQlrdW5tYXBfYXRvbWljKHBhZ2VfZGlyZWN0 b3J5KTsKKwogCQlzZXRfYml0KHBkcGUsIHBwZ3R0LT5wZHAudXNlZF9wZHBlcyk7CiAJfQogCisJ ZnJlZV9nZW44X3RlbXBfYml0bWFwcyhuZXdfcGFnZV9kaXJzLCBuZXdfcGFnZV90YWJsZXMpOwog CXJldHVybiAwOwogCiBlcnJfb3V0OgogCWdlbjhfcHBndHRfZnJlZShwcGd0dCk7CisKKwlmb3Jf ZWFjaF9zZXRfYml0KHBkcGUsIG5ld19wYWdlX2RpcnMsIEdFTjhfTEVHQUNZX1BEUEVTKQorCQl1 bm1hcF9hbmRfZnJlZV9wZChwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W3BkcGVdLCB2bS0+ZGV2 KTsKKworCWZyZWVfZ2VuOF90ZW1wX2JpdG1hcHMobmV3X3BhZ2VfZGlycywgbmV3X3BhZ2VfdGFi bGVzKTsKIAlyZXR1cm4gcmV0OwogfQogCkBAIC04MjYsMzggKzk4NCw2NyBAQCBlcnJfb3V0Ogog ICogc3BhY2UuCiAgKgogICovCi1zdGF0aWMgaW50IGdlbjhfcHBndHRfaW5pdChzdHJ1Y3QgaTkx NV9od19wcGd0dCAqcHBndHQsIHVpbnQ2NF90IHNpemUpCitzdGF0aWMgaW50IGdlbjhfcHBndHRf aW5pdF9jb21tb24oc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LCB1aW50NjRfdCBzaXplKQog ewotCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X2VudHJ5ICpwZDsKLQl1aW50NjRfdCB0ZW1w LCBzdGFydCA9IDA7Ci0JY29uc3QgdWludDY0X3Qgb3JpZ19sZW5ndGggPSBzaXplOwotCXVpbnQz Ml90IHBkcGU7Ci0JaW50IHJldDsKKwlwcGd0dC0+c2NyYXRjaF9wZCA9IGFsbG9jX3B0X3NjcmF0 Y2gocHBndHQtPmJhc2UuZGV2KTsKKwlpZiAoSVNfRVJSKHBwZ3R0LT5zY3JhdGNoX3BkKSkKKwkJ cmV0dXJuIFBUUl9FUlIocHBndHQtPnNjcmF0Y2hfcGQpOwogCiAJcHBndHQtPmJhc2Uuc3RhcnQg PSAwOwogCXBwZ3R0LT5iYXNlLnRvdGFsID0gc2l6ZTsKLQlwcGd0dC0+YmFzZS5jbGVhcl9yYW5n ZSA9IGdlbjhfcHBndHRfY2xlYXJfcmFuZ2U7Ci0JcHBndHQtPmJhc2UuaW5zZXJ0X2VudHJpZXMg PSBnZW44X3BwZ3R0X2luc2VydF9lbnRyaWVzOwogCXBwZ3R0LT5iYXNlLmNsZWFudXAgPSBnZW44 X3BwZ3R0X2NsZWFudXA7CisJcHBndHQtPmJhc2UuaW5zZXJ0X2VudHJpZXMgPSBnZW44X3BwZ3R0 X2luc2VydF9lbnRyaWVzOworCiAJcHBndHQtPnN3aXRjaF9tbSA9IGdlbjhfbW1fc3dpdGNoOwog Ci0JcHBndHQtPnNjcmF0Y2hfcGQgPSBhbGxvY19wdF9zY3JhdGNoKHBwZ3R0LT5iYXNlLmRldik7 Ci0JaWYgKElTX0VSUihwcGd0dC0+c2NyYXRjaF9wZCkpCi0JCXJldHVybiBQVFJfRVJSKHBwZ3R0 LT5zY3JhdGNoX3BkKTsKKwlyZXR1cm4gMDsKK30KIAorc3RhdGljIGludCBnZW44X2FsaWFzaW5n X3BwZ3R0X2luaXQoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQoreworCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBwcGd0dC0+YmFzZS5kZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9y eV9lbnRyeSAqcGQ7CisJdWludDY0X3QgdGVtcCwgc3RhcnQgPSAwLCBzaXplID0gZGV2X3ByaXYt Pmd0dC5iYXNlLnRvdGFsOworCXVpbnQzMl90IHBkcGU7CisJaW50IHJldDsKKworCXJldCA9IGdl bjhfcHBndHRfaW5pdF9jb21tb24ocHBndHQsIGRldl9wcml2LT5ndHQuYmFzZS50b3RhbCk7CisJ aWYgKHJldCkKKwkJcmV0dXJuIHJldDsKKworCS8qIEFsaWFzaW5nIFBQR1RUIGhhcyB0byBhbHdh eXMgd29yayBhbmQgYmUgbWFwcGVkIGJlY2F1c2Ugb2YgdGhlIHdheSB3ZQorCSAqIHVzZSBSRVNU T1JFX0lOSElCSVQgaW4gdGhlIGNvbnRleHQgc3dpdGNoLiBUaGlzIHdpbGwgYmUgZml4ZWQKKwkg KiBldmVudHVhbGx5LiAqLwogCXJldCA9IGdlbjhfYWxsb2NfdmFfcmFuZ2UoJnBwZ3R0LT5iYXNl LCBzdGFydCwgc2l6ZSk7CiAJaWYgKHJldCkgewogCQl1bm1hcF9hbmRfZnJlZV9wdChwcGd0dC0+ c2NyYXRjaF9wZCwgcHBndHQtPmJhc2UuZGV2KTsKIAkJcmV0dXJuIHJldDsKIAl9CiAKLQlzdGFy dCA9IDA7Ci0Jc2l6ZSA9IG9yaWdfbGVuZ3RoOwotCiAJZ2VuOF9mb3JfZWFjaF9wZHBlKHBkLCAm cHBndHQtPnBkcCwgc3RhcnQsIHNpemUsIHRlbXAsIHBkcGUpCiAJCWdlbjhfbWFwX3BhZ2V0YWJs ZV9yYW5nZShwZCwgc3RhcnQsIHNpemUsIHBwZ3R0LT5iYXNlLmRldik7CiAKKwlwcGd0dC0+YmFz ZS5hbGxvY2F0ZV92YV9yYW5nZSA9IE5VTEw7CisJcHBndHQtPmJhc2UuY2xlYXJfcmFuZ2UgPSBn ZW44X3BwZ3R0X2NsZWFyX3JhbmdlOwogCXBwZ3R0LT5iYXNlLmNsZWFyX3JhbmdlKCZwcGd0dC0+ YmFzZSwgMCwgcHBndHQtPmJhc2UudG90YWwsIHRydWUpOworCisJcmV0dXJuIDA7Cit9CisKK3N0 YXRpYyBpbnQgZ2VuOF9wcGd0dF9pbml0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKK3sK KwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcHBndHQtPmJhc2UuZGV2OworCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CisJaW50IHJldDsKKwor CXJldCA9IGdlbjhfcHBndHRfaW5pdF9jb21tb24ocHBndHQsIGRldl9wcml2LT5ndHQuYmFzZS50 b3RhbCk7CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsKKworCXBwZ3R0LT5iYXNlLmFsbG9jYXRl X3ZhX3JhbmdlID0gZ2VuOF9hbGxvY192YV9yYW5nZTsKKwlwcGd0dC0+YmFzZS5jbGVhcl9yYW5n ZSA9IGdlbjhfcHBndHRfY2xlYXJfcmFuZ2U7CisKIAlyZXR1cm4gMDsKIH0KIApAQCAtMTM4MCw3 ICsxNTY3LDcgQEAgc3RhdGljIGludCBnZW42X3BwZ3R0X2luaXQoc3RydWN0IGk5MTVfaHdfcHBn dHQgKnBwZ3R0LCBib29sIGFsaWFzaW5nKQogCQl9CiAJfQogCi0JcHBndHQtPmJhc2UuYWxsb2Nh dGVfdmFfcmFuZ2UgPSBnZW42X2FsbG9jX3ZhX3JhbmdlOworCXBwZ3R0LT5iYXNlLmFsbG9jYXRl X3ZhX3JhbmdlID0gYWxpYXNpbmcgPyBOVUxMIDogZ2VuNl9hbGxvY192YV9yYW5nZTsKIAlwcGd0 dC0+YmFzZS5jbGVhcl9yYW5nZSA9IGdlbjZfcHBndHRfY2xlYXJfcmFuZ2U7CiAJcHBndHQtPmJh c2UuaW5zZXJ0X2VudHJpZXMgPSBnZW42X3BwZ3R0X2luc2VydF9lbnRyaWVzOwogCXBwZ3R0LT5i YXNlLmNsZWFudXAgPSBnZW42X3BwZ3R0X2NsZWFudXA7CkBAIC0xNDIxLDggKzE2MDgsMTAgQEAg c3RhdGljIGludCBfX2h3X3BwZ3R0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0 IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAogCiAJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuIDwgOCkK IAkJcmV0dXJuIGdlbjZfcHBndHRfaW5pdChwcGd0dCwgYWxpYXNpbmcpOworCWVsc2UgaWYgKGFs aWFzaW5nKQorCQlyZXR1cm4gZ2VuOF9hbGlhc2luZ19wcGd0dF9pbml0KHBwZ3R0KTsKIAllbHNl Ci0JCXJldHVybiBnZW44X3BwZ3R0X2luaXQocHBndHQsIGRldl9wcml2LT5ndHQuYmFzZS50b3Rh bCk7CisJCXJldHVybiBnZW44X3BwZ3R0X2luaXQocHBndHQpOwogfQogaW50IGk5MTVfcHBndHRf aW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQp CiB7CkBAIC0xNTMxLDEwICsxNzIwLDEwIEBAIHBwZ3R0X2JpbmRfdm1hKHN0cnVjdCBpOTE1X3Zt YSAqdm1hLAogCiBzdGF0aWMgdm9pZCBwcGd0dF91bmJpbmRfdm1hKHN0cnVjdCBpOTE1X3ZtYSAq dm1hKQogewotCXZtYS0+dm0tPmNsZWFyX3JhbmdlKHZtYS0+dm0sCi0JCQkgICAgIHZtYS0+bm9k ZS5zdGFydCwKLQkJCSAgICAgdm1hLT5vYmotPmJhc2Uuc2l6ZSwKLQkJCSAgICAgdHJ1ZSk7CisJ CXZtYS0+dm0tPmNsZWFyX3JhbmdlKHZtYS0+dm0sCisJCQkJICAgICB2bWEtPm5vZGUuc3RhcnQs CisJCQkJICAgICB2bWEtPm9iai0+YmFzZS5zaXplLAorCQkJCSAgICAgdHJ1ZSk7CiB9CiAKIGV4 dGVybiBpbnQgaW50ZWxfaW9tbXVfZ2Z4X21hcHBlZDsKLS0gCjIuMS4xCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=