Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE7CFC43603 for ; Tue, 10 Dec 2019 14:41:27 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BC84120637 for ; Tue, 10 Dec 2019 14:41:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BC84120637 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6269C6E8EC; Tue, 10 Dec 2019 14:41:27 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 75F1D6E8EC for ; Tue, 10 Dec 2019 14:41:25 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Dec 2019 06:41:19 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,300,1571727600"; d="scan'208";a="295908727" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by orsmga001.jf.intel.com with SMTP; 10 Dec 2019 06:41:17 -0800 Received: by stinkbox (sSMTP sendmail emulation); Tue, 10 Dec 2019 16:41:16 +0200 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Date: Tue, 10 Dec 2019 16:41:04 +0200 Message-Id: <20191210144105.3239-4-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191210144105.3239-1-ville.syrjala@linux.intel.com> References: <20191210144105.3239-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v2 3/4] drm/i915: Move linetime wms into the crtc state X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClRo ZSBsaW5ldGltZSB3YXRlcm1hcmtzIHJlYWxseSBoYXZlIHZlcnkgbGl0dGxlIGluIGNvbW1vbiB3 aXRoIHRoZQpwbGFuZSB3YXRlcm1hcmtzLiBJdCBsb29rcyB0byBiZSBjbGVhbmVyIHRvIHNpbXBs eSB0cmFjayB0aGVtIGluCnRoZSBjcnRjX3N0YXRlIGFuZCBwcm9ncmFtIHRoZW0gZnJvbSB0aGUg bm9ybWFsIG1vZGVzZXQvZmFzdHNldApwYXRocy4KClRoZSBvbmx5IGRhcmsgY2xvdWQgY29tZXMg ZnJvbSB0aGUgZmFjdCB0aGF0IHRoZSByZWdpc3RlciBpcwpzdGlsbCBzdXBwb3NlZGx5IHNpbmds ZSBidWZmZXJlZC4gU28gaW4gdGhlb3J5IGl0IG1pZ2h0IHN0aWxsCm5lZWQgc29tZSBmb3JtIG9m IHR3byBzdGFnZSBwcm9ncmFtbWluZy4gTm90ZSB0aGF0IGV2ZW4gdGhvdWdoCkhTVy9CRFdoYXZl IHR3byBzdGFnZSBwcm9ncmFtbWluZyB3ZSBuZXZlciBjb21wdXRlZCBhbnkgc3BlY2lhbAppbnRl cm1lZGlhdGUgdmFsdWVzIGZvciB0aGUgbGluZXRpbWUgd2F0ZXJtYXJrcywgYW5kIG9uIFNLTCsK d2UgZG9uJ3QgZXZlbiBoYXZlIHRoZSB0d28gc3RhZ2Ugc3R1ZmYgcGx1Z2dlZCBpbiBzaW5jZSBl dmVyeXRoaW5nCmVsc2UgaXMgZG91YmxlIGJ1ZmZlcmVkLiBTbyBsZXQncyBhc3N1bWUgaXQncyBh bGwgZmluZSBhbmQKY29udGludWUgZG9pbmcgd2hhdCB3ZSd2ZSBiZWVuIGRvaW5nLgoKQWN0dWFs bHkgb24gSFNXL0JEVyB0aGUgdmFsdWUgc2hvdWxkIG5vdCBldmVuIGNoYW5nZSB3aXRob3V0CmEg ZnVsbCBtb2Rlc2V0IHNpbmNlIGl0IGRvZXNuJ3QgYWNjb3VudCBmb3IgcGZpdCBkb3duc2NhbGlu Zy4KVGh1cyBvbmx5IGZhc3Rib290IG1pZ2h0IGJlIGFmZmVjdGVkLiBCdXQgb24gU0tMKyB0aGUg cGZpdApzY2FsaW5nIGZhY3RvciBpcyB0YWtlIGludG8gY29uc2lkZXJhdGlvbiBzbyB0aGUgdmFs dWUgbWF5CmNoYW5nZSBkdXJpbmcgYW55IGZhc3RzZXQuCgpBcyBhIGJvbnVzIHdlJ2xsIHBsdWcg dGhpcyB0aGluZyBpbnRvIHRoZSBzdGF0ZQpjaGVja2VyL2R1bXAgbm93LgoKdjI6IFJlYmFzZSBk dWUgdG8gYmlnam9pbmVyIHByZXAKCkNjOiBTdGFuaXNsYXYgTGlzb3Zza2l5IDxzdGFuaXNsYXYu bGlzb3Zza2l5QGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxs ZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNw bGF5L2ludGVsX2Rpc3BsYXkuYyAgfCAgOTQgKysrKysrKysrKysrKy0KIC4uLi9kcm0vaTkxNS9k aXNwbGF5L2ludGVsX2Rpc3BsYXlfdHlwZXMuaCAgICB8ICAgNyArLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaCAgICAgICAgICAgICAgIHwgICAxIC0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3BtLmMgICAgICAgICAgICAgICB8IDExOCArLS0tLS0tLS0tLS0tLS0tLS0KIDQg ZmlsZXMgY2hhbmdlZCwgOTcgaW5zZXJ0aW9ucygrKSwgMTIzIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggYzE5NDA5NTRl MzA0Li45MjA1YjViYzFjYzIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3Bs YXkvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50 ZWxfZGlzcGxheS5jCkBAIC02NTQ5LDYgKzY1NDksMTYgQEAgc3RhdGljIHZvaWQgaWNsX3BpcGVf bWJ1c19lbmFibGUoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJSTkxNV9XUklURShQSVBFX01C VVNfREJPWF9DVEwocGlwZSksIHZhbCk7CiB9CiAKK3N0YXRpYyB2b2lkIGhzd19zZXRfbGluZXRp bWVfd20oY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCit7CisJc3Ry dWN0IGludGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKGNydGNfc3RhdGUtPnVhcGkuY3J0 Yyk7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5i YXNlLmRldik7CisKKwlJOTE1X1dSSVRFKFdNX0xJTkVUSU1FKGNydGMtPnBpcGUpLAorCQkgICBI U1dfTElORVRJTUUoY3J0Y19zdGF0ZS0+bGluZXRpbWUpIHwKKwkJICAgSFNXX0lQU19MSU5FVElN RShjcnRjX3N0YXRlLT5pcHNfbGluZXRpbWUpKTsKK30KKwogc3RhdGljIHZvaWQgaHN3X3NldF9m cmFtZV9zdGFydF9kZWxheShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0 ZSkKIHsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Y19zdGF0 ZS0+dWFwaS5jcnRjKTsKQEAgLTY2MzMsNiArNjY0Myw4IEBAIHN0YXRpYyB2b2lkIGhhc3dlbGxf Y3J0Y19lbmFibGUoc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJaWYgKElOVEVM X0dFTihkZXZfcHJpdikgPCA5KQogCQlpbnRlbF9kaXNhYmxlX3ByaW1hcnlfcGxhbmUobmV3X2Ny dGNfc3RhdGUpOwogCisJaHN3X3NldF9saW5ldGltZV93bShuZXdfY3J0Y19zdGF0ZSk7CisKIAlp ZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSAxMSkKIAkJaWNsX3NldF9waXBlX2NoaWNrZW4oY3J0 Yyk7CiAKQEAgLTEwNjMwLDYgKzEwNjQyLDcgQEAgc3RhdGljIGJvb2wgaGFzd2VsbF9nZXRfcGlw ZV9jb25maWcoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJZW51bSBpbnRlbF9kaXNwbGF5X3Bv d2VyX2RvbWFpbiBwb3dlcl9kb21haW47CiAJdTY0IHBvd2VyX2RvbWFpbl9tYXNrOwogCWJvb2wg YWN0aXZlOworCXUzMiB0bXA7CiAKIAlpbnRlbF9jcnRjX2luaXRfc2NhbGVycyhjcnRjLCBwaXBl X2NvbmZpZyk7CiAKQEAgLTEwNjk1LDcgKzEwNzA4LDcgQEAgc3RhdGljIGJvb2wgaGFzd2VsbF9n ZXRfcGlwZV9jb25maWcoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJcGlwZV9jb25maWctPmNz Y19tb2RlID0gSTkxNV9SRUFEKFBJUEVfQ1NDX01PREUoY3J0Yy0+cGlwZSkpOwogCiAJaWYgKElO VEVMX0dFTihkZXZfcHJpdikgPj0gOSkgewotCQl1MzIgdG1wID0gSTkxNV9SRUFEKFNLTF9CT1RU T01fQ09MT1IoY3J0Yy0+cGlwZSkpOworCQl0bXAgPSBJOTE1X1JFQUQoU0tMX0JPVFRPTV9DT0xP UihjcnRjLT5waXBlKSk7CiAKIAkJaWYgKHRtcCAmIFNLTF9CT1RUT01fQ09MT1JfR0FNTUFfRU5B QkxFKQogCQkJcGlwZV9jb25maWctPmdhbW1hX2VuYWJsZSA9IHRydWU7CkBAIC0xMDcwOCw2ICsx MDcyMSwxMiBAQCBzdGF0aWMgYm9vbCBoYXN3ZWxsX2dldF9waXBlX2NvbmZpZyhzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YywKIAogCWludGVsX2NvbG9yX2dldF9jb25maWcocGlwZV9jb25maWcpOwog CisJdG1wID0gSTkxNV9SRUFEKFdNX0xJTkVUSU1FKGNydGMtPnBpcGUpKTsKKwlwaXBlX2NvbmZp Zy0+bGluZXRpbWUgPSBSRUdfRklFTERfR0VUKEhTV19MSU5FVElNRV9NQVNLLCB0bXApOworCWlm IChJU19CUk9BRFdFTEwoZGV2X3ByaXYpIHx8IElTX0hBU1dFTEwoZGV2X3ByaXYpKQorCQlwaXBl X2NvbmZpZy0+aXBzX2xpbmV0aW1lID0KKwkJCVJFR19GSUVMRF9HRVQoSFNXX0lQU19MSU5FVElN RV9NQVNLLCB0bXApOworCiAJcG93ZXJfZG9tYWluID0gUE9XRVJfRE9NQUlOX1BJUEVfUEFORUxf RklUVEVSKGNydGMtPnBpcGUpOwogCVdBUk5fT04ocG93ZXJfZG9tYWluX21hc2sgJiBCSVRfVUxM KHBvd2VyX2RvbWFpbikpOwogCkBAIC0xMjEzMyw2ICsxMjE1Miw1MyBAQCBzdGF0aWMgaW50IGlj bF9hZGRfc3luY19tb2RlX2NydGNzKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRl KQogCXJldHVybiAwOwogfQogCitzdGF0aWMgdTE2IGhzd19saW5ldGltZV93bShjb25zdCBzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKK3sKKwljb25zdCBzdHJ1Y3QgZHJtX2Rp c3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9kZSA9CisJCSZjcnRjX3N0YXRlLT5ody5hZGp1c3RlZF9t b2RlOworCisJaWYgKCFjcnRjX3N0YXRlLT5ody5lbmFibGUpCisJCXJldHVybiAwOworCisJcmV0 dXJuIERJVl9ST1VORF9DTE9TRVNUKGFkanVzdGVkX21vZGUtPmNydGNfaHRvdGFsICogMTAwMCAq IDgsCisJCQkJIGFkanVzdGVkX21vZGUtPmNydGNfY2xvY2spOworfQorCitzdGF0aWMgdTE2IGhz d19pcHNfbGluZXRpbWVfd20oY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3Rh dGUpCit7CisJY29uc3Qgc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUgPQorCQl0b19p bnRlbF9hdG9taWNfc3RhdGUoY3J0Y19zdGF0ZS0+dWFwaS5zdGF0ZSk7CisJY29uc3Qgc3RydWN0 IGRybV9kaXNwbGF5X21vZGUgKmFkanVzdGVkX21vZGUgPQorCQkmY3J0Y19zdGF0ZS0+aHcuYWRq dXN0ZWRfbW9kZTsKKworCWlmICghY3J0Y19zdGF0ZS0+aHcuZW5hYmxlKQorCQlyZXR1cm4gMDsK KworCXJldHVybiBESVZfUk9VTkRfQ0xPU0VTVChhZGp1c3RlZF9tb2RlLT5jcnRjX2h0b3RhbCAq IDEwMDAgKiA4LAorCQkJCSBzdGF0ZS0+Y2RjbGsubG9naWNhbC5jZGNsayk7Cit9CisKK3N0YXRp YyB1MTYgc2tsX2xpbmV0aW1lX3dtKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRj X3N0YXRlKQoreworCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0gdG9faW50ZWxfY3J0YyhjcnRj X3N0YXRlLT51YXBpLmNydGMpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOworCWNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2Rl ICphZGp1c3RlZF9tb2RlID0KKwkJJmNydGNfc3RhdGUtPmh3LmFkanVzdGVkX21vZGU7CisJdTE2 IGxpbmV0aW1lX3dtOworCisJaWYgKCFjcnRjX3N0YXRlLT5ody5lbmFibGUpCisJCXJldHVybiAw OworCisJbGluZXRpbWVfd20gPSBESVZfUk9VTkRfVVAoYWRqdXN0ZWRfbW9kZS0+Y3J0Y19odG90 YWwgKiAxMDAwICogOCwKKwkJCQkgICBjcnRjX3N0YXRlLT5waXhlbF9yYXRlKTsKKworCS8qIERp c3BsYXkgV0EgIzExMzU6IEJYVDpBTEwgR0xLOkFMTCAqLworCWlmIChJU19HRU45X0xQKGRldl9w cml2KSAmJiBkZXZfcHJpdi0+aXBjX2VuYWJsZWQpCisJCWxpbmV0aW1lX3dtIC89IDI7CisKKwly ZXR1cm4gbGluZXRpbWVfd207Cit9CisKIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19hdG9taWNfY2hl Y2soc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJCQkJICAgc3RydWN0IGludGVs X2NydGMgKmNydGMpCiB7CkBAIC0xMjIwNCw2ICsxMjI3MCwxMyBAQCBzdGF0aWMgaW50IGludGVs X2NydGNfYXRvbWljX2NoZWNrKHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlLAogCWlm IChIQVNfSVBTKGRldl9wcml2KSkKIAkJY3J0Y19zdGF0ZS0+aXBzX2VuYWJsZWQgPSBoc3dfY29t cHV0ZV9pcHNfY29uZmlnKGNydGNfc3RhdGUpOwogCisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikg Pj0gOSkgeworCQljcnRjX3N0YXRlLT5saW5ldGltZSA9IHNrbF9saW5ldGltZV93bShjcnRjX3N0 YXRlKTsKKwl9IGVsc2UgaWYgKElTX0JST0FEV0VMTChkZXZfcHJpdikgfHwgSVNfSEFTV0VMTChk ZXZfcHJpdikpIHsKKwkJY3J0Y19zdGF0ZS0+bGluZXRpbWUgPSBoc3dfbGluZXRpbWVfd20oY3J0 Y19zdGF0ZSk7CisJCWNydGNfc3RhdGUtPmlwc19saW5ldGltZSA9IGhzd19pcHNfbGluZXRpbWVf d20oY3J0Y19zdGF0ZSk7CisJfQorCiAJcmV0dXJuIHJldDsKIH0KIApAQCAtMTI0OTMsNiArMTI1 NjYsOSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kdW1wX3BpcGVfY29uZmlnKGNvbnN0IHN0cnVjdCBp bnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZywKIAkJICAgICAgcGlwZV9jb25maWctPnBpcGVf c3JjX3csIHBpcGVfY29uZmlnLT5waXBlX3NyY19oLAogCQkgICAgICBwaXBlX2NvbmZpZy0+cGl4 ZWxfcmF0ZSk7CiAKKwlEUk1fREVCVUdfS01TKCJsaW5ldGltZTogJWQsIGlwcyBsaW5ldGltZTog JWRcbiIsCisJCSAgICAgIHBpcGVfY29uZmlnLT5saW5ldGltZSwgcGlwZV9jb25maWctPmlwc19s aW5ldGltZSk7CisKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5KQogCQlEUk1fREVCVUdf S01TKCJudW1fc2NhbGVyczogJWQsIHNjYWxlcl91c2VyczogMHgleCwgc2NhbGVyX2lkOiAlZFxu IiwKIAkJCSAgICAgIGNydGMtPm51bV9zY2FsZXJzLApAQCAtMTMyMzksMTAgKzEzMzE1LDEyIEBA IGludGVsX3BpcGVfY29uZmlnX2NvbXBhcmUoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmN1cnJlbnRfY29uZmlnLAogCQlQSVBFX0NPTkZfQ0hFQ0tfQk9PTChnYW1tYV9lbmFibGUpOwog CQlQSVBFX0NPTkZfQ0hFQ0tfQk9PTChjc2NfZW5hYmxlKTsKIAorCQlQSVBFX0NPTkZfQ0hFQ0tf SShsaW5ldGltZSk7CisJCVBJUEVfQ09ORl9DSEVDS19JKGlwc19saW5ldGltZSk7CisKIAkJYnBf Z2FtbWEgPSBpbnRlbF9jb2xvcl9nZXRfZ2FtbWFfYml0X3ByZWNpc2lvbihwaXBlX2NvbmZpZyk7 CiAJCWlmIChicF9nYW1tYSkKIAkJCVBJUEVfQ09ORl9DSEVDS19DT0xPUl9MVVQoZ2FtbWFfbW9k ZSwgaHcuZ2FtbWFfbHV0LCBicF9nYW1tYSk7Ci0KIAl9CiAKIAlQSVBFX0NPTkZfQ0hFQ0tfQk9P TChkb3VibGVfd2lkZSk7CkBAIC0xNDI1MCw2ICsxNDMyOCwxOCBAQCBzdGF0aWMgdm9pZCBpbnRl bF9waXBlX2Zhc3RzZXQoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0 YXRlLAogCQkJaXJvbmxha2VfcGZpdF9kaXNhYmxlKG9sZF9jcnRjX3N0YXRlKTsKIAl9CiAKKwkv KgorCSAqIFRoZSByZWdpc3RlciBpcyBzdXBwb3NlZGx5IHNpbmdsZSBidWZmZXJlZCBzbyBwZXJo YXBzCisJICogbm90IDEwMCUgY29ycmVjdCB0byBkbyB0aGlzIGhlcmUuIEJ1dCBTS0wrIGNhbGN1 bGF0ZQorCSAqIHRoaXMgYmFzZWQgb24gdGhlIGFkanVzdCBwaXhlbCByYXRlIHNvIHBmaXQgY2hh bmdlcyBkbworCSAqIGFmZmVjdCBpdCBhbmQgc28gaXQgbXVzdCBiZSB1cGRhdGVkIGZvciBmYXN0 c2V0cy4KKwkgKiBIU1cvQkRXIG9ubHkgcmVhbGx5IG5lZWQgdGhpcyBoZXJlIGZvciBmYXN0Ym9v dCwgYWZ0ZXIKKwkgKiB0aGF0IHRoZSB2YWx1ZSBzaG91bGQgbm90IGNoYW5nZSB3aXRob3V0IGEg ZnVsbCBtb2Rlc2V0LgorCSAqLworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkgfHwKKwkg ICAgSVNfQlJPQURXRUxMKGRldl9wcml2KSB8fCBJU19IQVNXRUxMKGRldl9wcml2KSkKKwkJaHN3 X3NldF9saW5ldGltZV93bShuZXdfY3J0Y19zdGF0ZSk7CisKIAlpZiAoSU5URUxfR0VOKGRldl9w cml2KSA+PSAxMSkKIAkJaWNsX3NldF9waXBlX2NoaWNrZW4oY3J0Yyk7CiB9CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXlfdHlwZXMuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheV90eXBlcy5oCmluZGV4IGY3 N2Y0N2VmYjhiNi4uMWI1YmQ1NThlNjVkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9kaXNwbGF5L2ludGVsX2Rpc3BsYXlfdHlwZXMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9kaXNwbGF5L2ludGVsX2Rpc3BsYXlfdHlwZXMuaApAQCAtNjU5LDggKzY1OSw2IEBAIHN0cnVj dCBpbnRlbF9jcnRjX3NjYWxlcl9zdGF0ZSB7CiAKIHN0cnVjdCBpbnRlbF9waXBlX3dtIHsKIAlz dHJ1Y3QgaW50ZWxfd21fbGV2ZWwgd21bNV07Ci0JdTE2IGxpbmV0aW1lOwotCXUxNiBpcHNfbGlu ZXRpbWU7CiAJYm9vbCBmYmNfd21fZW5hYmxlZDsKIAlib29sIHBpcGVfZW5hYmxlZDsKIAlib29s IHNwcml0ZXNfZW5hYmxlZDsKQEAgLTY3Niw3ICs2NzQsNiBAQCBzdHJ1Y3Qgc2tsX3BsYW5lX3dt IHsKIAogc3RydWN0IHNrbF9waXBlX3dtIHsKIAlzdHJ1Y3Qgc2tsX3BsYW5lX3dtIHBsYW5lc1tJ OTE1X01BWF9QTEFORVNdOwotCXUzMiBsaW5ldGltZTsKIH07CiAKIGVudW0gdmx2X3dtX2xldmVs IHsKQEAgLTEwNDcsNiArMTA0NCwxMCBAQCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSB7CiAJCXN0 cnVjdCBkcm1fZHNjX2NvbmZpZyBjb25maWc7CiAJfSBkc2M7CiAKKwkvKiBIU1crIGxpbmV0aW1l IHdhdGVybWFya3MgKi8KKwl1MTYgbGluZXRpbWU7CisJdTE2IGlwc19saW5ldGltZTsKKwogCS8q IEZvcndhcmQgRXJyb3IgY29ycmVjdGlvbiBTdGF0ZSAqLwogCWJvb2wgZmVjX2VuYWJsZTsKIApk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggY2UxMzBlMWYxZTQ3Li5kYjE1YThmNDg0N2YgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtNzQzLDcgKzc0Myw2IEBAIHN0cnVjdCBpbGtfd21f dmFsdWVzIHsKIAl1MzIgd21fcGlwZVszXTsKIAl1MzIgd21fbHBbM107CiAJdTMyIHdtX2xwX3Nw clszXTsKLQl1MzIgd21fbGluZXRpbWVbM107CiAJYm9vbCBlbmFibGVfZmJjX3dtOwogCWVudW0g aW50ZWxfZGRiX3BhcnRpdGlvbmluZyBwYXJ0aXRpb25pbmc7CiB9OwpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMKaW5kZXggYjllYjBhODliZTkzLi4wN2U5NTQ0MGI0MGQgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcG0uYwpAQCAtMjc4NywzNCArMjc4Nyw2IEBAIHN0YXRpYyB2b2lkIGlsa19jb21wdXRlX3dt X2xldmVsKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlyZXN1bHQt PmVuYWJsZSA9IHRydWU7CiB9CiAKLXN0YXRpYyB1MzIKLWhzd19saW5ldGltZV93bShjb25zdCBz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKLXsKLQljb25zdCBzdHJ1Y3QgZHJt X2Rpc3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9kZSA9Ci0JCSZjcnRjX3N0YXRlLT5ody5hZGp1c3Rl ZF9tb2RlOwotCi0JaWYgKCFjcnRjX3N0YXRlLT5ody5hY3RpdmUpCi0JCXJldHVybiAwOwotCi0J cmV0dXJuIERJVl9ST1VORF9DTE9TRVNUKGFkanVzdGVkX21vZGUtPmNydGNfaHRvdGFsICogMTAw MCAqIDgsCi0JCQkJIGFkanVzdGVkX21vZGUtPmNydGNfY2xvY2spOwotfQotCi1zdGF0aWMgdTMy Ci1oc3dfaXBzX2xpbmV0aW1lX3dtKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRj X3N0YXRlKQotewotCWNvbnN0IHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlID0KLQkJ dG9faW50ZWxfYXRvbWljX3N0YXRlKGNydGNfc3RhdGUtPnVhcGkuc3RhdGUpOwotCWNvbnN0IHN0 cnVjdCBkcm1fZGlzcGxheV9tb2RlICphZGp1c3RlZF9tb2RlID0KLQkJJmNydGNfc3RhdGUtPmh3 LmFkanVzdGVkX21vZGU7Ci0KLQlpZiAoIWNydGNfc3RhdGUtPmh3LmFjdGl2ZSkKLQkJcmV0dXJu IDA7Ci0KLQlyZXR1cm4gRElWX1JPVU5EX0NMT1NFU1QoYWRqdXN0ZWRfbW9kZS0+Y3J0Y19odG90 YWwgKiAxMDAwICogOCwKLQkJCQkgc3RhdGUtPmNkY2xrLmxvZ2ljYWwuY2RjbGspOwotfQotCiBz dGF0aWMgdm9pZCBpbnRlbF9yZWFkX3dtX2xhdGVuY3koc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LAogCQkJCSAgdTE2IHdtWzhdKQogewpAQCAtMzE1MCwxMSArMzEyMiw2IEBAIHN0 YXRpYyBpbnQgaWxrX2NvbXB1dGVfcGlwZV93bShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0 Y19zdGF0ZSkKIAlpbGtfY29tcHV0ZV93bV9sZXZlbChkZXZfcHJpdiwgaW50ZWxfY3J0YywgMCwg Y3J0Y19zdGF0ZSwKIAkJCSAgICAgcHJpc3RhdGUsIHNwcnN0YXRlLCBjdXJzdGF0ZSwgJnBpcGVf d20tPndtWzBdKTsKIAotCWlmIChJU19IQVNXRUxMKGRldl9wcml2KSB8fCBJU19CUk9BRFdFTEwo ZGV2X3ByaXYpKSB7Ci0JCXBpcGVfd20tPmxpbmV0aW1lID0gaHN3X2xpbmV0aW1lX3dtKGNydGNf c3RhdGUpOwotCQlwaXBlX3dtLT5pcHNfbGluZXRpbWUgPSBoc3dfaXBzX2xpbmV0aW1lX3dtKGNy dGNfc3RhdGUpOwotCX0KLQogCWlmICghaWxrX3ZhbGlkYXRlX3BpcGVfd20oZGV2X3ByaXYsIHBp cGVfd20pKQogCQlyZXR1cm4gLUVJTlZBTDsKIApAQCAtMzQwNiwxMCArMzM3Myw2IEBAIHN0YXRp YyB2b2lkIGlsa19jb21wdXRlX3dtX3Jlc3VsdHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2LAogCQlpZiAoV0FSTl9PTighci0+ZW5hYmxlKSkKIAkJCWNvbnRpbnVlOwogCi0JCXJl c3VsdHMtPndtX2xpbmV0aW1lW3BpcGVdID0KLQkJCUhTV19MSU5FVElNRShwaXBlX3dtLT5saW5l dGltZSkgfAotCQkJSFNXX0lQU19MSU5FVElNRShwaXBlX3dtLT5pcHNfbGluZXRpbWUpOwotCiAJ CXJlc3VsdHMtPndtX3BpcGVbcGlwZV0gPQogCQkJKHItPnByaV92YWwgPDwgV00wX1BJUEVfUExB TkVfU0hJRlQpIHwKIAkJCShyLT5zcHJfdmFsIDw8IFdNMF9QSVBFX1NQUklURV9TSElGVCkgfApA QCAtMzQ0OCw3ICszNDExLDYgQEAgaWxrX2ZpbmRfYmVzdF9yZXN1bHQoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAogCiAvKiBkaXJ0eSBiaXRzIHVzZWQgdG8gdHJhY2sgd2hpY2gg d2F0ZXJtYXJrcyBuZWVkIGNoYW5nZXMgKi8KICNkZWZpbmUgV01fRElSVFlfUElQRShwaXBlKSAo MSA8PCAocGlwZSkpCi0jZGVmaW5lIFdNX0RJUlRZX0xJTkVUSU1FKHBpcGUpICgxIDw8ICg4ICsg KHBpcGUpKSkKICNkZWZpbmUgV01fRElSVFlfTFAod21fbHApICgxIDw8ICgxNSArICh3bV9scCkp KQogI2RlZmluZSBXTV9ESVJUWV9MUF9BTEwgKFdNX0RJUlRZX0xQKDEpIHwgV01fRElSVFlfTFAo MikgfCBXTV9ESVJUWV9MUCgzKSkKICNkZWZpbmUgV01fRElSVFlfRkJDICgxIDw8IDI0KQpAQCAt MzQ2MywxMiArMzQyNSw2IEBAIHN0YXRpYyB1bnNpZ25lZCBpbnQgaWxrX2NvbXB1dGVfd21fZGly dHkoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCWludCB3bV9scDsKIAogCWZv cl9lYWNoX3BpcGUoZGV2X3ByaXYsIHBpcGUpIHsKLQkJaWYgKG9sZC0+d21fbGluZXRpbWVbcGlw ZV0gIT0gbmV3LT53bV9saW5ldGltZVtwaXBlXSkgewotCQkJZGlydHkgfD0gV01fRElSVFlfTElO RVRJTUUocGlwZSk7Ci0JCQkvKiBNdXN0IGRpc2FibGUgTFAxKyB3YXRlcm1hcmtzIHRvbyAqLwot CQkJZGlydHkgfD0gV01fRElSVFlfTFBfQUxMOwotCQl9Ci0KIAkJaWYgKG9sZC0+d21fcGlwZVtw aXBlXSAhPSBuZXctPndtX3BpcGVbcGlwZV0pIHsKIAkJCWRpcnR5IHw9IFdNX0RJUlRZX1BJUEUo cGlwZSk7CiAJCQkvKiBNdXN0IGRpc2FibGUgTFAxKyB3YXRlcm1hcmtzIHRvbyAqLwpAQCAtMzU2 MCwxMyArMzUxNiw2IEBAIHN0YXRpYyB2b2lkIGlsa193cml0ZV93bV92YWx1ZXMoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCWlmIChkaXJ0eSAmIFdNX0RJUlRZX1BJUEUoUElQ RV9DKSkKIAkJSTkxNV9XUklURShXTTBfUElQRUNfSVZCLCByZXN1bHRzLT53bV9waXBlWzJdKTsK IAotCWlmIChkaXJ0eSAmIFdNX0RJUlRZX0xJTkVUSU1FKFBJUEVfQSkpCi0JCUk5MTVfV1JJVEUo V01fTElORVRJTUUoUElQRV9BKSwgcmVzdWx0cy0+d21fbGluZXRpbWVbMF0pOwotCWlmIChkaXJ0 eSAmIFdNX0RJUlRZX0xJTkVUSU1FKFBJUEVfQikpCi0JCUk5MTVfV1JJVEUoV01fTElORVRJTUUo UElQRV9CKSwgcmVzdWx0cy0+d21fbGluZXRpbWVbMV0pOwotCWlmIChkaXJ0eSAmIFdNX0RJUlRZ X0xJTkVUSU1FKFBJUEVfQykpCi0JCUk5MTVfV1JJVEUoV01fTElORVRJTUUoUElQRV9DKSwgcmVz dWx0cy0+d21fbGluZXRpbWVbMl0pOwotCiAJaWYgKGRpcnR5ICYgV01fRElSVFlfRERCKSB7CiAJ CWlmIChJU19IQVNXRUxMKGRldl9wcml2KSB8fCBJU19CUk9BRFdFTEwoZGV2X3ByaXYpKSB7CiAJ CQl2YWwgPSBJOTE1X1JFQUQoV01fTUlTQyk7CkBAIC00ODE3LDI0ICs0NzY2LDYgQEAgc2tsX2Nv bXB1dGVfd21fbGV2ZWxzKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRl LAogCX0KIH0KIAotc3RhdGljIHUzMgotc2tsX2NvbXB1dGVfbGluZXRpbWVfd20oY29uc3Qgc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCi17Ci0Jc3RydWN0IGRybV9hdG9taWNf c3RhdGUgKnN0YXRlID0gY3J0Y19zdGF0ZS0+dWFwaS5zdGF0ZTsKLQlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KHN0YXRlLT5kZXYpOwotCXVpbnRfZml4ZWRfMTZf MTZfdCBsaW5ldGltZV91czsKLQl1MzIgbGluZXRpbWVfd207Ci0KLQlsaW5ldGltZV91cyA9IGlu dGVsX2dldF9saW5ldGltZV91cyhjcnRjX3N0YXRlKTsKLQlsaW5ldGltZV93bSA9IGZpeGVkMTZf dG9fdTMyX3JvdW5kX3VwKG11bF91MzJfZml4ZWQxNig4LCBsaW5ldGltZV91cykpOwotCi0JLyog RGlzcGxheSBXQSAjMTEzNTogQlhUOkFMTCBHTEs6QUxMICovCi0JaWYgKElTX0dFTjlfTFAoZGV2 X3ByaXYpICYmIGRldl9wcml2LT5pcGNfZW5hYmxlZCkKLQkJbGluZXRpbWVfd20gLz0gMjsKLQot CXJldHVybiBsaW5ldGltZV93bTsKLX0KLQogc3RhdGljIHZvaWQgc2tsX2NvbXB1dGVfdHJhbnNp dGlvbl93bShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJCQkg ICAgICBjb25zdCBzdHJ1Y3Qgc2tsX3dtX3BhcmFtcyAqd3AsCiAJCQkJICAgICAgc3RydWN0IHNr bF9wbGFuZV93bSAqd20pCkBAIC01MDIyLDggKzQ5NTMsNiBAQCBzdGF0aWMgaW50IHNrbF9idWls ZF9waXBlX3dtKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogCQkJcmV0dXJu IHJldDsKIAl9CiAKLQlwaXBlX3dtLT5saW5ldGltZSA9IHNrbF9jb21wdXRlX2xpbmV0aW1lX3dt KGNydGNfc3RhdGUpOwotCiAJcmV0dXJuIDA7CiB9CiAKQEAgLTUxNDgsNyArNTA3Nyw3IEBAIHN0 YXRpYyBib29sIHNrbF9waXBlX3dtX2VxdWFscyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJ CXJldHVybiBmYWxzZTsKIAl9CiAKLQlyZXR1cm4gd20xLT5saW5ldGltZSA9PSB3bTItPmxpbmV0 aW1lOworCXJldHVybiB0cnVlOwogfQogCiBzdGF0aWMgaW5saW5lIGJvb2wgc2tsX2RkYl9lbnRy aWVzX292ZXJsYXAoY29uc3Qgc3RydWN0IHNrbF9kZGJfZW50cnkgKmEsCkBAIC01NTI0LDQwICs1 NDUzLDYgQEAgc2tsX2NvbXB1dGVfd20oc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUp CiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyB2b2lkIHNrbF9hdG9taWNfdXBkYXRlX2NydGNfd20o c3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUsCi0JCQkJICAgICAgc3RydWN0IGludGVs X2NydGMgKmNydGMpCi17Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9f aTkxNShjcnRjLT5iYXNlLmRldik7Ci0JY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNy dGNfc3RhdGUgPQotCQlpbnRlbF9hdG9taWNfZ2V0X25ld19jcnRjX3N0YXRlKHN0YXRlLCBjcnRj KTsKLQljb25zdCBzdHJ1Y3Qgc2tsX3BpcGVfd20gKnBpcGVfd20gPSAmY3J0Y19zdGF0ZS0+d20u c2tsLm9wdGltYWw7Ci0JZW51bSBwaXBlIHBpcGUgPSBjcnRjLT5waXBlOwotCi0JaWYgKChzdGF0 ZS0+d21fcmVzdWx0cy5kaXJ0eV9waXBlcyAmIEJJVChjcnRjLT5waXBlKSkgPT0gMCkKLQkJcmV0 dXJuOwotCi0JSTkxNV9XUklURShXTV9MSU5FVElNRShwaXBlKSwgSFNXX0xJTkVUSU1FKHBpcGVf d20tPmxpbmV0aW1lKSk7Ci19Ci0KLXN0YXRpYyB2b2lkIHNrbF9pbml0aWFsX3dtKHN0cnVjdCBp bnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlLAotCQkJICAgc3RydWN0IGludGVsX2NydGMgKmNydGMp Ci17Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5i YXNlLmRldik7Ci0JY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUgPQot CQlpbnRlbF9hdG9taWNfZ2V0X25ld19jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKLQlzdHJ1Y3Qg c2tsX2RkYl92YWx1ZXMgKnJlc3VsdHMgPSAmc3RhdGUtPndtX3Jlc3VsdHM7Ci0KLQlpZiAoKHJl c3VsdHMtPmRpcnR5X3BpcGVzICYgQklUKGNydGMtPnBpcGUpKSA9PSAwKQotCQlyZXR1cm47Ci0K LQltdXRleF9sb2NrKCZkZXZfcHJpdi0+d20ud21fbXV0ZXgpOwotCi0JaWYgKGNydGNfc3RhdGUt PnVhcGkuYWN0aXZlX2NoYW5nZWQpCi0JCXNrbF9hdG9taWNfdXBkYXRlX2NydGNfd20oc3RhdGUs IGNydGMpOwotCi0JbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+d20ud21fbXV0ZXgpOwotfQotCiBz dGF0aWMgdm9pZCBpbGtfY29tcHV0ZV93bV9jb25maWcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LAogCQkJCSAgc3RydWN0IGludGVsX3dtX2NvbmZpZyAqY29uZmlnKQogewpAQCAt NTY4MCw5ICs1NTc1LDYgQEAgdm9pZCBza2xfcGlwZV93bV9nZXRfaHdfc3RhdGUoc3RydWN0IGlu dGVsX2NydGMgKmNydGMsCiAKIAlpZiAoIWNydGMtPmFjdGl2ZSkKIAkJcmV0dXJuOwotCi0JdmFs ID0gSTkxNV9SRUFEKFdNX0xJTkVUSU1FKHBpcGUpKTsKLQlvdXQtPmxpbmV0aW1lID0gUkVHX0ZJ RUxEX0dFVChIU1dfTElORVRJTUVfTUFTSywgdmFsKTsKIH0KIAogdm9pZCBza2xfd21fZ2V0X2h3 X3N0YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKQEAgLTU3MjMsOCArNTYx NSw2IEBAIHN0YXRpYyB2b2lkIGlsa19waXBlX3dtX2dldF9od19zdGF0ZShzdHJ1Y3QgaW50ZWxf Y3J0YyAqY3J0YykKIAl9OwogCiAJaHctPndtX3BpcGVbcGlwZV0gPSBJOTE1X1JFQUQod20wX3Bp cGVfcmVnW3BpcGVdKTsKLQlpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikgfHwgSVNfQlJPQURXRUxM KGRldl9wcml2KSkKLQkJaHctPndtX2xpbmV0aW1lW3BpcGVdID0gSTkxNV9SRUFEKFdNX0xJTkVU SU1FKHBpcGUpKTsKIAogCW1lbXNldChhY3RpdmUsIDAsIHNpemVvZigqYWN0aXZlKSk7CiAKQEAg LTU3NDMsMTAgKzU2MzMsNiBAQCBzdGF0aWMgdm9pZCBpbGtfcGlwZV93bV9nZXRfaHdfc3RhdGUo c3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJCWFjdGl2ZS0+d21bMF0ucHJpX3ZhbCA9ICh0bXAg JiBXTTBfUElQRV9QTEFORV9NQVNLKSA+PiBXTTBfUElQRV9QTEFORV9TSElGVDsKIAkJYWN0aXZl LT53bVswXS5zcHJfdmFsID0gKHRtcCAmIFdNMF9QSVBFX1NQUklURV9NQVNLKSA+PiBXTTBfUElQ RV9TUFJJVEVfU0hJRlQ7CiAJCWFjdGl2ZS0+d21bMF0uY3VyX3ZhbCA9IHRtcCAmIFdNMF9QSVBF X0NVUlNPUl9NQVNLOwotCQlhY3RpdmUtPmxpbmV0aW1lID0gUkVHX0ZJRUxEX0dFVChIU1dfTElO RVRJTUVfTUFTSywKLQkJCQkJCSBody0+d21fbGluZXRpbWVbcGlwZV0pOwotCQlhY3RpdmUtPmlw c19saW5ldGltZSA9IFJFR19GSUVMRF9HRVQoSFNXX0lQU19MSU5FVElNRV9NQVNLLAotCQkJCQkJ ICAgICBody0+d21fbGluZXRpbWVbcGlwZV0pOwogCX0gZWxzZSB7CiAJCWludCBsZXZlbCwgbWF4 X2xldmVsID0gaWxrX3dtX21heF9sZXZlbChkZXZfcHJpdik7CiAKQEAgLTcxOTcsOCArNzA4Myw2 IEBAIHZvaWQgaW50ZWxfaW5pdF9wbShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CiAJLyogRm9yIEZJRk8gd2F0ZXJtYXJrIHVwZGF0ZXMgKi8KIAlpZiAoSU5URUxfR0VOKGRldl9w cml2KSA+PSA5KSB7CiAJCXNrbF9zZXR1cF93bV9sYXRlbmN5KGRldl9wcml2KTsKLQkJZGV2X3By aXYtPmRpc3BsYXkuaW5pdGlhbF93YXRlcm1hcmtzID0gc2tsX2luaXRpYWxfd207Ci0JCWRldl9w cml2LT5kaXNwbGF5LmF0b21pY191cGRhdGVfd2F0ZXJtYXJrcyA9IHNrbF9hdG9taWNfdXBkYXRl X2NydGNfd207CiAJCWRldl9wcml2LT5kaXNwbGF5LmNvbXB1dGVfZ2xvYmFsX3dhdGVybWFya3Mg PSBza2xfY29tcHV0ZV93bTsKIAl9IGVsc2UgaWYgKEhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpKSB7 CiAJCWlsa19zZXR1cF93bV9sYXRlbmN5KGRldl9wcml2KTsKLS0gCjIuMjMuMAoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==