From: Alex Deucher Subject: [PATCH 082/102] drm/amdgpu: add harvest support for Arcturus Date: Mon, 15 Jul 2019 16:24:17 -0500 Message-ID: <20190715212437.31793-80-alexander.deucher@amd.com> References: <20190715212437.31793-1-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190715212437.31793-1-alexander.deucher-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: Alex Deucher , James Zhu , Leo Liu RnJvbTogSmFtZXMgWmh1IDxKYW1lcy5aaHVAYW1kLmNvbT4KCkFkZCBoYXJ2ZXN0IHN1cHBvcnQg Zm9yIEFyY3R1cnVzCgpTaWduZWQtb2ZmLWJ5OiBKYW1lcyBaaHUgPEphbWVzLlpodUBhbWQuY29t PgpSZXZpZXdlZC1ieTogTGVvIExpdSA8bGVvLmxpdUBhbWQuY29tPgpTaWduZWQtb2ZmLWJ5OiBB bGV4IERldWNoZXIgPGFsZXhhbmRlci5kZXVjaGVyQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2ttcy5jIHwgIDkgKysrKwogZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvYW1kZ3B1X3Zjbi5jIHwgMTEgKysrKysKIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdV92Y24uaCB8ICA0ICsrCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92Y25f djJfNS5jICAgfCA1NSArKysrKysrKysrKysrKysrKysrKysrKystCiA0IGZpbGVzIGNoYW5nZWQs IDc3IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2ttcy5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvYW1kZ3B1X2ttcy5jCmluZGV4IDM4ZjZjNzdhNTkzYS4uNmNmNjFlMDEwNDFmIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfa21zLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2ttcy5jCkBAIC00MDYsNiArNDA2LDkgQEAgc3Rh dGljIGludCBhbWRncHVfaHdfaXBfaW5mbyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAlj YXNlIEFNREdQVV9IV19JUF9WQ05fREVDOgogCQl0eXBlID0gQU1EX0lQX0JMT0NLX1RZUEVfVkNO OwogCQlmb3IgKGkgPSAwOyBpIDwgYWRldi0+dmNuLm51bV92Y25faW5zdDsgaSsrKSB7CisJCQlp ZiAoYWRldi0+dXZkLmhhcnZlc3RfY29uZmlnICYgKDEgPDwgaSkpCisJCQkJY29udGludWU7CisK IAkJCWlmIChhZGV2LT52Y24uaW5zdFtpXS5yaW5nX2RlYy5zY2hlZC5yZWFkeSkKIAkJCQkrK251 bV9yaW5nczsKIAkJfQpAQCAtNDE1LDYgKzQxOCw5IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X2h3X2lw X2luZm8oc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJY2FzZSBBTURHUFVfSFdfSVBfVkNO X0VOQzoKIAkJdHlwZSA9IEFNRF9JUF9CTE9DS19UWVBFX1ZDTjsKIAkJZm9yIChpID0gMDsgaSA8 IGFkZXYtPnZjbi5udW1fdmNuX2luc3Q7IGkrKykgeworCQkJaWYgKGFkZXYtPnV2ZC5oYXJ2ZXN0 X2NvbmZpZyAmICgxIDw8IGkpKQorCQkJCWNvbnRpbnVlOworCiAJCQlmb3IgKGogPSAwOyBqIDwg YWRldi0+dmNuLm51bV9lbmNfcmluZ3M7IGorKykKIAkJCQlpZiAoYWRldi0+dmNuLmluc3RbaV0u cmluZ19lbmNbal0uc2NoZWQucmVhZHkpCiAJCQkJCSsrbnVtX3JpbmdzOwpAQCAtNDI1LDYgKzQz MSw5IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X2h3X2lwX2luZm8oc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYsCiAJY2FzZSBBTURHUFVfSFdfSVBfVkNOX0pQRUc6CiAJCXR5cGUgPSBBTURfSVBfQkxP Q0tfVFlQRV9WQ047CiAJCWZvciAoaSA9IDA7IGkgPCBhZGV2LT52Y24ubnVtX3Zjbl9pbnN0OyBp KyspIHsKKwkJCWlmIChhZGV2LT51dmQuaGFydmVzdF9jb25maWcgJiAoMSA8PCBpKSkKKwkJCQlj b250aW51ZTsKKwogCQkJaWYgKGFkZXYtPnZjbi5pbnN0W2ldLnJpbmdfanBlZy5zY2hlZC5yZWFk eSkKIAkJCQkrK251bV9yaW5nczsKIAkJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvYW1kZ3B1X3Zjbi5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 X3Zjbi5jCmluZGV4IDUwMTZmYzU3MDIxMS4uYmUzNGJkYzQ3MTc0IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdmNuLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYW1kZ3B1X3Zjbi5jCkBAIC0xNDcsNiArMTQ3LDkgQEAgaW50IGFtZGdwdV92 Y25fc3dfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAkJYm9fc2l6ZSArPSBBTURH UFVfR1BVX1BBR0VfQUxJR04obGUzMl90b19jcHUoaGRyLT51Y29kZV9zaXplX2J5dGVzKSArIDgp OwogCiAJZm9yIChpID0gMDsgaSA8IGFkZXYtPnZjbi5udW1fdmNuX2luc3Q7IGkrKykgeworCQlp ZiAoYWRldi0+dmNuLmhhcnZlc3RfY29uZmlnICYgKDEgPDwgaSkpCisJCQljb250aW51ZTsKKwog CQlyID0gYW1kZ3B1X2JvX2NyZWF0ZV9rZXJuZWwoYWRldiwgYm9fc2l6ZSwgUEFHRV9TSVpFLAog CQkJCQkJQU1ER1BVX0dFTV9ET01BSU5fVlJBTSwgJmFkZXYtPnZjbi5pbnN0W2ldLnZjcHVfYm8s CiAJCQkJCQkmYWRldi0+dmNuLmluc3RbaV0uZ3B1X2FkZHIsICZhZGV2LT52Y24uaW5zdFtpXS5j cHVfYWRkcik7CkBAIC0xODAsNiArMTgzLDggQEAgaW50IGFtZGdwdV92Y25fc3dfZmluaShzdHJ1 Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAl9CiAKIAlmb3IgKGogPSAwOyBqIDwgYWRldi0+dmNu Lm51bV92Y25faW5zdDsgKytqKSB7CisJCWlmIChhZGV2LT52Y24uaGFydmVzdF9jb25maWcgJiAo MSA8PCBqKSkKKwkJCWNvbnRpbnVlOwogCQlrdmZyZWUoYWRldi0+dmNuLmluc3Rbal0uc2F2ZWRf Ym8pOwogCiAJCWFtZGdwdV9ib19mcmVlX2tlcm5lbCgmYWRldi0+dmNuLmluc3Rbal0udmNwdV9i bywKQEAgLTIwOCw2ICsyMTMsOCBAQCBpbnQgYW1kZ3B1X3Zjbl9zdXNwZW5kKHN0cnVjdCBhbWRn cHVfZGV2aWNlICphZGV2KQogCWNhbmNlbF9kZWxheWVkX3dvcmtfc3luYygmYWRldi0+dmNuLmlk bGVfd29yayk7CiAKIAlmb3IgKGkgPSAwOyBpIDwgYWRldi0+dmNuLm51bV92Y25faW5zdDsgKytp KSB7CisJCWlmIChhZGV2LT52Y24uaGFydmVzdF9jb25maWcgJiAoMSA8PCBpKSkKKwkJCWNvbnRp bnVlOwogCQlpZiAoYWRldi0+dmNuLmluc3RbaV0udmNwdV9ibyA9PSBOVUxMKQogCQkJcmV0dXJu IDA7CiAKQEAgLTIzMCw2ICsyMzcsOCBAQCBpbnQgYW1kZ3B1X3Zjbl9yZXN1bWUoc3RydWN0IGFt ZGdwdV9kZXZpY2UgKmFkZXYpCiAJaW50IGk7CiAKIAlmb3IgKGkgPSAwOyBpIDwgYWRldi0+dmNu Lm51bV92Y25faW5zdDsgKytpKSB7CisJCWlmIChhZGV2LT52Y24uaGFydmVzdF9jb25maWcgJiAo MSA8PCBpKSkKKwkJCWNvbnRpbnVlOwogCQlpZiAoYWRldi0+dmNuLmluc3RbaV0udmNwdV9ibyA9 PSBOVUxMKQogCQkJcmV0dXJuIC1FSU5WQUw7CiAKQEAgLTI2Niw2ICsyNzUsOCBAQCBzdGF0aWMg dm9pZCBhbWRncHVfdmNuX2lkbGVfd29ya19oYW5kbGVyKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29y aykKIAl1bnNpZ25lZCBpbnQgaSwgajsKIAogCWZvciAoaiA9IDA7IGogPCBhZGV2LT52Y24ubnVt X3Zjbl9pbnN0OyArK2opIHsKKwkJaWYgKGFkZXYtPnZjbi5oYXJ2ZXN0X2NvbmZpZyAmICgxIDw8 IGopKQorCQkJY29udGludWU7CiAJCWZvciAoaSA9IDA7IGkgPCBhZGV2LT52Y24ubnVtX2VuY19y aW5nczsgKytpKSB7CiAJCQlmZW5jZVtqXSArPSBhbWRncHVfZmVuY2VfY291bnRfZW1pdHRlZCgm YWRldi0+dmNuLmluc3Rbal0ucmluZ19lbmNbaV0pOwogCQl9CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdmNuLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9hbWRncHVfdmNuLmgKaW5kZXggZDJmYzQ3YTk1NGFiLi4zOGYwZDUzYTYzODEgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92Y24uaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdmNuLmgKQEAgLTMyLDYgKzMyLDkgQEAKIAog I2RlZmluZSBBTURHUFVfTUFYX1ZDTl9JTlNUQU5DRVMJMgogCisjZGVmaW5lIEFNREdQVV9WQ05f SEFSVkVTVF9WQ04wICgxIDw8IDApCisjZGVmaW5lIEFNREdQVV9WQ05fSEFSVkVTVF9WQ04xICgx IDw8IDEpCisKICNkZWZpbmUgVkNOX0RFQ19DTURfRkVOQ0UJCTB4MDAwMDAwMDAKICNkZWZpbmUg VkNOX0RFQ19DTURfVFJBUAkJMHgwMDAwMDAwMQogI2RlZmluZSBWQ05fREVDX0NNRF9XUklURV9S RUcJCTB4MDAwMDAwMDQKQEAgLTE4Nyw2ICsxOTAsNyBAQCBzdHJ1Y3QgYW1kZ3B1X3ZjbiB7CiAJ c3RydWN0IGFtZGdwdV92Y25faW5zdAlpbnN0W0FNREdQVV9NQVhfVkNOX0lOU1RBTkNFU107CiAJ c3RydWN0IGFtZGdwdV92Y25fcmVnCWludGVybmFsOwogCisJdW5zaWduZWQJaGFydmVzdF9jb25m aWc7CiAJaW50ICgqcGF1c2VfZHBnX21vZGUpKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAog CQlzdHJ1Y3QgZHBnX3BhdXNlX3N0YXRlICpuZXdfc3RhdGUpOwogfTsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3Zjbl92Ml81LmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS92Y25fdjJfNS5jCmluZGV4IGI3ZGMwNjliNjM3Yy4uZWY4YmI2Nzg0NGJlIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92Y25fdjJfNS5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3Zjbl92Ml81LmMKQEAgLTcyLDExICs3MiwyNCBAQCBzdGF0 aWMgaW50IGFtZGdwdV9paF9jbGllbnRpZF92Y25zW10gPSB7CiBzdGF0aWMgaW50IHZjbl92Ml81 X2Vhcmx5X2luaXQodm9pZCAqaGFuZGxlKQogewogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2 ID0gKHN0cnVjdCBhbWRncHVfZGV2aWNlICopaGFuZGxlOwotCWlmIChhZGV2LT5hc2ljX3R5cGUg PT0gQ0hJUF9BUkNUVVJVUykKKwlpZiAoYWRldi0+YXNpY190eXBlID09IENISVBfQVJDVFVSVVMp IHsKKwkJdTMyIGhhcnZlc3Q7CisJCWludCBpOwogCiAJCWFkZXYtPnZjbi5udW1fdmNuX2luc3Qg PSBWQ04yNV9NQVhfSFdfSU5TVEFOQ0VTX0FSQ1RVUlVTOwotCWVsc2UKKwkJZm9yIChpID0gMDsg aSA8IGFkZXYtPnZjbi5udW1fdmNuX2luc3Q7IGkrKykgeworCQkJaGFydmVzdCA9IFJSRUczMl9T T0MxNShVVkQsIGksIG1tQ0NfVVZEX0hBUlZFU1RJTkcpOworCQkJaWYgKGhhcnZlc3QgJiBDQ19V VkRfSEFSVkVTVElOR19fVVZEX0RJU0FCTEVfTUFTSykKKwkJCQlhZGV2LT52Y24uaGFydmVzdF9j b25maWcgfD0gMSA8PCBpOworCQl9CisKKwkJaWYgKGFkZXYtPnZjbi5oYXJ2ZXN0X2NvbmZpZyA9 PSAoQU1ER1BVX1ZDTl9IQVJWRVNUX1ZDTjAgfAorCQkJCQkJIEFNREdQVV9WQ05fSEFSVkVTVF9W Q04xKSkKKwkJCS8qIGJvdGggaW5zdGFuY2VzIGFyZSBoYXJ2ZXN0ZWQsIGRpc2FibGUgdGhlIGJs b2NrICovCisJCQlyZXR1cm4gLUVOT0VOVDsKKwl9IGVsc2UKIAkJYWRldi0+dmNuLm51bV92Y25f aW5zdCA9IDE7CisKIAlhZGV2LT52Y24ubnVtX2VuY19yaW5ncyA9IDI7CiAKIAl2Y25fdjJfNV9z ZXRfZGVjX3JpbmdfZnVuY3MoYWRldik7CkBAIC0xMDEsNiArMTE0LDggQEAgc3RhdGljIGludCB2 Y25fdjJfNV9zd19pbml0KHZvaWQgKmhhbmRsZSkKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRl diA9IChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqKWhhbmRsZTsKIAogCWZvciAoaiA9IDA7IGogPCBh ZGV2LT52Y24ubnVtX3Zjbl9pbnN0OyBqKyspIHsKKwkJaWYgKGFkZXYtPnZjbi5oYXJ2ZXN0X2Nv bmZpZyAmICgxIDw8IGopKQorCQkJY29udGludWU7CiAJCS8qIFZDTiBERUMgVFJBUCAqLwogCQly ID0gYW1kZ3B1X2lycV9hZGRfaWQoYWRldiwgYW1kZ3B1X2loX2NsaWVudGlkX3ZjbnNbal0sCiAJ CQkJVkNOXzJfMF9fU1JDSURfX1VWRF9TWVNURU1fTUVTU0FHRV9JTlRFUlJVUFQsICZhZGV2LT52 Y24uaW5zdFtqXS5pcnEpOwpAQCAtMTQ4LDYgKzE2Myw4IEBAIHN0YXRpYyBpbnQgdmNuX3YyXzVf c3dfaW5pdCh2b2lkICpoYW5kbGUpCiAJCXJldHVybiByOwogCiAJZm9yIChqID0gMDsgaiA8IGFk ZXYtPnZjbi5udW1fdmNuX2luc3Q7IGorKykgeworCQlpZiAoYWRldi0+dmNuLmhhcnZlc3RfY29u ZmlnICYgKDEgPDwgaikpCisJCQljb250aW51ZTsKIAkJYWRldi0+dmNuLmludGVybmFsLmNvbnRl eHRfaWQgPSBtbVVWRF9DT05URVhUX0lEX0lOVEVSTkFMX09GRlNFVDsKIAkJYWRldi0+dmNuLmlu dGVybmFsLmliX3ZtaWQgPSBtbVVWRF9MTUlfUkJDX0lCX1ZNSURfSU5URVJOQUxfT0ZGU0VUOwog CQlhZGV2LT52Y24uaW50ZXJuYWwuaWJfYmFyX2xvdyA9IG1tVVZEX0xNSV9SQkNfSUJfNjRCSVRf QkFSX0xPV19JTlRFUk5BTF9PRkZTRVQ7CkBAIC0yMzQsNiArMjUxLDggQEAgc3RhdGljIGludCB2 Y25fdjJfNV9od19pbml0KHZvaWQgKmhhbmRsZSkKIAlpbnQgaSwgaiwgcjsKIAogCWZvciAoaiA9 IDA7IGogPCBhZGV2LT52Y24ubnVtX3Zjbl9pbnN0OyArK2opIHsKKwkJaWYgKGFkZXYtPnZjbi5o YXJ2ZXN0X2NvbmZpZyAmICgxIDw8IGopKQorCQkJY29udGludWU7CiAJCXJpbmcgPSAmYWRldi0+ dmNuLmluc3Rbal0ucmluZ19kZWM7CiAKIAkJYWRldi0+bmJpb19mdW5jcy0+dmNuX2Rvb3JiZWxs X3JhbmdlKGFkZXYsIHJpbmctPnVzZV9kb29yYmVsbCwKQEAgLTI4NCw2ICszMDMsOCBAQCBzdGF0 aWMgaW50IHZjbl92Ml81X2h3X2Zpbmkodm9pZCAqaGFuZGxlKQogCWludCBpOwogCiAJZm9yIChp ID0gMDsgaSA8IGFkZXYtPnZjbi5udW1fdmNuX2luc3Q7ICsraSkgeworCQlpZiAoYWRldi0+dmNu LmhhcnZlc3RfY29uZmlnICYgKDEgPDwgaSkpCisJCQljb250aW51ZTsKIAkJcmluZyA9ICZhZGV2 LT52Y24uaW5zdFtpXS5yaW5nX2RlYzsKIAogCQlpZiAoUlJFRzMyX1NPQzE1KFZDTiwgaSwgbW1V VkRfU1RBVFVTKSkKQEAgLTM1OSw2ICszODAsOCBAQCBzdGF0aWMgdm9pZCB2Y25fdjJfNV9tY19y ZXN1bWUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJaW50IGk7CiAKIAlmb3IgKGkgPSAw OyBpIDwgYWRldi0+dmNuLm51bV92Y25faW5zdDsgKytpKSB7CisJCWlmIChhZGV2LT52Y24uaGFy dmVzdF9jb25maWcgJiAoMSA8PCBpKSkKKwkJCWNvbnRpbnVlOwogCQkvKiBjYWNoZSB3aW5kb3cg MDogZncgKi8KIAkJaWYgKGFkZXYtPmZpcm13YXJlLmxvYWRfdHlwZSA9PSBBTURHUFVfRldfTE9B RF9QU1ApIHsKIAkJCVdSRUczMl9TT0MxNShVVkQsIGksIG1tVVZEX0xNSV9WQ1BVX0NBQ0hFXzY0 QklUX0JBUl9MT1csCkBAIC00MTQsNiArNDM3LDggQEAgc3RhdGljIHZvaWQgdmNuX3YyXzVfZGlz YWJsZV9jbG9ja19nYXRpbmcoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJaW50IGk7CiAK IAlmb3IgKGkgPSAwOyBpIDwgYWRldi0+dmNuLm51bV92Y25faW5zdDsgKytpKSB7CisJCWlmIChh ZGV2LT52Y24uaGFydmVzdF9jb25maWcgJiAoMSA8PCBpKSkKKwkJCWNvbnRpbnVlOwogCQkvKiBV VkQgZGlzYWJsZSBDR0MgKi8KIAkJZGF0YSA9IFJSRUczMl9TT0MxNShWQ04sIGksIG1tVVZEX0NH Q19DVFJMKTsKIAkJaWYgKGFkZXYtPmNnX2ZsYWdzICYgQU1EX0NHX1NVUFBPUlRfVkNOX01HQ0cp CkBAIC01MzAsNiArNTU1LDggQEAgc3RhdGljIHZvaWQgdmNuX3YyXzVfZW5hYmxlX2Nsb2NrX2dh dGluZyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAlpbnQgaTsKIAogCWZvciAoaSA9IDA7 IGkgPCBhZGV2LT52Y24ubnVtX3Zjbl9pbnN0OyArK2kpIHsKKwkJaWYgKGFkZXYtPnZjbi5oYXJ2 ZXN0X2NvbmZpZyAmICgxIDw8IGkpKQorCQkJY29udGludWU7CiAJCS8qIGVuYWJsZSBVVkQgQ0dD ICovCiAJCWRhdGEgPSBSUkVHMzJfU09DMTUoVkNOLCBpLCBtbVVWRF9DR0NfQ1RSTCk7CiAJCWlm IChhZGV2LT5jZ19mbGFncyAmIEFNRF9DR19TVVBQT1JUX1ZDTl9NR0NHKQpAQCAtNTkxLDYgKzYx OCw4IEBAIHN0YXRpYyBpbnQganBlZ192Ml81X3N0YXJ0KHN0cnVjdCBhbWRncHVfZGV2aWNlICph ZGV2KQogCWludCBpOwogCiAJZm9yIChpID0gMDsgaSA8IGFkZXYtPnZjbi5udW1fdmNuX2luc3Q7 ICsraSkgeworCQlpZiAoYWRldi0+dmNuLmhhcnZlc3RfY29uZmlnICYgKDEgPDwgaSkpCisJCQlj b250aW51ZTsKIAkJcmluZyA9ICZhZGV2LT52Y24uaW5zdFtpXS5yaW5nX2pwZWc7CiAJCS8qIGRp c2FibGUgYW50aSBoYW5nIG1lY2hhbmlzbSAqLwogCQlXUkVHMzJfUChTT0MxNV9SRUdfT0ZGU0VU KFVWRCwgaSwgbW1VVkRfSlBFR19QT1dFUl9TVEFUVVMpLCAwLApAQCAtNjYxLDYgKzY5MCw4IEBA IHN0YXRpYyBpbnQganBlZ192Ml81X3N0b3Aoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJ aW50IGk7CiAKIAlmb3IgKGkgPSAwOyBpIDwgYWRldi0+dmNuLm51bV92Y25faW5zdDsgKytpKSB7 CisJCWlmIChhZGV2LT52Y24uaGFydmVzdF9jb25maWcgJiAoMSA8PCBpKSkKKwkJCWNvbnRpbnVl OwogCQkvKiByZXNldCBKTUkgKi8KIAkJV1JFRzMyX1AoU09DMTVfUkVHX09GRlNFVChVVkQsIGks IG1tVVZEX0pNSV9DTlRMKSwKIAkJCVVWRF9KTUlfQ05UTF9fU09GVF9SRVNFVF9NQVNLLApAQCAt Njg5LDYgKzcyMCw4IEBAIHN0YXRpYyBpbnQgdmNuX3YyXzVfc3RhcnQoc3RydWN0IGFtZGdwdV9k ZXZpY2UgKmFkZXYpCiAJaW50IGksIGosIGssIHI7CiAKIAlmb3IgKGkgPSAwOyBpIDwgYWRldi0+ dmNuLm51bV92Y25faW5zdDsgKytpKSB7CisJCWlmIChhZGV2LT52Y24uaGFydmVzdF9jb25maWcg JiAoMSA8PCBpKSkKKwkJCWNvbnRpbnVlOwogCQkvKiBkaXNhYmxlIHJlZ2lzdGVyIGFudGktaGFu ZyBtZWNoYW5pc20gKi8KIAkJV1JFRzMyX1AoU09DMTVfUkVHX09GRlNFVChVVkQsIGksIG1tVVZE X1BPV0VSX1NUQVRVUyksIDAsCiAJCQl+VVZEX1BPV0VSX1NUQVRVU19fVVZEX1BPV0VSX1NUQVRV U19NQVNLKTsKQEAgLTcwMiw2ICs3MzUsOCBAQCBzdGF0aWMgaW50IHZjbl92Ml81X3N0YXJ0KHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCXZjbl92Ml81X2Rpc2FibGVfY2xvY2tfZ2F0aW5n KGFkZXYpOwogCiAJZm9yIChpID0gMDsgaSA8IGFkZXYtPnZjbi5udW1fdmNuX2luc3Q7ICsraSkg eworCQlpZiAoYWRldi0+dmNuLmhhcnZlc3RfY29uZmlnICYgKDEgPDwgaSkpCisJCQljb250aW51 ZTsKIAkJLyogZW5hYmxlIFZDUFUgY2xvY2sgKi8KIAkJV1JFRzMyX1AoU09DMTVfUkVHX09GRlNF VChVVkQsIGksIG1tVVZEX1ZDUFVfQ05UTCksCiAJCQlVVkRfVkNQVV9DTlRMX19DTEtfRU5fTUFT SywgflVWRF9WQ1BVX0NOVExfX0NMS19FTl9NQVNLKTsKQEAgLTc0OSw2ICs3ODQsOCBAQCBzdGF0 aWMgaW50IHZjbl92Ml81X3N0YXJ0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCXZjbl92 Ml81X21jX3Jlc3VtZShhZGV2KTsKIAogCWZvciAoaSA9IDA7IGkgPCBhZGV2LT52Y24ubnVtX3Zj bl9pbnN0OyArK2kpIHsKKwkJaWYgKGFkZXYtPnZjbi5oYXJ2ZXN0X2NvbmZpZyAmICgxIDw8IGkp KQorCQkJY29udGludWU7CiAJCS8qIFZDTiBnbG9iYWwgdGlsaW5nIHJlZ2lzdGVycyAqLwogCQlX UkVHMzJfU09DMTUoVVZELCBpLCBtbVVWRF9HRlg4X0FERFJfQ09ORklHLAogCQkJYWRldi0+Z2Z4 LmNvbmZpZy5nYl9hZGRyX2NvbmZpZyk7CkBAIC04NjEsNiArODk4LDggQEAgc3RhdGljIGludCB2 Y25fdjJfNV9zdG9wKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCQlyZXR1cm4gcjsKIAog CWZvciAoaSA9IDA7IGkgPCBhZGV2LT52Y24ubnVtX3Zjbl9pbnN0OyArK2kpIHsKKwkJaWYgKGFk ZXYtPnZjbi5oYXJ2ZXN0X2NvbmZpZyAmICgxIDw8IGkpKQorCQkJY29udGludWU7CiAJCS8qIHdh aXQgZm9yIHZjbiBpZGxlICovCiAJCVNPQzE1X1dBSVRfT05fUlJFRyhWQ04sIGksIG1tVVZEX1NU QVRVUywgVVZEX1NUQVRVU19fSURMRSwgMHg3LCByKTsKIAkJaWYgKHIpCkBAIC0xMTc3LDYgKzEy MTYsOCBAQCBzdGF0aWMgdm9pZCB2Y25fdjJfNV9zZXRfZGVjX3JpbmdfZnVuY3Moc3RydWN0IGFt ZGdwdV9kZXZpY2UgKmFkZXYpCiAJaW50IGk7CiAKIAlmb3IgKGkgPSAwOyBpIDwgYWRldi0+dmNu Lm51bV92Y25faW5zdDsgKytpKSB7CisJCWlmIChhZGV2LT52Y24uaGFydmVzdF9jb25maWcgJiAo MSA8PCBpKSkKKwkJCWNvbnRpbnVlOwogCQlhZGV2LT52Y24uaW5zdFtpXS5yaW5nX2RlYy5mdW5j cyA9ICZ2Y25fdjJfNV9kZWNfcmluZ192bV9mdW5jczsKIAkJYWRldi0+dmNuLmluc3RbaV0ucmlu Z19kZWMubWUgPSBpOwogCQlEUk1fSU5GTygiVkNOKCVkKSBkZWNvZGUgaXMgZW5hYmxlZCBpbiBW TSBtb2RlXG4iLCBpKTsKQEAgLTExODgsNiArMTIyOSw4IEBAIHN0YXRpYyB2b2lkIHZjbl92Ml81 X3NldF9lbmNfcmluZ19mdW5jcyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAlpbnQgaSwg ajsKIAogCWZvciAoaiA9IDA7IGogPCBhZGV2LT52Y24ubnVtX3Zjbl9pbnN0OyArK2opIHsKKwkJ aWYgKGFkZXYtPnZjbi5oYXJ2ZXN0X2NvbmZpZyAmICgxIDw8IGopKQorCQkJY29udGludWU7CiAJ CWZvciAoaSA9IDA7IGkgPCBhZGV2LT52Y24ubnVtX2VuY19yaW5nczsgKytpKSB7CiAJCQlhZGV2 LT52Y24uaW5zdFtqXS5yaW5nX2VuY1tpXS5mdW5jcyA9ICZ2Y25fdjJfNV9lbmNfcmluZ192bV9m dW5jczsKIAkJCWFkZXYtPnZjbi5pbnN0W2pdLnJpbmdfZW5jW2ldLm1lID0gajsKQEAgLTEyMDEs NiArMTI0NCw4IEBAIHN0YXRpYyB2b2lkIHZjbl92Ml81X3NldF9qcGVnX3JpbmdfZnVuY3Moc3Ry dWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJaW50IGk7CiAKIAlmb3IgKGkgPSAwOyBpIDwgYWRl di0+dmNuLm51bV92Y25faW5zdDsgKytpKSB7CisJCWlmIChhZGV2LT52Y24uaGFydmVzdF9jb25m aWcgJiAoMSA8PCBpKSkKKwkJCWNvbnRpbnVlOwogCQlhZGV2LT52Y24uaW5zdFtpXS5yaW5nX2pw ZWcuZnVuY3MgPSAmdmNuX3YyXzVfanBlZ19yaW5nX3ZtX2Z1bmNzOwogCQlhZGV2LT52Y24uaW5z dFtpXS5yaW5nX2pwZWcubWUgPSBpOwogCQlEUk1fSU5GTygiVkNOKCVkKSBqcGVnIGRlY29kZSBp cyBlbmFibGVkIGluIFZNIG1vZGVcbiIsIGkpOwpAQCAtMTIxMyw2ICsxMjU4LDggQEAgc3RhdGlj IGJvb2wgdmNuX3YyXzVfaXNfaWRsZSh2b2lkICpoYW5kbGUpCiAJaW50IGksIHJldCA9IDE7CiAK IAlmb3IgKGkgPSAwOyBpIDwgYWRldi0+dmNuLm51bV92Y25faW5zdDsgKytpKSB7CisJCWlmIChh ZGV2LT52Y24uaGFydmVzdF9jb25maWcgJiAoMSA8PCBpKSkKKwkJCWNvbnRpbnVlOwogCQlyZXQg Jj0gKFJSRUczMl9TT0MxNShWQ04sIGksIG1tVVZEX1NUQVRVUykgPT0gVVZEX1NUQVRVU19fSURM RSk7CiAJfQogCkBAIC0xMjI1LDYgKzEyNzIsOCBAQCBzdGF0aWMgaW50IHZjbl92Ml81X3dhaXRf Zm9yX2lkbGUodm9pZCAqaGFuZGxlKQogCWludCBpLCByZXQgPSAwOwogCiAJZm9yIChpID0gMDsg aSA8IGFkZXYtPnZjbi5udW1fdmNuX2luc3Q7ICsraSkgeworCQlpZiAoYWRldi0+dmNuLmhhcnZl c3RfY29uZmlnICYgKDEgPDwgaSkpCisJCQljb250aW51ZTsKIAkJU09DMTVfV0FJVF9PTl9SUkVH KFZDTiwgaSwgbW1VVkRfU1RBVFVTLCBVVkRfU1RBVFVTX19JRExFLAogCQkJVVZEX1NUQVRVU19f SURMRSwgcmV0KTsKIAkJaWYgKHJldCkKQEAgLTEzMzEsNiArMTM4MCw4IEBAIHN0YXRpYyB2b2lk IHZjbl92Ml81X3NldF9pcnFfZnVuY3Moc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJaW50 IGk7CiAKIAlmb3IgKGkgPSAwOyBpIDwgYWRldi0+dmNuLm51bV92Y25faW5zdDsgKytpKSB7CisJ CWlmIChhZGV2LT52Y24uaGFydmVzdF9jb25maWcgJiAoMSA8PCBpKSkKKwkJCWNvbnRpbnVlOwog CQlhZGV2LT52Y24uaW5zdFtpXS5pcnEubnVtX3R5cGVzID0gYWRldi0+dmNuLm51bV9lbmNfcmlu Z3MgKyAyOwogCQlhZGV2LT52Y24uaW5zdFtpXS5pcnEuZnVuY3MgPSAmdmNuX3YyXzVfaXJxX2Z1 bmNzOwogCX0KLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQt Z2Z4