From: Harry Wentland Subject: [PATCH 12/28] drm/amd/display: PSR Refactor Date: Wed, 3 May 2017 17:13:35 -0400 Message-ID: <20170503211351.3520-13-harry.wentland@amd.com> References: <20170503211351.3520-1-harry.wentland@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170503211351.3520-1-harry.wentland-5C7GfCeVMHo@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Sylvia Tsai RnJvbTogU3lsdmlhIFRzYWkgPHN5bHZpYS50c2FpQGFtZC5jb20+CgotIFJlZmFjb3RyIFBTUiB0 byBmb2xsb3cgY29ycmVjdCBtb2R1bGUgcGF0dGVybgotIGZpeCBlRFAgb25seSB3b3JraW5nIG9u IHNpbmsgaW5kZXggMC4KClNpZ25lZC1vZmYtYnk6IFN5bHZpYSBUc2FpIDxzeWx2aWEudHNhaUBh bWQuY29tPgpBY2tlZC1ieTogSGFycnkgV2VudGxhbmQgPEhhcnJ5LldlbnRsYW5kQGFtZC5jb20+ ClJldmlld2VkLWJ5OiBUb255IENoZW5nIDxUb255LkNoZW5nQGFtZC5jb20+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGMuYyAgICAgICAgICAgfCA3NCArKysrKysr KystLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19s aW5rLmMgICAgICB8IDIyICsrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9j b3JlL2RjX2xpbmtfZHAuYyAgIHwgNTMgKy0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJt L2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNfcmVzb3VyY2UuYyAgfCAgMiArLQogZHJpdmVycy9ncHUv ZHJtL2FtZC9kaXNwbGF5L2RjL2RjLmggICAgICAgICAgICAgICAgfCAxNyArKystLQogZHJpdmVy cy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjX3R5cGVzLmggICAgICAgICAgfCAyNCArKystLS0t CiAuLi4vYW1kL2Rpc3BsYXkvZGMvZGNlMTEwL2RjZTExMF9od19zZXF1ZW5jZXIuYyAgICB8IDE4 ICsrKysrLQogLi4uL2Rpc3BsYXkvZGMvZGNlMTEwL2RjZTExMF90aW1pbmdfZ2VuZXJhdG9yLmMg ICAgfCAxNiAtLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2luYy9jb3JlX3R5 cGVzLmggICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvaW5jL2h3X3Nl cXVlbmNlci5oICB8ICAyICstCiAuLi4vZHJtL2FtZC9kaXNwbGF5L21vZHVsZXMvZnJlZXN5bmMv ZnJlZXN5bmMuYyAgICB8IDE0ICsrKy0KIDExIGZpbGVzIGNoYW5nZWQsIDkzIGluc2VydGlvbnMo KyksIDE1MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rp c3BsYXkvZGMvY29yZS9kYy5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUv ZGMuYwppbmRleCAxZGQ5YzczNmFlZGMuLjkzYzkzNmQ5MmY1YSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2Rpc3BsYXkvZGMvY29yZS9kYy5jCkBAIC0xOTksNiArMTk5LDMyIEBAIHN0YXRpYyBib29s IHNldF9nYW11dF9yZW1hcChzdHJ1Y3QgZGMgKmRjLAogCXJldHVybiByZXQ7CiB9CiAKK3N0YXRp YyB2b2lkIHNldF9zdGF0aWNfc2NyZWVuX2V2ZW50cyhzdHJ1Y3QgZGMgKmRjLAorCQljb25zdCBz dHJ1Y3QgZGNfc3RyZWFtICoqc3RyZWFtLAorCQlpbnQgbnVtX3N0cmVhbXMsCisJCWNvbnN0IHN0 cnVjdCBkY19zdGF0aWNfc2NyZWVuX2V2ZW50cyAqZXZlbnRzKQoreworCXN0cnVjdCBjb3JlX2Rj ICpjb3JlX2RjID0gRENfVE9fQ09SRShkYyk7CisJaW50IGkgPSAwOworCWludCBqID0gMDsKKwlz dHJ1Y3QgcGlwZV9jdHggKnBpcGVzX2FmZmVjdGVkW01BWF9QSVBFU107CisJaW50IG51bV9waXBl c19hZmZlY3RlZCA9IDA7CisKKwlmb3IgKGkgPSAwOyBpIDwgbnVtX3N0cmVhbXM7IGkrKykgewor CQlzdHJ1Y3QgY29yZV9zdHJlYW0gKmNvcmVfc3RyZWFtID0gRENfU1RSRUFNX1RPX0NPUkUoc3Ry ZWFtW2ldKTsKKworCQlmb3IgKGogPSAwOyBqIDwgTUFYX1BJUEVTOyBqKyspIHsKKwkJCWlmIChj b3JlX2RjLT5jdXJyZW50X2NvbnRleHQtPnJlc19jdHgucGlwZV9jdHhbal0uc3RyZWFtCisJCQkJ CT09IGNvcmVfc3RyZWFtKSB7CisJCQkJcGlwZXNfYWZmZWN0ZWRbbnVtX3BpcGVzX2FmZmVjdGVk KytdID0KKwkJCQkJCSZjb3JlX2RjLT5jdXJyZW50X2NvbnRleHQtPnJlc19jdHgucGlwZV9jdHhb al07CisJCQl9CisJCX0KKwl9CisKKwljb3JlX2RjLT5od3NzLnNldF9zdGF0aWNfc2NyZWVuX2Nv bnRyb2wocGlwZXNfYWZmZWN0ZWQsIG51bV9waXBlc19hZmZlY3RlZCwgZXZlbnRzKTsKK30KKwog LyogVGhpcyBmdW5jdGlvbiBpcyBub3QgZXhwZWN0ZWQgdG8gZmFpbCwgcHJvcGVyIGltcGxlbWVu dGF0aW9uIG9mCiAgKiB2YWxpZGF0aW9uIHdpbGwgcHJldmVudCB0aGlzIGZyb20gZXZlciBiZWlu ZyBjYWxsZWQgZm9yIHVuc3VwcG9ydGVkCiAgKiBjb25maWd1cmF0aW9ucy4KQEAgLTI0MCw0NSAr MjY2LDYgQEAgc3RhdGljIHZvaWQgc3RyZWFtX3VwZGF0ZV9zY2FsaW5nKAogCX0KIH0KIAotc3Rh dGljIGJvb2wgc2V0X3Bzcl9lbmFibGUoc3RydWN0IGRjICpkYywgYm9vbCBlbmFibGUpCi17Ci0J c3RydWN0IGNvcmVfZGMgKmNvcmVfZGMgPSBEQ19UT19DT1JFKGRjKTsKLQlpbnQgaTsKLQotCWZv ciAoaSA9IDA7IGkgPCBjb3JlX2RjLT5saW5rX2NvdW50OyBpKyspCi0JCWRjX2xpbmtfc2V0X3Bz cl9lbmFibGUoJmNvcmVfZGMtPmxpbmtzW2ldLT5wdWJsaWMsCi0JCQkJZW5hYmxlKTsKLQotCXJl dHVybiB0cnVlOwotfQotCi0KLXN0YXRpYyBib29sIHNldHVwX3BzcihzdHJ1Y3QgZGMgKmRjLCBj b25zdCBzdHJ1Y3QgZGNfc3RyZWFtICpzdHJlYW0pCi17Ci0Jc3RydWN0IGNvcmVfZGMgKmNvcmVf ZGMgPSBEQ19UT19DT1JFKGRjKTsKLQlzdHJ1Y3QgY29yZV9zdHJlYW0gKmNvcmVfc3RyZWFtID0g RENfU1RSRUFNX1RPX0NPUkUoc3RyZWFtKTsKLQlzdHJ1Y3QgcGlwZV9jdHggKnBpcGVzOwotCWlu dCBpOwotCXVuc2lnbmVkIGludCB1bmRlcmxheV9pZHggPSBjb3JlX2RjLT5yZXNfcG9vbC0+dW5k ZXJsYXlfcGlwZV9pbmRleDsKLQotCWZvciAoaSA9IDA7IGkgPCBjb3JlX2RjLT5saW5rX2NvdW50 OyBpKyspIHsKLQkJaWYgKGNvcmVfc3RyZWFtLT5zaW5rLT5saW5rID09IGNvcmVfZGMtPmxpbmtz W2ldKQotCQkJZGNfbGlua19zZXR1cF9wc3IoJmNvcmVfZGMtPmxpbmtzW2ldLT5wdWJsaWMsCi0J CQkJCXN0cmVhbSk7Ci0JfQotCi0JZm9yIChpID0gMDsgaSA8IE1BWF9QSVBFUzsgaSsrKSB7Ci0J CWlmIChjb3JlX2RjLT5jdXJyZW50X2NvbnRleHQtPnJlc19jdHgucGlwZV9jdHhbaV0uc3RyZWFt Ci0JCQkJPT0gY29yZV9zdHJlYW0gJiYgaSAhPSB1bmRlcmxheV9pZHgpIHsKLQkJCXBpcGVzID0g JmNvcmVfZGMtPmN1cnJlbnRfY29udGV4dC0+cmVzX2N0eC5waXBlX2N0eFtpXTsKLQkJCWNvcmVf ZGMtPmh3c3Muc2V0X3N0YXRpY19zY3JlZW5fY29udHJvbCgmcGlwZXMsIDEsCi0JCQkJCTB4MTgy KTsKLQkJfQotCX0KLQotCXJldHVybiB0cnVlOwotfQotCiBzdGF0aWMgdm9pZCBzZXRfZHJpdmVf c2V0dGluZ3Moc3RydWN0IGRjICpkYywKIAkJc3RydWN0IGxpbmtfdHJhaW5pbmdfc2V0dGluZ3Mg Kmx0X3NldHRpbmdzLAogCQljb25zdCBzdHJ1Y3QgZGNfbGluayAqbGluaykKQEAgLTM1OSwxNSAr MzQ2LDEyIEBAIHN0YXRpYyB2b2lkIGFsbG9jYXRlX2RjX3N0cmVhbV9mdW5jcyhzdHJ1Y3QgY29y ZV9kYyAqY29yZV9kYykKIAkJCQlzdHJlYW1fYWRqdXN0X3ZtaW5fdm1heDsKIAl9CiAKKwljb3Jl X2RjLT5wdWJsaWMuc3RyZWFtX2Z1bmNzLnNldF9zdGF0aWNfc2NyZWVuX2V2ZW50cyA9CisJCQlz ZXRfc3RhdGljX3NjcmVlbl9ldmVudHM7CisKIAljb3JlX2RjLT5wdWJsaWMuc3RyZWFtX2Z1bmNz LnNldF9nYW11dF9yZW1hcCA9CiAJCQlzZXRfZ2FtdXRfcmVtYXA7CiAKLQljb3JlX2RjLT5wdWJs aWMuc3RyZWFtX2Z1bmNzLnNldF9wc3JfZW5hYmxlID0KLQkJCXNldF9wc3JfZW5hYmxlOwotCi0J Y29yZV9kYy0+cHVibGljLnN0cmVhbV9mdW5jcy5zZXR1cF9wc3IgPQotCQkJc2V0dXBfcHNyOwot CiAJY29yZV9kYy0+cHVibGljLmxpbmtfZnVuY3Muc2V0X2RyaXZlX3NldHRpbmdzID0KIAkJCXNl dF9kcml2ZV9zZXR0aW5nczsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNw bGF5L2RjL2NvcmUvZGNfbGluay5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2Nv cmUvZGNfbGluay5jCmluZGV4IDQyNmY3ZjgxODdhNi4uNmY3ODQwM2UyZDY0IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19saW5rLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNfbGluay5jCkBAIC0xNDMwLDE0ICsx NDMwLDE0IEBAIGJvb2wgZGNfbGlua19zZXRfcHNyX2VuYWJsZShjb25zdCBzdHJ1Y3QgZGNfbGlu ayAqZGNfbGluaywgYm9vbCBlbmFibGUpCiAJc3RydWN0IGNvcmVfZGMgKmNvcmVfZGMgPSBEQ19U T19DT1JFKGN0eC0+ZGMpOwogCXN0cnVjdCBkbWN1ICpkbWN1ID0gY29yZV9kYy0+cmVzX3Bvb2wt PmRtY3U7CiAKLQlpZiAoZG1jdSAhPSBOVUxMICYmIGRjX2xpbmstPnBzcl9jYXBzLnBzcl92ZXJz aW9uID4gMCkKKwlpZiAoZG1jdSAhPSBOVUxMICYmIGxpbmstPnBzcl9lbmFibGVkKQogCQlkbWN1 LT5mdW5jcy0+c2V0X3Bzcl9lbmFibGUoZG1jdSwgZW5hYmxlKTsKIAogCXJldHVybiB0cnVlOwog fQogCiBib29sIGRjX2xpbmtfc2V0dXBfcHNyKGNvbnN0IHN0cnVjdCBkY19saW5rICpkY19saW5r LAotCQljb25zdCBzdHJ1Y3QgZGNfc3RyZWFtICpzdHJlYW0pCisJCWNvbnN0IHN0cnVjdCBkY19z dHJlYW0gKnN0cmVhbSwgc3RydWN0IHBzcl9jb25maWcgKnBzcl9jb25maWcpCiB7CiAJc3RydWN0 IGNvcmVfbGluayAqbGluayA9IERDX0xJTktfVE9fQ09SRShkY19saW5rKTsKIAlzdHJ1Y3QgZGNf Y29udGV4dCAqY3R4ID0gbGluay0+Y3R4OwpAQCAtMTQ0OSwxMCArMTQ0OSw4IEBAIGJvb2wgZGNf bGlua19zZXR1cF9wc3IoY29uc3Qgc3RydWN0IGRjX2xpbmsgKmRjX2xpbmssCiAKIAlwc3JfY29u dGV4dC5jb250cm9sbGVySWQgPSBDT05UUk9MTEVSX0lEX1VOREVGSU5FRDsKIAotCiAJaWYgKGRj X2xpbmsgIT0gTlVMTCAmJgotCQlkbWN1ICE9IE5VTEwgJiYKLQkJZGNfbGluay0+cHNyX2NhcHMu cHNyX3ZlcnNpb24gPiAwKSB7CisJCWRtY3UgIT0gTlVMTCkgewogCQkvKiB1cGRhdGVTaW5rUHNy RHBjZENvbmZpZyovCiAJCXVuaW9uIGRwY2RfcHNyX2NvbmZpZ3VyYXRpb24gcHNyX2NvbmZpZ3Vy YXRpb247CiAKQEAgLTE0NjEsMTAgKzE0NTksMTAgQEAgYm9vbCBkY19saW5rX3NldHVwX3Bzcihj b25zdCBzdHJ1Y3QgZGNfbGluayAqZGNfbGluaywKIAkJcHNyX2NvbmZpZ3VyYXRpb24uYml0cy5F TkFCTEUgICAgICAgICAgICAgICAgICAgID0gMTsKIAkJcHNyX2NvbmZpZ3VyYXRpb24uYml0cy5D UkNfVkVSSUZJQ0FUSU9OICAgICAgICAgID0gMTsKIAkJcHNyX2NvbmZpZ3VyYXRpb24uYml0cy5G UkFNRV9DQVBUVVJFX0lORElDQVRJT04gID0KLQkJCWRjX2xpbmstPnBzcl9jYXBzLnBzcl9mcmFt ZV9jYXB0dXJlX2luZGljYXRpb25fcmVxOworCQkJCXBzcl9jb25maWctPnBzcl9mcmFtZV9jYXB0 dXJlX2luZGljYXRpb25fcmVxOwogCiAJCS8qIENoZWNrIGZvciBQU1IgdjIqLwotCQlpZiAoZGNf bGluay0+cHNyX2NhcHMucHNyX3ZlcnNpb24gPT0gMHgyKSB7CisJCWlmIChwc3JfY29uZmlnLT5w c3JfdmVyc2lvbiA9PSAweDIpIHsKIAkJCS8qIEZvciBQU1IgdjIgc2VsZWN0aXZlIHVwZGF0ZS4K IAkJCSAqIEluZGljYXRlcyB3aGV0aGVyIHNpbmsgc2hvdWxkIHN0YXJ0IGNhcHR1cmluZwogCQkJ ICogaW1tZWRpYXRlbHkgZm9sbG93aW5nIGFjdGl2ZSBzY2FuIGxpbmUsCkBAIC0xNTEyLDE0ICsx NTEwLDEzIEBAIGJvb2wgZGNfbGlua19zZXR1cF9wc3IoY29uc3Qgc3RydWN0IGRjX2xpbmsgKmRj X2xpbmssCiAJCQkJCQlzdHJlYW0tPnRpbWluZy52X3RvdGFsKSwKIAkJCQkJCXN0cmVhbS0+dGlt aW5nLmhfdG90YWwpOwogCi0JCXBzcl9jb250ZXh0LnBzclN1cHBvcnRlZERpc3BsYXlDb25maWcg PQotCQkJKGRjX2xpbmstPnBzcl9jYXBzLnBzcl92ZXJzaW9uID4gMCkgPyB0cnVlIDogZmFsc2U7 CisJCXBzcl9jb250ZXh0LnBzclN1cHBvcnRlZERpc3BsYXlDb25maWcgPSB0cnVlOwogCQlwc3Jf Y29udGV4dC5wc3JFeGl0TGlua1RyYWluaW5nUmVxdWlyZWQgPQotCQkJZGNfbGluay0+cHNyX2Nh cHMucHNyX2V4aXRfbGlua190cmFpbmluZ19yZXF1aXJlZDsKKwkJCXBzcl9jb25maWctPnBzcl9l eGl0X2xpbmtfdHJhaW5pbmdfcmVxdWlyZWQ7CiAJCXBzcl9jb250ZXh0LnNkcFRyYW5zbWl0TGlu ZU51bURlYWRsaW5lID0KLQkJCWRjX2xpbmstPnBzcl9jYXBzLnBzcl9zZHBfdHJhbnNtaXRfbGlu ZV9udW1fZGVhZGxpbmU7CisJCQlwc3JfY29uZmlnLT5wc3Jfc2RwX3RyYW5zbWl0X2xpbmVfbnVt X2RlYWRsaW5lOwogCQlwc3JfY29udGV4dC5wc3JGcmFtZUNhcHR1cmVJbmRpY2F0aW9uUmVxID0K LQkJCWRjX2xpbmstPnBzcl9jYXBzLnBzcl9mcmFtZV9jYXB0dXJlX2luZGljYXRpb25fcmVxOwor CQkJcHNyX2NvbmZpZy0+cHNyX2ZyYW1lX2NhcHR1cmVfaW5kaWNhdGlvbl9yZXE7CiAKIAkJcHNy X2NvbnRleHQuc2tpcFBzcldhaXRGb3JQbGxMb2NrID0gMDsgLyogb25seSA9IDEgaW4gS1YgKi8K IApAQCAtMTU1MCw2ICsxNTQ3LDcgQEAgYm9vbCBkY19saW5rX3NldHVwX3Bzcihjb25zdCBzdHJ1 Y3QgZGNfbGluayAqZGNfbGluaywKIAkJICovCiAJCXBzcl9jb250ZXh0LmZyYW1lX2RlbGF5ID0g MDsKIAorCQlsaW5rLT5wc3JfZW5hYmxlZCA9IHRydWU7CiAJCWRtY3UtPmZ1bmNzLT5zZXR1cF9w c3IoZG1jdSwgbGluaywgJnBzcl9jb250ZXh0KTsKIAkJcmV0dXJuIHRydWU7CiAJfSBlbHNlCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19saW5rX2Rw LmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19saW5rX2RwLmMKaW5k ZXggMTcyODY0NjVlODUwLi5mODgzZmRiODIwYzggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX2xpbmtfZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2Rpc3BsYXkvZGMvY29yZS9kY19saW5rX2RwLmMKQEAgLTE0NzgsNyArMTQ3OCw3IEBAIHN0 YXRpYyBib29sIGhhbmRsZV9ocGRfaXJxX3Bzcl9zaW5rKGNvbnN0IHN0cnVjdCBjb3JlX2xpbmsg KmxpbmspCiB7CiAJdW5pb24gZHBjZF9wc3JfY29uZmlndXJhdGlvbiBwc3JfY29uZmlndXJhdGlv bjsKIAotCWlmIChsaW5rLT5wdWJsaWMucHNyX2NhcHMucHNyX3ZlcnNpb24gPT0gMCkKKwlpZiAo IWxpbmstPnBzcl9lbmFibGVkKQogCQlyZXR1cm4gZmFsc2U7CiAKIAlkbV9oZWxwZXJzX2RwX3Jl YWRfZHBjZCgKQEAgLTIwNjAsMzYgKzIwNjAsNiBAQCBzdGF0aWMgdm9pZCBkcF93YV9wb3dlcl91 cF8wMDEwRkEoc3RydWN0IGNvcmVfbGluayAqbGluaywgdWludDhfdCAqZHBjZF9kYXRhLAogCQls aW5rLT53YV9mbGFncy5kcF9rZWVwX3JlY2VpdmVyX3Bvd2VyZWQgPSBmYWxzZTsKIH0KIAotc3Rh dGljIHZvaWQgcmV0cmlldmVfcHNyX2xpbmtfY2FwKHN0cnVjdCBjb3JlX2xpbmsgKmxpbmssCi0J CWVudW0gZWRwX3JldmlzaW9uIGVkcF9yZXZpc2lvbikKLXsKLQlpZiAoZWRwX3JldmlzaW9uID49 IEVEUF9SRVZJU0lPTl8xMykgewotCQljb3JlX2xpbmtfcmVhZF9kcGNkKGxpbmssCi0JCQkJRFBf UFNSX1NVUFBPUlQsCi0JCQkJKHVpbnQ4X3QgKikoJmxpbmstPnB1YmxpYy5wc3JfY2FwcyksCi0J CQkJc2l6ZW9mKGxpbmstPnB1YmxpYy5wc3JfY2FwcykpOwotCQlpZiAobGluay0+cHVibGljLnBz cl9jYXBzLnBzcl92ZXJzaW9uICE9IDApIHsKLQkJCXVuc2lnbmVkIGNoYXIgcHNyX2NhcGFiaWxp dHkgPSAwOwotCi0JCQljb3JlX2xpbmtfcmVhZF9kcGNkKGxpbmssCi0JCQkJCSAgICBEUF9QU1Jf Q0FQUywKLQkJCQkJCSZwc3JfY2FwYWJpbGl0eSwKLQkJCQkJCXNpemVvZihwc3JfY2FwYWJpbGl0 eSkpOwotCQkJLyogQml0IDAgZGV0ZXJtaW5lcyB3aGV0aGVyIGZhc3QgbGluayB0cmFpbmluZyBp cwotCQkJICogcmVxdWlyZWQgb24gUFNSIGV4aXQuIElmIHNldCB0byAwLCBsaW5rIHRyYWluaW5n Ci0JCQkgKiBpcyByZXF1aXJlZC4gSWYgc2V0IHRvIDEsIHNpbmsgbXVzdCBsb2NrIHdpdGhpbgot CQkJICogZml2ZSBJZGxlIFBhdHRlcm5zIGFmdGVyIE1haW4gTGluayBpcyB0dXJuZWQgb24uCi0J CQkgKi8KLQkJCWxpbmstPnB1YmxpYy5wc3JfY2Fwcy5wc3JfZXhpdF9saW5rX3RyYWluaW5nX3Jl cXVpcmVkCi0JCQkJCQk9ICEocHNyX2NhcGFiaWxpdHkgJiAweDEpOwotCi0JCQlwc3JfY2FwYWJp bGl0eSA9IChwc3JfY2FwYWJpbGl0eSA+PiAxKSAmIDB4NzsKLQkJCWxpbmstPnB1YmxpYy5wc3Jf Y2Fwcy5wc3JfcmZiX3NldHVwX3RpbWUgPQotCQkJCQk1NSAqICg2IC0gcHNyX2NhcGFiaWxpdHkp OwotCQl9Ci0JfQotfQotCiBzdGF0aWMgdm9pZCByZXRyaWV2ZV9saW5rX2NhcChzdHJ1Y3QgY29y ZV9saW5rICpsaW5rKQogewogCXVpbnQ4X3QgZHBjZF9kYXRhW0RQX1RSQUlOSU5HX0FVWF9SRF9J TlRFUlZBTCAtIERQX0RQQ0RfUkVWICsgMV07CkBAIC0yMTU3LDM4ICsyMTI3LDE3IEBAIHN0YXRp YyB2b2lkIHJldHJpZXZlX2xpbmtfY2FwKHN0cnVjdCBjb3JlX2xpbmsgKmxpbmspCiAJbGluay0+ ZHBjZF9jYXBzLnBhbmVsX21vZGVfZWRwID0KIAkJZWRwX2NvbmZpZ19jYXAuYml0cy5BTFRfU0NS QU1CTEVSX1JFU0VUOwogCi0JbGluay0+ZWRwX3JldmlzaW9uID0gRURQX1JFVklTSU9OXzExOwot CiAJbGluay0+cHVibGljLnRlc3RfcGF0dGVybl9lbmFibGVkID0gZmFsc2U7CiAJbGluay0+cHVi bGljLmNvbXBsaWFuY2VfdGVzdF9zdGF0ZS5yYXcgPSAwOwogCi0JbGluay0+cHVibGljLnBzcl9j YXBzLnBzcl9leGl0X2xpbmtfdHJhaW5pbmdfcmVxdWlyZWQgPSBmYWxzZTsKLQlsaW5rLT5wdWJs aWMucHNyX2NhcHMucHNyX2ZyYW1lX2NhcHR1cmVfaW5kaWNhdGlvbl9yZXEgPSBmYWxzZTsKLQls aW5rLT5wdWJsaWMucHNyX2NhcHMucHNyX3JmYl9zZXR1cF90aW1lID0gMDsKLQlsaW5rLT5wdWJs aWMucHNyX2NhcHMucHNyX3NkcF90cmFuc21pdF9saW5lX251bV9kZWFkbGluZSA9IDA7Ci0JbGlu ay0+cHVibGljLnBzcl9jYXBzLnBzcl92ZXJzaW9uID0gMDsKLQogCS8qIHJlYWQgc2luayBjb3Vu dCAqLwogCWNvcmVfbGlua19yZWFkX2RwY2QobGluaywKIAkJCURQX1NJTktfQ09VTlQsCiAJCQkm bGluay0+ZHBjZF9jYXBzLnNpbmtfY291bnQucmF3LAogCQkJc2l6ZW9mKGxpbmstPmRwY2RfY2Fw cy5zaW5rX2NvdW50LnJhdykpOwogCi0JLyogRGlzcGxheSBjb250cm9sIHJlZ2lzdGVycyBzdGFy dGluZyBhdCBEUENEIDcwMGggYXJlIG9ubHkgdmFsaWQgYW5kCi0JICogZW5hYmxlZCBpZiB0aGlz IGVEUCBjb25maWcgY2FwIGJpdCBpcyBzZXQuICovCi0JaWYgKGVkcF9jb25maWdfY2FwLmJpdHMu RFBDRF9ESVNQTEFZX0NPTlRST0xfQ0FQQUJMRSkgewotCQkvKiBSZWFkIHRoZSBQYW5lbCdzIGVE UCByZXZpc2lvbiBhdCBEUENEIDcwMGguICovCi0JCWNvcmVfbGlua19yZWFkX2RwY2QobGluaywK LQkJCURQX0VEUF9EUENEX1JFViwKLQkJCSh1aW50OF90ICopKCZsaW5rLT5lZHBfcmV2aXNpb24p LAotCQkJc2l6ZW9mKGxpbmstPmVkcF9yZXZpc2lvbikpOwotCX0KLQogCS8qIENvbm5lY3Rpdml0 eSBsb2c6IGRldGVjdGlvbiAqLwogCUNPTk5fREFUQV9ERVRFQ1QobGluaywgZHBjZF9kYXRhLCBz aXplb2YoZHBjZF9kYXRhKSwgIlJ4IENhcHM6ICIpOwotCi0JLyogVE9ETzogQ29uZmlybSBpZiBu ZWVkIHJldHJpZXZlX3Bzcl9saW5rX2NhcCAqLwotCXJldHJpZXZlX3Bzcl9saW5rX2NhcChsaW5r LCBsaW5rLT5lZHBfcmV2aXNpb24pOwogfQogCiB2b2lkIGRldGVjdF9kcF9zaW5rX2NhcHMoc3Ry dWN0IGNvcmVfbGluayAqbGluaykKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlz cGxheS9kYy9jb3JlL2RjX3Jlc291cmNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkv ZGMvY29yZS9kY19yZXNvdXJjZS5jCmluZGV4IDJlMTJhMGJhNWRkZi4uY2RiOThkNWY3Y2FhIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19yZXNvdXJj ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3Jlc291cmNl LmMKQEAgLTIwMTUsNyArMjAxNSw3IEBAIHN0YXRpYyB2b2lkIHNldF92c2NfaW5mb19wYWNrZXQo CiAJdW5zaWduZWQgaW50IHZzY1BhY2tldFJldmlzaW9uID0gMDsKIAl1bnNpZ25lZCBpbnQgaTsK IAotCWlmIChzdHJlYW0tPnNpbmstPmxpbmstPnB1YmxpYy5wc3JfY2Fwcy5wc3JfdmVyc2lvbiAh PSAwKSB7CisJaWYgKHN0cmVhbS0+c2luay0+bGluay0+cHNyX2VuYWJsZWQpIHsKIAkJdnNjUGFj a2V0UmV2aXNpb24gPSAyOwogCX0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9k aXNwbGF5L2RjL2RjLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGMuaAppbmRl eCBhMmE5ZTRlZDM5M2MuLmQxMmFhNzI2MTY0ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2FtZC9kaXNwbGF5L2RjL2RjLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2Rj L2RjLmgKQEAgLTgyLDYgKzgyLDEyIEBAIHN0cnVjdCBkY19zdXJmYWNlX2RjY19jYXAgewogCX07 CiB9OwogCitzdHJ1Y3QgZGNfc3RhdGljX3NjcmVlbl9ldmVudHMgeworCWJvb2wgY3Vyc29yX3Vw ZGF0ZTsKKwlib29sIHN1cmZhY2VfdXBkYXRlOworCWJvb2wgb3ZlcmxheV91cGRhdGU7Cit9Owor CiAvKiBGb3J3YXJkIGRlY2xhcmF0aW9uKi8KIHN0cnVjdCBkYzsKIHN0cnVjdCBkY19zdXJmYWNl OwpAQCAtMTAyLDEwICsxMDgsMTQgQEAgc3RydWN0IGRjX3N0cmVhbV9mdW5jcyB7CiAJCQljb25z dCBzdHJ1Y3QgZGNfc3RyZWFtICpkY19zdHJlYW0sCiAJCQljb25zdCBzdHJ1Y3QgcmVjdCAqc3Jj LAogCQkJY29uc3Qgc3RydWN0IHJlY3QgKmRzdCk7CisKIAlib29sICgqc2V0X2dhbXV0X3JlbWFw KShzdHJ1Y3QgZGMgKmRjLAogCQkJY29uc3Qgc3RydWN0IGRjX3N0cmVhbSAqKnN0cmVhbSwgaW50 IG51bV9zdHJlYW1zKTsKLQlib29sICgqc2V0X3Bzcl9lbmFibGUpKHN0cnVjdCBkYyAqZGMsIGJv b2wgZW5hYmxlKTsKLQlib29sICgqc2V0dXBfcHNyKShzdHJ1Y3QgZGMgKmRjLCBjb25zdCBzdHJ1 Y3QgZGNfc3RyZWFtICpzdHJlYW0pOworCisJdm9pZCAoKnNldF9zdGF0aWNfc2NyZWVuX2V2ZW50 cykoc3RydWN0IGRjICpkYywKKwkJCWNvbnN0IHN0cnVjdCBkY19zdHJlYW0gKipzdHJlYW0sCisJ CQlpbnQgbnVtX3N0cmVhbXMsCisJCQljb25zdCBzdHJ1Y3QgZGNfc3RhdGljX3NjcmVlbl9ldmVu dHMgKmV2ZW50cyk7CiB9OwogCiBzdHJ1Y3QgbGlua190cmFpbmluZ19zZXR0aW5nczsKQEAgLTYw NCw3ICs2MTQsNiBAQCBzdHJ1Y3QgZGNfbGluayB7CiAJdWludDhfdCBkZGNfaHdfaW5zdDsKIAl1 aW50OF90IGxpbmtfZW5jX2h3X2luc3Q7CiAKLQlzdHJ1Y3QgcHNyX2NhcHMgcHNyX2NhcHM7CiAJ Ym9vbCB0ZXN0X3BhdHRlcm5fZW5hYmxlZDsKIAl1bmlvbiBjb21wbGlhbmNlX3Rlc3Rfc3RhdGUg Y29tcGxpYW5jZV90ZXN0X3N0YXRlOwogCkBAIC02NTcsNyArNjY2LDcgQEAgYm9vbCBkY19saW5r X3NldF9iYWNrbGlnaHRfbGV2ZWwoY29uc3Qgc3RydWN0IGRjX2xpbmsgKmRjX2xpbmssIHVpbnQz Ml90IGxldmVsLAogYm9vbCBkY19saW5rX3NldF9wc3JfZW5hYmxlKGNvbnN0IHN0cnVjdCBkY19s aW5rICpkY19saW5rLCBib29sIGVuYWJsZSk7CiAKIGJvb2wgZGNfbGlua19zZXR1cF9wc3IoY29u c3Qgc3RydWN0IGRjX2xpbmsgKmRjX2xpbmssCi0JCWNvbnN0IHN0cnVjdCBkY19zdHJlYW0gKnN0 cmVhbSk7CisJCWNvbnN0IHN0cnVjdCBkY19zdHJlYW0gKnN0cmVhbSwgc3RydWN0IHBzcl9jb25m aWcgKnBzcl9jb25maWcpOwogCiAvKiBSZXF1ZXN0IERDIHRvIGRldGVjdCBpZiB0aGVyZSBpcyBh IFBhbmVsIGNvbm5lY3RlZC4KICAqIGJvb3QgLSBJZiB0aGlzIGNhbGwgaXMgZHVyaW5nIGluaXRp YWwgYm9vdC4KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY190 eXBlcy5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjX3R5cGVzLmgKaW5kZXgg MmJhMDJiNTBiYzE4Li5kMmYzYjlmZDdhMzAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvZGlzcGxheS9kYy9kY190eXBlcy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxh eS9kYy9kY190eXBlcy5oCkBAIC00ODQsNiArNDg0LDE1IEBAIHN0cnVjdCBmcmVlc3luY19jb250 ZXh0IHsKIAl1bnNpZ25lZCBpbnQgbm9taW5hbF9yZWZyZXNoX2luX21pY3JvX2h6OwogfTsKIAor c3RydWN0IHBzcl9jb25maWcgeworCXVuc2lnbmVkIGNoYXIgcHNyX3ZlcnNpb247CisJdW5zaWdu ZWQgaW50IHBzcl9yZmJfc2V0dXBfdGltZTsKKwlib29sIHBzcl9leGl0X2xpbmtfdHJhaW5pbmdf cmVxdWlyZWQ7CisKKwlib29sIHBzcl9mcmFtZV9jYXB0dXJlX2luZGljYXRpb25fcmVxOworCXVu c2lnbmVkIGludCBwc3Jfc2RwX3RyYW5zbWl0X2xpbmVfbnVtX2RlYWRsaW5lOworfTsKKwogc3Ry dWN0IGNvbG9yc3BhY2VfdHJhbnNmb3JtIHsKIAlzdHJ1Y3QgZml4ZWQzMV8zMiBtYXRyaXhbMTJd OwogCWJvb2wgZW5hYmxlX3JlbWFwOwpAQCAtNDk0LDIxICs1MDMsNiBAQCBzdHJ1Y3QgY3NjX3Ry YW5zZm9ybSB7CiAJYm9vbCBlbmFibGVfYWRqdXN0bWVudDsKIH07CiAKLXN0cnVjdCBwc3JfY2Fw cyB7Ci0JLyogVGhlc2UgcGFyYW1ldGVycyBhcmUgZnJvbSBQU1IgY2FwYWJpbGl0aWVzIHJlcG9y dGVkIGJ5IFNpbmsgRFBDRCAqLwotCXVuc2lnbmVkIGNoYXIgcHNyX3ZlcnNpb247Ci0JdW5zaWdu ZWQgaW50IHBzcl9yZmJfc2V0dXBfdGltZTsKLQlib29sIHBzcl9leGl0X2xpbmtfdHJhaW5pbmdf cmVxdWlyZWQ7Ci0KLQkvKiBUaGVzZSBwYXJhbWV0ZXJzIGFyZSBjYWxjdWxhdGVkIGluIERyaXZl ciwKLQkgKiBiYXNlZCBvbiBkaXNwbGF5IHRpbWluZyBhbmQgU2luayBjYXBhYmlsaXRpZXMuCi0J ICogSWYgVkJMQU5LIHJlZ2lvbiBpcyB0b28gc21hbGwgYW5kIFNpbmsgdGFrZXMgYSBsb25nIHRp bWUKLQkgKiB0byBzZXQgdXAgUkZCLCBpdCBtYXkgdGFrZSBhbiBleHRyYSBmcmFtZSB0byBlbnRl ciBQU1Igc3RhdGUuCi0JICovCi0JYm9vbCBwc3JfZnJhbWVfY2FwdHVyZV9pbmRpY2F0aW9uX3Jl cTsKLQl1bnNpZ25lZCBpbnQgcHNyX3NkcF90cmFuc21pdF9saW5lX251bV9kZWFkbGluZTsKLX07 Ci0KIGVudW0gaTJjX21vdF9tb2RlIHsKIAlJMkNfTU9UX1VOREVGLAogCUkyQ19NT1RfVFJVRSwK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UxMTAvZGNlMTEw X2h3X3NlcXVlbmNlci5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTExMC9k Y2UxMTBfaHdfc2VxdWVuY2VyLmMKaW5kZXggNmIyNDlmNWJmMWRhLi42YTkzYzk2YjliMjYgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UxMTAvZGNlMTEwX2h3 X3NlcXVlbmNlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UxMTAv ZGNlMTEwX2h3X3NlcXVlbmNlci5jCkBAIC0xMDA1LDYgKzEwMDUsMTAgQEAgc3RhdGljIGVudW0g ZGNfc3RhdHVzIGRjZTExMF9wcm9nX3BpeGNsa19jcnRjX290ZygKIAkJCQlwaXBlX2N0eC0+dGcs CiAJCQkJJnN0cmVhbS0+cHVibGljLnRpbWluZywKIAkJCQl0cnVlKTsKKworCQlwaXBlX2N0eC0+ dGctPmZ1bmNzLT5zZXRfc3RhdGljX3NjcmVlbl9jb250cm9sKAorCQkJCXBpcGVfY3R4LT50ZywK KwkJCQkweDE4Mik7CiAJfQogCiAJaWYgKCFwaXBlX2N0eF9vbGQtPnN0cmVhbSkgewpAQCAtMTAx NSw2ICsxMDE5LDggQEAgc3RhdGljIGVudW0gZGNfc3RhdHVzIGRjZTExMF9wcm9nX3BpeGNsa19j cnRjX290ZygKIAkJfQogCX0KIAorCisKIAlyZXR1cm4gRENfT0s7CiB9CiAKQEAgLTExMTQsNiAr MTEyMCw4IEBAIHN0YXRpYyBlbnVtIGRjX3N0YXR1cyBhcHBseV9zaW5nbGVfY29udHJvbGxlcl9j dHhfdG9faHcoCiAJCQkJCXN0cmVhbS0+cHVibGljLnRpbWluZy5waXhfY2xrX2toeiwKIAkJCQkJ Y29udGV4dC0+c3RyZWFtX2NvdW50KTsKIAorCXBpcGVfY3R4LT5zdHJlYW0tPnNpbmstPmxpbmst PnBzcl9lbmFibGVkID0gZmFsc2U7CisKIAlyZXR1cm4gRENfT0s7CiB9CiAKQEAgLTEzNTUsOSAr MTM2MywxNyBAQCBzdGF0aWMgdm9pZCBzZXRfZHJyKHN0cnVjdCBwaXBlX2N0eCAqKnBpcGVfY3R4 LAogfQogCiBzdGF0aWMgdm9pZCBzZXRfc3RhdGljX3NjcmVlbl9jb250cm9sKHN0cnVjdCBwaXBl X2N0eCAqKnBpcGVfY3R4LAotCQlpbnQgbnVtX3BpcGVzLCBpbnQgdmFsdWUpCisJCWludCBudW1f cGlwZXMsIGNvbnN0IHN0cnVjdCBkY19zdGF0aWNfc2NyZWVuX2V2ZW50cyAqZXZlbnRzKQogewog CXVuc2lnbmVkIGludCBpOworCXVuc2lnbmVkIGludCB2YWx1ZSA9IDA7CisKKwlpZiAoZXZlbnRz LT5vdmVybGF5X3VwZGF0ZSkKKwkJdmFsdWUgfD0gMHgxMDA7CisJaWYgKGV2ZW50cy0+c3VyZmFj ZV91cGRhdGUpCisJCXZhbHVlIHw9IDB4ODA7CisJaWYgKGV2ZW50cy0+Y3Vyc29yX3VwZGF0ZSkK KwkJdmFsdWUgfD0gMHgyOwogCiAJZm9yIChpID0gMDsgaSA8IG51bV9waXBlczsgaSsrKQogCQlw aXBlX2N0eFtpXS0+dGctPmZ1bmNzLT4KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv ZGlzcGxheS9kYy9kY2UxMTAvZGNlMTEwX3RpbWluZ19nZW5lcmF0b3IuYyBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvZGlzcGxheS9kYy9kY2UxMTAvZGNlMTEwX3RpbWluZ19nZW5lcmF0b3IuYwppbmRl eCA3MDcwYWFmOWU0MzMuLjIzNzYwNzI3ZjAwMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2FtZC9kaXNwbGF5L2RjL2RjZTExMC9kY2UxMTBfdGltaW5nX2dlbmVyYXRvci5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UxMTAvZGNlMTEwX3RpbWluZ19nZW5lcmF0 b3IuYwpAQCAtMzcxLDcgKzM3MSw2IEBAIHZvaWQgZGNlMTEwX3RpbWluZ19nZW5lcmF0b3Jfc2V0 X2RycigKIAl1aW50MzJfdCB2X3RvdGFsX21pbiA9IDA7CiAJdWludDMyX3Qgdl90b3RhbF9tYXgg PSAwOwogCXVpbnQzMl90IHZfdG90YWxfY250bCA9IDA7Ci0JdWludDMyX3Qgc3RhdGljX3NjcmVl bl9jbnRsID0gMDsKIAlzdHJ1Y3QgZGNlMTEwX3RpbWluZ19nZW5lcmF0b3IgKnRnMTEwID0gRENF MTEwVEdfRlJPTV9URyh0Zyk7CiAKIAl1aW50MzJfdCBhZGRyID0gMDsKQEAgLTM4NSw5ICszODQs NiBAQCB2b2lkIGRjZTExMF90aW1pbmdfZ2VuZXJhdG9yX3NldF9kcnIoCiAJYWRkciA9IENSVENf UkVHKG1tQ1JUQ19WX1RPVEFMX0NPTlRST0wpOwogCXZfdG90YWxfY250bCA9IGRtX3JlYWRfcmVn KHRnLT5jdHgsIGFkZHIpOwogCi0JYWRkciA9IENSVENfUkVHKG1tQ1JUQ19TVEFUSUNfU0NSRUVO X0NPTlRST0wpOwotCXN0YXRpY19zY3JlZW5fY250bCA9IGRtX3JlYWRfcmVnKHRnLT5jdHgsIGFk ZHIpOwotCiAJaWYgKHBhcmFtcyAhPSBOVUxMICYmCiAJCXBhcmFtcy0+dmVydGljYWxfdG90YWxf bWF4ID4gMCAmJgogCQlwYXJhbXMtPnZlcnRpY2FsX3RvdGFsX21pbiA+IDApIHsKQEAgLTQzMCwy MCArNDI2LDExIEBAIHZvaWQgZGNlMTEwX3RpbWluZ19nZW5lcmF0b3Jfc2V0X2RycigKIAkJCQkw LAogCQkJCUNSVENfVl9UT1RBTF9DT05UUk9MLAogCQkJCUNSVENfU0VUX1ZfVE9UQUxfTUlOX01B U0spOwotCi0JCXNldF9yZWdfZmllbGRfdmFsdWUoc3RhdGljX3NjcmVlbl9jbnRsLAotCQkJCTB4 MTgwLAotCQkJQ1JUQ19TVEFUSUNfU0NSRUVOX0NPTlRST0wsCi0JCQlDUlRDX1NUQVRJQ19TQ1JF RU5fRVZFTlRfTUFTSyk7CiAJfSBlbHNlIHsKIAkJc2V0X3JlZ19maWVsZF92YWx1ZSh2X3RvdGFs X2NudGwsCiAJCQkwLAogCQkJQ1JUQ19WX1RPVEFMX0NPTlRST0wsCiAJCQlDUlRDX1NFVF9WX1RP VEFMX01JTl9NQVNLKTsKLQkJc2V0X3JlZ19maWVsZF92YWx1ZShzdGF0aWNfc2NyZWVuX2NudGws Ci0JCQkwLAotCQkJQ1JUQ19TVEFUSUNfU0NSRUVOX0NPTlRST0wsCi0JCQlDUlRDX1NUQVRJQ19T Q1JFRU5fRVZFTlRfTUFTSyk7CiAJCXNldF9yZWdfZmllbGRfdmFsdWUodl90b3RhbF9taW4sCiAJ CQkJMCwKIAkJCQlDUlRDX1ZfVE9UQUxfTUlOLApAQCAtNDc4LDkgKzQ2NSw2IEBAIHZvaWQgZGNl MTEwX3RpbWluZ19nZW5lcmF0b3Jfc2V0X2RycigKIAogCWFkZHIgPSBDUlRDX1JFRyhtbUNSVENf Vl9UT1RBTF9DT05UUk9MKTsKIAlkbV93cml0ZV9yZWcodGctPmN0eCwgYWRkciwgdl90b3RhbF9j bnRsKTsKLQotCWFkZHIgPSBDUlRDX1JFRyhtbUNSVENfU1RBVElDX1NDUkVFTl9DT05UUk9MKTsK LQlkbV93cml0ZV9yZWcodGctPmN0eCwgYWRkciwgc3RhdGljX3NjcmVlbl9jbnRsKTsKIH0KIAog dm9pZCBkY2UxMTBfdGltaW5nX2dlbmVyYXRvcl9zZXRfc3RhdGljX3NjcmVlbl9jb250cm9sKApk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2luYy9jb3JlX3R5cGVz LmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvaW5jL2NvcmVfdHlwZXMuaAppbmRl eCA0MDU2MDgzMThjY2MuLjJiNDNlMThjNjVmNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2FtZC9kaXNwbGF5L2RjL2luYy9jb3JlX3R5cGVzLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9kaXNwbGF5L2RjL2luYy9jb3JlX3R5cGVzLmgKQEAgLTE1Niw2ICsxNTYsNyBAQCBzdHJ1Y3Qg Y29yZV9saW5rIHsKIAl1bnNpZ25lZCBpbnQgZHBjZF9zaW5rX2NvdW50OwogCiAJZW51bSBlZHBf cmV2aXNpb24gZWRwX3JldmlzaW9uOworCWJvb2wgcHNyX2VuYWJsZWQ7CiAKIAkvKiBNU1QgcmVj b3JkIHN0cmVhbSB1c2luZyB0aGlzIGxpbmsgKi8KIAlzdHJ1Y3QgbGlua19mbGFncyB7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvaW5jL2h3X3NlcXVlbmNlci5o IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2luYy9od19zZXF1ZW5jZXIuaAppbmRl eCA5YmZhYWFkMDliZWEuLmI0MmU0YTBlZjE4YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2FtZC9kaXNwbGF5L2RjL2luYy9od19zZXF1ZW5jZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2Rpc3BsYXkvZGMvaW5jL2h3X3NlcXVlbmNlci5oCkBAIC0xMzIsNyArMTMyLDcgQEAgc3Ry dWN0IGh3X3NlcXVlbmNlcl9mdW5jcyB7CiAJCQlpbnQgdm1pbiwgaW50IHZtYXgpOwogCiAJdm9p ZCAoKnNldF9zdGF0aWNfc2NyZWVuX2NvbnRyb2wpKHN0cnVjdCBwaXBlX2N0eCAqKnBpcGVfY3R4 LAotCQkJaW50IG51bV9waXBlcywgaW50IHZhbHVlKTsKKwkJCWludCBudW1fcGlwZXMsIGNvbnN0 IHN0cnVjdCBkY19zdGF0aWNfc2NyZWVuX2V2ZW50cyAqZXZlbnRzKTsKIAogCWVudW0gZGNfc3Rh dHVzICgqcHJvZ19waXhjbGtfY3J0Y19vdGcpKAogCQkJc3RydWN0IHBpcGVfY3R4ICpwaXBlX2N0 eCwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9tb2R1bGVzL2ZyZWVz eW5jL2ZyZWVzeW5jLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvbW9kdWxlcy9mcmVl c3luYy9mcmVlc3luYy5jCmluZGV4IDVjNmRlNzIzZGE1ZC4uNzhiNGYyOGQ4NjJjIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvbW9kdWxlcy9mcmVlc3luYy9mcmVlc3lu Yy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9tb2R1bGVzL2ZyZWVzeW5jL2Zy ZWVzeW5jLmMKQEAgLTI2NCwxMCArMjY0LDEwIEBAIGJvb2wgbW9kX2ZyZWVzeW5jX2FkZF9zdHJl YW0oc3RydWN0IG1vZF9mcmVlc3luYyAqbW9kX2ZyZWVzeW5jLAogCQkJCQllbmFibGVfZm9yX3Zp ZGVvID0gZmFsc2U7CiAJCX0KIAotCQl0ZW1wID0gY29yZV9zdHJlYW0tPnB1YmxpYy50aW1pbmcu cGl4X2Nsa19raHo7CisJCXRlbXAgPSBzdHJlYW0tPnRpbWluZy5waXhfY2xrX2toejsKIAkJdGVt cCAqPSAxMDAwVUxMICogMTAwMFVMTCAqIDEwMDBVTEw7Ci0JCXRlbXAgPSBkaXZfdTY0KHRlbXAs IGNvcmVfc3RyZWFtLT5wdWJsaWMudGltaW5nLmhfdG90YWwpOwotCQl0ZW1wID0gZGl2X3U2NCh0 ZW1wLCBjb3JlX3N0cmVhbS0+cHVibGljLnRpbWluZy52X3RvdGFsKTsKKwkJdGVtcCA9IGRpdl91 NjQodGVtcCwgc3RyZWFtLT50aW1pbmcuaF90b3RhbCk7CisJCXRlbXAgPSBkaXZfdTY0KHRlbXAs IHN0cmVhbS0+dGltaW5nLnZfdG90YWwpOwogCiAJCW5vbV9yZWZyZXNoX3JhdGVfbWljcm9faHog PSAodW5zaWduZWQgaW50KSB0ZW1wOwogCkBAIC02NTcsNiArNjU3LDcgQEAgdm9pZCBtb2RfZnJl ZXN5bmNfaGFuZGxlX3ZfdXBkYXRlKHN0cnVjdCBtb2RfZnJlZXN5bmMgKm1vZF9mcmVlc3luYywK IAl1bnNpZ25lZCBpbnQgbWluX2ZyYW1lX2R1cmF0aW9uX2luX25zLCB2bWF4LCB2bWluID0gMDsK IAlzdHJ1Y3QgZnJlZXN5bmNfc3RhdGUgKnN0YXRlOwogCXN0cnVjdCBjb3JlX2ZyZWVzeW5jICpj b3JlX2ZyZWVzeW5jID0gTlVMTDsKKwlzdHJ1Y3QgZGNfc3RhdGljX3NjcmVlbl9ldmVudHMgdHJp Z2dlcnMgPSB7MH07CiAKIAlpZiAobW9kX2ZyZWVzeW5jID09IE5VTEwpCiAJCXJldHVybjsKQEAg LTc0OSw2ICs3NTAsMTMgQEAgdm9pZCBtb2RfZnJlZXN5bmNfaGFuZGxlX3ZfdXBkYXRlKHN0cnVj dCBtb2RfZnJlZXN5bmMgKm1vZF9mcmVlc3luYywKIAkJCQkJY29yZV9mcmVlc3luYy0+ZGMsIHN0 cmVhbXMsCiAJCQkJCW51bV9zdHJlYW1zLCB2X3RvdGFsLAogCQkJCQl2X3RvdGFsKTsKKworCQl0 cmlnZ2Vycy5vdmVybGF5X3VwZGF0ZSA9IHRydWU7CisJCXRyaWdnZXJzLnN1cmZhY2VfdXBkYXRl ID0gdHJ1ZTsKKworCQljb3JlX2ZyZWVzeW5jLT5kYy0+c3RyZWFtX2Z1bmNzLnNldF9zdGF0aWNf c2NyZWVuX2V2ZW50cygKKwkJCQkJY29yZV9mcmVlc3luYy0+ZGMsIHN0cmVhbXMsCW51bV9zdHJl YW1zLAorCQkJCQkmdHJpZ2dlcnMpOwogCX0KIH0KIAotLSAKMi4xMS4wCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAph bWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK