From: Rex Zhu Subject: [PATCH 3/3] drm/amd/amdgpu: coding style refine in sdma_v4_0.c Date: Mon, 17 Apr 2017 20:05:29 +0800 Message-ID: <1492430729-21807-3-git-send-email-Rex.Zhu@amd.com> References: <1492430729-21807-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: <1492430729-21807-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 UmVwbGFjZSA4IHNwYWNlcyB3aXRoIHRhYnMuCmNvcnJlY3Qge30gYnJhY2VzLCBldGMuCgpDaGFu Z2UtSWQ6IEk0NTAyZTJmYWE5MDBjYWMyMmRiNjNiZWNhNGI1MmJkMDZiM2MyZDM0ClNpZ25lZC1v ZmYtYnk6IFJleCBaaHUgPFJleC5aaHVAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9zZG1hX3Y0XzAuYyB8IDE1MSArKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0t LS0KIDEgZmlsZSBjaGFuZ2VkLCA3NSBpbnNlcnRpb25zKCspLCA3NiBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zZG1hX3Y0XzAuYyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3NkbWFfdjRfMC5jCmluZGV4IDM1ZGZmYjguLmY4NGQ2NDIg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3NkbWFfdjRfMC5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3NkbWFfdjRfMC5jCkBAIC00OCw4ICs0OCw3IEBA CiBzdGF0aWMgdm9pZCBzZG1hX3Y0XzBfc2V0X3ZtX3B0ZV9mdW5jcyhzdHJ1Y3QgYW1kZ3B1X2Rl dmljZSAqYWRldik7CiBzdGF0aWMgdm9pZCBzZG1hX3Y0XzBfc2V0X2lycV9mdW5jcyhzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldik7CiAKLXN0YXRpYyBjb25zdCB1MzIgZ29sZGVuX3NldHRpbmdz X3NkbWFfNFtdID0KLXsKK3N0YXRpYyBjb25zdCB1MzIgZ29sZGVuX3NldHRpbmdzX3NkbWFfNFtd ID0gewogCVNPQzE1X1JFR19PRkZTRVQoU0RNQTAsIDAsIG1tU0RNQTBfQ0hJQ0tFTl9CSVRTKSwg MHhmZTkzMWYwNywgMHgwMjgzMWYwNywKIAlTT0MxNV9SRUdfT0ZGU0VUKFNETUEwLCAwLCBtbVNE TUEwX0NMS19DVFJMKSwgMHhmZjAwMGZmMCwgMHgzZjAwMDEwMCwKIAlTT0MxNV9SRUdfT0ZGU0VU KFNETUEwLCAwLCBtbVNETUEwX0dGWF9JQl9DTlRMKSwgMHg4MDBmMDEwMCwgMHgwMDAwMDEwMCwK QEAgLTc2LDggKzc1LDcgQEAKIAlTT0MxNV9SRUdfT0ZGU0VUKFNETUExLCAwLCBtbVNETUExX1VU Q0wxX1BBR0UpLCAweDAwMDAwM2ZmLCAweDAwMDAwM2MwCiB9OwogCi1zdGF0aWMgY29uc3QgdTMy IGdvbGRlbl9zZXR0aW5nc19zZG1hX3ZnMTBbXSA9Ci17CitzdGF0aWMgY29uc3QgdTMyIGdvbGRl bl9zZXR0aW5nc19zZG1hX3ZnMTBbXSA9IHsKIAlTT0MxNV9SRUdfT0ZGU0VUKFNETUEwLCAwLCBt bVNETUEwX0dCX0FERFJfQ09ORklHKSwgMHgwMDE4NzczZiwgMHgwMDEwNDAwMiwKIAlTT0MxNV9S RUdfT0ZGU0VUKFNETUEwLCAwLCBtbVNETUEwX0dCX0FERFJfQ09ORklHX1JFQUQpLCAweDAwMTg3 NzNmLCAweDAwMTA0MDAyLAogCVNPQzE1X1JFR19PRkZTRVQoU0RNQTEsIDAsIG1tU0RNQTFfR0Jf QUREUl9DT05GSUcpLCAweDAwMTg3NzNmLCAweDAwMTA0MDAyLApAQCAtODcsMTYgKzg1LDE3IEBA CiBzdGF0aWMgdTMyIHNkbWFfdjRfMF9nZXRfcmVnX29mZnNldCh1MzIgaW5zdGFuY2UsIHUzMiBp bnRlcm5hbF9vZmZzZXQpCiB7CiAJdTMyIGJhc2UgPSAwOworCiAJc3dpdGNoIChpbnN0YW5jZSkg ewotCQljYXNlIDA6Ci0JCQliYXNlID0gU0RNQTBfQkFTRS5pbnN0YW5jZVswXS5zZWdtZW50WzBd OwotCQkJYnJlYWs7Ci0JCWNhc2UgMToKLQkJCWJhc2UgPSBTRE1BMV9CQVNFLmluc3RhbmNlWzBd LnNlZ21lbnRbMF07Ci0JCQlicmVhazsKLQkJZGVmYXVsdDoKLQkJCUJVRygpOwotCQkJYnJlYWs7 CisJY2FzZSAwOgorCQliYXNlID0gU0RNQTBfQkFTRS5pbnN0YW5jZVswXS5zZWdtZW50WzBdOwor CQlicmVhazsKKwljYXNlIDE6CisJCWJhc2UgPSBTRE1BMV9CQVNFLmluc3RhbmNlWzBdLnNlZ21l bnRbMF07CisJCWJyZWFrOworCWRlZmF1bHQ6CisJCUJVRygpOworCQlicmVhazsKIAl9CiAKIAly ZXR1cm4gYmFzZSArIGludGVybmFsX29mZnNldDsKQEAgLTE1OSw3ICsxNTgsOCBAQCBzdGF0aWMg aW50IHNkbWFfdjRfMF9pbml0X21pY3JvY29kZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikK IAljYXNlIENISVBfVkVHQTEwOgogCQljaGlwX25hbWUgPSAidmVnYTEwIjsKIAkJYnJlYWs7Ci0J ZGVmYXVsdDogQlVHKCk7CisJZGVmYXVsdDoKKwkJQlVHKCk7CiAJfQogCiAJZm9yIChpID0gMDsg aSA8IGFkZXYtPnNkbWEubnVtX2luc3RhbmNlczsgaSsrKSB7CkBAIC0xNzksNyArMTc5LDcgQEAg c3RhdGljIGludCBzZG1hX3Y0XzBfaW5pdF9taWNyb2NvZGUoc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYpCiAJCWlmIChhZGV2LT5zZG1hLmluc3RhbmNlW2ldLmZlYXR1cmVfdmVyc2lvbiA+PSAy MCkKIAkJCWFkZXYtPnNkbWEuaW5zdGFuY2VbaV0uYnVyc3Rfbm9wID0gdHJ1ZTsKIAkJRFJNX0RF QlVHKCJwc3BfbG9hZCA9PSAnJXMnXG4iLAotCQkJCWFkZXYtPmZpcm13YXJlLmxvYWRfdHlwZSA9 PSBBTURHUFVfRldfTE9BRF9QU1A/ICJ0cnVlIjogImZhbHNlIik7CisJCQkJYWRldi0+ZmlybXdh cmUubG9hZF90eXBlID09IEFNREdQVV9GV19MT0FEX1BTUCA/ICJ0cnVlIiA6ICJmYWxzZSIpOwog CiAJCWlmIChhZGV2LT5maXJtd2FyZS5sb2FkX3R5cGUgPT0gQU1ER1BVX0ZXX0xPQURfUFNQKSB7 CiAJCQlpbmZvID0gJmFkZXYtPmZpcm13YXJlLnVjb2RlW0FNREdQVV9VQ09ERV9JRF9TRE1BMCAr IGldOwpAQCAtMTkyLDkgKzE5Miw3IEBAIHN0YXRpYyBpbnQgc2RtYV92NF8wX2luaXRfbWljcm9j b2RlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCX0KIG91dDoKIAlpZiAoZXJyKSB7Ci0J CXByaW50ayhLRVJOX0VSUgotCQkgICAgICAgInNkbWFfdjRfMDogRmFpbGVkIHRvIGxvYWQgZmly bXdhcmUgXCIlc1wiXG4iLAotCQkgICAgICAgZndfbmFtZSk7CisJCURSTV9FUlJPUigic2RtYV92 NF8wOiBGYWlsZWQgdG8gbG9hZCBmaXJtd2FyZSBcIiVzXCJcbiIsIGZ3X25hbWUpOwogCQlmb3Ig KGkgPSAwOyBpIDwgYWRldi0+c2RtYS5udW1faW5zdGFuY2VzOyBpKyspIHsKIAkJCXJlbGVhc2Vf ZmlybXdhcmUoYWRldi0+c2RtYS5pbnN0YW5jZVtpXS5mdyk7CiAJCQlhZGV2LT5zZG1hLmluc3Rh bmNlW2ldLmZ3ID0gTlVMTDsKQEAgLTIxMiwxMCArMjEwLDEwIEBAIHN0YXRpYyBpbnQgc2RtYV92 NF8wX2luaXRfbWljcm9jb2RlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogICovCiBzdGF0 aWMgdWludDY0X3Qgc2RtYV92NF8wX3JpbmdfZ2V0X3JwdHIoc3RydWN0IGFtZGdwdV9yaW5nICpy aW5nKQogewotCXU2NCogcnB0cjsKKwl1NjQgKnJwdHI7CiAKIAkvKiBYWFggY2hlY2sgaWYgc3dh cHBpbmcgaXMgbmVjZXNzYXJ5IG9uIEJFICovCi0JcnB0ciA9KCh1NjQqKSZyaW5nLT5hZGV2LT53 Yi53YltyaW5nLT5ycHRyX29mZnNdKTsKKwlycHRyID0gKCh1NjQgKikmcmluZy0+YWRldi0+d2Iu d2JbcmluZy0+cnB0cl9vZmZzXSk7CiAKIAlEUk1fREVCVUcoInJwdHIgYmVmb3JlIHNoaWZ0ID09 IDB4JTAxNmxseFxuIiwgKnJwdHIpOwogCXJldHVybiAoKCpycHRyKSA+PiAyKTsKQEAgLTIzMSwx OSArMjI5LDIwIEBAIHN0YXRpYyB1aW50NjRfdCBzZG1hX3Y0XzBfcmluZ19nZXRfcnB0cihzdHJ1 Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpCiBzdGF0aWMgdWludDY0X3Qgc2RtYV92NF8wX3JpbmdfZ2V0 X3dwdHIoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQogewogCXN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2ID0gcmluZy0+YWRldjsKLQl1NjQqIHdwdHIgPSBOVUxMOwotCXVpbnQ2NF90IGxvY2Fs X3dwdHI9MDsKKwl1NjQgKndwdHIgPSBOVUxMOworCXVpbnQ2NF90IGxvY2FsX3dwdHIgPSAwOwog CiAJaWYgKHJpbmctPnVzZV9kb29yYmVsbCkgewogCQkvKiBYWFggY2hlY2sgaWYgc3dhcHBpbmcg aXMgbmVjZXNzYXJ5IG9uIEJFICovCi0JCXdwdHIgPSAoKHU2NCopJmFkZXYtPndiLndiW3Jpbmct PndwdHJfb2Zmc10pOworCQl3cHRyID0gKCh1NjQgKikmYWRldi0+d2Iud2JbcmluZy0+d3B0cl9v ZmZzXSk7CiAJCURSTV9ERUJVRygid3B0ci9kb29yYmVsbCBiZWZvcmUgc2hpZnQgPT0gMHglMDE2 bGx4XG4iLCAqd3B0cik7CiAJCSp3cHRyID0gKCp3cHRyKSA+PiAyOwogCQlEUk1fREVCVUcoIndw dHIvZG9vcmJlbGwgYWZ0ZXIgc2hpZnQgPT0gMHglMDE2bGx4XG4iLCAqd3B0cik7CiAJfSBlbHNl IHsKIAkJdTMyIGxvd2JpdCwgaGlnaGJpdDsKIAkJaW50IG1lID0gKHJpbmcgPT0gJmFkZXYtPnNk bWEuaW5zdGFuY2VbMF0ucmluZykgPyAwIDogMTsKLQkJd3B0cj0mbG9jYWxfd3B0cjsKKworCQl3 cHRyID0gJmxvY2FsX3dwdHI7CiAJCWxvd2JpdCA9IFJSRUczMihzZG1hX3Y0XzBfZ2V0X3JlZ19v ZmZzZXQobWUsIG1tU0RNQTBfR0ZYX1JCX1dQVFIpKSA+PiAyOwogCQloaWdoYml0ID0gUlJFRzMy KHNkbWFfdjRfMF9nZXRfcmVnX29mZnNldChtZSwgbW1TRE1BMF9HRlhfUkJfV1BUUl9ISSkpID4+ IDI7CiAKQEAgLTI4NSw5ICsyODQsMTAgQEAgc3RhdGljIHZvaWQgc2RtYV92NF8wX3Jpbmdfc2V0 X3dwdHIoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQogCQlXRE9PUkJFTEw2NChyaW5nLT5kb29y YmVsbF9pbmRleCwgcmluZy0+d3B0ciA8PCAyKTsKIAl9IGVsc2UgewogCQlpbnQgbWUgPSAocmlu ZyA9PSAmcmluZy0+YWRldi0+c2RtYS5pbnN0YW5jZVswXS5yaW5nKSA/IDAgOiAxOworCiAJCURS TV9ERUJVRygiTm90IHVzaW5nIGRvb3JiZWxsIC0tICIKIAkJCQkibW1TRE1BJWlfR0ZYX1JCX1dQ VFIgPT0gMHglMDh4ICIKLQkJCQkibW1TRE1BJWlfR0ZYX1JCX1dQVFJfSEkgPT0gMHglMDh4IFxu IiwKKwkJCQkibW1TRE1BJWlfR0ZYX1JCX1dQVFJfSEkgPT0gMHglMDh4XG4iLAogCQkJCW1lLAog CQkJCWxvd2VyXzMyX2JpdHMocmluZy0+d3B0ciA8PCAyKSwKIAkJCQltZSwKQEAgLTMxOSwyMiAr MzE5LDIyIEBAIHN0YXRpYyB2b2lkIHNkbWFfdjRfMF9yaW5nX2luc2VydF9ub3Aoc3RydWN0IGFt ZGdwdV9yaW5nICpyaW5nLCB1aW50MzJfdCBjb3VudCkKICAqIFNjaGVkdWxlIGFuIElCIGluIHRo ZSBETUEgcmluZyAoVkVHQTEwKS4KICAqLwogc3RhdGljIHZvaWQgc2RtYV92NF8wX3JpbmdfZW1p dF9pYihzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHN0cnVjdCBhbWRncHVfaWIgKmliLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB1bnNpZ25lZCB2bV9pZCwgYm9vbCBjdHhfc3dpdGNoKQorCQkJCQlzdHJ1Y3Qg YW1kZ3B1X2liICppYiwKKwkJCQkJdW5zaWduZWQgdm1faWQsIGJvb2wgY3R4X3N3aXRjaCkKIHsK LSAgICAgICAgdTMyIHZtaWQgPSB2bV9pZCAmIDB4ZjsKKwl1MzIgdm1pZCA9IHZtX2lkICYgMHhm OwogCi0gICAgICAgIC8qIElCIHBhY2tldCBtdXN0IGVuZCBvbiBhIDggRFcgYm91bmRhcnkgKi8K LSAgICAgICAgc2RtYV92NF8wX3JpbmdfaW5zZXJ0X25vcChyaW5nLCAoMTAgLSAobG93ZXJfMzJf Yml0cyhyaW5nLT53cHRyKSAmIDcpKSAlIDgpOworCS8qIElCIHBhY2tldCBtdXN0IGVuZCBvbiBh IDggRFcgYm91bmRhcnkgKi8KKwlzZG1hX3Y0XzBfcmluZ19pbnNlcnRfbm9wKHJpbmcsICgxMCAt IChsb3dlcl8zMl9iaXRzKHJpbmctPndwdHIpICYgNykpICUgOCk7CiAKLSAgICAgICAgYW1kZ3B1 X3Jpbmdfd3JpdGUocmluZywgU0RNQV9QS1RfSEVBREVSX09QKFNETUFfT1BfSU5ESVJFQ1QpIHwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgU0RNQV9QS1RfSU5ESVJFQ1RfSEVBREVSX1ZNSUQo dm1pZCkpOwotICAgICAgICAvKiBiYXNlIG11c3QgYmUgMzIgYnl0ZSBhbGlnbmVkICovCi0gICAg ICAgIGFtZGdwdV9yaW5nX3dyaXRlKHJpbmcsIGxvd2VyXzMyX2JpdHMoaWItPmdwdV9hZGRyKSAm IDB4ZmZmZmZmZTApOwotICAgICAgICBhbWRncHVfcmluZ193cml0ZShyaW5nLCB1cHBlcl8zMl9i aXRzKGliLT5ncHVfYWRkcikpOwotICAgICAgICBhbWRncHVfcmluZ193cml0ZShyaW5nLCBpYi0+ bGVuZ3RoX2R3KTsKLSAgICAgICAgYW1kZ3B1X3Jpbmdfd3JpdGUocmluZywgMCk7Ci0gICAgICAg IGFtZGdwdV9yaW5nX3dyaXRlKHJpbmcsIDApOworCWFtZGdwdV9yaW5nX3dyaXRlKHJpbmcsIFNE TUFfUEtUX0hFQURFUl9PUChTRE1BX09QX0lORElSRUNUKSB8CisJCQkgIFNETUFfUEtUX0lORElS RUNUX0hFQURFUl9WTUlEKHZtaWQpKTsKKwkvKiBiYXNlIG11c3QgYmUgMzIgYnl0ZSBhbGlnbmVk ICovCisJYW1kZ3B1X3Jpbmdfd3JpdGUocmluZywgbG93ZXJfMzJfYml0cyhpYi0+Z3B1X2FkZHIp ICYgMHhmZmZmZmZlMCk7CisJYW1kZ3B1X3Jpbmdfd3JpdGUocmluZywgdXBwZXJfMzJfYml0cyhp Yi0+Z3B1X2FkZHIpKTsKKwlhbWRncHVfcmluZ193cml0ZShyaW5nLCBpYi0+bGVuZ3RoX2R3KTsK KwlhbWRncHVfcmluZ193cml0ZShyaW5nLCAwKTsKKwlhbWRncHVfcmluZ193cml0ZShyaW5nLCAw KTsKIAogfQogCkBAIC01MjMsNyArNTIzLDcgQEAgc3RhdGljIGludCBzZG1hX3Y0XzBfZ2Z4X3Jl c3VtZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAl1MzIgZG9vcmJlbGw7CiAJdTMyIGRv b3JiZWxsX29mZnNldDsKIAl1MzIgdGVtcDsKLQlpbnQgaSxyOworCWludCBpLCByOwogCiAJZm9y IChpID0gMDsgaSA8IGFkZXYtPnNkbWEubnVtX2luc3RhbmNlczsgaSsrKSB7CiAJCXJpbmcgPSAm YWRldi0+c2RtYS5pbnN0YW5jZVtpXS5yaW5nOwpAQCAtNTcyLDcgKzU3Miw3IEBAIHN0YXRpYyBp bnQgc2RtYV92NF8wX2dmeF9yZXN1bWUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJCWRv b3JiZWxsID0gUlJFRzMyKHNkbWFfdjRfMF9nZXRfcmVnX29mZnNldChpLCBtbVNETUEwX0dGWF9E T09SQkVMTCkpOwogCQlkb29yYmVsbF9vZmZzZXQgPSBSUkVHMzIoc2RtYV92NF8wX2dldF9yZWdf b2Zmc2V0KGksIG1tU0RNQTBfR0ZYX0RPT1JCRUxMX09GRlNFVCkpOwogCi0JCWlmIChyaW5nLT51 c2VfZG9vcmJlbGwpeworCQlpZiAocmluZy0+dXNlX2Rvb3JiZWxsKSB7CiAJCQlkb29yYmVsbCA9 IFJFR19TRVRfRklFTEQoZG9vcmJlbGwsIFNETUEwX0dGWF9ET09SQkVMTCwgRU5BQkxFLCAxKTsK IAkJCWRvb3JiZWxsX29mZnNldCA9IFJFR19TRVRfRklFTEQoZG9vcmJlbGxfb2Zmc2V0LCBTRE1B MF9HRlhfRE9PUkJFTExfT0ZGU0VULAogCQkJCQlPRkZTRVQsIHJpbmctPmRvb3JiZWxsX2luZGV4 KTsKQEAgLTY5NCw5ICs2OTQsNyBAQCBzdGF0aWMgaW50IHNkbWFfdjRfMF9sb2FkX21pY3JvY29k ZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAogCiAJCWZvciAoaiA9IDA7IGogPCBmd19z aXplOyBqKyspCi0JCXsKIAkJCVdSRUczMihzZG1hX3Y0XzBfZ2V0X3JlZ19vZmZzZXQoaSwgbW1T RE1BMF9VQ09ERV9EQVRBKSwgbGUzMl90b19jcHVwKGZ3X2RhdGErKykpOwotCQl9CiAKIAkJV1JF RzMyKHNkbWFfdjRfMF9nZXRfcmVnX29mZnNldChpLCBtbVNETUEwX1VDT0RFX0FERFIpLCBhZGV2 LT5zZG1hLmluc3RhbmNlW2ldLmZ3X3ZlcnNpb24pOwogCX0KQEAgLTc5NSw5ICs3OTMsOCBAQCBz dGF0aWMgaW50IHNkbWFfdjRfMF9yaW5nX3Rlc3RfcmluZyhzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJp bmcpCiAKIAlmb3IgKGkgPSAwOyBpIDwgYWRldi0+dXNlY190aW1lb3V0OyBpKyspIHsKIAkJdG1w ID0gbGUzMl90b19jcHUoYWRldi0+d2Iud2JbaW5kZXhdKTsKLQkJaWYgKHRtcCA9PSAweERFQURC RUVGKSB7CisJCWlmICh0bXAgPT0gMHhERUFEQkVFRikKIAkJCWJyZWFrOwotCQl9CiAJCURSTV9V REVMQVkoMSk7CiAJfQogCkBAIC04NjIsMjkgKzg1OSwyOSBAQCBzdGF0aWMgaW50IHNkbWFfdjRf MF9yaW5nX3Rlc3RfaWIoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLCBsb25nIHRpbWVvdXQpCiAJ aWYgKHIpCiAJCWdvdG8gZXJyMTsKIAotICAgICAgICByID0gZmVuY2Vfd2FpdF90aW1lb3V0KGYs IGZhbHNlLCB0aW1lb3V0KTsKLSAgICAgICAgaWYgKHIgPT0gMCkgewotICAgICAgICAgICAgICAg IERSTV9FUlJPUigiYW1kZ3B1OiBJQiB0ZXN0IHRpbWVkIG91dFxuIik7Ci0gICAgICAgICAgICAg ICAgciA9IC1FVElNRURPVVQ7Ci0gICAgICAgICAgICAgICAgZ290byBlcnIxOwotICAgICAgICB9 IGVsc2UgaWYgKHIgPCAwKSB7Ci0gICAgICAgICAgICAgICAgRFJNX0VSUk9SKCJhbWRncHU6IGZl bmNlIHdhaXQgZmFpbGVkICglbGQpLlxuIiwgcik7Ci0gICAgICAgICAgICAgICAgZ290byBlcnIx OwotICAgICAgICB9Ci0gICAgICAgIHRtcCA9IGxlMzJfdG9fY3B1KGFkZXYtPndiLndiW2luZGV4 XSk7Ci0gICAgICAgIGlmICh0bXAgPT0gMHhERUFEQkVFRikgewotICAgICAgICAgICAgICAgIERS TV9JTkZPKCJpYiB0ZXN0IG9uIHJpbmcgJWQgc3VjY2VlZGVkXG4iLCByaW5nLT5pZHgpOwotICAg ICAgICAgICAgICAgIHIgPSAwOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgIERS TV9FUlJPUigiYW1kZ3B1OiBpYiB0ZXN0IGZhaWxlZCAoMHglMDhYKVxuIiwgdG1wKTsKLSAgICAg ICAgICAgICAgICByID0gLUVJTlZBTDsKLSAgICAgICAgfQorCXIgPSBmZW5jZV93YWl0X3RpbWVv dXQoZiwgZmFsc2UsIHRpbWVvdXQpOworCWlmIChyID09IDApIHsKKwkJRFJNX0VSUk9SKCJhbWRn cHU6IElCIHRlc3QgdGltZWQgb3V0XG4iKTsKKwkJciA9IC1FVElNRURPVVQ7CisJCWdvdG8gZXJy MTsKKwl9IGVsc2UgaWYgKHIgPCAwKSB7CisJCURSTV9FUlJPUigiYW1kZ3B1OiBmZW5jZSB3YWl0 IGZhaWxlZCAoJWxkKS5cbiIsIHIpOworCQlnb3RvIGVycjE7CisJfQorCXRtcCA9IGxlMzJfdG9f Y3B1KGFkZXYtPndiLndiW2luZGV4XSk7CisJaWYgKHRtcCA9PSAweERFQURCRUVGKSB7CisJCURS TV9JTkZPKCJpYiB0ZXN0IG9uIHJpbmcgJWQgc3VjY2VlZGVkXG4iLCByaW5nLT5pZHgpOworCQly ID0gMDsKKwl9IGVsc2UgeworCQlEUk1fRVJST1IoImFtZGdwdTogaWIgdGVzdCBmYWlsZWQgKDB4 JTA4WClcbiIsIHRtcCk7CisJCXIgPSAtRUlOVkFMOworCX0KIGVycjE6Ci0gICAgICAgIGFtZGdw dV9pYl9mcmVlKGFkZXYsICZpYiwgTlVMTCk7Ci0gICAgICAgIGZlbmNlX3B1dChmKTsKKwlhbWRn cHVfaWJfZnJlZShhZGV2LCAmaWIsIE5VTEwpOworCWZlbmNlX3B1dChmKTsKIGVycjA6Ci0gICAg ICAgIGFtZGdwdV93Yl9mcmVlKGFkZXYsIGluZGV4KTsKLSAgICAgICAgcmV0dXJuIHI7CisJYW1k Z3B1X3diX2ZyZWUoYWRldiwgaW5kZXgpOworCXJldHVybiByOwogfQogCiAKQEAgLTExOTEsMTAg KzExODgsMTIgQEAgc3RhdGljIGJvb2wgc2RtYV92NF8wX2lzX2lkbGUodm9pZCAqaGFuZGxlKQog ewogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gKHN0cnVjdCBhbWRncHVfZGV2aWNlICop aGFuZGxlOwogCXUzMiBpOworCiAJZm9yIChpID0gMDsgaSA8IGFkZXYtPnNkbWEubnVtX2luc3Rh bmNlczsgaSsrKSB7CiAJCXUzMiB0bXAgPSBSUkVHMzIoc2RtYV92NF8wX2dldF9yZWdfb2Zmc2V0 KGksIG1tU0RNQTBfU1RBVFVTX1JFRykpOworCiAJCWlmICghKHRtcCAmIFNETUEwX1NUQVRVU19S RUdfX0lETEVfTUFTSykpCi0JICAgCQkgcmV0dXJuIGZhbHNlOworCQkJcmV0dXJuIGZhbHNlOwog CX0KIAogCXJldHVybiB0cnVlOwpAQCAtMTIwMyw4ICsxMjAyLDkgQEAgc3RhdGljIGJvb2wgc2Rt YV92NF8wX2lzX2lkbGUodm9pZCAqaGFuZGxlKQogc3RhdGljIGludCBzZG1hX3Y0XzBfd2FpdF9m b3JfaWRsZSh2b2lkICpoYW5kbGUpCiB7CiAJdW5zaWduZWQgaTsKLQl1MzIgc2RtYTAsc2RtYTE7 CisJdTMyIHNkbWEwLCBzZG1hMTsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IChzdHJ1 Y3QgYW1kZ3B1X2RldmljZSAqKWhhbmRsZTsKKwogCWZvciAoaSA9IDA7IGkgPCBhZGV2LT51c2Vj X3RpbWVvdXQ7IGkrKykgewogCQlzZG1hMCA9IFJSRUczMihzZG1hX3Y0XzBfZ2V0X3JlZ19vZmZz ZXQoMCwgbW1TRE1BMF9TVEFUVVNfUkVHKSk7CiAJCXNkbWExID0gUlJFRzMyKHNkbWFfdjRfMF9n ZXRfcmVnX29mZnNldCgxLCBtbVNETUEwX1NUQVRVU19SRUcpKTsKQEAgLTEyMzIsNyArMTIzMiw3 IEBAIHN0YXRpYyBpbnQgc2RtYV92NF8wX3NldF90cmFwX2lycV9zdGF0ZShzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldiwKIAogCXUzMiByZWdfb2Zmc2V0ID0gKHR5cGUgPT0gQU1ER1BVX1NETUFf SVJRX1RSQVAwKSA/CiAJCXNkbWFfdjRfMF9nZXRfcmVnX29mZnNldCgwLCBtbVNETUEwX0NOVEwp IDoKLQkgICAgICAgCXNkbWFfdjRfMF9nZXRfcmVnX29mZnNldCgxLCBtbVNETUEwX0NOVEwpOwor CQlzZG1hX3Y0XzBfZ2V0X3JlZ19vZmZzZXQoMSwgbW1TRE1BMF9DTlRMKTsKIAogCXNkbWFfY250 bCA9IFJSRUczMihyZWdfb2Zmc2V0KTsKIAlzZG1hX2NudGwgPSBSRUdfU0VUX0ZJRUxEKHNkbWFf Y250bCwgU0RNQTBfQ05UTCwgVFJBUF9FTkFCTEUsCkBAIC0xMzI0LDcgKzEzMjQsNyBAQCBzdGF0 aWMgdm9pZCBzZG1hX3Y0XzBfdXBkYXRlX21lZGl1bV9ncmFpbl9jbG9ja19nYXRpbmcoCiAJCQkJ ICBTRE1BMV9DTEtfQ1RSTF9fU09GVF9PVkVSUklERTJfTUFTSyB8CiAJCQkJICBTRE1BMV9DTEtf Q1RSTF9fU09GVF9PVkVSUklERTFfTUFTSyB8CiAJCQkJICBTRE1BMV9DTEtfQ1RSTF9fU09GVF9P VkVSUklERTBfTUFTSyk7Ci0JCQlpZihkZWYgIT0gZGF0YSkKKwkJCWlmIChkZWYgIT0gZGF0YSkK IAkJCQlXUkVHMzIoU09DMTVfUkVHX09GRlNFVChTRE1BMSwgMCwgbW1TRE1BMV9DTEtfQ1RSTCks IGRhdGEpOwogCQl9CiAJfSBlbHNlIHsKQEAgLTEzNzQsMTcgKzEzNzQsMTcgQEAgc3RhdGljIHZv aWQgc2RtYV92NF8wX3VwZGF0ZV9tZWRpdW1fZ3JhaW5fbGlnaHRfc2xlZXAoCiAKIAkJLyogMS1u b3Qgb3ZlcnJpZGU6IGVuYWJsZSBzZG1hMSBtZW0gbGlnaHQgc2xlZXAgKi8KIAkJaWYgKGFkZXYt PmFzaWNfdHlwZSA9PSBDSElQX1ZFR0ExMCkgewotCQkJIGRlZiA9IGRhdGEgPSBSUkVHMzIoU09D MTVfUkVHX09GRlNFVChTRE1BMSwgMCwgbW1TRE1BMV9QT1dFUl9DTlRMKSk7Ci0JCQkgZGF0YSB8 PSBTRE1BMV9QT1dFUl9DTlRMX19NRU1fUE9XRVJfT1ZFUlJJREVfTUFTSzsKLQkJCSBpZiAoZGVm ICE9IGRhdGEpCi0JCQkJIFdSRUczMihTT0MxNV9SRUdfT0ZGU0VUKFNETUExLCAwLCBtbVNETUEx X1BPV0VSX0NOVEwpLCBkYXRhKTsKKwkJCWRlZiA9IGRhdGEgPSBSUkVHMzIoU09DMTVfUkVHX09G RlNFVChTRE1BMSwgMCwgbW1TRE1BMV9QT1dFUl9DTlRMKSk7CisJCQlkYXRhIHw9IFNETUExX1BP V0VSX0NOVExfX01FTV9QT1dFUl9PVkVSUklERV9NQVNLOworCQkJaWYgKGRlZiAhPSBkYXRhKQor CQkJCVdSRUczMihTT0MxNV9SRUdfT0ZGU0VUKFNETUExLCAwLCBtbVNETUExX1BPV0VSX0NOVEwp LCBkYXRhKTsKIAkJfQogCX0gZWxzZSB7CiAJCS8qIDAtb3ZlcnJpZGU6ZGlzYWJsZSBzZG1hMCBt ZW0gbGlnaHQgc2xlZXAgKi8KIAkJZGVmID0gZGF0YSA9IFJSRUczMihTT0MxNV9SRUdfT0ZGU0VU KFNETUEwLCAwLCBtbVNETUEwX1BPV0VSX0NOVEwpKTsKIAkJZGF0YSAmPSB+U0RNQTBfUE9XRVJf Q05UTF9fTUVNX1BPV0VSX09WRVJSSURFX01BU0s7CiAJCWlmIChkZWYgIT0gZGF0YSkKLQkJICAg ICAgIFdSRUczMihTT0MxNV9SRUdfT0ZGU0VUKFNETUEwLCAwLCBtbVNETUEwX1BPV0VSX0NOVEwp LCBkYXRhKTsKKwkJCVdSRUczMihTT0MxNV9SRUdfT0ZGU0VUKFNETUEwLCAwLCBtbVNETUEwX1BP V0VSX0NOVEwpLCBkYXRhKTsKIAogCQkvKiAwLW92ZXJyaWRlOmRpc2FibGUgc2RtYTEgbWVtIGxp Z2h0IHNsZWVwICovCiAJCWlmIChhZGV2LT5hc2ljX3R5cGUgPT0gQ0hJUF9WRUdBMTApIHsKQEAg LTE1OTksOCArMTU5OSw3IEBAIHN0YXRpYyB2b2lkIHNkbWFfdjRfMF9zZXRfdm1fcHRlX2Z1bmNz KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCX0KIH0KIAotY29uc3Qgc3RydWN0IGFtZGdw dV9pcF9ibG9ja192ZXJzaW9uIHNkbWFfdjRfMF9pcF9ibG9jayA9Ci17Citjb25zdCBzdHJ1Y3Qg YW1kZ3B1X2lwX2Jsb2NrX3ZlcnNpb24gc2RtYV92NF8wX2lwX2Jsb2NrID0gewogCS50eXBlID0g QU1EX0lQX0JMT0NLX1RZUEVfU0RNQSwKIAkubWFqb3IgPSA0LAogCS5taW5vciA9IDAsCi0tIAox LjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1k LWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==