From: Tom St Denis Subject: [PATCH 5/5] drm/amd/amdgpu: Use modern 32/64-bit types in gfx6 Date: Mon, 15 May 2017 09:48:54 -0400 Message-ID: <20170515134854.26644-6-tom.stdenis@amd.com> References: <20170515134854.26644-1-tom.stdenis@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170515134854.26644-1-tom.stdenis-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: Tom St Denis U3dpdGNoIHRvIHVpbnROTl90IGZyb20gInVOTiIgdHlwZXMgdG8gYmUgbW9yZSBjb25zaXN0ZW50 CndpdGggbW9kZXJuIGNvZGluZyBzdHlsZXMuCgpTaWduZWQtb2ZmLWJ5OiBUb20gU3QgRGVuaXMg PHRvbS5zdGRlbmlzQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4 X3Y2XzAuYyB8IDE1MCArKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgNzUgaW5zZXJ0aW9ucygrKSwgNzUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y2XzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2dmeF92Nl8wLmMKaW5kZXggMTM1MWY5MjMwZmNkLi5hNmM4OGY5OGRmMDggMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92Nl8wLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y2XzAuYwpAQCAtNjgsOCArNjgsOCBAQCBNT0RV TEVfRklSTVdBUkUoInJhZGVvbi9oYWluYW5fbWUuYmluIik7CiBNT0RVTEVfRklSTVdBUkUoInJh ZGVvbi9oYWluYW5fY2UuYmluIik7CiBNT0RVTEVfRklSTVdBUkUoInJhZGVvbi9oYWluYW5fcmxj LmJpbiIpOwogCi1zdGF0aWMgdTMyIGdmeF92Nl8wX2dldF9jc2Jfc2l6ZShzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldik7Ci1zdGF0aWMgdm9pZCBnZnhfdjZfMF9nZXRfY3NiX2J1ZmZlcihzdHJ1 Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgdm9sYXRpbGUgdTMyICpidWZmZXIpOworc3RhdGljIHVp bnQzMl90IGdmeF92Nl8wX2dldF9jc2Jfc2l6ZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldik7 CitzdGF0aWMgdm9pZCBnZnhfdjZfMF9nZXRfY3NiX2J1ZmZlcihzdHJ1Y3QgYW1kZ3B1X2Rldmlj ZSAqYWRldiwgdm9sYXRpbGUgdWludDMyX3QgKmJ1ZmZlcik7CiAvL3N0YXRpYyB2b2lkIGdmeF92 Nl8wX2luaXRfY3BfcGdfdGFibGUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpOwogc3RhdGlj IHZvaWQgZ2Z4X3Y2XzBfaW5pdF9wZyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldik7CiAKQEAg LTgzLDcgKzgzLDcgQEAgc3RhdGljIHZvaWQgZ2Z4X3Y2XzBfaW5pdF9wZyhzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldik7CiAjZGVmaW5lIE1BQ1JPX1RJTEVfQVNQRUNUKHgpCQkJCSgoeCkgPDwg MTgpCiAjZGVmaW5lIE5VTV9CQU5LUyh4KQkJCQkJKCh4KSA8PCAyMCkKIAotc3RhdGljIGNvbnN0 IHUzMiB2ZXJkZV9ybGNfc2F2ZV9yZXN0b3JlX3JlZ2lzdGVyX2xpc3RbXSA9CitzdGF0aWMgY29u c3QgdWludDMyX3QgdmVyZGVfcmxjX3NhdmVfcmVzdG9yZV9yZWdpc3Rlcl9saXN0W10gPQogewog CSgweDgwMDAgPDwgMTYpIHwgKDB4OThmNCA+PiAyKSwKIAkweDAwMDAwMDAwLApAQCAtMzkzLDgg KzM5Myw4IEBAIHN0YXRpYyBpbnQgZ2Z4X3Y2XzBfaW5pdF9taWNyb2NvZGUoc3RydWN0IGFtZGdw dV9kZXZpY2UgKmFkZXYpCiAKIHN0YXRpYyB2b2lkIGdmeF92Nl8wX3RpbGluZ19tb2RlX3RhYmxl X2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB7Ci0JY29uc3QgdTMyIG51bV90aWxl X21vZGVfc3RhdGVzID0gQVJSQVlfU0laRShhZGV2LT5nZnguY29uZmlnLnRpbGVfbW9kZV9hcnJh eSk7Ci0JdTMyIHJlZ19vZmZzZXQsIHNwbGl0X2VxdWFsX3RvX3Jvd19zaXplLCAqdGlsZW1vZGU7 CisJY29uc3QgdWludDMyX3QgbnVtX3RpbGVfbW9kZV9zdGF0ZXMgPSBBUlJBWV9TSVpFKGFkZXYt PmdmeC5jb25maWcudGlsZV9tb2RlX2FycmF5KTsKKwl1aW50MzJfdCByZWdfb2Zmc2V0LCBzcGxp dF9lcXVhbF90b19yb3dfc2l6ZSwgKnRpbGVtb2RlOwogCiAJbWVtc2V0KGFkZXYtPmdmeC5jb25m aWcudGlsZV9tb2RlX2FycmF5LCAwLCBzaXplb2YoYWRldi0+Z2Z4LmNvbmZpZy50aWxlX21vZGVf YXJyYXkpKTsKIAl0aWxlbW9kZSA9IGFkZXYtPmdmeC5jb25maWcudGlsZV9tb2RlX2FycmF5OwpA QCAtMTA4OSwxMCArMTA4OSwxMCBAQCBzdGF0aWMgdm9pZCBnZnhfdjZfMF90aWxpbmdfbW9kZV90 YWJsZV9pbml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCX0KIH0KIAotc3RhdGljIHZv aWQgZ2Z4X3Y2XzBfc2VsZWN0X3NlX3NoKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1MzIg c2VfbnVtLAotCQkJCSAgdTMyIHNoX251bSwgdTMyIGluc3RhbmNlKQorc3RhdGljIHZvaWQgZ2Z4 X3Y2XzBfc2VsZWN0X3NlX3NoKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1aW50MzJfdCBz ZV9udW0sCisJCQkJICB1aW50MzJfdCBzaF9udW0sIHVpbnQzMl90IGluc3RhbmNlKQogewotCXUz MiBkYXRhOworCXVpbnQzMl90IGRhdGE7CiAKIAlpZiAoaW5zdGFuY2UgPT0gMHhmZmZmZmZmZikK IAkJZGF0YSA9IFJFR19TRVRfRklFTEQoMCwgR1JCTV9HRlhfSU5ERVgsIElOU1RBTkNFX0JST0FE Q0FTVF9XUklURVMsIDEpOwpAQCAtMTExNCwxNCArMTExNCwxNCBAQCBzdGF0aWMgdm9pZCBnZnhf djZfMF9zZWxlY3Rfc2Vfc2goc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHUzMiBzZV9udW0s CiAJV1JFRzMyKG1tR1JCTV9HRlhfSU5ERVgsIGRhdGEpOwogfQogCi1zdGF0aWMgdTMyIGdmeF92 Nl8wX2NyZWF0ZV9iaXRtYXNrKHUzMiBiaXRfd2lkdGgpCitzdGF0aWMgdWludDMyX3QgZ2Z4X3Y2 XzBfY3JlYXRlX2JpdG1hc2sodWludDMyX3QgYml0X3dpZHRoKQogewotCXJldHVybiAodTMyKSgo KHU2NCkxIDw8IGJpdF93aWR0aCkgLSAxKTsKKwlyZXR1cm4gKHVpbnQzMl90KSgoKHVpbnQ2NF90 KTEgPDwgYml0X3dpZHRoKSAtIDEpOwogfQogCi1zdGF0aWMgdTMyIGdmeF92Nl8wX2dldF9yYl9h Y3RpdmVfYml0bWFwKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQorc3RhdGljIHVpbnQzMl90 IGdmeF92Nl8wX2dldF9yYl9hY3RpdmVfYml0bWFwKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2 KQogewotCXUzMiBkYXRhLCBtYXNrOworCXVpbnQzMl90IGRhdGEsIG1hc2s7CiAKIAlkYXRhID0g UlJFRzMyKG1tQ0NfUkJfQkFDS0VORF9ESVNBQkxFKSB8CiAJCVJSRUczMihtbUdDX1VTRVJfUkJf QkFDS0VORF9ESVNBQkxFKTsKQEAgLTExMzQsNyArMTEzNCw3IEBAIHN0YXRpYyB1MzIgZ2Z4X3Y2 XzBfZ2V0X3JiX2FjdGl2ZV9iaXRtYXAoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJcmV0 dXJuIH5kYXRhICYgbWFzazsKIH0KIAotc3RhdGljIHZvaWQgZ2Z4X3Y2XzBfcmFzdGVyX2NvbmZp ZyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgdTMyICpyY29uZikKK3N0YXRpYyB2b2lkIGdm eF92Nl8wX3Jhc3Rlcl9jb25maWcoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHVpbnQzMl90 ICpyY29uZikKIHsKIAlzd2l0Y2ggKGFkZXYtPmFzaWNfdHlwZSkgewogCWNhc2UgQ0hJUF9UQUhJ VEk6CkBAIC0xMTY3LDcgKzExNjcsNyBAQCBzdGF0aWMgdm9pZCBnZnhfdjZfMF9yYXN0ZXJfY29u ZmlnKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1MzIgKnJjb25mKQogfQogCiBzdGF0aWMg dm9pZCBnZnhfdjZfMF93cml0ZV9oYXJ2ZXN0ZWRfcmFzdGVyX2NvbmZpZ3Moc3RydWN0IGFtZGdw dV9kZXZpY2UgKmFkZXYsCi0JCQkJCQkgICAgdTMyIHJhc3Rlcl9jb25maWcsIHVuc2lnbmVkIHJi X21hc2ssCisJCQkJCQkgICAgdWludDMyX3QgcmFzdGVyX2NvbmZpZywgdW5zaWduZWQgcmJfbWFz aywKIAkJCQkJCSAgICB1bnNpZ25lZCBudW1fcmIpCiB7CiAJdW5zaWduZWQgc2hfcGVyX3NlID0g bWF4X3QodW5zaWduZWQsIGFkZXYtPmdmeC5jb25maWcubWF4X3NoX3Blcl9zZSwgMSk7CkBAIC0x MjU5LDEwICsxMjU5LDEwIEBAIHN0YXRpYyB2b2lkIGdmeF92Nl8wX3dyaXRlX2hhcnZlc3RlZF9y YXN0ZXJfY29uZmlncyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIHN0YXRpYyB2b2lkIGdm eF92Nl8wX3NldHVwX3JiKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogewogCWludCBpLCBq OwotCXUzMiBkYXRhOwotCXUzMiByYXN0ZXJfY29uZmlnID0gMDsKLQl1MzIgYWN0aXZlX3JicyA9 IDA7Ci0JdTMyIHJiX2JpdG1hcF93aWR0aF9wZXJfc2ggPSBhZGV2LT5nZnguY29uZmlnLm1heF9i YWNrZW5kc19wZXJfc2UgLworCXVpbnQzMl90IGRhdGE7CisJdWludDMyX3QgcmFzdGVyX2NvbmZp ZyA9IDA7CisJdWludDMyX3QgYWN0aXZlX3JicyA9IDA7CisJdWludDMyX3QgcmJfYml0bWFwX3dp ZHRoX3Blcl9zaCA9IGFkZXYtPmdmeC5jb25maWcubWF4X2JhY2tlbmRzX3Blcl9zZSAvCiAJCQkJ CWFkZXYtPmdmeC5jb25maWcubWF4X3NoX3Blcl9zZTsKIAl1bnNpZ25lZCBudW1fcmJfcGlwZXM7 CiAKQEAgLTEzMTEsOSArMTMxMSw5IEBAIHN0YXRpYyB2b2lkIGdmeF92Nl8wX3NldHVwX3JiKHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogfQogCiBzdGF0aWMgdm9pZCBnZnhfdjZfMF9zZXRf dXNlcl9jdV9pbmFjdGl2ZV9iaXRtYXAoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCi0JCQkJ CQkgdTMyIGJpdG1hcCkKKwkJCQkJCSB1aW50MzJfdCBiaXRtYXApCiB7Ci0JdTMyIGRhdGE7CisJ dWludDMyX3QgZGF0YTsKIAogCWlmICghYml0bWFwKQogCQlyZXR1cm47CkBAIC0xMzI0LDkgKzEz MjQsOSBAQCBzdGF0aWMgdm9pZCBnZnhfdjZfMF9zZXRfdXNlcl9jdV9pbmFjdGl2ZV9iaXRtYXAo c3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJV1JFRzMyKG1tR0NfVVNFUl9TSEFERVJfQVJS QVlfQ09ORklHLCBkYXRhKTsKIH0KIAotc3RhdGljIHUzMiBnZnhfdjZfMF9nZXRfY3VfZW5hYmxl ZChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKK3N0YXRpYyB1aW50MzJfdCBnZnhfdjZfMF9n ZXRfY3VfZW5hYmxlZChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIHsKLQl1MzIgZGF0YSwg bWFzazsKKwl1aW50MzJfdCBkYXRhLCBtYXNrOwogCiAJZGF0YSA9IFJSRUczMihtbUNDX0dDX1NI QURFUl9BUlJBWV9DT05GSUcpIHwKIAkJUlJFRzMyKG1tR0NfVVNFUl9TSEFERVJfQVJSQVlfQ09O RklHKTsKQEAgLTEzMzksOCArMTMzOSw4IEBAIHN0YXRpYyB1MzIgZ2Z4X3Y2XzBfZ2V0X2N1X2Vu YWJsZWQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiBzdGF0aWMgdm9pZCBnZnhfdjZfMF9z ZXR1cF9zcGkoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB7CiAJaW50IGksIGosIGs7Ci0J dTMyIGRhdGEsIG1hc2s7Ci0JdTMyIGFjdGl2ZV9jdSA9IDA7CisJdWludDMyX3QgZGF0YSwgbWFz azsKKwl1aW50MzJfdCBhY3RpdmVfY3UgPSAwOwogCiAJbXV0ZXhfbG9jaygmYWRldi0+Z3JibV9p ZHhfbXV0ZXgpOwogCWZvciAoaSA9IDA7IGkgPCBhZGV2LT5nZnguY29uZmlnLm1heF9zaGFkZXJf ZW5naW5lczsgaSsrKSB7CkBAIC0xMzcxLDExICsxMzcxLDExIEBAIHN0YXRpYyB2b2lkIGdmeF92 Nl8wX2NvbmZpZ19pbml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCiBzdGF0aWMgdm9p ZCBnZnhfdjZfMF9ncHVfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIHsKLQl1MzIg Z2JfYWRkcl9jb25maWcgPSAwOwotCXUzMiBtY19zaGFyZWRfY2htYXAsIG1jX2FyYl9yYW1jZmc7 Ci0JdTMyIHN4X2RlYnVnXzE7Ci0JdTMyIGhkcF9ob3N0X3BhdGhfY250bDsKLQl1MzIgdG1wOwor CXVpbnQzMl90IGdiX2FkZHJfY29uZmlnID0gMDsKKwl1aW50MzJfdCBtY19zaGFyZWRfY2htYXAs IG1jX2FyYl9yYW1jZmc7CisJdWludDMyX3Qgc3hfZGVidWdfMTsKKwl1aW50MzJfdCBoZHBfaG9z dF9wYXRoX2NudGw7CisJdWludDMyX3QgdG1wOwogCiAJc3dpdGNoIChhZGV2LT5hc2ljX3R5cGUp IHsKIAljYXNlIENISVBfVEFISVRJOgpAQCAtMTY2MSw4ICsxNjYxLDggQEAgc3RhdGljIHZvaWQg Z2Z4X3Y2XzBfcmluZ19lbWl0X2hkcF9pbnZhbGlkYXRlKHN0cnVjdCBhbWRncHVfcmluZyAqcmlu ZykKIAlhbWRncHVfcmluZ193cml0ZShyaW5nLCAweDEpOwogfQogCi1zdGF0aWMgdm9pZCBnZnhf djZfMF9yaW5nX2VtaXRfZmVuY2Uoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLCB1NjQgYWRkciwK LQkJCQkgICAgIHU2NCBzZXEsIHVuc2lnbmVkIGZsYWdzKQorc3RhdGljIHZvaWQgZ2Z4X3Y2XzBf cmluZ19lbWl0X2ZlbmNlKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZywgdWludDY0X3QgYWRkciwK KwkJCQkgICAgIHVpbnQ2NF90IHNlcSwgdW5zaWduZWQgZmxhZ3MpCiB7CiAJYm9vbCB3cml0ZTY0 Yml0ID0gZmxhZ3MgJiBBTURHUFVfRkVOQ0VfRkxBR182NEJJVDsKIAlib29sIGludF9zZWwgPSBm bGFncyAmIEFNREdQVV9GRU5DRV9GTEFHX0lOVDsKQEAgLTE2OTMsNyArMTY5Myw3IEBAIHN0YXRp YyB2b2lkIGdmeF92Nl8wX3JpbmdfZW1pdF9pYihzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsCiAJ CQkJICBzdHJ1Y3QgYW1kZ3B1X2liICppYiwKIAkJCQkgIHVuc2lnbmVkIHZtX2lkLCBib29sIGN0 eF9zd2l0Y2gpCiB7Ci0JdTMyIGhlYWRlciwgY29udHJvbCA9IDA7CisJdWludDMyX3QgaGVhZGVy LCBjb250cm9sID0gMDsKIAogCS8qIGluc2VydCBTV0lUQ0hfQlVGRkVSIHBhY2tldCBiZWZvcmUg Zmlyc3QgSUIgaW4gdGhlIHJpbmcgZnJhbWUgKi8KIAlpZiAoY3R4X3N3aXRjaCkgewpAQCAtMTgw OSw3ICsxODA5LDcgQEAgc3RhdGljIGludCBnZnhfdjZfMF9jcF9nZnhfbG9hZF9taWNyb2NvZGUo c3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJY29uc3Qgc3RydWN0IGdmeF9maXJtd2FyZV9o ZWFkZXJfdjFfMCAqY2VfaGRyOwogCWNvbnN0IHN0cnVjdCBnZnhfZmlybXdhcmVfaGVhZGVyX3Yx XzAgKm1lX2hkcjsKIAljb25zdCBfX2xlMzIgKmZ3X2RhdGE7Ci0JdTMyIGZ3X3NpemU7CisJdWlu dDMyX3QgZndfc2l6ZTsKIAogCWlmICghYWRldi0+Z2Z4Lm1lX2Z3IHx8ICFhZGV2LT5nZngucGZw X2Z3IHx8ICFhZGV2LT5nZnguY2VfZncpCiAJCXJldHVybiAtRUlOVkFMOwpAQCAtMTkyNSwxMCAr MTkyNSwxMCBAQCBzdGF0aWMgaW50IGdmeF92Nl8wX2NwX2dmeF9zdGFydChzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldikKIHN0YXRpYyBpbnQgZ2Z4X3Y2XzBfY3BfZ2Z4X3Jlc3VtZShzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldikKIHsKIAlzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmc7Ci0JdTMy IHRtcDsKLQl1MzIgcmJfYnVmc3o7CisJdWludDMyX3QgdG1wOworCXVpbnQzMl90IHJiX2J1ZnN6 OwogCWludCByOwotCXU2NCBycHRyX2FkZHI7CisJdWludDY0X3QgcnB0cl9hZGRyOwogCiAJV1JF RzMyKG1tQ1BfU0VNX1dBSVRfVElNRVIsIDB4MCk7CiAJV1JFRzMyKG1tQ1BfU0VNX0lOQ09NUExF VEVfVElNRVJfQ05UTCwgMHgwKTsKQEAgLTE5NzksMTIgKzE5NzksMTIgQEAgc3RhdGljIGludCBn ZnhfdjZfMF9jcF9nZnhfcmVzdW1lKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCXJldHVy biAwOwogfQogCi1zdGF0aWMgdTY0IGdmeF92Nl8wX3JpbmdfZ2V0X3JwdHIoc3RydWN0IGFtZGdw dV9yaW5nICpyaW5nKQorc3RhdGljIHVpbnQ2NF90IGdmeF92Nl8wX3JpbmdfZ2V0X3JwdHIoc3Ry dWN0IGFtZGdwdV9yaW5nICpyaW5nKQogewogCXJldHVybiByaW5nLT5hZGV2LT53Yi53YltyaW5n LT5ycHRyX29mZnNdOwogfQogCi1zdGF0aWMgdTY0IGdmeF92Nl8wX3JpbmdfZ2V0X3dwdHIoc3Ry dWN0IGFtZGdwdV9yaW5nICpyaW5nKQorc3RhdGljIHVpbnQ2NF90IGdmeF92Nl8wX3JpbmdfZ2V0 X3dwdHIoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQogewogCXN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2ID0gcmluZy0+YWRldjsKIApAQCAtMjAyNSwxMCArMjAyNSwxMCBAQCBzdGF0aWMgdm9p ZCBnZnhfdjZfMF9yaW5nX3NldF93cHRyX2NvbXB1dGUoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5n KQogc3RhdGljIGludCBnZnhfdjZfMF9jcF9jb21wdXRlX3Jlc3VtZShzdHJ1Y3QgYW1kZ3B1X2Rl dmljZSAqYWRldikKIHsKIAlzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmc7Ci0JdTMyIHRtcDsKLQl1 MzIgcmJfYnVmc3o7CisJdWludDMyX3QgdG1wOworCXVpbnQzMl90IHJiX2J1ZnN6OwogCWludCBp LCByOwotCXU2NCBycHRyX2FkZHI7CisJdWludDY0X3QgcnB0cl9hZGRyOwogCiAJLyogcmluZzEg IC0gY29tcHV0ZSBvbmx5ICovCiAJLyogU2V0IHJpbmcgYnVmZmVyIHNpemUgKi8KQEAgLTIwOTgs OCArMjA5OCw4IEBAIHN0YXRpYyBpbnQgZ2Z4X3Y2XzBfY3BfbG9hZF9taWNyb2NvZGUoc3RydWN0 IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiBzdGF0aWMgdm9pZCBnZnhfdjZfMF9lbmFibGVfZ3VpX2lk bGVfaW50ZXJydXB0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCQkJCQkgICAgICAgYm9v bCBlbmFibGUpCiB7Ci0JdTMyIHRtcCA9IFJSRUczMihtbUNQX0lOVF9DTlRMX1JJTkcwKTsKLQl1 MzIgbWFzazsKKwl1aW50MzJfdCB0bXAgPSBSUkVHMzIobW1DUF9JTlRfQ05UTF9SSU5HMCk7CisJ dWludDMyX3QgbWFzazsKIAlpbnQgaTsKIAogCWlmIChlbmFibGUpCkBAIC0yMjU5LDE2ICsyMjU5 LDE2IEBAIHN0YXRpYyB2b2lkIGdmeF92Nl8wX3JsY19maW5pKHN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2KQogCiBzdGF0aWMgaW50IGdmeF92Nl8wX3JsY19pbml0KHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2KQogewotCWNvbnN0IHUzMiAqc3JjX3B0cjsKLQl2b2xhdGlsZSB1MzIgKmRzdF9w dHI7Ci0JdTMyIGR3cywgaTsKLQl1NjQgcmVnX2xpc3RfbWNfYWRkcjsKKwljb25zdCB1aW50MzJf dCAqc3JjX3B0cjsKKwl2b2xhdGlsZSB1aW50MzJfdCAqZHN0X3B0cjsKKwl1aW50MzJfdCBkd3Ms IGk7CisJdWludDY0X3QgcmVnX2xpc3RfbWNfYWRkcjsKIAljb25zdCBzdHJ1Y3QgY3Nfc2VjdGlv bl9kZWYgKmNzX2RhdGE7CiAJaW50IHI7CiAKIAlhZGV2LT5nZngucmxjLnJlZ19saXN0ID0gdmVy ZGVfcmxjX3NhdmVfcmVzdG9yZV9yZWdpc3Rlcl9saXN0OwogCWFkZXYtPmdmeC5ybGMucmVnX2xp c3Rfc2l6ZSA9Ci0JCQkodTMyKUFSUkFZX1NJWkUodmVyZGVfcmxjX3NhdmVfcmVzdG9yZV9yZWdp c3Rlcl9saXN0KTsKKwkJCSh1aW50MzJfdClBUlJBWV9TSVpFKHZlcmRlX3JsY19zYXZlX3Jlc3Rv cmVfcmVnaXN0ZXJfbGlzdCk7CiAKIAlhZGV2LT5nZngucmxjLmNzX2RhdGEgPSBzaV9jc19kYXRh OwogCXNyY19wdHIgPSBhZGV2LT5nZngucmxjLnJlZ19saXN0OwpAQCAtMjM5NywxOCArMjM5Nywx OCBAQCBzdGF0aWMgdm9pZCBnZnhfdjZfMF93YWl0X2Zvcl9ybGNfc2VyZGVzKHN0cnVjdCBhbWRn cHVfZGV2aWNlICphZGV2KQogCX0KIH0KIAotc3RhdGljIHZvaWQgZ2Z4X3Y2XzBfdXBkYXRlX3Js YyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgdTMyIHJsYykKK3N0YXRpYyB2b2lkIGdmeF92 Nl8wX3VwZGF0ZV9ybGMoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHVpbnQzMl90IHJsYykK IHsKLQl1MzIgdG1wOworCXVpbnQzMl90IHRtcDsKIAogCXRtcCA9IFJSRUczMihtbVJMQ19DTlRM KTsKIAlpZiAodG1wICE9IHJsYykKIAkJV1JFRzMyKG1tUkxDX0NOVEwsIHJsYyk7CiB9CiAKLXN0 YXRpYyB1MzIgZ2Z4X3Y2XzBfaGFsdF9ybGMoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCitz dGF0aWMgdWludDMyX3QgZ2Z4X3Y2XzBfaGFsdF9ybGMoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFk ZXYpCiB7Ci0JdTMyIGRhdGEsIG9yaWc7CisJdWludDMyX3QgZGF0YSwgb3JpZzsKIAogCW9yaWcg PSBkYXRhID0gUlJFRzMyKG1tUkxDX0NOVEwpOwogCkBAIC0yNDQ5LDcgKzI0NDksNyBAQCBzdGF0 aWMgdm9pZCBnZnhfdjZfMF9ybGNfcmVzZXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAK IHN0YXRpYyBib29sIGdmeF92Nl8wX2xicHdfc3VwcG9ydGVkKHN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2KQogewotCXUzMiB0bXA7CisJdWludDMyX3QgdG1wOwogCiAJLyogRW5hYmxlIExCUFcg b25seSBmb3IgRERSMyAqLwogCXRtcCA9IFJSRUczMihtbU1DX1NFUV9NSVNDMCk7CkBAIC0yNDY0 LDEwICsyNDY0LDEwIEBAIHN0YXRpYyB2b2lkIGdmeF92Nl8wX2luaXRfY2coc3RydWN0IGFtZGdw dV9kZXZpY2UgKmFkZXYpCiAKIHN0YXRpYyBpbnQgZ2Z4X3Y2XzBfcmxjX3Jlc3VtZShzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldikKIHsKLQl1MzIgaTsKKwl1aW50MzJfdCBpOwogCWNvbnN0IHN0 cnVjdCBybGNfZmlybXdhcmVfaGVhZGVyX3YxXzAgKmhkcjsKIAljb25zdCBfX2xlMzIgKmZ3X2Rh dGE7Ci0JdTMyIGZ3X3NpemU7CisJdWludDMyX3QgZndfc2l6ZTsKIAogCiAJaWYgKCFhZGV2LT5n ZngucmxjX2Z3KQpAQCAtMjUwOSw3ICsyNTA5LDcgQEAgc3RhdGljIGludCBnZnhfdjZfMF9ybGNf cmVzdW1lKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCiBzdGF0aWMgdm9pZCBnZnhfdjZf MF9lbmFibGVfY2djZyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgYm9vbCBlbmFibGUpCiB7 Ci0JdTMyIGRhdGEsIG9yaWcsIHRtcDsKKwl1aW50MzJfdCBkYXRhLCBvcmlnLCB0bXA7CiAKIAlv cmlnID0gZGF0YSA9IFJSRUczMihtbVJMQ19DR0NHX0NHTFNfQ1RSTCk7CiAKQEAgLTI1NDksNyAr MjU0OSw3IEBAIHN0YXRpYyB2b2lkIGdmeF92Nl8wX2VuYWJsZV9jZ2NnKHN0cnVjdCBhbWRncHVf ZGV2aWNlICphZGV2LCBib29sIGVuYWJsZSkKIHN0YXRpYyB2b2lkIGdmeF92Nl8wX2VuYWJsZV9t Z2NnKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCBib29sIGVuYWJsZSkKIHsKIAotCXUzMiBk YXRhLCBvcmlnLCB0bXAgPSAwOworCXVpbnQzMl90IGRhdGEsIG9yaWcsIHRtcCA9IDA7CiAKIAlp ZiAoZW5hYmxlICYmIChhZGV2LT5jZ19mbGFncyAmIEFNRF9DR19TVVBQT1JUX0dGWF9NR0NHKSkg ewogCQlvcmlnID0gZGF0YSA9IFJSRUczMihtbUNHVFNfU01fQ1RSTF9SRUcpOwpAQCAtMjYyOSw3 ICsyNjI5LDcgQEAgc3RhdGljIHZvaWQgZ2Z4X3Y2XzBfZW5hYmxlX3NjbGtfc2xvd2Rvd25fb25f cGQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAKIHN0YXRpYyB2b2lkIGdmeF92Nl8wX2Vu YWJsZV9jcF9wZyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgYm9vbCBlbmFibGUpCiB7Ci0J dTMyIGRhdGEsIG9yaWc7CisJdWludDMyX3QgZGF0YSwgb3JpZzsKIAogCW9yaWcgPSBkYXRhID0g UlJFRzMyKG1tUkxDX1BHX0NOVEwpOwogCWlmIChlbmFibGUgJiYgKGFkZXYtPnBnX2ZsYWdzICYg QU1EX1BHX1NVUFBPUlRfQ1ApKQpAQCAtMjY0NywxMCArMjY0NywxMCBAQCBzdGF0aWMgdm9pZCBn ZnhfdjZfMF9lbmFibGVfZ2RzX3BnKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCBib29sIGVu YWJsZSkKIHN0YXRpYyB2b2lkIGdmeF92Nl8wX2luaXRfY3BfcGdfdGFibGUoc3RydWN0IGFtZGdw dV9kZXZpY2UgKmFkZXYpCiB7CiAJY29uc3QgX19sZTMyICpmd19kYXRhOwotCXZvbGF0aWxlIHUz MiAqZHN0X3B0cjsKKwl2b2xhdGlsZSB1aW50MzJfdCAqZHN0X3B0cjsKIAlpbnQgbWUsIGksIG1h eF9tZSA9IDQ7Ci0JdTMyIGJvX29mZnNldCA9IDA7Ci0JdTMyIHRhYmxlX29mZnNldCwgdGFibGVf c2l6ZTsKKwl1aW50MzJfdCBib19vZmZzZXQgPSAwOworCXVpbnQzMl90IHRhYmxlX29mZnNldCwg dGFibGVfc2l6ZTsKIAogCWlmIChhZGV2LT5hc2ljX3R5cGUgPT0gQ0hJUF9LQVZFUkkpCiAJCW1h eF9tZSA9IDU7CkBAIC0yNzI2LDcgKzI3MjYsNyBAQCBzdGF0aWMgdm9pZCBnZnhfdjZfMF9lbmFi bGVfZ2Z4X2NncGcoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAKIHN0YXRpYyB2b2lkIGdm eF92Nl8wX2luaXRfYW9fY3VfbWFzayhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIHsKLQl1 MzIgdG1wOworCXVpbnQzMl90IHRtcDsKIAogCVdSRUczMihtbVJMQ19QR19BTFdBWVNfT05fQ1Vf TUFTSywgYWRldi0+Z2Z4LmN1X2luZm8uYW9fY3VfbWFzayk7CiAKQEAgLTI3MzksNyArMjczOSw3 IEBAIHN0YXRpYyB2b2lkIGdmeF92Nl8wX2luaXRfYW9fY3VfbWFzayhzdHJ1Y3QgYW1kZ3B1X2Rl dmljZSAqYWRldikKIHN0YXRpYyB2b2lkIGdmeF92Nl8wX2VuYWJsZV9nZnhfc3RhdGljX21ncGco c3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJCQkJCSAgICBib29sIGVuYWJsZSkKIHsKLQl1 MzIgZGF0YSwgb3JpZzsKKwl1aW50MzJfdCBkYXRhLCBvcmlnOwogCiAJb3JpZyA9IGRhdGEgPSBS UkVHMzIobW1STENfUEdfQ05UTCk7CiAJaWYgKGVuYWJsZSAmJiAoYWRldi0+cGdfZmxhZ3MgJiBB TURfUEdfU1VQUE9SVF9HRlhfU01HKSkKQEAgLTI3NTMsNyArMjc1Myw3IEBAIHN0YXRpYyB2b2lk IGdmeF92Nl8wX2VuYWJsZV9nZnhfc3RhdGljX21ncGcoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFk ZXYsCiBzdGF0aWMgdm9pZCBnZnhfdjZfMF9lbmFibGVfZ2Z4X2R5bmFtaWNfbWdwZyhzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldiwKIAkJCQkJICAgICBib29sIGVuYWJsZSkKIHsKLQl1MzIgZGF0 YSwgb3JpZzsKKwl1aW50MzJfdCBkYXRhLCBvcmlnOwogCiAJb3JpZyA9IGRhdGEgPSBSUkVHMzIo bW1STENfUEdfQ05UTCk7CiAJaWYgKGVuYWJsZSAmJiAoYWRldi0+cGdfZmxhZ3MgJiBBTURfUEdf U1VQUE9SVF9HRlhfRE1HKSkKQEAgLTI3NjYsNyArMjc2Niw3IEBAIHN0YXRpYyB2b2lkIGdmeF92 Nl8wX2VuYWJsZV9nZnhfZHluYW1pY19tZ3BnKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAog CiBzdGF0aWMgdm9pZCBnZnhfdjZfMF9pbml0X2dmeF9jZ3BnKHN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2KQogewotCXUzMiB0bXA7CisJdWludDMyX3QgdG1wOwogCiAJV1JFRzMyKG1tUkxDX1NB VkVfQU5EX1JFU1RPUkVfQkFTRSwgYWRldi0+Z2Z4LnJsYy5zYXZlX3Jlc3RvcmVfZ3B1X2FkZHIg Pj4gOCk7CiAJV1JFRzMyX0ZJRUxEKFJMQ19QR19DTlRMLCBHRlhfUE9XRVJfR0FUSU5HX1NSQywg MSk7CkBAIC0yNzg2LDkgKzI3ODYsOSBAQCBzdGF0aWMgdm9pZCBnZnhfdjZfMF91cGRhdGVfZ2Z4 X3BnKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCBib29sIGVuYWJsZSkKIAlnZnhfdjZfMF9l bmFibGVfZ2Z4X2R5bmFtaWNfbWdwZyhhZGV2LCBlbmFibGUpOwogfQogCi1zdGF0aWMgdTMyIGdm eF92Nl8wX2dldF9jc2Jfc2l6ZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKK3N0YXRpYyB1 aW50MzJfdCBnZnhfdjZfMF9nZXRfY3NiX3NpemUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYp CiB7Ci0JdTMyIGNvdW50ID0gMDsKKwl1aW50MzJfdCBjb3VudCA9IDA7CiAJY29uc3Qgc3RydWN0 IGNzX3NlY3Rpb25fZGVmICpzZWN0ID0gTlVMTDsKIAljb25zdCBzdHJ1Y3QgY3NfZXh0ZW50X2Rl ZiAqZXh0ID0gTlVMTDsKIApAQCAtMjgxOSw5ICsyODE5LDkgQEAgc3RhdGljIHUzMiBnZnhfdjZf MF9nZXRfY3NiX3NpemUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB9CiAKIHN0YXRpYyB2 b2lkIGdmeF92Nl8wX2dldF9jc2JfYnVmZmVyKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAot CQkJCSAgICB2b2xhdGlsZSB1MzIgKmJ1ZmZlcikKKwkJCQkgICAgdm9sYXRpbGUgdWludDMyX3Qg KmJ1ZmZlcikKIHsKLQl1MzIgY291bnQgPSAwLCBpOworCXVpbnQzMl90IGNvdW50ID0gMCwgaTsK IAljb25zdCBzdHJ1Y3QgY3Nfc2VjdGlvbl9kZWYgKnNlY3QgPSBOVUxMOwogCWNvbnN0IHN0cnVj dCBjc19leHRlbnRfZGVmICpleHQgPSBOVUxMOwogCkBAIC0zMTgxLDcgKzMxODEsNyBAQCBzdGF0 aWMgaW50IGdmeF92Nl8wX3NvZnRfcmVzZXQodm9pZCAqaGFuZGxlKQogc3RhdGljIHZvaWQgZ2Z4 X3Y2XzBfc2V0X2dmeF9lb3BfaW50ZXJydXB0X3N0YXRlKHN0cnVjdCBhbWRncHVfZGV2aWNlICph ZGV2LAogCQkJCQkJIGVudW0gYW1kZ3B1X2ludGVycnVwdF9zdGF0ZSBzdGF0ZSkKIHsKLQl1MzIg Y3BfaW50X2NudGw7CisJdWludDMyX3QgY3BfaW50X2NudGw7CiAKIAlzd2l0Y2ggKHN0YXRlKSB7 CiAJY2FzZSBBTURHUFVfSVJRX1NUQVRFX0RJU0FCTEU6CkBAIC0zMjAzLDcgKzMyMDMsNyBAQCBz dGF0aWMgdm9pZCBnZnhfdjZfMF9zZXRfY29tcHV0ZV9lb3BfaW50ZXJydXB0X3N0YXRlKHN0cnVj dCBhbWRncHVfZGV2aWNlICphZGV2LAogCQkJCQkJICAgICBpbnQgcmluZywKIAkJCQkJCSAgICAg ZW51bSBhbWRncHVfaW50ZXJydXB0X3N0YXRlIHN0YXRlKQogewotCXUzMiBjcF9pbnRfY250bDsK Kwl1aW50MzJfdCBjcF9pbnRfY250bDsKIAlzd2l0Y2ggKHN0YXRlKXsKIAljYXNlIEFNREdQVV9J UlFfU1RBVEVfRElTQUJMRToKIAkJaWYgKHJpbmcgPT0gMCkgewpAQCAtMzI0NCw3ICszMjQ0LDcg QEAgc3RhdGljIGludCBnZnhfdjZfMF9zZXRfcHJpdl9yZWdfZmF1bHRfc3RhdGUoc3RydWN0IGFt ZGdwdV9kZXZpY2UgKmFkZXYsCiAJCQkJCSAgICAgdW5zaWduZWQgdHlwZSwKIAkJCQkJICAgICBl bnVtIGFtZGdwdV9pbnRlcnJ1cHRfc3RhdGUgc3RhdGUpCiB7Ci0JdTMyIGNwX2ludF9jbnRsOwor CXVpbnQzMl90IGNwX2ludF9jbnRsOwogCiAJc3dpdGNoIChzdGF0ZSkgewogCWNhc2UgQU1ER1BV X0lSUV9TVEFURV9ESVNBQkxFOgpAQCAtMzI2OSw3ICszMjY5LDcgQEAgc3RhdGljIGludCBnZnhf djZfMF9zZXRfcHJpdl9pbnN0X2ZhdWx0X3N0YXRlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2 LAogCQkJCQkgICAgICB1bnNpZ25lZCB0eXBlLAogCQkJCQkgICAgICBlbnVtIGFtZGdwdV9pbnRl cnJ1cHRfc3RhdGUgc3RhdGUpCiB7Ci0JdTMyIGNwX2ludF9jbnRsOworCXVpbnQzMl90IGNwX2lu dF9jbnRsOwogCiAJc3dpdGNoIChzdGF0ZSkgewogCWNhc2UgQU1ER1BVX0lSUV9TVEFURV9ESVNB QkxFOgpAQCAtMzUwMywxMCArMzUwMywxMCBAQCBzdGF0aWMgdm9pZCBnZnhfdjZfMF9zZXRfaXJx X2Z1bmNzKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogc3RhdGljIHZvaWQgZ2Z4X3Y2XzBf Z2V0X2N1X2luZm8oc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB7CiAJaW50IGksIGosIGss IGNvdW50ZXIsIGFjdGl2ZV9jdV9udW1iZXIgPSAwOwotCXUzMiBtYXNrLCBiaXRtYXAsIGFvX2Jp dG1hcCwgYW9fY3VfbWFzayA9IDA7CisJdWludDMyX3QgbWFzaywgYml0bWFwLCBhb19iaXRtYXAs IGFvX2N1X21hc2sgPSAwOwogCXN0cnVjdCBhbWRncHVfY3VfaW5mbyAqY3VfaW5mbyA9ICZhZGV2 LT5nZnguY3VfaW5mbzsKIAl1bnNpZ25lZCBkaXNhYmxlX21hc2tzWzQgKiAyXTsKLQl1MzIgYW9f Y3VfbnVtOworCXVpbnQzMl90IGFvX2N1X251bTsKIAogCWlmIChhZGV2LT5mbGFncyAmIEFNRF9J U19BUFUpCiAJCWFvX2N1X251bSA9IDI7Ci0tIAoyLjEyLjAKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vYW1kLWdmeAo=