From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ezequiel Garcia Subject: [PATCH v2] drm/virtio: Drop deprecated load/unload initialization Date: Tue, 8 Jan 2019 11:59:30 -0300 Message-ID: <20190108145930.15080-1-ezequiel@collabora.com> References: <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 [46.235.227.227]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5EC736EB39 for ; Tue, 8 Jan 2019 15:00:24 +0000 (UTC) In-Reply-To: <20190103161600.19556-1-ezequiel@collabora.com> 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, Gerd Hoffmann , virtualization@lists.linux-foundation.org Cc: David Airlie , Ezequiel Garcia List-Id: dri-devel@lists.freedesktop.org TW92ZSB0aGUgY29kZSBhcm91bmQgc28gdGhlIGRyaXZlciBpcyBwcm9iZWQgdGhlIGJ1cwoucHJv YmUgYW5kIHJlbW92ZWQgZnJvbSB0aGUgYnVzIC5yZW1vdmUgY2FsbGJhY2tzLgpUaGlzIGNvbW1p dCBpcyBqdXN0IGEgY2xlYW51cCBhbmQgc2hvdWxkbid0IGFmZmVjdApmdW5jdGlvbmFsaXR5LgoK U2lnbmVkLW9mZi1ieTogRXplcXVpZWwgR2FyY2lhIDxlemVxdWllbEBjb2xsYWJvcmEuY29tPgot LS0KdjI6IHJlYmFzZWQgb24gZHJtLW1pc2MtbmV4dAoKIGRyaXZlcnMvZ3B1L2RybS92aXJ0aW8v TWFrZWZpbGUgICAgICAgICAgfCAgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdw dV9kaXNwbGF5LmMgfCAgIDMgKy0KIGRyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9kcm1f YnVzLmMgfCAxMDMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS92aXJ0 aW8vdmlydGdwdV9kcnYuYyAgICAgfCAgNzkgKysrKysrKysrKysrKysrKy0KIGRyaXZlcnMvZ3B1 L2RybS92aXJ0aW8vdmlydGdwdV9kcnYuaCAgICAgfCAgIDkgKy0KIGRyaXZlcnMvZ3B1L2RybS92 aXJ0aW8vdmlydGdwdV9rbXMuYyAgICAgfCAgIDkgKy0KIDYgZmlsZXMgY2hhbmdlZCwgODMgaW5z ZXJ0aW9ucygrKSwgMTIyIGRlbGV0aW9ucygtKQogZGVsZXRlIG1vZGUgMTAwNjQ0IGRyaXZlcnMv Z3B1L2RybS92aXJ0aW8vdmlydGdwdV9kcm1fYnVzLmMKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vdmlydGlvL01ha2VmaWxlIGIvZHJpdmVycy9ncHUvZHJtL3ZpcnRpby9NYWtlZmlsZQpp bmRleCBmMjlkZWVjODNkMWYuLjRlOTBjYzhmYTY1MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL3ZpcnRpby9NYWtlZmlsZQorKysgYi9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL01ha2VmaWxl CkBAIC0zLDcgKzMsNyBAQAogIyBNYWtlZmlsZSBmb3IgdGhlIGRybSBkZXZpY2UgZHJpdmVyLiAg VGhpcyBkcml2ZXIgcHJvdmlkZXMgc3VwcG9ydCBmb3IgdGhlCiAjIERpcmVjdCBSZW5kZXJpbmcg SW5mcmFzdHJ1Y3R1cmUgKERSSSkgaW4gWEZyZWU4NiA0LjEuMCBhbmQgaGlnaGVyLgogCi12aXJ0 aW8tZ3B1LXkgOj0gdmlydGdwdV9kcnYubyB2aXJ0Z3B1X2ttcy5vIHZpcnRncHVfZHJtX2J1cy5v IHZpcnRncHVfZ2VtLm8gXAordmlydGlvLWdwdS15IDo9IHZpcnRncHVfZHJ2Lm8gdmlydGdwdV9r bXMubyB2aXJ0Z3B1X2dlbS5vIFwKIAl2aXJ0Z3B1X2ZiLm8gdmlydGdwdV9kaXNwbGF5Lm8gdmly dGdwdV92cS5vIHZpcnRncHVfdHRtLm8gXAogCXZpcnRncHVfZmVuY2UubyB2aXJ0Z3B1X29iamVj dC5vIHZpcnRncHVfZGVidWdmcy5vIHZpcnRncHVfcGxhbmUubyBcCiAJdmlydGdwdV9pb2N0bC5v IHZpcnRncHVfcHJpbWUubwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3ZpcnRpby92aXJ0 Z3B1X2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9kaXNwbGF5LmMK aW5kZXggZDUzOWJjMjhkYzk3Li44N2Q3YzQ5Y2YwNTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS92aXJ0aW8vdmlydGdwdV9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3ZpcnRp by92aXJ0Z3B1X2Rpc3BsYXkuYwpAQCAtMzU4LDcgKzM1OCw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1 Y3QgZHJtX21vZGVfY29uZmlnX2Z1bmNzIHZpcnRpb19ncHVfbW9kZV9mdW5jcyA9IHsKIAkuYXRv bWljX2NvbW1pdCA9IGRybV9hdG9taWNfaGVscGVyX2NvbW1pdCwKIH07CiAKLWludCB2aXJ0aW9f Z3B1X21vZGVzZXRfaW5pdChzdHJ1Y3QgdmlydGlvX2dwdV9kZXZpY2UgKnZnZGV2KQordm9pZCB2 aXJ0aW9fZ3B1X21vZGVzZXRfaW5pdChzdHJ1Y3QgdmlydGlvX2dwdV9kZXZpY2UgKnZnZGV2KQog ewogCWludCBpOwogCkBAIC0zNzcsNyArMzc3LDYgQEAgaW50IHZpcnRpb19ncHVfbW9kZXNldF9p bml0KHN0cnVjdCB2aXJ0aW9fZ3B1X2RldmljZSAqdmdkZXYpCiAJCXZnZGV2X291dHB1dF9pbml0 KHZnZGV2LCBpKTsKIAogCWRybV9tb2RlX2NvbmZpZ19yZXNldCh2Z2Rldi0+ZGRldik7Ci0JcmV0 dXJuIDA7CiB9CiAKIHZvaWQgdmlydGlvX2dwdV9tb2Rlc2V0X2Zpbmkoc3RydWN0IHZpcnRpb19n cHVfZGV2aWNlICp2Z2RldikKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmly dGdwdV9kcm1fYnVzLmMgYi9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfZHJtX2J1cy5j CmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwODg3ZTBiNjRiOWMuLjAwMDAwMDAwMDAw MAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfZHJtX2J1cy5jCisrKyAvZGV2 L251bGwKQEAgLTEsMTAzICswLDAgQEAKLS8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTUgUmVkIEhh dCwgSW5jLgotICogQWxsIFJpZ2h0cyBSZXNlcnZlZC4KLSAqCi0gKiBQZXJtaXNzaW9uIGlzIGhl cmVieSBncmFudGVkLCBmcmVlIG9mIGNoYXJnZSwgdG8gYW55IHBlcnNvbiBvYnRhaW5pbmcKLSAq IGEgY29weSBvZiB0aGlzIHNvZnR3YXJlIGFuZCBhc3NvY2lhdGVkIGRvY3VtZW50YXRpb24gZmls ZXMgKHRoZQotICogIlNvZnR3YXJlIiksIHRvIGRlYWwgaW4gdGhlIFNvZnR3YXJlIHdpdGhvdXQg cmVzdHJpY3Rpb24sIGluY2x1ZGluZwotICogd2l0aG91dCBsaW1pdGF0aW9uIHRoZSByaWdodHMg dG8gdXNlLCBjb3B5LCBtb2RpZnksIG1lcmdlLCBwdWJsaXNoLAotICogZGlzdHJpYnV0ZSwgc3Vi bGljZW5zZSwgYW5kL29yIHNlbGwgY29waWVzIG9mIHRoZSBTb2Z0d2FyZSwgYW5kIHRvCi0gKiBw ZXJtaXQgcGVyc29ucyB0byB3aG9tIHRoZSBTb2Z0d2FyZSBpcyBmdXJuaXNoZWQgdG8gZG8gc28s IHN1YmplY3QgdG8KLSAqIHRoZSBmb2xsb3dpbmcgY29uZGl0aW9uczoKLSAqCi0gKiBUaGUgYWJv dmUgY29weXJpZ2h0IG5vdGljZSBhbmQgdGhpcyBwZXJtaXNzaW9uIG5vdGljZSAoaW5jbHVkaW5n IHRoZQotICogbmV4dCBwYXJhZ3JhcGgpIHNoYWxsIGJlIGluY2x1ZGVkIGluIGFsbCBjb3BpZXMg b3Igc3Vic3RhbnRpYWwKLSAqIHBvcnRpb25zIG9mIHRoZSBTb2Z0d2FyZS4KLSAqCi0gKiBUSEUg U09GVFdBUkUgSVMgUFJPVklERUQgIkFTIElTIiwgV0lUSE9VVCBXQVJSQU5UWSBPRiBBTlkgS0lO RCwKLSAqIEVYUFJFU1MgT1IgSU1QTElFRCwgSU5DTFVESU5HIEJVVCBOT1QgTElNSVRFRCBUTyBU SEUgV0FSUkFOVElFUyBPRgotICogTUVSQ0hBTlRBQklMSVRZLCBGSVRORVNTIEZPUiBBIFBBUlRJ Q1VMQVIgUFVSUE9TRSBBTkQgTk9OSU5GUklOR0VNRU5ULgotICogSU4gTk8gRVZFTlQgU0hBTEwg VEhFIENPUFlSSUdIVCBPV05FUihTKSBBTkQvT1IgSVRTIFNVUFBMSUVSUyBCRQotICogTElBQkxF IEZPUiBBTlkgQ0xBSU0sIERBTUFHRVMgT1IgT1RIRVIgTElBQklMSVRZLCBXSEVUSEVSIElOIEFO IEFDVElPTgotICogT0YgQ09OVFJBQ1QsIFRPUlQgT1IgT1RIRVJXSVNFLCBBUklTSU5HIEZST00s IE9VVCBPRiBPUiBJTiBDT05ORUNUSU9OCi0gKiBXSVRIIFRIRSBTT0ZUV0FSRSBPUiBUSEUgVVNF IE9SIE9USEVSIERFQUxJTkdTIElOIFRIRSBTT0ZUV0FSRS4KLSAqLwotCi0jaW5jbHVkZSA8bGlu dXgvcGNpLmg+Ci0jaW5jbHVkZSA8ZHJtL2RybV9mYl9oZWxwZXIuaD4KLQotI2luY2x1ZGUgInZp cnRncHVfZHJ2LmgiCi0KLWludCBkcm1fdmlydGlvX2luaXQoc3RydWN0IGRybV9kcml2ZXIgKmRy aXZlciwgc3RydWN0IHZpcnRpb19kZXZpY2UgKnZkZXYpCi17Ci0Jc3RydWN0IGRybV9kZXZpY2Ug KmRldjsKLQlpbnQgcmV0OwotCi0JZGV2ID0gZHJtX2Rldl9hbGxvYyhkcml2ZXIsICZ2ZGV2LT5k ZXYpOwotCWlmIChJU19FUlIoZGV2KSkKLQkJcmV0dXJuIFBUUl9FUlIoZGV2KTsKLQl2ZGV2LT5w cml2ID0gZGV2OwotCi0JaWYgKHN0cmNtcCh2ZGV2LT5kZXYucGFyZW50LT5idXMtPm5hbWUsICJw Y2kiKSA9PSAwKSB7Ci0JCXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gdG9fcGNpX2Rldih2ZGV2LT5k ZXYucGFyZW50KTsKLQkJY29uc3QgY2hhciAqcG5hbWUgPSBkZXZfbmFtZSgmcGRldi0+ZGV2KTsK LQkJYm9vbCB2Z2EgPSAocGRldi0+Y2xhc3MgPj4gOCkgPT0gUENJX0NMQVNTX0RJU1BMQVlfVkdB OwotCQljaGFyIHVuaXF1ZVsyMF07Ci0KLQkJRFJNX0lORk8oInBjaTogJXMgZGV0ZWN0ZWQgYXQg JXNcbiIsCi0JCQkgdmdhID8gInZpcnRpby12Z2EiIDogInZpcnRpby1ncHUtcGNpIiwKLQkJCSBw bmFtZSk7Ci0JCWRldi0+cGRldiA9IHBkZXY7Ci0JCWlmICh2Z2EpCi0JCQlkcm1fZmJfaGVscGVy X3JlbW92ZV9jb25mbGljdGluZ19wY2lfZnJhbWVidWZmZXJzKHBkZXYsCi0JCQkJCQkJCQkgIDAs Ci0JCQkJCQkJCQkgICJ2aXJ0aW9kcm1mYiIpOwotCi0JCS8qCi0JCSAqIE5vcm1hbGx5IHRoZSBk cm1fZGV2X3NldF91bmlxdWUoKSBjYWxsIGlzIGRvbmUgYnkgY29yZSBEUk0uCi0JCSAqIFRoZSBm b2xsb3dpbmcgY29tbWVudCBjb3ZlcnMsIHdoeSB2aXJ0aW8gY2Fubm90IHJlbHkgb24gaXQuCi0J CSAqCi0JCSAqIFVubGlrZSB0aGUgb3RoZXIgdmlydHVhbCBHUFUgZHJpdmVycywgdmlydGlvIGFi c3RyYWN0cyB0aGUKLQkJICogdW5kZXJseWluZyBidXMgdHlwZSBieSB1c2luZyBzdHJ1Y3Qgdmly dGlvX2RldmljZS4KLQkJICoKLQkJICogSGVuY2UgdGhlIGRldl9pc19wY2koKSBjaGVjaywgdXNl ZCBpbiBjb3JlIERSTSwgd2lsbCBmYWlsCi0JCSAqIGFuZCB0aGUgdW5pcXVlIHJldHVybmVkIHdp bGwgYmUgdGhlIHZpcnRpb19kZXZpY2UgInZpcnRpbzAiLAotCQkgKiB3aGlsZSBhICJwY2k6Li4u IiBvbmUgaXMgcmVxdWlyZWQuCi0JCSAqCi0JCSAqIEEgZmV3IG90aGVyIGlkZWFzIHdlcmUgY29u c2lkZXJlZDoKLQkJICogLSBFeHRlbmQgdGhlIGRldl9pc19wY2koKSBjaGVjayBbaW4gZHJtX3Nl dF9idXNpZF0gdG8KLQkJICogICBjb25zaWRlciB2aXJ0aW8uCi0JCSAqICAgU2VlbXMgbGlrZSBh IGJpZ2dlciBoYWNrIHRoYW4gd2hhdCB3ZSBoYXZlIGFscmVhZHkuCi0JCSAqCi0JCSAqIC0gUG9p bnQgZHJtX2RldmljZTo6ZGV2IHRvIHRoZSBwYXJlbnQgb2YgdGhlIHZpcnRpb19kZXZpY2UKLQkJ ICogICBTZW1hbnRpYyBjaGFuZ2VzOgotCQkgKiAgICogVXNpbmcgdGhlIHdyb25nIGRldmljZSBm b3IgaTJjLCBmcmFtZWJ1ZmZlcl9hbGxvYyBhbmQKLQkJICogICAgIHByaW1lIGltcG9ydC4KLQkJ ICogICBWaXN1YWwgY2hhbmdlczoKLQkJICogICAqIEhlbHBlcnMgc3VjaCBhcyBEUk1fREVWX0VS Uk9SLCBkZXZfaW5mbywgZHJtX3ByaW50ZXIsCi0JCSAqICAgICB3aWxsIHByaW50IHRoZSB3cm9u ZyBpbmZvcm1hdGlvbi4KLQkJICoKLQkJICogV2UgY291bGQgYWRkcmVzcyB0aGUgbGF0dGVyIGlz c3VlcywgYnkgaW50cm9kdWNpbmcKLQkJICogZHJtX2RldmljZTo6YnVzX2RldiwgLi4uIHdoaWNo IHdvdWxkIGJlIHVzZWQgc29sZWx5IGZvciB0aGlzLgotCQkgKgotCQkgKiBTbyBmb3IgdGhlIG1v bWVudCBrZWVwIHRoaW5ncyBhcy1pcywgd2l0aCBhIGJ1bGt5IGNvbW1lbnQKLQkJICogZm9yIHRo ZSBuZXh0IHBlcnNvbiB3aG8gZmVlbHMgbGlrZSByZW1vdmluZyB0aGlzCi0JCSAqIGRybV9kZXZf c2V0X3VuaXF1ZSgpIHF1aXJrLgotCQkgKi8KLQkJc25wcmludGYodW5pcXVlLCBzaXplb2YodW5p cXVlKSwgInBjaTolcyIsIHBuYW1lKTsKLQkJcmV0ID0gZHJtX2Rldl9zZXRfdW5pcXVlKGRldiwg dW5pcXVlKTsKLQkJaWYgKHJldCkKLQkJCWdvdG8gZXJyX2ZyZWU7Ci0KLQl9Ci0KLQlyZXQgPSBk cm1fZGV2X3JlZ2lzdGVyKGRldiwgMCk7Ci0JaWYgKHJldCkKLQkJZ290byBlcnJfZnJlZTsKLQot CXJldHVybiAwOwotCi1lcnJfZnJlZToKLQlkcm1fZGV2X3B1dChkZXYpOwotCXJldHVybiByZXQ7 Ci19CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfZHJ2LmMgYi9k cml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfZHJ2LmMKaW5kZXggN2RmNTA5MjBjMWUwLi5h ZjkyOTY0YjY4ODkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9k cnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfZHJ2LmMKQEAgLTQwLDgg KzQwLDYwIEBAIHN0YXRpYyBpbnQgdmlydGlvX2dwdV9tb2Rlc2V0ID0gLTE7CiBNT0RVTEVfUEFS TV9ERVNDKG1vZGVzZXQsICJEaXNhYmxlL0VuYWJsZSBtb2Rlc2V0dGluZyIpOwogbW9kdWxlX3Bh cmFtX25hbWVkKG1vZGVzZXQsIHZpcnRpb19ncHVfbW9kZXNldCwgaW50LCAwNDAwKTsKIAorc3Rh dGljIGludCB2aXJ0aW9fZ3B1X3BjaV9xdWlyayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1 Y3QgdmlydGlvX2RldmljZSAqdmRldikKK3sKKwlzdHJ1Y3QgcGNpX2RldiAqcGRldiA9IHRvX3Bj aV9kZXYodmRldi0+ZGV2LnBhcmVudCk7CisJY29uc3QgY2hhciAqcG5hbWUgPSBkZXZfbmFtZSgm cGRldi0+ZGV2KTsKKwlib29sIHZnYSA9IChwZGV2LT5jbGFzcyA+PiA4KSA9PSBQQ0lfQ0xBU1Nf RElTUExBWV9WR0E7CisJY2hhciB1bmlxdWVbMjBdOworCisJRFJNX0lORk8oInBjaTogJXMgZGV0 ZWN0ZWQgYXQgJXNcbiIsCisJCSB2Z2EgPyAidmlydGlvLXZnYSIgOiAidmlydGlvLWdwdS1wY2ki LAorCQkgcG5hbWUpOworCWRldi0+cGRldiA9IHBkZXY7CisJaWYgKHZnYSkKKwkJZHJtX2ZiX2hl bHBlcl9yZW1vdmVfY29uZmxpY3RpbmdfcGNpX2ZyYW1lYnVmZmVycyhwZGV2LAorCQkJCQkJCQkg IDAsCisJCQkJCQkJCSAgInZpcnRpb2RybWZiIik7CisKKwkvKgorCSAqIE5vcm1hbGx5IHRoZSBk cm1fZGV2X3NldF91bmlxdWUoKSBjYWxsIGlzIGRvbmUgYnkgY29yZSBEUk0uCisJICogVGhlIGZv bGxvd2luZyBjb21tZW50IGNvdmVycywgd2h5IHZpcnRpbyBjYW5ub3QgcmVseSBvbiBpdC4KKwkg KgorCSAqIFVubGlrZSB0aGUgb3RoZXIgdmlydHVhbCBHUFUgZHJpdmVycywgdmlydGlvIGFic3Ry YWN0cyB0aGUKKwkgKiB1bmRlcmx5aW5nIGJ1cyB0eXBlIGJ5IHVzaW5nIHN0cnVjdCB2aXJ0aW9f ZGV2aWNlLgorCSAqCisJICogSGVuY2UgdGhlIGRldl9pc19wY2koKSBjaGVjaywgdXNlZCBpbiBj b3JlIERSTSwgd2lsbCBmYWlsCisJICogYW5kIHRoZSB1bmlxdWUgcmV0dXJuZWQgd2lsbCBiZSB0 aGUgdmlydGlvX2RldmljZSAidmlydGlvMCIsCisJICogd2hpbGUgYSAicGNpOi4uLiIgb25lIGlz IHJlcXVpcmVkLgorCSAqCisJICogQSBmZXcgb3RoZXIgaWRlYXMgd2VyZSBjb25zaWRlcmVkOgor CSAqIC0gRXh0ZW5kIHRoZSBkZXZfaXNfcGNpKCkgY2hlY2sgW2luIGRybV9zZXRfYnVzaWRdIHRv CisJICogICBjb25zaWRlciB2aXJ0aW8uCisJICogICBTZWVtcyBsaWtlIGEgYmlnZ2VyIGhhY2sg dGhhbiB3aGF0IHdlIGhhdmUgYWxyZWFkeS4KKwkgKgorCSAqIC0gUG9pbnQgZHJtX2RldmljZTo6 ZGV2IHRvIHRoZSBwYXJlbnQgb2YgdGhlIHZpcnRpb19kZXZpY2UKKwkgKiAgIFNlbWFudGljIGNo YW5nZXM6CisJICogICAqIFVzaW5nIHRoZSB3cm9uZyBkZXZpY2UgZm9yIGkyYywgZnJhbWVidWZm ZXJfYWxsb2MgYW5kCisJICogICAgIHByaW1lIGltcG9ydC4KKwkgKiAgIFZpc3VhbCBjaGFuZ2Vz OgorCSAqICAgKiBIZWxwZXJzIHN1Y2ggYXMgRFJNX0RFVl9FUlJPUiwgZGV2X2luZm8sIGRybV9w cmludGVyLAorCSAqICAgICB3aWxsIHByaW50IHRoZSB3cm9uZyBpbmZvcm1hdGlvbi4KKwkgKgor CSAqIFdlIGNvdWxkIGFkZHJlc3MgdGhlIGxhdHRlciBpc3N1ZXMsIGJ5IGludHJvZHVjaW5nCisJ ICogZHJtX2RldmljZTo6YnVzX2RldiwgLi4uIHdoaWNoIHdvdWxkIGJlIHVzZWQgc29sZWx5IGZv ciB0aGlzLgorCSAqCisJICogU28gZm9yIHRoZSBtb21lbnQga2VlcCB0aGluZ3MgYXMtaXMsIHdp dGggYSBidWxreSBjb21tZW50CisJICogZm9yIHRoZSBuZXh0IHBlcnNvbiB3aG8gZmVlbHMgbGlr ZSByZW1vdmluZyB0aGlzCisJICogZHJtX2Rldl9zZXRfdW5pcXVlKCkgcXVpcmsuCisJICovCisJ c25wcmludGYodW5pcXVlLCBzaXplb2YodW5pcXVlKSwgInBjaTolcyIsIHBuYW1lKTsKKwlyZXR1 cm4gZHJtX2Rldl9zZXRfdW5pcXVlKGRldiwgdW5pcXVlKTsKK30KKwogc3RhdGljIGludCB2aXJ0 aW9fZ3B1X3Byb2JlKHN0cnVjdCB2aXJ0aW9fZGV2aWNlICp2ZGV2KQogeworCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXY7CiAJaW50IHJldDsKIAogCWlmICh2Z2Fjb25fdGV4dF9mb3JjZSgpICYmIHZp cnRpb19ncHVfbW9kZXNldCA9PSAtMSkKQEAgLTUwLDE4ICsxMDIsMzkgQEAgc3RhdGljIGludCB2 aXJ0aW9fZ3B1X3Byb2JlKHN0cnVjdCB2aXJ0aW9fZGV2aWNlICp2ZGV2KQogCWlmICh2aXJ0aW9f Z3B1X21vZGVzZXQgPT0gMCkKIAkJcmV0dXJuIC1FSU5WQUw7CiAKLQlyZXQgPSBkcm1fdmlydGlv X2luaXQoJmRyaXZlciwgdmRldik7CisJZGV2ID0gZHJtX2Rldl9hbGxvYygmZHJpdmVyLCAmdmRl di0+ZGV2KTsKKwlpZiAoSVNfRVJSKGRldikpCisJCXJldHVybiBQVFJfRVJSKGRldik7CisJdmRl di0+cHJpdiA9IGRldjsKKworCWlmICghc3RyY21wKHZkZXYtPmRldi5wYXJlbnQtPmJ1cy0+bmFt ZSwgInBjaSIpKSB7CisJCXJldCA9IHZpcnRpb19ncHVfcGNpX3F1aXJrKGRldiwgdmRldik7CisJ CWlmIChyZXQpCisJCQlnb3RvIGVycl9mcmVlOworCX0KKworCXJldCA9IHZpcnRpb19ncHVfaW5p dChkZXYpOwogCWlmIChyZXQpCi0JCXJldHVybiByZXQ7CisJCWdvdG8gZXJyX2ZyZWU7CisKKwly ZXQgPSBkcm1fZGV2X3JlZ2lzdGVyKGRldiwgMCk7CisJaWYgKHJldCkKKwkJZ290byBlcnJfZnJl ZTsKIAogCWRybV9mYmRldl9nZW5lcmljX3NldHVwKHZkZXYtPnByaXYsIDMyKTsKIAlyZXR1cm4g MDsKKworZXJyX2ZyZWU6CisJZHJtX2Rldl9wdXQoZGV2KTsKKwlyZXR1cm4gcmV0OwogfQogCiBz dGF0aWMgdm9pZCB2aXJ0aW9fZ3B1X3JlbW92ZShzdHJ1Y3QgdmlydGlvX2RldmljZSAqdmRldikK IHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gdmRldi0+cHJpdjsKIAorCWRybV9kZXZfdW5y ZWdpc3RlcihkZXYpOworCXZpcnRpb19ncHVfZGVpbml0KGRldik7CiAJZHJtX3B1dF9kZXYoZGV2 KTsKIH0KIApAQCAtMTIzLDggKzE5Niw2IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZmlsZV9vcGVy YXRpb25zIHZpcnRpb19ncHVfZHJpdmVyX2ZvcHMgPSB7CiAKIHN0YXRpYyBzdHJ1Y3QgZHJtX2Ry aXZlciBkcml2ZXIgPSB7CiAJLmRyaXZlcl9mZWF0dXJlcyA9IERSSVZFUl9NT0RFU0VUIHwgRFJJ VkVSX0dFTSB8IERSSVZFUl9QUklNRSB8IERSSVZFUl9SRU5ERVIgfCBEUklWRVJfQVRPTUlDLAot CS5sb2FkID0gdmlydGlvX2dwdV9kcml2ZXJfbG9hZCwKLQkudW5sb2FkID0gdmlydGlvX2dwdV9k cml2ZXJfdW5sb2FkLAogCS5vcGVuID0gdmlydGlvX2dwdV9kcml2ZXJfb3BlbiwKIAkucG9zdGNs b3NlID0gdmlydGlvX2dwdV9kcml2ZXJfcG9zdGNsb3NlLAogCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3Zp cnRncHVfZHJ2LmgKaW5kZXggYmZiMzFmYzNkMDFkLi5jZjg5NmQ4NzkzODIgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vdmlydGlvL3ZpcnRncHVfZHJ2LmgKQEAgLTUwLDkgKzUwLDYgQEAKICNkZWZpbmUgRFJJVkVS X01JTk9SIDEKICNkZWZpbmUgRFJJVkVSX1BBVENITEVWRUwgMAogCi0vKiB2aXJ0Z3B1X2RybV9i dXMuYyAqLwotaW50IGRybV92aXJ0aW9faW5pdChzdHJ1Y3QgZHJtX2RyaXZlciAqZHJpdmVyLCBz dHJ1Y3QgdmlydGlvX2RldmljZSAqdmRldik7Ci0KIHN0cnVjdCB2aXJ0aW9fZ3B1X29iamVjdCB7 CiAJc3RydWN0IGRybV9nZW1fb2JqZWN0IGdlbV9iYXNlOwogCXVpbnQzMl90IGh3X3Jlc19oYW5k bGU7CkBAIC0yMDksOCArMjA2LDggQEAgc3RydWN0IHZpcnRpb19ncHVfZnByaXYgewogZXh0ZXJu IHN0cnVjdCBkcm1faW9jdGxfZGVzYyB2aXJ0aW9fZ3B1X2lvY3Rsc1tEUk1fVklSVElPX05VTV9J T0NUTFNdOwogCiAvKiB2aXJ0aW9fa21zLmMgKi8KLWludCB2aXJ0aW9fZ3B1X2RyaXZlcl9sb2Fk KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGxvbmcgZmxhZ3MpOwotdm9pZCB2aXJ0 aW9fZ3B1X2RyaXZlcl91bmxvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CitpbnQgdmlydGlv X2dwdV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwordm9pZCB2aXJ0aW9fZ3B1X2RlaW5p dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIGludCB2aXJ0aW9fZ3B1X2RyaXZlcl9vcGVuKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSk7CiB2b2lkIHZpcnRp b19ncHVfZHJpdmVyX3Bvc3RjbG9zZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJt X2ZpbGUgKmZpbGUpOwogCkBAIC0zMjAsNyArMzE3LDcgQEAgaW50IHZpcnRpb19ncHVfZnJhbWVi dWZmZXJfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJCXN0cnVjdCB2aXJ0aW9fZ3B1 X2ZyYW1lYnVmZmVyICp2Z2ZiLAogCQkJCWNvbnN0IHN0cnVjdCBkcm1fbW9kZV9mYl9jbWQyICpt b2RlX2NtZCwKIAkJCQlzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaik7Ci1pbnQgdmlydGlvX2dw dV9tb2Rlc2V0X2luaXQoc3RydWN0IHZpcnRpb19ncHVfZGV2aWNlICp2Z2Rldik7Cit2b2lkIHZp cnRpb19ncHVfbW9kZXNldF9pbml0KHN0cnVjdCB2aXJ0aW9fZ3B1X2RldmljZSAqdmdkZXYpOwog dm9pZCB2aXJ0aW9fZ3B1X21vZGVzZXRfZmluaShzdHJ1Y3QgdmlydGlvX2dwdV9kZXZpY2UgKnZn ZGV2KTsKIAogLyogdmlydGlvX2dwdV9wbGFuZS5jICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vdmlydGlvL3ZpcnRncHVfa21zLmMgYi9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRn cHVfa21zLmMKaW5kZXggYzM0MGJlMjUyZmNlLi44NGI2YTZiZjAwYzYgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9rbXMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v dmlydGlvL3ZpcnRncHVfa21zLmMKQEAgLTEwNiw3ICsxMDYsNyBAQCBzdGF0aWMgdm9pZCB2aXJ0 aW9fZ3B1X2dldF9jYXBzZXRzKHN0cnVjdCB2aXJ0aW9fZ3B1X2RldmljZSAqdmdkZXYsCiAJdmdk ZXYtPm51bV9jYXBzZXRzID0gbnVtX2NhcHNldHM7CiB9CiAKLWludCB2aXJ0aW9fZ3B1X2RyaXZl cl9sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGxvbmcgZmxhZ3MpCitpbnQg dmlydGlvX2dwdV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RhdGljIHZxX2Nh bGxiYWNrX3QgKmNhbGxiYWNrc1tdID0gewogCQl2aXJ0aW9fZ3B1X2N0cmxfYWNrLCB2aXJ0aW9f Z3B1X2N1cnNvcl9hY2sKQEAgLTE5Myw5ICsxOTMsNyBAQCBpbnQgdmlydGlvX2dwdV9kcml2ZXJf bG9hZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBsb25nIGZsYWdzKQogCQkgICAg IG51bV9jYXBzZXRzLCAmbnVtX2NhcHNldHMpOwogCURSTV9JTkZPKCJudW1iZXIgb2YgY2FwIHNl dHM6ICVkXG4iLCBudW1fY2Fwc2V0cyk7CiAKLQlyZXQgPSB2aXJ0aW9fZ3B1X21vZGVzZXRfaW5p dCh2Z2Rldik7Ci0JaWYgKHJldCkKLQkJZ290byBlcnJfbW9kZXNldDsKKwl2aXJ0aW9fZ3B1X21v ZGVzZXRfaW5pdCh2Z2Rldik7CiAKIAl2aXJ0aW9fZGV2aWNlX3JlYWR5KHZnZGV2LT52ZGV2KTsK IAl2Z2Rldi0+dnFzX3JlYWR5ID0gdHJ1ZTsKQEAgLTIwOSw3ICsyMDcsNiBAQCBpbnQgdmlydGlv X2dwdV9kcml2ZXJfbG9hZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBsb25nIGZs YWdzKQogCQkJICAgNSAqIEhaKTsKIAlyZXR1cm4gMDsKIAotZXJyX21vZGVzZXQ6CiBlcnJfc2Nh bm91dHM6CiAJdmlydGlvX2dwdV90dG1fZmluaSh2Z2Rldik7CiBlcnJfdHRtOgpAQCAtMjMxLDcg KzIyOCw3IEBAIHN0YXRpYyB2b2lkIHZpcnRpb19ncHVfY2xlYW51cF9jYXBfY2FjaGUoc3RydWN0 IHZpcnRpb19ncHVfZGV2aWNlICp2Z2RldikKIAl9CiB9CiAKLXZvaWQgdmlydGlvX2dwdV9kcml2 ZXJfdW5sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit2b2lkIHZpcnRpb19ncHVfZGVpbml0 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IHZpcnRpb19ncHVfZGV2aWNlICp2 Z2RldiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmkt ZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==