From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" Subject: [PATCH 7/7] drm/amdgpu: use entity instead of ring for CS Date: Wed, 1 Aug 2018 13:31:16 +0200 Message-ID: <20180801113116.1994-7-christian.koenig@amd.com> References: <20180801113116.1994-1-christian.koenig@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180801113116.1994-1-christian.koenig-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 RnVydGhlciBkZW1hbmdsZSByaW5nIGZyb20gZW50aXR5IGhhbmRsaW5nLgoKU2lnbmVkLW9mZi1i eTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jcy5jICAgIHwgNjYgKysrKysrKysrKysrKysrKy0tLS0t LS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2N0eC5jICAgfCA1 MyArKysrKysrKysrKysrKy0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfY3R4LmggICB8IDE2ICsrKystLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfdHJhY2UuaCB8ICA0ICstCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS91dmRfdjdf MC5jICAgICB8ICAzICstCiA2IGZpbGVzIGNoYW5nZWQsIDc4IGluc2VydGlvbnMoKyksIDY2IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdw dS5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKaW5kZXggNmRlMjQxODcx MWY4Li4yYjZlZjllMmIyNzkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L2FtZGdwdS5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oCkBAIC05 MTAsNyArOTEwLDcgQEAgc3RydWN0IGFtZGdwdV9jc19wYXJzZXIgewogCiAJLyogc2NoZWR1bGVy IGpvYiBvYmplY3QgKi8KIAlzdHJ1Y3QgYW1kZ3B1X2pvYgkqam9iOwotCXN0cnVjdCBhbWRncHVf cmluZwkqcmluZzsKKwlzdHJ1Y3QgZHJtX3NjaGVkX2VudGl0eQkqZW50aXR5OwogCiAJLyogYnVm ZmVyIG9iamVjdHMgKi8KIAlzdHJ1Y3Qgd3dfYWNxdWlyZV9jdHgJCXRpY2tldDsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jcy5jIGIvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2NzLmMKaW5kZXggYjA0NzE5ODY4Yzg1Li41ZGNiY2VhNjJi YTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jcy5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jcy5jCkBAIC04OTIsMTMgKzg5 MiwxMyBAQCBzdGF0aWMgaW50IGFtZGdwdV9ib192bV91cGRhdGVfcHRlKHN0cnVjdCBhbWRncHVf Y3NfcGFyc2VyICpwKQogc3RhdGljIGludCBhbWRncHVfY3NfaWJfdm1fY2h1bmsoc3RydWN0IGFt ZGdwdV9kZXZpY2UgKmFkZXYsCiAJCQkJIHN0cnVjdCBhbWRncHVfY3NfcGFyc2VyICpwKQogewor CXN0cnVjdCBhbWRncHVfcmluZyAqcmluZyA9IHRvX2FtZGdwdV9yaW5nKHAtPmVudGl0eS0+cnEt PnNjaGVkKTsKIAlzdHJ1Y3QgYW1kZ3B1X2Zwcml2ICpmcHJpdiA9IHAtPmZpbHAtPmRyaXZlcl9w cml2OwogCXN0cnVjdCBhbWRncHVfdm0gKnZtID0gJmZwcml2LT52bTsKLQlzdHJ1Y3QgYW1kZ3B1 X3JpbmcgKnJpbmcgPSBwLT5yaW5nOwogCWludCByOwogCiAJLyogT25seSBmb3IgVVZEL1ZDRSBW TSBlbXVsYXRpb24gKi8KLQlpZiAocC0+cmluZy0+ZnVuY3MtPnBhcnNlX2NzIHx8IHAtPnJpbmct PmZ1bmNzLT5wYXRjaF9jc19pbl9wbGFjZSkgeworCWlmIChyaW5nLT5mdW5jcy0+cGFyc2VfY3Mg fHwgcmluZy0+ZnVuY3MtPnBhdGNoX2NzX2luX3BsYWNlKSB7CiAJCXVuc2lnbmVkIGksIGo7CiAK IAkJZm9yIChpID0gMCwgaiA9IDA7IGkgPCBwLT5uY2h1bmtzICYmIGogPCBwLT5qb2ItPm51bV9p YnM7IGkrKykgewpAQCAtOTM5LDcgKzkzOSw3IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X2NzX2liX3Zt X2NodW5rKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCQkJb2Zmc2V0ID0gbS0+c3RhcnQg KiBBTURHUFVfR1BVX1BBR0VfU0laRTsKIAkJCWtwdHIgKz0gdmFfc3RhcnQgLSBvZmZzZXQ7CiAK LQkJCWlmIChwLT5yaW5nLT5mdW5jcy0+cGFyc2VfY3MpIHsKKwkJCWlmIChyaW5nLT5mdW5jcy0+ cGFyc2VfY3MpIHsKIAkJCQltZW1jcHkoaWItPnB0ciwga3B0ciwgY2h1bmtfaWItPmliX2J5dGVz KTsKIAkJCQlhbWRncHVfYm9fa3VubWFwKGFvYmopOwogCkBAIC05NzgsMTQgKzk3OCwxNSBAQCBz dGF0aWMgaW50IGFtZGdwdV9jc19pYl9maWxsKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAog ewogCXN0cnVjdCBhbWRncHVfZnByaXYgKmZwcml2ID0gcGFyc2VyLT5maWxwLT5kcml2ZXJfcHJp djsKIAlzdHJ1Y3QgYW1kZ3B1X3ZtICp2bSA9ICZmcHJpdi0+dm07Ci0JaW50IGksIGo7CiAJaW50 IHIsIGNlX3ByZWVtcHQgPSAwLCBkZV9wcmVlbXB0ID0gMDsKKwlzdHJ1Y3QgYW1kZ3B1X3Jpbmcg KnJpbmc7CisJaW50IGksIGo7CiAKIAlmb3IgKGkgPSAwLCBqID0gMDsgaSA8IHBhcnNlci0+bmNo dW5rcyAmJiBqIDwgcGFyc2VyLT5qb2ItPm51bV9pYnM7IGkrKykgewogCQlzdHJ1Y3QgYW1kZ3B1 X2NzX2NodW5rICpjaHVuazsKIAkJc3RydWN0IGFtZGdwdV9pYiAqaWI7CiAJCXN0cnVjdCBkcm1f YW1kZ3B1X2NzX2NodW5rX2liICpjaHVua19pYjsKLQkJc3RydWN0IGFtZGdwdV9yaW5nICpyaW5n OworCQlzdHJ1Y3QgZHJtX3NjaGVkX2VudGl0eSAqZW50aXR5OwogCiAJCWNodW5rID0gJnBhcnNl ci0+Y2h1bmtzW2ldOwogCQlpYiA9ICZwYXJzZXItPmpvYi0+aWJzW2pdOwpAQCAtMTAwNyw5ICsx MDA4LDkgQEAgc3RhdGljIGludCBhbWRncHVfY3NfaWJfZmlsbChzdHJ1Y3QgYW1kZ3B1X2Rldmlj ZSAqYWRldiwKIAkJCQlyZXR1cm4gLUVJTlZBTDsKIAkJfQogCi0JCXIgPSBhbWRncHVfY3R4X2dl dF9yaW5nKHBhcnNlci0+Y3R4LCBjaHVua19pYi0+aXBfdHlwZSwKLQkJCQkJY2h1bmtfaWItPmlw X2luc3RhbmNlLCBjaHVua19pYi0+cmluZywKLQkJCQkJJnJpbmcpOworCQlyID0gYW1kZ3B1X2N0 eF9nZXRfZW50aXR5KHBhcnNlci0+Y3R4LCBjaHVua19pYi0+aXBfdHlwZSwKKwkJCQkJICBjaHVu a19pYi0+aXBfaW5zdGFuY2UsIGNodW5rX2liLT5yaW5nLAorCQkJCQkgICZlbnRpdHkpOwogCQlp ZiAocikKIAkJCXJldHVybiByOwogCkBAIC0xMDIxLDE0ICsxMDIyLDE0IEBAIHN0YXRpYyBpbnQg YW1kZ3B1X2NzX2liX2ZpbGwoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJCQl9CiAJCX0K IAotCQlpZiAocGFyc2VyLT5yaW5nICYmIHBhcnNlci0+cmluZyAhPSByaW5nKQorCQlpZiAocGFy c2VyLT5lbnRpdHkgJiYgcGFyc2VyLT5lbnRpdHkgIT0gZW50aXR5KQogCQkJcmV0dXJuIC1FSU5W QUw7CiAKLQkJcGFyc2VyLT5yaW5nID0gcmluZzsKKwkJcGFyc2VyLT5lbnRpdHkgPSBlbnRpdHk7 CiAKLQkJciA9ICBhbWRncHVfaWJfZ2V0KGFkZXYsIHZtLAotCQkJCQlyaW5nLT5mdW5jcy0+cGFy c2VfY3MgPyBjaHVua19pYi0+aWJfYnl0ZXMgOiAwLAotCQkJCQlpYik7CisJCXJpbmcgPSB0b19h bWRncHVfcmluZyhlbnRpdHktPnJxLT5zY2hlZCk7CisJCXIgPSAgYW1kZ3B1X2liX2dldChhZGV2 LCB2bSwgcmluZy0+ZnVuY3MtPnBhcnNlX2NzID8KKwkJCQkgICBjaHVua19pYi0+aWJfYnl0ZXMg OiAwLCBpYik7CiAJCWlmIChyKSB7CiAJCQlEUk1fRVJST1IoIkZhaWxlZCB0byBnZXQgaWIgIVxu Iik7CiAJCQlyZXR1cm4gcjsKQEAgLTEwNDIsMTIgKzEwNDMsMTMgQEAgc3RhdGljIGludCBhbWRn cHVfY3NfaWJfZmlsbChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAl9CiAKIAkvKiBVVkQg JiBWQ0UgZncgZG9lc24ndCBzdXBwb3J0IHVzZXIgZmVuY2VzICovCisJcmluZyA9IHRvX2FtZGdw dV9yaW5nKHBhcnNlci0+ZW50aXR5LT5ycS0+c2NoZWQpOwogCWlmIChwYXJzZXItPmpvYi0+dWZf YWRkciAmJiAoCi0JICAgIHBhcnNlci0+cmluZy0+ZnVuY3MtPnR5cGUgPT0gQU1ER1BVX1JJTkdf VFlQRV9VVkQgfHwKLQkgICAgcGFyc2VyLT5yaW5nLT5mdW5jcy0+dHlwZSA9PSBBTURHUFVfUklO R19UWVBFX1ZDRSkpCisJICAgIHJpbmctPmZ1bmNzLT50eXBlID09IEFNREdQVV9SSU5HX1RZUEVf VVZEIHx8CisJICAgIHJpbmctPmZ1bmNzLT50eXBlID09IEFNREdQVV9SSU5HX1RZUEVfVkNFKSkK IAkJcmV0dXJuIC1FSU5WQUw7CiAKLQlyZXR1cm4gYW1kZ3B1X2N0eF93YWl0X3ByZXZfZmVuY2Uo cGFyc2VyLT5jdHgsIHBhcnNlci0+cmluZy0+aWR4KTsKKwlyZXR1cm4gYW1kZ3B1X2N0eF93YWl0 X3ByZXZfZmVuY2UocGFyc2VyLT5jdHgsIHBhcnNlci0+ZW50aXR5KTsKIH0KIAogc3RhdGljIGlu dCBhbWRncHVfY3NfcHJvY2Vzc19mZW5jZV9kZXAoc3RydWN0IGFtZGdwdV9jc19wYXJzZXIgKnAs CkBAIC0xMDYzLDIzICsxMDY1LDIzIEBAIHN0YXRpYyBpbnQgYW1kZ3B1X2NzX3Byb2Nlc3NfZmVu Y2VfZGVwKHN0cnVjdCBhbWRncHVfY3NfcGFyc2VyICpwLAogCQlzaXplb2Yoc3RydWN0IGRybV9h bWRncHVfY3NfY2h1bmtfZGVwKTsKIAogCWZvciAoaSA9IDA7IGkgPCBudW1fZGVwczsgKytpKSB7 Ci0JCXN0cnVjdCBhbWRncHVfcmluZyAqcmluZzsKIAkJc3RydWN0IGFtZGdwdV9jdHggKmN0eDsK KwkJc3RydWN0IGRybV9zY2hlZF9lbnRpdHkgKmVudGl0eTsKIAkJc3RydWN0IGRtYV9mZW5jZSAq ZmVuY2U7CiAKIAkJY3R4ID0gYW1kZ3B1X2N0eF9nZXQoZnByaXYsIGRlcHNbaV0uY3R4X2lkKTsK IAkJaWYgKGN0eCA9PSBOVUxMKQogCQkJcmV0dXJuIC1FSU5WQUw7CiAKLQkJciA9IGFtZGdwdV9j dHhfZ2V0X3JpbmcoY3R4LCBkZXBzW2ldLmlwX3R5cGUsCi0JCQkJCWRlcHNbaV0uaXBfaW5zdGFu Y2UsCi0JCQkJCWRlcHNbaV0ucmluZywgJnJpbmcpOworCQlyID0gYW1kZ3B1X2N0eF9nZXRfZW50 aXR5KGN0eCwgZGVwc1tpXS5pcF90eXBlLAorCQkJCQkgIGRlcHNbaV0uaXBfaW5zdGFuY2UsCisJ CQkJCSAgZGVwc1tpXS5yaW5nLCAmZW50aXR5KTsKIAkJaWYgKHIpIHsKIAkJCWFtZGdwdV9jdHhf cHV0KGN0eCk7CiAJCQlyZXR1cm4gcjsKIAkJfQogCi0JCWZlbmNlID0gYW1kZ3B1X2N0eF9nZXRf ZmVuY2UoY3R4LCByaW5nLAorCQlmZW5jZSA9IGFtZGdwdV9jdHhfZ2V0X2ZlbmNlKGN0eCwgZW50 aXR5LAogCQkJCQkgICAgIGRlcHNbaV0uaGFuZGxlKTsKIAkJaWYgKElTX0VSUihmZW5jZSkpIHsK IAkJCXIgPSBQVFJfRVJSKGZlbmNlKTsKQEAgLTExOTgsOSArMTIwMCw5IEBAIHN0YXRpYyBpbnQg YW1kZ3B1X2NzX3N1Ym1pdChzdHJ1Y3QgYW1kZ3B1X2NzX3BhcnNlciAqcCwKIAkJCSAgICB1bmlv biBkcm1fYW1kZ3B1X2NzICpjcykKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2Zwcml2ICpmcHJpdiA9IHAt PmZpbHAtPmRyaXZlcl9wcml2OwotCXN0cnVjdCBhbWRncHVfcmluZyAqcmluZyA9IHAtPnJpbmc7 Ci0Jc3RydWN0IGRybV9zY2hlZF9lbnRpdHkgKmVudGl0eSA9ICZwLT5jdHgtPnJpbmdzW3Jpbmct PmlkeF0uZW50aXR5OworCXN0cnVjdCBkcm1fc2NoZWRfZW50aXR5ICplbnRpdHkgPSBwLT5lbnRp dHk7CiAJZW51bSBkcm1fc2NoZWRfcHJpb3JpdHkgcHJpb3JpdHk7CisJc3RydWN0IGFtZGdwdV9y aW5nICpyaW5nOwogCXN0cnVjdCBhbWRncHVfYm9fbGlzdF9lbnRyeSAqZTsKIAlzdHJ1Y3QgYW1k Z3B1X2pvYiAqam9iOwogCXVpbnQ2NF90IHNlcTsKQEAgLTEyMzAsNyArMTIzMiw3IEBAIHN0YXRp YyBpbnQgYW1kZ3B1X2NzX3N1Ym1pdChzdHJ1Y3QgYW1kZ3B1X2NzX3BhcnNlciAqcCwKIAlqb2It Pm93bmVyID0gcC0+ZmlscDsKIAlwLT5mZW5jZSA9IGRtYV9mZW5jZV9nZXQoJmpvYi0+YmFzZS5z X2ZlbmNlLT5maW5pc2hlZCk7CiAKLQlyID0gYW1kZ3B1X2N0eF9hZGRfZmVuY2UocC0+Y3R4LCBy aW5nLCBwLT5mZW5jZSwgJnNlcSk7CisJciA9IGFtZGdwdV9jdHhfYWRkX2ZlbmNlKHAtPmN0eCwg ZW50aXR5LCBwLT5mZW5jZSwgJnNlcSk7CiAJaWYgKHIpIHsKIAkJZG1hX2ZlbmNlX3B1dChwLT5m ZW5jZSk7CiAJCWRtYV9mZW5jZV9wdXQoJmpvYi0+YmFzZS5zX2ZlbmNlLT5maW5pc2hlZCk7CkBA IC0xMzI5LDcgKzEzMzEsNyBAQCBpbnQgYW1kZ3B1X2NzX3dhaXRfaW9jdGwoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIHsKIAl1bmlvbiBkcm1fYW1kZ3B1X3dhaXRfY3MgKndh aXQgPSBkYXRhOwogCXVuc2lnbmVkIGxvbmcgdGltZW91dCA9IGFtZGdwdV9nZW1fdGltZW91dCh3 YWl0LT5pbi50aW1lb3V0KTsKLQlzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcgPSBOVUxMOworCXN0 cnVjdCBkcm1fc2NoZWRfZW50aXR5ICplbnRpdHk7CiAJc3RydWN0IGFtZGdwdV9jdHggKmN0eDsK IAlzdHJ1Y3QgZG1hX2ZlbmNlICpmZW5jZTsKIAlsb25nIHI7CkBAIC0xMzM4LDE0ICsxMzQwLDE0 IEBAIGludCBhbWRncHVfY3Nfd2FpdF9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lk ICpkYXRhLAogCWlmIChjdHggPT0gTlVMTCkKIAkJcmV0dXJuIC1FSU5WQUw7CiAKLQlyID0gYW1k Z3B1X2N0eF9nZXRfcmluZyhjdHgsIHdhaXQtPmluLmlwX3R5cGUsIHdhaXQtPmluLmlwX2luc3Rh bmNlLAotCQkJCXdhaXQtPmluLnJpbmcsICZyaW5nKTsKKwlyID0gYW1kZ3B1X2N0eF9nZXRfZW50 aXR5KGN0eCwgd2FpdC0+aW4uaXBfdHlwZSwgd2FpdC0+aW4uaXBfaW5zdGFuY2UsCisJCQkJICB3 YWl0LT5pbi5yaW5nLCAmZW50aXR5KTsKIAlpZiAocikgewogCQlhbWRncHVfY3R4X3B1dChjdHgp OwogCQlyZXR1cm4gcjsKIAl9CiAKLQlmZW5jZSA9IGFtZGdwdV9jdHhfZ2V0X2ZlbmNlKGN0eCwg cmluZywgd2FpdC0+aW4uaGFuZGxlKTsKKwlmZW5jZSA9IGFtZGdwdV9jdHhfZ2V0X2ZlbmNlKGN0 eCwgZW50aXR5LCB3YWl0LT5pbi5oYW5kbGUpOwogCWlmIChJU19FUlIoZmVuY2UpKQogCQlyID0g UFRSX0VSUihmZW5jZSk7CiAJZWxzZSBpZiAoZmVuY2UpIHsKQEAgLTEzNzcsNyArMTM3OSw3IEBA IHN0YXRpYyBzdHJ1Y3QgZG1hX2ZlbmNlICphbWRncHVfY3NfZ2V0X2ZlbmNlKHN0cnVjdCBhbWRn cHVfZGV2aWNlICphZGV2LAogCQkJCQkgICAgIHN0cnVjdCBkcm1fZmlsZSAqZmlscCwKIAkJCQkJ ICAgICBzdHJ1Y3QgZHJtX2FtZGdwdV9mZW5jZSAqdXNlcikKIHsKLQlzdHJ1Y3QgYW1kZ3B1X3Jp bmcgKnJpbmc7CisJc3RydWN0IGRybV9zY2hlZF9lbnRpdHkgKmVudGl0eTsKIAlzdHJ1Y3QgYW1k Z3B1X2N0eCAqY3R4OwogCXN0cnVjdCBkbWFfZmVuY2UgKmZlbmNlOwogCWludCByOwpAQCAtMTM4 NiwxNCArMTM4OCwxNCBAQCBzdGF0aWMgc3RydWN0IGRtYV9mZW5jZSAqYW1kZ3B1X2NzX2dldF9m ZW5jZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAlpZiAoY3R4ID09IE5VTEwpCiAJCXJl dHVybiBFUlJfUFRSKC1FSU5WQUwpOwogCi0JciA9IGFtZGdwdV9jdHhfZ2V0X3JpbmcoY3R4LCB1 c2VyLT5pcF90eXBlLCB1c2VyLT5pcF9pbnN0YW5jZSwKLQkJCQl1c2VyLT5yaW5nLCAmcmluZyk7 CisJciA9IGFtZGdwdV9jdHhfZ2V0X2VudGl0eShjdHgsIHVzZXItPmlwX3R5cGUsIHVzZXItPmlw X2luc3RhbmNlLAorCQkJCSAgdXNlci0+cmluZywgJmVudGl0eSk7CiAJaWYgKHIpIHsKIAkJYW1k Z3B1X2N0eF9wdXQoY3R4KTsKIAkJcmV0dXJuIEVSUl9QVFIocik7CiAJfQogCi0JZmVuY2UgPSBh bWRncHVfY3R4X2dldF9mZW5jZShjdHgsIHJpbmcsIHVzZXItPnNlcV9ubyk7CisJZmVuY2UgPSBh bWRncHVfY3R4X2dldF9mZW5jZShjdHgsIGVudGl0eSwgdXNlci0+c2VxX25vKTsKIAlhbWRncHVf Y3R4X3B1dChjdHgpOwogCiAJcmV0dXJuIGZlbmNlOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2N0eC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1X2N0eC5jCmluZGV4IGNkM2ZjZDVmYWJjMS4uMjkwYWI4MTQ1YTk3IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfY3R4LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2N0eC5jCkBAIC0yNyw2ICsyNyw5IEBACiAjaW5jbHVk ZSAiYW1kZ3B1LmgiCiAjaW5jbHVkZSAiYW1kZ3B1X3NjaGVkLmgiCiAKKyNkZWZpbmUgdG9fYW1k Z3B1X2N0eF9yaW5nKGUpCVwKKwljb250YWluZXJfb2YoKGUpLCBzdHJ1Y3QgYW1kZ3B1X2N0eF9y aW5nLCBlbnRpdHkpCisKIHN0YXRpYyBpbnQgYW1kZ3B1X2N0eF9wcmlvcml0eV9wZXJtaXQoc3Ry dWN0IGRybV9maWxlICpmaWxwLAogCQkJCSAgICAgIGVudW0gZHJtX3NjaGVkX3ByaW9yaXR5IHBy aW9yaXR5KQogewpAQCAtMTUxLDEyICsxNTQsMTIgQEAgc3RhdGljIHZvaWQgYW1kZ3B1X2N0eF9m aW5pKHN0cnVjdCBrcmVmICpyZWYpCiAJa2ZyZWUoY3R4KTsKIH0KIAotaW50IGFtZGdwdV9jdHhf Z2V0X3Jpbmcoc3RydWN0IGFtZGdwdV9jdHggKmN0eCwKLQkJCXUzMiBod19pcCwgdTMyIGluc3Rh bmNlLCB1MzIgcmluZywKLQkJCXN0cnVjdCBhbWRncHVfcmluZyAqKm91dF9yaW5nKQoraW50IGFt ZGdwdV9jdHhfZ2V0X2VudGl0eShzdHJ1Y3QgYW1kZ3B1X2N0eCAqY3R4LCB1MzIgaHdfaXAsIHUz MiBpbnN0YW5jZSwKKwkJCSAgdTMyIHJpbmcsIHN0cnVjdCBkcm1fc2NoZWRfZW50aXR5ICoqZW50 aXR5KQogewogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gY3R4LT5hZGV2OwogCXVuc2ln bmVkIG51bV9yaW5ncyA9IDA7CisJc3RydWN0IGFtZGdwdV9yaW5nICpvdXRfcmluZzsKIAogCS8q IFJpZ2h0IG5vdyBhbGwgSVBzIGhhdmUgb25seSBvbmUgaW5zdGFuY2UgLSBtdWx0aXBsZSByaW5n cy4gKi8KIAlpZiAoaW5zdGFuY2UgIT0gMCkgewpAQCAtMTY2LDM5ICsxNjksMzkgQEAgaW50IGFt ZGdwdV9jdHhfZ2V0X3Jpbmcoc3RydWN0IGFtZGdwdV9jdHggKmN0eCwKIAogCXN3aXRjaCAoaHdf aXApIHsKIAljYXNlIEFNREdQVV9IV19JUF9HRlg6Ci0JCSpvdXRfcmluZyA9ICZhZGV2LT5nZngu Z2Z4X3JpbmdbcmluZ107CisJCW91dF9yaW5nID0gJmFkZXYtPmdmeC5nZnhfcmluZ1tyaW5nXTsK IAkJbnVtX3JpbmdzID0gYWRldi0+Z2Z4Lm51bV9nZnhfcmluZ3M7CiAJCWJyZWFrOwogCWNhc2Ug QU1ER1BVX0hXX0lQX0NPTVBVVEU6Ci0JCSpvdXRfcmluZyA9ICZhZGV2LT5nZnguY29tcHV0ZV9y aW5nW3JpbmddOworCQlvdXRfcmluZyA9ICZhZGV2LT5nZnguY29tcHV0ZV9yaW5nW3JpbmddOwog CQludW1fcmluZ3MgPSBhZGV2LT5nZngubnVtX2NvbXB1dGVfcmluZ3M7CiAJCWJyZWFrOwogCWNh c2UgQU1ER1BVX0hXX0lQX0RNQToKLQkJKm91dF9yaW5nID0gJmFkZXYtPnNkbWEuaW5zdGFuY2Vb cmluZ10ucmluZzsKKwkJb3V0X3JpbmcgPSAmYWRldi0+c2RtYS5pbnN0YW5jZVtyaW5nXS5yaW5n OwogCQludW1fcmluZ3MgPSBhZGV2LT5zZG1hLm51bV9pbnN0YW5jZXM7CiAJCWJyZWFrOwogCWNh c2UgQU1ER1BVX0hXX0lQX1VWRDoKLQkJKm91dF9yaW5nID0gJmFkZXYtPnV2ZC5pbnN0WzBdLnJp bmc7CisJCW91dF9yaW5nID0gJmFkZXYtPnV2ZC5pbnN0WzBdLnJpbmc7CiAJCW51bV9yaW5ncyA9 IGFkZXYtPnV2ZC5udW1fdXZkX2luc3Q7CiAJCWJyZWFrOwogCWNhc2UgQU1ER1BVX0hXX0lQX1ZD RToKLQkJKm91dF9yaW5nID0gJmFkZXYtPnZjZS5yaW5nW3JpbmddOworCQlvdXRfcmluZyA9ICZh ZGV2LT52Y2UucmluZ1tyaW5nXTsKIAkJbnVtX3JpbmdzID0gYWRldi0+dmNlLm51bV9yaW5nczsK IAkJYnJlYWs7CiAJY2FzZSBBTURHUFVfSFdfSVBfVVZEX0VOQzoKLQkJKm91dF9yaW5nID0gJmFk ZXYtPnV2ZC5pbnN0WzBdLnJpbmdfZW5jW3JpbmddOworCQlvdXRfcmluZyA9ICZhZGV2LT51dmQu aW5zdFswXS5yaW5nX2VuY1tyaW5nXTsKIAkJbnVtX3JpbmdzID0gYWRldi0+dXZkLm51bV9lbmNf cmluZ3M7CiAJCWJyZWFrOwogCWNhc2UgQU1ER1BVX0hXX0lQX1ZDTl9ERUM6Ci0JCSpvdXRfcmlu ZyA9ICZhZGV2LT52Y24ucmluZ19kZWM7CisJCW91dF9yaW5nID0gJmFkZXYtPnZjbi5yaW5nX2Rl YzsKIAkJbnVtX3JpbmdzID0gMTsKIAkJYnJlYWs7CiAJY2FzZSBBTURHUFVfSFdfSVBfVkNOX0VO QzoKLQkJKm91dF9yaW5nID0gJmFkZXYtPnZjbi5yaW5nX2VuY1tyaW5nXTsKKwkJb3V0X3Jpbmcg PSAmYWRldi0+dmNuLnJpbmdfZW5jW3JpbmddOwogCQludW1fcmluZ3MgPSBhZGV2LT52Y24ubnVt X2VuY19yaW5nczsKIAkJYnJlYWs7CiAJY2FzZSBBTURHUFVfSFdfSVBfVkNOX0pQRUc6Ci0JCSpv dXRfcmluZyA9ICZhZGV2LT52Y24ucmluZ19qcGVnOworCQlvdXRfcmluZyA9ICZhZGV2LT52Y24u cmluZ19qcGVnOwogCQludW1fcmluZ3MgPSAxOwogCQlicmVhazsKIAlkZWZhdWx0OgpAQCAtMjA5 LDYgKzIxMiw3IEBAIGludCBhbWRncHVfY3R4X2dldF9yaW5nKHN0cnVjdCBhbWRncHVfY3R4ICpj dHgsCiAJaWYgKHJpbmcgPiBudW1fcmluZ3MpCiAJCXJldHVybiAtRUlOVkFMOwogCisJKmVudGl0 eSA9ICZjdHgtPnJpbmdzW291dF9yaW5nLT5pZHhdLmVudGl0eTsKIAlyZXR1cm4gMDsKIH0KIApA QCAtNDE0LDEzICs0MTgsMTQgQEAgaW50IGFtZGdwdV9jdHhfcHV0KHN0cnVjdCBhbWRncHVfY3R4 ICpjdHgpCiAJcmV0dXJuIDA7CiB9CiAKLWludCBhbWRncHVfY3R4X2FkZF9mZW5jZShzdHJ1Y3Qg YW1kZ3B1X2N0eCAqY3R4LCBzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsCi0JCQkgICAgICBzdHJ1 Y3QgZG1hX2ZlbmNlICpmZW5jZSwgdWludDY0X3QqIGhhbmRsZXIpCitpbnQgYW1kZ3B1X2N0eF9h ZGRfZmVuY2Uoc3RydWN0IGFtZGdwdV9jdHggKmN0eCwKKwkJCSBzdHJ1Y3QgZHJtX3NjaGVkX2Vu dGl0eSAqZW50aXR5LAorCQkJIHN0cnVjdCBkbWFfZmVuY2UgKmZlbmNlLCB1aW50NjRfdCogaGFu ZGxlKQogewotCXN0cnVjdCBhbWRncHVfY3R4X3JpbmcgKmNyaW5nID0gJiBjdHgtPnJpbmdzW3Jp bmctPmlkeF07CisJc3RydWN0IGFtZGdwdV9jdHhfcmluZyAqY3JpbmcgPSB0b19hbWRncHVfY3R4 X3JpbmcoZW50aXR5KTsKIAl1aW50NjRfdCBzZXEgPSBjcmluZy0+c2VxdWVuY2U7Ci0JdW5zaWdu ZWQgaWR4ID0gMDsKIAlzdHJ1Y3QgZG1hX2ZlbmNlICpvdGhlciA9IE5VTEw7CisJdW5zaWduZWQg aWR4ID0gMDsKIAogCWlkeCA9IHNlcSAmIChhbWRncHVfc2NoZWRfam9icyAtIDEpOwogCW90aGVy ID0gY3JpbmctPmZlbmNlc1tpZHhdOwpAQCAtNDM1LDIyICs0NDAsMjMgQEAgaW50IGFtZGdwdV9j dHhfYWRkX2ZlbmNlKHN0cnVjdCBhbWRncHVfY3R4ICpjdHgsIHN0cnVjdCBhbWRncHVfcmluZyAq cmluZywKIAlzcGluX3VubG9jaygmY3R4LT5yaW5nX2xvY2spOwogCiAJZG1hX2ZlbmNlX3B1dChv dGhlcik7Ci0JaWYgKGhhbmRsZXIpCi0JCSpoYW5kbGVyID0gc2VxOworCWlmIChoYW5kbGUpCisJ CSpoYW5kbGUgPSBzZXE7CiAKIAlyZXR1cm4gMDsKIH0KIAogc3RydWN0IGRtYV9mZW5jZSAqYW1k Z3B1X2N0eF9nZXRfZmVuY2Uoc3RydWN0IGFtZGdwdV9jdHggKmN0eCwKLQkJCQkgICAgICAgc3Ry dWN0IGFtZGdwdV9yaW5nICpyaW5nLCB1aW50NjRfdCBzZXEpCisJCQkJICAgICAgIHN0cnVjdCBk cm1fc2NoZWRfZW50aXR5ICplbnRpdHksCisJCQkJICAgICAgIHVpbnQ2NF90IHNlcSkKIHsKLQlz dHJ1Y3QgYW1kZ3B1X2N0eF9yaW5nICpjcmluZyA9ICYgY3R4LT5yaW5nc1tyaW5nLT5pZHhdOwor CXN0cnVjdCBhbWRncHVfY3R4X3JpbmcgKmNyaW5nID0gdG9fYW1kZ3B1X2N0eF9yaW5nKGVudGl0 eSk7CiAJc3RydWN0IGRtYV9mZW5jZSAqZmVuY2U7CiAKIAlzcGluX2xvY2soJmN0eC0+cmluZ19s b2NrKTsKIAogCWlmIChzZXEgPT0gfjB1bGwpCi0JCXNlcSA9IGN0eC0+cmluZ3NbcmluZy0+aWR4 XS5zZXF1ZW5jZSAtIDE7CisJCXNlcSA9IGNyaW5nLT5zZXF1ZW5jZSAtIDE7CiAKIAlpZiAoc2Vx ID49IGNyaW5nLT5zZXF1ZW5jZSkgewogCQlzcGluX3VubG9jaygmY3R4LT5yaW5nX2xvY2spOwpA QCAtNDk2LDkgKzUwMiwxMCBAQCB2b2lkIGFtZGdwdV9jdHhfcHJpb3JpdHlfb3ZlcnJpZGUoc3Ry dWN0IGFtZGdwdV9jdHggKmN0eCwKIAl9CiB9CiAKLWludCBhbWRncHVfY3R4X3dhaXRfcHJldl9m ZW5jZShzdHJ1Y3QgYW1kZ3B1X2N0eCAqY3R4LCB1bnNpZ25lZCByaW5nX2lkKQoraW50IGFtZGdw dV9jdHhfd2FpdF9wcmV2X2ZlbmNlKHN0cnVjdCBhbWRncHVfY3R4ICpjdHgsCisJCQkgICAgICAg c3RydWN0IGRybV9zY2hlZF9lbnRpdHkgKmVudGl0eSkKIHsKLQlzdHJ1Y3QgYW1kZ3B1X2N0eF9y aW5nICpjcmluZyA9ICZjdHgtPnJpbmdzW3JpbmdfaWRdOworCXN0cnVjdCBhbWRncHVfY3R4X3Jp bmcgKmNyaW5nID0gdG9fYW1kZ3B1X2N0eF9yaW5nKGVudGl0eSk7CiAJdW5zaWduZWQgaWR4ID0g Y3JpbmctPnNlcXVlbmNlICYgKGFtZGdwdV9zY2hlZF9qb2JzIC0gMSk7CiAJc3RydWN0IGRtYV9m ZW5jZSAqb3RoZXIgPSBjcmluZy0+ZmVuY2VzW2lkeF07CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jdHguaCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdV9jdHguaAppbmRleCA1NjY0YjFmNTQxNDIuLjYwOWY5MjViMDc2YyAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2N0eC5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jdHguaApAQCAtNjEsMjAgKzYxLDIyIEBAIHN0 cnVjdCBhbWRncHVfY3R4X21nciB7CiBzdHJ1Y3QgYW1kZ3B1X2N0eCAqYW1kZ3B1X2N0eF9nZXQo c3RydWN0IGFtZGdwdV9mcHJpdiAqZnByaXYsIHVpbnQzMl90IGlkKTsKIGludCBhbWRncHVfY3R4 X3B1dChzdHJ1Y3QgYW1kZ3B1X2N0eCAqY3R4KTsKIAotaW50IGFtZGdwdV9jdHhfZ2V0X3Jpbmco c3RydWN0IGFtZGdwdV9jdHggKmN0eCwKLQkJCXUzMiBod19pcCwgdTMyIGluc3RhbmNlLCB1MzIg cmluZywKLQkJCXN0cnVjdCBhbWRncHVfcmluZyAqKm91dF9yaW5nKTsKLWludCBhbWRncHVfY3R4 X2FkZF9mZW5jZShzdHJ1Y3QgYW1kZ3B1X2N0eCAqY3R4LCBzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJp bmcsCi0JCQkgICAgICBzdHJ1Y3QgZG1hX2ZlbmNlICpmZW5jZSwgdWludDY0X3QgKnNlcSk7Citp bnQgYW1kZ3B1X2N0eF9nZXRfZW50aXR5KHN0cnVjdCBhbWRncHVfY3R4ICpjdHgsIHUzMiBod19p cCwgdTMyIGluc3RhbmNlLAorCQkJICB1MzIgcmluZywgc3RydWN0IGRybV9zY2hlZF9lbnRpdHkg KiplbnRpdHkpOworaW50IGFtZGdwdV9jdHhfYWRkX2ZlbmNlKHN0cnVjdCBhbWRncHVfY3R4ICpj dHgsCisJCQkgc3RydWN0IGRybV9zY2hlZF9lbnRpdHkgKmVudGl0eSwKKwkJCSBzdHJ1Y3QgZG1h X2ZlbmNlICpmZW5jZSwgdWludDY0X3QgKnNlcSk7CiBzdHJ1Y3QgZG1hX2ZlbmNlICphbWRncHVf Y3R4X2dldF9mZW5jZShzdHJ1Y3QgYW1kZ3B1X2N0eCAqY3R4LAotCQkJCSAgIHN0cnVjdCBhbWRn cHVfcmluZyAqcmluZywgdWludDY0X3Qgc2VxKTsKKwkJCQkgICAgICAgc3RydWN0IGRybV9zY2hl ZF9lbnRpdHkgKmVudGl0eSwKKwkJCQkgICAgICAgdWludDY0X3Qgc2VxKTsKIHZvaWQgYW1kZ3B1 X2N0eF9wcmlvcml0eV9vdmVycmlkZShzdHJ1Y3QgYW1kZ3B1X2N0eCAqY3R4LAogCQkJCSAgZW51 bSBkcm1fc2NoZWRfcHJpb3JpdHkgcHJpb3JpdHkpOwogCiBpbnQgYW1kZ3B1X2N0eF9pb2N0bChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQkgICAgIHN0cnVjdCBkcm1fZmls ZSAqZmlscCk7CiAKLWludCBhbWRncHVfY3R4X3dhaXRfcHJldl9mZW5jZShzdHJ1Y3QgYW1kZ3B1 X2N0eCAqY3R4LCB1bnNpZ25lZCByaW5nX2lkKTsKK2ludCBhbWRncHVfY3R4X3dhaXRfcHJldl9m ZW5jZShzdHJ1Y3QgYW1kZ3B1X2N0eCAqY3R4LAorCQkJICAgICAgIHN0cnVjdCBkcm1fc2NoZWRf ZW50aXR5ICplbnRpdHkpOwogCiB2b2lkIGFtZGdwdV9jdHhfbWdyX2luaXQoc3RydWN0IGFtZGdw dV9jdHhfbWdyICptZ3IpOwogdm9pZCBhbWRncHVfY3R4X21ncl9lbnRpdHlfZmluaShzdHJ1Y3Qg YW1kZ3B1X2N0eF9tZ3IgKm1ncik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9hbWRncHVfdHJhY2UuaCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV90 cmFjZS5oCmluZGV4IDcyMDZhMDAyNWIxNy4uODM4OWFhNWM5OGIyIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdHJhY2UuaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9hbWRncHVfdHJhY2UuaApAQCAtMTUwLDEwICsxNTAsMTAgQEAgVFJBQ0Vf RVZFTlQoYW1kZ3B1X2NzLAogCiAJICAgIFRQX2Zhc3RfYXNzaWduKAogCQkJICAgX19lbnRyeS0+ Ym9fbGlzdCA9IHAtPmJvX2xpc3Q7Ci0JCQkgICBfX2VudHJ5LT5yaW5nID0gcC0+cmluZy0+aWR4 OworCQkJICAgX19lbnRyeS0+cmluZyA9IHRvX2FtZGdwdV9yaW5nKHAtPmVudGl0eS0+cnEtPnNj aGVkKS0+aWR4OwogCQkJICAgX19lbnRyeS0+ZHcgPSBwLT5qb2ItPmlic1tpXS5sZW5ndGhfZHc7 CiAJCQkgICBfX2VudHJ5LT5mZW5jZXMgPSBhbWRncHVfZmVuY2VfY291bnRfZW1pdHRlZCgKLQkJ CQlwLT5yaW5nKTsKKwkJCQl0b19hbWRncHVfcmluZyhwLT5lbnRpdHktPnJxLT5zY2hlZCkpOwog CQkJICAgKSwKIAkgICAgVFBfcHJpbnRrKCJib19saXN0PSVwLCByaW5nPSV1LCBkdz0ldSwgZmVu Y2VzPSV1IiwKIAkJICAgICAgX19lbnRyeS0+Ym9fbGlzdCwgX19lbnRyeS0+cmluZywgX19lbnRy eS0+ZHcsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS91dmRfdjdfMC5j IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdXZkX3Y3XzAuYwppbmRleCA1ZmFiMzU2MGE3 MWQuLjY0ODc2MDNjZTNlYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv dXZkX3Y3XzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS91dmRfdjdfMC5jCkBA IC0xMjU5LDExICsxMjU5LDEyIEBAIHN0YXRpYyBpbnQgdXZkX3Y3XzBfcmluZ190ZXN0X3Jpbmco c3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQogc3RhdGljIGludCB1dmRfdjdfMF9yaW5nX3BhdGNo X2NzX2luX3BsYWNlKHN0cnVjdCBhbWRncHVfY3NfcGFyc2VyICpwLAogCQkJCQkgICB1aW50MzJf dCBpYl9pZHgpCiB7CisJc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nID0gdG9fYW1kZ3B1X3Jpbmco cC0+ZW50aXR5LT5ycS0+c2NoZWQpOwogCXN0cnVjdCBhbWRncHVfaWIgKmliID0gJnAtPmpvYi0+ aWJzW2liX2lkeF07CiAJdW5zaWduZWQgaTsKIAogCS8qIE5vIHBhdGNoaW5nIG5lY2Vzc2FyeSBm b3IgdGhlIGZpcnN0IGluc3RhbmNlICovCi0JaWYgKCFwLT5yaW5nLT5tZSkKKwlpZiAoIXJpbmct Pm1lKQogCQlyZXR1cm4gMDsKIAogCWZvciAoaSA9IDA7IGkgPCBpYi0+bGVuZ3RoX2R3OyBpICs9 IDIpIHsKLS0gCjIuMTQuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4 Cg==