From: Rex Zhu Subject: [PATCH 2/4] drm/amd/powerplay: Unify dpm level defines Date: Fri, 23 Dec 2016 16:45:50 +0800 Message-ID: <1482482752-31020-2-git-send-email-Rex.Zhu@amd.com> References: <1482482752-31020-1-git-send-email-Rex.Zhu@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1482482752-31020-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Rex Zhu Q2hhbmdlLUlkOiBJMjA5YTY3MzJmNzk1Njc3ODQ4NWI3ZTU1ZmE5ZTg1ZTY5ODdjMDIyOQotLS0K IGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kcG0uaCAgICAgICAgICAgfCAxOSAr KysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3BtLmMgICAgICAg ICAgICB8IDM5ICsrKysrKysrKy0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9jaV9kcG0uYyAgICAgICAgICAgICAgIHwgMTIgKysrLS0tLQogZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUva3ZfZHBtLmMgICAgICAgICAgICAgICB8IDEwICsrKy0tLQogZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvc2lfZHBtLmMgICAgICAgICAgICAgICB8IDEwICsrKy0tLQogZHJp dmVycy9ncHUvZHJtL2FtZC9pbmNsdWRlL2FtZF9zaGFyZWQuaCAgICAgICAgICB8ICA3ICsrKysK IGRyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L2luYy9hbWRfcG93ZXJwbGF5LmggfCAgNyAt LS0tCiA3IGZpbGVzIGNoYW5nZWQsIDQ1IGluc2VydGlvbnMoKyksIDU5IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kcG0uaCBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kcG0uaAppbmRleCBlNjczZjA4Li42YzU4 YzdkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZHBtLmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RwbS5oCkBAIC0yNDEsMTMg KzI0MSw2IEBAIGVudW0gYW1kZ3B1X3BjaWVfZ2VuIHsKIAlBTURHUFVfUENJRV9HRU5fSU5WQUxJ RCA9IDB4ZmZmZgogfTsKIAotZW51bSBhbWRncHVfZHBtX2ZvcmNlZF9sZXZlbCB7Ci0JQU1ER1BV X0RQTV9GT1JDRURfTEVWRUxfQVVUTyA9IDAsCi0JQU1ER1BVX0RQTV9GT1JDRURfTEVWRUxfTE9X ID0gMSwKLQlBTURHUFVfRFBNX0ZPUkNFRF9MRVZFTF9ISUdIID0gMiwKLQlBTURHUFVfRFBNX0ZP UkNFRF9MRVZFTF9NQU5VQUwgPSAzLAotfTsKLQogc3RydWN0IGFtZGdwdV9kcG1fZnVuY3Mgewog CWludCAoKmdldF90ZW1wZXJhdHVyZSkoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpOwogCWlu dCAoKnByZV9zZXRfcG93ZXJfc3RhdGUpKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KTsKQEAg LTI1OCw3ICsyNTEsNyBAQCBzdHJ1Y3QgYW1kZ3B1X2RwbV9mdW5jcyB7CiAJdTMyICgqZ2V0X21j bGspKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCBib29sIGxvdyk7CiAJdm9pZCAoKnByaW50 X3Bvd2VyX3N0YXRlKShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgc3RydWN0IGFtZGdwdV9w cyAqcHMpOwogCXZvaWQgKCpkZWJ1Z2ZzX3ByaW50X2N1cnJlbnRfcGVyZm9ybWFuY2VfbGV2ZWwp KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCBzdHJ1Y3Qgc2VxX2ZpbGUgKm0pOwotCWludCAo KmZvcmNlX3BlcmZvcm1hbmNlX2xldmVsKShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgZW51 bSBhbWRncHVfZHBtX2ZvcmNlZF9sZXZlbCBsZXZlbCk7CisJaW50ICgqZm9yY2VfcGVyZm9ybWFu Y2VfbGV2ZWwpKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCBlbnVtIGFtZF9kcG1fZm9yY2Vk X2xldmVsIGxldmVsKTsKIAlib29sICgqdmJsYW5rX3Rvb19zaG9ydCkoc3RydWN0IGFtZGdwdV9k ZXZpY2UgKmFkZXYpOwogCXZvaWQgKCpwb3dlcmdhdGVfdXZkKShzdHJ1Y3QgYW1kZ3B1X2Rldmlj ZSAqYWRldiwgYm9vbCBnYXRlKTsKIAl2b2lkICgqcG93ZXJnYXRlX3ZjZSkoc3RydWN0IGFtZGdw dV9kZXZpY2UgKmFkZXYsIGJvb2wgZ2F0ZSk7CkBAIC0zNTMsOSArMzQ2LDYgQEAgc3RydWN0IGFt ZGdwdV9kcG1fZnVuY3MgewogI2RlZmluZSBhbWRncHVfZHBtX2dldF9jdXJyZW50X3Bvd2VyX3N0 YXRlKGFkZXYpIFwKIAkoYWRldiktPnBvd2VycGxheS5wcF9mdW5jcy0+Z2V0X2N1cnJlbnRfcG93 ZXJfc3RhdGUoKGFkZXYpLT5wb3dlcnBsYXkucHBfaGFuZGxlKQogCi0jZGVmaW5lIGFtZGdwdV9k cG1fZ2V0X3BlcmZvcm1hbmNlX2xldmVsKGFkZXYpIFwKLQkoYWRldiktPnBvd2VycGxheS5wcF9m dW5jcy0+Z2V0X3BlcmZvcm1hbmNlX2xldmVsKChhZGV2KS0+cG93ZXJwbGF5LnBwX2hhbmRsZSkK LQogI2RlZmluZSBhbWRncHVfZHBtX2dldF9wcF9udW1fc3RhdGVzKGFkZXYsIGRhdGEpIFwKIAko YWRldiktPnBvd2VycGxheS5wcF9mdW5jcy0+Z2V0X3BwX251bV9zdGF0ZXMoKGFkZXYpLT5wb3dl cnBsYXkucHBfaGFuZGxlLCBkYXRhKQogCkBAIC0zOTMsNiArMzgzLDExIEBAIHN0cnVjdCBhbWRn cHVfZHBtX2Z1bmNzIHsKIAkgKGFkZXYpLT5wb3dlcnBsYXkucHBfZnVuY3MtPmdldF92Y2VfY2xv Y2tfc3RhdGUoKGFkZXYpLT5wb3dlcnBsYXkucHBfaGFuZGxlLCAoaSkpIDogXAogCSAoYWRldikt PnBtLmZ1bmNzLT5nZXRfdmNlX2Nsb2NrX3N0YXRlKChhZGV2KSwgKGkpKSkKIAorI2RlZmluZSBh bWRncHVfZHBtX2dldF9wZXJmb3JtYW5jZV9sZXZlbChhZGV2KSBcCisJKChhZGV2KS0+cHBfZW5h YmxlZCA/CQkJCQkJXAorCShhZGV2KS0+cG93ZXJwbGF5LnBwX2Z1bmNzLT5nZXRfcGVyZm9ybWFu Y2VfbGV2ZWwoKGFkZXYpLT5wb3dlcnBsYXkucHBfaGFuZGxlKSA6IFwKKwkoYWRldiktPnBtLmRw bS5mb3JjZWRfbGV2ZWwpCisKIHN0cnVjdCBhbWRncHVfZHBtIHsKIAlzdHJ1Y3QgYW1kZ3B1X3Bz ICAgICAgICAqcHM7CiAJLyogbnVtYmVyIG9mIHZhbGlkIHBvd2VyIHN0YXRlcyAqLwpAQCAtNDQw LDcgKzQzNSw3IEBAIHN0cnVjdCBhbWRncHVfZHBtIHsKIAkvKiB0aGVybWFsIGhhbmRsaW5nICov CiAJc3RydWN0IGFtZGdwdV9kcG1fdGhlcm1hbCB0aGVybWFsOwogCS8qIGZvcmNlZCBsZXZlbHMg Ki8KLQllbnVtIGFtZGdwdV9kcG1fZm9yY2VkX2xldmVsIGZvcmNlZF9sZXZlbDsKKwllbnVtIGFt ZF9kcG1fZm9yY2VkX2xldmVsIGZvcmNlZF9sZXZlbDsKIH07CiAKIHN0cnVjdCBhbWRncHVfcG0g ewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3BtLmMgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcG0uYwppbmRleCAwZjhjNzQ3Li4yYmZl ZGU4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcG0uYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcG0uYwpAQCAtMTEyLDI4ICsx MTIsMTkgQEAgc3RhdGljIHNzaXplX3QgYW1kZ3B1X2dldF9kcG1fZm9yY2VkX3BlcmZvcm1hbmNl X2xldmVsKHN0cnVjdCBkZXZpY2UgKmRldiwKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGRldiA9 IGRldl9nZXRfZHJ2ZGF0YShkZXYpOwogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gZGRl di0+ZGV2X3ByaXZhdGU7CisJZW51bSBhbWRfZHBtX2ZvcmNlZF9sZXZlbCBsZXZlbDsKIAogCWlm ICAoKGFkZXYtPmZsYWdzICYgQU1EX0lTX1BYKSAmJgogCSAgICAgKGRkZXYtPnN3aXRjaF9wb3dl cl9zdGF0ZSAhPSBEUk1fU1dJVENIX1BPV0VSX09OKSkKIAkJcmV0dXJuIHNucHJpbnRmKGJ1Ziwg UEFHRV9TSVpFLCAib2ZmXG4iKTsKIAotCWlmIChhZGV2LT5wcF9lbmFibGVkKSB7Ci0JCWVudW0g YW1kX2RwbV9mb3JjZWRfbGV2ZWwgbGV2ZWw7Ci0KLQkJbGV2ZWwgPSBhbWRncHVfZHBtX2dldF9w ZXJmb3JtYW5jZV9sZXZlbChhZGV2KTsKLQkJcmV0dXJuIHNucHJpbnRmKGJ1ZiwgUEFHRV9TSVpF LCAiJXNcbiIsCi0JCQkJKGxldmVsID09IEFNRF9EUE1fRk9SQ0VEX0xFVkVMX0FVVE8pID8gImF1 dG8iIDoKLQkJCQkobGV2ZWwgPT0gQU1EX0RQTV9GT1JDRURfTEVWRUxfTE9XKSA/ICJsb3ciIDoK LQkJCQkobGV2ZWwgPT0gQU1EX0RQTV9GT1JDRURfTEVWRUxfSElHSCkgPyAiaGlnaCIgOgotCQkJ CShsZXZlbCA9PSBBTURfRFBNX0ZPUkNFRF9MRVZFTF9NQU5VQUwpID8gIm1hbnVhbCIgOiAidW5r bm93biIpOwotCX0gZWxzZSB7Ci0JCWVudW0gYW1kZ3B1X2RwbV9mb3JjZWRfbGV2ZWwgbGV2ZWw7 Ci0KLQkJbGV2ZWwgPSBhZGV2LT5wbS5kcG0uZm9yY2VkX2xldmVsOwotCQlyZXR1cm4gc25wcmlu dGYoYnVmLCBQQUdFX1NJWkUsICIlc1xuIiwKLQkJCQkobGV2ZWwgPT0gQU1ER1BVX0RQTV9GT1JD RURfTEVWRUxfQVVUTykgPyAiYXV0byIgOgotCQkJCShsZXZlbCA9PSBBTURHUFVfRFBNX0ZPUkNF RF9MRVZFTF9MT1cpID8gImxvdyIgOiAiaGlnaCIpOwotCX0KKwlsZXZlbCA9IGFtZGdwdV9kcG1f Z2V0X3BlcmZvcm1hbmNlX2xldmVsKGFkZXYpOworCXJldHVybiBzbnByaW50ZihidWYsIFBBR0Vf U0laRSwgIiVzXG4iLAorCQkJKGxldmVsICYgKEFNRF9EUE1fRk9SQ0VEX0xFVkVMX0FVVE8pID8g ImF1dG8iIDoKKwkJCShsZXZlbCAmIEFNRF9EUE1fRk9SQ0VEX0xFVkVMX0xPVykgPyAibG93IiA6 CisJCQkobGV2ZWwgJiBBTURfRFBNX0ZPUkNFRF9MRVZFTF9ISUdIKSA/ICJoaWdoIiA6CisJCQko bGV2ZWwgJiBBTURfRFBNX0ZPUkNFRF9MRVZFTF9NQU5VQUwpID8gIm1hbnVhbCIgOgorCQkJInVu a25vd24iKSk7CiB9CiAKIHN0YXRpYyBzc2l6ZV90IGFtZGdwdV9zZXRfZHBtX2ZvcmNlZF9wZXJm b3JtYW5jZV9sZXZlbChzdHJ1Y3QgZGV2aWNlICpkZXYsCkBAIC0xNDMsNyArMTM0LDcgQEAgc3Rh dGljIHNzaXplX3QgYW1kZ3B1X3NldF9kcG1fZm9yY2VkX3BlcmZvcm1hbmNlX2xldmVsKHN0cnVj dCBkZXZpY2UgKmRldiwKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGRldiA9IGRldl9nZXRfZHJ2 ZGF0YShkZXYpOwogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gZGRldi0+ZGV2X3ByaXZh dGU7Ci0JZW51bSBhbWRncHVfZHBtX2ZvcmNlZF9sZXZlbCBsZXZlbDsKKwllbnVtIGFtZF9kcG1f Zm9yY2VkX2xldmVsIGxldmVsOwogCWludCByZXQgPSAwOwogCiAJLyogQ2FuJ3QgZm9yY2UgcGVy Zm9ybWFuY2UgbGV2ZWwgd2hlbiB0aGUgY2FyZCBpcyBvZmYgKi8KQEAgLTE1MiwxMyArMTQzLDEz IEBAIHN0YXRpYyBzc2l6ZV90IGFtZGdwdV9zZXRfZHBtX2ZvcmNlZF9wZXJmb3JtYW5jZV9sZXZl bChzdHJ1Y3QgZGV2aWNlICpkZXYsCiAJCXJldHVybiAtRUlOVkFMOwogCiAJaWYgKHN0cm5jbXAo ImxvdyIsIGJ1Ziwgc3RybGVuKCJsb3ciKSkgPT0gMCkgewotCQlsZXZlbCA9IEFNREdQVV9EUE1f Rk9SQ0VEX0xFVkVMX0xPVzsKKwkJbGV2ZWwgPSBBTURfRFBNX0ZPUkNFRF9MRVZFTF9MT1c7CiAJ fSBlbHNlIGlmIChzdHJuY21wKCJoaWdoIiwgYnVmLCBzdHJsZW4oImhpZ2giKSkgPT0gMCkgewot CQlsZXZlbCA9IEFNREdQVV9EUE1fRk9SQ0VEX0xFVkVMX0hJR0g7CisJCWxldmVsID0gQU1EX0RQ TV9GT1JDRURfTEVWRUxfSElHSDsKIAl9IGVsc2UgaWYgKHN0cm5jbXAoImF1dG8iLCBidWYsIHN0 cmxlbigiYXV0byIpKSA9PSAwKSB7Ci0JCWxldmVsID0gQU1ER1BVX0RQTV9GT1JDRURfTEVWRUxf QVVUTzsKKwkJbGV2ZWwgPSBBTURfRFBNX0ZPUkNFRF9MRVZFTF9BVVRPOwogCX0gZWxzZSBpZiAo c3RybmNtcCgibWFudWFsIiwgYnVmLCBzdHJsZW4oIm1hbnVhbCIpKSA9PSAwKSB7Ci0JCWxldmVs ID0gQU1ER1BVX0RQTV9GT1JDRURfTEVWRUxfTUFOVUFMOworCQlsZXZlbCA9IEFNRF9EUE1fRk9S Q0VEX0xFVkVMX01BTlVBTDsKIAl9IGVsc2UgewogCQljb3VudCA9IC1FSU5WQUw7CiAJCWdvdG8g ZmFpbDsKQEAgLTEwNjAsOSArMTA1MSw5IEBAIHN0YXRpYyB2b2lkIGFtZGdwdV9kcG1fY2hhbmdl X3Bvd2VyX3N0YXRlX2xvY2tlZChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAogCWlmIChh ZGV2LT5wbS5mdW5jcy0+Zm9yY2VfcGVyZm9ybWFuY2VfbGV2ZWwpIHsKIAkJaWYgKGFkZXYtPnBt LmRwbS50aGVybWFsX2FjdGl2ZSkgewotCQkJZW51bSBhbWRncHVfZHBtX2ZvcmNlZF9sZXZlbCBs ZXZlbCA9IGFkZXYtPnBtLmRwbS5mb3JjZWRfbGV2ZWw7CisJCQllbnVtIGFtZF9kcG1fZm9yY2Vk X2xldmVsIGxldmVsID0gYWRldi0+cG0uZHBtLmZvcmNlZF9sZXZlbDsKIAkJCS8qIGZvcmNlIGxv dyBwZXJmIGxldmVsIGZvciB0aGVybWFsICovCi0JCQlhbWRncHVfZHBtX2ZvcmNlX3BlcmZvcm1h bmNlX2xldmVsKGFkZXYsIEFNREdQVV9EUE1fRk9SQ0VEX0xFVkVMX0xPVyk7CisJCQlhbWRncHVf ZHBtX2ZvcmNlX3BlcmZvcm1hbmNlX2xldmVsKGFkZXYsIEFNRF9EUE1fRk9SQ0VEX0xFVkVMX0xP Vyk7CiAJCQkvKiBzYXZlIHRoZSB1c2VyJ3MgbGV2ZWwgKi8KIAkJCWFkZXYtPnBtLmRwbS5mb3Jj ZWRfbGV2ZWwgPSBsZXZlbDsKIAkJfSBlbHNlIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L2NpX2RwbS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvY2lfZHBt LmMKaW5kZXggYmRhOWUzZC4uZDhkZTdlYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvY2lfZHBtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvY2lfZHBt LmMKQEAgLTQzMzYsMTMgKzQzMzYsMTMgQEAgc3RhdGljIHUzMiBjaV9nZXRfbG93ZXN0X2VuYWJs ZWRfbGV2ZWwoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAKIAogc3RhdGljIGludCBjaV9k cG1fZm9yY2VfcGVyZm9ybWFuY2VfbGV2ZWwoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCi0J CQkJCSAgZW51bSBhbWRncHVfZHBtX2ZvcmNlZF9sZXZlbCBsZXZlbCkKKwkJCQkJICBlbnVtIGFt ZF9kcG1fZm9yY2VkX2xldmVsIGxldmVsKQogewogCXN0cnVjdCBjaV9wb3dlcl9pbmZvICpwaSA9 IGNpX2dldF9waShhZGV2KTsKIAl1MzIgdG1wLCBsZXZlbHMsIGk7CiAJaW50IHJldDsKIAotCWlm IChsZXZlbCA9PSBBTURHUFVfRFBNX0ZPUkNFRF9MRVZFTF9ISUdIKSB7CisJaWYgKGxldmVsID09 IEFNRF9EUE1fRk9SQ0VEX0xFVkVMX0hJR0gpIHsKIAkJaWYgKCghcGktPnBjaWVfZHBtX2tleV9k aXNhYmxlZCkgJiYKIAkJICAgIHBpLT5kcG1fbGV2ZWxfZW5hYmxlX21hc2sucGNpZV9kcG1fZW5h YmxlX21hc2spIHsKIAkJCWxldmVscyA9IDA7CkBAIC00NDAzLDcgKzQ0MDMsNyBAQCBzdGF0aWMg aW50IGNpX2RwbV9mb3JjZV9wZXJmb3JtYW5jZV9sZXZlbChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldiwKIAkJCQl9CiAJCQl9CiAJCX0KLQl9IGVsc2UgaWYgKGxldmVsID09IEFNREdQVV9EUE1f Rk9SQ0VEX0xFVkVMX0xPVykgeworCX0gZWxzZSBpZiAobGV2ZWwgPT0gQU1EX0RQTV9GT1JDRURf TEVWRUxfTE9XKSB7CiAJCWlmICgoIXBpLT5zY2xrX2RwbV9rZXlfZGlzYWJsZWQpICYmCiAJCSAg ICBwaS0+ZHBtX2xldmVsX2VuYWJsZV9tYXNrLnNjbGtfZHBtX2VuYWJsZV9tYXNrKSB7CiAJCQls ZXZlbHMgPSBjaV9nZXRfbG93ZXN0X2VuYWJsZWRfbGV2ZWwoYWRldiwKQEAgLTQ0NTIsNyArNDQ1 Miw3IEBAIHN0YXRpYyBpbnQgY2lfZHBtX2ZvcmNlX3BlcmZvcm1hbmNlX2xldmVsKHN0cnVjdCBh bWRncHVfZGV2aWNlICphZGV2LAogCQkJCXVkZWxheSgxKTsKIAkJCX0KIAkJfQotCX0gZWxzZSBp ZiAobGV2ZWwgPT0gQU1ER1BVX0RQTV9GT1JDRURfTEVWRUxfQVVUTykgeworCX0gZWxzZSBpZiAo bGV2ZWwgPT0gQU1EX0RQTV9GT1JDRURfTEVWRUxfQVVUTykgewogCQlpZiAoIXBpLT5wY2llX2Rw bV9rZXlfZGlzYWJsZWQpIHsKIAkJCVBQU01DX1Jlc3VsdCBzbWNfcmVzdWx0OwogCkBAIC02MjYy LDcgKzYyNjIsNyBAQCBzdGF0aWMgaW50IGNpX2RwbV9zd19pbml0KHZvaWQgKmhhbmRsZSkKIAkv KiBkZWZhdWx0IHRvIGJhbGFuY2VkIHN0YXRlICovCiAJYWRldi0+cG0uZHBtLnN0YXRlID0gUE9X RVJfU1RBVEVfVFlQRV9CQUxBTkNFRDsKIAlhZGV2LT5wbS5kcG0udXNlcl9zdGF0ZSA9IFBPV0VS X1NUQVRFX1RZUEVfQkFMQU5DRUQ7Ci0JYWRldi0+cG0uZHBtLmZvcmNlZF9sZXZlbCA9IEFNREdQ VV9EUE1fRk9SQ0VEX0xFVkVMX0FVVE87CisJYWRldi0+cG0uZHBtLmZvcmNlZF9sZXZlbCA9IEFN RF9EUE1fRk9SQ0VEX0xFVkVMX0FVVE87CiAJYWRldi0+cG0uZGVmYXVsdF9zY2xrID0gYWRldi0+ Y2xvY2suZGVmYXVsdF9zY2xrOwogCWFkZXYtPnBtLmRlZmF1bHRfbWNsayA9IGFkZXYtPmNsb2Nr LmRlZmF1bHRfbWNsazsKIAlhZGV2LT5wbS5jdXJyZW50X3NjbGsgPSBhZGV2LT5jbG9jay5kZWZh dWx0X3NjbGs7CkBAIC02NTcyLDcgKzY1NzIsNyBAQCBzdGF0aWMgaW50IGNpX2RwbV9mb3JjZV9j bG9ja19sZXZlbChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAlzdHJ1Y3QgY2lfcG93ZXJf aW5mbyAqcGkgPSBjaV9nZXRfcGkoYWRldik7CiAKIAlpZiAoYWRldi0+cG0uZHBtLmZvcmNlZF9s ZXZlbAotCQkJIT0gQU1ER1BVX0RQTV9GT1JDRURfTEVWRUxfTUFOVUFMKQorCQkJIT0gQU1EX0RQ TV9GT1JDRURfTEVWRUxfTUFOVUFMKQogCQlyZXR1cm4gLUVJTlZBTDsKIAogCXN3aXRjaCAodHlw ZSkgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUva3ZfZHBtLmMgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9rdl9kcG0uYwppbmRleCA1YTFiYzM1Li45MWY4ODVi IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9rdl9kcG0uYworKysgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9rdl9kcG0uYwpAQCAtMTkwNCwxOSArMTkwNCwxOSBA QCBzdGF0aWMgaW50IGt2X2VuYWJsZV9uYl9kcG0oc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYs CiB9CiAKIHN0YXRpYyBpbnQga3ZfZHBtX2ZvcmNlX3BlcmZvcm1hbmNlX2xldmVsKHN0cnVjdCBh bWRncHVfZGV2aWNlICphZGV2LAotCQkJCQkgIGVudW0gYW1kZ3B1X2RwbV9mb3JjZWRfbGV2ZWwg bGV2ZWwpCisJCQkJCSAgZW51bSBhbWRfZHBtX2ZvcmNlZF9sZXZlbCBsZXZlbCkKIHsKIAlpbnQg cmV0OwogCi0JaWYgKGxldmVsID09IEFNREdQVV9EUE1fRk9SQ0VEX0xFVkVMX0hJR0gpIHsKKwlp ZiAobGV2ZWwgPT0gQU1EX0RQTV9GT1JDRURfTEVWRUxfSElHSCkgewogCQlyZXQgPSBrdl9mb3Jj ZV9kcG1faGlnaGVzdChhZGV2KTsKIAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7Ci0JfSBlbHNl IGlmIChsZXZlbCA9PSBBTURHUFVfRFBNX0ZPUkNFRF9MRVZFTF9MT1cpIHsKKwl9IGVsc2UgaWYg KGxldmVsID09IEFNRF9EUE1fRk9SQ0VEX0xFVkVMX0xPVykgewogCQlyZXQgPSBrdl9mb3JjZV9k cG1fbG93ZXN0KGFkZXYpOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsKLQl9IGVsc2UgaWYg KGxldmVsID09IEFNREdQVV9EUE1fRk9SQ0VEX0xFVkVMX0FVVE8pIHsKKwl9IGVsc2UgaWYgKGxl dmVsID09IEFNRF9EUE1fRk9SQ0VEX0xFVkVMX0FVVE8pIHsKIAkJcmV0ID0ga3ZfdW5mb3JjZV9s ZXZlbHMoYWRldik7CiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwpAQCAtMzAyOSw3ICszMDI5 LDcgQEAgc3RhdGljIGludCBrdl9kcG1fc3dfaW5pdCh2b2lkICpoYW5kbGUpCiAJLyogZGVmYXVs dCB0byBiYWxhbmNlZCBzdGF0ZSAqLwogCWFkZXYtPnBtLmRwbS5zdGF0ZSA9IFBPV0VSX1NUQVRF X1RZUEVfQkFMQU5DRUQ7CiAJYWRldi0+cG0uZHBtLnVzZXJfc3RhdGUgPSBQT1dFUl9TVEFURV9U WVBFX0JBTEFOQ0VEOwotCWFkZXYtPnBtLmRwbS5mb3JjZWRfbGV2ZWwgPSBBTURHUFVfRFBNX0ZP UkNFRF9MRVZFTF9BVVRPOworCWFkZXYtPnBtLmRwbS5mb3JjZWRfbGV2ZWwgPSBBTURfRFBNX0ZP UkNFRF9MRVZFTF9BVVRPOwogCWFkZXYtPnBtLmRlZmF1bHRfc2NsayA9IGFkZXYtPmNsb2NrLmRl ZmF1bHRfc2NsazsKIAlhZGV2LT5wbS5kZWZhdWx0X21jbGsgPSBhZGV2LT5jbG9jay5kZWZhdWx0 X21jbGs7CiAJYWRldi0+cG0uY3VycmVudF9zY2xrID0gYWRldi0+Y2xvY2suZGVmYXVsdF9zY2xr OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2lfZHBtLmMgYi9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zaV9kcG0uYwppbmRleCBhM2Y2MzMxLi4wODU5ZmU3IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zaV9kcG0uYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zaV9kcG0uYwpAQCAtMzkyOSwyNSArMzkyOSwyNSBAQCBz dGF0aWMgaW50IHNpX3Jlc3RyaWN0X3BlcmZvcm1hbmNlX2xldmVsc19iZWZvcmVfc3dpdGNoKHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZAogfQogCiBzdGF0aWMgaW50IHNpX2RwbV9mb3JjZV9wZXJm b3JtYW5jZV9sZXZlbChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKLQkJCQkgICBlbnVtIGFt ZGdwdV9kcG1fZm9yY2VkX2xldmVsIGxldmVsKQorCQkJCSAgIGVudW0gYW1kX2RwbV9mb3JjZWRf bGV2ZWwgbGV2ZWwpCiB7CiAJc3RydWN0IGFtZGdwdV9wcyAqcnBzID0gYWRldi0+cG0uZHBtLmN1 cnJlbnRfcHM7CiAJc3RydWN0ICBzaV9wcyAqcHMgPSBzaV9nZXRfcHMocnBzKTsKIAl1MzIgbGV2 ZWxzID0gcHMtPnBlcmZvcm1hbmNlX2xldmVsX2NvdW50OwogCi0JaWYgKGxldmVsID09IEFNREdQ VV9EUE1fRk9SQ0VEX0xFVkVMX0hJR0gpIHsKKwlpZiAobGV2ZWwgPT0gQU1EX0RQTV9GT1JDRURf TEVWRUxfSElHSCkgewogCQlpZiAoc2lfc2VuZF9tc2dfdG9fc21jX3dpdGhfcGFyYW1ldGVyKGFk ZXYsIFBQU01DX01TR19TZXRFbmFibGVkTGV2ZWxzLCBsZXZlbHMpICE9IFBQU01DX1Jlc3VsdF9P SykKIAkJCXJldHVybiAtRUlOVkFMOwogCiAJCWlmIChzaV9zZW5kX21zZ190b19zbWNfd2l0aF9w YXJhbWV0ZXIoYWRldiwgUFBTTUNfTVNHX1NldEZvcmNlZExldmVscywgMSkgIT0gUFBTTUNfUmVz dWx0X09LKQogCQkJcmV0dXJuIC1FSU5WQUw7Ci0JfSBlbHNlIGlmIChsZXZlbCA9PSBBTURHUFVf RFBNX0ZPUkNFRF9MRVZFTF9MT1cpIHsKKwl9IGVsc2UgaWYgKGxldmVsID09IEFNRF9EUE1fRk9S Q0VEX0xFVkVMX0xPVykgewogCQlpZiAoc2lfc2VuZF9tc2dfdG9fc21jX3dpdGhfcGFyYW1ldGVy KGFkZXYsIFBQU01DX01TR19TZXRGb3JjZWRMZXZlbHMsIDApICE9IFBQU01DX1Jlc3VsdF9PSykK IAkJCXJldHVybiAtRUlOVkFMOwogCiAJCWlmIChzaV9zZW5kX21zZ190b19zbWNfd2l0aF9wYXJh bWV0ZXIoYWRldiwgUFBTTUNfTVNHX1NldEVuYWJsZWRMZXZlbHMsIDEpICE9IFBQU01DX1Jlc3Vs dF9PSykKIAkJCXJldHVybiAtRUlOVkFMOwotCX0gZWxzZSBpZiAobGV2ZWwgPT0gQU1ER1BVX0RQ TV9GT1JDRURfTEVWRUxfQVVUTykgeworCX0gZWxzZSBpZiAobGV2ZWwgPT0gQU1EX0RQTV9GT1JD RURfTEVWRUxfQVVUTykgewogCQlpZiAoc2lfc2VuZF9tc2dfdG9fc21jX3dpdGhfcGFyYW1ldGVy KGFkZXYsIFBQU01DX01TR19TZXRGb3JjZWRMZXZlbHMsIDApICE9IFBQU01DX1Jlc3VsdF9PSykK IAkJCXJldHVybiAtRUlOVkFMOwogCkBAIC03NzY4LDcgKzc3NjgsNyBAQCBzdGF0aWMgaW50IHNp X2RwbV9zd19pbml0KHZvaWQgKmhhbmRsZSkKIAkvKiBkZWZhdWx0IHRvIGJhbGFuY2VkIHN0YXRl ICovCiAJYWRldi0+cG0uZHBtLnN0YXRlID0gUE9XRVJfU1RBVEVfVFlQRV9CQUxBTkNFRDsKIAlh ZGV2LT5wbS5kcG0udXNlcl9zdGF0ZSA9IFBPV0VSX1NUQVRFX1RZUEVfQkFMQU5DRUQ7Ci0JYWRl di0+cG0uZHBtLmZvcmNlZF9sZXZlbCA9IEFNREdQVV9EUE1fRk9SQ0VEX0xFVkVMX0FVVE87CisJ YWRldi0+cG0uZHBtLmZvcmNlZF9sZXZlbCA9IEFNRF9EUE1fRk9SQ0VEX0xFVkVMX0FVVE87CiAJ YWRldi0+cG0uZGVmYXVsdF9zY2xrID0gYWRldi0+Y2xvY2suZGVmYXVsdF9zY2xrOwogCWFkZXYt PnBtLmRlZmF1bHRfbWNsayA9IGFkZXYtPmNsb2NrLmRlZmF1bHRfbWNsazsKIAlhZGV2LT5wbS5j dXJyZW50X3NjbGsgPSBhZGV2LT5jbG9jay5kZWZhdWx0X3NjbGs7CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2luY2x1ZGUvYW1kX3NoYXJlZC5oIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9pbmNsdWRlL2FtZF9zaGFyZWQuaAppbmRleCA1ZjU5MTE3Li4zZjJhNmI5IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2luY2x1ZGUvYW1kX3NoYXJlZC5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvaW5jbHVkZS9hbWRfc2hhcmVkLmgKQEAgLTgwLDYgKzgwLDEzIEBAIGVudW0g YW1kX2Nsb2NrZ2F0aW5nX3N0YXRlIHsKIAlBTURfQ0dfU1RBVEVfVU5HQVRFLAogfTsKIAorZW51 bSBhbWRfZHBtX2ZvcmNlZF9sZXZlbCB7CisJQU1EX0RQTV9GT1JDRURfTEVWRUxfQVVUTyA9IDB4 MSwKKwlBTURfRFBNX0ZPUkNFRF9MRVZFTF9NQU5VQUwgPSAweDIsCisJQU1EX0RQTV9GT1JDRURf TEVWRUxfTE9XID0gMHg0LAorCUFNRF9EUE1fRk9SQ0VEX0xFVkVMX0hJR0ggPSAweDgsCit9Owor CiBlbnVtIGFtZF9wb3dlcmdhdGluZ19zdGF0ZSB7CiAJQU1EX1BHX1NUQVRFX0dBVEUgPSAwLAog CUFNRF9QR19TVEFURV9VTkdBVEUsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bv d2VycGxheS9pbmMvYW1kX3Bvd2VycGxheS5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBs YXkvaW5jL2FtZF9wb3dlcnBsYXkuaAppbmRleCAzYTg4M2U2Li42ZDUyYTM5IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9pbmMvYW1kX3Bvd2VycGxheS5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L2luYy9hbWRfcG93ZXJwbGF5LmgKQEAgLTEz NSwxMyArMTM1LDYgQEAgZW51bSBhbWRfcHBfZXZlbnQgewogCUFNRF9QUF9FVkVOVF9NQVgKIH07 CiAKLWVudW0gYW1kX2RwbV9mb3JjZWRfbGV2ZWwgewotCUFNRF9EUE1fRk9SQ0VEX0xFVkVMX0FV VE8gPSAwLAotCUFNRF9EUE1fRk9SQ0VEX0xFVkVMX0xPVyA9IDEsCi0JQU1EX0RQTV9GT1JDRURf TEVWRUxfSElHSCA9IDIsCi0JQU1EX0RQTV9GT1JDRURfTEVWRUxfTUFOVUFMID0gMywKLX07Ci0K IHN0cnVjdCBhbWRfcHBfaW5pdCB7CiAJc3RydWN0IGNnc19kZXZpY2UgKmRldmljZTsKIAl1aW50 MzJfdCBjaGlwX2ZhbWlseTsKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2FtZC1nZngK