From: Imre Deak Subject: [PATCH v2 16/18] drm/i915/gen9+: Unify the HSW/BDW and GEN9+ power well helpers Date: Tue, 11 Jul 2017 23:42:36 +0300 Message-ID: <20170711204236.5618-7-imre.deak@intel.com> References: <20170711204236.5618-1-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 326736E31E for ; Tue, 11 Jul 2017 20:42:49 +0000 (UTC) In-Reply-To: <20170711204236.5618-1-imre.deak@intel.com> In-Reply-To: <1499352040-8819-17-git-send-email-imre.deak@intel.com> References: <1499352040-8819-17-git-send-email-imre.deak@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 QWZ0ZXIgdGhlIHByZXZpb3VzIHJlZmFjdG9yaW5ncyB0aGUgSFNXL0JEVyBhbmQgR0VOOSsgcG93 ZXIgd2VsbCBoZWxwZXJzCmFyZSBwcmFjdGljYWxseSBpZGVudGljYWwsIHNvIHVzZSB0aGUgSFNX IHBvd2VyIHdlbGwgaGVscGVycyBmb3IgR0VOOSsKdG9vLiBUaGlzIG1lYW5zIHVzaW5nIHRoZSBI U1cgcG93ZXIgd2VsbCBvcHMgaW5zdGVhZCBvZiB0aGUgU0tMIG9uZSBhbmQKc2V0dGluZyB0aGUg aXJxX3BpcGVfbWFzaywgaGFzX3ZnYSBhbmQgaGFzX2Z1c2VzIGF0dHJpYnV0ZXMgYXMgbmVlZGVk LgoKdjI6Ci0gUmViYXNlZCBvbiB2MiBvZiBwYXRjaCAxNS4KClNpZ25lZC1vZmYtYnk6IEltcmUg RGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ydW50aW1lX3BtLmMgfCAyMzEgKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEg ZmlsZSBjaGFuZ2VkLCA0MyBpbnNlcnRpb25zKCspLCAxODggZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jCmluZGV4IGI0NzNiZDEwMjhmZi4uNGUzYTdk Nzk3ZTE1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3Bt LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jCkBAIC0zMTMs MzggKzMxMyw2IEBAIHN0YXRpYyB2b2lkIGhzd19wb3dlcl93ZWxsX3ByZV9kaXNhYmxlKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJZ2VuOF9pcnFfcG93ZXJfd2VsbF9wcmVf ZGlzYWJsZShkZXZfcHJpdiwgaXJxX3BpcGVfbWFzayk7CiB9CiAKLXN0YXRpYyB2b2lkIHNrbF9w b3dlcl93ZWxsX3Bvc3RfZW5hYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwK LQkJCQkgICAgICAgc3RydWN0IGk5MTVfcG93ZXJfd2VsbCAqcG93ZXJfd2VsbCkKLXsKLQlzdHJ1 Y3QgcGNpX2RldiAqcGRldiA9IGRldl9wcml2LT5kcm0ucGRldjsKLQotCS8qCi0JICogQWZ0ZXIg d2UgcmUtZW5hYmxlIHRoZSBwb3dlciB3ZWxsLCBpZiB3ZSB0b3VjaCBWR0EgcmVnaXN0ZXIgMHgz ZDUKLQkgKiB3ZSdsbCBnZXQgdW5jbGFpbWVkIHJlZ2lzdGVyIGludGVycnVwdHMuIFRoaXMgc3Rv cHMgYWZ0ZXIgd2Ugd3JpdGUKLQkgKiBhbnl0aGluZyB0byB0aGUgVkdBIE1TUiByZWdpc3Rlci4g VGhlIHZnYWNvbiBtb2R1bGUgdXNlcyB0aGlzCi0JICogcmVnaXN0ZXIgYWxsIHRoZSB0aW1lLCBz byBpZiB3ZSB1bmJpbmQgb3VyIGRyaXZlciBhbmQsIGFzIGEKLQkgKiBjb25zZXF1ZW5jZSwgYmlu ZCB2Z2Fjb24sIHdlJ2xsIGdldCBzdHVjayBpbiBhbiBpbmZpbml0ZSBsb29wIGF0Ci0JICogY29u c29sZV91bmxvY2soKS4gU28gbWFrZSBoZXJlIHdlIHRvdWNoIHRoZSBWR0EgTVNSIHJlZ2lzdGVy LCBtYWtpbmcKLQkgKiBzdXJlIHZnYWNvbiBjYW4ga2VlcCB3b3JraW5nIG5vcm1hbGx5IHdpdGhv dXQgdHJpZ2dlcmluZyBpbnRlcnJ1cHRzCi0JICogYW5kIGVycm9yIG1lc3NhZ2VzLgotCSAqLwot CWlmIChwb3dlcl93ZWxsLT5pZCA9PSBTS0xfRElTUF9QV18yKSB7Ci0JCXZnYV9nZXRfdW5pbnRl cnJ1cHRpYmxlKHBkZXYsIFZHQV9SU1JDX0xFR0FDWV9JTyk7Ci0JCW91dGIoaW5iKFZHQV9NU1Jf UkVBRCksIFZHQV9NU1JfV1JJVEUpOwotCQl2Z2FfcHV0KHBkZXYsIFZHQV9SU1JDX0xFR0FDWV9J Tyk7Ci0KLQkJZ2VuOF9pcnFfcG93ZXJfd2VsbF9wb3N0X2VuYWJsZShkZXZfcHJpdiwKLQkJCQkJ CTEgPDwgUElQRV9DIHwgMSA8PCBQSVBFX0IpOwotCX0KLX0KLQotc3RhdGljIHZvaWQgc2tsX3Bv d2VyX3dlbGxfcHJlX2Rpc2FibGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAot CQkJCSAgICAgICBzdHJ1Y3QgaTkxNV9wb3dlcl93ZWxsICpwb3dlcl93ZWxsKQotewotCWlmIChw b3dlcl93ZWxsLT5pZCA9PSBTS0xfRElTUF9QV18yKQotCQlnZW44X2lycV9wb3dlcl93ZWxsX3By ZV9kaXNhYmxlKGRldl9wcml2LAotCQkJCQkJMSA8PCBQSVBFX0MgfCAxIDw8IFBJUEVfQik7Ci19 CiAKIHN0YXRpYyB2b2lkIGhzd193YWl0X2Zvcl9wb3dlcl93ZWxsX2VuYWJsZShzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJCSAgIHN0cnVjdCBpOTE1X3Bvd2VyX3dlbGwg KnBvd2VyX3dlbGwpCkBAIC04MjMsOTEgKzc5MSw2IEBAIHZvaWQgc2tsX2Rpc2FibGVfZGM2KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlnZW45X3NldF9kY19zdGF0ZShkZXZf cHJpdiwgRENfU1RBVEVfRElTQUJMRSk7CiB9CiAKLXN0YXRpYyB2b2lkIHNrbF9zZXRfcG93ZXJf d2VsbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkgICAgICAgc3RydWN0 IGk5MTVfcG93ZXJfd2VsbCAqcG93ZXJfd2VsbCwgYm9vbCBlbmFibGUpCi17Ci0JdWludDMyX3Qg dG1wLCBmdXNlX3N0YXR1czsKLQl1aW50MzJfdCByZXFfbWFzaywgc3RhdGVfbWFzazsKLQlib29s IGNoZWNrX2Z1c2Vfc3RhdHVzID0gZmFsc2U7Ci0KLQl0bXAgPSBJOTE1X1JFQUQoSFNXX1BXUl9X RUxMX0RSSVZFUik7Ci0JZnVzZV9zdGF0dXMgPSBJOTE1X1JFQUQoU0tMX0ZVU0VfU1RBVFVTKTsK LQotCXN3aXRjaCAocG93ZXJfd2VsbC0+aWQpIHsKLQljYXNlIFNLTF9ESVNQX1BXXzE6Ci0JCWlm IChpbnRlbF93YWl0X2Zvcl9yZWdpc3RlcihkZXZfcHJpdiwKLQkJCQkJICAgIFNLTF9GVVNFX1NU QVRVUywKLQkJCQkJICAgIFNLTF9GVVNFX1BHX0RJU1RfU1RBVFVTKFNLTF9QRzApLAotCQkJCQkg ICAgU0tMX0ZVU0VfUEdfRElTVF9TVEFUVVMoU0tMX1BHMCksCi0JCQkJCSAgICAxKSkgewotCQkJ RFJNX0VSUk9SKCJQRzAgbm90IGVuYWJsZWRcbiIpOwotCQkJcmV0dXJuOwotCQl9Ci0JCWJyZWFr OwotCWNhc2UgU0tMX0RJU1BfUFdfMjoKLQkJaWYgKCEoZnVzZV9zdGF0dXMgJiBTS0xfRlVTRV9Q R19ESVNUX1NUQVRVUyhTS0xfUEcxKSkpIHsKLQkJCURSTV9FUlJPUigiUEcxIGluIGRpc2FibGVk IHN0YXRlXG4iKTsKLQkJCXJldHVybjsKLQkJfQotCQlicmVhazsKLQljYXNlIFNLTF9ESVNQX1BX X01JU0NfSU86Ci0JY2FzZSBTS0xfRElTUF9QV19ERElfQV9FOiAvKiBHTEtfRElTUF9QV19ERElf QSwgQ05MX0RJU1BfUFdfRERJX0EgKi8KLQljYXNlIFNLTF9ESVNQX1BXX0RESV9COgotCWNhc2Ug U0tMX0RJU1BfUFdfRERJX0M6Ci0JY2FzZSBTS0xfRElTUF9QV19ERElfRDoKLQljYXNlIEdMS19E SVNQX1BXX0FVWF9BOiAvKiBDTkxfRElTUF9QV19BVVhfQSAqLwotCWNhc2UgR0xLX0RJU1BfUFdf QVVYX0I6IC8qIENOTF9ESVNQX1BXX0FVWF9CICovCi0JY2FzZSBHTEtfRElTUF9QV19BVVhfQzog LyogQ05MX0RJU1BfUFdfQVVYX0MgKi8KLQljYXNlIENOTF9ESVNQX1BXX0FVWF9EOgotCQlicmVh azsKLQlkZWZhdWx0OgotCQlXQVJOKDEsICJVbmtub3duIHBvd2VyIHdlbGwgJXVcbiIsIHBvd2Vy X3dlbGwtPmlkKTsKLQkJcmV0dXJuOwotCX0KLQotCXJlcV9tYXNrID0gSFNXX1BXUl9XRUxMX0NU TF9SRVEocG93ZXJfd2VsbC0+aWQpOwotCXN0YXRlX21hc2sgPSBIU1dfUFdSX1dFTExfQ1RMX1NU QVRFKHBvd2VyX3dlbGwtPmlkKTsKLQotCWlmICghZW5hYmxlKQotCQlza2xfcG93ZXJfd2VsbF9w cmVfZGlzYWJsZShkZXZfcHJpdiwgcG93ZXJfd2VsbCk7Ci0KLQlpZiAoZW5hYmxlKSB7Ci0JCUk5 MTVfV1JJVEUoSFNXX1BXUl9XRUxMX0RSSVZFUiwgdG1wIHwgcmVxX21hc2spOwotCi0JCURSTV9E RUJVR19LTVMoIkVuYWJsaW5nICVzXG4iLCBwb3dlcl93ZWxsLT5uYW1lKTsKLQkJY2hlY2tfZnVz ZV9zdGF0dXMgPSB0cnVlOwotCi0JCWhzd193YWl0X2Zvcl9wb3dlcl93ZWxsX2VuYWJsZShkZXZf cHJpdiwgcG93ZXJfd2VsbCk7Ci0JfSBlbHNlIHsKLQkJSTkxNV9XUklURShIU1dfUFdSX1dFTExf RFJJVkVSLAl0bXAgJiB+cmVxX21hc2spOwotCQlQT1NUSU5HX1JFQUQoSFNXX1BXUl9XRUxMX0RS SVZFUik7Ci0JCURSTV9ERUJVR19LTVMoIkRpc2FibGluZyAlc1xuIiwgcG93ZXJfd2VsbC0+bmFt ZSk7Ci0KLQkJaHN3X3dhaXRfZm9yX3Bvd2VyX3dlbGxfZGlzYWJsZShkZXZfcHJpdiwgcG93ZXJf d2VsbCk7Ci0JfQotCi0JaWYgKGNoZWNrX2Z1c2Vfc3RhdHVzKSB7Ci0JCWlmIChwb3dlcl93ZWxs LT5pZCA9PSBTS0xfRElTUF9QV18xKSB7Ci0JCQlpZiAoaW50ZWxfd2FpdF9mb3JfcmVnaXN0ZXIo ZGV2X3ByaXYsCi0JCQkJCQkgICAgU0tMX0ZVU0VfU1RBVFVTLAotCQkJCQkJICAgIFNLTF9GVVNF X1BHX0RJU1RfU1RBVFVTKFNLTF9QRzEpLAotCQkJCQkJICAgIFNLTF9GVVNFX1BHX0RJU1RfU1RB VFVTKFNLTF9QRzEpLAotCQkJCQkJICAgIDEpKQotCQkJCURSTV9FUlJPUigiUEcxIGRpc3RyaWJ1 dGluZyBzdGF0dXMgdGltZW91dFxuIik7Ci0JCX0gZWxzZSBpZiAocG93ZXJfd2VsbC0+aWQgPT0g U0tMX0RJU1BfUFdfMikgewotCQkJaWYgKGludGVsX3dhaXRfZm9yX3JlZ2lzdGVyKGRldl9wcml2 LAotCQkJCQkJICAgIFNLTF9GVVNFX1NUQVRVUywKLQkJCQkJCSAgICBTS0xfRlVTRV9QR19ESVNU X1NUQVRVUyhTS0xfUEcyKSwKLQkJCQkJCSAgICBTS0xfRlVTRV9QR19ESVNUX1NUQVRVUyhTS0xf UEcyKSwKLQkJCQkJCSAgICAxKSkKLQkJCQlEUk1fRVJST1IoIlBHMiBkaXN0cmlidXRpbmcgc3Rh dHVzIHRpbWVvdXRcbiIpOwotCQl9Ci0JfQotCi0JaWYgKGVuYWJsZSkKLQkJc2tsX3Bvd2VyX3dl bGxfcG9zdF9lbmFibGUoZGV2X3ByaXYsIHBvd2VyX3dlbGwpOwotfQotCiBzdGF0aWMgdm9pZCBo c3dfcG93ZXJfd2VsbF9zeW5jX2h3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwK IAkJCQkgICBzdHJ1Y3QgaTkxNV9wb3dlcl93ZWxsICpwb3dlcl93ZWxsKQogewpAQCAtOTI1LDQz ICs4MDgsNiBAQCBzdGF0aWMgdm9pZCBoc3dfcG93ZXJfd2VsbF9zeW5jX2h3KHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAl9CiB9CiAKLXN0YXRpYyBib29sIHNrbF9wb3dlcl93 ZWxsX2VuYWJsZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkJCQlzdHJ1 Y3QgaTkxNV9wb3dlcl93ZWxsICpwb3dlcl93ZWxsKQotewotCXVpbnQzMl90IG1hc2sgPSBIU1df UFdSX1dFTExfQ1RMX1JFUShwb3dlcl93ZWxsLT5pZCkgfAotCQkJSFNXX1BXUl9XRUxMX0NUTF9T VEFURShwb3dlcl93ZWxsLT5pZCk7Ci0KLQlyZXR1cm4gKEk5MTVfUkVBRChIU1dfUFdSX1dFTExf RFJJVkVSKSAmIG1hc2spID09IG1hc2s7Ci19Ci0KLXN0YXRpYyB2b2lkIHNrbF9wb3dlcl93ZWxs X3N5bmNfaHcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkJCXN0cnVjdCBp OTE1X3Bvd2VyX3dlbGwgKnBvd2VyX3dlbGwpCi17Ci0JdWludDMyX3QgbWFzayA9IEhTV19QV1Jf V0VMTF9DVExfUkVRKHBvd2VyX3dlbGwtPmlkKTsKLQl1aW50MzJfdCBiaW9zX3JlcSA9IEk5MTVf UkVBRChIU1dfUFdSX1dFTExfQklPUyk7Ci0KLQkvKiBUYWtlIG92ZXIgdGhlIHJlcXVlc3QgYml0 IGlmIHNldCBieSBCSU9TLiAqLwotCWlmIChiaW9zX3JlcSAmIG1hc2spIHsKLQkJdWludDMyX3Qg ZHJ2X3JlcSA9IEk5MTVfUkVBRChIU1dfUFdSX1dFTExfRFJJVkVSKTsKLQotCQlpZiAoIShkcnZf cmVxICYgbWFzaykpCi0JCQlJOTE1X1dSSVRFKEhTV19QV1JfV0VMTF9EUklWRVIsIGRydl9yZXEg fCBtYXNrKTsKLQkJSTkxNV9XUklURShIU1dfUFdSX1dFTExfQklPUywgYmlvc19yZXEgJiB+bWFz ayk7Ci0JfQotfQotCi1zdGF0aWMgdm9pZCBza2xfcG93ZXJfd2VsbF9lbmFibGUoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkJCXN0cnVjdCBpOTE1X3Bvd2VyX3dlbGwgKnBv d2VyX3dlbGwpCi17Ci0Jc2tsX3NldF9wb3dlcl93ZWxsKGRldl9wcml2LCBwb3dlcl93ZWxsLCB0 cnVlKTsKLX0KLQotc3RhdGljIHZvaWQgc2tsX3Bvd2VyX3dlbGxfZGlzYWJsZShzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkJc3RydWN0IGk5MTVfcG93ZXJfd2VsbCAqcG93 ZXJfd2VsbCkKLXsKLQlza2xfc2V0X3Bvd2VyX3dlbGwoZGV2X3ByaXYsIHBvd2VyX3dlbGwsIGZh bHNlKTsKLX0KLQogc3RhdGljIHZvaWQgYnh0X2RwaW9fY21uX3Bvd2VyX3dlbGxfZW5hYmxlKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkJICAgc3RydWN0IGk5MTVfcG93 ZXJfd2VsbCAqcG93ZXJfd2VsbCkKIHsKQEAgLTIwNDksMTMgKzE4OTUsNiBAQCBzdGF0aWMgY29u c3Qgc3RydWN0IGk5MTVfcG93ZXJfd2VsbF9vcHMgaHN3X3Bvd2VyX3dlbGxfb3BzID0gewogCS5p c19lbmFibGVkID0gaHN3X3Bvd2VyX3dlbGxfZW5hYmxlZCwKIH07CiAKLXN0YXRpYyBjb25zdCBz dHJ1Y3QgaTkxNV9wb3dlcl93ZWxsX29wcyBza2xfcG93ZXJfd2VsbF9vcHMgPSB7Ci0JLnN5bmNf aHcgPSBza2xfcG93ZXJfd2VsbF9zeW5jX2h3LAotCS5lbmFibGUgPSBza2xfcG93ZXJfd2VsbF9l bmFibGUsCi0JLmRpc2FibGUgPSBza2xfcG93ZXJfd2VsbF9kaXNhYmxlLAotCS5pc19lbmFibGVk ID0gc2tsX3Bvd2VyX3dlbGxfZW5hYmxlZCwKLX07Ci0KIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaTkx NV9wb3dlcl93ZWxsX29wcyBnZW45X2RjX29mZl9wb3dlcl93ZWxsX29wcyA9IHsKIAkuc3luY19o dyA9IGk5eHhfcG93ZXJfd2VsbF9zeW5jX2h3X25vb3AsCiAJLmVuYWJsZSA9IGdlbjlfZGNfb2Zm X3Bvd2VyX3dlbGxfZW5hYmxlLApAQCAtMjI0MSwxNCArMjA4MCwxNSBAQCBzdGF0aWMgc3RydWN0 IGk5MTVfcG93ZXJfd2VsbCBza2xfcG93ZXJfd2VsbHNbXSA9IHsKIAkJLm5hbWUgPSAicG93ZXIg d2VsbCAxIiwKIAkJLyogSGFuZGxlZCBieSB0aGUgRE1DIGZpcm13YXJlICovCiAJCS5kb21haW5z ID0gMCwKLQkJLm9wcyA9ICZza2xfcG93ZXJfd2VsbF9vcHMsCisJCS5vcHMgPSAmaHN3X3Bvd2Vy X3dlbGxfb3BzLAogCQkuaWQgPSBTS0xfRElTUF9QV18xLAorCQkuaHN3Lmhhc19mdXNlcyA9IHRy dWUsCiAJfSwKIAl7CiAJCS5uYW1lID0gIk1JU0MgSU8gcG93ZXIgd2VsbCIsCiAJCS8qIEhhbmRs ZWQgYnkgdGhlIERNQyBmaXJtd2FyZSAqLwogCQkuZG9tYWlucyA9IDAsCi0JCS5vcHMgPSAmc2ts X3Bvd2VyX3dlbGxfb3BzLAorCQkub3BzID0gJmhzd19wb3dlcl93ZWxsX29wcywKIAkJLmlkID0g U0tMX0RJU1BfUFdfTUlTQ19JTywKIAl9LAogCXsKQEAgLTIyNjAsMzEgKzIxMDAsMzQgQEAgc3Rh dGljIHN0cnVjdCBpOTE1X3Bvd2VyX3dlbGwgc2tsX3Bvd2VyX3dlbGxzW10gPSB7CiAJewogCQku bmFtZSA9ICJwb3dlciB3ZWxsIDIiLAogCQkuZG9tYWlucyA9IFNLTF9ESVNQTEFZX1BPV0VSV0VM TF8yX1BPV0VSX0RPTUFJTlMsCi0JCS5vcHMgPSAmc2tsX3Bvd2VyX3dlbGxfb3BzLAorCQkub3Bz ID0gJmhzd19wb3dlcl93ZWxsX29wcywKIAkJLmlkID0gU0tMX0RJU1BfUFdfMiwKKwkJLmhzdy5p cnFfcGlwZV9tYXNrID0gQklUKFBJUEVfQikgfCBCSVQoUElQRV9DKSwKKwkJLmhzdy5oYXNfdmdh ID0gdHJ1ZSwKKwkJLmhzdy5oYXNfZnVzZXMgPSB0cnVlLAogCX0sCiAJewogCQkubmFtZSA9ICJE REkgQS9FIElPIHBvd2VyIHdlbGwiLAogCQkuZG9tYWlucyA9IFNLTF9ESVNQTEFZX0RESV9JT19B X0VfUE9XRVJfRE9NQUlOUywKLQkJLm9wcyA9ICZza2xfcG93ZXJfd2VsbF9vcHMsCisJCS5vcHMg PSAmaHN3X3Bvd2VyX3dlbGxfb3BzLAogCQkuaWQgPSBTS0xfRElTUF9QV19ERElfQV9FLAogCX0s CiAJewogCQkubmFtZSA9ICJEREkgQiBJTyBwb3dlciB3ZWxsIiwKIAkJLmRvbWFpbnMgPSBTS0xf RElTUExBWV9ERElfSU9fQl9QT1dFUl9ET01BSU5TLAotCQkub3BzID0gJnNrbF9wb3dlcl93ZWxs X29wcywKKwkJLm9wcyA9ICZoc3dfcG93ZXJfd2VsbF9vcHMsCiAJCS5pZCA9IFNLTF9ESVNQX1BX X0RESV9CLAogCX0sCiAJewogCQkubmFtZSA9ICJEREkgQyBJTyBwb3dlciB3ZWxsIiwKIAkJLmRv bWFpbnMgPSBTS0xfRElTUExBWV9ERElfSU9fQ19QT1dFUl9ET01BSU5TLAotCQkub3BzID0gJnNr bF9wb3dlcl93ZWxsX29wcywKKwkJLm9wcyA9ICZoc3dfcG93ZXJfd2VsbF9vcHMsCiAJCS5pZCA9 IFNLTF9ESVNQX1BXX0RESV9DLAogCX0sCiAJewogCQkubmFtZSA9ICJEREkgRCBJTyBwb3dlciB3 ZWxsIiwKIAkJLmRvbWFpbnMgPSBTS0xfRElTUExBWV9ERElfSU9fRF9QT1dFUl9ET01BSU5TLAot CQkub3BzID0gJnNrbF9wb3dlcl93ZWxsX29wcywKKwkJLm9wcyA9ICZoc3dfcG93ZXJfd2VsbF9v cHMsCiAJCS5pZCA9IFNLTF9ESVNQX1BXX0RESV9ELAogCX0sCiB9OwpAQCAtMjMwMCw4ICsyMTQz LDkgQEAgc3RhdGljIHN0cnVjdCBpOTE1X3Bvd2VyX3dlbGwgYnh0X3Bvd2VyX3dlbGxzW10gPSB7 CiAJewogCQkubmFtZSA9ICJwb3dlciB3ZWxsIDEiLAogCQkuZG9tYWlucyA9IDAsCi0JCS5vcHMg PSAmc2tsX3Bvd2VyX3dlbGxfb3BzLAorCQkub3BzID0gJmhzd19wb3dlcl93ZWxsX29wcywKIAkJ LmlkID0gU0tMX0RJU1BfUFdfMSwKKwkJLmhzdy5oYXNfZnVzZXMgPSB0cnVlLAogCX0sCiAJewog CQkubmFtZSA9ICJEQyBvZmYiLApAQCAtMjMxMiw4ICsyMTU2LDExIEBAIHN0YXRpYyBzdHJ1Y3Qg aTkxNV9wb3dlcl93ZWxsIGJ4dF9wb3dlcl93ZWxsc1tdID0gewogCXsKIAkJLm5hbWUgPSAicG93 ZXIgd2VsbCAyIiwKIAkJLmRvbWFpbnMgPSBCWFRfRElTUExBWV9QT1dFUldFTExfMl9QT1dFUl9E T01BSU5TLAotCQkub3BzID0gJnNrbF9wb3dlcl93ZWxsX29wcywKKwkJLm9wcyA9ICZoc3dfcG93 ZXJfd2VsbF9vcHMsCiAJCS5pZCA9IFNLTF9ESVNQX1BXXzIsCisJCS5oc3cuaXJxX3BpcGVfbWFz ayA9IEJJVChQSVBFX0IpIHwgQklUKFBJUEVfQyksCisJCS5oc3cuaGFzX3ZnYSA9IHRydWUsCisJ CS5oc3cuaGFzX2Z1c2VzID0gdHJ1ZSwKIAl9LAogCXsKIAkJLm5hbWUgPSAiZHBpby1jb21tb24t YSIsCkBAIC0yMzQzLDggKzIxOTAsOSBAQCBzdGF0aWMgc3RydWN0IGk5MTVfcG93ZXJfd2VsbCBn bGtfcG93ZXJfd2VsbHNbXSA9IHsKIAkJLm5hbWUgPSAicG93ZXIgd2VsbCAxIiwKIAkJLyogSGFu ZGxlZCBieSB0aGUgRE1DIGZpcm13YXJlICovCiAJCS5kb21haW5zID0gMCwKLQkJLm9wcyA9ICZz a2xfcG93ZXJfd2VsbF9vcHMsCisJCS5vcHMgPSAmaHN3X3Bvd2VyX3dlbGxfb3BzLAogCQkuaWQg PSBTS0xfRElTUF9QV18xLAorCQkuaHN3Lmhhc19mdXNlcyA9IHRydWUsCiAJfSwKIAl7CiAJCS5u YW1lID0gIkRDIG9mZiIsCkBAIC0yMzU1LDggKzIyMDMsMTEgQEAgc3RhdGljIHN0cnVjdCBpOTE1 X3Bvd2VyX3dlbGwgZ2xrX3Bvd2VyX3dlbGxzW10gPSB7CiAJewogCQkubmFtZSA9ICJwb3dlciB3 ZWxsIDIiLAogCQkuZG9tYWlucyA9IEdMS19ESVNQTEFZX1BPV0VSV0VMTF8yX1BPV0VSX0RPTUFJ TlMsCi0JCS5vcHMgPSAmc2tsX3Bvd2VyX3dlbGxfb3BzLAorCQkub3BzID0gJmhzd19wb3dlcl93 ZWxsX29wcywKIAkJLmlkID0gU0tMX0RJU1BfUFdfMiwKKwkJLmhzdy5pcnFfcGlwZV9tYXNrID0g QklUKFBJUEVfQikgfCBCSVQoUElQRV9DKSwKKwkJLmhzdy5oYXNfdmdhID0gdHJ1ZSwKKwkJLmhz dy5oYXNfZnVzZXMgPSB0cnVlLAogCX0sCiAJewogCQkubmFtZSA9ICJkcGlvLWNvbW1vbi1hIiwK QEAgLTIzODIsMzcgKzIyMzMsMzcgQEAgc3RhdGljIHN0cnVjdCBpOTE1X3Bvd2VyX3dlbGwgZ2xr X3Bvd2VyX3dlbGxzW10gPSB7CiAJewogCQkubmFtZSA9ICJBVVggQSIsCiAJCS5kb21haW5zID0g R0xLX0RJU1BMQVlfQVVYX0FfUE9XRVJfRE9NQUlOUywKLQkJLm9wcyA9ICZza2xfcG93ZXJfd2Vs bF9vcHMsCisJCS5vcHMgPSAmaHN3X3Bvd2VyX3dlbGxfb3BzLAogCQkuaWQgPSBHTEtfRElTUF9Q V19BVVhfQSwKIAl9LAogCXsKIAkJLm5hbWUgPSAiQVVYIEIiLAogCQkuZG9tYWlucyA9IEdMS19E SVNQTEFZX0FVWF9CX1BPV0VSX0RPTUFJTlMsCi0JCS5vcHMgPSAmc2tsX3Bvd2VyX3dlbGxfb3Bz LAorCQkub3BzID0gJmhzd19wb3dlcl93ZWxsX29wcywKIAkJLmlkID0gR0xLX0RJU1BfUFdfQVVY X0IsCiAJfSwKIAl7CiAJCS5uYW1lID0gIkFVWCBDIiwKIAkJLmRvbWFpbnMgPSBHTEtfRElTUExB WV9BVVhfQ19QT1dFUl9ET01BSU5TLAotCQkub3BzID0gJnNrbF9wb3dlcl93ZWxsX29wcywKKwkJ Lm9wcyA9ICZoc3dfcG93ZXJfd2VsbF9vcHMsCiAJCS5pZCA9IEdMS19ESVNQX1BXX0FVWF9DLAog CX0sCiAJewogCQkubmFtZSA9ICJEREkgQSBJTyBwb3dlciB3ZWxsIiwKIAkJLmRvbWFpbnMgPSBH TEtfRElTUExBWV9ERElfSU9fQV9QT1dFUl9ET01BSU5TLAotCQkub3BzID0gJnNrbF9wb3dlcl93 ZWxsX29wcywKKwkJLm9wcyA9ICZoc3dfcG93ZXJfd2VsbF9vcHMsCiAJCS5pZCA9IEdMS19ESVNQ X1BXX0RESV9BLAogCX0sCiAJewogCQkubmFtZSA9ICJEREkgQiBJTyBwb3dlciB3ZWxsIiwKIAkJ LmRvbWFpbnMgPSBHTEtfRElTUExBWV9ERElfSU9fQl9QT1dFUl9ET01BSU5TLAotCQkub3BzID0g JnNrbF9wb3dlcl93ZWxsX29wcywKKwkJLm9wcyA9ICZoc3dfcG93ZXJfd2VsbF9vcHMsCiAJCS5p ZCA9IFNLTF9ESVNQX1BXX0RESV9CLAogCX0sCiAJewogCQkubmFtZSA9ICJEREkgQyBJTyBwb3dl ciB3ZWxsIiwKIAkJLmRvbWFpbnMgPSBHTEtfRElTUExBWV9ERElfSU9fQ19QT1dFUl9ET01BSU5T LAotCQkub3BzID0gJnNrbF9wb3dlcl93ZWxsX29wcywKKwkJLm9wcyA9ICZoc3dfcG93ZXJfd2Vs bF9vcHMsCiAJCS5pZCA9IFNLTF9ESVNQX1BXX0RESV9DLAogCX0sCiB9OwpAQCAtMjQyOSwzMSAr MjI4MCwzMiBAQCBzdGF0aWMgc3RydWN0IGk5MTVfcG93ZXJfd2VsbCBjbmxfcG93ZXJfd2VsbHNb XSA9IHsKIAkJLm5hbWUgPSAicG93ZXIgd2VsbCAxIiwKIAkJLyogSGFuZGxlZCBieSB0aGUgRE1D IGZpcm13YXJlICovCiAJCS5kb21haW5zID0gMCwKLQkJLm9wcyA9ICZza2xfcG93ZXJfd2VsbF9v cHMsCisJCS5vcHMgPSAmaHN3X3Bvd2VyX3dlbGxfb3BzLAogCQkuaWQgPSBTS0xfRElTUF9QV18x LAorCQkuaHN3Lmhhc19mdXNlcyA9IHRydWUsCiAJfSwKIAl7CiAJCS5uYW1lID0gIkFVWCBBIiwK IAkJLmRvbWFpbnMgPSBDTkxfRElTUExBWV9BVVhfQV9QT1dFUl9ET01BSU5TLAotCQkub3BzID0g JnNrbF9wb3dlcl93ZWxsX29wcywKKwkJLm9wcyA9ICZoc3dfcG93ZXJfd2VsbF9vcHMsCiAJCS5p ZCA9IENOTF9ESVNQX1BXX0FVWF9BLAogCX0sCiAJewogCQkubmFtZSA9ICJBVVggQiIsCiAJCS5k b21haW5zID0gQ05MX0RJU1BMQVlfQVVYX0JfUE9XRVJfRE9NQUlOUywKLQkJLm9wcyA9ICZza2xf cG93ZXJfd2VsbF9vcHMsCisJCS5vcHMgPSAmaHN3X3Bvd2VyX3dlbGxfb3BzLAogCQkuaWQgPSBD TkxfRElTUF9QV19BVVhfQiwKIAl9LAogCXsKIAkJLm5hbWUgPSAiQVVYIEMiLAogCQkuZG9tYWlu cyA9IENOTF9ESVNQTEFZX0FVWF9DX1BPV0VSX0RPTUFJTlMsCi0JCS5vcHMgPSAmc2tsX3Bvd2Vy X3dlbGxfb3BzLAorCQkub3BzID0gJmhzd19wb3dlcl93ZWxsX29wcywKIAkJLmlkID0gQ05MX0RJ U1BfUFdfQVVYX0MsCiAJfSwKIAl7CiAJCS5uYW1lID0gIkFVWCBEIiwKIAkJLmRvbWFpbnMgPSBD TkxfRElTUExBWV9BVVhfRF9QT1dFUl9ET01BSU5TLAotCQkub3BzID0gJnNrbF9wb3dlcl93ZWxs X29wcywKKwkJLm9wcyA9ICZoc3dfcG93ZXJfd2VsbF9vcHMsCiAJCS5pZCA9IENOTF9ESVNQX1BX X0FVWF9ELAogCX0sCiAJewpAQCAtMjQ2NSwzMSArMjMxNywzNCBAQCBzdGF0aWMgc3RydWN0IGk5 MTVfcG93ZXJfd2VsbCBjbmxfcG93ZXJfd2VsbHNbXSA9IHsKIAl7CiAJCS5uYW1lID0gInBvd2Vy IHdlbGwgMiIsCiAJCS5kb21haW5zID0gQ05MX0RJU1BMQVlfUE9XRVJXRUxMXzJfUE9XRVJfRE9N QUlOUywKLQkJLm9wcyA9ICZza2xfcG93ZXJfd2VsbF9vcHMsCisJCS5vcHMgPSAmaHN3X3Bvd2Vy X3dlbGxfb3BzLAogCQkuaWQgPSBTS0xfRElTUF9QV18yLAorCQkuaHN3LmlycV9waXBlX21hc2sg PSBCSVQoUElQRV9CKSB8IEJJVChQSVBFX0MpLAorCQkuaHN3Lmhhc192Z2EgPSB0cnVlLAorCQku aHN3Lmhhc19mdXNlcyA9IHRydWUsCiAJfSwKIAl7CiAJCS5uYW1lID0gIkRESSBBIElPIHBvd2Vy IHdlbGwiLAogCQkuZG9tYWlucyA9IENOTF9ESVNQTEFZX0RESV9BX0lPX1BPV0VSX0RPTUFJTlMs Ci0JCS5vcHMgPSAmc2tsX3Bvd2VyX3dlbGxfb3BzLAorCQkub3BzID0gJmhzd19wb3dlcl93ZWxs X29wcywKIAkJLmlkID0gQ05MX0RJU1BfUFdfRERJX0EsCiAJfSwKIAl7CiAJCS5uYW1lID0gIkRE SSBCIElPIHBvd2VyIHdlbGwiLAogCQkuZG9tYWlucyA9IENOTF9ESVNQTEFZX0RESV9CX0lPX1BP V0VSX0RPTUFJTlMsCi0JCS5vcHMgPSAmc2tsX3Bvd2VyX3dlbGxfb3BzLAorCQkub3BzID0gJmhz d19wb3dlcl93ZWxsX29wcywKIAkJLmlkID0gU0tMX0RJU1BfUFdfRERJX0IsCiAJfSwKIAl7CiAJ CS5uYW1lID0gIkRESSBDIElPIHBvd2VyIHdlbGwiLAogCQkuZG9tYWlucyA9IENOTF9ESVNQTEFZ X0RESV9DX0lPX1BPV0VSX0RPTUFJTlMsCi0JCS5vcHMgPSAmc2tsX3Bvd2VyX3dlbGxfb3BzLAor CQkub3BzID0gJmhzd19wb3dlcl93ZWxsX29wcywKIAkJLmlkID0gU0tMX0RJU1BfUFdfRERJX0Ms CiAJfSwKIAl7CiAJCS5uYW1lID0gIkRESSBEIElPIHBvd2VyIHdlbGwiLAogCQkuZG9tYWlucyA9 IENOTF9ESVNQTEFZX0RESV9EX0lPX1BPV0VSX0RPTUFJTlMsCi0JCS5vcHMgPSAmc2tsX3Bvd2Vy X3dlbGxfb3BzLAorCQkub3BzID0gJmhzd19wb3dlcl93ZWxsX29wcywKIAkJLmlkID0gU0tMX0RJ U1BfUFdfRERJX0QsCiAJfSwKIH07Ci0tIAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=