From: Andres Rodriguez Subject: [PATCH 11/22] drm/amdkfd: allow split HQD on per-queue granularity v4 Date: Thu, 2 Mar 2017 02:03:13 -0500 Message-ID: <20170302070324.7089-12-andresx7@gmail.com> References: <20170302070324.7089-1-andresx7@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170302070324.7089-1-andresx7-Re5JQEeQqe8AvxtiuMwx3w@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: andresx7-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org VXBkYXRlIHRoZSBLR0QgdG8gS0ZEIGludGVyZmFjZSB0byBhbGxvdyBzaGFyaW5nIHBpcGVzIHdp dGggcXVldWUKZ3JhbnVsYXJpdHkgaW5zdGVhZCBvZiBwaXBlIGdyYW51bGFyaXR5LgoKVGhpcyBh bGxvd3MgZm9yIG1vcmUgaW50ZXJlc3RpbmcgcGlwZS9xdWV1ZSBzcGxpdHMuCgp2MjogZml4IG92 ZXJmbG93IGNoZWNrIGZvciByZXMucXVldWVfbWFzawp2MzogZml4IHNoaWZ0IG92ZXJmbG93IHdo ZW4gc2V0dGluZyByZXMucXVldWVfbWFzawp2NDogZml4IGNvbW1lbnQgaW4gaXNfcGlwZWxpbmVf ZW5hYmxlZCgpCgpTaWduZWQtb2ZmLWJ5OiBBbmRyZXMgUm9kcmlndWV6IDxhbmRyZXN4N0BnbWFp bC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2FtZGtmZC5jICAg ICAgICAgfCAgMjIgKysrKy0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tmZF9kZXZpY2Uu YyAgICAgICAgICAgIHwgICA0ICsKIC4uLi9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX2RldmljZV9x dWV1ZV9tYW5hZ2VyLmMgIHwgMTAwICsrKysrKysrKysrKysrLS0tLS0tLQogLi4uL2dwdS9kcm0v YW1kL2FtZGtmZC9rZmRfZGV2aWNlX3F1ZXVlX21hbmFnZXIuaCAgfCAgMTAgKy0tCiAuLi4vZHJt L2FtZC9hbWRrZmQva2ZkX2RldmljZV9xdWV1ZV9tYW5hZ2VyX2Npay5jICB8ICAgMiArLQogZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX3BhY2tldF9tYW5hZ2VyLmMgICAgfCAgIDMgKy0K IC4uLi9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX3Byb2Nlc3NfcXVldWVfbWFuYWdlci5jIHwgICAy ICstCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2luY2x1ZGUva2dkX2tmZF9pbnRlcmZhY2UuaCAgICB8 ICAxNyArKy0tCiBkcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9rZmQuYyAgICAgICAgICAg ICAgICB8ICAyMSArKysrLQogOSBmaWxlcyBjaGFuZ2VkLCAxMjYgaW5zZXJ0aW9ucygrKSwgNTUg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1k Z3B1X2FtZGtmZC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2FtZGtmZC5j CmluZGV4IDMyMDBmZjkuLjhmYzVhYTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV9hbWRrZmQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfYW1ka2ZkLmMKQEAgLTk1LDE0ICs5NSwzMCBAQCB2b2lkIGFtZGdwdV9hbWRrZmRfZGV2 aWNlX3Byb2JlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCiB2b2lkIGFtZGdwdV9hbWRr ZmRfZGV2aWNlX2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB7CisJaW50IGk7CisJ aW50IGxhc3RfdmFsaWRfYml0OwogCWlmIChhZGV2LT5rZmQpIHsKIAkJc3RydWN0IGtnZDJrZmRf c2hhcmVkX3Jlc291cmNlcyBncHVfcmVzb3VyY2VzID0gewogCQkJLmNvbXB1dGVfdm1pZF9iaXRt YXAgPSAweEZGMDAsCi0KLQkJCS5maXJzdF9jb21wdXRlX3BpcGUgPSAxLAotCQkJLmNvbXB1dGVf cGlwZV9jb3VudCA9IDQgLSAxLAorCQkJLm51bV9tZWMgPSBhZGV2LT5nZngubWVjLm51bV9tZWMs CisJCQkubnVtX3BpcGVfcGVyX21lYyA9IGFkZXYtPmdmeC5tZWMubnVtX3BpcGVfcGVyX21lYywK KwkJCS5udW1fcXVldWVfcGVyX3BpcGUgPSBhZGV2LT5nZngubWVjLm51bV9xdWV1ZV9wZXJfcGlw ZQogCQl9OwogCisJCS8qIHRoaXMgaXMgZ29pbmcgdG8gaGF2ZSBhIGZldyBvZiB0aGUgTVNCcyBz ZXQgdGhhdCB3ZSBuZWVkIHRvCisJCSAqIGNsZWFyICovCisJCWJpdG1hcF9jb21wbGVtZW50KGdw dV9yZXNvdXJjZXMucXVldWVfYml0bWFwLAorCQkJCSAgYWRldi0+Z2Z4Lm1lYy5xdWV1ZV9iaXRt YXAsCisJCQkJICBLR0RfTUFYX1FVRVVFUyk7CisKKwkJLyogQWNjb3JkaW5nIHRvIGxpbnV4L2Jp dG1hcC5oIHdlIHNob3VsZG4ndCB1c2UgYml0bWFwX2NsZWFyIGlmCisJCSAqIG5iaXRzIGlzIG5v dCBjb21waWxlIHRpbWUgY29uc3RhbnQgKi8KKwkJbGFzdF92YWxpZF9iaXQgPSBhZGV2LT5nZngu bWVjLm51bV9tZWMKKwkJCQkqIGFkZXYtPmdmeC5tZWMubnVtX3BpcGVfcGVyX21lYworCQkJCSog YWRldi0+Z2Z4Lm1lYy5udW1fcXVldWVfcGVyX3BpcGU7CisJCWZvciAoaSA9IGxhc3RfdmFsaWRf Yml0OyBpIDwgS0dEX01BWF9RVUVVRVM7ICsraSkKKwkJCWNsZWFyX2JpdChpLCBncHVfcmVzb3Vy Y2VzLnF1ZXVlX2JpdG1hcCk7CisKIAkJYW1kZ3B1X2Rvb3JiZWxsX2dldF9rZmRfaW5mbyhhZGV2 LAogCQkJCSZncHVfcmVzb3VyY2VzLmRvb3JiZWxsX3BoeXNpY2FsX2FkZHJlc3MsCiAJCQkJJmdw dV9yZXNvdXJjZXMuZG9vcmJlbGxfYXBlcnR1cmVfc2l6ZSwKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1ka2ZkL2tmZF9kZXZpY2UuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k a2ZkL2tmZF9kZXZpY2UuYwppbmRleCAzZjk1ZjdjLi44ODE4N2JmIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRfZGV2aWNlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRrZmQva2ZkX2RldmljZS5jCkBAIC0yMjYsNiArMjI2LDEwIEBAIGJvb2wga2dkMmtm ZF9kZXZpY2VfaW5pdChzdHJ1Y3Qga2ZkX2RldiAqa2ZkLAogCiAJa2ZkLT5zaGFyZWRfcmVzb3Vy Y2VzID0gKmdwdV9yZXNvdXJjZXM7CiAKKwkvKiBXZSBvbmx5IHVzZSB0aGUgZmlyc3QgTUVDICov CisJaWYgKGtmZC0+c2hhcmVkX3Jlc291cmNlcy5udW1fbWVjID4gMSkKKwkJa2ZkLT5zaGFyZWRf cmVzb3VyY2VzLm51bV9tZWMgPSAxOworCiAJLyogY2FsY3VsYXRlIG1heCBzaXplIG9mIG1xZHMg bmVlZGVkIGZvciBxdWV1ZXMgKi8KIAlzaXplID0gbWF4X251bV9vZl9xdWV1ZXNfcGVyX2Rldmlj ZSAqCiAJCQlrZmQtPmRldmljZV9pbmZvLT5tcWRfc2l6ZV9hbGlnbmVkOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX2RldmljZV9xdWV1ZV9tYW5hZ2VyLmMgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRfZGV2aWNlX3F1ZXVlX21hbmFnZXIuYwppbmRl eCBjMDY0ZGVhLi41ZjI4NzIwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtm ZC9rZmRfZGV2aWNlX3F1ZXVlX21hbmFnZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGtmZC9rZmRfZGV2aWNlX3F1ZXVlX21hbmFnZXIuYwpAQCAtNjMsMjEgKzYzLDQ0IEBAIGVudW0g S0ZEX01RRF9UWVBFIGdldF9tcWRfdHlwZV9mcm9tX3F1ZXVlX3R5cGUoZW51bSBrZmRfcXVldWVf dHlwZSB0eXBlKQogCXJldHVybiBLRkRfTVFEX1RZUEVfQ1A7CiB9CiAKLXVuc2lnbmVkIGludCBn ZXRfZmlyc3RfcGlwZShzdHJ1Y3QgZGV2aWNlX3F1ZXVlX21hbmFnZXIgKmRxbSkKK3N0YXRpYyBi b29sIGlzX3BpcGVfZW5hYmxlZChzdHJ1Y3QgZGV2aWNlX3F1ZXVlX21hbmFnZXIgKmRxbSwgaW50 IG1lYywgaW50IHBpcGUpCit7CisJaW50IGk7CisJaW50IHBpcGVfb2Zmc2V0ID0gbWVjICogZHFt LT5kZXYtPnNoYXJlZF9yZXNvdXJjZXMubnVtX3BpcGVfcGVyX21lYworCQkrIHBpcGUgKiBkcW0t PmRldi0+c2hhcmVkX3Jlc291cmNlcy5udW1fcXVldWVfcGVyX3BpcGU7CisKKwkvKiBxdWV1ZSBp cyBhdmFpbGFibGUgZm9yIEtGRCB1c2FnZSBpZiBiaXQgaXMgMSAqLworCWZvciAoaSA9IDA7IGkg PCAgZHFtLT5kZXYtPnNoYXJlZF9yZXNvdXJjZXMubnVtX3F1ZXVlX3Blcl9waXBlOyArK2kpCisJ CWlmICh0ZXN0X2JpdChwaXBlX29mZnNldCArIGksCisJCQkgICAgICBkcW0tPmRldi0+c2hhcmVk X3Jlc291cmNlcy5xdWV1ZV9iaXRtYXApKQorCQkJcmV0dXJuIHRydWU7CisJcmV0dXJuIGZhbHNl OworfQorCit1bnNpZ25lZCBpbnQgZ2V0X21lY19udW0oc3RydWN0IGRldmljZV9xdWV1ZV9tYW5h Z2VyICpkcW0pCit7CisJQlVHX09OKCFkcW0gfHwgIWRxbS0+ZGV2KTsKKworCXJldHVybiBkcW0t PmRldi0+c2hhcmVkX3Jlc291cmNlcy5udW1fbWVjOworfQorCit1bnNpZ25lZCBpbnQgZ2V0X3F1 ZXVlc19udW0oc3RydWN0IGRldmljZV9xdWV1ZV9tYW5hZ2VyICpkcW0pCiB7CiAJQlVHX09OKCFk cW0gfHwgIWRxbS0+ZGV2KTsKLQlyZXR1cm4gZHFtLT5kZXYtPnNoYXJlZF9yZXNvdXJjZXMuZmly c3RfY29tcHV0ZV9waXBlOworCXJldHVybiBiaXRtYXBfd2VpZ2h0KGRxbS0+ZGV2LT5zaGFyZWRf cmVzb3VyY2VzLnF1ZXVlX2JpdG1hcCwKKwkJCQlLR0RfTUFYX1FVRVVFUyk7CiB9CiAKLXVuc2ln bmVkIGludCBnZXRfcGlwZXNfbnVtKHN0cnVjdCBkZXZpY2VfcXVldWVfbWFuYWdlciAqZHFtKQor dW5zaWduZWQgaW50IGdldF9xdWV1ZXNfcGVyX3BpcGUoc3RydWN0IGRldmljZV9xdWV1ZV9tYW5h Z2VyICpkcW0pCiB7CiAJQlVHX09OKCFkcW0gfHwgIWRxbS0+ZGV2KTsKLQlyZXR1cm4gZHFtLT5k ZXYtPnNoYXJlZF9yZXNvdXJjZXMuY29tcHV0ZV9waXBlX2NvdW50OworCXJldHVybiBkcW0tPmRl di0+c2hhcmVkX3Jlc291cmNlcy5udW1fcXVldWVfcGVyX3BpcGU7CiB9CiAKLXN0YXRpYyBpbmxp bmUgdW5zaWduZWQgaW50IGdldF9waXBlc19udW1fY3BzY2godm9pZCkKK3Vuc2lnbmVkIGludCBn ZXRfcGlwZXNfcGVyX21lYyhzdHJ1Y3QgZGV2aWNlX3F1ZXVlX21hbmFnZXIgKmRxbSkKIHsKLQly ZXR1cm4gUElQRV9QRVJfTUVfQ1BfU0NIRURVTElORzsKKwlCVUdfT04oIWRxbSB8fCAhZHFtLT5k ZXYpOworCXJldHVybiBkcW0tPmRldi0+c2hhcmVkX3Jlc291cmNlcy5udW1fcGlwZV9wZXJfbWVj OwogfQogCiB2b2lkIHByb2dyYW1fc2hfbWVtX3NldHRpbmdzKHN0cnVjdCBkZXZpY2VfcXVldWVf bWFuYWdlciAqZHFtLApAQCAtMjAwLDEyICsyMjMsMTYgQEAgc3RhdGljIGludCBhbGxvY2F0ZV9o cWQoc3RydWN0IGRldmljZV9xdWV1ZV9tYW5hZ2VyICpkcW0sIHN0cnVjdCBxdWV1ZSAqcSkKIAog CXNldCA9IGZhbHNlOwogCi0JZm9yIChwaXBlID0gZHFtLT5uZXh0X3BpcGVfdG9fYWxsb2NhdGUs IGkgPSAwOyBpIDwgZ2V0X3BpcGVzX251bShkcW0pOwotCQkJcGlwZSA9ICgocGlwZSArIDEpICUg Z2V0X3BpcGVzX251bShkcW0pKSwgKytpKSB7CisJZm9yIChwaXBlID0gZHFtLT5uZXh0X3BpcGVf dG9fYWxsb2NhdGUsIGkgPSAwOyBpIDwgZ2V0X3BpcGVzX3Blcl9tZWMoZHFtKTsKKwkJCXBpcGUg PSAoKHBpcGUgKyAxKSAlIGdldF9waXBlc19wZXJfbWVjKGRxbSkpLCArK2kpIHsKKworCQlpZiAo IWlzX3BpcGVfZW5hYmxlZChkcW0sIDAsIHBpcGUpKQorCQkJY29udGludWU7CisKIAkJaWYgKGRx bS0+YWxsb2NhdGVkX3F1ZXVlc1twaXBlXSAhPSAwKSB7CiAJCQliaXQgPSBmaW5kX2ZpcnN0X2Jp dCgKIAkJCQkodW5zaWduZWQgbG9uZyAqKSZkcW0tPmFsbG9jYXRlZF9xdWV1ZXNbcGlwZV0sCi0J CQkJUVVFVUVTX1BFUl9QSVBFKTsKKwkJCQlnZXRfcXVldWVzX3Blcl9waXBlKGRxbSkpOwogCiAJ CQljbGVhcl9iaXQoYml0LAogCQkJCSh1bnNpZ25lZCBsb25nICopJmRxbS0+YWxsb2NhdGVkX3F1 ZXVlc1twaXBlXSk7CkBAIC0yMjIsNyArMjQ5LDcgQEAgc3RhdGljIGludCBhbGxvY2F0ZV9ocWQo c3RydWN0IGRldmljZV9xdWV1ZV9tYW5hZ2VyICpkcW0sIHN0cnVjdCBxdWV1ZSAqcSkKIAlwcl9k ZWJ1Zygia2ZkOiBEUU0gJXMgaHFkIHNsb3QgLSBwaXBlICglZCkgcXVldWUoJWQpXG4iLAogCQkJ CV9fZnVuY19fLCBxLT5waXBlLCBxLT5xdWV1ZSk7CiAJLyogaG9yaXpvbnRhbCBocWQgYWxsb2Nh dGlvbiAqLwotCWRxbS0+bmV4dF9waXBlX3RvX2FsbG9jYXRlID0gKHBpcGUgKyAxKSAlIGdldF9w aXBlc19udW0oZHFtKTsKKwlkcW0tPm5leHRfcGlwZV90b19hbGxvY2F0ZSA9IChwaXBlICsgMSkg JSBnZXRfcGlwZXNfcGVyX21lYyhkcW0pOwogCiAJcmV0dXJuIDA7CiB9CkBAIC00NjksMzYgKzQ5 NiwyNSBAQCBzZXRfcGFzaWRfdm1pZF9tYXBwaW5nKHN0cnVjdCBkZXZpY2VfcXVldWVfbWFuYWdl ciAqZHFtLCB1bnNpZ25lZCBpbnQgcGFzaWQsCiAJCQkJCQl2bWlkKTsKIH0KIAotaW50IGluaXRf cGlwZWxpbmVzKHN0cnVjdCBkZXZpY2VfcXVldWVfbWFuYWdlciAqZHFtLAotCQkJdW5zaWduZWQg aW50IHBpcGVzX251bSwgdW5zaWduZWQgaW50IGZpcnN0X3BpcGUpCi17Ci0JQlVHX09OKCFkcW0g fHwgIWRxbS0+ZGV2KTsKLQotCXByX2RlYnVnKCJrZmQ6IEluIGZ1bmMgJXNcbiIsIF9fZnVuY19f KTsKLQotCXJldHVybiAwOwotfQotCiBzdGF0aWMgdm9pZCBpbml0X2ludGVycnVwdHMoc3RydWN0 IGRldmljZV9xdWV1ZV9tYW5hZ2VyICpkcW0pCiB7CiAJdW5zaWduZWQgaW50IGk7CiAKIAlCVUdf T04oZHFtID09IE5VTEwpOwogCi0JZm9yIChpID0gMCA7IGkgPCBnZXRfcGlwZXNfbnVtKGRxbSkg OyBpKyspCi0JCWRxbS0+ZGV2LT5rZmQya2dkLT5pbml0X2ludGVycnVwdHMoZHFtLT5kZXYtPmtn ZCwKLQkJCQlpICsgZ2V0X2ZpcnN0X3BpcGUoZHFtKSk7CisJZm9yIChpID0gMCA7IGkgPCBnZXRf cGlwZXNfcGVyX21lYyhkcW0pIDsgaSsrKQorCQlpZiAoaXNfcGlwZV9lbmFibGVkKGRxbSwgMCwg aSkpCisJCQlkcW0tPmRldi0+a2ZkMmtnZC0+aW5pdF9pbnRlcnJ1cHRzKGRxbS0+ZGV2LT5rZ2Qs IGkpOwogfQogCiBzdGF0aWMgaW50IGluaXRfc2NoZWR1bGVyKHN0cnVjdCBkZXZpY2VfcXVldWVf bWFuYWdlciAqZHFtKQogewotCWludCByZXR2YWw7CisJaW50IHJldHZhbCA9IDA7CiAKIAlCVUdf T04oIWRxbSk7CiAKIAlwcl9kZWJ1Zygia2ZkOiBJbiAlc1xuIiwgX19mdW5jX18pOwogCi0JcmV0 dmFsID0gaW5pdF9waXBlbGluZXMoZHFtLCBnZXRfcGlwZXNfbnVtKGRxbSksIGdldF9maXJzdF9w aXBlKGRxbSkpOwogCXJldHVybiByZXR2YWw7CiB9CiAKQEAgLTUwOSwyMSArNTI1LDIxIEBAIHN0 YXRpYyBpbnQgaW5pdGlhbGl6ZV9ub2Nwc2NoKHN0cnVjdCBkZXZpY2VfcXVldWVfbWFuYWdlciAq ZHFtKQogCUJVR19PTighZHFtKTsKIAogCXByX2RlYnVnKCJrZmQ6IEluIGZ1bmMgJXMgbnVtIG9m IHBpcGVzOiAlZFxuIiwKLQkJCV9fZnVuY19fLCBnZXRfcGlwZXNfbnVtKGRxbSkpOworCQkJX19m dW5jX18sIGdldF9waXBlc19wZXJfbWVjKGRxbSkpOwogCiAJbXV0ZXhfaW5pdCgmZHFtLT5sb2Nr KTsKIAlJTklUX0xJU1RfSEVBRCgmZHFtLT5xdWV1ZXMpOwogCWRxbS0+cXVldWVfY291bnQgPSBk cW0tPm5leHRfcGlwZV90b19hbGxvY2F0ZSA9IDA7CiAJZHFtLT5zZG1hX3F1ZXVlX2NvdW50ID0g MDsKLQlkcW0tPmFsbG9jYXRlZF9xdWV1ZXMgPSBrY2FsbG9jKGdldF9waXBlc19udW0oZHFtKSwK KwlkcW0tPmFsbG9jYXRlZF9xdWV1ZXMgPSBrY2FsbG9jKGdldF9waXBlc19wZXJfbWVjKGRxbSks CiAJCQkJCXNpemVvZih1bnNpZ25lZCBpbnQpLCBHRlBfS0VSTkVMKTsKIAlpZiAoIWRxbS0+YWxs b2NhdGVkX3F1ZXVlcykgewogCQltdXRleF9kZXN0cm95KCZkcW0tPmxvY2spOwogCQlyZXR1cm4g LUVOT01FTTsKIAl9CiAKLQlmb3IgKGkgPSAwOyBpIDwgZ2V0X3BpcGVzX251bShkcW0pOyBpKysp Ci0JCWRxbS0+YWxsb2NhdGVkX3F1ZXVlc1tpXSA9ICgxIDw8IFFVRVVFU19QRVJfUElQRSkgLSAx OworCWZvciAoaSA9IDA7IGkgPCBnZXRfcGlwZXNfcGVyX21lYyhkcW0pOyBpKyspCisJCWRxbS0+ YWxsb2NhdGVkX3F1ZXVlc1tpXSA9ICgxIDw8IGdldF9xdWV1ZXNfcGVyX3BpcGUoZHFtKSkgLSAx OwogCiAJZHFtLT52bWlkX2JpdG1hcCA9ICgxIDw8IFZNSURfUEVSX0RFVklDRSkgLSAxOwogCWRx bS0+c2RtYV9iaXRtYXAgPSAoMSA8PCBDSUtfU0RNQV9RVUVVRVMpIC0gMTsKQEAgLTYzMCwxOCAr NjQ2LDM0IEBAIHN0YXRpYyBpbnQgY3JlYXRlX3NkbWFfcXVldWVfbm9jcHNjaChzdHJ1Y3QgZGV2 aWNlX3F1ZXVlX21hbmFnZXIgKmRxbSwKIAogc3RhdGljIGludCBzZXRfc2NoZWRfcmVzb3VyY2Vz KHN0cnVjdCBkZXZpY2VfcXVldWVfbWFuYWdlciAqZHFtKQogeworCWludCBpOwogCXN0cnVjdCBz Y2hlZHVsaW5nX3Jlc291cmNlcyByZXM7Ci0JdW5zaWduZWQgaW50IHF1ZXVlX251bSwgcXVldWVf bWFzazsKIAogCUJVR19PTighZHFtKTsKIAogCXByX2RlYnVnKCJrZmQ6IEluIGZ1bmMgJXNcbiIs IF9fZnVuY19fKTsKIAotCXF1ZXVlX251bSA9IGdldF9waXBlc19udW1fY3BzY2goKSAqIFFVRVVF U19QRVJfUElQRTsKLQlxdWV1ZV9tYXNrID0gKDEgPDwgcXVldWVfbnVtKSAtIDE7CiAJcmVzLnZt aWRfbWFzayA9ICgxIDw8IFZNSURfUEVSX0RFVklDRSkgLSAxOwogCXJlcy52bWlkX21hc2sgPDw9 IEtGRF9WTUlEX1NUQVJUX09GRlNFVDsKLQlyZXMucXVldWVfbWFzayA9IHF1ZXVlX21hc2sgPDwg KGdldF9maXJzdF9waXBlKGRxbSkgKiBRVUVVRVNfUEVSX1BJUEUpOworCisJLyogQXZvaWQgdG91 Y2hpbmcgdGhlIGludGVybmFsIHJlcHJlc2VudGF0aW9uIHF1ZXVlX2JpdG1hcCBkaXJlY3RseS4K KwkgKiBFdmVuIHRob3VnaCBkb2luZyBhIHNpbXBsZSBtZW1jcHkgbWlnaHQgc291bmQgdGVtcHRp bmcsIGl0IHdvdWxkCisJICogc2lsZW50bHkgYnJlYWsgaWYgdGhlIGltcGxlbWVudGF0aW9uIG9m IGJpdG1hcHMgaXMgY2hhbmdlZCAqLworCXJlcy5xdWV1ZV9tYXNrID0gMDsKKwlmb3IgKGkgPSAw OyBpIDwgS0dEX01BWF9RVUVVRVM7ICsraSkgeworCQlpZiAoIXRlc3RfYml0KGksIGRxbS0+ZGV2 LT5zaGFyZWRfcmVzb3VyY2VzLnF1ZXVlX2JpdG1hcCkpCisJCQljb250aW51ZTsKKworCQkvKiBU aGlzIHNpdHVhdGlvbiBtYXkgYmUgaGl0IGluIHRoZSBmdXR1cmUgaWYgYSBuZXcgSFcKKwkJICog Z2VuZXJhdGlvbiBleHBvc2VzIG1vcmUgdGhhbiA2NCBxdWV1ZXMuIElmIHNvLCB0aGUKKwkJICog ZGVmaW5pdGlvbiBvZiByZXMucXVldWVfbWFzayBuZWVkcyB1cGRhdGluZyAqLworCQlpZiAoV0FS Tl9PTihpID4gKHNpemVvZihyZXMucXVldWVfbWFzaykqOCkpKSB7CisJCQlwcl9lcnIoIkludmFs aWQgcXVldWUgZW5hYmxlZCBieSBhbWRncHU6ICVkXG4iLCBpKTsKKwkJCWJyZWFrOworCQl9CisK KwkJcmVzLnF1ZXVlX21hc2sgfD0gKDF1bGwgPDwgaSk7CisJfQogCXJlcy5nd3NfbWFzayA9IHJl cy5vYWNfbWFzayA9IHJlcy5nZHNfaGVhcF9iYXNlID0KIAkJCQkJCXJlcy5nZHNfaGVhcF9zaXpl ID0gMDsKIApAQCAtNjYwLDcgKzY5Miw3IEBAIHN0YXRpYyBpbnQgaW5pdGlhbGl6ZV9jcHNjaChz dHJ1Y3QgZGV2aWNlX3F1ZXVlX21hbmFnZXIgKmRxbSkKIAlCVUdfT04oIWRxbSk7CiAKIAlwcl9k ZWJ1Zygia2ZkOiBJbiBmdW5jICVzIG51bSBvZiBwaXBlczogJWRcbiIsCi0JCQlfX2Z1bmNfXywg Z2V0X3BpcGVzX251bV9jcHNjaCgpKTsKKwkJCV9fZnVuY19fLCBnZXRfcGlwZXNfcGVyX21lYyhk cW0pKTsKIAogCW11dGV4X2luaXQoJmRxbS0+bG9jayk7CiAJSU5JVF9MSVNUX0hFQUQoJmRxbS0+ cXVldWVzKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tmZF9kZXZp Y2VfcXVldWVfbWFuYWdlci5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX2Rldmlj ZV9xdWV1ZV9tYW5hZ2VyLmgKaW5kZXggYTYyNWI5MS4uNjZiOTYxNSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX2RldmljZV9xdWV1ZV9tYW5hZ2VyLmgKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX2RldmljZV9xdWV1ZV9tYW5hZ2VyLmgKQEAg LTMwLDggKzMwLDYgQEAKICNpbmNsdWRlICJrZmRfbXFkX21hbmFnZXIuaCIKIAogI2RlZmluZSBR VUVVRV9QUkVFTVBUX0RFRkFVTFRfVElNRU9VVF9NUwkoNTAwKQotI2RlZmluZSBRVUVVRVNfUEVS X1BJUEUJCQkJKDgpCi0jZGVmaW5lIFBJUEVfUEVSX01FX0NQX1NDSEVEVUxJTkcJCSgzKQogI2Rl ZmluZSBDSUtfVk1JRF9OVU0JCQkJKDgpCiAjZGVmaW5lIEtGRF9WTUlEX1NUQVJUX09GRlNFVAkJ CSg4KQogI2RlZmluZSBWTUlEX1BFUl9ERVZJQ0UJCQkJQ0lLX1ZNSURfTlVNCkBAIC0xODIsMTAg KzE4MCwxMCBAQCB2b2lkIGRldmljZV9xdWV1ZV9tYW5hZ2VyX2luaXRfY2lrKHN0cnVjdCBkZXZp Y2VfcXVldWVfbWFuYWdlcl9hc2ljX29wcyAqb3BzKTsKIHZvaWQgZGV2aWNlX3F1ZXVlX21hbmFn ZXJfaW5pdF92aShzdHJ1Y3QgZGV2aWNlX3F1ZXVlX21hbmFnZXJfYXNpY19vcHMgKm9wcyk7CiB2 b2lkIHByb2dyYW1fc2hfbWVtX3NldHRpbmdzKHN0cnVjdCBkZXZpY2VfcXVldWVfbWFuYWdlciAq ZHFtLAogCQkJCQlzdHJ1Y3QgcWNtX3Byb2Nlc3NfZGV2aWNlICpxcGQpOwotaW50IGluaXRfcGlw ZWxpbmVzKHN0cnVjdCBkZXZpY2VfcXVldWVfbWFuYWdlciAqZHFtLAotCQl1bnNpZ25lZCBpbnQg cGlwZXNfbnVtLCB1bnNpZ25lZCBpbnQgZmlyc3RfcGlwZSk7Ci11bnNpZ25lZCBpbnQgZ2V0X2Zp cnN0X3BpcGUoc3RydWN0IGRldmljZV9xdWV1ZV9tYW5hZ2VyICpkcW0pOwotdW5zaWduZWQgaW50 IGdldF9waXBlc19udW0oc3RydWN0IGRldmljZV9xdWV1ZV9tYW5hZ2VyICpkcW0pOwordW5zaWdu ZWQgaW50IGdldF9tZWNfbnVtKHN0cnVjdCBkZXZpY2VfcXVldWVfbWFuYWdlciAqZHFtKTsKK3Vu c2lnbmVkIGludCBnZXRfcXVldWVzX251bShzdHJ1Y3QgZGV2aWNlX3F1ZXVlX21hbmFnZXIgKmRx bSk7Cit1bnNpZ25lZCBpbnQgZ2V0X3F1ZXVlc19wZXJfcGlwZShzdHJ1Y3QgZGV2aWNlX3F1ZXVl X21hbmFnZXIgKmRxbSk7Cit1bnNpZ25lZCBpbnQgZ2V0X3BpcGVzX3Blcl9tZWMoc3RydWN0IGRl dmljZV9xdWV1ZV9tYW5hZ2VyICpkcW0pOwogCiBzdGF0aWMgaW5saW5lIHVuc2lnbmVkIGludCBn ZXRfc2hfbWVtX2Jhc2VzXzMyKHN0cnVjdCBrZmRfcHJvY2Vzc19kZXZpY2UgKnBkZCkKIHsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tmZF9kZXZpY2VfcXVldWVfbWFu YWdlcl9jaWsuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tmZF9kZXZpY2VfcXVldWVf bWFuYWdlcl9jaWsuYwppbmRleCBjNmY0MzVhLi40OGRjMDU2IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRfZGV2aWNlX3F1ZXVlX21hbmFnZXJfY2lrLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX2RldmljZV9xdWV1ZV9tYW5hZ2VyX2Npay5j CkBAIC0xNTEsNSArMTUxLDUgQEAgc3RhdGljIHZvaWQgaW5pdF9zZG1hX3ZtKHN0cnVjdCBkZXZp Y2VfcXVldWVfbWFuYWdlciAqZHFtLCBzdHJ1Y3QgcXVldWUgKnEsCiAKIHN0YXRpYyBpbnQgaW5p dGlhbGl6ZV9jcHNjaF9jaWsoc3RydWN0IGRldmljZV9xdWV1ZV9tYW5hZ2VyICpkcW0pCiB7Ci0J cmV0dXJuIGluaXRfcGlwZWxpbmVzKGRxbSwgZ2V0X3BpcGVzX251bShkcW0pLCBnZXRfZmlyc3Rf cGlwZShkcW0pKTsKKwlyZXR1cm4gMDsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1ka2ZkL2tmZF9wYWNrZXRfbWFuYWdlci5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRr ZmQva2ZkX3BhY2tldF9tYW5hZ2VyLmMKaW5kZXggY2E4YzA5My4uNzEzMTk5OCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX3BhY2tldF9tYW5hZ2VyLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX3BhY2tldF9tYW5hZ2VyLmMKQEAgLTY1LDgg KzY1LDcgQEAgc3RhdGljIHZvaWQgcG1fY2FsY19ybGliX3NpemUoc3RydWN0IHBhY2tldF9tYW5h Z2VyICpwbSwKIAogCS8qIGNoZWNrIGlmIHRoZXJlIGlzIG92ZXIgc3Vic2NyaXB0aW9uKi8KIAkq b3Zlcl9zdWJzY3JpcHRpb24gPSBmYWxzZTsKLQlpZiAoKHByb2Nlc3NfY291bnQgPiAxKSB8fAot CQlxdWV1ZV9jb3VudCA+IFBJUEVfUEVSX01FX0NQX1NDSEVEVUxJTkcgKiBRVUVVRVNfUEVSX1BJ UEUpIHsKKwlpZiAoKHByb2Nlc3NfY291bnQgPiAxKSB8fCBxdWV1ZV9jb3VudCA+IGdldF9xdWV1 ZXNfbnVtKHBtLT5kcW0pKSB7CiAJCSpvdmVyX3N1YnNjcmlwdGlvbiA9IHRydWU7CiAJCXByX2Rl YnVnKCJrZmQ6IG92ZXIgc3Vic2NyaWJlZCBydW5saXN0XG4iKTsKIAl9CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRfcHJvY2Vzc19xdWV1ZV9tYW5hZ2VyLmMgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRfcHJvY2Vzc19xdWV1ZV9tYW5hZ2VyLmMKaW5k ZXggZTFmYjQwYi4uMzJjZGYyYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRr ZmQva2ZkX3Byb2Nlc3NfcXVldWVfbWFuYWdlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1ka2ZkL2tmZF9wcm9jZXNzX3F1ZXVlX21hbmFnZXIuYwpAQCAtMjA5LDcgKzIwOSw3IEBAIGlu dCBwcW1fY3JlYXRlX3F1ZXVlKHN0cnVjdCBwcm9jZXNzX3F1ZXVlX21hbmFnZXIgKnBxbSwKIAkJ LyogY2hlY2sgaWYgdGhlcmUgaXMgb3ZlciBzdWJzY3JpcHRpb24gKi8KIAkJaWYgKChzY2hlZF9w b2xpY3kgPT0gS0ZEX1NDSEVEX1BPTElDWV9IV1NfTk9fT1ZFUlNVQlNDUklQVElPTikgJiYKIAkJ KChkZXYtPmRxbS0+cHJvY2Vzc2VzX2NvdW50ID49IFZNSURfUEVSX0RFVklDRSkgfHwKLQkJKGRl di0+ZHFtLT5xdWV1ZV9jb3VudCA+PSBQSVBFX1BFUl9NRV9DUF9TQ0hFRFVMSU5HICogUVVFVUVT X1BFUl9QSVBFKSkpIHsKKwkJKGRldi0+ZHFtLT5xdWV1ZV9jb3VudCA+PSBnZXRfcXVldWVzX251 bShkZXYtPmRxbSkpKSkgewogCQkJcHJfZXJyKCJrZmQ6IG92ZXItc3Vic2NyaXB0aW9uIGlzIG5v dCBhbGxvd2VkIGluIHJhZGVvbl9rZmQuc2NoZWRfcG9saWN5ID09IDFcbiIpOwogCQkJcmV0dmFs ID0gLUVQRVJNOwogCQkJZ290byBlcnJfY3JlYXRlX3F1ZXVlOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2FtZC9pbmNsdWRlL2tnZF9rZmRfaW50ZXJmYWNlLmggYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2luY2x1ZGUva2dkX2tmZF9pbnRlcmZhY2UuaAppbmRleCA2N2Y2ZDE5Li45MWVmMTQ4 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2luY2x1ZGUva2dkX2tmZF9pbnRlcmZh Y2UuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2luY2x1ZGUva2dkX2tmZF9pbnRlcmZhY2Uu aApAQCAtMjksMTAgKzI5LDExIEBACiAjZGVmaW5lIEtHRF9LRkRfSU5URVJGQUNFX0hfSU5DTFVE RUQKIAogI2luY2x1ZGUgPGxpbnV4L3R5cGVzLmg+CisjaW5jbHVkZSA8bGludXgvYml0bWFwLmg+ CiAKIHN0cnVjdCBwY2lfZGV2OwogCi0jZGVmaW5lIEtGRF9JTlRFUkZBQ0VfVkVSU0lPTiAxCisj ZGVmaW5lIEtGRF9JTlRFUkZBQ0VfVkVSU0lPTiAyCiAjZGVmaW5lIEtHRF9NQVhfUVVFVUVTIDEy OAogCiBzdHJ1Y3Qga2ZkX2RldjsKQEAgLTYyLDExICs2MywxNyBAQCBzdHJ1Y3Qga2dkMmtmZF9z aGFyZWRfcmVzb3VyY2VzIHsKIAkvKiBCaXQgbiA9PSAxIG1lYW5zIFZNSUQgbiBpcyBhdmFpbGFi bGUgZm9yIEtGRC4gKi8KIAl1bnNpZ25lZCBpbnQgY29tcHV0ZV92bWlkX2JpdG1hcDsKIAotCS8q IENvbXB1dGUgcGlwZXMgYXJlIGNvdW50ZWQgc3RhcnRpbmcgZnJvbSBNRUMwL3BpcGUwIGFzIDAu ICovCi0JdW5zaWduZWQgaW50IGZpcnN0X2NvbXB1dGVfcGlwZTsKKwkvKiBudW1iZXIgb2YgbWVj IGF2YWlsYWJsZSBmcm9tIHRoZSBoYXJkd2FyZSAqLworCXVpbnQzMl90IG51bV9tZWM7CiAKLQkv KiBOdW1iZXIgb2YgTUVDIHBpcGVzIGF2YWlsYWJsZSBmb3IgS0ZELiAqLwotCXVuc2lnbmVkIGlu dCBjb21wdXRlX3BpcGVfY291bnQ7CisJLyogbnVtYmVyIG9mIHBpcGVzIHBlciBtZWMgKi8KKwl1 aW50MzJfdCBudW1fcGlwZV9wZXJfbWVjOworCisJLyogbnVtYmVyIG9mIHF1ZXVlcyBwZXIgcGlw ZSAqLworCXVpbnQzMl90IG51bV9xdWV1ZV9wZXJfcGlwZTsKKworCS8qIEJpdCBuID09IDEgbWVh bnMgUXVldWUgbiBpcyBhdmFpbGFibGUgZm9yIEtGRCAqLworCURFQ0xBUkVfQklUTUFQKHF1ZXVl X2JpdG1hcCwgS0dEX01BWF9RVUVVRVMpOwogCiAJLyogQmFzZSBhZGRyZXNzIG9mIGRvb3JiZWxs IGFwZXJ0dXJlLiAqLwogCXBoeXNfYWRkcl90IGRvb3JiZWxsX3BoeXNpY2FsX2FkZHJlc3M7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9rZmQuYyBiL2RyaXZlcnMv Z3B1L2RybS9yYWRlb24vcmFkZW9uX2tmZC5jCmluZGV4IGEwNmUzYjEuLjY5OWZlN2YgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2tmZC5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9yYWRlb24vcmFkZW9uX2tmZC5jCkBAIC0xNzksMTQgKzE3OSwyOSBAQCB2b2lkIHJh ZGVvbl9rZmRfZGV2aWNlX3Byb2JlKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2KQogCiB2b2lk IHJhZGVvbl9rZmRfZGV2aWNlX2luaXQoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYpCiB7CisJ aW50IGksIHF1ZXVlLCBwaXBlLCBtZWM7CisKIAlpZiAocmRldi0+a2ZkKSB7CiAJCXN0cnVjdCBr Z2Qya2ZkX3NoYXJlZF9yZXNvdXJjZXMgZ3B1X3Jlc291cmNlcyA9IHsKIAkJCS5jb21wdXRlX3Zt aWRfYml0bWFwID0gMHhGRjAwLAotCi0JCQkuZmlyc3RfY29tcHV0ZV9waXBlID0gMSwKLQkJCS5j b21wdXRlX3BpcGVfY291bnQgPSA0IC0gMSwKKwkJCS5udW1fbWVjID0gMSwKKwkJCS5udW1fcGlw ZV9wZXJfbWVjID0gNCwKKwkJCS5udW1fcXVldWVfcGVyX3BpcGUgPSA4CiAJCX07CiAKKwkJYml0 bWFwX3plcm8oZ3B1X3Jlc291cmNlcy5xdWV1ZV9iaXRtYXAsIEtHRF9NQVhfUVVFVUVTKTsKKwor CQlmb3IgKGkgPSAwOyBpIDwgS0dEX01BWF9RVUVVRVM7ICsraSkgeworCQkJcXVldWUgPSBpICUg Z3B1X3Jlc291cmNlcy5udW1fcXVldWVfcGVyX3BpcGU7CisJCQlwaXBlID0gKGkgLyBncHVfcmVz b3VyY2VzLm51bV9xdWV1ZV9wZXJfcGlwZSkKKwkJCQklIGdwdV9yZXNvdXJjZXMubnVtX3BpcGVf cGVyX21lYzsKKwkJCW1lYyA9IChpIC8gZ3B1X3Jlc291cmNlcy5udW1fcXVldWVfcGVyX3BpcGUp CisJCQkJLyBncHVfcmVzb3VyY2VzLm51bV9waXBlX3Blcl9tZWM7CisKKwkJCWlmIChtZWMgPT0g MCAmJiBwaXBlID4gMCkKKwkJCQlzZXRfYml0KGksIGdwdV9yZXNvdXJjZXMucXVldWVfYml0bWFw KTsKKwkJfQorCiAJCXJhZGVvbl9kb29yYmVsbF9nZXRfa2ZkX2luZm8ocmRldiwKIAkJCQkmZ3B1 X3Jlc291cmNlcy5kb29yYmVsbF9waHlzaWNhbF9hZGRyZXNzLAogCQkJCSZncHVfcmVzb3VyY2Vz LmRvb3JiZWxsX2FwZXJ0dXJlX3NpemUsCi0tIAoyLjkuMwoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9hbWQtZ2Z4Cg==