From: David Weinehall Subject: [PATCH 2/5] drm/i915: Consistent struct device * naming Date: Mon, 8 Aug 2016 16:19:58 +0300 Message-ID: <1470662401-30347-3-git-send-email-david.weinehall@linux.intel.com> References: <1470662401-30347-1-git-send-email-david.weinehall@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 194F16E33C for ; Mon, 8 Aug 2016 13:20:04 +0000 (UTC) In-Reply-To: <1470662401-30347-1-git-send-email-david.weinehall@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org V2UgY3VycmVudGx5IGhhdmUgYSBtaXggb2Ygc3RydWN0IGRldmljZSAqZGV2aWNlLCBzdHJ1Y3Qg ZGV2aWNlICprZGV2LAphbmQgc3RydWN0IGRldmljZSAqZGV2ICh0aGUgbGF0dGVyIGZvcmNpbmcg dXMgdG8gcmVmZXIgdG8Kc3RydWN0IGRybV9kZXZpY2UgYXMgc29tZXRoaW5nIGVsc2UgdGhhbiB0 aGUgbm9ybWFsIGRldikuCgpUbyBzaW1wbGlmeSB0aGluZ3MsIGFsd2F5cyB1c2Uga2RldiB3aGVu IHJlZmVycmluZyB0byBzdHJ1Y3QgZGV2aWNlLgoKV2hpbGUgYXQgaXQgbWFrZSBkZXZfdG9fZHJt X21pbm9yKCkgYW4gaW5saW5lIGZ1bmN0aW9uIGFuZApmb3IgY29uc2lzdGVuY3kgcmVuYW1lIGl0 IGtkZXZfdG9fZHJtX21pbm9yKCkuCgpTaWduZWQtb2ZmLWJ5OiBEYXZpZCBXZWluZWhhbGwgPGRh dmlkLndlaW5laGFsbEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuYyAgICAgICAgIHwgOTYgKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgfCAgNCArLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgICAgIHwgIDYgKy0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X3N5c2ZzLmMgICAgICAgfCA2NSArKysrKysrKysrKy0tLS0tLS0tLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdWRpby5jICAgICAgfCA0NiArKysrKysrKy0tLS0t LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMgfCAzNyArKysrKysr LS0tLS0tCiA2IGZpbGVzIGNoYW5nZWQsIDEyOCBpbnNlcnRpb25zKCspLCAxMjYgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggOGNmYzI2NGVjOWY2Li5lMzI0Y2QwZGJm YTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtNzcsNyArNzcsNyBAQCBfX2k5MTVfcHJp bnRrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgY29uc3QgY2hhciAqbGV2ZWws CiAJICAgICAgY29uc3QgY2hhciAqZm10LCAuLi4pCiB7CiAJc3RhdGljIGJvb2wgc2hvd25fYnVn X29uY2U7Ci0Jc3RydWN0IGRldmljZSAqZGV2ID0gZGV2X3ByaXYtPmRybS5kZXY7CisJc3RydWN0 IGRldmljZSAqa2RldiA9IGRldl9wcml2LT5kcm0uZGV2OwogCWJvb2wgaXNfZXJyb3IgPSBsZXZl bFsxXSA8PSBLRVJOX0VSUlsxXTsKIAlib29sIGlzX2RlYnVnID0gbGV2ZWxbMV0gPT0gS0VSTl9E RUJVR1sxXTsKIAlzdHJ1Y3QgdmFfZm9ybWF0IHZhZjsKQEAgLTkxLDExICs5MSwxMSBAQCBfX2k5 MTVfcHJpbnRrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgY29uc3QgY2hhciAq bGV2ZWwsCiAJdmFmLmZtdCA9IGZtdDsKIAl2YWYudmEgPSAmYXJnczsKIAotCWRldl9wcmludGso bGV2ZWwsIGRldiwgIlsiIERSTV9OQU1FICI6JXBzXSAlcFYiLAorCWRldl9wcmludGsobGV2ZWws IGtkZXYsICJbIiBEUk1fTkFNRSAiOiVwc10gJXBWIiwKIAkJICAgX19idWlsdGluX3JldHVybl9h ZGRyZXNzKDApLCAmdmFmKTsKIAogCWlmIChpc19lcnJvciAmJiAhc2hvd25fYnVnX29uY2UpIHsK LQkJZGV2X25vdGljZShkZXYsICIlcyIsIEZET19CVUdfTVNHKTsKKwkJZGV2X25vdGljZShrZGV2 LCAiJXMiLCBGRE9fQlVHX01TRyk7CiAJCXNob3duX2J1Z19vbmNlID0gdHJ1ZTsKIAl9CiAKQEAg LTE0NjAsOSArMTQ2MCw5IEBAIG91dDoKIAlyZXR1cm4gZXJyb3I7CiB9CiAKLXN0YXRpYyBpbnQg aTkxNV9kcm1fc3VzcGVuZF9sYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkcm1fZGV2LCBib29sIGhp YmVybmF0aW9uKQorc3RhdGljIGludCBpOTE1X2RybV9zdXNwZW5kX2xhdGUoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgYm9vbCBoaWJlcm5hdGlvbikKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRybV9kZXYpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAlib29sIGZ3X2NzcjsKIAlpbnQgcmV0OwogCkBA IC0xNDk2LDcgKzE0OTYsNyBAQCBzdGF0aWMgaW50IGk5MTVfZHJtX3N1c3BlbmRfbGF0ZShzdHJ1 Y3QgZHJtX2RldmljZSAqZHJtX2RldiwgYm9vbCBoaWJlcm5hdGlvbikKIAkJZ290byBvdXQ7CiAJ fQogCi0JcGNpX2Rpc2FibGVfZGV2aWNlKGRybV9kZXYtPnBkZXYpOworCXBjaV9kaXNhYmxlX2Rl dmljZShkZXYtPnBkZXYpOwogCS8qCiAJICogRHVyaW5nIGhpYmVybmF0aW9uIG9uIHNvbWUgcGxh dGZvcm1zIHRoZSBCSU9TIG1heSB0cnkgdG8gYWNjZXNzCiAJICogdGhlIGRldmljZSBldmVuIHRo b3VnaCBpdCdzIGFscmVhZHkgaW4gRDMgYW5kIGhhbmcgdGhlIG1hY2hpbmUuIFNvCkBAIC0xNTEw LDcgKzE1MTAsNyBAQCBzdGF0aWMgaW50IGk5MTVfZHJtX3N1c3BlbmRfbGF0ZShzdHJ1Y3QgZHJt X2RldmljZSAqZHJtX2RldiwgYm9vbCBoaWJlcm5hdGlvbikKIAkgKiBBY2VyIEFzcGlyZSAxODMw VAogCSAqLwogCWlmICghKGhpYmVybmF0aW9uICYmIElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4g PCA2KSkKLQkJcGNpX3NldF9wb3dlcl9zdGF0ZShkcm1fZGV2LT5wZGV2LCBQQ0lfRDNob3QpOwor CQlwY2lfc2V0X3Bvd2VyX3N0YXRlKGRldi0+cGRldiwgUENJX0QzaG90KTsKIAogCWRldl9wcml2 LT5zdXNwZW5kZWRfdG9faWRsZSA9IHN1c3BlbmRfdG9faWRsZShkZXZfcHJpdik7CiAKQEAgLTE4 MDcsMjUgKzE4MDcsMjUgQEAgZXJyb3I6CiAJcmV0dXJuIHJldDsKIH0KIAotc3RhdGljIGludCBp OTE1X3BtX3N1c3BlbmQoc3RydWN0IGRldmljZSAqZGV2KQorc3RhdGljIGludCBpOTE1X3BtX3N1 c3BlbmQoc3RydWN0IGRldmljZSAqa2RldikKIHsKLQlzdHJ1Y3QgcGNpX2RldiAqcGRldiA9IHRv X3BjaV9kZXYoZGV2KTsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZHJtX2RldiA9IHBjaV9nZXRfZHJ2 ZGF0YShwZGV2KTsKKwlzdHJ1Y3QgcGNpX2RldiAqcGRldiA9IHRvX3BjaV9kZXYoa2Rldik7CisJ c3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBjaV9nZXRfZHJ2ZGF0YShwZGV2KTsKIAotCWlmICgh ZHJtX2RldikgewotCQlkZXZfZXJyKGRldiwgIkRSTSBub3QgaW5pdGlhbGl6ZWQsIGFib3J0aW5n IHN1c3BlbmQuXG4iKTsKKwlpZiAoIWRldikgeworCQlkZXZfZXJyKGtkZXYsICJEUk0gbm90IGlu aXRpYWxpemVkLCBhYm9ydGluZyBzdXNwZW5kLlxuIik7CiAJCXJldHVybiAtRU5PREVWOwogCX0K IAotCWlmIChkcm1fZGV2LT5zd2l0Y2hfcG93ZXJfc3RhdGUgPT0gRFJNX1NXSVRDSF9QT1dFUl9P RkYpCisJaWYgKGRldi0+c3dpdGNoX3Bvd2VyX3N0YXRlID09IERSTV9TV0lUQ0hfUE9XRVJfT0ZG KQogCQlyZXR1cm4gMDsKIAotCXJldHVybiBpOTE1X2RybV9zdXNwZW5kKGRybV9kZXYpOworCXJl dHVybiBpOTE1X2RybV9zdXNwZW5kKGRldik7CiB9CiAKLXN0YXRpYyBpbnQgaTkxNV9wbV9zdXNw ZW5kX2xhdGUoc3RydWN0IGRldmljZSAqZGV2KQorc3RhdGljIGludCBpOTE1X3BtX3N1c3BlbmRf bGF0ZShzdHJ1Y3QgZGV2aWNlICprZGV2KQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkcm1fZGV2 ID0gJmRldl90b19pOTE1KGRldiktPmRybTsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gJmtk ZXZfdG9faTkxNShrZGV2KS0+ZHJtOwogCiAJLyoKIAkgKiBXZSBoYXZlIGEgc3VzcGVuZCBvcmRl cmluZyBpc3N1ZSB3aXRoIHRoZSBzbmQtaGRhIGRyaXZlciBhbHNvCkBAIC0xODM2LDU3ICsxODM2 LDU3IEBAIHN0YXRpYyBpbnQgaTkxNV9wbV9zdXNwZW5kX2xhdGUoc3RydWN0IGRldmljZSAqZGV2 KQogCSAqIEZJWE1FOiBUaGlzIHNob3VsZCBiZSBzb2x2ZWQgd2l0aCBhIHNwZWNpYWwgaGRtaSBz aW5rIGRldmljZSBvcgogCSAqIHNpbWlsYXIgc28gdGhhdCBwb3dlciBkb21haW5zIGNhbiBiZSBl bXBsb3llZC4KIAkgKi8KLQlpZiAoZHJtX2Rldi0+c3dpdGNoX3Bvd2VyX3N0YXRlID09IERSTV9T V0lUQ0hfUE9XRVJfT0ZGKQorCWlmIChkZXYtPnN3aXRjaF9wb3dlcl9zdGF0ZSA9PSBEUk1fU1dJ VENIX1BPV0VSX09GRikKIAkJcmV0dXJuIDA7CiAKLQlyZXR1cm4gaTkxNV9kcm1fc3VzcGVuZF9s YXRlKGRybV9kZXYsIGZhbHNlKTsKKwlyZXR1cm4gaTkxNV9kcm1fc3VzcGVuZF9sYXRlKGRldiwg ZmFsc2UpOwogfQogCi1zdGF0aWMgaW50IGk5MTVfcG1fcG93ZXJvZmZfbGF0ZShzdHJ1Y3QgZGV2 aWNlICpkZXYpCitzdGF0aWMgaW50IGk5MTVfcG1fcG93ZXJvZmZfbGF0ZShzdHJ1Y3QgZGV2aWNl ICprZGV2KQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkcm1fZGV2ID0gJmRldl90b19pOTE1KGRl diktPmRybTsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gJmtkZXZfdG9faTkxNShrZGV2KS0+ ZHJtOwogCi0JaWYgKGRybV9kZXYtPnN3aXRjaF9wb3dlcl9zdGF0ZSA9PSBEUk1fU1dJVENIX1BP V0VSX09GRikKKwlpZiAoZGV2LT5zd2l0Y2hfcG93ZXJfc3RhdGUgPT0gRFJNX1NXSVRDSF9QT1dF Ul9PRkYpCiAJCXJldHVybiAwOwogCi0JcmV0dXJuIGk5MTVfZHJtX3N1c3BlbmRfbGF0ZShkcm1f ZGV2LCB0cnVlKTsKKwlyZXR1cm4gaTkxNV9kcm1fc3VzcGVuZF9sYXRlKGRldiwgdHJ1ZSk7CiB9 CiAKLXN0YXRpYyBpbnQgaTkxNV9wbV9yZXN1bWVfZWFybHkoc3RydWN0IGRldmljZSAqZGV2KQor c3RhdGljIGludCBpOTE1X3BtX3Jlc3VtZV9lYXJseShzdHJ1Y3QgZGV2aWNlICprZGV2KQogewot CXN0cnVjdCBkcm1fZGV2aWNlICpkcm1fZGV2ID0gJmRldl90b19pOTE1KGRldiktPmRybTsKKwlz dHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gJmtkZXZfdG9faTkxNShrZGV2KS0+ZHJtOwogCi0JaWYg KGRybV9kZXYtPnN3aXRjaF9wb3dlcl9zdGF0ZSA9PSBEUk1fU1dJVENIX1BPV0VSX09GRikKKwlp ZiAoZGV2LT5zd2l0Y2hfcG93ZXJfc3RhdGUgPT0gRFJNX1NXSVRDSF9QT1dFUl9PRkYpCiAJCXJl dHVybiAwOwogCi0JcmV0dXJuIGk5MTVfZHJtX3Jlc3VtZV9lYXJseShkcm1fZGV2KTsKKwlyZXR1 cm4gaTkxNV9kcm1fcmVzdW1lX2Vhcmx5KGRldik7CiB9CiAKLXN0YXRpYyBpbnQgaTkxNV9wbV9y ZXN1bWUoc3RydWN0IGRldmljZSAqZGV2KQorc3RhdGljIGludCBpOTE1X3BtX3Jlc3VtZShzdHJ1 Y3QgZGV2aWNlICprZGV2KQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkcm1fZGV2ID0gJmRldl90 b19pOTE1KGRldiktPmRybTsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gJmtkZXZfdG9faTkx NShrZGV2KS0+ZHJtOwogCi0JaWYgKGRybV9kZXYtPnN3aXRjaF9wb3dlcl9zdGF0ZSA9PSBEUk1f U1dJVENIX1BPV0VSX09GRikKKwlpZiAoZGV2LT5zd2l0Y2hfcG93ZXJfc3RhdGUgPT0gRFJNX1NX SVRDSF9QT1dFUl9PRkYpCiAJCXJldHVybiAwOwogCi0JcmV0dXJuIGk5MTVfZHJtX3Jlc3VtZShk cm1fZGV2KTsKKwlyZXR1cm4gaTkxNV9kcm1fcmVzdW1lKGRldik7CiB9CiAKIC8qIGZyZWV6ZTog YmVmb3JlIGNyZWF0aW5nIHRoZSBoaWJlcm5hdGlvbl9pbWFnZSAqLwotc3RhdGljIGludCBpOTE1 X3BtX2ZyZWV6ZShzdHJ1Y3QgZGV2aWNlICpkZXYpCitzdGF0aWMgaW50IGk5MTVfcG1fZnJlZXpl KHN0cnVjdCBkZXZpY2UgKmtkZXYpCiB7Ci0JcmV0dXJuIGk5MTVfcG1fc3VzcGVuZChkZXYpOwor CXJldHVybiBpOTE1X3BtX3N1c3BlbmQoa2Rldik7CiB9CiAKLXN0YXRpYyBpbnQgaTkxNV9wbV9m cmVlemVfbGF0ZShzdHJ1Y3QgZGV2aWNlICpkZXYpCitzdGF0aWMgaW50IGk5MTVfcG1fZnJlZXpl X2xhdGUoc3RydWN0IGRldmljZSAqa2RldikKIHsKIAlpbnQgcmV0OwogCi0JcmV0ID0gaTkxNV9w bV9zdXNwZW5kX2xhdGUoZGV2KTsKKwlyZXQgPSBpOTE1X3BtX3N1c3BlbmRfbGF0ZShrZGV2KTsK IAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0JcmV0ID0gaTkxNV9nZW1fZnJlZXplX2xhdGUo ZGV2X3RvX2k5MTUoZGV2KSk7CisJcmV0ID0gaTkxNV9nZW1fZnJlZXplX2xhdGUoa2Rldl90b19p OTE1KGtkZXYpKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCkBAIC0xODk0LDI1ICsxODk0 LDI1IEBAIHN0YXRpYyBpbnQgaTkxNV9wbV9mcmVlemVfbGF0ZShzdHJ1Y3QgZGV2aWNlICpkZXYp CiB9CiAKIC8qIHRoYXc6IGNhbGxlZCBhZnRlciBjcmVhdGluZyB0aGUgaGliZXJuYXRpb24gaW1h Z2UsIGJ1dCBiZWZvcmUgdHVybmluZyBvZmYuICovCi1zdGF0aWMgaW50IGk5MTVfcG1fdGhhd19l YXJseShzdHJ1Y3QgZGV2aWNlICpkZXYpCitzdGF0aWMgaW50IGk5MTVfcG1fdGhhd19lYXJseShz dHJ1Y3QgZGV2aWNlICprZGV2KQogewotCXJldHVybiBpOTE1X3BtX3Jlc3VtZV9lYXJseShkZXYp OworCXJldHVybiBpOTE1X3BtX3Jlc3VtZV9lYXJseShrZGV2KTsKIH0KIAotc3RhdGljIGludCBp OTE1X3BtX3RoYXcoc3RydWN0IGRldmljZSAqZGV2KQorc3RhdGljIGludCBpOTE1X3BtX3RoYXco c3RydWN0IGRldmljZSAqa2RldikKIHsKLQlyZXR1cm4gaTkxNV9wbV9yZXN1bWUoZGV2KTsKKwly ZXR1cm4gaTkxNV9wbV9yZXN1bWUoa2Rldik7CiB9CiAKIC8qIHJlc3RvcmU6IGNhbGxlZCBhZnRl ciBsb2FkaW5nIHRoZSBoaWJlcm5hdGlvbiBpbWFnZS4gKi8KLXN0YXRpYyBpbnQgaTkxNV9wbV9y ZXN0b3JlX2Vhcmx5KHN0cnVjdCBkZXZpY2UgKmRldikKK3N0YXRpYyBpbnQgaTkxNV9wbV9yZXN0 b3JlX2Vhcmx5KHN0cnVjdCBkZXZpY2UgKmtkZXYpCiB7Ci0JcmV0dXJuIGk5MTVfcG1fcmVzdW1l X2Vhcmx5KGRldik7CisJcmV0dXJuIGk5MTVfcG1fcmVzdW1lX2Vhcmx5KGtkZXYpOwogfQogCi1z dGF0aWMgaW50IGk5MTVfcG1fcmVzdG9yZShzdHJ1Y3QgZGV2aWNlICpkZXYpCitzdGF0aWMgaW50 IGk5MTVfcG1fcmVzdG9yZShzdHJ1Y3QgZGV2aWNlICprZGV2KQogewotCXJldHVybiBpOTE1X3Bt X3Jlc3VtZShkZXYpOworCXJldHVybiBpOTE1X3BtX3Jlc3VtZShrZGV2KTsKIH0KIAogLyoKQEAg LTIyNzQsOSArMjI3NCw5IEBAIHN0YXRpYyBpbnQgdmx2X3Jlc3VtZV9wcmVwYXJlKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlyZXR1cm4gcmV0OwogfQogCi1zdGF0aWMgaW50 IGludGVsX3J1bnRpbWVfc3VzcGVuZChzdHJ1Y3QgZGV2aWNlICpkZXZpY2UpCitzdGF0aWMgaW50 IGludGVsX3J1bnRpbWVfc3VzcGVuZChzdHJ1Y3QgZGV2aWNlICprZGV2KQogewotCXN0cnVjdCBw Y2lfZGV2ICpwZGV2ID0gdG9fcGNpX2RldihkZXZpY2UpOworCXN0cnVjdCBwY2lfZGV2ICpwZGV2 ID0gdG9fcGNpX2RldihrZGV2KTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcGNpX2dldF9k cnZkYXRhKHBkZXYpOwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5 MTUoZGV2KTsKIAlpbnQgcmV0OwpAQCAtMjMwMiw3ICsyMzAyLDcgQEAgc3RhdGljIGludCBpbnRl bF9ydW50aW1lX3N1c3BlbmQoc3RydWN0IGRldmljZSAqZGV2aWNlKQogCQkgKiBCdW1wIHRoZSBl eHBpcmF0aW9uIHRpbWVzdGFtcCwgb3RoZXJ3aXNlIHRoZSBzdXNwZW5kIHdvbid0CiAJCSAqIGJl IHJlc2NoZWR1bGVkLgogCQkgKi8KLQkJcG1fcnVudGltZV9tYXJrX2xhc3RfYnVzeShkZXZpY2Up OworCQlwbV9ydW50aW1lX21hcmtfbGFzdF9idXN5KGtkZXYpOwogCiAJCXJldHVybiAtRUFHQUlO OwogCX0KQEAgLTIzODEsOSArMjM4MSw5IEBAIHN0YXRpYyBpbnQgaW50ZWxfcnVudGltZV9zdXNw ZW5kKHN0cnVjdCBkZXZpY2UgKmRldmljZSkKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIGludCBp bnRlbF9ydW50aW1lX3Jlc3VtZShzdHJ1Y3QgZGV2aWNlICpkZXZpY2UpCitzdGF0aWMgaW50IGlu dGVsX3J1bnRpbWVfcmVzdW1lKHN0cnVjdCBkZXZpY2UgKmtkZXYpCiB7Ci0Jc3RydWN0IHBjaV9k ZXYgKnBkZXYgPSB0b19wY2lfZGV2KGRldmljZSk7CisJc3RydWN0IHBjaV9kZXYgKnBkZXYgPSB0 b19wY2lfZGV2KGtkZXYpOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwY2lfZ2V0X2RydmRh dGEocGRldik7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShk ZXYpOwogCWludCByZXQgPSAwOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggZTcxZjMzNGE0 NmJjLi40OTc1ZGU3NWUyYTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjA0OSw5ICsy MDQ5LDkgQEAgc3RhdGljIGlubGluZSBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqdG9faTkxNShj b25zdCBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCXJldHVybiBjb250YWluZXJfb2YoZGV2LCBz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSwgZHJtKTsKIH0KIAotc3RhdGljIGlubGluZSBzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3RvX2k5MTUoc3RydWN0IGRldmljZSAqZGV2KQorc3RhdGlj IGlubGluZSBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqa2Rldl90b19pOTE1KHN0cnVjdCBkZXZp Y2UgKmtkZXYpCiB7Ci0JcmV0dXJuIHRvX2k5MTUoZGV2X2dldF9kcnZkYXRhKGRldikpOworCXJl dHVybiB0b19pOTE1KGRldl9nZXRfZHJ2ZGF0YShrZGV2KSk7CiB9CiAKIHN0YXRpYyBpbmxpbmUg c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmd1Y190b19pOTE1KHN0cnVjdCBpbnRlbF9ndWMgKmd1 YykKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggMThjN2M5NjQ0NzYxLi43MmFh MzE2NDVkYTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC0zMjQsMTYgKzMy NCwxNiBAQCBzdGF0aWMgZ2VuNl9wdGVfdCBpcmlzX3B0ZV9lbmNvZGUoZG1hX2FkZHJfdCBhZGRy LAogc3RhdGljIGludCBfX3NldHVwX3BhZ2VfZG1hKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJ CQkgICAgc3RydWN0IGk5MTVfcGFnZV9kbWEgKnAsIGdmcF90IGZsYWdzKQogewotCXN0cnVjdCBk ZXZpY2UgKmRldmljZSA9ICZkZXYtPnBkZXYtPmRldjsKKwlzdHJ1Y3QgZGV2aWNlICprZGV2ID0g JmRldi0+cGRldi0+ZGV2OwogCiAJcC0+cGFnZSA9IGFsbG9jX3BhZ2UoZmxhZ3MpOwogCWlmICgh cC0+cGFnZSkKIAkJcmV0dXJuIC1FTk9NRU07CiAKLQlwLT5kYWRkciA9IGRtYV9tYXBfcGFnZShk ZXZpY2UsCisJcC0+ZGFkZHIgPSBkbWFfbWFwX3BhZ2Uoa2RldiwKIAkJCQlwLT5wYWdlLCAwLCA0 MDk2LCBQQ0lfRE1BX0JJRElSRUNUSU9OQUwpOwogCi0JaWYgKGRtYV9tYXBwaW5nX2Vycm9yKGRl dmljZSwgcC0+ZGFkZHIpKSB7CisJaWYgKGRtYV9tYXBwaW5nX2Vycm9yKGtkZXYsIHAtPmRhZGRy KSkgewogCQlfX2ZyZWVfcGFnZShwLT5wYWdlKTsKIAkJcmV0dXJuIC1FSU5WQUw7CiAJfQpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zeXNmcy5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9zeXNmcy5jCmluZGV4IGYxZmZkZTdmN2MwYi4uMDVjYjk1YmYyZjRiIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3N5c2ZzLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9zeXNmcy5jCkBAIC0zMiw3ICszMiwxMCBAQAogI2luY2x1ZGUg ImludGVsX2Rydi5oIgogI2luY2x1ZGUgImk5MTVfZHJ2LmgiCiAKLSNkZWZpbmUgZGV2X3RvX2Ry bV9taW5vcihkKSBkZXZfZ2V0X2RydmRhdGEoKGQpKQorc3RhdGljIGlubGluZSBzdHJ1Y3QgZHJt X21pbm9yICprZGV2X3RvX2RybV9taW5vcihzdHJ1Y3QgZGV2aWNlICprZGV2KQoreworCXJldHVy biBkZXZfZ2V0X2RydmRhdGEoa2Rldik7Cit9CiAKICNpZmRlZiBDT05GSUdfUE0KIHN0YXRpYyB1 MzIgY2FsY19yZXNpZGVuY3koc3RydWN0IGRybV9kZXZpY2UgKmRldiwKQEAgLTg0LDcgKzg3LDcg QEAgc2hvd19yYzZfbXMoc3RydWN0IGRldmljZSAqa2Rldiwgc3RydWN0IGRldmljZV9hdHRyaWJ1 dGUgKmF0dHIsIGNoYXIgKmJ1ZikKIHN0YXRpYyBzc2l6ZV90CiBzaG93X3JjNnBfbXMoc3RydWN0 IGRldmljZSAqa2Rldiwgc3RydWN0IGRldmljZV9hdHRyaWJ1dGUgKmF0dHIsIGNoYXIgKmJ1ZikK IHsKLQlzdHJ1Y3QgZHJtX21pbm9yICpkbWlub3IgPSBkZXZfdG9fZHJtX21pbm9yKGtkZXYpOwor CXN0cnVjdCBkcm1fbWlub3IgKmRtaW5vciA9IGtkZXZfdG9fZHJtX21pbm9yKGtkZXYpOwogCXUz MiByYzZwX3Jlc2lkZW5jeSA9IGNhbGNfcmVzaWRlbmN5KGRtaW5vci0+ZGV2LCBHRU42X0dUX0dG WF9SQzZwKTsKIAlyZXR1cm4gc25wcmludGYoYnVmLCBQQUdFX1NJWkUsICIldVxuIiwgcmM2cF9y ZXNpZGVuY3kpOwogfQpAQCAtOTIsNyArOTUsNyBAQCBzaG93X3JjNnBfbXMoc3RydWN0IGRldmlj ZSAqa2Rldiwgc3RydWN0IGRldmljZV9hdHRyaWJ1dGUgKmF0dHIsIGNoYXIgKmJ1ZikKIHN0YXRp YyBzc2l6ZV90CiBzaG93X3JjNnBwX21zKHN0cnVjdCBkZXZpY2UgKmtkZXYsIHN0cnVjdCBkZXZp Y2VfYXR0cmlidXRlICphdHRyLCBjaGFyICpidWYpCiB7Ci0Jc3RydWN0IGRybV9taW5vciAqZG1p bm9yID0gZGV2X3RvX2RybV9taW5vcihrZGV2KTsKKwlzdHJ1Y3QgZHJtX21pbm9yICpkbWlub3Ig PSBrZGV2X3RvX2RybV9taW5vcihrZGV2KTsKIAl1MzIgcmM2cHBfcmVzaWRlbmN5ID0gY2FsY19y ZXNpZGVuY3koZG1pbm9yLT5kZXYsIEdFTjZfR1RfR0ZYX1JDNnBwKTsKIAlyZXR1cm4gc25wcmlu dGYoYnVmLCBQQUdFX1NJWkUsICIldVxuIiwgcmM2cHBfcmVzaWRlbmN5KTsKIH0KQEAgLTE2Mywy MiArMTY2LDIyIEBAIGk5MTVfbDNfcmVhZChzdHJ1Y3QgZmlsZSAqZmlscCwgc3RydWN0IGtvYmpl Y3QgKmtvYmosCiAJICAgICBzdHJ1Y3QgYmluX2F0dHJpYnV0ZSAqYXR0ciwgY2hhciAqYnVmLAog CSAgICAgbG9mZl90IG9mZnNldCwgc2l6ZV90IGNvdW50KQogewotCXN0cnVjdCBkZXZpY2UgKmRl diA9IGtvYmpfdG9fZGV2KGtvYmopOwotCXN0cnVjdCBkcm1fbWlub3IgKmRtaW5vciA9IGRldl90 b19kcm1fbWlub3IoZGV2KTsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZHJtX2RldiA9IGRtaW5vci0+ ZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZHJtX2Rl dik7CisJc3RydWN0IGRldmljZSAqa2RldiA9IGtvYmpfdG9fZGV2KGtvYmopOworCXN0cnVjdCBk cm1fbWlub3IgKmRtaW5vciA9IGtkZXZfdG9fZHJtX21pbm9yKGtkZXYpOworCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBkbWlub3ItPmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSB0b19pOTE1KGRldik7CiAJaW50IHNsaWNlID0gKGludCkodWludHB0cl90KWF0dHIt PnByaXZhdGU7CiAJaW50IHJldDsKIAogCWNvdW50ID0gcm91bmRfZG93bihjb3VudCwgNCk7CiAK LQlyZXQgPSBsM19hY2Nlc3NfdmFsaWQoZHJtX2Rldiwgb2Zmc2V0KTsKKwlyZXQgPSBsM19hY2Nl c3NfdmFsaWQoZGV2LCBvZmZzZXQpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKIAljb3Vu dCA9IG1pbl90KHNpemVfdCwgR0VON19MM0xPR19TSVpFIC0gb2Zmc2V0LCBjb3VudCk7CiAKLQly ZXQgPSBpOTE1X211dGV4X2xvY2tfaW50ZXJydXB0aWJsZShkcm1fZGV2KTsKKwlyZXQgPSBpOTE1 X211dGV4X2xvY2tfaW50ZXJydXB0aWJsZShkZXYpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7 CiAKQEAgLTE4OSw3ICsxOTIsNyBAQCBpOTE1X2wzX3JlYWQoc3RydWN0IGZpbGUgKmZpbHAsIHN0 cnVjdCBrb2JqZWN0ICprb2JqLAogCWVsc2UKIAkJbWVtc2V0KGJ1ZiwgMCwgY291bnQpOwogCi0J bXV0ZXhfdW5sb2NrKCZkcm1fZGV2LT5zdHJ1Y3RfbXV0ZXgpOworCW11dGV4X3VubG9jaygmZGV2 LT5zdHJ1Y3RfbXV0ZXgpOwogCiAJcmV0dXJuIGNvdW50OwogfQpAQCAtMTk5LDMwICsyMDIsMzAg QEAgaTkxNV9sM193cml0ZShzdHJ1Y3QgZmlsZSAqZmlscCwgc3RydWN0IGtvYmplY3QgKmtvYmos CiAJICAgICAgc3RydWN0IGJpbl9hdHRyaWJ1dGUgKmF0dHIsIGNoYXIgKmJ1ZiwKIAkgICAgICBs b2ZmX3Qgb2Zmc2V0LCBzaXplX3QgY291bnQpCiB7Ci0Jc3RydWN0IGRldmljZSAqZGV2ID0ga29i al90b19kZXYoa29iaik7Ci0Jc3RydWN0IGRybV9taW5vciAqZG1pbm9yID0gZGV2X3RvX2RybV9t aW5vcihkZXYpOwotCXN0cnVjdCBkcm1fZGV2aWNlICpkcm1fZGV2ID0gZG1pbm9yLT5kZXY7Ci0J c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkcm1fZGV2KTsKKwlz dHJ1Y3QgZGV2aWNlICprZGV2ID0ga29ial90b19kZXYoa29iaik7CisJc3RydWN0IGRybV9taW5v ciAqZG1pbm9yID0ga2Rldl90b19kcm1fbWlub3Ioa2Rldik7CisJc3RydWN0IGRybV9kZXZpY2Ug KmRldiA9IGRtaW5vci0+ZGV2OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IHRvX2k5MTUoZGV2KTsKIAlzdHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAqY3R4OwogCXUzMiAqdGVt cCA9IE5VTEw7IC8qIEp1c3QgaGVyZSB0byBtYWtlIGhhbmRsaW5nIGZhaWx1cmVzIGVhc3kgKi8K IAlpbnQgc2xpY2UgPSAoaW50KSh1aW50cHRyX3QpYXR0ci0+cHJpdmF0ZTsKIAlpbnQgcmV0Owog Ci0JaWYgKCFIQVNfSFdfQ09OVEVYVFMoZHJtX2RldikpCisJaWYgKCFIQVNfSFdfQ09OVEVYVFMo ZGV2KSkKIAkJcmV0dXJuIC1FTlhJTzsKIAotCXJldCA9IGwzX2FjY2Vzc192YWxpZChkcm1fZGV2 LCBvZmZzZXQpOworCXJldCA9IGwzX2FjY2Vzc192YWxpZChkZXYsIG9mZnNldCk7CiAJaWYgKHJl dCkKIAkJcmV0dXJuIHJldDsKIAotCXJldCA9IGk5MTVfbXV0ZXhfbG9ja19pbnRlcnJ1cHRpYmxl KGRybV9kZXYpOworCXJldCA9IGk5MTVfbXV0ZXhfbG9ja19pbnRlcnJ1cHRpYmxlKGRldik7CiAJ aWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAogCWlmICghZGV2X3ByaXYtPmwzX3Bhcml0eS5yZW1h cF9pbmZvW3NsaWNlXSkgewogCQl0ZW1wID0ga3phbGxvYyhHRU43X0wzTE9HX1NJWkUsIEdGUF9L RVJORUwpOwogCQlpZiAoIXRlbXApIHsKLQkJCW11dGV4X3VubG9jaygmZHJtX2Rldi0+c3RydWN0 X211dGV4KTsKKwkJCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCQkJcmV0dXJu IC1FTk9NRU07CiAJCX0KIAl9CkBAIC0yNDAsNyArMjQzLDcgQEAgaTkxNV9sM193cml0ZShzdHJ1 Y3QgZmlsZSAqZmlscCwgc3RydWN0IGtvYmplY3QgKmtvYmosCiAJbGlzdF9mb3JfZWFjaF9lbnRy eShjdHgsICZkZXZfcHJpdi0+Y29udGV4dF9saXN0LCBsaW5rKQogCQljdHgtPnJlbWFwX3NsaWNl IHw9ICgxPDxzbGljZSk7CiAKLQltdXRleF91bmxvY2soJmRybV9kZXYtPnN0cnVjdF9tdXRleCk7 CisJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAKIAlyZXR1cm4gY291bnQ7CiB9 CkBAIC0yNjYsNyArMjY5LDcgQEAgc3RhdGljIHN0cnVjdCBiaW5fYXR0cmlidXRlIGRwZl9hdHRy c18xID0gewogc3RhdGljIHNzaXplX3QgZ3RfYWN0X2ZyZXFfbWh6X3Nob3coc3RydWN0IGRldmlj ZSAqa2RldiwKIAkJCQkgICAgc3RydWN0IGRldmljZV9hdHRyaWJ1dGUgKmF0dHIsIGNoYXIgKmJ1 ZikKIHsKLQlzdHJ1Y3QgZHJtX21pbm9yICptaW5vciA9IGRldl90b19kcm1fbWlub3Ioa2Rldik7 CisJc3RydWN0IGRybV9taW5vciAqbWlub3IgPSBrZGV2X3RvX2RybV9taW5vcihrZGV2KTsKIAlz dHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gbWlub3ItPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJaW50IHJldDsKQEAgLTI5OCw3ICszMDEs NyBAQCBzdGF0aWMgc3NpemVfdCBndF9hY3RfZnJlcV9taHpfc2hvdyhzdHJ1Y3QgZGV2aWNlICpr ZGV2LAogc3RhdGljIHNzaXplX3QgZ3RfY3VyX2ZyZXFfbWh6X3Nob3coc3RydWN0IGRldmljZSAq a2RldiwKIAkJCQkgICAgc3RydWN0IGRldmljZV9hdHRyaWJ1dGUgKmF0dHIsIGNoYXIgKmJ1ZikK IHsKLQlzdHJ1Y3QgZHJtX21pbm9yICptaW5vciA9IGRldl90b19kcm1fbWlub3Ioa2Rldik7CisJ c3RydWN0IGRybV9taW5vciAqbWlub3IgPSBrZGV2X3RvX2RybV9taW5vcihrZGV2KTsKIAlzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2ID0gbWlub3ItPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAKQEAgLTMwOSw3ICszMTIsNyBAQCBzdGF0aWMg c3NpemVfdCBndF9jdXJfZnJlcV9taHpfc2hvdyhzdHJ1Y3QgZGV2aWNlICprZGV2LAogCiBzdGF0 aWMgc3NpemVfdCBndF9ib29zdF9mcmVxX21oel9zaG93KHN0cnVjdCBkZXZpY2UgKmtkZXYsIHN0 cnVjdCBkZXZpY2VfYXR0cmlidXRlICphdHRyLCBjaGFyICpidWYpCiB7Ci0Jc3RydWN0IGRybV9t aW5vciAqbWlub3IgPSBkZXZfdG9fZHJtX21pbm9yKGtkZXYpOworCXN0cnVjdCBkcm1fbWlub3Ig Km1pbm9yID0ga2Rldl90b19kcm1fbWlub3Ioa2Rldik7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gdG9faTkxNShtaW5vci0+ZGV2KTsKIAogCXJldHVybiBzbnByaW50Zihi dWYsIFBBR0VfU0laRSwgIiVkXG4iLApAQCAtMzIxLDcgKzMyNCw3IEBAIHN0YXRpYyBzc2l6ZV90 IGd0X2Jvb3N0X2ZyZXFfbWh6X3N0b3JlKHN0cnVjdCBkZXZpY2UgKmtkZXYsCiAJCQkJICAgICAg IHN0cnVjdCBkZXZpY2VfYXR0cmlidXRlICphdHRyLAogCQkJCSAgICAgICBjb25zdCBjaGFyICpi dWYsIHNpemVfdCBjb3VudCkKIHsKLQlzdHJ1Y3QgZHJtX21pbm9yICptaW5vciA9IGRldl90b19k cm1fbWlub3Ioa2Rldik7CisJc3RydWN0IGRybV9taW5vciAqbWlub3IgPSBrZGV2X3RvX2RybV9t aW5vcihrZGV2KTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gbWlub3ItPmRldjsKIAlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJdTMyIHZhbDsK QEAgLTM0Niw3ICszNDksNyBAQCBzdGF0aWMgc3NpemVfdCBndF9ib29zdF9mcmVxX21oel9zdG9y ZShzdHJ1Y3QgZGV2aWNlICprZGV2LAogc3RhdGljIHNzaXplX3Qgdmx2X3JwZV9mcmVxX21oel9z aG93KHN0cnVjdCBkZXZpY2UgKmtkZXYsCiAJCQkJICAgICBzdHJ1Y3QgZGV2aWNlX2F0dHJpYnV0 ZSAqYXR0ciwgY2hhciAqYnVmKQogewotCXN0cnVjdCBkcm1fbWlub3IgKm1pbm9yID0gZGV2X3Rv X2RybV9taW5vcihrZGV2KTsKKwlzdHJ1Y3QgZHJtX21pbm9yICptaW5vciA9IGtkZXZfdG9fZHJt X21pbm9yKGtkZXYpOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBtaW5vci0+ZGV2OwogCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIApAQCAtMzU3 LDcgKzM2MCw3IEBAIHN0YXRpYyBzc2l6ZV90IHZsdl9ycGVfZnJlcV9taHpfc2hvdyhzdHJ1Y3Qg ZGV2aWNlICprZGV2LAogCiBzdGF0aWMgc3NpemVfdCBndF9tYXhfZnJlcV9taHpfc2hvdyhzdHJ1 Y3QgZGV2aWNlICprZGV2LCBzdHJ1Y3QgZGV2aWNlX2F0dHJpYnV0ZSAqYXR0ciwgY2hhciAqYnVm KQogewotCXN0cnVjdCBkcm1fbWlub3IgKm1pbm9yID0gZGV2X3RvX2RybV9taW5vcihrZGV2KTsK KwlzdHJ1Y3QgZHJtX21pbm9yICptaW5vciA9IGtkZXZfdG9fZHJtX21pbm9yKGtkZXYpOwogCXN0 cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBtaW5vci0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIApAQCAtMzcwLDcgKzM3Myw3IEBAIHN0YXRp YyBzc2l6ZV90IGd0X21heF9mcmVxX21oel9zdG9yZShzdHJ1Y3QgZGV2aWNlICprZGV2LAogCQkJ CSAgICAgc3RydWN0IGRldmljZV9hdHRyaWJ1dGUgKmF0dHIsCiAJCQkJICAgICBjb25zdCBjaGFy ICpidWYsIHNpemVfdCBjb3VudCkKIHsKLQlzdHJ1Y3QgZHJtX21pbm9yICptaW5vciA9IGRldl90 b19kcm1fbWlub3Ioa2Rldik7CisJc3RydWN0IGRybV9taW5vciAqbWlub3IgPSBrZGV2X3RvX2Ry bV9taW5vcihrZGV2KTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gbWlub3ItPmRldjsKIAlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJdTMyIHZh bDsKQEAgLTQxOCw3ICs0MjEsNyBAQCBzdGF0aWMgc3NpemVfdCBndF9tYXhfZnJlcV9taHpfc3Rv cmUoc3RydWN0IGRldmljZSAqa2RldiwKIAogc3RhdGljIHNzaXplX3QgZ3RfbWluX2ZyZXFfbWh6 X3Nob3coc3RydWN0IGRldmljZSAqa2Rldiwgc3RydWN0IGRldmljZV9hdHRyaWJ1dGUgKmF0dHIs IGNoYXIgKmJ1ZikKIHsKLQlzdHJ1Y3QgZHJtX21pbm9yICptaW5vciA9IGRldl90b19kcm1fbWlu b3Ioa2Rldik7CisJc3RydWN0IGRybV9taW5vciAqbWlub3IgPSBrZGV2X3RvX2RybV9taW5vcihr ZGV2KTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gbWlub3ItPmRldjsKIAlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAKQEAgLTQzMSw3ICs0MzQs NyBAQCBzdGF0aWMgc3NpemVfdCBndF9taW5fZnJlcV9taHpfc3RvcmUoc3RydWN0IGRldmljZSAq a2RldiwKIAkJCQkgICAgIHN0cnVjdCBkZXZpY2VfYXR0cmlidXRlICphdHRyLAogCQkJCSAgICAg Y29uc3QgY2hhciAqYnVmLCBzaXplX3QgY291bnQpCiB7Ci0Jc3RydWN0IGRybV9taW5vciAqbWlu b3IgPSBkZXZfdG9fZHJtX21pbm9yKGtkZXYpOworCXN0cnVjdCBkcm1fbWlub3IgKm1pbm9yID0g a2Rldl90b19kcm1fbWlub3Ioa2Rldik7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IG1pbm9y LT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYp OwogCXUzMiB2YWw7CkBAIC00OTAsNyArNDkzLDcgQEAgc3RhdGljIERFVklDRV9BVFRSKGd0X1JQ bl9mcmVxX21oeiwgU19JUlVHTywgZ3RfcnBfbWh6X3Nob3csIE5VTEwpOwogLyogRm9yIG5vdyB3 ZSBoYXZlIGEgc3RhdGljIG51bWJlciBvZiBSUCBzdGF0ZXMgKi8KIHN0YXRpYyBzc2l6ZV90IGd0 X3JwX21oel9zaG93KHN0cnVjdCBkZXZpY2UgKmtkZXYsIHN0cnVjdCBkZXZpY2VfYXR0cmlidXRl ICphdHRyLCBjaGFyICpidWYpCiB7Ci0Jc3RydWN0IGRybV9taW5vciAqbWlub3IgPSBkZXZfdG9f ZHJtX21pbm9yKGtkZXYpOworCXN0cnVjdCBkcm1fbWlub3IgKm1pbm9yID0ga2Rldl90b19kcm1f bWlub3Ioa2Rldik7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IG1pbm9yLT5kZXY7CiAJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCXUzMiB2YWw7 CkBAIC01MzgsNyArNTQxLDcgQEAgc3RhdGljIHNzaXplX3QgZXJyb3Jfc3RhdGVfcmVhZChzdHJ1 Y3QgZmlsZSAqZmlscCwgc3RydWN0IGtvYmplY3QgKmtvYmosCiB7CiAKIAlzdHJ1Y3QgZGV2aWNl ICprZGV2ID0ga29ial90b19kZXYoa29iaik7Ci0Jc3RydWN0IGRybV9taW5vciAqbWlub3IgPSBk ZXZfdG9fZHJtX21pbm9yKGtkZXYpOworCXN0cnVjdCBkcm1fbWlub3IgKm1pbm9yID0ga2Rldl90 b19kcm1fbWlub3Ioa2Rldik7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IG1pbm9yLT5kZXY7 CiAJc3RydWN0IGk5MTVfZXJyb3Jfc3RhdGVfZmlsZV9wcml2IGVycm9yX3ByaXY7CiAJc3RydWN0 IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiBlcnJvcl9zdHI7CkBAIC01NzMsNyArNTc2LDcgQEAg c3RhdGljIHNzaXplX3QgZXJyb3Jfc3RhdGVfd3JpdGUoc3RydWN0IGZpbGUgKmZpbGUsIHN0cnVj dCBrb2JqZWN0ICprb2JqLAogCQkJCSBsb2ZmX3Qgb2ZmLCBzaXplX3QgY291bnQpCiB7CiAJc3Ry dWN0IGRldmljZSAqa2RldiA9IGtvYmpfdG9fZGV2KGtvYmopOwotCXN0cnVjdCBkcm1fbWlub3Ig Km1pbm9yID0gZGV2X3RvX2RybV9taW5vcihrZGV2KTsKKwlzdHJ1Y3QgZHJtX21pbm9yICptaW5v ciA9IGtkZXZfdG9fZHJtX21pbm9yKGtkZXYpOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBt aW5vci0+ZGV2OwogCWludCByZXQ7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2F1ZGlvLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdWRpby5jCmluZGV4 IGQzMmY1ODZmOWMwNS4uNzYyNTcyYWVjYTIzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9hdWRpby5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F1ZGlv LmMKQEAgLTU4MSwyNiArNTgxLDI2IEBAIHZvaWQgaW50ZWxfaW5pdF9hdWRpb19ob29rcyhzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJfQogfQogCi1zdGF0aWMgdm9pZCBpOTE1 X2F1ZGlvX2NvbXBvbmVudF9nZXRfcG93ZXIoc3RydWN0IGRldmljZSAqZGV2KQorc3RhdGljIHZv aWQgaTkxNV9hdWRpb19jb21wb25lbnRfZ2V0X3Bvd2VyKHN0cnVjdCBkZXZpY2UgKmtkZXYpCiB7 Ci0JaW50ZWxfZGlzcGxheV9wb3dlcl9nZXQoZGV2X3RvX2k5MTUoZGV2KSwgUE9XRVJfRE9NQUlO X0FVRElPKTsKKwlpbnRlbF9kaXNwbGF5X3Bvd2VyX2dldChrZGV2X3RvX2k5MTUoa2RldiksIFBP V0VSX0RPTUFJTl9BVURJTyk7CiB9CiAKLXN0YXRpYyB2b2lkIGk5MTVfYXVkaW9fY29tcG9uZW50 X3B1dF9wb3dlcihzdHJ1Y3QgZGV2aWNlICpkZXYpCitzdGF0aWMgdm9pZCBpOTE1X2F1ZGlvX2Nv bXBvbmVudF9wdXRfcG93ZXIoc3RydWN0IGRldmljZSAqa2RldikKIHsKLQlpbnRlbF9kaXNwbGF5 X3Bvd2VyX3B1dChkZXZfdG9faTkxNShkZXYpLCBQT1dFUl9ET01BSU5fQVVESU8pOworCWludGVs X2Rpc3BsYXlfcG93ZXJfcHV0KGtkZXZfdG9faTkxNShrZGV2KSwgUE9XRVJfRE9NQUlOX0FVRElP KTsKIH0KIAotc3RhdGljIHZvaWQgaTkxNV9hdWRpb19jb21wb25lbnRfY29kZWNfd2FrZV9vdmVy cmlkZShzdHJ1Y3QgZGV2aWNlICpkZXYsCitzdGF0aWMgdm9pZCBpOTE1X2F1ZGlvX2NvbXBvbmVu dF9jb2RlY193YWtlX292ZXJyaWRlKHN0cnVjdCBkZXZpY2UgKmtkZXYsCiAJCQkJCQkgICAgIGJv b2wgZW5hYmxlKQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldl90 b19pOTE1KGRldik7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0ga2Rldl90 b19pOTE1KGtkZXYpOwogCXUzMiB0bXA7CiAKIAlpZiAoIUlTX1NLWUxBS0UoZGV2X3ByaXYpICYm ICFJU19LQUJZTEFLRShkZXZfcHJpdikpCiAJCXJldHVybjsKIAotCWk5MTVfYXVkaW9fY29tcG9u ZW50X2dldF9wb3dlcihkZXYpOworCWk5MTVfYXVkaW9fY29tcG9uZW50X2dldF9wb3dlcihrZGV2 KTsKIAogCS8qCiAJICogRW5hYmxlL2Rpc2FibGUgZ2VuZXJhdGluZyB0aGUgY29kZWMgd2FrZSBz aWduYWwsIG92ZXJyaWRpbmcgdGhlCkBAIC02MTgsMTMgKzYxOCwxMyBAQCBzdGF0aWMgdm9pZCBp OTE1X2F1ZGlvX2NvbXBvbmVudF9jb2RlY193YWtlX292ZXJyaWRlKHN0cnVjdCBkZXZpY2UgKmRl diwKIAkJdXNsZWVwX3JhbmdlKDEwMDAsIDE1MDApOwogCX0KIAotCWk5MTVfYXVkaW9fY29tcG9u ZW50X3B1dF9wb3dlcihkZXYpOworCWk5MTVfYXVkaW9fY29tcG9uZW50X3B1dF9wb3dlcihrZGV2 KTsKIH0KIAogLyogR2V0IENEQ0xLIGluIGtIeiAgKi8KLXN0YXRpYyBpbnQgaTkxNV9hdWRpb19j b21wb25lbnRfZ2V0X2NkY2xrX2ZyZXEoc3RydWN0IGRldmljZSAqZGV2KQorc3RhdGljIGludCBp OTE1X2F1ZGlvX2NvbXBvbmVudF9nZXRfY2RjbGtfZnJlcShzdHJ1Y3QgZGV2aWNlICprZGV2KQog ewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldl90b19pOTE1KGRldik7 CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0ga2Rldl90b19pOTE1KGtkZXYp OwogCiAJaWYgKFdBUk5fT05fT05DRSghSEFTX0RESShkZXZfcHJpdikpKQogCQlyZXR1cm4gLUVO T0RFVjsKQEAgLTYzMiwxMCArNjMyLDEwIEBAIHN0YXRpYyBpbnQgaTkxNV9hdWRpb19jb21wb25l bnRfZ2V0X2NkY2xrX2ZyZXEoc3RydWN0IGRldmljZSAqZGV2KQogCXJldHVybiBkZXZfcHJpdi0+ Y2RjbGtfZnJlcTsKIH0KIAotc3RhdGljIGludCBpOTE1X2F1ZGlvX2NvbXBvbmVudF9zeW5jX2F1 ZGlvX3JhdGUoc3RydWN0IGRldmljZSAqZGV2LAorc3RhdGljIGludCBpOTE1X2F1ZGlvX2NvbXBv bmVudF9zeW5jX2F1ZGlvX3JhdGUoc3RydWN0IGRldmljZSAqa2RldiwKIAkJCQkJCWludCBwb3J0 LCBpbnQgcmF0ZSkKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXZf dG9faTkxNShkZXYpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGtkZXZf dG9faTkxNShrZGV2KTsKIAlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlcjsKIAlz dHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YzsKIAlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZTsK QEAgLTY1Miw3ICs2NTIsNyBAQCBzdGF0aWMgaW50IGk5MTVfYXVkaW9fY29tcG9uZW50X3N5bmNf YXVkaW9fcmF0ZShzdHJ1Y3QgZGV2aWNlICpkZXYsCiAJICAgICFJU19IQVNXRUxMKGRldl9wcml2 KSkKIAkJcmV0dXJuIDA7CiAKLQlpOTE1X2F1ZGlvX2NvbXBvbmVudF9nZXRfcG93ZXIoZGV2KTsK KwlpOTE1X2F1ZGlvX2NvbXBvbmVudF9nZXRfcG93ZXIoa2Rldik7CiAJbXV0ZXhfbG9jaygmZGV2 X3ByaXYtPmF2X211dGV4KTsKIAkvKiAxLiBnZXQgdGhlIHBpcGUgKi8KIAlpbnRlbF9lbmNvZGVy ID0gZGV2X3ByaXYtPmRpZ19wb3J0X21hcFtwb3J0XTsKQEAgLTcwMywxNSArNzAzLDE1IEBAIHN0 YXRpYyBpbnQgaTkxNV9hdWRpb19jb21wb25lbnRfc3luY19hdWRpb19yYXRlKHN0cnVjdCBkZXZp Y2UgKmRldiwKIAogIHVubG9jazoKIAltdXRleF91bmxvY2soJmRldl9wcml2LT5hdl9tdXRleCk7 Ci0JaTkxNV9hdWRpb19jb21wb25lbnRfcHV0X3Bvd2VyKGRldik7CisJaTkxNV9hdWRpb19jb21w b25lbnRfcHV0X3Bvd2VyKGtkZXYpOwogCXJldHVybiBlcnI7CiB9CiAKLXN0YXRpYyBpbnQgaTkx NV9hdWRpb19jb21wb25lbnRfZ2V0X2VsZChzdHJ1Y3QgZGV2aWNlICpkZXYsIGludCBwb3J0LAor c3RhdGljIGludCBpOTE1X2F1ZGlvX2NvbXBvbmVudF9nZXRfZWxkKHN0cnVjdCBkZXZpY2UgKmtk ZXYsIGludCBwb3J0LAogCQkJCQlib29sICplbmFibGVkLAogCQkJCQl1bnNpZ25lZCBjaGFyICpi dWYsIGludCBtYXhfYnl0ZXMpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gZGV2X3RvX2k5MTUoZGV2KTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSBrZGV2X3RvX2k5MTUoa2Rldik7CiAJc3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29k ZXI7CiAJc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQ7CiAJY29uc3Qg dTggKmVsZDsKQEAgLTc0NSwxMSArNzQ1LDExIEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaTkxNV9h dWRpb19jb21wb25lbnRfb3BzIGk5MTVfYXVkaW9fY29tcG9uZW50X29wcyA9IHsKIAkuZ2V0X2Vs ZAk9IGk5MTVfYXVkaW9fY29tcG9uZW50X2dldF9lbGQsCiB9OwogCi1zdGF0aWMgaW50IGk5MTVf YXVkaW9fY29tcG9uZW50X2JpbmQoc3RydWN0IGRldmljZSAqaTkxNV9kZXYsCi0JCQkJICAgICBz dHJ1Y3QgZGV2aWNlICpoZGFfZGV2LCB2b2lkICpkYXRhKQorc3RhdGljIGludCBpOTE1X2F1ZGlv X2NvbXBvbmVudF9iaW5kKHN0cnVjdCBkZXZpY2UgKmk5MTVfa2RldiwKKwkJCQkgICAgIHN0cnVj dCBkZXZpY2UgKmhkYV9rZGV2LCB2b2lkICpkYXRhKQogewogCXN0cnVjdCBpOTE1X2F1ZGlvX2Nv bXBvbmVudCAqYWNvbXAgPSBkYXRhOwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IGRldl90b19pOTE1KGk5MTVfZGV2KTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSBrZGV2X3RvX2k5MTUoaTkxNV9rZGV2KTsKIAlpbnQgaTsKIAogCWlmIChXQVJOX09O KGFjb21wLT5vcHMgfHwgYWNvbXAtPmRldikpCkBAIC03NTcsNyArNzU3LDcgQEAgc3RhdGljIGlu dCBpOTE1X2F1ZGlvX2NvbXBvbmVudF9iaW5kKHN0cnVjdCBkZXZpY2UgKmk5MTVfZGV2LAogCiAJ ZHJtX21vZGVzZXRfbG9ja19hbGwoJmRldl9wcml2LT5kcm0pOwogCWFjb21wLT5vcHMgPSAmaTkx NV9hdWRpb19jb21wb25lbnRfb3BzOwotCWFjb21wLT5kZXYgPSBpOTE1X2RldjsKKwlhY29tcC0+ ZGV2ID0gaTkxNV9rZGV2OwogCUJVSUxEX0JVR19PTihNQVhfUE9SVFMgIT0gSTkxNV9NQVhfUE9S VFMpOwogCWZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKGFjb21wLT5hdWRfc2FtcGxlX3JhdGUp OyBpKyspCiAJCWFjb21wLT5hdWRfc2FtcGxlX3JhdGVbaV0gPSAwOwpAQCAtNzY3LDExICs3Njcs MTEgQEAgc3RhdGljIGludCBpOTE1X2F1ZGlvX2NvbXBvbmVudF9iaW5kKHN0cnVjdCBkZXZpY2Ug Kmk5MTVfZGV2LAogCXJldHVybiAwOwogfQogCi1zdGF0aWMgdm9pZCBpOTE1X2F1ZGlvX2NvbXBv bmVudF91bmJpbmQoc3RydWN0IGRldmljZSAqaTkxNV9kZXYsCi0JCQkJCXN0cnVjdCBkZXZpY2Ug KmhkYV9kZXYsIHZvaWQgKmRhdGEpCitzdGF0aWMgdm9pZCBpOTE1X2F1ZGlvX2NvbXBvbmVudF91 bmJpbmQoc3RydWN0IGRldmljZSAqaTkxNV9rZGV2LAorCQkJCQlzdHJ1Y3QgZGV2aWNlICpoZGFf a2Rldiwgdm9pZCAqZGF0YSkKIHsKIAlzdHJ1Y3QgaTkxNV9hdWRpb19jb21wb25lbnQgKmFjb21w ID0gZGF0YTsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXZfdG9faTkx NShpOTE1X2Rldik7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0ga2Rldl90 b19pOTE1KGk5MTVfa2Rldik7CiAKIAlkcm1fbW9kZXNldF9sb2NrX2FsbCgmZGV2X3ByaXYtPmRy bSk7CiAJYWNvbXAtPm9wcyA9IE5VTEw7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9ydW50aW1lX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1l X3BtLmMKaW5kZXggMWM2MDNiYmU1Nzg0Li44ODZiMTNiMDhhYzQgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKQEAgLTIyODQsNyArMjI4NCw3IEBAIGludCBpbnRlbF9w b3dlcl9kb21haW5zX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogICov CiB2b2lkIGludGVsX3Bvd2VyX2RvbWFpbnNfZmluaShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCiB7Ci0Jc3RydWN0IGRldmljZSAqZGV2aWNlID0gJmRldl9wcml2LT5kcm0ucGRl di0+ZGV2OworCXN0cnVjdCBkZXZpY2UgKmtkZXYgPSAmZGV2X3ByaXYtPmRybS5wZGV2LT5kZXY7 CiAKIAkvKgogCSAqIFRoZSBpOTE1LmtvIG1vZHVsZSBpcyBzdGlsbCBub3QgcHJlcGFyZWQgdG8g YmUgbG9hZGVkIHdoZW4KQEAgLTIzMDYsNyArMjMwNiw3IEBAIHZvaWQgaW50ZWxfcG93ZXJfZG9t YWluc19maW5pKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkgKiB0aGUgcGxh dGZvcm0gZG9lc24ndCBzdXBwb3J0IHJ1bnRpbWUgUE0uCiAJICovCiAJaWYgKCFIQVNfUlVOVElN RV9QTShkZXZfcHJpdikpCi0JCXBtX3J1bnRpbWVfcHV0KGRldmljZSk7CisJCXBtX3J1bnRpbWVf cHV0KGtkZXYpOwogfQogCiBzdGF0aWMgdm9pZCBpbnRlbF9wb3dlcl9kb21haW5zX3N5bmNfaHco c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQpAQCAtMjY0OCw5ICsyNjQ4LDkgQEAg dm9pZCBpbnRlbF9wb3dlcl9kb21haW5zX3N1c3BlbmQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KQogdm9pZCBpbnRlbF9ydW50aW1lX3BtX2dldChzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9ICZkZXZfcHJpdi0+ ZHJtOwotCXN0cnVjdCBkZXZpY2UgKmRldmljZSA9ICZkZXYtPnBkZXYtPmRldjsKKwlzdHJ1Y3Qg ZGV2aWNlICprZGV2ID0gJmRldi0+cGRldi0+ZGV2OwogCi0JcG1fcnVudGltZV9nZXRfc3luYyhk ZXZpY2UpOworCXBtX3J1bnRpbWVfZ2V0X3N5bmMoa2Rldik7CiAKIAlhdG9taWNfaW5jKCZkZXZf cHJpdi0+cG0ud2FrZXJlZl9jb3VudCk7CiAJYXNzZXJ0X3JwbV93YWtlbG9ja19oZWxkKGRldl9w cml2KTsKQEAgLTI2NjksMTAgKzI2NjksMTAgQEAgdm9pZCBpbnRlbF9ydW50aW1lX3BtX2dldChz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiBib29sIGludGVsX3J1bnRpbWVfcG1f Z2V0X2lmX2luX3VzZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJc3Ry dWN0IGRybV9kZXZpY2UgKmRldiA9ICZkZXZfcHJpdi0+ZHJtOwotCXN0cnVjdCBkZXZpY2UgKmRl dmljZSA9ICZkZXYtPnBkZXYtPmRldjsKKwlzdHJ1Y3QgZGV2aWNlICprZGV2ID0gJmRldi0+cGRl di0+ZGV2OwogCiAJaWYgKElTX0VOQUJMRUQoQ09ORklHX1BNKSkgewotCQlpbnQgcmV0ID0gcG1f cnVudGltZV9nZXRfaWZfaW5fdXNlKGRldmljZSk7CisJCWludCByZXQgPSBwbV9ydW50aW1lX2dl dF9pZl9pbl91c2Uoa2Rldik7CiAKIAkJLyoKIAkJICogSW4gY2FzZXMgcnVudGltZSBQTSBpcyBk aXNhYmxlZCBieSB0aGUgUlBNIGNvcmUgYW5kIHdlIGdldApAQCAtMjcxMSwxMCArMjcxMSwxMCBA QCBib29sIGludGVsX3J1bnRpbWVfcG1fZ2V0X2lmX2luX3VzZShzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiB2b2lkIGludGVsX3J1bnRpbWVfcG1fZ2V0X25vcmVzdW1lKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 ID0gJmRldl9wcml2LT5kcm07Ci0Jc3RydWN0IGRldmljZSAqZGV2aWNlID0gJmRldi0+cGRldi0+ ZGV2OworCXN0cnVjdCBkZXZpY2UgKmtkZXYgPSAmZGV2LT5wZGV2LT5kZXY7CiAKIAlhc3NlcnRf cnBtX3dha2Vsb2NrX2hlbGQoZGV2X3ByaXYpOwotCXBtX3J1bnRpbWVfZ2V0X25vcmVzdW1lKGRl dmljZSk7CisJcG1fcnVudGltZV9nZXRfbm9yZXN1bWUoa2Rldik7CiAKIAlhdG9taWNfaW5jKCZk ZXZfcHJpdi0+cG0ud2FrZXJlZl9jb3VudCk7CiB9CkBAIC0yNzMwLDE0ICsyNzMwLDE0IEBAIHZv aWQgaW50ZWxfcnVudGltZV9wbV9nZXRfbm9yZXN1bWUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KQogdm9pZCBpbnRlbF9ydW50aW1lX3BtX3B1dChzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9ICZkZXZfcHJpdi0+ ZHJtOwotCXN0cnVjdCBkZXZpY2UgKmRldmljZSA9ICZkZXYtPnBkZXYtPmRldjsKKwlzdHJ1Y3Qg ZGV2aWNlICprZGV2ID0gJmRldi0+cGRldi0+ZGV2OwogCiAJYXNzZXJ0X3JwbV93YWtlbG9ja19o ZWxkKGRldl9wcml2KTsKIAlpZiAoYXRvbWljX2RlY19hbmRfdGVzdCgmZGV2X3ByaXYtPnBtLndh a2VyZWZfY291bnQpKQogCQlhdG9taWNfaW5jKCZkZXZfcHJpdi0+cG0uYXRvbWljX3NlcSk7CiAK LQlwbV9ydW50aW1lX21hcmtfbGFzdF9idXN5KGRldmljZSk7Ci0JcG1fcnVudGltZV9wdXRfYXV0 b3N1c3BlbmQoZGV2aWNlKTsKKwlwbV9ydW50aW1lX21hcmtfbGFzdF9idXN5KGtkZXYpOworCXBt X3J1bnRpbWVfcHV0X2F1dG9zdXNwZW5kKGtkZXYpOwogfQogCiAvKioKQEAgLTI3NTMsMTAgKzI3 NTMsMTAgQEAgdm9pZCBpbnRlbF9ydW50aW1lX3BtX3B1dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpCiB2b2lkIGludGVsX3J1bnRpbWVfcG1fZW5hYmxlKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gJmRldl9w cml2LT5kcm07Ci0Jc3RydWN0IGRldmljZSAqZGV2aWNlID0gJmRldi0+cGRldi0+ZGV2OworCXN0 cnVjdCBkZXZpY2UgKmtkZXYgPSAmZGV2LT5wZGV2LT5kZXY7CiAKLQlwbV9ydW50aW1lX3NldF9h dXRvc3VzcGVuZF9kZWxheShkZXZpY2UsIDEwMDAwKTsgLyogMTBzICovCi0JcG1fcnVudGltZV9t YXJrX2xhc3RfYnVzeShkZXZpY2UpOworCXBtX3J1bnRpbWVfc2V0X2F1dG9zdXNwZW5kX2RlbGF5 KGtkZXYsIDEwMDAwKTsgLyogMTBzICovCisJcG1fcnVudGltZV9tYXJrX2xhc3RfYnVzeShrZGV2 KTsKIAogCS8qCiAJICogVGFrZSBhIHBlcm1hbmVudCByZWZlcmVuY2UgdG8gZGlzYWJsZSB0aGUg UlBNIGZ1bmN0aW9uYWxpdHkgYW5kIGRyb3AKQEAgLTI3NjUsMTAgKzI3NjUsMTAgQEAgdm9pZCBp bnRlbF9ydW50aW1lX3BtX2VuYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CiAJICogcGxhdGZvcm1zIHdpdGhvdXQgUlBNIHN1cHBvcnQuCiAJICovCiAJaWYgKCFIQVNfUlVO VElNRV9QTShkZXYpKSB7Ci0JCXBtX3J1bnRpbWVfZG9udF91c2VfYXV0b3N1c3BlbmQoZGV2aWNl KTsKLQkJcG1fcnVudGltZV9nZXRfc3luYyhkZXZpY2UpOworCQlwbV9ydW50aW1lX2RvbnRfdXNl X2F1dG9zdXNwZW5kKGtkZXYpOworCQlwbV9ydW50aW1lX2dldF9zeW5jKGtkZXYpOwogCX0gZWxz ZSB7Ci0JCXBtX3J1bnRpbWVfdXNlX2F1dG9zdXNwZW5kKGRldmljZSk7CisJCXBtX3J1bnRpbWVf dXNlX2F1dG9zdXNwZW5kKGtkZXYpOwogCX0KIAogCS8qCkBAIC0yNzc2LDYgKzI3NzYsNSBAQCB2 b2lkIGludGVsX3J1bnRpbWVfcG1fZW5hYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKIAkgKiBXZSBkcm9wIHRoYXQgaGVyZSBhbmQgd2lsbCByZWFjcXVpcmUgaXQgZHVyaW5n IHVubG9hZGluZyBpbgogCSAqIGludGVsX3Bvd2VyX2RvbWFpbnNfZmluaSgpLgogCSAqLwotCXBt X3J1bnRpbWVfcHV0X2F1dG9zdXNwZW5kKGRldmljZSk7CisJcG1fcnVudGltZV9wdXRfYXV0b3N1 c3BlbmQoa2Rldik7CiB9Ci0KLS0gCjIuOC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK