From: Michel Thierry Subject: [PATCH 3/5] drm/i915: Track GEN6 page table usage Date: Mon, 16 Mar 2015 16:00:56 +0000 Message-ID: <1426521658-28408-4-git-send-email-michel.thierry@intel.com> References: <1426521658-28408-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 2C7A96E578 for ; Mon, 16 Mar 2015 09:00:51 -0700 (PDT) In-Reply-To: <1426521658-28408-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 cy9wZHAucGFnZV9kaXJlY3RvcnkvcGRwLnBhZ2VfZGlyZWN0b3JpZXMKTWFrZSBhIHNjcmF0Y2gg cGFnZSBhbGxvY2F0aW9uIGhlbHBlcgoKdjM6IFJlYmFzZSBhbmQgZXhwYW5kIGNvbW1pdCBtZXNz YWdlLgoKdjQ6IEFsbG9jYXRlIHJlcXVpcmVkIHBhZ2V0YWJsZXMgb25seSB3aGVuIGl0IGlzIG5l ZWRlZCwgX2JpbmRfdG9fdm0KaW5zdGVhZCBvZiBiaW5kX3ZtYSAoRGFuaWVsKS4KCnY1OiBSZWJh c2VkIHRvIHJlbW92ZSB0aGUgdW5uZWNlc3Nhcnkgbm9pc2UgaW4gdGhlIGRpZmYsIGFsc286CiAt IFBERSBtYXNrIGlzIEdFTiBhZ25vc3RpYywgcmVuYW1lZCBHRU42X1BERV9NQVNLIHRvIEk5MTVf UERFX01BU0suCiAtIFJlbW92ZWQgdW5uZWNlc3NhcnkgY2hlY2tzIGluIGdlbjZfYWxsb2NfdmFf cmFuZ2UuCiAtIENoYW5nZWQgbWFwL3VubWFwX3B4X3NpbmdsZSBtYWNyb3MgdG8gdXNlIGRtYSBm dW5jdGlvbnMgZGlyZWN0bHkgYW5kCiAgIGJlIHBhcnQgb2YgYSBzdGF0aWMgaW5saW5lIGZ1bmN0 aW9uIGluc3RlYWQuCiAtIE1vdmVkIGRybV9kZXZpY2UgcGx1bWJpbmcgdGhyb3VnaCBwYWdlIHRh YmxlcyBvcGVyYXRpb24gdG8gaXRzIG93bgogICBwYXRjaC4KIC0gTW92ZWQgYWxsb2NhdGUvdGVh cmRvd25fdmFfcmFuZ2UgY2FsbHMgdW50aWwgdGhleSBhcmUgZnVsbHkKICAgaW1wbGVtZW50ZWQg KGluIHN1YnNlcXVlbnQgcGF0Y2gpLgogLSBNZXJnZWQgcHQgYW5kIHNjcmF0Y2hfcHQgdW5tYXBf YW5kX2ZyZWUgcGF0aC4KIC0gTW92ZWQgc2NyYXRjaCBwYWdlIGFsbG9jYXRvciBoZWxwZXIgdG8g dGhlIHBhdGNoIHRoYXQgd2lsbCB1c2UgaXQuCgp2NjogUmVkdWNlIGNvbXBsZXhpdHkgYnkgbm90 IHRlYXJpbmcgZG93biBwYWdldGFibGVzIGR5bmFtaWNhbGx5LCB0aGUKc2FtZSBjYW4gYmUgYWNo aWV2ZWQgd2hpbGUgZnJlZWluZyBlbXB0eSB2bXMuIChEYW5pZWwpCgp2Nzogcy9pOTE1X2RtYV9t YXBfcHhfc2luZ2xlL2k5MTVfZG1hX21hcF9zaW5nbGUKcy9nZW42X3dyaXRlX3BkZXMvZ2VuNl93 cml0ZV9wZGUKUHJldmVudCBhIE5VTEwgY2FzZSB3aGVuIG9ubHkgR0dUVCBpcyBhdmFpbGFibGUu IChNaWthKQoKdjg6IFJlYmFzZWQgYWZ0ZXIgcy9wYWdlX3RhYmxlcy9wYWdlX3RhYmxlLy4KCnY5 OiBSZXdvcmtlZCBpOTE1X3B0ZV9pbmRleCBhbmQgaTkxNV9wdGVfY291bnQuCkFsc28gZXhlcmNp c2UgYml0bWFwIGFsbG9jYXRpb24gaGVyZSAoZ2VuNl9hbGxvY192YV9yYW5nZSkgYW5kIGZpeApp bmNvcnJlY3Qgd3JpdGVfcGFnZV9yYW5nZSBpbiBpOTE1X2dlbV9yZXN0b3JlX2d0dF9tYXBwaW5n cyAoTWlrYSkuCgpDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVsQGZmd2xsLmNoPgpDYzogTWlrYSBL dW9wcGFsYSA8bWlrYS5rdW9wcGFsYUBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEJl biBXaWRhd3NreSA8YmVuQGJ3aWRhd3NrLm5ldD4KU2lnbmVkLW9mZi1ieTogTWljaGVsIFRoaWVy cnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4gKHYzKykKLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbS5jICAgICB8ICAgOSArKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZ3R0LmMgfCAxOTkgKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCB8ICA3MyArKysrKysrKysrKysrCiAzIGZp bGVzIGNoYW5nZWQsIDIxOSBpbnNlcnRpb25zKCspLCA2MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW0uYwppbmRleCBlMTU0NzcwLi4wN2Q0MjdhIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtLmMKQEAgLTM2MDAsNiArMzYwMCwxNSBAQCBzZWFyY2hfZnJlZToKIAlpZiAocmV0KQogCQln b3RvIGVycl9yZW1vdmVfbm9kZTsKIAorCS8qICBhbGxvY2F0ZSBiZWZvcmUgaW5zZXJ0IC8gYmlu ZCAqLworCWlmICh2bWEtPnZtLT5hbGxvY2F0ZV92YV9yYW5nZSkgeworCQlyZXQgPSB2bWEtPnZt LT5hbGxvY2F0ZV92YV9yYW5nZSh2bWEtPnZtLAorCQkJCQkJdm1hLT5ub2RlLnN0YXJ0LAorCQkJ CQkJdm1hLT5ub2RlLnNpemUpOworCQlpZiAocmV0KQorCQkJZ290byBlcnJfcmVtb3ZlX25vZGU7 CisJfQorCiAJdHJhY2VfaTkxNV92bWFfYmluZCh2bWEsIGZsYWdzKTsKIAlyZXQgPSBpOTE1X3Zt YV9iaW5kKHZtYSwgb2JqLT5jYWNoZV9sZXZlbCwKIAkJCSAgICBmbGFncyAmIFBJTl9HTE9CQUwg PyBHTE9CQUxfQklORCA6IDApOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCA2 ZDg1YmZmLi5jNTBiNGFiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAtMjc4 LDI5ICsyNzgsODggQEAgc3RhdGljIGdlbjZfcHRlX3QgaXJpc19wdGVfZW5jb2RlKGRtYV9hZGRy X3QgYWRkciwKIAlyZXR1cm4gcHRlOwogfQogCi1zdGF0aWMgdm9pZCB1bm1hcF9hbmRfZnJlZV9w dChzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlX2VudHJ5ICpwdCwgc3RydWN0IGRybV9kZXZpY2UgKmRl dikKKyNkZWZpbmUgaTkxNV9kbWFfdW5tYXBfc2luZ2xlKHB4LCBkZXYpIFwKKwlfX2k5MTVfZG1h X3VubWFwX3NpbmdsZSgocHgpLT5kYWRkciwgZGV2KQorCitzdGF0aWMgaW5saW5lIHZvaWQgX19p OTE1X2RtYV91bm1hcF9zaW5nbGUoZG1hX2FkZHJfdCBkYWRkciwKKwkJCQkJc3RydWN0IGRybV9k ZXZpY2UgKmRldikKK3sKKwlzdHJ1Y3QgZGV2aWNlICpkZXZpY2UgPSAmZGV2LT5wZGV2LT5kZXY7 CisKKwlkbWFfdW5tYXBfcGFnZShkZXZpY2UsIGRhZGRyLCA0MDk2LCBQQ0lfRE1BX0JJRElSRUNU SU9OQUwpOworfQorCisvKioKKyAqIGk5MTVfZG1hX21hcF9zaW5nbGUoKSAtIENyZWF0ZSBhIGRt YSBtYXBwaW5nIGZvciBhIHBhZ2UgdGFibGUvZGlyL2V0Yy4KKyAqIEBweDoJUGFnZSB0YWJsZS9k aXIvZXRjIHRvIGdldCBhIERNQSBtYXAgZm9yCisgKiBAZGV2Oglkcm0gZGV2aWNlCisgKgorICog UGFnZSB0YWJsZSBhbGxvY2F0aW9ucyBhcmUgdW5pZmllZCBhY3Jvc3MgYWxsIGdlbnMuIFRoZXkg YWx3YXlzIHJlcXVpcmUgYQorICogc2luZ2xlIDRrIGFsbG9jYXRpb24sIGFzIHdlbGwgYXMgYSBE TUEgbWFwcGluZy4gSWYgd2Uga2VlcCB0aGUgc3RydWN0cworICogc3ltbWV0cmljIGhlcmUsIHRo ZSBzaW1wbGUgbWFjcm8gY292ZXJzIHVzIGZvciBldmVyeSBwYWdlIHRhYmxlIHR5cGUuCisgKgor ICogUmV0dXJuOiAwIGlmIHN1Y2Nlc3MuCisgKi8KKyNkZWZpbmUgaTkxNV9kbWFfbWFwX3Npbmds ZShweCwgZGV2KSBcCisJaTkxNV9kbWFfbWFwX3BhZ2Vfc2luZ2xlKChweCktPnBhZ2UsIChkZXYp LCAmKHB4KS0+ZGFkZHIpCisKK3N0YXRpYyBpbmxpbmUgaW50IGk5MTVfZG1hX21hcF9wYWdlX3Np bmdsZShzdHJ1Y3QgcGFnZSAqcGFnZSwKKwkJCQkJICAgc3RydWN0IGRybV9kZXZpY2UgKmRldiwK KwkJCQkJICAgZG1hX2FkZHJfdCAqZGFkZHIpCit7CisJc3RydWN0IGRldmljZSAqZGV2aWNlID0g JmRldi0+cGRldi0+ZGV2OworCisJKmRhZGRyID0gZG1hX21hcF9wYWdlKGRldmljZSwgcGFnZSwg MCwgNDA5NiwgUENJX0RNQV9CSURJUkVDVElPTkFMKTsKKwlyZXR1cm4gZG1hX21hcHBpbmdfZXJy b3IoZGV2aWNlLCAqZGFkZHIpOworfQorCitzdGF0aWMgdm9pZCB1bm1hcF9hbmRfZnJlZV9wdChz dHJ1Y3QgaTkxNV9wYWdlX3RhYmxlX2VudHJ5ICpwdCwKKwkJCSAgICAgICBzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQogewogCWlmIChXQVJOX09OKCFwdC0+cGFnZSkpCiAJCXJldHVybjsKKworCWk5 MTVfZG1hX3VubWFwX3NpbmdsZShwdCwgZGV2KTsKIAlfX2ZyZWVfcGFnZShwdC0+cGFnZSk7CisJ a2ZyZWUocHQtPnVzZWRfcHRlcyk7CiAJa2ZyZWUocHQpOwogfQogCiBzdGF0aWMgc3RydWN0IGk5 MTVfcGFnZV90YWJsZV9lbnRyeSAqYWxsb2NfcHRfc2luZ2xlKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiB7CiAJc3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRyeSAqcHQ7CisJY29uc3Qgc2l6ZV90 IGNvdW50ID0gSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOCA/CisJCUdFTjhfUFRFUyA6IEdFTjZf UFRFUzsKKwlpbnQgcmV0ID0gLUVOT01FTTsKIAogCXB0ID0ga3phbGxvYyhzaXplb2YoKnB0KSwg R0ZQX0tFUk5FTCk7CiAJaWYgKCFwdCkKIAkJcmV0dXJuIEVSUl9QVFIoLUVOT01FTSk7CiAKKwlw dC0+dXNlZF9wdGVzID0ga2NhbGxvYyhCSVRTX1RPX0xPTkdTKGNvdW50KSwgc2l6ZW9mKCpwdC0+ dXNlZF9wdGVzKSwKKwkJCQlHRlBfS0VSTkVMKTsKKworCWlmICghcHQtPnVzZWRfcHRlcykKKwkJ Z290byBmYWlsX2JpdG1hcDsKKwogCXB0LT5wYWdlID0gYWxsb2NfcGFnZShHRlBfS0VSTkVMIHwg X19HRlBfWkVSTyk7Ci0JaWYgKCFwdC0+cGFnZSkgewotCQlrZnJlZShwdCk7Ci0JCXJldHVybiBF UlJfUFRSKC1FTk9NRU0pOwotCX0KKwlpZiAoIXB0LT5wYWdlKQorCQlnb3RvIGZhaWxfcGFnZTsK KworCXJldCA9IGk5MTVfZG1hX21hcF9zaW5nbGUocHQsIGRldik7CisJaWYgKHJldCkKKwkJZ290 byBmYWlsX2RtYTsKIAogCXJldHVybiBwdDsKKworZmFpbF9kbWE6CisJX19mcmVlX3BhZ2UocHQt PnBhZ2UpOworZmFpbF9wYWdlOgorCWtmcmVlKHB0LT51c2VkX3B0ZXMpOworZmFpbF9iaXRtYXA6 CisJa2ZyZWUocHQpOworCisJcmV0dXJuIEVSUl9QVFIocmV0KTsKIH0KIAogLyoqCkBAIC04NDcs MjYgKzkwNiwzNiBAQCBzdGF0aWMgdm9pZCBnZW42X2R1bXBfcHBndHQoc3RydWN0IGk5MTVfaHdf cHBndHQgKnBwZ3R0LCBzdHJ1Y3Qgc2VxX2ZpbGUgKm0pCiAJfQogfQogCi1zdGF0aWMgdm9pZCBn ZW42X3dyaXRlX3BkZXMoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQorLyogV3JpdGUgcGRl IChpbmRleCkgZnJvbSB0aGUgcGFnZSBkaXJlY3RvcnkgQHBkIHRvIHRoZSBwYWdlIHRhYmxlIEBw dCAqLworc3RhdGljIHZvaWQgZ2VuNl93cml0ZV9wZGUoc3RydWN0IGk5MTVfcGFnZV9kaXJlY3Rv cnlfZW50cnkgKnBkLAorCQkJICAgIGNvbnN0IGludCBwZGUsIHN0cnVjdCBpOTE1X3BhZ2VfdGFi bGVfZW50cnkgKnB0KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHBw Z3R0LT5iYXNlLmRldi0+ZGV2X3ByaXZhdGU7Ci0JZ2VuNl9wdGVfdCBfX2lvbWVtICpwZF9hZGRy OwotCXVpbnQzMl90IHBkX2VudHJ5OwotCWludCBpOworCS8qIENhbGxlciBuZWVkcyB0byBtYWtl IHN1cmUgdGhlIHdyaXRlIGNvbXBsZXRlcyBpZiBuZWNlc3NhcnkgKi8KKwlzdHJ1Y3QgaTkxNV9o d19wcGd0dCAqcHBndHQgPQorCQljb250YWluZXJfb2YocGQsIHN0cnVjdCBpOTE1X2h3X3BwZ3R0 LCBwZCk7CisJdTMyIHBkX2VudHJ5OwogCi0JV0FSTl9PTihwcGd0dC0+cGQucGRfb2Zmc2V0ICYg MHgzZik7Ci0JcGRfYWRkciA9IChnZW42X3B0ZV90IF9faW9tZW0qKWRldl9wcml2LT5ndHQuZ3Nt ICsKLQkJcHBndHQtPnBkLnBkX29mZnNldCAvIHNpemVvZihnZW42X3B0ZV90KTsKLQlmb3IgKGkg PSAwOyBpIDwgcHBndHQtPm51bV9wZF9lbnRyaWVzOyBpKyspIHsKLQkJZG1hX2FkZHJfdCBwdF9h ZGRyOworCXBkX2VudHJ5ID0gR0VONl9QREVfQUREUl9FTkNPREUocHQtPmRhZGRyKTsKKwlwZF9l bnRyeSB8PSBHRU42X1BERV9WQUxJRDsKIAotCQlwdF9hZGRyID0gcHBndHQtPnBkLnBhZ2VfdGFi bGVbaV0tPmRhZGRyOwotCQlwZF9lbnRyeSA9IEdFTjZfUERFX0FERFJfRU5DT0RFKHB0X2FkZHIp OwotCQlwZF9lbnRyeSB8PSBHRU42X1BERV9WQUxJRDsKKwl3cml0ZWwocGRfZW50cnksIHBwZ3R0 LT5wZF9hZGRyICsgcGRlKTsKK30KIAotCQl3cml0ZWwocGRfZW50cnksIHBkX2FkZHIgKyBpKTsK LQl9Ci0JcmVhZGwocGRfYWRkcik7CisvKiBXcml0ZSBhbGwgdGhlIHBhZ2UgdGFibGVzIGZvdW5k IGluIHRoZSBwcGd0dCBzdHJ1Y3R1cmUgdG8gaW5jcmVtZW50aW5nIHBhZ2UKKyAqIGRpcmVjdG9y aWVzLiAqLworc3RhdGljIHZvaWQgZ2VuNl93cml0ZV9wYWdlX3JhbmdlKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKKwkJCQkgIHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X2Vu dHJ5ICpwZCwKKwkJCQkgIHVpbnQzMl90IHN0YXJ0LCB1aW50MzJfdCBsZW5ndGgpCit7CisJc3Ry dWN0IGk5MTVfcGFnZV90YWJsZV9lbnRyeSAqcHQ7CisJdWludDMyX3QgcGRlLCB0ZW1wOworCisJ Z2VuNl9mb3JfZWFjaF9wZGUocHQsIHBkLCBzdGFydCwgbGVuZ3RoLCB0ZW1wLCBwZGUpCisJCWdl bjZfd3JpdGVfcGRlKHBkLCBwZGUsIHB0KTsKKworCS8qIE1ha2Ugc3VyZSB3cml0ZSBpcyBjb21w bGV0ZSBiZWZvcmUgb3RoZXIgY29kZSBjYW4gdXNlIHRoaXMgcGFnZQorCSAqIHRhYmxlLiBBbHNv IHJlcXVpcmUgZm9yIFdDIG1hcHBlZCBQVEVzICovCisJcmVhZGwoZGV2X3ByaXYtPmd0dC5nc20p OwogfQogCiBzdGF0aWMgdWludDMyX3QgZ2V0X3BkX29mZnNldChzdHJ1Y3QgaTkxNV9od19wcGd0 dCAqcHBndHQpCkBAIC0xMDkyLDYgKzExNjEsMjggQEAgc3RhdGljIHZvaWQgZ2VuNl9wcGd0dF91 bm1hcF9wYWdlcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiAJCQkgICAgICAgNDA5Niwg UENJX0RNQV9CSURJUkVDVElPTkFMKTsKIH0KIAorc3RhdGljIGludCBnZW42X2FsbG9jX3ZhX3Jh bmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAorCQkJICAgICAgIHVpbnQ2NF90IHN0 YXJ0LCB1aW50NjRfdCBsZW5ndGgpCit7CisJc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0K KwkJCQljb250YWluZXJfb2Yodm0sIHN0cnVjdCBpOTE1X2h3X3BwZ3R0LCBiYXNlKTsKKwlzdHJ1 Y3QgaTkxNV9wYWdlX3RhYmxlX2VudHJ5ICpwdDsKKwl1aW50MzJfdCBwZGUsIHRlbXA7CisKKwln ZW42X2Zvcl9lYWNoX3BkZShwdCwgJnBwZ3R0LT5wZCwgc3RhcnQsIGxlbmd0aCwgdGVtcCwgcGRl KSB7CisJCURFQ0xBUkVfQklUTUFQKHRtcF9iaXRtYXAsIEdFTjZfUFRFUyk7CisKKwkJYml0bWFw X3plcm8odG1wX2JpdG1hcCwgR0VONl9QVEVTKTsKKwkJYml0bWFwX3NldCh0bXBfYml0bWFwLCBn ZW42X3B0ZV9pbmRleChzdGFydCksCisJCQkgICBnZW42X3B0ZV9jb3VudChzdGFydCwgbGVuZ3Ro KSk7CisKKwkJYml0bWFwX29yKHB0LT51c2VkX3B0ZXMsIHB0LT51c2VkX3B0ZXMsIHRtcF9iaXRt YXAsCisJCQkJR0VONl9QVEVTKTsKKwl9CisKKwlyZXR1cm4gMDsKK30KKwogc3RhdGljIHZvaWQg Z2VuNl9wcGd0dF9mcmVlKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIHsKIAlpbnQgaTsK QEAgLTExMzgsMjAgKzEyMjksMjQgQEAgYWxsb2M6CiAJCQkJCSAgICAgICAwLCBkZXZfcHJpdi0+ Z3R0LmJhc2UudG90YWwsCiAJCQkJCSAgICAgICAwKTsKIAkJaWYgKHJldCkKLQkJCXJldHVybiBy ZXQ7CisJCQlnb3RvIGVycl9vdXQ7CiAKIAkJcmV0cmllZCA9IHRydWU7CiAJCWdvdG8gYWxsb2M7 CiAJfQogCiAJaWYgKHJldCkKLQkJcmV0dXJuIHJldDsKKwkJZ290byBlcnJfb3V0OworCiAKIAlp ZiAocHBndHQtPm5vZGUuc3RhcnQgPCBkZXZfcHJpdi0+Z3R0Lm1hcHBhYmxlX2VuZCkKIAkJRFJN X0RFQlVHKCJGb3JjZWQgdG8gdXNlIGFwZXJ0dXJlIGZvciBQREVzXG4iKTsKIAogCXBwZ3R0LT5u dW1fcGRfZW50cmllcyA9IEk5MTVfUERFUzsKIAlyZXR1cm4gMDsKKworZXJyX291dDoKKwlyZXR1 cm4gcmV0OwogfQogCiBzdGF0aWMgaW50IGdlbjZfcHBndHRfYWxsb2Moc3RydWN0IGk5MTVfaHdf cHBndHQgKnBwZ3R0KQpAQCAtMTE3MywzMCArMTI2OCw2IEBAIHN0YXRpYyBpbnQgZ2VuNl9wcGd0 dF9hbGxvYyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiAJcmV0dXJuIDA7CiB9CiAKLXN0 YXRpYyBpbnQgZ2VuNl9wcGd0dF9zZXR1cF9wYWdlX3RhYmxlcyhzdHJ1Y3QgaTkxNV9od19wcGd0 dCAqcHBndHQpCi17Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBwZ3R0LT5iYXNlLmRldjsK LQlpbnQgaTsKLQotCWZvciAoaSA9IDA7IGkgPCBwcGd0dC0+bnVtX3BkX2VudHJpZXM7IGkrKykg ewotCQlzdHJ1Y3QgcGFnZSAqcGFnZTsKLQkJZG1hX2FkZHJfdCBwdF9hZGRyOwotCi0JCXBhZ2Ug PSBwcGd0dC0+cGQucGFnZV90YWJsZVtpXS0+cGFnZTsKLQkJcHRfYWRkciA9IHBjaV9tYXBfcGFn ZShkZXYtPnBkZXYsIHBhZ2UsIDAsIDQwOTYsCi0JCQkJICAgICAgIFBDSV9ETUFfQklESVJFQ1RJ T05BTCk7Ci0KLQkJaWYgKHBjaV9kbWFfbWFwcGluZ19lcnJvcihkZXYtPnBkZXYsIHB0X2FkZHIp KSB7Ci0JCQlnZW42X3BwZ3R0X3VubWFwX3BhZ2VzKHBwZ3R0KTsKLQkJCXJldHVybiAtRUlPOwot CQl9Ci0KLQkJcHBndHQtPnBkLnBhZ2VfdGFibGVbaV0tPmRhZGRyID0gcHRfYWRkcjsKLQl9Ci0K LQlyZXR1cm4gMDsKLX0KLQogc3RhdGljIGludCBnZW42X3BwZ3R0X2luaXQoc3RydWN0IGk5MTVf aHdfcHBndHQgKnBwZ3R0KQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwcGd0dC0+YmFz ZS5kZXY7CkBAIC0xMjIwLDEyICsxMjkxLDcgQEAgc3RhdGljIGludCBnZW42X3BwZ3R0X2luaXQo c3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAK LQlyZXQgPSBnZW42X3BwZ3R0X3NldHVwX3BhZ2VfdGFibGVzKHBwZ3R0KTsKLQlpZiAocmV0KSB7 Ci0JCWdlbjZfcHBndHRfZnJlZShwcGd0dCk7Ci0JCXJldHVybiByZXQ7Ci0JfQotCisJcHBndHQt PmJhc2UuYWxsb2NhdGVfdmFfcmFuZ2UgPSBnZW42X2FsbG9jX3ZhX3JhbmdlOwogCXBwZ3R0LT5i YXNlLmNsZWFyX3JhbmdlID0gZ2VuNl9wcGd0dF9jbGVhcl9yYW5nZTsKIAlwcGd0dC0+YmFzZS5p bnNlcnRfZW50cmllcyA9IGdlbjZfcHBndHRfaW5zZXJ0X2VudHJpZXM7CiAJcHBndHQtPmJhc2Uu Y2xlYW51cCA9IGdlbjZfcHBndHRfY2xlYW51cDsKQEAgLTEyMzYsMTMgKzEzMDIsMTcgQEAgc3Rh dGljIGludCBnZW42X3BwZ3R0X2luaXQoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogCXBw Z3R0LT5wZC5wZF9vZmZzZXQgPQogCQlwcGd0dC0+bm9kZS5zdGFydCAvIFBBR0VfU0laRSAqIHNp emVvZihnZW42X3B0ZV90KTsKIAorCXBwZ3R0LT5wZF9hZGRyID0gKGdlbjZfcHRlX3QgX19pb21l bSAqKWRldl9wcml2LT5ndHQuZ3NtICsKKwkJcHBndHQtPnBkLnBkX29mZnNldCAvIHNpemVvZihn ZW42X3B0ZV90KTsKKwogCXBwZ3R0LT5iYXNlLmNsZWFyX3JhbmdlKCZwcGd0dC0+YmFzZSwgMCwg cHBndHQtPmJhc2UudG90YWwsIHRydWUpOwogCisJZ2VuNl93cml0ZV9wYWdlX3JhbmdlKGRldl9w cml2LCAmcHBndHQtPnBkLCAwLCBwcGd0dC0+YmFzZS50b3RhbCk7CisKIAlEUk1fREVCVUdfRFJJ VkVSKCJBbGxvY2F0ZWQgcGRlIHNwYWNlICglbGxkTSkgYXQgR1RUIGVudHJ5OiAlbGx4XG4iLAog CQkJIHBwZ3R0LT5ub2RlLnNpemUgPj4gMjAsCiAJCQkgcHBndHQtPm5vZGUuc3RhcnQgLyBQQUdF X1NJWkUpOwogCi0JZ2VuNl93cml0ZV9wZGVzKHBwZ3R0KTsKIAlEUk1fREVCVUcoIkFkZGluZyBQ UEdUVCBhdCBvZmZzZXQgJXhcbiIsCiAJCSAgcHBndHQtPnBkLnBkX29mZnNldCA8PCAxMCk7CiAK QEAgLTE1MTMsMTUgKzE1ODMsMjAgQEAgdm9pZCBpOTE1X2dlbV9yZXN0b3JlX2d0dF9tYXBwaW5n cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlyZXR1cm47CiAJfQogCi0JbGlzdF9mb3JfZWFj aF9lbnRyeSh2bSwgJmRldl9wcml2LT52bV9saXN0LCBnbG9iYWxfbGluaykgewotCQkvKiBUT0RP OiBQZXJoYXBzIGl0IHNob3VsZG4ndCBiZSBnZW42IHNwZWNpZmljICovCi0JCWlmIChpOTE1X2lz X2dndHQodm0pKSB7Ci0JCQlpZiAoZGV2X3ByaXYtPm1tLmFsaWFzaW5nX3BwZ3R0KQotCQkJCWdl bjZfd3JpdGVfcGRlcyhkZXZfcHJpdi0+bW0uYWxpYXNpbmdfcHBndHQpOwotCQkJY29udGludWU7 Ci0JCX0KKwlpZiAoVVNFU19QUEdUVChkZXYpKSB7CisJCWxpc3RfZm9yX2VhY2hfZW50cnkodm0s ICZkZXZfcHJpdi0+dm1fbGlzdCwgZ2xvYmFsX2xpbmspIHsKKwkJCS8qIFRPRE86IFBlcmhhcHMg aXQgc2hvdWxkbid0IGJlIGdlbjYgc3BlY2lmaWMgKi8KKworCQkJc3RydWN0IGk5MTVfaHdfcHBn dHQgKnBwZ3R0ID0KKwkJCQkJY29udGFpbmVyX29mKHZtLCBzdHJ1Y3QgaTkxNV9od19wcGd0dCwK KwkJCQkJCSAgICAgYmFzZSk7CiAKLQkJZ2VuNl93cml0ZV9wZGVzKGNvbnRhaW5lcl9vZih2bSwg c3RydWN0IGk5MTVfaHdfcHBndHQsIGJhc2UpKTsKKwkJCWlmIChpOTE1X2lzX2dndHQodm0pKQor CQkJCXBwZ3R0ID0gZGV2X3ByaXYtPm1tLmFsaWFzaW5nX3BwZ3R0OworCisJCQlnZW42X3dyaXRl X3BhZ2VfcmFuZ2UoZGV2X3ByaXYsICZwcGd0dC0+cGQsCisJCQkJCSAgICAgIDAsIHBwZ3R0LT5i YXNlLnRvdGFsKTsKKwkJfQogCX0KIAogCWk5MTVfZ2d0dF9mbHVzaChkZXZfcHJpdik7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCmluZGV4IDVjYTdjNWUuLmMzMGFmNjIgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCkBAIC01NSwxMCArNTUsMTIgQEAgdHlwZWRlZiB1aW50 NjRfdCBnZW44X3BkZV90OwogI2RlZmluZSBJOTE1X1BURV9NQVNLKHB0ZV9sZW4pCQkoSTkxNV9Q VEVTKHB0ZV9sZW4pIC0gMSkKICNkZWZpbmUgSTkxNV9QREVTCQkJNTEyCiAjZGVmaW5lIEk5MTVf UERFX01BU0sJCQkoSTkxNV9QREVTIC0gMSkKKyNkZWZpbmUgTlVNX1BURShwZGVfc2hpZnQpICAg ICAoMSA8PCAocGRlX3NoaWZ0IC0gUEFHRV9TSElGVCkpCiAKICNkZWZpbmUgR0VONl9QVEVTCQkJ STkxNV9QVEVTKHNpemVvZihnZW42X3B0ZV90KSkKICNkZWZpbmUgR0VONl9QRF9TSVpFCQkgICAg ICAgIChJOTE1X1BERVMgKiBQQUdFX1NJWkUpCiAjZGVmaW5lIEdFTjZfUERfQUxJR04JCQkoUEFH RV9TSVpFICogMTYpCisjZGVmaW5lIEdFTjZfUERFX1NISUZUCQkJMjIKICNkZWZpbmUgR0VONl9Q REVfVkFMSUQJCQkoMSA8PCAwKQogCiAjZGVmaW5lIEdFTjdfUFRFX0NBQ0hFX0wzX0xMQwkJKDMg PDwgMSkKQEAgLTE5NCw2ICsxOTYsOCBAQCBzdHJ1Y3QgaTkxNV92bWEgewogc3RydWN0IGk5MTVf cGFnZV90YWJsZV9lbnRyeSB7CiAJc3RydWN0IHBhZ2UgKnBhZ2U7CiAJZG1hX2FkZHJfdCBkYWRk cjsKKworCXVuc2lnbmVkIGxvbmcgKnVzZWRfcHRlczsKIH07CiAKIHN0cnVjdCBpOTE1X3BhZ2Vf ZGlyZWN0b3J5X2VudHJ5IHsKQEAgLTI1MCw2ICsyNTQsOSBAQCBzdHJ1Y3QgaTkxNV9hZGRyZXNz X3NwYWNlIHsKIAlnZW42X3B0ZV90ICgqcHRlX2VuY29kZSkoZG1hX2FkZHJfdCBhZGRyLAogCQkJ CSBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwgbGV2ZWwsCiAJCQkJIGJvb2wgdmFsaWQsIHUzMiBmbGFn cyk7IC8qIENyZWF0ZSBhIHZhbGlkIFBURSAqLworCWludCAoKmFsbG9jYXRlX3ZhX3JhbmdlKShz dHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKKwkJCQkgdWludDY0X3Qgc3RhcnQsCisJCQkJ IHVpbnQ2NF90IGxlbmd0aCk7CiAJdm9pZCAoKmNsZWFyX3JhbmdlKShzdHJ1Y3QgaTkxNV9hZGRy ZXNzX3NwYWNlICp2bSwKIAkJCSAgICB1aW50NjRfdCBzdGFydCwKIAkJCSAgICB1aW50NjRfdCBs ZW5ndGgsCkBAIC0zMDIsMTIgKzMwOSw3OCBAQCBzdHJ1Y3QgaTkxNV9od19wcGd0dCB7CiAKIAlz dHJ1Y3QgZHJtX2k5MTVfZmlsZV9wcml2YXRlICpmaWxlX3ByaXY7CiAKKwlnZW42X3B0ZV90IF9f aW9tZW0gKnBkX2FkZHI7CisKIAlpbnQgKCplbmFibGUpKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpw cGd0dCk7CiAJaW50ICgqc3dpdGNoX21tKShzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCiAJ CQkgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CiAJdm9pZCAoKmRlYnVnX2R1bXApKHN0 cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwgc3RydWN0IHNlcV9maWxlICptKTsKIH07CiAKKy8q IEZvciBlYWNoIHBkZSBpdGVyYXRlcyBvdmVyIGV2ZXJ5IHBkZSBiZXR3ZWVuIGZyb20gc3RhcnQg dW50aWwgc3RhcnQgKyBsZW5ndGguCisgKiBJZiBzdGFydCwgYW5kIHN0YXJ0K2xlbmd0aCBhcmUg bm90IHBlcmZlY3RseSBkaXZpc2libGUsIHRoZSBtYWNybyB3aWxsIHJvdW5kCisgKiBkb3duLCBh bmQgdXAgYXMgbmVlZGVkLiBUaGUgbWFjcm8gbW9kaWZpZXMgcGRlLCBzdGFydCwgYW5kIGxlbmd0 aC4gRGV2IGlzCisgKiBvbmx5IHVzZWQgdG8gZGlmZmVyZW50aWF0ZSBzaGlmdCB2YWx1ZXMuIFRl bXAgaXMgdGVtcC4gIE9uIGdlbjYvNywgc3RhcnQgPSAwLAorICogYW5kIGxlbmd0aCA9IDJHIGVm ZmVjdGl2ZWx5IGl0ZXJhdGVzIG92ZXIgZXZlcnkgUERFIGluIHRoZSBzeXN0ZW0uCisgKgorICog WFhYOiB0ZW1wIGlzIG5vdCBhY3R1YWxseSBuZWVkZWQsIGJ1dCBpdCBzYXZlcyBkb2luZyB0aGUg QUxJR04gb3BlcmF0aW9uLgorICovCisjZGVmaW5lIGdlbjZfZm9yX2VhY2hfcGRlKHB0LCBwZCwg c3RhcnQsIGxlbmd0aCwgdGVtcCwgaXRlcikgXAorCWZvciAoaXRlciA9IGdlbjZfcGRlX2luZGV4 KHN0YXJ0KSwgcHQgPSAocGQpLT5wYWdlX3RhYmxlW2l0ZXJdOyBcCisJICAgICBsZW5ndGggPiAw ICYmIGl0ZXIgPCBJOTE1X1BERVM7IFwKKwkgICAgIHB0ID0gKHBkKS0+cGFnZV90YWJsZVsrK2l0 ZXJdLCBcCisJICAgICB0ZW1wID0gQUxJR04oc3RhcnQrMSwgMSA8PCBHRU42X1BERV9TSElGVCkg LSBzdGFydCwgXAorCSAgICAgdGVtcCA9IG1pbl90KHVuc2lnbmVkLCB0ZW1wLCBsZW5ndGgpLCBc CisJICAgICBzdGFydCArPSB0ZW1wLCBsZW5ndGggLT0gdGVtcCkKKworc3RhdGljIGlubGluZSB1 aW50MzJfdCBpOTE1X3B0ZV9pbmRleCh1aW50NjRfdCBhZGRyZXNzLCB1aW50MzJfdCBwZGVfc2hp ZnQpCit7CisJY29uc3QgdWludDMyX3QgbWFzayA9IE5VTV9QVEUocGRlX3NoaWZ0KSAtIDE7CisK KwlyZXR1cm4gKGFkZHJlc3MgPj4gUEFHRV9TSElGVCkgJiBtYXNrOworfQorCisvKiBIZWxwZXIg dG8gY291bnRzIHRoZSBudW1iZXIgb2YgUFRFcyB3aXRoaW4gdGhlIGdpdmVuIGxlbmd0aC4gVGhp cyBjb3VudAorICogZG9lcyBub3QgY3Jvc3MgYSBwYWdlIHRhYmxlIGJvdW5kYXJ5LCBzbyB0aGUg bWF4IHZhbHVlIHdvdWxkIGJlCisgKiBHRU42X1BURVMgZm9yIEdFTjYsIGFuZCBHRU44X1BURVMg Zm9yIEdFTjguCisqLworc3RhdGljIGlubGluZSB1aW50MzJfdCBpOTE1X3B0ZV9jb3VudCh1aW50 NjRfdCBhZGRyLCBzaXplX3QgbGVuZ3RoLAorCQkJCQl1aW50MzJfdCBwZGVfc2hpZnQpCit7CisJ Y29uc3QgdWludDY0X3QgbWFzayA9IH4oKDEgPDwgcGRlX3NoaWZ0KSAtIDEpOworCXVpbnQ2NF90 IGVuZDsKKworCUJVR19PTihsZW5ndGggPT0gMCk7CisJQlVHX09OKG9mZnNldF9pbl9wYWdlKGFk ZHJ8bGVuZ3RoKSk7CisKKwllbmQgPSBhZGRyICsgbGVuZ3RoOworCisJaWYgKChhZGRyICYgbWFz aykgIT0gKGVuZCAmIG1hc2spKQorCQlyZXR1cm4gTlVNX1BURShwZGVfc2hpZnQpIC0gaTkxNV9w dGVfaW5kZXgoYWRkciwgcGRlX3NoaWZ0KTsKKworCXJldHVybiBpOTE1X3B0ZV9pbmRleChlbmQs IHBkZV9zaGlmdCkgLSBpOTE1X3B0ZV9pbmRleChhZGRyLCBwZGVfc2hpZnQpOworfQorCitzdGF0 aWMgaW5saW5lIHVpbnQzMl90IGk5MTVfcGRlX2luZGV4KHVpbnQ2NF90IGFkZHIsIHVpbnQzMl90 IHNoaWZ0KQoreworCXJldHVybiAoYWRkciA+PiBzaGlmdCkgJiBJOTE1X1BERV9NQVNLOworfQor CitzdGF0aWMgaW5saW5lIHVpbnQzMl90IGdlbjZfcHRlX2luZGV4KHVpbnQzMl90IGFkZHIpCit7 CisJcmV0dXJuIGk5MTVfcHRlX2luZGV4KGFkZHIsIEdFTjZfUERFX1NISUZUKTsKK30KKworc3Rh dGljIGlubGluZSBzaXplX3QgZ2VuNl9wdGVfY291bnQodWludDMyX3QgYWRkciwgdWludDMyX3Qg bGVuZ3RoKQoreworCXJldHVybiBpOTE1X3B0ZV9jb3VudChhZGRyLCBsZW5ndGgsIEdFTjZfUERF X1NISUZUKTsKK30KKworc3RhdGljIGlubGluZSB1aW50MzJfdCBnZW42X3BkZV9pbmRleCh1aW50 MzJfdCBhZGRyKQoreworCXJldHVybiBpOTE1X3BkZV9pbmRleChhZGRyLCBHRU42X1BERV9TSElG VCk7Cit9CisKIGludCBpOTE1X2dlbV9ndHRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsK IHZvaWQgaTkxNV9nZW1faW5pdF9nbG9iYWxfZ3R0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwog dm9pZCBpOTE1X2dsb2JhbF9ndHRfY2xlYW51cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKLS0g CjIuMS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=