From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" Subject: [PATCH 4/5] drm/amdgpu: move GART recovery into GTT manager Date: Fri, 20 Oct 2017 11:20:35 +0200 Message-ID: <20171020092036.11145-4-deathsimple@vodafone.de> References: <20171020092036.11145-1-deathsimple@vodafone.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171020092036.11145-1-deathsimple-ANTagKRnAhcb1SvskN2V4Q@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 RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKVGhlIEdU VCBtYW5hZ2VyIGhhbmRsZXMgdGhlIEdBUlQgYWRkcmVzcyBzcGFjZSBhbnl3YXksIHNvIGl0IGlz CmNvbXBsZXRlbHkgcG9pbnRsZXNzIHRvIGtlZXAgdGhlIHNhbWUgaW5mb3JtYXRpb24gYXJvdW5k IHR3aWNlLgoKU2lnbmVkLW9mZi1ieTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5p Z0BhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oICAgICAg ICAgfCAgMyAtLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jICB8 ICA4ICsrLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZ3R0X21nci5jIHwg NTMgKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdV90dG0uYyAgICAgfCA1MSArKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIGRy aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV90dG0uaCAgICAgfCAgMyArLQogNSBmaWxl cyBjaGFuZ2VkLCA1OSBpbnNlcnRpb25zKCspLCA1OSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaCBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdS5oCmluZGV4IDc3NGVkYzFhMzExOC4uYmYzNDA3NmVlZGNhIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaAorKysgYi9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaApAQCAtMTYzMSw5ICsxNjMxLDYgQEAgc3RydWN0 IGFtZGdwdV9kZXZpY2UgewogCS8qIGxpbmsgYWxsIHNoYWRvdyBibyAqLwogCXN0cnVjdCBsaXN0 X2hlYWQgICAgICAgICAgICAgICAgc2hhZG93X2xpc3Q7CiAJc3RydWN0IG11dGV4ICAgICAgICAg ICAgICAgICAgICBzaGFkb3dfbGlzdF9sb2NrOwotCS8qIGxpbmsgYWxsIGd0dCAqLwotCXNwaW5s b2NrX3QJCQlndHRfbGlzdF9sb2NrOwotCXN0cnVjdCBsaXN0X2hlYWQgICAgICAgICAgICAgICAg Z3R0X2xpc3Q7CiAJLyoga2VlcCBhbiBscnUgbGlzdCBvZiByaW5ncyBieSBIVyBJUCAqLwogCXN0 cnVjdCBsaXN0X2hlYWQJCXJpbmdfbHJ1X2xpc3Q7CiAJc3BpbmxvY2tfdAkJCXJpbmdfbHJ1X2xp c3RfbG9jazsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9k ZXZpY2UuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2UuYwppbmRl eCA5OWFjZjI5NzgxMzQuLjRmOTlkMTdhYTU4MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdV9kZXZpY2UuYwpAQCAtMjE3Nyw5ICsyMTc3LDYgQEAgaW50IGFtZGdwdV9kZXZp Y2VfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAlJTklUX0xJU1RfSEVBRCgmYWRl di0+c2hhZG93X2xpc3QpOwogCW11dGV4X2luaXQoJmFkZXYtPnNoYWRvd19saXN0X2xvY2spOwog Ci0JSU5JVF9MSVNUX0hFQUQoJmFkZXYtPmd0dF9saXN0KTsKLQlzcGluX2xvY2tfaW5pdCgmYWRl di0+Z3R0X2xpc3RfbG9jayk7Ci0KIAlJTklUX0xJU1RfSEVBRCgmYWRldi0+cmluZ19scnVfbGlz dCk7CiAJc3Bpbl9sb2NrX2luaXQoJmFkZXYtPnJpbmdfbHJ1X2xpc3RfbG9jayk7CiAKQEAgLTI4 ODUsNyArMjg4Miw3IEBAIGludCBhbWRncHVfc3Jpb3ZfZ3B1X3Jlc2V0KHN0cnVjdCBhbWRncHVf ZGV2aWNlICphZGV2LCBzdHJ1Y3QgYW1kZ3B1X2pvYiAqam9iKQogCWFtZGdwdV9zcmlvdl9yZWlu aXRfZWFybHkoYWRldik7CiAKIAkvKiB3ZSBuZWVkIHJlY292ZXIgZ2FydCBwcmlvciB0byBydW4g U01DL0NQL1NETUEgcmVzdW1lICovCi0JYW1kZ3B1X3R0bV9yZWNvdmVyX2dhcnQoYWRldik7CisJ YW1kZ3B1X2d0dF9tZ3JfcmVjb3ZlcigmYWRldi0+bW1hbi5iZGV2Lm1hbltUVE1fUExfVFRdKTsK IAogCS8qIG5vdyB3ZSBhcmUgb2theSB0byByZXN1bWUgU01DL0NQL1NETUEgKi8KIAlhbWRncHVf c3Jpb3ZfcmVpbml0X2xhdGUoYWRldik7CkBAIC0zMDI2LDcgKzMwMjMsOCBAQCBpbnQgYW1kZ3B1 X2dwdV9yZXNldChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAkJCQlEUk1fRVJST1IoIlZS QU0gaXMgbG9zdCFcbiIpOwogCQkJCWF0b21pY19pbmMoJmFkZXYtPnZyYW1fbG9zdF9jb3VudGVy KTsKIAkJCX0KLQkJCXIgPSBhbWRncHVfdHRtX3JlY292ZXJfZ2FydChhZGV2KTsKKwkJCXIgPSBh bWRncHVfZ3R0X21ncl9yZWNvdmVyKAorCQkJCSZhZGV2LT5tbWFuLmJkZXYubWFuW1RUTV9QTF9U VF0pOwogCQkJaWYgKHIpCiAJCQkJZ290byBvdXQ7CiAJCQlyID0gYW1kZ3B1X3Jlc3VtZV9waGFz ZTIoYWRldik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVf Z3R0X21nci5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2d0dF9tZ3IuYwpp bmRleCAzMzUzNWQzNDc3MzQuLmYyNzZmYTdmMDg4YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2d0dF9tZ3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHVfZ3R0X21nci5jCkBAIC0zMSw2ICszMSwxMSBAQCBzdHJ1Y3QgYW1kZ3B1 X2d0dF9tZ3IgewogCWF0b21pYzY0X3QgYXZhaWxhYmxlOwogfTsKIAorc3RydWN0IGFtZGdwdV9n dHRfbm9kZSB7CisJc3RydWN0IGRybV9tbV9ub2RlIG5vZGU7CisJc3RydWN0IHR0bV9idWZmZXJf b2JqZWN0ICp0Ym87Cit9OworCiAvKioKICAqIGFtZGdwdV9ndHRfbWdyX2luaXQgLSBpbml0IEdU VCBtYW5hZ2VyIGFuZCBEUk0gTU0KICAqCkBAIC05Myw5ICs5OCw5IEBAIHN0YXRpYyBpbnQgYW1k Z3B1X2d0dF9tZ3JfZmluaShzdHJ1Y3QgdHRtX21lbV90eXBlX21hbmFnZXIgKm1hbikKICAqLwog Ym9vbCBhbWRncHVfZ3R0X21ncl9pc19hbGxvY2F0ZWQoc3RydWN0IHR0bV9tZW1fcmVnICptZW0p CiB7Ci0Jc3RydWN0IGRybV9tbV9ub2RlICpub2RlID0gbWVtLT5tbV9ub2RlOworCXN0cnVjdCBh bWRncHVfZ3R0X25vZGUgKm5vZGUgPSBtZW0tPm1tX25vZGU7CiAKLQlyZXR1cm4gKG5vZGUtPnN0 YXJ0ICE9IEFNREdQVV9CT19JTlZBTElEX09GRlNFVCk7CisJcmV0dXJuIChub2RlLT5ub2RlLnN0 YXJ0ICE9IEFNREdQVV9CT19JTlZBTElEX09GRlNFVCk7CiB9CiAKIC8qKgpAQCAtMTE1LDcgKzEy MCw3IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X2d0dF9tZ3JfYWxsb2Moc3RydWN0IHR0bV9tZW1fdHlw ZV9tYW5hZ2VyICptYW4sCiB7CiAJc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSBhbWRncHVf dHRtX2FkZXYobWFuLT5iZGV2KTsKIAlzdHJ1Y3QgYW1kZ3B1X2d0dF9tZ3IgKm1nciA9IG1hbi0+ cHJpdjsKLQlzdHJ1Y3QgZHJtX21tX25vZGUgKm5vZGUgPSBtZW0tPm1tX25vZGU7CisJc3RydWN0 IGFtZGdwdV9ndHRfbm9kZSAqbm9kZSA9IG1lbS0+bW1fbm9kZTsKIAllbnVtIGRybV9tbV9pbnNl cnRfbW9kZSBtb2RlOwogCXVuc2lnbmVkIGxvbmcgZnBmbiwgbHBmbjsKIAlpbnQgcjsKQEAgLTEz OCwxMyArMTQzLDEzIEBAIHN0YXRpYyBpbnQgYW1kZ3B1X2d0dF9tZ3JfYWxsb2Moc3RydWN0IHR0 bV9tZW1fdHlwZV9tYW5hZ2VyICptYW4sCiAJCW1vZGUgPSBEUk1fTU1fSU5TRVJUX0hJR0g7CiAK IAlzcGluX2xvY2soJm1nci0+bG9jayk7Ci0JciA9IGRybV9tbV9pbnNlcnRfbm9kZV9pbl9yYW5n ZSgmbWdyLT5tbSwgbm9kZSwKLQkJCQkJbWVtLT5udW1fcGFnZXMsIG1lbS0+cGFnZV9hbGlnbm1l bnQsIDAsCi0JCQkJCWZwZm4sIGxwZm4sIG1vZGUpOworCXIgPSBkcm1fbW1faW5zZXJ0X25vZGVf aW5fcmFuZ2UoJm1nci0+bW0sICZub2RlLT5ub2RlLCBtZW0tPm51bV9wYWdlcywKKwkJCQkJbWVt LT5wYWdlX2FsaWdubWVudCwgMCwgZnBmbiwgbHBmbiwKKwkJCQkJbW9kZSk7CiAJc3Bpbl91bmxv Y2soJm1nci0+bG9jayk7CiAKIAlpZiAoIXIpCi0JCW1lbS0+c3RhcnQgPSBub2RlLT5zdGFydDsK KwkJbWVtLT5zdGFydCA9IG5vZGUtPm5vZGUuc3RhcnQ7CiAKIAlyZXR1cm4gcjsKIH0KQEAgLTE2 NSw3ICsxNzAsNyBAQCBzdGF0aWMgaW50IGFtZGdwdV9ndHRfbWdyX25ldyhzdHJ1Y3QgdHRtX21l bV90eXBlX21hbmFnZXIgKm1hbiwKIAkJCSAgICAgIHN0cnVjdCB0dG1fbWVtX3JlZyAqbWVtKQog ewogCXN0cnVjdCBhbWRncHVfZ3R0X21nciAqbWdyID0gbWFuLT5wcml2OwotCXN0cnVjdCBkcm1f bW1fbm9kZSAqbm9kZTsKKwlzdHJ1Y3QgYW1kZ3B1X2d0dF9ub2RlICpub2RlOwogCWludCByOwog CiAJc3Bpbl9sb2NrKCZtZ3ItPmxvY2spOwpAQCAtMTgzLDggKzE4OCw5IEBAIHN0YXRpYyBpbnQg YW1kZ3B1X2d0dF9tZ3JfbmV3KHN0cnVjdCB0dG1fbWVtX3R5cGVfbWFuYWdlciAqbWFuLAogCQln b3RvIGVycl9vdXQ7CiAJfQogCi0Jbm9kZS0+c3RhcnQgPSBBTURHUFVfQk9fSU5WQUxJRF9PRkZT RVQ7Ci0Jbm9kZS0+c2l6ZSA9IG1lbS0+bnVtX3BhZ2VzOworCW5vZGUtPm5vZGUuc3RhcnQgPSBB TURHUFVfQk9fSU5WQUxJRF9PRkZTRVQ7CisJbm9kZS0+bm9kZS5zaXplID0gbWVtLT5udW1fcGFn ZXM7CisJbm9kZS0+dGJvID0gdGJvOwogCW1lbS0+bW1fbm9kZSA9IG5vZGU7CiAKIAlpZiAocGxh Y2UtPmZwZm4gfHwgcGxhY2UtPmxwZm4gfHwgcGxhY2UtPmZsYWdzICYgVFRNX1BMX0ZMQUdfVE9Q RE9XTikgewpAQCAtMTk2LDcgKzIwMiw3IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X2d0dF9tZ3JfbmV3 KHN0cnVjdCB0dG1fbWVtX3R5cGVfbWFuYWdlciAqbWFuLAogCQkJZ290byBlcnJfb3V0OwogCQl9 CiAJfSBlbHNlIHsKLQkJbWVtLT5zdGFydCA9IG5vZGUtPnN0YXJ0OworCQltZW0tPnN0YXJ0ID0g bm9kZS0+bm9kZS5zdGFydDsKIAl9CiAKIAlyZXR1cm4gMDsKQEAgLTIyMCwxNCArMjI2LDE0IEBA IHN0YXRpYyB2b2lkIGFtZGdwdV9ndHRfbWdyX2RlbChzdHJ1Y3QgdHRtX21lbV90eXBlX21hbmFn ZXIgKm1hbiwKIAkJCSAgICAgICBzdHJ1Y3QgdHRtX21lbV9yZWcgKm1lbSkKIHsKIAlzdHJ1Y3Qg YW1kZ3B1X2d0dF9tZ3IgKm1nciA9IG1hbi0+cHJpdjsKLQlzdHJ1Y3QgZHJtX21tX25vZGUgKm5v ZGUgPSBtZW0tPm1tX25vZGU7CisJc3RydWN0IGFtZGdwdV9ndHRfbm9kZSAqbm9kZSA9IG1lbS0+ bW1fbm9kZTsKIAogCWlmICghbm9kZSkKIAkJcmV0dXJuOwogCiAJc3Bpbl9sb2NrKCZtZ3ItPmxv Y2spOwotCWlmIChub2RlLT5zdGFydCAhPSBBTURHUFVfQk9fSU5WQUxJRF9PRkZTRVQpCi0JCWRy bV9tbV9yZW1vdmVfbm9kZShub2RlKTsKKwlpZiAobm9kZS0+bm9kZS5zdGFydCAhPSBBTURHUFVf Qk9fSU5WQUxJRF9PRkZTRVQpCisJCWRybV9tbV9yZW1vdmVfbm9kZSgmbm9kZS0+bm9kZSk7CiAJ c3Bpbl91bmxvY2soJm1nci0+bG9jayk7CiAJYXRvbWljNjRfYWRkKG1lbS0+bnVtX3BhZ2VzLCAm bWdyLT5hdmFpbGFibGUpOwogCkBAIC0yNTAsNiArMjU2LDI1IEBAIHVpbnQ2NF90IGFtZGdwdV9n dHRfbWdyX3VzYWdlKHN0cnVjdCB0dG1fbWVtX3R5cGVfbWFuYWdlciAqbWFuKQogCXJldHVybiAo cmVzdWx0ID4gMCA/IHJlc3VsdCA6IDApICogUEFHRV9TSVpFOwogfQogCitpbnQgYW1kZ3B1X2d0 dF9tZ3JfcmVjb3ZlcihzdHJ1Y3QgdHRtX21lbV90eXBlX21hbmFnZXIgKm1hbikKK3sKKwlzdHJ1 Y3QgYW1kZ3B1X2d0dF9tZ3IgKm1nciA9IG1hbi0+cHJpdjsKKwlzdHJ1Y3QgYW1kZ3B1X2d0dF9u b2RlICpub2RlOworCXN0cnVjdCBkcm1fbW1fbm9kZSAqbW1fbm9kZTsKKwlpbnQgciA9IDA7CisK KwlzcGluX2xvY2soJm1nci0+bG9jayk7CisJZHJtX21tX2Zvcl9lYWNoX25vZGUobW1fbm9kZSwg Jm1nci0+bW0pIHsKKwkJbm9kZSA9IGNvbnRhaW5lcl9vZihtbV9ub2RlLCBzdHJ1Y3QgYW1kZ3B1 X2d0dF9ub2RlLCBub2RlKTsKKwkJciA9IGFtZGdwdV90dG1fcmVjb3Zlcl9nYXJ0KG5vZGUtPnRi byk7CisJCWlmIChyKQorCQkJYnJlYWs7CisJfQorCXNwaW5fdW5sb2NrKCZtZ3ItPmxvY2spOwor CisJcmV0dXJuIHI7Cit9CisKIC8qKgogICogYW1kZ3B1X2d0dF9tZ3JfZGVidWcgLSBkdW1wIFZS QU0gdGFibGUKICAqCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfdHRtLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdHRtLmMKaW5kZXgg YTA5NDRhMTUwZDlhLi4xZWI2MTc3ZDRhZjAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdV90dG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfdHRtLmMKQEAgLTY5MCw3ICs2OTAsNiBAQCBzdHJ1Y3QgYW1kZ3B1X3R0bV90dCB7CiAJ c3RydWN0IGxpc3RfaGVhZCAgICAgICAgZ3VwdGFza3M7CiAJYXRvbWljX3QJCW1tdV9pbnZhbGlk YXRpb25zOwogCXVpbnQzMl90CQlsYXN0X3NldF9wYWdlczsKLQlzdHJ1Y3QgbGlzdF9oZWFkICAg ICAgICBsaXN0OwogfTsKIAogaW50IGFtZGdwdV90dG1fdHRfZ2V0X3VzZXJfcGFnZXMoc3RydWN0 IHR0bV90dCAqdHRtLCBzdHJ1Y3QgcGFnZSAqKnBhZ2VzKQpAQCAtODY2LDIxICs4NjUsMTQgQEAg c3RhdGljIGludCBhbWRncHVfdHRtX2JhY2tlbmRfYmluZChzdHJ1Y3QgdHRtX3R0ICp0dG0sCiAJ CXJldHVybiAwOwogCX0KIAotCXNwaW5fbG9jaygmZ3R0LT5hZGV2LT5ndHRfbGlzdF9sb2NrKTsK IAlmbGFncyA9IGFtZGdwdV90dG1fdHRfcHRlX2ZsYWdzKGd0dC0+YWRldiwgdHRtLCBib19tZW0p OwogCWd0dC0+b2Zmc2V0ID0gKHU2NClib19tZW0tPnN0YXJ0IDw8IFBBR0VfU0hJRlQ7CiAJciA9 IGFtZGdwdV9nYXJ0X2JpbmQoZ3R0LT5hZGV2LCBndHQtPm9mZnNldCwgdHRtLT5udW1fcGFnZXMs CiAJCXR0bS0+cGFnZXMsIGd0dC0+dHRtLmRtYV9hZGRyZXNzLCBmbGFncyk7CiAKLQlpZiAocikg eworCWlmIChyKQogCQlEUk1fRVJST1IoImZhaWxlZCB0byBiaW5kICVsdSBwYWdlcyBhdCAweCUw OGxsWFxuIiwKIAkJCSAgdHRtLT5udW1fcGFnZXMsIGd0dC0+b2Zmc2V0KTsKLQkJZ290byBlcnJv cl9nYXJ0X2JpbmQ7Ci0JfQotCi0JbGlzdF9hZGRfdGFpbCgmZ3R0LT5saXN0LCAmZ3R0LT5hZGV2 LT5ndHRfbGlzdCk7Ci1lcnJvcl9nYXJ0X2JpbmQ6Ci0Jc3Bpbl91bmxvY2soJmd0dC0+YWRldi0+ Z3R0X2xpc3RfbG9jayk7CiAJcmV0dXJuIHI7CiB9CiAKQEAgLTkyMiwyOSArOTE0LDIzIEBAIGlu dCBhbWRncHVfdHRtX2JpbmQoc3RydWN0IHR0bV9idWZmZXJfb2JqZWN0ICpibykKIAlyZXR1cm4g cjsKIH0KIAotaW50IGFtZGdwdV90dG1fcmVjb3Zlcl9nYXJ0KHN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2KQoraW50IGFtZGdwdV90dG1fcmVjb3Zlcl9nYXJ0KHN0cnVjdCB0dG1fYnVmZmVyX29i amVjdCAqdGJvKQogewotCXN0cnVjdCBhbWRncHVfdHRtX3R0ICpndHQsICp0bXA7Ci0Jc3RydWN0 IHR0bV9tZW1fcmVnIGJvX21lbTsKKwlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IGFtZGdw dV90dG1fYWRldih0Ym8tPmJkZXYpOworCXN0cnVjdCBhbWRncHVfdHRtX3R0ICpndHQgPSAodm9p ZCAqKXRiby0+dHRtOwogCXVpbnQ2NF90IGZsYWdzOwogCWludCByOwogCi0JYm9fbWVtLm1lbV90 eXBlID0gVFRNX1BMX1RUOwotCXNwaW5fbG9jaygmYWRldi0+Z3R0X2xpc3RfbG9jayk7Ci0JbGlz dF9mb3JfZWFjaF9lbnRyeV9zYWZlKGd0dCwgdG1wLCAmYWRldi0+Z3R0X2xpc3QsIGxpc3QpIHsK LQkJZmxhZ3MgPSBhbWRncHVfdHRtX3R0X3B0ZV9mbGFncyhndHQtPmFkZXYsICZndHQtPnR0bS50 dG0sICZib19tZW0pOwotCQlyID0gYW1kZ3B1X2dhcnRfYmluZChhZGV2LCBndHQtPm9mZnNldCwg Z3R0LT50dG0udHRtLm51bV9wYWdlcywKLQkJCQkgICAgIGd0dC0+dHRtLnR0bS5wYWdlcywgZ3R0 LT50dG0uZG1hX2FkZHJlc3MsCi0JCQkJICAgICBmbGFncyk7Ci0JCWlmIChyKSB7Ci0JCQlzcGlu X3VubG9jaygmYWRldi0+Z3R0X2xpc3RfbG9jayk7Ci0JCQlEUk1fRVJST1IoImZhaWxlZCB0byBi aW5kICVsdSBwYWdlcyBhdCAweCUwOGxsWFxuIiwKLQkJCQkgIGd0dC0+dHRtLnR0bS5udW1fcGFn ZXMsIGd0dC0+b2Zmc2V0KTsKLQkJCXJldHVybiByOwotCQl9Ci0JfQotCXNwaW5fdW5sb2NrKCZh ZGV2LT5ndHRfbGlzdF9sb2NrKTsKLQlyZXR1cm4gMDsKKwlpZiAoIWd0dCkKKwkJcmV0dXJuIDA7 CisKKwlmbGFncyA9IGFtZGdwdV90dG1fdHRfcHRlX2ZsYWdzKGFkZXYsICZndHQtPnR0bS50dG0s ICZ0Ym8tPm1lbSk7CisJciA9IGFtZGdwdV9nYXJ0X2JpbmQoYWRldiwgZ3R0LT5vZmZzZXQsIGd0 dC0+dHRtLnR0bS5udW1fcGFnZXMsCisJCQkgICAgIGd0dC0+dHRtLnR0bS5wYWdlcywgZ3R0LT50 dG0uZG1hX2FkZHJlc3MsIGZsYWdzKTsKKwlpZiAocikKKwkJRFJNX0VSUk9SKCJmYWlsZWQgdG8g YmluZCAlbHUgcGFnZXMgYXQgMHglMDhsbFhcbiIsCisJCQkgIGd0dC0+dHRtLnR0bS5udW1fcGFn ZXMsIGd0dC0+b2Zmc2V0KTsKKwlyZXR1cm4gcjsKIH0KIAogc3RhdGljIGludCBhbWRncHVfdHRt X2JhY2tlbmRfdW5iaW5kKHN0cnVjdCB0dG1fdHQgKnR0bSkKQEAgLTk1OSwxNiArOTQ1LDEwIEBA IHN0YXRpYyBpbnQgYW1kZ3B1X3R0bV9iYWNrZW5kX3VuYmluZChzdHJ1Y3QgdHRtX3R0ICp0dG0p CiAJCXJldHVybiAwOwogCiAJLyogdW5iaW5kIHNob3VsZG4ndCBiZSBkb25lIGZvciBHRFMvR1dT L09BIGluIHR0bV9ib19jbGVhbl9tbSAqLwotCXNwaW5fbG9jaygmZ3R0LT5hZGV2LT5ndHRfbGlz dF9sb2NrKTsKIAlyID0gYW1kZ3B1X2dhcnRfdW5iaW5kKGd0dC0+YWRldiwgZ3R0LT5vZmZzZXQs IHR0bS0+bnVtX3BhZ2VzKTsKLQlpZiAocikgeworCWlmIChyKQogCQlEUk1fRVJST1IoImZhaWxl ZCB0byB1bmJpbmQgJWx1IHBhZ2VzIGF0IDB4JTA4bGxYXG4iLAogCQkJICBndHQtPnR0bS50dG0u bnVtX3BhZ2VzLCBndHQtPm9mZnNldCk7Ci0JCWdvdG8gZXJyb3JfdW5iaW5kOwotCX0KLQlsaXN0 X2RlbF9pbml0KCZndHQtPmxpc3QpOwotZXJyb3JfdW5iaW5kOgotCXNwaW5fdW5sb2NrKCZndHQt PmFkZXYtPmd0dF9saXN0X2xvY2spOwogCXJldHVybiByOwogfQogCkBAIC0xMDA1LDcgKzk4NSw2 IEBAIHN0YXRpYyBzdHJ1Y3QgdHRtX3R0ICphbWRncHVfdHRtX3R0X2NyZWF0ZShzdHJ1Y3QgdHRt X2JvX2RldmljZSAqYmRldiwKIAkJa2ZyZWUoZ3R0KTsKIAkJcmV0dXJuIE5VTEw7CiAJfQotCUlO SVRfTElTVF9IRUFEKCZndHQtPmxpc3QpOwogCXJldHVybiAmZ3R0LT50dG0udHRtOwogfQogCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdHRtLmggYi9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdHRtLmgKaW5kZXggMzkxNDBlZDg4MjczLi4z YzM0MDZkOWZjNjQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdw dV90dG0uaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdHRtLmgKQEAg LTY5LDYgKzY5LDcgQEAgZXh0ZXJuIGNvbnN0IHN0cnVjdCB0dG1fbWVtX3R5cGVfbWFuYWdlcl9m dW5jIGFtZGdwdV92cmFtX21ncl9mdW5jOwogCiBib29sIGFtZGdwdV9ndHRfbWdyX2lzX2FsbG9j YXRlZChzdHJ1Y3QgdHRtX21lbV9yZWcgKm1lbSk7CiB1aW50NjRfdCBhbWRncHVfZ3R0X21ncl91 c2FnZShzdHJ1Y3QgdHRtX21lbV90eXBlX21hbmFnZXIgKm1hbik7CitpbnQgYW1kZ3B1X2d0dF9t Z3JfcmVjb3ZlcihzdHJ1Y3QgdHRtX21lbV90eXBlX21hbmFnZXIgKm1hbik7CiAKIHVpbnQ2NF90 IGFtZGdwdV92cmFtX21ncl91c2FnZShzdHJ1Y3QgdHRtX21lbV90eXBlX21hbmFnZXIgKm1hbik7 CiB1aW50NjRfdCBhbWRncHVfdnJhbV9tZ3JfdmlzX3VzYWdlKHN0cnVjdCB0dG1fbWVtX3R5cGVf bWFuYWdlciAqbWFuKTsKQEAgLTkxLDcgKzkyLDcgQEAgaW50IGFtZGdwdV9maWxsX2J1ZmZlcihz dHJ1Y3QgYW1kZ3B1X2JvICpibywKIAogaW50IGFtZGdwdV9tbWFwKHN0cnVjdCBmaWxlICpmaWxw LCBzdHJ1Y3Qgdm1fYXJlYV9zdHJ1Y3QgKnZtYSk7CiBpbnQgYW1kZ3B1X3R0bV9iaW5kKHN0cnVj dCB0dG1fYnVmZmVyX29iamVjdCAqYm8pOwotaW50IGFtZGdwdV90dG1fcmVjb3Zlcl9nYXJ0KHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KTsKK2ludCBhbWRncHVfdHRtX3JlY292ZXJfZ2FydChz dHJ1Y3QgdHRtX2J1ZmZlcl9vYmplY3QgKnRibyk7CiAKIGludCBhbWRncHVfdHRtX3R0X2dldF91 c2VyX3BhZ2VzKHN0cnVjdCB0dG1fdHQgKnR0bSwgc3RydWN0IHBhZ2UgKipwYWdlcyk7CiB2b2lk IGFtZGdwdV90dG1fdHRfc2V0X3VzZXJfcGFnZXMoc3RydWN0IHR0bV90dCAqdHRtLCBzdHJ1Y3Qg cGFnZSAqKnBhZ2VzKTsKLS0gCjIuMTEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9hbWQtZ2Z4Cg==