From: Alex Deucher Subject: [PATCH 10/19] drm/amdgpu: split swSMU baco_reset into enter and exit Date: Thu, 10 Oct 2019 20:45:27 -0500 Message-ID: <20191011014536.10869-11-alexander.deucher@amd.com> References: <20191011014536.10869-1-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20191011014536.10869-1-alexander.deucher-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, tiwai-l3A5Bk7waGM@public.gmane.org, lukas-JFq808J9C/izQB+pC5nmwQ@public.gmane.org Cc: Alex Deucher U28gd2UgY2FuIHVzZSBpdCBmb3IgcG93ZXIgc2F2aW5ncyByYXRoZXIgdGhhbiBqdXN0IHJlc2V0 LgoKU2lnbmVkLW9mZi1ieTogQWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L252LmMgICAgICAgICAgICAgICAgfCAg NyArKysrKystCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zb2MxNS5jICAgICAgICAgICAg IHwgMTEgKysrKysrKysrKy0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L2luYy9hbWRn cHVfc211LmggfCAgOSArKysrKystLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L3Nt dV92MTFfMC5jICAgICAgfCAxMiArKysrKysrKysrLS0KIDQgZmlsZXMgY2hhbmdlZCwgMzIgaW5z ZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9udi5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvbnYuYwppbmRleCA2 OGMxOGY1ZjRiNDEuLmY3MTZmOGYxNDcxNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvbnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9udi5jCkBAIC0z MzEsNyArMzMxLDEyIEBAIHN0YXRpYyBpbnQgbnZfYXNpY19yZXNldChzdHJ1Y3QgYW1kZ3B1X2Rl dmljZSAqYWRldikKIAlpZiAobnZfYXNpY19yZXNldF9tZXRob2QoYWRldikgPT0gQU1EX1JFU0VU X01FVEhPRF9CQUNPKSB7CiAJCWlmICghYWRldi0+aW5fc3VzcGVuZCkKIAkJCWFtZGdwdV9pbmNf dnJhbV9sb3N0KGFkZXYpOwotCQlyZXQgPSBzbXVfYmFjb19yZXNldChzbXUpOworCQlyZXQgPSBz bXVfYmFjb19lbnRlcihzbXUpOworCQlpZiAocmV0KQorCQkJcmV0dXJuIHJldDsKKwkJcmV0ID0g c211X2JhY29fZXhpdChzbXUpOworCQlpZiAocmV0KQorCQkJcmV0dXJuIHJldDsKIAl9IGVsc2Ug ewogCQlpZiAoIWFkZXYtPmluX3N1c3BlbmQpCiAJCQlhbWRncHVfaW5jX3ZyYW1fbG9zdChhZGV2 KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3NvYzE1LmMgYi9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zb2MxNS5jCmluZGV4IGM0OWY3YTc4YTJkNS4uMGJhZTlm NzcyNDJiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zb2MxNS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3NvYzE1LmMKQEAgLTUwMCwxMCArNTAwLDE5 IEBAIHN0YXRpYyBpbnQgc29jMTVfYXNpY19iYWNvX3Jlc2V0KHN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2KQogewogCWlmIChpc19zdXBwb3J0X3N3X3NtdShhZGV2KSkgewogCQlzdHJ1Y3Qgc211 X2NvbnRleHQgKnNtdSA9ICZhZGV2LT5zbXU7CisJCWludCByZXQ7CisKKwkJcmV0ID0gc211X2Jh Y29fZW50ZXIoc211KTsKKwkJaWYgKHJldCkKKwkJCXJldHVybiByZXQ7CisKKwkJcmV0ID0gc211 X2JhY29fZXhpdChzbXUpOworCQlpZiAocmV0KQorCQkJcmV0dXJuIHJldDsKIAogCQlkZXZfaW5m byhhZGV2LT5kZXYsICJHUFUgQkFDTyByZXNldFxuIik7CiAKLQkJcmV0dXJuIHNtdV9iYWNvX3Jl c2V0KHNtdSk7CisJCXJldHVybiAwOwogCX0gZWxzZSB7CiAJCXZvaWQgKnBwX2hhbmRsZSA9IGFk ZXYtPnBvd2VycGxheS5wcF9oYW5kbGU7CiAJCWNvbnN0IHN0cnVjdCBhbWRfcG1fZnVuY3MgKnBw X2Z1bmNzID0gYWRldi0+cG93ZXJwbGF5LnBwX2Z1bmNzOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2FtZC9wb3dlcnBsYXkvaW5jL2FtZGdwdV9zbXUuaCBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvcG93ZXJwbGF5L2luYy9hbWRncHVfc211LmgKaW5kZXggY2NmNzExYzMyN2M4Li43OGQyMjdi MDQ4ZmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L2luYy9hbWRn cHVfc211LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvaW5jL2FtZGdwdV9z bXUuaApAQCAtNTQ2LDcgKzU0Niw4IEBAIHN0cnVjdCBzbXVfZnVuY3MKIAlib29sICgqYmFjb19p c19zdXBwb3J0KShzdHJ1Y3Qgc211X2NvbnRleHQgKnNtdSk7CiAJZW51bSBzbXVfYmFjb19zdGF0 ZSAoKmJhY29fZ2V0X3N0YXRlKShzdHJ1Y3Qgc211X2NvbnRleHQgKnNtdSk7CiAJaW50ICgqYmFj b19zZXRfc3RhdGUpKHN0cnVjdCBzbXVfY29udGV4dCAqc211LCBlbnVtIHNtdV9iYWNvX3N0YXRl IHN0YXRlKTsKLQlpbnQgKCpiYWNvX3Jlc2V0KShzdHJ1Y3Qgc211X2NvbnRleHQgKnNtdSk7CisJ aW50ICgqYmFjb19lbnRlcikoc3RydWN0IHNtdV9jb250ZXh0ICpzbXUpOworCWludCAoKmJhY29f ZXhpdCkoc3RydWN0IHNtdV9jb250ZXh0ICpzbXUpOwogCWludCAoKm1vZGUyX3Jlc2V0KShzdHJ1 Y3Qgc211X2NvbnRleHQgKnNtdSk7CiAJaW50ICgqZ2V0X2RwbV91bHRpbWF0ZV9mcmVxKShzdHJ1 Y3Qgc211X2NvbnRleHQgKnNtdSwgZW51bSBzbXVfY2xrX3R5cGUgY2xrX3R5cGUsIHVpbnQzMl90 ICptaW4sIHVpbnQzMl90ICptYXgpOwogCWludCAoKnNldF9zb2Z0X2ZyZXFfbGltaXRlZF9yYW5n ZSkoc3RydWN0IHNtdV9jb250ZXh0ICpzbXUsIGVudW0gc211X2Nsa190eXBlIGNsa190eXBlLCB1 aW50MzJfdCBtaW4sIHVpbnQzMl90IG1heCk7CkBAIC03NjgsOCArNzY5LDEwIEBAIHN0cnVjdCBz bXVfZnVuY3MKIAkoKHNtdSktPmZ1bmNzLT5iYWNvX2lzX3N1cHBvcnQ/IChzbXUpLT5mdW5jcy0+ YmFjb19pc19zdXBwb3J0KChzbXUpKSA6IGZhbHNlKQogI2RlZmluZSBzbXVfYmFjb19nZXRfc3Rh dGUoc211LCBzdGF0ZSkgXAogCSgoc211KS0+ZnVuY3MtPmJhY29fZ2V0X3N0YXRlPyAoc211KS0+ ZnVuY3MtPmJhY29fZ2V0X3N0YXRlKChzbXUpLCAoc3RhdGUpKSA6IDApCi0jZGVmaW5lIHNtdV9i YWNvX3Jlc2V0KHNtdSkgXAotCSgoc211KS0+ZnVuY3MtPmJhY29fcmVzZXQ/IChzbXUpLT5mdW5j cy0+YmFjb19yZXNldCgoc211KSkgOiAwKQorI2RlZmluZSBzbXVfYmFjb19lbnRlcihzbXUpIFwK KwkoKHNtdSktPmZ1bmNzLT5iYWNvX2VudGVyPyAoc211KS0+ZnVuY3MtPmJhY29fZW50ZXIoKHNt dSkpIDogMCkKKyNkZWZpbmUgc211X2JhY29fZXhpdChzbXUpCQkJCQkJXAorCSgoc211KS0+ZnVu Y3MtPmJhY29fZXhpdD8gKHNtdSktPmZ1bmNzLT5iYWNvX2V4aXQoKHNtdSkpIDogMCkKICNkZWZp bmUgc211X21vZGUyX3Jlc2V0KHNtdSkgXAogCSgoc211KS0+ZnVuY3MtPm1vZGUyX3Jlc2V0PyAo c211KS0+ZnVuY3MtPm1vZGUyX3Jlc2V0KChzbXUpKSA6IDApCiAjZGVmaW5lIHNtdV9hc2ljX3Nl dF9wZXJmb3JtYW5jZV9sZXZlbChzbXUsIGxldmVsKSBcCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vYW1kL3Bvd2VycGxheS9zbXVfdjExXzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvcG93 ZXJwbGF5L3NtdV92MTFfMC5jCmluZGV4IGM5ZTkwZDU5YTZiOC4uNGU4OGZjOTA0N2IwIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9zbXVfdjExXzAuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9zbXVfdjExXzAuYwpAQCAtMTcwNSw3ICsxNzA1 LDcgQEAgc3RhdGljIGludCBzbXVfdjExXzBfYmFjb19zZXRfc3RhdGUoc3RydWN0IHNtdV9jb250 ZXh0ICpzbXUsIGVudW0gc211X2JhY29fc3RhdGUKIAlyZXR1cm4gcmV0OwogfQogCi1zdGF0aWMg aW50IHNtdV92MTFfMF9iYWNvX3Jlc2V0KHN0cnVjdCBzbXVfY29udGV4dCAqc211KQorc3RhdGlj IGludCBzbXVfdjExXzBfYmFjb19lbnRlcihzdHJ1Y3Qgc211X2NvbnRleHQgKnNtdSkKIHsKIAlp bnQgcmV0ID0gMDsKIApAQCAtMTcxOSw2ICsxNzE5LDEzIEBAIHN0YXRpYyBpbnQgc211X3YxMV8w X2JhY29fcmVzZXQoc3RydWN0IHNtdV9jb250ZXh0ICpzbXUpCiAKIAltc2xlZXAoMTApOwogCisJ cmV0dXJuIHJldDsKK30KKworc3RhdGljIGludCBzbXVfdjExXzBfYmFjb19leGl0KHN0cnVjdCBz bXVfY29udGV4dCAqc211KQoreworCWludCByZXQgPSAwOworCiAJcmV0ID0gc211X3YxMV8wX2Jh Y29fc2V0X3N0YXRlKHNtdSwgU01VX0JBQ09fU1RBVEVfRVhJVCk7CiAJaWYgKHJldCkKIAkJcmV0 dXJuIHJldDsKQEAgLTE4NDEsNyArMTg0OCw4IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3Qgc211X2Z1 bmNzIHNtdV92MTFfMF9mdW5jcyA9IHsKIAkuYmFjb19pc19zdXBwb3J0ID0gc211X3YxMV8wX2Jh Y29faXNfc3VwcG9ydCwKIAkuYmFjb19nZXRfc3RhdGUgPSBzbXVfdjExXzBfYmFjb19nZXRfc3Rh dGUsCiAJLmJhY29fc2V0X3N0YXRlID0gc211X3YxMV8wX2JhY29fc2V0X3N0YXRlLAotCS5iYWNv X3Jlc2V0ID0gc211X3YxMV8wX2JhY29fcmVzZXQsCisJLmJhY29fZW50ZXIgPSBzbXVfdjExXzBf YmFjb19lbnRlciwKKwkuYmFjb19leGl0ID0gc211X3YxMV8wX2JhY29fZXhpdCwKIAkuZ2V0X2Rw bV91bHRpbWF0ZV9mcmVxID0gc211X3YxMV8wX2dldF9kcG1fdWx0aW1hdGVfZnJlcSwKIAkuc2V0 X3NvZnRfZnJlcV9saW1pdGVkX3JhbmdlID0gc211X3YxMV8wX3NldF9zb2Z0X2ZyZXFfbGltaXRl ZF9yYW5nZSwKIH07Ci0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v YW1kLWdmeA==