From: Monk Liu Subject: [PATCH] drm/amdgpu: fix double ucode load by PSP(v3) Date: Wed, 31 Jul 2019 16:54:24 +0800 Message-ID: <1564563264-30902-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: 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 YWRpbmcgYW5kIGFueSBibG9jaydzIGh3X2luaXQvcmVzdW1lCgp2MjoKc3RpbGwgZG8gdGhlIHNt dSBmdyBsb2FkaW5nIHNpbmNlIGl0IGlzIG5lZWRlZCBieSBiYXJlLW1ldGFsCgp2MzoKZHJvcCB0 aGUgY2hhbmdlIGluIHJlaW5pdF9lYXJseV9zcmlvdiwganVzdCBjbGVhciBhbGwgYmxvY2sncyBz dGF0dXMuaHcKaW4gdGhlIGhlYWQgcGxhY2UgYW5kIHNldCB0aGUgc3RhdHVzLmh3IGFmdGVyIGh3 X2luaXQgZG9uZSBpcyBlbm91Z2gKClNpZ25lZC1vZmYtYnk6IE1vbmsgTGl1IDxNb25rLkxpdUBh bWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2UuYyB8 IDU5ICsrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDM4IGlu c2VydGlvbnMoKyksIDIxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2UuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L2FtZGdwdV9kZXZpY2UuYwppbmRleCA2Y2IzNThjLi4zMDQzNmJhIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jCkBAIC0xNjczLDI4ICsxNjczLDM0IEBAIHN0 YXRpYyBpbnQgYW1kZ3B1X2RldmljZV9md19sb2FkaW5nKHN0cnVjdCBhbWRncHVfZGV2aWNlICph ZGV2KQogCiAJaWYgKGFkZXYtPmFzaWNfdHlwZSA+PSBDSElQX1ZFR0ExMCkgewogCQlmb3IgKGkg PSAwOyBpIDwgYWRldi0+bnVtX2lwX2Jsb2NrczsgaSsrKSB7Ci0JCQlpZiAoYWRldi0+aXBfYmxv Y2tzW2ldLnZlcnNpb24tPnR5cGUgPT0gQU1EX0lQX0JMT0NLX1RZUEVfUFNQKSB7Ci0JCQkJaWYg KGFkZXYtPmluX2dwdV9yZXNldCB8fCBhZGV2LT5pbl9zdXNwZW5kKSB7Ci0JCQkJCWlmIChhbWRn cHVfc3Jpb3ZfdmYoYWRldikgJiYgYWRldi0+aW5fZ3B1X3Jlc2V0KQotCQkJCQkJYnJlYWs7IC8q IHNyaW92IGdwdSByZXNldCwgcHNwIG5lZWQgdG8gZG8gaHdfaW5pdCBiZWZvcmUgSUggYmVjYXVz ZSBvZiBodyBsaW1pdCAqLwotCQkJCQlyID0gYWRldi0+aXBfYmxvY2tzW2ldLnZlcnNpb24tPmZ1 bmNzLT5yZXN1bWUoYWRldik7Ci0JCQkJCWlmIChyKSB7Ci0JCQkJCQlEUk1fRVJST1IoInJlc3Vt ZSBvZiBJUCBibG9jayA8JXM+IGZhaWxlZCAlZFxuIiwKKwkJCWlmIChhZGV2LT5pcF9ibG9ja3Nb aV0udmVyc2lvbi0+dHlwZSAhPSBBTURfSVBfQkxPQ0tfVFlQRV9QU1ApCisJCQkJY29udGludWU7 CisKKwkJCS8qIG5vIG5lZWQgdG8gZG8gdGhlIGZ3IGxvYWRpbmcgYWdhaW4gaWYgYWxyZWFkeSBk b25lKi8KKwkJCWlmIChhZGV2LT5pcF9ibG9ja3NbaV0uc3RhdHVzLmh3ID09IHRydWUpCisJCQkJ YnJlYWs7CisKKwkJCWlmIChhZGV2LT5pbl9ncHVfcmVzZXQgfHwgYWRldi0+aW5fc3VzcGVuZCkg eworCQkJCXIgPSBhZGV2LT5pcF9ibG9ja3NbaV0udmVyc2lvbi0+ZnVuY3MtPnJlc3VtZShhZGV2 KTsKKwkJCQlpZiAocikgeworCQkJCQlEUk1fRVJST1IoInJlc3VtZSBvZiBJUCBibG9jayA8JXM+ IGZhaWxlZCAlZFxuIiwKIAkJCQkJCQkgIGFkZXYtPmlwX2Jsb2Nrc1tpXS52ZXJzaW9uLT5mdW5j cy0+bmFtZSwgcik7Ci0JCQkJCQlyZXR1cm4gcjsKLQkJCQkJfQotCQkJCX0gZWxzZSB7Ci0JCQkJ CXIgPSBhZGV2LT5pcF9ibG9ja3NbaV0udmVyc2lvbi0+ZnVuY3MtPmh3X2luaXQoYWRldik7Ci0J CQkJCWlmIChyKSB7Ci0JCQkJCQlEUk1fRVJST1IoImh3X2luaXQgb2YgSVAgYmxvY2sgPCVzPiBm YWlsZWQgJWRcbiIsCi0JCQkJCQkgIGFkZXYtPmlwX2Jsb2Nrc1tpXS52ZXJzaW9uLT5mdW5jcy0+ bmFtZSwgcik7Ci0JCQkJCQlyZXR1cm4gcjsKLQkJCQkJfQorCQkJCQlyZXR1cm4gcjsKKwkJCQl9 CisJCQl9IGVsc2UgeworCQkJCXIgPSBhZGV2LT5pcF9ibG9ja3NbaV0udmVyc2lvbi0+ZnVuY3Mt Pmh3X2luaXQoYWRldik7CisJCQkJaWYgKHIpIHsKKwkJCQkJRFJNX0VSUk9SKCJod19pbml0IG9m IElQIGJsb2NrIDwlcz4gZmFpbGVkICVkXG4iLAorCQkJCQkJCSAgYWRldi0+aXBfYmxvY2tzW2ld LnZlcnNpb24tPmZ1bmNzLT5uYW1lLCByKTsKKwkJCQkJcmV0dXJuIHI7CiAJCQkJfQotCQkJCWFk ZXYtPmlwX2Jsb2Nrc1tpXS5zdGF0dXMuaHcgPSB0cnVlOwogCQkJfQorCisJCQlhZGV2LT5pcF9i bG9ja3NbaV0uc3RhdHVzLmh3ID0gdHJ1ZTsKKwkJCWJyZWFrOwogCQl9CiAJfQorCiAJciA9IGFt ZGdwdV9wbV9sb2FkX3NtdV9maXJtd2FyZShhZGV2LCAmc211X3ZlcnNpb24pOwogCiAJcmV0dXJu IHI7CkBAIC0yMTM2LDcgKzIxNDIsOSBAQCBzdGF0aWMgaW50IGFtZGdwdV9kZXZpY2VfaXBfc3Vz cGVuZF9waGFzZTEoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJCQlpZiAocikgewogCQkJ CURSTV9FUlJPUigic3VzcGVuZCBvZiBJUCBibG9jayA8JXM+IGZhaWxlZCAlZFxuIiwKIAkJCQkJ ICBhZGV2LT5pcF9ibG9ja3NbaV0udmVyc2lvbi0+ZnVuY3MtPm5hbWUsIHIpOworCQkJCXJldHVy biByOwogCQkJfQorCQkJYWRldi0+aXBfYmxvY2tzW2ldLnN0YXR1cy5odyA9IGZhbHNlOwogCQl9 CiAJfQogCkBAIC0yMTc2LDE0ICsyMTg0LDE2IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X2RldmljZV9p cF9zdXNwZW5kX3BoYXNlMihzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAkJCWlmIChpc19z dXBwb3J0X3N3X3NtdShhZGV2KSkgewogCQkJCS8qIHRvZG8gKi8KIAkJCX0gZWxzZSBpZiAoYWRl di0+cG93ZXJwbGF5LnBwX2Z1bmNzICYmCi0JCQkJICAgYWRldi0+cG93ZXJwbGF5LnBwX2Z1bmNz LT5zZXRfbXAxX3N0YXRlKSB7CisJCQkJCSAgIGFkZXYtPnBvd2VycGxheS5wcF9mdW5jcy0+c2V0 X21wMV9zdGF0ZSkgewogCQkJCXIgPSBhZGV2LT5wb3dlcnBsYXkucHBfZnVuY3MtPnNldF9tcDFf c3RhdGUoCiAJCQkJCWFkZXYtPnBvd2VycGxheS5wcF9oYW5kbGUsCiAJCQkJCWFkZXYtPm1wMV9z dGF0ZSk7CiAJCQkJaWYgKHIpIHsKIAkJCQkJRFJNX0VSUk9SKCJTTUMgZmFpbGVkIHRvIHNldCBt cDEgc3RhdGUgJWQsICVkXG4iLAogCQkJCQkJICBhZGV2LT5tcDFfc3RhdGUsIHIpOworCQkJCQly ZXR1cm4gcjsKIAkJCQl9CisJCQkJYWRldi0+aXBfYmxvY2tzW2ldLnN0YXR1cy5odyA9IGZhbHNl OwogCQkJfQogCQl9CiAJfQpAQCAtMjIzOCw2ICsyMjQ4LDcgQEAgc3RhdGljIGludCBhbWRncHVf ZGV2aWNlX2lwX3JlaW5pdF9lYXJseV9zcmlvdihzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikK IAkJZm9yIChqID0gMDsgaiA8IGFkZXYtPm51bV9pcF9ibG9ja3M7IGorKykgewogCQkJYmxvY2sg PSAmYWRldi0+aXBfYmxvY2tzW2pdOwogCisJCQlibG9jay0+c3RhdHVzLmh3ID0gZmFsc2U7CiAJ CQlpZiAoYmxvY2stPnZlcnNpb24tPnR5cGUgIT0gaXBfb3JkZXJbaV0gfHwKIAkJCQkhYmxvY2st PnN0YXR1cy52YWxpZCkKIAkJCQljb250aW51ZTsKQEAgLTIyNDYsNiArMjI1Nyw3IEBAIHN0YXRp YyBpbnQgYW1kZ3B1X2RldmljZV9pcF9yZWluaXRfZWFybHlfc3Jpb3Yoc3RydWN0IGFtZGdwdV9k ZXZpY2UgKmFkZXYpCiAJCQlEUk1fSU5GTygiUkUtSU5JVC1lYXJseTogJXMgJXNcbiIsIGJsb2Nr LT52ZXJzaW9uLT5mdW5jcy0+bmFtZSwgcj8iZmFpbGVkIjoic3VjY2VlZGVkIik7CiAJCQlpZiAo cikKIAkJCQlyZXR1cm4gcjsKKwkJCWJsb2NrLT5zdGF0dXMuaHcgPSB0cnVlOwogCQl9CiAJfQog CkBAIC0yMjczLDEzICsyMjg1LDE1IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X2RldmljZV9pcF9yZWlu aXRfbGF0ZV9zcmlvdihzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAkJCWJsb2NrID0gJmFk ZXYtPmlwX2Jsb2Nrc1tqXTsKIAogCQkJaWYgKGJsb2NrLT52ZXJzaW9uLT50eXBlICE9IGlwX29y ZGVyW2ldIHx8Ci0JCQkJIWJsb2NrLT5zdGF0dXMudmFsaWQpCisJCQkJIWJsb2NrLT5zdGF0dXMu dmFsaWQgfHwKKwkJCQlibG9jay0+c3RhdHVzLmh3KQogCQkJCWNvbnRpbnVlOwogCiAJCQlyID0g YmxvY2stPnZlcnNpb24tPmZ1bmNzLT5od19pbml0KGFkZXYpOwogCQkJRFJNX0lORk8oIlJFLUlO SVQtbGF0ZTogJXMgJXNcbiIsIGJsb2NrLT52ZXJzaW9uLT5mdW5jcy0+bmFtZSwgcj8iZmFpbGVk Ijoic3VjY2VlZGVkIik7CiAJCQlpZiAocikKIAkJCQlyZXR1cm4gcjsKKwkJCWJsb2NrLT5zdGF0 dXMuaHcgPSB0cnVlOwogCQl9CiAJfQogCkBAIC0yMzAzLDE3ICsyMzE3LDE5IEBAIHN0YXRpYyBp bnQgYW1kZ3B1X2RldmljZV9pcF9yZXN1bWVfcGhhc2UxKHN0cnVjdCBhbWRncHVfZGV2aWNlICph ZGV2KQogCWludCBpLCByOwogCiAJZm9yIChpID0gMDsgaSA8IGFkZXYtPm51bV9pcF9ibG9ja3M7 IGkrKykgewotCQlpZiAoIWFkZXYtPmlwX2Jsb2Nrc1tpXS5zdGF0dXMudmFsaWQpCisJCWlmICgh YWRldi0+aXBfYmxvY2tzW2ldLnN0YXR1cy52YWxpZCB8fCBhZGV2LT5pcF9ibG9ja3NbaV0uc3Rh dHVzLmh3KQogCQkJY29udGludWU7CiAJCWlmIChhZGV2LT5pcF9ibG9ja3NbaV0udmVyc2lvbi0+ dHlwZSA9PSBBTURfSVBfQkxPQ0tfVFlQRV9DT01NT04gfHwKIAkJICAgIGFkZXYtPmlwX2Jsb2Nr c1tpXS52ZXJzaW9uLT50eXBlID09IEFNRF9JUF9CTE9DS19UWVBFX0dNQyB8fAogCQkgICAgYWRl di0+aXBfYmxvY2tzW2ldLnZlcnNpb24tPnR5cGUgPT0gQU1EX0lQX0JMT0NLX1RZUEVfSUgpIHsK KwogCQkJciA9IGFkZXYtPmlwX2Jsb2Nrc1tpXS52ZXJzaW9uLT5mdW5jcy0+cmVzdW1lKGFkZXYp OwogCQkJaWYgKHIpIHsKIAkJCQlEUk1fRVJST1IoInJlc3VtZSBvZiBJUCBibG9jayA8JXM+IGZh aWxlZCAlZFxuIiwKIAkJCQkJICBhZGV2LT5pcF9ibG9ja3NbaV0udmVyc2lvbi0+ZnVuY3MtPm5h bWUsIHIpOwogCQkJCXJldHVybiByOwogCQkJfQorCQkJYWRldi0+aXBfYmxvY2tzW2ldLnN0YXR1 cy5odyA9IHRydWU7CiAJCX0KIAl9CiAKQEAgLTIzMzgsNyArMjM1NCw3IEBAIHN0YXRpYyBpbnQg YW1kZ3B1X2RldmljZV9pcF9yZXN1bWVfcGhhc2UyKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2 KQogCWludCBpLCByOwogCiAJZm9yIChpID0gMDsgaSA8IGFkZXYtPm51bV9pcF9ibG9ja3M7IGkr KykgewotCQlpZiAoIWFkZXYtPmlwX2Jsb2Nrc1tpXS5zdGF0dXMudmFsaWQpCisJCWlmICghYWRl di0+aXBfYmxvY2tzW2ldLnN0YXR1cy52YWxpZCB8fCBhZGV2LT5pcF9ibG9ja3NbaV0uc3RhdHVz Lmh3KQogCQkJY29udGludWU7CiAJCWlmIChhZGV2LT5pcF9ibG9ja3NbaV0udmVyc2lvbi0+dHlw ZSA9PSBBTURfSVBfQkxPQ0tfVFlQRV9DT01NT04gfHwKIAkJICAgIGFkZXYtPmlwX2Jsb2Nrc1tp XS52ZXJzaW9uLT50eXBlID09IEFNRF9JUF9CTE9DS19UWVBFX0dNQyB8fApAQCAtMjM1MSw2ICsy MzY3LDcgQEAgc3RhdGljIGludCBhbWRncHVfZGV2aWNlX2lwX3Jlc3VtZV9waGFzZTIoc3RydWN0 IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJCQkJICBhZGV2LT5pcF9ibG9ja3NbaV0udmVyc2lvbi0+ ZnVuY3MtPm5hbWUsIHIpOwogCQkJcmV0dXJuIHI7CiAJCX0KKwkJYWRldi0+aXBfYmxvY2tzW2ld LnN0YXR1cy5odyA9IHRydWU7CiAJfQogCiAJcmV0dXJuIDA7Ci0tIAoyLjcuNAoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxp c3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4