From: Monk Liu Subject: [PATCH 3/3] drm/amdgpu: fix double ucode load by PSP Date: Wed, 31 Jul 2019 11:53:46 +0800 Message-ID: <1564545226-2633-3-git-send-email-Monk.Liu@amd.com> References: <1564545226-2633-1-git-send-email-Monk.Liu@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1564545226-2633-1-git-send-email-Monk.Liu-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: Monk Liu cHJldmlvdXNseSB0aGUgdWNvZGUgbG9hZGluZyBvZiBQU1Agd2FzIHJlcHJlYXRlZCwgb25lIGV4 ZWN1dGVkIGluCnBoYXNlXzEgaW5pdC9yZS1pbml0L3Jlc3VtZSBhbmQgdGhlIG90aGVyIGluIGZ3 X2xvYWRpbmcgcm91dGluZQoKQXZvaWQgdGhpcyBkb3VibGUgbG9hZGluZyBieSBjbGVhcmluZyBp cF9ibG9ja3Muc3RhdHVzLmh3IGluIHN1c3BlbmQgb3IgcmVzZXQKcHJpb3IgdG8gdGhlIEZXIGxv YWRpbmcgYW5kIGFueSBibG9jaydzIGh3X2luaXQvcmVzdW1lCgpTaWduZWQtb2ZmLWJ5OiBNb25r IExpdSA8TW9uay5MaXVAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfZGV2aWNlLmMgfCA3OSArKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0KIDEgZmls ZSBjaGFuZ2VkLCA0OSBpbnNlcnRpb25zKCspLCAzMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMKaW5kZXggNmNiMzU4Yy4uMjVlNzIxZCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2UuYwpAQCAtMTY3Mywy OSArMTY3MywzNSBAQCBzdGF0aWMgaW50IGFtZGdwdV9kZXZpY2VfZndfbG9hZGluZyhzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldikKIAogCWlmIChhZGV2LT5hc2ljX3R5cGUgPj0gQ0hJUF9WRUdB MTApIHsKIAkJZm9yIChpID0gMDsgaSA8IGFkZXYtPm51bV9pcF9ibG9ja3M7IGkrKykgewotCQkJ aWYgKGFkZXYtPmlwX2Jsb2Nrc1tpXS52ZXJzaW9uLT50eXBlID09IEFNRF9JUF9CTE9DS19UWVBF X1BTUCkgewotCQkJCWlmIChhZGV2LT5pbl9ncHVfcmVzZXQgfHwgYWRldi0+aW5fc3VzcGVuZCkg ewotCQkJCQlpZiAoYW1kZ3B1X3NyaW92X3ZmKGFkZXYpICYmIGFkZXYtPmluX2dwdV9yZXNldCkK LQkJCQkJCWJyZWFrOyAvKiBzcmlvdiBncHUgcmVzZXQsIHBzcCBuZWVkIHRvIGRvIGh3X2luaXQg YmVmb3JlIElIIGJlY2F1c2Ugb2YgaHcgbGltaXQgKi8KLQkJCQkJciA9IGFkZXYtPmlwX2Jsb2Nr c1tpXS52ZXJzaW9uLT5mdW5jcy0+cmVzdW1lKGFkZXYpOwotCQkJCQlpZiAocikgewotCQkJCQkJ RFJNX0VSUk9SKCJyZXN1bWUgb2YgSVAgYmxvY2sgPCVzPiBmYWlsZWQgJWRcbiIsCisJCQlpZiAo YWRldi0+aXBfYmxvY2tzW2ldLnZlcnNpb24tPnR5cGUgIT0gQU1EX0lQX0JMT0NLX1RZUEVfUFNQ KQorCQkJCWNvbnRpbnVlOworCisJCQkvKiBubyBuZWVkIHRvIGRvIHRoZSBmdyBsb2FkaW5nIGFn YWluIGlmIGFscmVhZHkgZG9uZSovCisJCQlpZiAoYWRldi0+aXBfYmxvY2tzW2ldLnN0YXR1cy5o dyA9PSB0cnVlKQorCQkJCWJyZWFrOworCisJCQlpZiAoYWRldi0+aW5fZ3B1X3Jlc2V0IHx8IGFk ZXYtPmluX3N1c3BlbmQpIHsKKwkJCQlyID0gYWRldi0+aXBfYmxvY2tzW2ldLnZlcnNpb24tPmZ1 bmNzLT5yZXN1bWUoYWRldik7CisJCQkJaWYgKHIpIHsKKwkJCQkJRFJNX0VSUk9SKCJyZXN1bWUg b2YgSVAgYmxvY2sgPCVzPiBmYWlsZWQgJWRcbiIsCiAJCQkJCQkJICBhZGV2LT5pcF9ibG9ja3Nb aV0udmVyc2lvbi0+ZnVuY3MtPm5hbWUsIHIpOwotCQkJCQkJcmV0dXJuIHI7Ci0JCQkJCX0KLQkJ CQl9IGVsc2UgewotCQkJCQlyID0gYWRldi0+aXBfYmxvY2tzW2ldLnZlcnNpb24tPmZ1bmNzLT5o d19pbml0KGFkZXYpOwotCQkJCQlpZiAocikgewotCQkJCQkJRFJNX0VSUk9SKCJod19pbml0IG9m IElQIGJsb2NrIDwlcz4gZmFpbGVkICVkXG4iLAotCQkJCQkJICBhZGV2LT5pcF9ibG9ja3NbaV0u dmVyc2lvbi0+ZnVuY3MtPm5hbWUsIHIpOwotCQkJCQkJcmV0dXJuIHI7Ci0JCQkJCX0KKwkJCQkJ cmV0dXJuIHI7CisJCQkJfQorCQkJfSBlbHNlIHsKKwkJCQlyID0gYWRldi0+aXBfYmxvY2tzW2ld LnZlcnNpb24tPmZ1bmNzLT5od19pbml0KGFkZXYpOworCQkJCWlmIChyKSB7CisJCQkJCURSTV9F UlJPUigiaHdfaW5pdCBvZiBJUCBibG9jayA8JXM+IGZhaWxlZCAlZFxuIiwKKwkJCQkJCQkgIGFk ZXYtPmlwX2Jsb2Nrc1tpXS52ZXJzaW9uLT5mdW5jcy0+bmFtZSwgcik7CisJCQkJCXJldHVybiBy OwogCQkJCX0KLQkJCQlhZGV2LT5pcF9ibG9ja3NbaV0uc3RhdHVzLmh3ID0gdHJ1ZTsKIAkJCX0K KworCQkJYWRldi0+aXBfYmxvY2tzW2ldLnN0YXR1cy5odyA9IHRydWU7CisJCQlicmVhazsKIAkJ fQorCX0gZWxzZSB7CisJCXIgPSBhbWRncHVfcG1fbG9hZF9zbXVfZmlybXdhcmUoYWRldiwgJnNt dV92ZXJzaW9uKTsKIAl9Ci0JciA9IGFtZGdwdV9wbV9sb2FkX3NtdV9maXJtd2FyZShhZGV2LCAm c211X3ZlcnNpb24pOwogCiAJcmV0dXJuIHI7CiB9CkBAIC0yMTI4LDYgKzIxMzQsNyBAQCBzdGF0 aWMgaW50IGFtZGdwdV9kZXZpY2VfaXBfc3VzcGVuZF9waGFzZTEoc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYpCiAJZm9yIChpID0gYWRldi0+bnVtX2lwX2Jsb2NrcyAtIDE7IGkgPj0gMDsgaS0t KSB7CiAJCWlmICghYWRldi0+aXBfYmxvY2tzW2ldLnN0YXR1cy52YWxpZCkKIAkJCWNvbnRpbnVl OworCiAJCS8qIGRpc3BsYXlzIGFyZSBoYW5kbGVkIHNlcGFyYXRlbHkgKi8KIAkJaWYgKGFkZXYt PmlwX2Jsb2Nrc1tpXS52ZXJzaW9uLT50eXBlID09IEFNRF9JUF9CTE9DS19UWVBFX0RDRSkgewog CQkJLyogWFhYIGhhbmRsZSBlcnJvcnMgKi8KQEAgLTIxMzYsNyArMjE0Myw5IEBAIHN0YXRpYyBp bnQgYW1kZ3B1X2RldmljZV9pcF9zdXNwZW5kX3BoYXNlMShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldikKIAkJCWlmIChyKSB7CiAJCQkJRFJNX0VSUk9SKCJzdXNwZW5kIG9mIElQIGJsb2NrIDwl cz4gZmFpbGVkICVkXG4iLAogCQkJCQkgIGFkZXYtPmlwX2Jsb2Nrc1tpXS52ZXJzaW9uLT5mdW5j cy0+bmFtZSwgcik7CisJCQkJcmV0dXJuIHI7CiAJCQl9CisJCQlhZGV2LT5pcF9ibG9ja3NbaV0u c3RhdHVzLmh3ID0gZmFsc2U7CiAJCX0KIAl9CiAKQEAgLTIxNzYsMTQgKzIxODUsMTYgQEAgc3Rh dGljIGludCBhbWRncHVfZGV2aWNlX2lwX3N1c3BlbmRfcGhhc2UyKHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2KQogCQkJaWYgKGlzX3N1cHBvcnRfc3dfc211KGFkZXYpKSB7CiAJCQkJLyogdG9k byAqLwogCQkJfSBlbHNlIGlmIChhZGV2LT5wb3dlcnBsYXkucHBfZnVuY3MgJiYKLQkJCQkgICBh ZGV2LT5wb3dlcnBsYXkucHBfZnVuY3MtPnNldF9tcDFfc3RhdGUpIHsKKwkJCQkJICAgYWRldi0+ cG93ZXJwbGF5LnBwX2Z1bmNzLT5zZXRfbXAxX3N0YXRlKSB7CiAJCQkJciA9IGFkZXYtPnBvd2Vy cGxheS5wcF9mdW5jcy0+c2V0X21wMV9zdGF0ZSgKIAkJCQkJYWRldi0+cG93ZXJwbGF5LnBwX2hh bmRsZSwKIAkJCQkJYWRldi0+bXAxX3N0YXRlKTsKIAkJCQlpZiAocikgewogCQkJCQlEUk1fRVJS T1IoIlNNQyBmYWlsZWQgdG8gc2V0IG1wMSBzdGF0ZSAlZCwgJWRcbiIsCiAJCQkJCQkgIGFkZXYt Pm1wMV9zdGF0ZSwgcik7CisJCQkJCXJldHVybiByOwogCQkJCX0KKwkJCQlhZGV2LT5pcF9ibG9j a3NbaV0uc3RhdHVzLmh3ID0gZmFsc2U7CiAJCQl9CiAJCX0KIAl9CkBAIC0yMjMxLDIxICsyMjQy LDI0IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X2RldmljZV9pcF9yZWluaXRfZWFybHlfc3Jpb3Yoc3Ry dWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJCUFNRF9JUF9CTE9DS19UWVBFX0lILAogCX07CiAK LQlmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0laRShpcF9vcmRlcik7IGkrKykgeworCWZvciAoaSA9 IDA7IGkgPCBhZGV2LT5udW1faXBfYmxvY2tzOyBpKyspIHsKIAkJaW50IGo7Ci0JCXN0cnVjdCBh bWRncHVfaXBfYmxvY2sgKmJsb2NrOwogCi0JCWZvciAoaiA9IDA7IGogPCBhZGV2LT5udW1faXBf YmxvY2tzOyBqKyspIHsKLQkJCWJsb2NrID0gJmFkZXYtPmlwX2Jsb2Nrc1tqXTsKKwkJaWYgKCFh ZGV2LT5pcF9ibG9ja3NbaV0uc3RhdHVzLnZhbGlkKQorCQkJY29udGludWU7CiAKLQkJCWlmIChi bG9jay0+dmVyc2lvbi0+dHlwZSAhPSBpcF9vcmRlcltpXSB8fAotCQkJCSFibG9jay0+c3RhdHVz LnZhbGlkKQorCQlhZGV2LT5pcF9ibG9ja3NbaV0uc3RhdHVzLmh3ID0gZmFsc2U7CisKKwkJZm9y IChqID0gMDsgaiA8IEFSUkFZX1NJWkUoaXBfb3JkZXIpOyBqKyspIHsKKwkJCWlmIChpcF9vcmRl cltqXSAhPSBhZGV2LT5pcF9ibG9ja3NbaV0udmVyc2lvbi0+dHlwZSkKIAkJCQljb250aW51ZTsK IAotCQkJciA9IGJsb2NrLT52ZXJzaW9uLT5mdW5jcy0+aHdfaW5pdChhZGV2KTsKLQkJCURSTV9J TkZPKCJSRS1JTklULWVhcmx5OiAlcyAlc1xuIiwgYmxvY2stPnZlcnNpb24tPmZ1bmNzLT5uYW1l LCByPyJmYWlsZWQiOiJzdWNjZWVkZWQiKTsKKwkJCXIgPSBhZGV2LT5pcF9ibG9ja3NbaV0udmVy c2lvbi0+ZnVuY3MtPmh3X2luaXQoYWRldik7CisJCQlEUk1fSU5GTygiUkUtSU5JVC1lYXJseTog JXMgJXNcbiIsIGFkZXYtPmlwX2Jsb2Nrc1tpXS52ZXJzaW9uLT5mdW5jcy0+bmFtZSwgcj8iZmFp bGVkIjoic3VjY2VlZGVkIik7CiAJCQlpZiAocikKIAkJCQlyZXR1cm4gcjsKKworCQkJYWRldi0+ aXBfYmxvY2tzW2ldLnN0YXR1cy5odyA9IHRydWU7CiAJCX0KIAl9CiAKQEAgLTIyNzMsMTMgKzIy ODcsMTUgQEAgc3RhdGljIGludCBhbWRncHVfZGV2aWNlX2lwX3JlaW5pdF9sYXRlX3NyaW92KHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCQkJYmxvY2sgPSAmYWRldi0+aXBfYmxvY2tzW2pd OwogCiAJCQlpZiAoYmxvY2stPnZlcnNpb24tPnR5cGUgIT0gaXBfb3JkZXJbaV0gfHwKLQkJCQkh YmxvY2stPnN0YXR1cy52YWxpZCkKKwkJCQkhYmxvY2stPnN0YXR1cy52YWxpZCB8fAorCQkJCWJs b2NrLT5zdGF0dXMuaHcpCiAJCQkJY29udGludWU7CiAKIAkJCXIgPSBibG9jay0+dmVyc2lvbi0+ ZnVuY3MtPmh3X2luaXQoYWRldik7CiAJCQlEUk1fSU5GTygiUkUtSU5JVC1sYXRlOiAlcyAlc1xu IiwgYmxvY2stPnZlcnNpb24tPmZ1bmNzLT5uYW1lLCByPyJmYWlsZWQiOiJzdWNjZWVkZWQiKTsK IAkJCWlmIChyKQogCQkJCXJldHVybiByOworCQkJYmxvY2stPnN0YXR1cy5odyA9IHRydWU7CiAJ CX0KIAl9CiAKQEAgLTIzMDMsMTcgKzIzMTksMTkgQEAgc3RhdGljIGludCBhbWRncHVfZGV2aWNl X2lwX3Jlc3VtZV9waGFzZTEoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJaW50IGksIHI7 CiAKIAlmb3IgKGkgPSAwOyBpIDwgYWRldi0+bnVtX2lwX2Jsb2NrczsgaSsrKSB7Ci0JCWlmICgh YWRldi0+aXBfYmxvY2tzW2ldLnN0YXR1cy52YWxpZCkKKwkJaWYgKCFhZGV2LT5pcF9ibG9ja3Nb aV0uc3RhdHVzLnZhbGlkIHx8IGFkZXYtPmlwX2Jsb2Nrc1tpXS5zdGF0dXMuaHcpCiAJCQljb250 aW51ZTsKIAkJaWYgKGFkZXYtPmlwX2Jsb2Nrc1tpXS52ZXJzaW9uLT50eXBlID09IEFNRF9JUF9C TE9DS19UWVBFX0NPTU1PTiB8fAogCQkgICAgYWRldi0+aXBfYmxvY2tzW2ldLnZlcnNpb24tPnR5 cGUgPT0gQU1EX0lQX0JMT0NLX1RZUEVfR01DIHx8CiAJCSAgICBhZGV2LT5pcF9ibG9ja3NbaV0u dmVyc2lvbi0+dHlwZSA9PSBBTURfSVBfQkxPQ0tfVFlQRV9JSCkgeworCiAJCQlyID0gYWRldi0+ aXBfYmxvY2tzW2ldLnZlcnNpb24tPmZ1bmNzLT5yZXN1bWUoYWRldik7CiAJCQlpZiAocikgewog CQkJCURSTV9FUlJPUigicmVzdW1lIG9mIElQIGJsb2NrIDwlcz4gZmFpbGVkICVkXG4iLAogCQkJ CQkgIGFkZXYtPmlwX2Jsb2Nrc1tpXS52ZXJzaW9uLT5mdW5jcy0+bmFtZSwgcik7CiAJCQkJcmV0 dXJuIHI7CiAJCQl9CisJCQlhZGV2LT5pcF9ibG9ja3NbaV0uc3RhdHVzLmh3ID0gdHJ1ZTsKIAkJ fQogCX0KIApAQCAtMjMzOCw3ICsyMzU2LDcgQEAgc3RhdGljIGludCBhbWRncHVfZGV2aWNlX2lw X3Jlc3VtZV9waGFzZTIoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJaW50IGksIHI7CiAK IAlmb3IgKGkgPSAwOyBpIDwgYWRldi0+bnVtX2lwX2Jsb2NrczsgaSsrKSB7Ci0JCWlmICghYWRl di0+aXBfYmxvY2tzW2ldLnN0YXR1cy52YWxpZCkKKwkJaWYgKCFhZGV2LT5pcF9ibG9ja3NbaV0u c3RhdHVzLnZhbGlkIHx8IGFkZXYtPmlwX2Jsb2Nrc1tpXS5zdGF0dXMuaHcpCiAJCQljb250aW51 ZTsKIAkJaWYgKGFkZXYtPmlwX2Jsb2Nrc1tpXS52ZXJzaW9uLT50eXBlID09IEFNRF9JUF9CTE9D S19UWVBFX0NPTU1PTiB8fAogCQkgICAgYWRldi0+aXBfYmxvY2tzW2ldLnZlcnNpb24tPnR5cGUg PT0gQU1EX0lQX0JMT0NLX1RZUEVfR01DIHx8CkBAIC0yMzUxLDYgKzIzNjksNyBAQCBzdGF0aWMg aW50IGFtZGdwdV9kZXZpY2VfaXBfcmVzdW1lX3BoYXNlMihzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldikKIAkJCQkgIGFkZXYtPmlwX2Jsb2Nrc1tpXS52ZXJzaW9uLT5mdW5jcy0+bmFtZSwgcik7 CiAJCQlyZXR1cm4gcjsKIAkJfQorCQlhZGV2LT5pcF9ibG9ja3NbaV0uc3RhdHVzLmh3ID0gdHJ1 ZTsKIAl9CiAKIAlyZXR1cm4gMDsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2FtZC1nZng=