From: Hawking Zhang Subject: [PATCH 2/2] drm/amdgpu/psp: make get_fw_type and prep_cmd_buf to be common interfaces Date: Thu, 3 Jan 2019 22:00:44 +0800 Message-ID: <1546524044-8359-2-git-send-email-Hawking.Zhang@amd.com> References: <1546524044-8359-1-git-send-email-Hawking.Zhang@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1546524044-8359-1-git-send-email-Hawking.Zhang-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: Hawking Zhang Z2V0X2Z3X3R5cGUgYW5kIHByZXBfY21kX2J1ZiBzaG91bGQgYmUgY29tbW9uIGludGVyZmFjZQpp bnN0ZWFkIG9mIElQIHNwZWNpZmljIG9uZXMKCkNoYW5nZS1JZDogSTExNWE4ZDNmYWZkYmUxNDMw MDhiMzY5OGFkM2E1ZjNiZDRiODc0ODEKU2lnbmVkLW9mZi1ieTogSGF3a2luZyBaaGFuZyA8SGF3 a2luZy5aaGFuZ0BhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdw dV9wc3AuYyB8IDk0ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLQogZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3BzcC5oIHwgIDMgLS0KIGRyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L3BzcF92MTBfMC5jICB8IDkwIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3BzcF92MTFfMC5jICB8IDc1IC0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9wc3BfdjNfMS5j ICAgfCA3MiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiA1IGZpbGVzIGNoYW5nZWQsIDkzIGlu c2VydGlvbnMoKyksIDI0MSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9hbWRncHVfcHNwLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfcHNwLmMKaW5kZXggODE4OWE5MC4uNTNjMmQ2MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3BzcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV9wc3AuYwpAQCAtNTAxLDYgKzUwMSw5OCBAQCBzdGF0aWMgaW50IHBzcF9o d19zdGFydChzdHJ1Y3QgcHNwX2NvbnRleHQgKnBzcCkKIAlyZXR1cm4gMDsKIH0KIAorc3RhdGlj IGludCBwc3BfZ2V0X2Z3X3R5cGUoc3RydWN0IGFtZGdwdV9maXJtd2FyZV9pbmZvICp1Y29kZSwK KwkJCSAgIGVudW0gcHNwX2dmeF9md190eXBlICp0eXBlKQoreworCXN3aXRjaCAodWNvZGUtPnVj b2RlX2lkKSB7CisJY2FzZSBBTURHUFVfVUNPREVfSURfU0RNQTA6CisJCSp0eXBlID0gR0ZYX0ZX X1RZUEVfU0RNQTA7CisJCWJyZWFrOworCWNhc2UgQU1ER1BVX1VDT0RFX0lEX1NETUExOgorCQkq dHlwZSA9IEdGWF9GV19UWVBFX1NETUExOworCQlicmVhazsKKwljYXNlIEFNREdQVV9VQ09ERV9J RF9DUF9DRToKKwkJKnR5cGUgPSBHRlhfRldfVFlQRV9DUF9DRTsKKwkJYnJlYWs7CisJY2FzZSBB TURHUFVfVUNPREVfSURfQ1BfUEZQOgorCQkqdHlwZSA9IEdGWF9GV19UWVBFX0NQX1BGUDsKKwkJ YnJlYWs7CisJY2FzZSBBTURHUFVfVUNPREVfSURfQ1BfTUU6CisJCSp0eXBlID0gR0ZYX0ZXX1RZ UEVfQ1BfTUU7CisJCWJyZWFrOworCWNhc2UgQU1ER1BVX1VDT0RFX0lEX0NQX01FQzE6CisJCSp0 eXBlID0gR0ZYX0ZXX1RZUEVfQ1BfTUVDOworCQlicmVhazsKKwljYXNlIEFNREdQVV9VQ09ERV9J RF9DUF9NRUMxX0pUOgorCQkqdHlwZSA9IEdGWF9GV19UWVBFX0NQX01FQ19NRTE7CisJCWJyZWFr OworCWNhc2UgQU1ER1BVX1VDT0RFX0lEX0NQX01FQzI6CisJCSp0eXBlID0gR0ZYX0ZXX1RZUEVf Q1BfTUVDOworCQlicmVhazsKKwljYXNlIEFNREdQVV9VQ09ERV9JRF9DUF9NRUMyX0pUOgorCQkq dHlwZSA9IEdGWF9GV19UWVBFX0NQX01FQ19NRTI7CisJCWJyZWFrOworCWNhc2UgQU1ER1BVX1VD T0RFX0lEX1JMQ19HOgorCQkqdHlwZSA9IEdGWF9GV19UWVBFX1JMQ19HOworCQlicmVhazsKKwlj YXNlIEFNREdQVV9VQ09ERV9JRF9STENfUkVTVE9SRV9MSVNUX0NOVEw6CisJCSp0eXBlID0gR0ZY X0ZXX1RZUEVfUkxDX1JFU1RPUkVfTElTVF9TUk1fQ05UTDsKKwkJYnJlYWs7CisJY2FzZSBBTURH UFVfVUNPREVfSURfUkxDX1JFU1RPUkVfTElTVF9HUE1fTUVNOgorCQkqdHlwZSA9IEdGWF9GV19U WVBFX1JMQ19SRVNUT1JFX0xJU1RfR1BNX01FTTsKKwkJYnJlYWs7CisJY2FzZSBBTURHUFVfVUNP REVfSURfUkxDX1JFU1RPUkVfTElTVF9TUk1fTUVNOgorCQkqdHlwZSA9IEdGWF9GV19UWVBFX1JM Q19SRVNUT1JFX0xJU1RfU1JNX01FTTsKKwkJYnJlYWs7CisJY2FzZSBBTURHUFVfVUNPREVfSURf U01DOgorCQkqdHlwZSA9IEdGWF9GV19UWVBFX1NNVTsKKwkJYnJlYWs7CisJY2FzZSBBTURHUFVf VUNPREVfSURfVVZEOgorCQkqdHlwZSA9IEdGWF9GV19UWVBFX1VWRDsKKwkJYnJlYWs7CisJY2Fz ZSBBTURHUFVfVUNPREVfSURfVVZEMToKKwkJKnR5cGUgPSBHRlhfRldfVFlQRV9VVkQxOworCQli cmVhazsKKwljYXNlIEFNREdQVV9VQ09ERV9JRF9WQ0U6CisJCSp0eXBlID0gR0ZYX0ZXX1RZUEVf VkNFOworCQlicmVhazsKKwljYXNlIEFNREdQVV9VQ09ERV9JRF9WQ046CisJCSp0eXBlID0gR0ZY X0ZXX1RZUEVfVkNOOworCQlicmVhazsKKwljYXNlIEFNREdQVV9VQ09ERV9JRF9ETUNVX0VSQU06 CisJCSp0eXBlID0gR0ZYX0ZXX1RZUEVfRE1DVV9FUkFNOworCQlicmVhazsKKwljYXNlIEFNREdQ VV9VQ09ERV9JRF9ETUNVX0lOVFY6CisJCSp0eXBlID0gR0ZYX0ZXX1RZUEVfRE1DVV9JU1I7CisJ CWJyZWFrOworCWNhc2UgQU1ER1BVX1VDT0RFX0lEX01BWElNVU06CisJZGVmYXVsdDoKKwkJcmV0 dXJuIC1FSU5WQUw7CisJfQorCisJcmV0dXJuIDA7Cit9CisKK3N0YXRpYyBpbnQgcHNwX3ByZXBf bG9hZF9pcF9md19jbWRfYnVmKHN0cnVjdCBhbWRncHVfZmlybXdhcmVfaW5mbyAqdWNvZGUsCisJ CQkJICAgICAgIHN0cnVjdCBwc3BfZ2Z4X2NtZF9yZXNwICpjbWQpCit7CisJaW50IHJldDsKKwl1 aW50NjRfdCBmd19tZW1fbWNfYWRkciA9IHVjb2RlLT5tY19hZGRyOworCisJbWVtc2V0KGNtZCwg MCwgc2l6ZW9mKHN0cnVjdCBwc3BfZ2Z4X2NtZF9yZXNwKSk7CisKKwljbWQtPmNtZF9pZCA9IEdG WF9DTURfSURfTE9BRF9JUF9GVzsKKwljbWQtPmNtZC5jbWRfbG9hZF9pcF9mdy5md19waHlfYWRk cl9sbyA9IGxvd2VyXzMyX2JpdHMoZndfbWVtX21jX2FkZHIpOworCWNtZC0+Y21kLmNtZF9sb2Fk X2lwX2Z3LmZ3X3BoeV9hZGRyX2hpID0gdXBwZXJfMzJfYml0cyhmd19tZW1fbWNfYWRkcik7CisJ Y21kLT5jbWQuY21kX2xvYWRfaXBfZncuZndfc2l6ZSA9IHVjb2RlLT51Y29kZV9zaXplOworCisJ cmV0ID0gcHNwX2dldF9md190eXBlKHVjb2RlLCAmY21kLT5jbWQuY21kX2xvYWRfaXBfZncuZndf dHlwZSk7CisJaWYgKHJldCkKKwkJRFJNX0VSUk9SKCJVbmtub3duIGZpcm13YXJlIHR5cGVcbiIp OworCisJcmV0dXJuIHJldDsKK30KKwogc3RhdGljIGludCBwc3BfbnBfZndfbG9hZChzdHJ1Y3Qg cHNwX2NvbnRleHQgKnBzcCkKIHsKIAlpbnQgaSwgcmV0OwpAQCAtNTIyLDcgKzYxNCw3IEBAIHN0 YXRpYyBpbnQgcHNwX25wX2Z3X2xvYWQoc3RydWN0IHBzcF9jb250ZXh0ICpwc3ApCiAJCQkvKnNr aXAgdWNvZGUgbG9hZGluZyBpbiBTUklPViBWRiAqLwogCQkJY29udGludWU7CiAKLQkJcmV0ID0g cHNwX3ByZXBfY21kX2J1Zih1Y29kZSwgcHNwLT5jbWQpOworCQlyZXQgPSBwc3BfcHJlcF9sb2Fk X2lwX2Z3X2NtZF9idWYodWNvZGUsIHBzcC0+Y21kKTsKIAkJaWYgKHJldCkKIAkJCXJldHVybiBy ZXQ7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9wc3Au aCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9wc3AuaAppbmRleCAzZWU1NzNi Li4yZWY5OGNjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVf cHNwLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3BzcC5oCkBAIC02 NSw4ICs2NSw2IEBAIHN0cnVjdCBwc3BfZnVuY3MKIAlpbnQgKCppbml0X21pY3JvY29kZSkoc3Ry dWN0IHBzcF9jb250ZXh0ICpwc3ApOwogCWludCAoKmJvb3Rsb2FkZXJfbG9hZF9zeXNkcnYpKHN0 cnVjdCBwc3BfY29udGV4dCAqcHNwKTsKIAlpbnQgKCpib290bG9hZGVyX2xvYWRfc29zKShzdHJ1 Y3QgcHNwX2NvbnRleHQgKnBzcCk7Ci0JaW50ICgqcHJlcF9jbWRfYnVmKShzdHJ1Y3QgYW1kZ3B1 X2Zpcm13YXJlX2luZm8gKnVjb2RlLAotCQkJICAgIHN0cnVjdCBwc3BfZ2Z4X2NtZF9yZXNwICpj bWQpOwogCWludCAoKnJpbmdfaW5pdCkoc3RydWN0IHBzcF9jb250ZXh0ICpwc3AsIGVudW0gcHNw X3JpbmdfdHlwZSByaW5nX3R5cGUpOwogCWludCAoKnJpbmdfY3JlYXRlKShzdHJ1Y3QgcHNwX2Nv bnRleHQgKnBzcCwKIAkJCSAgIGVudW0gcHNwX3JpbmdfdHlwZSByaW5nX3R5cGUpOwpAQCAtMTc2 LDcgKzE3NCw2IEBAIHN0cnVjdCBwc3BfeGdtaV90b3BvbG9neV9pbmZvIHsKIAlzdHJ1Y3QgcHNw X3hnbWlfbm9kZV9pbmZvCW5vZGVzW0FNREdQVV9YR01JX01BWF9DT05ORUNURURfTk9ERVNdOwog fTsKIAotI2RlZmluZSBwc3BfcHJlcF9jbWRfYnVmKHVjb2RlLCB0eXBlKSAocHNwKS0+ZnVuY3Mt PnByZXBfY21kX2J1ZigodWNvZGUpLCAodHlwZSkpCiAjZGVmaW5lIHBzcF9yaW5nX2luaXQocHNw LCB0eXBlKSAocHNwKS0+ZnVuY3MtPnJpbmdfaW5pdCgocHNwKSwgKHR5cGUpKQogI2RlZmluZSBw c3BfcmluZ19jcmVhdGUocHNwLCB0eXBlKSAocHNwKS0+ZnVuY3MtPnJpbmdfY3JlYXRlKChwc3Ap LCAodHlwZSkpCiAjZGVmaW5lIHBzcF9yaW5nX3N0b3AocHNwLCB0eXBlKSAocHNwKS0+ZnVuY3Mt PnJpbmdfc3RvcCgocHNwKSwgKHR5cGUpKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvcHNwX3YxMF8wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9wc3BfdjEw XzAuYwppbmRleCBmMmU5MzdhOS4uNzdjMmJjMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvcHNwX3YxMF8wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv cHNwX3YxMF8wLmMKQEAgLTM4LDc1ICszOCw2IEBAIE1PRFVMRV9GSVJNV0FSRSgiYW1kZ3B1L3Jh dmVuX2FzZC5iaW4iKTsKIE1PRFVMRV9GSVJNV0FSRSgiYW1kZ3B1L3BpY2Fzc29fYXNkLmJpbiIp OwogTU9EVUxFX0ZJUk1XQVJFKCJhbWRncHUvcmF2ZW4yX2FzZC5iaW4iKTsKIAotc3RhdGljIGlu dAotcHNwX3YxMF8wX2dldF9md190eXBlKHN0cnVjdCBhbWRncHVfZmlybXdhcmVfaW5mbyAqdWNv ZGUsIGVudW0gcHNwX2dmeF9md190eXBlICp0eXBlKQotewotCXN3aXRjaCh1Y29kZS0+dWNvZGVf aWQpIHsKLQljYXNlIEFNREdQVV9VQ09ERV9JRF9TRE1BMDoKLQkJKnR5cGUgPSBHRlhfRldfVFlQ RV9TRE1BMDsKLQkJYnJlYWs7Ci0JY2FzZSBBTURHUFVfVUNPREVfSURfU0RNQTE6Ci0JCSp0eXBl ID0gR0ZYX0ZXX1RZUEVfU0RNQTE7Ci0JCWJyZWFrOwotCWNhc2UgQU1ER1BVX1VDT0RFX0lEX0NQ X0NFOgotCQkqdHlwZSA9IEdGWF9GV19UWVBFX0NQX0NFOwotCQlicmVhazsKLQljYXNlIEFNREdQ VV9VQ09ERV9JRF9DUF9QRlA6Ci0JCSp0eXBlID0gR0ZYX0ZXX1RZUEVfQ1BfUEZQOwotCQlicmVh azsKLQljYXNlIEFNREdQVV9VQ09ERV9JRF9DUF9NRToKLQkJKnR5cGUgPSBHRlhfRldfVFlQRV9D UF9NRTsKLQkJYnJlYWs7Ci0JY2FzZSBBTURHUFVfVUNPREVfSURfQ1BfTUVDMToKLQkJKnR5cGUg PSBHRlhfRldfVFlQRV9DUF9NRUM7Ci0JCWJyZWFrOwotCWNhc2UgQU1ER1BVX1VDT0RFX0lEX0NQ X01FQzFfSlQ6Ci0JCSp0eXBlID0gR0ZYX0ZXX1RZUEVfQ1BfTUVDX01FMTsKLQkJYnJlYWs7Ci0J Y2FzZSBBTURHUFVfVUNPREVfSURfQ1BfTUVDMjoKLQkJKnR5cGUgPSBHRlhfRldfVFlQRV9DUF9N RUM7Ci0JCWJyZWFrOwotCWNhc2UgQU1ER1BVX1VDT0RFX0lEX0NQX01FQzJfSlQ6Ci0JCSp0eXBl ID0gR0ZYX0ZXX1RZUEVfQ1BfTUVDX01FMjsKLQkJYnJlYWs7Ci0JY2FzZSBBTURHUFVfVUNPREVf SURfUkxDX0c6Ci0JCSp0eXBlID0gR0ZYX0ZXX1RZUEVfUkxDX0c7Ci0JCWJyZWFrOwotCWNhc2Ug QU1ER1BVX1VDT0RFX0lEX1JMQ19SRVNUT1JFX0xJU1RfQ05UTDoKLQkJKnR5cGUgPSBHRlhfRldf VFlQRV9STENfUkVTVE9SRV9MSVNUX1NSTV9DTlRMOwotCQlicmVhazsKLQljYXNlIEFNREdQVV9V Q09ERV9JRF9STENfUkVTVE9SRV9MSVNUX0dQTV9NRU06Ci0JCSp0eXBlID0gR0ZYX0ZXX1RZUEVf UkxDX1JFU1RPUkVfTElTVF9HUE1fTUVNOwotCQlicmVhazsKLQljYXNlIEFNREdQVV9VQ09ERV9J RF9STENfUkVTVE9SRV9MSVNUX1NSTV9NRU06Ci0JCSp0eXBlID0gR0ZYX0ZXX1RZUEVfUkxDX1JF U1RPUkVfTElTVF9TUk1fTUVNOwotCQlicmVhazsKLQljYXNlIEFNREdQVV9VQ09ERV9JRF9TTUM6 Ci0JCSp0eXBlID0gR0ZYX0ZXX1RZUEVfU01VOwotCQlicmVhazsKLQljYXNlIEFNREdQVV9VQ09E RV9JRF9VVkQ6Ci0JCSp0eXBlID0gR0ZYX0ZXX1RZUEVfVVZEOwotCQlicmVhazsKLQljYXNlIEFN REdQVV9VQ09ERV9JRF9WQ0U6Ci0JCSp0eXBlID0gR0ZYX0ZXX1RZUEVfVkNFOwotCQlicmVhazsK LQljYXNlIEFNREdQVV9VQ09ERV9JRF9WQ046Ci0JCSp0eXBlID0gR0ZYX0ZXX1RZUEVfVkNOOwot CQlicmVhazsKLQljYXNlIEFNREdQVV9VQ09ERV9JRF9ETUNVX0VSQU06Ci0JCSp0eXBlID0gR0ZY X0ZXX1RZUEVfRE1DVV9FUkFNOwotCQlicmVhazsKLQljYXNlIEFNREdQVV9VQ09ERV9JRF9ETUNV X0lOVFY6Ci0JCSp0eXBlID0gR0ZYX0ZXX1RZUEVfRE1DVV9JU1I7Ci0JCWJyZWFrOwotCWNhc2Ug QU1ER1BVX1VDT0RFX0lEX01BWElNVU06Ci0JZGVmYXVsdDoKLQkJcmV0dXJuIC1FSU5WQUw7Ci0J fQotCi0JcmV0dXJuIDA7Ci19Ci0KIHN0YXRpYyBpbnQgcHNwX3YxMF8wX2luaXRfbWljcm9jb2Rl KHN0cnVjdCBwc3BfY29udGV4dCAqcHNwKQogewogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2 ID0gcHNwLT5hZGV2OwpAQCAtMTU4LDI2ICs4OSw2IEBAIHN0YXRpYyBpbnQgcHNwX3YxMF8wX2lu aXRfbWljcm9jb2RlKHN0cnVjdCBwc3BfY29udGV4dCAqcHNwKQogCXJldHVybiBlcnI7CiB9CiAK LXN0YXRpYyBpbnQgcHNwX3YxMF8wX3ByZXBfY21kX2J1ZihzdHJ1Y3QgYW1kZ3B1X2Zpcm13YXJl X2luZm8gKnVjb2RlLAotCQkJCSAgc3RydWN0IHBzcF9nZnhfY21kX3Jlc3AgKmNtZCkKLXsKLQlp bnQgcmV0OwotCXVpbnQ2NF90IGZ3X21lbV9tY19hZGRyID0gdWNvZGUtPm1jX2FkZHI7Ci0KLQlt ZW1zZXQoY21kLCAwLCBzaXplb2Yoc3RydWN0IHBzcF9nZnhfY21kX3Jlc3ApKTsKLQotCWNtZC0+ Y21kX2lkID0gR0ZYX0NNRF9JRF9MT0FEX0lQX0ZXOwotCWNtZC0+Y21kLmNtZF9sb2FkX2lwX2Z3 LmZ3X3BoeV9hZGRyX2xvID0gbG93ZXJfMzJfYml0cyhmd19tZW1fbWNfYWRkcik7Ci0JY21kLT5j bWQuY21kX2xvYWRfaXBfZncuZndfcGh5X2FkZHJfaGkgPSB1cHBlcl8zMl9iaXRzKGZ3X21lbV9t Y19hZGRyKTsKLQljbWQtPmNtZC5jbWRfbG9hZF9pcF9mdy5md19zaXplID0gdWNvZGUtPnVjb2Rl X3NpemU7Ci0KLQlyZXQgPSBwc3BfdjEwXzBfZ2V0X2Z3X3R5cGUodWNvZGUsICZjbWQtPmNtZC5j bWRfbG9hZF9pcF9mdy5md190eXBlKTsKLQlpZiAocmV0KQotCQlEUk1fRVJST1IoIlVua25vd24g ZmlybXdhcmUgdHlwZVxuIik7Ci0KLQlyZXR1cm4gcmV0OwotfQotCiBzdGF0aWMgaW50IHBzcF92 MTBfMF9yaW5nX2luaXQoc3RydWN0IHBzcF9jb250ZXh0ICpwc3AsCiAJCQkgICAgICAgZW51bSBw c3BfcmluZ190eXBlIHJpbmdfdHlwZSkKIHsKQEAgLTQ1NCw3ICszNjUsNiBAQCBzdGF0aWMgaW50 IHBzcF92MTBfMF9tb2RlMV9yZXNldChzdHJ1Y3QgcHNwX2NvbnRleHQgKnBzcCkKIAogc3RhdGlj IGNvbnN0IHN0cnVjdCBwc3BfZnVuY3MgcHNwX3YxMF8wX2Z1bmNzID0gewogCS5pbml0X21pY3Jv Y29kZSA9IHBzcF92MTBfMF9pbml0X21pY3JvY29kZSwKLQkucHJlcF9jbWRfYnVmID0gcHNwX3Yx MF8wX3ByZXBfY21kX2J1ZiwKIAkucmluZ19pbml0ID0gcHNwX3YxMF8wX3JpbmdfaW5pdCwKIAku cmluZ19jcmVhdGUgPSBwc3BfdjEwXzBfcmluZ19jcmVhdGUsCiAJLnJpbmdfc3RvcCA9IHBzcF92 MTBfMF9yaW5nX3N0b3AsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9w c3BfdjExXzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3BzcF92MTFfMC5jCmluZGV4 IDBjNmU3ZjkuLmY3MTM4NGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L3BzcF92MTFfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3BzcF92MTFfMC5j CkBAIC00MCw2MCArNDAsNiBAQCBNT0RVTEVfRklSTVdBUkUoImFtZGdwdS92ZWdhMjBfdGEuYmlu Iik7CiAvKiBhZGRyZXNzIGJsb2NrICovCiAjZGVmaW5lIHNtbk1QMV9GSVJNV0FSRV9GTEFHUwkJ MHgzMDEwMDI0CiAKLXN0YXRpYyBpbnQKLXBzcF92MTFfMF9nZXRfZndfdHlwZShzdHJ1Y3QgYW1k Z3B1X2Zpcm13YXJlX2luZm8gKnVjb2RlLCBlbnVtIHBzcF9nZnhfZndfdHlwZSAqdHlwZSkKLXsK LQlzd2l0Y2ggKHVjb2RlLT51Y29kZV9pZCkgewotCWNhc2UgQU1ER1BVX1VDT0RFX0lEX1NETUEw OgotCQkqdHlwZSA9IEdGWF9GV19UWVBFX1NETUEwOwotCQlicmVhazsKLQljYXNlIEFNREdQVV9V Q09ERV9JRF9TRE1BMToKLQkJKnR5cGUgPSBHRlhfRldfVFlQRV9TRE1BMTsKLQkJYnJlYWs7Ci0J Y2FzZSBBTURHUFVfVUNPREVfSURfQ1BfQ0U6Ci0JCSp0eXBlID0gR0ZYX0ZXX1RZUEVfQ1BfQ0U7 Ci0JCWJyZWFrOwotCWNhc2UgQU1ER1BVX1VDT0RFX0lEX0NQX1BGUDoKLQkJKnR5cGUgPSBHRlhf RldfVFlQRV9DUF9QRlA7Ci0JCWJyZWFrOwotCWNhc2UgQU1ER1BVX1VDT0RFX0lEX0NQX01FOgot CQkqdHlwZSA9IEdGWF9GV19UWVBFX0NQX01FOwotCQlicmVhazsKLQljYXNlIEFNREdQVV9VQ09E RV9JRF9DUF9NRUMxOgotCQkqdHlwZSA9IEdGWF9GV19UWVBFX0NQX01FQzsKLQkJYnJlYWs7Ci0J Y2FzZSBBTURHUFVfVUNPREVfSURfQ1BfTUVDMV9KVDoKLQkJKnR5cGUgPSBHRlhfRldfVFlQRV9D UF9NRUNfTUUxOwotCQlicmVhazsKLQljYXNlIEFNREdQVV9VQ09ERV9JRF9DUF9NRUMyOgotCQkq dHlwZSA9IEdGWF9GV19UWVBFX0NQX01FQzsKLQkJYnJlYWs7Ci0JY2FzZSBBTURHUFVfVUNPREVf SURfQ1BfTUVDMl9KVDoKLQkJKnR5cGUgPSBHRlhfRldfVFlQRV9DUF9NRUNfTUUyOwotCQlicmVh azsKLQljYXNlIEFNREdQVV9VQ09ERV9JRF9STENfRzoKLQkJKnR5cGUgPSBHRlhfRldfVFlQRV9S TENfRzsKLQkJYnJlYWs7Ci0JY2FzZSBBTURHUFVfVUNPREVfSURfU01DOgotCQkqdHlwZSA9IEdG WF9GV19UWVBFX1NNVTsKLQkJYnJlYWs7Ci0JY2FzZSBBTURHUFVfVUNPREVfSURfVVZEOgotCQkq dHlwZSA9IEdGWF9GV19UWVBFX1VWRDsKLQkJYnJlYWs7Ci0JY2FzZSBBTURHUFVfVUNPREVfSURf VkNFOgotCQkqdHlwZSA9IEdGWF9GV19UWVBFX1ZDRTsKLQkJYnJlYWs7Ci0JY2FzZSBBTURHUFVf VUNPREVfSURfVVZEMToKLQkJKnR5cGUgPSBHRlhfRldfVFlQRV9VVkQxOwotCQlicmVhazsKLQlj YXNlIEFNREdQVV9VQ09ERV9JRF9NQVhJTVVNOgotCWRlZmF1bHQ6Ci0JCXJldHVybiAtRUlOVkFM OwotCX0KLQotCXJldHVybiAwOwotfQotCiBzdGF0aWMgaW50IHBzcF92MTFfMF9pbml0X21pY3Jv Y29kZShzdHJ1Y3QgcHNwX2NvbnRleHQgKnBzcCkKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldiA9IHBzcC0+YWRldjsKQEAgLTI2NywyNiArMjEzLDYgQEAgc3RhdGljIGludCBwc3BfdjEx XzBfYm9vdGxvYWRlcl9sb2FkX3NvcyhzdHJ1Y3QgcHNwX2NvbnRleHQgKnBzcCkKIAlyZXR1cm4g cmV0OwogfQogCi1zdGF0aWMgaW50IHBzcF92MTFfMF9wcmVwX2NtZF9idWYoc3RydWN0IGFtZGdw dV9maXJtd2FyZV9pbmZvICp1Y29kZSwKLQkJCQkgc3RydWN0IHBzcF9nZnhfY21kX3Jlc3AgKmNt ZCkKLXsKLQlpbnQgcmV0OwotCXVpbnQ2NF90IGZ3X21lbV9tY19hZGRyID0gdWNvZGUtPm1jX2Fk ZHI7Ci0KLQltZW1zZXQoY21kLCAwLCBzaXplb2Yoc3RydWN0IHBzcF9nZnhfY21kX3Jlc3ApKTsK LQotCWNtZC0+Y21kX2lkID0gR0ZYX0NNRF9JRF9MT0FEX0lQX0ZXOwotCWNtZC0+Y21kLmNtZF9s b2FkX2lwX2Z3LmZ3X3BoeV9hZGRyX2xvID0gbG93ZXJfMzJfYml0cyhmd19tZW1fbWNfYWRkcik7 Ci0JY21kLT5jbWQuY21kX2xvYWRfaXBfZncuZndfcGh5X2FkZHJfaGkgPSB1cHBlcl8zMl9iaXRz KGZ3X21lbV9tY19hZGRyKTsKLQljbWQtPmNtZC5jbWRfbG9hZF9pcF9mdy5md19zaXplID0gdWNv ZGUtPnVjb2RlX3NpemU7Ci0KLQlyZXQgPSBwc3BfdjExXzBfZ2V0X2Z3X3R5cGUodWNvZGUsICZj bWQtPmNtZC5jbWRfbG9hZF9pcF9mdy5md190eXBlKTsKLQlpZiAocmV0KQotCQlEUk1fRVJST1Io IlVua25vd24gZmlybXdhcmUgdHlwZVxuIik7Ci0KLQlyZXR1cm4gcmV0OwotfQotCiBzdGF0aWMg aW50IHBzcF92MTFfMF9yaW5nX2luaXQoc3RydWN0IHBzcF9jb250ZXh0ICpwc3AsCiAJCQkgICAg ICBlbnVtIHBzcF9yaW5nX3R5cGUgcmluZ190eXBlKQogewpAQCAtNzUzLDcgKzY3OSw2IEBAIHN0 YXRpYyBjb25zdCBzdHJ1Y3QgcHNwX2Z1bmNzIHBzcF92MTFfMF9mdW5jcyA9IHsKIAkuaW5pdF9t aWNyb2NvZGUgPSBwc3BfdjExXzBfaW5pdF9taWNyb2NvZGUsCiAJLmJvb3Rsb2FkZXJfbG9hZF9z eXNkcnYgPSBwc3BfdjExXzBfYm9vdGxvYWRlcl9sb2FkX3N5c2RydiwKIAkuYm9vdGxvYWRlcl9s b2FkX3NvcyA9IHBzcF92MTFfMF9ib290bG9hZGVyX2xvYWRfc29zLAotCS5wcmVwX2NtZF9idWYg PSBwc3BfdjExXzBfcHJlcF9jbWRfYnVmLAogCS5yaW5nX2luaXQgPSBwc3BfdjExXzBfcmluZ19p bml0LAogCS5yaW5nX2NyZWF0ZSA9IHBzcF92MTFfMF9yaW5nX2NyZWF0ZSwKIAkucmluZ19zdG9w ID0gcHNwX3YxMV8wX3Jpbmdfc3RvcCwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L3BzcF92M18xLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9wc3BfdjNfMS5j CmluZGV4IDc5Njk0ZmYuLmM2M2RlOTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L3BzcF92M18xLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvcHNwX3Yz XzEuYwpAQCAtNDcsNTcgKzQ3LDYgQEAgTU9EVUxFX0ZJUk1XQVJFKCJhbWRncHUvdmVnYTEyX2Fz ZC5iaW4iKTsKIAogc3RhdGljIHVpbnQzMl90IHNvc19vbGRfdmVyc2lvbnNbXSA9IHsxNTE3NjE2 LCAxNTEwNTkyLCAxNDQ4NTk0LCAxNDQ2NTU0fTsKIAotc3RhdGljIGludAotcHNwX3YzXzFfZ2V0 X2Z3X3R5cGUoc3RydWN0IGFtZGdwdV9maXJtd2FyZV9pbmZvICp1Y29kZSwgZW51bSBwc3BfZ2Z4 X2Z3X3R5cGUgKnR5cGUpCi17Ci0Jc3dpdGNoKHVjb2RlLT51Y29kZV9pZCkgewotCWNhc2UgQU1E R1BVX1VDT0RFX0lEX1NETUEwOgotCQkqdHlwZSA9IEdGWF9GV19UWVBFX1NETUEwOwotCQlicmVh azsKLQljYXNlIEFNREdQVV9VQ09ERV9JRF9TRE1BMToKLQkJKnR5cGUgPSBHRlhfRldfVFlQRV9T RE1BMTsKLQkJYnJlYWs7Ci0JY2FzZSBBTURHUFVfVUNPREVfSURfQ1BfQ0U6Ci0JCSp0eXBlID0g R0ZYX0ZXX1RZUEVfQ1BfQ0U7Ci0JCWJyZWFrOwotCWNhc2UgQU1ER1BVX1VDT0RFX0lEX0NQX1BG UDoKLQkJKnR5cGUgPSBHRlhfRldfVFlQRV9DUF9QRlA7Ci0JCWJyZWFrOwotCWNhc2UgQU1ER1BV X1VDT0RFX0lEX0NQX01FOgotCQkqdHlwZSA9IEdGWF9GV19UWVBFX0NQX01FOwotCQlicmVhazsK LQljYXNlIEFNREdQVV9VQ09ERV9JRF9DUF9NRUMxOgotCQkqdHlwZSA9IEdGWF9GV19UWVBFX0NQ X01FQzsKLQkJYnJlYWs7Ci0JY2FzZSBBTURHUFVfVUNPREVfSURfQ1BfTUVDMV9KVDoKLQkJKnR5 cGUgPSBHRlhfRldfVFlQRV9DUF9NRUNfTUUxOwotCQlicmVhazsKLQljYXNlIEFNREdQVV9VQ09E RV9JRF9DUF9NRUMyOgotCQkqdHlwZSA9IEdGWF9GV19UWVBFX0NQX01FQzsKLQkJYnJlYWs7Ci0J Y2FzZSBBTURHUFVfVUNPREVfSURfQ1BfTUVDMl9KVDoKLQkJKnR5cGUgPSBHRlhfRldfVFlQRV9D UF9NRUNfTUUyOwotCQlicmVhazsKLQljYXNlIEFNREdQVV9VQ09ERV9JRF9STENfRzoKLQkJKnR5 cGUgPSBHRlhfRldfVFlQRV9STENfRzsKLQkJYnJlYWs7Ci0JY2FzZSBBTURHUFVfVUNPREVfSURf U01DOgotCQkqdHlwZSA9IEdGWF9GV19UWVBFX1NNVTsKLQkJYnJlYWs7Ci0JY2FzZSBBTURHUFVf VUNPREVfSURfVVZEOgotCQkqdHlwZSA9IEdGWF9GV19UWVBFX1VWRDsKLQkJYnJlYWs7Ci0JY2Fz ZSBBTURHUFVfVUNPREVfSURfVkNFOgotCQkqdHlwZSA9IEdGWF9GV19UWVBFX1ZDRTsKLQkJYnJl YWs7Ci0JY2FzZSBBTURHUFVfVUNPREVfSURfTUFYSU1VTToKLQlkZWZhdWx0OgotCQlyZXR1cm4g LUVJTlZBTDsKLQl9Ci0KLQlyZXR1cm4gMDsKLX0KLQogc3RhdGljIGludCBwc3BfdjNfMV9pbml0 X21pY3JvY29kZShzdHJ1Y3QgcHNwX2NvbnRleHQgKnBzcCkKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2Rl dmljZSAqYWRldiA9IHBzcC0+YWRldjsKQEAgLTI3NywyNiArMjI2LDYgQEAgc3RhdGljIGludCBw c3BfdjNfMV9ib290bG9hZGVyX2xvYWRfc29zKHN0cnVjdCBwc3BfY29udGV4dCAqcHNwKQogCXJl dHVybiByZXQ7CiB9CiAKLXN0YXRpYyBpbnQgcHNwX3YzXzFfcHJlcF9jbWRfYnVmKHN0cnVjdCBh bWRncHVfZmlybXdhcmVfaW5mbyAqdWNvZGUsCi0JCQkJIHN0cnVjdCBwc3BfZ2Z4X2NtZF9yZXNw ICpjbWQpCi17Ci0JaW50IHJldDsKLQl1aW50NjRfdCBmd19tZW1fbWNfYWRkciA9IHVjb2RlLT5t Y19hZGRyOwotCi0JbWVtc2V0KGNtZCwgMCwgc2l6ZW9mKHN0cnVjdCBwc3BfZ2Z4X2NtZF9yZXNw KSk7Ci0KLQljbWQtPmNtZF9pZCA9IEdGWF9DTURfSURfTE9BRF9JUF9GVzsKLQljbWQtPmNtZC5j bWRfbG9hZF9pcF9mdy5md19waHlfYWRkcl9sbyA9IGxvd2VyXzMyX2JpdHMoZndfbWVtX21jX2Fk ZHIpOwotCWNtZC0+Y21kLmNtZF9sb2FkX2lwX2Z3LmZ3X3BoeV9hZGRyX2hpID0gdXBwZXJfMzJf Yml0cyhmd19tZW1fbWNfYWRkcik7Ci0JY21kLT5jbWQuY21kX2xvYWRfaXBfZncuZndfc2l6ZSA9 IHVjb2RlLT51Y29kZV9zaXplOwotCi0JcmV0ID0gcHNwX3YzXzFfZ2V0X2Z3X3R5cGUodWNvZGUs ICZjbWQtPmNtZC5jbWRfbG9hZF9pcF9mdy5md190eXBlKTsKLQlpZiAocmV0KQotCQlEUk1fRVJS T1IoIlVua25vd24gZmlybXdhcmUgdHlwZVxuIik7Ci0KLQlyZXR1cm4gcmV0OwotfQotCiBzdGF0 aWMgaW50IHBzcF92M18xX3JpbmdfaW5pdChzdHJ1Y3QgcHNwX2NvbnRleHQgKnBzcCwKIAkJCSAg ICAgIGVudW0gcHNwX3JpbmdfdHlwZSByaW5nX3R5cGUpCiB7CkBAIC02MTUsNyArNTQ0LDYgQEAg c3RhdGljIGNvbnN0IHN0cnVjdCBwc3BfZnVuY3MgcHNwX3YzXzFfZnVuY3MgPSB7CiAJLmluaXRf bWljcm9jb2RlID0gcHNwX3YzXzFfaW5pdF9taWNyb2NvZGUsCiAJLmJvb3Rsb2FkZXJfbG9hZF9z eXNkcnYgPSBwc3BfdjNfMV9ib290bG9hZGVyX2xvYWRfc3lzZHJ2LAogCS5ib290bG9hZGVyX2xv YWRfc29zID0gcHNwX3YzXzFfYm9vdGxvYWRlcl9sb2FkX3NvcywKLQkucHJlcF9jbWRfYnVmID0g cHNwX3YzXzFfcHJlcF9jbWRfYnVmLAogCS5yaW5nX2luaXQgPSBwc3BfdjNfMV9yaW5nX2luaXQs CiAJLnJpbmdfY3JlYXRlID0gcHNwX3YzXzFfcmluZ19jcmVhdGUsCiAJLnJpbmdfc3RvcCA9IHBz cF92M18xX3Jpbmdfc3RvcCwKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2FtZC1nZngK