From: Ander Conselvan de Oliveira Subject: [PATCH 07/13] drm/i915: Use a table to initilize shared dplls Date: Fri, 26 Feb 2016 15:54:20 +0200 Message-ID: <1456494866-7665-8-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1456494866-7665-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 1DFE96EAEC for ; Fri, 26 Feb 2016 13:54:43 +0000 (UTC) In-Reply-To: <1456494866-7665-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 VXNlIGEgdGFibGUgdG8gc3RvcmUgdGhlIHBlci1wbGF0Zm9ybSBzaGFyZWQgZHBsbCBpbmZvcm1h dGlvbiBpbiBvbmUKcGxhY2UuIFRoaXMgd2F5LCB0aGVyZSBpcyBubyBuZWVkIGZvciBwbGF0Zm9y bSBzcGVjaWZpYyBpbml0IGZ1bnRpb25zLgoKU2lnbmVkLW9mZi1ieTogQW5kZXIgQ29uc2VsdmFu IGRlIE9saXZlaXJhIDxhbmRlci5jb25zZWx2YW4uZGUub2xpdmVpcmFAaW50ZWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgfCAgMTYgKy0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcGxsX21nci5jIHwgMTg5ICsrKysrKysrKysrKysrKystLS0t LS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmggfCAg MjIgKystLQogMyBmaWxlcyBjaGFuZ2VkLCAxMDggaW5zZXJ0aW9ucygrKSwgMTE5IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBlNzIzMzIzLi4xMzNi NmI3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC05MTQ4LDggKzkxNDgs OCBAQCBzdGF0aWMgYm9vbCBpcm9ubGFrZV9nZXRfcGlwZV9jb25maWcoc3RydWN0IGludGVsX2Ny dGMgKmNydGMsCiAJCQlpbnRlbF9nZXRfc2hhcmVkX2RwbGxfYnlfaWQoZGV2X3ByaXYsIHBsbF9p ZCk7CiAJCXBsbCA9IHBpcGVfY29uZmlnLT5zaGFyZWRfZHBsbDsKIAotCQlXQVJOX09OKCFwbGwt PmdldF9od19zdGF0ZShkZXZfcHJpdiwgcGxsLAotCQkJCQkgICAmcGlwZV9jb25maWctPmRwbGxf aHdfc3RhdGUpKTsKKwkJV0FSTl9PTighcGxsLT5mdW5jcy5nZXRfaHdfc3RhdGUoZGV2X3ByaXYs IHBsbCwKKwkJCQkJCSAmcGlwZV9jb25maWctPmRwbGxfaHdfc3RhdGUpKTsKIAogCQl0bXAgPSBw aXBlX2NvbmZpZy0+ZHBsbF9od19zdGF0ZS5kcGxsOwogCQlwaXBlX2NvbmZpZy0+cGl4ZWxfbXVs dGlwbGllciA9CkBAIC05Njk1LDggKzk2OTUsOCBAQCBzdGF0aWMgdm9pZCBoYXN3ZWxsX2dldF9k ZGlfcG9ydF9zdGF0ZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAogCXBsbCA9IHBpcGVfY29u ZmlnLT5zaGFyZWRfZHBsbDsKIAlpZiAocGxsKSB7Ci0JCVdBUk5fT04oIXBsbC0+Z2V0X2h3X3N0 YXRlKGRldl9wcml2LCBwbGwsCi0JCQkJCSAgICZwaXBlX2NvbmZpZy0+ZHBsbF9od19zdGF0ZSkp OworCQlXQVJOX09OKCFwbGwtPmZ1bmNzLmdldF9od19zdGF0ZShkZXZfcHJpdiwgcGxsLAorCQkJ CQkJICZwaXBlX2NvbmZpZy0+ZHBsbF9od19zdGF0ZSkpOwogCX0KIAogCS8qCkBAIC0xMjcyOCw3 ICsxMjcyOCw3IEBAIGNoZWNrX3NoYXJlZF9kcGxsX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAKIAkJRFJNX0RFQlVHX0tNUygiJXNcbiIsIHBsbC0+bmFtZSk7CiAKLQkJYWN0aXZlID0g cGxsLT5nZXRfaHdfc3RhdGUoZGV2X3ByaXYsIHBsbCwgJmRwbGxfaHdfc3RhdGUpOworCQlhY3Rp dmUgPSBwbGwtPmZ1bmNzLmdldF9od19zdGF0ZShkZXZfcHJpdiwgcGxsLCAmZHBsbF9od19zdGF0 ZSk7CiAKIAkJSTkxNV9TVEFURV9XQVJOKHBsbC0+YWN0aXZlID4gaHdlaWdodDMyKHBsbC0+Y29u ZmlnLmNydGNfbWFzayksCiAJCSAgICAgIm1vcmUgYWN0aXZlIHBsbCB1c2VycyB0aGFuIHJlZmVy ZW5jZXM6ICVpIHZzICVpXG4iLApAQCAtMTU0NjYsOCArMTU0NjYsOCBAQCBzdGF0aWMgdm9pZCBp bnRlbF9tb2Rlc2V0X3JlYWRvdXRfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlm b3IgKGkgPSAwOyBpIDwgZGV2X3ByaXYtPm51bV9zaGFyZWRfZHBsbDsgaSsrKSB7CiAJCXN0cnVj dCBpbnRlbF9zaGFyZWRfZHBsbCAqcGxsID0gJmRldl9wcml2LT5zaGFyZWRfZHBsbHNbaV07CiAK LQkJcGxsLT5vbiA9IHBsbC0+Z2V0X2h3X3N0YXRlKGRldl9wcml2LCBwbGwsCi0JCQkJCSAgICAm cGxsLT5jb25maWcuaHdfc3RhdGUpOworCQlwbGwtPm9uID0gcGxsLT5mdW5jcy5nZXRfaHdfc3Rh dGUoZGV2X3ByaXYsIHBsbCwKKwkJCQkJCSAgJnBsbC0+Y29uZmlnLmh3X3N0YXRlKTsKIAkJcGxs LT5hY3RpdmUgPSAwOwogCQlwbGwtPmNvbmZpZy5jcnRjX21hc2sgPSAwOwogCQlmb3JfZWFjaF9p bnRlbF9jcnRjKGRldiwgY3J0YykgewpAQCAtMTU2MDIsNyArMTU2MDIsNyBAQCBpbnRlbF9tb2Rl c2V0X3NldHVwX2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAkJRFJNX0RFQlVH X0tNUygiJXMgZW5hYmxlZCBidXQgbm90IGluIHVzZSwgZGlzYWJsaW5nXG4iLCBwbGwtPm5hbWUp OwogCi0JCXBsbC0+ZGlzYWJsZShkZXZfcHJpdiwgcGxsKTsKKwkJcGxsLT5mdW5jcy5kaXNhYmxl KGRldl9wcml2LCBwbGwpOwogCQlwbGwtPm9uID0gZmFsc2U7CiAJfQogCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcGxsX21nci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHBsbF9tZ3IuYwppbmRleCA4ODljZWVkLi5lODhkYzQ2IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcGxsX21nci5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2RwbGxfbWdyLmMKQEAgLTc0LDcgKzc0LDcgQEAgdm9pZCBhc3NlcnRfc2hh cmVkX2RwbGwoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCWlmIChXQVJOKCFw bGwsICJhc3NlcnRpbmcgRFBMTCAlcyB3aXRoIG5vIERQTExcbiIsIG9ub2ZmKHN0YXRlKSkpCiAJ CXJldHVybjsKIAotCWN1cl9zdGF0ZSA9IHBsbC0+Z2V0X2h3X3N0YXRlKGRldl9wcml2LCBwbGws ICZod19zdGF0ZSk7CisJY3VyX3N0YXRlID0gcGxsLT5mdW5jcy5nZXRfaHdfc3RhdGUoZGV2X3By aXYsIHBsbCwgJmh3X3N0YXRlKTsKIAlJOTE1X1NUQVRFX1dBUk4oY3VyX3N0YXRlICE9IHN0YXRl LAogCSAgICAgIiVzIGFzc2VydGlvbiBmYWlsdXJlIChleHBlY3RlZCAlcywgY3VycmVudCAlcylc biIsCiAJCQlwbGwtPm5hbWUsIG9ub2ZmKHN0YXRlKSwgb25vZmYoY3VyX3N0YXRlKSk7CkBAIC05 NSw3ICs5NSw3IEBAIHZvaWQgaW50ZWxfcHJlcGFyZV9zaGFyZWRfZHBsbChzdHJ1Y3QgaW50ZWxf Y3J0YyAqY3J0YykKIAkJV0FSTl9PTihwbGwtPm9uKTsKIAkJYXNzZXJ0X3NoYXJlZF9kcGxsX2Rp c2FibGVkKGRldl9wcml2LCBwbGwpOwogCi0JCXBsbC0+bW9kZV9zZXQoZGV2X3ByaXYsIHBsbCk7 CisJCXBsbC0+ZnVuY3MubW9kZV9zZXQoZGV2X3ByaXYsIHBsbCk7CiAJfQogfQogCkBAIC0xMzMs NyArMTMzLDcgQEAgdm9pZCBpbnRlbF9lbmFibGVfc2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2Ny dGMgKmNydGMpCiAJaW50ZWxfZGlzcGxheV9wb3dlcl9nZXQoZGV2X3ByaXYsIFBPV0VSX0RPTUFJ Tl9QTExTKTsKIAogCURSTV9ERUJVR19LTVMoImVuYWJsaW5nICVzXG4iLCBwbGwtPm5hbWUpOwot CXBsbC0+ZW5hYmxlKGRldl9wcml2LCBwbGwpOworCXBsbC0+ZnVuY3MuZW5hYmxlKGRldl9wcml2 LCBwbGwpOwogCXBsbC0+b24gPSB0cnVlOwogfQogCkBAIC0xNjgsNyArMTY4LDcgQEAgdm9pZCBp bnRlbF9kaXNhYmxlX3NoYXJlZF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCQlyZXR1 cm47CiAKIAlEUk1fREVCVUdfS01TKCJkaXNhYmxpbmcgJXNcbiIsIHBsbC0+bmFtZSk7Ci0JcGxs LT5kaXNhYmxlKGRldl9wcml2LCBwbGwpOworCXBsbC0+ZnVuY3MuZGlzYWJsZShkZXZfcHJpdiwg cGxsKTsKIAlwbGwtPm9uID0gZmFsc2U7CiAKIAlpbnRlbF9kaXNwbGF5X3Bvd2VyX3B1dChkZXZf cHJpdiwgUE9XRVJfRE9NQUlOX1BMTFMpOwpAQCAtMzk4LDI5ICszOTgsMTMgQEAgc3RhdGljIHZv aWQgaWJ4X3BjaF9kcGxsX2Rpc2FibGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 LAogCXVkZWxheSgyMDApOwogfQogCi1zdGF0aWMgY2hhciAqaWJ4X3BjaF9kcGxsX25hbWVzW10g PSB7Ci0JIlBDSCBEUExMIEEiLAotCSJQQ0ggRFBMTCBCIiwKK3N0YXRpYyBjb25zdCBzdHJ1Y3Qg aW50ZWxfc2hhcmVkX2RwbGxfZnVuY3MgaWJ4X3BjaF9kcGxsX2Z1bmNzID0geworCS5tb2RlX3Nl dCA9IGlieF9wY2hfZHBsbF9tb2RlX3NldCwKKwkuZW5hYmxlID0gaWJ4X3BjaF9kcGxsX2VuYWJs ZSwKKwkuZGlzYWJsZSA9IGlieF9wY2hfZHBsbF9kaXNhYmxlLAorCS5nZXRfaHdfc3RhdGUgPSBp YnhfcGNoX2RwbGxfZ2V0X2h3X3N0YXRlLAogfTsKIAotc3RhdGljIHZvaWQgaWJ4X3BjaF9kcGxs X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKLXsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwotCWludCBpOwotCi0JZGV2X3ByaXYtPm51 bV9zaGFyZWRfZHBsbCA9IDI7Ci0KLQlmb3IgKGkgPSAwOyBpIDwgZGV2X3ByaXYtPm51bV9zaGFy ZWRfZHBsbDsgaSsrKSB7Ci0JCWRldl9wcml2LT5zaGFyZWRfZHBsbHNbaV0uaWQgPSBpOwotCQlk ZXZfcHJpdi0+c2hhcmVkX2RwbGxzW2ldLm5hbWUgPSBpYnhfcGNoX2RwbGxfbmFtZXNbaV07Ci0J CWRldl9wcml2LT5zaGFyZWRfZHBsbHNbaV0ubW9kZV9zZXQgPSBpYnhfcGNoX2RwbGxfbW9kZV9z ZXQ7Ci0JCWRldl9wcml2LT5zaGFyZWRfZHBsbHNbaV0uZW5hYmxlID0gaWJ4X3BjaF9kcGxsX2Vu YWJsZTsKLQkJZGV2X3ByaXYtPnNoYXJlZF9kcGxsc1tpXS5kaXNhYmxlID0gaWJ4X3BjaF9kcGxs X2Rpc2FibGU7Ci0JCWRldl9wcml2LT5zaGFyZWRfZHBsbHNbaV0uZ2V0X2h3X3N0YXRlID0KLQkJ CWlieF9wY2hfZHBsbF9nZXRfaHdfc3RhdGU7Ci0JfQotfQotCiBzdGF0aWMgdm9pZCBoc3dfZGRp X3dycGxsX2VuYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkgICAg ICAgc3RydWN0IGludGVsX3NoYXJlZF9kcGxsICpwbGwpCiB7CkBAIC00OTIsNDAgKzQ3NiwxNiBA QCBzdGF0aWMgYm9vbCBoc3dfZGRpX3NwbGxfZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwKIH0KIAogCi1zdGF0aWMgY29uc3QgY2hhciAqIGNvbnN0IGhzd19k ZGlfcGxsX25hbWVzW10gPSB7Ci0JIldSUExMIDEiLAotCSJXUlBMTCAyIiwKLQkiU1BMTCIKK3N0 YXRpYyBjb25zdCBzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGxfZnVuY3MgaHN3X2RkaV93cnBsbF9m dW5jcyA9IHsKKwkuZW5hYmxlID0gaHN3X2RkaV93cnBsbF9lbmFibGUsCisJLmRpc2FibGUgPSBo c3dfZGRpX3dycGxsX2Rpc2FibGUsCisJLmdldF9od19zdGF0ZSA9IGhzd19kZGlfd3JwbGxfZ2V0 X2h3X3N0YXRlLAogfTsKIAotc3RhdGljIHZvaWQgaHN3X3NoYXJlZF9kcGxsc19pbml0KHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKLXsKLQlpbnQgaTsKLQotCWRldl9wcml2LT5u dW1fc2hhcmVkX2RwbGwgPSAzOwotCi0JZm9yIChpID0gMDsgaSA8IDI7IGkrKykgewotCQlkZXZf cHJpdi0+c2hhcmVkX2RwbGxzW2ldLmlkID0gaTsKLQkJZGV2X3ByaXYtPnNoYXJlZF9kcGxsc1tp XS5uYW1lID0gaHN3X2RkaV9wbGxfbmFtZXNbaV07Ci0JCWRldl9wcml2LT5zaGFyZWRfZHBsbHNb aV0uZGlzYWJsZSA9IGhzd19kZGlfd3JwbGxfZGlzYWJsZTsKLQkJZGV2X3ByaXYtPnNoYXJlZF9k cGxsc1tpXS5lbmFibGUgPSBoc3dfZGRpX3dycGxsX2VuYWJsZTsKLQkJZGV2X3ByaXYtPnNoYXJl ZF9kcGxsc1tpXS5nZXRfaHdfc3RhdGUgPQotCQkJaHN3X2RkaV93cnBsbF9nZXRfaHdfc3RhdGU7 Ci0JfQotCi0JLyogU1BMTCBpcyBzcGVjaWFsLCBidXQgbmVlZHMgdG8gYmUgaW5pdGlhbGl6ZWQg YW55d2F5Li4gKi8KLQlkZXZfcHJpdi0+c2hhcmVkX2RwbGxzW2ldLmlkID0gaTsKLQlkZXZfcHJp di0+c2hhcmVkX2RwbGxzW2ldLm5hbWUgPSBoc3dfZGRpX3BsbF9uYW1lc1tpXTsKLQlkZXZfcHJp di0+c2hhcmVkX2RwbGxzW2ldLmRpc2FibGUgPSBoc3dfZGRpX3NwbGxfZGlzYWJsZTsKLQlkZXZf cHJpdi0+c2hhcmVkX2RwbGxzW2ldLmVuYWJsZSA9IGhzd19kZGlfc3BsbF9lbmFibGU7Ci0JZGV2 X3ByaXYtPnNoYXJlZF9kcGxsc1tpXS5nZXRfaHdfc3RhdGUgPSBoc3dfZGRpX3NwbGxfZ2V0X2h3 X3N0YXRlOwotCi19Ci0KLXN0YXRpYyBjb25zdCBjaGFyICogY29uc3Qgc2tsX2RkaV9wbGxfbmFt ZXNbXSA9IHsKLQkiRFBMTCAxIiwKLQkiRFBMTCAyIiwKLQkiRFBMTCAzIiwKK3N0YXRpYyBjb25z dCBzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGxfZnVuY3MgaHN3X2RkaV9zcGxsX2Z1bmNzID0gewor CS5lbmFibGUgPSBoc3dfZGRpX3NwbGxfZW5hYmxlLAorCS5kaXNhYmxlID0gaHN3X2RkaV9zcGxs X2Rpc2FibGUsCisJLmdldF9od19zdGF0ZSA9IGhzd19kZGlfc3BsbF9nZXRfaHdfc3RhdGUsCiB9 OwogCiBzdHJ1Y3Qgc2tsX2RwbGxfcmVncyB7CkBAIC02MzQsMjYgKzU5NCwxMCBAQCBvdXQ6CiAJ cmV0dXJuIHJldDsKIH0KIAotc3RhdGljIHZvaWQgc2tsX3NoYXJlZF9kcGxsc19pbml0KHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKLXsKLQlpbnQgaTsKLQotCWRldl9wcml2LT5u dW1fc2hhcmVkX2RwbGwgPSAzOwotCi0JZm9yIChpID0gMDsgaSA8IGRldl9wcml2LT5udW1fc2hh cmVkX2RwbGw7IGkrKykgewotCQlkZXZfcHJpdi0+c2hhcmVkX2RwbGxzW2ldLmlkID0gaTsKLQkJ ZGV2X3ByaXYtPnNoYXJlZF9kcGxsc1tpXS5uYW1lID0gc2tsX2RkaV9wbGxfbmFtZXNbaV07Ci0J CWRldl9wcml2LT5zaGFyZWRfZHBsbHNbaV0uZGlzYWJsZSA9IHNrbF9kZGlfcGxsX2Rpc2FibGU7 Ci0JCWRldl9wcml2LT5zaGFyZWRfZHBsbHNbaV0uZW5hYmxlID0gc2tsX2RkaV9wbGxfZW5hYmxl OwotCQlkZXZfcHJpdi0+c2hhcmVkX2RwbGxzW2ldLmdldF9od19zdGF0ZSA9Ci0JCQlza2xfZGRp X3BsbF9nZXRfaHdfc3RhdGU7Ci0JfQotfQotCi1zdGF0aWMgY29uc3QgY2hhciAqIGNvbnN0IGJ4 dF9kZGlfcGxsX25hbWVzW10gPSB7Ci0JIlBPUlQgUExMIEEiLAotCSJQT1JUIFBMTCBCIiwKLQki UE9SVCBQTEwgQyIsCitzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX3NoYXJlZF9kcGxsX2Z1bmNz IHNrbF9kZGlfcGxsX2Z1bmNzID0geworCS5lbmFibGUgPSBza2xfZGRpX3BsbF9lbmFibGUsCisJ LmRpc2FibGUgPSBza2xfZGRpX3BsbF9kaXNhYmxlLAorCS5nZXRfaHdfc3RhdGUgPSBza2xfZGRp X3BsbF9nZXRfaHdfc3RhdGUsCiB9OwogCiBzdGF0aWMgdm9pZCBieHRfZGRpX3BsbF9lbmFibGUo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LApAQCAtODM4LDM0ICs3ODIsMTcgQEAg b3V0OgogCXJldHVybiByZXQ7CiB9CiAKLXN0YXRpYyB2b2lkIGJ4dF9zaGFyZWRfZHBsbHNfaW5p dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCi17Ci0JaW50IGk7Ci0KLQlkZXZf cHJpdi0+bnVtX3NoYXJlZF9kcGxsID0gMzsKLQotCWZvciAoaSA9IDA7IGkgPCBkZXZfcHJpdi0+ bnVtX3NoYXJlZF9kcGxsOyBpKyspIHsKLQkJZGV2X3ByaXYtPnNoYXJlZF9kcGxsc1tpXS5pZCA9 IGk7Ci0JCWRldl9wcml2LT5zaGFyZWRfZHBsbHNbaV0ubmFtZSA9IGJ4dF9kZGlfcGxsX25hbWVz W2ldOwotCQlkZXZfcHJpdi0+c2hhcmVkX2RwbGxzW2ldLmRpc2FibGUgPSBieHRfZGRpX3BsbF9k aXNhYmxlOwotCQlkZXZfcHJpdi0+c2hhcmVkX2RwbGxzW2ldLmVuYWJsZSA9IGJ4dF9kZGlfcGxs X2VuYWJsZTsKLQkJZGV2X3ByaXYtPnNoYXJlZF9kcGxsc1tpXS5nZXRfaHdfc3RhdGUgPQotCQkJ Ynh0X2RkaV9wbGxfZ2V0X2h3X3N0YXRlOwotCX0KLX0KK3N0YXRpYyBjb25zdCBzdHJ1Y3QgaW50 ZWxfc2hhcmVkX2RwbGxfZnVuY3MgYnh0X2RkaV9wbGxfZnVuY3MgPSB7CisJLmVuYWJsZSA9IGJ4 dF9kZGlfcGxsX2VuYWJsZSwKKwkuZGlzYWJsZSA9IGJ4dF9kZGlfcGxsX2Rpc2FibGUsCisJLmdl dF9od19zdGF0ZSA9IGJ4dF9kZGlfcGxsX2dldF9od19zdGF0ZSwKK307CiAKIHN0YXRpYyB2b2lk IGludGVsX2RkaV9wbGxfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJdWludDMyX3Qg dmFsID0gSTkxNV9SRUFEKExDUExMX0NUTCk7CiAKLQlpZiAoSVNfU0tZTEFLRShkZXYpIHx8IElT X0tBQllMQUtFKGRldikpCi0JCXNrbF9zaGFyZWRfZHBsbHNfaW5pdChkZXZfcHJpdik7Ci0JZWxz ZSBpZiAoSVNfQlJPWFRPTihkZXYpKQotCQlieHRfc2hhcmVkX2RwbGxzX2luaXQoZGV2X3ByaXYp OwotCWVsc2UKLQkJaHN3X3NoYXJlZF9kcGxsc19pbml0KGRldl9wcml2KTsKLQogCWlmIChJU19T S1lMQUtFKGRldikgfHwgSVNfS0FCWUxBS0UoZGV2KSkgewogCQlpbnQgY2RjbGtfZnJlcTsKIApA QCAtODkzLDE2ICs4MjAsNzIgQEAgc3RhdGljIHZvaWQgaW50ZWxfZGRpX3BsbF9pbml0KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiAJfQogfQogCitzdHJ1Y3QgZHBsbF9pbmZvIHsKKwljb25zdCBj aGFyICpuYW1lOworCWNvbnN0IGludCBpZDsKKwljb25zdCBzdHJ1Y3QgaW50ZWxfc2hhcmVkX2Rw bGxfZnVuY3MgKmZ1bmNzOworfTsKKworc3RhdGljIGNvbnN0IHN0cnVjdCBkcGxsX2luZm8gcGNo X3BsbHNbXSA9IHsKKwl7ICJQQ0ggRFBMTCBBIiwgRFBMTF9JRF9QQ0hfUExMX0EsICZpYnhfcGNo X2RwbGxfZnVuY3MgfSwKKwl7ICJQQ0ggRFBMTCBCIiwgRFBMTF9JRF9QQ0hfUExMX0IsICZpYnhf cGNoX2RwbGxfZnVuY3MgfSwKKwl7IE5VTEwsIC0xLCBOVUxMIH0sCit9OworCitzdGF0aWMgY29u c3Qgc3RydWN0IGRwbGxfaW5mbyBoc3dfcGxsc1tdID0geworCXsgIldSUExMIDEiLCBEUExMX0lE X1dSUExMMSwgJmhzd19kZGlfd3JwbGxfZnVuY3MgfSwKKwl7ICJXUlBMTCAyIiwgRFBMTF9JRF9X UlBMTDIsICZoc3dfZGRpX3dycGxsX2Z1bmNzIH0sCisJeyAiU1BMTCIsICAgIERQTExfSURfU1BM TCwgICAmaHN3X2RkaV9zcGxsX2Z1bmNzIH0sCisJeyBOVUxMLCAtMSwgTlVMTCwgfSwKK307CisK K3N0YXRpYyBjb25zdCBzdHJ1Y3QgZHBsbF9pbmZvIHNrbF9wbGxzW10gPSB7CisJeyAiRFBQTCAx IiwgRFBMTF9JRF9TS0xfRFBMTDEsICZza2xfZGRpX3BsbF9mdW5jcyB9LAorCXsgIkRQUEwgMiIs IERQTExfSURfU0tMX0RQTEwyLCAmc2tsX2RkaV9wbGxfZnVuY3MgfSwKKwl7ICJEUFBMIDMiLCBE UExMX0lEX1NLTF9EUExMMywgJnNrbF9kZGlfcGxsX2Z1bmNzIH0sCisJeyBOVUxMLCAtMSwgTlVM TCwgfSwKK307CisKK3N0YXRpYyBjb25zdCBzdHJ1Y3QgZHBsbF9pbmZvIGJ4dF9wbGxzW10gPSB7 CisJeyAiUE9SVCBQTEwgQSIsIDAsICZieHRfZGRpX3BsbF9mdW5jcyB9LAorCXsgIlBPUlQgUExM IEIiLCAxLCAmYnh0X2RkaV9wbGxfZnVuY3MgfSwKKwl7ICJQT1JUIFBMTCBDIiwgMiwgJmJ4dF9k ZGlfcGxsX2Z1bmNzIH0sCisJeyBOVUxMLCAtMSwgTlVMTCwgfSwKK307CisKIHZvaWQgaW50ZWxf c2hhcmVkX2RwbGxfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CisJY29uc3Qgc3RydWN0 IGRwbGxfaW5mbyAqZHBsbF9pbmZvID0gTlVMTDsKKwlpbnQgaTsKIAotCWlmIChIQVNfRERJKGRl dikpCi0JCWludGVsX2RkaV9wbGxfaW5pdChkZXYpOworCWlmIChJU19TS1lMQUtFKGRldikgfHwg SVNfS0FCWUxBS0UoZGV2KSkKKwkJZHBsbF9pbmZvID0gc2tsX3BsbHM7CisJZWxzZSBpZiBJU19C Uk9YVE9OKGRldikKKwkJZHBsbF9pbmZvID0gYnh0X3BsbHM7CisJZWxzZSBpZiAoSEFTX0RESShk ZXYpKQorCQlkcGxsX2luZm8gPSBoc3dfcGxsczsKIAllbHNlIGlmIChIQVNfUENIX0lCWChkZXYp IHx8IEhBU19QQ0hfQ1BUKGRldikpCi0JCWlieF9wY2hfZHBsbF9pbml0KGRldik7Ci0JZWxzZQor CQlkcGxsX2luZm8gPSBwY2hfcGxsczsKKworCWlmICghZHBsbF9pbmZvKSB7CiAJCWRldl9wcml2 LT5udW1fc2hhcmVkX2RwbGwgPSAwOworCQlyZXR1cm47CisJfQorCisJZm9yIChpID0gMDsgZHBs bF9pbmZvW2ldLmlkID49IDA7IGkrKykgeworCQlXQVJOX09OKGkgIT0gZHBsbF9pbmZvW2ldLmlk KTsKKworCQlkZXZfcHJpdi0+c2hhcmVkX2RwbGxzW2ldLmlkID0gZHBsbF9pbmZvW2ldLmlkOwor CQlkZXZfcHJpdi0+c2hhcmVkX2RwbGxzW2ldLm5hbWUgPSBkcGxsX2luZm9baV0ubmFtZTsKKwkJ ZGV2X3ByaXYtPnNoYXJlZF9kcGxsc1tpXS5mdW5jcyA9ICpkcGxsX2luZm9baV0uZnVuY3M7CisJ fQorCisJZGV2X3ByaXYtPm51bV9zaGFyZWRfZHBsbCA9IGk7CiAKIAlCVUdfT04oZGV2X3ByaXYt Pm51bV9zaGFyZWRfZHBsbCA+IEk5MTVfTlVNX1BMTFMpOworCisJLyogRklYTUU6IE1vdmUgdGhp cyB0byBhIG1vcmUgc3VpdGFibGUgcGxhY2UgKi8KKwlpZiAoSEFTX0RESShkZXYpKQorCQlpbnRl bF9kZGlfcGxsX2luaXQoZGV2KTsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2RwbGxfbWdyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcGxsX21nci5o CmluZGV4IGEyZWNmODAuLjhiZTI0NzggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2RwbGxfbWdyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBsbF9t Z3IuaApAQCAtMjgsNiArMjgsNyBAQAogc3RydWN0IGRybV9pOTE1X3ByaXZhdGU7CiBzdHJ1Y3Qg aW50ZWxfY3J0YzsKIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlOworc3RydWN0IGludGVsX3NoYXJl ZF9kcGxsOwogCiBlbnVtIGludGVsX2RwbGxfaWQgewogCURQTExfSURfUFJJVkFURSA9IC0xLCAv KiBub24tc2hhcmVkIGRwbGwgaW4gdXNlICovCkBAIC03OCwxNCArNzksNyBAQCBzdHJ1Y3QgaW50 ZWxfc2hhcmVkX2RwbGxfY29uZmlnIHsKIAlzdHJ1Y3QgaW50ZWxfZHBsbF9od19zdGF0ZSBod19z dGF0ZTsKIH07CiAKLXN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCB7Ci0Jc3RydWN0IGludGVsX3No YXJlZF9kcGxsX2NvbmZpZyBjb25maWc7Ci0KLQlpbnQgYWN0aXZlOyAvKiBjb3VudCBvZiBudW1i ZXIgb2YgYWN0aXZlIENSVENzIChpLmUuIERQTVMgb24pICovCi0JYm9vbCBvbjsgLyogaXMgdGhl IFBMTCBhY3R1YWxseSBhY3RpdmU/IERpc2FibGVkIGR1cmluZyBtb2Rlc2V0ICovCi0JY29uc3Qg Y2hhciAqbmFtZTsKLQkvKiBzaG91bGQgbWF0Y2ggdGhlIGluZGV4IGluIHRoZSBkZXZfcHJpdi0+ c2hhcmVkX2RwbGxzIGFycmF5ICovCi0JZW51bSBpbnRlbF9kcGxsX2lkIGlkOworc3RydWN0IGlu dGVsX3NoYXJlZF9kcGxsX2Z1bmNzIHsKIAkvKiBUaGUgbW9kZV9zZXQgaG9vayBpcyBvcHRpb25h bCBhbmQgc2hvdWxkIGJlIHVzZWQgdG9nZXRoZXIgd2l0aCB0aGUKIAkgKiBpbnRlbF9wcmVwYXJl X3NoYXJlZF9kcGxsIGZ1bmN0aW9uLiAqLwogCXZvaWQgKCptb2RlX3NldCkoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2LApAQCAtOTksNiArOTMsMTggQEAgc3RydWN0IGludGVsX3No YXJlZF9kcGxsIHsKIAkJCSAgICAgc3RydWN0IGludGVsX2RwbGxfaHdfc3RhdGUgKmh3X3N0YXRl KTsKIH07CiAKK3N0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCB7CisJc3RydWN0IGludGVsX3NoYXJl ZF9kcGxsX2NvbmZpZyBjb25maWc7CisKKwlpbnQgYWN0aXZlOyAvKiBjb3VudCBvZiBudW1iZXIg b2YgYWN0aXZlIENSVENzIChpLmUuIERQTVMgb24pICovCisJYm9vbCBvbjsgLyogaXMgdGhlIFBM TCBhY3R1YWxseSBhY3RpdmU/IERpc2FibGVkIGR1cmluZyBtb2Rlc2V0ICovCisJY29uc3QgY2hh ciAqbmFtZTsKKwkvKiBzaG91bGQgbWF0Y2ggdGhlIGluZGV4IGluIHRoZSBkZXZfcHJpdi0+c2hh cmVkX2RwbGxzIGFycmF5ICovCisJZW51bSBpbnRlbF9kcGxsX2lkIGlkOworCisJc3RydWN0IGlu dGVsX3NoYXJlZF9kcGxsX2Z1bmNzIGZ1bmNzOworfTsKKwogI2RlZmluZSBTS0xfRFBMTDAgMAog I2RlZmluZSBTS0xfRFBMTDEgMQogI2RlZmluZSBTS0xfRFBMTDIgMgotLSAKMi40LjMKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=