From: Nick Hoath Subject: [PATCH] drm/i915: Clean up lrc context init Date: Fri, 7 Aug 2015 11:05:24 +0100 Message-ID: <1438941924-28677-1-git-send-email-nicholas.hoath@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 219F46ECF0 for ; Fri, 7 Aug 2015 03:05:32 -0700 (PDT) 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 Q2xlYW4gdXAgbHJjIGNvbnRleHQgaW5pdCBieToKICAgLSBNb3ZlIGNvbnRleHQgaW5pdGlhbGlz YXRpb24gaW4gdG8gaTkxNV9nZW1faW5pdF9odwogICAtIE1vdmUgb25lIG9mZiBpbml0aWFsaXNh dGlvbiBmb3IgcmVuZGVyIHJpbmcgdG8KICAgICAgICBpOTE1X2dlbV92YWxpZGF0ZV9jb250ZXh0 CiAgIC0gTW92ZSBkZWZhdWx0IGNvbnRleHQgaW5pdGlhbGlzYXRpb24gdG8gbG9naWNhbF9yaW5n X2luaXQKClJlbmFtZSBpbnRlbF9scl9jb250ZXh0X2RlZmVycmVkX2NyZWF0ZSB0bwppbnRlbF9s cl9jb250ZXh0X2RlZmVycmVkX2FsbG9jLCB0byByZWZsZWN0IHJlZHVjZWQgZnVuY3Rpb25hbGl0 eS4KCklzc3VlOiBWSVotNDc5OApTaWduZWQtb2ZmLWJ5OiBOaWNrIEhvYXRoIDxuaWNob2xhcy5o b2F0aEBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAg ICAgICAgIHwgICAxIC0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgICAg ICB8ICAyMyArKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jICAg IHwgIDIxIC0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMg fCAgMzYgKysrKysrKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICAg ICB8IDEzMyArKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfbHJjLmggICAgICAgICAgIHwgICA0ICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9yaW5nYnVmZmVyLmMgICAgfCAgIDIgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cmluZ2J1ZmZlci5oICAgIHwgICAxICsKIDggZmlsZXMgY2hhbmdlZCwgMTA1IGluc2VydGlvbnMo KyksIDExNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA5MmVhOWFk Li5hYTZjNmRjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTMwNjUsNyArMzA2NSw2IEBA IGludCBfX211c3RfY2hlY2sgaTkxNV9nZW1fY29udGV4dF9pbml0KHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpOwogdm9pZCBpOTE1X2dlbV9jb250ZXh0X2Zpbmkoc3RydWN0IGRybV9kZXZpY2UgKmRl dik7CiB2b2lkIGk5MTVfZ2VtX2NvbnRleHRfcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7 CiBpbnQgaTkxNV9nZW1fY29udGV4dF9vcGVuKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVj dCBkcm1fZmlsZSAqZmlsZSk7Ci1pbnQgaTkxNV9nZW1fY29udGV4dF9lbmFibGUoc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpOwogdm9pZCBpOTE1X2dlbV9jb250ZXh0X2Nsb3NlKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSk7CiBpbnQgaTkxNV9z d2l0Y2hfY29udGV4dChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSk7CiBzdHJ1Y3Qg aW50ZWxfY29udGV4dCAqCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCBkOWYyNzAxLi43ZWJj NmUzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTQ5OTYsMTQgKzQ5OTYsOCBAQCBpbnQg aTkxNV9nZW1faW5pdF9yaW5ncyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJZ290byBjbGVh bnVwX3ZlYm94X3Jpbmc7CiAJfQogCi0JcmV0ID0gaTkxNV9nZW1fc2V0X3NlcW5vKGRldiwgKCh1 MzIpfjAgLSAweDEwMDApKTsKLQlpZiAocmV0KQotCQlnb3RvIGNsZWFudXBfYnNkMl9yaW5nOwot CiAJcmV0dXJuIDA7CiAKLWNsZWFudXBfYnNkMl9yaW5nOgotCWludGVsX2NsZWFudXBfcmluZ19i dWZmZXIoJmRldl9wcml2LT5yaW5nW1ZDUzJdKTsKIGNsZWFudXBfdmVib3hfcmluZzoKIAlpbnRl bF9jbGVhbnVwX3JpbmdfYnVmZmVyKCZkZXZfcHJpdi0+cmluZ1tWRUNTXSk7CiBjbGVhbnVwX2Js dF9yaW5nOgpAQCAtNTAyMiw2ICs1MDE2LDcgQEAgaTkxNV9nZW1faW5pdF9odyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZzsKIAlpbnQgcmV0LCBp LCBqOworCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxOwogCiAJaWYgKElOVEVMX0lO Rk8oZGV2KS0+Z2VuIDwgNiAmJiAhaW50ZWxfZW5hYmxlX2d0dCgpKQogCQlyZXR1cm4gLUVJTzsK QEAgLTUwNzMsOSArNTA2OCwxMiBAQCBpOTE1X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiAJCQlnb3RvIG91dDsKIAl9CiAKKwlyZXQgPSBpOTE1X2dlbV9zZXRfc2Vxbm8oZGV2 LCAoKHUzMil+MCAtIDB4MTAwMCkpOworCWlmIChyZXQpCisJCWdvdG8gb3V0OworCiAJLyogTm93 IGl0IGlzIHNhZmUgdG8gZ28gYmFjayByb3VuZCBhbmQgZG8gZXZlcnl0aGluZyBlbHNlOiAqLwog CWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpIHsKLQkJc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpyZXE7CiAKIAkJV0FSTl9PTighcmluZy0+ZGVmYXVsdF9jb250ZXh0KTsKIApA QCAtNTA5OCw5ICs1MDk2LDE0IEBAIGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKIAkJCWdvdG8gb3V0OwogCQl9CiAKLQkJcmV0ID0gaTkxNV9nZW1fY29udGV4dF9lbmFi bGUocmVxKTsKLQkJaWYgKHJldCAmJiByZXQgIT0gLUVJTykgewotCQkJRFJNX0VSUk9SKCJDb250 ZXh0IGVuYWJsZSByaW5nICMlZCBmYWlsZWQgJWRcbiIsIGksIHJldCk7CisJCXJldCA9IDA7CisJ CWlmIChyaW5nLT5zd2l0Y2hfY29udGV4dCAhPSBOVUxMKSB7CisJCQlyZXQgPSByaW5nLT5zd2l0 Y2hfY29udGV4dChyZXEpOworCQl9IGVsc2UgaWYgKHJpbmctPmluaXRfY29udGV4dCAhPSBOVUxM KSB7CisJCQlyZXQgPSByaW5nLT5pbml0X2NvbnRleHQocmVxKTsKKwkJfQorCQlpZiAocmV0KSB7 CisJCQlEUk1fRVJST1IoInJpbmcgaW5pdCBjb250ZXh0OiAlZFxuIiwgcmV0KTsKIAkJCWk5MTVf Z2VtX3JlcXVlc3RfY2FuY2VsKHJlcSk7CiAJCQlpOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIo ZGV2KTsKIAkJCWdvdG8gb3V0OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fY29udGV4dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5j CmluZGV4IGI3N2E4ZjcuLjE4YmQ1ZjUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2NvbnRleHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9j b250ZXh0LmMKQEAgLTQwNywyNyArNDA3LDYgQEAgdm9pZCBpOTE1X2dlbV9jb250ZXh0X2Zpbmko c3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpOTE1X2dlbV9jb250ZXh0X3VucmVmZXJlbmNlKGRj dHgpOwogfQogCi1pbnQgaTkxNV9nZW1fY29udGV4dF9lbmFibGUoc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpyZXEpCi17Ci0Jc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJlcS0+ cmluZzsKLQlpbnQgcmV0OwotCi0JaWYgKGk5MTUuZW5hYmxlX2V4ZWNsaXN0cykgewotCQlpZiAo cmluZy0+aW5pdF9jb250ZXh0ID09IE5VTEwpCi0JCQlyZXR1cm4gMDsKLQotCQlyZXQgPSByaW5n LT5pbml0X2NvbnRleHQocmVxKTsKLQl9IGVsc2UKLQkJcmV0ID0gaTkxNV9zd2l0Y2hfY29udGV4 dChyZXEpOwotCi0JaWYgKHJldCkgewotCQlEUk1fRVJST1IoInJpbmcgaW5pdCBjb250ZXh0OiAl ZFxuIiwgcmV0KTsKLQkJcmV0dXJuIHJldDsKLQl9Ci0KLQlyZXR1cm4gMDsKLX0KLQogc3RhdGlj IGludCBjb250ZXh0X2lkcl9jbGVhbnVwKGludCBpZCwgdm9pZCAqcCwgdm9pZCAqZGF0YSkKIHsK IAlzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4ID0gcDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2V4ZWNidWZmZXIuYwppbmRleCA5MjNhM2M0Li4zN2I0NDBhIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCkBAIC05OTQsNiArOTk0LDcgQEAgaTkx NV9nZW1fdmFsaWRhdGVfY29udGV4dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJt X2ZpbGUgKmZpbGUsCiB7CiAJc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCA9IE5VTEw7CiAJc3Ry dWN0IGk5MTVfY3R4X2hhbmdfc3RhdHMgKmhzOworCWludCByZXQ7CiAKIAlpZiAocmluZy0+aWQg IT0gUkNTICYmIGN0eF9pZCAhPSBERUZBVUxUX0NPTlRFWFRfSEFORExFKQogCQlyZXR1cm4gRVJS X1BUUigtRUlOVkFMKTsKQEAgLTEwMDksMTQgKzEwMTAsNDcgQEAgaTkxNV9nZW1fdmFsaWRhdGVf Y29udGV4dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCiAJ fQogCiAJaWYgKGk5MTUuZW5hYmxlX2V4ZWNsaXN0cyAmJiAhY3R4LT5lbmdpbmVbcmluZy0+aWRd LnN0YXRlKSB7Ci0JCWludCByZXQgPSBpbnRlbF9scl9jb250ZXh0X2RlZmVycmVkX2NyZWF0ZShj dHgsIHJpbmcpOworCQlyZXQgPSBpbnRlbF9scl9jb250ZXh0X2RlZmVycmVkX2FsbG9jKGN0eCwg cmluZyk7CiAJCWlmIChyZXQpIHsKIAkJCURSTV9ERUJVRygiQ291bGQgbm90IGNyZWF0ZSBMUkMg JXU6ICVkXG4iLCBjdHhfaWQsIHJldCk7CiAJCQlyZXR1cm4gRVJSX1BUUihyZXQpOwogCQl9CisK KwkJaWYgKHJpbmctPmlkID09IFJDUyAmJiAhY3R4LT5yY3NfaW5pdGlhbGl6ZWQpIHsKKwkJCWlm IChyaW5nLT5pbml0X2NvbnRleHQpIHsKKwkJCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg KnJlcTsKKworCQkJCXJldCA9IGk5MTVfZ2VtX3JlcXVlc3RfYWxsb2MocmluZywKKwkJCQkJcmlu Zy0+ZGVmYXVsdF9jb250ZXh0LCAmcmVxKTsKKwkJCQlpZiAocmV0KSB7CisJCQkJCURSTV9FUlJP UigicmluZyBjcmVhdGUgcmVxOiAlZFxuIiwKKwkJCQkJCSAgcmV0KTsKKwkJCQkJaTkxNV9nZW1f cmVxdWVzdF9jYW5jZWwocmVxKTsKKwkJCQkJZ290byB2YWxpZGF0ZV9lcnJvcjsKKwkJCQl9CisK KwkJCQlyZXQgPSByaW5nLT5pbml0X2NvbnRleHQocmVxKTsKKwkJCQlpZiAocmV0KSB7CisJCQkJ CURSTV9FUlJPUigicmluZyBpbml0IGNvbnRleHQ6ICVkXG4iLAorCQkJCQkJICByZXQpOworCQkJ CQlpOTE1X2dlbV9yZXF1ZXN0X2NhbmNlbChyZXEpOworCQkJCQlnb3RvIHZhbGlkYXRlX2Vycm9y OworCQkJCX0KKwkJCQlpOTE1X2FkZF9yZXF1ZXN0X25vX2ZsdXNoKHJlcSk7CisJCQl9CisKKwkJ CWN0eC0+cmNzX2luaXRpYWxpemVkID0gdHJ1ZTsKKwkJfQogCX0KIAogCXJldHVybiBjdHg7CisK K3ZhbGlkYXRlX2Vycm9yOgorCWludGVsX2Rlc3Ryb3lfcmluZ2J1ZmZlcl9vYmooY3R4LT5lbmdp bmVbcmluZy0+aWRdLnJpbmdidWYpOworCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZjdHgt PmVuZ2luZVtyaW5nLT5pZF0uc3RhdGUtPmJhc2UpOworCWN0eC0+ZW5naW5lW3JpbmctPmlkXS5y aW5nYnVmID0gTlVMTDsKKwljdHgtPmVuZ2luZVtyaW5nLT5pZF0uc3RhdGUgPSBOVUxMOworCXJl dHVybiBFUlJfUFRSKHJldCk7CiB9CiAKIHZvaWQKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5k ZXggMDAwN2Q0NS4uNzA4ZjAzZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTEzMzQs MTEgKzEzMzQsMzEgQEAgb3V0OgogCXJldHVybiByZXQ7CiB9CiAKK3N0YXRpYyB2b2lkIGxyY19z ZXR1cF9oYXJkd2FyZV9zdGF0dXNfcGFnZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAor CQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqZGVmYXVsdF9jdHhfb2JqKQoreworCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHJpbmctPmRldi0+ZGV2X3ByaXZhdGU7CisK KwkvKiBUaGUgc3RhdHVzIHBhZ2UgaXMgb2Zmc2V0IDAgZnJvbSB0aGUgZGVmYXVsdCBjb250ZXh0 IG9iamVjdAorCSAqIGluIExSQyBtb2RlLiAqLworCXJpbmctPnN0YXR1c19wYWdlLmdmeF9hZGRy ID0gaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KGRlZmF1bHRfY3R4X29iaik7CisJcmluZy0+c3Rh dHVzX3BhZ2UucGFnZV9hZGRyID0KKwkJCWttYXAoc2dfcGFnZShkZWZhdWx0X2N0eF9vYmotPnBh Z2VzLT5zZ2wpKTsKKwlyaW5nLT5zdGF0dXNfcGFnZS5vYmogPSBkZWZhdWx0X2N0eF9vYmo7CisK KwlJOTE1X1dSSVRFKFJJTkdfSFdTX1BHQShyaW5nLT5tbWlvX2Jhc2UpLAorCQkJKHUzMilyaW5n LT5zdGF0dXNfcGFnZS5nZnhfYWRkcik7CisJUE9TVElOR19SRUFEKFJJTkdfSFdTX1BHQShyaW5n LT5tbWlvX2Jhc2UpKTsKK30KKwogc3RhdGljIGludCBnZW44X2luaXRfY29tbW9uX3Jpbmcoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0g cmluZy0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2 X3ByaXZhdGU7CiAKKwlscmNfc2V0dXBfaGFyZHdhcmVfc3RhdHVzX3BhZ2UocmluZywKKwkJCQly aW5nLT5kZWZhdWx0X2NvbnRleHQtPmVuZ2luZVtyaW5nLT5pZF0uc3RhdGUpOworCiAJSTkxNV9X UklURV9JTVIocmluZywgfihyaW5nLT5pcnFfZW5hYmxlX21hc2sgfCByaW5nLT5pcnFfa2VlcF9t YXNrKSk7CiAJSTkxNV9XUklURShSSU5HX0hXU1RBTShyaW5nLT5tbWlvX2Jhc2UpLCAweGZmZmZm ZmZmKTsKIApAQCAtMTczMiw5ICsxNzUyLDM0IEBAIHN0YXRpYyBpbnQgbG9naWNhbF9yaW5nX2lu aXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluCiAJ aWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAotCXJldCA9IGludGVsX2xyX2NvbnRleHRfZGVmZXJy ZWRfY3JlYXRlKHJpbmctPmRlZmF1bHRfY29udGV4dCwgcmluZyk7CisJcmV0ID0gaW50ZWxfbHJf Y29udGV4dF9kZWZlcnJlZF9hbGxvYyhyaW5nLT5kZWZhdWx0X2NvbnRleHQsIHJpbmcpOworCWlm IChyZXQpCisJCXJldHVybiByZXQ7CisKKwlyZXQgPSBpOTE1X2dlbV9vYmpfZ2d0dF9waW4oCisJ CXJpbmctPmRlZmF1bHRfY29udGV4dC0+ZW5naW5lW3JpbmctPmlkXS5zdGF0ZSwKKwkJR0VOOF9M Ul9DT05URVhUX0FMSUdOLCAwKTsKKwlpZiAocmV0KSB7CisJCURSTV9ERUJVR19EUklWRVIoIlBp biBMUkMgYmFja2luZyBvYmogZmFpbGVkOiAlZFxuIiwKKwkJCQlyZXQpOworCQlyZXR1cm4gcmV0 OworCX0KKworCXJldCA9IGludGVsX3Bpbl9hbmRfbWFwX3JpbmdidWZmZXJfb2JqKGRldiwKKwkJ cmluZy0+ZGVmYXVsdF9jb250ZXh0LT5lbmdpbmVbcmluZy0+aWRdLnJpbmdidWYpOworCWlmIChy ZXQpIHsKKwkJRFJNX0VSUk9SKAorCQkJIkZhaWxlZCB0byBwaW4gYW5kIG1hcCByaW5nYnVmZmVy ICVzOiAlZFxuIiwKKwkJCXJpbmctPm5hbWUsIHJldCk7CisJCWdvdG8gZXJyb3JfdW5waW5fZ2d0 dDsKKwl9CiAKIAlyZXR1cm4gcmV0OworCitlcnJvcl91bnBpbl9nZ3R0OgorCWk5MTVfZ2VtX29i amVjdF9nZ3R0X3VucGluKAorCQlyaW5nLT5kZWZhdWx0X2NvbnRleHQtPmVuZ2luZVtyaW5nLT5p ZF0uc3RhdGUpOworCXJldHVybiByZXQ7CiB9CiAKIHN0YXRpYyBpbnQgbG9naWNhbF9yZW5kZXJf cmluZ19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCkBAIC0xOTM1LDE0ICsxOTgwLDggQEAg aW50IGludGVsX2xvZ2ljYWxfcmluZ3NfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJ Z290byBjbGVhbnVwX3ZlYm94X3Jpbmc7CiAJfQogCi0JcmV0ID0gaTkxNV9nZW1fc2V0X3NlcW5v KGRldiwgKCh1MzIpfjAgLSAweDEwMDApKTsKLQlpZiAocmV0KQotCQlnb3RvIGNsZWFudXBfYnNk Ml9yaW5nOwotCiAJcmV0dXJuIDA7CiAKLWNsZWFudXBfYnNkMl9yaW5nOgotCWludGVsX2xvZ2lj YWxfcmluZ19jbGVhbnVwKCZkZXZfcHJpdi0+cmluZ1tWQ1MyXSk7CiBjbGVhbnVwX3ZlYm94X3Jp bmc6CiAJaW50ZWxfbG9naWNhbF9yaW5nX2NsZWFudXAoJmRldl9wcml2LT5yaW5nW1ZFQ1NdKTsK IGNsZWFudXBfYmx0X3Jpbmc6CkBAIC0yMTgzLDI1ICsyMjIyLDggQEAgc3RhdGljIHVpbnQzMl90 IGdldF9scl9jb250ZXh0X3NpemUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAlyZXR1 cm4gcmV0OwogfQogCi1zdGF0aWMgdm9pZCBscmNfc2V0dXBfaGFyZHdhcmVfc3RhdHVzX3BhZ2Uo c3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKLQkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmpl Y3QgKmRlZmF1bHRfY3R4X29iaikKLXsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSByaW5nLT5kZXYtPmRldl9wcml2YXRlOwotCi0JLyogVGhlIHN0YXR1cyBwYWdlIGlzIG9m ZnNldCAwIGZyb20gdGhlIGRlZmF1bHQgY29udGV4dCBvYmplY3QKLQkgKiBpbiBMUkMgbW9kZS4g Ki8KLQlyaW5nLT5zdGF0dXNfcGFnZS5nZnhfYWRkciA9IGk5MTVfZ2VtX29ial9nZ3R0X29mZnNl dChkZWZhdWx0X2N0eF9vYmopOwotCXJpbmctPnN0YXR1c19wYWdlLnBhZ2VfYWRkciA9Ci0JCQlr bWFwKHNnX3BhZ2UoZGVmYXVsdF9jdHhfb2JqLT5wYWdlcy0+c2dsKSk7Ci0JcmluZy0+c3RhdHVz X3BhZ2Uub2JqID0gZGVmYXVsdF9jdHhfb2JqOwotCi0JSTkxNV9XUklURShSSU5HX0hXU19QR0Eo cmluZy0+bW1pb19iYXNlKSwKLQkJCSh1MzIpcmluZy0+c3RhdHVzX3BhZ2UuZ2Z4X2FkZHIpOwot CVBPU1RJTkdfUkVBRChSSU5HX0hXU19QR0EocmluZy0+bW1pb19iYXNlKSk7Ci19Ci0KIC8qKgot ICogaW50ZWxfbHJfY29udGV4dF9kZWZlcnJlZF9jcmVhdGUoKSAtIGNyZWF0ZSB0aGUgTFJDIHNw ZWNpZmljIGJpdHMgb2YgYSBjb250ZXh0CisgKiBpbnRlbF9scl9jb250ZXh0X2RlZmVycmVkX2Fs bG9jKCkgLSBjcmVhdGUgdGhlIExSQyBzcGVjaWZpYyBiaXRzIG9mIGEgY29udGV4dAogICogQGN0 eDogTFIgY29udGV4dCB0byBjcmVhdGUuCiAgKiBAcmluZzogZW5naW5lIHRvIGJlIHVzZWQgd2l0 aCB0aGUgY29udGV4dC4KICAqCkBAIC0yMjEzLDEwICsyMjM1LDEwIEBAIHN0YXRpYyB2b2lkIGxy Y19zZXR1cF9oYXJkd2FyZV9zdGF0dXNfcGFnZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5n LAogICoKICAqIFJldHVybjogbm9uLXplcm8gb24gZXJyb3IuCiAgKi8KLWludCBpbnRlbF9scl9j b250ZXh0X2RlZmVycmVkX2NyZWF0ZShzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAorCitpbnQg aW50ZWxfbHJfY29udGV4dF9kZWZlcnJlZF9hbGxvYyhzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4 LAogCQkJCSAgICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIHsKLQljb25zdCBib29s IGlzX2dsb2JhbF9kZWZhdWx0X2N0eCA9IChjdHggPT0gcmluZy0+ZGVmYXVsdF9jb250ZXh0KTsK IAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcmluZy0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9n ZW1fb2JqZWN0ICpjdHhfb2JqOwogCXVpbnQzMl90IGNvbnRleHRfc2l6ZTsKQEAgLTIyMzQsMjIg KzIyNTYsMTIgQEAgaW50IGludGVsX2xyX2NvbnRleHRfZGVmZXJyZWRfY3JlYXRlKHN0cnVjdCBp bnRlbF9jb250ZXh0ICpjdHgsCiAJCXJldHVybiAtRU5PTUVNOwogCX0KIAotCWlmIChpc19nbG9i YWxfZGVmYXVsdF9jdHgpIHsKLQkJcmV0ID0gaTkxNV9nZW1fb2JqX2dndHRfcGluKGN0eF9vYmos IEdFTjhfTFJfQ09OVEVYVF9BTElHTiwgMCk7Ci0JCWlmIChyZXQpIHsKLQkJCURSTV9ERUJVR19E UklWRVIoIlBpbiBMUkMgYmFja2luZyBvYmogZmFpbGVkOiAlZFxuIiwKLQkJCQkJcmV0KTsKLQkJ CWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZjdHhfb2JqLT5iYXNlKTsKLQkJCXJldHVybiBy ZXQ7Ci0JCX0KLQl9Ci0KIAlyaW5nYnVmID0ga3phbGxvYyhzaXplb2YoKnJpbmdidWYpLCBHRlBf S0VSTkVMKTsKIAlpZiAoIXJpbmdidWYpIHsKIAkJRFJNX0RFQlVHX0RSSVZFUigiRmFpbGVkIHRv IGFsbG9jYXRlIHJpbmdidWZmZXIgJXNcbiIsCiAJCQkJcmluZy0+bmFtZSk7CiAJCXJldCA9IC1F Tk9NRU07Ci0JCWdvdG8gZXJyb3JfdW5waW5fY3R4OworCQlnb3RvIGVycm9yX2RlcmVmX29iajsK IAl9CiAKIAlyaW5nYnVmLT5yaW5nID0gcmluZzsKQEAgLTIyNjksNjUgKzIyODEsMjQgQEAgaW50 IGludGVsX2xyX2NvbnRleHRfZGVmZXJyZWRfY3JlYXRlKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpj dHgsCiAJCQkJcmluZy0+bmFtZSwgcmV0KTsKIAkJCWdvdG8gZXJyb3JfZnJlZV9yYnVmOwogCQl9 Ci0KLQkJaWYgKGlzX2dsb2JhbF9kZWZhdWx0X2N0eCkgewotCQkJcmV0ID0gaW50ZWxfcGluX2Fu ZF9tYXBfcmluZ2J1ZmZlcl9vYmooZGV2LCByaW5nYnVmKTsKLQkJCWlmIChyZXQpIHsKLQkJCQlE Uk1fRVJST1IoCi0JCQkJCSJGYWlsZWQgdG8gcGluIGFuZCBtYXAgcmluZ2J1ZmZlciAlczogJWRc biIsCi0JCQkJCXJpbmctPm5hbWUsIHJldCk7Ci0JCQkJZ290byBlcnJvcl9kZXN0cm95X3JidWY7 Ci0JCQl9Ci0JCX0KLQogCX0KIAogCXJldCA9IHBvcHVsYXRlX2xyX2NvbnRleHQoY3R4LCBjdHhf b2JqLCByaW5nLCByaW5nYnVmKTsKIAlpZiAocmV0KSB7CiAJCURSTV9ERUJVR19EUklWRVIoIkZh aWxlZCB0byBwb3B1bGF0ZSBMUkM6ICVkXG4iLCByZXQpOwotCQlnb3RvIGVycm9yOworCQlnb3Rv IGVycm9yX2Rlc3Ryb3lfcmJ1ZjsKIAl9CiAKIAljdHgtPmVuZ2luZVtyaW5nLT5pZF0ucmluZ2J1 ZiA9IHJpbmdidWY7CiAJY3R4LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlID0gY3R4X29iajsKIAot CWlmIChjdHggPT0gcmluZy0+ZGVmYXVsdF9jb250ZXh0KQotCQlscmNfc2V0dXBfaGFyZHdhcmVf c3RhdHVzX3BhZ2UocmluZywgY3R4X29iaik7Ci0JZWxzZSBpZiAocmluZy0+aWQgPT0gUkNTICYm ICFjdHgtPnJjc19pbml0aWFsaXplZCkgewotCQlpZiAocmluZy0+aW5pdF9jb250ZXh0KSB7Ci0J CQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcTsKLQotCQkJcmV0ID0gaTkxNV9nZW1f cmVxdWVzdF9hbGxvYyhyaW5nLCBjdHgsICZyZXEpOwotCQkJaWYgKHJldCkKLQkJCQlyZXR1cm4g cmV0OwotCi0JCQlyZXQgPSByaW5nLT5pbml0X2NvbnRleHQocmVxKTsKLQkJCWlmIChyZXQpIHsK LQkJCQlEUk1fRVJST1IoInJpbmcgaW5pdCBjb250ZXh0OiAlZFxuIiwgcmV0KTsKLQkJCQlpOTE1 X2dlbV9yZXF1ZXN0X2NhbmNlbChyZXEpOwotCQkJCWN0eC0+ZW5naW5lW3JpbmctPmlkXS5yaW5n YnVmID0gTlVMTDsKLQkJCQljdHgtPmVuZ2luZVtyaW5nLT5pZF0uc3RhdGUgPSBOVUxMOwotCQkJ CWdvdG8gZXJyb3I7Ci0JCQl9Ci0KLQkJCWk5MTVfYWRkX3JlcXVlc3Rfbm9fZmx1c2gocmVxKTsK LQkJfQotCi0JCWN0eC0+cmNzX2luaXRpYWxpemVkID0gdHJ1ZTsKLQl9Ci0KIAlyZXR1cm4gMDsK IAotZXJyb3I6Ci0JaWYgKGlzX2dsb2JhbF9kZWZhdWx0X2N0eCkKLQkJaW50ZWxfdW5waW5fcmlu Z2J1ZmZlcl9vYmoocmluZ2J1Zik7CiBlcnJvcl9kZXN0cm95X3JidWY6CiAJaW50ZWxfZGVzdHJv eV9yaW5nYnVmZmVyX29iaihyaW5nYnVmKTsKIGVycm9yX2ZyZWVfcmJ1ZjoKIAlrZnJlZShyaW5n YnVmKTsKLWVycm9yX3VucGluX2N0eDoKLQlpZiAoaXNfZ2xvYmFsX2RlZmF1bHRfY3R4KQotCQlp OTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihjdHhfb2JqKTsKK2Vycm9yX2RlcmVmX29iajoKIAlk cm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZSgmY3R4X29iai0+YmFzZSk7CiAJcmV0dXJuIHJldDsK IH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgKaW5kZXggZTAyOTlmYi4uOTU5YzY4ZSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbHJjLmgKQEAgLTY4LDggKzY4LDggQEAgc3RhdGljIGlubGluZSB2b2lk IGludGVsX2xvZ2ljYWxfcmluZ19lbWl0KHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVm LAogCiAvKiBMb2dpY2FsIFJpbmcgQ29udGV4dHMgKi8KIHZvaWQgaW50ZWxfbHJfY29udGV4dF9m cmVlKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgpOwotaW50IGludGVsX2xyX2NvbnRleHRfZGVm ZXJyZWRfY3JlYXRlKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCi0JCQkJICAgICBzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICpyaW5nKTsKK2ludCBpbnRlbF9scl9jb250ZXh0X2RlZmVycmVkX2Fs bG9jKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCisJCQkJICAgIHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKnJpbmcpOwogdm9pZCBpbnRlbF9scl9jb250ZXh0X3VucGluKHN0cnVjdCBkcm1faTkx NV9nZW1fcmVxdWVzdCAqcmVxKTsKIHZvaWQgaW50ZWxfbHJfY29udGV4dF9yZXNldChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LAogCQkJc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCk7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKaW5kZXggMzg1ODU5ZS4uZjBkMDI5ZiAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMjY3Niw2ICsyNjc2LDgg QEAgaW50IGludGVsX2luaXRfcmVuZGVyX3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAJZWxzZQogCQlyaW5nLT5kaXNwYXRjaF9leGVjYnVmZmVyID0gaTkxNV9kaXNwYXRjaF9l eGVjYnVmZmVyOwogCXJpbmctPmluaXRfaHcgPSBpbml0X3JlbmRlcl9yaW5nOworCWlmICghaTkx NS5lbmFibGVfZXhlY2xpc3RzKQorCQlyaW5nLT5zd2l0Y2hfY29udGV4dCA9IGk5MTVfc3dpdGNo X2NvbnRleHQ7CiAJcmluZy0+Y2xlYW51cCA9IHJlbmRlcl9yaW5nX2NsZWFudXA7CiAKIAkvKiBX b3JrYXJvdW5kIGJhdGNoYnVmZmVyIHRvIGNvbWJhdCBDUyB0bGIgYnVnLiAqLwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCmluZGV4IDJlODVmZGEuLjgyMmZmYmUgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTE3Nyw2ICsxNzcsNyBAQCBz dHJ1Y3QgIGludGVsX2VuZ2luZV9jcyB7CiAJaW50CQkoKmluaXRfaHcpKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKnJpbmcpOwogCiAJaW50CQkoKmluaXRfY29udGV4dCkoc3RydWN0IGRybV9pOTE1 X2dlbV9yZXF1ZXN0ICpyZXEpOworCWludAkJKCpzd2l0Y2hfY29udGV4dCkoc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpyZXEpOwogCiAJdm9pZAkJKCp3cml0ZV90YWlsKShzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICpyaW5nLAogCQkJCSAgICAgIHUzMiB2YWx1ZSk7Ci0tIAoyLjEuMQoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK