From: Ander Conselvan de Oliveira Subject: [PATCH 3/4] drm/i915: Move current pll config to shared global state Date: Thu, 29 Jan 2015 16:55:10 +0200 Message-ID: <1422543311-5107-3-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1422543311-5107-1-git-send-email-ander.conselvan.de.oliveira@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 584076E793 for ; Thu, 29 Jan 2015 06:55:25 -0800 (PST) In-Reply-To: <1422543311-5107-1-git-send-email-ander.conselvan.de.oliveira@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 Cc: Ander Conselvan de Oliveira List-Id: intel-gfx@lists.freedesktop.org VGhpcyBwYXRjaCBhZGRzIGEgZGlzcGxheV9zdGF0ZSBwb2ludGVyIHRvIGRybV9pOTE1X3ByaXZh dGUgYW5kIG1vdmVzCnRoZSBjdXJyZW50IHBsbCBjb25maWcgaW50byBpdC4KClNpZ25lZC1vZmYt Ynk6IEFuZGVyIENvbnNlbHZhbiBkZSBPbGl2ZWlyYSA8YW5kZXIuY29uc2VsdmFuLmRlLm9saXZl aXJhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyAg fCAxNSArKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgfCAgNCAr LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMgICAgIHwgMTMgKysrKy0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA4NiArKysrKysrKysrKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgNzkgaW5zZXJ0aW9ucygrKSwgMzkg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1 Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRleCAzYjMzMmE0 Li5lYjE4YTk5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtMjc2NSwxNyAr Mjc2NSwyMCBAQCBzdGF0aWMgaW50IGk5MTVfc2hhcmVkX2RwbGxzX2luZm8oc3RydWN0IHNlcV9m aWxlICptLCB2b2lkICp1bnVzZWQpCiAJZHJtX21vZGVzZXRfbG9ja19hbGwoZGV2KTsKIAlmb3Ig KGkgPSAwOyBpIDwgZGV2X3ByaXYtPm51bV9zaGFyZWRfZHBsbDsgaSsrKSB7CiAJCXN0cnVjdCBp bnRlbF9zaGFyZWRfZHBsbCAqcGxsID0gJmRldl9wcml2LT5zaGFyZWRfZHBsbHNbaV07CisJCXN0 cnVjdCBpbnRlbF9zaGFyZWRfZHBsbF9jb25maWcgKnBsbF9jb25maWc7CisKKwkJcGxsX2NvbmZp ZyA9ICZkZXZfcHJpdi0+ZGlzcGxheV9zdGF0ZS0+c2hhcmVkX2RwbGxbaV07CiAKIAkJc2VxX3By aW50ZihtLCAiRFBMTCVpOiAlcywgaWQ6ICVpXG4iLCBpLCBwbGwtPm5hbWUsIHBsbC0+aWQpOwog CQlzZXFfcHJpbnRmKG0sICIgY3J0Y19tYXNrOiAweCUwOHgsIGFjdGl2ZTogJWQsIG9uOiAlc1xu IiwKLQkJCSAgIHBsbC0+Y29uZmlnLmNydGNfbWFzaywgcGxsLT5hY3RpdmUsIHllc25vKHBsbC0+ b24pKTsKKwkJCSAgIHBsbF9jb25maWctPmNydGNfbWFzaywgcGxsLT5hY3RpdmUsIHllc25vKHBs bC0+b24pKTsKIAkJc2VxX3ByaW50ZihtLCAiIHRyYWNrZWQgaGFyZHdhcmUgc3RhdGU6XG4iKTsK LQkJc2VxX3ByaW50ZihtLCAiIGRwbGw6ICAgIDB4JTA4eFxuIiwgcGxsLT5jb25maWcuaHdfc3Rh dGUuZHBsbCk7CisJCXNlcV9wcmludGYobSwgIiBkcGxsOiAgICAweCUwOHhcbiIsIHBsbF9jb25m aWctPmh3X3N0YXRlLmRwbGwpOwogCQlzZXFfcHJpbnRmKG0sICIgZHBsbF9tZDogMHglMDh4XG4i LAotCQkJICAgcGxsLT5jb25maWcuaHdfc3RhdGUuZHBsbF9tZCk7Ci0JCXNlcV9wcmludGYobSwg IiBmcDA6ICAgICAweCUwOHhcbiIsIHBsbC0+Y29uZmlnLmh3X3N0YXRlLmZwMCk7Ci0JCXNlcV9w cmludGYobSwgIiBmcDE6ICAgICAweCUwOHhcbiIsIHBsbC0+Y29uZmlnLmh3X3N0YXRlLmZwMSk7 Ci0JCXNlcV9wcmludGYobSwgIiB3cnBsbDogICAweCUwOHhcbiIsIHBsbC0+Y29uZmlnLmh3X3N0 YXRlLndycGxsKTsKKwkJCSAgIHBsbF9jb25maWctPmh3X3N0YXRlLmRwbGxfbWQpOworCQlzZXFf cHJpbnRmKG0sICIgZnAwOiAgICAgMHglMDh4XG4iLCBwbGxfY29uZmlnLT5od19zdGF0ZS5mcDAp OworCQlzZXFfcHJpbnRmKG0sICIgZnAxOiAgICAgMHglMDh4XG4iLCBwbGxfY29uZmlnLT5od19z dGF0ZS5mcDEpOworCQlzZXFfcHJpbnRmKG0sICIgd3JwbGw6ICAgMHglMDh4XG4iLCBwbGxfY29u ZmlnLT5od19zdGF0ZS53cnBsbCk7CiAJfQogCWRybV9tb2Rlc2V0X3VubG9ja19hbGwoZGV2KTsK IApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggODYyZWRjNC4uMTMyZWI3YiAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCkBAIC0yOTYsOCArMjk2LDYgQEAgc3RydWN0IGludGVsX3NoYXJlZF9k cGxsX2NvbmZpZyB7CiB9OwogCiBzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwgewotCXN0cnVjdCBp bnRlbF9zaGFyZWRfZHBsbF9jb25maWcgY29uZmlnOwotCiAJaW50IGFjdGl2ZTsgLyogY291bnQg b2YgbnVtYmVyIG9mIGFjdGl2ZSBDUlRDcyAoaS5lLiBEUE1TIG9uKSAqLwogCWJvb2wgb247IC8q IGlzIHRoZSBQTEwgYWN0dWFsbHkgYWN0aXZlPyBEaXNhYmxlZCBkdXJpbmcgbW9kZXNldCAqLwog CWNvbnN0IGNoYXIgKm5hbWU7CkBAIC0xNzg0LDYgKzE3ODIsOCBAQCBzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSB7CiAJc3RydWN0IGludGVsX3BpcGVfY3JjIHBpcGVfY3JjW0k5MTVfTUFYX1BJUEVT XTsKICNlbmRpZgogCisJc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqZGlzcGxheV9zdGF0ZTsK KwogCWludCBudW1fc2hhcmVkX2RwbGw7CiAJc3RydWN0IGludGVsX3NoYXJlZF9kcGxsIHNoYXJl ZF9kcGxsc1tJOTE1X05VTV9QTExTXTsKIAlpbnQgZHBpb19waHlfaW9zZl9wb3J0W0k5MTVfTlVN X1BIWVNfVkxWXTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKaW5kZXggMWNkNTQxZi4uZmYyMTk3 YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKQEAgLTE3NDcsNyArMTc0NywxMCBAQCBpbnQg aW50ZWxfZGRpX2dldF9jZGNsa19mcmVxKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dikKIHN0YXRpYyB2b2lkIGhzd19kZGlfcGxsX2VuYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsCiAJCQkgICAgICAgc3RydWN0IGludGVsX3NoYXJlZF9kcGxsICpwbGwpCiB7 Ci0JSTkxNV9XUklURShXUlBMTF9DVEwocGxsLT5pZCksIHBsbC0+Y29uZmlnLmh3X3N0YXRlLndy cGxsKTsKKwlzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGxfY29uZmlnICpwbGxfY29uZmlnID0KKwkJ JmRldl9wcml2LT5kaXNwbGF5X3N0YXRlLT5zaGFyZWRfZHBsbFtwbGwtPmlkXTsKKworCUk5MTVf V1JJVEUoV1JQTExfQ1RMKHBsbC0+aWQpLCBwbGxfY29uZmlnLT5od19zdGF0ZS53cnBsbCk7CiAJ UE9TVElOR19SRUFEKFdSUExMX0NUTChwbGwtPmlkKSk7CiAJdWRlbGF5KDIwKTsKIH0KQEAgLTE4 MzYsNiArMTgzOSw4IEBAIHN0YXRpYyB2b2lkIHNrbF9kZGlfcGxsX2VuYWJsZShzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJdWludDMyX3QgdmFsOwogCXVuc2lnbmVkIGludCBk cGxsOwogCWNvbnN0IHN0cnVjdCBza2xfZHBsbF9yZWdzICpyZWdzID0gc2tsX2RwbGxfcmVnczsK KwlzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGxfY29uZmlnICpwbGxfY29uZmlnID0KKwkJJmRldl9w cml2LT5kaXNwbGF5X3N0YXRlLT5zaGFyZWRfZHBsbFtwbGwtPmlkXTsKIAogCS8qIERQTEwwIGlz IG5vdCBwYXJ0IG9mIHRoZSBzaGFyZWQgRFBMTHMsIHNvIHBsbC0+aWQgaXMgMCBmb3IgRFBMTDEg Ki8KIAlkcGxsID0gcGxsLT5pZCArIDE7CkBAIC0xODQ0LDEzICsxODQ5LDEzIEBAIHN0YXRpYyB2 b2lkIHNrbF9kZGlfcGxsX2VuYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYs CiAKIAl2YWwgJj0gfihEUExMX0NUUkwxX0hETUlfTU9ERShkcGxsKSB8IERQTExfQ1RSTDFfU1ND KGRwbGwpIHwKIAkJIERQTExfQ1JUTDFfTElOS19SQVRFX01BU0soZHBsbCkpOwotCXZhbCB8PSBw bGwtPmNvbmZpZy5od19zdGF0ZS5jdHJsMSA8PCAoZHBsbCAqIDYpOworCXZhbCB8PSBwbGxfY29u ZmlnLT5od19zdGF0ZS5jdHJsMSA8PCAoZHBsbCAqIDYpOwogCiAJSTkxNV9XUklURShEUExMX0NU UkwxLCB2YWwpOwogCVBPU1RJTkdfUkVBRChEUExMX0NUUkwxKTsKIAotCUk5MTVfV1JJVEUocmVn c1twbGwtPmlkXS5jZmdjcjEsIHBsbC0+Y29uZmlnLmh3X3N0YXRlLmNmZ2NyMSk7Ci0JSTkxNV9X UklURShyZWdzW3BsbC0+aWRdLmNmZ2NyMiwgcGxsLT5jb25maWcuaHdfc3RhdGUuY2ZnY3IyKTsK KwlJOTE1X1dSSVRFKHJlZ3NbcGxsLT5pZF0uY2ZnY3IxLCBwbGxfY29uZmlnLT5od19zdGF0ZS5j ZmdjcjEpOworCUk5MTVfV1JJVEUocmVnc1twbGwtPmlkXS5jZmdjcjIsIHBsbF9jb25maWctPmh3 X3N0YXRlLmNmZ2NyMik7CiAJUE9TVElOR19SRUFEKHJlZ3NbcGxsLT5pZF0uY2ZnY3IxKTsKIAlQ T1NUSU5HX1JFQUQocmVnc1twbGwtPmlkXS5jZmdjcjIpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKaW5kZXggMTU5ZTZjOC4uZmVjZmZiYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYwpAQCAtMTc3OCwxMSArMTc3OCwxMyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9w cmVwYXJlX3NoYXJlZF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAq cGxsID0gaW50ZWxfY3J0Y190b19zaGFyZWRfZHBsbChjcnRjKTsKKwlzdHJ1Y3QgaW50ZWxfc2hh cmVkX2RwbGxfY29uZmlnICpwbGxfY29uZmlnID0KKwkJJmRldl9wcml2LT5kaXNwbGF5X3N0YXRl LT5zaGFyZWRfZHBsbFtwbGwtPmlkXTsKIAogCWlmIChXQVJOX09OKHBsbCA9PSBOVUxMKSkKIAkJ cmV0dXJuOwogCi0JV0FSTl9PTighcGxsLT5jb25maWcuY3J0Y19tYXNrKTsKKwlXQVJOX09OKCFw bGxfY29uZmlnLT5jcnRjX21hc2spOwogCWlmIChwbGwtPmFjdGl2ZSA9PSAwKSB7CiAJCURSTV9E RUJVR19EUklWRVIoInNldHRpbmcgdXAgJXNcbiIsIHBsbC0+bmFtZSk7CiAJCVdBUk5fT04ocGxs LT5vbik7CkBAIC0xODA1LDExICsxODA3LDEzIEBAIHN0YXRpYyB2b2lkIGludGVsX2VuYWJsZV9z aGFyZWRfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAlzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2ID0gY3J0Yy0+YmFzZS5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwgKnBsbCA9IGlu dGVsX2NydGNfdG9fc2hhcmVkX2RwbGwoY3J0Yyk7CisJc3RydWN0IGludGVsX3NoYXJlZF9kcGxs X2NvbmZpZyAqcGxsX2NvbmZpZyA9CisJCSZkZXZfcHJpdi0+ZGlzcGxheV9zdGF0ZS0+c2hhcmVk X2RwbGxbcGxsLT5pZF07CiAKIAlpZiAoV0FSTl9PTihwbGwgPT0gTlVMTCkpCiAJCXJldHVybjsK IAotCWlmIChXQVJOX09OKHBsbC0+Y29uZmlnLmNydGNfbWFzayA9PSAwKSkKKwlpZiAoV0FSTl9P TihwbGxfY29uZmlnLT5jcnRjX21hc2sgPT0gMCkpCiAJCXJldHVybjsKIAogCURSTV9ERUJVR19L TVMoImVuYWJsZSAlcyAoYWN0aXZlICVkLCBvbj8gJWQpIGZvciBjcnRjICVkXG4iLApAQCAtMTgz NSwxMyArMTgzOSwxNSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kaXNhYmxlX3NoYXJlZF9kcGxsKHN0 cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5i YXNlLmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9w cml2YXRlOwogCXN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAqcGxsID0gaW50ZWxfY3J0Y190b19z aGFyZWRfZHBsbChjcnRjKTsKKwlzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGxfY29uZmlnICpwbGxf Y29uZmlnID0KKwkJJmRldl9wcml2LT5kaXNwbGF5X3N0YXRlLT5zaGFyZWRfZHBsbFtwbGwtPmlk XTsKIAogCS8qIFBDSCBvbmx5IGF2YWlsYWJsZSBvbiBJTEsrICovCiAJQlVHX09OKElOVEVMX0lO Rk8oZGV2KS0+Z2VuIDwgNSk7CiAJaWYgKFdBUk5fT04ocGxsID09IE5VTEwpKQogCSAgICAgICBy ZXR1cm47CiAKLQlpZiAoV0FSTl9PTihwbGwtPmNvbmZpZy5jcnRjX21hc2sgPT0gMCkpCisJaWYg KFdBUk5fT04ocGxsX2NvbmZpZy0+Y3J0Y19tYXNrID09IDApKQogCQlyZXR1cm47CiAKIAlEUk1f REVCVUdfS01TKCJkaXNhYmxlICVzIChhY3RpdmUgJWQsIG9uPyAlZCkgZm9yIGNydGMgJWRcbiIs CkBAIC0zODcxLDE4ICszODc3LDIxIEBAIHN0YXRpYyB2b2lkIGxwdF9wY2hfZW5hYmxlKHN0cnVj dCBkcm1fY3J0YyAqY3J0YykKIAogdm9pZCBpbnRlbF9wdXRfc2hhcmVkX2RwbGwoc3RydWN0IGlu dGVsX2NydGMgKmNydGMpCiB7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g dG9faTkxNShjcnRjLT5iYXNlLmRldik7CiAJc3RydWN0IGludGVsX3NoYXJlZF9kcGxsICpwbGwg PSBpbnRlbF9jcnRjX3RvX3NoYXJlZF9kcGxsKGNydGMpOworCXN0cnVjdCBpbnRlbF9zaGFyZWRf ZHBsbF9jb25maWcgKnBsbF9jb25maWcgPQorCQkmZGV2X3ByaXYtPmRpc3BsYXlfc3RhdGUtPnNo YXJlZF9kcGxsW3BsbC0+aWRdOwogCiAJaWYgKHBsbCA9PSBOVUxMKQogCQlyZXR1cm47CiAKLQlp ZiAoIShwbGwtPmNvbmZpZy5jcnRjX21hc2sgJiAoMSA8PCBjcnRjLT5waXBlKSkpIHsKKwlpZiAo IShwbGxfY29uZmlnLT5jcnRjX21hc2sgJiAoMSA8PCBjcnRjLT5waXBlKSkpIHsKIAkJV0FSTigx LCAiYmFkICVzIGNydGMgbWFza1xuIiwgcGxsLT5uYW1lKTsKIAkJcmV0dXJuOwogCX0KIAotCXBs bC0+Y29uZmlnLmNydGNfbWFzayAmPSB+KDEgPDwgY3J0Yy0+cGlwZSk7Ci0JaWYgKHBsbC0+Y29u ZmlnLmNydGNfbWFzayA9PSAwKSB7CisJcGxsX2NvbmZpZy0+Y3J0Y19tYXNrICY9IH4oMSA8PCBj cnRjLT5waXBlKTsKKwlpZiAocGxsX2NvbmZpZy0+Y3J0Y19tYXNrID09IDApIHsKIAkJV0FSTl9P TihwbGwtPm9uKTsKIAkJV0FSTl9PTihwbGwtPmFjdGl2ZSk7CiAJfQpAQCAtMzk2NiwxNCArMzk3 NSwxNiBAQCBzdGF0aWMgaW50IGludGVsX3NoYXJlZF9kcGxsX3N0YXJ0X2NvbmZpZyhzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJCSAgc3RydWN0IGludGVsX2F0b21pY19z dGF0ZSAqc3RhdGUsCiAJCQkJCSAgdW5zaWduZWQgY2xlYXJfcGlwZXMpCiB7Ci0Jc3RydWN0IGlu dGVsX3NoYXJlZF9kcGxsICpwbGw7CisJc3RydWN0IGludGVsX3NoYXJlZF9kcGxsX2NvbmZpZyAq cGxsX2NvbmZpZzsKIAllbnVtIGludGVsX2RwbGxfaWQgaTsKIAorCS8qIEZJWE1FOiBjb252ZXJ0 IHRoaXMgdG8gYSBzaW1wbGUgbWVtZHVwICovCisKIAlmb3IgKGkgPSAwOyBpIDwgZGV2X3ByaXYt Pm51bV9zaGFyZWRfZHBsbDsgaSsrKSB7Ci0JCXBsbCA9ICZkZXZfcHJpdi0+c2hhcmVkX2RwbGxz W2ldOworCQlwbGxfY29uZmlnID0gJmRldl9wcml2LT5kaXNwbGF5X3N0YXRlLT5zaGFyZWRfZHBs bFtpXTsKIAotCQltZW1jcHkoJnN0YXRlLT5zaGFyZWRfZHBsbFtpXSwgJnBsbC0+Y29uZmlnLAot CQkgICAgICAgc2l6ZW9mIHBsbC0+Y29uZmlnKTsKKwkJbWVtY3B5KCZzdGF0ZS0+c2hhcmVkX2Rw bGxbaV0sIHBsbF9jb25maWcsCisJCSAgICAgICBzaXplb2YgKnBsbF9jb25maWcpOwogCQlzdGF0 ZS0+c2hhcmVkX2RwbGxbaV0uY3J0Y19tYXNrICY9IH5jbGVhcl9waXBlczsKIAl9CiAKQEAgLTM5 ODMsMTIgKzM5OTQsMTQgQEAgc3RhdGljIGludCBpbnRlbF9zaGFyZWRfZHBsbF9zdGFydF9jb25m aWcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogc3RhdGljIHZvaWQgaW50ZWxf c2hhcmVkX2RwbGxfY29tbWl0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJ CQkgICAgIHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlKQogewotCXN0cnVjdCBpbnRl bF9zaGFyZWRfZHBsbCAqcGxsOworCXN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbF9jb25maWcgKnBs bF9jb25maWc7CiAJZW51bSBpbnRlbF9kcGxsX2lkIGk7CiAKKwkvKiBGSVhNRTogY29udmVydCB0 aGlzIHRvIGEgcG9pbmVyIHN3YXAgKi8KKwogCWZvciAoaSA9IDA7IGkgPCBkZXZfcHJpdi0+bnVt X3NoYXJlZF9kcGxsOyBpKyspIHsKLQkJcGxsID0gJmRldl9wcml2LT5zaGFyZWRfZHBsbHNbaV07 Ci0JCXBsbC0+Y29uZmlnID0gc3RhdGUtPnNoYXJlZF9kcGxsW2ldOworCQlwbGxfY29uZmlnID0g JmRldl9wcml2LT5kaXNwbGF5X3N0YXRlLT5zaGFyZWRfZHBsbFtpXTsKKwkJKnBsbF9jb25maWcg PSBzdGF0ZS0+c2hhcmVkX2RwbGxbaV07CiAJfQogfQogCkBAIC0xMDg2NCw2ICsxMDg3Nyw4IEBA IGNoZWNrX3NoYXJlZF9kcGxsX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAlmb3Ig KGkgPSAwOyBpIDwgZGV2X3ByaXYtPm51bV9zaGFyZWRfZHBsbDsgaSsrKSB7CiAJCXN0cnVjdCBp bnRlbF9zaGFyZWRfZHBsbCAqcGxsID0gJmRldl9wcml2LT5zaGFyZWRfZHBsbHNbaV07CisJCXN0 cnVjdCBpbnRlbF9zaGFyZWRfZHBsbF9jb25maWcgKnBsbF9jb25maWcgPQorCQkJJmRldl9wcml2 LT5kaXNwbGF5X3N0YXRlLT5zaGFyZWRfZHBsbFtwbGwtPmlkXTsKIAkJaW50IGVuYWJsZWRfY3J0 Y3MgPSAwLCBhY3RpdmVfY3J0Y3MgPSAwOwogCQlib29sIGFjdGl2ZTsKIApAQCAtMTA4NzMsOSAr MTA4ODgsOSBAQCBjaGVja19zaGFyZWRfZHBsbF9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQogCiAJCWFjdGl2ZSA9IHBsbC0+Z2V0X2h3X3N0YXRlKGRldl9wcml2LCBwbGwsICZkcGxsX2h3 X3N0YXRlKTsKIAotCQlJOTE1X1NUQVRFX1dBUk4ocGxsLT5hY3RpdmUgPiBod2VpZ2h0MzIocGxs LT5jb25maWcuY3J0Y19tYXNrKSwKKwkJSTkxNV9TVEFURV9XQVJOKHBsbC0+YWN0aXZlID4gaHdl aWdodDMyKHBsbF9jb25maWctPmNydGNfbWFzayksCiAJCSAgICAgIm1vcmUgYWN0aXZlIHBsbCB1 c2VycyB0aGFuIHJlZmVyZW5jZXM6ICVpIHZzICVpXG4iLAotCQkgICAgIHBsbC0+YWN0aXZlLCBo d2VpZ2h0MzIocGxsLT5jb25maWcuY3J0Y19tYXNrKSk7CisJCSAgICAgcGxsLT5hY3RpdmUsIGh3 ZWlnaHQzMihwbGxfY29uZmlnLT5jcnRjX21hc2spKTsKIAkJSTkxNV9TVEFURV9XQVJOKHBsbC0+ YWN0aXZlICYmICFwbGwtPm9uLAogCQkgICAgICJwbGwgaW4gYWN0aXZlIHVzZSBidXQgbm90IG9u IGluIHN3IHRyYWNraW5nXG4iKTsKIAkJSTkxNV9TVEFURV9XQVJOKHBsbC0+b24gJiYgIXBsbC0+ YWN0aXZlLApAQCAtMTA4OTMsMTEgKzEwOTA4LDExIEBAIGNoZWNrX3NoYXJlZF9kcGxsX3N0YXRl KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCUk5MTVfU1RBVEVfV0FSTihwbGwtPmFjdGl2ZSAh PSBhY3RpdmVfY3J0Y3MsCiAJCSAgICAgInBsbCBhY3RpdmUgY3J0Y3MgbWlzbWF0Y2ggKGV4cGVj dGVkICVpLCBmb3VuZCAlaSlcbiIsCiAJCSAgICAgcGxsLT5hY3RpdmUsIGFjdGl2ZV9jcnRjcyk7 Ci0JCUk5MTVfU1RBVEVfV0FSTihod2VpZ2h0MzIocGxsLT5jb25maWcuY3J0Y19tYXNrKSAhPSBl bmFibGVkX2NydGNzLAorCQlJOTE1X1NUQVRFX1dBUk4oaHdlaWdodDMyKHBsbF9jb25maWctPmNy dGNfbWFzaykgIT0gZW5hYmxlZF9jcnRjcywKIAkJICAgICAicGxsIGVuYWJsZWQgY3J0Y3MgbWlz bWF0Y2ggKGV4cGVjdGVkICVpLCBmb3VuZCAlaSlcbiIsCi0JCSAgICAgaHdlaWdodDMyKHBsbC0+ Y29uZmlnLmNydGNfbWFzayksIGVuYWJsZWRfY3J0Y3MpOworCQkgICAgIGh3ZWlnaHQzMihwbGxf Y29uZmlnLT5jcnRjX21hc2spLCBlbmFibGVkX2NydGNzKTsKIAotCQlJOTE1X1NUQVRFX1dBUk4o cGxsLT5vbiAmJiBtZW1jbXAoJnBsbC0+Y29uZmlnLmh3X3N0YXRlLCAmZHBsbF9od19zdGF0ZSwK KwkJSTkxNV9TVEFURV9XQVJOKHBsbC0+b24gJiYgbWVtY21wKCZwbGxfY29uZmlnLT5od19zdGF0 ZSwgJmRwbGxfaHdfc3RhdGUsCiAJCQkJICAgICAgIHNpemVvZihkcGxsX2h3X3N0YXRlKSksCiAJ CSAgICAgInBsbCBodyBzdGF0ZSBtaXNtYXRjaFxuIik7CiAJfQpAQCAtMTE2NzUsMTcgKzExNjkw LDIzIEBAIHN0YXRpYyBib29sIGlieF9wY2hfZHBsbF9nZXRfaHdfc3RhdGUoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2LAogc3RhdGljIHZvaWQgaWJ4X3BjaF9kcGxsX21vZGVfc2V0 KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkgIHN0cnVjdCBpbnRlbF9z aGFyZWRfZHBsbCAqcGxsKQogewotCUk5MTVfV1JJVEUoUENIX0ZQMChwbGwtPmlkKSwgcGxsLT5j b25maWcuaHdfc3RhdGUuZnAwKTsKLQlJOTE1X1dSSVRFKFBDSF9GUDEocGxsLT5pZCksIHBsbC0+ Y29uZmlnLmh3X3N0YXRlLmZwMSk7CisJc3RydWN0IGludGVsX3NoYXJlZF9kcGxsX2NvbmZpZyAq cGxsX2NvbmZpZyA9CisJCSZkZXZfcHJpdi0+ZGlzcGxheV9zdGF0ZS0+c2hhcmVkX2RwbGxbcGxs LT5pZF07CisKKwlJOTE1X1dSSVRFKFBDSF9GUDAocGxsLT5pZCksIHBsbF9jb25maWctPmh3X3N0 YXRlLmZwMCk7CisJSTkxNV9XUklURShQQ0hfRlAxKHBsbC0+aWQpLCBwbGxfY29uZmlnLT5od19z dGF0ZS5mcDEpOwogfQogCiBzdGF0aWMgdm9pZCBpYnhfcGNoX2RwbGxfZW5hYmxlKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQlzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwg KnBsbCkKIHsKKwlzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGxfY29uZmlnICpwbGxfY29uZmlnID0K KwkJJmRldl9wcml2LT5kaXNwbGF5X3N0YXRlLT5zaGFyZWRfZHBsbFtwbGwtPmlkXTsKKwogCS8q IFBDSCByZWZjbG9jayBtdXN0IGJlIGVuYWJsZWQgZmlyc3QgKi8KIAlpYnhfYXNzZXJ0X3BjaF9y ZWZjbGtfZW5hYmxlZChkZXZfcHJpdik7CiAKLQlJOTE1X1dSSVRFKFBDSF9EUExMKHBsbC0+aWQp LCBwbGwtPmNvbmZpZy5od19zdGF0ZS5kcGxsKTsKKwlJOTE1X1dSSVRFKFBDSF9EUExMKHBsbC0+ aWQpLCBwbGxfY29uZmlnLT5od19zdGF0ZS5kcGxsKTsKIAogCS8qIFdhaXQgZm9yIHRoZSBjbG9j a3MgdG8gc3RhYmlsaXplLiAqLwogCVBPU1RJTkdfUkVBRChQQ0hfRFBMTChwbGwtPmlkKSk7CkBA IC0xMTY5Niw3ICsxMTcxNyw3IEBAIHN0YXRpYyB2b2lkIGlieF9wY2hfZHBsbF9lbmFibGUoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCSAqCiAJICogU28gd3JpdGUgaXQgYWdh aW4uCiAJICovCi0JSTkxNV9XUklURShQQ0hfRFBMTChwbGwtPmlkKSwgcGxsLT5jb25maWcuaHdf c3RhdGUuZHBsbCk7CisJSTkxNV9XUklURShQQ0hfRFBMTChwbGwtPmlkKSwgcGxsX2NvbmZpZy0+ aHdfc3RhdGUuZHBsbCk7CiAJUE9TVElOR19SRUFEKFBDSF9EUExMKHBsbC0+aWQpKTsKIAl1ZGVs YXkoMjAwKTsKIH0KQEAgLTEzMTM5LDYgKzEzMTYwLDEzIEBAIHZvaWQgaW50ZWxfbW9kZXNldF9p bml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJZW51bSBwaXBlIHBpcGU7CiAJc3RydWN0IGlu dGVsX2NydGMgKmNydGM7CiAKKwlkZXZfcHJpdi0+ZGlzcGxheV9zdGF0ZSA9IGt6YWxsb2Moc2l6 ZW9mICpkZXZfcHJpdi0+ZGlzcGxheV9zdGF0ZSwKKwkJCQkJICBHRlBfS0VSTkVMKTsKKwlpZiAo IWRldl9wcml2LT5kaXNwbGF5X3N0YXRlKSB7CisJCURSTV9ERUJVR19LTVMoIkZhaWxlZCB0byBh bGxvY2F0ZSBkaXNwbGF5IHN0YXRlLlxuIik7CisJCXJldHVybjsKKwl9CisKIAlkcm1fbW9kZV9j b25maWdfaW5pdChkZXYpOwogCiAJZGV2LT5tb2RlX2NvbmZpZy5taW5fd2lkdGggPSAwOwpAQCAt MTM1MDksMjIgKzEzNTM3LDI0IEBAIHN0YXRpYyB2b2lkIGludGVsX21vZGVzZXRfcmVhZG91dF9o d19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJZm9yIChpID0gMDsgaSA8IGRldl9w cml2LT5udW1fc2hhcmVkX2RwbGw7IGkrKykgewogCQlzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwg KnBsbCA9ICZkZXZfcHJpdi0+c2hhcmVkX2RwbGxzW2ldOworCQlzdHJ1Y3QgaW50ZWxfc2hhcmVk X2RwbGxfY29uZmlnICpwbGxfY29uZmlnID0KKwkJCSZkZXZfcHJpdi0+ZGlzcGxheV9zdGF0ZS0+ c2hhcmVkX2RwbGxbcGxsLT5pZF07CiAKIAkJcGxsLT5vbiA9IHBsbC0+Z2V0X2h3X3N0YXRlKGRl dl9wcml2LCBwbGwsCi0JCQkJCSAgICAmcGxsLT5jb25maWcuaHdfc3RhdGUpOworCQkJCQkgICAg JnBsbF9jb25maWctPmh3X3N0YXRlKTsKIAkJcGxsLT5hY3RpdmUgPSAwOwotCQlwbGwtPmNvbmZp Zy5jcnRjX21hc2sgPSAwOworCQlwbGxfY29uZmlnLT5jcnRjX21hc2sgPSAwOwogCQlmb3JfZWFj aF9pbnRlbF9jcnRjKGRldiwgY3J0YykgewogCQkJaWYgKGNydGMtPmFjdGl2ZSAmJiBpbnRlbF9j cnRjX3RvX3NoYXJlZF9kcGxsKGNydGMpID09IHBsbCkgewogCQkJCXBsbC0+YWN0aXZlKys7Ci0J CQkJcGxsLT5jb25maWcuY3J0Y19tYXNrIHw9IDEgPDwgY3J0Yy0+cGlwZTsKKwkJCQlwbGxfY29u ZmlnLT5jcnRjX21hc2sgfD0gMSA8PCBjcnRjLT5waXBlOwogCQkJfQogCQl9CiAKIAkJRFJNX0RF QlVHX0tNUygiJXMgaHcgc3RhdGUgcmVhZG91dDogY3J0Y19tYXNrIDB4JTA4eCwgb24gJWlcbiIs Ci0JCQkgICAgICBwbGwtPm5hbWUsIHBsbC0+Y29uZmlnLmNydGNfbWFzaywgcGxsLT5vbik7CisJ CQkgICAgICBwbGwtPm5hbWUsIHBsbF9jb25maWctPmNydGNfbWFzaywgcGxsLT5vbik7CiAKLQkJ aWYgKHBsbC0+Y29uZmlnLmNydGNfbWFzaykKKwkJaWYgKHBsbF9jb25maWctPmNydGNfbWFzaykK IAkJCWludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0KGRldl9wcml2LCBQT1dFUl9ET01BSU5fUExMUyk7 CiAJfQogCkBAIC0xMzc0OSw2ICsxMzc3OSw4IEBAIHZvaWQgaW50ZWxfbW9kZXNldF9jbGVhbnVw KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgp OwogCWludGVsX2NsZWFudXBfZ3RfcG93ZXJzYXZlKGRldik7CiAJbXV0ZXhfdW5sb2NrKCZkZXYt PnN0cnVjdF9tdXRleCk7CisKKwlrZnJlZShkZXZfcHJpdi0+ZGlzcGxheV9zdGF0ZSk7CiB9CiAK IC8qCi0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK