From: Alex Deucher Subject: [PATCH 15/15] drm/amdgpu: enable BACO reset for SMU7 based dGPUs (v2) Date: Thu, 10 Oct 2019 20:21:35 -0500 Message-ID: <20191011012135.18566-16-alexander.deucher@amd.com> References: <20191011012135.18566-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: <20191011012135.18566-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 Cc: Alex Deucher VXNlIEJBQ08gdG8gcmVzZXQgdGhlIEdQVSBpZiBzdXBwb3J0ZWQgb24gU01VNyBiYXNlZApkR1BV cy4KCnYyOiBkb24ndCB1c2UgYmFjbyBvbiBDSSBwYXJ0cwoKU2lnbmVkLW9mZi1ieTogQWxleCBE ZXVjaGVyIDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2Npay5jIHwgNDggKysrKysrKysrKysrKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9jaWsuaCB8ICAzICsrCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92aS5j ICB8IDg0ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS92aS5oICB8ICAzICsrCiA0IGZpbGVzIGNoYW5nZWQsIDEyOCBpbnNlcnRpb25z KCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9jaWsuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Npay5jCmluZGV4IGI4MWJi NDE0ZmNiMy4uZmM4YjM0NDgwZjY2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9jaWsuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9jaWsuYwpAQCAtMTI3 MCwxNSArMTI3MCwxNSBAQCBzdGF0aWMgaW50IGNpa19ncHVfcGNpX2NvbmZpZ19yZXNldChzdHJ1 Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIH0KIAogLyoqCi0gKiBjaWtfYXNpY19yZXNldCAtIHNv ZnQgcmVzZXQgR1BVCisgKiBjaWtfYXNpY19wY2lfY29uZmlnX3Jlc2V0IC0gc29mdCByZXNldCBH UFUKICAqCiAgKiBAYWRldjogYW1kZ3B1X2RldmljZSBwb2ludGVyCiAgKgotICogTG9vayB1cCB3 aGljaCBibG9ja3MgYXJlIGh1bmcgYW5kIGF0dGVtcHQKLSAqIHRvIHJlc2V0IHRoZW0uCisgKiBV c2UgUENJIENvbmZpZyBtZXRob2QgdG8gcmVzZXQgdGhlIEdQVS4KKyAqCiAgKiBSZXR1cm5zIDAg Zm9yIHN1Y2Nlc3MuCiAgKi8KLXN0YXRpYyBpbnQgY2lrX2FzaWNfcmVzZXQoc3RydWN0IGFtZGdw dV9kZXZpY2UgKmFkZXYpCitzdGF0aWMgaW50IGNpa19hc2ljX3BjaV9jb25maWdfcmVzZXQoc3Ry dWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB7CiAJaW50IHI7CiAKQEAgLTEyOTQsNyArMTI5NCw0 NSBAQCBzdGF0aWMgaW50IGNpa19hc2ljX3Jlc2V0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2 KQogc3RhdGljIGVudW0gYW1kX3Jlc2V0X21ldGhvZAogY2lrX2FzaWNfcmVzZXRfbWV0aG9kKHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogewotCXJldHVybiBBTURfUkVTRVRfTUVUSE9EX0xF R0FDWTsKKwlib29sIGJhY29fcmVzZXQ7CisKKwlzd2l0Y2ggKGFkZXYtPmFzaWNfdHlwZSkgewor CWNhc2UgQ0hJUF9CT05BSVJFOgorCWNhc2UgQ0hJUF9IQVdBSUk6CisJCS8qIGRpc2FibGUgYmFj byByZXNldCB1bnRpbCBpdCB3b3JrcyAqLworCQkvKiBzbXU3X2FzaWNfZ2V0X2JhY29fY2FwYWJp bGl0eShhZGV2LCAmYmFjb19yZXNldCk7ICovCisJCWJhY29fcmVzZXQgPSBmYWxzZTsKKwkJYnJl YWs7CisJZGVmYXVsdDoKKwkJYmFjb19yZXNldCA9IGZhbHNlOworCQlicmVhazsKKwl9CisKKwlp ZiAoYmFjb19yZXNldCkKKwkJcmV0dXJuIEFNRF9SRVNFVF9NRVRIT0RfQkFDTzsKKwllbHNlCisJ CXJldHVybiBBTURfUkVTRVRfTUVUSE9EX0xFR0FDWTsKK30KKworLyoqCisgKiBjaWtfYXNpY19y ZXNldCAtIHNvZnQgcmVzZXQgR1BVCisgKgorICogQGFkZXY6IGFtZGdwdV9kZXZpY2UgcG9pbnRl cgorICoKKyAqIExvb2sgdXAgd2hpY2ggYmxvY2tzIGFyZSBodW5nIGFuZCBhdHRlbXB0CisgKiB0 byByZXNldCB0aGVtLgorICogUmV0dXJucyAwIGZvciBzdWNjZXNzLgorICovCitzdGF0aWMgaW50 IGNpa19hc2ljX3Jlc2V0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQoreworCWludCByOwor CisJaWYgKGNpa19hc2ljX3Jlc2V0X21ldGhvZChhZGV2KSA9PSBBTURfUkVTRVRfTUVUSE9EX0JB Q08pCisJCXIgPSBzbXU3X2FzaWNfYmFjb19yZXNldChhZGV2KTsKKwllbHNlCisJCXIgPSBjaWtf YXNpY19wY2lfY29uZmlnX3Jlc2V0KGFkZXYpOworCisJcmV0dXJuIHI7CiB9CiAKIHN0YXRpYyB1 MzIgY2lrX2dldF9jb25maWdfbWVtc2l6ZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Npay5oIGIvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvY2lrLmgKaW5kZXggNTRjNjI1YTJlNTcwLi45ODcwYmYyNzg3MGUgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Npay5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2Npay5oCkBAIC0zMSw0ICszMSw3IEBAIHZvaWQgY2lrX3NyYm1f c2VsZWN0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogaW50IGNpa19zZXRfaXBfYmxvY2tz KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KTsKIAogdm9pZCBsZWdhY3lfZG9vcmJlbGxfaW5k ZXhfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldik7CitpbnQgc211N19hc2ljX2dldF9i YWNvX2NhcGFiaWxpdHkoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIGJvb2wgKmNhcCk7Citp bnQgc211N19hc2ljX2JhY29fcmVzZXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpOworCiAj ZW5kaWYKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3ZpLmMgYi9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92aS5jCmluZGV4IDVmOGM4Nzg2Y2FjNS4uNzhlNWNkYzBj MDU4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92aS5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3ZpLmMKQEAgLTY4OSwxNiArNjg5LDUwIEBAIHN0YXRp YyBpbnQgdmlfZ3B1X3BjaV9jb25maWdfcmVzZXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYp CiAJcmV0dXJuIC1FSU5WQUw7CiB9CiAKK2ludCBzbXU3X2FzaWNfZ2V0X2JhY29fY2FwYWJpbGl0 eShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgYm9vbCAqY2FwKQoreworCXZvaWQgKnBwX2hh bmRsZSA9IGFkZXYtPnBvd2VycGxheS5wcF9oYW5kbGU7CisJY29uc3Qgc3RydWN0IGFtZF9wbV9m dW5jcyAqcHBfZnVuY3MgPSBhZGV2LT5wb3dlcnBsYXkucHBfZnVuY3M7CisKKwlpZiAoIXBwX2Z1 bmNzIHx8ICFwcF9mdW5jcy0+Z2V0X2FzaWNfYmFjb19jYXBhYmlsaXR5KSB7CisJCSpjYXAgPSBm YWxzZTsKKwkJcmV0dXJuIC1FTk9FTlQ7CisJfQorCisJcmV0dXJuIHBwX2Z1bmNzLT5nZXRfYXNp Y19iYWNvX2NhcGFiaWxpdHkocHBfaGFuZGxlLCBjYXApOworfQorCitpbnQgc211N19hc2ljX2Jh Y29fcmVzZXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCit7CisJdm9pZCAqcHBfaGFuZGxl ID0gYWRldi0+cG93ZXJwbGF5LnBwX2hhbmRsZTsKKwljb25zdCBzdHJ1Y3QgYW1kX3BtX2Z1bmNz ICpwcF9mdW5jcyA9IGFkZXYtPnBvd2VycGxheS5wcF9mdW5jczsKKworCWlmICghcHBfZnVuY3Mg fHwhcHBfZnVuY3MtPmdldF9hc2ljX2JhY29fc3RhdGUgfHwhcHBfZnVuY3MtPnNldF9hc2ljX2Jh Y29fc3RhdGUpCisJCXJldHVybiAtRU5PRU5UOworCisJLyogZW50ZXIgQkFDTyBzdGF0ZSAqLwor CWlmIChwcF9mdW5jcy0+c2V0X2FzaWNfYmFjb19zdGF0ZShwcF9oYW5kbGUsIDEpKQorCQlyZXR1 cm4gLUVJTzsKKworCS8qIGV4aXQgQkFDTyBzdGF0ZSAqLworCWlmIChwcF9mdW5jcy0+c2V0X2Fz aWNfYmFjb19zdGF0ZShwcF9oYW5kbGUsIDApKQorCQlyZXR1cm4gLUVJTzsKKworCWRldl9pbmZv KGFkZXYtPmRldiwgIkdQVSBCQUNPIHJlc2V0XG4iKTsKKworCXJldHVybiAwOworfQorCiAvKioK LSAqIHZpX2FzaWNfcmVzZXQgLSBzb2Z0IHJlc2V0IEdQVQorICogdmlfYXNpY19wY2lfY29uZmln X3Jlc2V0IC0gc29mdCByZXNldCBHUFUKICAqCiAgKiBAYWRldjogYW1kZ3B1X2RldmljZSBwb2lu dGVyCiAgKgotICogTG9vayB1cCB3aGljaCBibG9ja3MgYXJlIGh1bmcgYW5kIGF0dGVtcHQKLSAq IHRvIHJlc2V0IHRoZW0uCisgKiBVc2UgUENJIENvbmZpZyBtZXRob2QgdG8gcmVzZXQgdGhlIEdQ VS4KKyAqCiAgKiBSZXR1cm5zIDAgZm9yIHN1Y2Nlc3MuCiAgKi8KLXN0YXRpYyBpbnQgdmlfYXNp Y19yZXNldChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKK3N0YXRpYyBpbnQgdmlfYXNpY19w Y2lfY29uZmlnX3Jlc2V0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogewogCWludCByOwog CkBAIC03MTQsNyArNzQ4LDQ3IEBAIHN0YXRpYyBpbnQgdmlfYXNpY19yZXNldChzdHJ1Y3QgYW1k Z3B1X2RldmljZSAqYWRldikKIHN0YXRpYyBlbnVtIGFtZF9yZXNldF9tZXRob2QKIHZpX2FzaWNf cmVzZXRfbWV0aG9kKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogewotCXJldHVybiBBTURf UkVTRVRfTUVUSE9EX0xFR0FDWTsKKwlib29sIGJhY29fcmVzZXQ7CisKKwlzd2l0Y2ggKGFkZXYt PmFzaWNfdHlwZSkgeworCWNhc2UgQ0hJUF9GSUpJOgorCWNhc2UgQ0hJUF9UT05HQToKKwljYXNl IENISVBfUE9MQVJJUzEwOgorCWNhc2UgQ0hJUF9QT0xBUklTMTE6CisJY2FzZSBDSElQX1BPTEFS SVMxMjoKKwljYXNlIENISVBfVE9QQVo6CisJCXNtdTdfYXNpY19nZXRfYmFjb19jYXBhYmlsaXR5 KGFkZXYsICZiYWNvX3Jlc2V0KTsKKwkJYnJlYWs7CisJZGVmYXVsdDoKKwkJYmFjb19yZXNldCA9 IGZhbHNlOworCQlicmVhazsKKwl9CisKKwlpZiAoYmFjb19yZXNldCkKKwkJcmV0dXJuIEFNRF9S RVNFVF9NRVRIT0RfQkFDTzsKKwllbHNlCisJCXJldHVybiBBTURfUkVTRVRfTUVUSE9EX0xFR0FD WTsKK30KKworLyoqCisgKiB2aV9hc2ljX3Jlc2V0IC0gc29mdCByZXNldCBHUFUKKyAqCisgKiBA YWRldjogYW1kZ3B1X2RldmljZSBwb2ludGVyCisgKgorICogTG9vayB1cCB3aGljaCBibG9ja3Mg YXJlIGh1bmcgYW5kIGF0dGVtcHQKKyAqIHRvIHJlc2V0IHRoZW0uCisgKiBSZXR1cm5zIDAgZm9y IHN1Y2Nlc3MuCisgKi8KK3N0YXRpYyBpbnQgdmlfYXNpY19yZXNldChzdHJ1Y3QgYW1kZ3B1X2Rl dmljZSAqYWRldikKK3sKKwlpbnQgcjsKKworCWlmICh2aV9hc2ljX3Jlc2V0X21ldGhvZChhZGV2 KSA9PSBBTURfUkVTRVRfTUVUSE9EX0JBQ08pCisJCXIgPSBzbXU3X2FzaWNfYmFjb19yZXNldChh ZGV2KTsKKwllbHNlCisJCXIgPSB2aV9hc2ljX3BjaV9jb25maWdfcmVzZXQoYWRldik7CisKKwly ZXR1cm4gcjsKIH0KIAogc3RhdGljIHUzMiB2aV9nZXRfY29uZmlnX21lbXNpemUoc3RydWN0IGFt ZGdwdV9kZXZpY2UgKmFkZXYpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS92aS5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdmkuaAppbmRleCA4ZGUwNzcyZjk4 NmMuLjQwZDQxNzQ5MTNhNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv dmkuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92aS5oCkBAIC0zMSw0ICszMSw3 IEBAIHZvaWQgdmlfc3JibV9zZWxlY3Qoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiBpbnQg dmlfc2V0X2lwX2Jsb2NrcyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldik7CiAKIHZvaWQgbGVn YWN5X2Rvb3JiZWxsX2luZGV4X2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpOworaW50 IHNtdTdfYXNpY19nZXRfYmFjb19jYXBhYmlsaXR5KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2 LCBib29sICpjYXApOworaW50IHNtdTdfYXNpY19iYWNvX3Jlc2V0KHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2KTsKKwogI2VuZGlmCi0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vYW1kLWdmeA==