From: Michel Thierry Subject: [PATCH v3 10/25] drm/i915: Track GEN6 page table usage Date: Tue, 13 Jan 2015 11:52:24 +0000 Message-ID: <1421149959-30383-11-git-send-email-michel.thierry@intel.com> References: <1418922621-25818-1-git-send-email-michel.thierry@intel.com> <1421149959-30383-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 62EF96E5CD for ; Tue, 13 Jan 2015 03:52:25 -0800 (PST) In-Reply-To: <1421149959-30383-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 aGUgcGF0Y2ggdGhhdCB3aWxsIHVzZSBpdC4KCkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWxAZmZ3 bGwuY2g+ClNpZ25lZC1vZmYtYnk6IEJlbiBXaWRhd3NreSA8YmVuQGJ3aWRhd3NrLm5ldD4KU2ln bmVkLW9mZi1ieTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4gKHYz KykKLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyB8IDIwNiArKysrKysr KysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2d0dC5oIHwgIDc3ICsrKysrKysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDIyMyBpbnNl cnRpb25zKCspLCA2MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5j CmluZGV4IGMzYzE4MjguLjk1OTM0YTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5j CkBAIC0yNzQsMjkgKzI3NCw4OSBAQCBzdGF0aWMgZ2VuNl9ndHRfcHRlX3QgaXJpc19wdGVfZW5j b2RlKGRtYV9hZGRyX3QgYWRkciwKIAlyZXR1cm4gcHRlOwogfQogCi1zdGF0aWMgdm9pZCB1bm1h cF9hbmRfZnJlZV9wdChzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlX2VudHJ5ICpwdCwgc3RydWN0IGRy bV9kZXZpY2UgKmRldikKKyNkZWZpbmUgaTkxNV9kbWFfdW5tYXBfc2luZ2xlKHB4LCBkZXYpIGRv IHsgXAorCV9faTkxNV9kbWFfdW5tYXBfc2luZ2xlKChweCktPmRhZGRyLCBkZXYpOyBcCit9IHdo aWxlICgwKQorCitzdGF0aWMgaW5saW5lIHZvaWQgX19pOTE1X2RtYV91bm1hcF9zaW5nbGUoZG1h X2FkZHJfdCBkYWRkciwKKwkJCQkJc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3sKKwlzdHJ1Y3Qg ZGV2aWNlICpkZXZpY2UgPSAmZGV2LT5wZGV2LT5kZXY7CisKKwlkbWFfdW5tYXBfcGFnZShkZXZp Y2UsIGRhZGRyLCA0MDk2LCBQQ0lfRE1BX0JJRElSRUNUSU9OQUwpOworfQorCisvKioKKyAqIGk5 MTVfZG1hX21hcF9weF9zaW5nbGUoKSAtIENyZWF0ZSBhIGRtYSBtYXBwaW5nIGZvciBhIHBhZ2Ug dGFibGUvZGlyL2V0Yy4KKyAqIEBweDoJCVBhZ2UgdGFibGUvZGlyL2V0YyB0byBnZXQgYSBETUEg bWFwIGZvcgorICogQGRldjoJZHJtIGRldmljZQorICoKKyAqIFBhZ2UgdGFibGUgYWxsb2NhdGlv bnMgYXJlIHVuaWZpZWQgYWNyb3NzIGFsbCBnZW5zLiBUaGV5IGFsd2F5cyByZXF1aXJlIGEKKyAq IHNpbmdsZSA0ayBhbGxvY2F0aW9uLCBhcyB3ZWxsIGFzIGEgRE1BIG1hcHBpbmcuIElmIHdlIGtl ZXAgdGhlIHN0cnVjdHMKKyAqIHN5bW1ldHJpYyBoZXJlLCB0aGUgc2ltcGxlIG1hY3JvIGNvdmVy cyB1cyBmb3IgZXZlcnkgcGFnZSB0YWJsZSB0eXBlLgorICoKKyAqIFJldHVybjogMCBpZiBzdWNj ZXNzLgorICovCisjZGVmaW5lIGk5MTVfZG1hX21hcF9weF9zaW5nbGUocHgsIGRldikgXAorICAg IGk5MTVfZG1hX21hcF9wYWdlX3NpbmdsZSgocHgpLT5wYWdlLCAoZGV2KSwgJihweCktPmRhZGRy KQorCitzdGF0aWMgaW5saW5lIGludCBpOTE1X2RtYV9tYXBfcGFnZV9zaW5nbGUoc3RydWN0IHBh Z2UgKnBhZ2UsCisJCQkJCSAgIHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCisJCQkJCSAgIGRtYV9h ZGRyX3QgKmRhZGRyKQoreworCXN0cnVjdCBkZXZpY2UgKmRldmljZSA9ICZkZXYtPnBkZXYtPmRl djsKKworCSpkYWRkciA9IGRtYV9tYXBfcGFnZShkZXZpY2UsIHBhZ2UsIDAsIDQwOTYsIFBDSV9E TUFfQklESVJFQ1RJT05BTCk7CisJcmV0dXJuIGRtYV9tYXBwaW5nX2Vycm9yKGRldmljZSwgKmRh ZGRyKTsKK30KKworc3RhdGljIHZvaWQgdW5tYXBfYW5kX2ZyZWVfcHQoc3RydWN0IGk5MTVfcGFn ZV90YWJsZV9lbnRyeSAqcHQsCisJCQkgICAgICAgc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsK IAlpZiAoV0FSTl9PTighcHQtPnBhZ2UpKQogCQlyZXR1cm47CisKKwlpOTE1X2RtYV91bm1hcF9z aW5nbGUocHQsIGRldik7CiAJX19mcmVlX3BhZ2UocHQtPnBhZ2UpOworCWtmcmVlKHB0LT51c2Vk X3B0ZXMpOwogCWtmcmVlKHB0KTsKIH0KIAogc3RhdGljIHN0cnVjdCBpOTE1X3BhZ2VfdGFibGVf ZW50cnkgKmFsbG9jX3B0X3NpbmdsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVj dCBpOTE1X3BhZ2VfdGFibGVfZW50cnkgKnB0OworCWNvbnN0IHNpemVfdCBjb3VudCA9IElOVEVM X0lORk8oZGV2KS0+Z2VuID49IDggPworCQlHRU44X1BURVNfUEVSX1BBR0UgOiBJOTE1X1BQR1RU X1BUX0VOVFJJRVM7CisJaW50IHJldCA9IC1FTk9NRU07CiAKIAlwdCA9IGt6YWxsb2Moc2l6ZW9m KCpwdCksIEdGUF9LRVJORUwpOwogCWlmICghcHQpCiAJCXJldHVybiBFUlJfUFRSKC1FTk9NRU0p OwogCisJcHQtPnVzZWRfcHRlcyA9IGtjYWxsb2MoQklUU19UT19MT05HUyhjb3VudCksIHNpemVv ZigqcHQtPnVzZWRfcHRlcyksCisJCQkJR0ZQX0tFUk5FTCk7CisKKwlpZiAoIXB0LT51c2VkX3B0 ZXMpCisJCWdvdG8gZmFpbF9iaXRtYXA7CisKIAlwdC0+cGFnZSA9IGFsbG9jX3BhZ2UoR0ZQX0tF Uk5FTCB8IF9fR0ZQX1pFUk8pOwotCWlmICghcHQtPnBhZ2UpIHsKLQkJa2ZyZWUocHQpOwotCQly ZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKLQl9CisJaWYgKCFwdC0+cGFnZSkKKwkJZ290byBmYWls X3BhZ2U7CisKKwlyZXQgPSBpOTE1X2RtYV9tYXBfcHhfc2luZ2xlKHB0LCBkZXYpOworCWlmIChy ZXQpCisJCWdvdG8gZmFpbF9kbWE7CiAKIAlyZXR1cm4gcHQ7CisKK2ZhaWxfZG1hOgorCV9fZnJl ZV9wYWdlKHB0LT5wYWdlKTsKK2ZhaWxfcGFnZToKKwlrZnJlZShwdC0+dXNlZF9wdGVzKTsKK2Zh aWxfYml0bWFwOgorCWtmcmVlKHB0KTsKKworCXJldHVybiBFUlJfUFRSKHJldCk7CiB9CiAKIC8q KgpAQCAtODA1LDI2ICs4NjUsMzYgQEAgc3RhdGljIHZvaWQgZ2VuNl9kdW1wX3BwZ3R0KHN0cnVj dCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwgc3RydWN0IHNlcV9maWxlICptKQogCX0KIH0KIAotc3Rh dGljIHZvaWQgZ2VuNl93cml0ZV9wZGVzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKKy8q IFdyaXRlIHBkZSAoaW5kZXgpIGZyb20gdGhlIHBhZ2UgZGlyZWN0b3J5IEBwZCB0byB0aGUgcGFn ZSB0YWJsZSBAcHQgKi8KK3N0YXRpYyB2b2lkIGdlbjZfd3JpdGVfcGRlcyhzdHJ1Y3QgaTkxNV9w YWdlX2RpcmVjdG9yeV9lbnRyeSAqcGQsCisJCQkgICAgY29uc3QgaW50IHBkZSwgc3RydWN0IGk5 MTVfcGFnZV90YWJsZV9lbnRyeSAqcHQpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gcHBndHQtPmJhc2UuZGV2LT5kZXZfcHJpdmF0ZTsKLQlnZW42X2d0dF9wdGVfdCBf X2lvbWVtICpwZF9hZGRyOwotCXVpbnQzMl90IHBkX2VudHJ5OwotCWludCBpOworCXN0cnVjdCBp OTE1X2h3X3BwZ3R0ICpwcGd0dCA9CisJCWNvbnRhaW5lcl9vZihwZCwgc3RydWN0IGk5MTVfaHdf cHBndHQsIHBkKTsKKwl1MzIgcGRfZW50cnk7CiAKLQlXQVJOX09OKHBwZ3R0LT5wZC5wZF9vZmZz ZXQgJiAweDNmKTsKLQlwZF9hZGRyID0gKGdlbjZfZ3R0X3B0ZV90IF9faW9tZW0qKWRldl9wcml2 LT5ndHQuZ3NtICsKLQkJcHBndHQtPnBkLnBkX29mZnNldCAvIHNpemVvZihnZW42X2d0dF9wdGVf dCk7Ci0JZm9yIChpID0gMDsgaSA8IHBwZ3R0LT5udW1fcGRfZW50cmllczsgaSsrKSB7Ci0JCWRt YV9hZGRyX3QgcHRfYWRkcjsKKwlwZF9lbnRyeSA9IEdFTjZfUERFX0FERFJfRU5DT0RFKHB0LT5k YWRkcik7CisJcGRfZW50cnkgfD0gR0VONl9QREVfVkFMSUQ7CiAKLQkJcHRfYWRkciA9IHBwZ3R0 LT5wZC5wYWdlX3RhYmxlc1tpXS0+ZGFkZHI7Ci0JCXBkX2VudHJ5ID0gR0VONl9QREVfQUREUl9F TkNPREUocHRfYWRkcik7Ci0JCXBkX2VudHJ5IHw9IEdFTjZfUERFX1ZBTElEOworCXdyaXRlbChw ZF9lbnRyeSwgcHBndHQtPnBkX2FkZHIgKyBwZGUpOwogCi0JCXdyaXRlbChwZF9lbnRyeSwgcGRf YWRkciArIGkpOwotCX0KLQlyZWFkbChwZF9hZGRyKTsKKwkvKiBYWFg6IENhbGxlciBuZWVkcyB0 byBtYWtlIHN1cmUgdGhlIHdyaXRlIGNvbXBsZXRlcyBpZiBuZWNlc3NhcnkgKi8KK30KKworLyog V3JpdGUgYWxsIHRoZSBwYWdlIHRhYmxlcyBmb3VuZCBpbiB0aGUgcHBndHQgc3RydWN0dXJlIHRv IGluY3JlbWVudGluZyBwYWdlCisgKiBkaXJlY3Rvcmllcy4gKi8KK3N0YXRpYyB2b2lkIGdlbjZf d3JpdGVfcGFnZV9yYW5nZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJ c3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfZW50cnkgKnBkLCB1aW50MzJfdCBzdGFydCwgdWlu dDMyX3QgbGVuZ3RoKQoreworCXN0cnVjdCBpOTE1X3BhZ2VfdGFibGVfZW50cnkgKnB0OworCXVp bnQzMl90IHBkZSwgdGVtcDsKKworCWdlbjZfZm9yX2VhY2hfcGRlKHB0LCBwZCwgc3RhcnQsIGxl bmd0aCwgdGVtcCwgcGRlKQorCQlnZW42X3dyaXRlX3BkZXMocGQsIHBkZSwgcHQpOworCisJLyog TWFrZSBzdXJlIHdyaXRlIGlzIGNvbXBsZXRlIGJlZm9yZSBvdGhlciBjb2RlIGNhbiB1c2UgdGhp cyBwYWdlCisJICogdGFibGUuIEFsc28gcmVxdWlyZSBmb3IgV0MgbWFwcGVkIFBURXMgKi8KKwly ZWFkbChkZXZfcHJpdi0+Z3R0LmdzbSk7CiB9CiAKIHN0YXRpYyB1aW50MzJfdCBnZXRfcGRfb2Zm c2V0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKQEAgLTEwNDAsNiArMTExMCw0MSBAQCBz dGF0aWMgdm9pZCBnZW42X3BwZ3R0X3VubWFwX3BhZ2VzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpw cGd0dCkKIAkJCSAgICAgICA0MDk2LCBQQ0lfRE1BX0JJRElSRUNUSU9OQUwpOwogfQogCitzdGF0 aWMgaW50IGdlbjZfYWxsb2NfdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0s CisJCQkgICAgICAgdWludDY0X3Qgc3RhcnQsIHVpbnQ2NF90IGxlbmd0aCkKK3sKKwlzdHJ1Y3Qg aTkxNV9od19wcGd0dCAqcHBndHQgPQorCQkJCWNvbnRhaW5lcl9vZih2bSwgc3RydWN0IGk5MTVf aHdfcHBndHQsIGJhc2UpOworCXN0cnVjdCBpOTE1X3BhZ2VfdGFibGVfZW50cnkgKnB0OworCXVp bnQzMl90IHBkZSwgdGVtcDsKKworCWdlbjZfZm9yX2VhY2hfcGRlKHB0LCAmcHBndHQtPnBkLCBz dGFydCwgbGVuZ3RoLCB0ZW1wLCBwZGUpIHsKKwkJREVDTEFSRV9CSVRNQVAodG1wX2JpdG1hcCwg STkxNV9QUEdUVF9QVF9FTlRSSUVTKTsKKwkJYml0bWFwX3plcm8odG1wX2JpdG1hcCwgSTkxNV9Q UEdUVF9QVF9FTlRSSUVTKTsKKwkJYml0bWFwX3NldCh0bXBfYml0bWFwLCBnZW42X3B0ZV9pbmRl eChzdGFydCksCisJCQkgICBnZW42X3B0ZV9jb3VudChzdGFydCwgbGVuZ3RoKSk7CisKKwkJYml0 bWFwX29yKHB0LT51c2VkX3B0ZXMsIHB0LT51c2VkX3B0ZXMsIHRtcF9iaXRtYXAsCisJCQkJSTkx NV9QUEdUVF9QVF9FTlRSSUVTKTsKKwl9CisKKwlyZXR1cm4gMDsKK30KKworc3RhdGljIHZvaWQg Z2VuNl90ZWFyZG93bl92YV9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKKwkJ CQkgICB1aW50NjRfdCBzdGFydCwgdWludDY0X3QgbGVuZ3RoKQoreworCXN0cnVjdCBpOTE1X2h3 X3BwZ3R0ICpwcGd0dCA9CisJCQkJY29udGFpbmVyX29mKHZtLCBzdHJ1Y3QgaTkxNV9od19wcGd0 dCwgYmFzZSk7CisJc3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRyeSAqcHQ7CisJdWludDMyX3Qg cGRlLCB0ZW1wOworCisJZ2VuNl9mb3JfZWFjaF9wZGUocHQsICZwcGd0dC0+cGQsIHN0YXJ0LCBs ZW5ndGgsIHRlbXAsIHBkZSkgeworCQliaXRtYXBfY2xlYXIocHQtPnVzZWRfcHRlcywgZ2VuNl9w dGVfaW5kZXgoc3RhcnQpLAorCQkJICAgICBnZW42X3B0ZV9jb3VudChzdGFydCwgbGVuZ3RoKSk7 CisJfQorfQorCiBzdGF0aWMgdm9pZCBnZW42X3BwZ3R0X2ZyZWUoc3RydWN0IGk5MTVfaHdfcHBn dHQgKnBwZ3R0KQogewogCWludCBpOwpAQCAtMTA4NiwyMCArMTE5MSwyNCBAQCBhbGxvYzoKIAkJ CQkJICAgICAgIDAsIGRldl9wcml2LT5ndHQuYmFzZS50b3RhbCwKIAkJCQkJICAgICAgIDApOwog CQlpZiAocmV0KQotCQkJcmV0dXJuIHJldDsKKwkJCWdvdG8gZXJyX291dDsKIAogCQlyZXRyaWVk ID0gdHJ1ZTsKIAkJZ290byBhbGxvYzsKIAl9CiAKIAlpZiAocmV0KQotCQlyZXR1cm4gcmV0Owor CQlnb3RvIGVycl9vdXQ7CisKIAogCWlmIChwcGd0dC0+bm9kZS5zdGFydCA8IGRldl9wcml2LT5n dHQubWFwcGFibGVfZW5kKQogCQlEUk1fREVCVUcoIkZvcmNlZCB0byB1c2UgYXBlcnR1cmUgZm9y IFBERXNcbiIpOwogCiAJcHBndHQtPm51bV9wZF9lbnRyaWVzID0gR0VONl9QUEdUVF9QRF9FTlRS SUVTOwogCXJldHVybiAwOworCitlcnJfb3V0OgorCXJldHVybiByZXQ7CiB9CiAKIHN0YXRpYyBp bnQgZ2VuNl9wcGd0dF9hbGxvYyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCkBAIC0xMTIx LDMwICsxMjMwLDYgQEAgc3RhdGljIGludCBnZW42X3BwZ3R0X2FsbG9jKHN0cnVjdCBpOTE1X2h3 X3BwZ3R0ICpwcGd0dCkKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIGludCBnZW42X3BwZ3R0X3Nl dHVwX3BhZ2VfdGFibGVzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKLXsKLQlzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2ID0gcHBndHQtPmJhc2UuZGV2OwotCWludCBpOwotCi0JZm9yIChpID0g MDsgaSA8IHBwZ3R0LT5udW1fcGRfZW50cmllczsgaSsrKSB7Ci0JCXN0cnVjdCBwYWdlICpwYWdl OwotCQlkbWFfYWRkcl90IHB0X2FkZHI7Ci0KLQkJcGFnZSA9IHBwZ3R0LT5wZC5wYWdlX3RhYmxl c1tpXS0+cGFnZTsKLQkJcHRfYWRkciA9IHBjaV9tYXBfcGFnZShkZXYtPnBkZXYsIHBhZ2UsIDAs IDQwOTYsCi0JCQkJICAgICAgIFBDSV9ETUFfQklESVJFQ1RJT05BTCk7Ci0KLQkJaWYgKHBjaV9k bWFfbWFwcGluZ19lcnJvcihkZXYtPnBkZXYsIHB0X2FkZHIpKSB7Ci0JCQlnZW42X3BwZ3R0X3Vu bWFwX3BhZ2VzKHBwZ3R0KTsKLQkJCXJldHVybiAtRUlPOwotCQl9Ci0KLQkJcHBndHQtPnBkLnBh Z2VfdGFibGVzW2ldLT5kYWRkciA9IHB0X2FkZHI7Ci0JfQotCi0JcmV0dXJuIDA7Ci19Ci0KIHN0 YXRpYyBpbnQgZ2VuNl9wcGd0dF9pbml0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIHsK IAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcHBndHQtPmJhc2UuZGV2OwpAQCAtMTE2NSwxMiAr MTI1MCw4IEBAIHN0YXRpYyBpbnQgZ2VuNl9wcGd0dF9pbml0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0 ICpwcGd0dCkKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0JcmV0ID0gZ2VuNl9wcGd0dF9z ZXR1cF9wYWdlX3RhYmxlcyhwcGd0dCk7Ci0JaWYgKHJldCkgewotCQlnZW42X3BwZ3R0X2ZyZWUo cHBndHQpOwotCQlyZXR1cm4gcmV0OwotCX0KLQorCXBwZ3R0LT5iYXNlLmFsbG9jYXRlX3ZhX3Jh bmdlID0gZ2VuNl9hbGxvY192YV9yYW5nZTsKKwlwcGd0dC0+YmFzZS50ZWFyZG93bl92YV9yYW5n ZSA9IGdlbjZfdGVhcmRvd25fdmFfcmFuZ2U7CiAJcHBndHQtPmJhc2UuY2xlYXJfcmFuZ2UgPSBn ZW42X3BwZ3R0X2NsZWFyX3JhbmdlOwogCXBwZ3R0LT5iYXNlLmluc2VydF9lbnRyaWVzID0gZ2Vu Nl9wcGd0dF9pbnNlcnRfZW50cmllczsKIAlwcGd0dC0+YmFzZS5jbGVhbnVwID0gZ2VuNl9wcGd0 dF9jbGVhbnVwOwpAQCAtMTE4MSwxMSArMTI2MiwxNSBAQCBzdGF0aWMgaW50IGdlbjZfcHBndHRf aW5pdChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiAJcHBndHQtPnBkLnBkX29mZnNldCA9 CiAJCXBwZ3R0LT5ub2RlLnN0YXJ0IC8gUEFHRV9TSVpFICogc2l6ZW9mKGdlbjZfZ3R0X3B0ZV90 KTsKIAorCXBwZ3R0LT5wZF9hZGRyID0gKGdlbjZfZ3R0X3B0ZV90IF9faW9tZW0gKilkZXZfcHJp di0+Z3R0LmdzbSArCisJCXBwZ3R0LT5wZC5wZF9vZmZzZXQgLyBzaXplb2YoZ2VuNl9ndHRfcHRl X3QpOworCisJZ2VuNl93cml0ZV9wYWdlX3JhbmdlKGRldl9wcml2LCAmcHBndHQtPnBkLCAwLCBw cGd0dC0+YmFzZS50b3RhbCk7CisKIAlEUk1fREVCVUdfRFJJVkVSKCJBbGxvY2F0ZWQgcGRlIHNw YWNlICglbGRNKSBhdCBHVFQgZW50cnk6ICVseFxuIiwKIAkJCSBwcGd0dC0+bm9kZS5zaXplID4+ IDIwLAogCQkJIHBwZ3R0LT5ub2RlLnN0YXJ0IC8gUEFHRV9TSVpFKTsKIAotCWdlbjZfd3JpdGVf cGRlcyhwcGd0dCk7CiAJRFJNX0RFQlVHKCJBZGRpbmcgUFBHVFQgYXQgb2Zmc2V0ICV4XG4iLAog CQkgIHBwZ3R0LT5wZC5wZF9vZmZzZXQgPDwgMTApOwogCkBAIC0xNDYwLDEzICsxNTQ1LDE0IEBA IHZvaWQgaTkxNV9nZW1fcmVzdG9yZV9ndHRfbWFwcGluZ3Moc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIAogCWxpc3RfZm9yX2VhY2hfZW50cnkodm0sICZkZXZfcHJpdi0+dm1fbGlzdCwgZ2xvYmFs X2xpbmspIHsKIAkJLyogVE9ETzogUGVyaGFwcyBpdCBzaG91bGRuJ3QgYmUgZ2VuNiBzcGVjaWZp YyAqLwotCQlpZiAoaTkxNV9pc19nZ3R0KHZtKSkgewotCQkJaWYgKGRldl9wcml2LT5tbS5hbGlh c2luZ19wcGd0dCkKLQkJCQlnZW42X3dyaXRlX3BkZXMoZGV2X3ByaXYtPm1tLmFsaWFzaW5nX3Bw Z3R0KTsKLQkJCWNvbnRpbnVlOwotCQl9CiAKLQkJZ2VuNl93cml0ZV9wZGVzKGNvbnRhaW5lcl9v Zih2bSwgc3RydWN0IGk5MTVfaHdfcHBndHQsIGJhc2UpKTsKKwkJc3RydWN0IGk5MTVfaHdfcHBn dHQgKnBwZ3R0ID0KKwkJCWNvbnRhaW5lcl9vZih2bSwgc3RydWN0IGk5MTVfaHdfcHBndHQsIGJh c2UpOworCisJCWlmIChpOTE1X2lzX2dndHQodm0pKQorCQkJcHBndHQgPSBkZXZfcHJpdi0+bW0u YWxpYXNpbmdfcHBndHQ7CisKKwkJZ2VuNl93cml0ZV9wYWdlX3JhbmdlKGRldl9wcml2LCAmcHBn dHQtPnBkLCAwLCBwcGd0dC0+bnVtX3BkX2VudHJpZXMpOwogCX0KIAogCWk5MTVfZ2d0dF9mbHVz aChkZXZfcHJpdik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9n dHQuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCmluZGV4IGU4Y2FkNzIu LmNhYTFhYTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCkBAIC01NCw3ICs1NCwx MCBAQCB0eXBlZGVmIGdlbjhfZ3R0X3B0ZV90IGdlbjhfcHBndHRfcGRlX3Q7CiAjZGVmaW5lIEdF TjZfUFBHVFRfUERfRU5UUklFUwkJNTEyCiAjZGVmaW5lIEdFTjZfUERfU0laRQkJCShHRU42X1BQ R1RUX1BEX0VOVFJJRVMgKiBQQUdFX1NJWkUpCiAjZGVmaW5lIEdFTjZfUERfQUxJR04JCQkoUEFH RV9TSVpFICogMTYpCisjZGVmaW5lIEdFTjZfUERFX1NISUZUCQkJMjIKICNkZWZpbmUgR0VONl9Q REVfVkFMSUQJCQkoMSA8PCAwKQorI2RlZmluZSBJOTE1X1BERV9NQVNLCQkJKEdFTjZfUFBHVFRf UERfRU5UUklFUy0xKQorI2RlZmluZSBOVU1fUFRFKHBkZV9zaGlmdCkJCSgxIDw8IChwZGVfc2hp ZnQgLSBQQUdFX1NISUZUKSkKIAogI2RlZmluZSBHRU43X1BURV9DQUNIRV9MM19MTEMJCSgzIDw8 IDEpCiAKQEAgLTE5MCw2ICsxOTMsOCBAQCBzdHJ1Y3QgaTkxNV92bWEgewogc3RydWN0IGk5MTVf cGFnZV90YWJsZV9lbnRyeSB7CiAJc3RydWN0IHBhZ2UgKnBhZ2U7CiAJZG1hX2FkZHJfdCBkYWRk cjsKKworCXVuc2lnbmVkIGxvbmcgKnVzZWRfcHRlczsKIH07CiAKIHN0cnVjdCBpOTE1X3BhZ2Vf ZGlyZWN0b3J5X2VudHJ5IHsKQEAgLTI0Niw2ICsyNTEsMTIgQEAgc3RydWN0IGk5MTVfYWRkcmVz c19zcGFjZSB7CiAJZ2VuNl9ndHRfcHRlX3QgKCpwdGVfZW5jb2RlKShkbWFfYWRkcl90IGFkZHIs CiAJCQkJICAgICBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwgbGV2ZWwsCiAJCQkJICAgICBib29sIHZh bGlkLCB1MzIgZmxhZ3MpOyAvKiBDcmVhdGUgYSB2YWxpZCBQVEUgKi8KKwlpbnQgKCphbGxvY2F0 ZV92YV9yYW5nZSkoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCisJCQkJIHVpbnQ2NF90 IHN0YXJ0LAorCQkJCSB1aW50NjRfdCBsZW5ndGgpOworCXZvaWQgKCp0ZWFyZG93bl92YV9yYW5n ZSkoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCisJCQkJICB1aW50NjRfdCBzdGFydCwK KwkJCQkgIHVpbnQ2NF90IGxlbmd0aCk7CiAJdm9pZCAoKmNsZWFyX3JhbmdlKShzdHJ1Y3QgaTkx NV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJCSAgICB1aW50NjRfdCBzdGFydCwKIAkJCSAgICB1aW50 NjRfdCBsZW5ndGgsCkBAIC0yOTgsMTIgKzMwOSw3OCBAQCBzdHJ1Y3QgaTkxNV9od19wcGd0dCB7 CiAKIAlzdHJ1Y3QgZHJtX2k5MTVfZmlsZV9wcml2YXRlICpmaWxlX3ByaXY7CiAKKwlnZW42X2d0 dF9wdGVfdCBfX2lvbWVtICpwZF9hZGRyOworCiAJaW50ICgqZW5hYmxlKShzdHJ1Y3QgaTkxNV9o d19wcGd0dCAqcHBndHQpOwogCWludCAoKnN3aXRjaF9tbSkoc3RydWN0IGk5MTVfaHdfcHBndHQg KnBwZ3R0LAogCQkJIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwogCXZvaWQgKCpkZWJ1 Z19kdW1wKShzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsIHN0cnVjdCBzZXFfZmlsZSAqbSk7 CiB9OwogCisvKiBGb3IgZWFjaCBwZGUgaXRlcmF0ZXMgb3ZlciBldmVyeSBwZGUgYmV0d2VlbiBm cm9tIHN0YXJ0IHVudGlsIHN0YXJ0ICsgbGVuZ3RoLgorICogSWYgc3RhcnQsIGFuZCBzdGFydCts ZW5ndGggYXJlIG5vdCBwZXJmZWN0bHkgZGl2aXNpYmxlLCB0aGUgbWFjcm8gd2lsbCByb3VuZAor ICogZG93biwgYW5kIHVwIGFzIG5lZWRlZC4gVGhlIG1hY3JvIG1vZGlmaWVzIHBkZSwgc3RhcnQs IGFuZCBsZW5ndGguIERldiBpcworICogb25seSB1c2VkIHRvIGRpZmZlcmVudGlhdGUgc2hpZnQg dmFsdWVzLiBUZW1wIGlzIHRlbXAuICBPbiBnZW42LzcsIHN0YXJ0ID0gMCwKKyAqIGFuZCBsZW5n dGggPSAyRyBlZmZlY3RpdmVseSBpdGVyYXRlcyBvdmVyIGV2ZXJ5IFBERSBpbiB0aGUgc3lzdGVt LiBPbiBnZW44KworICogaXQgc2ltcGx5IGl0ZXJhdGVzIG92ZXIgZXZlcnkgcGFnZSBkaXJlY3Rv cnkgZW50cnkgaW4gYSBwYWdlIGRpcmVjdG9yeS4KKyAqCisgKiBYWFg6IHRlbXAgaXMgbm90IGFj dHVhbGx5IG5lZWRlZCwgYnV0IGl0IHNhdmVzIGRvaW5nIHRoZSBBTElHTiBvcGVyYXRpb24uCisg Ki8KKyNkZWZpbmUgZ2VuNl9mb3JfZWFjaF9wZGUocHQsIHBkLCBzdGFydCwgbGVuZ3RoLCB0ZW1w LCBpdGVyKSBcCisJZm9yIChpdGVyID0gZ2VuNl9wZGVfaW5kZXgoc3RhcnQpLCBwdCA9IChwZCkt PnBhZ2VfdGFibGVzW2l0ZXJdOyBcCisJICAgICBsZW5ndGggPiAwICYmIGl0ZXIgPCBHRU42X1BQ R1RUX1BEX0VOVFJJRVM7IFwKKwkgICAgIHB0ID0gKHBkKS0+cGFnZV90YWJsZXNbKytpdGVyXSwg XAorCSAgICAgdGVtcCA9IEFMSUdOKHN0YXJ0KzEsIDEgPDwgR0VONl9QREVfU0hJRlQpIC0gc3Rh cnQsIFwKKwkgICAgIHRlbXAgPSBtaW4odGVtcCwgKHVuc2lnbmVkKWxlbmd0aCksIFwKKwkgICAg IHN0YXJ0ICs9IHRlbXAsIGxlbmd0aCAtPSB0ZW1wKQorCitzdGF0aWMgaW5saW5lIHVpbnQzMl90 IGk5MTVfcHRlX2luZGV4KHVpbnQ2NF90IGFkZHJlc3MsIHVpbnQzMl90IHBkZV9zaGlmdCkKK3sK Kwljb25zdCB1aW50MzJfdCBtYXNrID0gTlVNX1BURShwZGVfc2hpZnQpIC0gMTsKKwlyZXR1cm4g KGFkZHJlc3MgPj4gUEFHRV9TSElGVCkgJiBtYXNrOworfQorCisvKiBIZWxwZXIgdG8gY291bnRz IHRoZSBudW1iZXIgb2YgUFRFcyB3aXRoaW4gdGhlIGdpdmVuIGxlbmd0aC4gVGhpcyBjb3VudCBk b2VzCisqIG5vdCBjcm9zcyBhIHBhZ2UgdGFibGUgYm91bmRhcnksIHNvIHRoZSBtYXggdmFsdWUg d291bGQgYmUKKyogSTkxNV9QUEdUVF9QVF9FTlRSSUVTIGZvciBHRU42LCBhbmQgR0VOOF9QVEVT X1BFUl9QQUdFIGZvciBHRU44LgorKi8KK3N0YXRpYyBpbmxpbmUgc2l6ZV90IGk5MTVfcHRlX2Nv dW50KHVpbnQ2NF90IGFkZHIsIHNpemVfdCBsZW5ndGgsCisJCQkJCXVpbnQzMl90IHBkZV9zaGlm dCkKK3sKKwljb25zdCB1aW50NjRfdCBtYXNrID0gfigoMSA8PCBwZGVfc2hpZnQpIC0gMSk7CisJ dWludDY0X3QgZW5kOworCisJQlVHX09OKGxlbmd0aCA9PSAwKTsKKwlCVUdfT04ob2Zmc2V0X2lu X3BhZ2UoYWRkcnxsZW5ndGgpKTsKKworCWVuZCA9IGFkZHIgKyBsZW5ndGg7CisKKwlpZiAoKGFk ZHIgJiBtYXNrKSAhPSAoZW5kICYgbWFzaykpCisJCXJldHVybiBOVU1fUFRFKHBkZV9zaGlmdCkg LSBpOTE1X3B0ZV9pbmRleChhZGRyLCBwZGVfc2hpZnQpOworCisJcmV0dXJuIGk5MTVfcHRlX2lu ZGV4KGVuZCwgcGRlX3NoaWZ0KSAtIGk5MTVfcHRlX2luZGV4KGFkZHIsIHBkZV9zaGlmdCk7Cit9 CisKK3N0YXRpYyBpbmxpbmUgdWludDMyX3QgaTkxNV9wZGVfaW5kZXgodWludDY0X3QgYWRkciwg dWludDMyX3Qgc2hpZnQpCit7CisJcmV0dXJuIChhZGRyID4+IHNoaWZ0KSAmIEk5MTVfUERFX01B U0s7Cit9CisKK3N0YXRpYyBpbmxpbmUgdWludDMyX3QgZ2VuNl9wdGVfaW5kZXgodWludDMyX3Qg YWRkcikKK3sKKwlyZXR1cm4gaTkxNV9wdGVfaW5kZXgoYWRkciwgR0VONl9QREVfU0hJRlQpOwor fQorCitzdGF0aWMgaW5saW5lIHNpemVfdCBnZW42X3B0ZV9jb3VudCh1aW50MzJfdCBhZGRyLCB1 aW50MzJfdCBsZW5ndGgpCit7CisJcmV0dXJuIGk5MTVfcHRlX2NvdW50KGFkZHIsIGxlbmd0aCwg R0VONl9QREVfU0hJRlQpOworfQorCitzdGF0aWMgaW5saW5lIHVpbnQzMl90IGdlbjZfcGRlX2lu ZGV4KHVpbnQzMl90IGFkZHIpCit7CisJcmV0dXJuIGk5MTVfcGRlX2luZGV4KGFkZHIsIEdFTjZf UERFX1NISUZUKTsKK30KKwogaW50IGk5MTVfZ2VtX2d0dF9pbml0KHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpOwogdm9pZCBpOTE1X2dlbV9pbml0X2dsb2JhbF9ndHQoc3RydWN0IGRybV9kZXZpY2Ug KmRldik7CiB2b2lkIGk5MTVfZ2xvYmFsX2d0dF9jbGVhbnVwKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpOwotLSAKMi4xLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==