From: Rex Zhu Subject: [PATCH] drm/amdgpu: fix regresstion on SR-IOV gpu reset failed Date: Wed, 18 Oct 2017 17:29:39 +0800 Message-ID: <1508318979-30613-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: 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 ZncgdWNvZGUgaXMgY29ycnVwdGVkIGFmdGVyIHZmIGZsciBieSBQU1Agc28gdWNvZGVfaW5pdCgp IGlzCmEgbXVzdCBpbiBwc3BfaHdfaW5pdCBvdGhld2lzZSBLSVEvS0NRIGVuYWJsaW5nIHdpbGwg ZmFpbAoKUmV2ZXJ0ICJkcm0vYW1kZ3B1OiByZWZpbmUgY29kZSBkZWxldGUgZHVwbGljYXRlZCBl cnJvciBoYW5kbGluZyIKVGhpcyByZXZlcnRzIGNvbW1pdCBlNTdiODdmZjgyOGY5NWVmZTk5MjQ2 OGU2ZDE4YzJjMDU5YjI3YWE5LgpSZXZlcnQgImRybS9hbWRncHU6IG1vdmUgYW1kZ3B1X3Vjb2Rl X2luaXRfYm8gdG8gYW1kZ3B1X2RldmljZS5jIgpUaGlzIHJldmVydHMgY29tbWl0IDgxNWI4Zjg1 OTUxNDhkMDZhNjRkMmNlNDI4MmU4ZTgwZGZjYjAyZjEuCgpDaGFuZ2UtSWQ6IEk0YzRmMDVjZTg1 Zjc4MjhlN2FjMTlhMmJmZmZhMjIzNjE0Y2NhNTlhClNpZ25lZC1vZmYtYnk6IFJleCBaaHUgPFJl eC5aaHVAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2 aWNlLmMgICAgfCA4IC0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVf cG93ZXJwbGF5LmMgfCA1ICsrKysrCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVf cHNwLmMgICAgICAgfCA5ICsrKysrKysrKwogMyBmaWxlcyBjaGFuZ2VkLCAxNCBpbnNlcnRpb25z KCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdV9kZXZpY2UuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9k ZXZpY2UuYwppbmRleCAyYWU0ODhiLi4wZTM1ZTA5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvYW1kZ3B1X2RldmljZS5jCkBAIC0xNjgwLDcgKzE2ODAsNiBAQCBzdGF0aWMgaW50IGFt ZGdwdV9pbml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCQkJcmV0dXJuIHI7CiAJCX0K IAkJYWRldi0+aXBfYmxvY2tzW2ldLnN0YXR1cy5zdyA9IHRydWU7Ci0KIAkJLyogbmVlZCB0byBk byBnbWMgaHcgaW5pdCBlYXJseSBzbyB3ZSBjYW4gYWxsb2NhdGUgZ3B1IG1lbSAqLwogCQlpZiAo YWRldi0+aXBfYmxvY2tzW2ldLnZlcnNpb24tPnR5cGUgPT0gQU1EX0lQX0JMT0NLX1RZUEVfR01D KSB7CiAJCQlyID0gYW1kZ3B1X3ZyYW1fc2NyYXRjaF9pbml0KGFkZXYpOwpAQCAtMTcxMSwxMSAr MTcxMCw2IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFk ZXYpCiAJCX0KIAl9CiAKLQltdXRleF9sb2NrKCZhZGV2LT5maXJtd2FyZS5tdXRleCk7Ci0JaWYg KGFkZXYtPmZpcm13YXJlLmxvYWRfdHlwZSAhPSBBTURHUFVfRldfTE9BRF9ESVJFQ1QpCi0JCWFt ZGdwdV91Y29kZV9pbml0X2JvKGFkZXYpOwotCW11dGV4X3VubG9jaygmYWRldi0+ZmlybXdhcmUu bXV0ZXgpOwotCiAJZm9yIChpID0gMDsgaSA8IGFkZXYtPm51bV9pcF9ibG9ja3M7IGkrKykgewog CQlpZiAoIWFkZXYtPmlwX2Jsb2Nrc1tpXS5zdGF0dXMuc3cpCiAJCQljb250aW51ZTsKQEAgLTE4 NTEsOCArMTg0NSw2IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X2Zpbmkoc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYpCiAKIAkJYWRldi0+aXBfYmxvY2tzW2ldLnN0YXR1cy5odyA9IGZhbHNlOwogCX0K LQlpZiAoYWRldi0+ZmlybXdhcmUubG9hZF90eXBlICE9IEFNREdQVV9GV19MT0FEX0RJUkVDVCkK LQkJYW1kZ3B1X3Vjb2RlX2ZpbmlfYm8oYWRldik7CiAKIAlmb3IgKGkgPSBhZGV2LT5udW1faXBf YmxvY2tzIC0gMTsgaSA+PSAwOyBpLS0pIHsKIAkJaWYgKCFhZGV2LT5pcF9ibG9ja3NbaV0uc3Rh dHVzLnN3KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3Bv d2VycGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3Bvd2VycGxheS5j CmluZGV4IDNiNDJmNDAuLjVmNWFhNWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV9wb3dlcnBsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfcG93ZXJwbGF5LmMKQEAgLTE0NSw2ICsxNDUsOCBAQCBzdGF0aWMgaW50IGFtZGdw dV9wcF9od19pbml0KHZvaWQgKmhhbmRsZSkKIAlpbnQgcmV0ID0gMDsKIAlzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldiA9IChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqKWhhbmRsZTsKIAorCWlmIChh ZGV2LT5maXJtd2FyZS5sb2FkX3R5cGUgPT0gQU1ER1BVX0ZXX0xPQURfU01VKQorCQlhbWRncHVf dWNvZGVfaW5pdF9ibyhhZGV2KTsKIAogCWlmIChhZGV2LT5wb3dlcnBsYXkuaXBfZnVuY3MtPmh3 X2luaXQpCiAJCXJldCA9IGFkZXYtPnBvd2VycGxheS5pcF9mdW5jcy0+aHdfaW5pdCgKQEAgLTE2 Miw2ICsxNjQsOSBAQCBzdGF0aWMgaW50IGFtZGdwdV9wcF9od19maW5pKHZvaWQgKmhhbmRsZSkK IAkJcmV0ID0gYWRldi0+cG93ZXJwbGF5LmlwX2Z1bmNzLT5od19maW5pKAogCQkJCQlhZGV2LT5w b3dlcnBsYXkucHBfaGFuZGxlKTsKIAorCWlmIChhZGV2LT5maXJtd2FyZS5sb2FkX3R5cGUgPT0g QU1ER1BVX0ZXX0xPQURfU01VKQorCQlhbWRncHVfdWNvZGVfZmluaV9ibyhhZGV2KTsKKwogCXJl dHVybiByZXQ7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Ft ZGdwdV9wc3AuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9wc3AuYwppbmRl eCBmMTAzNWE2Li40NDdkNDQ2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfcHNwLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3Bz cC5jCkBAIC00MTEsNiArNDExLDEzIEBAIHN0YXRpYyBpbnQgcHNwX2h3X2luaXQodm9pZCAqaGFu ZGxlKQogCQlyZXR1cm4gMDsKIAogCW11dGV4X2xvY2soJmFkZXYtPmZpcm13YXJlLm11dGV4KTsK KwkvKgorCSAqIFRoaXMgc2VxdWVuY2UgaXMganVzdCB1c2VkIG9uIGh3X2luaXQgb25seSBvbmNl LCBubyBuZWVkIG9uCisJICogcmVzdW1lLgorCSAqLworCXJldCA9IGFtZGdwdV91Y29kZV9pbml0 X2JvKGFkZXYpOworCWlmIChyZXQpCisJCWdvdG8gZmFpbGVkOwogCiAJcmV0ID0gcHNwX2xvYWRf ZncoYWRldik7CiAJaWYgKHJldCkgewpAQCAtNDM1LDYgKzQ0Miw4IEBAIHN0YXRpYyBpbnQgcHNw X2h3X2Zpbmkodm9pZCAqaGFuZGxlKQogCWlmIChhZGV2LT5maXJtd2FyZS5sb2FkX3R5cGUgIT0g QU1ER1BVX0ZXX0xPQURfUFNQKQogCQlyZXR1cm4gMDsKIAorCWFtZGdwdV91Y29kZV9maW5pX2Jv KGFkZXYpOworCiAJcHNwX3JpbmdfZGVzdHJveShwc3AsIFBTUF9SSU5HX1RZUEVfX0tNKTsKIAog CWFtZGdwdV9ib19mcmVlX2tlcm5lbCgmcHNwLT50bXJfYm8sICZwc3AtPnRtcl9tY19hZGRyLCAm cHNwLT50bXJfYnVmKTsKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2FtZC1nZngK