From: Michel Thierry Subject: [PATCH v4 09/24] drm/i915: Track GEN6 page table usage Date: Thu, 22 Jan 2015 17:01:31 +0000 Message-ID: <1421946106-7921-10-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 1FD93720A2 for ; Thu, 22 Jan 2015 09:01:36 -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+CgpJbnN0ZWFk IG9mIGltcGxlbWVudGluZyB0aGUgZnVsbCB0cmFja2luZyArIGR5bmFtaWMgYWxsb2NhdGlvbiwg dGhpcwpwYXRjaCBkb2VzIGEgYml0IGxlc3MgdGhhbiBoYWxmIG9mIHRoZSB3b3JrLCBieSB0cmFj a2luZyBhbmQgd2FybmluZyBvbgp1bmV4cGVjdGVkIGNvbmRpdGlvbnMuIFRoZSB0cmFja2luZyBp dHNlbGYgZm9sbG93cyB3aGljaCBQVEVzIHdpdGhpbiBhCnBhZ2UgdGFibGUgYXJlIGN1cnJlbnRs eSBiZWluZyB1c2VkIGZvciBvYmplY3RzLiBUaGUgbmV4dCBwYXRjaCB3aWxsCm1vZGlmeSB0aGlz IHRvIGFjdHVhbGx5IGFsbG9jYXRlIHRoZSBwYWdlIHRhYmxlcyBvbmx5IHdoZW4gbmVjZXNzYXJ5 LgoKV2l0aCB0aGUgY3VycmVudCBwYXRjaCB0aGVyZSBpc24ndCBtdWNoIGluIHRoZSB3YXkgb2Yg bWFraW5nIGEgZ2VuCmFnbm9zdGljIHJhbmdlIGFsbG9jYXRpb24gZnVuY3Rpb24uIEhvd2V2ZXIs IGluIHRoZSBuZXh0IHBhdGNoIHdlJ2xsIGFkZAptb3JlIHNwZWNpZmljaXR5IHdoaWNoIG1ha2Vz IGhhdmluZyBzZXBhcmF0ZSBmdW5jdGlvbnMgYSBiaXQgZWFzaWVyIHRvCm1hbmFnZS4KCk9uZSBp bXBvcnRhbnQgY2hhbmdlIGludHJvZHVjZWQgaGVyZSBpcyB0aGF0IERNQSBtYXBwaW5ncyBhcmUK Y3JlYXRlZC9kZXN0cm95ZWQgYXQgdGhlIHNhbWUgcGFnZSBkaXJlY3Rvcmllcy90YWJsZXMgYXJl CmFsbG9jYXRlZC9kZWFsbG9jYXRlZC4KCk5vdGljZSB0aGF0IGFsaWFzaW5nIFBQR1RUIGlzIG5v dCBtYW5hZ2VkIGhlcmUuIFRoZSBwYXRjaCB3aGljaCBhY3R1YWxseQpiZWdpbnMgZHluYW1pYyBh bGxvY2F0aW9uL3RlYXJkb3duIGV4cGxhaW5zIHRoZSByZWFzb25pbmcgZm9yIHRoaXMuCgp2Mjog cy9wZHAucGFnZV9kaXJlY3RvcnkvcGRwLnBhZ2VfZGlyZWN0b3J5cwpNYWtlIGEgc2NyYXRjaCBw YWdlIGFsbG9jYXRpb24gaGVscGVyCgp2MzogUmViYXNlIGFuZCBleHBhbmQgY29tbWl0IG1lc3Nh Z2UuCgp2NDogQWxsb2NhdGUgcmVxdWlyZWQgcGFnZXRhYmxlcyBvbmx5IHdoZW4gaXQgaXMgbmVl ZGVkLCBfYmluZF90b192bQppbnN0ZWFkIG9mIGJpbmRfdm1hIChEYW5pZWwpLgoKdjU6IFJlYmFz ZWQgdG8gcmVtb3ZlIHRoZSB1bm5lY2Vzc2FyeSBub2lzZSBpbiB0aGUgZGlmZiwgYWxzbzoKIC0g UERFIG1hc2sgaXMgR0VOIGFnbm9zdGljLCByZW5hbWVkIEdFTjZfUERFX01BU0sgdG8gSTkxNV9Q REVfTUFTSy4KIC0gUmVtb3ZlZCB1bm5lY2Vzc2FyeSBjaGVja3MgaW4gZ2VuNl9hbGxvY192YV9y YW5nZS4KIC0gQ2hhbmdlZCBtYXAvdW5tYXBfcHhfc2luZ2xlIG1hY3JvcyB0byB1c2UgZG1hIGZ1 bmN0aW9ucyBkaXJlY3RseSBhbmQKICAgYmUgcGFydCBvZiBhIHN0YXRpYyBpbmxpbmUgZnVuY3Rp b24gaW5zdGVhZC4KIC0gTW92ZWQgZHJtX2RldmljZSBwbHVtYmluZyB0aHJvdWdoIHBhZ2UgdGFi bGVzIG9wZXJhdGlvbiB0byBpdHMgb3duCiAgIHBhdGNoLgogLSBNb3ZlZCBhbGxvY2F0ZS90ZWFy ZG93bl92YV9yYW5nZSBjYWxscyB1bnRpbCB0aGV5IGFyZSBmdWxseQogICBpbXBsZW1lbnRlZCAo aW4gc3Vic2VxdWVudCBwYXRjaCkuCiAtIE1lcmdlZCBwdCBhbmQgc2NyYXRjaF9wdCB1bm1hcF9h bmRfZnJlZSBwYXRoLgogLSBNb3ZlZCBzY3JhdGNoIHBhZ2UgYWxsb2NhdG9yIGhlbHBlciB0byB0 aGUgcGF0Y2ggdGhhdCB3aWxsIHVzZSBpdC4KCnY2OiBSZWR1Y2UgY29tcGxleGl0eSBieSBub3Qg dGVhcmluZyBkb3duIHBhZ2V0YWJsZXMgZHluYW1pY2FsbHksIHRoZQpzYW1lIGNhbiBiZSBhY2hp ZXZlZCB3aGlsZSBmcmVlaW5nIGVtcHR5IHZtcy4gKERhbmllbCkKCkNjOiBEYW5pZWwgVmV0dGVy IDxkYW5pZWxAZmZ3bGwuY2g+ClNpZ25lZC1vZmYtYnk6IEJlbiBXaWRhd3NreSA8YmVuQGJ3aWRh d3NrLm5ldD4KU2lnbmVkLW9mZi1ieTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGlu dGVsLmNvbT4gKHYzKykKLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyB8 IDE5MSArKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2d0dC5oIHwgIDc1ICsrKysrKysrKysrKysrCiAyIGZpbGVzIGNoYW5n ZWQsIDIwNiBpbnNlcnRpb25zKCspLCA2MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2d0dC5jCmluZGV4IGUyYmNkMTAuLjc2MDU4NWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2d0dC5jCkBAIC0yNzQsMjkgKzI3NCw4OCBAQCBzdGF0aWMgZ2VuNl9ndHRfcHRlX3Qg aXJpc19wdGVfZW5jb2RlKGRtYV9hZGRyX3QgYWRkciwKIAlyZXR1cm4gcHRlOwogfQogCi1zdGF0 aWMgdm9pZCB1bm1hcF9hbmRfZnJlZV9wdChzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlX2VudHJ5ICpw dCwgc3RydWN0IGRybV9kZXZpY2UgKmRldikKKyNkZWZpbmUgaTkxNV9kbWFfdW5tYXBfc2luZ2xl KHB4LCBkZXYpIFwKKwlfX2k5MTVfZG1hX3VubWFwX3NpbmdsZSgocHgpLT5kYWRkciwgZGV2KQor CitzdGF0aWMgaW5saW5lIHZvaWQgX19pOTE1X2RtYV91bm1hcF9zaW5nbGUoZG1hX2FkZHJfdCBk YWRkciwKKwkJCQkJc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3sKKwlzdHJ1Y3QgZGV2aWNlICpk ZXZpY2UgPSAmZGV2LT5wZGV2LT5kZXY7CisKKwlkbWFfdW5tYXBfcGFnZShkZXZpY2UsIGRhZGRy LCA0MDk2LCBQQ0lfRE1BX0JJRElSRUNUSU9OQUwpOworfQorCisvKioKKyAqIGk5MTVfZG1hX21h cF9weF9zaW5nbGUoKSAtIENyZWF0ZSBhIGRtYSBtYXBwaW5nIGZvciBhIHBhZ2UgdGFibGUvZGly L2V0Yy4KKyAqIEBweDoJCVBhZ2UgdGFibGUvZGlyL2V0YyB0byBnZXQgYSBETUEgbWFwIGZvcgor ICogQGRldjoJZHJtIGRldmljZQorICoKKyAqIFBhZ2UgdGFibGUgYWxsb2NhdGlvbnMgYXJlIHVu aWZpZWQgYWNyb3NzIGFsbCBnZW5zLiBUaGV5IGFsd2F5cyByZXF1aXJlIGEKKyAqIHNpbmdsZSA0 ayBhbGxvY2F0aW9uLCBhcyB3ZWxsIGFzIGEgRE1BIG1hcHBpbmcuIElmIHdlIGtlZXAgdGhlIHN0 cnVjdHMKKyAqIHN5bW1ldHJpYyBoZXJlLCB0aGUgc2ltcGxlIG1hY3JvIGNvdmVycyB1cyBmb3Ig ZXZlcnkgcGFnZSB0YWJsZSB0eXBlLgorICoKKyAqIFJldHVybjogMCBpZiBzdWNjZXNzLgorICov CisjZGVmaW5lIGk5MTVfZG1hX21hcF9weF9zaW5nbGUocHgsIGRldikgXAorCWk5MTVfZG1hX21h cF9wYWdlX3NpbmdsZSgocHgpLT5wYWdlLCAoZGV2KSwgJihweCktPmRhZGRyKQorCitzdGF0aWMg aW5saW5lIGludCBpOTE1X2RtYV9tYXBfcGFnZV9zaW5nbGUoc3RydWN0IHBhZ2UgKnBhZ2UsCisJ CQkJCSAgIHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCisJCQkJCSAgIGRtYV9hZGRyX3QgKmRhZGRy KQoreworCXN0cnVjdCBkZXZpY2UgKmRldmljZSA9ICZkZXYtPnBkZXYtPmRldjsKKworCSpkYWRk ciA9IGRtYV9tYXBfcGFnZShkZXZpY2UsIHBhZ2UsIDAsIDQwOTYsIFBDSV9ETUFfQklESVJFQ1RJ T05BTCk7CisJcmV0dXJuIGRtYV9tYXBwaW5nX2Vycm9yKGRldmljZSwgKmRhZGRyKTsKK30KKwor c3RhdGljIHZvaWQgdW5tYXBfYW5kX2ZyZWVfcHQoc3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRy eSAqcHQsCisJCQkgICAgICAgc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlpZiAoV0FSTl9P TighcHQtPnBhZ2UpKQogCQlyZXR1cm47CisKKwlpOTE1X2RtYV91bm1hcF9zaW5nbGUocHQsIGRl dik7CiAJX19mcmVlX3BhZ2UocHQtPnBhZ2UpOworCWtmcmVlKHB0LT51c2VkX3B0ZXMpOwogCWtm cmVlKHB0KTsKIH0KIAogc3RhdGljIHN0cnVjdCBpOTE1X3BhZ2VfdGFibGVfZW50cnkgKmFsbG9j X3B0X3NpbmdsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBpOTE1X3BhZ2Vf dGFibGVfZW50cnkgKnB0OworCWNvbnN0IHNpemVfdCBjb3VudCA9IElOVEVMX0lORk8oZGV2KS0+ Z2VuID49IDggPworCQlHRU44X1BURVNfUEVSX1BBR0UgOiBJOTE1X1BQR1RUX1BUX0VOVFJJRVM7 CisJaW50IHJldCA9IC1FTk9NRU07CiAKIAlwdCA9IGt6YWxsb2Moc2l6ZW9mKCpwdCksIEdGUF9L RVJORUwpOwogCWlmICghcHQpCiAJCXJldHVybiBFUlJfUFRSKC1FTk9NRU0pOwogCisJcHQtPnVz ZWRfcHRlcyA9IGtjYWxsb2MoQklUU19UT19MT05HUyhjb3VudCksIHNpemVvZigqcHQtPnVzZWRf cHRlcyksCisJCQkJR0ZQX0tFUk5FTCk7CisKKwlpZiAoIXB0LT51c2VkX3B0ZXMpCisJCWdvdG8g ZmFpbF9iaXRtYXA7CisKIAlwdC0+cGFnZSA9IGFsbG9jX3BhZ2UoR0ZQX0tFUk5FTCB8IF9fR0ZQ X1pFUk8pOwotCWlmICghcHQtPnBhZ2UpIHsKLQkJa2ZyZWUocHQpOwotCQlyZXR1cm4gRVJSX1BU UigtRU5PTUVNKTsKLQl9CisJaWYgKCFwdC0+cGFnZSkKKwkJZ290byBmYWlsX3BhZ2U7CisKKwly ZXQgPSBpOTE1X2RtYV9tYXBfcHhfc2luZ2xlKHB0LCBkZXYpOworCWlmIChyZXQpCisJCWdvdG8g ZmFpbF9kbWE7CiAKIAlyZXR1cm4gcHQ7CisKK2ZhaWxfZG1hOgorCV9fZnJlZV9wYWdlKHB0LT5w YWdlKTsKK2ZhaWxfcGFnZToKKwlrZnJlZShwdC0+dXNlZF9wdGVzKTsKK2ZhaWxfYml0bWFwOgor CWtmcmVlKHB0KTsKKworCXJldHVybiBFUlJfUFRSKHJldCk7CiB9CiAKIC8qKgpAQCAtODM2LDI2 ICs4OTUsMzYgQEAgc3RhdGljIHZvaWQgZ2VuNl9kdW1wX3BwZ3R0KHN0cnVjdCBpOTE1X2h3X3Bw Z3R0ICpwcGd0dCwgc3RydWN0IHNlcV9maWxlICptKQogCX0KIH0KIAotc3RhdGljIHZvaWQgZ2Vu Nl93cml0ZV9wZGVzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKKy8qIFdyaXRlIHBkZSAo aW5kZXgpIGZyb20gdGhlIHBhZ2UgZGlyZWN0b3J5IEBwZCB0byB0aGUgcGFnZSB0YWJsZSBAcHQg Ki8KK3N0YXRpYyB2b2lkIGdlbjZfd3JpdGVfcGRlcyhzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9y eV9lbnRyeSAqcGQsCisJCQkgICAgY29uc3QgaW50IHBkZSwgc3RydWN0IGk5MTVfcGFnZV90YWJs ZV9lbnRyeSAqcHQpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gcHBn dHQtPmJhc2UuZGV2LT5kZXZfcHJpdmF0ZTsKLQlnZW42X2d0dF9wdGVfdCBfX2lvbWVtICpwZF9h ZGRyOwotCXVpbnQzMl90IHBkX2VudHJ5OwotCWludCBpOworCXN0cnVjdCBpOTE1X2h3X3BwZ3R0 ICpwcGd0dCA9CisJCWNvbnRhaW5lcl9vZihwZCwgc3RydWN0IGk5MTVfaHdfcHBndHQsIHBkKTsK Kwl1MzIgcGRfZW50cnk7CiAKLQlXQVJOX09OKHBwZ3R0LT5wZC5wZF9vZmZzZXQgJiAweDNmKTsK LQlwZF9hZGRyID0gKGdlbjZfZ3R0X3B0ZV90IF9faW9tZW0qKWRldl9wcml2LT5ndHQuZ3NtICsK LQkJcHBndHQtPnBkLnBkX29mZnNldCAvIHNpemVvZihnZW42X2d0dF9wdGVfdCk7Ci0JZm9yIChp ID0gMDsgaSA8IHBwZ3R0LT5udW1fcGRfZW50cmllczsgaSsrKSB7Ci0JCWRtYV9hZGRyX3QgcHRf YWRkcjsKKwlwZF9lbnRyeSA9IEdFTjZfUERFX0FERFJfRU5DT0RFKHB0LT5kYWRkcik7CisJcGRf ZW50cnkgfD0gR0VONl9QREVfVkFMSUQ7CiAKLQkJcHRfYWRkciA9IHBwZ3R0LT5wZC5wYWdlX3Rh Ymxlc1tpXS0+ZGFkZHI7Ci0JCXBkX2VudHJ5ID0gR0VONl9QREVfQUREUl9FTkNPREUocHRfYWRk cik7Ci0JCXBkX2VudHJ5IHw9IEdFTjZfUERFX1ZBTElEOworCXdyaXRlbChwZF9lbnRyeSwgcHBn dHQtPnBkX2FkZHIgKyBwZGUpOwogCi0JCXdyaXRlbChwZF9lbnRyeSwgcGRfYWRkciArIGkpOwot CX0KLQlyZWFkbChwZF9hZGRyKTsKKwkvKiBYWFg6IENhbGxlciBuZWVkcyB0byBtYWtlIHN1cmUg dGhlIHdyaXRlIGNvbXBsZXRlcyBpZiBuZWNlc3NhcnkgKi8KK30KKworLyogV3JpdGUgYWxsIHRo ZSBwYWdlIHRhYmxlcyBmb3VuZCBpbiB0aGUgcHBndHQgc3RydWN0dXJlIHRvIGluY3JlbWVudGlu ZyBwYWdlCisgKiBkaXJlY3Rvcmllcy4gKi8KK3N0YXRpYyB2b2lkIGdlbjZfd3JpdGVfcGFnZV9y YW5nZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJc3RydWN0IGk5MTVf cGFnZV9kaXJlY3RvcnlfZW50cnkgKnBkLCB1aW50MzJfdCBzdGFydCwgdWludDMyX3QgbGVuZ3Ro KQoreworCXN0cnVjdCBpOTE1X3BhZ2VfdGFibGVfZW50cnkgKnB0OworCXVpbnQzMl90IHBkZSwg dGVtcDsKKworCWdlbjZfZm9yX2VhY2hfcGRlKHB0LCBwZCwgc3RhcnQsIGxlbmd0aCwgdGVtcCwg cGRlKQorCQlnZW42X3dyaXRlX3BkZXMocGQsIHBkZSwgcHQpOworCisJLyogTWFrZSBzdXJlIHdy aXRlIGlzIGNvbXBsZXRlIGJlZm9yZSBvdGhlciBjb2RlIGNhbiB1c2UgdGhpcyBwYWdlCisJICog dGFibGUuIEFsc28gcmVxdWlyZSBmb3IgV0MgbWFwcGVkIFBURXMgKi8KKwlyZWFkbChkZXZfcHJp di0+Z3R0LmdzbSk7CiB9CiAKIHN0YXRpYyB1aW50MzJfdCBnZXRfcGRfb2Zmc2V0KHN0cnVjdCBp OTE1X2h3X3BwZ3R0ICpwcGd0dCkKQEAgLTEwNzEsNiArMTE0MCwyOCBAQCBzdGF0aWMgdm9pZCBn ZW42X3BwZ3R0X3VubWFwX3BhZ2VzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIAkJCSAg ICAgICA0MDk2LCBQQ0lfRE1BX0JJRElSRUNUSU9OQUwpOwogfQogCitzdGF0aWMgaW50IGdlbjZf YWxsb2NfdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCisJCQkgICAgICAg dWludDY0X3Qgc3RhcnQsIHVpbnQ2NF90IGxlbmd0aCkKK3sKKwlzdHJ1Y3QgaTkxNV9od19wcGd0 dCAqcHBndHQgPQorCQkJCWNvbnRhaW5lcl9vZih2bSwgc3RydWN0IGk5MTVfaHdfcHBndHQsIGJh c2UpOworCXN0cnVjdCBpOTE1X3BhZ2VfdGFibGVfZW50cnkgKnB0OworCXVpbnQzMl90IHBkZSwg dGVtcDsKKworCWdlbjZfZm9yX2VhY2hfcGRlKHB0LCAmcHBndHQtPnBkLCBzdGFydCwgbGVuZ3Ro LCB0ZW1wLCBwZGUpIHsKKwkJREVDTEFSRV9CSVRNQVAodG1wX2JpdG1hcCwgSTkxNV9QUEdUVF9Q VF9FTlRSSUVTKTsKKworCQliaXRtYXBfemVybyh0bXBfYml0bWFwLCBJOTE1X1BQR1RUX1BUX0VO VFJJRVMpOworCQliaXRtYXBfc2V0KHRtcF9iaXRtYXAsIGdlbjZfcHRlX2luZGV4KHN0YXJ0KSwK KwkJCSAgIGdlbjZfcHRlX2NvdW50KHN0YXJ0LCBsZW5ndGgpKTsKKworCQliaXRtYXBfb3IocHQt PnVzZWRfcHRlcywgcHQtPnVzZWRfcHRlcywgdG1wX2JpdG1hcCwKKwkJCQlJOTE1X1BQR1RUX1BU X0VOVFJJRVMpOworCX0KKworCXJldHVybiAwOworfQorCiBzdGF0aWMgdm9pZCBnZW42X3BwZ3R0 X2ZyZWUoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogewogCWludCBpOwpAQCAtMTExNywy MCArMTIwOCwyNCBAQCBhbGxvYzoKIAkJCQkJICAgICAgIDAsIGRldl9wcml2LT5ndHQuYmFzZS50 b3RhbCwKIAkJCQkJICAgICAgIDApOwogCQlpZiAocmV0KQotCQkJcmV0dXJuIHJldDsKKwkJCWdv dG8gZXJyX291dDsKIAogCQlyZXRyaWVkID0gdHJ1ZTsKIAkJZ290byBhbGxvYzsKIAl9CiAKIAlp ZiAocmV0KQotCQlyZXR1cm4gcmV0OworCQlnb3RvIGVycl9vdXQ7CisKIAogCWlmIChwcGd0dC0+ bm9kZS5zdGFydCA8IGRldl9wcml2LT5ndHQubWFwcGFibGVfZW5kKQogCQlEUk1fREVCVUcoIkZv cmNlZCB0byB1c2UgYXBlcnR1cmUgZm9yIFBERXNcbiIpOwogCiAJcHBndHQtPm51bV9wZF9lbnRy aWVzID0gR0VONl9QUEdUVF9QRF9FTlRSSUVTOwogCXJldHVybiAwOworCitlcnJfb3V0OgorCXJl dHVybiByZXQ7CiB9CiAKIHN0YXRpYyBpbnQgZ2VuNl9wcGd0dF9hbGxvYyhzdHJ1Y3QgaTkxNV9o d19wcGd0dCAqcHBndHQpCkBAIC0xMTUyLDMwICsxMjQ3LDYgQEAgc3RhdGljIGludCBnZW42X3Bw Z3R0X2FsbG9jKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIAlyZXR1cm4gMDsKIH0KIAot c3RhdGljIGludCBnZW42X3BwZ3R0X3NldHVwX3BhZ2VfdGFibGVzKHN0cnVjdCBpOTE1X2h3X3Bw Z3R0ICpwcGd0dCkKLXsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcHBndHQtPmJhc2UuZGV2 OwotCWludCBpOwotCi0JZm9yIChpID0gMDsgaSA8IHBwZ3R0LT5udW1fcGRfZW50cmllczsgaSsr KSB7Ci0JCXN0cnVjdCBwYWdlICpwYWdlOwotCQlkbWFfYWRkcl90IHB0X2FkZHI7Ci0KLQkJcGFn ZSA9IHBwZ3R0LT5wZC5wYWdlX3RhYmxlc1tpXS0+cGFnZTsKLQkJcHRfYWRkciA9IHBjaV9tYXBf cGFnZShkZXYtPnBkZXYsIHBhZ2UsIDAsIDQwOTYsCi0JCQkJICAgICAgIFBDSV9ETUFfQklESVJF Q1RJT05BTCk7Ci0KLQkJaWYgKHBjaV9kbWFfbWFwcGluZ19lcnJvcihkZXYtPnBkZXYsIHB0X2Fk ZHIpKSB7Ci0JCQlnZW42X3BwZ3R0X3VubWFwX3BhZ2VzKHBwZ3R0KTsKLQkJCXJldHVybiAtRUlP OwotCQl9Ci0KLQkJcHBndHQtPnBkLnBhZ2VfdGFibGVzW2ldLT5kYWRkciA9IHB0X2FkZHI7Ci0J fQotCi0JcmV0dXJuIDA7Ci19Ci0KIHN0YXRpYyBpbnQgZ2VuNl9wcGd0dF9pbml0KHN0cnVjdCBp OTE1X2h3X3BwZ3R0ICpwcGd0dCkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcHBndHQt PmJhc2UuZGV2OwpAQCAtMTE5NiwxMiArMTI2Nyw3IEBAIHN0YXRpYyBpbnQgZ2VuNl9wcGd0dF9p bml0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0 OwogCi0JcmV0ID0gZ2VuNl9wcGd0dF9zZXR1cF9wYWdlX3RhYmxlcyhwcGd0dCk7Ci0JaWYgKHJl dCkgewotCQlnZW42X3BwZ3R0X2ZyZWUocHBndHQpOwotCQlyZXR1cm4gcmV0OwotCX0KLQorCXBw Z3R0LT5iYXNlLmFsbG9jYXRlX3ZhX3JhbmdlID0gZ2VuNl9hbGxvY192YV9yYW5nZTsKIAlwcGd0 dC0+YmFzZS5jbGVhcl9yYW5nZSA9IGdlbjZfcHBndHRfY2xlYXJfcmFuZ2U7CiAJcHBndHQtPmJh c2UuaW5zZXJ0X2VudHJpZXMgPSBnZW42X3BwZ3R0X2luc2VydF9lbnRyaWVzOwogCXBwZ3R0LT5i YXNlLmNsZWFudXAgPSBnZW42X3BwZ3R0X2NsZWFudXA7CkBAIC0xMjEyLDEzICsxMjc4LDE3IEBA IHN0YXRpYyBpbnQgZ2VuNl9wcGd0dF9pbml0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkK IAlwcGd0dC0+cGQucGRfb2Zmc2V0ID0KIAkJcHBndHQtPm5vZGUuc3RhcnQgLyBQQUdFX1NJWkUg KiBzaXplb2YoZ2VuNl9ndHRfcHRlX3QpOwogCisJcHBndHQtPnBkX2FkZHIgPSAoZ2VuNl9ndHRf cHRlX3QgX19pb21lbSAqKWRldl9wcml2LT5ndHQuZ3NtICsKKwkJcHBndHQtPnBkLnBkX29mZnNl dCAvIHNpemVvZihnZW42X2d0dF9wdGVfdCk7CisKIAlwcGd0dC0+YmFzZS5jbGVhcl9yYW5nZSgm cHBndHQtPmJhc2UsIDAsIHBwZ3R0LT5iYXNlLnRvdGFsLCB0cnVlKTsKIAorCWdlbjZfd3JpdGVf cGFnZV9yYW5nZShkZXZfcHJpdiwgJnBwZ3R0LT5wZCwgMCwgcHBndHQtPmJhc2UudG90YWwpOwor CiAJRFJNX0RFQlVHX0RSSVZFUigiQWxsb2NhdGVkIHBkZSBzcGFjZSAoJWxkTSkgYXQgR1RUIGVu dHJ5OiAlbHhcbiIsCiAJCQkgcHBndHQtPm5vZGUuc2l6ZSA+PiAyMCwKIAkJCSBwcGd0dC0+bm9k ZS5zdGFydCAvIFBBR0VfU0laRSk7CiAKLQlnZW42X3dyaXRlX3BkZXMocHBndHQpOwogCURSTV9E RUJVRygiQWRkaW5nIFBQR1RUIGF0IG9mZnNldCAleFxuIiwKIAkJICBwcGd0dC0+cGQucGRfb2Zm c2V0IDw8IDEwKTsKIApAQCAtMTQ5MSwxMyArMTU2MSwxNCBAQCB2b2lkIGk5MTVfZ2VtX3Jlc3Rv cmVfZ3R0X21hcHBpbmdzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAlsaXN0X2Zvcl9lYWNo X2VudHJ5KHZtLCAmZGV2X3ByaXYtPnZtX2xpc3QsIGdsb2JhbF9saW5rKSB7CiAJCS8qIFRPRE86 IFBlcmhhcHMgaXQgc2hvdWxkbid0IGJlIGdlbjYgc3BlY2lmaWMgKi8KLQkJaWYgKGk5MTVfaXNf Z2d0dCh2bSkpIHsKLQkJCWlmIChkZXZfcHJpdi0+bW0uYWxpYXNpbmdfcHBndHQpCi0JCQkJZ2Vu Nl93cml0ZV9wZGVzKGRldl9wcml2LT5tbS5hbGlhc2luZ19wcGd0dCk7Ci0JCQljb250aW51ZTsK LQkJfQogCi0JCWdlbjZfd3JpdGVfcGRlcyhjb250YWluZXJfb2Yodm0sIHN0cnVjdCBpOTE1X2h3 X3BwZ3R0LCBiYXNlKSk7CisJCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9CisJCQljb250 YWluZXJfb2Yodm0sIHN0cnVjdCBpOTE1X2h3X3BwZ3R0LCBiYXNlKTsKKworCQlpZiAoaTkxNV9p c19nZ3R0KHZtKSkKKwkJCXBwZ3R0ID0gZGV2X3ByaXYtPm1tLmFsaWFzaW5nX3BwZ3R0OworCisJ CWdlbjZfd3JpdGVfcGFnZV9yYW5nZShkZXZfcHJpdiwgJnBwZ3R0LT5wZCwgMCwgcHBndHQtPm51 bV9wZF9lbnRyaWVzKTsKIAl9CiAKIAlpOTE1X2dndHRfZmx1c2goZGV2X3ByaXYpOwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9ndHQuaAppbmRleCBlOGNhZDcyLi4xYjE1ZmM5IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9ndHQuaApAQCAtNTQsNyArNTQsMTAgQEAgdHlwZWRlZiBnZW44X2d0 dF9wdGVfdCBnZW44X3BwZ3R0X3BkZV90OwogI2RlZmluZSBHRU42X1BQR1RUX1BEX0VOVFJJRVMJ CTUxMgogI2RlZmluZSBHRU42X1BEX1NJWkUJCQkoR0VONl9QUEdUVF9QRF9FTlRSSUVTICogUEFH RV9TSVpFKQogI2RlZmluZSBHRU42X1BEX0FMSUdOCQkJKFBBR0VfU0laRSAqIDE2KQorI2RlZmlu ZSBHRU42X1BERV9TSElGVAkJCTIyCiAjZGVmaW5lIEdFTjZfUERFX1ZBTElECQkJKDEgPDwgMCkK KyNkZWZpbmUgSTkxNV9QREVfTUFTSwkJCShHRU42X1BQR1RUX1BEX0VOVFJJRVMtMSkKKyNkZWZp bmUgTlVNX1BURShwZGVfc2hpZnQpCQkoMSA8PCAocGRlX3NoaWZ0IC0gUEFHRV9TSElGVCkpCiAK ICNkZWZpbmUgR0VON19QVEVfQ0FDSEVfTDNfTExDCQkoMyA8PCAxKQogCkBAIC0xOTAsNiArMTkz LDggQEAgc3RydWN0IGk5MTVfdm1hIHsKIHN0cnVjdCBpOTE1X3BhZ2VfdGFibGVfZW50cnkgewog CXN0cnVjdCBwYWdlICpwYWdlOwogCWRtYV9hZGRyX3QgZGFkZHI7CisKKwl1bnNpZ25lZCBsb25n ICp1c2VkX3B0ZXM7CiB9OwogCiBzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9lbnRyeSB7CkBA IC0yNDYsNiArMjUxLDkgQEAgc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSB7CiAJZ2VuNl9ndHRf cHRlX3QgKCpwdGVfZW5jb2RlKShkbWFfYWRkcl90IGFkZHIsCiAJCQkJICAgICBlbnVtIGk5MTVf Y2FjaGVfbGV2ZWwgbGV2ZWwsCiAJCQkJICAgICBib29sIHZhbGlkLCB1MzIgZmxhZ3MpOyAvKiBD cmVhdGUgYSB2YWxpZCBQVEUgKi8KKwlpbnQgKCphbGxvY2F0ZV92YV9yYW5nZSkoc3RydWN0IGk5 MTVfYWRkcmVzc19zcGFjZSAqdm0sCisJCQkJIHVpbnQ2NF90IHN0YXJ0LAorCQkJCSB1aW50NjRf dCBsZW5ndGgpOwogCXZvaWQgKCpjbGVhcl9yYW5nZSkoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFj ZSAqdm0sCiAJCQkgICAgdWludDY0X3Qgc3RhcnQsCiAJCQkgICAgdWludDY0X3QgbGVuZ3RoLApA QCAtMjk4LDEyICszMDYsNzkgQEAgc3RydWN0IGk5MTVfaHdfcHBndHQgewogCiAJc3RydWN0IGRy bV9pOTE1X2ZpbGVfcHJpdmF0ZSAqZmlsZV9wcml2OwogCisJZ2VuNl9ndHRfcHRlX3QgX19pb21l bSAqcGRfYWRkcjsKKwogCWludCAoKmVuYWJsZSkoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0 KTsKIAlpbnQgKCpzd2l0Y2hfbW0pKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKIAkJCSBz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKIAl2b2lkICgqZGVidWdfZHVtcCkoc3RydWN0 IGk5MTVfaHdfcHBndHQgKnBwZ3R0LCBzdHJ1Y3Qgc2VxX2ZpbGUgKm0pOwogfTsKIAorLyogRm9y IGVhY2ggcGRlIGl0ZXJhdGVzIG92ZXIgZXZlcnkgcGRlIGJldHdlZW4gZnJvbSBzdGFydCB1bnRp bCBzdGFydCArIGxlbmd0aC4KKyAqIElmIHN0YXJ0LCBhbmQgc3RhcnQrbGVuZ3RoIGFyZSBub3Qg cGVyZmVjdGx5IGRpdmlzaWJsZSwgdGhlIG1hY3JvIHdpbGwgcm91bmQKKyAqIGRvd24sIGFuZCB1 cCBhcyBuZWVkZWQuIFRoZSBtYWNybyBtb2RpZmllcyBwZGUsIHN0YXJ0LCBhbmQgbGVuZ3RoLiBE ZXYgaXMKKyAqIG9ubHkgdXNlZCB0byBkaWZmZXJlbnRpYXRlIHNoaWZ0IHZhbHVlcy4gVGVtcCBp cyB0ZW1wLiAgT24gZ2VuNi83LCBzdGFydCA9IDAsCisgKiBhbmQgbGVuZ3RoID0gMkcgZWZmZWN0 aXZlbHkgaXRlcmF0ZXMgb3ZlciBldmVyeSBQREUgaW4gdGhlIHN5c3RlbS4gT24gZ2VuOCsKKyAq IGl0IHNpbXBseSBpdGVyYXRlcyBvdmVyIGV2ZXJ5IHBhZ2UgZGlyZWN0b3J5IGVudHJ5IGluIGEg cGFnZSBkaXJlY3RvcnkuCisgKgorICogWFhYOiB0ZW1wIGlzIG5vdCBhY3R1YWxseSBuZWVkZWQs IGJ1dCBpdCBzYXZlcyBkb2luZyB0aGUgQUxJR04gb3BlcmF0aW9uLgorICovCisjZGVmaW5lIGdl bjZfZm9yX2VhY2hfcGRlKHB0LCBwZCwgc3RhcnQsIGxlbmd0aCwgdGVtcCwgaXRlcikgXAorCWZv ciAoaXRlciA9IGdlbjZfcGRlX2luZGV4KHN0YXJ0KSwgcHQgPSAocGQpLT5wYWdlX3RhYmxlc1tp dGVyXTsgXAorCSAgICAgbGVuZ3RoID4gMCAmJiBpdGVyIDwgR0VONl9QUEdUVF9QRF9FTlRSSUVT OyBcCisJICAgICBwdCA9IChwZCktPnBhZ2VfdGFibGVzWysraXRlcl0sIFwKKwkgICAgIHRlbXAg PSBBTElHTihzdGFydCsxLCAxIDw8IEdFTjZfUERFX1NISUZUKSAtIHN0YXJ0LCBcCisJICAgICB0 ZW1wID0gbWluX3QodW5zaWduZWQsIHRlbXAsIGxlbmd0aCksIFwKKwkgICAgIHN0YXJ0ICs9IHRl bXAsIGxlbmd0aCAtPSB0ZW1wKQorCitzdGF0aWMgaW5saW5lIHVpbnQzMl90IGk5MTVfcHRlX2lu ZGV4KHVpbnQ2NF90IGFkZHJlc3MsIHVpbnQzMl90IHBkZV9zaGlmdCkKK3sKKwljb25zdCB1aW50 MzJfdCBtYXNrID0gTlVNX1BURShwZGVfc2hpZnQpIC0gMTsKKworCXJldHVybiAoYWRkcmVzcyA+ PiBQQUdFX1NISUZUKSAmIG1hc2s7Cit9CisKKy8qIEhlbHBlciB0byBjb3VudHMgdGhlIG51bWJl ciBvZiBQVEVzIHdpdGhpbiB0aGUgZ2l2ZW4gbGVuZ3RoLiBUaGlzIGNvdW50IGRvZXMKKyogbm90 IGNyb3NzIGEgcGFnZSB0YWJsZSBib3VuZGFyeSwgc28gdGhlIG1heCB2YWx1ZSB3b3VsZCBiZQor KiBJOTE1X1BQR1RUX1BUX0VOVFJJRVMgZm9yIEdFTjYsIGFuZCBHRU44X1BURVNfUEVSX1BBR0Ug Zm9yIEdFTjguCisqLworc3RhdGljIGlubGluZSBzaXplX3QgaTkxNV9wdGVfY291bnQodWludDY0 X3QgYWRkciwgc2l6ZV90IGxlbmd0aCwKKwkJCQkJdWludDMyX3QgcGRlX3NoaWZ0KQoreworCWNv bnN0IHVpbnQ2NF90IG1hc2sgPSB+KCgxIDw8IHBkZV9zaGlmdCkgLSAxKTsKKwl1aW50NjRfdCBl bmQ7CisKKwlCVUdfT04obGVuZ3RoID09IDApOworCUJVR19PTihvZmZzZXRfaW5fcGFnZShhZGRy fGxlbmd0aCkpOworCisJZW5kID0gYWRkciArIGxlbmd0aDsKKworCWlmICgoYWRkciAmIG1hc2sp ICE9IChlbmQgJiBtYXNrKSkKKwkJcmV0dXJuIE5VTV9QVEUocGRlX3NoaWZ0KSAtIGk5MTVfcHRl X2luZGV4KGFkZHIsIHBkZV9zaGlmdCk7CisKKwlyZXR1cm4gaTkxNV9wdGVfaW5kZXgoZW5kLCBw ZGVfc2hpZnQpIC0gaTkxNV9wdGVfaW5kZXgoYWRkciwgcGRlX3NoaWZ0KTsKK30KKworc3RhdGlj IGlubGluZSB1aW50MzJfdCBpOTE1X3BkZV9pbmRleCh1aW50NjRfdCBhZGRyLCB1aW50MzJfdCBz aGlmdCkKK3sKKwlyZXR1cm4gKGFkZHIgPj4gc2hpZnQpICYgSTkxNV9QREVfTUFTSzsKK30KKwor c3RhdGljIGlubGluZSB1aW50MzJfdCBnZW42X3B0ZV9pbmRleCh1aW50MzJfdCBhZGRyKQorewor CXJldHVybiBpOTE1X3B0ZV9pbmRleChhZGRyLCBHRU42X1BERV9TSElGVCk7Cit9CisKK3N0YXRp YyBpbmxpbmUgc2l6ZV90IGdlbjZfcHRlX2NvdW50KHVpbnQzMl90IGFkZHIsIHVpbnQzMl90IGxl bmd0aCkKK3sKKwlyZXR1cm4gaTkxNV9wdGVfY291bnQoYWRkciwgbGVuZ3RoLCBHRU42X1BERV9T SElGVCk7Cit9CisKK3N0YXRpYyBpbmxpbmUgdWludDMyX3QgZ2VuNl9wZGVfaW5kZXgodWludDMy X3QgYWRkcikKK3sKKwlyZXR1cm4gaTkxNV9wZGVfaW5kZXgoYWRkciwgR0VONl9QREVfU0hJRlQp OworfQorCiBpbnQgaTkxNV9nZW1fZ3R0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiB2 b2lkIGk5MTVfZ2VtX2luaXRfZ2xvYmFsX2d0dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIHZv aWQgaTkxNV9nbG9iYWxfZ3R0X2NsZWFudXAoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Ci0tIAoy LjEuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK