From: Alex Deucher Subject: [PATCH 027/100] drm/amdgpu: use new flag to handle different firmware loading method Date: Mon, 20 Mar 2017 16:29:22 -0400 Message-ID: <1490041835-11255-13-git-send-email-alexander.deucher@amd.com> References: <1490041835-11255-1-git-send-email-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1490041835-11255-1-git-send-email-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 , Huang Rui RnJvbTogSHVhbmcgUnVpIDxyYXkuaHVhbmdAYW1kLmNvbT4KClRoaXMgcGF0Y2ggaW50cm9kdWNl cyBhIG5ldyBmbGFnIG5hbWVkICJhbWRncHVfZmlybXdhcmVfbG9hZF90eXBlIiB0bwpoYW5kbGUg ZGlmZmVyZW50IGZpcm13YXJlIGxvYWRpbmcgbWV0aG9kLiBTaW5jZSBWZWdhMTAsIHRoZXJlIGFy ZQp0aHJlZSB3YXlzIHRvIGxvYWQgZmlybXdhcmUuIEl0IHdvdWxkIGJlIGJldHRlciB0byB1c2Ug YSBmbGFnIGFuZCBhCmZ3X2xvYWRfdHlwZSBrZXJuZWwgcGFyYW1ldGVyIHRvIGNvbmZpZ3VyZSBp dC4KClNpZ25lZC1vZmYtYnk6IEh1YW5nIFJ1aSA8cmF5Lmh1YW5nQGFtZC5jb20+ClJldmlld2Vk LWJ5OiBBbGV4IERldWNoZXIgPGFsZXhhbmRlci5kZXVjaGVyQGFtZC5jb20+ClNpZ25lZC1vZmYt Ynk6IEFsZXggRGV1Y2hlciA8YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaCAgICAgICAgICAgfCAxMCArKystCiBkcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZHJ2LmMgICAgICAgfCAgNiArLS0KIGRyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9wb3dlcnBsYXkuYyB8ICA0ICstCiBkcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdWNvZGUuYyAgICAgfCA2NyArKysrKysrKysrKysrKysr KysrKysrKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV91Y29kZS5oICAg ICB8ICAzICsrCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9jaWsuYyAgICAgICAgICAgICAg fCAgMiArCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjhfMC5jICAgICAgICAgfCAg NiArLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3NkbWFfdjJfNC5jICAgICAgICB8ICA0 ICstCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zZG1hX3YzXzAuYyAgICAgICAgfCAgNCAr LQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdmkuYyAgICAgICAgICAgICAgIHwgIDQgKy0K IDEwIGZpbGVzIGNoYW5nZWQsIDkwIGluc2VydGlvbnMoKyksIDIwIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKaW5kZXggYjcxM2YzNy4uNGQwNmRlOGIgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oCkBAIC04Miw3ICs4Miw3IEBAIGV4dGVybiBpbnQg YW1kZ3B1X3BjaWVfZ2VuMjsKIGV4dGVybiBpbnQgYW1kZ3B1X21zaTsKIGV4dGVybiBpbnQgYW1k Z3B1X2xvY2t1cF90aW1lb3V0OwogZXh0ZXJuIGludCBhbWRncHVfZHBtOwotZXh0ZXJuIGludCBh bWRncHVfc21jX2xvYWRfZnc7CitleHRlcm4gaW50IGFtZGdwdV9md19sb2FkX3R5cGU7CiBleHRl cm4gaW50IGFtZGdwdV9hc3BtOwogZXh0ZXJuIGludCBhbWRncHVfcnVudGltZV9wbTsKIGV4dGVy biB1bnNpZ25lZCBhbWRncHVfaXBfYmxvY2tfbWFzazsKQEAgLTEwNjUsOSArMTA2NSwxNSBAQCBz dHJ1Y3QgYW1kZ3B1X3NkbWEgewogLyoKICAqIEZpcm13YXJlCiAgKi8KK2VudW0gYW1kZ3B1X2Zp cm13YXJlX2xvYWRfdHlwZSB7CisJQU1ER1BVX0ZXX0xPQURfRElSRUNUID0gMCwKKwlBTURHUFVf RldfTE9BRF9TTVUsCisJQU1ER1BVX0ZXX0xPQURfUFNQLAorfTsKKwogc3RydWN0IGFtZGdwdV9m aXJtd2FyZSB7CiAJc3RydWN0IGFtZGdwdV9maXJtd2FyZV9pbmZvIHVjb2RlW0FNREdQVV9VQ09E RV9JRF9NQVhJTVVNXTsKLQlib29sIHNtdV9sb2FkOworCWVudW0gYW1kZ3B1X2Zpcm13YXJlX2xv YWRfdHlwZSBsb2FkX3R5cGU7CiAJc3RydWN0IGFtZGdwdV9ibyAqZndfYnVmOwogCXVuc2lnbmVk IGludCBmd19zaXplOwogfTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L2FtZGdwdV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kcnYuYwpp bmRleCAyOTZkY2I3Li4zZDBlOGIxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9hbWRncHVfZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 X2Rydi5jCkBAIC03OSw3ICs3OSw3IEBAIGludCBhbWRncHVfcGNpZV9nZW4yID0gLTE7CiBpbnQg YW1kZ3B1X21zaSA9IC0xOwogaW50IGFtZGdwdV9sb2NrdXBfdGltZW91dCA9IDA7CiBpbnQgYW1k Z3B1X2RwbSA9IC0xOwotaW50IGFtZGdwdV9zbWNfbG9hZF9mdyA9IDE7CitpbnQgYW1kZ3B1X2Z3 X2xvYWRfdHlwZSA9IC0xOwogaW50IGFtZGdwdV9hc3BtID0gLTE7CiBpbnQgYW1kZ3B1X3J1bnRp bWVfcG0gPSAtMTsKIHVuc2lnbmVkIGFtZGdwdV9pcF9ibG9ja19tYXNrID0gMHhmZmZmZmZmZjsK QEAgLTE0MCw4ICsxNDAsOCBAQCBtb2R1bGVfcGFyYW1fbmFtZWQobG9ja3VwX3RpbWVvdXQsIGFt ZGdwdV9sb2NrdXBfdGltZW91dCwgaW50LCAwNDQ0KTsKIE1PRFVMRV9QQVJNX0RFU0MoZHBtLCAi RFBNIHN1cHBvcnQgKDEgPSBlbmFibGUsIDAgPSBkaXNhYmxlLCAtMSA9IGF1dG8pIik7CiBtb2R1 bGVfcGFyYW1fbmFtZWQoZHBtLCBhbWRncHVfZHBtLCBpbnQsIDA0NDQpOwogCi1NT0RVTEVfUEFS TV9ERVNDKHNtY19sb2FkX2Z3LCAiU01DIGZpcm13YXJlIGxvYWRpbmcoMSA9IGVuYWJsZSwgMCA9 IGRpc2FibGUpIik7Ci1tb2R1bGVfcGFyYW1fbmFtZWQoc21jX2xvYWRfZncsIGFtZGdwdV9zbWNf bG9hZF9mdywgaW50LCAwNDQ0KTsKK01PRFVMRV9QQVJNX0RFU0MoZndfbG9hZF90eXBlLCAiZmly bXdhcmUgbG9hZGluZyB0eXBlICgwID0gZGlyZWN0LCAxID0gU01VLCAyID0gUFNQLCAtMSA9IGF1 dG8pIik7Cittb2R1bGVfcGFyYW1fbmFtZWQoZndfbG9hZF90eXBlLCBhbWRncHVfZndfbG9hZF90 eXBlLCBpbnQsIDA0NDQpOwogCiBNT0RVTEVfUEFSTV9ERVNDKGFzcG0sICJBU1BNIHN1cHBvcnQg KDEgPSBlbmFibGUsIDAgPSBkaXNhYmxlLCAtMSA9IGF1dG8pIik7CiBtb2R1bGVfcGFyYW1fbmFt ZWQoYXNwbSwgYW1kZ3B1X2FzcG0sIGludCwgMDQ0NCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcG93ZXJwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHVfcG93ZXJwbGF5LmMKaW5kZXggZDU2ZDIwMC4uOTZhNTExMyAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3Bvd2VycGxheS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9wb3dlcnBsYXkuYwpAQCAtMTYzLDcg KzE2Myw3IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X3BwX2h3X2luaXQodm9pZCAqaGFuZGxlKQogCWlu dCByZXQgPSAwOwogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gKHN0cnVjdCBhbWRncHVf ZGV2aWNlICopaGFuZGxlOwogCi0JaWYgKGFkZXYtPnBwX2VuYWJsZWQgJiYgYWRldi0+ZmlybXdh cmUuc211X2xvYWQpCisJaWYgKGFkZXYtPnBwX2VuYWJsZWQgJiYgYWRldi0+ZmlybXdhcmUubG9h ZF90eXBlID09IEFNREdQVV9GV19MT0FEX1NNVSkKIAkJYW1kZ3B1X3Vjb2RlX2luaXRfYm8oYWRl dik7CiAKIAlpZiAoYWRldi0+cG93ZXJwbGF5LmlwX2Z1bmNzLT5od19pbml0KQpAQCAtMTkwLDcg KzE5MCw3IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X3BwX2h3X2Zpbmkodm9pZCAqaGFuZGxlKQogCQly ZXQgPSBhZGV2LT5wb3dlcnBsYXkuaXBfZnVuY3MtPmh3X2ZpbmkoCiAJCQkJCWFkZXYtPnBvd2Vy cGxheS5wcF9oYW5kbGUpOwogCi0JaWYgKGFkZXYtPnBwX2VuYWJsZWQgJiYgYWRldi0+ZmlybXdh cmUuc211X2xvYWQpCisJaWYgKGFkZXYtPnBwX2VuYWJsZWQgJiYgYWRldi0+ZmlybXdhcmUubG9h ZF90eXBlID09IEFNREdQVV9GV19MT0FEX1NNVSkKIAkJYW1kZ3B1X3Vjb2RlX2ZpbmlfYm8oYWRl dik7CiAKIAlyZXR1cm4gcmV0OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvYW1kZ3B1X3Vjb2RlLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdWNv ZGUuYwppbmRleCBiZTE2Mzc3Li43M2MzZTY2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfdWNvZGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfdWNvZGUuYwpAQCAtMjE3LDYgKzIxNyw0OSBAQCBib29sIGFtZGdwdV91Y29kZV9o ZHJfdmVyc2lvbih1bmlvbiBhbWRncHVfZmlybXdhcmVfaGVhZGVyICpoZHIsCiAJcmV0dXJuIHRy dWU7CiB9CiAKK2VudW0gYW1kZ3B1X2Zpcm13YXJlX2xvYWRfdHlwZQorYW1kZ3B1X3Vjb2RlX2dl dF9sb2FkX3R5cGUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIGludCBsb2FkX3R5cGUpCit7 CisJc3dpdGNoIChhZGV2LT5hc2ljX3R5cGUpIHsKKyNpZmRlZiBDT05GSUdfRFJNX0FNREdQVV9T SQorCWNhc2UgQ0hJUF9UQUhJVEk6CisJY2FzZSBDSElQX1BJVENBSVJOOgorCWNhc2UgQ0hJUF9W RVJERToKKwljYXNlIENISVBfT0xBTkQ6CisJCXJldHVybiBBTURHUFVfRldfTE9BRF9ESVJFQ1Q7 CisjZW5kaWYKKyNpZmRlZiBDT05GSUdfRFJNX0FNREdQVV9DSUsKKwljYXNlIENISVBfQk9OQUlS RToKKwljYXNlIENISVBfS0FWRVJJOgorCWNhc2UgQ0hJUF9LQUJJTkk6CisJY2FzZSBDSElQX0hB V0FJSToKKwljYXNlIENISVBfTVVMTElOUzoKKwkJcmV0dXJuIEFNREdQVV9GV19MT0FEX0RJUkVD VDsKKyNlbmRpZgorCWNhc2UgQ0hJUF9UT1BBWjoKKwljYXNlIENISVBfVE9OR0E6CisJY2FzZSBD SElQX0ZJSkk6CisJY2FzZSBDSElQX0NBUlJJWk86CisJY2FzZSBDSElQX1NUT05FWToKKwljYXNl IENISVBfUE9MQVJJUzEwOgorCWNhc2UgQ0hJUF9QT0xBUklTMTE6CisJY2FzZSBDSElQX1BPTEFS SVMxMjoKKwkJaWYgKCFsb2FkX3R5cGUpCisJCQlyZXR1cm4gQU1ER1BVX0ZXX0xPQURfRElSRUNU OworCQllbHNlCisJCQlyZXR1cm4gQU1ER1BVX0ZXX0xPQURfU01VOworCWNhc2UgQ0hJUF9WRUdB MTA6CisJCWlmICghbG9hZF90eXBlKQorCQkJcmV0dXJuIEFNREdQVV9GV19MT0FEX0RJUkVDVDsK KwkJZWxzZQorCQkJcmV0dXJuIEFNREdQVV9GV19MT0FEX1BTUDsKKwlkZWZhdWx0OgorCQlEUk1f RVJST1IoIlVua25vdyBmaXJtd2FyZSBsb2FkIHR5cGVcbiIpOworCX0KKworCXJldHVybiBBTURH UFVfRldfTE9BRF9ESVJFQ1Q7Cit9CisKIHN0YXRpYyBpbnQgYW1kZ3B1X3Vjb2RlX2luaXRfc2lu Z2xlX2Z3KHN0cnVjdCBhbWRncHVfZmlybXdhcmVfaW5mbyAqdWNvZGUsCiAJCQkJdWludDY0X3Qg bWNfYWRkciwgdm9pZCAqa3B0cikKIHsKQEAgLTI3Myw3ICszMTYsNyBAQCBpbnQgYW1kZ3B1X3Vj b2RlX2luaXRfYm8oc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJdWludDY0X3QgZndfbWNf YWRkcjsKIAl2b2lkICpmd19idWZfcHRyID0gTlVMTDsKIAl1aW50NjRfdCBmd19vZmZzZXQgPSAw OwotCWludCBpLCBlcnI7CisJaW50IGksIGVyciwgbWF4OwogCXN0cnVjdCBhbWRncHVfZmlybXdh cmVfaW5mbyAqdWNvZGUgPSBOVUxMOwogCWNvbnN0IHN0cnVjdCBjb21tb25fZmlybXdhcmVfaGVh ZGVyICpoZWFkZXIgPSBOVUxMOwogCkBAIC0zMDYsNyArMzQ5LDE2IEBAIGludCBhbWRncHVfdWNv ZGVfaW5pdF9ibyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAogCWFtZGdwdV9ib191bnJl c2VydmUoKmJvKTsKIAotCWZvciAoaSA9IDA7IGkgPCBBTURHUFVfVUNPREVfSURfTUFYSU1VTTsg aSsrKSB7CisJLyoKKwkgKiBpZiBTTVUgbG9hZGVkIGZpcm13YXJlLCBpdCBuZWVkbid0IGFkZCBT TUMsIFVWRCwgYW5kIFZDRQorCSAqIHVjb2RlIGluZm8gaGVyZQorCSAqLworCWlmIChhZGV2LT5m aXJtd2FyZS5sb2FkX3R5cGUgIT0gQU1ER1BVX0ZXX0xPQURfUFNQKQorCQltYXggPSBBTURHUFVf VUNPREVfSURfTUFYSU1VTSAtIDM7CisJZWxzZQorCQltYXggPSBBTURHUFVfVUNPREVfSURfTUFY SU1VTTsKKworCWZvciAoaSA9IDA7IGkgPCBtYXg7IGkrKykgewogCQl1Y29kZSA9ICZhZGV2LT5m aXJtd2FyZS51Y29kZVtpXTsKIAkJaWYgKHVjb2RlLT5mdykgewogCQkJaGVhZGVyID0gKGNvbnN0 IHN0cnVjdCBjb21tb25fZmlybXdhcmVfaGVhZGVyICopdWNvZGUtPmZ3LT5kYXRhOwpAQCAtMzMx LDcgKzM4Myw4IEBAIGludCBhbWRncHVfdWNvZGVfaW5pdF9ibyhzdHJ1Y3QgYW1kZ3B1X2Rldmlj ZSAqYWRldikKIGZhaWxlZF9yZXNlcnZlOgogCWFtZGdwdV9ib191bnJlZihibyk7CiBmYWlsZWQ6 Ci0JYWRldi0+ZmlybXdhcmUuc211X2xvYWQgPSBmYWxzZTsKKwlpZiAoZXJyKQorCQlhZGV2LT5m aXJtd2FyZS5sb2FkX3R5cGUgPSBBTURHUFVfRldfTE9BRF9ESVJFQ1Q7CiAKIAlyZXR1cm4gZXJy OwogfQpAQCAtMzQwLDggKzM5MywxNCBAQCBpbnQgYW1kZ3B1X3Vjb2RlX2ZpbmlfYm8oc3RydWN0 IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB7CiAJaW50IGk7CiAJc3RydWN0IGFtZGdwdV9maXJtd2Fy ZV9pbmZvICp1Y29kZSA9IE5VTEw7CisJaW50IG1heDsKKworCWlmIChhZGV2LT5maXJtd2FyZS5s b2FkX3R5cGUgIT0gQU1ER1BVX0ZXX0xPQURfUFNQKQorCQltYXggPSBBTURHUFVfVUNPREVfSURf TUFYSU1VTSAtIDM7CisJZWxzZQorCQltYXggPSBBTURHUFVfVUNPREVfSURfTUFYSU1VTTsKIAot CWZvciAoaSA9IDA7IGkgPCBBTURHUFVfVUNPREVfSURfTUFYSU1VTTsgaSsrKSB7CisJZm9yIChp ID0gMDsgaSA8IG1heDsgaSsrKSB7CiAJCXVjb2RlID0gJmFkZXYtPmZpcm13YXJlLnVjb2RlW2ld OwogCQlpZiAodWNvZGUtPmZ3KSB7CiAJCQl1Y29kZS0+bWNfYWRkciA9IDA7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdWNvZGUuaCBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV91Y29kZS5oCmluZGV4IDE5YTU4NGMuLjJiMjEyYjAgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV91Y29kZS5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV91Y29kZS5oCkBAIC0xNzYsNCArMTc2 LDcgQEAgYm9vbCBhbWRncHVfdWNvZGVfaGRyX3ZlcnNpb24odW5pb24gYW1kZ3B1X2Zpcm13YXJl X2hlYWRlciAqaGRyLAogaW50IGFtZGdwdV91Y29kZV9pbml0X2JvKHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2KTsKIGludCBhbWRncHVfdWNvZGVfZmluaV9ibyhzdHJ1Y3QgYW1kZ3B1X2Rldmlj ZSAqYWRldik7CiAKK2VudW0gYW1kZ3B1X2Zpcm13YXJlX2xvYWRfdHlwZQorYW1kZ3B1X3Vjb2Rl X2dldF9sb2FkX3R5cGUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIGludCBsb2FkX3R5cGUp OworCiAjZW5kaWYKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Npay5j IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvY2lrLmMKaW5kZXggMzdiMDMzYS4uMTQ1MTU5 NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvY2lrLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvY2lrLmMKQEAgLTE3ODYsNiArMTc4Niw4IEBAIHN0YXRp YyBpbnQgY2lrX2NvbW1vbl9lYXJseV9pbml0KHZvaWQgKmhhbmRsZSkKIAkJcmV0dXJuIC1FSU5W QUw7CiAJfQogCisJYWRldi0+ZmlybXdhcmUubG9hZF90eXBlID0gYW1kZ3B1X3Vjb2RlX2dldF9s b2FkX3R5cGUoYWRldiwgYW1kZ3B1X2Z3X2xvYWRfdHlwZSk7CisKIAlhbWRncHVfZ2V0X3BjaWVf aW5mbyhhZGV2KTsKIAogCXJldHVybiAwOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvZ2Z4X3Y4XzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OF8w LmMKaW5kZXggZDA5NzVhYy4uYTUzZTM2YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvZ2Z4X3Y4XzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhf djhfMC5jCkBAIC0xMDQwLDcgKzEwNDAsNyBAQCBzdGF0aWMgaW50IGdmeF92OF8wX2luaXRfbWlj cm9jb2RlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCQl9CiAJfQogCi0JaWYgKGFkZXYt PmZpcm13YXJlLnNtdV9sb2FkKSB7CisJaWYgKGFkZXYtPmZpcm13YXJlLmxvYWRfdHlwZSA9PSBB TURHUFVfRldfTE9BRF9TTVUpIHsKIAkJaW5mbyA9ICZhZGV2LT5maXJtd2FyZS51Y29kZVtBTURH UFVfVUNPREVfSURfQ1BfUEZQXTsKIAkJaW5mby0+dWNvZGVfaWQgPSBBTURHUFVfVUNPREVfSURf Q1BfUEZQOwogCQlpbmZvLT5mdyA9IGFkZXYtPmdmeC5wZnBfZnc7CkBAIC00MjQ2LDcgKzQyNDYs NyBAQCBzdGF0aWMgaW50IGdmeF92OF8wX3JsY19yZXN1bWUoc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYpCiAJZ2Z4X3Y4XzBfaW5pdF9wZyhhZGV2KTsKIAogCWlmICghYWRldi0+cHBfZW5hYmxl ZCkgewotCQlpZiAoIWFkZXYtPmZpcm13YXJlLnNtdV9sb2FkKSB7CisJCWlmIChhZGV2LT5maXJt d2FyZS5sb2FkX3R5cGUgIT0gQU1ER1BVX0ZXX0xPQURfU01VKSB7CiAJCQkvKiBsZWdhY3kgcmxj IGZpcm13YXJlIGxvYWRpbmcgKi8KIAkJCXIgPSBnZnhfdjhfMF9ybGNfbG9hZF9taWNyb2NvZGUo YWRldik7CiAJCQlpZiAocikKQEAgLTUyNjYsNyArNTI2Niw3IEBAIHN0YXRpYyBpbnQgZ2Z4X3Y4 XzBfY3BfcmVzdW1lKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCQlnZnhfdjhfMF9lbmFi bGVfZ3VpX2lkbGVfaW50ZXJydXB0KGFkZXYsIGZhbHNlKTsKIAogCWlmICghYWRldi0+cHBfZW5h YmxlZCkgewotCQlpZiAoIWFkZXYtPmZpcm13YXJlLnNtdV9sb2FkKSB7CisJCWlmIChhZGV2LT5m aXJtd2FyZS5sb2FkX3R5cGUgIT0gQU1ER1BVX0ZXX0xPQURfU01VKSB7CiAJCQkvKiBsZWdhY3kg ZmlybXdhcmUgbG9hZGluZyAqLwogCQkJciA9IGdmeF92OF8wX2NwX2dmeF9sb2FkX21pY3JvY29k ZShhZGV2KTsKIAkJCWlmIChyKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvc2RtYV92Ml80LmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zZG1hX3YyXzQuYwpp bmRleCA3ZmM0ODU0Li5iY2MxNGVkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9zZG1hX3YyXzQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zZG1hX3Yy XzQuYwpAQCAtMTU4LDcgKzE1OCw3IEBAIHN0YXRpYyBpbnQgc2RtYV92Ml80X2luaXRfbWljcm9j b2RlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCQlpZiAoYWRldi0+c2RtYS5pbnN0YW5j ZVtpXS5mZWF0dXJlX3ZlcnNpb24gPj0gMjApCiAJCQlhZGV2LT5zZG1hLmluc3RhbmNlW2ldLmJ1 cnN0X25vcCA9IHRydWU7CiAKLQkJaWYgKGFkZXYtPmZpcm13YXJlLnNtdV9sb2FkKSB7CisJCWlm IChhZGV2LT5maXJtd2FyZS5sb2FkX3R5cGUgPT0gQU1ER1BVX0ZXX0xPQURfU01VKSB7CiAJCQlp bmZvID0gJmFkZXYtPmZpcm13YXJlLnVjb2RlW0FNREdQVV9VQ09ERV9JRF9TRE1BMCArIGldOwog CQkJaW5mby0+dWNvZGVfaWQgPSBBTURHUFVfVUNPREVfSURfU0RNQTAgKyBpOwogCQkJaW5mby0+ ZncgPSBhZGV2LT5zZG1hLmluc3RhbmNlW2ldLmZ3OwpAQCAtNTYyLDcgKzU2Miw3IEBAIHN0YXRp YyBpbnQgc2RtYV92Ml80X3N0YXJ0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCWludCBy OwogCiAJaWYgKCFhZGV2LT5wcF9lbmFibGVkKSB7Ci0JCWlmICghYWRldi0+ZmlybXdhcmUuc211 X2xvYWQpIHsKKwkJaWYgKGFkZXYtPmZpcm13YXJlLmxvYWRfdHlwZSAhPSBBTURHUFVfRldfTE9B RF9TTVUpIHsKIAkJCXIgPSBzZG1hX3YyXzRfbG9hZF9taWNyb2NvZGUoYWRldik7CiAJCQlpZiAo cikKIAkJCQlyZXR1cm4gcjsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L3NkbWFfdjNfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2RtYV92M18wLmMKaW5k ZXggMjdhODIzYS4uNDk3YzAwYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvc2RtYV92M18wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2RtYV92M18w LmMKQEAgLTMxMCw3ICszMTAsNyBAQCBzdGF0aWMgaW50IHNkbWFfdjNfMF9pbml0X21pY3JvY29k ZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAkJaWYgKGFkZXYtPnNkbWEuaW5zdGFuY2Vb aV0uZmVhdHVyZV92ZXJzaW9uID49IDIwKQogCQkJYWRldi0+c2RtYS5pbnN0YW5jZVtpXS5idXJz dF9ub3AgPSB0cnVlOwogCi0JCWlmIChhZGV2LT5maXJtd2FyZS5zbXVfbG9hZCkgeworCQlpZiAo YWRldi0+ZmlybXdhcmUubG9hZF90eXBlID09IEFNREdQVV9GV19MT0FEX1NNVSkgewogCQkJaW5m byA9ICZhZGV2LT5maXJtd2FyZS51Y29kZVtBTURHUFVfVUNPREVfSURfU0RNQTAgKyBpXTsKIAkJ CWluZm8tPnVjb2RlX2lkID0gQU1ER1BVX1VDT0RFX0lEX1NETUEwICsgaTsKIAkJCWluZm8tPmZ3 ID0gYWRldi0+c2RtYS5pbnN0YW5jZVtpXS5mdzsKQEAgLTc3MSw3ICs3NzEsNyBAQCBzdGF0aWMg aW50IHNkbWFfdjNfMF9zdGFydChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAlpbnQgciwg aTsKIAogCWlmICghYWRldi0+cHBfZW5hYmxlZCkgewotCQlpZiAoIWFkZXYtPmZpcm13YXJlLnNt dV9sb2FkKSB7CisJCWlmIChhZGV2LT5maXJtd2FyZS5sb2FkX3R5cGUgIT0gQU1ER1BVX0ZXX0xP QURfU01VKSB7CiAJCQlyID0gc2RtYV92M18wX2xvYWRfbWljcm9jb2RlKGFkZXYpOwogCQkJaWYg KHIpCiAJCQkJcmV0dXJuIHI7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS92aS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdmkuYwppbmRleCAzNWQ4ZjM2Li45 ZDg0MzRlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92aS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3ZpLmMKQEAgLTEwOTcsOCArMTA5Nyw4IEBAIHN0 YXRpYyBpbnQgdmlfY29tbW9uX2Vhcmx5X2luaXQodm9pZCAqaGFuZGxlKQogCQlyZXR1cm4gLUVJ TlZBTDsKIAl9CiAKLQlpZiAoYW1kZ3B1X3NtY19sb2FkX2Z3ICYmIHNtY19lbmFibGVkKQotCQlh ZGV2LT5maXJtd2FyZS5zbXVfbG9hZCA9IHRydWU7CisJLyogdmkgdXNlIHNtYyBsb2FkIGJ5IGRl ZmF1bHQgKi8KKwlhZGV2LT5maXJtd2FyZS5sb2FkX3R5cGUgPSBhbWRncHVfdWNvZGVfZ2V0X2xv YWRfdHlwZShhZGV2LCBhbWRncHVfZndfbG9hZF90eXBlKTsKIAogCWFtZGdwdV9nZXRfcGNpZV9p bmZvKGFkZXYpOwogCi0tIAoyLjUuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9h bWQtZ2Z4Cg==