From: Ville Syrjala Subject: [PATCH 2/8] drm/i915: Add enum aux_ch and clean up the aux init to use it Date: Thu, 22 Feb 2018 20:10:30 +0200 Message-ID: <20180222181036.15251-2-ville.syrjala@linux.intel.com> References: <20180222181036.15251-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id BA62B6EF41 for ; Thu, 22 Feb 2018 18:10:41 +0000 (UTC) In-Reply-To: <20180222181036.15251-1-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClNp bmNlIHdlIG5vIGxvbmdlciBoYXZlIGEgMToxIGNvcnJlc3BvbmRlbmNlIGJldHdlZW4gcG9ydHMg YW5kIEFVWApjaGFubmVscywgbGV0J3MgZ2l2ZSBBVVggY2hhbm5lbHMgdGhlaXIgb3duIGVudW0u IE1ha2VzIGl0IGVhc2llcgp0byB0ZWxsIHRoZSBhcHBsZXMgZnJvbSB0aGUgb3JhbmdlcywgYW5k IHdlIGdldCByaWQgb2YgdGhlCnBvcnQgRSBBVVggcG93ZXIgZG9tYWluIEZJWE1FIHNpbmNlIHdl IG5vdyBkZXJpdmUgdGhlIHBvd2VyIGRvbWFpbgpmcm9tIHRoZSBhY3R1YWwgQVVYIENILgoKdjI6 IFJlYmFzZSBkdWUgdG8gQVVYIEYKdjM6IFNwbGl0IG91dCB0aGUgcG93ZXIgZG9tYWluIGZpeCAo Um9kcmlnbykKClJldmlld2VkLWJ5OiBSb2RyaWdvIFZpdmkgPHJvZHJpZ28udml2aUBpbnRlbC5j b20+ICN2MgpSZXZpZXdlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28u dWs+ICN2MgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGlu dXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmggICAgICB8 ICAgOCArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5oIHwgIDExICsrCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jICAgICAgfCAyMzYgKysrKysrKysrKysrKysr KystLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAg ICB8ICAgMSArCiA0IGZpbGVzIGNoYW5nZWQsIDEzMSBpbnNlcnRpb25zKCspLCAxMjUgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKaW5kZXggOGMxMmVlMmY4OWE5Li5lZWE1YjJj NTM3ZDQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaApAQCAtNTM1NCw4ICs1MzU0LDggQEAgZW51 bSB7CiAjZGVmaW5lIF9EUEZfQVVYX0NIX0RBVEE0CShkZXZfcHJpdi0+aW5mby5kaXNwbGF5X21t aW9fb2Zmc2V0ICsgMHg2NDUyMCkKICNkZWZpbmUgX0RQRl9BVVhfQ0hfREFUQTUJKGRldl9wcml2 LT5pbmZvLmRpc3BsYXlfbW1pb19vZmZzZXQgKyAweDY0NTI0KQogCi0jZGVmaW5lIERQX0FVWF9D SF9DVEwocG9ydCkJX01NSU9fUE9SVChwb3J0LCBfRFBBX0FVWF9DSF9DVEwsIF9EUEJfQVVYX0NI X0NUTCkKLSNkZWZpbmUgRFBfQVVYX0NIX0RBVEEocG9ydCwgaSkJX01NSU8oX1BPUlQocG9ydCwg X0RQQV9BVVhfQ0hfREFUQTEsIF9EUEJfQVVYX0NIX0RBVEExKSArIChpKSAqIDQpIC8qIDUgcmVn aXN0ZXJzICovCisjZGVmaW5lIERQX0FVWF9DSF9DVEwoYXV4X2NoKQlfTU1JT19QT1JUKGF1eF9j aCwgX0RQQV9BVVhfQ0hfQ1RMLCBfRFBCX0FVWF9DSF9DVEwpCisjZGVmaW5lIERQX0FVWF9DSF9E QVRBKGF1eF9jaCwgaSkJX01NSU8oX1BPUlQoYXV4X2NoLCBfRFBBX0FVWF9DSF9EQVRBMSwgX0RQ Ql9BVVhfQ0hfREFUQTEpICsgKGkpICogNCkgLyogNSByZWdpc3RlcnMgKi8KIAogI2RlZmluZSAg IERQX0FVWF9DSF9DVExfU0VORF9CVVNZCSAgICAoMSA8PCAzMSkKICNkZWZpbmUgICBEUF9BVVhf Q0hfQ1RMX0RPTkUJCSAgICAoMSA8PCAzMCkKQEAgLTc4ODIsOCArNzg4Miw4IEBAIGVudW0gewog I2RlZmluZSBfUENIX0RQRF9BVVhfQ0hfREFUQTQJMHhlNDMyMAogI2RlZmluZSBfUENIX0RQRF9B VVhfQ0hfREFUQTUJMHhlNDMyNAogCi0jZGVmaW5lIFBDSF9EUF9BVVhfQ0hfQ1RMKHBvcnQpCQlf TU1JT19QT1JUKChwb3J0KSAtIFBPUlRfQiwgX1BDSF9EUEJfQVVYX0NIX0NUTCwgX1BDSF9EUENf QVVYX0NIX0NUTCkKLSNkZWZpbmUgUENIX0RQX0FVWF9DSF9EQVRBKHBvcnQsIGkpCV9NTUlPKF9Q T1JUKChwb3J0KSAtIFBPUlRfQiwgX1BDSF9EUEJfQVVYX0NIX0RBVEExLCBfUENIX0RQQ19BVVhf Q0hfREFUQTEpICsgKGkpICogNCkgLyogNSByZWdpc3RlcnMgKi8KKyNkZWZpbmUgUENIX0RQX0FV WF9DSF9DVEwoYXV4X2NoKQkJX01NSU9fUE9SVCgoYXV4X2NoKSAtIEFVWF9DSF9CLCBfUENIX0RQ Ql9BVVhfQ0hfQ1RMLCBfUENIX0RQQ19BVVhfQ0hfQ1RMKQorI2RlZmluZSBQQ0hfRFBfQVVYX0NI X0RBVEEoYXV4X2NoLCBpKQlfTU1JTyhfUE9SVCgoYXV4X2NoKSAtIEFVWF9DSF9CLCBfUENIX0RQ Ql9BVVhfQ0hfREFUQTEsIF9QQ0hfRFBDX0FVWF9DSF9EQVRBMSkgKyAoaSkgKiA0KSAvKiA1IHJl Z2lzdGVycyAqLwogCiAvKiBDUFQgKi8KICNkZWZpbmUgIFBPUlRfVFJBTlNfQV9TRUxfQ1BUCTAK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuaCBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuaAppbmRleCBjNDA0MmUzNDJmNTAuLmY1NzMz YTI1NzZlNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuaApAQCAtMTM5LDYgKzEz OSwxNyBAQCBlbnVtIGRwaW9fcGh5IHsKIAogI2RlZmluZSBJOTE1X05VTV9QSFlTX1ZMViAyCiAK K2VudW0gYXV4X2NoIHsKKwlBVVhfQ0hfQSwKKwlBVVhfQ0hfQiwKKwlBVVhfQ0hfQywKKwlBVVhf Q0hfRCwKKwlfQVVYX0NIX0UsIC8qIGRvZXMgbm90IGV4aXN0ICovCisJQVVYX0NIX0YsCit9Owor CisjZGVmaW5lIGF1eF9jaF9uYW1lKGEpICgoYSkgKyAnQScpCisKIGVudW0gaW50ZWxfZGlzcGxh eV9wb3dlcl9kb21haW4gewogCVBPV0VSX0RPTUFJTl9QSVBFX0EsCiAJUE9XRVJfRE9NQUlOX1BJ UEVfQiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCmluZGV4IGFmMWVlNWU5N2QxNy4uZWViOGEwMjZm ZDA4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKQEAgLTEzMzEsMTcxICsxMzMxLDE5NCBAQCBp bnRlbF9kcF9hdXhfdHJhbnNmZXIoc3RydWN0IGRybV9kcF9hdXggKmF1eCwgc3RydWN0IGRybV9k cF9hdXhfbXNnICptc2cpCiAJcmV0dXJuIHJldDsKIH0KIAotc3RhdGljIGVudW0gcG9ydCBpbnRl bF9hdXhfcG9ydChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkJZW51bSBw b3J0IHBvcnQpCitzdGF0aWMgZW51bSBhdXhfY2ggaW50ZWxfYXV4X2NoKHN0cnVjdCBpbnRlbF9k cCAqaW50ZWxfZHApCiB7CisJc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIgPSAmZHBfdG9f ZGlnX3BvcnQoaW50ZWxfZHApLT5iYXNlOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IHRvX2k5MTUoZW5jb2Rlci0+YmFzZS5kZXYpOworCWVudW0gcG9ydCBwb3J0ID0gZW5j b2Rlci0+cG9ydDsKIAljb25zdCBzdHJ1Y3QgZGRpX3ZidF9wb3J0X2luZm8gKmluZm8gPQogCQkm ZGV2X3ByaXYtPnZidC5kZGlfcG9ydF9pbmZvW3BvcnRdOwotCWVudW0gcG9ydCBhdXhfcG9ydDsK KwllbnVtIGF1eF9jaCBhdXhfY2g7CiAKIAlpZiAoIWluZm8tPmFsdGVybmF0ZV9hdXhfY2hhbm5l bCkgeworCQlhdXhfY2ggPSAoZW51bSBhdXhfY2gpIHBvcnQ7CisKIAkJRFJNX0RFQlVHX0tNUygi dXNpbmcgQVVYICVjIGZvciBwb3J0ICVjIChwbGF0Zm9ybSBkZWZhdWx0KVxuIiwKLQkJCSAgICAg IHBvcnRfbmFtZShwb3J0KSwgcG9ydF9uYW1lKHBvcnQpKTsKLQkJcmV0dXJuIHBvcnQ7CisJCQkg ICAgICBhdXhfY2hfbmFtZShhdXhfY2gpLCBwb3J0X25hbWUocG9ydCkpOworCQlyZXR1cm4gYXV4 X2NoOwogCX0KIAogCXN3aXRjaCAoaW5mby0+YWx0ZXJuYXRlX2F1eF9jaGFubmVsKSB7CiAJY2Fz ZSBEUF9BVVhfQToKLQkJYXV4X3BvcnQgPSBQT1JUX0E7CisJCWF1eF9jaCA9IEFVWF9DSF9BOwog CQlicmVhazsKIAljYXNlIERQX0FVWF9COgotCQlhdXhfcG9ydCA9IFBPUlRfQjsKKwkJYXV4X2No ID0gQVVYX0NIX0I7CiAJCWJyZWFrOwogCWNhc2UgRFBfQVVYX0M6Ci0JCWF1eF9wb3J0ID0gUE9S VF9DOworCQlhdXhfY2ggPSBBVVhfQ0hfQzsKIAkJYnJlYWs7CiAJY2FzZSBEUF9BVVhfRDoKLQkJ YXV4X3BvcnQgPSBQT1JUX0Q7CisJCWF1eF9jaCA9IEFVWF9DSF9EOwogCQlicmVhazsKIAljYXNl IERQX0FVWF9GOgotCQlhdXhfcG9ydCA9IFBPUlRfRjsKKwkJYXV4X2NoID0gQVVYX0NIX0Y7CiAJ CWJyZWFrOwogCWRlZmF1bHQ6CiAJCU1JU1NJTkdfQ0FTRShpbmZvLT5hbHRlcm5hdGVfYXV4X2No YW5uZWwpOwotCQlhdXhfcG9ydCA9IFBPUlRfQTsKKwkJYXV4X2NoID0gQVVYX0NIX0E7CiAJCWJy ZWFrOwogCX0KIAogCURSTV9ERUJVR19LTVMoInVzaW5nIEFVWCAlYyBmb3IgcG9ydCAlYyAoVkJU KVxuIiwKLQkJICAgICAgcG9ydF9uYW1lKGF1eF9wb3J0KSwgcG9ydF9uYW1lKHBvcnQpKTsKKwkJ ICAgICAgYXV4X2NoX25hbWUoYXV4X2NoKSwgcG9ydF9uYW1lKHBvcnQpKTsKIAotCXJldHVybiBh dXhfcG9ydDsKKwlyZXR1cm4gYXV4X2NoOworfQorCitzdGF0aWMgZW51bSBpbnRlbF9kaXNwbGF5 X3Bvd2VyX2RvbWFpbgoraW50ZWxfYXV4X3Bvd2VyX2RvbWFpbihzdHJ1Y3QgaW50ZWxfZHAgKmlu dGVsX2RwKQoreworCXN3aXRjaCAoaW50ZWxfZHAtPmF1eF9jaCkgeworCWNhc2UgQVVYX0NIX0E6 CisJCXJldHVybiBQT1dFUl9ET01BSU5fQVVYX0E7CisJY2FzZSBBVVhfQ0hfQjoKKwkJcmV0dXJu IFBPV0VSX0RPTUFJTl9BVVhfQjsKKwljYXNlIEFVWF9DSF9DOgorCQlyZXR1cm4gUE9XRVJfRE9N QUlOX0FVWF9DOworCWNhc2UgQVVYX0NIX0Q6CisJCXJldHVybiBQT1dFUl9ET01BSU5fQVVYX0Q7 CisJY2FzZSBBVVhfQ0hfRjoKKwkJcmV0dXJuIFBPV0VSX0RPTUFJTl9BVVhfRjsKKwlkZWZhdWx0 OgorCQlNSVNTSU5HX0NBU0UoaW50ZWxfZHAtPmF1eF9jaCk7CisJCXJldHVybiBQT1dFUl9ET01B SU5fQVVYX0E7CisJfQogfQogCiBzdGF0aWMgaTkxNV9yZWdfdCBnNHhfYXV4X2N0bF9yZWcoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkJCSAgZW51bSBwb3J0IHBvcnQpCisJ CQkJICBlbnVtIGF1eF9jaCBhdXhfY2gpCiB7Ci0Jc3dpdGNoIChwb3J0KSB7Ci0JY2FzZSBQT1JU X0I6Ci0JY2FzZSBQT1JUX0M6Ci0JY2FzZSBQT1JUX0Q6Ci0JCXJldHVybiBEUF9BVVhfQ0hfQ1RM KHBvcnQpOworCXN3aXRjaCAoYXV4X2NoKSB7CisJY2FzZSBBVVhfQ0hfQjoKKwljYXNlIEFVWF9D SF9DOgorCWNhc2UgQVVYX0NIX0Q6CisJCXJldHVybiBEUF9BVVhfQ0hfQ1RMKGF1eF9jaCk7CiAJ ZGVmYXVsdDoKLQkJTUlTU0lOR19DQVNFKHBvcnQpOwotCQlyZXR1cm4gRFBfQVVYX0NIX0NUTChQ T1JUX0IpOworCQlNSVNTSU5HX0NBU0UoYXV4X2NoKTsKKwkJcmV0dXJuIERQX0FVWF9DSF9DVEwo QVVYX0NIX0IpOwogCX0KIH0KIAogc3RhdGljIGk5MTVfcmVnX3QgZzR4X2F1eF9kYXRhX3JlZyhz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkJICAgZW51bSBwb3J0IHBvcnQs IGludCBpbmRleCkKKwkJCQkgICBlbnVtIGF1eF9jaCBhdXhfY2gsIGludCBpbmRleCkKIHsKLQlz d2l0Y2ggKHBvcnQpIHsKLQljYXNlIFBPUlRfQjoKLQljYXNlIFBPUlRfQzoKLQljYXNlIFBPUlRf RDoKLQkJcmV0dXJuIERQX0FVWF9DSF9EQVRBKHBvcnQsIGluZGV4KTsKKwlzd2l0Y2ggKGF1eF9j aCkgeworCWNhc2UgQVVYX0NIX0I6CisJY2FzZSBBVVhfQ0hfQzoKKwljYXNlIEFVWF9DSF9EOgor CQlyZXR1cm4gRFBfQVVYX0NIX0RBVEEoYXV4X2NoLCBpbmRleCk7CiAJZGVmYXVsdDoKLQkJTUlT U0lOR19DQVNFKHBvcnQpOwotCQlyZXR1cm4gRFBfQVVYX0NIX0RBVEEoUE9SVF9CLCBpbmRleCk7 CisJCU1JU1NJTkdfQ0FTRShhdXhfY2gpOworCQlyZXR1cm4gRFBfQVVYX0NIX0RBVEEoQVVYX0NI X0IsIGluZGV4KTsKIAl9CiB9CiAKIHN0YXRpYyBpOTE1X3JlZ190IGlsa19hdXhfY3RsX3JlZyhz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkJICBlbnVtIHBvcnQgcG9ydCkK LXsKLQlzd2l0Y2ggKHBvcnQpIHsKLQljYXNlIFBPUlRfQToKLQkJcmV0dXJuIERQX0FVWF9DSF9D VEwocG9ydCk7Ci0JY2FzZSBQT1JUX0I6Ci0JY2FzZSBQT1JUX0M6Ci0JY2FzZSBQT1JUX0Q6Ci0J CXJldHVybiBQQ0hfRFBfQVVYX0NIX0NUTChwb3J0KTsKKwkJCQkgIGVudW0gYXV4X2NoIGF1eF9j aCkKK3sKKwlzd2l0Y2ggKGF1eF9jaCkgeworCWNhc2UgQVVYX0NIX0E6CisJCXJldHVybiBEUF9B VVhfQ0hfQ1RMKGF1eF9jaCk7CisJY2FzZSBBVVhfQ0hfQjoKKwljYXNlIEFVWF9DSF9DOgorCWNh c2UgQVVYX0NIX0Q6CisJCXJldHVybiBQQ0hfRFBfQVVYX0NIX0NUTChhdXhfY2gpOwogCWRlZmF1 bHQ6Ci0JCU1JU1NJTkdfQ0FTRShwb3J0KTsKLQkJcmV0dXJuIERQX0FVWF9DSF9DVEwoUE9SVF9B KTsKKwkJTUlTU0lOR19DQVNFKGF1eF9jaCk7CisJCXJldHVybiBEUF9BVVhfQ0hfQ1RMKEFVWF9D SF9BKTsKIAl9CiB9CiAKIHN0YXRpYyBpOTE1X3JlZ190IGlsa19hdXhfZGF0YV9yZWcoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkJCSAgIGVudW0gcG9ydCBwb3J0LCBpbnQg aW5kZXgpCi17Ci0Jc3dpdGNoIChwb3J0KSB7Ci0JY2FzZSBQT1JUX0E6Ci0JCXJldHVybiBEUF9B VVhfQ0hfREFUQShwb3J0LCBpbmRleCk7Ci0JY2FzZSBQT1JUX0I6Ci0JY2FzZSBQT1JUX0M6Ci0J Y2FzZSBQT1JUX0Q6Ci0JCXJldHVybiBQQ0hfRFBfQVVYX0NIX0RBVEEocG9ydCwgaW5kZXgpOwor CQkJCSAgIGVudW0gYXV4X2NoIGF1eF9jaCwgaW50IGluZGV4KQoreworCXN3aXRjaCAoYXV4X2No KSB7CisJY2FzZSBBVVhfQ0hfQToKKwkJcmV0dXJuIERQX0FVWF9DSF9EQVRBKGF1eF9jaCwgaW5k ZXgpOworCWNhc2UgQVVYX0NIX0I6CisJY2FzZSBBVVhfQ0hfQzoKKwljYXNlIEFVWF9DSF9EOgor CQlyZXR1cm4gUENIX0RQX0FVWF9DSF9EQVRBKGF1eF9jaCwgaW5kZXgpOwogCWRlZmF1bHQ6Ci0J CU1JU1NJTkdfQ0FTRShwb3J0KTsKLQkJcmV0dXJuIERQX0FVWF9DSF9EQVRBKFBPUlRfQSwgaW5k ZXgpOworCQlNSVNTSU5HX0NBU0UoYXV4X2NoKTsKKwkJcmV0dXJuIERQX0FVWF9DSF9EQVRBKEFV WF9DSF9BLCBpbmRleCk7CiAJfQogfQogCiBzdGF0aWMgaTkxNV9yZWdfdCBza2xfYXV4X2N0bF9y ZWcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkJCSAgZW51bSBwb3J0IHBv cnQpCi17Ci0Jc3dpdGNoIChwb3J0KSB7Ci0JY2FzZSBQT1JUX0E6Ci0JY2FzZSBQT1JUX0I6Ci0J Y2FzZSBQT1JUX0M6Ci0JY2FzZSBQT1JUX0Q6Ci0JY2FzZSBQT1JUX0Y6Ci0JCXJldHVybiBEUF9B VVhfQ0hfQ1RMKHBvcnQpOworCQkJCSAgZW51bSBhdXhfY2ggYXV4X2NoKQoreworCXN3aXRjaCAo YXV4X2NoKSB7CisJY2FzZSBBVVhfQ0hfQToKKwljYXNlIEFVWF9DSF9COgorCWNhc2UgQVVYX0NI X0M6CisJY2FzZSBBVVhfQ0hfRDoKKwljYXNlIEFVWF9DSF9GOgorCQlyZXR1cm4gRFBfQVVYX0NI X0NUTChhdXhfY2gpOwogCWRlZmF1bHQ6Ci0JCU1JU1NJTkdfQ0FTRShwb3J0KTsKLQkJcmV0dXJu IERQX0FVWF9DSF9DVEwoUE9SVF9BKTsKKwkJTUlTU0lOR19DQVNFKGF1eF9jaCk7CisJCXJldHVy biBEUF9BVVhfQ0hfQ1RMKEFVWF9DSF9BKTsKIAl9CiB9CiAKIHN0YXRpYyBpOTE1X3JlZ190IHNr bF9hdXhfZGF0YV9yZWcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkJCSAg IGVudW0gcG9ydCBwb3J0LCBpbnQgaW5kZXgpCi17Ci0Jc3dpdGNoIChwb3J0KSB7Ci0JY2FzZSBQ T1JUX0E6Ci0JY2FzZSBQT1JUX0I6Ci0JY2FzZSBQT1JUX0M6Ci0JY2FzZSBQT1JUX0Q6Ci0JY2Fz ZSBQT1JUX0Y6Ci0JCXJldHVybiBEUF9BVVhfQ0hfREFUQShwb3J0LCBpbmRleCk7CisJCQkJICAg ZW51bSBhdXhfY2ggYXV4X2NoLCBpbnQgaW5kZXgpCit7CisJc3dpdGNoIChhdXhfY2gpIHsKKwlj YXNlIEFVWF9DSF9BOgorCWNhc2UgQVVYX0NIX0I6CisJY2FzZSBBVVhfQ0hfQzoKKwljYXNlIEFV WF9DSF9EOgorCWNhc2UgQVVYX0NIX0Y6CisJCXJldHVybiBEUF9BVVhfQ0hfREFUQShhdXhfY2gs IGluZGV4KTsKIAlkZWZhdWx0OgotCQlNSVNTSU5HX0NBU0UocG9ydCk7Ci0JCXJldHVybiBEUF9B VVhfQ0hfREFUQShQT1JUX0EsIGluZGV4KTsKKwkJTUlTU0lOR19DQVNFKGF1eF9jaCk7CisJCXJl dHVybiBEUF9BVVhfQ0hfREFUQShBVVhfQ0hfQSwgaW5kZXgpOwogCX0KIH0KIAogc3RhdGljIGk5 MTVfcmVnX3QgaW50ZWxfYXV4X2N0bF9yZWcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LAotCQkJCSAgICBlbnVtIHBvcnQgcG9ydCkKKwkJCQkgICAgZW51bSBhdXhfY2ggYXV4X2No KQogewogCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpCi0JCXJldHVybiBza2xfYXV4X2N0 bF9yZWcoZGV2X3ByaXYsIHBvcnQpOworCQlyZXR1cm4gc2tsX2F1eF9jdGxfcmVnKGRldl9wcml2 LCBhdXhfY2gpOwogCWVsc2UgaWYgKEhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpKQotCQlyZXR1cm4g aWxrX2F1eF9jdGxfcmVnKGRldl9wcml2LCBwb3J0KTsKKwkJcmV0dXJuIGlsa19hdXhfY3RsX3Jl ZyhkZXZfcHJpdiwgYXV4X2NoKTsKIAllbHNlCi0JCXJldHVybiBnNHhfYXV4X2N0bF9yZWcoZGV2 X3ByaXYsIHBvcnQpOworCQlyZXR1cm4gZzR4X2F1eF9jdGxfcmVnKGRldl9wcml2LCBhdXhfY2gp OwogfQogCiBzdGF0aWMgaTkxNV9yZWdfdCBpbnRlbF9hdXhfZGF0YV9yZWcoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkJCSAgICAgZW51bSBwb3J0IHBvcnQsIGludCBpbmRl eCkKKwkJCQkgICAgIGVudW0gYXV4X2NoIGF1eF9jaCwgaW50IGluZGV4KQogewogCWlmIChJTlRF TF9HRU4oZGV2X3ByaXYpID49IDkpCi0JCXJldHVybiBza2xfYXV4X2RhdGFfcmVnKGRldl9wcml2 LCBwb3J0LCBpbmRleCk7CisJCXJldHVybiBza2xfYXV4X2RhdGFfcmVnKGRldl9wcml2LCBhdXhf Y2gsIGluZGV4KTsKIAllbHNlIGlmIChIQVNfUENIX1NQTElUKGRldl9wcml2KSkKLQkJcmV0dXJu IGlsa19hdXhfZGF0YV9yZWcoZGV2X3ByaXYsIHBvcnQsIGluZGV4KTsKKwkJcmV0dXJuIGlsa19h dXhfZGF0YV9yZWcoZGV2X3ByaXYsIGF1eF9jaCwgaW5kZXgpOwogCWVsc2UKLQkJcmV0dXJuIGc0 eF9hdXhfZGF0YV9yZWcoZGV2X3ByaXYsIHBvcnQsIGluZGV4KTsKKwkJcmV0dXJuIGc0eF9hdXhf ZGF0YV9yZWcoZGV2X3ByaXYsIGF1eF9jaCwgaW5kZXgpOwogfQogCiBzdGF0aWMgdm9pZCBpbnRl bF9hdXhfcmVnX2luaXQoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIHsKIAlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGludGVsX2RwX3RvX2RldihpbnRlbF9k cCkpOwotCWVudW0gcG9ydCBwb3J0ID0gaW50ZWxfYXV4X3BvcnQoZGV2X3ByaXYsCi0JCQkJCWRw X3RvX2RpZ19wb3J0KGludGVsX2RwKS0+YmFzZS5wb3J0KTsKKwllbnVtIGF1eF9jaCBhdXhfY2gg PSBpbnRlbF9kcC0+YXV4X2NoOwogCWludCBpOwogCi0JaW50ZWxfZHAtPmF1eF9jaF9jdGxfcmVn ID0gaW50ZWxfYXV4X2N0bF9yZWcoZGV2X3ByaXYsIHBvcnQpOworCWludGVsX2RwLT5hdXhfY2hf Y3RsX3JlZyA9IGludGVsX2F1eF9jdGxfcmVnKGRldl9wcml2LCBhdXhfY2gpOwogCWZvciAoaSA9 IDA7IGkgPCBBUlJBWV9TSVpFKGludGVsX2RwLT5hdXhfY2hfZGF0YV9yZWcpOyBpKyspCi0JCWlu dGVsX2RwLT5hdXhfY2hfZGF0YV9yZWdbaV0gPSBpbnRlbF9hdXhfZGF0YV9yZWcoZGV2X3ByaXYs IHBvcnQsIGkpOworCQlpbnRlbF9kcC0+YXV4X2NoX2RhdGFfcmVnW2ldID0gaW50ZWxfYXV4X2Rh dGFfcmVnKGRldl9wcml2LCBhdXhfY2gsIGkpOwogfQogCiBzdGF0aWMgdm9pZApAQCAtMTUwNywx NCArMTUzMCwxNyBAQCBpbnRlbF9kcF9hdXhfZmluaShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2Rw KQogc3RhdGljIHZvaWQKIGludGVsX2RwX2F1eF9pbml0KHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxf ZHApCiB7Ci0Jc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQgPSBkcF90 b19kaWdfcG9ydChpbnRlbF9kcCk7Ci0JZW51bSBwb3J0IHBvcnQgPSBpbnRlbF9kaWdfcG9ydC0+ YmFzZS5wb3J0OworCXN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyID0gJmRwX3RvX2RpZ19w b3J0KGludGVsX2RwKS0+YmFzZTsKKworCWludGVsX2RwLT5hdXhfY2ggPSBpbnRlbF9hdXhfY2go aW50ZWxfZHApOworCWludGVsX2RwLT5hdXhfcG93ZXJfZG9tYWluID0gaW50ZWxfYXV4X3Bvd2Vy X2RvbWFpbihpbnRlbF9kcCk7CiAKIAlpbnRlbF9hdXhfcmVnX2luaXQoaW50ZWxfZHApOwogCWRy bV9kcF9hdXhfaW5pdCgmaW50ZWxfZHAtPmF1eCk7CiAKIAkvKiBGYWlsdXJlIHRvIGFsbG9jYXRl IG91ciBwcmVmZXJyZWQgbmFtZSBpcyBub3QgY3JpdGljYWwgKi8KLQlpbnRlbF9kcC0+YXV4Lm5h bWUgPSBrYXNwcmludGYoR0ZQX0tFUk5FTCwgIkRQRERDLSVjIiwgcG9ydF9uYW1lKHBvcnQpKTsK KwlpbnRlbF9kcC0+YXV4Lm5hbWUgPSBrYXNwcmludGYoR0ZQX0tFUk5FTCwgIkRQRERDLSVjIiwK KwkJCQkgICAgICAgcG9ydF9uYW1lKGVuY29kZXItPnBvcnQpKTsKIAlpbnRlbF9kcC0+YXV4LnRy YW5zZmVyID0gaW50ZWxfZHBfYXV4X3RyYW5zZmVyOwogfQogCkBAIC02MjY2LDM4ICs2MjkyLDYg QEAgc3RhdGljIGJvb2wgaW50ZWxfZWRwX2luaXRfY29ubmVjdG9yKHN0cnVjdCBpbnRlbF9kcCAq aW50ZWxfZHAsCiAJcmV0dXJuIGZhbHNlOwogfQogCi0vKiBTZXQgdXAgdGhlIGhvdHBsdWcgcGlu IGFuZCBhdXggcG93ZXIgZG9tYWluLiAqLwotc3RhdGljIHZvaWQKLWludGVsX2RwX2luaXRfY29u bmVjdG9yX3BvcnRfaW5mbyhzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9y dCkKLXsKLQlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciA9ICZpbnRlbF9kaWdfcG9ydC0+ YmFzZTsKLQlzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwID0gJmludGVsX2RpZ19wb3J0LT5kcDsK LQlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlciA9ICZpbnRlbF9kaWdfcG9ydC0+ YmFzZTsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGludGVs X2VuY29kZXItPmJhc2UuZGV2KTsKLQotCWVuY29kZXItPmhwZF9waW4gPSBpbnRlbF9ocGRfcGlu X2RlZmF1bHQoZGV2X3ByaXYsIGVuY29kZXItPnBvcnQpOwotCi0Jc3dpdGNoIChpbnRlbF9hdXhf cG9ydChkZXZfcHJpdiwgZW5jb2Rlci0+cG9ydCkpIHsKLQljYXNlIFBPUlRfQToKLQkJaW50ZWxf ZHAtPmF1eF9wb3dlcl9kb21haW4gPSBQT1dFUl9ET01BSU5fQVVYX0E7Ci0JCWJyZWFrOwotCWNh c2UgUE9SVF9COgotCQlpbnRlbF9kcC0+YXV4X3Bvd2VyX2RvbWFpbiA9IFBPV0VSX0RPTUFJTl9B VVhfQjsKLQkJYnJlYWs7Ci0JY2FzZSBQT1JUX0M6Ci0JCWludGVsX2RwLT5hdXhfcG93ZXJfZG9t YWluID0gUE9XRVJfRE9NQUlOX0FVWF9DOwotCQlicmVhazsKLQljYXNlIFBPUlRfRDoKLQkJaW50 ZWxfZHAtPmF1eF9wb3dlcl9kb21haW4gPSBQT1dFUl9ET01BSU5fQVVYX0Q7Ci0JCWJyZWFrOwot CWNhc2UgUE9SVF9GOgotCQlpbnRlbF9kcC0+YXV4X3Bvd2VyX2RvbWFpbiA9IFBPV0VSX0RPTUFJ Tl9BVVhfRjsKLQkJYnJlYWs7Ci0JZGVmYXVsdDoKLQkJTUlTU0lOR19DQVNFKGVuY29kZXItPnBv cnQpOwotCX0KLX0KLQogc3RhdGljIHZvaWQgaW50ZWxfZHBfbW9kZXNldF9yZXRyeV93b3JrX2Zu KHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIHsKIAlzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICpp bnRlbF9jb25uZWN0b3I7CkBAIC02NDAzLDcgKzYzOTcsNyBAQCBpbnRlbF9kcF9pbml0X2Nvbm5l Y3RvcihzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCwKIAkJY29ubmVj dG9yLT5pbnRlcmxhY2VfYWxsb3dlZCA9IHRydWU7CiAJY29ubmVjdG9yLT5kb3VibGVzY2FuX2Fs bG93ZWQgPSAwOwogCi0JaW50ZWxfZHBfaW5pdF9jb25uZWN0b3JfcG9ydF9pbmZvKGludGVsX2Rp Z19wb3J0KTsKKwlpbnRlbF9lbmNvZGVyLT5ocGRfcGluID0gaW50ZWxfaHBkX3Bpbl9kZWZhdWx0 KGRldl9wcml2LCBwb3J0KTsKIAogCWludGVsX2RwX2F1eF9pbml0KGludGVsX2RwKTsKIApkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCAxNTM1YmZiN2VhNDAuLjE5MDhiYmNjNTg1YSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTEwNTMsNiArMTA1Myw3IEBAIHN0cnVjdCBpbnRl bF9kcCB7CiAJYm9vbCBkZXRlY3RfZG9uZTsKIAlib29sIGNoYW5uZWxfZXFfc3RhdHVzOwogCWJv b2wgcmVzZXRfbGlua19wYXJhbXM7CisJZW51bSBhdXhfY2ggYXV4X2NoOwogCXVpbnQ4X3QgZHBj ZFtEUF9SRUNFSVZFUl9DQVBfU0laRV07CiAJdWludDhfdCBwc3JfZHBjZFtFRFBfUFNSX1JFQ0VJ VkVSX0NBUF9TSVpFXTsKIAl1aW50OF90IGRvd25zdHJlYW1fcG9ydHNbRFBfTUFYX0RPV05TVFJF QU1fUE9SVFNdOwotLSAKMi4xMy42CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK