From: Tvrtko Ursulin Subject: [PATCH 08/12] drm/i915/selftests: Convert eviction selftests to gt/ggtt Date: Tue, 22 Oct 2019 10:47:22 +0100 Message-ID: <20191022094726.3001-9-tvrtko.ursulin@linux.intel.com> References: <20191022094726.3001-1-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 491BD6E4E8 for ; Tue, 22 Oct 2019 09:47:40 +0000 (UTC) In-Reply-To: <20191022094726.3001-1-tvrtko.ursulin@linux.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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkNvbnZlcnQg dGhlIHRlc3QgY29kZSB0byB3b3JrIGRpcmVjdGx5IG9uIHdoYXQgaXQgbmVlZHMgcmF0aGVyIHRo YW4KZ29pbmcgdGhyb3VnaCB0aGUgdG9wLWxldmVsIGk5MTUuCgpUaGlzIGVuYWJsZXMgYW5vdGhl ciBuYXR1cmFsIHVzYWdlIGZvciBmb3JfZWFjaF9lbmdpbmUoLi4sIGd0LCAuLikuCgpTaWduZWQt b2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgotLS0KIC4u Li9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2k5MTVfZ2VtX2V2aWN0LmMgICB8IDEwMCArKysrKysr KystLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA1MSBpbnNlcnRpb25zKCspLCA0OSBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaTkxNV9n ZW1fZXZpY3QuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9pOTE1X2dlbV9ldmlj dC5jCmluZGV4IDBhZjlhNThkMDExZC4uNDJlOTQ4MTQ0ZjFiIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaTkxNV9nZW1fZXZpY3QuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9zZWxmdGVzdHMvaTkxNV9nZW1fZXZpY3QuYwpAQCAtNDMsOCArNDMsNyBAQCBz dGF0aWMgdm9pZCBxdWlya19hZGQoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAls aXN0X2FkZCgmb2JqLT5zdF9saW5rLCBvYmplY3RzKTsKIH0KIAotc3RhdGljIGludCBwb3B1bGF0 ZV9nZ3R0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LAotCQkJIHN0cnVjdCBsaXN0X2hl YWQgKm9iamVjdHMpCitzdGF0aWMgaW50IHBvcHVsYXRlX2dndHQoc3RydWN0IGk5MTVfZ2d0dCAq Z2d0dCwgc3RydWN0IGxpc3RfaGVhZCAqb2JqZWN0cykKIHsKIAl1bnNpZ25lZCBsb25nIHVuYm91 bmQsIGJvdW5kLCBjb3VudDsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOwpAQCAt NTMsNyArNTIsOCBAQCBzdGF0aWMgaW50IHBvcHVsYXRlX2dndHQoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmk5MTUsCiAJZG8gewogCQlzdHJ1Y3QgaTkxNV92bWEgKnZtYTsKIAotCQlvYmogPSBp OTE1X2dlbV9vYmplY3RfY3JlYXRlX2ludGVybmFsKGk5MTUsIEk5MTVfR1RUX1BBR0VfU0laRSk7 CisJCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGVfaW50ZXJuYWwoZ2d0dC0+dm0uaTkxNSwK KwkJCQkJCSAgICAgIEk5MTVfR1RUX1BBR0VfU0laRSk7CiAJCWlmIChJU19FUlIob2JqKSkKIAkJ CXJldHVybiBQVFJfRVJSKG9iaik7CiAKQEAgLTcwLDcgKzcwLDcgQEAgc3RhdGljIGludCBwb3B1 bGF0ZV9nZ3R0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LAogCQljb3VudCsrOwogCX0g d2hpbGUgKDEpOwogCXByX2RlYnVnKCJGaWxsZWQgR0dUVCB3aXRoICVsdSBwYWdlcyBbJWxsdSB0 b3RhbF1cbiIsCi0JCSBjb3VudCwgaTkxNS0+Z2d0dC52bS50b3RhbCAvIFBBR0VfU0laRSk7CisJ CSBjb3VudCwgZ2d0dC0+dm0udG90YWwgLyBQQUdFX1NJWkUpOwogCiAJYm91bmQgPSAwOwogCXVu Ym91bmQgPSAwOwpAQCAtOTYsNyArOTYsNyBAQCBzdGF0aWMgaW50IHBvcHVsYXRlX2dndHQoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsCiAJCXJldHVybiAtRUlOVkFMOwogCX0KIAotCWlm IChsaXN0X2VtcHR5KCZpOTE1LT5nZ3R0LnZtLmJvdW5kX2xpc3QpKSB7CisJaWYgKGxpc3RfZW1w dHkoJmdndHQtPnZtLmJvdW5kX2xpc3QpKSB7CiAJCXByX2VycigiTm8gb2JqZWN0cyBvbiB0aGUg R0dUVCBpbmFjdGl2ZSBsaXN0IVxuIik7CiAJCXJldHVybiAtRUlOVkFMOwogCX0KQEAgLTEwNCwx NyArMTA0LDE2IEBAIHN0YXRpYyBpbnQgcG9wdWxhdGVfZ2d0dChzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqaTkxNSwKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIHZvaWQgdW5waW5fZ2d0dChzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKK3N0YXRpYyB2b2lkIHVucGluX2dndHQoc3RydWN0 IGk5MTVfZ2d0dCAqZ2d0dCkKIHsKIAlzdHJ1Y3QgaTkxNV92bWEgKnZtYTsKIAotCWxpc3RfZm9y X2VhY2hfZW50cnkodm1hLCAmaTkxNS0+Z2d0dC52bS5ib3VuZF9saXN0LCB2bV9saW5rKQorCWxp c3RfZm9yX2VhY2hfZW50cnkodm1hLCAmZ2d0dC0+dm0uYm91bmRfbGlzdCwgdm1fbGluaykKIAkJ aWYgKHZtYS0+b2JqLT5tbS5xdWlya2VkKQogCQkJaTkxNV92bWFfdW5waW4odm1hKTsKIH0KIAot c3RhdGljIHZvaWQgY2xlYW51cF9vYmplY3RzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1 LAotCQkJICAgIHN0cnVjdCBsaXN0X2hlYWQgKmxpc3QpCitzdGF0aWMgdm9pZCBjbGVhbnVwX29i amVjdHMoc3RydWN0IGk5MTVfZ2d0dCAqZ2d0dCwgc3RydWN0IGxpc3RfaGVhZCAqbGlzdCkKIHsK IAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLCAqb247CiAKQEAgLTEyNCwxOSArMTIz LDE5IEBAIHN0YXRpYyB2b2lkIGNsZWFudXBfb2JqZWN0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqaTkxNSwKIAkJaTkxNV9nZW1fb2JqZWN0X3B1dChvYmopOwogCX0KIAotCWk5MTVfZ2VtX2Ry YWluX2ZyZWVkX29iamVjdHMoaTkxNSk7CisJaTkxNV9nZW1fZHJhaW5fZnJlZWRfb2JqZWN0cyhn Z3R0LT52bS5pOTE1KTsKIH0KIAogc3RhdGljIGludCBpZ3RfZXZpY3Rfc29tZXRoaW5nKHZvaWQg KmFyZykKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSA9IGFyZzsKLQlzdHJ1Y3Qg aTkxNV9nZ3R0ICpnZ3R0ID0gJmk5MTUtPmdndHQ7CisJc3RydWN0IGludGVsX2d0ICpndCA9IGFy ZzsKKwlzdHJ1Y3QgaTkxNV9nZ3R0ICpnZ3R0ID0gZ3QtPmdndHQ7CiAJTElTVF9IRUFEKG9iamVj dHMpOwogCWludCBlcnI7CiAKIAkvKiBGaWxsIHRoZSBHR1RUIHdpdGggcGlubmVkIG9iamVjdHMg YW5kIHRyeSB0byBldmljdCBvbmUuICovCiAKLQllcnIgPSBwb3B1bGF0ZV9nZ3R0KGk5MTUsICZv YmplY3RzKTsKKwllcnIgPSBwb3B1bGF0ZV9nZ3R0KGdndHQsICZvYmplY3RzKTsKIAlpZiAoZXJy KQogCQlnb3RvIGNsZWFudXA7CiAKQEAgLTE1Myw3ICsxNTIsNyBAQCBzdGF0aWMgaW50IGlndF9l dmljdF9zb21ldGhpbmcodm9pZCAqYXJnKQogCQlnb3RvIGNsZWFudXA7CiAJfQogCi0JdW5waW5f Z2d0dChpOTE1KTsKKwl1bnBpbl9nZ3R0KGdndHQpOwogCiAJLyogRXZlcnl0aGluZyBpcyB1bnBp bm5lZCwgd2Ugc2hvdWxkIGJlIGFibGUgdG8gZXZpY3Qgc29tZXRoaW5nICovCiAJbXV0ZXhfbG9j aygmZ2d0dC0+dm0ubXV0ZXgpOwpAQCAtMTY5LDEzICsxNjgsMTQgQEAgc3RhdGljIGludCBpZ3Rf ZXZpY3Rfc29tZXRoaW5nKHZvaWQgKmFyZykKIAl9CiAKIGNsZWFudXA6Ci0JY2xlYW51cF9vYmpl Y3RzKGk5MTUsICZvYmplY3RzKTsKKwljbGVhbnVwX29iamVjdHMoZ2d0dCwgJm9iamVjdHMpOwog CXJldHVybiBlcnI7CiB9CiAKIHN0YXRpYyBpbnQgaWd0X292ZXJjb21taXQodm9pZCAqYXJnKQog ewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1ID0gYXJnOworCXN0cnVjdCBpbnRlbF9n dCAqZ3QgPSBhcmc7CisJc3RydWN0IGk5MTVfZ2d0dCAqZ2d0dCA9IGd0LT5nZ3R0OwogCXN0cnVj dCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CiAJc3RydWN0IGk5MTVfdm1hICp2bWE7CiAJTElT VF9IRUFEKG9iamVjdHMpOwpAQCAtMTg1LDExICsxODUsMTEgQEAgc3RhdGljIGludCBpZ3Rfb3Zl cmNvbW1pdCh2b2lkICphcmcpCiAJICogV2UgZXhwZWN0IGl0IHRvIGZhaWwuCiAJICovCiAKLQll cnIgPSBwb3B1bGF0ZV9nZ3R0KGk5MTUsICZvYmplY3RzKTsKKwllcnIgPSBwb3B1bGF0ZV9nZ3R0 KGdndHQsICZvYmplY3RzKTsKIAlpZiAoZXJyKQogCQlnb3RvIGNsZWFudXA7CiAKLQlvYmogPSBp OTE1X2dlbV9vYmplY3RfY3JlYXRlX2ludGVybmFsKGk5MTUsIEk5MTVfR1RUX1BBR0VfU0laRSk7 CisJb2JqID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9pbnRlcm5hbChndC0+aTkxNSwgSTkxNV9H VFRfUEFHRV9TSVpFKTsKIAlpZiAoSVNfRVJSKG9iaikpIHsKIAkJZXJyID0gUFRSX0VSUihvYmop OwogCQlnb3RvIGNsZWFudXA7CkBAIC0yMDUsMTQgKzIwNSwxNCBAQCBzdGF0aWMgaW50IGlndF9v dmVyY29tbWl0KHZvaWQgKmFyZykKIAl9CiAKIGNsZWFudXA6Ci0JY2xlYW51cF9vYmplY3RzKGk5 MTUsICZvYmplY3RzKTsKKwljbGVhbnVwX29iamVjdHMoZ2d0dCwgJm9iamVjdHMpOwogCXJldHVy biBlcnI7CiB9CiAKIHN0YXRpYyBpbnQgaWd0X2V2aWN0X2Zvcl92bWEodm9pZCAqYXJnKQogewot CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1ID0gYXJnOwotCXN0cnVjdCBpOTE1X2dndHQg KmdndHQgPSAmaTkxNS0+Z2d0dDsKKwlzdHJ1Y3QgaW50ZWxfZ3QgKmd0ID0gYXJnOworCXN0cnVj dCBpOTE1X2dndHQgKmdndHQgPSBndC0+Z2d0dDsKIAlzdHJ1Y3QgZHJtX21tX25vZGUgdGFyZ2V0 ID0gewogCQkuc3RhcnQgPSAwLAogCQkuc2l6ZSA9IDQwOTYsCkBAIC0yMjIsNyArMjIyLDcgQEAg c3RhdGljIGludCBpZ3RfZXZpY3RfZm9yX3ZtYSh2b2lkICphcmcpCiAKIAkvKiBGaWxsIHRoZSBH R1RUIHdpdGggcGlubmVkIG9iamVjdHMgYW5kIHRyeSB0byBldmljdCBhIHJhbmdlLiAqLwogCi0J ZXJyID0gcG9wdWxhdGVfZ2d0dChpOTE1LCAmb2JqZWN0cyk7CisJZXJyID0gcG9wdWxhdGVfZ2d0 dChnZ3R0LCAmb2JqZWN0cyk7CiAJaWYgKGVycikKIAkJZ290byBjbGVhbnVwOwogCkBAIC0yMzYs NyArMjM2LDcgQEAgc3RhdGljIGludCBpZ3RfZXZpY3RfZm9yX3ZtYSh2b2lkICphcmcpCiAJCWdv dG8gY2xlYW51cDsKIAl9CiAKLQl1bnBpbl9nZ3R0KGk5MTUpOworCXVucGluX2dndHQoZ2d0dCk7 CiAKIAkvKiBFdmVyeXRoaW5nIGlzIHVucGlubmVkLCB3ZSBzaG91bGQgYmUgYWJsZSB0byBldmlj dCB0aGUgbm9kZSAqLwogCW11dGV4X2xvY2soJmdndHQtPnZtLm11dGV4KTsKQEAgLTI0OSw3ICsy NDksNyBAQCBzdGF0aWMgaW50IGlndF9ldmljdF9mb3Jfdm1hKHZvaWQgKmFyZykKIAl9CiAKIGNs ZWFudXA6Ci0JY2xlYW51cF9vYmplY3RzKGk5MTUsICZvYmplY3RzKTsKKwljbGVhbnVwX29iamVj dHMoZ2d0dCwgJm9iamVjdHMpOwogCXJldHVybiBlcnI7CiB9CiAKQEAgLTI2Miw4ICsyNjIsOCBA QCBzdGF0aWMgdm9pZCBtb2NrX2NvbG9yX2FkanVzdChjb25zdCBzdHJ1Y3QgZHJtX21tX25vZGUg Km5vZGUsCiAKIHN0YXRpYyBpbnQgaWd0X2V2aWN0X2Zvcl9jYWNoZV9jb2xvcih2b2lkICphcmcp CiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUgPSBhcmc7Ci0Jc3RydWN0IGk5MTVf Z2d0dCAqZ2d0dCA9ICZpOTE1LT5nZ3R0OworCXN0cnVjdCBpbnRlbF9ndCAqZ3QgPSBhcmc7CisJ c3RydWN0IGk5MTVfZ2d0dCAqZ2d0dCA9IGd0LT5nZ3R0OwogCWNvbnN0IHVuc2lnbmVkIGxvbmcg ZmxhZ3MgPSBQSU5fT0ZGU0VUX0ZJWEVEOwogCXN0cnVjdCBkcm1fbW1fbm9kZSB0YXJnZXQgPSB7 CiAJCS5zdGFydCA9IEk5MTVfR1RUX1BBR0VfU0laRSAqIDIsCkBAIC0yODQsNyArMjg0LDcgQEAg c3RhdGljIGludCBpZ3RfZXZpY3RfZm9yX2NhY2hlX2NvbG9yKHZvaWQgKmFyZykKIAlnZ3R0LT52 bS5tbS5jb2xvcl9hZGp1c3QgPSBtb2NrX2NvbG9yX2FkanVzdDsKIAlHRU1fQlVHX09OKCFpOTE1 X3ZtX2hhc19jYWNoZV9jb2xvcmluZygmZ2d0dC0+dm0pKTsKIAotCW9iaiA9IGk5MTVfZ2VtX29i amVjdF9jcmVhdGVfaW50ZXJuYWwoaTkxNSwgSTkxNV9HVFRfUEFHRV9TSVpFKTsKKwlvYmogPSBp OTE1X2dlbV9vYmplY3RfY3JlYXRlX2ludGVybmFsKGd0LT5pOTE1LCBJOTE1X0dUVF9QQUdFX1NJ WkUpOwogCWlmIChJU19FUlIob2JqKSkgewogCQllcnIgPSBQVFJfRVJSKG9iaik7CiAJCWdvdG8g Y2xlYW51cDsKQEAgLTMwMCw3ICszMDAsNyBAQCBzdGF0aWMgaW50IGlndF9ldmljdF9mb3JfY2Fj aGVfY29sb3Iodm9pZCAqYXJnKQogCQlnb3RvIGNsZWFudXA7CiAJfQogCi0Jb2JqID0gaTkxNV9n ZW1fb2JqZWN0X2NyZWF0ZV9pbnRlcm5hbChpOTE1LCBJOTE1X0dUVF9QQUdFX1NJWkUpOworCW9i aiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGVfaW50ZXJuYWwoZ3QtPmk5MTUsIEk5MTVfR1RUX1BB R0VfU0laRSk7CiAJaWYgKElTX0VSUihvYmopKSB7CiAJCWVyciA9IFBUUl9FUlIob2JqKTsKIAkJ Z290byBjbGVhbnVwOwpAQCAtMzQ1LDIyICszNDUsMjIgQEAgc3RhdGljIGludCBpZ3RfZXZpY3Rf Zm9yX2NhY2hlX2NvbG9yKHZvaWQgKmFyZykKIAllcnIgPSAwOwogCiBjbGVhbnVwOgotCXVucGlu X2dndHQoaTkxNSk7Ci0JY2xlYW51cF9vYmplY3RzKGk5MTUsICZvYmplY3RzKTsKKwl1bnBpbl9n Z3R0KGdndHQpOworCWNsZWFudXBfb2JqZWN0cyhnZ3R0LCAmb2JqZWN0cyk7CiAJZ2d0dC0+dm0u bW0uY29sb3JfYWRqdXN0ID0gTlVMTDsKIAlyZXR1cm4gZXJyOwogfQogCiBzdGF0aWMgaW50IGln dF9ldmljdF92bSh2b2lkICphcmcpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUg PSBhcmc7Ci0Jc3RydWN0IGk5MTVfZ2d0dCAqZ2d0dCA9ICZpOTE1LT5nZ3R0OworCXN0cnVjdCBp bnRlbF9ndCAqZ3QgPSBhcmc7CisJc3RydWN0IGk5MTVfZ2d0dCAqZ2d0dCA9IGd0LT5nZ3R0Owog CUxJU1RfSEVBRChvYmplY3RzKTsKIAlpbnQgZXJyOwogCiAJLyogRmlsbCB0aGUgR0dUVCB3aXRo IHBpbm5lZCBvYmplY3RzIGFuZCB0cnkgdG8gZXZpY3QgZXZlcnl0aGluZy4gKi8KIAotCWVyciA9 IHBvcHVsYXRlX2dndHQoaTkxNSwgJm9iamVjdHMpOworCWVyciA9IHBvcHVsYXRlX2dndHQoZ2d0 dCwgJm9iamVjdHMpOwogCWlmIChlcnIpCiAJCWdvdG8gY2xlYW51cDsKIApAQCAtMzc0LDcgKzM3 NCw3IEBAIHN0YXRpYyBpbnQgaWd0X2V2aWN0X3ZtKHZvaWQgKmFyZykKIAkJZ290byBjbGVhbnVw OwogCX0KIAotCXVucGluX2dndHQoaTkxNSk7CisJdW5waW5fZ2d0dChnZ3R0KTsKIAogCW11dGV4 X2xvY2soJmdndHQtPnZtLm11dGV4KTsKIAllcnIgPSBpOTE1X2dlbV9ldmljdF92bSgmZ2d0dC0+ dm0pOwpAQCAtMzg2LDE0ICszODYsMTYgQEAgc3RhdGljIGludCBpZ3RfZXZpY3Rfdm0odm9pZCAq YXJnKQogCX0KIAogY2xlYW51cDoKLQljbGVhbnVwX29iamVjdHMoaTkxNSwgJm9iamVjdHMpOwor CWNsZWFudXBfb2JqZWN0cyhnZ3R0LCAmb2JqZWN0cyk7CiAJcmV0dXJuIGVycjsKIH0KIAogc3Rh dGljIGludCBpZ3RfZXZpY3RfY29udGV4dHModm9pZCAqYXJnKQogewogCWNvbnN0IHU2NCBQUkVU RU5EX0dHVFRfU0laRSA9IDE2dWxsIDw8IDIwOwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpp OTE1ID0gYXJnOworCXN0cnVjdCBpbnRlbF9ndCAqZ3QgPSBhcmc7CisJc3RydWN0IGk5MTVfZ2d0 dCAqZ2d0dCA9IGd0LT5nZ3R0OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1ID0gZ3Qt Pmk5MTU7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwogCWVudW0gaW50ZWxfZW5n aW5lX2lkIGlkOwogCXN0cnVjdCByZXNlcnZlZCB7CkBAIC00MjMsMTAgKzQyNSwxMCBAQCBzdGF0 aWMgaW50IGlndF9ldmljdF9jb250ZXh0cyh2b2lkICphcmcpCiAKIAkvKiBSZXNlcnZlIGEgYmxv Y2sgc28gdGhhdCB3ZSBrbm93IHdlIGhhdmUgZW5vdWdoIHRvIGZpdCBhIGZldyBycSAqLwogCW1l bXNldCgmaG9sZSwgMCwgc2l6ZW9mKGhvbGUpKTsKLQltdXRleF9sb2NrKCZpOTE1LT5nZ3R0LnZt Lm11dGV4KTsKLQllcnIgPSBpOTE1X2dlbV9ndHRfaW5zZXJ0KCZpOTE1LT5nZ3R0LnZtLCAmaG9s ZSwKKwltdXRleF9sb2NrKCZnZ3R0LT52bS5tdXRleCk7CisJZXJyID0gaTkxNV9nZW1fZ3R0X2lu c2VydCgmZ2d0dC0+dm0sICZob2xlLAogCQkJCSAgUFJFVEVORF9HR1RUX1NJWkUsIDAsIEk5MTVf Q09MT1JfVU5FVklDVEFCTEUsCi0JCQkJICAwLCBpOTE1LT5nZ3R0LnZtLnRvdGFsLAorCQkJCSAg MCwgZ2d0dC0+dm0udG90YWwsCiAJCQkJICBQSU5fTk9FVklDVCk7CiAJaWYgKGVycikKIAkJZ290 byBvdXRfbG9ja2VkOwpAQCAtNDM2LDE3ICs0MzgsMTcgQEAgc3RhdGljIGludCBpZ3RfZXZpY3Rf Y29udGV4dHModm9pZCAqYXJnKQogCWRvIHsKIAkJc3RydWN0IHJlc2VydmVkICpyOwogCi0JCW11 dGV4X3VubG9jaygmaTkxNS0+Z2d0dC52bS5tdXRleCk7CisJCW11dGV4X3VubG9jaygmZ2d0dC0+ dm0ubXV0ZXgpOwogCQlyID0ga2NhbGxvYygxLCBzaXplb2YoKnIpLCBHRlBfS0VSTkVMKTsKLQkJ bXV0ZXhfbG9jaygmaTkxNS0+Z2d0dC52bS5tdXRleCk7CisJCW11dGV4X2xvY2soJmdndHQtPnZt Lm11dGV4KTsKIAkJaWYgKCFyKSB7CiAJCQllcnIgPSAtRU5PTUVNOwogCQkJZ290byBvdXRfbG9j a2VkOwogCQl9CiAKLQkJaWYgKGk5MTVfZ2VtX2d0dF9pbnNlcnQoJmk5MTUtPmdndHQudm0sICZy LT5ub2RlLAorCQlpZiAoaTkxNV9nZW1fZ3R0X2luc2VydCgmZ2d0dC0+dm0sICZyLT5ub2RlLAog CQkJCQkxdWwgPDwgMjAsIDAsIEk5MTVfQ09MT1JfVU5FVklDVEFCTEUsCi0JCQkJCTAsIGk5MTUt PmdndHQudm0udG90YWwsCisJCQkJCTAsIGdndHQtPnZtLnRvdGFsLAogCQkJCQlQSU5fTk9FVklD VCkpIHsKIAkJCWtmcmVlKHIpOwogCQkJYnJlYWs7CkBAIC00NTgsMTEgKzQ2MCwxMSBAQCBzdGF0 aWMgaW50IGlndF9ldmljdF9jb250ZXh0cyh2b2lkICphcmcpCiAJCWNvdW50Kys7CiAJfSB3aGls ZSAoMSk7CiAJZHJtX21tX3JlbW92ZV9ub2RlKCZob2xlKTsKLQltdXRleF91bmxvY2soJmk5MTUt PmdndHQudm0ubXV0ZXgpOworCW11dGV4X3VubG9jaygmZ2d0dC0+dm0ubXV0ZXgpOwogCXByX2lu Zm8oIkZpbGxlZCBHR1RUIHdpdGggJWx1IDFNaUIgbm9kZXNcbiIsIGNvdW50KTsKIAogCS8qIE92 ZXJmaWxsIHRoZSBHR1RUIHdpdGggY29udGV4dCBvYmplY3RzIGFuZCBzbyB0cnkgdG8gZXZpY3Qg b25lLiAqLwotCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGk5MTUsIGlkKSB7CisJZm9yX2VhY2hf ZW5naW5lKGVuZ2luZSwgZ3QsIGlkKSB7CiAJCXN0cnVjdCBpOTE1X3N3X2ZlbmNlIGZlbmNlOwog CQlzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGU7CiAKQEAgLTUxOCw3ICs1MjAsNyBAQCBzdGF0aWMgaW50 IGlndF9ldmljdF9jb250ZXh0cyh2b2lkICphcmcpCiAJCQlicmVhazsKIAl9CiAKLQltdXRleF9s b2NrKCZpOTE1LT5nZ3R0LnZtLm11dGV4KTsKKwltdXRleF9sb2NrKCZnZ3R0LT52bS5tdXRleCk7 CiBvdXRfbG9ja2VkOgogCWlmIChpZ3RfZmx1c2hfdGVzdChpOTE1KSkKIAkJZXJyID0gLUVJTzsK QEAgLTUzMiw3ICs1MzQsNyBAQCBzdGF0aWMgaW50IGlndF9ldmljdF9jb250ZXh0cyh2b2lkICph cmcpCiAJfQogCWlmIChkcm1fbW1fbm9kZV9hbGxvY2F0ZWQoJmhvbGUpKQogCQlkcm1fbW1fcmVt b3ZlX25vZGUoJmhvbGUpOwotCW11dGV4X3VubG9jaygmaTkxNS0+Z2d0dC52bS5tdXRleCk7CisJ bXV0ZXhfdW5sb2NrKCZnZ3R0LT52bS5tdXRleCk7CiAJaW50ZWxfcnVudGltZV9wbV9wdXQoJmk5 MTUtPnJ1bnRpbWVfcG0sIHdha2VyZWYpOwogCiAJcmV0dXJuIGVycjsKQEAgLTU1Niw3ICs1NTgs NyBAQCBpbnQgaTkxNV9nZW1fZXZpY3RfbW9ja19zZWxmdGVzdHModm9pZCkKIAkJcmV0dXJuIC1F Tk9NRU07CiAKIAl3aXRoX2ludGVsX3J1bnRpbWVfcG0oJmk5MTUtPnJ1bnRpbWVfcG0sIHdha2Vy ZWYpCi0JCWVyciA9IGk5MTVfc3VidGVzdHModGVzdHMsIGk5MTUpOworCQllcnIgPSBpOTE1X3N1 YnRlc3RzKHRlc3RzLCAmaTkxNS0+Z3QpOwogCiAJZHJtX2Rldl9wdXQoJmk5MTUtPmRybSk7CiAJ cmV0dXJuIGVycjsKQEAgLTU3MSw1ICs1NzMsNSBAQCBpbnQgaTkxNV9nZW1fZXZpY3RfbGl2ZV9z ZWxmdGVzdHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCiAJaWYgKGludGVsX2d0X2lz X3dlZGdlZCgmaTkxNS0+Z3QpKQogCQlyZXR1cm4gMDsKIAotCXJldHVybiBpOTE1X3N1YnRlc3Rz KHRlc3RzLCBpOTE1KTsKKwlyZXR1cm4gaW50ZWxfZ3RfbGl2ZV9zdWJ0ZXN0cyh0ZXN0cywgJmk5 MTUtPmd0KTsKIH0KLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4