From: Rex Zhu Subject: [PATCH 3/4] drm/amd/powerplay: refine pp code for raven Date: Fri, 25 Aug 2017 17:27:27 +0800 Message-ID: <1503653248-13906-3-git-send-email-Rex.Zhu@amd.com> References: <1503653248-13906-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: <1503653248-13906-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 ZGVsZXRlIHVzZWxlc3MgY29kZS4KClNpZ25lZC1vZmYtYnk6IFJleCBaaHUgPFJleC5aaHVAYW1k LmNvbT4KCkNvbmZsaWN0czoKCWRyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L2h3bWdyL3J2 X2h3bWdyLmMKCkNoYW5nZS1JZDogSTQwMzQ1Nzc2MmVlNGNhZGIzNTdmNjllZDA4NDZhZGZhNTVh OWRiZWEKLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9od21nci9ydl9od21nci5j IHwgMTExICsrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzNyBpbnNl cnRpb25zKCspLCA3NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v YW1kL3Bvd2VycGxheS9od21nci9ydl9od21nci5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dl cnBsYXkvaHdtZ3IvcnZfaHdtZ3IuYwppbmRleCA0YzdmNDMwLi41YmJlZmRkIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9od21nci9ydl9od21nci5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L2h3bWdyL3J2X2h3bWdyLmMKQEAgLTM4LDE5ICsz OCwzOSBAQAogI2luY2x1ZGUgInBwX3NvYzE1LmgiCiAKICNkZWZpbmUgUkFWRU5fTUFYX0RFRVBT TEVFUF9ESVZJREVSX0lEICAgICA1Ci0jZGVmaW5lIFJBVkVOX01JTklNVU1fRU5HSU5FX0NMT0NL ICAgICAgICAgODAwICAgLy84TWh6LCB0aGUgbG93IGJvdW5kYXJ5IG9mIGVuZ2luZSBjbG9jayBh bGxvd2VkIG9uIHRoaXMgY2hpcAorI2RlZmluZSBSQVZFTl9NSU5JTVVNX0VOR0lORV9DTE9DSyAg ICAgICAgIDgwMCAgIC8qIDhNaHosIHRoZSBsb3cgYm91bmRhcnkgb2YgZW5naW5lIGNsb2NrIGFs bG93ZWQgb24gdGhpcyBjaGlwICovCiAjZGVmaW5lIFNDTEtfTUlOX0RJVl9JTlRWX1NISUZUICAg ICAgICAgMTIKLSNkZWZpbmUgUkFWRU5fRElTUENMS19CWVBBU1NfVEhSRVNIT0xEICAgICAxMDAw MCAvLzEwMG1oegorI2RlZmluZSBSQVZFTl9ESVNQQ0xLX0JZUEFTU19USFJFU0hPTEQgICAgIDEw MDAwIC8qIDEwME1oeiAqLwogI2RlZmluZSBTTUNfUkFNX0VORCAgICAgICAgICAgICAgICAgICAg IDB4NDAwMDAKIAogc3RhdGljIGNvbnN0IHVuc2lnbmVkIGxvbmcgUGh3UmF2ZW5fTWFnaWMgPSAo dW5zaWduZWQgbG9uZykgUEhNX1J2X01hZ2ljOworCisKIGludCBydl9kaXNwbGF5X2Nsb2NrX3Zv bHRhZ2VfcmVxdWVzdChzdHJ1Y3QgcHBfaHdtZ3IgKmh3bWdyLAogCQlzdHJ1Y3QgcHBfZGlzcGxh eV9jbG9ja19yZXF1ZXN0ICpjbG9ja19yZXEpOwogCiBzdHJ1Y3QgcGhtX3ZxX2J1ZGdldGluZ19y ZWNvcmQgcnZfdnF0YWJsZVtdID0gewotCS8qIF9UQkQKLQkgKiBDVXMsIFNTUCBsb3csIFNTUCBI aWdoLCBNaW4gU2NsayBMb3csIE1pbiBTY2xrLCBIaWdoLCBBV0Qvbm9uLUFXRCwgRENMSywgRUNM SywgU3VzdGFpbmFibGUgU2NsaywgU3VzdGFpbmFibGUgQ1VzICovCi0JeyA4LCAwLCA0NSwgMCwg MCwgVlFfRGlzcGxheUNvbmZpZ19Ob25lQVdELCA4MDAwMCwgMTIwMDAwLCA0LCAwIH0sCisvKiBD VXMsIFNTUCBsb3csIFNTUCBIaWdoLCBEaXNwbGF5IENvbmZpZ3VyYXRpb24sIEFXRC9ub24tQVdE LAorICogU3VzdGFpbmFibGUgR0ZYQ0xLLCBTdXN0YWluYWJsZSBGQ0xLLCBTdXN0YWluYWJsZSBD VXMsCisgKiB1bnVzZWQsIHVudXNlZCwgdW51c2VkCisgKi8KKwl7IDExLCAzMCwgNjAsIFZRX0Rp c3BsYXlDb25maWdfTm9uZUFXRCwgIDgwMDAwLCAxNjAwMDAsIDExLCAwLCAwLCAwIH0sCisJeyAx MSwgMzAsIDYwLCBWUV9EaXNwbGF5Q29uZmlnX0FXRCwgICAgICA4MDAwMCwgMTYwMDAwLCAxMSwg MCwgMCwgMCB9LAorCisJeyAgOCwgMzAsIDYwLCBWUV9EaXNwbGF5Q29uZmlnX05vbmVBV0QsIDEw MDAwMCwgMTYwMDAwLCAgOCwgMCwgMCwgMCB9LAorCXsgIDgsIDMwLCA2MCwgVlFfRGlzcGxheUNv bmZpZ19BV0QsICAgICAxMDAwMDAsIDE2MDAwMCwgIDgsIDAsIDAsIDAgfSwKKworCXsgMTAsIDEy LCAzMCwgVlFfRGlzcGxheUNvbmZpZ19Ob25lQVdELCAgNDAwMDAsIDEyMDAwMCwgMTAsIDAsIDAs IDAgfSwKKwl7IDEwLCAxMiwgMzAsIFZRX0Rpc3BsYXlDb25maWdfQVdELCAgICAgIDQwMDAwLCAx MjAwMDAsIDEwLCAwLCAwLCAwIH0sCisKKwl7ICA4LCAxMiwgMzAsIFZRX0Rpc3BsYXlDb25maWdf Tm9uZUFXRCwgIDQ1MDAwLCAxMjAwMDAsICA4LCAwLCAwLCAwIH0sCisJeyAgOCwgMTIsIDMwLCBW UV9EaXNwbGF5Q29uZmlnX0FXRCwgICAgICA0NTAwMCwgMTIwMDAwLCAgOCwgMCwgMCwgMCB9LAor CisJeyAgNiwgMTIsIDMwLCBWUV9EaXNwbGF5Q29uZmlnX05vbmVBV0QsICA0NTAwMCwgMTIwMDAw LCAgNiwgMCwgMCwgMCB9LAorCXsgIDYsIDEyLCAzMCwgVlFfRGlzcGxheUNvbmZpZ19BV0QsICAg ICAgNDUwMDAsIDEyMDAwMCwgIDYsIDAsIDAsIDAgfSwKKworCXsgIDMsIDEyLCAzMCwgVlFfRGlz cGxheUNvbmZpZ19Ob25lQVdELCAgNDUwMDAsIDEyMDAwMCwgIDMsIDAsIDAsIDAgfSwKKwl7ICAz LCAxMiwgMzAsIFZRX0Rpc3BsYXlDb25maWdfQVdELCAgICAgIDQ1MDAwLCAxMjAwMDAsICAzLCAw LCAwLCAwIH0sCiB9OwogCiBzdGF0aWMgc3RydWN0IHJ2X3Bvd2VyX3N0YXRlICpjYXN0X3J2X3Bz KHN0cnVjdCBwcF9od19wb3dlcl9zdGF0ZSAqaHdfcHMpCkBAIC0xMDksNjIgKzEyOSwyMSBAQCBz dGF0aWMgaW50IHJ2X2luaXRfdnFfYnVkZ2V0X3RhYmxlKHN0cnVjdCBwcF9od21nciAqaHdtZ3Ip CiBzdGF0aWMgaW50IHJ2X2luaXRpYWxpemVfZHBtX2RlZmF1bHRzKHN0cnVjdCBwcF9od21nciAq aHdtZ3IpCiB7CiAJc3RydWN0IHJ2X2h3bWdyICpydl9od21nciA9IChzdHJ1Y3QgcnZfaHdtZ3Ig KikoaHdtZ3ItPmJhY2tlbmQpOwotCXN0cnVjdCBjZ3Nfc3lzdGVtX2luZm8gc3lzX2luZm8gPSB7 MH07Ci0JaW50IHJlc3VsdDsKIAotCXJ2X2h3bWdyLT5kZGlfcG93ZXJfZ2F0aW5nX2Rpc2FibGVk ID0gMDsKLQlydl9od21nci0+YmFwbV9lbmFibGVkID0gMTsKIAlydl9od21nci0+ZGNlX3Nsb3df c2Nsa190aHJlc2hvbGQgPSAzMDAwMDsKLQlydl9od21nci0+ZGlzYWJsZV9kcml2ZXJfdGhlcm1h bF9wb2xpY3kgPSAxOwogCXJ2X2h3bWdyLT50aGVybWFsX2F1dG9fdGhyb3R0bGluZ190cmVzaG9s ZCA9IDA7CiAJcnZfaHdtZ3ItPmlzX25iX2RwbV9lbmFibGVkID0gMTsKIAlydl9od21nci0+ZHBt X2ZsYWdzID0gMTsKLQlydl9od21nci0+ZGlzYWJsZV9zbXVfYWNwX3MzX2hhbmRzaGFrZSA9IDE7 Ci0JcnZfaHdtZ3ItPmRpc2FibGVfbm90aWZ5X3NtdV92cHVfcmVjb3ZlcnkgPSAwOwogCXJ2X2h3 bWdyLT5nZnhfb2ZmX2NvbnRyb2xlZF9ieV9kcml2ZXIgPSBmYWxzZTsKIAogCXBobV9jYXBfdW5z ZXQoaHdtZ3ItPnBsYXRmb3JtX2Rlc2NyaXB0b3IucGxhdGZvcm1DYXBzLAotCQkJCQlQSE1fUGxh dGZvcm1DYXBzX0R5bmFtaWNNM0FyYml0ZXIpOwotCi0JcGhtX2NhcF91bnNldChod21nci0+cGxh dGZvcm1fZGVzY3JpcHRvci5wbGF0Zm9ybUNhcHMsCi0JCQkJCVBITV9QbGF0Zm9ybUNhcHNfVVZE UG93ZXJHYXRpbmcpOwotCi0JcGhtX2NhcF91bnNldChod21nci0+cGxhdGZvcm1fZGVzY3JpcHRv ci5wbGF0Zm9ybUNhcHMsCi0JCQkJCVBITV9QbGF0Zm9ybUNhcHNfVVZERHluYW1pY1Bvd2VyR2F0 aW5nKTsKLQotCXBobV9jYXBfdW5zZXQoaHdtZ3ItPnBsYXRmb3JtX2Rlc2NyaXB0b3IucGxhdGZv cm1DYXBzLAotCQkJCQlQSE1fUGxhdGZvcm1DYXBzX1ZDRVBvd2VyR2F0aW5nKTsKLQotCXBobV9j YXBfdW5zZXQoaHdtZ3ItPnBsYXRmb3JtX2Rlc2NyaXB0b3IucGxhdGZvcm1DYXBzLAotCQkJCQlQ SE1fUGxhdGZvcm1DYXBzX1NhbXVQb3dlckdhdGluZyk7Ci0KLQlwaG1fY2FwX3Vuc2V0KGh3bWdy LT5wbGF0Zm9ybV9kZXNjcmlwdG9yLnBsYXRmb3JtQ2FwcywKLQkJCQkJUEhNX1BsYXRmb3JtQ2Fw c19BQ1ApOwotCi0JcGhtX2NhcF91bnNldChod21nci0+cGxhdGZvcm1fZGVzY3JpcHRvci5wbGF0 Zm9ybUNhcHMsCiAJCQkJCVBITV9QbGF0Zm9ybUNhcHNfU2Nsa0RlZXBTbGVlcCk7CiAKIAlwaG1f Y2FwX3Vuc2V0KGh3bWdyLT5wbGF0Zm9ybV9kZXNjcmlwdG9yLnBsYXRmb3JtQ2FwcywKLQkJCQlQ SE1fUGxhdGZvcm1DYXBzX0dGWER5bmFtaWNNR1Bvd2VyR2F0aW5nKTsKLQotCXBobV9jYXBfdW5z ZXQoaHdtZ3ItPnBsYXRmb3JtX2Rlc2NyaXB0b3IucGxhdGZvcm1DYXBzLAogCQkJCVBITV9QbGF0 Zm9ybUNhcHNfU2Nsa1Rocm90dGxlTG93Tm90aWZpY2F0aW9uKTsKIAotCXBobV9jYXBfdW5zZXQo aHdtZ3ItPnBsYXRmb3JtX2Rlc2NyaXB0b3IucGxhdGZvcm1DYXBzLAotCQkJCVBITV9QbGF0Zm9y bUNhcHNfRGlzYWJsZVZvbHRhZ2VJc2xhbmQpOwotCiAJcGhtX2NhcF9zZXQoaHdtZ3ItPnBsYXRm b3JtX2Rlc2NyaXB0b3IucGxhdGZvcm1DYXBzLAotCQkJCQlQSE1fUGxhdGZvcm1DYXBzX0R5bmFt aWNVVkRTdGF0ZSk7Ci0KLQlzeXNfaW5mby5zaXplID0gc2l6ZW9mKHN0cnVjdCBjZ3Nfc3lzdGVt X2luZm8pOwotCXN5c19pbmZvLmluZm9faWQgPSBDR1NfU1lTVEVNX0lORk9fUEdfRkxBR1M7Ci0J cmVzdWx0ID0gY2dzX3F1ZXJ5X3N5c3RlbV9pbmZvKGh3bWdyLT5kZXZpY2UsICZzeXNfaW5mbyk7 Ci0JaWYgKCFyZXN1bHQpIHsKLQkJaWYgKHN5c19pbmZvLnZhbHVlICYgQU1EX1BHX1NVUFBPUlRf R0ZYX0RNRykKLQkJCXBobV9jYXBfc2V0KGh3bWdyLT5wbGF0Zm9ybV9kZXNjcmlwdG9yLnBsYXRm b3JtQ2FwcywKLQkJCQkgICAgICBQSE1fUGxhdGZvcm1DYXBzX0dGWER5bmFtaWNNR1Bvd2VyR2F0 aW5nKTsKLQl9Ci0KKwkJCQlQSE1fUGxhdGZvcm1DYXBzX1Bvd2VyUGxheVN1cHBvcnQpOwogCXJl dHVybiAwOwogfQogCkBAIC0yNTYsMTQgKzIzNSw2IEBAIHN0YXRpYyBpbnQgcnZfdGZfc2V0X2Ns b2NrX2xpbWl0KHN0cnVjdCBwcF9od21nciAqaHdtZ3IsIHZvaWQgKmlucHV0LAogCQlzbXVtX3Nl bmRfbXNnX3RvX3NtY193aXRoX3BhcmFtZXRlcihod21nci0+c211bWdyLAogCQkJCQlQUFNNQ19N U0dfU2V0TWluRGVlcFNsZWVwRGNlZmNsaywKIAkJCQkJY2xvY2tzLmRjZWZDbG9ja0luU1IgLyAx MDApOwotCS8qCi0JaWYoIXJ2X2RhdGEtPmlzcF90aWxlQV9wb3dlcl9nYXRlZCB8fCAhcnZfZGF0 YS0+aXNwX3RpbGVCX3Bvd2VyX2dhdGVkKSB7Ci0JCWlmICgoaHdtZ3ItPmlzcEFyYml0ZXIuaWNs ayAhPSAwKSAmJiAocnZfZGF0YS0+SVNQQWN0dWFsSGFyZE1pbkZyZXEgIT0gKGh3bWdyLT5pc3BB cmJpdGVyLmljbGsgLyAxMDApICkpIHsKLQkJCXNtdW1fc2VuZF9tc2dfdG9fc21jX3dpdGhfcGFy YW1ldGVyKGh3bWdyLT5zbXVtZ3IsCi0JCQkJCVBQU01DX01TR19TZXRIYXJkTWluSXNwY2xrQnlG cmVxLCBod21nci0+aXNwQXJiaXRlci5pY2xrIC8gMTAwKTsKLQkJCXJ2X3JlYWRfYXJnX2Zyb21f c21jKGh3bWdyLT5zbXVtZ3IsICZydl9kYXRhLT5JU1BBY3R1YWxIYXJkTWluRnJlcSksCi0JCX0K LQl9ICovCiAKIAlpZigoaHdtZ3ItPmdmeF9hcmJpdGVyLnNjbGtfaGFyZF9taW4gIT0gMCkgJiYK IAkJKChod21nci0+Z2Z4X2FyYml0ZXIuc2Nsa19oYXJkX21pbiAvIDEwMCkgIT0gcnZfZGF0YS0+ c29jX2FjdHVhbF9oYXJkX21pbl9mcmVxKSkgewpAQCAtMjcxLDcgKzI0Miw3IEBAIHN0YXRpYyBp bnQgcnZfdGZfc2V0X2Nsb2NrX2xpbWl0KHN0cnVjdCBwcF9od21nciAqaHdtZ3IsIHZvaWQgKmlu cHV0LAogCQkJCQlQUFNNQ19NU0dfU2V0SGFyZE1pblNvY2Nsa0J5RnJlcSwKIAkJCQkJaHdtZ3It PmdmeF9hcmJpdGVyLnNjbGtfaGFyZF9taW4gLyAxMDApOwogCQkJcnZfcmVhZF9hcmdfZnJvbV9z bWMoaHdtZ3ItPnNtdW1nciwgJnJ2X2RhdGEtPnNvY19hY3R1YWxfaGFyZF9taW5fZnJlcSk7Ci0J fQorCQl9CiAKIAlpZiAoKGh3bWdyLT5nZnhfYXJiaXRlci5nZnhjbGsgIT0gMCkgJiYKIAkJKHJ2 X2RhdGEtPmdmeF9hY3R1YWxfc29mdF9taW5fZnJlcSAhPSAoaHdtZ3ItPmdmeF9hcmJpdGVyLmdm eGNsaykpKSB7CkBAIC0yOTIsNiArMjYzLDcgQEAgc3RhdGljIGludCBydl90Zl9zZXRfY2xvY2tf bGltaXQoc3RydWN0IHBwX2h3bWdyICpod21nciwgdm9pZCAqaW5wdXQsCiAJcmV0dXJuIDA7CiB9 CiAKKwogc3RhdGljIGludCBydl90Zl9zZXRfbnVtX2FjdGl2ZV9kaXNwbGF5KHN0cnVjdCBwcF9o d21nciAqaHdtZ3IsIHZvaWQgKmlucHV0LAogCQkJCXZvaWQgKm91dHB1dCwgdm9pZCAqc3RvcmFn ZSwgaW50IHJlc3VsdCkKIHsKQEAgLTMwNCw2ICsyNzYsNyBAQCBzdGF0aWMgaW50IHJ2X3RmX3Nl dF9udW1fYWN0aXZlX2Rpc3BsYXkoc3RydWN0IHBwX2h3bWdyICpod21nciwgdm9pZCAqaW5wdXQs CiAJc211bV9zZW5kX21zZ190b19zbWNfd2l0aF9wYXJhbWV0ZXIoaHdtZ3ItPnNtdW1nciwKIAkJ CQlQUFNNQ19NU0dfU2V0RGlzcGxheUNvdW50LAogCQkJCW51bV9vZl9hY3RpdmVfZGlzcGxheXMp OworCiAJcmV0dXJuIDA7CiB9CiAKQEAgLTU1NCw5ICs1MjcsNiBAQCBzdGF0aWMgaW50IHJ2X2h3 bWdyX2JhY2tlbmRfaW5pdChzdHJ1Y3QgcHBfaHdtZ3IgKmh3bWdyKQogCQlyZXR1cm4gcmVzdWx0 OwogCX0KIAotCXBobV9jYXBfc2V0KGh3bWdyLT5wbGF0Zm9ybV9kZXNjcmlwdG9yLnBsYXRmb3Jt Q2FwcywKLSAgICAgICAgICAgICAgICBQSE1fUGxhdGZvcm1DYXBzX1Bvd2VyUGxheVN1cHBvcnQp OwotCiAJcnZfcG9wdWxhdGVfY2xvY2tfdGFibGUoaHdtZ3IpOwogCiAJcmVzdWx0ID0gcnZfZ2V0 X3N5c3RlbV9pbmZvX2RhdGEoaHdtZ3IpOwpAQCAtNzAyLDE4ICs2NzIsOSBAQCBzdGF0aWMgaW50 IHJ2X2RwbV9nZXRfcHBfdGFibGVfZW50cnlfY2FsbGJhY2soCiB7CiAJc3RydWN0IHJ2X3Bvd2Vy X3N0YXRlICpydl9wcyA9IGNhc3RfcnZfcHMoaHdfcHMpOwogCi0JY29uc3QgQVRPTV9QUExJQl9D Wl9DTE9DS19JTkZPICpydl9jbG9ja19pbmZvID0gY2xvY2tfaW5mbzsKLQotCXN0cnVjdCBwaG1f Y2xvY2tfdm9sdGFnZV9kZXBlbmRlbmN5X3RhYmxlICp0YWJsZSA9Ci0JCQkJICAgIGh3bWdyLT5k eW5fc3RhdGUudmRkY19kZXBlbmRlbmN5X29uX3NjbGs7Ci0JdWludDhfdCBjbG9ja19pbmZvX2lu ZGV4ID0gcnZfY2xvY2tfaW5mby0+aW5kZXg7Ci0KLQlpZiAoY2xvY2tfaW5mb19pbmRleCA+ICh1 aW50OF90KShod21nci0+cGxhdGZvcm1fZGVzY3JpcHRvci5oYXJkd2FyZUFjdGl2aXR5UGVyZm9y bWFuY2VMZXZlbHMgLSAxKSkKLQkJY2xvY2tfaW5mb19pbmRleCA9ICh1aW50OF90KShod21nci0+ cGxhdGZvcm1fZGVzY3JpcHRvci5oYXJkd2FyZUFjdGl2aXR5UGVyZm9ybWFuY2VMZXZlbHMgLSAx KTsKLQotCXJ2X3BzLT5sZXZlbHNbaW5kZXhdLmVuZ2luZV9jbG9jayA9IHRhYmxlLT5lbnRyaWVz W2Nsb2NrX2luZm9faW5kZXhdLmNsazsKLQlydl9wcy0+bGV2ZWxzW2luZGV4XS52ZGRjX2luZGV4 ID0gKHVpbnQ4X3QpdGFibGUtPmVudHJpZXNbY2xvY2tfaW5mb19pbmRleF0udjsKKwlydl9wcy0+ bGV2ZWxzW2luZGV4XS5lbmdpbmVfY2xvY2sgPSAwOwogCisJcnZfcHMtPmxldmVsc1tpbmRleF0u dmRkY19pbmRleCA9IDA7CiAJcnZfcHMtPmxldmVsID0gaW5kZXggKyAxOwogCiAJaWYgKHBobV9j YXBfZW5hYmxlZChod21nci0+cGxhdGZvcm1fZGVzY3JpcHRvci5wbGF0Zm9ybUNhcHMsIFBITV9Q bGF0Zm9ybUNhcHNfU2Nsa0RlZXBTbGVlcCkpIHsKQEAgLTgwNSwxMiArNzY2LDEyIEBAIHN0YXRp YyBpbnQgcnZfZ2V0X3BlcmZvcm1hbmNlX2xldmVsKHN0cnVjdCBwcF9od21nciAqaHdtZ3IsIGNv bnN0IHN0cnVjdCBwcF9od19wCiAJcHMgPSBjYXN0X2NvbnN0X3J2X3BzKHN0YXRlKTsKIAogCWxl dmVsX2luZGV4ID0gaW5kZXggPiBwcy0+bGV2ZWwgLSAxID8gcHMtPmxldmVsIC0gMSA6IGluZGV4 OwotCWxldmVsLT5jb3JlQ2xvY2sgPSBwcy0+bGV2ZWxzW2xldmVsX2luZGV4XS5lbmdpbmVfY2xv Y2s7CisJbGV2ZWwtPmNvcmVDbG9jayA9IDMwMDAwOwogCiAJaWYgKGRlc2lnbmF0aW9uID09IFBI TV9QZXJmb3JtYW5jZUxldmVsRGVzaWduYXRpb25fUG93ZXJDb250YWlubWVudCkgewogCQlmb3Ig KGkgPSAxOyBpIDwgcHMtPmxldmVsOyBpKyspIHsKIAkJCWlmIChwcy0+bGV2ZWxzW2ldLmVuZ2lu ZV9jbG9jayA+IGRhdGEtPmRjZV9zbG93X3NjbGtfdGhyZXNob2xkKSB7Ci0JCQkJbGV2ZWwtPmNv cmVDbG9jayA9IHBzLT5sZXZlbHNbaV0uZW5naW5lX2Nsb2NrOworCQkJCWxldmVsLT5jb3JlQ2xv Y2sgPSAzMDAwMDsKIAkJCQlicmVhazsKIAkJCX0KIAkJfQpAQCAtODIwLDggKzc4MSw5IEBAIHN0 YXRpYyBpbnQgcnZfZ2V0X3BlcmZvcm1hbmNlX2xldmVsKHN0cnVjdCBwcF9od21nciAqaHdtZ3Is IGNvbnN0IHN0cnVjdCBwcF9od19wCiAJCXZvbF9kZXBfcmVjb3JkX2luZGV4ID0gZGF0YS0+Y2xv Y2tfdm9sX2luZm8udmRkX2RlcF9vbl9mY2xrLT5jb3VudCAtIDE7CiAJCWxldmVsLT5tZW1vcnlf Y2xvY2sgPQogCQkJZGF0YS0+Y2xvY2tfdm9sX2luZm8udmRkX2RlcF9vbl9mY2xrLT5lbnRyaWVz W3ZvbF9kZXBfcmVjb3JkX2luZGV4XS5jbGs7Ci0JfSBlbHNlCisJfSBlbHNlIHsKIAkJbGV2ZWwt Pm1lbW9yeV9jbG9jayA9IGRhdGEtPmNsb2NrX3ZvbF9pbmZvLnZkZF9kZXBfb25fZmNsay0+ZW50 cmllc1swXS5jbGs7CisJfQogCiAJbGV2ZWwtPm5vbkxvY2FsTWVtb3J5RnJlcSA9IDA7CiAJbGV2 ZWwtPm5vbkxvY2FsTWVtb3J5V2lkdGggPSAwOwpAQCAtOTkyLDcgKzk1NCw4IEBAIGludCBydl9k aXNwbGF5X2Nsb2NrX3ZvbHRhZ2VfcmVxdWVzdChzdHJ1Y3QgcHBfaHdtZ3IgKmh3bWdyLAogCiBz dGF0aWMgaW50IHJ2X2dldF9tYXhfaGlnaF9jbG9ja3Moc3RydWN0IHBwX2h3bWdyICpod21nciwg c3RydWN0IGFtZF9wcF9zaW1wbGVfY2xvY2tfaW5mbyAqY2xvY2tzKQogewotCXJldHVybiAtRUlO VkFMOworCWNsb2Nrcy0+ZW5naW5lX21heF9jbG9jayA9IDgwMDAwOyAvKiBkcml2ZXIgY2FuJ3Qg Z2V0IGVuZ2luZSBjbG9jaywgdGVtcCBoYXJkIGNvZGUgdG8gODAwTUh6ICovCisJcmV0dXJuIDA7 CiB9CiAKIHN0YXRpYyBpbnQgcnZfdGhlcm1hbF9nZXRfdGVtcGVyYXR1cmUoc3RydWN0IHBwX2h3 bWdyICpod21ncikKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ft ZC1nZngK