From: Ville Syrjala Subject: [PATCH v4 09/12] drm/i915: Extract skl_universal_plane_init() Date: Fri, 1 Jun 2018 21:39:15 +0300 Message-ID: <20180601183915.951-1-ville.syrjala@linux.intel.com> References: <20180601170034.13095-10-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id E5F706E371 for ; Fri, 1 Jun 2018 18:39:18 +0000 (UTC) In-Reply-To: <20180601170034.13095-10-ville.syrjala@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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClRo ZXJlJ3Mgbm90IG11Y2ggcG9pbnQgaW4gZm9sbG93aW5nIHRoZSBwcmltYXJ5IHZzLiBzcHJpdGUg c3BsaXQKZm9yIHRoZSBTS0wrIHVuaXZlcnNhbCBwbGFuZSBpbml0IGNvZGUuIFRoZSBvbmx5IGRp ZmZlcmVuY2UgaXMKb2Ygb3VyIG93biBkb2luZyBpbiB0aGUgZm9ybSBvZiB0aGUgLmNoZWNrX3Bs YW5lKCkuIExldCdzIG1ha2UKYSBzbWFsbCBleGNlcHRpb24gZm9yIHRoYXQgbGl0dGxlIGRldGFp bCBhbmQgb3RoZXJ3aXNlIHNoYXJlCnRoZSBzYW1lIGNvZGUgdG8gaW5pdGlhbGl6ZSBhbGwgdGhl IHVuaXZlcnNhbCBwbGFuZXMuCgpFdmVudHVhbGx5IHdlIHNob3VsZCBlbGltaW5hdGUgdGhlIG1l c3MgYXJvdW5kIC5jaGVja19wbGFuZSgpCmFzIHdlbGwsIGJ1dCBmb3Igbm93IGxldCdzIGJlIGhh cHB5IHdpdGggc29tZSBjb2RlIHJlZHVjdGlvbi4KCnYyOiBSZW1lbWJlciB0byBzZXQgdXAgcGxh bmUtPmhhc19mYmMKICAgIE1ha2Ugc2tsX3BsYW5lX2hhc19jY3MoKSBzdGF0aWMKdjM6IFJlYmFz ZSBkdWUgdG8gTlYxMiwgcmVuYW1lIHNvbWUgdmFyaWFibGVzCnY0OiBEb24ndCBsZWF2ZSB0aGUg Y29sb3JfZW5jb2RpbmcvcmFuZ2UgcHJvcHMgYmVoaW5kCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBT eXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDIyMCArKystLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDEyICst CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyAgfCAyMDEgKysrKysrKysrKysr KysrKysrKysrKystLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTY3IGluc2VydGlvbnMoKyks IDI2NiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXgg MTNkZTRlOWUyNzZhLi4yNTQ5ZmVjMzFjNzkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKQEAgLTczLDU1ICs3Myw2IEBAIHN0YXRpYyBjb25zdCB1aW50NjRfdCBpOXh4X2Zvcm1h dF9tb2RpZmllcnNbXSA9IHsKIAlEUk1fRk9STUFUX01PRF9JTlZBTElECiB9OwogCi1zdGF0aWMg Y29uc3QgdWludDMyX3Qgc2tsX3ByaW1hcnlfZm9ybWF0c1tdID0gewotCURSTV9GT1JNQVRfQzgs Ci0JRFJNX0ZPUk1BVF9SR0I1NjUsCi0JRFJNX0ZPUk1BVF9YUkdCODg4OCwKLQlEUk1fRk9STUFU X1hCR1I4ODg4LAotCURSTV9GT1JNQVRfQVJHQjg4ODgsCi0JRFJNX0ZPUk1BVF9BQkdSODg4OCwK LQlEUk1fRk9STUFUX1hSR0IyMTAxMDEwLAotCURSTV9GT1JNQVRfWEJHUjIxMDEwMTAsCi0JRFJN X0ZPUk1BVF9ZVVlWLAotCURSTV9GT1JNQVRfWVZZVSwKLQlEUk1fRk9STUFUX1VZVlksCi0JRFJN X0ZPUk1BVF9WWVVZLAotfTsKLQotc3RhdGljIGNvbnN0IHVpbnQzMl90IHNrbF9wcmlfcGxhbmFy X2Zvcm1hdHNbXSA9IHsKLQlEUk1fRk9STUFUX0M4LAotCURSTV9GT1JNQVRfUkdCNTY1LAotCURS TV9GT1JNQVRfWFJHQjg4ODgsCi0JRFJNX0ZPUk1BVF9YQkdSODg4OCwKLQlEUk1fRk9STUFUX0FS R0I4ODg4LAotCURSTV9GT1JNQVRfQUJHUjg4ODgsCi0JRFJNX0ZPUk1BVF9YUkdCMjEwMTAxMCwK LQlEUk1fRk9STUFUX1hCR1IyMTAxMDEwLAotCURSTV9GT1JNQVRfWVVZViwKLQlEUk1fRk9STUFU X1lWWVUsCi0JRFJNX0ZPUk1BVF9VWVZZLAotCURSTV9GT1JNQVRfVllVWSwKLQlEUk1fRk9STUFU X05WMTIsCi19OwotCi1zdGF0aWMgY29uc3QgdWludDY0X3Qgc2tsX2Zvcm1hdF9tb2RpZmllcnNf bm9jY3NbXSA9IHsKLQlJOTE1X0ZPUk1BVF9NT0RfWWZfVElMRUQsCi0JSTkxNV9GT1JNQVRfTU9E X1lfVElMRUQsCi0JSTkxNV9GT1JNQVRfTU9EX1hfVElMRUQsCi0JRFJNX0ZPUk1BVF9NT0RfTElO RUFSLAotCURSTV9GT1JNQVRfTU9EX0lOVkFMSUQKLX07Ci0KLXN0YXRpYyBjb25zdCB1aW50NjRf dCBza2xfZm9ybWF0X21vZGlmaWVyc19jY3NbXSA9IHsKLQlJOTE1X0ZPUk1BVF9NT0RfWWZfVElM RURfQ0NTLAotCUk5MTVfRk9STUFUX01PRF9ZX1RJTEVEX0NDUywKLQlJOTE1X0ZPUk1BVF9NT0Rf WWZfVElMRUQsCi0JSTkxNV9GT1JNQVRfTU9EX1lfVElMRUQsCi0JSTkxNV9GT1JNQVRfTU9EX1hf VElMRUQsCi0JRFJNX0ZPUk1BVF9NT0RfTElORUFSLAotCURSTV9GT1JNQVRfTU9EX0lOVkFMSUQK LX07Ci0KIC8qIEN1cnNvciBmb3JtYXRzICovCiBzdGF0aWMgY29uc3QgdWludDMyX3QgaW50ZWxf Y3Vyc29yX2Zvcm1hdHNbXSA9IHsKIAlEUk1fRk9STUFUX0FSR0I4ODg4LApAQCAtMTMyNzMsNTcg KzEzMjI0LDYgQEAgc3RhdGljIGJvb2wgaTk2NV9wbGFuZV9mb3JtYXRfbW9kX3N1cHBvcnRlZChz dHJ1Y3QgZHJtX3BsYW5lICpfcGxhbmUsCiAJfQogfQogCi1zdGF0aWMgYm9vbCBza2xfcGxhbmVf Zm9ybWF0X21vZF9zdXBwb3J0ZWQoc3RydWN0IGRybV9wbGFuZSAqX3BsYW5lLAotCQkJCQkgICB1 MzIgZm9ybWF0LCB1NjQgbW9kaWZpZXIpCi17Ci0Jc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSA9 IHRvX2ludGVsX3BsYW5lKF9wbGFuZSk7Ci0KLQlzd2l0Y2ggKG1vZGlmaWVyKSB7Ci0JY2FzZSBE Uk1fRk9STUFUX01PRF9MSU5FQVI6Ci0JY2FzZSBJOTE1X0ZPUk1BVF9NT0RfWF9USUxFRDoKLQlj YXNlIEk5MTVfRk9STUFUX01PRF9ZX1RJTEVEOgotCWNhc2UgSTkxNV9GT1JNQVRfTU9EX1lmX1RJ TEVEOgotCQlicmVhazsKLQljYXNlIEk5MTVfRk9STUFUX01PRF9ZX1RJTEVEX0NDUzoKLQljYXNl IEk5MTVfRk9STUFUX01PRF9ZZl9USUxFRF9DQ1M6Ci0JCWlmICghcGxhbmUtPmhhc19jY3MpCi0J CQlyZXR1cm4gZmFsc2U7Ci0JCWJyZWFrOwotCWRlZmF1bHQ6Ci0JCXJldHVybiBmYWxzZTsKLQl9 Ci0KLQlzd2l0Y2ggKGZvcm1hdCkgewotCWNhc2UgRFJNX0ZPUk1BVF9YUkdCODg4ODoKLQljYXNl IERSTV9GT1JNQVRfWEJHUjg4ODg6Ci0JY2FzZSBEUk1fRk9STUFUX0FSR0I4ODg4OgotCWNhc2Ug RFJNX0ZPUk1BVF9BQkdSODg4ODoKLQkJaWYgKG1vZGlmaWVyID09IEk5MTVfRk9STUFUX01PRF9Z Zl9USUxFRF9DQ1MgfHwKLQkJICAgIG1vZGlmaWVyID09IEk5MTVfRk9STUFUX01PRF9ZX1RJTEVE X0NDUykKLQkJCXJldHVybiB0cnVlOwotCQkvKiBmYWxsIHRocm91Z2ggKi8KLQljYXNlIERSTV9G T1JNQVRfUkdCNTY1OgotCWNhc2UgRFJNX0ZPUk1BVF9YUkdCMjEwMTAxMDoKLQljYXNlIERSTV9G T1JNQVRfWEJHUjIxMDEwMTA6Ci0JY2FzZSBEUk1fRk9STUFUX1lVWVY6Ci0JY2FzZSBEUk1fRk9S TUFUX1lWWVU6Ci0JY2FzZSBEUk1fRk9STUFUX1VZVlk6Ci0JY2FzZSBEUk1fRk9STUFUX1ZZVVk6 Ci0JY2FzZSBEUk1fRk9STUFUX05WMTI6Ci0JCWlmIChtb2RpZmllciA9PSBJOTE1X0ZPUk1BVF9N T0RfWWZfVElMRUQpCi0JCQlyZXR1cm4gdHJ1ZTsKLQkJLyogZmFsbCB0aHJvdWdoICovCi0JY2Fz ZSBEUk1fRk9STUFUX0M4OgotCQlpZiAobW9kaWZpZXIgPT0gRFJNX0ZPUk1BVF9NT0RfTElORUFS IHx8Ci0JCSAgICBtb2RpZmllciA9PSBJOTE1X0ZPUk1BVF9NT0RfWF9USUxFRCB8fAotCQkgICAg bW9kaWZpZXIgPT0gSTkxNV9GT1JNQVRfTU9EX1lfVElMRUQpCi0JCQlyZXR1cm4gdHJ1ZTsKLQkJ LyogZmFsbCB0aHJvdWdoICovCi0JZGVmYXVsdDoKLQkJcmV0dXJuIGZhbHNlOwotCX0KLX0KLQog c3RhdGljIGJvb2wgaW50ZWxfY3Vyc29yX2Zvcm1hdF9tb2Rfc3VwcG9ydGVkKHN0cnVjdCBkcm1f cGxhbmUgKl9wbGFuZSwKIAkJCQkJICAgICAgdTMyIGZvcm1hdCwgdTY0IG1vZGlmaWVyKQogewpA QCAtMTMzMzEsMTcgKzEzMjMxLDYgQEAgc3RhdGljIGJvb2wgaW50ZWxfY3Vyc29yX2Zvcm1hdF9t b2Rfc3VwcG9ydGVkKHN0cnVjdCBkcm1fcGxhbmUgKl9wbGFuZSwKIAkJZm9ybWF0ID09IERSTV9G T1JNQVRfQVJHQjg4ODg7CiB9CiAKLXN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX2Z1bmNz IHNrbF9wbGFuZV9mdW5jcyA9IHsKLQkudXBkYXRlX3BsYW5lID0gZHJtX2F0b21pY19oZWxwZXJf dXBkYXRlX3BsYW5lLAotCS5kaXNhYmxlX3BsYW5lID0gZHJtX2F0b21pY19oZWxwZXJfZGlzYWJs ZV9wbGFuZSwKLQkuZGVzdHJveSA9IGludGVsX3BsYW5lX2Rlc3Ryb3ksCi0JLmF0b21pY19nZXRf cHJvcGVydHkgPSBpbnRlbF9wbGFuZV9hdG9taWNfZ2V0X3Byb3BlcnR5LAotCS5hdG9taWNfc2V0 X3Byb3BlcnR5ID0gaW50ZWxfcGxhbmVfYXRvbWljX3NldF9wcm9wZXJ0eSwKLQkuYXRvbWljX2R1 cGxpY2F0ZV9zdGF0ZSA9IGludGVsX3BsYW5lX2R1cGxpY2F0ZV9zdGF0ZSwKLQkuYXRvbWljX2Rl c3Ryb3lfc3RhdGUgPSBpbnRlbF9wbGFuZV9kZXN0cm95X3N0YXRlLAotCS5mb3JtYXRfbW9kX3N1 cHBvcnRlZCA9IHNrbF9wbGFuZV9mb3JtYXRfbW9kX3N1cHBvcnRlZCwKLX07Ci0KIHN0YXRpYyBj b25zdCBzdHJ1Y3QgZHJtX3BsYW5lX2Z1bmNzIGk5NjVfcGxhbmVfZnVuY3MgPSB7CiAJLnVwZGF0 ZV9wbGFuZSA9IGRybV9hdG9taWNfaGVscGVyX3VwZGF0ZV9wbGFuZSwKIAkuZGlzYWJsZV9wbGFu ZSA9IGRybV9hdG9taWNfaGVscGVyX2Rpc2FibGVfcGxhbmUsCkBAIC0xMzUwNiwzOSArMTMzOTUs NiBAQCBzdGF0aWMgYm9vbCBpOXh4X3BsYW5lX2hhc19mYmMoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LAogCQlyZXR1cm4gaTl4eF9wbGFuZSA9PSBQTEFORV9BOwogfQogCi1zdGF0 aWMgYm9vbCBza2xfcGxhbmVfaGFzX2ZiYyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsCi0JCQkgICAgICBlbnVtIHBpcGUgcGlwZSwgZW51bSBwbGFuZV9pZCBwbGFuZV9pZCkKLXsK LQlpZiAoIUhBU19GQkMoZGV2X3ByaXYpKQotCQlyZXR1cm4gZmFsc2U7Ci0KLQlyZXR1cm4gcGlw ZSA9PSBQSVBFX0EgJiYgcGxhbmVfaWQgPT0gUExBTkVfUFJJTUFSWTsKLX0KLQotYm9vbCBza2xf cGxhbmVfaGFzX3BsYW5hcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkg IGVudW0gcGlwZSBwaXBlLCBlbnVtIHBsYW5lX2lkIHBsYW5lX2lkKQotewotCWlmIChwbGFuZV9p ZCA9PSBQTEFORV9QUklNQVJZKSB7Ci0JCWlmIChJU19TS1lMQUtFKGRldl9wcml2KSB8fCBJU19C Uk9YVE9OKGRldl9wcml2KSkKLQkJCXJldHVybiBmYWxzZTsKLQkJZWxzZSBpZiAoKElOVEVMX0dF TihkZXZfcHJpdikgPT0gOSAmJiBwaXBlID09IFBJUEVfQykgJiYKLQkJCSAhSVNfR0VNSU5JTEFL RShkZXZfcHJpdikpCi0JCQlyZXR1cm4gZmFsc2U7Ci0JfSBlbHNlIGlmIChwbGFuZV9pZCA+PSBQ TEFORV9TUFJJVEUwKSB7Ci0JCWlmIChwbGFuZV9pZCA9PSBQTEFORV9DVVJTT1IpCi0JCQlyZXR1 cm4gZmFsc2U7Ci0JCWlmIChJU19HRU1JTklMQUtFKGRldl9wcml2KSB8fCBJTlRFTF9HRU4oZGV2 X3ByaXYpID09IDEwKSB7Ci0JCQlpZiAocGxhbmVfaWQgIT0gUExBTkVfU1BSSVRFMCkKLQkJCQly ZXR1cm4gZmFsc2U7Ci0JCX0gZWxzZSB7Ci0JCQlpZiAocGxhbmVfaWQgIT0gUExBTkVfU1BSSVRF MCB8fCBwaXBlID09IFBJUEVfQyB8fAotCQkJICAgIElTX1NLWUxBS0UoZGV2X3ByaXYpIHx8IElT X0JST1hUT04oZGV2X3ByaXYpKQotCQkJCXJldHVybiBmYWxzZTsKLQkJfQotCX0KLQlyZXR1cm4g dHJ1ZTsKLX0KLQogc3RhdGljIHN0cnVjdCBpbnRlbF9wbGFuZSAqCiBpbnRlbF9wcmltYXJ5X3Bs YW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGVudW0gcGlwZSBw aXBlKQogewpAQCAtMTM1NTEsMTQgKzEzNDA3LDI0IEBAIGludGVsX3ByaW1hcnlfcGxhbmVfY3Jl YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgZW51bSBwaXBlIHBpcGUpCiAJ Y29uc3QgdWludDY0X3QgKm1vZGlmaWVyczsKIAlpbnQgcmV0OwogCisJaWYgKElOVEVMX0dFTihk ZXZfcHJpdikgPj0gOSkgeworCQlwcmltYXJ5ID0gc2tsX3VuaXZlcnNhbF9wbGFuZV9jcmVhdGUo ZGV2X3ByaXYsIHBpcGUsCisJCQkJCQkgICAgIFBMQU5FX1BSSU1BUlkpOworCQlpZiAoSVNfRVJS KHByaW1hcnkpKQorCQkJcmV0dXJuIHByaW1hcnk7CisKKwkJLyogRklYTUUgdW5pZnkgKi8KKwkJ cHJpbWFyeS0+Y2hlY2tfcGxhbmUgPSBpbnRlbF9jaGVja19wcmltYXJ5X3BsYW5lOworCisJCXJl dHVybiBwcmltYXJ5OworCX0KKwogCXByaW1hcnkgPSBpbnRlbF9wbGFuZV9hbGxvYygpOwogCWlm IChJU19FUlIocHJpbWFyeSkpCiAJCXJldHVybiBwcmltYXJ5OwogCiAJcHJpbWFyeS0+Y2FuX3Nj YWxlID0gZmFsc2U7CiAJcHJpbWFyeS0+bWF4X2Rvd25zY2FsZSA9IDE7Ci0JaWYgKElOVEVMX0dF TihkZXZfcHJpdikgPj0gOSkKLQkJcHJpbWFyeS0+Y2FuX3NjYWxlID0gdHJ1ZTsKIAlwcmltYXJ5 LT5waXBlID0gcGlwZTsKIAkvKgogCSAqIE9uIGdlbjIvMyBvbmx5IHBsYW5lIEEgY2FuIGRvIEZC QywgYnV0IHRoZSBwYW5lbCBmaXR0ZXIgYW5kIExWRFMKQEAgLTEzNTcxLDE0ICsxMzQzNyw3IEBA IGludGVsX3ByaW1hcnlfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwgZW51bSBwaXBlIHBpcGUpCiAJcHJpbWFyeS0+aWQgPSBQTEFORV9QUklNQVJZOwogCXBy aW1hcnktPmZyb250YnVmZmVyX2JpdCA9IElOVEVMX0ZST05UQlVGRkVSKHBpcGUsIHByaW1hcnkt PmlkKTsKIAotCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpCi0JCXByaW1hcnktPmhhc19m YmMgPSBza2xfcGxhbmVfaGFzX2ZiYyhkZXZfcHJpdiwKLQkJCQkJCSAgICAgcHJpbWFyeS0+cGlw ZSwKLQkJCQkJCSAgICAgcHJpbWFyeS0+aWQpOwotCWVsc2UKLQkJcHJpbWFyeS0+aGFzX2ZiYyA9 IGk5eHhfcGxhbmVfaGFzX2ZiYyhkZXZfcHJpdiwKLQkJCQkJCSAgICAgIHByaW1hcnktPmk5eHhf cGxhbmUpOwotCisJcHJpbWFyeS0+aGFzX2ZiYyA9IGk5eHhfcGxhbmVfaGFzX2ZiYyhkZXZfcHJp diwgcHJpbWFyeS0+aTl4eF9wbGFuZSk7CiAJaWYgKHByaW1hcnktPmhhc19mYmMpIHsKIAkJc3Ry dWN0IGludGVsX2ZiYyAqZmJjID0gJmRldl9wcml2LT5mYmM7CiAKQEAgLTEzNTg3LDI5ICsxMzQ0 Niw3IEBAIGludGVsX3ByaW1hcnlfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwgZW51bSBwaXBlIHBpcGUpCiAKIAlwcmltYXJ5LT5jaGVja19wbGFuZSA9IGlu dGVsX2NoZWNrX3ByaW1hcnlfcGxhbmU7CiAKLQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5 KSB7Ci0JCXByaW1hcnktPmhhc19jY3MgPSBza2xfcGxhbmVfaGFzX2NjcyhkZXZfcHJpdiwgcGlw ZSwKLQkJCQkJCSAgICAgUExBTkVfUFJJTUFSWSk7Ci0KLQkJaWYgKHNrbF9wbGFuZV9oYXNfcGxh bmFyKGRldl9wcml2LCBwaXBlLCBQTEFORV9QUklNQVJZKSkgewotCQkJaW50ZWxfcHJpbWFyeV9m b3JtYXRzID0gc2tsX3ByaV9wbGFuYXJfZm9ybWF0czsKLQkJCW51bV9mb3JtYXRzID0gQVJSQVlf U0laRShza2xfcHJpX3BsYW5hcl9mb3JtYXRzKTsKLQkJfSBlbHNlIHsKLQkJCWludGVsX3ByaW1h cnlfZm9ybWF0cyA9IHNrbF9wcmltYXJ5X2Zvcm1hdHM7Ci0JCQludW1fZm9ybWF0cyA9IEFSUkFZ X1NJWkUoc2tsX3ByaW1hcnlfZm9ybWF0cyk7Ci0JCX0KLQotCQlpZiAocHJpbWFyeS0+aGFzX2Nj cykKLQkJCW1vZGlmaWVycyA9IHNrbF9mb3JtYXRfbW9kaWZpZXJzX2NjczsKLQkJZWxzZQotCQkJ bW9kaWZpZXJzID0gc2tsX2Zvcm1hdF9tb2RpZmllcnNfbm9jY3M7Ci0KLQkJcHJpbWFyeS0+dXBk YXRlX3BsYW5lID0gc2tsX3VwZGF0ZV9wbGFuZTsKLQkJcHJpbWFyeS0+ZGlzYWJsZV9wbGFuZSA9 IHNrbF9kaXNhYmxlX3BsYW5lOwotCQlwcmltYXJ5LT5nZXRfaHdfc3RhdGUgPSBza2xfcGxhbmVf Z2V0X2h3X3N0YXRlOwotCi0JCXBsYW5lX2Z1bmNzID0gJnNrbF9wbGFuZV9mdW5jczsKLQl9IGVs c2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNCkgeworCWlmIChJTlRFTF9HRU4oZGV2X3By aXYpID49IDQpIHsKIAkJaW50ZWxfcHJpbWFyeV9mb3JtYXRzID0gaTk2NV9wcmltYXJ5X2Zvcm1h dHM7CiAJCW51bV9mb3JtYXRzID0gQVJSQVlfU0laRShpOTY1X3ByaW1hcnlfZm9ybWF0cyk7CiAJ CW1vZGlmaWVycyA9IGk5eHhfZm9ybWF0X21vZGlmaWVyczsKQEAgLTEzNjMzLDE0ICsxMzQ3MCw3 IEBAIGludGVsX3ByaW1hcnlfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwgZW51bSBwaXBlIHBpcGUpCiAKIAlwb3NzaWJsZV9jcnRjcyA9IEJJVChwaXBlKTsK IAotCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpCi0JCXJldCA9IGRybV91bml2ZXJzYWxf cGxhbmVfaW5pdCgmZGV2X3ByaXYtPmRybSwgJnByaW1hcnktPmJhc2UsCi0JCQkJCSAgICAgICBw b3NzaWJsZV9jcnRjcywgcGxhbmVfZnVuY3MsCi0JCQkJCSAgICAgICBpbnRlbF9wcmltYXJ5X2Zv cm1hdHMsIG51bV9mb3JtYXRzLAotCQkJCQkgICAgICAgbW9kaWZpZXJzLAotCQkJCQkgICAgICAg RFJNX1BMQU5FX1RZUEVfUFJJTUFSWSwKLQkJCQkJICAgICAgICJwbGFuZSAxJWMiLCBwaXBlX25h bWUocGlwZSkpOwotCWVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNSB8fCBJU19HNFgo ZGV2X3ByaXYpKQorCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDUgfHwgSVNfRzRYKGRldl9w cml2KSkKIAkJcmV0ID0gZHJtX3VuaXZlcnNhbF9wbGFuZV9pbml0KCZkZXZfcHJpdi0+ZHJtLCAm cHJpbWFyeS0+YmFzZSwKIAkJCQkJICAgICAgIHBvc3NpYmxlX2NydGNzLCBwbGFuZV9mdW5jcywK IAkJCQkJICAgICAgIGludGVsX3ByaW1hcnlfZm9ybWF0cywgbnVtX2Zvcm1hdHMsCkBAIC0xMzY1 OCwxNiArMTM0ODgsNyBAQCBpbnRlbF9wcmltYXJ5X3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGVudW0gcGlwZSBwaXBlKQogCWlmIChyZXQpCiAJCWdvdG8g ZmFpbDsKIAotCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDEwKSB7Ci0JCXN1cHBvcnRlZF9y b3RhdGlvbnMgPQotCQkJRFJNX01PREVfUk9UQVRFXzAgfCBEUk1fTU9ERV9ST1RBVEVfOTAgfAot CQkJRFJNX01PREVfUk9UQVRFXzE4MCB8IERSTV9NT0RFX1JPVEFURV8yNzAgfAotCQkJRFJNX01P REVfUkVGTEVDVF9YOwotCX0gZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5KSB7Ci0J CXN1cHBvcnRlZF9yb3RhdGlvbnMgPQotCQkJRFJNX01PREVfUk9UQVRFXzAgfCBEUk1fTU9ERV9S T1RBVEVfOTAgfAotCQkJRFJNX01PREVfUk9UQVRFXzE4MCB8IERSTV9NT0RFX1JPVEFURV8yNzA7 Ci0JfSBlbHNlIGlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSAmJiBwaXBlID09IFBJUEVfQikg eworCWlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSAmJiBwaXBlID09IFBJUEVfQikgewogCQlz dXBwb3J0ZWRfcm90YXRpb25zID0KIAkJCURSTV9NT0RFX1JPVEFURV8wIHwgRFJNX01PREVfUk9U QVRFXzE4MCB8CiAJCQlEUk1fTU9ERV9SRUZMRUNUX1g7CkBAIC0xMzY4MywxNSArMTM1MDQsNiBA QCBpbnRlbF9wcmltYXJ5X3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsIGVudW0gcGlwZSBwaXBlKQogCQkJCQkJICAgRFJNX01PREVfUk9UQVRFXzAsCiAJCQkJ CQkgICBzdXBwb3J0ZWRfcm90YXRpb25zKTsKIAotCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49 IDkpCi0JCWRybV9wbGFuZV9jcmVhdGVfY29sb3JfcHJvcGVydGllcygmcHJpbWFyeS0+YmFzZSwK LQkJCQkJCSAgQklUKERSTV9DT0xPUl9ZQ0JDUl9CVDYwMSkgfAotCQkJCQkJICBCSVQoRFJNX0NP TE9SX1lDQkNSX0JUNzA5KSwKLQkJCQkJCSAgQklUKERSTV9DT0xPUl9ZQ0JDUl9MSU1JVEVEX1JB TkdFKSB8Ci0JCQkJCQkgIEJJVChEUk1fQ09MT1JfWUNCQ1JfRlVMTF9SQU5HRSksCi0JCQkJCQkg IERSTV9DT0xPUl9ZQ0JDUl9CVDcwOSwKLQkJCQkJCSAgRFJNX0NPTE9SX1lDQkNSX0xJTUlURURf UkFOR0UpOwotCiAJZHJtX3BsYW5lX2hlbHBlcl9hZGQoJnByaW1hcnktPmJhc2UsICZpbnRlbF9w bGFuZV9oZWxwZXJfZnVuY3MpOwogCiAJcmV0dXJuIHByaW1hcnk7CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rydi5oCmluZGV4IDg4YWRmMzFlZjFjMi4uM2Q1MjgxYTNjZjFlIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaApAQCAtMjA4MSwxOCArMjA4MSwxMiBAQCBpbnQgaW50ZWxfc3ByaXRlX3NldF9j b2xvcmtleV9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQkJCSAg ICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdik7CiB2b2lkIGludGVsX3BpcGVfdXBkYXRlX3N0 YXJ0KGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpuZXdfY3J0Y19zdGF0ZSk7CiB2b2lk IGludGVsX3BpcGVfdXBkYXRlX2VuZChzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqbmV3X2NydGNf c3RhdGUpOwotdm9pZCBza2xfdXBkYXRlX3BsYW5lKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUs Ci0JCSAgICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAotCQkg ICAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlKTsKLXZvaWQg c2tsX2Rpc2FibGVfcGxhbmUoc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSwgc3RydWN0IGludGVs X2NydGMgKmNydGMpOwotYm9vbCBza2xfcGxhbmVfZ2V0X2h3X3N0YXRlKHN0cnVjdCBpbnRlbF9w bGFuZSAqcGxhbmUsIGVudW0gcGlwZSAqcGlwZSk7Ci1ib29sIHNrbF9wbGFuZV9oYXNfY2NzKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJICAgICAgIGVudW0gcGlwZSBwaXBl LCBlbnVtIHBsYW5lX2lkIHBsYW5lX2lkKTsKIGJvb2wgaW50ZWxfZm9ybWF0X2lzX3l1dih1aW50 MzJfdCBmb3JtYXQpOwotYm9vbCBza2xfcGxhbmVfaGFzX3BsYW5hcihzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkgIGVudW0gcGlwZSBwaXBlLCBlbnVtIHBsYW5lX2lkIHBs YW5lX2lkKTsKIHN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmVfYWxsb2Modm9pZCk7CiB2 b2lkIGludGVsX3BsYW5lX2ZyZWUoc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSk7CitzdHJ1Y3Qg aW50ZWxfcGxhbmUgKgorc2tsX3VuaXZlcnNhbF9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAorCQkJICAgZW51bSBwaXBlIHBpcGUsIGVudW0gcGxhbmVfaWQg cGxhbmVfaWQpOwogCiAKIC8qIGludGVsX3R2LmMgKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3By aXRlLmMKaW5kZXggY2M3OGQ2YjE0YmYwLi4yMWI2ZmY2M2QxNWQgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3Nwcml0ZS5jCkBAIC0yMzAsNyArMjMwLDcgQEAgdm9pZCBpbnRlbF9waXBlX3VwZGF0 ZV9lbmQoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm5ld19jcnRjX3N0YXRlKQogI2VuZGlmCiB9 CiAKLXZvaWQKK3N0YXRpYyB2b2lkCiBza2xfdXBkYXRlX3BsYW5lKHN0cnVjdCBpbnRlbF9wbGFu ZSAqcGxhbmUsCiAJCSBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwK IAkJIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUpCkBAIC0zMzAs NyArMzMwLDcgQEAgc2tsX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lLAog CXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmRldl9wcml2LT51bmNvcmUubG9jaywgaXJxZmxhZ3Mp OwogfQogCi12b2lkCitzdGF0aWMgdm9pZAogc2tsX2Rpc2FibGVfcGxhbmUoc3RydWN0IGludGVs X3BsYW5lICpwbGFuZSwgc3RydWN0IGludGVsX2NydGMgKmNydGMpCiB7CiAJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShwbGFuZS0+YmFzZS5kZXYpOwpAQCAtMzQ4 LDcgKzM0OCw3IEBAIHNrbF9kaXNhYmxlX3BsYW5lKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUs IHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmRldl9w cml2LT51bmNvcmUubG9jaywgaXJxZmxhZ3MpOwogfQogCi1ib29sCitzdGF0aWMgYm9vbAogc2ts X3BsYW5lX2dldF9od19zdGF0ZShzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lLAogCQkgICAgICAg ZW51bSBwaXBlICpwaXBlKQogewpAQCAtMTQ0MCw4ICsxNDQwLDQxIEBAIHN0YXRpYyBjb25zdCBz dHJ1Y3QgZHJtX3BsYW5lX2Z1bmNzIHNrbF9wbGFuZV9mdW5jcyA9IHsKIAkuZm9ybWF0X21vZF9z dXBwb3J0ZWQgPSBza2xfcGxhbmVfZm9ybWF0X21vZF9zdXBwb3J0ZWQsCiB9OwogCi1ib29sIHNr bF9wbGFuZV9oYXNfY2NzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJICAg ICAgIGVudW0gcGlwZSBwaXBlLCBlbnVtIHBsYW5lX2lkIHBsYW5lX2lkKQorc3RhdGljIGJvb2wg c2tsX3BsYW5lX2hhc19mYmMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJ ICAgICAgZW51bSBwaXBlIHBpcGUsIGVudW0gcGxhbmVfaWQgcGxhbmVfaWQpCit7CisJaWYgKCFI QVNfRkJDKGRldl9wcml2KSkKKwkJcmV0dXJuIGZhbHNlOworCisJcmV0dXJuIHBpcGUgPT0gUElQ RV9BICYmIHBsYW5lX2lkID09IFBMQU5FX1BSSU1BUlk7Cit9CisKK3N0YXRpYyBib29sIHNrbF9w bGFuZV9oYXNfcGxhbmFyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJCQkg ZW51bSBwaXBlIHBpcGUsIGVudW0gcGxhbmVfaWQgcGxhbmVfaWQpCit7CisJaWYgKHBsYW5lX2lk ID09IFBMQU5FX1BSSU1BUlkpIHsKKwkJaWYgKElTX1NLWUxBS0UoZGV2X3ByaXYpIHx8IElTX0JS T1hUT04oZGV2X3ByaXYpKQorCQkJcmV0dXJuIGZhbHNlOworCQllbHNlIGlmICgoSU5URUxfR0VO KGRldl9wcml2KSA9PSA5ICYmIHBpcGUgPT0gUElQRV9DKSAmJgorCQkJICFJU19HRU1JTklMQUtF KGRldl9wcml2KSkKKwkJCXJldHVybiBmYWxzZTsKKwl9IGVsc2UgaWYgKHBsYW5lX2lkID49IFBM QU5FX1NQUklURTApIHsKKwkJaWYgKHBsYW5lX2lkID09IFBMQU5FX0NVUlNPUikKKwkJCXJldHVy biBmYWxzZTsKKwkJaWYgKElTX0dFTUlOSUxBS0UoZGV2X3ByaXYpIHx8IElOVEVMX0dFTihkZXZf cHJpdikgPT0gMTApIHsKKwkJCWlmIChwbGFuZV9pZCAhPSBQTEFORV9TUFJJVEUwKQorCQkJCXJl dHVybiBmYWxzZTsKKwkJfSBlbHNlIHsKKwkJCWlmIChwbGFuZV9pZCAhPSBQTEFORV9TUFJJVEUw IHx8IHBpcGUgPT0gUElQRV9DIHx8CisJCQkgICAgSVNfU0tZTEFLRShkZXZfcHJpdikgfHwgSVNf QlJPWFRPTihkZXZfcHJpdikpCisJCQkJcmV0dXJuIGZhbHNlOworCQl9CisJfQorCXJldHVybiB0 cnVlOworfQorCitzdGF0aWMgYm9vbCBza2xfcGxhbmVfaGFzX2NjcyhzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkgICAgICBlbnVtIHBpcGUgcGlwZSwgZW51bSBwbGFuZV9p ZCBwbGFuZV9pZCkKIHsKIAlpZiAocGxhbmVfaWQgPT0gUExBTkVfQ1VSU09SKQogCQlyZXR1cm4g ZmFsc2U7CkBAIC0xNDg2LDYgKzE1MTksOTggQEAgdm9pZCBpbnRlbF9wbGFuZV9mcmVlKHN0cnVj dCBpbnRlbF9wbGFuZSAqcGxhbmUpCiAJa2ZyZWUocGxhbmUpOwogfQogCitzdHJ1Y3QgaW50ZWxf cGxhbmUgKgorc2tsX3VuaXZlcnNhbF9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LAorCQkJICAgZW51bSBwaXBlIHBpcGUsIGVudW0gcGxhbmVfaWQgcGxhbmVf aWQpCit7CisJc3RydWN0IGludGVsX3BsYW5lICpwbGFuZTsKKwllbnVtIGRybV9wbGFuZV90eXBl IHBsYW5lX3R5cGU7CisJdW5zaWduZWQgaW50IHN1cHBvcnRlZF9yb3RhdGlvbnM7CisJdW5zaWdu ZWQgaW50IHBvc3NpYmxlX2NydGNzOworCWNvbnN0IHU2NCAqbW9kaWZpZXJzOworCWNvbnN0IHUz MiAqZm9ybWF0czsKKwlpbnQgbnVtX2Zvcm1hdHM7CisJaW50IHJldDsKKworCXBsYW5lID0gaW50 ZWxfcGxhbmVfYWxsb2MoKTsKKwlpZiAoSVNfRVJSKHBsYW5lKSkKKwkJcmV0dXJuIHBsYW5lOwor CisJcGxhbmUtPnBpcGUgPSBwaXBlOworCXBsYW5lLT5pZCA9IHBsYW5lX2lkOworCXBsYW5lLT5m cm9udGJ1ZmZlcl9iaXQgPSBJTlRFTF9GUk9OVEJVRkZFUihwaXBlLCBwbGFuZV9pZCk7CisKKwlw bGFuZS0+Y2FuX3NjYWxlID0gdHJ1ZTsKKworCXBsYW5lLT5oYXNfZmJjID0gc2tsX3BsYW5lX2hh c19mYmMoZGV2X3ByaXYsIHBpcGUsIHBsYW5lX2lkKTsKKwlpZiAocGxhbmUtPmhhc19mYmMpIHsK KwkJc3RydWN0IGludGVsX2ZiYyAqZmJjID0gJmRldl9wcml2LT5mYmM7CisKKwkJZmJjLT5wb3Nz aWJsZV9mcmFtZWJ1ZmZlcl9iaXRzIHw9IHBsYW5lLT5mcm9udGJ1ZmZlcl9iaXQ7CisJfQorCisJ cGxhbmUtPnVwZGF0ZV9wbGFuZSA9IHNrbF91cGRhdGVfcGxhbmU7CisJcGxhbmUtPmRpc2FibGVf cGxhbmUgPSBza2xfZGlzYWJsZV9wbGFuZTsKKwlwbGFuZS0+Z2V0X2h3X3N0YXRlID0gc2tsX3Bs YW5lX2dldF9od19zdGF0ZTsKKworCWlmIChza2xfcGxhbmVfaGFzX3BsYW5hcihkZXZfcHJpdiwg cGlwZSwgcGxhbmVfaWQpKSB7CisJCWZvcm1hdHMgPSBza2xfcGxhbmFyX2Zvcm1hdHM7CisJCW51 bV9mb3JtYXRzID0gQVJSQVlfU0laRShza2xfcGxhbmFyX2Zvcm1hdHMpOworCX0gZWxzZSB7CisJ CWZvcm1hdHMgPSBza2xfcGxhbmVfZm9ybWF0czsKKwkJbnVtX2Zvcm1hdHMgPSBBUlJBWV9TSVpF KHNrbF9wbGFuZV9mb3JtYXRzKTsKKwl9CisKKwlpZiAoc2tsX3BsYW5lX2hhc19jY3MoZGV2X3By aXYsIHBpcGUsIHBsYW5lX2lkKSkKKwkJbW9kaWZpZXJzID0gc2tsX3BsYW5lX2Zvcm1hdF9tb2Rp ZmllcnNfY2NzOworCWVsc2UKKwkJbW9kaWZpZXJzID0gc2tsX3BsYW5lX2Zvcm1hdF9tb2RpZmll cnNfbm9jY3M7CisKKwlpZiAocGxhbmVfaWQgPT0gUExBTkVfUFJJTUFSWSkKKwkJcGxhbmVfdHlw ZSA9IERSTV9QTEFORV9UWVBFX1BSSU1BUlk7CisJZWxzZQorCQlwbGFuZV90eXBlID0gRFJNX1BM QU5FX1RZUEVfT1ZFUkxBWTsKKworCXBvc3NpYmxlX2NydGNzID0gQklUKHBpcGUpOworCisJcmV0 ID0gZHJtX3VuaXZlcnNhbF9wbGFuZV9pbml0KCZkZXZfcHJpdi0+ZHJtLCAmcGxhbmUtPmJhc2Us CisJCQkJICAgICAgIHBvc3NpYmxlX2NydGNzLCAmc2tsX3BsYW5lX2Z1bmNzLAorCQkJCSAgICAg ICBmb3JtYXRzLCBudW1fZm9ybWF0cywgbW9kaWZpZXJzLAorCQkJCSAgICAgICBwbGFuZV90eXBl LAorCQkJCSAgICAgICAicGxhbmUgJWQlYyIsIHBsYW5lX2lkICsgMSwKKwkJCQkgICAgICAgcGlw ZV9uYW1lKHBpcGUpKTsKKwlpZiAocmV0KQorCQlnb3RvIGZhaWw7CisKKwlzdXBwb3J0ZWRfcm90 YXRpb25zID0KKwkJRFJNX01PREVfUk9UQVRFXzAgfCBEUk1fTU9ERV9ST1RBVEVfOTAgfAorCQlE Uk1fTU9ERV9ST1RBVEVfMTgwIHwgRFJNX01PREVfUk9UQVRFXzI3MDsKKworCWlmIChJTlRFTF9H RU4oZGV2X3ByaXYpID49IDEwKQorCQlzdXBwb3J0ZWRfcm90YXRpb25zIHw9IERSTV9NT0RFX1JF RkxFQ1RfWDsKKworCWRybV9wbGFuZV9jcmVhdGVfcm90YXRpb25fcHJvcGVydHkoJnBsYW5lLT5i YXNlLAorCQkJCQkgICBEUk1fTU9ERV9ST1RBVEVfMCwKKwkJCQkJICAgc3VwcG9ydGVkX3JvdGF0 aW9ucyk7CisKKwlkcm1fcGxhbmVfY3JlYXRlX2NvbG9yX3Byb3BlcnRpZXMoJnBsYW5lLT5iYXNl LAorCQkJCQkgIEJJVChEUk1fQ09MT1JfWUNCQ1JfQlQ2MDEpIHwKKwkJCQkJICBCSVQoRFJNX0NP TE9SX1lDQkNSX0JUNzA5KSwKKwkJCQkJICBCSVQoRFJNX0NPTE9SX1lDQkNSX0xJTUlURURfUkFO R0UpIHwKKwkJCQkJICBCSVQoRFJNX0NPTE9SX1lDQkNSX0ZVTExfUkFOR0UpLAorCQkJCQkgIERS TV9DT0xPUl9ZQ0JDUl9CVDcwOSwKKwkJCQkJICBEUk1fQ09MT1JfWUNCQ1JfTElNSVRFRF9SQU5H RSk7CisKKwlkcm1fcGxhbmVfaGVscGVyX2FkZCgmcGxhbmUtPmJhc2UsICZpbnRlbF9wbGFuZV9o ZWxwZXJfZnVuY3MpOworCisJcmV0dXJuIHBsYW5lOworCitmYWlsOgorCWludGVsX3BsYW5lX2Zy ZWUocGxhbmUpOworCisJcmV0dXJuIEVSUl9QVFIocmV0KTsKK30KKwogc3RydWN0IGludGVsX3Bs YW5lICoKIGludGVsX3Nwcml0ZV9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LAogCQkJICBlbnVtIHBpcGUgcGlwZSwgaW50IHBsYW5lKQpAQCAtMTQ5OSwzNiAr MTYyNCwyMyBAQCBpbnRlbF9zcHJpdGVfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiwKIAlpbnQgbnVtX3BsYW5lX2Zvcm1hdHM7CiAJaW50IHJldDsKIAotCWlu dGVsX3BsYW5lID0gaW50ZWxfcGxhbmVfYWxsb2MoKTsKLQlpZiAoSVNfRVJSKGludGVsX3BsYW5l KSkKLQkJcmV0dXJuIGludGVsX3BsYW5lOwotCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0g OSkgewotCQlpbnRlbF9wbGFuZS0+Y2FuX3NjYWxlID0gdHJ1ZTsKLQotCQlpbnRlbF9wbGFuZS0+ aGFzX2NjcyA9IHNrbF9wbGFuZV9oYXNfY2NzKGRldl9wcml2LCBwaXBlLAorCQlpbnRlbF9wbGFu ZSA9IHNrbF91bml2ZXJzYWxfcGxhbmVfY3JlYXRlKGRldl9wcml2LCBwaXBlLAogCQkJCQkJCSBQ TEFORV9TUFJJVEUwICsgcGxhbmUpOworCQlpZiAoSVNfRVJSKGludGVsX3BsYW5lKSkKKwkJCXJl dHVybiBpbnRlbF9wbGFuZTsKIAotCQlpbnRlbF9wbGFuZS0+dXBkYXRlX3BsYW5lID0gc2tsX3Vw ZGF0ZV9wbGFuZTsKLQkJaW50ZWxfcGxhbmUtPmRpc2FibGVfcGxhbmUgPSBza2xfZGlzYWJsZV9w bGFuZTsKLQkJaW50ZWxfcGxhbmUtPmdldF9od19zdGF0ZSA9IHNrbF9wbGFuZV9nZXRfaHdfc3Rh dGU7CisJCS8qIEZJWE1FIHVuaWZ5ICovCisJCWludGVsX3BsYW5lLT5jaGVja19wbGFuZSA9IGlu dGVsX2NoZWNrX3Nwcml0ZV9wbGFuZTsKIAotCQlpZiAoc2tsX3BsYW5lX2hhc19wbGFuYXIoZGV2 X3ByaXYsIHBpcGUsCi0JCQkJCSBQTEFORV9TUFJJVEUwICsgcGxhbmUpKSB7Ci0JCQlwbGFuZV9m b3JtYXRzID0gc2tsX3BsYW5hcl9mb3JtYXRzOwotCQkJbnVtX3BsYW5lX2Zvcm1hdHMgPSBBUlJB WV9TSVpFKHNrbF9wbGFuYXJfZm9ybWF0cyk7Ci0JCX0gZWxzZSB7Ci0JCQlwbGFuZV9mb3JtYXRz ID0gc2tsX3BsYW5lX2Zvcm1hdHM7Ci0JCQludW1fcGxhbmVfZm9ybWF0cyA9IEFSUkFZX1NJWkUo c2tsX3BsYW5lX2Zvcm1hdHMpOwotCQl9CisJCXJldHVybiBpbnRlbF9wbGFuZTsKKwl9CiAKLQkJ aWYgKGludGVsX3BsYW5lLT5oYXNfY2NzKQotCQkJbW9kaWZpZXJzID0gc2tsX3BsYW5lX2Zvcm1h dF9tb2RpZmllcnNfY2NzOwotCQllbHNlCi0JCQltb2RpZmllcnMgPSBza2xfcGxhbmVfZm9ybWF0 X21vZGlmaWVyc19ub2NjczsKKwlpbnRlbF9wbGFuZSA9IGludGVsX3BsYW5lX2FsbG9jKCk7CisJ aWYgKElTX0VSUihpbnRlbF9wbGFuZSkpCisJCXJldHVybiBpbnRlbF9wbGFuZTsKIAotCQlwbGFu ZV9mdW5jcyA9ICZza2xfcGxhbmVfZnVuY3M7Ci0JfSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRl dl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkgeworCWlmIChJU19WQUxMRVlWSUVX KGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQlpbnRlbF9wbGFuZS0+ Y2FuX3NjYWxlID0gZmFsc2U7CiAJCWludGVsX3BsYW5lLT5tYXhfZG93bnNjYWxlID0gMTsKIApA QCAtMTU4MSwxNiArMTY5Myw3IEBAIGludGVsX3Nwcml0ZV9wbGFuZV9jcmVhdGUoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQl9CiAJfQogCi0JaWYgKElOVEVMX0dFTihkZXZf cHJpdikgPj0gMTApIHsKLQkJc3VwcG9ydGVkX3JvdGF0aW9ucyA9Ci0JCQlEUk1fTU9ERV9ST1RB VEVfMCB8IERSTV9NT0RFX1JPVEFURV85MCB8Ci0JCQlEUk1fTU9ERV9ST1RBVEVfMTgwIHwgRFJN X01PREVfUk9UQVRFXzI3MCB8Ci0JCQlEUk1fTU9ERV9SRUZMRUNUX1g7Ci0JfSBlbHNlIGlmIChJ TlRFTF9HRU4oZGV2X3ByaXYpID49IDkpIHsKLQkJc3VwcG9ydGVkX3JvdGF0aW9ucyA9Ci0JCQlE Uk1fTU9ERV9ST1RBVEVfMCB8IERSTV9NT0RFX1JPVEFURV85MCB8Ci0JCQlEUk1fTU9ERV9ST1RB VEVfMTgwIHwgRFJNX01PREVfUk9UQVRFXzI3MDsKLQl9IGVsc2UgaWYgKElTX0NIRVJSWVZJRVco ZGV2X3ByaXYpICYmIHBpcGUgPT0gUElQRV9CKSB7CisJaWYgKElTX0NIRVJSWVZJRVcoZGV2X3By aXYpICYmIHBpcGUgPT0gUElQRV9CKSB7CiAJCXN1cHBvcnRlZF9yb3RhdGlvbnMgPQogCQkJRFJN X01PREVfUk9UQVRFXzAgfCBEUk1fTU9ERV9ST1RBVEVfMTgwIHwKIAkJCURSTV9NT0RFX1JFRkxF Q1RfWDsKQEAgLTE2MDYsMjAgKzE3MDksMTIgQEAgaW50ZWxfc3ByaXRlX3BsYW5lX2NyZWF0ZShz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAKIAlwb3NzaWJsZV9jcnRjcyA9IEJJ VChwaXBlKTsKIAotCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpCi0JCXJldCA9IGRybV91 bml2ZXJzYWxfcGxhbmVfaW5pdCgmZGV2X3ByaXYtPmRybSwgJmludGVsX3BsYW5lLT5iYXNlLAot CQkJCQkgICAgICAgcG9zc2libGVfY3J0Y3MsIHBsYW5lX2Z1bmNzLAotCQkJCQkgICAgICAgcGxh bmVfZm9ybWF0cywgbnVtX3BsYW5lX2Zvcm1hdHMsCi0JCQkJCSAgICAgICBtb2RpZmllcnMsCi0J CQkJCSAgICAgICBEUk1fUExBTkVfVFlQRV9PVkVSTEFZLAotCQkJCQkgICAgICAgInBsYW5lICVk JWMiLCBwbGFuZSArIDIsIHBpcGVfbmFtZShwaXBlKSk7Ci0JZWxzZQotCQlyZXQgPSBkcm1fdW5p dmVyc2FsX3BsYW5lX2luaXQoJmRldl9wcml2LT5kcm0sICZpbnRlbF9wbGFuZS0+YmFzZSwKLQkJ CQkJICAgICAgIHBvc3NpYmxlX2NydGNzLCBwbGFuZV9mdW5jcywKLQkJCQkJICAgICAgIHBsYW5l X2Zvcm1hdHMsIG51bV9wbGFuZV9mb3JtYXRzLAotCQkJCQkgICAgICAgbW9kaWZpZXJzLAotCQkJ CQkgICAgICAgRFJNX1BMQU5FX1RZUEVfT1ZFUkxBWSwKLQkJCQkJICAgICAgICJzcHJpdGUgJWMi LCBzcHJpdGVfbmFtZShwaXBlLCBwbGFuZSkpOworCXJldCA9IGRybV91bml2ZXJzYWxfcGxhbmVf aW5pdCgmZGV2X3ByaXYtPmRybSwgJmludGVsX3BsYW5lLT5iYXNlLAorCQkJCSAgICAgICBwb3Nz aWJsZV9jcnRjcywgcGxhbmVfZnVuY3MsCisJCQkJICAgICAgIHBsYW5lX2Zvcm1hdHMsIG51bV9w bGFuZV9mb3JtYXRzLAorCQkJCSAgICAgICBtb2RpZmllcnMsCisJCQkJICAgICAgIERSTV9QTEFO RV9UWVBFX09WRVJMQVksCisJCQkJICAgICAgICJzcHJpdGUgJWMiLCBzcHJpdGVfbmFtZShwaXBl LCBwbGFuZSkpOwogCWlmIChyZXQpCiAJCWdvdG8gZmFpbDsKIAotLSAKMi4xNi40CgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK