From: Michel Thierry Subject: [PATCH v2 10/24] drm/i915: Track GEN6 page table usage Date: Tue, 23 Dec 2014 17:16:13 +0000 Message-ID: <1419354987-4622-11-git-send-email-michel.thierry@intel.com> References: <1418922621-25818-1-git-send-email-michel.thierry@intel.com> <1419354987-4622-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 F2A1C6E4ED for ; Tue, 23 Dec 2014 09:16:20 -0800 (PST) In-Reply-To: <1419354987-4622-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+CgpJbnN0ZWFk IG9mIGltcGxlbWVudGluZyB0aGUgZnVsbCB0cmFja2luZyArIGR5bmFtaWMgYWxsb2NhdGlvbiwg dGhpcwpwYXRjaCBkb2VzIGEgYml0IGxlc3MgdGhhbiBoYWxmIG9mIHRoZSB3b3JrLCBieSB0cmFj a2luZyBhbmQgd2FybmluZyBvbgp1bmV4cGVjdGVkIGNvbmRpdGlvbnMuIFRoZSB0cmFja2luZyBp dHNlbGYgZm9sbG93cyB3aGljaCBQVEVzIHdpdGhpbiBhCnBhZ2UgdGFibGUgYXJlIGN1cnJlbnRs eSBiZWluZyB1c2VkIGZvciBvYmplY3RzLiBUaGUgbmV4dCBwYXRjaCB3aWxsCm1vZGlmeSB0aGlz IHRvIGFjdHVhbGx5IGFsbG9jYXRlIHRoZSBwYWdlIHRhYmxlcyBvbmx5IHdoZW4gbmVjZXNzYXJ5 LgoKV2l0aCB0aGUgY3VycmVudCBwYXRjaCB0aGVyZSBpc24ndCBtdWNoIGluIHRoZSB3YXkgb2Yg bWFraW5nIGEgZ2VuCmFnbm9zdGljIHJhbmdlIGFsbG9jYXRpb24gZnVuY3Rpb24uIEhvd2V2ZXIs IGluIHRoZSBuZXh0IHBhdGNoIHdlJ2xsIGFkZAptb3JlIHNwZWNpZmljaXR5IHdoaWNoIG1ha2Vz IGhhdmluZyBzZXBhcmF0ZSBmdW5jdGlvbnMgYSBiaXQgZWFzaWVyIHRvCm1hbmFnZS4KCk9uZSBp bXBvcnRhbnQgY2hhbmdlIGludHJvZHVjZWQgaGVyZSBpcyB0aGF0IERNQSBtYXBwaW5ncyBhcmUK Y3JlYXRlZC9kZXN0cm95ZWQgYXQgdGhlIHNhbWUgcGFnZSBkaXJlY3Rvcmllcy90YWJsZXMgYXJl CmFsbG9jYXRlZC9kZWFsbG9jYXRlZC4KCk5vdGljZSB0aGF0IGFsaWFzaW5nIFBQR1RUIGlzIG5v dCBtYW5hZ2VkIGhlcmUuIFRoZSBwYXRjaCB3aGljaCBhY3R1YWxseQpiZWdpbnMgZHluYW1pYyBh bGxvY2F0aW9uL3RlYXJkb3duIGV4cGxhaW5zIHRoZSByZWFzb25pbmcgZm9yIHRoaXMuCgp2Mjog cy9wZHAucGFnZWRpci9wZHAucGFnZWRpcnMKTWFrZSBhIHNjcmF0Y2ggcGFnZSBhbGxvY2F0aW9u IGhlbHBlcgoKdjM6IFJlYmFzZSBhbmQgZXhwYW5kIGNvbW1pdCBtZXNzYWdlLgoKdjQ6IEFsbG9j YXRlIHJlcXVpcmVkIHBhZ2V0YWJsZXMgb25seSB3aGVuIGl0IGlzIG5lZWRlZCwgX2JpbmRfdG9f dm0KaW5zdGVhZCBvZiBiaW5kX3ZtYSAoRGFuaWVsKS4KCkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5p ZWxAZmZ3bGwuY2g+ClNpZ25lZC1vZmYtYnk6IEJlbiBXaWRhd3NreSA8YmVuQGJ3aWRhd3NrLm5l dD4KU2lnbmVkLW9mZi1ieTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNv bT4gKHYzKykKLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICB8ICAgOSAr KwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgfCAyNzcgKysrKysrKysrKysr KysrKysrKysrKysrKystLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9n dHQuaCB8IDE0OSArKysrKysrKysrKysrKy0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDMyMiBpbnNl cnRpb25zKCspLCAxMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXgg MmI2ZWNmZC4uNWQ1Mjk5MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0zNTk3LDYgKzM1 OTcsMTUgQEAgc2VhcmNoX2ZyZWU6CiAJaWYgKHJldCkKIAkJZ290byBlcnJfcmVtb3ZlX25vZGU7 CiAKKwkvKiAgYWxsb2NhdGUgYmVmb3JlIGluc2VydCAvIGJpbmQgKi8KKwlpZiAodm1hLT52bS0+ YWxsb2NhdGVfdmFfcmFuZ2UpIHsKKwkJcmV0ID0gdm1hLT52bS0+YWxsb2NhdGVfdmFfcmFuZ2Uo dm1hLT52bSwKKwkJCQkJCXZtYS0+bm9kZS5zdGFydCwKKwkJCQkJCXZtYS0+bm9kZS5zaXplKTsK KwkJaWYgKHJldCkKKwkJCWdvdG8gZXJyX3JlbW92ZV9ub2RlOworCX0KKwogCXRyYWNlX2k5MTVf dm1hX2JpbmQodm1hLCBmbGFncyk7CiAJcmV0ID0gaTkxNV92bWFfYmluZCh2bWEsIG9iai0+Y2Fj aGVfbGV2ZWwsCiAJCQkgICAgZmxhZ3MgJiBQSU5fR0xPQkFMID8gR0xPQkFMX0JJTkQgOiAwKTsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggNTJiZGRlNy4uMzEzNDMyZSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTEzOCwxMCArMTM4LDkgQEAgc3RhdGlj IGludCBzYW5pdGl6ZV9lbmFibGVfcHBndHQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IGVu YWJsZV9wcGd0dCkKIAkJcmV0dXJuIGhhc19hbGlhc2luZ19wcGd0dCA/IDEgOiAwOwogfQogCi0K IHN0YXRpYyB2b2lkIHBwZ3R0X2JpbmRfdm1hKHN0cnVjdCBpOTE1X3ZtYSAqdm1hLAotCQkJICAg ZW51bSBpOTE1X2NhY2hlX2xldmVsIGNhY2hlX2xldmVsLAotCQkJICAgdTMyIGZsYWdzKTsKKwkJ CSAgZW51bSBpOTE1X2NhY2hlX2xldmVsIGNhY2hlX2xldmVsLAorCQkJICB1MzIgZmxhZ3MpOwog c3RhdGljIHZvaWQgcHBndHRfdW5iaW5kX3ZtYShzdHJ1Y3QgaTkxNV92bWEgKnZtYSk7CiAKIHN0 YXRpYyBpbmxpbmUgZ2VuOF9ndHRfcHRlX3QgZ2VuOF9wdGVfZW5jb2RlKGRtYV9hZGRyX3QgYWRk ciwKQEAgLTI3NSwyNyArMjc0LDk5IEBAIHN0YXRpYyBnZW42X2d0dF9wdGVfdCBpcmlzX3B0ZV9l bmNvZGUoZG1hX2FkZHJfdCBhZGRyLAogCXJldHVybiBwdGU7CiB9CiAKLXN0YXRpYyB2b2lkIGZy ZWVfcHRfc2luZ2xlKHN0cnVjdCBpOTE1X3BhZ2V0YWIgKnB0KQoteworI2RlZmluZSBpOTE1X2Rt YV91bm1hcF9zaW5nbGUocHgsIGRldikgZG8geyBcCisJcGNpX3VubWFwX3BhZ2UoKGRldiktPnBk ZXYsIChweCktPmRhZGRyLCA0MDk2LCBQQ0lfRE1BX0JJRElSRUNUSU9OQUwpOyBcCit9IHdoaWxl ICgwKTsKKworLyoqCisgKiBpOTE1X2RtYV9tYXBfcHhfc2luZ2xlKCkgLSBDcmVhdGUgYSBkbWEg bWFwcGluZyBmb3IgYSBwYWdlIHRhYmxlL2Rpci9ldGMuCisgKiBAcHg6CQlQYWdlIHRhYmxlL2Rp ci9ldGMgdG8gZ2V0IGEgRE1BIG1hcCBmb3IKKyAqIEBkZXY6CWRybSBkZXZpY2UKKyAqCisgKiBQ YWdlIHRhYmxlIGFsbG9jYXRpb25zIGFyZSB1bmlmaWVkIGFjcm9zcyBhbGwgZ2Vucy4gVGhleSBh bHdheXMgcmVxdWlyZSBhCisgKiBzaW5nbGUgNGsgYWxsb2NhdGlvbiwgYXMgd2VsbCBhcyBhIERN QSBtYXBwaW5nLiBJZiB3ZSBrZWVwIHRoZSBzdHJ1Y3RzCisgKiBzeW1tZXRyaWMgaGVyZSwgdGhl IHNpbXBsZSBtYWNybyBjb3ZlcnMgdXMgZm9yIGV2ZXJ5IHBhZ2UgdGFibGUgdHlwZS4KKyAqCisg KiBSZXR1cm46IDAgaWYgc3VjY2Vzcy4KKyAqLworI2RlZmluZSBpOTE1X2RtYV9tYXBfcHhfc2lu Z2xlKHB4LCBkZXYpIFwKKwlwY2lfZG1hX21hcHBpbmdfZXJyb3IoKGRldiktPnBkZXYsIFwKKwkJ CSAgICAgIChweCktPmRhZGRyID0gcGNpX21hcF9wYWdlKChkZXYpLT5wZGV2LCBcCisJCQkJCQkJ IChweCktPnBhZ2UsIDAsIDQwOTYsIFwKKwkJCQkJCQkgUENJX0RNQV9CSURJUkVDVElPTkFMKSkK Kworc3RhdGljIHZvaWQgX19mcmVlX3B0X3NpbmdsZShzdHJ1Y3QgaTkxNV9wYWdldGFiICpwdCwg c3RydWN0IGRybV9kZXZpY2UgKmRldiwKKwkJCSAgICAgaW50IHNjcmF0Y2gpCit7CisJaWYgKFdB Uk4oc2NyYXRjaCBeIHB0LT5zY3JhdGNoLAorCQkgIlRyaWVkIHRvIGZyZWUgc2NyYXRjaCA9ICVk LiBJcyBzY3JhdGNoID0gJWRcbiIsCisJCSBzY3JhdGNoLCBwdC0+c2NyYXRjaCkpCisJCXJldHVy bjsKKwogCWlmIChXQVJOX09OKCFwdC0+cGFnZSkpCiAJCXJldHVybjsKKworCWlmICghc2NyYXRj aCkgeworCQljb25zdCBzaXplX3QgY291bnQgPSBJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA4ID8K KwkJCUdFTjhfUFRFU19QRVJfUEFHRSA6IEk5MTVfUFBHVFRfUFRfRU5UUklFUzsKKwkJV0FSTigh Yml0bWFwX2VtcHR5KHB0LT51c2VkX3B0ZXMsIGNvdW50KSwKKwkJICAgICAiRnJlZSBwYWdlIHRh YmxlIHdpdGggJWQgdXNlZCBwYWdlc1xuIiwKKwkJICAgICBiaXRtYXBfd2VpZ2h0KHB0LT51c2Vk X3B0ZXMsIGNvdW50KSk7CisJfQorCisJaTkxNV9kbWFfdW5tYXBfc2luZ2xlKHB0LCBkZXYpOwog CV9fZnJlZV9wYWdlKHB0LT5wYWdlKTsKKwlrZnJlZShwdC0+dXNlZF9wdGVzKTsKIAlrZnJlZShw dCk7CiB9CiAKLXN0YXRpYyBzdHJ1Y3QgaTkxNV9wYWdldGFiICphbGxvY19wdF9zaW5nbGUodm9p ZCkKKyNkZWZpbmUgZnJlZV9wdF9zaW5nbGUocHQsIGRldikgXAorCV9fZnJlZV9wdF9zaW5nbGUo cHQsIGRldiwgZmFsc2UpCisjZGVmaW5lIGZyZWVfcHRfc2NyYXRjaChwdCwgZGV2KSBcCisJX19m cmVlX3B0X3NpbmdsZShwdCwgZGV2LCB0cnVlKQorCitzdGF0aWMgc3RydWN0IGk5MTVfcGFnZXRh YiAqYWxsb2NfcHRfc2luZ2xlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGk5 MTVfcGFnZXRhYiAqcHQ7CisJY29uc3Qgc2l6ZV90IGNvdW50ID0gSU5URUxfSU5GTyhkZXYpLT5n ZW4gPj0gOCA/CisJCUdFTjhfUFRFU19QRVJfUEFHRSA6IEk5MTVfUFBHVFRfUFRfRU5UUklFUzsK KwlpbnQgcmV0ID0gLUVOT01FTTsKIAogCXB0ID0ga3phbGxvYyhzaXplb2YoKnB0KSwgR0ZQX0tF Uk5FTCk7CiAJaWYgKCFwdCkKIAkJcmV0dXJuIEVSUl9QVFIoLUVOT01FTSk7CiAKKwlwdC0+dXNl ZF9wdGVzID0ga2NhbGxvYyhCSVRTX1RPX0xPTkdTKGNvdW50KSwgc2l6ZW9mKCpwdC0+dXNlZF9w dGVzKSwKKwkJCQlHRlBfS0VSTkVMKTsKKworCWlmICghcHQtPnVzZWRfcHRlcykKKwkJZ290byBm YWlsX2JpdG1hcDsKKwogCXB0LT5wYWdlID0gYWxsb2NfcGFnZShHRlBfS0VSTkVMIHwgX19HRlBf WkVSTyk7Ci0JaWYgKCFwdC0+cGFnZSkgewotCQlrZnJlZShwdCk7Ci0JCXJldHVybiBFUlJfUFRS KC1FTk9NRU0pOwotCX0KKwlpZiAoIXB0LT5wYWdlKQorCQlnb3RvIGZhaWxfcGFnZTsKKworCXJl dCA9IGk5MTVfZG1hX21hcF9weF9zaW5nbGUocHQsIGRldik7CisJaWYgKHJldCkKKwkJZ290byBm YWlsX2RtYTsKKworCXJldHVybiBwdDsKKworZmFpbF9kbWE6CisJX19mcmVlX3BhZ2UocHQtPnBh Z2UpOworZmFpbF9wYWdlOgorCWtmcmVlKHB0LT51c2VkX3B0ZXMpOworZmFpbF9iaXRtYXA6CisJ a2ZyZWUocHQpOworCisJcmV0dXJuIEVSUl9QVFIocmV0KTsKK30KKworc3RhdGljIGlubGluZSBz dHJ1Y3QgaTkxNV9wYWdldGFiICphbGxvY19wdF9zY3JhdGNoKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCit7CisJc3RydWN0IGk5MTVfcGFnZXRhYiAqcHQgPSBhbGxvY19wdF9zaW5nbGUoZGV2KTsK KwlpZiAoIUlTX0VSUihwdCkpCisJCXB0LT5zY3JhdGNoID0gMTsKIAogCXJldHVybiBwdDsKIH0K QEAgLTMxMyw3ICszODQsOSBAQCBzdGF0aWMgc3RydWN0IGk5MTVfcGFnZXRhYiAqYWxsb2NfcHRf c2luZ2xlKHZvaWQpCiAgKgogICogUmV0dXJuOiAwIGlmIGFsbG9jYXRpb24gc3VjY2VlZGVkLgog ICovCi1zdGF0aWMgaW50IGFsbG9jX3B0X3JhbmdlKHN0cnVjdCBpOTE1X3BhZ2VkaXIgKnBkLCB1 aW50MTZfdCBwZGUsIHNpemVfdCBjb3VudCkKK3N0YXRpYyBpbnQgYWxsb2NfcHRfcmFuZ2Uoc3Ry dWN0IGk5MTVfcGFnZWRpciAqcGQsIHVpbnQxNl90IHBkZSwgc2l6ZV90IGNvdW50LAorCQkgIHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCisKIHsKIAlpbnQgaSwgcmV0OwogCkBAIC0zMjMsNyArMzk2 LDcgQEAgc3RhdGljIGludCBhbGxvY19wdF9yYW5nZShzdHJ1Y3QgaTkxNV9wYWdlZGlyICpwZCwg dWludDE2X3QgcGRlLCBzaXplX3QgY291bnQpCiAJQlVHX09OKHBkZSArIGNvdW50ID4gR0VONl9Q UEdUVF9QRF9FTlRSSUVTKTsKIAogCWZvciAoaSA9IHBkZTsgaSA8IHBkZSArIGNvdW50OyBpKysp IHsKLQkJc3RydWN0IGk5MTVfcGFnZXRhYiAqcHQgPSBhbGxvY19wdF9zaW5nbGUoKTsKKwkJc3Ry dWN0IGk5MTVfcGFnZXRhYiAqcHQgPSBhbGxvY19wdF9zaW5nbGUoZGV2KTsKIAkJaWYgKElTX0VS UihwdCkpIHsKIAkJCXJldCA9IFBUUl9FUlIocHQpOwogCQkJZ290byBlcnJfb3V0OwpAQCAtMzM4 LDcgKzQxMSw3IEBAIHN0YXRpYyBpbnQgYWxsb2NfcHRfcmFuZ2Uoc3RydWN0IGk5MTVfcGFnZWRp ciAqcGQsIHVpbnQxNl90IHBkZSwgc2l6ZV90IGNvdW50KQogCiBlcnJfb3V0OgogCXdoaWxlIChp LS0pCi0JCWZyZWVfcHRfc2luZ2xlKHBkLT5wYWdlX3RhYmxlc1tpXSk7CisJCWZyZWVfcHRfc2lu Z2xlKHBkLT5wYWdlX3RhYmxlc1tpXSwgZGV2KTsKIAlyZXR1cm4gcmV0OwogfQogCkBAIC01MDYs NyArNTc5LDcgQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9pbnNlcnRfZW50cmllcyhzdHJ1Y3Qg aTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAl9CiB9CiAKLXN0YXRpYyB2b2lkIGdlbjhfZnJlZV9w YWdlX3RhYmxlcyhzdHJ1Y3QgaTkxNV9wYWdlZGlyICpwZCkKK3N0YXRpYyB2b2lkIGdlbjhfZnJl ZV9wYWdlX3RhYmxlcyhzdHJ1Y3QgaTkxNV9wYWdlZGlyICpwZCwgc3RydWN0IGRybV9kZXZpY2Ug KmRldikKIHsKIAlpbnQgaTsKIApAQCAtNTE0LDcgKzU4Nyw3IEBAIHN0YXRpYyB2b2lkIGdlbjhf ZnJlZV9wYWdlX3RhYmxlcyhzdHJ1Y3QgaTkxNV9wYWdlZGlyICpwZCkKIAkJcmV0dXJuOwogCiAJ Zm9yIChpID0gMDsgaSA8IEdFTjhfUERFU19QRVJfUEFHRTsgaSsrKSB7Ci0JCWZyZWVfcHRfc2lu Z2xlKHBkLT5wYWdlX3RhYmxlc1tpXSk7CisJCWZyZWVfcHRfc2luZ2xlKHBkLT5wYWdlX3RhYmxl c1tpXSwgZGV2KTsKIAkJcGQtPnBhZ2VfdGFibGVzW2ldID0gTlVMTDsKIAl9CiB9CkBAIC01MjQs NyArNTk3LDcgQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9mcmVlKHN0cnVjdCBpOTE1X2h3X3Bw Z3R0ICpwcGd0dCkKIAlpbnQgaTsKIAogCWZvciAoaSA9IDA7IGkgPCBwcGd0dC0+bnVtX3BkX3Bh Z2VzOyBpKyspIHsKLQkJZ2VuOF9mcmVlX3BhZ2VfdGFibGVzKHBwZ3R0LT5wZHAucGFnZWRpcltp XSk7CisJCWdlbjhfZnJlZV9wYWdlX3RhYmxlcyhwcGd0dC0+cGRwLnBhZ2VkaXJbaV0sIHBwZ3R0 LT5iYXNlLmRldik7CiAJCWZyZWVfcGRfc2luZ2xlKHBwZ3R0LT5wZHAucGFnZWRpcltpXSk7CiAJ fQogfQpAQCAtNTY5LDcgKzY0Miw3IEBAIHN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9hbGxvY2F0ZV9w YWdlX3RhYmxlcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiAKIAlmb3IgKGkgPSAwOyBp IDwgcHBndHQtPm51bV9wZF9wYWdlczsgaSsrKSB7CiAJCXJldCA9IGFsbG9jX3B0X3JhbmdlKHBw Z3R0LT5wZHAucGFnZWRpcltpXSwKLQkJCQkgICAgIDAsIEdFTjhfUERFU19QRVJfUEFHRSk7CisJ CQkJICAgICAwLCBHRU44X1BERVNfUEVSX1BBR0UsIHBwZ3R0LT5iYXNlLmRldik7CiAJCWlmIChy ZXQpCiAJCQlnb3RvIHVud2luZF9vdXQ7CiAJfQpAQCAtNTc4LDcgKzY1MSw3IEBAIHN0YXRpYyBp bnQgZ2VuOF9wcGd0dF9hbGxvY2F0ZV9wYWdlX3RhYmxlcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAq cHBndHQpCiAKIHVud2luZF9vdXQ6CiAJd2hpbGUgKGktLSkKLQkJZ2VuOF9mcmVlX3BhZ2VfdGFi bGVzKHBwZ3R0LT5wZHAucGFnZWRpcltpXSk7CisJCWdlbjhfZnJlZV9wYWdlX3RhYmxlcyhwcGd0 dC0+cGRwLnBhZ2VkaXJbaV0sIHBwZ3R0LT5iYXNlLmRldik7CiAKIAlyZXR1cm4gLUVOT01FTTsK IH0KQEAgLTgwOCwyNiArODgxLDM2IEBAIHN0YXRpYyB2b2lkIGdlbjZfZHVtcF9wcGd0dChzdHJ1 Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsIHN0cnVjdCBzZXFfZmlsZSAqbSkKIAl9CiB9CiAKLXN0 YXRpYyB2b2lkIGdlbjZfd3JpdGVfcGRlcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCisv KiBXcml0ZSBwZGUgKGluZGV4KSBmcm9tIHRoZSBwYWdlIGRpcmVjdG9yeSBAcGQgdG8gdGhlIHBh Z2UgdGFibGUgQHB0ICovCitzdGF0aWMgdm9pZCBnZW42X3dyaXRlX3BkZXMoc3RydWN0IGk5MTVf cGFnZWRpciAqcGQsCisJCQkgICAgY29uc3QgaW50IHBkZSwgc3RydWN0IGk5MTVfcGFnZXRhYiAq cHQpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gcHBndHQtPmJhc2Uu ZGV2LT5kZXZfcHJpdmF0ZTsKLQlnZW42X2d0dF9wdGVfdCBfX2lvbWVtICpwZF9hZGRyOwotCXVp bnQzMl90IHBkX2VudHJ5OwotCWludCBpOworCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9 CisJCWNvbnRhaW5lcl9vZihwZCwgc3RydWN0IGk5MTVfaHdfcHBndHQsIHBkKTsKKwl1MzIgcGRf ZW50cnk7CiAKLQlXQVJOX09OKHBwZ3R0LT5wZC5wZF9vZmZzZXQgJiAweDNmKTsKLQlwZF9hZGRy ID0gKGdlbjZfZ3R0X3B0ZV90IF9faW9tZW0qKWRldl9wcml2LT5ndHQuZ3NtICsKLQkJcHBndHQt PnBkLnBkX29mZnNldCAvIHNpemVvZihnZW42X2d0dF9wdGVfdCk7Ci0JZm9yIChpID0gMDsgaSA8 IHBwZ3R0LT5udW1fcGRfZW50cmllczsgaSsrKSB7Ci0JCWRtYV9hZGRyX3QgcHRfYWRkcjsKKwlw ZF9lbnRyeSA9IEdFTjZfUERFX0FERFJfRU5DT0RFKHB0LT5kYWRkcik7CisJcGRfZW50cnkgfD0g R0VONl9QREVfVkFMSUQ7CiAKLQkJcHRfYWRkciA9IHBwZ3R0LT5wZC5wYWdlX3RhYmxlc1tpXS0+ ZGFkZHI7Ci0JCXBkX2VudHJ5ID0gR0VONl9QREVfQUREUl9FTkNPREUocHRfYWRkcik7Ci0JCXBk X2VudHJ5IHw9IEdFTjZfUERFX1ZBTElEOworCXdyaXRlbChwZF9lbnRyeSwgcHBndHQtPnBkX2Fk ZHIgKyBwZGUpOwogCi0JCXdyaXRlbChwZF9lbnRyeSwgcGRfYWRkciArIGkpOwotCX0KLQlyZWFk bChwZF9hZGRyKTsKKwkvKiBYWFg6IENhbGxlciBuZWVkcyB0byBtYWtlIHN1cmUgdGhlIHdyaXRl IGNvbXBsZXRlcyBpZiBuZWNlc3NhcnkgKi8KK30KKworLyogV3JpdGUgYWxsIHRoZSBwYWdlIHRh YmxlcyBmb3VuZCBpbiB0aGUgcHBndHQgc3RydWN0dXJlIHRvIGluY3JlbWVudGluZyBwYWdlCisg KiBkaXJlY3Rvcmllcy4gKi8KK3N0YXRpYyB2b2lkIGdlbjZfd3JpdGVfcGFnZV9yYW5nZShzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJc3RydWN0IGk5MTVfcGFnZWRpciAq cGQsIHVpbnQzMl90IHN0YXJ0LCB1aW50MzJfdCBsZW5ndGgpCit7CisJc3RydWN0IGk5MTVfcGFn ZXRhYiAqcHQ7CisJdWludDMyX3QgcGRlLCB0ZW1wOworCisJZ2VuNl9mb3JfZWFjaF9wZGUocHQs IHBkLCBzdGFydCwgbGVuZ3RoLCB0ZW1wLCBwZGUpCisJCWdlbjZfd3JpdGVfcGRlcyhwZCwgcGRl LCBwdCk7CisKKwkvKiBNYWtlIHN1cmUgd3JpdGUgaXMgY29tcGxldGUgYmVmb3JlIG90aGVyIGNv ZGUgY2FuIHVzZSB0aGlzIHBhZ2UKKwkgKiB0YWJsZS4gQWxzbyByZXF1aXJlIGZvciBXQyBtYXBw ZWQgUFRFcyAqLworCXJlYWRsKGRldl9wcml2LT5ndHQuZ3NtKTsKIH0KIAogc3RhdGljIHVpbnQz Ml90IGdldF9wZF9vZmZzZXQoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQpAQCAtMTA0Mywx MyArMTEyNiw1OSBAQCBzdGF0aWMgdm9pZCBnZW42X3BwZ3R0X3VubWFwX3BhZ2VzKHN0cnVjdCBp OTE1X2h3X3BwZ3R0ICpwcGd0dCkKIAkJCSAgICAgICA0MDk2LCBQQ0lfRE1BX0JJRElSRUNUSU9O QUwpOwogfQogCitzdGF0aWMgaW50IGdlbjZfYWxsb2NfdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRk cmVzc19zcGFjZSAqdm0sCisJCQkgICAgICAgdWludDY0X3Qgc3RhcnQsIHVpbnQ2NF90IGxlbmd0 aCkKK3sKKwlzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPQorCQkJCWNvbnRhaW5lcl9vZih2 bSwgc3RydWN0IGk5MTVfaHdfcHBndHQsIGJhc2UpOworCXN0cnVjdCBpOTE1X3BhZ2V0YWIgKnB0 OworCXVpbnQzMl90IHBkZSwgdGVtcDsKKworCWdlbjZfZm9yX2VhY2hfcGRlKHB0LCAmcHBndHQt PnBkLCBzdGFydCwgbGVuZ3RoLCB0ZW1wLCBwZGUpIHsKKwkJaW50IGo7CisKKwkJREVDTEFSRV9C SVRNQVAodG1wX2JpdG1hcCwgSTkxNV9QUEdUVF9QVF9FTlRSSUVTKTsKKwkJYml0bWFwX3plcm8o dG1wX2JpdG1hcCwgSTkxNV9QUEdUVF9QVF9FTlRSSUVTKTsKKwkJYml0bWFwX3NldCh0bXBfYml0 bWFwLCBnZW42X3B0ZV9pbmRleChzdGFydCksCisJCQkgICBnZW42X3B0ZV9jb3VudChzdGFydCwg bGVuZ3RoKSk7CisKKwkJLyogVE9ETzogVG8gYmUgZG9uZSBpbiB0aGUgbmV4dCBwYXRjaC4gTWFw IHRoZSBwYWdlL2luc2VydAorCQkgKiBlbnRyaWVzIGhlcmUgKi8KKwkJZm9yX2VhY2hfc2V0X2Jp dChqLCB0bXBfYml0bWFwLCBJOTE1X1BQR1RUX1BUX0VOVFJJRVMpIHsKKwkJCWlmICh0ZXN0X2Jp dChqLCBwdC0+dXNlZF9wdGVzKSkgeworCQkJCS8qIENoZWNrIHRoYXQgd2UncmUgY2hhbmdpbmcg Y2FjaGUgbGV2ZWxzICovCisJCQl9CisJCX0KKworCQliaXRtYXBfb3IocHQtPnVzZWRfcHRlcywg cHQtPnVzZWRfcHRlcywgdG1wX2JpdG1hcCwKKwkJCQlJOTE1X1BQR1RUX1BUX0VOVFJJRVMpOwor CX0KKworCXJldHVybiAwOworfQorCitzdGF0aWMgdm9pZCBnZW42X3RlYXJkb3duX3ZhX3Jhbmdl KHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAorCQkJCSAgIHVpbnQ2NF90IHN0YXJ0LCB1 aW50NjRfdCBsZW5ndGgpCit7CisJc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0KKwkJCQlj b250YWluZXJfb2Yodm0sIHN0cnVjdCBpOTE1X2h3X3BwZ3R0LCBiYXNlKTsKKwlzdHJ1Y3QgaTkx NV9wYWdldGFiICpwdDsKKwl1aW50MzJfdCBwZGUsIHRlbXA7CisKKwlnZW42X2Zvcl9lYWNoX3Bk ZShwdCwgJnBwZ3R0LT5wZCwgc3RhcnQsIGxlbmd0aCwgdGVtcCwgcGRlKSB7CisJCWJpdG1hcF9j bGVhcihwdC0+dXNlZF9wdGVzLCBnZW42X3B0ZV9pbmRleChzdGFydCksCisJCQkgICAgIGdlbjZf cHRlX2NvdW50KHN0YXJ0LCBsZW5ndGgpKTsKKwl9Cit9CisKIHN0YXRpYyB2b2lkIGdlbjZfcHBn dHRfZnJlZShzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiB7CiAJaW50IGk7CiAKIAlmb3Ig KGkgPSAwOyBpIDwgcHBndHQtPm51bV9wZF9lbnRyaWVzOyBpKyspCi0JCWZyZWVfcHRfc2luZ2xl KHBwZ3R0LT5wZC5wYWdlX3RhYmxlc1tpXSk7CisJCWZyZWVfcHRfc2luZ2xlKHBwZ3R0LT5wZC5w YWdlX3RhYmxlc1tpXSwgcHBndHQtPmJhc2UuZGV2KTsKIAorCWZyZWVfcHRfc2NyYXRjaChwcGd0 dC0+c2NyYXRjaF9wdCwgcHBndHQtPmJhc2UuZGV2KTsKIAlmcmVlX3BkX3NpbmdsZSgmcHBndHQt PnBkKTsKIH0KIApAQCAtMTA3Niw2ICsxMjA1LDkgQEAgc3RhdGljIGludCBnZW42X3BwZ3R0X2Fs bG9jYXRlX3BhZ2VfZGlyZWN0b3JpZXMoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogCSAq IHNpemUuIFdlIGFsbG9jYXRlIGF0IHRoZSB0b3Agb2YgdGhlIEdUVCB0byBhdm9pZCBmcmFnbWVu dGF0aW9uLgogCSAqLwogCUJVR19PTighZHJtX21tX2luaXRpYWxpemVkKCZkZXZfcHJpdi0+Z3R0 LmJhc2UubW0pKTsKKwlwcGd0dC0+c2NyYXRjaF9wdCA9IGFsbG9jX3B0X3NjcmF0Y2gocHBndHQt PmJhc2UuZGV2KTsKKwlpZiAoSVNfRVJSKHBwZ3R0LT5zY3JhdGNoX3B0KSkKKwkJcmV0dXJuIFBU Ul9FUlIocHBndHQtPnNjcmF0Y2hfcHQpOwogYWxsb2M6CiAJcmV0ID0gZHJtX21tX2luc2VydF9u b2RlX2luX3JhbmdlX2dlbmVyaWMoJmRldl9wcml2LT5ndHQuYmFzZS5tbSwKIAkJCQkJCSAgJnBw Z3R0LT5ub2RlLCBHRU42X1BEX1NJWkUsCkBAIC0xMDg5LDIwICsxMjIxLDI1IEBAIGFsbG9jOgog CQkJCQkgICAgICAgMCwgZGV2X3ByaXYtPmd0dC5iYXNlLnRvdGFsLAogCQkJCQkgICAgICAgMCk7 CiAJCWlmIChyZXQpCi0JCQlyZXR1cm4gcmV0OworCQkJZ290byBlcnJfb3V0OwogCiAJCXJldHJp ZWQgPSB0cnVlOwogCQlnb3RvIGFsbG9jOwogCX0KIAogCWlmIChyZXQpCi0JCXJldHVybiByZXQ7 CisJCWdvdG8gZXJyX291dDsKKwogCiAJaWYgKHBwZ3R0LT5ub2RlLnN0YXJ0IDwgZGV2X3ByaXYt Pmd0dC5tYXBwYWJsZV9lbmQpCiAJCURSTV9ERUJVRygiRm9yY2VkIHRvIHVzZSBhcGVydHVyZSBm b3IgUERFc1xuIik7CiAKIAlwcGd0dC0+bnVtX3BkX2VudHJpZXMgPSBHRU42X1BQR1RUX1BEX0VO VFJJRVM7CiAJcmV0dXJuIDA7CisKK2Vycl9vdXQ6CisJZnJlZV9wdF9zY3JhdGNoKHBwZ3R0LT5z Y3JhdGNoX3B0LCBwcGd0dC0+YmFzZS5kZXYpOworCXJldHVybiByZXQ7CiB9CiAKIHN0YXRpYyBp bnQgZ2VuNl9wcGd0dF9hbGxvYyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCkBAIC0xMTEz LDcgKzEyNTAsOSBAQCBzdGF0aWMgaW50IGdlbjZfcHBndHRfYWxsb2Moc3RydWN0IGk5MTVfaHdf cHBndHQgKnBwZ3R0KQogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKLQlyZXQgPSBhbGxvY19w dF9yYW5nZSgmcHBndHQtPnBkLCAwLCBwcGd0dC0+bnVtX3BkX2VudHJpZXMpOworCXJldCA9IGFs bG9jX3B0X3JhbmdlKCZwcGd0dC0+cGQsIDAsIHBwZ3R0LT5udW1fcGRfZW50cmllcywKKwkJCXBw Z3R0LT5iYXNlLmRldik7CisKIAlpZiAocmV0KSB7CiAJCWRybV9tbV9yZW1vdmVfbm9kZSgmcHBn dHQtPm5vZGUpOwogCQlyZXR1cm4gcmV0OwpAQCAtMTEyMiwzMCArMTI2MSw2IEBAIHN0YXRpYyBp bnQgZ2VuNl9wcGd0dF9hbGxvYyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiAJcmV0dXJu IDA7CiB9CiAKLXN0YXRpYyBpbnQgZ2VuNl9wcGd0dF9zZXR1cF9wYWdlX3RhYmxlcyhzdHJ1Y3Qg aTkxNV9od19wcGd0dCAqcHBndHQpCi17Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBwZ3R0 LT5iYXNlLmRldjsKLQlpbnQgaTsKLQotCWZvciAoaSA9IDA7IGkgPCBwcGd0dC0+bnVtX3BkX2Vu dHJpZXM7IGkrKykgewotCQlzdHJ1Y3QgcGFnZSAqcGFnZTsKLQkJZG1hX2FkZHJfdCBwdF9hZGRy OwotCi0JCXBhZ2UgPSBwcGd0dC0+cGQucGFnZV90YWJsZXNbaV0tPnBhZ2U7Ci0JCXB0X2FkZHIg PSBwY2lfbWFwX3BhZ2UoZGV2LT5wZGV2LCBwYWdlLCAwLCA0MDk2LAotCQkJCSAgICAgICBQQ0lf RE1BX0JJRElSRUNUSU9OQUwpOwotCi0JCWlmIChwY2lfZG1hX21hcHBpbmdfZXJyb3IoZGV2LT5w ZGV2LCBwdF9hZGRyKSkgewotCQkJZ2VuNl9wcGd0dF91bm1hcF9wYWdlcyhwcGd0dCk7Ci0JCQly ZXR1cm4gLUVJTzsKLQkJfQotCi0JCXBwZ3R0LT5wZC5wYWdlX3RhYmxlc1tpXS0+ZGFkZHIgPSBw dF9hZGRyOwotCX0KLQotCXJldHVybiAwOwotfQotCiBzdGF0aWMgaW50IGdlbjZfcHBndHRfaW5p dChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRl diA9IHBwZ3R0LT5iYXNlLmRldjsKQEAgLTExNjYsMTIgKzEyODEsOCBAQCBzdGF0aWMgaW50IGdl bjZfcHBndHRfaW5pdChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiAJaWYgKHJldCkKIAkJ cmV0dXJuIHJldDsKIAotCXJldCA9IGdlbjZfcHBndHRfc2V0dXBfcGFnZV90YWJsZXMocHBndHQp OwotCWlmIChyZXQpIHsKLQkJZ2VuNl9wcGd0dF9mcmVlKHBwZ3R0KTsKLQkJcmV0dXJuIHJldDsK LQl9Ci0KKwlwcGd0dC0+YmFzZS5hbGxvY2F0ZV92YV9yYW5nZSA9IGdlbjZfYWxsb2NfdmFfcmFu Z2U7CisJcHBndHQtPmJhc2UudGVhcmRvd25fdmFfcmFuZ2UgPSBnZW42X3RlYXJkb3duX3ZhX3Jh bmdlOwogCXBwZ3R0LT5iYXNlLmNsZWFyX3JhbmdlID0gZ2VuNl9wcGd0dF9jbGVhcl9yYW5nZTsK IAlwcGd0dC0+YmFzZS5pbnNlcnRfZW50cmllcyA9IGdlbjZfcHBndHRfaW5zZXJ0X2VudHJpZXM7 CiAJcHBndHQtPmJhc2UuY2xlYW51cCA9IGdlbjZfcHBndHRfY2xlYW51cDsKQEAgLTExODIsMTEg KzEyOTMsMTUgQEAgc3RhdGljIGludCBnZW42X3BwZ3R0X2luaXQoc3RydWN0IGk5MTVfaHdfcHBn dHQgKnBwZ3R0KQogCXBwZ3R0LT5wZC5wZF9vZmZzZXQgPQogCQlwcGd0dC0+bm9kZS5zdGFydCAv IFBBR0VfU0laRSAqIHNpemVvZihnZW42X2d0dF9wdGVfdCk7CiAKKwlwcGd0dC0+cGRfYWRkciA9 IChnZW42X2d0dF9wdGVfdCBfX2lvbWVtICopZGV2X3ByaXYtPmd0dC5nc20gKworCQlwcGd0dC0+ cGQucGRfb2Zmc2V0IC8gc2l6ZW9mKGdlbjZfZ3R0X3B0ZV90KTsKKworCWdlbjZfd3JpdGVfcGFn ZV9yYW5nZShkZXZfcHJpdiwgJnBwZ3R0LT5wZCwgMCwgcHBndHQtPmJhc2UudG90YWwpOworCiAJ RFJNX0RFQlVHX0RSSVZFUigiQWxsb2NhdGVkIHBkZSBzcGFjZSAoJWxkTSkgYXQgR1RUIGVudHJ5 OiAlbHhcbiIsCiAJCQkgcHBndHQtPm5vZGUuc2l6ZSA+PiAyMCwKIAkJCSBwcGd0dC0+bm9kZS5z dGFydCAvIFBBR0VfU0laRSk7CiAKLQlnZW42X3dyaXRlX3BkZXMocHBndHQpOwogCURSTV9ERUJV RygiQWRkaW5nIFBQR1RUIGF0IG9mZnNldCAleFxuIiwKIAkJICBwcGd0dC0+cGQucGRfb2Zmc2V0 IDw8IDEwKTsKIApAQCAtMTMxOCw2ICsxNDMzLDkgQEAgc3RhdGljIHZvaWQgcHBndHRfdW5iaW5k X3ZtYShzdHJ1Y3QgaTkxNV92bWEgKnZtYSkKIAkJCSAgICAgdm1hLT5ub2RlLnN0YXJ0LAogCQkJ ICAgICB2bWEtPm9iai0+YmFzZS5zaXplLAogCQkJICAgICB0cnVlKTsKKwlpZiAodm1hLT52bS0+ dGVhcmRvd25fdmFfcmFuZ2UpCisJCXZtYS0+dm0tPnRlYXJkb3duX3ZhX3JhbmdlKHZtYS0+dm0s CisJCQkJCSAgIHZtYS0+bm9kZS5zdGFydCwgdm1hLT5ub2RlLnNpemUpOwogfQogCiBleHRlcm4g aW50IGludGVsX2lvbW11X2dmeF9tYXBwZWQ7CkBAIC0xNDYxLDEzICsxNTc5LDE0IEBAIHZvaWQg aTkxNV9nZW1fcmVzdG9yZV9ndHRfbWFwcGluZ3Moc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAog CWxpc3RfZm9yX2VhY2hfZW50cnkodm0sICZkZXZfcHJpdi0+dm1fbGlzdCwgZ2xvYmFsX2xpbmsp IHsKIAkJLyogVE9ETzogUGVyaGFwcyBpdCBzaG91bGRuJ3QgYmUgZ2VuNiBzcGVjaWZpYyAqLwot CQlpZiAoaTkxNV9pc19nZ3R0KHZtKSkgewotCQkJaWYgKGRldl9wcml2LT5tbS5hbGlhc2luZ19w cGd0dCkKLQkJCQlnZW42X3dyaXRlX3BkZXMoZGV2X3ByaXYtPm1tLmFsaWFzaW5nX3BwZ3R0KTsK LQkJCWNvbnRpbnVlOwotCQl9CiAKLQkJZ2VuNl93cml0ZV9wZGVzKGNvbnRhaW5lcl9vZih2bSwg c3RydWN0IGk5MTVfaHdfcHBndHQsIGJhc2UpKTsKKwkJc3RydWN0IGk5MTVfaHdfcHBndHQgKnBw Z3R0ID0KKwkJCWNvbnRhaW5lcl9vZih2bSwgc3RydWN0IGk5MTVfaHdfcHBndHQsIGJhc2UpOwor CisJCWlmIChpOTE1X2lzX2dndHQodm0pKQorCQkJcHBndHQgPSBkZXZfcHJpdi0+bW0uYWxpYXNp bmdfcHBndHQ7CisKKwkJZ2VuNl93cml0ZV9wYWdlX3JhbmdlKGRldl9wcml2LCAmcHBndHQtPnBk LCAwLCBwcGd0dC0+bnVtX3BkX2VudHJpZXMpOwogCX0KIAogCWk5MTVfZ2d0dF9mbHVzaChkZXZf cHJpdik7CkBAIC0xNjMzLDggKzE3NTIsOCBAQCBzdGF0aWMgdm9pZCBnZW42X2dndHRfY2xlYXJf cmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAKIAogc3RhdGljIHZvaWQgaTkx NV9nZ3R0X2JpbmRfdm1hKHN0cnVjdCBpOTE1X3ZtYSAqdm1hLAotCQkJICAgICAgIGVudW0gaTkx NV9jYWNoZV9sZXZlbCBjYWNoZV9sZXZlbCwKLQkJCSAgICAgICB1MzIgdW51c2VkKQorCQkJICAg ICAgZW51bSBpOTE1X2NhY2hlX2xldmVsIGNhY2hlX2xldmVsLAorCQkJICAgICAgdTMyIHVudXNl ZCkKIHsKIAljb25zdCB1bnNpZ25lZCBsb25nIGVudHJ5ID0gdm1hLT5ub2RlLnN0YXJ0ID4+IFBB R0VfU0hJRlQ7CiAJdW5zaWduZWQgaW50IGZsYWdzID0gKGNhY2hlX2xldmVsID09IEk5MTVfQ0FD SEVfTk9ORSkgPwpAQCAtMTY2Niw4ICsxNzg1LDggQEAgc3RhdGljIHZvaWQgaTkxNV9nZ3R0X3Vu YmluZF92bWEoc3RydWN0IGk5MTVfdm1hICp2bWEpCiB9CiAKIHN0YXRpYyB2b2lkIGdndHRfYmlu ZF92bWEoc3RydWN0IGk5MTVfdm1hICp2bWEsCi0JCQkgIGVudW0gaTkxNV9jYWNoZV9sZXZlbCBj YWNoZV9sZXZlbCwKLQkJCSAgdTMyIGZsYWdzKQorCQkJIGVudW0gaTkxNV9jYWNoZV9sZXZlbCBj YWNoZV9sZXZlbCwKKwkJCSB1MzIgZmxhZ3MpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9 IHZtYS0+dm0tPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYt PmRldl9wcml2YXRlOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Z3R0LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAppbmRleCBjMDhmZThi Li5kNTc5Zjc0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQu aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaApAQCAtNTQsNyArNTQs MTAgQEAgdHlwZWRlZiBnZW44X2d0dF9wdGVfdCBnZW44X3BwZ3R0X3BkZV90OwogI2RlZmluZSBH RU42X1BQR1RUX1BEX0VOVFJJRVMJCTUxMgogI2RlZmluZSBHRU42X1BEX1NJWkUJCQkoR0VONl9Q UEdUVF9QRF9FTlRSSUVTICogUEFHRV9TSVpFKQogI2RlZmluZSBHRU42X1BEX0FMSUdOCQkJKFBB R0VfU0laRSAqIDE2KQorI2RlZmluZSBHRU42X1BERV9TSElGVCAgICAgICAgICAyMgogI2RlZmlu ZSBHRU42X1BERV9WQUxJRAkJCSgxIDw8IDApCisjZGVmaW5lIEdFTjZfUERFX01BU0sJCQkoR0VO Nl9QUEdUVF9QRF9FTlRSSUVTLTEpCisjZGVmaW5lIE5VTV9QVEUocGRlX3NoaWZ0KQkJKDEgPDwg KHBkZV9zaGlmdCAtIFBBR0VfU0hJRlQpKQogCiAjZGVmaW5lIEdFTjdfUFRFX0NBQ0hFX0wzX0xM QwkJKDMgPDwgMSkKIApAQCAtMTgzLDggKzE4NiwzMiBAQCBzdHJ1Y3QgaTkxNV92bWEgewogCXZv aWQgKCp1bmJpbmRfdm1hKShzdHJ1Y3QgaTkxNV92bWEgKnZtYSk7CiAJLyogTWFwIGFuIG9iamVj dCBpbnRvIGFuIGFkZHJlc3Mgc3BhY2Ugd2l0aCB0aGUgZ2l2ZW4gY2FjaGUgZmxhZ3MuICovCiAJ dm9pZCAoKmJpbmRfdm1hKShzdHJ1Y3QgaTkxNV92bWEgKnZtYSwKLQkJCSBlbnVtIGk5MTVfY2Fj aGVfbGV2ZWwgY2FjaGVfbGV2ZWwsCi0JCQkgdTMyIGZsYWdzKTsKKwkJCWVudW0gaTkxNV9jYWNo ZV9sZXZlbCBjYWNoZV9sZXZlbCwKKwkJCXUzMiBmbGFncyk7Cit9OworCisKK3N0cnVjdCBpOTE1 X3BhZ2V0YWIgeworCXN0cnVjdCBwYWdlICpwYWdlOworCWRtYV9hZGRyX3QgZGFkZHI7CisKKwl1 bnNpZ25lZCBsb25nICp1c2VkX3B0ZXM7CisJdW5zaWduZWQgaW50IHNjcmF0Y2g6MTsKK307CisK K3N0cnVjdCBpOTE1X3BhZ2VkaXIgeworCXN0cnVjdCBwYWdlICpwYWdlOyAvKiBOVUxMIGZvciBH RU42LUdFTjcgKi8KKwl1bmlvbiB7CisJCXVpbnQzMl90IHBkX29mZnNldDsKKwkJZG1hX2FkZHJf dCBkYWRkcjsKKwl9OworCisJc3RydWN0IGk5MTVfcGFnZXRhYiAqcGFnZV90YWJsZXNbR0VONl9Q UEdUVF9QRF9FTlRSSUVTXTsKK307CisKK3N0cnVjdCBpOTE1X3BhZ2VkaXJwbyB7CisJLyogc3Ry dWN0IHBhZ2UgKnBhZ2U7ICovCisJc3RydWN0IGk5MTVfcGFnZWRpciAqcGFnZWRpcltHRU44X0xF R0FDWV9QRFBFU107CiB9OwogCiBzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlIHsKQEAgLTIyNiw2 ICsyNTMsMTIgQEAgc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSB7CiAJZ2VuNl9ndHRfcHRlX3Qg KCpwdGVfZW5jb2RlKShkbWFfYWRkcl90IGFkZHIsCiAJCQkJICAgICBlbnVtIGk5MTVfY2FjaGVf bGV2ZWwgbGV2ZWwsCiAJCQkJICAgICBib29sIHZhbGlkLCB1MzIgZmxhZ3MpOyAvKiBDcmVhdGUg YSB2YWxpZCBQVEUgKi8KKwlpbnQgKCphbGxvY2F0ZV92YV9yYW5nZSkoc3RydWN0IGk5MTVfYWRk cmVzc19zcGFjZSAqdm0sCisJCQkJIHVpbnQ2NF90IHN0YXJ0LAorCQkJCSB1aW50NjRfdCBsZW5n dGgpOworCXZvaWQgKCp0ZWFyZG93bl92YV9yYW5nZSkoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFj ZSAqdm0sCisJCQkJICB1aW50NjRfdCBzdGFydCwKKwkJCQkgIHVpbnQ2NF90IGxlbmd0aCk7CiAJ dm9pZCAoKmNsZWFyX3JhbmdlKShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJCSAg ICB1aW50NjRfdCBzdGFydCwKIAkJCSAgICB1aW50NjRfdCBsZW5ndGgsCkBAIC0yMzcsNiArMjcw LDI5IEBAIHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgewogCXZvaWQgKCpjbGVhbnVwKShzdHJ1 Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSk7CiB9OwogCitzdHJ1Y3QgaTkxNV9od19wcGd0dCB7 CisJc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSBiYXNlOworCXN0cnVjdCBrcmVmIHJlZjsKKwlz dHJ1Y3QgZHJtX21tX25vZGUgbm9kZTsKKwl1bnNpZ25lZCBudW1fcGRfZW50cmllczsKKwl1bnNp Z25lZCBudW1fcGRfcGFnZXM7IC8qIGdlbjgrICovCisJdW5pb24geworCQlzdHJ1Y3QgaTkxNV9w YWdlZGlycG8gcGRwOworCQlzdHJ1Y3QgaTkxNV9wYWdlZGlyIHBkOworCX07CisKKwlzdHJ1Y3Qg aTkxNV9wYWdldGFiICpzY3JhdGNoX3B0OworCisJc3RydWN0IGRybV9pOTE1X2ZpbGVfcHJpdmF0 ZSAqZmlsZV9wcml2OworCisJZ2VuNl9ndHRfcHRlX3QgX19pb21lbSAqcGRfYWRkcjsKKworCWlu dCAoKmVuYWJsZSkoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KTsKKwlpbnQgKCpzd2l0Y2hf bW0pKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKKwkJCSBzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICpyaW5nKTsKKwl2b2lkICgqZGVidWdfZHVtcCkoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBw Z3R0LCBzdHJ1Y3Qgc2VxX2ZpbGUgKm0pOworfTsKKwogLyogVGhlIEdyYXBoaWNzIFRyYW5zbGF0 aW9uIFRhYmxlIGlzIHRoZSB3YXkgaW4gd2hpY2ggR0VOIGhhcmR3YXJlIHRyYW5zbGF0ZXMgYQog ICogR3JhcGhpY3MgVmlydHVhbCBBZGRyZXNzIGludG8gYSBQaHlzaWNhbCBBZGRyZXNzLiBJbiBh ZGRpdGlvbiB0byB0aGUgbm9ybWFsCiAgKiBjb2xsYXRlcmFsIGFzc29jaWF0ZWQgd2l0aCBhbnkg dmEtPnBhIHRyYW5zbGF0aW9ucyBHRU4gaGFyZHdhcmUgYWxzbyBoYXMgYQpAQCAtMjY1LDQ0ICsz MjEsNjkgQEAgc3RydWN0IGk5MTVfZ3R0IHsKIAkJCSAgdW5zaWduZWQgbG9uZyAqbWFwcGFibGVf ZW5kKTsKIH07CiAKLXN0cnVjdCBpOTE1X3BhZ2V0YWIgewotCXN0cnVjdCBwYWdlICpwYWdlOwot CWRtYV9hZGRyX3QgZGFkZHI7Ci19OworLyogRm9yIGVhY2ggcGRlIGl0ZXJhdGVzIG92ZXIgZXZl cnkgcGRlIGJldHdlZW4gZnJvbSBzdGFydCB1bnRpbCBzdGFydCArIGxlbmd0aC4KKyAqIElmIHN0 YXJ0LCBhbmQgc3RhcnQrbGVuZ3RoIGFyZSBub3QgcGVyZmVjdGx5IGRpdmlzaWJsZSwgdGhlIG1h Y3JvIHdpbGwgcm91bmQKKyAqIGRvd24sIGFuZCB1cCBhcyBuZWVkZWQuIFRoZSBtYWNybyBtb2Rp ZmllcyBwZGUsIHN0YXJ0LCBhbmQgbGVuZ3RoLiBEZXYgaXMKKyAqIG9ubHkgdXNlZCB0byBkaWZm ZXJlbnRpYXRlIHNoaWZ0IHZhbHVlcy4gVGVtcCBpcyB0ZW1wLiAgT24gZ2VuNi83LCBzdGFydCA9 IDAsCisgKiBhbmQgbGVuZ3RoID0gMkcgZWZmZWN0aXZlbHkgaXRlcmF0ZXMgb3ZlciBldmVyeSBQ REUgaW4gdGhlIHN5c3RlbS4gT24gZ2VuOCsKKyAqIGl0IHNpbXBseSBpdGVyYXRlcyBvdmVyIGV2 ZXJ5IHBhZ2UgZGlyZWN0b3J5IGVudHJ5IGluIGEgcGFnZSBkaXJlY3RvcnkuCisgKgorICogWFhY OiB0ZW1wIGlzIG5vdCBhY3R1YWxseSBuZWVkZWQsIGJ1dCBpdCBzYXZlcyBkb2luZyB0aGUgQUxJ R04gb3BlcmF0aW9uLgorICovCisjZGVmaW5lIGdlbjZfZm9yX2VhY2hfcGRlKHB0LCBwZCwgc3Rh cnQsIGxlbmd0aCwgdGVtcCwgaXRlcikgXAorCWZvciAoaXRlciA9IGdlbjZfcGRlX2luZGV4KHN0 YXJ0KSwgcHQgPSAocGQpLT5wYWdlX3RhYmxlc1tpdGVyXTsgXAorCSAgICAgbGVuZ3RoID4gMCAm JiBpdGVyIDwgR0VONl9QUEdUVF9QRF9FTlRSSUVTOyBcCisJICAgICBwdCA9IChwZCktPnBhZ2Vf dGFibGVzWysraXRlcl0sIFwKKwkgICAgIHRlbXAgPSBBTElHTihzdGFydCsxLCAxIDw8IEdFTjZf UERFX1NISUZUKSAtIHN0YXJ0LCBcCisJICAgICB0ZW1wID0gbWluKHRlbXAsICh1bnNpZ25lZCls ZW5ndGgpLCBcCisJICAgICBzdGFydCArPSB0ZW1wLCBsZW5ndGggLT0gdGVtcCkKKworc3RhdGlj IGlubGluZSB1aW50MzJfdCBpOTE1X3B0ZV9pbmRleCh1aW50NjRfdCBhZGRyZXNzLCB1aW50MzJf dCBwZGVfc2hpZnQpCit7CisJY29uc3QgdWludDMyX3QgbWFzayA9IE5VTV9QVEUocGRlX3NoaWZ0 KSAtIDE7CisJcmV0dXJuIChhZGRyZXNzID4+IFBBR0VfU0hJRlQpICYgbWFzazsKK30KIAotc3Ry dWN0IGk5MTVfcGFnZWRpciB7Ci0Jc3RydWN0IHBhZ2UgKnBhZ2U7IC8qIE5VTEwgZm9yIEdFTjYt R0VONyAqLwotCXVuaW9uIHsKLQkJdWludDMyX3QgcGRfb2Zmc2V0OwotCQlkbWFfYWRkcl90IGRh ZGRyOwotCX07CisvKiBIZWxwZXIgdG8gY291bnRzIHRoZSBudW1iZXIgb2YgUFRFcyB3aXRoaW4g dGhlIGdpdmVuIGxlbmd0aC4gVGhpcyBjb3VudCBkb2VzCisqIG5vdCBjcm9zcyBhIHBhZ2UgdGFi bGUgYm91bmRhcnksIHNvIHRoZSBtYXggdmFsdWUgd291bGQgYmUKKyogSTkxNV9QUEdUVF9QVF9F TlRSSUVTIGZvciBHRU42LCBhbmQgR0VOOF9QVEVTX1BFUl9QQUdFIGZvciBHRU44LgorKi8KK3N0 YXRpYyBpbmxpbmUgc2l6ZV90IGk5MTVfcHRlX2NvdW50KHVpbnQ2NF90IGFkZHIsIHNpemVfdCBs ZW5ndGgsCisJCQkJCXVpbnQzMl90IHBkZV9zaGlmdCkKK3sKKwljb25zdCB1aW50NjRfdCBtYXNr ID0gfigoMSA8PCBwZGVfc2hpZnQpIC0gMSk7CisJdWludDY0X3QgZW5kOwogCi0Jc3RydWN0IGk5 MTVfcGFnZXRhYiAqcGFnZV90YWJsZXNbR0VONl9QUEdUVF9QRF9FTlRSSUVTXTsgLyogUERFcyAq LwotfTsKKwlCVUdfT04obGVuZ3RoID09IDApOworCUJVR19PTihvZmZzZXRfaW5fcGFnZShhZGRy fGxlbmd0aCkpOwogCi1zdHJ1Y3QgaTkxNV9wYWdlZGlycG8gewotCS8qIHN0cnVjdCBwYWdlICpw YWdlOyAqLwotCXN0cnVjdCBpOTE1X3BhZ2VkaXIgKnBhZ2VkaXJbR0VOOF9MRUdBQ1lfUERQRVNd OwotfTsKKwllbmQgPSBhZGRyICsgbGVuZ3RoOwogCi1zdHJ1Y3QgaTkxNV9od19wcGd0dCB7Ci0J c3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSBiYXNlOwotCXN0cnVjdCBrcmVmIHJlZjsKLQlzdHJ1 Y3QgZHJtX21tX25vZGUgbm9kZTsKLQl1bnNpZ25lZCBudW1fcGRfZW50cmllczsKLQl1bnNpZ25l ZCBudW1fcGRfcGFnZXM7IC8qIGdlbjgrICovCi0JdW5pb24gewotCQlzdHJ1Y3QgaTkxNV9wYWdl ZGlycG8gcGRwOwotCQlzdHJ1Y3QgaTkxNV9wYWdlZGlyIHBkOwotCX07CisJaWYgKChhZGRyICYg bWFzaykgIT0gKGVuZCAmIG1hc2spKQorCQlyZXR1cm4gTlVNX1BURShwZGVfc2hpZnQpIC0gaTkx NV9wdGVfaW5kZXgoYWRkciwgcGRlX3NoaWZ0KTsKIAotCXN0cnVjdCBkcm1faTkxNV9maWxlX3By aXZhdGUgKmZpbGVfcHJpdjsKKwlyZXR1cm4gaTkxNV9wdGVfaW5kZXgoZW5kLCBwZGVfc2hpZnQp IC0gaTkxNV9wdGVfaW5kZXgoYWRkciwgcGRlX3NoaWZ0KTsKK30KIAotCWludCAoKmVuYWJsZSko c3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KTsKLQlpbnQgKCpzd2l0Y2hfbW0pKHN0cnVjdCBp OTE1X2h3X3BwZ3R0ICpwcGd0dCwKLQkJCSBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsK LQl2b2lkICgqZGVidWdfZHVtcCkoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LCBzdHJ1Y3Qg c2VxX2ZpbGUgKm0pOwotfTsKK3N0YXRpYyBpbmxpbmUgdWludDMyX3QgaTkxNV9wZGVfaW5kZXgo dWludDY0X3QgYWRkciwgdWludDMyX3Qgc2hpZnQpCit7CisJcmV0dXJuIChhZGRyID4+IHNoaWZ0 KSAmIEdFTjZfUERFX01BU0s7Cit9CisKK3N0YXRpYyBpbmxpbmUgdWludDMyX3QgZ2VuNl9wdGVf aW5kZXgodWludDMyX3QgYWRkcikKK3sKKwlyZXR1cm4gaTkxNV9wdGVfaW5kZXgoYWRkciwgR0VO Nl9QREVfU0hJRlQpOworfQorCitzdGF0aWMgaW5saW5lIHNpemVfdCBnZW42X3B0ZV9jb3VudCh1 aW50MzJfdCBhZGRyLCB1aW50MzJfdCBsZW5ndGgpCit7CisJcmV0dXJuIGk5MTVfcHRlX2NvdW50 KGFkZHIsIGxlbmd0aCwgR0VONl9QREVfU0hJRlQpOworfQorCitzdGF0aWMgaW5saW5lIHVpbnQz Ml90IGdlbjZfcGRlX2luZGV4KHVpbnQzMl90IGFkZHIpCit7CisJcmV0dXJuIGk5MTVfcGRlX2lu ZGV4KGFkZHIsIEdFTjZfUERFX1NISUZUKTsKK30KIAogaW50IGk5MTVfZ2VtX2d0dF9pbml0KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCBpOTE1X2dlbV9pbml0X2dsb2JhbF9ndHQoc3Ry dWN0IGRybV9kZXZpY2UgKmRldik7Ci0tIAoyLjEuMQoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK