From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jordan Crouse Subject: [PATCH 2/9] drm/msm: Move memptrs to msm_gpu Date: Wed, 11 Oct 2017 09:14:17 -0600 Message-ID: <1507734864-25069-3-git-send-email-jcrouse@codeaurora.org> References: <1507734864-25069-1-git-send-email-jcrouse@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1507734864-25069-1-git-send-email-jcrouse-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: freedreno-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Freedreno" To: freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-arm-msm@vger.kernel.org V2hlbiB3ZSBtb3ZlIHRvIG11bHRpcGxlIHJpbmdidWZmZXJzIHdlJ3JlIGdvaW5nIHRvIHN0b3Jl IHRoZSBkYXRhCmluIHRoZSBtZW1wdHJzIG9uIGEgcGVyLXJpbmcgYmFzaXMuIEluIG9yZGVyIHRv IHByZXBhcmUgZm9yIHRoYXQKbW92ZSB0aGUgY3VycmVudCBtZW1wdHJzIGZyb20gdGhlIGFkcmVu byBuYW1lc3BhY2UgaW50byBtc21fZ3B1LgpUaGlzIGlzIHdheSBjbGVhbmVyIGFuZCBpbW1lZGlh dGVseSBsZXRzIHVzIGtpbGwgb2ZmIHNvbWUgc3ViCmZ1bmN0aW9ucyBzbyB0aGVyZSBpcyBtdWNo IGxlc3MgY29zdCBsYXRlciB3aGVuIHdlIGRvIG1vdmUgdG8KcGVyLXJpbmcgc3RydWN0cy4KClNp Z25lZC1vZmYtYnk6IEpvcmRhbiBDcm91c2UgPGpjcm91c2VAY29kZWF1cm9yYS5vcmc+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL21zbS9hZHJlbm8vYTN4eF9ncHUuYyAgIHwgIDEgLQogZHJpdmVycy9n cHUvZHJtL21zbS9hZHJlbm8vYTR4eF9ncHUuYyAgIHwgIDEgLQogZHJpdmVycy9ncHUvZHJtL21z bS9hZHJlbm8vYTV4eF9ncHUuYyAgIHwgIDggKystLS0KIGRyaXZlcnMvZ3B1L2RybS9tc20vYWRy ZW5vL2FkcmVub19ncHUuYyB8IDUyICsrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQog ZHJpdmVycy9ncHUvZHJtL21zbS9hZHJlbm8vYWRyZW5vX2dwdS5oIHwgMTYgLS0tLS0tLS0tLQog ZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZ3B1LmMgICAgICAgICAgIHwgMzAgKysrKysrKysrKysr KysrKystLQogZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZ3B1LmggICAgICAgICAgIHwgMTcgKysr KysrKysrLS0KIDcgZmlsZXMgY2hhbmdlZCwgNTcgaW5zZXJ0aW9ucygrKSwgNjggZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21zbS9hZHJlbm8vYTN4eF9ncHUuYyBi L2RyaXZlcnMvZ3B1L2RybS9tc20vYWRyZW5vL2EzeHhfZ3B1LmMKaW5kZXggNzc5MTMxMy4uNzg5 ZjdmYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21zbS9hZHJlbm8vYTN4eF9ncHUuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL2FkcmVuby9hM3h4X2dwdS5jCkBAIC00NDQsNyArNDQ0 LDYgQEAgc3RhdGljIHZvaWQgYTN4eF9kdW1wKHN0cnVjdCBtc21fZ3B1ICpncHUpCiAJCS5wbV9z dXNwZW5kID0gbXNtX2dwdV9wbV9zdXNwZW5kLAogCQkucG1fcmVzdW1lID0gbXNtX2dwdV9wbV9y ZXN1bWUsCiAJCS5yZWNvdmVyID0gYTN4eF9yZWNvdmVyLAotCQkubGFzdF9mZW5jZSA9IGFkcmVu b19sYXN0X2ZlbmNlLAogCQkuc3VibWl0ID0gYWRyZW5vX3N1Ym1pdCwKIAkJLmZsdXNoID0gYWRy ZW5vX2ZsdXNoLAogCQkuaXJxID0gYTN4eF9pcnEsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vbXNtL2FkcmVuby9hNHh4X2dwdS5jIGIvZHJpdmVycy9ncHUvZHJtL21zbS9hZHJlbm8vYTR4 eF9ncHUuYwppbmRleCA1ODM0MWVmLi5mODdjNDMxMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL21zbS9hZHJlbm8vYTR4eF9ncHUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL2FkcmVu by9hNHh4X2dwdS5jCkBAIC01MzIsNyArNTMyLDYgQEAgc3RhdGljIGludCBhNHh4X2dldF90aW1l c3RhbXAoc3RydWN0IG1zbV9ncHUgKmdwdSwgdWludDY0X3QgKnZhbHVlKQogCQkucG1fc3VzcGVu ZCA9IGE0eHhfcG1fc3VzcGVuZCwKIAkJLnBtX3Jlc3VtZSA9IGE0eHhfcG1fcmVzdW1lLAogCQku cmVjb3ZlciA9IGE0eHhfcmVjb3ZlciwKLQkJLmxhc3RfZmVuY2UgPSBhZHJlbm9fbGFzdF9mZW5j ZSwKIAkJLnN1Ym1pdCA9IGFkcmVub19zdWJtaXQsCiAJCS5mbHVzaCA9IGFkcmVub19mbHVzaCwK IAkJLmlycSA9IGE0eHhfaXJxLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21zbS9hZHJl bm8vYTV4eF9ncHUuYyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vYWRyZW5vL2E1eHhfZ3B1LmMKaW5k ZXggMTdjNTlkOC4uMzJhNWI1NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21zbS9hZHJl bm8vYTV4eF9ncHUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL2FkcmVuby9hNXh4X2dwdS5j CkBAIC05OCw3ICs5OCw2IEBAIHN0YXRpYyBpbnQgemFwX3NoYWRlcl9sb2FkX21kdChzdHJ1Y3Qg ZGV2aWNlICpkZXYsIGNvbnN0IGNoYXIgKmZ3bmFtZSkKIHN0YXRpYyB2b2lkIGE1eHhfc3VibWl0 KHN0cnVjdCBtc21fZ3B1ICpncHUsIHN0cnVjdCBtc21fZ2VtX3N1Ym1pdCAqc3VibWl0LAogCXN0 cnVjdCBtc21fZmlsZV9wcml2YXRlICpjdHgpCiB7Ci0Jc3RydWN0IGFkcmVub19ncHUgKmFkcmVu b19ncHUgPSB0b19hZHJlbm9fZ3B1KGdwdSk7CiAJc3RydWN0IG1zbV9kcm1fcHJpdmF0ZSAqcHJp diA9IGdwdS0+ZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgbXNtX3JpbmdidWZmZXIgKnJpbmcg PSBncHUtPnJiOwogCXVuc2lnbmVkIGludCBpLCBpYnMgPSAwOwpAQCAtMTI1LDggKzEyNCw4IEBA IHN0YXRpYyB2b2lkIGE1eHhfc3VibWl0KHN0cnVjdCBtc21fZ3B1ICpncHUsIHN0cnVjdCBtc21f Z2VtX3N1Ym1pdCAqc3VibWl0LAogCiAJT1VUX1BLVDcocmluZywgQ1BfRVZFTlRfV1JJVEUsIDQp OwogCU9VVF9SSU5HKHJpbmcsIENBQ0hFX0ZMVVNIX1RTIHwgKDEgPDwgMzEpKTsKLQlPVVRfUklO RyhyaW5nLCBsb3dlcl8zMl9iaXRzKHJibWVtcHRyKGFkcmVub19ncHUsIGZlbmNlKSkpOwotCU9V VF9SSU5HKHJpbmcsIHVwcGVyXzMyX2JpdHMocmJtZW1wdHIoYWRyZW5vX2dwdSwgZmVuY2UpKSk7 CisJT1VUX1JJTkcocmluZywgbG93ZXJfMzJfYml0cyhyYm1lbXB0cihncHUsIGZlbmNlKSkpOwor CU9VVF9SSU5HKHJpbmcsIHVwcGVyXzMyX2JpdHMocmJtZW1wdHIoZ3B1LCBmZW5jZSkpKTsKIAlP VVRfUklORyhyaW5nLCBzdWJtaXQtPmZlbmNlLT5zZXFubyk7CiAKIAlncHUtPmZ1bmNzLT5mbHVz aChncHUpOwpAQCAtODA0LDcgKzgwMyw3IEBAIHN0YXRpYyB2b2lkIGE1eHhfZmF1bHRfZGV0ZWN0 X2lycShzdHJ1Y3QgbXNtX2dwdSAqZ3B1KQogCXN0cnVjdCBtc21fZHJtX3ByaXZhdGUgKnByaXYg PSBkZXYtPmRldl9wcml2YXRlOwogCiAJZGV2X2VycihkZXYtPmRldiwgImdwdSBmYXVsdCBmZW5j ZSAleCBzdGF0dXMgJTguOFggcmIgJTQuNHgvJTQuNHggaWIxICUxNi4xNmxsWC8lNC40eCBpYjIg JTE2LjE2bGxYLyU0LjR4XG4iLAotCQlncHUtPmZ1bmNzLT5sYXN0X2ZlbmNlKGdwdSksCisJCWdw dS0+bWVtcHRycy0+ZmVuY2UsCiAJCWdwdV9yZWFkKGdwdSwgUkVHX0E1WFhfUkJCTV9TVEFUVVMp LAogCQlncHVfcmVhZChncHUsIFJFR19BNVhYX0NQX1JCX1JQVFIpLAogCQlncHVfcmVhZChncHUs IFJFR19BNVhYX0NQX1JCX1dQVFIpLApAQCAtOTkyLDcgKzk5MSw2IEBAIHN0YXRpYyB2b2lkIGE1 eHhfc2hvdyhzdHJ1Y3QgbXNtX2dwdSAqZ3B1LCBzdHJ1Y3Qgc2VxX2ZpbGUgKm0pCiAJCS5wbV9z dXNwZW5kID0gYTV4eF9wbV9zdXNwZW5kLAogCQkucG1fcmVzdW1lID0gYTV4eF9wbV9yZXN1bWUs CiAJCS5yZWNvdmVyID0gYTV4eF9yZWNvdmVyLAotCQkubGFzdF9mZW5jZSA9IGFkcmVub19sYXN0 X2ZlbmNlLAogCQkuc3VibWl0ID0gYTV4eF9zdWJtaXQsCiAJCS5mbHVzaCA9IGFkcmVub19mbHVz aCwKIAkJLmlycSA9IGE1eHhfaXJxLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21zbS9h ZHJlbm8vYWRyZW5vX2dwdS5jIGIvZHJpdmVycy9ncHUvZHJtL21zbS9hZHJlbm8vYWRyZW5vX2dw dS5jCmluZGV4IGM4YjRhYzIuLmI5MjM4YWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9t c20vYWRyZW5vL2FkcmVub19ncHUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL2FkcmVuby9h ZHJlbm9fZ3B1LmMKQEAgLTgyLDggKzgyLDggQEAgaW50IGFkcmVub19od19pbml0KHN0cnVjdCBt c21fZ3B1ICpncHUpCiAJZ3B1LT5yYi0+Y3VyID0gZ3B1LT5yYi0+c3RhcnQ7CiAKIAkvKiByZXNl dCBjb21wbGV0ZWQgZmVuY2Ugc2Vxbm86ICovCi0JYWRyZW5vX2dwdS0+bWVtcHRycy0+ZmVuY2Ug PSBncHUtPmZjdHgtPmNvbXBsZXRlZF9mZW5jZTsKLQlhZHJlbm9fZ3B1LT5tZW1wdHJzLT5ycHRy ICA9IDA7CisJZ3B1LT5tZW1wdHJzLT5mZW5jZSA9IGdwdS0+ZmN0eC0+Y29tcGxldGVkX2ZlbmNl OworCWdwdS0+bWVtcHRycy0+cnB0ciAgPSAwOwogCiAJLyogU2V0dXAgUkVHX0NQX1JCX0NOVEw6 ICovCiAJYWRyZW5vX2dwdV93cml0ZShhZHJlbm9fZ3B1LCBSRUdfQURSRU5PX0NQX1JCX0NOVEws CkBAIC05OCw4ICs5OCw3IEBAIGludCBhZHJlbm9faHdfaW5pdChzdHJ1Y3QgbXNtX2dwdSAqZ3B1 KQogCiAJaWYgKCFhZHJlbm9faXNfYTQzMChhZHJlbm9fZ3B1KSkgewogCQlhZHJlbm9fZ3B1X3dy aXRlNjQoYWRyZW5vX2dwdSwgUkVHX0FEUkVOT19DUF9SQl9SUFRSX0FERFIsCi0JCQlSRUdfQURS RU5PX0NQX1JCX1JQVFJfQUREUl9ISSwKLQkJCXJibWVtcHRyKGFkcmVub19ncHUsIHJwdHIpKTsK KwkJCVJFR19BRFJFTk9fQ1BfUkJfUlBUUl9BRERSX0hJLCByYm1lbXB0cihncHUsIHJwdHIpKTsK IAl9CiAKIAlyZXR1cm4gMDsKQEAgLTExMywxNyArMTEyLDEzIEBAIHN0YXRpYyB1aW50MzJfdCBn ZXRfd3B0cihzdHJ1Y3QgbXNtX3JpbmdidWZmZXIgKnJpbmcpCiAvKiBVc2UgdGhpcyBoZWxwZXIg dG8gcmVhZCBycHRyLCBzaW5jZSBhNDMwIGRvZXNuJ3QgdXBkYXRlIHJwdHIgaW4gbWVtb3J5ICov CiBzdGF0aWMgdWludDMyX3QgZ2V0X3JwdHIoc3RydWN0IGFkcmVub19ncHUgKmFkcmVub19ncHUp CiB7CisJc3RydWN0IG1zbV9ncHUgKmdwdSA9ICZhZHJlbm9fZ3B1LT5iYXNlOworCiAJaWYgKGFk cmVub19pc19hNDMwKGFkcmVub19ncHUpKQotCQlyZXR1cm4gYWRyZW5vX2dwdS0+bWVtcHRycy0+ cnB0ciA9IGFkcmVub19ncHVfcmVhZCgKKwkJcmV0dXJuIGdwdS0+bWVtcHRycy0+cnB0ciA9IGFk cmVub19ncHVfcmVhZCgKIAkJCWFkcmVub19ncHUsIFJFR19BRFJFTk9fQ1BfUkJfUlBUUik7CiAJ ZWxzZQotCQlyZXR1cm4gYWRyZW5vX2dwdS0+bWVtcHRycy0+cnB0cjsKLX0KLQotdWludDMyX3Qg YWRyZW5vX2xhc3RfZmVuY2Uoc3RydWN0IG1zbV9ncHUgKmdwdSkKLXsKLQlzdHJ1Y3QgYWRyZW5v X2dwdSAqYWRyZW5vX2dwdSA9IHRvX2FkcmVub19ncHUoZ3B1KTsKLQlyZXR1cm4gYWRyZW5vX2dw dS0+bWVtcHRycy0+ZmVuY2U7CisJCXJldHVybiBncHUtPm1lbXB0cnMtPnJwdHI7CiB9CiAKIHZv aWQgYWRyZW5vX3JlY292ZXIoc3RydWN0IG1zbV9ncHUgKmdwdSkKQEAgLTE4OCw3ICsxODMsNyBA QCB2b2lkIGFkcmVub19zdWJtaXQoc3RydWN0IG1zbV9ncHUgKmdwdSwgc3RydWN0IG1zbV9nZW1f c3VibWl0ICpzdWJtaXQsCiAKIAlPVVRfUEtUMyhyaW5nLCBDUF9FVkVOVF9XUklURSwgMyk7CiAJ T1VUX1JJTkcocmluZywgQ0FDSEVfRkxVU0hfVFMpOwotCU9VVF9SSU5HKHJpbmcsIHJibWVtcHRy KGFkcmVub19ncHUsIGZlbmNlKSk7CisJT1VUX1JJTkcocmluZywgcmJtZW1wdHIoZ3B1LCBmZW5j ZSkpOwogCU9VVF9SSU5HKHJpbmcsIHN1Ym1pdC0+ZmVuY2UtPnNlcW5vKTsKIAogCS8qIHdlIGNv dWxkIG1heWJlIGJlIGNsZXZlciBhbmQgb25seSBDUF9DT05EX0VYRUMgdGhlIGludGVycnVwdDog Ki8KQEAgLTI2MSw3ICsyNTYsNyBAQCB2b2lkIGFkcmVub19zaG93KHN0cnVjdCBtc21fZ3B1ICpn cHUsIHN0cnVjdCBzZXFfZmlsZSAqbSkKIAkJCWFkcmVub19ncHUtPnJldi5tYWpvciwgYWRyZW5v X2dwdS0+cmV2Lm1pbm9yLAogCQkJYWRyZW5vX2dwdS0+cmV2LnBhdGNoaWQpOwogCi0Jc2VxX3By aW50ZihtLCAiZmVuY2U6ICAgICVkLyVkXG4iLCBhZHJlbm9fZ3B1LT5tZW1wdHJzLT5mZW5jZSwK KwlzZXFfcHJpbnRmKG0sICJmZW5jZTogICAgJWQvJWRcbiIsIGdwdS0+bWVtcHRycy0+ZmVuY2Us CiAJCQlncHUtPmZjdHgtPmxhc3RfZmVuY2UpOwogCXNlcV9wcmludGYobSwgInJwdHI6ICAgICAl ZFxuIiwgZ2V0X3JwdHIoYWRyZW5vX2dwdSkpOwogCXNlcV9wcmludGYobSwgInJiIHdwdHI6ICAl ZFxuIiwgZ2V0X3dwdHIoZ3B1LT5yYikpOwpAQCAtMjk2LDcgKzI5MSw3IEBAIHZvaWQgYWRyZW5v X2R1bXBfaW5mbyhzdHJ1Y3QgbXNtX2dwdSAqZ3B1KQogCQkJYWRyZW5vX2dwdS0+cmV2Lm1ham9y LCBhZHJlbm9fZ3B1LT5yZXYubWlub3IsCiAJCQlhZHJlbm9fZ3B1LT5yZXYucGF0Y2hpZCk7CiAK LQlwcmludGsoImZlbmNlOiAgICAlZC8lZFxuIiwgYWRyZW5vX2dwdS0+bWVtcHRycy0+ZmVuY2Us CisJcHJpbnRrKCJmZW5jZTogICAgJWQvJWRcbiIsIGdwdS0+bWVtcHRycy0+ZmVuY2UsCiAJCQln cHUtPmZjdHgtPmxhc3RfZmVuY2UpOwogCXByaW50aygicnB0cjogICAgICVkXG4iLCBnZXRfcnB0 cihhZHJlbm9fZ3B1KSk7CiAJcHJpbnRrKCJyYiB3cHRyOiAgJWRcbiIsIGdldF93cHRyKGdwdS0+ cmIpKTsKQEAgLTM4NSw0MCArMzgwLDE3IEBAIGludCBhZHJlbm9fZ3B1X2luaXQoc3RydWN0IGRy bV9kZXZpY2UgKmRybSwgc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldiwKIAl9CiAKIAlyZXQg PSByZXF1ZXN0X2Zpcm13YXJlKCZhZHJlbm9fZ3B1LT5wZnAsIGFkcmVub19ncHUtPmluZm8tPnBm cGZ3LCBkcm0tPmRldik7Ci0JaWYgKHJldCkgeworCWlmIChyZXQpCiAJCWRldl9lcnIoZHJtLT5k ZXYsICJmYWlsZWQgdG8gbG9hZCAlcyBQRlAgZmlybXdhcmU6ICVkXG4iLAogCQkJCWFkcmVub19n cHUtPmluZm8tPnBmcGZ3LCByZXQpOwotCQlyZXR1cm4gcmV0OwotCX0KLQotCWFkcmVub19ncHUt Pm1lbXB0cnMgPSBtc21fZ2VtX2tlcm5lbF9uZXcoZHJtLAotCQlzaXplb2YoKmFkcmVub19ncHUt Pm1lbXB0cnMpLCBNU01fQk9fVU5DQUNIRUQsIGdwdS0+YXNwYWNlLAotCQkmYWRyZW5vX2dwdS0+ bWVtcHRyc19ibywgJmFkcmVub19ncHUtPm1lbXB0cnNfaW92YSk7Ci0KLQlpZiAoSVNfRVJSKGFk cmVub19ncHUtPm1lbXB0cnMpKSB7Ci0JCXJldCA9IFBUUl9FUlIoYWRyZW5vX2dwdS0+bWVtcHRy cyk7Ci0JCWFkcmVub19ncHUtPm1lbXB0cnMgPSBOVUxMOwotCQlkZXZfZXJyKGRybS0+ZGV2LCAi Y291bGQgbm90IGFsbG9jYXRlIG1lbXB0cnM6ICVkXG4iLCByZXQpOwotCX0KIAogCXJldHVybiBy ZXQ7CiB9CiAKIHZvaWQgYWRyZW5vX2dwdV9jbGVhbnVwKHN0cnVjdCBhZHJlbm9fZ3B1ICphZHJl bm9fZ3B1KQogewotCXN0cnVjdCBtc21fZ3B1ICpncHUgPSAmYWRyZW5vX2dwdS0+YmFzZTsKLQot CWlmIChhZHJlbm9fZ3B1LT5tZW1wdHJzX2JvKSB7Ci0JCWlmIChhZHJlbm9fZ3B1LT5tZW1wdHJz KQotCQkJbXNtX2dlbV9wdXRfdmFkZHIoYWRyZW5vX2dwdS0+bWVtcHRyc19ibyk7Ci0KLQkJaWYg KGFkcmVub19ncHUtPm1lbXB0cnNfaW92YSkKLQkJCW1zbV9nZW1fcHV0X2lvdmEoYWRyZW5vX2dw dS0+bWVtcHRyc19ibywgZ3B1LT5hc3BhY2UpOwotCi0JCWRybV9nZW1fb2JqZWN0X3VucmVmZXJl bmNlX3VubG9ja2VkKGFkcmVub19ncHUtPm1lbXB0cnNfYm8pOwotCX0KIAlyZWxlYXNlX2Zpcm13 YXJlKGFkcmVub19ncHUtPnBtNCk7CiAJcmVsZWFzZV9maXJtd2FyZShhZHJlbm9fZ3B1LT5wZnAp OwogCi0JbXNtX2dwdV9jbGVhbnVwKGdwdSk7CisJbXNtX2dwdV9jbGVhbnVwKCZhZHJlbm9fZ3B1 LT5iYXNlKTsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9tc20vYWRyZW5vL2FkcmVu b19ncHUuaCBiL2RyaXZlcnMvZ3B1L2RybS9tc20vYWRyZW5vL2FkcmVub19ncHUuaAppbmRleCA0 ZDkxNjVmLi41ZWUxZDZhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbXNtL2FkcmVuby9h ZHJlbm9fZ3B1LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL21zbS9hZHJlbm8vYWRyZW5vX2dwdS5o CkBAIC04MiwxNCArODIsNiBAQCBzdHJ1Y3QgYWRyZW5vX2luZm8gewogCiBjb25zdCBzdHJ1Y3Qg YWRyZW5vX2luZm8gKmFkcmVub19pbmZvKHN0cnVjdCBhZHJlbm9fcmV2IHJldik7CiAKLSNkZWZp bmUgcmJtZW1wdHIoYWRyZW5vX2dwdSwgbWVtYmVyKSAgXAotCSgoYWRyZW5vX2dwdSktPm1lbXB0 cnNfaW92YSArIG9mZnNldG9mKHN0cnVjdCBhZHJlbm9fcmJtZW1wdHJzLCBtZW1iZXIpKQotCi1z dHJ1Y3QgYWRyZW5vX3JibWVtcHRycyB7Ci0Jdm9sYXRpbGUgdWludDMyX3QgcnB0cjsKLQl2b2xh dGlsZSB1aW50MzJfdCBmZW5jZTsKLX07Ci0KIHN0cnVjdCBhZHJlbm9fZ3B1IHsKIAlzdHJ1Y3Qg bXNtX2dwdSBiYXNlOwogCXN0cnVjdCBhZHJlbm9fcmV2IHJldjsKQEAgLTEwNCwxMyArOTYsNiBA QCBzdHJ1Y3QgYWRyZW5vX2dwdSB7CiAJLyogZmlybXdhcmU6ICovCiAJY29uc3Qgc3RydWN0IGZp cm13YXJlICpwbTQsICpwZnA7CiAKLQkvKiByaW5nYnVmZmVyIHJwdHIvd3B0cjogKi8KLQkvLyBU T0RPIHNob3VsZCB0aGlzIGJlIGluIG1zbV9yaW5nYnVmZmVyPyAgSSB0aGluayBpdCB3b3VsZCBi ZQotCS8vIGRpZmZlcmVudCBmb3IgejE4MC4uCi0Jc3RydWN0IGFkcmVub19yYm1lbXB0cnMgKm1l bXB0cnM7Ci0Jc3RydWN0IGRybV9nZW1fb2JqZWN0ICptZW1wdHJzX2JvOwotCXVpbnQ2NF90IG1l bXB0cnNfaW92YTsKLQogCS8qCiAJICogUmVnaXN0ZXIgb2Zmc2V0cyBhcmUgZGlmZmVyZW50IGJl dHdlZW4gc29tZSBHUFVzLgogCSAqIEdQVSBzcGVjaWZpYyBvZmZzZXRzIHdpbGwgYmUgZXhwb3J0 ZWQgYnkgR1BVIHNwZWNpZmljCkBAIC0xOTcsNyArMTgyLDYgQEAgc3RhdGljIGlubGluZSBpbnQg YWRyZW5vX2lzX2E1MzAoc3RydWN0IGFkcmVub19ncHUgKmdwdSkKIAogaW50IGFkcmVub19nZXRf cGFyYW0oc3RydWN0IG1zbV9ncHUgKmdwdSwgdWludDMyX3QgcGFyYW0sIHVpbnQ2NF90ICp2YWx1 ZSk7CiBpbnQgYWRyZW5vX2h3X2luaXQoc3RydWN0IG1zbV9ncHUgKmdwdSk7Ci11aW50MzJfdCBh ZHJlbm9fbGFzdF9mZW5jZShzdHJ1Y3QgbXNtX2dwdSAqZ3B1KTsKIHZvaWQgYWRyZW5vX3JlY292 ZXIoc3RydWN0IG1zbV9ncHUgKmdwdSk7CiB2b2lkIGFkcmVub19zdWJtaXQoc3RydWN0IG1zbV9n cHUgKmdwdSwgc3RydWN0IG1zbV9nZW1fc3VibWl0ICpzdWJtaXQsCiAJCXN0cnVjdCBtc21fZmls ZV9wcml2YXRlICpjdHgpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZ3B1 LmMgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9ncHUuYwppbmRleCBmZmJmZjI3Li45ZTY0NWNh IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9ncHUuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vbXNtL21zbV9ncHUuYwpAQCAtMjI4LDcgKzIyOCw3IEBAIHN0YXRpYyB2b2lkIHJl Y292ZXJfd29ya2VyKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIAlzdHJ1Y3QgbXNtX2dwdSAq Z3B1ID0gY29udGFpbmVyX29mKHdvcmssIHN0cnVjdCBtc21fZ3B1LCByZWNvdmVyX3dvcmspOwog CXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBncHUtPmRldjsKIAlzdHJ1Y3QgbXNtX2dlbV9zdWJt aXQgKnN1Ym1pdDsKLQl1aW50MzJfdCBmZW5jZSA9IGdwdS0+ZnVuY3MtPmxhc3RfZmVuY2UoZ3B1 KTsKKwl1aW50MzJfdCBmZW5jZSA9IGdwdS0+bWVtcHRycy0+ZmVuY2U7CiAKIAltc21fdXBkYXRl X2ZlbmNlKGdwdS0+ZmN0eCwgZmVuY2UgKyAxKTsKIApAQCAtMjgxLDcgKzI4MSw3IEBAIHN0YXRp YyB2b2lkIGhhbmdjaGVja19oYW5kbGVyKHVuc2lnbmVkIGxvbmcgZGF0YSkKIAlzdHJ1Y3QgbXNt X2dwdSAqZ3B1ID0gKHN0cnVjdCBtc21fZ3B1ICopZGF0YTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2ID0gZ3B1LT5kZXY7CiAJc3RydWN0IG1zbV9kcm1fcHJpdmF0ZSAqcHJpdiA9IGRldi0+ZGV2 X3ByaXZhdGU7Ci0JdWludDMyX3QgZmVuY2UgPSBncHUtPmZ1bmNzLT5sYXN0X2ZlbmNlKGdwdSk7 CisJdWludDMyX3QgZmVuY2UgPSBncHUtPm1lbXB0cnMtPmZlbmNlOwogCiAJaWYgKGZlbmNlICE9 IGdwdS0+aGFuZ2NoZWNrX2ZlbmNlKSB7CiAJCS8qIHNvbWUgcHJvZ3Jlc3MgaGFzIGJlZW4gbWFk ZS4uIHlhISAqLwpAQCAtNDQ5LDcgKzQ0OSw3IEBAIHN0YXRpYyB2b2lkIHJldGlyZV93b3JrZXIo c3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQogewogCXN0cnVjdCBtc21fZ3B1ICpncHUgPSBjb250 YWluZXJfb2Yod29yaywgc3RydWN0IG1zbV9ncHUsIHJldGlyZV93b3JrKTsKIAlzdHJ1Y3QgZHJt X2RldmljZSAqZGV2ID0gZ3B1LT5kZXY7Ci0JdWludDMyX3QgZmVuY2UgPSBncHUtPmZ1bmNzLT5s YXN0X2ZlbmNlKGdwdSk7CisJdWludDMyX3QgZmVuY2UgPSBncHUtPm1lbXB0cnMtPmZlbmNlOwog CiAJbXNtX3VwZGF0ZV9mZW5jZShncHUtPmZjdHgsIGZlbmNlKTsKIApAQCAtNjg5LDYgKzY4OSwx NyBAQCBpbnQgbXNtX2dwdV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkcm0sIHN0cnVjdCBwbGF0 Zm9ybV9kZXZpY2UgKnBkZXYsCiAJCWdvdG8gZmFpbDsKIAl9CiAKKwlncHUtPm1lbXB0cnMgPSBt c21fZ2VtX2tlcm5lbF9uZXcoZHJtLCBzaXplb2YoKmdwdS0+bWVtcHRyc19ibyksCisJCU1TTV9C T19VTkNBQ0hFRCwgZ3B1LT5hc3BhY2UsICZncHUtPm1lbXB0cnNfYm8sCisJCSZncHUtPm1lbXB0 cnNfaW92YSk7CisKKwlpZiAoSVNfRVJSKGdwdS0+bWVtcHRycykpIHsKKwkJcmV0ID0gUFRSX0VS UihncHUtPm1lbXB0cnMpOworCQlncHUtPm1lbXB0cnMgPSBOVUxMOworCQlkZXZfZXJyKGRybS0+ ZGV2LCAiY291bGQgbm90IGFsbG9jYXRlIG1lbXB0cnM6ICVkXG4iLCByZXQpOworCQlnb3RvIGZh aWw7CisJfQorCiAJLyogQ3JlYXRlIHJpbmdidWZmZXI6ICovCiAJZ3B1LT5yYiA9IG1zbV9yaW5n YnVmZmVyX25ldyhncHUsIGNvbmZpZy0+cmluZ3N6KTsKIAlpZiAoSVNfRVJSKGdwdS0+cmIpKSB7 CkBAIC03MDEsNiArNzEyLDEyIEBAIGludCBtc21fZ3B1X2luaXQoc3RydWN0IGRybV9kZXZpY2Ug KmRybSwgc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldiwKIAlyZXR1cm4gMDsKIAogZmFpbDoK KwlpZiAoZ3B1LT5tZW1wdHJzX2JvKSB7CisJCW1zbV9nZW1fcHV0X3ZhZGRyKGdwdS0+bWVtcHRy c19ibyk7CisJCW1zbV9nZW1fcHV0X2lvdmEoZ3B1LT5tZW1wdHJzX2JvLCBncHUtPmFzcGFjZSk7 CisJCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlX3VubG9ja2VkKGdwdS0+bWVtcHRyc19ibyk7 CisJfQorCiAJcGxhdGZvcm1fc2V0X2RydmRhdGEocGRldiwgTlVMTCk7CiAJcmV0dXJuIHJldDsK IH0KQEAgLTcxOCw2ICs3MzUsMTMgQEAgdm9pZCBtc21fZ3B1X2NsZWFudXAoc3RydWN0IG1zbV9n cHUgKmdwdSkKIAkJCW1zbV9nZW1fcHV0X2lvdmEoZ3B1LT5yYi0+Ym8sIGdwdS0+YXNwYWNlKTsK IAkJbXNtX3JpbmdidWZmZXJfZGVzdHJveShncHUtPnJiKTsKIAl9CisKKwlpZiAoZ3B1LT5tZW1w dHJzX2JvKSB7CisJCW1zbV9nZW1fcHV0X3ZhZGRyKGdwdS0+bWVtcHRyc19ibyk7CisJCW1zbV9n ZW1fcHV0X2lvdmEoZ3B1LT5tZW1wdHJzX2JvLCBncHUtPmFzcGFjZSk7CisJCWRybV9nZW1fb2Jq ZWN0X3VucmVmZXJlbmNlX3VubG9ja2VkKGdwdS0+bWVtcHRyc19ibyk7CisJfQorCiAJaWYgKGdw dS0+YXNwYWNlKSB7CiAJCWdwdS0+YXNwYWNlLT5tbXUtPmZ1bmNzLT5kZXRhY2goZ3B1LT5hc3Bh Y2UtPm1tdSwKIAkJCU5VTEwsIDApOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21zbS9t c21fZ3B1LmggYi9kcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9ncHUuaAppbmRleCBhODkwMTc2Li44 ZGRkYTA1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9ncHUuaAorKysgYi9k cml2ZXJzL2dwdS9kcm0vbXNtL21zbV9ncHUuaApAQCAtNTksNyArNTksNiBAQCBzdHJ1Y3QgbXNt X2dwdV9mdW5jcyB7CiAJCQlzdHJ1Y3QgbXNtX2ZpbGVfcHJpdmF0ZSAqY3R4KTsKIAl2b2lkICgq Zmx1c2gpKHN0cnVjdCBtc21fZ3B1ICpncHUpOwogCWlycXJldHVybl90ICgqaXJxKShzdHJ1Y3Qg bXNtX2dwdSAqaXJxKTsKLQl1aW50MzJfdCAoKmxhc3RfZmVuY2UpKHN0cnVjdCBtc21fZ3B1ICpn cHUpOwogCXZvaWQgKCpyZWNvdmVyKShzdHJ1Y3QgbXNtX2dwdSAqZ3B1KTsKIAl2b2lkICgqZGVz dHJveSkoc3RydWN0IG1zbV9ncHUgKmdwdSk7CiAjaWZkZWYgQ09ORklHX0RFQlVHX0ZTCkBAIC02 OCw2ICs2NywxNCBAQCBzdHJ1Y3QgbXNtX2dwdV9mdW5jcyB7CiAjZW5kaWYKIH07CiAKKyNkZWZp bmUgcmJtZW1wdHIoZ3B1LCBtZW1iZXIpICBcCisJKChncHUpLT5tZW1wdHJzX2lvdmEgKyBvZmZz ZXRvZihzdHJ1Y3QgbXNtX3JibWVtcHRycywgbWVtYmVyKSkKKworc3RydWN0IG1zbV9yYm1lbXB0 cnMgeworCXZvbGF0aWxlIHVpbnQzMl90IHJwdHI7CisJdm9sYXRpbGUgdWludDMyX3QgZmVuY2U7 Cit9OworCiBzdHJ1Y3QgbXNtX2dwdSB7CiAJY29uc3QgY2hhciAqbmFtZTsKIAlzdHJ1Y3QgZHJt X2RldmljZSAqZGV2OwpAQCAtMTMwLDExICsxMzcsMTcgQEAgc3RydWN0IG1zbV9ncHUgewogCXN0 cnVjdCB3b3JrX3N0cnVjdCByZWNvdmVyX3dvcms7CiAKIAlzdHJ1Y3QgbGlzdF9oZWFkIHN1Ym1p dF9saXN0OworCisJc3RydWN0IG1zbV9yYm1lbXB0cnMgKm1lbXB0cnM7CisJc3RydWN0IGRybV9n ZW1fb2JqZWN0ICptZW1wdHJzX2JvOworCXVpbnQ2NF90IG1lbXB0cnNfaW92YTsKKworCiB9Owog CiBzdGF0aWMgaW5saW5lIGJvb2wgbXNtX2dwdV9hY3RpdmUoc3RydWN0IG1zbV9ncHUgKmdwdSkK IHsKLQlyZXR1cm4gZ3B1LT5mY3R4LT5sYXN0X2ZlbmNlID4gZ3B1LT5mdW5jcy0+bGFzdF9mZW5j ZShncHUpOworCXJldHVybiBncHUtPmZjdHgtPmxhc3RfZmVuY2UgPiBncHUtPm1lbXB0cnMtPmZl bmNlOwogfQogCiAvKiBQZXJmLUNvdW50ZXJzOgotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkZyZWVkcmVubyBtYWlsaW5nIGxpc3QKRnJl ZWRyZW5vQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ZyZWVkcmVubwo=