From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ezequiel Garcia Subject: [PATCH] drm/virtio: Drop deprecated load/unload initialization Date: Thu, 3 Jan 2019 13:16:00 -0300 Message-ID: <20190103161600.19556-1-ezequiel@collabora.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by gabe.freedesktop.org (Postfix) with ESMTPS id D89106E3DD for ; Thu, 3 Jan 2019 16:16:18 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org, virtualization@lists.linux-foundation.org Cc: David Airlie , Ezequiel Garcia , Gerd Hoffmann List-Id: dri-devel@lists.freedesktop.org TW92ZSB0aGUgY29kZSBhcm91bmQgc28gdGhlIGRyaXZlciBpcyBwcm9iZWQgdGhlIGJ1cwoucHJv YmUgYW5kIHJlbW92ZWQgZnJvbSB0aGUgYnVzIC5yZW1vdmUgY2FsbGJhY2tzLgpUaGlzIGNvbW1p dCBpcyBqdXN0IGEgY2xlYW51cCBhbmQgc2hvdWxkbid0IGFmZmVjdApmdW5jdGlvbmFsaXR5LgoK U2lnbmVkLW9mZi1ieTogRXplcXVpZWwgR2FyY2lhIDxlemVxdWllbEBjb2xsYWJvcmEuY29tPgot LS0KIGRyaXZlcnMvZ3B1L2RybS92aXJ0aW8vTWFrZWZpbGUgICAgICAgICAgfCAgIDIgKy0KIGRy aXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9kaXNwbGF5LmMgfCAgIDMgKy0KIGRyaXZlcnMv Z3B1L2RybS92aXJ0aW8vdmlydGdwdV9kcm1fYnVzLmMgfCAxMDMgLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0KIGRyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9kcnYuYyAgICAgfCAgNzkgKysr KysrKysrKysrKysrKy0KIGRyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9kcnYuaCAgICAg fCAgIDkgKy0KIGRyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9rbXMuYyAgICAgfCAgIDkg Ky0KIDYgZmlsZXMgY2hhbmdlZCwgODMgaW5zZXJ0aW9ucygrKSwgMTIyIGRlbGV0aW9ucygtKQog ZGVsZXRlIG1vZGUgMTAwNjQ0IGRyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9kcm1fYnVz LmMKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL01ha2VmaWxlIGIvZHJpdmVy cy9ncHUvZHJtL3ZpcnRpby9NYWtlZmlsZQppbmRleCBmMjlkZWVjODNkMWYuLjRlOTBjYzhmYTY1 MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3ZpcnRpby9NYWtlZmlsZQorKysgYi9kcml2 ZXJzL2dwdS9kcm0vdmlydGlvL01ha2VmaWxlCkBAIC0zLDcgKzMsNyBAQAogIyBNYWtlZmlsZSBm b3IgdGhlIGRybSBkZXZpY2UgZHJpdmVyLiAgVGhpcyBkcml2ZXIgcHJvdmlkZXMgc3VwcG9ydCBm b3IgdGhlCiAjIERpcmVjdCBSZW5kZXJpbmcgSW5mcmFzdHJ1Y3R1cmUgKERSSSkgaW4gWEZyZWU4 NiA0LjEuMCBhbmQgaGlnaGVyLgogCi12aXJ0aW8tZ3B1LXkgOj0gdmlydGdwdV9kcnYubyB2aXJ0 Z3B1X2ttcy5vIHZpcnRncHVfZHJtX2J1cy5vIHZpcnRncHVfZ2VtLm8gXAordmlydGlvLWdwdS15 IDo9IHZpcnRncHVfZHJ2Lm8gdmlydGdwdV9rbXMubyB2aXJ0Z3B1X2dlbS5vIFwKIAl2aXJ0Z3B1 X2ZiLm8gdmlydGdwdV9kaXNwbGF5Lm8gdmlydGdwdV92cS5vIHZpcnRncHVfdHRtLm8gXAogCXZp cnRncHVfZmVuY2UubyB2aXJ0Z3B1X29iamVjdC5vIHZpcnRncHVfZGVidWdmcy5vIHZpcnRncHVf cGxhbmUubyBcCiAJdmlydGdwdV9pb2N0bC5vIHZpcnRncHVfcHJpbWUubwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL3ZpcnRpby92aXJ0Z3B1X2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2Ry bS92aXJ0aW8vdmlydGdwdV9kaXNwbGF5LmMKaW5kZXggZDUzOWJjMjhkYzk3Li44N2Q3YzQ5Y2Yw NTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9kaXNwbGF5LmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL3ZpcnRpby92aXJ0Z3B1X2Rpc3BsYXkuYwpAQCAtMzU4LDcg KzM1OCw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX21vZGVfY29uZmlnX2Z1bmNzIHZpcnRp b19ncHVfbW9kZV9mdW5jcyA9IHsKIAkuYXRvbWljX2NvbW1pdCA9IGRybV9hdG9taWNfaGVscGVy X2NvbW1pdCwKIH07CiAKLWludCB2aXJ0aW9fZ3B1X21vZGVzZXRfaW5pdChzdHJ1Y3QgdmlydGlv X2dwdV9kZXZpY2UgKnZnZGV2KQordm9pZCB2aXJ0aW9fZ3B1X21vZGVzZXRfaW5pdChzdHJ1Y3Qg dmlydGlvX2dwdV9kZXZpY2UgKnZnZGV2KQogewogCWludCBpOwogCkBAIC0zNzcsNyArMzc3LDYg QEAgaW50IHZpcnRpb19ncHVfbW9kZXNldF9pbml0KHN0cnVjdCB2aXJ0aW9fZ3B1X2RldmljZSAq dmdkZXYpCiAJCXZnZGV2X291dHB1dF9pbml0KHZnZGV2LCBpKTsKIAogCWRybV9tb2RlX2NvbmZp Z19yZXNldCh2Z2Rldi0+ZGRldik7Ci0JcmV0dXJuIDA7CiB9CiAKIHZvaWQgdmlydGlvX2dwdV9t b2Rlc2V0X2Zpbmkoc3RydWN0IHZpcnRpb19ncHVfZGV2aWNlICp2Z2RldikKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9kcm1fYnVzLmMgYi9kcml2ZXJzL2dwdS9k cm0vdmlydGlvL3ZpcnRncHVfZHJtX2J1cy5jCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwODg3ZTBiNjRiOWMuLjAwMDAwMDAwMDAwMAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdmlydGlv L3ZpcnRncHVfZHJtX2J1cy5jCisrKyAvZGV2L251bGwKQEAgLTEsMTAzICswLDAgQEAKLS8qCi0g KiBDb3B5cmlnaHQgKEMpIDIwMTUgUmVkIEhhdCwgSW5jLgotICogQWxsIFJpZ2h0cyBSZXNlcnZl ZC4KLSAqCi0gKiBQZXJtaXNzaW9uIGlzIGhlcmVieSBncmFudGVkLCBmcmVlIG9mIGNoYXJnZSwg dG8gYW55IHBlcnNvbiBvYnRhaW5pbmcKLSAqIGEgY29weSBvZiB0aGlzIHNvZnR3YXJlIGFuZCBh c3NvY2lhdGVkIGRvY3VtZW50YXRpb24gZmlsZXMgKHRoZQotICogIlNvZnR3YXJlIiksIHRvIGRl YWwgaW4gdGhlIFNvZnR3YXJlIHdpdGhvdXQgcmVzdHJpY3Rpb24sIGluY2x1ZGluZwotICogd2l0 aG91dCBsaW1pdGF0aW9uIHRoZSByaWdodHMgdG8gdXNlLCBjb3B5LCBtb2RpZnksIG1lcmdlLCBw dWJsaXNoLAotICogZGlzdHJpYnV0ZSwgc3VibGljZW5zZSwgYW5kL29yIHNlbGwgY29waWVzIG9m IHRoZSBTb2Z0d2FyZSwgYW5kIHRvCi0gKiBwZXJtaXQgcGVyc29ucyB0byB3aG9tIHRoZSBTb2Z0 d2FyZSBpcyBmdXJuaXNoZWQgdG8gZG8gc28sIHN1YmplY3QgdG8KLSAqIHRoZSBmb2xsb3dpbmcg Y29uZGl0aW9uczoKLSAqCi0gKiBUaGUgYWJvdmUgY29weXJpZ2h0IG5vdGljZSBhbmQgdGhpcyBw ZXJtaXNzaW9uIG5vdGljZSAoaW5jbHVkaW5nIHRoZQotICogbmV4dCBwYXJhZ3JhcGgpIHNoYWxs IGJlIGluY2x1ZGVkIGluIGFsbCBjb3BpZXMgb3Igc3Vic3RhbnRpYWwKLSAqIHBvcnRpb25zIG9m IHRoZSBTb2Z0d2FyZS4KLSAqCi0gKiBUSEUgU09GVFdBUkUgSVMgUFJPVklERUQgIkFTIElTIiwg V0lUSE9VVCBXQVJSQU5UWSBPRiBBTlkgS0lORCwKLSAqIEVYUFJFU1MgT1IgSU1QTElFRCwgSU5D TFVESU5HIEJVVCBOT1QgTElNSVRFRCBUTyBUSEUgV0FSUkFOVElFUyBPRgotICogTUVSQ0hBTlRB QklMSVRZLCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBTkQgTk9OSU5GUklOR0VN RU5ULgotICogSU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVCBPV05FUihTKSBBTkQvT1Ig SVRTIFNVUFBMSUVSUyBCRQotICogTElBQkxFIEZPUiBBTlkgQ0xBSU0sIERBTUFHRVMgT1IgT1RI RVIgTElBQklMSVRZLCBXSEVUSEVSIElOIEFOIEFDVElPTgotICogT0YgQ09OVFJBQ1QsIFRPUlQg T1IgT1RIRVJXSVNFLCBBUklTSU5HIEZST00sIE9VVCBPRiBPUiBJTiBDT05ORUNUSU9OCi0gKiBX SVRIIFRIRSBTT0ZUV0FSRSBPUiBUSEUgVVNFIE9SIE9USEVSIERFQUxJTkdTIElOIFRIRSBTT0ZU V0FSRS4KLSAqLwotCi0jaW5jbHVkZSA8bGludXgvcGNpLmg+Ci0jaW5jbHVkZSA8ZHJtL2RybV9m Yl9oZWxwZXIuaD4KLQotI2luY2x1ZGUgInZpcnRncHVfZHJ2LmgiCi0KLWludCBkcm1fdmlydGlv X2luaXQoc3RydWN0IGRybV9kcml2ZXIgKmRyaXZlciwgc3RydWN0IHZpcnRpb19kZXZpY2UgKnZk ZXYpCi17Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldjsKLQlpbnQgcmV0OwotCi0JZGV2ID0gZHJt X2Rldl9hbGxvYyhkcml2ZXIsICZ2ZGV2LT5kZXYpOwotCWlmIChJU19FUlIoZGV2KSkKLQkJcmV0 dXJuIFBUUl9FUlIoZGV2KTsKLQl2ZGV2LT5wcml2ID0gZGV2OwotCi0JaWYgKHN0cmNtcCh2ZGV2 LT5kZXYucGFyZW50LT5idXMtPm5hbWUsICJwY2kiKSA9PSAwKSB7Ci0JCXN0cnVjdCBwY2lfZGV2 ICpwZGV2ID0gdG9fcGNpX2Rldih2ZGV2LT5kZXYucGFyZW50KTsKLQkJY29uc3QgY2hhciAqcG5h bWUgPSBkZXZfbmFtZSgmcGRldi0+ZGV2KTsKLQkJYm9vbCB2Z2EgPSAocGRldi0+Y2xhc3MgPj4g OCkgPT0gUENJX0NMQVNTX0RJU1BMQVlfVkdBOwotCQljaGFyIHVuaXF1ZVsyMF07Ci0KLQkJRFJN X0lORk8oInBjaTogJXMgZGV0ZWN0ZWQgYXQgJXNcbiIsCi0JCQkgdmdhID8gInZpcnRpby12Z2Ei IDogInZpcnRpby1ncHUtcGNpIiwKLQkJCSBwbmFtZSk7Ci0JCWRldi0+cGRldiA9IHBkZXY7Ci0J CWlmICh2Z2EpCi0JCQlkcm1fZmJfaGVscGVyX3JlbW92ZV9jb25mbGljdGluZ19wY2lfZnJhbWVi dWZmZXJzKHBkZXYsCi0JCQkJCQkJCQkgIDAsCi0JCQkJCQkJCQkgICJ2aXJ0aW9kcm1mYiIpOwot Ci0JCS8qCi0JCSAqIE5vcm1hbGx5IHRoZSBkcm1fZGV2X3NldF91bmlxdWUoKSBjYWxsIGlzIGRv bmUgYnkgY29yZSBEUk0uCi0JCSAqIFRoZSBmb2xsb3dpbmcgY29tbWVudCBjb3ZlcnMsIHdoeSB2 aXJ0aW8gY2Fubm90IHJlbHkgb24gaXQuCi0JCSAqCi0JCSAqIFVubGlrZSB0aGUgb3RoZXIgdmly dHVhbCBHUFUgZHJpdmVycywgdmlydGlvIGFic3RyYWN0cyB0aGUKLQkJICogdW5kZXJseWluZyBi dXMgdHlwZSBieSB1c2luZyBzdHJ1Y3QgdmlydGlvX2RldmljZS4KLQkJICoKLQkJICogSGVuY2Ug dGhlIGRldl9pc19wY2koKSBjaGVjaywgdXNlZCBpbiBjb3JlIERSTSwgd2lsbCBmYWlsCi0JCSAq IGFuZCB0aGUgdW5pcXVlIHJldHVybmVkIHdpbGwgYmUgdGhlIHZpcnRpb19kZXZpY2UgInZpcnRp bzAiLAotCQkgKiB3aGlsZSBhICJwY2k6Li4uIiBvbmUgaXMgcmVxdWlyZWQuCi0JCSAqCi0JCSAq IEEgZmV3IG90aGVyIGlkZWFzIHdlcmUgY29uc2lkZXJlZDoKLQkJICogLSBFeHRlbmQgdGhlIGRl dl9pc19wY2koKSBjaGVjayBbaW4gZHJtX3NldF9idXNpZF0gdG8KLQkJICogICBjb25zaWRlciB2 aXJ0aW8uCi0JCSAqICAgU2VlbXMgbGlrZSBhIGJpZ2dlciBoYWNrIHRoYW4gd2hhdCB3ZSBoYXZl IGFscmVhZHkuCi0JCSAqCi0JCSAqIC0gUG9pbnQgZHJtX2RldmljZTo6ZGV2IHRvIHRoZSBwYXJl bnQgb2YgdGhlIHZpcnRpb19kZXZpY2UKLQkJICogICBTZW1hbnRpYyBjaGFuZ2VzOgotCQkgKiAg ICogVXNpbmcgdGhlIHdyb25nIGRldmljZSBmb3IgaTJjLCBmcmFtZWJ1ZmZlcl9hbGxvYyBhbmQK LQkJICogICAgIHByaW1lIGltcG9ydC4KLQkJICogICBWaXN1YWwgY2hhbmdlczoKLQkJICogICAq IEhlbHBlcnMgc3VjaCBhcyBEUk1fREVWX0VSUk9SLCBkZXZfaW5mbywgZHJtX3ByaW50ZXIsCi0J CSAqICAgICB3aWxsIHByaW50IHRoZSB3cm9uZyBpbmZvcm1hdGlvbi4KLQkJICoKLQkJICogV2Ug Y291bGQgYWRkcmVzcyB0aGUgbGF0dGVyIGlzc3VlcywgYnkgaW50cm9kdWNpbmcKLQkJICogZHJt X2RldmljZTo6YnVzX2RldiwgLi4uIHdoaWNoIHdvdWxkIGJlIHVzZWQgc29sZWx5IGZvciB0aGlz LgotCQkgKgotCQkgKiBTbyBmb3IgdGhlIG1vbWVudCBrZWVwIHRoaW5ncyBhcy1pcywgd2l0aCBh IGJ1bGt5IGNvbW1lbnQKLQkJICogZm9yIHRoZSBuZXh0IHBlcnNvbiB3aG8gZmVlbHMgbGlrZSBy ZW1vdmluZyB0aGlzCi0JCSAqIGRybV9kZXZfc2V0X3VuaXF1ZSgpIHF1aXJrLgotCQkgKi8KLQkJ c25wcmludGYodW5pcXVlLCBzaXplb2YodW5pcXVlKSwgInBjaTolcyIsIHBuYW1lKTsKLQkJcmV0 ID0gZHJtX2Rldl9zZXRfdW5pcXVlKGRldiwgdW5pcXVlKTsKLQkJaWYgKHJldCkKLQkJCWdvdG8g ZXJyX2ZyZWU7Ci0KLQl9Ci0KLQlyZXQgPSBkcm1fZGV2X3JlZ2lzdGVyKGRldiwgMCk7Ci0JaWYg KHJldCkKLQkJZ290byBlcnJfZnJlZTsKLQotCXJldHVybiAwOwotCi1lcnJfZnJlZToKLQlkcm1f ZGV2X3B1dChkZXYpOwotCXJldHVybiByZXQ7Ci19CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vdmlydGlvL3ZpcnRncHVfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVf ZHJ2LmMKaW5kZXggN2RmNTA5MjBjMWUwLi5hZjkyOTY0YjY4ODkgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdmly dGlvL3ZpcnRncHVfZHJ2LmMKQEAgLTQwLDggKzQwLDYwIEBAIHN0YXRpYyBpbnQgdmlydGlvX2dw dV9tb2Rlc2V0ID0gLTE7CiBNT0RVTEVfUEFSTV9ERVNDKG1vZGVzZXQsICJEaXNhYmxlL0VuYWJs ZSBtb2Rlc2V0dGluZyIpOwogbW9kdWxlX3BhcmFtX25hbWVkKG1vZGVzZXQsIHZpcnRpb19ncHVf bW9kZXNldCwgaW50LCAwNDAwKTsKIAorc3RhdGljIGludCB2aXJ0aW9fZ3B1X3BjaV9xdWlyayhz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgdmlydGlvX2RldmljZSAqdmRldikKK3sKKwlz dHJ1Y3QgcGNpX2RldiAqcGRldiA9IHRvX3BjaV9kZXYodmRldi0+ZGV2LnBhcmVudCk7CisJY29u c3QgY2hhciAqcG5hbWUgPSBkZXZfbmFtZSgmcGRldi0+ZGV2KTsKKwlib29sIHZnYSA9IChwZGV2 LT5jbGFzcyA+PiA4KSA9PSBQQ0lfQ0xBU1NfRElTUExBWV9WR0E7CisJY2hhciB1bmlxdWVbMjBd OworCisJRFJNX0lORk8oInBjaTogJXMgZGV0ZWN0ZWQgYXQgJXNcbiIsCisJCSB2Z2EgPyAidmly dGlvLXZnYSIgOiAidmlydGlvLWdwdS1wY2kiLAorCQkgcG5hbWUpOworCWRldi0+cGRldiA9IHBk ZXY7CisJaWYgKHZnYSkKKwkJZHJtX2ZiX2hlbHBlcl9yZW1vdmVfY29uZmxpY3RpbmdfcGNpX2Zy YW1lYnVmZmVycyhwZGV2LAorCQkJCQkJCQkgIDAsCisJCQkJCQkJCSAgInZpcnRpb2RybWZiIik7 CisKKwkvKgorCSAqIE5vcm1hbGx5IHRoZSBkcm1fZGV2X3NldF91bmlxdWUoKSBjYWxsIGlzIGRv bmUgYnkgY29yZSBEUk0uCisJICogVGhlIGZvbGxvd2luZyBjb21tZW50IGNvdmVycywgd2h5IHZp cnRpbyBjYW5ub3QgcmVseSBvbiBpdC4KKwkgKgorCSAqIFVubGlrZSB0aGUgb3RoZXIgdmlydHVh bCBHUFUgZHJpdmVycywgdmlydGlvIGFic3RyYWN0cyB0aGUKKwkgKiB1bmRlcmx5aW5nIGJ1cyB0 eXBlIGJ5IHVzaW5nIHN0cnVjdCB2aXJ0aW9fZGV2aWNlLgorCSAqCisJICogSGVuY2UgdGhlIGRl dl9pc19wY2koKSBjaGVjaywgdXNlZCBpbiBjb3JlIERSTSwgd2lsbCBmYWlsCisJICogYW5kIHRo ZSB1bmlxdWUgcmV0dXJuZWQgd2lsbCBiZSB0aGUgdmlydGlvX2RldmljZSAidmlydGlvMCIsCisJ ICogd2hpbGUgYSAicGNpOi4uLiIgb25lIGlzIHJlcXVpcmVkLgorCSAqCisJICogQSBmZXcgb3Ro ZXIgaWRlYXMgd2VyZSBjb25zaWRlcmVkOgorCSAqIC0gRXh0ZW5kIHRoZSBkZXZfaXNfcGNpKCkg Y2hlY2sgW2luIGRybV9zZXRfYnVzaWRdIHRvCisJICogICBjb25zaWRlciB2aXJ0aW8uCisJICog ICBTZWVtcyBsaWtlIGEgYmlnZ2VyIGhhY2sgdGhhbiB3aGF0IHdlIGhhdmUgYWxyZWFkeS4KKwkg KgorCSAqIC0gUG9pbnQgZHJtX2RldmljZTo6ZGV2IHRvIHRoZSBwYXJlbnQgb2YgdGhlIHZpcnRp b19kZXZpY2UKKwkgKiAgIFNlbWFudGljIGNoYW5nZXM6CisJICogICAqIFVzaW5nIHRoZSB3cm9u ZyBkZXZpY2UgZm9yIGkyYywgZnJhbWVidWZmZXJfYWxsb2MgYW5kCisJICogICAgIHByaW1lIGlt cG9ydC4KKwkgKiAgIFZpc3VhbCBjaGFuZ2VzOgorCSAqICAgKiBIZWxwZXJzIHN1Y2ggYXMgRFJN X0RFVl9FUlJPUiwgZGV2X2luZm8sIGRybV9wcmludGVyLAorCSAqICAgICB3aWxsIHByaW50IHRo ZSB3cm9uZyBpbmZvcm1hdGlvbi4KKwkgKgorCSAqIFdlIGNvdWxkIGFkZHJlc3MgdGhlIGxhdHRl ciBpc3N1ZXMsIGJ5IGludHJvZHVjaW5nCisJICogZHJtX2RldmljZTo6YnVzX2RldiwgLi4uIHdo aWNoIHdvdWxkIGJlIHVzZWQgc29sZWx5IGZvciB0aGlzLgorCSAqCisJICogU28gZm9yIHRoZSBt b21lbnQga2VlcCB0aGluZ3MgYXMtaXMsIHdpdGggYSBidWxreSBjb21tZW50CisJICogZm9yIHRo ZSBuZXh0IHBlcnNvbiB3aG8gZmVlbHMgbGlrZSByZW1vdmluZyB0aGlzCisJICogZHJtX2Rldl9z ZXRfdW5pcXVlKCkgcXVpcmsuCisJICovCisJc25wcmludGYodW5pcXVlLCBzaXplb2YodW5pcXVl KSwgInBjaTolcyIsIHBuYW1lKTsKKwlyZXR1cm4gZHJtX2Rldl9zZXRfdW5pcXVlKGRldiwgdW5p cXVlKTsKK30KKwogc3RhdGljIGludCB2aXJ0aW9fZ3B1X3Byb2JlKHN0cnVjdCB2aXJ0aW9fZGV2 aWNlICp2ZGV2KQogeworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXY7CiAJaW50IHJldDsKIAogCWlm ICh2Z2Fjb25fdGV4dF9mb3JjZSgpICYmIHZpcnRpb19ncHVfbW9kZXNldCA9PSAtMSkKQEAgLTUw LDE4ICsxMDIsMzkgQEAgc3RhdGljIGludCB2aXJ0aW9fZ3B1X3Byb2JlKHN0cnVjdCB2aXJ0aW9f ZGV2aWNlICp2ZGV2KQogCWlmICh2aXJ0aW9fZ3B1X21vZGVzZXQgPT0gMCkKIAkJcmV0dXJuIC1F SU5WQUw7CiAKLQlyZXQgPSBkcm1fdmlydGlvX2luaXQoJmRyaXZlciwgdmRldik7CisJZGV2ID0g ZHJtX2Rldl9hbGxvYygmZHJpdmVyLCAmdmRldi0+ZGV2KTsKKwlpZiAoSVNfRVJSKGRldikpCisJ CXJldHVybiBQVFJfRVJSKGRldik7CisJdmRldi0+cHJpdiA9IGRldjsKKworCWlmICghc3RyY21w KHZkZXYtPmRldi5wYXJlbnQtPmJ1cy0+bmFtZSwgInBjaSIpKSB7CisJCXJldCA9IHZpcnRpb19n cHVfcGNpX3F1aXJrKGRldiwgdmRldik7CisJCWlmIChyZXQpCisJCQlnb3RvIGVycl9mcmVlOwor CX0KKworCXJldCA9IHZpcnRpb19ncHVfaW5pdChkZXYpOwogCWlmIChyZXQpCi0JCXJldHVybiBy ZXQ7CisJCWdvdG8gZXJyX2ZyZWU7CisKKwlyZXQgPSBkcm1fZGV2X3JlZ2lzdGVyKGRldiwgMCk7 CisJaWYgKHJldCkKKwkJZ290byBlcnJfZnJlZTsKIAogCWRybV9mYmRldl9nZW5lcmljX3NldHVw KHZkZXYtPnByaXYsIDMyKTsKIAlyZXR1cm4gMDsKKworZXJyX2ZyZWU6CisJZHJtX2Rldl9wdXQo ZGV2KTsKKwlyZXR1cm4gcmV0OwogfQogCiBzdGF0aWMgdm9pZCB2aXJ0aW9fZ3B1X3JlbW92ZShz dHJ1Y3QgdmlydGlvX2RldmljZSAqdmRldikKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0g dmRldi0+cHJpdjsKIAorCWRybV9kZXZfdW5yZWdpc3RlcihkZXYpOworCXZpcnRpb19ncHVfZGVp bml0KGRldik7CiAJZHJtX3B1dF9kZXYoZGV2KTsKIH0KIApAQCAtMTIzLDggKzE5Niw2IEBAIHN0 YXRpYyBjb25zdCBzdHJ1Y3QgZmlsZV9vcGVyYXRpb25zIHZpcnRpb19ncHVfZHJpdmVyX2ZvcHMg PSB7CiAKIHN0YXRpYyBzdHJ1Y3QgZHJtX2RyaXZlciBkcml2ZXIgPSB7CiAJLmRyaXZlcl9mZWF0 dXJlcyA9IERSSVZFUl9NT0RFU0VUIHwgRFJJVkVSX0dFTSB8IERSSVZFUl9QUklNRSB8IERSSVZF Ul9SRU5ERVIgfCBEUklWRVJfQVRPTUlDLAotCS5sb2FkID0gdmlydGlvX2dwdV9kcml2ZXJfbG9h ZCwKLQkudW5sb2FkID0gdmlydGlvX2dwdV9kcml2ZXJfdW5sb2FkLAogCS5vcGVuID0gdmlydGlv X2dwdV9kcml2ZXJfb3BlbiwKIAkucG9zdGNsb3NlID0gdmlydGlvX2dwdV9kcml2ZXJfcG9zdGNs b3NlLAogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfZHJ2Lmgg Yi9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfZHJ2LmgKaW5kZXggZjUwY2E4MTEzMmQ5 Li42OWFiNDI5NDAzNjggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdw dV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfZHJ2LmgKQEAgLTUw LDkgKzUwLDYgQEAKICNkZWZpbmUgRFJJVkVSX01JTk9SIDEKICNkZWZpbmUgRFJJVkVSX1BBVENI TEVWRUwgMAogCi0vKiB2aXJ0Z3B1X2RybV9idXMuYyAqLwotaW50IGRybV92aXJ0aW9faW5pdChz dHJ1Y3QgZHJtX2RyaXZlciAqZHJpdmVyLCBzdHJ1Y3QgdmlydGlvX2RldmljZSAqdmRldik7Ci0K IHN0cnVjdCB2aXJ0aW9fZ3B1X29iamVjdF9wYXJhbXMgewogCXVpbnQzMl90IGZvcm1hdDsKIAl1 aW50MzJfdCB3aWR0aDsKQEAgLTIyNyw4ICsyMjQsOCBAQCBzdHJ1Y3QgdmlydGlvX2dwdV9mcHJp diB7CiBleHRlcm4gc3RydWN0IGRybV9pb2N0bF9kZXNjIHZpcnRpb19ncHVfaW9jdGxzW0RSTV9W SVJUSU9fTlVNX0lPQ1RMU107CiAKIC8qIHZpcnRpb19rbXMuYyAqLwotaW50IHZpcnRpb19ncHVf ZHJpdmVyX2xvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdW5zaWduZWQgbG9uZyBmbGFncyk7 Ci12b2lkIHZpcnRpb19ncHVfZHJpdmVyX3VubG9hZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsK K2ludCB2aXJ0aW9fZ3B1X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Cit2b2lkIHZpcnRp b19ncHVfZGVpbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogaW50IHZpcnRpb19ncHVfZHJp dmVyX29wZW4oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxlKTsK IHZvaWQgdmlydGlvX2dwdV9kcml2ZXJfcG9zdGNsb3NlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHN0cnVjdCBkcm1fZmlsZSAqZmlsZSk7CiAKQEAgLTMzNiw3ICszMzMsNyBAQCBpbnQgdmlydGlv X2dwdV9mcmFtZWJ1ZmZlcl9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJc3RydWN0 IHZpcnRpb19ncHVfZnJhbWVidWZmZXIgKnZnZmIsCiAJCQkJY29uc3Qgc3RydWN0IGRybV9tb2Rl X2ZiX2NtZDIgKm1vZGVfY21kLAogCQkJCXN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqKTsKLWlu dCB2aXJ0aW9fZ3B1X21vZGVzZXRfaW5pdChzdHJ1Y3QgdmlydGlvX2dwdV9kZXZpY2UgKnZnZGV2 KTsKK3ZvaWQgdmlydGlvX2dwdV9tb2Rlc2V0X2luaXQoc3RydWN0IHZpcnRpb19ncHVfZGV2aWNl ICp2Z2Rldik7CiB2b2lkIHZpcnRpb19ncHVfbW9kZXNldF9maW5pKHN0cnVjdCB2aXJ0aW9fZ3B1 X2RldmljZSAqdmdkZXYpOwogCiAvKiB2aXJ0aW9fZ3B1X3BsYW5lLmMgKi8KZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9rbXMuYyBiL2RyaXZlcnMvZ3B1L2RybS92 aXJ0aW8vdmlydGdwdV9rbXMuYwppbmRleCBjMzQwYmUyNTJmY2UuLjg0YjZhNmJmMDBjNiAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3ZpcnRpby92aXJ0Z3B1X2ttcy5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9rbXMuYwpAQCAtMTA2LDcgKzEwNiw3IEBAIHN0YXRp YyB2b2lkIHZpcnRpb19ncHVfZ2V0X2NhcHNldHMoc3RydWN0IHZpcnRpb19ncHVfZGV2aWNlICp2 Z2RldiwKIAl2Z2Rldi0+bnVtX2NhcHNldHMgPSBudW1fY2Fwc2V0czsKIH0KIAotaW50IHZpcnRp b19ncHVfZHJpdmVyX2xvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdW5zaWduZWQgbG9uZyBm bGFncykKK2ludCB2aXJ0aW9fZ3B1X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlz dGF0aWMgdnFfY2FsbGJhY2tfdCAqY2FsbGJhY2tzW10gPSB7CiAJCXZpcnRpb19ncHVfY3RybF9h Y2ssIHZpcnRpb19ncHVfY3Vyc29yX2FjawpAQCAtMTkzLDkgKzE5Myw3IEBAIGludCB2aXJ0aW9f Z3B1X2RyaXZlcl9sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGxvbmcgZmxh Z3MpCiAJCSAgICAgbnVtX2NhcHNldHMsICZudW1fY2Fwc2V0cyk7CiAJRFJNX0lORk8oIm51bWJl ciBvZiBjYXAgc2V0czogJWRcbiIsIG51bV9jYXBzZXRzKTsKIAotCXJldCA9IHZpcnRpb19ncHVf bW9kZXNldF9pbml0KHZnZGV2KTsKLQlpZiAocmV0KQotCQlnb3RvIGVycl9tb2Rlc2V0OworCXZp cnRpb19ncHVfbW9kZXNldF9pbml0KHZnZGV2KTsKIAogCXZpcnRpb19kZXZpY2VfcmVhZHkodmdk ZXYtPnZkZXYpOwogCXZnZGV2LT52cXNfcmVhZHkgPSB0cnVlOwpAQCAtMjA5LDcgKzIwNyw2IEBA IGludCB2aXJ0aW9fZ3B1X2RyaXZlcl9sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2ln bmVkIGxvbmcgZmxhZ3MpCiAJCQkgICA1ICogSFopOwogCXJldHVybiAwOwogCi1lcnJfbW9kZXNl dDoKIGVycl9zY2Fub3V0czoKIAl2aXJ0aW9fZ3B1X3R0bV9maW5pKHZnZGV2KTsKIGVycl90dG06 CkBAIC0yMzEsNyArMjI4LDcgQEAgc3RhdGljIHZvaWQgdmlydGlvX2dwdV9jbGVhbnVwX2NhcF9j YWNoZShzdHJ1Y3QgdmlydGlvX2dwdV9kZXZpY2UgKnZnZGV2KQogCX0KIH0KIAotdm9pZCB2aXJ0 aW9fZ3B1X2RyaXZlcl91bmxvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3ZvaWQgdmlydGlv X2dwdV9kZWluaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgdmlydGlvX2dw dV9kZXZpY2UgKnZnZGV2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAotLSAKMi4yMC4wCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGlu ZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK