From: Ville Syrjala Subject: [PATCH v2 12/14] drm/i915: Clean up DP pipe select bits Date: Fri, 2 Mar 2018 20:08:48 +0200 Message-ID: <20180302180848.1085-1-ville.syrjala@linux.intel.com> References: <20180302095512.19329-13-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 04BD66E22C for ; Fri, 2 Mar 2018 18:08:51 +0000 (UTC) In-Reply-To: <20180302095512.19329-13-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkNs ZWFuIHVwIHRoZSBEUCBwaXBlIHNlbGVjdCBiaXRzLiBUbyBtYWtlIHRoZSB3aG9sZSBzaXR1YXRp b24gYSBiaXQKbGVzcyB1Z2x5IHdlJ2xsIHN0YXJ0IHRvIHNoYXJlIHRoZSBzYW1lIGNvZGUgYmV0 d2VlbiAuZ2V0X2h3X3N0YXRlKCksCnRoZSBwb3J0IHN0YXRlIGFzc2VydHMsIGFuZCB0aGUgVkxW IHBvd2VyIHNlcXVlbmNlciBjb2RlLgoKdjI6IFJldHVybiBQSVBFX0EgZm9yIGNwdC9wcHQgd2hl biB0aGUgcG9ydCBpc24ndCBzZWxlY3RlZCBieQogICAgYW55IHRyYW5zY29kZXIuIFJldHVybmlu ZyBJTlZBTElEX1BJUEUgZXhwbG9kZXMgKnNvbWV3aGVyZSoKICAgIG9uIHNvbWUgbWFjaGluZXMg KGNhbid0IGltbWVkaWF0ZWx5IHNlZSB3aGVyZSB0aG91Z2gpLiBUaGlzCiAgICBub3cgbWF0Y2hl cyB0aGUgb2xkIGJlaGF2aW91ci4KClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmls bGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9yZWcuaCAgICAgIHwgIDI0ICsrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMgfCAgNDYgKysrKystLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcC5jICAgICAgfCAxMTAgKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICAgMyArCiA0IGZpbGVzIGNoYW5n ZWQsIDkwIGluc2VydGlvbnMoKyksIDkzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Jl Zy5oCmluZGV4IGRjOWZjNjIyMDUwOS4uOTU0OGUwYmVlN2RiIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf cmVnLmgKQEAgLTUyNDgsMTAgKzUyNDgsMTUgQEAgZW51bSB7CiAjZGVmaW5lIENIVl9EUF9ECQlf TU1JTyhWTFZfRElTUExBWV9CQVNFICsgMHg2NDMwMCkKIAogI2RlZmluZSAgIERQX1BPUlRfRU4J CQkoMSA8PCAzMSkKLSNkZWZpbmUgICBEUF9QSVBFQl9TRUxFQ1QJCSgxIDw8IDMwKQotI2RlZmlu ZSAgIERQX1BJUEVfTUFTSwkJCSgxIDw8IDMwKQotI2RlZmluZSAgIERQX1BJUEVfU0VMRUNUX0NI VihwaXBlKQkoKHBpcGUpIDw8IDE2KQotI2RlZmluZSAgIERQX1BJUEVfTUFTS19DSFYJCSgzIDw8 IDE2KQorI2RlZmluZSAgIERQX1BJUEVfU0VMKHBpcGUpCQkoKHBpcGUpIDw8IDMwKQorI2RlZmlu ZSAgIERQX1BJUEVfU0VMX01BU0sJCSgxIDw8IDMwKQorI2RlZmluZSAgIERQX1BJUEVfU0VMX1NI SUZUCQkzMAorI2RlZmluZSAgIERQX1BJUEVfU0VMX0lWQihwaXBlKQkJKChwaXBlKSA8PCAyOSkK KyNkZWZpbmUgICBEUF9QSVBFX1NFTF9NQVNLX0lWQgkJKDMgPDwgMjkpCisjZGVmaW5lICAgRFBf UElQRV9TRUxfU0hJRlRfSVZCCQkyOQorI2RlZmluZSAgIERQX1BJUEVfU0VMX0NIVihwaXBlKQkJ KChwaXBlKSA8PCAxNikKKyNkZWZpbmUgICBEUF9QSVBFX1NFTF9NQVNLX0NIVgkJKDMgPDwgMTYp CisjZGVmaW5lICAgRFBfUElQRV9TRUxfU0hJRlRfQ0hWCQkxNgogCiAvKiBMaW5rIHRyYWluaW5n IG1vZGUgLSBzZWxlY3QgYSBzdWl0YWJsZSBtb2RlIGZvciBlYWNoIHN0YWdlICovCiAjZGVmaW5l ICAgRFBfTElOS19UUkFJTl9QQVRfMQkJKDAgPDwgMjgpCkBAIC03OTIxLDE2ICs3OTI2LDYgQEAg ZW51bSB7CiAjZGVmaW5lIFBDSF9EUF9BVVhfQ0hfREFUQShhdXhfY2gsIGkpCV9NTUlPKF9QT1JU KChhdXhfY2gpIC0gQVVYX0NIX0IsIF9QQ0hfRFBCX0FVWF9DSF9EQVRBMSwgX1BDSF9EUENfQVVY X0NIX0RBVEExKSArIChpKSAqIDQpIC8qIDUgcmVnaXN0ZXJzICovCiAKIC8qIENQVCAqLwotI2Rl ZmluZSAgUE9SVF9UUkFOU19BX1NFTF9DUFQJMAotI2RlZmluZSAgUE9SVF9UUkFOU19CX1NFTF9D UFQJKDE8PDI5KQotI2RlZmluZSAgUE9SVF9UUkFOU19DX1NFTF9DUFQJKDI8PDI5KQotI2RlZmlu ZSAgUE9SVF9UUkFOU19TRUxfTUFTSwkoMzw8MjkpCi0jZGVmaW5lICBQT1JUX1RSQU5TX1NFTF9D UFQocGlwZSkJKChwaXBlKSA8PCAyOSkKLSNkZWZpbmUgIFBPUlRfVE9fUElQRSh2YWwpCSgoKHZh bCkgJiAoMTw8MzApKSA+PiAzMCkKLSNkZWZpbmUgIFBPUlRfVE9fUElQRV9DUFQodmFsKQkoKCh2 YWwpICYgUE9SVF9UUkFOU19TRUxfTUFTSykgPj4gMjkpCi0jZGVmaW5lICBTRFZPX1BPUlRfVE9f UElQRV9DSFYodmFsKQkoKCh2YWwpICYgKDM8PDI0KSkgPj4gMjQpCi0jZGVmaW5lICBEUF9QT1JU X1RPX1BJUEVfQ0hWKHZhbCkJKCgodmFsKSAmICgzPDwxNikpID4+IDE2KQotCiAjZGVmaW5lIF9U UkFOU19EUF9DVExfQQkJMHhlMDMwMAogI2RlZmluZSBfVFJBTlNfRFBfQ1RMX0IJCTB4ZTEzMDAK ICNkZWZpbmUgX1RSQU5TX0RQX0NUTF9DCQkweGUyMzAwCkBAIC03OTM5LDcgKzc5MzQsNiBAQCBl bnVtIHsKICNkZWZpbmUgIFRSQU5TX0RQX1BPUlRfU0VMKHBvcnQpCSgoKHBvcnQpIC0gUE9SVF9C KSA8PCAyOSkKICNkZWZpbmUgIFRSQU5TX0RQX1BPUlRfU0VMX05PTkUJCSgzIDw8IDI5KQogI2Rl ZmluZSAgVFJBTlNfRFBfUE9SVF9TRUxfTUFTSwkJKDMgPDwgMjkpCi0jZGVmaW5lICBUUkFOU19E UF9QSVBFX1RPX1BPUlQodmFsKQkoKCgodmFsKSAmIFRSQU5TX0RQX1BPUlRfU0VMX01BU0spID4+ IDI5KSArIFBPUlRfQikKICNkZWZpbmUgIFRSQU5TX0RQX0FVRElPX09OTFkJKDE8PDI2KQogI2Rl ZmluZSAgVFJBTlNfRFBfRU5IX0ZSQU1JTkcJKDE8PDE4KQogI2RlZmluZSAgVFJBTlNfRFBfOEJQ QwkJKDA8PDkpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggNDNiNTg5ZGZl NzFmLi5kZmUzYTE3Yjg2ZDEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAg LTEyNjEsMzggKzEyNjEsMjIgQEAgdm9pZCBhc3NlcnRfcGNoX3RyYW5zY29kZXJfZGlzYWJsZWQo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCSAgICAgcGlwZV9uYW1lKHBpcGUp KTsKIH0KIAotc3RhdGljIGJvb2wgZHBfcGlwZV9lbmFibGVkKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiwKLQkJCSAgICBlbnVtIHBpcGUgcGlwZSwgdTMyIHBvcnRfc2VsLCB1MzIg dmFsKQorc3RhdGljIHZvaWQgYXNzZXJ0X3BjaF9kcF9kaXNhYmxlZChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJICAgZW51bSBwaXBlIHBpcGUsIGVudW0gcG9ydCBwb3J0 LAorCQkJCSAgIGk5MTVfcmVnX3QgZHBfcmVnKQogewotCWlmICgodmFsICYgRFBfUE9SVF9FTikg PT0gMCkKLQkJcmV0dXJuIGZhbHNlOworCWVudW0gcGlwZSBwb3J0X3BpcGU7CisJYm9vbCBzdGF0 ZTsKIAotCWlmIChIQVNfUENIX0NQVChkZXZfcHJpdikpIHsKLQkJdTMyIHRyYW5zX2RwX2N0bCA9 IEk5MTVfUkVBRChUUkFOU19EUF9DVEwocGlwZSkpOwotCQlpZiAoKHRyYW5zX2RwX2N0bCAmIFRS QU5TX0RQX1BPUlRfU0VMX01BU0spICE9IHBvcnRfc2VsKQotCQkJcmV0dXJuIGZhbHNlOwotCX0g ZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKLQkJaWYgKCh2YWwgJiBEUF9QSVBF X01BU0tfQ0hWKSAhPSBEUF9QSVBFX1NFTEVDVF9DSFYocGlwZSkpCi0JCQlyZXR1cm4gZmFsc2U7 Ci0JfSBlbHNlIHsKLQkJaWYgKCh2YWwgJiBEUF9QSVBFX01BU0spICE9IChwaXBlIDw8IDMwKSkK LQkJCXJldHVybiBmYWxzZTsKLQl9Ci0JcmV0dXJuIHRydWU7Ci19CisJc3RhdGUgPSBpbnRlbF9k cF9wb3J0X2VuYWJsZWQoZGV2X3ByaXYsIGRwX3JlZywgcG9ydCwgJnBvcnRfcGlwZSk7CiAKLXN0 YXRpYyB2b2lkIGFzc2VydF9wY2hfZHBfZGlzYWJsZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LAotCQkJCSAgIGVudW0gcGlwZSBwaXBlLCBpOTE1X3JlZ190IHJlZywKLQkJCQkg ICB1MzIgcG9ydF9zZWwpCi17Ci0JdTMyIHZhbCA9IEk5MTVfUkVBRChyZWcpOwotCUk5MTVfU1RB VEVfV0FSTihkcF9waXBlX2VuYWJsZWQoZGV2X3ByaXYsIHBpcGUsIHBvcnRfc2VsLCB2YWwpLAot CSAgICAgIlBDSCBEUCAoMHglMDh4KSBlbmFibGVkIG9uIHRyYW5zY29kZXIgJWMsIHNob3VsZCBi ZSBkaXNhYmxlZFxuIiwKLQkgICAgIGk5MTVfbW1pb19yZWdfb2Zmc2V0KHJlZyksIHBpcGVfbmFt ZShwaXBlKSk7CisJSTkxNV9TVEFURV9XQVJOKHN0YXRlICYmIHBvcnRfcGlwZSA9PSBwaXBlLAor CQkJIlBDSCBEUCAlYyBlbmFibGVkIG9uIHRyYW5zY29kZXIgJWMsIHNob3VsZCBiZSBkaXNhYmxl ZFxuIiwKKwkJCXBvcnRfbmFtZShwb3J0KSwgcGlwZV9uYW1lKHBpcGUpKTsKIAotCUk5MTVfU1RB VEVfV0FSTihIQVNfUENIX0lCWChkZXZfcHJpdikgJiYgKHZhbCAmIERQX1BPUlRfRU4pID09IDAK LQkgICAgICYmICh2YWwgJiBEUF9QSVBFQl9TRUxFQ1QpLAotCSAgICAgIklCWCBQQ0ggZHAgcG9y dCBzdGlsbCB1c2luZyB0cmFuc2NvZGVyIEJcbiIpOworCUk5MTVfU1RBVEVfV0FSTihIQVNfUENI X0lCWChkZXZfcHJpdikgJiYgIXN0YXRlICYmIHBvcnRfcGlwZSA9PSBQSVBFX0IsCisJCQkiSUJY IFBDSCBEUCAlYyBzdGlsbCB1c2luZyB0cmFuc2NvZGVyIEJcbiIsCisJCQlwb3J0X25hbWUocG9y dCkpOwogfQogCiBzdGF0aWMgdm9pZCBhc3NlcnRfcGNoX2hkbWlfZGlzYWJsZWQoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LApAQCAtMTMxOCw5ICsxMzAyLDkgQEAgc3RhdGljIHZv aWQgYXNzZXJ0X3BjaF9wb3J0c19kaXNhYmxlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCiB7CiAJZW51bSBwaXBlIHBvcnRfcGlwZTsKIAotCWFzc2VydF9wY2hfZHBfZGlzYWJs ZWQoZGV2X3ByaXYsIHBpcGUsIFBDSF9EUF9CLCBUUkFOU19EUF9QT1JUX1NFTChQT1JUX0IpKTsK LQlhc3NlcnRfcGNoX2RwX2Rpc2FibGVkKGRldl9wcml2LCBwaXBlLCBQQ0hfRFBfQywgVFJBTlNf RFBfUE9SVF9TRUwoUE9SVF9DKSk7Ci0JYXNzZXJ0X3BjaF9kcF9kaXNhYmxlZChkZXZfcHJpdiwg cGlwZSwgUENIX0RQX0QsIFRSQU5TX0RQX1BPUlRfU0VMKFBPUlRfRCkpOworCWFzc2VydF9wY2hf ZHBfZGlzYWJsZWQoZGV2X3ByaXYsIHBpcGUsIFBPUlRfQiwgUENIX0RQX0IpOworCWFzc2VydF9w Y2hfZHBfZGlzYWJsZWQoZGV2X3ByaXYsIHBpcGUsIFBPUlRfQywgUENIX0RQX0MpOworCWFzc2Vy dF9wY2hfZHBfZGlzYWJsZWQoZGV2X3ByaXYsIHBpcGUsIFBPUlRfRCwgUENIX0RQX0QpOwogCiAJ STkxNV9TVEFURV9XQVJOKGludGVsX2NydF9wb3J0X2VuYWJsZWQoZGV2X3ByaXYsIFBDSF9BRFBB LCAmcG9ydF9waXBlKSAmJgogCQkJcG9ydF9waXBlID09IHBpcGUsCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHAuYwppbmRleCAyYTgyZWNjZmZlNTQuLjYzOGE5ZGQwNTU5MiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcC5jCkBAIC01MzIsOSArNTMyLDkgQEAgdmx2X3Bvd2VyX3NlcXVlbmNlcl9raWNrKHN0cnVj dCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJRFAgfD0gRFBfTElOS19UUkFJTl9QQVRfMTsKIAogCWlm IChJU19DSEVSUllWSUVXKGRldl9wcml2KSkKLQkJRFAgfD0gRFBfUElQRV9TRUxFQ1RfQ0hWKHBp cGUpOwotCWVsc2UgaWYgKHBpcGUgPT0gUElQRV9CKQotCQlEUCB8PSBEUF9QSVBFQl9TRUxFQ1Q7 CisJCURQIHw9IERQX1BJUEVfU0VMX0NIVihwaXBlKTsKKwllbHNlCisJCURQIHw9IERQX1BJUEVf U0VMKHBpcGUpOwogCiAJcGxsX2VuYWJsZWQgPSBJOTE1X1JFQUQoRFBMTChwaXBlKSkgJiBEUExM X1ZDT19FTkFCTEU7CiAKQEAgLTE5ODAsNyArMTk4MCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2Rw X3ByZXBhcmUoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJCWlmIChkcm1fZHBfZW5o YW5jZWRfZnJhbWVfY2FwKGludGVsX2RwLT5kcGNkKSkKIAkJCWludGVsX2RwLT5EUCB8PSBEUF9F TkhBTkNFRF9GUkFNSU5HOwogCi0JCWludGVsX2RwLT5EUCB8PSBjcnRjLT5waXBlIDw8IDI5Owor CQlpbnRlbF9kcC0+RFAgfD0gRFBfUElQRV9TRUxfSVZCKGNydGMtPnBpcGUpOwogCX0gZWxzZSBp ZiAoSEFTX1BDSF9DUFQoZGV2X3ByaXYpICYmIHBvcnQgIT0gUE9SVF9BKSB7CiAJCXUzMiB0cmFu c19kcDsKIApAQCAtMjAwNiw5ICsyMDA2LDkgQEAgc3RhdGljIHZvaWQgaW50ZWxfZHBfcHJlcGFy ZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCWludGVsX2RwLT5EUCB8PSBEUF9F TkhBTkNFRF9GUkFNSU5HOwogCiAJCWlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkKLQkJCWlu dGVsX2RwLT5EUCB8PSBEUF9QSVBFX1NFTEVDVF9DSFYoY3J0Yy0+cGlwZSk7Ci0JCWVsc2UgaWYg KGNydGMtPnBpcGUgPT0gUElQRV9CKQotCQkJaW50ZWxfZHAtPkRQIHw9IERQX1BJUEVCX1NFTEVD VDsKKwkJCWludGVsX2RwLT5EUCB8PSBEUF9QSVBFX1NFTF9DSFYoY3J0Yy0+cGlwZSk7CisJCWVs c2UKKwkJCWludGVsX2RwLT5EUCB8PSBEUF9QSVBFX1NFTChjcnRjLT5waXBlKTsKIAl9CiB9CiAK QEAgLTI2MzAsNTIgKzI2MzAsNjcgQEAgdm9pZCBpbnRlbF9kcF9zaW5rX2RwbXMoc3RydWN0IGlu dGVsX2RwICppbnRlbF9kcCwgaW50IG1vZGUpCiAJCQkgICAgICBtb2RlID09IERSTV9NT0RFX0RQ TVNfT04gPyAiZW5hYmxlIiA6ICJkaXNhYmxlIik7CiB9CiAKLXN0YXRpYyBib29sIGludGVsX2Rw X2dldF9od19zdGF0ZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKLQkJCQkgIGVudW0g cGlwZSAqcGlwZSkKK3N0YXRpYyBib29sIGNwdF9kcF9wb3J0X3NlbGVjdGVkKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJCQkgZW51bSBwb3J0IHBvcnQsIGVudW0gcGlwZSAq cGlwZSkKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGVu Y29kZXItPmJhc2UuZGV2KTsKLQlzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwID0gZW5jX3RvX2lu dGVsX2RwKCZlbmNvZGVyLT5iYXNlKTsKLQllbnVtIHBvcnQgcG9ydCA9IGVuY29kZXItPnBvcnQ7 Ci0JdTMyIHRtcDsKLQlib29sIHJldDsKKwllbnVtIHBpcGUgcDsKIAotCWlmICghaW50ZWxfZGlz cGxheV9wb3dlcl9nZXRfaWZfZW5hYmxlZChkZXZfcHJpdiwKLQkJCQkJCWVuY29kZXItPnBvd2Vy X2RvbWFpbikpCi0JCXJldHVybiBmYWxzZTsKKwlmb3JfZWFjaF9waXBlKGRldl9wcml2LCBwKSB7 CisJCXUzMiB2YWwgPSBJOTE1X1JFQUQoVFJBTlNfRFBfQ1RMKHApKTsKKworCQlpZiAoKHZhbCAm IFRSQU5TX0RQX1BPUlRfU0VMX01BU0spID09IFRSQU5TX0RQX1BPUlRfU0VMKHBvcnQpKSB7CisJ CQkqcGlwZSA9IHA7CisJCQlyZXR1cm4gdHJ1ZTsKKwkJfQorCX0KIAotCXJldCA9IGZhbHNlOwor CURSTV9ERUJVR19LTVMoIk5vIHBpcGUgZm9yIERQIHBvcnQgJWMgZm91bmRcbiIsIHBvcnRfbmFt ZShwb3J0KSk7CiAKLQl0bXAgPSBJOTE1X1JFQUQoaW50ZWxfZHAtPm91dHB1dF9yZWcpOworCS8q IG11c3QgaW5pdGlhbGl6ZSBwaXBlIHRvIHNvbWV0aGluZyBmb3IgdGhlIGFzc2VydHMgKi8KKwkq cGlwZSA9IFBJUEVfQTsKIAotCWlmICghKHRtcCAmIERQX1BPUlRfRU4pKQotCQlnb3RvIG91dDsK KwlyZXR1cm4gZmFsc2U7Cit9CiAKLQlpZiAoSVNfSVZZQlJJREdFKGRldl9wcml2KSAmJiBwb3J0 ID09IFBPUlRfQSkgewotCQkqcGlwZSA9IFBPUlRfVE9fUElQRV9DUFQodG1wKTsKLQl9IGVsc2Ug aWYgKEhBU19QQ0hfQ1BUKGRldl9wcml2KSAmJiBwb3J0ICE9IFBPUlRfQSkgewotCQllbnVtIHBp cGUgcDsKK2Jvb2wgaW50ZWxfZHBfcG9ydF9lbmFibGVkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKKwkJCSAgIGk5MTVfcmVnX3QgZHBfcmVnLCBlbnVtIHBvcnQgcG9ydCwKKwkJ CSAgIGVudW0gcGlwZSAqcGlwZSkKK3sKKwlib29sIHJldDsKKwl1MzIgdmFsOwogCi0JCWZvcl9l YWNoX3BpcGUoZGV2X3ByaXYsIHApIHsKLQkJCXUzMiB0cmFuc19kcCA9IEk5MTVfUkVBRChUUkFO U19EUF9DVEwocCkpOwotCQkJaWYgKFRSQU5TX0RQX1BJUEVfVE9fUE9SVCh0cmFuc19kcCkgPT0g cG9ydCkgewotCQkJCSpwaXBlID0gcDsKLQkJCQlyZXQgPSB0cnVlOworCXZhbCA9IEk5MTVfUkVB RChkcF9yZWcpOwogCi0JCQkJZ290byBvdXQ7Ci0JCQl9Ci0JCX0KKwlyZXQgPSB2YWwgJiBEUF9Q T1JUX0VOOwogCi0JCURSTV9ERUJVR19LTVMoIk5vIHBpcGUgZm9yIGRwIHBvcnQgMHgleCBmb3Vu ZFxuIiwKLQkJCSAgICAgIGk5MTVfbW1pb19yZWdfb2Zmc2V0KGludGVsX2RwLT5vdXRwdXRfcmVn KSk7CisJLyogYXNzZXJ0cyB3YW50IHRvIGtub3cgdGhlIHBpcGUgZXZlbiBpZiB0aGUgcG9ydCBp cyBkaXNhYmxlZCAqLworCWlmIChJU19JVllCUklER0UoZGV2X3ByaXYpICYmIHBvcnQgPT0gUE9S VF9BKSB7CisJCSpwaXBlID0gKHZhbCAmIERQX1BJUEVfU0VMX01BU0tfSVZCKSA+PiBEUF9QSVBF X1NFTF9TSElGVF9JVkI7CisJfSBlbHNlIGlmIChIQVNfUENIX0NQVChkZXZfcHJpdikgJiYgcG9y dCAhPSBQT1JUX0EpIHsKKwkJcmV0ICY9IGNwdF9kcF9wb3J0X3NlbGVjdGVkKGRldl9wcml2LCBw b3J0LCBwaXBlKTsKIAl9IGVsc2UgaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7Ci0JCSpw aXBlID0gRFBfUE9SVF9UT19QSVBFX0NIVih0bXApOworCQkqcGlwZSA9ICh2YWwgJiBEUF9QSVBF X1NFTF9NQVNLX0NIVikgPj4gRFBfUElQRV9TRUxfU0hJRlRfQ0hWOwogCX0gZWxzZSB7Ci0JCSpw aXBlID0gUE9SVF9UT19QSVBFKHRtcCk7CisJCSpwaXBlID0gKHZhbCAmIERQX1BJUEVfU0VMX01B U0spID4+IERQX1BJUEVfU0VMX1NISUZUOwogCX0KIAotCXJldCA9IHRydWU7CisJcmV0dXJuIHJl dDsKK30KKworc3RhdGljIGJvb2wgaW50ZWxfZHBfZ2V0X2h3X3N0YXRlKHN0cnVjdCBpbnRlbF9l bmNvZGVyICplbmNvZGVyLAorCQkJCSAgZW51bSBwaXBlICpwaXBlKQoreworCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZW5jb2Rlci0+YmFzZS5kZXYpOworCXN0 cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAgPSBlbmNfdG9faW50ZWxfZHAoJmVuY29kZXItPmJhc2Up OworCWJvb2wgcmV0OworCisJaWYgKCFpbnRlbF9kaXNwbGF5X3Bvd2VyX2dldF9pZl9lbmFibGVk KGRldl9wcml2LAorCQkJCQkJZW5jb2Rlci0+cG93ZXJfZG9tYWluKSkKKwkJcmV0dXJuIGZhbHNl OworCisJcmV0ID0gaW50ZWxfZHBfcG9ydF9lbmFibGVkKGRldl9wcml2LCBpbnRlbF9kcC0+b3V0 cHV0X3JlZywKKwkJCQkgICAgZW5jb2Rlci0+cG9ydCwgcGlwZSk7CiAKLW91dDoKIAlpbnRlbF9k aXNwbGF5X3Bvd2VyX3B1dChkZXZfcHJpdiwgZW5jb2Rlci0+cG93ZXJfZG9tYWluKTsKIAogCXJl dHVybiByZXQ7CkBAIC0zNjczLDggKzM2ODgsOSBAQCBpbnRlbF9kcF9saW5rX2Rvd24oc3RydWN0 IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJCWludGVsX3NldF9wY2hfZmlmb191bmRlcnJ1bl9y ZXBvcnRpbmcoZGV2X3ByaXYsIFBJUEVfQSwgZmFsc2UpOwogCiAJCS8qIGFsd2F5cyBlbmFibGUg d2l0aCBwYXR0ZXJuIDEgKGFzIHBlciBzcGVjKSAqLwotCQlEUCAmPSB+KERQX1BJUEVCX1NFTEVD VCB8IERQX0xJTktfVFJBSU5fTUFTSyk7Ci0JCURQIHw9IERQX1BPUlRfRU4gfCBEUF9MSU5LX1RS QUlOX1BBVF8xOworCQlEUCAmPSB+KERQX1BJUEVfU0VMX01BU0sgfCBEUF9MSU5LX1RSQUlOX01B U0spOworCQlEUCB8PSBEUF9QT1JUX0VOIHwgRFBfUElQRV9TRUwoUElQRV9BKSB8CisJCQlEUF9M SU5LX1RSQUlOX1BBVF8xOwogCQlJOTE1X1dSSVRFKGludGVsX2RwLT5vdXRwdXRfcmVnLCBEUCk7 CiAJCVBPU1RJTkdfUkVBRChpbnRlbF9kcC0+b3V0cHV0X3JlZyk7CiAKQEAgLTUyNDgsMTQgKzUy NjQsMTQgQEAgc3RhdGljIHZvaWQgaW50ZWxfZWRwX3BhbmVsX3ZkZF9zYW5pdGl6ZShzdHJ1Y3Qg aW50ZWxfZHAgKmludGVsX2RwKQogc3RhdGljIGVudW0gcGlwZSB2bHZfYWN0aXZlX3BpcGUoc3Ry dWN0IGludGVsX2RwICppbnRlbF9kcCkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSB0b19pOTE1KGludGVsX2RwX3RvX2RldihpbnRlbF9kcCkpOworCXN0cnVjdCBpbnRl bF9lbmNvZGVyICplbmNvZGVyID0gJmRwX3RvX2RpZ19wb3J0KGludGVsX2RwKS0+YmFzZTsKKwll bnVtIHBpcGUgcGlwZTsKIAotCWlmICgoaW50ZWxfZHAtPkRQICYgRFBfUE9SVF9FTikgPT0gMCkK LQkJcmV0dXJuIElOVkFMSURfUElQRTsKKwlpZiAoaW50ZWxfZHBfcG9ydF9lbmFibGVkKGRldl9w cml2LCBpbnRlbF9kcC0+b3V0cHV0X3JlZywKKwkJCQkgIGVuY29kZXItPnBvcnQsICZwaXBlKSkK KwkJcmV0dXJuIHBpcGU7CiAKLQlpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCi0JCXJldHVy biBEUF9QT1JUX1RPX1BJUEVfQ0hWKGludGVsX2RwLT5EUCk7Ci0JZWxzZQotCQlyZXR1cm4gUE9S VF9UT19QSVBFKGludGVsX2RwLT5EUCk7CisJcmV0dXJuIElOVkFMSURfUElQRTsKIH0KIAogdm9p ZCBpbnRlbF9kcF9lbmNvZGVyX3Jlc2V0KHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcikKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggMTFjMGYzNzg1ZjU5Li5mZDY0MDE2NDc2YTQgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0xNjE3LDYgKzE2MTcsOSBAQCB2b2lkIGludGVs X2Nzcl91Y29kZV9zdXNwZW5kKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICopOwogdm9pZCBpbnRl bF9jc3JfdWNvZGVfcmVzdW1lKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICopOwogCiAvKiBpbnRl bF9kcC5jICovCitib29sIGludGVsX2RwX3BvcnRfZW5hYmxlZChzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsCisJCQkgICBpOTE1X3JlZ190IGRwX3JlZywgZW51bSBwb3J0IHBvcnQs CisJCQkgICBlbnVtIHBpcGUgKnBpcGUpOwogYm9vbCBpbnRlbF9kcF9pbml0KHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaTkxNV9yZWdfdCBvdXRwdXRfcmVnLAogCQkgICBlbnVt IHBvcnQgcG9ydCk7CiBib29sIGludGVsX2RwX2luaXRfY29ubmVjdG9yKHN0cnVjdCBpbnRlbF9k aWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0LAotLSAKMi4xNi4xCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK