From: =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 8/8] drm/amdgpu: move align_mask and nop into ring funcs as well Date: Wed, 5 Oct 2016 16:13:29 +0200 Message-ID: <1475676809-3061-8-git-send-email-deathsimple@vodafone.de> References: <1475676809-3061-1-git-send-email-deathsimple@vodafone.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1475676809-3061-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@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 RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKVGhleSBh cmUgY29uc3RhbnQgYXMgd2VsbC4KClNpZ25lZC1vZmYtYnk6IENocmlzdGlhbiBLw7ZuaWcgPGNo cmlzdGlhbi5rb2VuaWdAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfcmluZy5jIHwgMTkgKysrKysrKysrLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvYW1kZ3B1X3JpbmcuaCB8ICA4ICsrKystLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9jaWtfc2RtYS5jICAgIHwgIDcgKysrKy0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvZ2Z4X3Y2XzAuYyAgICB8ICA2ICsrKystLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvZ2Z4X3Y3XzAuYyAgICB8ICA2ICsrKystLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv Z2Z4X3Y4XzAuYyAgICB8IDE0ICsrKysrKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9zZG1hX3YyXzQuYyAgIHwgIDcgKysrKy0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvc2RtYV92M18wLmMgICB8ICA3ICsrKystLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L3NpX2RtYS5jICAgICAgfCAgMyArKy0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3V2ZF92 NF8yLmMgICAgfCAgNSArKystLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdXZkX3Y1XzAu YyAgICB8ICA1ICsrKy0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS91dmRfdjZfMC5jICAg IHwgIDUgKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3ZjZV92Ml8wLmMgICAgfCAg NCArKystCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92Y2VfdjNfMC5jICAgIHwgIDUgKysr LS0KIDE0IGZpbGVzIGNoYW5nZWQsIDU4IGluc2VydGlvbnMoKyksIDQzIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9yaW5nLmMgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcmluZy5jCmluZGV4IGIyZGY3MzUuLmEx NDFiNDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9yaW5n LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3JpbmcuYwpAQCAtNjUs NyArNjUsNyBAQCBpbnQgYW1kZ3B1X3JpbmdfYWxsb2Moc3RydWN0IGFtZGdwdV9yaW5nICpyaW5n LCB1bnNpZ25lZCBuZHcpCiB7CiAJLyogQWxpZ24gcmVxdWVzdGVkIHNpemUgd2l0aCBwYWRkaW5n IHNvIHVubG9ja19jb21taXQgY2FuCiAJICogcGFkIHNhZmVseSAqLwotCW5kdyA9IChuZHcgKyBy aW5nLT5hbGlnbl9tYXNrKSAmIH5yaW5nLT5hbGlnbl9tYXNrOworCW5kdyA9IChuZHcgKyByaW5n LT5mdW5jcy0+YWxpZ25fbWFzaykgJiB+cmluZy0+ZnVuY3MtPmFsaWduX21hc2s7CiAKIAkvKiBN YWtlIHN1cmUgd2UgYXJlbid0IHRyeWluZyB0byBhbGxvY2F0ZSBtb3JlIHNwYWNlCiAJICogdGhh biB0aGUgbWF4aW11bSBmb3Igb25lIHN1Ym1pc3Npb24KQEAgLTk0LDcgKzk0LDcgQEAgdm9pZCBh bWRncHVfcmluZ19pbnNlcnRfbm9wKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZywgdWludDMyX3Qg Y291bnQpCiAJaW50IGk7CiAKIAlmb3IgKGkgPSAwOyBpIDwgY291bnQ7IGkrKykKLQkJYW1kZ3B1 X3Jpbmdfd3JpdGUocmluZywgcmluZy0+bm9wKTsKKwkJYW1kZ3B1X3Jpbmdfd3JpdGUocmluZywg cmluZy0+ZnVuY3MtPm5vcCk7CiB9CiAKIC8qKiBhbWRncHVfcmluZ19nZW5lcmljX3BhZF9pYiAt IHBhZCBJQiB3aXRoIE5PUCBwYWNrZXRzCkBAIC0xMDYsOCArMTA2LDggQEAgdm9pZCBhbWRncHVf cmluZ19pbnNlcnRfbm9wKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZywgdWludDMyX3QgY291bnQp CiAgKi8KIHZvaWQgYW1kZ3B1X3JpbmdfZ2VuZXJpY19wYWRfaWIoc3RydWN0IGFtZGdwdV9yaW5n ICpyaW5nLCBzdHJ1Y3QgYW1kZ3B1X2liICppYikKIHsKLQl3aGlsZSAoaWItPmxlbmd0aF9kdyAm IHJpbmctPmFsaWduX21hc2spCi0JCWliLT5wdHJbaWItPmxlbmd0aF9kdysrXSA9IHJpbmctPm5v cDsKKwl3aGlsZSAoaWItPmxlbmd0aF9kdyAmIHJpbmctPmZ1bmNzLT5hbGlnbl9tYXNrKQorCQlp Yi0+cHRyW2liLT5sZW5ndGhfZHcrK10gPSByaW5nLT5mdW5jcy0+bm9wOwogfQogCiAvKioKQEAg LTEyNSw4ICsxMjUsOSBAQCB2b2lkIGFtZGdwdV9yaW5nX2NvbW1pdChzdHJ1Y3QgYW1kZ3B1X3Jp bmcgKnJpbmcpCiAJdWludDMyX3QgY291bnQ7CiAKIAkvKiBXZSBwYWQgdG8gbWF0Y2ggZmV0Y2gg c2l6ZSAqLwotCWNvdW50ID0gcmluZy0+YWxpZ25fbWFzayArIDEgLSAocmluZy0+d3B0ciAmIHJp bmctPmFsaWduX21hc2spOwotCWNvdW50ICU9IHJpbmctPmFsaWduX21hc2sgKyAxOworCWNvdW50 ID0gcmluZy0+ZnVuY3MtPmFsaWduX21hc2sgKyAxIC0KKwkJKHJpbmctPndwdHIgJiByaW5nLT5m dW5jcy0+YWxpZ25fbWFzayk7CisJY291bnQgJT0gcmluZy0+ZnVuY3MtPmFsaWduX21hc2sgKyAx OwogCXJpbmctPmZ1bmNzLT5pbnNlcnRfbm9wKHJpbmcsIGNvdW50KTsKIAogCW1iKCk7CkBAIC0x NjMsOCArMTY0LDggQEAgdm9pZCBhbWRncHVfcmluZ191bmRvKHN0cnVjdCBhbWRncHVfcmluZyAq cmluZykKICAqIFJldHVybnMgMCBvbiBzdWNjZXNzLCBlcnJvciBvbiBmYWlsdXJlLgogICovCiBp bnQgYW1kZ3B1X3JpbmdfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgc3RydWN0IGFt ZGdwdV9yaW5nICpyaW5nLAotCQkgICAgIHVuc2lnbmVkIG1heF9kdywgdTMyIG5vcCwgdTMyIGFs aWduX21hc2ssCi0JCSAgICAgc3RydWN0IGFtZGdwdV9pcnFfc3JjICppcnFfc3JjLCB1bnNpZ25l ZCBpcnFfdHlwZSkKKwkJICAgICB1bnNpZ25lZCBtYXhfZHcsIHN0cnVjdCBhbWRncHVfaXJxX3Ny YyAqaXJxX3NyYywKKwkJICAgICB1bnNpZ25lZCBpcnFfdHlwZSkKIHsKIAlpbnQgcjsKIApAQCAt MjE1LDggKzIxNiw2IEBAIGludCBhbWRncHVfcmluZ19pbml0KHN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2LCBzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsCiAKIAlyaW5nLT5yaW5nX3NpemUgPSBy b3VuZHVwX3Bvd19vZl90d28obWF4X2R3ICogNCAqCiAJCQkJCSAgICAgYW1kZ3B1X3NjaGVkX2h3 X3N1Ym1pc3Npb24pOwotCXJpbmctPmFsaWduX21hc2sgPSBhbGlnbl9tYXNrOwotCXJpbmctPm5v cCA9IG5vcDsKIAogCS8qIEFsbG9jYXRlIHJpbmcgYnVmZmVyICovCiAJaWYgKHJpbmctPnJpbmdf b2JqID09IE5VTEwpIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Ft ZGdwdV9yaW5nLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcmluZy5oCmlu ZGV4IDZjZjg5YzkuLjFlZTFiNjUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdV9yaW5nLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 X3JpbmcuaApAQCAtOTMsNiArOTMsOCBAQCB1bnNpZ25lZCBhbWRncHVfZmVuY2VfY291bnRfZW1p dHRlZChzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpOwogLyogcHJvdmlkZWQgYnkgaHcgYmxvY2tz IHRoYXQgZXhwb3NlIGEgcmluZyBidWZmZXIgZm9yIGNvbW1hbmRzICovCiBzdHJ1Y3QgYW1kZ3B1 X3JpbmdfZnVuY3MgewogCWVudW0gYW1kZ3B1X3JpbmdfdHlwZQl0eXBlOworCXVpbnQzMl90CQlh bGlnbl9tYXNrOworCXUzMgkJCW5vcDsKIAogCS8qIHJpbmcgcmVhZC93cml0ZSBwdHIgaGFuZGxp bmcgKi8KIAl1MzIgKCpnZXRfcnB0cikoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKTsKQEAgLTE0 OSwxMCArMTUxLDggQEAgc3RydWN0IGFtZGdwdV9yaW5nIHsKIAl1bnNpZ25lZAkJbWF4X2R3Owog CWludAkJCWNvdW50X2R3OwogCXVpbnQ2NF90CQlncHVfYWRkcjsKLQl1aW50MzJfdAkJYWxpZ25f bWFzazsKIAl1aW50MzJfdAkJcHRyX21hc2s7CiAJYm9vbAkJCXJlYWR5OwotCXUzMgkJCW5vcDsK IAl1MzIJCQlpZHg7CiAJdTMyCQkJbWU7CiAJdTMyCQkJcGlwZTsKQEAgLTE3OCw4ICsxNzgsOCBA QCB2b2lkIGFtZGdwdV9yaW5nX2dlbmVyaWNfcGFkX2liKHN0cnVjdCBhbWRncHVfcmluZyAqcmlu Zywgc3RydWN0IGFtZGdwdV9pYiAqaWIpOwogdm9pZCBhbWRncHVfcmluZ19jb21taXQoc3RydWN0 IGFtZGdwdV9yaW5nICpyaW5nKTsKIHZvaWQgYW1kZ3B1X3JpbmdfdW5kbyhzdHJ1Y3QgYW1kZ3B1 X3JpbmcgKnJpbmcpOwogaW50IGFtZGdwdV9yaW5nX2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYsIHN0cnVjdCBhbWRncHVfcmluZyAqcmluZywKLQkJICAgICB1bnNpZ25lZCByaW5nX3Np emUsIHUzMiBub3AsIHUzMiBhbGlnbl9tYXNrLAotCQkgICAgIHN0cnVjdCBhbWRncHVfaXJxX3Ny YyAqaXJxX3NyYywgdW5zaWduZWQgaXJxX3R5cGUpOworCQkgICAgIHVuc2lnbmVkIHJpbmdfc2l6 ZSwgc3RydWN0IGFtZGdwdV9pcnFfc3JjICppcnFfc3JjLAorCQkgICAgIHVuc2lnbmVkIGlycV90 eXBlKTsKIHZvaWQgYW1kZ3B1X3JpbmdfZmluaShzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpOwog CiAjZW5kaWYKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Npa19zZG1h LmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9jaWtfc2RtYS5jCmluZGV4IGY5MWYwMmYu LjY2NGY4OTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Npa19zZG1h LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvY2lrX3NkbWEuYwpAQCAtMjA1LDEw ICsyMDUsMTAgQEAgc3RhdGljIHZvaWQgY2lrX3NkbWFfcmluZ19pbnNlcnRfbm9wKHN0cnVjdCBh bWRncHVfcmluZyAqcmluZywgdWludDMyX3QgY291bnQpCiAKIAlmb3IgKGkgPSAwOyBpIDwgY291 bnQ7IGkrKykKIAkJaWYgKHNkbWEgJiYgc2RtYS0+YnVyc3Rfbm9wICYmIChpID09IDApKQotCQkJ YW1kZ3B1X3Jpbmdfd3JpdGUocmluZywgcmluZy0+bm9wIHwKKwkJCWFtZGdwdV9yaW5nX3dyaXRl KHJpbmcsIHJpbmctPmZ1bmNzLT5ub3AgfAogCQkJCQkgIFNETUFfTk9QX0NPVU5UKGNvdW50IC0g MSkpOwogCQllbHNlCi0JCQlhbWRncHVfcmluZ193cml0ZShyaW5nLCByaW5nLT5ub3ApOworCQkJ YW1kZ3B1X3Jpbmdfd3JpdGUocmluZywgcmluZy0+ZnVuY3MtPm5vcCk7CiB9CiAKIC8qKgpAQCAt OTQyLDcgKzk0Miw2IEBAIHN0YXRpYyBpbnQgY2lrX3NkbWFfc3dfaW5pdCh2b2lkICpoYW5kbGUp CiAJCXJpbmctPnJpbmdfb2JqID0gTlVMTDsKIAkJc3ByaW50ZihyaW5nLT5uYW1lLCAic2RtYSVk IiwgaSk7CiAJCXIgPSBhbWRncHVfcmluZ19pbml0KGFkZXYsIHJpbmcsIDEwMjQsCi0JCQkJICAg ICBTRE1BX1BBQ0tFVChTRE1BX09QQ09ERV9OT1AsIDAsIDApLCAweGYsCiAJCQkJICAgICAmYWRl di0+c2RtYS50cmFwX2lycSwKIAkJCQkgICAgIChpID09IDApID8KIAkJCQkgICAgIEFNREdQVV9T RE1BX0lSUV9UUkFQMCA6CkBAIC0xMjA3LDYgKzEyMDYsOCBAQCBjb25zdCBzdHJ1Y3QgYW1kX2lw X2Z1bmNzIGNpa19zZG1hX2lwX2Z1bmNzID0gewogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGFtZGdw dV9yaW5nX2Z1bmNzIGNpa19zZG1hX3JpbmdfZnVuY3MgPSB7CiAJLnR5cGUgPSBBTURHUFVfUklO R19UWVBFX1NETUEsCisJLmFsaWduX21hc2sgPSAweGYsCisJLm5vcCA9IFNETUFfUEFDS0VUKFNE TUFfT1BDT0RFX05PUCwgMCwgMCksCiAJLmdldF9ycHRyID0gY2lrX3NkbWFfcmluZ19nZXRfcnB0 ciwKIAkuZ2V0X3dwdHIgPSBjaWtfc2RtYV9yaW5nX2dldF93cHRyLAogCS5zZXRfd3B0ciA9IGNp a19zZG1hX3Jpbmdfc2V0X3dwdHIsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9nZnhfdjZfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y2XzAuYwpp bmRleCAxZjg2ODdmZC4uMzY3YjE0ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvZ2Z4X3Y2XzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjZf MC5jCkBAIC0yODY5LDcgKzI4NjksNiBAQCBzdGF0aWMgaW50IGdmeF92Nl8wX3N3X2luaXQodm9p ZCAqaGFuZGxlKQogCQlyaW5nLT5yaW5nX29iaiA9IE5VTEw7CiAJCXNwcmludGYocmluZy0+bmFt ZSwgImdmeCIpOwogCQlyID0gYW1kZ3B1X3JpbmdfaW5pdChhZGV2LCByaW5nLCAxMDI0LAotCQkJ CSAgICAgMHg4MDAwMDAwMCwgMHhmZiwKIAkJCQkgICAgICZhZGV2LT5nZnguZW9wX2lycSwgQU1E R1BVX0NQX0lSUV9HRlhfRU9QKTsKIAkJaWYgKHIpCiAJCQlyZXR1cm4gcjsKQEAgLTI4OTIsNyAr Mjg5MSw2IEBAIHN0YXRpYyBpbnQgZ2Z4X3Y2XzBfc3dfaW5pdCh2b2lkICpoYW5kbGUpCiAJCXNw cmludGYocmluZy0+bmFtZSwgImNvbXAgJWQuJWQuJWQiLCByaW5nLT5tZSwgcmluZy0+cGlwZSwg cmluZy0+cXVldWUpOwogCQlpcnFfdHlwZSA9IEFNREdQVV9DUF9JUlFfQ09NUFVURV9NRUMxX1BJ UEUwX0VPUCArIHJpbmctPnBpcGU7CiAJCXIgPSBhbWRncHVfcmluZ19pbml0KGFkZXYsIHJpbmcs IDEwMjQsCi0JCQkJICAgICAweDgwMDAwMDAwLCAweGZmLAogCQkJCSAgICAgJmFkZXYtPmdmeC5l b3BfaXJxLCBpcnFfdHlwZSk7CiAJCWlmIChyKQogCQkJcmV0dXJuIHI7CkBAIC0zMjI3LDYgKzMy MjUsOCBAQCBjb25zdCBzdHJ1Y3QgYW1kX2lwX2Z1bmNzIGdmeF92Nl8wX2lwX2Z1bmNzID0gewog CiBzdGF0aWMgY29uc3Qgc3RydWN0IGFtZGdwdV9yaW5nX2Z1bmNzIGdmeF92Nl8wX3JpbmdfZnVu Y3NfZ2Z4ID0gewogCS50eXBlID0gQU1ER1BVX1JJTkdfVFlQRV9HRlgsCisJLmFsaWduX21hc2sg PSAweGZmLAorCS5ub3AgPSAweDgwMDAwMDAwLAogCS5nZXRfcnB0ciA9IGdmeF92Nl8wX3Jpbmdf Z2V0X3JwdHIsCiAJLmdldF93cHRyID0gZ2Z4X3Y2XzBfcmluZ19nZXRfd3B0ciwKIAkuc2V0X3dw dHIgPSBnZnhfdjZfMF9yaW5nX3NldF93cHRyX2dmeCwKQEAgLTMyNTIsNiArMzI1Miw4IEBAIHN0 YXRpYyBjb25zdCBzdHJ1Y3QgYW1kZ3B1X3JpbmdfZnVuY3MgZ2Z4X3Y2XzBfcmluZ19mdW5jc19n ZnggPSB7CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgYW1kZ3B1X3JpbmdfZnVuY3MgZ2Z4X3Y2XzBf cmluZ19mdW5jc19jb21wdXRlID0gewogCS50eXBlID0gQU1ER1BVX1JJTkdfVFlQRV9DT01QVVRF LAorCS5hbGlnbl9tYXNrID0gMHhmZiwKKwkubm9wID0gMHg4MDAwMDAwMCwKIAkuZ2V0X3JwdHIg PSBnZnhfdjZfMF9yaW5nX2dldF9ycHRyLAogCS5nZXRfd3B0ciA9IGdmeF92Nl8wX3JpbmdfZ2V0 X3dwdHIsCiAJLnNldF93cHRyID0gZ2Z4X3Y2XzBfcmluZ19zZXRfd3B0cl9jb21wdXRlLApkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y3XzAuYyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92N18wLmMKaW5kZXggYmUzODgxZS4uMTVmMjRiZCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y3XzAuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjdfMC5jCkBAIC00NjA1LDcgKzQ2MDUsNiBAQCBz dGF0aWMgaW50IGdmeF92N18wX3N3X2luaXQodm9pZCAqaGFuZGxlKQogCQlyaW5nLT5yaW5nX29i aiA9IE5VTEw7CiAJCXNwcmludGYocmluZy0+bmFtZSwgImdmeCIpOwogCQlyID0gYW1kZ3B1X3Jp bmdfaW5pdChhZGV2LCByaW5nLCAxMDI0LAotCQkJCSAgICAgUEFDS0VUMyhQQUNLRVQzX05PUCwg MHgzRkZGKSwgMHhmZiwKIAkJCQkgICAgICZhZGV2LT5nZnguZW9wX2lycSwgQU1ER1BVX0NQX0lS UV9HRlhfRU9QKTsKIAkJaWYgKHIpCiAJCQlyZXR1cm4gcjsKQEAgLTQ2MzEsNyArNDYzMCw2IEBA IHN0YXRpYyBpbnQgZ2Z4X3Y3XzBfc3dfaW5pdCh2b2lkICpoYW5kbGUpCiAJCWlycV90eXBlID0g QU1ER1BVX0NQX0lSUV9DT01QVVRFX01FQzFfUElQRTBfRU9QICsgcmluZy0+cGlwZTsKIAkJLyog dHlwZS0yIHBhY2tldHMgYXJlIGRlcHJlY2F0ZWQgb24gTUVDLCB1c2UgdHlwZS0zIGluc3RlYWQg Ki8KIAkJciA9IGFtZGdwdV9yaW5nX2luaXQoYWRldiwgcmluZywgMTAyNCwKLQkJCQkgICAgIFBB Q0tFVDMoUEFDS0VUM19OT1AsIDB4M0ZGRiksIDB4ZmYsCiAJCQkJICAgICAmYWRldi0+Z2Z4LmVv cF9pcnEsIGlycV90eXBlKTsKIAkJaWYgKHIpCiAJCQlyZXR1cm4gcjsKQEAgLTUxMDIsNiArNTEw MCw4IEBAIGNvbnN0IHN0cnVjdCBhbWRfaXBfZnVuY3MgZ2Z4X3Y3XzBfaXBfZnVuY3MgPSB7CiAK IHN0YXRpYyBjb25zdCBzdHJ1Y3QgYW1kZ3B1X3JpbmdfZnVuY3MgZ2Z4X3Y3XzBfcmluZ19mdW5j c19nZnggPSB7CiAJLnR5cGUgPSBBTURHUFVfUklOR19UWVBFX0dGWCwKKwkuYWxpZ25fbWFzayA9 IDB4ZmYsCisJLm5vcCA9IFBBQ0tFVDMoUEFDS0VUM19OT1AsIDB4M0ZGRiksCiAJLmdldF9ycHRy ID0gZ2Z4X3Y3XzBfcmluZ19nZXRfcnB0ciwKIAkuZ2V0X3dwdHIgPSBnZnhfdjdfMF9yaW5nX2dl dF93cHRyX2dmeCwKIAkuc2V0X3dwdHIgPSBnZnhfdjdfMF9yaW5nX3NldF93cHRyX2dmeCwKQEAg LTUxMzAsNiArNTEzMCw4IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgYW1kZ3B1X3JpbmdfZnVuY3Mg Z2Z4X3Y3XzBfcmluZ19mdW5jc19nZnggPSB7CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgYW1kZ3B1 X3JpbmdfZnVuY3MgZ2Z4X3Y3XzBfcmluZ19mdW5jc19jb21wdXRlID0gewogCS50eXBlID0gQU1E R1BVX1JJTkdfVFlQRV9DT01QVVRFLAorCS5hbGlnbl9tYXNrID0gMHhmZiwKKwkubm9wID0gUEFD S0VUMyhQQUNLRVQzX05PUCwgMHgzRkZGKSwKIAkuZ2V0X3JwdHIgPSBnZnhfdjdfMF9yaW5nX2dl dF9ycHRyLAogCS5nZXRfd3B0ciA9IGdmeF92N18wX3JpbmdfZ2V0X3dwdHJfY29tcHV0ZSwKIAku c2V0X3dwdHIgPSBnZnhfdjdfMF9yaW5nX3NldF93cHRyX2NvbXB1dGUsCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjhfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvZ2Z4X3Y4XzAuYwppbmRleCAwZDY2ZjQ5Li41MWYxMTM5IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjhfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L2dmeF92OF8wLmMKQEAgLTIwNjEsOSArMjA2MSw4IEBAIHN0YXRpYyBpbnQg Z2Z4X3Y4XzBfc3dfaW5pdCh2b2lkICpoYW5kbGUpCiAJCQlyaW5nLT5kb29yYmVsbF9pbmRleCA9 IEFNREdQVV9ET09SQkVMTF9HRlhfUklORzA7CiAJCX0KIAotCQlyID0gYW1kZ3B1X3JpbmdfaW5p dChhZGV2LCByaW5nLCAxMDI0LAotCQkJCSAgICAgUEFDS0VUMyhQQUNLRVQzX05PUCwgMHgzRkZG KSwgMHhmZiwKLQkJCQkgICAgICZhZGV2LT5nZnguZW9wX2lycSwgQU1ER1BVX0NQX0lSUV9HRlhf RU9QKTsKKwkJciA9IGFtZGdwdV9yaW5nX2luaXQoYWRldiwgcmluZywgMTAyNCwgJmFkZXYtPmdm eC5lb3BfaXJxLAorCQkJCSAgICAgQU1ER1BVX0NQX0lSUV9HRlhfRU9QKTsKIAkJaWYgKHIpCiAJ CQlyZXR1cm4gcjsKIAl9CkBAIC0yMDg3LDkgKzIwODYsOCBAQCBzdGF0aWMgaW50IGdmeF92OF8w X3N3X2luaXQodm9pZCAqaGFuZGxlKQogCQlzcHJpbnRmKHJpbmctPm5hbWUsICJjb21wXyVkLiVk LiVkIiwgcmluZy0+bWUsIHJpbmctPnBpcGUsIHJpbmctPnF1ZXVlKTsKIAkJaXJxX3R5cGUgPSBB TURHUFVfQ1BfSVJRX0NPTVBVVEVfTUVDMV9QSVBFMF9FT1AgKyByaW5nLT5waXBlOwogCQkvKiB0 eXBlLTIgcGFja2V0cyBhcmUgZGVwcmVjYXRlZCBvbiBNRUMsIHVzZSB0eXBlLTMgaW5zdGVhZCAq LwotCQlyID0gYW1kZ3B1X3JpbmdfaW5pdChhZGV2LCByaW5nLCAxMDI0LAotCQkJCSAgICAgUEFD S0VUMyhQQUNLRVQzX05PUCwgMHgzRkZGKSwgMHhmZiwKLQkJCQkgICAgICZhZGV2LT5nZnguZW9w X2lycSwgaXJxX3R5cGUpOworCQlyID0gYW1kZ3B1X3JpbmdfaW5pdChhZGV2LCByaW5nLCAxMDI0 LCAmYWRldi0+Z2Z4LmVvcF9pcnEsCisJCQkJICAgICBpcnFfdHlwZSk7CiAJCWlmIChyKQogCQkJ cmV0dXJuIHI7CiAJfQpAQCAtNjUzMiw2ICs2NTMwLDggQEAgY29uc3Qgc3RydWN0IGFtZF9pcF9m dW5jcyBnZnhfdjhfMF9pcF9mdW5jcyA9IHsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBhbWRncHVf cmluZ19mdW5jcyBnZnhfdjhfMF9yaW5nX2Z1bmNzX2dmeCA9IHsKIAkudHlwZSA9IEFNREdQVV9S SU5HX1RZUEVfR0ZYLAorCS5hbGlnbl9tYXNrID0gMHhmZiwKKwkubm9wID0gUEFDS0VUMyhQQUNL RVQzX05PUCwgMHgzRkZGKSwKIAkuZ2V0X3JwdHIgPSBnZnhfdjhfMF9yaW5nX2dldF9ycHRyLAog CS5nZXRfd3B0ciA9IGdmeF92OF8wX3JpbmdfZ2V0X3dwdHJfZ2Z4LAogCS5zZXRfd3B0ciA9IGdm eF92OF8wX3Jpbmdfc2V0X3dwdHJfZ2Z4LApAQCAtNjU2Miw2ICs2NTYyLDggQEAgc3RhdGljIGNv bnN0IHN0cnVjdCBhbWRncHVfcmluZ19mdW5jcyBnZnhfdjhfMF9yaW5nX2Z1bmNzX2dmeCA9IHsK IAogc3RhdGljIGNvbnN0IHN0cnVjdCBhbWRncHVfcmluZ19mdW5jcyBnZnhfdjhfMF9yaW5nX2Z1 bmNzX2NvbXB1dGUgPSB7CiAJLnR5cGUgPSBBTURHUFVfUklOR19UWVBFX0NPTVBVVEUsCisJLmFs aWduX21hc2sgPSAweGZmLAorCS5ub3AgPSBQQUNLRVQzKFBBQ0tFVDNfTk9QLCAweDNGRkYpLAog CS5nZXRfcnB0ciA9IGdmeF92OF8wX3JpbmdfZ2V0X3JwdHIsCiAJLmdldF93cHRyID0gZ2Z4X3Y4 XzBfcmluZ19nZXRfd3B0cl9jb21wdXRlLAogCS5zZXRfd3B0ciA9IGdmeF92OF8wX3Jpbmdfc2V0 X3dwdHJfY29tcHV0ZSwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3Nk bWFfdjJfNC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2RtYV92Ml80LmMKaW5kZXgg YjExYTgxZS4uNDljNDdkNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv c2RtYV92Ml80LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2RtYV92Ml80LmMK QEAgLTIzNiwxMCArMjM2LDEwIEBAIHN0YXRpYyB2b2lkIHNkbWFfdjJfNF9yaW5nX2luc2VydF9u b3Aoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLCB1aW50MzJfdCBjb3VudCkKIAogCWZvciAoaSA9 IDA7IGkgPCBjb3VudDsgaSsrKQogCQlpZiAoc2RtYSAmJiBzZG1hLT5idXJzdF9ub3AgJiYgKGkg PT0gMCkpCi0JCQlhbWRncHVfcmluZ193cml0ZShyaW5nLCByaW5nLT5ub3AgfAorCQkJYW1kZ3B1 X3Jpbmdfd3JpdGUocmluZywgcmluZy0+ZnVuY3MtPm5vcCB8CiAJCQkJU0RNQV9QS1RfTk9QX0hF QURFUl9DT1VOVChjb3VudCAtIDEpKTsKIAkJZWxzZQotCQkJYW1kZ3B1X3Jpbmdfd3JpdGUocmlu ZywgcmluZy0+bm9wKTsKKwkJCWFtZGdwdV9yaW5nX3dyaXRlKHJpbmcsIHJpbmctPmZ1bmNzLT5u b3ApOwogfQogCiAvKioKQEAgLTk1Myw3ICs5NTMsNiBAQCBzdGF0aWMgaW50IHNkbWFfdjJfNF9z d19pbml0KHZvaWQgKmhhbmRsZSkKIAkJcmluZy0+dXNlX2Rvb3JiZWxsID0gZmFsc2U7CiAJCXNw cmludGYocmluZy0+bmFtZSwgInNkbWElZCIsIGkpOwogCQlyID0gYW1kZ3B1X3JpbmdfaW5pdChh ZGV2LCByaW5nLCAxMDI0LAotCQkJCSAgICAgU0RNQV9QS1RfTk9QX0hFQURFUl9PUChTRE1BX09Q X05PUCksIDB4ZiwKIAkJCQkgICAgICZhZGV2LT5zZG1hLnRyYXBfaXJxLAogCQkJCSAgICAgKGkg PT0gMCkgPwogCQkJCSAgICAgQU1ER1BVX1NETUFfSVJRX1RSQVAwIDoKQEAgLTEyMTEsNiArMTIx MCw4IEBAIGNvbnN0IHN0cnVjdCBhbWRfaXBfZnVuY3Mgc2RtYV92Ml80X2lwX2Z1bmNzID0gewog CiBzdGF0aWMgY29uc3Qgc3RydWN0IGFtZGdwdV9yaW5nX2Z1bmNzIHNkbWFfdjJfNF9yaW5nX2Z1 bmNzID0gewogCS50eXBlID0gQU1ER1BVX1JJTkdfVFlQRV9TRE1BLAorCS5hbGlnbl9tYXNrID0g MHhmLAorCS5ub3AgPSBTRE1BX1BLVF9OT1BfSEVBREVSX09QKFNETUFfT1BfTk9QKSwKIAkuZ2V0 X3JwdHIgPSBzZG1hX3YyXzRfcmluZ19nZXRfcnB0ciwKIAkuZ2V0X3dwdHIgPSBzZG1hX3YyXzRf cmluZ19nZXRfd3B0ciwKIAkuc2V0X3dwdHIgPSBzZG1hX3YyXzRfcmluZ19zZXRfd3B0ciwKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3NkbWFfdjNfMC5jIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvc2RtYV92M18wLmMKaW5kZXggYWNjZjRkMS4uZjhlYzM3MCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2RtYV92M18wLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2RtYV92M18wLmMKQEAgLTM5NiwxMCArMzk2LDEw IEBAIHN0YXRpYyB2b2lkIHNkbWFfdjNfMF9yaW5nX2luc2VydF9ub3Aoc3RydWN0IGFtZGdwdV9y aW5nICpyaW5nLCB1aW50MzJfdCBjb3VudCkKIAogCWZvciAoaSA9IDA7IGkgPCBjb3VudDsgaSsr KQogCQlpZiAoc2RtYSAmJiBzZG1hLT5idXJzdF9ub3AgJiYgKGkgPT0gMCkpCi0JCQlhbWRncHVf cmluZ193cml0ZShyaW5nLCByaW5nLT5ub3AgfAorCQkJYW1kZ3B1X3Jpbmdfd3JpdGUocmluZywg cmluZy0+ZnVuY3MtPm5vcCB8CiAJCQkJU0RNQV9QS1RfTk9QX0hFQURFUl9DT1VOVChjb3VudCAt IDEpKTsKIAkJZWxzZQotCQkJYW1kZ3B1X3Jpbmdfd3JpdGUocmluZywgcmluZy0+bm9wKTsKKwkJ CWFtZGdwdV9yaW5nX3dyaXRlKHJpbmcsIHJpbmctPmZ1bmNzLT5ub3ApOwogfQogCiAvKioKQEAg LTExNjUsNyArMTE2NSw2IEBAIHN0YXRpYyBpbnQgc2RtYV92M18wX3N3X2luaXQodm9pZCAqaGFu ZGxlKQogCiAJCXNwcmludGYocmluZy0+bmFtZSwgInNkbWElZCIsIGkpOwogCQlyID0gYW1kZ3B1 X3JpbmdfaW5pdChhZGV2LCByaW5nLCAxMDI0LAotCQkJCSAgICAgU0RNQV9QS1RfTk9QX0hFQURF Ul9PUChTRE1BX09QX05PUCksIDB4ZiwKIAkJCQkgICAgICZhZGV2LT5zZG1hLnRyYXBfaXJxLAog CQkJCSAgICAgKGkgPT0gMCkgPwogCQkJCSAgICAgQU1ER1BVX1NETUFfSVJRX1RSQVAwIDoKQEAg LTE1NTYsNiArMTU1NSw4IEBAIGNvbnN0IHN0cnVjdCBhbWRfaXBfZnVuY3Mgc2RtYV92M18wX2lw X2Z1bmNzID0gewogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGFtZGdwdV9yaW5nX2Z1bmNzIHNkbWFf djNfMF9yaW5nX2Z1bmNzID0gewogCS50eXBlID0gQU1ER1BVX1JJTkdfVFlQRV9TRE1BLAorCS5h bGlnbl9tYXNrID0gMHhmLAorCS5ub3AgPSBTRE1BX1BLVF9OT1BfSEVBREVSX09QKFNETUFfT1Bf Tk9QKSwKIAkuZ2V0X3JwdHIgPSBzZG1hX3YzXzBfcmluZ19nZXRfcnB0ciwKIAkuZ2V0X3dwdHIg PSBzZG1hX3YzXzBfcmluZ19nZXRfd3B0ciwKIAkuc2V0X3dwdHIgPSBzZG1hX3YzXzBfcmluZ19z ZXRfd3B0ciwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3NpX2RtYS5j IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2lfZG1hLmMKaW5kZXggMWFlZTQ1Yi4uN2Zl Y2UxZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2lfZG1hLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2lfZG1hLmMKQEAgLTUzMSw3ICs1MzEsNiBA QCBzdGF0aWMgaW50IHNpX2RtYV9zd19pbml0KHZvaWQgKmhhbmRsZSkKIAkJcmluZy0+dXNlX2Rv b3JiZWxsID0gZmFsc2U7CiAJCXNwcmludGYocmluZy0+bmFtZSwgInNkbWElZCIsIGkpOwogCQly ID0gYW1kZ3B1X3JpbmdfaW5pdChhZGV2LCByaW5nLCAxMDI0LAotCQkJCSAgICAgRE1BX1BBQ0tF VChETUFfUEFDS0VUX05PUCwgMCwgMCwgMCwgMCksIDB4ZiwKIAkJCQkgICAgICZhZGV2LT5zZG1h LnRyYXBfaXJxLAogCQkJCSAgICAgKGkgPT0gMCkgPwogCQkJCSAgICAgQU1ER1BVX1NETUFfSVJR X1RSQVAwIDoKQEAgLTc2NSw2ICs3NjQsOCBAQCBjb25zdCBzdHJ1Y3QgYW1kX2lwX2Z1bmNzIHNp X2RtYV9pcF9mdW5jcyA9IHsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBhbWRncHVfcmluZ19mdW5j cyBzaV9kbWFfcmluZ19mdW5jcyA9IHsKIAkudHlwZSA9IEFNREdQVV9SSU5HX1RZUEVfU0RNQSwK KwkuYWxpZ25fbWFzayA9IDB4ZiwKKwkubm9wID0gRE1BX1BBQ0tFVChETUFfUEFDS0VUX05PUCwg MCwgMCwgMCwgMCksCiAJLmdldF9ycHRyID0gc2lfZG1hX3JpbmdfZ2V0X3JwdHIsCiAJLmdldF93 cHRyID0gc2lfZG1hX3JpbmdfZ2V0X3dwdHIsCiAJLnNldF93cHRyID0gc2lfZG1hX3Jpbmdfc2V0 X3dwdHIsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS91dmRfdjRfMi5j IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdXZkX3Y0XzIuYwppbmRleCA1NWFmOGFjLi4x YmFiNzVhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS91dmRfdjRfMi5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3V2ZF92NF8yLmMKQEAgLTExNiw4ICsx MTYsNyBAQCBzdGF0aWMgaW50IHV2ZF92NF8yX3N3X2luaXQodm9pZCAqaGFuZGxlKQogCiAJcmlu ZyA9ICZhZGV2LT51dmQucmluZzsKIAlzcHJpbnRmKHJpbmctPm5hbWUsICJ1dmQiKTsKLQlyID0g YW1kZ3B1X3JpbmdfaW5pdChhZGV2LCByaW5nLCA1MTIsIFBBQ0tFVDAobW1VVkRfTk9fT1AsIDAp LCAweGYsCi0JCQkgICAgICZhZGV2LT51dmQuaXJxLCAwKTsKKwlyID0gYW1kZ3B1X3JpbmdfaW5p dChhZGV2LCByaW5nLCA1MTIsICZhZGV2LT51dmQuaXJxLCAwKTsKIAogCXJldHVybiByOwogfQpA QCAtNzQzLDYgKzc0Miw4IEBAIGNvbnN0IHN0cnVjdCBhbWRfaXBfZnVuY3MgdXZkX3Y0XzJfaXBf ZnVuY3MgPSB7CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgYW1kZ3B1X3JpbmdfZnVuY3MgdXZkX3Y0 XzJfcmluZ19mdW5jcyA9IHsKIAkudHlwZSA9IEFNREdQVV9SSU5HX1RZUEVfVVZELAorCS5hbGln bl9tYXNrID0gMHhmLAorCS5ub3AgPSBQQUNLRVQwKG1tVVZEX05PX09QLCAwKSwKIAkuZ2V0X3Jw dHIgPSB1dmRfdjRfMl9yaW5nX2dldF9ycHRyLAogCS5nZXRfd3B0ciA9IHV2ZF92NF8yX3Jpbmdf Z2V0X3dwdHIsCiAJLnNldF93cHRyID0gdXZkX3Y0XzJfcmluZ19zZXRfd3B0ciwKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3V2ZF92NV8wLmMgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS91dmRfdjVfMC5jCmluZGV4IDIxZTcyNWIuLmVjODQ4ZmMgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3V2ZF92NV8wLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvdXZkX3Y1XzAuYwpAQCAtMTEyLDggKzExMiw3IEBAIHN0YXRpYyBp bnQgdXZkX3Y1XzBfc3dfaW5pdCh2b2lkICpoYW5kbGUpCiAKIAlyaW5nID0gJmFkZXYtPnV2ZC5y aW5nOwogCXNwcmludGYocmluZy0+bmFtZSwgInV2ZCIpOwotCXIgPSBhbWRncHVfcmluZ19pbml0 KGFkZXYsIHJpbmcsIDUxMiwgUEFDS0VUMChtbVVWRF9OT19PUCwgMCksIDB4ZiwKLQkJCSAgICAg JmFkZXYtPnV2ZC5pcnEsIDApOworCXIgPSBhbWRncHVfcmluZ19pbml0KGFkZXYsIHJpbmcsIDUx MiwgJmFkZXYtPnV2ZC5pcnEsIDApOwogCiAJcmV0dXJuIHI7CiB9CkBAIC03OTQsNiArNzkzLDgg QEAgY29uc3Qgc3RydWN0IGFtZF9pcF9mdW5jcyB1dmRfdjVfMF9pcF9mdW5jcyA9IHsKIAogc3Rh dGljIGNvbnN0IHN0cnVjdCBhbWRncHVfcmluZ19mdW5jcyB1dmRfdjVfMF9yaW5nX2Z1bmNzID0g ewogCS50eXBlID0gQU1ER1BVX1JJTkdfVFlQRV9VVkQsCisJLmFsaWduX21hc2sgPSAweGYsCisJ Lm5vcCA9IFBBQ0tFVDAobW1VVkRfTk9fT1AsIDApLAogCS5nZXRfcnB0ciA9IHV2ZF92NV8wX3Jp bmdfZ2V0X3JwdHIsCiAJLmdldF93cHRyID0gdXZkX3Y1XzBfcmluZ19nZXRfd3B0ciwKIAkuc2V0 X3dwdHIgPSB1dmRfdjVfMF9yaW5nX3NldF93cHRyLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvdXZkX3Y2XzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3V2 ZF92Nl8wLmMKaW5kZXggMmNlMTgxOC4uMTU3MDhmOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvdXZkX3Y2XzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS91dmRfdjZfMC5jCkBAIC0xMTYsOCArMTE2LDcgQEAgc3RhdGljIGludCB1dmRfdjZfMF9zd19p bml0KHZvaWQgKmhhbmRsZSkKIAogCXJpbmcgPSAmYWRldi0+dXZkLnJpbmc7CiAJc3ByaW50Zihy aW5nLT5uYW1lLCAidXZkIik7Ci0JciA9IGFtZGdwdV9yaW5nX2luaXQoYWRldiwgcmluZywgNTEy LCBQQUNLRVQwKG1tVVZEX05PX09QLCAwKSwgMHhmLAotCQkJICAgICAmYWRldi0+dXZkLmlycSwg MCk7CisJciA9IGFtZGdwdV9yaW5nX2luaXQoYWRldiwgcmluZywgNTEyLCAmYWRldi0+dXZkLmly cSwgMCk7CiAKIAlyZXR1cm4gcjsKIH0KQEAgLTEwNDcsNiArMTA0Niw4IEBAIHN0YXRpYyBjb25z dCBzdHJ1Y3QgYW1kZ3B1X3JpbmdfZnVuY3MgdXZkX3Y2XzBfcmluZ19waHlzX2Z1bmNzID0gewog CiBzdGF0aWMgY29uc3Qgc3RydWN0IGFtZGdwdV9yaW5nX2Z1bmNzIHV2ZF92Nl8wX3Jpbmdfdm1f ZnVuY3MgPSB7CiAJLnR5cGUgPSBBTURHUFVfUklOR19UWVBFX1VWRCwKKwkuYWxpZ25fbWFzayA9 IDB4ZiwKKwkubm9wID0gUEFDS0VUMChtbVVWRF9OT19PUCwgMCksCiAJLmdldF9ycHRyID0gdXZk X3Y2XzBfcmluZ19nZXRfcnB0ciwKIAkuZ2V0X3dwdHIgPSB1dmRfdjZfMF9yaW5nX2dldF93cHRy LAogCS5zZXRfd3B0ciA9IHV2ZF92Nl8wX3Jpbmdfc2V0X3dwdHIsCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92Y2VfdjJfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvdmNlX3YyXzAuYwppbmRleCBjZjBjNjhmLi5kNTg1ODM5IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92Y2VfdjJfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L3ZjZV92Ml8wLmMKQEAgLTIyNCw3ICsyMjQsNyBAQCBzdGF0aWMgaW50IHZjZV92 Ml8wX3N3X2luaXQodm9pZCAqaGFuZGxlKQogCWZvciAoaSA9IDA7IGkgPCBhZGV2LT52Y2UubnVt X3JpbmdzOyBpKyspIHsKIAkJcmluZyA9ICZhZGV2LT52Y2UucmluZ1tpXTsKIAkJc3ByaW50Zihy aW5nLT5uYW1lLCAidmNlJWQiLCBpKTsKLQkJciA9IGFtZGdwdV9yaW5nX2luaXQoYWRldiwgcmlu ZywgNTEyLCBWQ0VfQ01EX05PX09QLCAweGYsCisJCXIgPSBhbWRncHVfcmluZ19pbml0KGFkZXYs IHJpbmcsIDUxMiwKIAkJCQkgICAgICZhZGV2LT52Y2UuaXJxLCAwKTsKIAkJaWYgKHIpCiAJCQly ZXR1cm4gcjsKQEAgLTYxMSw2ICs2MTEsOCBAQCBjb25zdCBzdHJ1Y3QgYW1kX2lwX2Z1bmNzIHZj ZV92Ml8wX2lwX2Z1bmNzID0gewogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGFtZGdwdV9yaW5nX2Z1 bmNzIHZjZV92Ml8wX3JpbmdfZnVuY3MgPSB7CiAJLnR5cGUgPSBBTURHUFVfUklOR19UWVBFX1ZD RSwKKwkuYWxpZ25fbWFzayA9IDB4ZiwKKwkubm9wID0gVkNFX0NNRF9OT19PUCwKIAkuZ2V0X3Jw dHIgPSB2Y2VfdjJfMF9yaW5nX2dldF9ycHRyLAogCS5nZXRfd3B0ciA9IHZjZV92Ml8wX3Jpbmdf Z2V0X3dwdHIsCiAJLnNldF93cHRyID0gdmNlX3YyXzBfcmluZ19zZXRfd3B0ciwKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3ZjZV92M18wLmMgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS92Y2VfdjNfMC5jCmluZGV4IDU2YTNmZWIuLmY3ZGJkMGQgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3ZjZV92M18wLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvdmNlX3YzXzAuYwpAQCAtMzg5LDggKzM4OSw3IEBAIHN0YXRpYyBp bnQgdmNlX3YzXzBfc3dfaW5pdCh2b2lkICpoYW5kbGUpCiAJZm9yIChpID0gMDsgaSA8IGFkZXYt PnZjZS5udW1fcmluZ3M7IGkrKykgewogCQlyaW5nID0gJmFkZXYtPnZjZS5yaW5nW2ldOwogCQlz cHJpbnRmKHJpbmctPm5hbWUsICJ2Y2UlZCIsIGkpOwotCQlyID0gYW1kZ3B1X3JpbmdfaW5pdChh ZGV2LCByaW5nLCA1MTIsIFZDRV9DTURfTk9fT1AsIDB4ZiwKLQkJCQkgICAgICZhZGV2LT52Y2Uu aXJxLCAwKTsKKwkJciA9IGFtZGdwdV9yaW5nX2luaXQoYWRldiwgcmluZywgNTEyLCAmYWRldi0+ dmNlLmlycSwgMCk7CiAJCWlmIChyKQogCQkJcmV0dXJuIHI7CiAJfQpAQCAtODUwLDYgKzg0OSw4 IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgYW1kZ3B1X3JpbmdfZnVuY3MgdmNlX3YzXzBfcmluZ19w aHlzX2Z1bmNzID0gewogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGFtZGdwdV9yaW5nX2Z1bmNzIHZj ZV92M18wX3Jpbmdfdm1fZnVuY3MgPSB7CiAJLnR5cGUgPSBBTURHUFVfUklOR19UWVBFX1ZDRSwK KwkuYWxpZ25fbWFzayA9IDB4ZiwKKwkubm9wID0gVkNFX0NNRF9OT19PUCwKIAkuZ2V0X3JwdHIg PSB2Y2VfdjNfMF9yaW5nX2dldF9ycHRyLAogCS5nZXRfd3B0ciA9IHZjZV92M18wX3JpbmdfZ2V0 X3dwdHIsCiAJLnNldF93cHRyID0gdmNlX3YzXzBfcmluZ19zZXRfd3B0ciwKLS0gCjIuNS4wCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1h aWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK