From: Horace Chen Subject: [PATCH] drm/amdgpu: Add firmware VRAM reservation from vbios Date: Tue, 26 Sep 2017 18:11:50 +0800 Message-ID: <1506420710-25971-1-git-send-email-horace.chen@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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: Horace Chen IFZCSU9TIGhhcyBhIHN0cnVjdHVyZSBWUkFNX1VzYWdlQnlGaXJtd2FyZSB0byB0ZWxsIHRoZSBk cml2ZXIgdGhhdApWQklPUyBuZWVkIHJlc2VydmUgc29tZSBtZW1vcnkgYXQgdGhlIHNwZWNpZmll ZCBwbGFjZSBvbiB0aGUgVlJBTS4KIFNSLUlPViBuZWVkIHRvIGVuYWJsZSB0aGlzIGZlYXR1cmUg dG8gZXhjaGFuZ2UgZGF0YSBiZXR3ZWVuIFBGCmFuZCBWRi4KIFNvIGFkZCB0d28gbmV3IG1ldGhv ZCB0byBjcmVhdGUgYW5kIGZyZWUgYm8gYXQgdGhlIGV4YWN0IHBsYWNlLgogQW5kIGFkZCBhIG5l dyBBTURHUFVfR0VNX0NSRUFURV9WUkFNX1NQRUNJRklFRCBmbGFnIHRvIHRlbGwKZnVuY3Rpb24g dG8gc2V0IHRoZSB0dG1fcGxhY2VtZW50IHRvIHRoZSBleGFjdCBwbGFjZSB0byBhdm9pZApldmlj dGlvbiB3aGVucGlubm5pbmcuCgpTaWduZWQtb2ZmLWJ5OiBIb3JhY2UgQ2hlbiA8aG9yYWNlLmNo ZW5AYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaCAgICAg ICAgICB8ICAxNyArKysrKwogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2F0b21i aW9zLmMgfCAgMTggKysrKy0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZp Y2UuYyAgIHwgIDU4ICsrKysrKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfb2JqZWN0LmMgICB8IDEwOSArKysrKysrKysrKysrKysrKysrKysrKysrKy0KIGRyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9vYmplY3QuaCAgIHwgICA4ICsrCiBkcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdHRtLmMgICAgICB8ICAgOSArKysKIGRyaXZlcnMv Z3B1L2RybS9hbWQvaW5jbHVkZS9hdG9tYmlvcy5oICAgICAgIHwgICAxICsKIGluY2x1ZGUvdWFw aS9kcm0vYW1kZ3B1X2RybS5oICAgICAgICAgICAgICAgIHwgICAyICsKIDggZmlsZXMgY2hhbmdl ZCwgMjE5IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHUuaAppbmRleCBhNWIwYjY3Li5hYzUzZGJhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHUuaApAQCAtMTM4MCw2ICsxMzgwLDIxIEBAIHN0cnVjdCBhbWRncHVfYXRjcyB7CiB9 OwogCiAvKgorICogRmlybXdhcmUgVlJBTSByZXNlcnZhdGlvbgorICovCisjZGVmaW5lIEtCX1RP X0JZVEUoeCkgICAgICAgICAgICAgICAgICAgICAgICAgICAoKHgpIDw8IDEwKQorI2RlZmluZSBC WVRFX1RPX0tCKHgpICAgICAgICAgICAgICAgICAgICAgICAgICAgKCh4KSA+PiAxMCkKKworc3Ry dWN0IGFtZGdwdV9md192cmFtX3VzYWdlIHsKKwl1aW50MzJfdCBzdGFydF9hZGRyZXNzX2luX2ti OworCXVpbnQxNl90IHNpemVfaW5fa2I7CisJc3RydWN0IGFtZGdwdV9ibyAqcmVzZXJ2ZWRfYm87 CisJdm9sYXRpbGUgdWludDMyX3QgKnZhOworfTsKKworaW50IGFtZGdwdV9md19yZXNlcnZlX3Zy YW1faW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldik7CisKKy8qCiAgKiBDR1MKICAqLwog c3RydWN0IGNnc19kZXZpY2UgKmFtZGdwdV9jZ3NfY3JlYXRlX2RldmljZShzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldik7CkBAIC0xNTg4LDYgKzE2MDMsOCBAQCBzdHJ1Y3QgYW1kZ3B1X2Rldmlj ZSB7CiAJc3RydWN0IGRlbGF5ZWRfd29yayAgICAgbGF0ZV9pbml0X3dvcms7CiAKIAlzdHJ1Y3Qg YW1kZ3B1X3ZpcnQJdmlydDsKKwkvKiBmaXJtd2FyZSBWUkFNIHJlc2VydmF0aW9uICovCisJc3Ry dWN0IGFtZGdwdV9md192cmFtX3VzYWdlIGZ3X3ZyYW1fdXNhZ2U7CiAKIAkvKiBsaW5rIGFsbCBz aGFkb3cgYm8gKi8KIAlzdHJ1Y3QgbGlzdF9oZWFkICAgICAgICAgICAgICAgIHNoYWRvd19saXN0 OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2F0b21iaW9z LmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfYXRvbWJpb3MuYwppbmRleCBj ZTQ0MzU4Li41NmJmZGRmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfYXRvbWJpb3MuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVf YXRvbWJpb3MuYwpAQCAtMTgwNyw2ICsxODA3LDggQEAgaW50IGFtZGdwdV9hdG9tYmlvc19hbGxv Y2F0ZV9mYl9zY3JhdGNoKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCXVpbnQxNl90IGRh dGFfb2Zmc2V0OwogCWludCB1c2FnZV9ieXRlcyA9IDA7CiAJc3RydWN0IF9BVE9NX1ZSQU1fVVNB R0VfQllfRklSTVdBUkUgKmZpcm13YXJlX3VzYWdlOworCXVpbnQzMl90IHN0YXJ0X2FkZHI7CisJ dWludDE2X3Qgc2l6ZTsKIAogCWlmIChhbWRncHVfYXRvbV9wYXJzZV9kYXRhX2hlYWRlcihjdHgs IGluZGV4LCBOVUxMLCBOVUxMLCBOVUxMLCAmZGF0YV9vZmZzZXQpKSB7CiAJCWZpcm13YXJlX3Vz YWdlID0gKHN0cnVjdCBfQVRPTV9WUkFNX1VTQUdFX0JZX0ZJUk1XQVJFICopKGN0eC0+YmlvcyAr IGRhdGFfb2Zmc2V0KTsKQEAgLTE4MTUsNyArMTgxNywyMSBAQCBpbnQgYW1kZ3B1X2F0b21iaW9z X2FsbG9jYXRlX2ZiX3NjcmF0Y2goc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJCQkgIGxl MzJfdG9fY3B1KGZpcm13YXJlX3VzYWdlLT5hc0Zpcm13YXJlVnJhbVJlc2VydmVJbmZvWzBdLnVs U3RhcnRBZGRyVXNlZEJ5RmlybXdhcmUpLAogCQkJICBsZTE2X3RvX2NwdShmaXJtd2FyZV91c2Fn ZS0+YXNGaXJtd2FyZVZyYW1SZXNlcnZlSW5mb1swXS51c0Zpcm13YXJlVXNlSW5LYikpOwogCi0J CXVzYWdlX2J5dGVzID0gbGUxNl90b19jcHUoZmlybXdhcmVfdXNhZ2UtPmFzRmlybXdhcmVWcmFt UmVzZXJ2ZUluZm9bMF0udXNGaXJtd2FyZVVzZUluS2IpICogMTAyNDsKKwkJc3RhcnRfYWRkciA9 IGZpcm13YXJlX3VzYWdlLT5hc0Zpcm13YXJlVnJhbVJlc2VydmVJbmZvWzBdLnVsU3RhcnRBZGRy VXNlZEJ5RmlybXdhcmU7CisJCXNpemUgPSBmaXJtd2FyZV91c2FnZS0+YXNGaXJtd2FyZVZyYW1S ZXNlcnZlSW5mb1swXS51c0Zpcm13YXJlVXNlSW5LYjsKKworCQlpZiAoKHVpbnQzMl90KShzdGFy dF9hZGRyICYgQVRPTV9WUkFNX09QRVJBVElPTl9GTEFHU19NQVNLKSA9PQorCQkJKHVpbnQzMl90 KShBVE9NX1ZSQU1fQkxPQ0tfU1JJT1ZfTVNHX1NIQVJFX1JFU0VSVkFUSU9OIDw8CisJCQlBVE9N X1ZSQU1fT1BFUkFUSU9OX0ZMQUdTX1NISUZUKSkgeworCQkJLyogRmlybXdhcmUgcmVxdWVzdCBW UkFNIHJlc2VydmF0aW9uIGZvciBTUi1JT1YgKi8KKwkJCWFkZXYtPmZ3X3ZyYW1fdXNhZ2Uuc3Rh cnRfYWRkcmVzc19pbl9rYiA9CisJCQkgICAgc3RhcnRfYWRkciAmICh+QVRPTV9WUkFNX09QRVJB VElPTl9GTEFHU19NQVNLKTsKKwkJCWFkZXYtPmZ3X3ZyYW1fdXNhZ2Uuc2l6ZV9pbl9rYiA9IHNp emU7CisJCQkvKiBVc2UgdGhlIGRlZmF1bHQgc2NyYXRjaCBzaXplICovCisJCQl1c2FnZV9ieXRl cyA9IDA7CisJCX0gZWxzZSB7CisJCQl1c2FnZV9ieXRlcyA9IGxlMTZfdG9fY3B1KGZpcm13YXJl X3VzYWdlLT5hc0Zpcm13YXJlVnJhbVJlc2VydmVJbmZvWzBdLnVzRmlybXdhcmVVc2VJbktiKSAq IDEwMjQ7CisJCX0KIAl9CiAJY3R4LT5zY3JhdGNoX3NpemVfYnl0ZXMgPSAwOwogCWlmICh1c2Fn ZV9ieXRlcyA9PSAwKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1k Z3B1X2RldmljZS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5j CmluZGV4IGE4NmQ4NTYuLjUxYmVlNjggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV9kZXZpY2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfZGV2aWNlLmMKQEAgLTY1OCw2ICs2NTgsNjIgQEAgdm9pZCBhbWRncHVfZ2FydF9sb2Nh dGlvbihzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgc3RydWN0IGFtZGdwdV9tYyAqbWMpCiB9 CiAKIC8qCisgKiBGaXJtd2FyZSBSZXNlcnZhdGlvbiBmdW5jdGlvbgorICovCisvKioKKyAqIGFt ZGdwdV9md19yZXNlcnZlX3ZyYW1fZmluaSAtIGZyZWUgZncgcmVzZXJ2ZWQgdnJhbQorICoKKyAq IEBhZGV2OiBhbWRncHVfZGV2aWNlIHBvaW50ZXIKKyAqCisgKiBmcmVlIGZ3IHJlc2VydmVkIHZy YW0gaWYgaXQgaXMgcmVzZXJ2ZWQuCisgKi8KK3ZvaWQgYW1kZ3B1X2Z3X3Jlc2VydmVfdnJhbV9m aW5pKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQoreworCisJaWYgKGFkZXYtPmZ3X3ZyYW1f dXNhZ2UucmVzZXJ2ZWRfYm8gPT0gTlVMTCkKKwkJcmV0dXJuOworCisJYW1kZ3B1X2JvX2ZyZWVf dnJhbV9zcGVjaWZpZWQoJmFkZXYtPmZ3X3ZyYW1fdXNhZ2UucmVzZXJ2ZWRfYm8sIE5VTEwsCisJ CSh2b2lkICoqKSZhZGV2LT5md192cmFtX3VzYWdlLnZhKTsKKwlhZGV2LT5md192cmFtX3VzYWdl LnJlc2VydmVkX2JvID0gTlVMTDsKK30KKworLyoqCisgKiBhbWRncHVfZndfcmVzZXJ2ZV92cmFt X2ZpbmkgLSBjcmVhdGUgYm8gdnJhbSByZXNlcnZhdGlvbiBmcm9tIGZ3CisgKgorICogQGFkZXY6 IGFtZGdwdV9kZXZpY2UgcG9pbnRlcgorICoKKyAqIGNyZWF0ZSBibyB2cmFtIHJlc2VydmF0aW9u IGZyb20gZncuCisgKi8KK2ludCBhbWRncHVfZndfcmVzZXJ2ZV92cmFtX2luaXQoc3RydWN0IGFt ZGdwdV9kZXZpY2UgKmFkZXYpCit7CisJaW50IHIgPSAwOworCXU2NCBncHVfYWRkcjsKKwl1NjQg dnJhbV9zaXplID0gYWRldi0+bWMudmlzaWJsZV92cmFtX3NpemU7CisKKwlhZGV2LT5md192cmFt X3VzYWdlLnZhID0gTlVMTDsKKwlhZGV2LT5md192cmFtX3VzYWdlLnJlc2VydmVkX2JvID0gTlVM TDsKKworCWlmIChhZGV2LT5md192cmFtX3VzYWdlLnNpemVfaW5fa2IgPiAwICYmCisJCUtCX1RP X0JZVEUoKHU2NClhZGV2LT5md192cmFtX3VzYWdlLnNpemVfaW5fa2IpIDw9IHZyYW1fc2l6ZSkg eworCisJCXIgPSBhbWRncHVfYm9fY3JlYXRlX3ZyYW1fc3BlY2lmaWVkKGFkZXYsCisJCQkgICAg S0JfVE9fQllURSgodTY0KWFkZXYtPmZ3X3ZyYW1fdXNhZ2Uuc3RhcnRfYWRkcmVzc19pbl9rYiks CisJCQkgICAgS0JfVE9fQllURSgodTY0KWFkZXYtPmZ3X3ZyYW1fdXNhZ2Uuc2l6ZV9pbl9rYiks CisJCQkgICAgUEFHRV9TSVpFLAorCQkJICAgIEFNREdQVV9HRU1fQ1JFQVRFX0NQVV9BQ0NFU1Nf UkVRVUlSRUQgfAorCQkJICAgIEFNREdQVV9HRU1fQ1JFQVRFX1ZSQU1fQ09OVElHVU9VUywKKwkJ CSAgICAmYWRldi0+ZndfdnJhbV91c2FnZS5yZXNlcnZlZF9ibywKKwkJCSAgICAmZ3B1X2FkZHIs ICh2b2lkICoqKSZhZGV2LT5md192cmFtX3VzYWdlLnZhKTsKKwkJaWYgKHIpCisJCQlkZXZfaW5m byhhZGV2LT5kZXYsICJSZXNlcnZlIFZSQU0gZm9yIGZpcm13YXJlIGZhaWxlZCIpOworCX0KKwor CXJldHVybiByOworfQorCisKKy8qCiAgKiBHUFUgaGVscGVycyBmdW5jdGlvbi4KICAqLwogLyoq CkBAIC0yMDU1LDYgKzIxMTEsNyBAQCBpbnQgYW1kZ3B1X2RldmljZV9pbml0KHN0cnVjdCBhbWRn cHVfZGV2aWNlICphZGV2LAogCWFkZXYtPnZtX21hbmFnZXIudm1fcHRlX251bV9yaW5ncyA9IDA7 CiAJYWRldi0+Z2FydC5nYXJ0X2Z1bmNzID0gTlVMTDsKIAlhZGV2LT5mZW5jZV9jb250ZXh0ID0g ZG1hX2ZlbmNlX2NvbnRleHRfYWxsb2MoQU1ER1BVX01BWF9SSU5HUyk7CisJYWRldi0+ZndfdnJh bV91c2FnZS5zaXplX2luX2tiID0gMDsKIAogCWFkZXYtPnNtY19ycmVnID0gJmFtZGdwdV9pbnZh bGlkX3JyZWc7CiAJYWRldi0+c21jX3dyZWcgPSAmYW1kZ3B1X2ludmFsaWRfd3JlZzsKQEAgLTIz MzEsNiArMjM4OCw3IEBAIHZvaWQgYW1kZ3B1X2RldmljZV9maW5pKHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2KQogCS8qIGV2aWN0IHZyYW0gbWVtb3J5ICovCiAJYW1kZ3B1X2JvX2V2aWN0X3Zy YW0oYWRldik7CiAJYW1kZ3B1X2liX3Bvb2xfZmluaShhZGV2KTsKKwlhbWRncHVfZndfcmVzZXJ2 ZV92cmFtX2ZpbmkoYWRldik7CiAJYW1kZ3B1X2ZlbmNlX2RyaXZlcl9maW5pKGFkZXYpOwogCWFt ZGdwdV9mYmRldl9maW5pKGFkZXYpOwogCXIgPSBhbWRncHVfZmluaShhZGV2KTsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9vYmplY3QuYyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9vYmplY3QuYwppbmRleCA2OTgyYmFlLi44NjAyNzg0 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfb2JqZWN0LmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X29iamVjdC5jCkBAIC04Nyw2 ICs4NywxNCBAQCB2b2lkIGFtZGdwdV90dG1fcGxhY2VtZW50X2Zyb21fZG9tYWluKHN0cnVjdCBh bWRncHVfYm8gKmFibywgdTMyIGRvbWFpbikKIAogCQlpZiAoZmxhZ3MgJiBBTURHUFVfR0VNX0NS RUFURV9WUkFNX0NPTlRJR1VPVVMpCiAJCQlwbGFjZXNbY10uZmxhZ3MgfD0gVFRNX1BMX0ZMQUdf Q09OVElHVU9VUzsKKworCQlpZiAoZmxhZ3MgJiBBTURHUFVfR0VNX0NSRUFURV9WUkFNX1NQRUNJ RklFRCkgeworCQkJLyogIHNwZWNpZmllZCB2cmFtIG11c3QgYmUgY29udGlndW91cyAqLworCQkJ cGxhY2VzW2NdLmZsYWdzIHw9IFRUTV9QTF9GTEFHX0NPTlRJR1VPVVM7CisJCQlwbGFjZXNbY10u ZnBmbiA9IGFiby0+c3RhcnRfYWRkcmVzcyA+PiBQQUdFX1NISUZUOworCQkJcGxhY2VzW2NdLmxw Zm4gPQorCQkJICAgIChhYm8tPnN0YXJ0X2FkZHJlc3MgKyBhYm8tPmdlbV9iYXNlLnNpemUpID4+ IFBBR0VfU0hJRlQ7CisJCX0KIAkJYysrOwogCX0KIApAQCAtMjg0LDYgKzI5Miw3IEBAIHZvaWQg YW1kZ3B1X2JvX2ZyZWVfa2VybmVsKHN0cnVjdCBhbWRncHVfYm8gKipibywgdTY0ICpncHVfYWRk ciwKIH0KIAogc3RhdGljIGludCBhbWRncHVfYm9fZG9fY3JlYXRlKHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2LAorCQkJICAgICAgIHU2NCBzdGFydF9hZGRyLAogCQkJICAgICAgIHVuc2lnbmVk IGxvbmcgc2l6ZSwgaW50IGJ5dGVfYWxpZ24sCiAJCQkgICAgICAgYm9vbCBrZXJuZWwsIHUzMiBk b21haW4sIHU2NCBmbGFncywKIAkJCSAgICAgICBzdHJ1Y3Qgc2dfdGFibGUgKnNnLApAQCAtMzAw LDYgKzMwOSw3IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X2JvX2RvX2NyZWF0ZShzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldiwKIAogCXBhZ2VfYWxpZ24gPSByb3VuZHVwKGJ5dGVfYWxpZ24sIFBBR0Vf U0laRSkgPj4gUEFHRV9TSElGVDsKIAlzaXplID0gQUxJR04oc2l6ZSwgUEFHRV9TSVpFKTsKKwlz dGFydF9hZGRyID0gQUxJR04oc3RhcnRfYWRkciwgUEFHRV9TSVpFKTsKIAogCWlmIChrZXJuZWwp IHsKIAkJdHlwZSA9IHR0bV9ib190eXBlX2tlcm5lbDsKQEAgLTMzMyw2ICszNDMsNyBAQCBzdGF0 aWMgaW50IGFtZGdwdV9ib19kb19jcmVhdGUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJ aWYgKCFrZXJuZWwgJiYgYm8tPmFsbG93ZWRfZG9tYWlucyA9PSBBTURHUFVfR0VNX0RPTUFJTl9W UkFNKQogCQliby0+YWxsb3dlZF9kb21haW5zIHw9IEFNREdQVV9HRU1fRE9NQUlOX0dUVDsKIAor CWJvLT5zdGFydF9hZGRyZXNzID0gc3RhcnRfYWRkcjsKIAliby0+ZmxhZ3MgPSBmbGFnczsKIAog I2lmZGVmIENPTkZJR19YODZfMzIKQEAgLTQxOCw2ICs0MjksMTAwIEBAIHN0YXRpYyBpbnQgYW1k Z3B1X2JvX2RvX2NyZWF0ZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAlyZXR1cm4gcjsK IH0KIAorLyoqCisgKiBhbWRncHVfYm9fY3JlYXRlX3ZyYW1fc3BlY2lmaWVkIC0KKyAqICAgIGNy ZWF0ZSBCTyBhdCB0aGUgc3BlY2lmaWVkIHBsYWNlIG9uIHRoZSBWUkFNLgorICoKKyAqIEBhZGV2 OiBhbWRncHUgZGV2aWNlIG9iamVjdAorICogQHN0YXJ0X2FkZHI6IHN0YXJ0IG9mZnNldCBvZiB0 aGUgbmV3IEJPCisgKiBAc2l6ZTogc2l6ZSBmb3IgdGhlIG5ldyBCTworICogQGJ5dGVfYWxpZ246 IGFsaWdubWVudCBmb3IgdGhlIG5ldyBCTworICogQGZsYWdzOiBhZGRpdGlvbiBmbGFncyBmb3Ig dGhlIEJPCisgKiBAYm9fcHRyOiByZXN1bHRpbmcgQk8KKyAqIEBncHVfYWRkcjogR1BVIGFkZHIg b2YgdGhlIHBpbm5lZCBCTworICogQGNwdV9hZGRyOiBvcHRpb25hbCBDUFUgYWRkcmVzcyBtYXBw aW5nCisgKgorICogQWxsb2NhdGVzIGFuZCBwaW5zIGEgQk8gYXQgdGhlIHNwZWNpZmllZCBwbGFj ZSBvbiB0aGUgVlJBTS4KKyAqCisgKiBSZXR1cm5zIDAgb24gc3VjY2VzcywgbmVnYXRpdmUgZXJy b3IgY29kZSBvdGhlcndpc2UuCisgKi8KK2ludCBhbWRncHVfYm9fY3JlYXRlX3ZyYW1fc3BlY2lm aWVkKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAorCQkgICAgIHU2NCBzdGFydF9hZGRyLCB1 bnNpZ25lZCBsb25nIHNpemUsIGludCBieXRlX2FsaWduLAorCQkgICAgIHU2NCBmbGFncywgc3Ry dWN0IGFtZGdwdV9ibyAqKmJvX3B0ciwKKwkJICAgICB1NjQgKmdwdV9hZGRyLCB2b2lkICoqY3B1 X2FkZHIpCit7CisJaW50IHI7CisJLyogc3BlY2lmaWVkIG1lbW9yeSBtdXN0IGJlIGluIGNvbnRp Z3VvdXMqLworCWZsYWdzIHw9IEFNREdQVV9HRU1fQ1JFQVRFX1ZSQU1fQ09OVElHVU9VUzsKKwlm bGFncyB8PSBBTURHUFVfR0VNX0NSRUFURV9WUkFNX1NQRUNJRklFRDsKKworCXIgPSBhbWRncHVf Ym9fZG9fY3JlYXRlKGFkZXYsIHN0YXJ0X2FkZHIsIHNpemUsIGJ5dGVfYWxpZ24sIHRydWUsCisJ CUFNREdQVV9HRU1fRE9NQUlOX1ZSQU0sIGZsYWdzLCBOVUxMLCBOVUxMLCAwLCBib19wdHIpOwor CWlmIChyKQorCQlyZXR1cm4gcjsKKworCXIgPSBhbWRncHVfYm9fcmVzZXJ2ZSgqYm9fcHRyLCBm YWxzZSk7CisJaWYgKHIpCisJCWdvdG8gZXJyb3JfcmVzZXJ2ZTsKKwlyID0gYW1kZ3B1X2JvX3Bp bl9yZXN0cmljdGVkKCpib19wdHIsCisJCUFNREdQVV9HRU1fRE9NQUlOX1ZSQU0sIHN0YXJ0X2Fk ZHIsIChzdGFydF9hZGRyICsgc2l6ZSksCisJCWdwdV9hZGRyKTsKKwlpZiAocikKKwkJZ290byBl cnJvcl9waW47CisJaWYgKGNwdV9hZGRyKSB7CisJCXIgPSBhbWRncHVfYm9fa21hcCgqYm9fcHRy LAorCQkJCQljcHVfYWRkcik7CisJCWlmIChyKQorCQkJZ290byBlcnJvcl9rbWFwOworCX0KKwor CWFtZGdwdV9ib191bnJlc2VydmUoKmJvX3B0cik7CisKKwlyZXR1cm4gcjsKK2Vycm9yX2ttYXA6 CisJYW1kZ3B1X2JvX3VucGluKCpib19wdHIpOworZXJyb3JfcGluOgorCWFtZGdwdV9ib191bnJl c2VydmUoKmJvX3B0cik7CitlcnJvcl9yZXNlcnZlOgorCWFtZGdwdV9ib191bnJlZihib19wdHIp OworCWlmIChjcHVfYWRkcikKKwkJKmNwdV9hZGRyID0gTlVMTDsKKwlpZiAoZ3B1X2FkZHIpCisJ CSpncHVfYWRkciA9IDA7CisJcmV0dXJuIHI7Cit9CisKKy8qKgorICogYW1kZ3B1X2JvX2ZyZWVf dnJhbV9zcGVjaWZpZWQgLSBmcmVlIEJPIGZvciBzcGVjaWZpZWQgdnJhbQorICoKKyAqIEBibzog YW1kZ3B1IEJPIHRvIGZyZWUKKyAqIEBncHVfYWRkciA6IGdwdSBhZGRyZXNzCisgKiBAY3B1X2Fk ZHIgOiBjcHUgYWRkcmVzcyBpZiBtYXBwZWQKKyAqCisgKiB1bm1hcHMgYW5kIHVucGluIGEgQk8g Zm9yIHNwZWNpZmllZCB2cmFtLgorICovCit2b2lkIGFtZGdwdV9ib19mcmVlX3ZyYW1fc3BlY2lm aWVkKHN0cnVjdCBhbWRncHVfYm8gKipibywgdTY0ICpncHVfYWRkciwKKwkJCSAgIHZvaWQgKipj cHVfYWRkcikKK3sKKwlpZiAoKmJvID09IE5VTEwpCisJCXJldHVybjsKKworCWlmIChsaWtlbHko YW1kZ3B1X2JvX3Jlc2VydmUoKmJvLCB0cnVlKSA9PSAwKSkgeworCQlpZiAoY3B1X2FkZHIpCisJ CQlhbWRncHVfYm9fa3VubWFwKCpibyk7CisJCWFtZGdwdV9ib191bnBpbigqYm8pOworCQlhbWRn cHVfYm9fdW5yZXNlcnZlKCpibyk7CisJfQorCWFtZGdwdV9ib191bnJlZihibyk7CisKKwlpZiAo Z3B1X2FkZHIpCisJCSpncHVfYWRkciA9IDA7CisKKwlpZiAoY3B1X2FkZHIpCisJCSpjcHVfYWRk ciA9IE5VTEw7Cit9CisKKwogc3RhdGljIGludCBhbWRncHVfYm9fY3JlYXRlX3NoYWRvdyhzdHJ1 Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAkJCQkgICB1bnNpZ25lZCBsb25nIHNpemUsIGludCBi eXRlX2FsaWduLAogCQkJCSAgIHN0cnVjdCBhbWRncHVfYm8gKmJvKQpAQCAtNDI3LDcgKzUzMiw3 IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X2JvX2NyZWF0ZV9zaGFkb3coc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYsCiAJaWYgKGJvLT5zaGFkb3cpCiAJCXJldHVybiAwOwogCi0JciA9IGFtZGdwdV9i b19kb19jcmVhdGUoYWRldiwgc2l6ZSwgYnl0ZV9hbGlnbiwgdHJ1ZSwKKwlyID0gYW1kZ3B1X2Jv X2RvX2NyZWF0ZShhZGV2LCAwLCBzaXplLCBieXRlX2FsaWduLCB0cnVlLAogCQkJCUFNREdQVV9H RU1fRE9NQUlOX0dUVCwKIAkJCQlBTURHUFVfR0VNX0NSRUFURV9DUFVfR1RUX1VTV0MgfAogCQkJ CUFNREdQVV9HRU1fQ1JFQVRFX1NIQURPVywKQEAgLTQ1Nyw3ICs1NjIsNyBAQCBpbnQgYW1kZ3B1 X2JvX2NyZWF0ZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAl1aW50NjRfdCBwYXJlbnRf ZmxhZ3MgPSBmbGFncyAmIH5BTURHUFVfR0VNX0NSRUFURV9TSEFET1c7CiAJaW50IHI7CiAKLQly ID0gYW1kZ3B1X2JvX2RvX2NyZWF0ZShhZGV2LCBzaXplLCBieXRlX2FsaWduLCBrZXJuZWwsIGRv bWFpbiwKKwlyID0gYW1kZ3B1X2JvX2RvX2NyZWF0ZShhZGV2LCAwLCBzaXplLCBieXRlX2FsaWdu LCBrZXJuZWwsIGRvbWFpbiwKIAkJCQlwYXJlbnRfZmxhZ3MsIHNnLCByZXN2LCBpbml0X3ZhbHVl LCBib19wdHIpOwogCWlmIChyKQogCQlyZXR1cm4gcjsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9vYmplY3QuaCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdV9vYmplY3QuaAppbmRleCAzOWI2YmY2Li44OGYyYzVhIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfb2JqZWN0LmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X29iamVjdC5oCkBAIC03OCw2ICs3OCw4IEBAIHN0cnVj dCBhbWRncHVfYm8gewogCXZvaWQJCQkJKm1ldGFkYXRhOwogCXUzMgkJCQltZXRhZGF0YV9zaXpl OwogCXVuc2lnbmVkCQkJcHJpbWVfc2hhcmVkX2NvdW50OworCS8qIHNwZWNpZmllZCBWUkFNIHBs YWNlICovCisJdTY0CQkJCXN0YXJ0X2FkZHJlc3M7CiAJLyogbGlzdCBvZiBhbGwgdmlydHVhbCBh ZGRyZXNzIHRvIHdoaWNoIHRoaXMgYm8gaXMgYXNzb2NpYXRlZCB0byAqLwogCXN0cnVjdCBsaXN0 X2hlYWQJCXZhOwogCS8qIENvbnN0YW50IGFmdGVyIGluaXRpYWxpemF0aW9uICovCkBAIC0yMDUs NiArMjA3LDEyIEBAIGludCBhbWRncHVfYm9fY3JlYXRlX2tlcm5lbChzdHJ1Y3QgYW1kZ3B1X2Rl dmljZSAqYWRldiwKIAkJCSAgICB1NjQgKmdwdV9hZGRyLCB2b2lkICoqY3B1X2FkZHIpOwogdm9p ZCBhbWRncHVfYm9fZnJlZV9rZXJuZWwoc3RydWN0IGFtZGdwdV9ibyAqKmJvLCB1NjQgKmdwdV9h ZGRyLAogCQkJICAgdm9pZCAqKmNwdV9hZGRyKTsKK2ludCBhbWRncHVfYm9fY3JlYXRlX3ZyYW1f c3BlY2lmaWVkKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAorCQkgICAgIHU2NCBzdGFydF9h ZGRyLCB1bnNpZ25lZCBsb25nIHNpemUsIGludCBieXRlX2FsaWduLAorCQkgICAgIHU2NCBmbGFn cywgc3RydWN0IGFtZGdwdV9ibyAqKmJvX3B0ciwKKwkJICAgICB1NjQgKmdwdV9hZGRyLCB2b2lk ICoqY3B1X2FkZHIpOwordm9pZCBhbWRncHVfYm9fZnJlZV92cmFtX3NwZWNpZmllZChzdHJ1Y3Qg YW1kZ3B1X2JvICoqYm8sIHU2NCAqZ3B1X2FkZHIsCisJCQkgICB2b2lkICoqY3B1X2FkZHIpOwog aW50IGFtZGdwdV9ib19rbWFwKHN0cnVjdCBhbWRncHVfYm8gKmJvLCB2b2lkICoqcHRyKTsKIHZv aWQgKmFtZGdwdV9ib19rcHRyKHN0cnVjdCBhbWRncHVfYm8gKmJvKTsKIHZvaWQgYW1kZ3B1X2Jv X2t1bm1hcChzdHJ1Y3QgYW1kZ3B1X2JvICpibyk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9hbWRncHVfdHRtLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfdHRtLmMKaW5kZXggMTA4NmYwMy4uYTUyNTNjZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3R0bS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV90dG0uYwpAQCAtMTI1Niw2ICsxMjU2LDE1IEBAIGludCBhbWRncHVfdHRt X2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJLyogQ2hhbmdlIHRoZSBzaXplIGhl cmUgaW5zdGVhZCBvZiB0aGUgaW5pdCBhYm92ZSBzbyBvbmx5IGxwZm4gaXMgYWZmZWN0ZWQgKi8K IAlhbWRncHVfdHRtX3NldF9hY3RpdmVfdnJhbV9zaXplKGFkZXYsIGFkZXYtPm1jLnZpc2libGVf dnJhbV9zaXplKTsKIAorCS8qCisJICpUaGUgcmVzZXJ2ZWQgdnJhbSBmb3IgZmlybXdhcmUgbXVz dCBiZSBwaW5uZWQgdG8gdGhlIHNwZWNpZmllZAorCSAqcGxhY2Ugb24gdGhlIFZSQU0sIHNvIHJl c2VydmUgaXQgZWFybHkuCisJICovCisJciA9IGFtZGdwdV9md19yZXNlcnZlX3ZyYW1faW5pdChh ZGV2KTsKKwlpZiAocikgeworCQlyZXR1cm4gcjsKKwl9CisKIAlyID0gYW1kZ3B1X2JvX2NyZWF0 ZV9rZXJuZWwoYWRldiwgYWRldi0+bWMuc3RvbGVuX3NpemUsIFBBR0VfU0laRSwKIAkJCQkgICAg QU1ER1BVX0dFTV9ET01BSU5fVlJBTSwKIAkJCQkgICAgJmFkZXYtPnN0b2xlbl92Z2FfbWVtb3J5 LApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9pbmNsdWRlL2F0b21iaW9zLmggYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2luY2x1ZGUvYXRvbWJpb3MuaAppbmRleCAxODFhMmMzLi5mNjk2 YmJiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2luY2x1ZGUvYXRvbWJpb3MuaAor KysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2luY2x1ZGUvYXRvbWJpb3MuaApAQCAtNDI5Miw2ICs0 MjkyLDcgQEAgdHlwZWRlZiBzdHJ1Y3QgX0FUT01fRFBDRF9JTkZPCiAjZGVmaW5lIEFUT01fVlJB TV9PUEVSQVRJT05fRkxBR1NfU0hJRlQgICAgICAgIDMwCiAjZGVmaW5lICAgQVRPTV9WUkFNX0JM T0NLX05FRURTX05PX1JFU0VSVkFUSU9OICAgMHgxCiAjZGVmaW5lICAgQVRPTV9WUkFNX0JMT0NL X05FRURTX1JFU0VSVkFUSU9OICAgICAgMHgwCisjZGVmaW5lICAgQVRPTV9WUkFNX0JMT0NLX1NS SU9WX01TR19TSEFSRV9SRVNFUlZBVElPTiAweDIKIAogLyoqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqLwogLy8gU3RydWN0dXJlIHVzZWQgaW4gVlJBTV9Vc2FnZUJ5RmlybXdhcmVUYWJsZQpkaWZm IC0tZ2l0IGEvaW5jbHVkZS91YXBpL2RybS9hbWRncHVfZHJtLmggYi9pbmNsdWRlL3VhcGkvZHJt L2FtZGdwdV9kcm0uaAppbmRleCA5ZjViZDk3Li44YzIxM2YwIDEwMDY0NAotLS0gYS9pbmNsdWRl L3VhcGkvZHJtL2FtZGdwdV9kcm0uaAorKysgYi9pbmNsdWRlL3VhcGkvZHJtL2FtZGdwdV9kcm0u aApAQCAtOTEsNiArOTEsOCBAQCBleHRlcm4gIkMiIHsKICNkZWZpbmUgQU1ER1BVX0dFTV9DUkVB VEVfVlJBTV9DT05USUdVT1VTCSgxIDw8IDUpCiAvKiBGbGFnIHRoYXQgQk8gaXMgYWx3YXlzIHZh bGlkIGluIHRoaXMgVk0gKi8KICNkZWZpbmUgQU1ER1BVX0dFTV9DUkVBVEVfVk1fQUxXQVlTX1ZB TElECSgxIDw8IDYpCisvKiBGbGFnIHRoYXQgYWxsb2NhdGluZyB0aGUgQk8gYXQgdGhlIHNwZWNp ZmllZCBwbGFjZSBvbiBWUkFNKi8KKyNkZWZpbmUgQU1ER1BVX0dFTV9DUkVBVEVfVlJBTV9TUEVD SUZJRUQJKDEgPDwgNykKIAogc3RydWN0IGRybV9hbWRncHVfZ2VtX2NyZWF0ZV9pbiAgewogCS8q KiB0aGUgcmVxdWVzdGVkIG1lbW9yeSBzaXplICovCi0tIAoyLjcuNAoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1k LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==