From: Abhay Kumar Subject: [PATCH v3] drm/i915: Force 2*96 MHz cdclk on glk/cnl when audio power is enabled Date: Tue, 12 Jun 2018 00:17:41 -0700 Message-ID: <1528787861-2877-1-git-send-email-abhay.kumar@intel.com> References: <1525915532-4443-1-git-send-email-abhay.kumar@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1961189DB0 for ; Tue, 12 Jun 2018 07:19:24 +0000 (UTC) In-Reply-To: <1525915532-4443-1-git-send-email-abhay.kumar@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, ville.syrjala@intel.com Cc: jani.nikula@intel.com List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkNE Q0xLIGhhcyB0byBiZSBhdCBsZWFzdCB0d2ljZSB0aGUgQkxDSyByZWdhcmRsZXNzIG9mIGF1ZGlv LiBBdWRpbwpkcml2ZXIgaGFzIHRvIHByb2JlIHVzaW5nIHRoaXMgaG9vayBhbmQgaW5jcmVhc2Ug dGhlIGNsb2NrIGV2ZW4gaW4KYWJzZW5jZSBvZiBhbnkgZGlzcGxheS4KCnYyOiBVc2UgYXRvbWlj IHJlZmNvdW50IGZvciBnZXRfcG93ZXIsIHB1dF9wb3dlciBzbyB0aGF0IHdlIGNhbgogICAgY2Fs bCBlYWNoIG9uY2UoQWJoYXkpLgp2MzogUmVzZXQgcG93ZXIgd2VsbCAyIHRvIGF2b2lkIGFueSB0 cmFuc2FjdGlvbiBvbiBpRGlzcCBsaW5rCiAgICBkdXJpbmcgY2RjbGsgY2hhbmdlKEFiaGF5KS4K ClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRl bC5jb20+ClNpZ25lZC1vZmYtYnk6IEFiaGF5IEt1bWFyIDxhYmhheS5rdW1hckBpbnRlbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgIHwgIDMgKysKIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmggICAgICB8ICA0ICsrCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9hdWRpby5jICAgfCA4NyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NkY2xrLmMgICB8IDI5ICsrKystLS0t LS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgIDcgKystCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgMiArCiA2IGZpbGVzIGNoYW5nZWQs IDEwNyBpbnNlcnRpb25zKCspLCAyNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aAppbmRleCA2MTA0ZDcxMTUwNTQuLmE0YTM4NmE1ZGI2OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oCkBAIC0xNzAyLDYgKzE3MDIsNyBAQCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSB7CiAJdW5z aWduZWQgaW50IGhwbGxfZnJlcTsKIAl1bnNpZ25lZCBpbnQgZmRpX3BsbF9mcmVxOwogCXVuc2ln bmVkIGludCBjemNsa19mcmVxOworCXUzMiBnZXRfcHV0X3JlZmNvdW50OwogCiAJc3RydWN0IHsK IAkJLyoKQEAgLTE3MTksNiArMTcyMCw4IEBAIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlIHsKIAkJ c3RydWN0IGludGVsX2NkY2xrX3N0YXRlIGFjdHVhbDsKIAkJLyogVGhlIGN1cnJlbnQgaGFyZHdh cmUgY2RjbGsgc3RhdGUgKi8KIAkJc3RydWN0IGludGVsX2NkY2xrX3N0YXRlIGh3OworCisJCWlu dCBmb3JjZV9taW5fY2RjbGs7CiAJfSBjZGNsazsKIAogCS8qKgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVn LmgKaW5kZXggOTg3ZGVmMjZjZTgyLi5jZWY3NzAxODQyNDUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9y ZWcuaApAQCAtODg2OSw2ICs4ODY5LDEwIEBAIGVudW0gc2tsX3Bvd2VyX2dhdGUgewogICogU0tM IENsb2NrcwogICovCiAKKy8qIFBvd2VyIHdlbGwgMiAqLworI2RlZmluZSBQT1dFUl9XRUxMXzIJ CQlfTU1JTygweDQ1NDA0KQorI2RlZmluZSBQT1dFUl9XRUxMXzJfUkVRVUVTVAkJKDE8PDMxKQor CiAvKiBDRENMS19DVEwgKi8KICNkZWZpbmUgQ0RDTEtfQ1RMCQkJX01NSU8oMHg0NjAwMCkKICNk ZWZpbmUgIENEQ0xLX0ZSRVFfU0VMX01BU0sJCSgzIDw8IDI2KQpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfYXVkaW8uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2F1ZGlvLmMKaW5kZXggM2VhNTY2Zjk5NDUwLi4xZjVhOWFmMTNlZjAgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F1ZGlvLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfYXVkaW8uYwpAQCAtNjE4LDcgKzYxOCw2IEBAIHZvaWQgaW50ZWxfYXVkaW9fY29k ZWNfZW5hYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCiAJaWYgKCFjb25uZWN0 b3ItPmVsZFswXSkKIAkJcmV0dXJuOwotCiAJRFJNX0RFQlVHX0RSSVZFUigiRUxEIG9uIFtDT05O RUNUT1I6JWQ6JXNdLCBbRU5DT0RFUjolZDolc11cbiIsCiAJCQkgY29ubmVjdG9yLT5iYXNlLmlk LAogCQkJIGNvbm5lY3Rvci0+bmFtZSwKQEAgLTcxMywxNCArNzEyLDk0IEBAIHZvaWQgaW50ZWxf aW5pdF9hdWRpb19ob29rcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJfQog fQogCitzdGF0aWMgdm9pZCBnbGtfZm9yY2VfYXVkaW9fY2RjbGsoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LAorCQkJCWJvb2wgZW5hYmxlKQoreworCXN0cnVjdCBkcm1fbW9kZXNl dF9hY3F1aXJlX2N0eCBjdHg7CisJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlOworCWlu dCByZXQ7CisKKwlkcm1fbW9kZXNldF9hY3F1aXJlX2luaXQoJmN0eCwgMCk7CisJc3RhdGUgPSBk cm1fYXRvbWljX3N0YXRlX2FsbG9jKCZkZXZfcHJpdi0+ZHJtKTsKKwlpZiAoV0FSTl9PTighc3Rh dGUpKQorCQlyZXR1cm47CisKKwlzdGF0ZS0+YWNxdWlyZV9jdHggPSAmY3R4OworCityZXRyeToK Kwl0b19pbnRlbF9hdG9taWNfc3RhdGUoc3RhdGUpLT5tb2Rlc2V0ID0gdHJ1ZTsKKwl0b19pbnRl bF9hdG9taWNfc3RhdGUoc3RhdGUpLT5jZGNsay5mb3JjZV9taW5fY2RjbGsgPQorCQllbmFibGUg PyAyICogOTYwMDAgOiAwOworCisJLyoKKwkgKiBQcm90ZWN0cyBkZXZfcHJpdi0+Y2RjbGsuZm9y Y2VfbWluX2NkY2xrCisJICogTmVlZCB0byBsb2NrIHRoaXMgaGVyZSBpbiBjYXNlIHdlIGhhdmUg bm8gYWN0aXZlIHBpcGVzCisJICogYW5kIHRodXMgd291bGRuJ3QgbG9jayBpdCBkdXJpbmcgdGhl IGNvbW1pdCBvdGhlcndpc2UuCisJICovCisJcmV0ID0gZHJtX21vZGVzZXRfbG9jaygmZGV2X3By aXYtPmRybS5tb2RlX2NvbmZpZy5jb25uZWN0aW9uX211dGV4LCAmY3R4KTsKKwlpZiAoIXJldCkK KwkJcmV0ID0gZHJtX2F0b21pY19jb21taXQoc3RhdGUpOworCisJaWYgKHJldCA9PSAtRURFQURM SykgeworCQlkcm1fYXRvbWljX3N0YXRlX2NsZWFyKHN0YXRlKTsKKwkJZHJtX21vZGVzZXRfYmFj a29mZigmY3R4KTsKKwkJZ290byByZXRyeTsKKwl9CisKKwlXQVJOX09OKHJldCk7CisKKwlkcm1f YXRvbWljX3N0YXRlX3B1dChzdGF0ZSk7CisKKwlkcm1fbW9kZXNldF9kcm9wX2xvY2tzKCZjdHgp OworCWRybV9tb2Rlc2V0X2FjcXVpcmVfZmluaSgmY3R4KTsKK30KKwogc3RhdGljIHZvaWQgaTkx NV9hdWRpb19jb21wb25lbnRfZ2V0X3Bvd2VyKHN0cnVjdCBkZXZpY2UgKmtkZXYpCiB7Ci0JaW50 ZWxfZGlzcGxheV9wb3dlcl9nZXQoa2Rldl90b19pOTE1KGtkZXYpLCBQT1dFUl9ET01BSU5fQVVE SU8pOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGtkZXZfdG9faTkxNShr ZGV2KTsKKwl1MzIgdG1wOworCisJZGV2X3ByaXYtPmdldF9wdXRfcmVmY291bnQrKzsKKworCS8q IEZvcmNlIGNkY2xrIHRvIDIqQkNMSyBkdXJpbmcgZmlyc3QgdGltZSBnZXQgcG93ZXIgY2FsbCAq LworCWlmIChkZXZfcHJpdi0+Z2V0X3B1dF9yZWZjb3VudCA9PSAxKSB7CisJCWlmIChJU19DQU5O T05MQUtFKGRldl9wcml2KSB8fCBJU19HRU1JTklMQUtFKGRldl9wcml2KSkgeworCisJCQkvKkZJ WE1FOiBNYWtlIHN1cmUgdGhlcmUgaXMgbm8gdHJhbnNhY3Rpb24KKwkJCSAqIG9uIGlEaXNwIGxp bmsgd2hpbGUgY2hhbmdpbmcgY2RjbGsKKwkJCSAqLworCisJCQkvKiBUdXJuIG9mZiBwb3dlciB3 ZWxsIDIqLworCQkJdG1wID0gSTkxNV9SRUFEKFBPV0VSX1dFTExfMik7CisJCQl0bXAgPSB0bXAg JiB+UE9XRVJfV0VMTF8yX1JFUVVFU1Q7CisJCQlJOTE1X1dSSVRFKFBPV0VSX1dFTExfMiwgdG1w KTsKKwkJCXRtcCA9IEk5MTVfUkVBRChQT1dFUl9XRUxMXzIpOworCisJCQkvKiBUdXJuIG9uIHBv d2VyIHdlbGwgMiovCisJCQl0bXAgPSBJOTE1X1JFQUQoUE9XRVJfV0VMTF8yKTsKKwkJCXRtcCA9 IHRtcCB8IFBPV0VSX1dFTExfMl9SRVFVRVNUOworCQkJSTkxNV9XUklURShQT1dFUl9XRUxMXzIs IHRtcCk7CisJCQl0bXAgPSBJOTE1X1JFQUQoUE9XRVJfV0VMTF8yKTsKKworCQkJZ2xrX2ZvcmNl X2F1ZGlvX2NkY2xrKGRldl9wcml2LCB0cnVlKTsKKwkJfQorCX0KKworCWludGVsX2Rpc3BsYXlf cG93ZXJfZ2V0KGRldl9wcml2LCBQT1dFUl9ET01BSU5fQVVESU8pOwogfQogCiBzdGF0aWMgdm9p ZCBpOTE1X2F1ZGlvX2NvbXBvbmVudF9wdXRfcG93ZXIoc3RydWN0IGRldmljZSAqa2RldikKIHsK LQlpbnRlbF9kaXNwbGF5X3Bvd2VyX3B1dChrZGV2X3RvX2k5MTUoa2RldiksIFBPV0VSX0RPTUFJ Tl9BVURJTyk7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0ga2Rldl90b19p OTE1KGtkZXYpOworCisJZGV2X3ByaXYtPmdldF9wdXRfcmVmY291bnQtLTsKKworCS8qIEZvcmNl IHJlcXVpcmVkIGNkY2xrIGR1cmluZyBsYXN0IHRpbWUgcHV0IHBvd2VyIGNhbGwgKi8KKwlpZiAo ZGV2X3ByaXYtPmdldF9wdXRfcmVmY291bnQgPT0gMCkKKwkJaWYgKElTX0NBTk5PTkxBS0UoZGV2 X3ByaXYpIHx8IElTX0dFTUlOSUxBS0UoZGV2X3ByaXYpKQorCQkJZ2xrX2ZvcmNlX2F1ZGlvX2Nk Y2xrKGRldl9wcml2LCBmYWxzZSk7CisKKwlpbnRlbF9kaXNwbGF5X3Bvd2VyX3B1dChkZXZfcHJp diwgUE9XRVJfRE9NQUlOX0FVRElPKTsKIH0KIAogc3RhdGljIHZvaWQgaTkxNV9hdWRpb19jb21w b25lbnRfY29kZWNfd2FrZV9vdmVycmlkZShzdHJ1Y3QgZGV2aWNlICprZGV2LApAQCAtOTU5LDcg KzEwMzgsNyBAQCB2b2lkIGk5MTVfYXVkaW9fY29tcG9uZW50X2luaXQoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQogCQkvKiBjb250aW51ZSB3aXRoIHJlZHVjZWQgZnVuY3Rpb25h bGl0eSAqLwogCQlyZXR1cm47CiAJfQotCisJZGV2X3ByaXYtPmdldF9wdXRfcmVmY291bnQgPSAw OwogCWRldl9wcml2LT5hdWRpb19jb21wb25lbnRfcmVnaXN0ZXJlZCA9IHRydWU7CiB9CiAKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NkY2xrLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9jZGNsay5jCmluZGV4IDhlZDdiZDA1MmU0Ni4uMGYwYWVhOTAwY2Vi IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jZGNsay5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NkY2xrLmMKQEAgLTIxNTMsMTkgKzIxNTMsOCBAQCBp bnQgaW50ZWxfY3J0Y19jb21wdXRlX21pbl9jZGNsayhjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqY3J0Y19zdGF0ZSkKIAkvKgogCSAqIEFjY29yZGluZyB0byBCU3BlYywgIlRoZSBDRCBj bG9jayBmcmVxdWVuY3kgbXVzdCBiZSBhdCBsZWFzdCB0d2ljZQogCSAqIHRoZSBmcmVxdWVuY3kg b2YgdGhlIEF6YWxpYSBCQ0xLLiIgYW5kIEJDTEsgaXMgOTYgTUh6IGJ5IGRlZmF1bHQuCi0JICoK LQkgKiBGSVhNRTogQ2hlY2sgdGhlIGFjdHVhbCwgbm90IGRlZmF1bHQsIEJDTEsgYmVpbmcgdXNl ZC4KLQkgKgotCSAqIEZJWE1FOiBUaGlzIGRvZXMgbm90IGRlcGVuZCBvbiAtPmhhc19hdWRpbyBi ZWNhdXNlIHRoZSBoaWdoZXIgQ0RDTEsKLQkgKiBpcyByZXF1aXJlZCBmb3IgYXVkaW8gcHJvYmUs IGFsc28gd2hlbiB0aGVyZSBhcmUgbm8gYXVkaW8gY2FwYWJsZQotCSAqIGRpc3BsYXlzIGNvbm5l Y3RlZCBhdCBwcm9iZSB0aW1lLiBUaGlzIGxlYWRzIHRvIHVubmVjZXNzYXJpbHkgaGlnaAotCSAq IENEQ0xLIHdoZW4gYXVkaW8gaXMgbm90IHJlcXVpcmVkLgotCSAqCi0JICogRklYTUU6IFRoaXMg bGltaXQgaXMgb25seSBhcHBsaWVkIHdoZW4gdGhlcmUgYXJlIGRpc3BsYXlzIGNvbm5lY3RlZAot CSAqIGF0IHByb2JlIHRpbWUuIElmIHdlIHByb2JlIHdpdGhvdXQgZGlzcGxheXMsIHdlJ2xsIHN0 aWxsIGVuZCB1cCB1c2luZwotCSAqIHRoZSBwbGF0Zm9ybSBtaW5pbXVtIENEQ0xLLCBmYWlsaW5n IGF1ZGlvIHByb2JlLgogCSAqLwotCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpCisJaWYg KGNydGNfc3RhdGUtPmhhc19hdWRpbyAmJiBJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpCiAJCW1p bl9jZGNsayA9IG1heCgyICogOTYwMDAsIG1pbl9jZGNsayk7CiAKIAkvKgpAQCAtMjIwNSw3ICsy MTk0LDcgQEAgc3RhdGljIGludCBpbnRlbF9jb21wdXRlX21pbl9jZGNsayhzdHJ1Y3QgZHJtX2F0 b21pY19zdGF0ZSAqc3RhdGUpCiAJCWludGVsX3N0YXRlLT5taW5fY2RjbGtbaV0gPSBtaW5fY2Rj bGs7CiAJfQogCi0JbWluX2NkY2xrID0gMDsKKwltaW5fY2RjbGsgPSBpbnRlbF9zdGF0ZS0+Y2Rj bGsuZm9yY2VfbWluX2NkY2xrOwogCWZvcl9lYWNoX3BpcGUoZGV2X3ByaXYsIHBpcGUpCiAJCW1p bl9jZGNsayA9IG1heChpbnRlbF9zdGF0ZS0+bWluX2NkY2xrW3BpcGVdLCBtaW5fY2RjbGspOwog CkBAIC0yMjY2LDcgKzIyNTUsNyBAQCBzdGF0aWMgaW50IHZsdl9tb2Rlc2V0X2NhbGNfY2RjbGso c3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCQl2bHZfY2FsY192b2x0YWdlX2xldmVs KGRldl9wcml2LCBjZGNsayk7CiAKIAlpZiAoIWludGVsX3N0YXRlLT5hY3RpdmVfY3J0Y3MpIHsK LQkJY2RjbGsgPSB2bHZfY2FsY19jZGNsayhkZXZfcHJpdiwgMCk7CisJCWNkY2xrID0gdmx2X2Nh bGNfY2RjbGsoZGV2X3ByaXYsIGludGVsX3N0YXRlLT5jZGNsay5mb3JjZV9taW5fY2RjbGspOwog CiAJCWludGVsX3N0YXRlLT5jZGNsay5hY3R1YWwuY2RjbGsgPSBjZGNsazsKIAkJaW50ZWxfc3Rh dGUtPmNkY2xrLmFjdHVhbC52b2x0YWdlX2xldmVsID0KQEAgLTIyOTksNyArMjI4OCw3IEBAIHN0 YXRpYyBpbnQgYmR3X21vZGVzZXRfY2FsY19jZGNsayhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAq c3RhdGUpCiAJCWJkd19jYWxjX3ZvbHRhZ2VfbGV2ZWwoY2RjbGspOwogCiAJaWYgKCFpbnRlbF9z dGF0ZS0+YWN0aXZlX2NydGNzKSB7Ci0JCWNkY2xrID0gYmR3X2NhbGNfY2RjbGsoMCk7CisJCWNk Y2xrID0gYmR3X2NhbGNfY2RjbGsoaW50ZWxfc3RhdGUtPmNkY2xrLmZvcmNlX21pbl9jZGNsayk7 CiAKIAkJaW50ZWxfc3RhdGUtPmNkY2xrLmFjdHVhbC5jZGNsayA9IGNkY2xrOwogCQlpbnRlbF9z dGF0ZS0+Y2RjbGsuYWN0dWFsLnZvbHRhZ2VfbGV2ZWwgPQpAQCAtMjM3MSw3ICsyMzYwLDcgQEAg c3RhdGljIGludCBza2xfbW9kZXNldF9jYWxjX2NkY2xrKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRl ICpzdGF0ZSkKIAkJc2tsX2NhbGNfdm9sdGFnZV9sZXZlbChjZGNsayk7CiAKIAlpZiAoIWludGVs X3N0YXRlLT5hY3RpdmVfY3J0Y3MpIHsKLQkJY2RjbGsgPSBza2xfY2FsY19jZGNsaygwLCB2Y28p OworCQljZGNsayA9IHNrbF9jYWxjX2NkY2xrKGludGVsX3N0YXRlLT5jZGNsay5mb3JjZV9taW5f Y2RjbGssIHZjbyk7CiAKIAkJaW50ZWxfc3RhdGUtPmNkY2xrLmFjdHVhbC52Y28gPSB2Y287CiAJ CWludGVsX3N0YXRlLT5jZGNsay5hY3R1YWwuY2RjbGsgPSBjZGNsazsKQEAgLTI0MTAsMTAgKzIz OTksMTAgQEAgc3RhdGljIGludCBieHRfbW9kZXNldF9jYWxjX2NkY2xrKHN0cnVjdCBkcm1fYXRv bWljX3N0YXRlICpzdGF0ZSkKIAogCWlmICghaW50ZWxfc3RhdGUtPmFjdGl2ZV9jcnRjcykgewog CQlpZiAoSVNfR0VNSU5JTEFLRShkZXZfcHJpdikpIHsKLQkJCWNkY2xrID0gZ2xrX2NhbGNfY2Rj bGsoMCk7CisJCQkgY2RjbGsgPSBnbGtfY2FsY19jZGNsayhpbnRlbF9zdGF0ZS0+Y2RjbGsuZm9y Y2VfbWluX2NkY2xrKTsKIAkJCXZjbyA9IGdsa19kZV9wbGxfdmNvKGRldl9wcml2LCBjZGNsayk7 CiAJCX0gZWxzZSB7Ci0JCQljZGNsayA9IGJ4dF9jYWxjX2NkY2xrKDApOworCQkJY2RjbGsgPSBi eHRfY2FsY19jZGNsayhpbnRlbF9zdGF0ZS0+Y2RjbGsuZm9yY2VfbWluX2NkY2xrKTsKIAkJCXZj byA9IGJ4dF9kZV9wbGxfdmNvKGRldl9wcml2LCBjZGNsayk7CiAJCX0KIApAQCAtMjQ0OSw3ICsy NDM4LDcgQEAgc3RhdGljIGludCBjbmxfbW9kZXNldF9jYWxjX2NkY2xrKHN0cnVjdCBkcm1fYXRv bWljX3N0YXRlICpzdGF0ZSkKIAkJICAgIGNubF9jb21wdXRlX21pbl92b2x0YWdlX2xldmVsKGlu dGVsX3N0YXRlKSk7CiAKIAlpZiAoIWludGVsX3N0YXRlLT5hY3RpdmVfY3J0Y3MpIHsKLQkJY2Rj bGsgPSBjbmxfY2FsY19jZGNsaygwKTsKKwkJY2RjbGsgPSBjbmxfY2FsY19jZGNsayhpbnRlbF9z dGF0ZS0+Y2RjbGsuZm9yY2VfbWluX2NkY2xrKTsKIAkJdmNvID0gY25sX2NkY2xrX3BsbF92Y28o ZGV2X3ByaXYsIGNkY2xrKTsKIAogCQlpbnRlbF9zdGF0ZS0+Y2RjbGsuYWN0dWFsLnZjbyA9IHZj bzsKQEAgLTI0ODIsNyArMjQ3MSw3IEBAIHN0YXRpYyBpbnQgaWNsX21vZGVzZXRfY2FsY19jZGNs ayhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAJaW50ZWxfc3RhdGUtPmNkY2xrLmxv Z2ljYWwuY2RjbGsgPSBjZGNsazsKIAogCWlmICghaW50ZWxfc3RhdGUtPmFjdGl2ZV9jcnRjcykg ewotCQljZGNsayA9IGljbF9jYWxjX2NkY2xrKDAsIHJlZik7CisJCWNkY2xrID0gaWNsX2NhbGNf Y2RjbGsoaW50ZWxfc3RhdGUtPmNkY2xrLmZvcmNlX21pbl9jZGNsaywgcmVmKTsKIAkJdmNvID0g aWNsX2NhbGNfY2RjbGtfcGxsX3ZjbyhkZXZfcHJpdiwgY2RjbGspOwogCiAJCWludGVsX3N0YXRl LT5jZGNsay5hY3R1YWwudmNvID0gdmNvOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CmluZGV4IDE3YzU5MGI0MmZkNy4uM2VlMWMxZjU0MTlkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jCkBAIC0xMjE2Miw2ICsxMjE2MiwxMCBAQCBzdGF0aWMgaW50IGludGVsX21v ZGVzZXRfY2hlY2tzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJcmV0dXJuIC1F SU5WQUw7CiAJfQogCisJLyoga2VlcCB0aGUgY3VycmVudCBzZXR0aW5nICovCisJaWYgKCFpbnRl bF9zdGF0ZS0+bW9kZXNldCkKKwkJaW50ZWxfc3RhdGUtPmNkY2xrLmZvcmNlX21pbl9jZGNsayA9 IGRldl9wcml2LT5jZGNsay5mb3JjZV9taW5fY2RjbGs7CisKIAlpbnRlbF9zdGF0ZS0+bW9kZXNl dCA9IHRydWU7CiAJaW50ZWxfc3RhdGUtPmFjdGl2ZV9jcnRjcyA9IGRldl9wcml2LT5hY3RpdmVf Y3J0Y3M7CiAJaW50ZWxfc3RhdGUtPmNkY2xrLmxvZ2ljYWwgPSBkZXZfcHJpdi0+Y2RjbGsubG9n aWNhbDsKQEAgLTEyMjU3LDcgKzEyMjYxLDcgQEAgc3RhdGljIGludCBpbnRlbF9hdG9taWNfY2hl Y2soc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7CiAJc3Ry dWN0IGRybV9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwgKmNydGNfc3RhdGU7CiAJaW50IHJl dCwgaTsKLQlib29sIGFueV9tcyA9IGZhbHNlOworCWJvb2wgYW55X21zID0gaW50ZWxfc3RhdGUt Pm1vZGVzZXQ7CiAKIAkvKiBDYXRjaCBJOTE1X01PREVfRkxBR19JTkhFUklURUQgKi8KIAlmb3Jf ZWFjaF9vbGRuZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0Yywgb2xkX2NydGNfc3RhdGUsCkBA IC0xMjgwNSw2ICsxMjgwOSw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWljX2NvbW1pdChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAogCQlkZXZfcHJpdi0+YWN0aXZlX2NydGNzID0gaW50ZWxfc3Rh dGUtPmFjdGl2ZV9jcnRjczsKIAkJZGV2X3ByaXYtPmNkY2xrLmxvZ2ljYWwgPSBpbnRlbF9zdGF0 ZS0+Y2RjbGsubG9naWNhbDsKIAkJZGV2X3ByaXYtPmNkY2xrLmFjdHVhbCA9IGludGVsX3N0YXRl LT5jZGNsay5hY3R1YWw7CisJCWRldl9wcml2LT5jZGNsay5mb3JjZV9taW5fY2RjbGsgPSBpbnRl bF9zdGF0ZS0+Y2RjbGsuZm9yY2VfbWluX2NkY2xrOwogCX0KIAogCWRybV9hdG9taWNfc3RhdGVf Z2V0KHN0YXRlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggODY0MTU4Mzg0MmJlLi4w ZGExN2FkMDU2ZWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC00NTksNiArNDU5LDgg QEAgc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSB7CiAJCSAqIHN0YXRlIG9ubHkgd2hlbiBhbGwg Y3J0YydzIGFyZSBEUE1TIG9mZi4KIAkJICovCiAJCXN0cnVjdCBpbnRlbF9jZGNsa19zdGF0ZSBh Y3R1YWw7CisKKwkJaW50IGZvcmNlX21pbl9jZGNsazsKIAl9IGNkY2xrOwogCiAJYm9vbCBkcGxs X3NldCwgbW9kZXNldDsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK