From: Hans de Goede Subject: [PATCH 04/12] staging: vboxvideo: Embed drm_device into driver structure Date: Tue, 18 Sep 2018 19:44:30 +0200 Message-ID: <20180918174438.19780-5-hdegoede@redhat.com> References: <20180918174438.19780-1-hdegoede@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTPS id DD6C46E43F for ; Tue, 18 Sep 2018 17:44:47 +0000 (UTC) In-Reply-To: <20180918174438.19780-1-hdegoede@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Greg Kroah-Hartman Cc: devel@driverdev.osuosl.org, Hans de Goede , Michael Thayer , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org VGhpcyBpcyB0aGUgcmVjb21tZW5kZWQgd2F5IHRvIGNyZWF0ZSB0aGUgZHJtX2RldmljZSBzdHJ1 Y3R1cmUsCmFjY29yZGluZyB0byBEUk0gZG9jdW1lbnRhdGlvbi4KClNpZ25lZC1vZmYtYnk6IEhh bnMgZGUgR29lZGUgPGhkZWdvZWRlQHJlZGhhdC5jb20+Ci0tLQogZHJpdmVycy9zdGFnaW5nL3Zi b3h2aWRlby92Ym94X2Rydi5jICB8IDExMCArKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLQogZHJp dmVycy9zdGFnaW5nL3Zib3h2aWRlby92Ym94X2Rydi5oICB8ICAxNyArKy0tCiBkcml2ZXJzL3N0 YWdpbmcvdmJveHZpZGVvL3Zib3hfZmIuYyAgIHwgIDE5ICsrLS0tCiBkcml2ZXJzL3N0YWdpbmcv dmJveHZpZGVvL3Zib3hfaXJxLmMgIHwgICA4ICstCiBkcml2ZXJzL3N0YWdpbmcvdmJveHZpZGVv L3Zib3hfbWFpbi5jIHwgIDMwICsrKy0tLS0KIGRyaXZlcnMvc3RhZ2luZy92Ym94dmlkZW8vdmJv eF9tb2RlLmMgfCAgMzYgKysrKy0tLS0tCiBkcml2ZXJzL3N0YWdpbmcvdmJveHZpZGVvL3Zib3hf dHRtLmMgIHwgIDEzICsrLQogNyBmaWxlcyBjaGFuZ2VkLCAxMTEgaW5zZXJ0aW9ucygrKSwgMTIy IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy92Ym94dmlkZW8vdmJv eF9kcnYuYyBiL2RyaXZlcnMvc3RhZ2luZy92Ym94dmlkZW8vdmJveF9kcnYuYwppbmRleCA0MTBh MWYzNWI3NDYuLmM0MjkwZDRiNGE1MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9zdGFnaW5nL3Zib3h2 aWRlby92Ym94X2Rydi5jCisrKyBiL2RyaXZlcnMvc3RhZ2luZy92Ym94dmlkZW8vdmJveF9kcnYu YwpAQCAtNTEsMzUgKzUxLDMxIEBAIE1PRFVMRV9ERVZJQ0VfVEFCTEUocGNpLCBwY2lpZGxpc3Qp OwogCiBzdGF0aWMgaW50IHZib3hfcGNpX3Byb2JlKHN0cnVjdCBwY2lfZGV2ICpwZGV2LCBjb25z dCBzdHJ1Y3QgcGNpX2RldmljZV9pZCAqZW50KQogewotCXN0cnVjdCB2Ym94X3ByaXZhdGUgKnZi b3ggPSBOVUxMOwotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBOVUxMOworCXN0cnVjdCB2Ym94 X3ByaXZhdGUgKnZib3g7CiAJaW50IHJldCA9IDA7CiAKIAlpZiAoIXZib3hfY2hlY2tfc3VwcG9y dGVkKFZCRV9ESVNQSV9JRF9IR1NNSSkpCiAJCXJldHVybiAtRU5PREVWOwogCi0JZGV2ID0gZHJt X2Rldl9hbGxvYygmZHJpdmVyLCAmcGRldi0+ZGV2KTsKLQlpZiAoSVNfRVJSKGRldikpCi0JCXJl dHVybiBQVFJfRVJSKGRldik7CisJdmJveCA9IGt6YWxsb2Moc2l6ZW9mKCp2Ym94KSwgR0ZQX0tF Uk5FTCk7CisJaWYgKCF2Ym94KQorCQlyZXR1cm4gLUVOT01FTTsKIAotCXJldCA9IHBjaV9lbmFi bGVfZGV2aWNlKHBkZXYpOwotCWlmIChyZXQpCi0JCWdvdG8gZXJyX2Rldl9wdXQ7Ci0KLQlkZXYt PnBkZXYgPSBwZGV2OwotCXBjaV9zZXRfZHJ2ZGF0YShwZGV2LCBkZXYpOwotCi0JdmJveCA9IGRl dm1fa3phbGxvYygmcGRldi0+ZGV2LCBzaXplb2YoKnZib3gpLCBHRlBfS0VSTkVMKTsKLQlpZiAo IXZib3gpIHsKLQkJcmV0ID0gLUVOT01FTTsKLQkJZ290byBlcnJfcGNpX2Rpc2FibGU7CisJcmV0 ID0gZHJtX2Rldl9pbml0KCZ2Ym94LT5kZGV2LCAmZHJpdmVyLCAmcGRldi0+ZGV2KTsKKwlpZiAo cmV0KSB7CisJCWtmcmVlKHZib3gpOworCQlyZXR1cm4gcmV0OwogCX0KIAotCWRldi0+ZGV2X3By aXZhdGUgPSB2Ym94OwotCXZib3gtPmRldiA9IGRldjsKLQorCXZib3gtPmRkZXYucGRldiA9IHBk ZXY7CisJdmJveC0+ZGRldi5kZXZfcHJpdmF0ZSA9IHZib3g7CisJcGNpX3NldF9kcnZkYXRhKHBk ZXYsIHZib3gpOwogCW11dGV4X2luaXQoJnZib3gtPmh3X211dGV4KTsKIAorCXJldCA9IHBjaV9l bmFibGVfZGV2aWNlKHBkZXYpOworCWlmIChyZXQpCisJCWdvdG8gZXJyX2Rldl9wdXQ7CisKIAly ZXQgPSB2Ym94X2h3X2luaXQodmJveCk7CiAJaWYgKHJldCkKIAkJZ290byBlcnJfcGNpX2Rpc2Fi bGU7CkBAIC04OCw3ICs4NCw3IEBAIHN0YXRpYyBpbnQgdmJveF9wY2lfcHJvYmUoc3RydWN0IHBj aV9kZXYgKnBkZXYsIGNvbnN0IHN0cnVjdCBwY2lfZGV2aWNlX2lkICplbnQpCiAJaWYgKHJldCkK IAkJZ290byBlcnJfaHdfZmluaTsKIAotCXJldCA9IHZib3hfbW9kZV9pbml0KGRldik7CisJcmV0 ID0gdmJveF9tb2RlX2luaXQodmJveCk7CiAJaWYgKHJldCkKIAkJZ290byBlcnJfbW1fZmluaTsK IApAQCAtOTYsMjIgKzkyLDIyIEBAIHN0YXRpYyBpbnQgdmJveF9wY2lfcHJvYmUoc3RydWN0IHBj aV9kZXYgKnBkZXYsIGNvbnN0IHN0cnVjdCBwY2lfZGV2aWNlX2lkICplbnQpCiAJaWYgKHJldCkK IAkJZ290byBlcnJfbW9kZV9maW5pOwogCi0JcmV0ID0gdmJveF9mYmRldl9pbml0KGRldik7CisJ cmV0ID0gdmJveF9mYmRldl9pbml0KHZib3gpOwogCWlmIChyZXQpCiAJCWdvdG8gZXJyX2lycV9m aW5pOwogCi0JcmV0ID0gZHJtX2Rldl9yZWdpc3RlcihkZXYsIDApOworCXJldCA9IGRybV9kZXZf cmVnaXN0ZXIoJnZib3gtPmRkZXYsIDApOwogCWlmIChyZXQpCiAJCWdvdG8gZXJyX2ZiZGV2X2Zp bmk7CiAKIAlyZXR1cm4gMDsKIAogZXJyX2ZiZGV2X2Zpbmk6Ci0JdmJveF9mYmRldl9maW5pKGRl dik7CisJdmJveF9mYmRldl9maW5pKHZib3gpOwogZXJyX2lycV9maW5pOgogCXZib3hfaXJxX2Zp bmkodmJveCk7CiBlcnJfbW9kZV9maW5pOgotCXZib3hfbW9kZV9maW5pKGRldik7CisJdmJveF9t b2RlX2ZpbmkodmJveCk7CiBlcnJfbW1fZmluaToKIAl2Ym94X21tX2ZpbmkodmJveCk7CiBlcnJf aHdfZmluaToKQEAgLTExOSwxMTAgKzExNSwxMDAgQEAgc3RhdGljIGludCB2Ym94X3BjaV9wcm9i ZShzdHJ1Y3QgcGNpX2RldiAqcGRldiwgY29uc3Qgc3RydWN0IHBjaV9kZXZpY2VfaWQgKmVudCkK IGVycl9wY2lfZGlzYWJsZToKIAlwY2lfZGlzYWJsZV9kZXZpY2UocGRldik7CiBlcnJfZGV2X3B1 dDoKLQlkcm1fZGV2X3B1dChkZXYpOworCWRybV9kZXZfcHV0KCZ2Ym94LT5kZGV2KTsKIAlyZXR1 cm4gcmV0OwogfQogCiBzdGF0aWMgdm9pZCB2Ym94X3BjaV9yZW1vdmUoc3RydWN0IHBjaV9kZXYg KnBkZXYpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBjaV9nZXRfZHJ2ZGF0YShwZGV2 KTsKLQlzdHJ1Y3QgdmJveF9wcml2YXRlICp2Ym94ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1 Y3QgdmJveF9wcml2YXRlICp2Ym94ID0gcGNpX2dldF9kcnZkYXRhKHBkZXYpOwogCi0JZHJtX2Rl dl91bnJlZ2lzdGVyKGRldik7Ci0JdmJveF9mYmRldl9maW5pKGRldik7CisJZHJtX2Rldl91bnJl Z2lzdGVyKCZ2Ym94LT5kZGV2KTsKKwl2Ym94X2ZiZGV2X2ZpbmkodmJveCk7CiAJdmJveF9pcnFf ZmluaSh2Ym94KTsKLQl2Ym94X21vZGVfZmluaShkZXYpOworCXZib3hfbW9kZV9maW5pKHZib3gp OwogCXZib3hfbW1fZmluaSh2Ym94KTsKIAl2Ym94X2h3X2ZpbmkodmJveCk7Ci0JZHJtX2Rldl9w dXQoZGV2KTsKKwlkcm1fZGV2X3B1dCgmdmJveC0+ZGRldik7CiB9CiAKLXN0YXRpYyBpbnQgdmJv eF9kcm1fZnJlZXplKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitzdGF0aWMgaW50IHZib3hfZHJt X2ZyZWV6ZShzdHJ1Y3QgdmJveF9wcml2YXRlICp2Ym94KQogewotCXN0cnVjdCB2Ym94X3ByaXZh dGUgKnZib3ggPSBkZXYtPmRldl9wcml2YXRlOwotCi0JZHJtX2ttc19oZWxwZXJfcG9sbF9kaXNh YmxlKGRldik7CisJZHJtX2ttc19oZWxwZXJfcG9sbF9kaXNhYmxlKCZ2Ym94LT5kZGV2KTsKIAot CXBjaV9zYXZlX3N0YXRlKGRldi0+cGRldik7CisJcGNpX3NhdmVfc3RhdGUodmJveC0+ZGRldi5w ZGV2KTsKIAogCWRybV9mYl9oZWxwZXJfc2V0X3N1c3BlbmRfdW5sb2NrZWQoJnZib3gtPmZiZGV2 LT5oZWxwZXIsIHRydWUpOwogCiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyBpbnQgdmJveF9kcm1f dGhhdyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQorc3RhdGljIGludCB2Ym94X2RybV90aGF3KHN0 cnVjdCB2Ym94X3ByaXZhdGUgKnZib3gpCiB7Ci0Jc3RydWN0IHZib3hfcHJpdmF0ZSAqdmJveCA9 IGRldi0+ZGV2X3ByaXZhdGU7Ci0KLQlkcm1fbW9kZV9jb25maWdfcmVzZXQoZGV2KTsKLQlkcm1f aGVscGVyX3Jlc3VtZV9mb3JjZV9tb2RlKGRldik7CisJZHJtX21vZGVfY29uZmlnX3Jlc2V0KCZ2 Ym94LT5kZGV2KTsKKwlkcm1faGVscGVyX3Jlc3VtZV9mb3JjZV9tb2RlKCZ2Ym94LT5kZGV2KTsK IAlkcm1fZmJfaGVscGVyX3NldF9zdXNwZW5kX3VubG9ja2VkKCZ2Ym94LT5mYmRldi0+aGVscGVy LCBmYWxzZSk7CiAKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIGludCB2Ym94X2RybV9yZXN1bWUo c3RydWN0IGRybV9kZXZpY2UgKmRldikKK3N0YXRpYyBpbnQgdmJveF9kcm1fcmVzdW1lKHN0cnVj dCB2Ym94X3ByaXZhdGUgKnZib3gpCiB7CiAJaW50IHJldDsKIAotCWlmIChwY2lfZW5hYmxlX2Rl dmljZShkZXYtPnBkZXYpKQorCWlmIChwY2lfZW5hYmxlX2RldmljZSh2Ym94LT5kZGV2LnBkZXYp KQogCQlyZXR1cm4gLUVJTzsKIAotCXJldCA9IHZib3hfZHJtX3RoYXcoZGV2KTsKKwlyZXQgPSB2 Ym94X2RybV90aGF3KHZib3gpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKLQlkcm1fa21z X2hlbHBlcl9wb2xsX2VuYWJsZShkZXYpOworCWRybV9rbXNfaGVscGVyX3BvbGxfZW5hYmxlKCZ2 Ym94LT5kZGV2KTsKIAogCXJldHVybiAwOwogfQogCiBzdGF0aWMgaW50IHZib3hfcG1fc3VzcGVu ZChzdHJ1Y3QgZGV2aWNlICpkZXYpCiB7Ci0Jc3RydWN0IHBjaV9kZXYgKnBkZXYgPSB0b19wY2lf ZGV2KGRldik7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRkZXYgPSBwY2lfZ2V0X2RydmRhdGEocGRl dik7CisJc3RydWN0IHZib3hfcHJpdmF0ZSAqdmJveCA9IGRldl9nZXRfZHJ2ZGF0YShkZXYpOwog CWludCBlcnJvcjsKIAotCWVycm9yID0gdmJveF9kcm1fZnJlZXplKGRkZXYpOworCWVycm9yID0g dmJveF9kcm1fZnJlZXplKHZib3gpOwogCWlmIChlcnJvcikKIAkJcmV0dXJuIGVycm9yOwogCi0J cGNpX2Rpc2FibGVfZGV2aWNlKHBkZXYpOwotCXBjaV9zZXRfcG93ZXJfc3RhdGUocGRldiwgUENJ X0QzaG90KTsKKwlwY2lfZGlzYWJsZV9kZXZpY2UodmJveC0+ZGRldi5wZGV2KTsKKwlwY2lfc2V0 X3Bvd2VyX3N0YXRlKHZib3gtPmRkZXYucGRldiwgUENJX0QzaG90KTsKIAogCXJldHVybiAwOwog fQogCiBzdGF0aWMgaW50IHZib3hfcG1fcmVzdW1lKHN0cnVjdCBkZXZpY2UgKmRldikKIHsKLQlz dHJ1Y3QgZHJtX2RldmljZSAqZGRldiA9IHBjaV9nZXRfZHJ2ZGF0YSh0b19wY2lfZGV2KGRldikp OworCXN0cnVjdCB2Ym94X3ByaXZhdGUgKnZib3ggPSBkZXZfZ2V0X2RydmRhdGEoZGV2KTsKIAot CXJldHVybiB2Ym94X2RybV9yZXN1bWUoZGRldik7CisJcmV0dXJuIHZib3hfZHJtX3Jlc3VtZSh2 Ym94KTsKIH0KIAogc3RhdGljIGludCB2Ym94X3BtX2ZyZWV6ZShzdHJ1Y3QgZGV2aWNlICpkZXYp CiB7Ci0Jc3RydWN0IHBjaV9kZXYgKnBkZXYgPSB0b19wY2lfZGV2KGRldik7Ci0Jc3RydWN0IGRy bV9kZXZpY2UgKmRkZXYgPSBwY2lfZ2V0X2RydmRhdGEocGRldik7Ci0KLQlpZiAoIWRkZXYgfHwg IWRkZXYtPmRldl9wcml2YXRlKQotCQlyZXR1cm4gLUVOT0RFVjsKKwlzdHJ1Y3QgdmJveF9wcml2 YXRlICp2Ym94ID0gZGV2X2dldF9kcnZkYXRhKGRldik7CiAKLQlyZXR1cm4gdmJveF9kcm1fZnJl ZXplKGRkZXYpOworCXJldHVybiB2Ym94X2RybV9mcmVlemUodmJveCk7CiB9CiAKIHN0YXRpYyBp bnQgdmJveF9wbV90aGF3KHN0cnVjdCBkZXZpY2UgKmRldikKIHsKLQlzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGRldiA9IHBjaV9nZXRfZHJ2ZGF0YSh0b19wY2lfZGV2KGRldikpOworCXN0cnVjdCB2Ym94 X3ByaXZhdGUgKnZib3ggPSBkZXZfZ2V0X2RydmRhdGEoZGV2KTsKIAotCXJldHVybiB2Ym94X2Ry bV90aGF3KGRkZXYpOworCXJldHVybiB2Ym94X2RybV90aGF3KHZib3gpOwogfQogCiBzdGF0aWMg aW50IHZib3hfcG1fcG93ZXJvZmYoc3RydWN0IGRldmljZSAqZGV2KQogewotCXN0cnVjdCBkcm1f ZGV2aWNlICpkZGV2ID0gcGNpX2dldF9kcnZkYXRhKHRvX3BjaV9kZXYoZGV2KSk7CisJc3RydWN0 IHZib3hfcHJpdmF0ZSAqdmJveCA9IGRldl9nZXRfZHJ2ZGF0YShkZXYpOwogCi0JcmV0dXJuIHZi b3hfZHJtX2ZyZWV6ZShkZGV2KTsKKwlyZXR1cm4gdmJveF9kcm1fZnJlZXplKHZib3gpOwogfQog CiBzdGF0aWMgY29uc3Qgc3RydWN0IGRldl9wbV9vcHMgdmJveF9wbV9vcHMgPSB7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL3N0YWdpbmcvdmJveHZpZGVvL3Zib3hfZHJ2LmggYi9kcml2ZXJzL3N0YWdp bmcvdmJveHZpZGVvL3Zib3hfZHJ2LmgKaW5kZXggYThlMGRkOGI1N2JmLi4yOGZmZGZmZTg3N2Eg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvc3RhZ2luZy92Ym94dmlkZW8vdmJveF9kcnYuaAorKysgYi9k cml2ZXJzL3N0YWdpbmcvdmJveHZpZGVvL3Zib3hfZHJ2LmgKQEAgLTc1LDcgKzc1LDggQEAKIHN0 cnVjdCB2Ym94X2ZiZGV2OwogCiBzdHJ1Y3QgdmJveF9wcml2YXRlIHsKLQlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2OworCS8qIE11c3QgYmUgZmlyc3Q7IG9yIHdlIG11c3QgZGVmaW5lIG91ciBvd24g cmVsZWFzZSBjYWxsYmFjayAqLworCXN0cnVjdCBkcm1fZGV2aWNlIGRkZXY7CiAKIAl1OCBfX2lv bWVtICpndWVzdF9oZWFwOwogCXU4IF9faW9tZW0gKnZidmFfYnVmZmVyczsKQEAgLTE3OSw4ICsx ODAsOCBAQCBib29sIHZib3hfY2hlY2tfc3VwcG9ydGVkKHUxNiBpZCk7CiBpbnQgdmJveF9od19p bml0KHN0cnVjdCB2Ym94X3ByaXZhdGUgKnZib3gpOwogdm9pZCB2Ym94X2h3X2Zpbmkoc3RydWN0 IHZib3hfcHJpdmF0ZSAqdmJveCk7CiAKLWludCB2Ym94X21vZGVfaW5pdChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KTsKLXZvaWQgdmJveF9tb2RlX2Zpbmkoc3RydWN0IGRybV9kZXZpY2UgKmRldik7 CitpbnQgdmJveF9tb2RlX2luaXQoc3RydWN0IHZib3hfcHJpdmF0ZSAqdmJveCk7Cit2b2lkIHZi b3hfbW9kZV9maW5pKHN0cnVjdCB2Ym94X3ByaXZhdGUgKnZib3gpOwogCiAjZGVmaW5lIERSTV9N T0RFX0ZCX0NNRCBkcm1fbW9kZV9mYl9jbWQyCiAjZGVmaW5lIENSVENfRkIoY3J0YykgKChjcnRj KS0+cHJpbWFyeS0+ZmIpCkBAIC0xOTMsMTMgKzE5NCwxMyBAQCB2b2lkIHZib3hfZnJhbWVidWZm ZXJfZGlydHlfcmVjdGFuZ2xlcyhzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKIAkJCQkgICAg ICAgc3RydWN0IGRybV9jbGlwX3JlY3QgKnJlY3RzLAogCQkJCSAgICAgICB1bnNpZ25lZCBpbnQg bnVtX3JlY3RzKTsKIAotaW50IHZib3hfZnJhbWVidWZmZXJfaW5pdChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAoraW50IHZib3hfZnJhbWVidWZmZXJfaW5pdChzdHJ1Y3QgdmJveF9wcml2YXRlICp2 Ym94LAogCQkJICBzdHJ1Y3QgdmJveF9mcmFtZWJ1ZmZlciAqdmJveF9mYiwKIAkJCSAgY29uc3Qg c3RydWN0IERSTV9NT0RFX0ZCX0NNRCAqbW9kZV9jbWQsCiAJCQkgIHN0cnVjdCBkcm1fZ2VtX29i amVjdCAqb2JqKTsKIAotaW50IHZib3hfZmJkZXZfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KTsKLXZvaWQgdmJveF9mYmRldl9maW5pKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOworaW50IHZi b3hfZmJkZXZfaW5pdChzdHJ1Y3QgdmJveF9wcml2YXRlICp2Ym94KTsKK3ZvaWQgdmJveF9mYmRl dl9maW5pKHN0cnVjdCB2Ym94X3ByaXZhdGUgKnZib3gpOwogdm9pZCB2Ym94X2ZiZGV2X3NldF9i YXNlKHN0cnVjdCB2Ym94X3ByaXZhdGUgKnZib3gsIHVuc2lnbmVkIGxvbmcgZ3B1X2FkZHIpOwog CiBzdHJ1Y3QgdmJveF9ibyB7CkBAIC0yMzQsMTAgKzIzNSwxMCBAQCBpbnQgdmJveF9kdW1iX21t YXBfb2Zmc2V0KHN0cnVjdCBkcm1fZmlsZSAqZmlsZSwKIGludCB2Ym94X21tX2luaXQoc3RydWN0 IHZib3hfcHJpdmF0ZSAqdmJveCk7CiB2b2lkIHZib3hfbW1fZmluaShzdHJ1Y3QgdmJveF9wcml2 YXRlICp2Ym94KTsKIAotaW50IHZib3hfYm9fY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IGludCBzaXplLCBpbnQgYWxpZ24sCitpbnQgdmJveF9ib19jcmVhdGUoc3RydWN0IHZib3hfcHJp dmF0ZSAqdmJveCwgaW50IHNpemUsIGludCBhbGlnbiwKIAkJICAgdTMyIGZsYWdzLCBzdHJ1Y3Qg dmJveF9ibyAqKnB2Ym94Ym8pOwogCi1pbnQgdmJveF9nZW1fY3JlYXRlKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsCitpbnQgdmJveF9nZW1fY3JlYXRlKHN0cnVjdCB2Ym94X3ByaXZhdGUgKnZib3gs CiAJCSAgICB1MzIgc2l6ZSwgYm9vbCBpc2tlcm5lbCwgc3RydWN0IGRybV9nZW1fb2JqZWN0ICoq b2JqKTsKIAogaW50IHZib3hfYm9fcGluKHN0cnVjdCB2Ym94X2JvICpibywgdTMyIHBsX2ZsYWcs IHU2NCAqZ3B1X2FkZHIpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9zdGFnaW5nL3Zib3h2aWRlby92 Ym94X2ZiLmMgYi9kcml2ZXJzL3N0YWdpbmcvdmJveHZpZGVvL3Zib3hfZmIuYwppbmRleCA3OTgx NDExN2UwNjMuLjExYjYzNjRlZDE0YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9zdGFnaW5nL3Zib3h2 aWRlby92Ym94X2ZiLmMKKysrIGIvZHJpdmVycy9zdGFnaW5nL3Zib3h2aWRlby92Ym94X2ZiLmMK QEAgLTcxLDcgKzcxLDkgQEAgc3RhdGljIGludCB2Ym94ZmJfY3JlYXRlKHN0cnVjdCBkcm1fZmJf aGVscGVyICpoZWxwZXIsCiB7CiAJc3RydWN0IHZib3hfZmJkZXYgKmZiZGV2ID0KIAkgICAgY29u dGFpbmVyX29mKGhlbHBlciwgc3RydWN0IHZib3hfZmJkZXYsIGhlbHBlcik7Ci0Jc3RydWN0IGRy bV9kZXZpY2UgKmRldiA9IGZiZGV2LT5oZWxwZXIuZGV2OworCXN0cnVjdCB2Ym94X3ByaXZhdGUg KnZib3ggPSBjb250YWluZXJfb2YoZmJkZXYtPmhlbHBlci5kZXYsCisJCQkJCQkgc3RydWN0IHZi b3hfcHJpdmF0ZSwgZGRldik7CisJc3RydWN0IHBjaV9kZXYgKnBkZXYgPSB2Ym94LT5kZGV2LnBk ZXY7CiAJc3RydWN0IERSTV9NT0RFX0ZCX0NNRCBtb2RlX2NtZDsKIAlzdHJ1Y3QgZHJtX2ZyYW1l YnVmZmVyICpmYjsKIAlzdHJ1Y3QgZmJfaW5mbyAqaW5mbzsKQEAgLTg5LDEzICs5MSwxMyBAQCBz dGF0aWMgaW50IHZib3hmYl9jcmVhdGUoc3RydWN0IGRybV9mYl9oZWxwZXIgKmhlbHBlciwKIAog CXNpemUgPSBwaXRjaCAqIG1vZGVfY21kLmhlaWdodDsKIAotCXJldCA9IHZib3hfZ2VtX2NyZWF0 ZShmYmRldi0+aGVscGVyLmRldiwgc2l6ZSwgdHJ1ZSwgJmdvYmopOworCXJldCA9IHZib3hfZ2Vt X2NyZWF0ZSh2Ym94LCBzaXplLCB0cnVlLCAmZ29iaik7CiAJaWYgKHJldCkgewogCQlEUk1fRVJS T1IoImZhaWxlZCB0byBjcmVhdGUgZmJjb24gYmFja2luZyBvYmplY3QgJWRcbiIsIHJldCk7CiAJ CXJldHVybiByZXQ7CiAJfQogCi0JcmV0ID0gdmJveF9mcmFtZWJ1ZmZlcl9pbml0KGRldiwgJmZi ZGV2LT5hZmIsICZtb2RlX2NtZCwgZ29iaik7CisJcmV0ID0gdmJveF9mcmFtZWJ1ZmZlcl9pbml0 KHZib3gsICZmYmRldi0+YWZiLCAmbW9kZV9jbWQsIGdvYmopOwogCWlmIChyZXQpCiAJCXJldHVy biByZXQ7CiAKQEAgLTE0Myw4ICsxNDUsOCBAQCBzdGF0aWMgaW50IHZib3hmYl9jcmVhdGUoc3Ry dWN0IGRybV9mYl9oZWxwZXIgKmhlbHBlciwKIAkgKiBUaGlzIHNlZW1zIHRvIGJlIGRvbmUgZm9y IHNhZmV0eSBjaGVja2luZyB0aGF0IHRoZSBmcmFtZWJ1ZmZlcgogCSAqIGlzIG5vdCByZWdpc3Rl cmVkIHR3aWNlIGJ5IGRpZmZlcmVudCBkcml2ZXJzLgogCSAqLwotCWluZm8tPmFwZXJ0dXJlcy0+ cmFuZ2VzWzBdLmJhc2UgPSBwY2lfcmVzb3VyY2Vfc3RhcnQoZGV2LT5wZGV2LCAwKTsKLQlpbmZv LT5hcGVydHVyZXMtPnJhbmdlc1swXS5zaXplID0gcGNpX3Jlc291cmNlX2xlbihkZXYtPnBkZXYs IDApOworCWluZm8tPmFwZXJ0dXJlcy0+cmFuZ2VzWzBdLmJhc2UgPSBwY2lfcmVzb3VyY2Vfc3Rh cnQocGRldiwgMCk7CisJaW5mby0+YXBlcnR1cmVzLT5yYW5nZXNbMF0uc2l6ZSA9IHBjaV9yZXNv dXJjZV9sZW4ocGRldiwgMCk7CiAKIAlkcm1fZmJfaGVscGVyX2ZpbGxfZml4KGluZm8sIGZiLT5w aXRjaGVzWzBdLCBmYi0+Zm9ybWF0LT5kZXB0aCk7CiAJZHJtX2ZiX2hlbHBlcl9maWxsX3Zhcihp bmZvLCAmZmJkZXYtPmhlbHBlciwgc2l6ZXMtPmZiX3dpZHRoLApAQCAtMTY5LDkgKzE3MSw4IEBA IHN0YXRpYyBzdHJ1Y3QgZHJtX2ZiX2hlbHBlcl9mdW5jcyB2Ym94X2ZiX2hlbHBlcl9mdW5jcyA9 IHsKIAkuZmJfcHJvYmUgPSB2Ym94ZmJfY3JlYXRlLAogfTsKIAotdm9pZCB2Ym94X2ZiZGV2X2Zp bmkoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3ZvaWQgdmJveF9mYmRldl9maW5pKHN0cnVjdCB2 Ym94X3ByaXZhdGUgKnZib3gpCiB7Ci0Jc3RydWN0IHZib3hfcHJpdmF0ZSAqdmJveCA9IGRldi0+ ZGV2X3ByaXZhdGU7CiAJc3RydWN0IHZib3hfZmJkZXYgKmZiZGV2ID0gdmJveC0+ZmJkZXY7CiAJ c3RydWN0IHZib3hfZnJhbWVidWZmZXIgKmFmYiA9ICZmYmRldi0+YWZiOwogCkBAIC0yMDUsOSAr MjA2LDkgQEAgdm9pZCB2Ym94X2ZiZGV2X2Zpbmkoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlk cm1fZnJhbWVidWZmZXJfY2xlYW51cCgmYWZiLT5iYXNlKTsKIH0KIAotaW50IHZib3hfZmJkZXZf aW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQoraW50IHZib3hfZmJkZXZfaW5pdChzdHJ1Y3Qg dmJveF9wcml2YXRlICp2Ym94KQogewotCXN0cnVjdCB2Ym94X3ByaXZhdGUgKnZib3ggPSBkZXYt PmRldl9wcml2YXRlOworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSAmdmJveC0+ZGRldjsKIAlz dHJ1Y3QgdmJveF9mYmRldiAqZmJkZXY7CiAJaW50IHJldDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVy cy9zdGFnaW5nL3Zib3h2aWRlby92Ym94X2lycS5jIGIvZHJpdmVycy9zdGFnaW5nL3Zib3h2aWRl by92Ym94X2lycS5jCmluZGV4IDc0YWJkZjAyZDlmZC4uMDlmODU4ZWMxMzY5IDEwMDY0NAotLS0g YS9kcml2ZXJzL3N0YWdpbmcvdmJveHZpZGVvL3Zib3hfaXJxLmMKKysrIGIvZHJpdmVycy9zdGFn aW5nL3Zib3h2aWRlby92Ym94X2lycS5jCkBAIC0xMjMsNyArMTIzLDcgQEAgc3RhdGljIHZvaWQg dmFsaWRhdGVfb3Jfc2V0X3Bvc2l0aW9uX2hpbnRzKHN0cnVjdCB2Ym94X3ByaXZhdGUgKnZib3gp CiAgKi8KIHN0YXRpYyB2b2lkIHZib3hfdXBkYXRlX21vZGVfaGludHMoc3RydWN0IHZib3hfcHJp dmF0ZSAqdmJveCkKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gdmJveC0+ZGV2OworCXN0 cnVjdCBkcm1fZGV2aWNlICpkZXYgPSAmdmJveC0+ZGRldjsKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3Rv ciAqY29ubmVjdG9yOwogCXN0cnVjdCB2Ym94X2Nvbm5lY3RvciAqdmJveF9jb25uOwogCXN0cnVj dCB2YnZhX21vZGVoaW50ICpoaW50czsKQEAgLTE3OSw3ICsxNzksNyBAQCBzdGF0aWMgdm9pZCB2 Ym94X2hvdHBsdWdfd29ya2VyKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIAkJCQkJCSBob3Rw bHVnX3dvcmspOwogCiAJdmJveF91cGRhdGVfbW9kZV9oaW50cyh2Ym94KTsKLQlkcm1fa21zX2hl bHBlcl9ob3RwbHVnX2V2ZW50KHZib3gtPmRldik7CisJZHJtX2ttc19oZWxwZXJfaG90cGx1Z19l dmVudCgmdmJveC0+ZGRldik7CiB9CiAKIGludCB2Ym94X2lycV9pbml0KHN0cnVjdCB2Ym94X3By aXZhdGUgKnZib3gpCkBAIC0xODcsMTEgKzE4NywxMSBAQCBpbnQgdmJveF9pcnFfaW5pdChzdHJ1 Y3QgdmJveF9wcml2YXRlICp2Ym94KQogCUlOSVRfV09SSygmdmJveC0+aG90cGx1Z193b3JrLCB2 Ym94X2hvdHBsdWdfd29ya2VyKTsKIAl2Ym94X3VwZGF0ZV9tb2RlX2hpbnRzKHZib3gpOwogCi0J cmV0dXJuIGRybV9pcnFfaW5zdGFsbCh2Ym94LT5kZXYsIHZib3gtPmRldi0+cGRldi0+aXJxKTsK KwlyZXR1cm4gZHJtX2lycV9pbnN0YWxsKCZ2Ym94LT5kZGV2LCB2Ym94LT5kZGV2LnBkZXYtPmly cSk7CiB9CiAKIHZvaWQgdmJveF9pcnFfZmluaShzdHJ1Y3QgdmJveF9wcml2YXRlICp2Ym94KQog ewotCWRybV9pcnFfdW5pbnN0YWxsKHZib3gtPmRldik7CisJZHJtX2lycV91bmluc3RhbGwoJnZi b3gtPmRkZXYpOwogCWZsdXNoX3dvcmsoJnZib3gtPmhvdHBsdWdfd29yayk7CiB9CmRpZmYgLS1n aXQgYS9kcml2ZXJzL3N0YWdpbmcvdmJveHZpZGVvL3Zib3hfbWFpbi5jIGIvZHJpdmVycy9zdGFn aW5nL3Zib3h2aWRlby92Ym94X21haW4uYwppbmRleCA4MTUyOTJmMWQ3ZTYuLjk1MTAwYzU5NzZl NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9zdGFnaW5nL3Zib3h2aWRlby92Ym94X21haW4uYworKysg Yi9kcml2ZXJzL3N0YWdpbmcvdmJveHZpZGVvL3Zib3hfbWFpbi5jCkBAIC0xNTUsMTYgKzE1NSwx NiBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9mcmFtZWJ1ZmZlcl9mdW5jcyB2Ym94X2ZiX2Z1 bmNzID0gewogCS5kaXJ0eSA9IHZib3hfdXNlcl9mcmFtZWJ1ZmZlcl9kaXJ0eSwKIH07CiAKLWlu dCB2Ym94X2ZyYW1lYnVmZmVyX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKK2ludCB2Ym94 X2ZyYW1lYnVmZmVyX2luaXQoc3RydWN0IHZib3hfcHJpdmF0ZSAqdmJveCwKIAkJCSAgc3RydWN0 IHZib3hfZnJhbWVidWZmZXIgKnZib3hfZmIsCiAJCQkgIGNvbnN0IHN0cnVjdCBEUk1fTU9ERV9G Ql9DTUQgKm1vZGVfY21kLAogCQkJICBzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaikKIHsKIAlp bnQgcmV0OwogCi0JZHJtX2hlbHBlcl9tb2RlX2ZpbGxfZmJfc3RydWN0KGRldiwgJnZib3hfZmIt PmJhc2UsIG1vZGVfY21kKTsKKwlkcm1faGVscGVyX21vZGVfZmlsbF9mYl9zdHJ1Y3QoJnZib3gt PmRkZXYsICZ2Ym94X2ZiLT5iYXNlLCBtb2RlX2NtZCk7CiAJdmJveF9mYi0+b2JqID0gb2JqOwot CXJldCA9IGRybV9mcmFtZWJ1ZmZlcl9pbml0KGRldiwgJnZib3hfZmItPmJhc2UsICZ2Ym94X2Zi X2Z1bmNzKTsKKwlyZXQgPSBkcm1fZnJhbWVidWZmZXJfaW5pdCgmdmJveC0+ZGRldiwgJnZib3hf ZmItPmJhc2UsICZ2Ym94X2ZiX2Z1bmNzKTsKIAlpZiAocmV0KSB7CiAJCURSTV9FUlJPUigiZnJh bWVidWZmZXIgaW5pdCBmYWlsZWQgJWRcbiIsIHJldCk7CiAJCXJldHVybiByZXQ7CkBAIC0xNzcs NyArMTc3LDcgQEAgc3RhdGljIGludCB2Ym94X2FjY2VsX2luaXQoc3RydWN0IHZib3hfcHJpdmF0 ZSAqdmJveCkKIHsKIAl1bnNpZ25lZCBpbnQgaTsKIAotCXZib3gtPnZidmFfaW5mbyA9IGRldm1f a2NhbGxvYyh2Ym94LT5kZXYtPmRldiwgdmJveC0+bnVtX2NydGNzLAorCXZib3gtPnZidmFfaW5m byA9IGRldm1fa2NhbGxvYyh2Ym94LT5kZGV2LmRldiwgdmJveC0+bnVtX2NydGNzLAogCQkJCSAg ICAgICBzaXplb2YoKnZib3gtPnZidmFfaW5mbyksIEdGUF9LRVJORUwpOwogCWlmICghdmJveC0+ dmJ2YV9pbmZvKQogCQlyZXR1cm4gLUVOT01FTTsKQEAgLTE4NSw3ICsxODUsNyBAQCBzdGF0aWMg aW50IHZib3hfYWNjZWxfaW5pdChzdHJ1Y3QgdmJveF9wcml2YXRlICp2Ym94KQogCS8qIFRha2Ug YSBjb21tYW5kIGJ1ZmZlciBmb3IgZWFjaCBzY3JlZW4gZnJvbSB0aGUgZW5kIG9mIHVzYWJsZSBW UkFNLiAqLwogCXZib3gtPmF2YWlsYWJsZV92cmFtX3NpemUgLT0gdmJveC0+bnVtX2NydGNzICog VkJWQV9NSU5fQlVGRkVSX1NJWkU7CiAKLQl2Ym94LT52YnZhX2J1ZmZlcnMgPSBwY2lfaW9tYXBf cmFuZ2UodmJveC0+ZGV2LT5wZGV2LCAwLAorCXZib3gtPnZidmFfYnVmZmVycyA9IHBjaV9pb21h cF9yYW5nZSh2Ym94LT5kZGV2LnBkZXYsIDAsCiAJCQkJCSAgICAgdmJveC0+YXZhaWxhYmxlX3Zy YW1fc2l6ZSwKIAkJCQkJICAgICB2Ym94LT5udW1fY3J0Y3MgKgogCQkJCQkgICAgIFZCVkFfTUlO X0JVRkZFUl9TSVpFKTsKQEAgLTIwNCw3ICsyMDQsNyBAQCBzdGF0aWMgaW50IHZib3hfYWNjZWxf aW5pdChzdHJ1Y3QgdmJveF9wcml2YXRlICp2Ym94KQogc3RhdGljIHZvaWQgdmJveF9hY2NlbF9m aW5pKHN0cnVjdCB2Ym94X3ByaXZhdGUgKnZib3gpCiB7CiAJdmJveF9kaXNhYmxlX2FjY2VsKHZi b3gpOwotCXBjaV9pb3VubWFwKHZib3gtPmRldi0+cGRldiwgdmJveC0+dmJ2YV9idWZmZXJzKTsK KwlwY2lfaW91bm1hcCh2Ym94LT5kZGV2LnBkZXYsIHZib3gtPnZidmFfYnVmZmVycyk7CiB9CiAK IC8qKiBEbyB3ZSBzdXBwb3J0IHRoZSA0LjMgcGx1cyBtb2RlIGhpbnQgcmVwb3J0aW5nIGludGVy ZmFjZT8gKi8KQEAgLTI1Myw3ICsyNTMsNyBAQCBpbnQgdmJveF9od19pbml0KHN0cnVjdCB2Ym94 X3ByaXZhdGUgKnZib3gpCiAKIAkvKiBNYXAgZ3Vlc3QtaGVhcCBhdCBlbmQgb2YgdnJhbSAqLwog CXZib3gtPmd1ZXN0X2hlYXAgPQotCSAgICBwY2lfaW9tYXBfcmFuZ2UodmJveC0+ZGV2LT5wZGV2 LCAwLCBHVUVTVF9IRUFQX09GRlNFVCh2Ym94KSwKKwkgICAgcGNpX2lvbWFwX3JhbmdlKHZib3gt PmRkZXYucGRldiwgMCwgR1VFU1RfSEVBUF9PRkZTRVQodmJveCksCiAJCQkgICAgR1VFU1RfSEVB UF9TSVpFKTsKIAlpZiAoIXZib3gtPmd1ZXN0X2hlYXApCiAJCXJldHVybiAtRU5PTUVNOwpAQCAt Mjg4LDcgKzI4OCw3IEBAIGludCB2Ym94X2h3X2luaXQoc3RydWN0IHZib3hfcHJpdmF0ZSAqdmJv eCkKIAkJZ290byBlcnJfZGVzdHJveV9ndWVzdF9wb29sOwogCX0KIAotCXZib3gtPmxhc3RfbW9k ZV9oaW50cyA9IGRldm1fa2NhbGxvYyh2Ym94LT5kZXYtPmRldiwgdmJveC0+bnVtX2NydGNzLAor CXZib3gtPmxhc3RfbW9kZV9oaW50cyA9IGRldm1fa2NhbGxvYyh2Ym94LT5kZGV2LmRldiwgdmJv eC0+bnVtX2NydGNzLAogCQkJCQkgICAgIHNpemVvZihzdHJ1Y3QgdmJ2YV9tb2RlaGludCksCiAJ CQkJCSAgICAgR0ZQX0tFUk5FTCk7CiAJaWYgKCF2Ym94LT5sYXN0X21vZGVfaGludHMpIHsKQEAg LTMwNSw3ICszMDUsNyBAQCBpbnQgdmJveF9od19pbml0KHN0cnVjdCB2Ym94X3ByaXZhdGUgKnZi b3gpCiBlcnJfZGVzdHJveV9ndWVzdF9wb29sOgogCWdlbl9wb29sX2Rlc3Ryb3kodmJveC0+Z3Vl c3RfcG9vbCk7CiBlcnJfdW5tYXBfZ3Vlc3RfaGVhcDoKLQlwY2lfaW91bm1hcCh2Ym94LT5kZXYt PnBkZXYsIHZib3gtPmd1ZXN0X2hlYXApOworCXBjaV9pb3VubWFwKHZib3gtPmRkZXYucGRldiwg dmJveC0+Z3Vlc3RfaGVhcCk7CiAJcmV0dXJuIHJldDsKIH0KIApAQCAtMzEzLDcgKzMxMyw3IEBA IHZvaWQgdmJveF9od19maW5pKHN0cnVjdCB2Ym94X3ByaXZhdGUgKnZib3gpCiB7CiAJdmJveF9h Y2NlbF9maW5pKHZib3gpOwogCWdlbl9wb29sX2Rlc3Ryb3kodmJveC0+Z3Vlc3RfcG9vbCk7Ci0J cGNpX2lvdW5tYXAodmJveC0+ZGV2LT5wZGV2LCB2Ym94LT5ndWVzdF9oZWFwKTsKKwlwY2lfaW91 bm1hcCh2Ym94LT5kZGV2LnBkZXYsIHZib3gtPmd1ZXN0X2hlYXApOwogfQogCiAvKioKQEAgLTMy OCw3ICszMjgsNyBAQCB2b2lkIHZib3hfZHJpdmVyX2xhc3RjbG9zZShzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCQlkcm1fZmJfaGVscGVyX3Jlc3RvcmVfZmJkZXZfbW9kZV91bmxvY2tlZCgmdmJv eC0+ZmJkZXYtPmhlbHBlcik7CiB9CiAKLWludCB2Ym94X2dlbV9jcmVhdGUoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKK2ludCB2Ym94X2dlbV9jcmVhdGUoc3RydWN0IHZib3hfcHJpdmF0ZSAqdmJv eCwKIAkJICAgIHUzMiBzaXplLCBib29sIGlza2VybmVsLCBzdHJ1Y3QgZHJtX2dlbV9vYmplY3Qg KipvYmopCiB7CiAJc3RydWN0IHZib3hfYm8gKnZib3hibzsKQEAgLTM0MCw3ICszNDAsNyBAQCBp bnQgdmJveF9nZW1fY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaWYgKHNpemUgPT0g MCkKIAkJcmV0dXJuIC1FSU5WQUw7CiAKLQlyZXQgPSB2Ym94X2JvX2NyZWF0ZShkZXYsIHNpemUs IDAsIDAsICZ2Ym94Ym8pOworCXJldCA9IHZib3hfYm9fY3JlYXRlKHZib3gsIHNpemUsIDAsIDAs ICZ2Ym94Ym8pOwogCWlmIChyZXQpIHsKIAkJaWYgKHJldCAhPSAtRVJFU1RBUlRTWVMpCiAJCQlE Uk1fRVJST1IoImZhaWxlZCB0byBhbGxvY2F0ZSBHRU0gb2JqZWN0XG4iKTsKQEAgLTM1NSwxNCAr MzU1LDE2IEBAIGludCB2Ym94X2dlbV9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIGlu dCB2Ym94X2R1bWJfY3JlYXRlKHN0cnVjdCBkcm1fZmlsZSAqZmlsZSwKIAkJICAgICBzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX21vZGVfY3JlYXRlX2R1bWIgKmFyZ3MpCiB7Ci0J aW50IHJldDsKKwlzdHJ1Y3QgdmJveF9wcml2YXRlICp2Ym94ID0KKwkJY29udGFpbmVyX29mKGRl diwgc3RydWN0IHZib3hfcHJpdmF0ZSwgZGRldik7CiAJc3RydWN0IGRybV9nZW1fb2JqZWN0ICpn b2JqOwogCXUzMiBoYW5kbGU7CisJaW50IHJldDsKIAogCWFyZ3MtPnBpdGNoID0gYXJncy0+d2lk dGggKiAoKGFyZ3MtPmJwcCArIDcpIC8gOCk7CiAJYXJncy0+c2l6ZSA9IGFyZ3MtPnBpdGNoICog YXJncy0+aGVpZ2h0OwogCi0JcmV0ID0gdmJveF9nZW1fY3JlYXRlKGRldiwgYXJncy0+c2l6ZSwg ZmFsc2UsICZnb2JqKTsKKwlyZXQgPSB2Ym94X2dlbV9jcmVhdGUodmJveCwgYXJncy0+c2l6ZSwg ZmFsc2UsICZnb2JqKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCmRpZmYgLS1naXQgYS9k cml2ZXJzL3N0YWdpbmcvdmJveHZpZGVvL3Zib3hfbW9kZS5jIGIvZHJpdmVycy9zdGFnaW5nL3Zi b3h2aWRlby92Ym94X21vZGUuYwppbmRleCAyNTg3ZTZhZWNjYTIuLjEzNjk2YmExOWM0ZiAxMDA2 NDQKLS0tIGEvZHJpdmVycy9zdGFnaW5nL3Zib3h2aWRlby92Ym94X21vZGUuYworKysgYi9kcml2 ZXJzL3N0YWdpbmcvdmJveHZpZGVvL3Zib3hfbW9kZS5jCkBAIC0xNzksNyArMTc5LDcgQEAgc3Rh dGljIGJvb2wgdmJveF9zZXRfdXBfaW5wdXRfbWFwcGluZyhzdHJ1Y3QgdmJveF9wcml2YXRlICp2 Ym94KQogCSAqIElmIHNvIHRoZW4gc2NyZWVuIGxheW91dCBjYW4gYmUgZGVkdWNlZCBmcm9tIHRo ZSBjcnRjIG9mZnNldHMuCiAJICogU2FtZSBmYWxsLWJhY2sgaWYgdGhpcyBpcyB0aGUgZmJkZXYg ZnJhbWUtYnVmZmVyLgogCSAqLwotCWxpc3RfZm9yX2VhY2hfZW50cnkoY3J0Y2ksICZ2Ym94LT5k ZXYtPm1vZGVfY29uZmlnLmNydGNfbGlzdCwgaGVhZCkgeworCWxpc3RfZm9yX2VhY2hfZW50cnko Y3J0Y2ksICZ2Ym94LT5kZGV2Lm1vZGVfY29uZmlnLmNydGNfbGlzdCwgaGVhZCkgewogCQlpZiAo IWZiMSkgewogCQkJZmIxID0gQ1JUQ19GQihjcnRjaSk7CiAJCQlpZiAodG9fdmJveF9mcmFtZWJ1 ZmZlcihmYjEpID09ICZ2Ym94LT5mYmRldi0+YWZiKQpAQCAtMTg5LDcgKzE4OSw3IEBAIHN0YXRp YyBib29sIHZib3hfc2V0X3VwX2lucHV0X21hcHBpbmcoc3RydWN0IHZib3hfcHJpdmF0ZSAqdmJv eCkKIAkJfQogCX0KIAlpZiAoc2luZ2xlX2ZyYW1lYnVmZmVyKSB7Ci0JCWxpc3RfZm9yX2VhY2hf ZW50cnkoY3J0Y2ksICZ2Ym94LT5kZXYtPm1vZGVfY29uZmlnLmNydGNfbGlzdCwKKwkJbGlzdF9m b3JfZWFjaF9lbnRyeShjcnRjaSwgJnZib3gtPmRkZXYubW9kZV9jb25maWcuY3J0Y19saXN0LAog CQkJCSAgICBoZWFkKSB7CiAJCQlpZiAodG9fdmJveF9jcnRjKGNydGNpKS0+Y3J0Y19pZCAhPSAw KQogCQkJCWNvbnRpbnVlOwpAQCAtMjAyLDcgKzIwMiw3IEBAIHN0YXRpYyBib29sIHZib3hfc2V0 X3VwX2lucHV0X21hcHBpbmcoc3RydWN0IHZib3hfcHJpdmF0ZSAqdmJveCkKIAkJfQogCX0KIAkv KiBPdGhlcndpc2UgY2FsY3VsYXRlIHRoZSB0b3RhbCBzcGFuIG9mIGFsbCBzY3JlZW5zLiAqLwot CWxpc3RfZm9yX2VhY2hfZW50cnkoY29ubmVjdG9yaSwgJnZib3gtPmRldi0+bW9kZV9jb25maWcu Y29ubmVjdG9yX2xpc3QsCisJbGlzdF9mb3JfZWFjaF9lbnRyeShjb25uZWN0b3JpLCAmdmJveC0+ ZGRldi5tb2RlX2NvbmZpZy5jb25uZWN0b3JfbGlzdCwKIAkJCSAgICBoZWFkKSB7CiAJCXN0cnVj dCB2Ym94X2Nvbm5lY3RvciAqdmJveF9jb25uZWN0b3IgPQogCQkgICAgdG9fdmJveF9jb25uZWN0 b3IoY29ubmVjdG9yaSk7CkBAIC0yODUsNyArMjg1LDcgQEAgc3RhdGljIGludCB2Ym94X2NydGNf c2V0X2Jhc2VfYW5kX21vZGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCWlmIChtb2RlICYmIHZi b3hfc2V0X3VwX2lucHV0X21hcHBpbmcodmJveCkpIHsKIAkJc3RydWN0IGRybV9jcnRjICpjcnRj aTsKIAotCQlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNydGNpLCAmdmJveC0+ZGV2LT5tb2RlX2NvbmZp Zy5jcnRjX2xpc3QsCisJCWxpc3RfZm9yX2VhY2hfZW50cnkoY3J0Y2ksICZ2Ym94LT5kZGV2Lm1v ZGVfY29uZmlnLmNydGNfbGlzdCwKIAkJCQkgICAgaGVhZCkgewogCQkJaWYgKGNydGNpID09IGNy dGMpCiAJCQkJY29udGludWU7CkBAIC0zMjQsOCArMzI0LDYgQEAgc3RhdGljIGludCB2Ym94X2Ny dGNfcGFnZV9mbGlwKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCSAgICAgICB1aW50MzJfdCBw YWdlX2ZsaXBfZmxhZ3MsCiAJCQkgICAgICAgc3RydWN0IGRybV9tb2Rlc2V0X2FjcXVpcmVfY3R4 ICpjdHgpCiB7Ci0Jc3RydWN0IHZib3hfcHJpdmF0ZSAqdmJveCA9IGNydGMtPmRldi0+ZGV2X3By aXZhdGU7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRybSA9IHZib3gtPmRldjsKIAl1bnNpZ25lZCBs b25nIGZsYWdzOwogCWludCByYzsKIApAQCAtMzMzLDEyICszMzEsMTIgQEAgc3RhdGljIGludCB2 Ym94X2NydGNfcGFnZV9mbGlwKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlpZiAocmMpCiAJCXJl dHVybiByYzsKIAotCXNwaW5fbG9ja19pcnFzYXZlKCZkcm0tPmV2ZW50X2xvY2ssIGZsYWdzKTsK KwlzcGluX2xvY2tfaXJxc2F2ZSgmY3J0Yy0+ZGV2LT5ldmVudF9sb2NrLCBmbGFncyk7CiAKIAlp ZiAoZXZlbnQpCiAJCWRybV9jcnRjX3NlbmRfdmJsYW5rX2V2ZW50KGNydGMsIGV2ZW50KTsKIAot CXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmRybS0+ZXZlbnRfbG9jaywgZmxhZ3MpOworCXNwaW5f dW5sb2NrX2lycXJlc3RvcmUoJmNydGMtPmRldi0+ZXZlbnRfbG9jaywgZmxhZ3MpOwogCiAJcmV0 dXJuIDA7CiB9CkBAIC01OTMsMTkgKzU5MSwxOSBAQCBzdGF0aWMgaW50IHZib3hfZ2V0X21vZGVz KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiAKIAlpZiAodmJveF9jb25uZWN0b3It PnZib3hfY3J0Yy0+eF9oaW50ICE9IC0xKQogCQlkcm1fb2JqZWN0X3Byb3BlcnR5X3NldF92YWx1 ZSgmY29ubmVjdG9yLT5iYXNlLAotCQkJdmJveC0+ZGV2LT5tb2RlX2NvbmZpZy5zdWdnZXN0ZWRf eF9wcm9wZXJ0eSwKKwkJCXZib3gtPmRkZXYubW9kZV9jb25maWcuc3VnZ2VzdGVkX3hfcHJvcGVy dHksCiAJCQl2Ym94X2Nvbm5lY3Rvci0+dmJveF9jcnRjLT54X2hpbnQpOwogCWVsc2UKIAkJZHJt X29iamVjdF9wcm9wZXJ0eV9zZXRfdmFsdWUoJmNvbm5lY3Rvci0+YmFzZSwKLQkJCXZib3gtPmRl di0+bW9kZV9jb25maWcuc3VnZ2VzdGVkX3hfcHJvcGVydHksIDApOworCQkJdmJveC0+ZGRldi5t b2RlX2NvbmZpZy5zdWdnZXN0ZWRfeF9wcm9wZXJ0eSwgMCk7CiAKIAlpZiAodmJveF9jb25uZWN0 b3ItPnZib3hfY3J0Yy0+eV9oaW50ICE9IC0xKQogCQlkcm1fb2JqZWN0X3Byb3BlcnR5X3NldF92 YWx1ZSgmY29ubmVjdG9yLT5iYXNlLAotCQkJdmJveC0+ZGV2LT5tb2RlX2NvbmZpZy5zdWdnZXN0 ZWRfeV9wcm9wZXJ0eSwKKwkJCXZib3gtPmRkZXYubW9kZV9jb25maWcuc3VnZ2VzdGVkX3lfcHJv cGVydHksCiAJCQl2Ym94X2Nvbm5lY3Rvci0+dmJveF9jcnRjLT55X2hpbnQpOwogCWVsc2UKIAkJ ZHJtX29iamVjdF9wcm9wZXJ0eV9zZXRfdmFsdWUoJmNvbm5lY3Rvci0+YmFzZSwKLQkJCXZib3gt PmRldi0+bW9kZV9jb25maWcuc3VnZ2VzdGVkX3lfcHJvcGVydHksIDApOworCQkJdmJveC0+ZGRl di5tb2RlX2NvbmZpZy5zdWdnZXN0ZWRfeV9wcm9wZXJ0eSwgMCk7CiAKIAlyZXR1cm4gbnVtX21v ZGVzOwogfQpAQCAtNzAxLDYgKzY5OSw4IEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVy ICp2Ym94X3VzZXJfZnJhbWVidWZmZXJfY3JlYXRlKAogCQlzdHJ1Y3QgZHJtX2ZpbGUgKmZpbHAs CiAJCWNvbnN0IHN0cnVjdCBkcm1fbW9kZV9mYl9jbWQyICptb2RlX2NtZCkKIHsKKwlzdHJ1Y3Qg dmJveF9wcml2YXRlICp2Ym94ID0KKwkJY29udGFpbmVyX29mKGRldiwgc3RydWN0IHZib3hfcHJp dmF0ZSwgZGRldik7CiAJc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmo7CiAJc3RydWN0IHZib3hf ZnJhbWVidWZmZXIgKnZib3hfZmI7CiAJaW50IHJldCA9IC1FTk9NRU07CkBAIC03MTMsNyArNzEz LDcgQEAgc3RhdGljIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKnZib3hfdXNlcl9mcmFtZWJ1ZmZl cl9jcmVhdGUoCiAJaWYgKCF2Ym94X2ZiKQogCQlnb3RvIGVycl91bnJlZl9vYmo7CiAKLQlyZXQg PSB2Ym94X2ZyYW1lYnVmZmVyX2luaXQoZGV2LCB2Ym94X2ZiLCBtb2RlX2NtZCwgb2JqKTsKKwly ZXQgPSB2Ym94X2ZyYW1lYnVmZmVyX2luaXQodmJveCwgdmJveF9mYiwgbW9kZV9jbWQsIG9iaik7 CiAJaWYgKHJldCkKIAkJZ290byBlcnJfZnJlZV92Ym94X2ZiOwogCkBAIC03MzAsOSArNzMwLDkg QEAgc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fbW9kZV9jb25maWdfZnVuY3MgdmJveF9tb2RlX2Z1 bmNzID0gewogCS5mYl9jcmVhdGUgPSB2Ym94X3VzZXJfZnJhbWVidWZmZXJfY3JlYXRlLAogfTsK IAotaW50IHZib3hfbW9kZV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitpbnQgdmJveF9t b2RlX2luaXQoc3RydWN0IHZib3hfcHJpdmF0ZSAqdmJveCkKIHsKLQlzdHJ1Y3QgdmJveF9wcml2 YXRlICp2Ym94ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0g JnZib3gtPmRkZXY7CiAJc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyOwogCXN0cnVjdCB2Ym94 X2NydGMgKnZib3hfY3J0YzsKIAl1bnNpZ25lZCBpbnQgaTsKQEAgLTc3MSw5ICs3NzEsOSBAQCBp bnQgdmJveF9tb2RlX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlyZXR1cm4gcmV0Owog fQogCi12b2lkIHZib3hfbW9kZV9maW5pKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit2b2lkIHZi b3hfbW9kZV9maW5pKHN0cnVjdCB2Ym94X3ByaXZhdGUgKnZib3gpCiB7Ci0JZHJtX21vZGVfY29u ZmlnX2NsZWFudXAoZGV2KTsKKwlkcm1fbW9kZV9jb25maWdfY2xlYW51cCgmdmJveC0+ZGRldik7 CiAJLyogdmJveF9jdXJzb3JfZmluaShkZXYpOyAqLwogfQogCkBAIC04MjQsNyArODI0LDcgQEAg c3RhdGljIGludCB2Ym94X2N1cnNvcl9zZXQyKHN0cnVjdCBkcm1fY3J0YyAqY3J0Yywgc3RydWN0 IGRybV9maWxlICpmaWxlX3ByaXYsCiAKIAkJLyogSGlkZSBjdXJzb3IuICovCiAJCXZib3hfY3J0 Yy0+Y3Vyc29yX2VuYWJsZWQgPSBmYWxzZTsKLQkJbGlzdF9mb3JfZWFjaF9lbnRyeShjcnRjaSwg JnZib3gtPmRldi0+bW9kZV9jb25maWcuY3J0Y19saXN0LAorCQlsaXN0X2Zvcl9lYWNoX2VudHJ5 KGNydGNpLCAmdmJveC0+ZGRldi5tb2RlX2NvbmZpZy5jcnRjX2xpc3QsCiAJCQkJICAgIGhlYWQp IHsKIAkJCWlmICh0b192Ym94X2NydGMoY3J0Y2kpLT5jdXJzb3JfZW5hYmxlZCkKIAkJCQljdXJz b3JfZW5hYmxlZCA9IHRydWU7CmRpZmYgLS1naXQgYS9kcml2ZXJzL3N0YWdpbmcvdmJveHZpZGVv L3Zib3hfdHRtLmMgYi9kcml2ZXJzL3N0YWdpbmcvdmJveHZpZGVvL3Zib3hfdHRtLmMKaW5kZXgg NTQ4ZWRiN2M0OTRiLi43YjhlYWMzMGZhY2EgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvc3RhZ2luZy92 Ym94dmlkZW8vdmJveF90dG0uYworKysgYi9kcml2ZXJzL3N0YWdpbmcvdmJveHZpZGVvL3Zib3hf dHRtLmMKQEAgLTE2OSw3ICsxNjksNyBAQCBzdGF0aWMgaW50IHZib3hfdHRtX2lvX21lbV9yZXNl cnZlKHN0cnVjdCB0dG1fYm9fZGV2aWNlICpiZGV2LAogCQlyZXR1cm4gMDsKIAljYXNlIFRUTV9Q TF9WUkFNOgogCQltZW0tPmJ1cy5vZmZzZXQgPSBtZW0tPnN0YXJ0IDw8IFBBR0VfU0hJRlQ7Ci0J CW1lbS0+YnVzLmJhc2UgPSBwY2lfcmVzb3VyY2Vfc3RhcnQodmJveC0+ZGV2LT5wZGV2LCAwKTsK KwkJbWVtLT5idXMuYmFzZSA9IHBjaV9yZXNvdXJjZV9zdGFydCh2Ym94LT5kZGV2LnBkZXYsIDAp OwogCQltZW0tPmJ1cy5pc19pb21lbSA9IHRydWU7CiAJCWJyZWFrOwogCWRlZmF1bHQ6CkBAIC0y MjQsNyArMjI0LDcgQEAgc3RhdGljIHN0cnVjdCB0dG1fYm9fZHJpdmVyIHZib3hfYm9fZHJpdmVy ID0gewogaW50IHZib3hfbW1faW5pdChzdHJ1Y3QgdmJveF9wcml2YXRlICp2Ym94KQogewogCWlu dCByZXQ7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHZib3gtPmRldjsKKwlzdHJ1Y3QgZHJt X2RldmljZSAqZGV2ID0gJnZib3gtPmRkZXY7CiAJc3RydWN0IHR0bV9ib19kZXZpY2UgKmJkZXYg PSAmdmJveC0+dHRtLmJkZXY7CiAKIAlyZXQgPSB2Ym94X3R0bV9nbG9iYWxfaW5pdCh2Ym94KTsK QEAgLTI2OSw4ICsyNjksOCBAQCB2b2lkIHZib3hfbW1fZmluaShzdHJ1Y3QgdmJveF9wcml2YXRl ICp2Ym94KQogewogI2lmZGVmIERSTV9NVFJSX1dDCiAJZHJtX210cnJfZGVsKHZib3gtPmZiX210 cnIsCi0JCSAgICAgcGNpX3Jlc291cmNlX3N0YXJ0KHZib3gtPmRldi0+cGRldiwgMCksCi0JCSAg ICAgcGNpX3Jlc291cmNlX2xlbih2Ym94LT5kZXYtPnBkZXYsIDApLCBEUk1fTVRSUl9XQyk7CisJ CSAgICAgcGNpX3Jlc291cmNlX3N0YXJ0KHZib3gtPmRkZXYucGRldiwgMCksCisJCSAgICAgcGNp X3Jlc291cmNlX2xlbih2Ym94LT5kZGV2LnBkZXYsIDApLCBEUk1fTVRSUl9XQyk7CiAjZWxzZQog CWFyY2hfcGh5c193Y19kZWwodmJveC0+ZmJfbXRycik7CiAjZW5kaWYKQEAgLTMwNSwxMCArMzA1 LDkgQEAgdm9pZCB2Ym94X3R0bV9wbGFjZW1lbnQoc3RydWN0IHZib3hfYm8gKmJvLCBpbnQgZG9t YWluKQogCX0KIH0KIAotaW50IHZib3hfYm9fY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IGludCBzaXplLCBpbnQgYWxpZ24sCitpbnQgdmJveF9ib19jcmVhdGUoc3RydWN0IHZib3hfcHJp dmF0ZSAqdmJveCwgaW50IHNpemUsIGludCBhbGlnbiwKIAkJICAgdTMyIGZsYWdzLCBzdHJ1Y3Qg dmJveF9ibyAqKnB2Ym94Ym8pCiB7Ci0Jc3RydWN0IHZib3hfcHJpdmF0ZSAqdmJveCA9IGRldi0+ ZGV2X3ByaXZhdGU7CiAJc3RydWN0IHZib3hfYm8gKnZib3hibzsKIAlzaXplX3QgYWNjX3NpemU7 CiAJaW50IHJldDsKQEAgLTMxNyw3ICszMTYsNyBAQCBpbnQgdmJveF9ib19jcmVhdGUoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwgaW50IHNpemUsIGludCBhbGlnbiwKIAlpZiAoIXZib3hibykKIAkJ cmV0dXJuIC1FTk9NRU07CiAKLQlyZXQgPSBkcm1fZ2VtX29iamVjdF9pbml0KGRldiwgJnZib3hi by0+Z2VtLCBzaXplKTsKKwlyZXQgPSBkcm1fZ2VtX29iamVjdF9pbml0KCZ2Ym94LT5kZGV2LCAm dmJveGJvLT5nZW0sIHNpemUpOwogCWlmIChyZXQpCiAJCWdvdG8gZXJyX2ZyZWVfdmJveGJvOwog Ci0tIAoyLjE5LjAucmMxCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmkt ZGV2ZWwK