From: Felix Kuehling Subject: [PATCH 11/16] drm/amdkfd: Simplify event ID and signal slot management Date: Fri, 20 Oct 2017 20:23:15 -0400 Message-ID: <1508545400-24338-12-git-send-email-Felix.Kuehling@amd.com> References: <1508545400-24338-1-git-send-email-Felix.Kuehling@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1508545400-24338-1-git-send-email-Felix.Kuehling-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, oded.gabbay-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org Cc: Felix Kuehling U2lnbmFsIHNsb3RzIGFyZSBpZGVudGljYWwgdG8gZXZlbnQgSURzLgoKUmVwbGFjZSB0aGUgdXNl ZF9zbG90X2JpdG1hcCBhbmQgZXZlbnRzIGhhc2ggdGFibGUgd2l0aCBhbiBJRFIgdG8KYWxsb2Nh dGUgYW5kIGxvb2t1cCBldmVudCBJRHMgYW5kIHNpZ25hbCBzbG90cyBtb3JlIGVmZmljaWVudGx5 LgoKU2lnbmVkLW9mZi1ieTogRmVsaXggS3VlaGxpbmcgPEZlbGl4Lkt1ZWhsaW5nQGFtZC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX2V2ZW50cy5jIHwgMjMwICsrKysr KysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9r ZmRfZXZlbnRzLmggfCAgMTQgKy0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tmZF9wcml2 LmggICB8ICAgNiArLQogMyBmaWxlcyBjaGFuZ2VkLCA4MCBpbnNlcnRpb25zKCspLCAxNzAgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX2V2 ZW50cy5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX2V2ZW50cy5jCmluZGV4IGY4 MDBlNDguLmNkZGQ0YjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tm ZF9ldmVudHMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRfZXZlbnRzLmMK QEAgLTQxLDI0ICs0MSwxNiBAQCBzdHJ1Y3Qga2ZkX2V2ZW50X3dhaXRlciB7CiAJYm9vbCBhY3Rp dmF0ZWQ7CQkgLyogQmVjb21lcyB0cnVlIHdoZW4gZXZlbnQgaXMgc2lnbmFsZWQgKi8KIH07CiAK LSNkZWZpbmUgU0xPVFNfUEVSX1BBR0UgS0ZEX1NJR05BTF9FVkVOVF9MSU1JVAotI2RlZmluZSBT TE9UX0JJVE1BUF9MT05HUyBCSVRTX1RPX0xPTkdTKFNMT1RTX1BFUl9QQUdFKQotCiAvKgotICog T3Zlci1jb21wbGljYXRlZCBwb29sZWQgYWxsb2NhdG9yIGZvciBldmVudCBub3RpZmljYXRpb24g c2xvdHMuCi0gKgogICogRWFjaCBzaWduYWwgZXZlbnQgbmVlZHMgYSA2NC1iaXQgc2lnbmFsIHNs b3Qgd2hlcmUgdGhlIHNpZ25hbGVyIHdpbGwgd3JpdGUKLSAqIGEgMSBiZWZvcmUgc2VuZGluZyBh biBpbnRlcnJ1cHQubCAoVGhpcyBpcyBuZWVkZWQgYmVjYXVzZSBzb21lIGludGVycnVwdHMKKyAq IGEgMSBiZWZvcmUgc2VuZGluZyBhbiBpbnRlcnJ1cHQuIChUaGlzIGlzIG5lZWRlZCBiZWNhdXNl IHNvbWUgaW50ZXJydXB0cwogICogZG8gbm90IGNvbnRhaW4gZW5vdWdoIHNwYXJlIGRhdGEgYml0 cyB0byBpZGVudGlmeSBhbiBldmVudC4pCi0gKiBXZSBnZXQgd2hvbGUgcGFnZXMgZnJvbSB2bWFs bG9jIGFuZCBtYXAgdGhlbSB0byB0aGUgcHJvY2VzcyBWQS4KLSAqIEluZGl2aWR1YWwgc2lnbmFs IGV2ZW50cyBhcmUgdGhlbiBhbGxvY2F0ZWQgYSBzbG90IGluIGEgcGFnZS4KKyAqIFdlIGdldCB3 aG9sZSBwYWdlcyBhbmQgbWFwIHRoZW0gdG8gdGhlIHByb2Nlc3MgVkEuCisgKiBJbmRpdmlkdWFs IHNpZ25hbCBldmVudHMgdXNlIHRoZWlyIGV2ZW50X2lkIGFzIHNsb3QgaW5kZXguCiAgKi8KLQog c3RydWN0IGtmZF9zaWduYWxfcGFnZSB7CiAJdWludDY0X3QgKmtlcm5lbF9hZGRyZXNzOwogCXVp bnQ2NF90IF9fdXNlciAqdXNlcl9hZGRyZXNzOwotCXVuc2lnbmVkIGludCBmcmVlX3Nsb3RzOwot CXVuc2lnbmVkIGxvbmcgdXNlZF9zbG90X2JpdG1hcFtTTE9UX0JJVE1BUF9MT05HU107CiB9Owog CiAvKgpAQCAtNzMsMzQgKzY1LDYgQEAgc3RhdGljIHVpbnQ2NF90ICpwYWdlX3Nsb3RzKHN0cnVj dCBrZmRfc2lnbmFsX3BhZ2UgKnBhZ2UpCiAJcmV0dXJuIHBhZ2UtPmtlcm5lbF9hZGRyZXNzOwog fQogCi1zdGF0aWMgYm9vbCBhbGxvY2F0ZV9mcmVlX3Nsb3Qoc3RydWN0IGtmZF9wcm9jZXNzICpw cm9jZXNzLAotCQkJICAgICAgIHVuc2lnbmVkIGludCAqb3V0X3Nsb3RfaW5kZXgpCi17Ci0Jc3Ry dWN0IGtmZF9zaWduYWxfcGFnZSAqcGFnZSA9IHByb2Nlc3MtPnNpZ25hbF9wYWdlOwotCXVuc2ln bmVkIGludCBzbG90OwotCi0JaWYgKCFwYWdlIHx8IHBhZ2UtPmZyZWVfc2xvdHMgPT0gMCkgewot CQlwcl9kZWJ1ZygiTm8gZnJlZSBldmVudCBzaWduYWwgc2xvdHMgd2VyZSBmb3VuZCBmb3IgcHJv Y2VzcyAlcFxuIiwKLQkJCSBwcm9jZXNzKTsKLQotCQlyZXR1cm4gZmFsc2U7Ci0JfQotCi0Jc2xv dCA9IGZpbmRfZmlyc3RfemVyb19iaXQocGFnZS0+dXNlZF9zbG90X2JpdG1hcCwgU0xPVFNfUEVS X1BBR0UpOwotCi0JX19zZXRfYml0KHNsb3QsIHBhZ2UtPnVzZWRfc2xvdF9iaXRtYXApOwotCXBh Z2UtPmZyZWVfc2xvdHMtLTsKLQotCXBhZ2Vfc2xvdHMocGFnZSlbc2xvdF0gPSBVTlNJR05BTEVE X0VWRU5UX1NMT1Q7Ci0KLQkqb3V0X3Nsb3RfaW5kZXggPSBzbG90OwotCi0JcHJfZGVidWcoIkFs bG9jYXRlZCBldmVudCBzaWduYWwgc2xvdCBpbiBwYWdlICVwLCBzbG90ICVkXG4iLAotCQkgcGFn ZSwgc2xvdCk7Ci0KLQlyZXR1cm4gdHJ1ZTsKLX0KLQogc3RhdGljIHN0cnVjdCBrZmRfc2lnbmFs X3BhZ2UgKmFsbG9jYXRlX3NpZ25hbF9wYWdlKHN0cnVjdCBrZmRfcHJvY2VzcyAqcCkKIHsKIAl2 b2lkICpiYWNraW5nX3N0b3JlOwpAQCAtMTEwLDggKzc0LDYgQEAgc3RhdGljIHN0cnVjdCBrZmRf c2lnbmFsX3BhZ2UgKmFsbG9jYXRlX3NpZ25hbF9wYWdlKHN0cnVjdCBrZmRfcHJvY2VzcyAqcCkK IAlpZiAoIXBhZ2UpCiAJCXJldHVybiBOVUxMOwogCi0JcGFnZS0+ZnJlZV9zbG90cyA9IFNMT1RT X1BFUl9QQUdFOwotCiAJYmFja2luZ19zdG9yZSA9ICh2b2lkICopIF9fZ2V0X2ZyZWVfcGFnZXMo R0ZQX0tFUk5FTCwKIAkJCQkJZ2V0X29yZGVyKEtGRF9TSUdOQUxfRVZFTlRfTElNSVQgKiA4KSk7 CiAJaWYgKCFiYWNraW5nX3N0b3JlKQpAQCAtMTMyLDI4ICs5NCwyNiBAQCBzdGF0aWMgc3RydWN0 IGtmZF9zaWduYWxfcGFnZSAqYWxsb2NhdGVfc2lnbmFsX3BhZ2Uoc3RydWN0IGtmZF9wcm9jZXNz ICpwKQogCXJldHVybiBOVUxMOwogfQogCi1zdGF0aWMgYm9vbCBhbGxvY2F0ZV9ldmVudF9ub3Rp ZmljYXRpb25fc2xvdChzdHJ1Y3Qga2ZkX3Byb2Nlc3MgKnAsCi0JCQkJCSAgICAgdW5zaWduZWQg aW50ICpzaWduYWxfc2xvdF9pbmRleCkKK3N0YXRpYyBpbnQgYWxsb2NhdGVfZXZlbnRfbm90aWZp Y2F0aW9uX3Nsb3Qoc3RydWN0IGtmZF9wcm9jZXNzICpwLAorCQkJCQkgICAgc3RydWN0IGtmZF9l dmVudCAqZXYpCiB7CisJaW50IGlkOworCiAJaWYgKCFwLT5zaWduYWxfcGFnZSkgewogCQlwLT5z aWduYWxfcGFnZSA9IGFsbG9jYXRlX3NpZ25hbF9wYWdlKHApOwogCQlpZiAoIXAtPnNpZ25hbF9w YWdlKQotCQkJcmV0dXJuIGZhbHNlOworCQkJcmV0dXJuIC1FTk9NRU07CiAJfQogCi0JcmV0dXJu IGFsbG9jYXRlX2ZyZWVfc2xvdChwLCBzaWduYWxfc2xvdF9pbmRleCk7Ci19CisJaWQgPSBpZHJf YWxsb2MoJnAtPmV2ZW50X2lkciwgZXYsIDAsIEtGRF9TSUdOQUxfRVZFTlRfTElNSVQsCisJCSAg ICAgICBHRlBfS0VSTkVMKTsKKwlpZiAoaWQgPCAwKQorCQlyZXR1cm4gaWQ7CiAKLS8qIEFzc3Vt ZXMgdGhhdCB0aGUgcHJvY2VzcydzIGV2ZW50X211dGV4IGlzIGxvY2tlZC4gKi8KLXN0YXRpYyB2 b2lkIHJlbGVhc2VfZXZlbnRfbm90aWZpY2F0aW9uX3Nsb3Qoc3RydWN0IGtmZF9zaWduYWxfcGFn ZSAqcGFnZSwKLQkJCQkJCXNpemVfdCBzbG90X2luZGV4KQotewotCV9fY2xlYXJfYml0KHNsb3Rf aW5kZXgsIHBhZ2UtPnVzZWRfc2xvdF9iaXRtYXApOwotCXBhZ2UtPmZyZWVfc2xvdHMrKzsKKwll di0+ZXZlbnRfaWQgPSBpZDsKKwlwYWdlX3Nsb3RzKHAtPnNpZ25hbF9wYWdlKVtpZF0gPSBVTlNJ R05BTEVEX0VWRU5UX1NMT1Q7CiAKLQkvKiBXZSBkb24ndCBmcmVlIHNpZ25hbCBwYWdlcywgdGhl eSBhcmUgcmV0YWluZWQgYnkgdGhlIHByb2Nlc3MKLQkgKiBhbmQgcmV1c2VkIHVudGlsIGl0IGV4 aXRzLgotCSAqLworCXJldHVybiAwOwogfQogCiAvKgpAQCAtMTYyLDg5ICsxMjIsMzIgQEAgc3Rh dGljIHZvaWQgcmVsZWFzZV9ldmVudF9ub3RpZmljYXRpb25fc2xvdChzdHJ1Y3Qga2ZkX3NpZ25h bF9wYWdlICpwYWdlLAogICovCiBzdGF0aWMgc3RydWN0IGtmZF9ldmVudCAqbG9va3VwX2V2ZW50 X2J5X2lkKHN0cnVjdCBrZmRfcHJvY2VzcyAqcCwgdWludDMyX3QgaWQpCiB7Ci0Jc3RydWN0IGtm ZF9ldmVudCAqZXY7Ci0KLQloYXNoX2Zvcl9lYWNoX3Bvc3NpYmxlKHAtPmV2ZW50cywgZXYsIGV2 ZW50cywgaWQpCi0JCWlmIChldi0+ZXZlbnRfaWQgPT0gaWQpCi0JCQlyZXR1cm4gZXY7Ci0KLQly ZXR1cm4gTlVMTDsKLX0KLQotLyoKLSAqIFByb2R1Y2UgYSBrZmQgZXZlbnQgaWQgZm9yIGEgbm9u c2lnbmFsIGV2ZW50LgotICogVGhlc2UgYXJlIGFyYml0cmFyeSBudW1iZXJzLCBzbyB3ZSBkbyBh IHNlcXVlbnRpYWwgc2VhcmNoIHRocm91Z2gKLSAqIHRoZSBoYXNoIHRhYmxlIGZvciBhbiB1bnVz ZWQgbnVtYmVyLgotICovCi1zdGF0aWMgdTMyIG1ha2Vfbm9uc2lnbmFsX2V2ZW50X2lkKHN0cnVj dCBrZmRfcHJvY2VzcyAqcCkKLXsKLQl1MzIgaWQ7Ci0KLQlmb3IgKGlkID0gcC0+bmV4dF9ub25z aWduYWxfZXZlbnRfaWQ7Ci0JCWlkIDwgS0ZEX0xBU1RfTk9OU0lHTkFMX0VWRU5UX0lEICYmCi0J CWxvb2t1cF9ldmVudF9ieV9pZChwLCBpZCk7Ci0JCWlkKyspCi0JCTsKLQotCWlmIChpZCA8IEtG RF9MQVNUX05PTlNJR05BTF9FVkVOVF9JRCkgewotCi0JCS8qCi0JCSAqIFdoYXQgaWYgaWQgPT0g TEFTVF9OT05TSUdOQUxfRVZFTlRfSUQgLSAxPwotCQkgKiBUaGVuIG5leHRfbm9uc2lnbmFsX2V2 ZW50X2lkID0gTEFTVF9OT05TSUdOQUxfRVZFTlRfSUQgc28KLQkJICogdGhlIGZpcnN0IGxvb3Ag ZmFpbHMgaW1tZWRpYXRlbHkgYW5kIHdlIHByb2NlZWQgd2l0aCB0aGUKLQkJICogd3JhcGFyb3Vu ZCBsb29wIGJlbG93LgotCQkgKi8KLQkJcC0+bmV4dF9ub25zaWduYWxfZXZlbnRfaWQgPSBpZCAr IDE7Ci0KLQkJcmV0dXJuIGlkOwotCX0KLQotCWZvciAoaWQgPSBLRkRfRklSU1RfTk9OU0lHTkFM X0VWRU5UX0lEOwotCQlpZCA8IEtGRF9MQVNUX05PTlNJR05BTF9FVkVOVF9JRCAmJgotCQlsb29r dXBfZXZlbnRfYnlfaWQocCwgaWQpOwotCQlpZCsrKQotCQk7Ci0KLQotCWlmIChpZCA8IEtGRF9M QVNUX05PTlNJR05BTF9FVkVOVF9JRCkgewotCQlwLT5uZXh0X25vbnNpZ25hbF9ldmVudF9pZCA9 IGlkICsgMTsKLQkJcmV0dXJuIGlkOwotCX0KLQotCXAtPm5leHRfbm9uc2lnbmFsX2V2ZW50X2lk ID0gS0ZEX0ZJUlNUX05PTlNJR05BTF9FVkVOVF9JRDsKLQlyZXR1cm4gMDsKLX0KLQotc3RhdGlj IHN0cnVjdCBrZmRfZXZlbnQgKmxvb2t1cF9ldmVudF9ieV9wYWdlX3Nsb3Qoc3RydWN0IGtmZF9w cm9jZXNzICpwLAotCQkJCQkJdW5zaWduZWQgaW50IHNpZ25hbF9zbG90KQotewotCXJldHVybiBs b29rdXBfZXZlbnRfYnlfaWQocCwgc2lnbmFsX3Nsb3QpOworCXJldHVybiBpZHJfZmluZCgmcC0+ ZXZlbnRfaWRyLCBpZCk7CiB9CiAKIHN0YXRpYyBpbnQgY3JlYXRlX3NpZ25hbF9ldmVudChzdHJ1 Y3QgZmlsZSAqZGV2a2ZkLAogCQkJCXN0cnVjdCBrZmRfcHJvY2VzcyAqcCwKIAkJCQlzdHJ1Y3Qg a2ZkX2V2ZW50ICpldikKIHsKKwlpbnQgcmV0OworCiAJaWYgKHAtPnNpZ25hbF9ldmVudF9jb3Vu dCA9PSBLRkRfU0lHTkFMX0VWRU5UX0xJTUlUKSB7CiAJCWlmICghcC0+c2lnbmFsX2V2ZW50X2xp bWl0X3JlYWNoZWQpIHsKIAkJCXByX3dhcm4oIlNpZ25hbCBldmVudCB3YXNuJ3QgY3JlYXRlZCBi ZWNhdXNlIGxpbWl0IHdhcyByZWFjaGVkXG4iKTsKIAkJCXAtPnNpZ25hbF9ldmVudF9saW1pdF9y ZWFjaGVkID0gdHJ1ZTsKIAkJfQotCQlyZXR1cm4gLUVOT01FTTsKKwkJcmV0dXJuIC1FTk9TUEM7 CiAJfQogCi0JaWYgKCFhbGxvY2F0ZV9ldmVudF9ub3RpZmljYXRpb25fc2xvdChwLCAmZXYtPnNp Z25hbF9zbG90X2luZGV4KSkgeworCXJldCA9IGFsbG9jYXRlX2V2ZW50X25vdGlmaWNhdGlvbl9z bG90KHAsIGV2KTsKKwlpZiAocmV0KSB7CiAJCXByX3dhcm4oIlNpZ25hbCBldmVudCB3YXNuJ3Qg Y3JlYXRlZCBiZWNhdXNlIG91dCBvZiBrZXJuZWwgbWVtb3J5XG4iKTsKLQkJcmV0dXJuIC1FTk9N RU07CisJCXJldHVybiByZXQ7CiAJfQogCiAJcC0+c2lnbmFsX2V2ZW50X2NvdW50Kys7CiAKLQll di0+dXNlcl9zaWduYWxfYWRkcmVzcyA9Ci0JCQkmcC0+c2lnbmFsX3BhZ2UtPnVzZXJfYWRkcmVz c1tldi0+c2lnbmFsX3Nsb3RfaW5kZXhdOwotCi0JZXYtPmV2ZW50X2lkID0gZXYtPnNpZ25hbF9z bG90X2luZGV4OwotCisJZXYtPnVzZXJfc2lnbmFsX2FkZHJlc3MgPSAmcC0+c2lnbmFsX3BhZ2Ut PnVzZXJfYWRkcmVzc1tldi0+ZXZlbnRfaWRdOwogCXByX2RlYnVnKCJTaWduYWwgZXZlbnQgbnVt YmVyICV6dSBjcmVhdGVkIHdpdGggaWQgJWQsIGFkZHJlc3MgJXBcbiIsCiAJCQlwLT5zaWduYWxf ZXZlbnRfY291bnQsIGV2LT5ldmVudF9pZCwKIAkJCWV2LT51c2VyX3NpZ25hbF9hZGRyZXNzKTsK QEAgLTI1MiwxNiArMTU1LDIwIEBAIHN0YXRpYyBpbnQgY3JlYXRlX3NpZ25hbF9ldmVudChzdHJ1 Y3QgZmlsZSAqZGV2a2ZkLAogCXJldHVybiAwOwogfQogCi0vKgotICogTm8gbm9uLXNpZ25hbCBl dmVudHMgYXJlIHN1cHBvcnRlZCB5ZXQuCi0gKiBXZSBjcmVhdGUgdGhlbSBhcyBldmVudHMgdGhh dCBuZXZlciBzaWduYWwuCi0gKiBTZXQgZXZlbnQgY2FsbHMgZnJvbSB1c2VyLW1vZGUgYXJlIGZh aWxlZC4KLSAqLwogc3RhdGljIGludCBjcmVhdGVfb3RoZXJfZXZlbnQoc3RydWN0IGtmZF9wcm9j ZXNzICpwLCBzdHJ1Y3Qga2ZkX2V2ZW50ICpldikKIHsKLQlldi0+ZXZlbnRfaWQgPSBtYWtlX25v bnNpZ25hbF9ldmVudF9pZChwKTsKLQlpZiAoZXYtPmV2ZW50X2lkID09IDApCi0JCXJldHVybiAt RU5PTUVNOworCS8qIENhc3QgS0ZEX0xBU1RfTk9OU0lHTkFMX0VWRU5UIHRvIHVpbnQzMl90LiBU aGlzIGFsbG93cyBhbgorCSAqIGludGVudGlvbmFsIGludGVnZXIgb3ZlcmZsb3cgdG8gLTEgd2l0 aG91dCBhIGNvbXBpbGVyCisJICogd2FybmluZy4gaWRyX2FsbG9jIHRyZWF0cyBhIG5lZ2F0aXZl IHZhbHVlIGFzICJtYXhpbXVtCisJICogc2lnbmVkIGludGVnZXIiLgorCSAqLworCWludCBpZCA9 IGlkcl9hbGxvYygmcC0+ZXZlbnRfaWRyLCBldiwgS0ZEX0ZJUlNUX05PTlNJR05BTF9FVkVOVF9J RCwKKwkJCSAgICh1aW50MzJfdClLRkRfTEFTVF9OT05TSUdOQUxfRVZFTlRfSUQgKyAxLAorCQkJ ICAgR0ZQX0tFUk5FTCk7CisKKwlpZiAoaWQgPCAwKQorCQlyZXR1cm4gaWQ7CisJZXYtPmV2ZW50 X2lkID0gaWQ7CiAKIAlyZXR1cm4gMDsKIH0KQEAgLTI2OSw5ICsxNzYsOCBAQCBzdGF0aWMgaW50 IGNyZWF0ZV9vdGhlcl9ldmVudChzdHJ1Y3Qga2ZkX3Byb2Nlc3MgKnAsIHN0cnVjdCBrZmRfZXZl bnQgKmV2KQogdm9pZCBrZmRfZXZlbnRfaW5pdF9wcm9jZXNzKHN0cnVjdCBrZmRfcHJvY2VzcyAq cCkKIHsKIAltdXRleF9pbml0KCZwLT5ldmVudF9tdXRleCk7Ci0JaGFzaF9pbml0KHAtPmV2ZW50 cyk7CisJaWRyX2luaXQoJnAtPmV2ZW50X2lkcik7CiAJcC0+c2lnbmFsX3BhZ2UgPSBOVUxMOwot CXAtPm5leHRfbm9uc2lnbmFsX2V2ZW50X2lkID0gS0ZEX0ZJUlNUX05PTlNJR05BTF9FVkVOVF9J RDsKIAlwLT5zaWduYWxfZXZlbnRfY291bnQgPSAwOwogfQogCkBAIC0yODQsMjUgKzE5MCwyMiBA QCBzdGF0aWMgdm9pZCBkZXN0cm95X2V2ZW50KHN0cnVjdCBrZmRfcHJvY2VzcyAqcCwgc3RydWN0 IGtmZF9ldmVudCAqZXYpCiAJCXdhaXRlci0+ZXZlbnQgPSBOVUxMOwogCXdha2VfdXBfYWxsKCZl di0+d3EpOwogCi0JaWYgKChldi0+dHlwZSA9PSBLRkRfRVZFTlRfVFlQRV9TSUdOQUwgfHwKLQkg ICAgIGV2LT50eXBlID09IEtGRF9FVkVOVF9UWVBFX0RFQlVHKSAmJiBwLT5zaWduYWxfcGFnZSkg ewotCQlyZWxlYXNlX2V2ZW50X25vdGlmaWNhdGlvbl9zbG90KHAtPnNpZ25hbF9wYWdlLAotCQkJ CQkJZXYtPnNpZ25hbF9zbG90X2luZGV4KTsKKwlpZiAoZXYtPnR5cGUgPT0gS0ZEX0VWRU5UX1RZ UEVfU0lHTkFMIHx8CisJICAgIGV2LT50eXBlID09IEtGRF9FVkVOVF9UWVBFX0RFQlVHKQogCQlw LT5zaWduYWxfZXZlbnRfY291bnQtLTsKLQl9CiAKLQloYXNoX2RlbCgmZXYtPmV2ZW50cyk7CisJ aWRyX3JlbW92ZSgmcC0+ZXZlbnRfaWRyLCBldi0+ZXZlbnRfaWQpOwogCWtmcmVlKGV2KTsKIH0K IAogc3RhdGljIHZvaWQgZGVzdHJveV9ldmVudHMoc3RydWN0IGtmZF9wcm9jZXNzICpwKQogewog CXN0cnVjdCBrZmRfZXZlbnQgKmV2OwotCXN0cnVjdCBobGlzdF9ub2RlICp0bXA7Ci0JdW5zaWdu ZWQgaW50IGhhc2hfYmt0OworCXVpbnQzMl90IGlkOwogCi0JaGFzaF9mb3JfZWFjaF9zYWZlKHAt PmV2ZW50cywgaGFzaF9ia3QsIHRtcCwgZXYsIGV2ZW50cykKKwlpZHJfZm9yX2VhY2hfZW50cnko JnAtPmV2ZW50X2lkciwgZXYsIGlkKQogCQlkZXN0cm95X2V2ZW50KHAsIGV2KTsKKwlpZHJfZGVz dHJveSgmcC0+ZXZlbnRfaWRyKTsKIH0KIAogLyoKQEAgLTM2NSw3ICsyNjgsNyBAQCBpbnQga2Zk X2V2ZW50X2NyZWF0ZShzdHJ1Y3QgZmlsZSAqZGV2a2ZkLCBzdHJ1Y3Qga2ZkX3Byb2Nlc3MgKnAs CiAJCWlmICghcmV0KSB7CiAJCQkqZXZlbnRfcGFnZV9vZmZzZXQgPSBLRkRfTU1BUF9FVkVOVFNf TUFTSzsKIAkJCSpldmVudF9wYWdlX29mZnNldCA8PD0gUEFHRV9TSElGVDsKLQkJCSpldmVudF9z bG90X2luZGV4ID0gZXYtPnNpZ25hbF9zbG90X2luZGV4OworCQkJKmV2ZW50X3Nsb3RfaW5kZXgg PSBldi0+ZXZlbnRfaWQ7CiAJCX0KIAkJYnJlYWs7CiAJZGVmYXVsdDoKQEAgLTM3NCw4ICsyNzcs NiBAQCBpbnQga2ZkX2V2ZW50X2NyZWF0ZShzdHJ1Y3QgZmlsZSAqZGV2a2ZkLCBzdHJ1Y3Qga2Zk X3Byb2Nlc3MgKnAsCiAJfQogCiAJaWYgKCFyZXQpIHsKLQkJaGFzaF9hZGQocC0+ZXZlbnRzLCAm ZXYtPmV2ZW50cywgZXYtPmV2ZW50X2lkKTsKLQogCQkqZXZlbnRfaWQgPSBldi0+ZXZlbnRfaWQ7 CiAJCSpldmVudF90cmlnZ2VyX2RhdGEgPSBldi0+ZXZlbnRfaWQ7CiAJfSBlbHNlIHsKQEAgLTQ2 NSwxNyArMzY2LDcgQEAgaW50IGtmZF9yZXNldF9ldmVudChzdHJ1Y3Qga2ZkX3Byb2Nlc3MgKnAs IHVpbnQzMl90IGV2ZW50X2lkKQogCiBzdGF0aWMgdm9pZCBhY2tub3dsZWRnZV9zaWduYWwoc3Ry dWN0IGtmZF9wcm9jZXNzICpwLCBzdHJ1Y3Qga2ZkX2V2ZW50ICpldikKIHsKLQlwYWdlX3Nsb3Rz KHAtPnNpZ25hbF9wYWdlKVtldi0+c2lnbmFsX3Nsb3RfaW5kZXhdID0KLQkJCQkJCVVOU0lHTkFM RURfRVZFTlRfU0xPVDsKLX0KLQotc3RhdGljIGJvb2wgaXNfc2xvdF9zaWduYWxlZChzdHJ1Y3Qg a2ZkX3Byb2Nlc3MgKnAsIHVuc2lnbmVkIGludCBpbmRleCkKLXsKLQlpZiAoIXAtPnNpZ25hbF9w YWdlKQotCQlyZXR1cm4gZmFsc2U7Ci0JZWxzZQotCQlyZXR1cm4gcGFnZV9zbG90cyhwLT5zaWdu YWxfcGFnZSlbaW5kZXhdICE9Ci0JCQlVTlNJR05BTEVEX0VWRU5UX1NMT1Q7CisJcGFnZV9zbG90 cyhwLT5zaWduYWxfcGFnZSlbZXYtPmV2ZW50X2lkXSA9IFVOU0lHTkFMRURfRVZFTlRfU0xPVDsK IH0KIAogc3RhdGljIHZvaWQgc2V0X2V2ZW50X2Zyb21faW50ZXJydXB0KHN0cnVjdCBrZmRfcHJv Y2VzcyAqcCwKQEAgLTUxNCwxMyArNDA1LDMxIEBAIHZvaWQga2ZkX3NpZ25hbF9ldmVudF9pbnRl cnJ1cHQodW5zaWduZWQgaW50IHBhc2lkLCB1aW50MzJfdCBwYXJ0aWFsX2lkLAogCQkgKiBpZ25v cmUgaXQsIGJ1dCB3ZSBjb3VsZCB1c2UgYW55IGJpdHMgd2UgZGlkIHJlY2VpdmUgdG8KIAkJICog c2VhcmNoIGZhc3Rlci4KIAkJICovCi0JCXVuc2lnbmVkIGludCBpOworCQl1aW50NjRfdCAqc2xv dHMgPSBwYWdlX3Nsb3RzKHAtPnNpZ25hbF9wYWdlKTsKKwkJdWludDMyX3QgaWQ7CisKKwkJaWYg KHAtPnNpZ25hbF9ldmVudF9jb3VudCA8IEtGRF9TSUdOQUxfRVZFTlRfTElNSVQvMikgeworCQkJ LyogV2l0aCByZWxhdGl2ZWx5IGZldyBldmVudHMsIGl0J3MgZmFzdGVyIHRvCisJCQkgKiBpdGVy YXRlIG92ZXIgdGhlIGV2ZW50IElEUgorCQkJICovCisJCQlpZHJfZm9yX2VhY2hfZW50cnkoJnAt PmV2ZW50X2lkciwgZXYsIGlkKSB7CisJCQkJaWYgKGlkID49IEtGRF9TSUdOQUxfRVZFTlRfTElN SVQpCisJCQkJCWJyZWFrOwogCi0JCWZvciAoaSA9IDA7IGkgPCBTTE9UU19QRVJfUEFHRTsgaSsr KQotCQkJaWYgKGlzX3Nsb3Rfc2lnbmFsZWQocCwgaSkpIHsKLQkJCQlldiA9IGxvb2t1cF9ldmVu dF9ieV9wYWdlX3Nsb3QocCwgaSk7Ci0JCQkJc2V0X2V2ZW50X2Zyb21faW50ZXJydXB0KHAsIGV2 KTsKKwkJCQlpZiAoc2xvdHNbaWRdICE9IFVOU0lHTkFMRURfRVZFTlRfU0xPVCkKKwkJCQkJc2V0 X2V2ZW50X2Zyb21faW50ZXJydXB0KHAsIGV2KTsKIAkJCX0KKwkJfSBlbHNlIHsKKwkJCS8qIFdp dGggcmVsYXRpdmVseSBtYW55IGV2ZW50cywgaXQncyBmYXN0ZXIgdG8KKwkJCSAqIGl0ZXJhdGUg b3ZlciB0aGUgc2lnbmFsIHNsb3RzIGFuZCBsb29rdXAKKwkJCSAqIG9ubHkgc2lnbmFsZWQgZXZl bnRzIGZyb20gdGhlIElEUi4KKwkJCSAqLworCQkJZm9yIChpZCA9IDA7IGlkIDwgS0ZEX1NJR05B TF9FVkVOVF9MSU1JVDsgaWQrKykKKwkJCQlpZiAoc2xvdHNbaWRdICE9IFVOU0lHTkFMRURfRVZF TlRfU0xPVCkgeworCQkJCQlldiA9IGxvb2t1cF9ldmVudF9ieV9pZChwLCBpZCk7CisJCQkJCXNl dF9ldmVudF9mcm9tX2ludGVycnVwdChwLCBldik7CisJCQkJfQorCQl9CiAJfQogCiAJbXV0ZXhf dW5sb2NrKCZwLT5ldmVudF9tdXRleCk7CkBAIC04MzIsMTIgKzc0MSwxMyBAQCBzdGF0aWMgdm9p ZCBsb29rdXBfZXZlbnRzX2J5X3R5cGVfYW5kX3NpZ25hbChzdHJ1Y3Qga2ZkX3Byb2Nlc3MgKnAs CiB7CiAJc3RydWN0IGtmZF9oc2FfbWVtb3J5X2V4Y2VwdGlvbl9kYXRhICpldl9kYXRhOwogCXN0 cnVjdCBrZmRfZXZlbnQgKmV2OwotCWludCBia3Q7CisJdWludDMyX3QgaWQ7CiAJYm9vbCBzZW5k X3NpZ25hbCA9IHRydWU7CiAKIAlldl9kYXRhID0gKHN0cnVjdCBrZmRfaHNhX21lbW9yeV9leGNl cHRpb25fZGF0YSAqKSBldmVudF9kYXRhOwogCi0JaGFzaF9mb3JfZWFjaChwLT5ldmVudHMsIGJr dCwgZXYsIGV2ZW50cykKKwlpZCA9IEtGRF9GSVJTVF9OT05TSUdOQUxfRVZFTlRfSUQ7CisJaWRy X2Zvcl9lYWNoX2VudHJ5X2NvbnRpbnVlKCZwLT5ldmVudF9pZHIsIGV2LCBpZCkKIAkJaWYgKGV2 LT50eXBlID09IHR5cGUpIHsKIAkJCXNlbmRfc2lnbmFsID0gZmFsc2U7CiAJCQlkZXZfZGJnKGtm ZF9kZXZpY2UsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRfZXZl bnRzLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRfZXZlbnRzLmgKaW5kZXggZjg1 ZmNlZS4uYWJjYTViZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRrZmQva2Zk X2V2ZW50cy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tmZF9ldmVudHMuaApA QCAtMzEsOSArMzEsMTMgQEAKICNpbmNsdWRlICJrZmRfcHJpdi5oIgogI2luY2x1ZGUgPHVhcGkv bGludXgva2ZkX2lvY3RsLmg+CiAKLSNkZWZpbmUgS0ZEX0VWRU5UX0lEX05PTlNJR05BTF9NQVNL IDB4ODAwMDAwMDBVCi0jZGVmaW5lIEtGRF9GSVJTVF9OT05TSUdOQUxfRVZFTlRfSUQgS0ZEX0VW RU5UX0lEX05PTlNJR05BTF9NQVNLCi0jZGVmaW5lIEtGRF9MQVNUX05PTlNJR05BTF9FVkVOVF9J RCBVSU5UX01BWAorLyoKKyAqIElEUiBzdXBwb3J0cyBub24tbmVnYXRpdmUgaW50ZWdlciBJRHMu IFNtYWxsIElEcyBhcmUgdXNlZCBmb3IKKyAqIHNpZ25hbCBldmVudHMgdG8gbWF0Y2ggdGhlaXIg c2lnbmFsIHNsb3QuIFVzZSB0aGUgdXBwZXIgaGFsZiBvZiB0aGUKKyAqIElEIHNwYWNlIGZvciBu b24tc2lnbmFsIGV2ZW50cy4KKyAqLworI2RlZmluZSBLRkRfRklSU1RfTk9OU0lHTkFMX0VWRU5U X0lEICgoSU5UX01BWCA+PiAxKSArIDEpCisjZGVmaW5lIEtGRF9MQVNUX05PTlNJR05BTF9FVkVO VF9JRCBJTlRfTUFYCiAKIC8qCiAgKiBXcml0dGVuIGludG8ga2ZkX3NpZ25hbF9zbG90X3QgdG8g aW5kaWNhdGUgdGhhdCB0aGUgZXZlbnQgaXMgbm90IHNpZ25hbGVkLgpAQCAtNDcsOSArNTEsNiBA QCBzdHJ1Y3Qga2ZkX2V2ZW50X3dhaXRlcjsKIHN0cnVjdCBzaWduYWxfcGFnZTsKIAogc3RydWN0 IGtmZF9ldmVudCB7Ci0JLyogQWxsIGV2ZW50cyBpbiBwcm9jZXNzLCByb290ZWQgYXQga2ZkX3By b2Nlc3MuZXZlbnRzLiAqLwotCXN0cnVjdCBobGlzdF9ub2RlIGV2ZW50czsKLQogCXUzMiBldmVu dF9pZDsKIAogCWJvb2wgc2lnbmFsZWQ7CkBAIC02MCw3ICs2MSw2IEBAIHN0cnVjdCBrZmRfZXZl bnQgewogCXdhaXRfcXVldWVfaGVhZF90IHdxOyAvKiBMaXN0IG9mIGV2ZW50IHdhaXRlcnMuICov CiAKIAkvKiBPbmx5IGZvciBzaWduYWwgZXZlbnRzLiAqLwotCXVuc2lnbmVkIGludCBzaWduYWxf c2xvdF9pbmRleDsKIAl1aW50NjRfdCBfX3VzZXIgKnVzZXJfc2lnbmFsX2FkZHJlc3M7CiAKIAkv KiB0eXBlIHNwZWNpZmljIGRhdGEgKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1ka2ZkL2tmZF9wcml2LmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRfcHJpdi5o CmluZGV4IGMxYjNlZTIuLmViYWU4ZTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1ka2ZkL2tmZF9wcml2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX3By aXYuaApAQCAtMzEsNiArMzEsNyBAQAogI2luY2x1ZGUgPGxpbnV4L3dvcmtxdWV1ZS5oPgogI2lu Y2x1ZGUgPGxpbnV4L3NwaW5sb2NrLmg+CiAjaW5jbHVkZSA8bGludXgva2ZkX2lvY3RsLmg+Cisj aW5jbHVkZSA8bGludXgvaWRyLmg+CiAjaW5jbHVkZSA8a2dkX2tmZF9pbnRlcmZhY2UuaD4KIAog I2luY2x1ZGUgImFtZF9zaGFyZWQuaCIKQEAgLTUzOCwxMSArNTM5LDEwIEBAIHN0cnVjdCBrZmRf cHJvY2VzcyB7CiAKIAkvKiBFdmVudC1yZWxhdGVkIGRhdGEgKi8KIAlzdHJ1Y3QgbXV0ZXggZXZl bnRfbXV0ZXg7Ci0JLyogQWxsIGV2ZW50cyBpbiBwcm9jZXNzIGhhc2hlZCBieSBJRCwgbGlua2Vk IG9uIGtmZF9ldmVudC5ldmVudHMuICovCi0JREVDTEFSRV9IQVNIVEFCTEUoZXZlbnRzLCA0KTsK KwkvKiBFdmVudCBJRCBhbGxvY2F0b3IgYW5kIGxvb2t1cCAqLworCXN0cnVjdCBpZHIgZXZlbnRf aWRyOwogCS8qIEV2ZW50IHBhZ2UgKi8KIAlzdHJ1Y3Qga2ZkX3NpZ25hbF9wYWdlICpzaWduYWxf cGFnZTsKLQl1MzIgbmV4dF9ub25zaWduYWxfZXZlbnRfaWQ7CiAJc2l6ZV90IHNpZ25hbF9ldmVu dF9jb3VudDsKIAlib29sIHNpZ25hbF9ldmVudF9saW1pdF9yZWFjaGVkOwogfTsKLS0gCjIuNy40 CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4 IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK