From: Arun Siluvery Subject: [PATCH v2 2/2] drm/i915/guc: Reset GuC and retry on firmware load failure Date: Tue, 8 Mar 2016 11:38:18 +0000 Message-ID: <1457437098-21689-3-git-send-email-arun.siluvery@linux.intel.com> References: <1457437098-21689-1-git-send-email-arun.siluvery@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 2E2126E01C for ; Tue, 8 Mar 2016 11:38:28 +0000 (UTC) In-Reply-To: <1457437098-21689-1-git-send-email-arun.siluvery@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: Mika Kuoppala List-Id: intel-gfx@lists.freedesktop.org RHVlIHRvIHRpbWluZyBpc3N1ZXMgaW4gdGhlIEhXIHNvbWUgb2YgdGhlIHN0YXR1cyBiaXRzIHJl cXVpcmVkIGZvciBHdUMKYXV0aGVudGljYXRpb24gZG9lc24ndCBnZXQgc2V0IG9jY2Fzc2lvbmFs bHksIHdoZW4gdGhhdCBoYXBwZW5zLCBHdUMgY2Fubm90CmJlIGluaXRpYWxpemVkIGFuZCB3ZSB3 aWxsIGJlIGxlZnQgd2l0aCBhIHdlZGdlZCBHUFUuIFRoZSBXQSBzdWdnZXN0ZWQgaXMKdG8gcGVy Zm9ybSBhIHNvZnQgcmVzZXQgb2YgR3VDIGFuZCBhdHRlbXB0IHRvIHJlbG9hZCB0aGUgZncgYWdh aW4gZm9yIGZldwp0aW1lcyBiZWZvcmUgZ2l2aW5nIHVwLgoKQXMgdGhlIGZhaWx1cmUgaXMgZGVw ZW5kZW50IG9uIHRpbWluZywgdGVzdHMgcGVyZm9ybWVkIGJ5IHRyaWdnZXJpbmcgbWFudWFsCmZ1 bGwgZ3B1IHJlc2V0IChpOTE1X3dlZGdlZCkgc2hvd2VkIHRoYXQgd2UgY291bGQgc29tZXRpbWVz IGhpdCB0aGlzIGFmdGVyCnNldmVyYWwgdGhvdXNhbmQgaXRlcmF0aW9ucyBidXQgc29tZXRpbWVz IHRlc3RzIHJhbiBldmVuIGxvbmdlciB3aXRob3V0IGFueQppc3N1ZXMuIFJlc2V0IGFuZCByZWxv YWQgbWVjaGFuaXNtIHByb3ZlZCBoZWxwZnVsIHdoZW4gd2UgaW5kZWVkIGhpdCBmdwpsb2FkIGZh aWx1cmUgc28gaXQgaXMgYmV0dGVyIHRvIGluY2x1ZGUgdGhpcyB0byBpbXByb3ZlIGRyaXZlciBz dGFiaWxpdHkuCgpUaGlzIGNoYW5nZSBpbXBsZW1lbnRzIHRoZSBmb2xsb3dpbmcgV0EsCgpXYUVu YWJsZXVLZXJuZWxIZWFkZXJWYWxpZEZpeDpza2wsYnh0CldhRW5hYmxlR3VDQm9vdEhhc2hDaGVj a05vdFNldDpza2wsYnh0CgpDYzogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNv bT4KQ2M6IEFsZXggRGFpIDx5dS5kYWlAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBBcnVuIFNp bHV2ZXJ5IDxhcnVuLnNpbHV2ZXJ5QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2d1Y19yZWcuaCAgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5o ICAgICAgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMg fCA0OSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3VuY29yZS5jICAgICB8IDE5ICsrKysrKysrKysrKysKIDUgZmlsZXMgY2hhbmdl ZCwgNjkgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aAppbmRleCBmMzdhYzEyLi4wZGY3YzgyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI3 NTcsNiArMjc1Nyw3IEBAIGV4dGVybiBsb25nIGk5MTVfY29tcGF0X2lvY3RsKHN0cnVjdCBmaWxl ICpmaWxwLCB1bnNpZ25lZCBpbnQgY21kLAogZXh0ZXJuIGludCBpbnRlbF9ncHVfcmVzZXQoc3Ry dWN0IGRybV9kZXZpY2UgKmRldik7CiBleHRlcm4gYm9vbCBpbnRlbF9oYXNfZ3B1X3Jlc2V0KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogZXh0ZXJuIGludCBpOTE1X3Jlc2V0KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpOworZXh0ZXJuIGludCBpbnRlbF9ndWNfcmVzZXQoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KTsKIGV4dGVybiB1bnNpZ25lZCBsb25nIGk5MTVfY2hpcHNldF92 YWwoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIGV4dGVybiB1bnNpZ25lZCBs b25nIGk5MTVfbWNoX3ZhbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogZXh0 ZXJuIHVuc2lnbmVkIGxvbmcgaTkxNV9nZnhfdmFsKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19yZWcu aCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3JlZy5oCmluZGV4IGU0YmE1ODIuLjk0 Y2VlZTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3JlZy5oCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3JlZy5oCkBAIC0yNyw2ICsyNyw3IEBA CiAvKiBEZWZpbml0aW9ucyBvZiBHdUMgSC9XIHJlZ2lzdGVycywgYml0cywgZXRjICovCiAKICNk ZWZpbmUgR1VDX1NUQVRVUwkJCV9NTUlPKDB4YzAwMCkKKyNkZWZpbmUgICBHU19NSUFfSU5fUkVT RVQJCSgxIDw8IDApCiAjZGVmaW5lICAgR1NfQk9PVFJPTV9TSElGVAkJMQogI2RlZmluZSAgIEdT X0JPT1RST01fTUFTSwkJICAoMHg3RiA8PCBHU19CT09UUk9NX1NISUZUKQogI2RlZmluZSAgIEdT X0JPT1RST01fUlNBX0ZBSUxFRAkJICAoMHg1MCA8PCBHU19CT09UUk9NX1NISUZUKQpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfcmVnLmgKaW5kZXggN2RmYzQwMC4uNDhhMjNkZSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X3JlZy5oCkBAIC0xNjQsNiArMTY0LDcgQEAgc3RhdGljIGlubGluZSBib29sIGk5MTVfbW1pb19y ZWdfdmFsaWQoaTkxNV9yZWdfdCByZWcpCiAjZGVmaW5lICBHRU42X0dSRE9NX1JFTkRFUgkJKDEg PDwgMSkKICNkZWZpbmUgIEdFTjZfR1JET01fTUVESUEJCSgxIDw8IDIpCiAjZGVmaW5lICBHRU42 X0dSRE9NX0JMVAkJCSgxIDw8IDMpCisjZGVmaW5lICBHRU45X0dSRE9NX0dVQwkJCSgxIDw8IDUp CiAKICNkZWZpbmUgUklOR19QUF9ESVJfQkFTRShyaW5nKQkJX01NSU8oKHJpbmcpLT5tbWlvX2Jh c2UrMHgyMjgpCiAjZGVmaW5lIFJJTkdfUFBfRElSX0JBU0VfUkVBRChyaW5nKQlfTU1JTygocmlu ZyktPm1taW9fYmFzZSsweDUxOCkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2d1Y19sb2FkZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIu YwppbmRleCA4MmEzYzAzLi5mOWNiODE0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9ndWNfbG9hZGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3Vj X2xvYWRlci5jCkBAIC0zNTMsNiArMzUzLDI0IEBAIHN0YXRpYyBpbnQgZ3VjX3Vjb2RlX3hmZXIo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCXJldHVybiByZXQ7CiB9CiAKK3N0 YXRpYyBpbnQgaTkxNV9yZXNldF9ndWMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQoreworCWludCByZXQ7CisJdTMyIGd1Y19zdGF0dXM7CisKKwlyZXQgPSBpbnRlbF9ndWNfcmVz ZXQoZGV2X3ByaXYpOworCWlmIChyZXQpIHsKKwkJRFJNX0VSUk9SKCJHdUMgcmVzZXQgZmFpbGVk LCByZXQgPSAlZFxuIiwgcmV0KTsKKwkJcmV0dXJuIHJldDsKKwl9CisKKwlndWNfc3RhdHVzID0g STkxNV9SRUFEKEdVQ19TVEFUVVMpOworCVdBUk4oIShndWNfc3RhdHVzICYgR1NfTUlBX0lOX1JF U0VUKSwKKwkgICAgICJHdUMgc3RhdHVzOiAweCV4LCBNSUEgY29yZSBleHBlY3RlZCB0byBiZSBp biByZXNldFxuIiwgZ3VjX3N0YXR1cyk7CisKKwlyZXR1cm4gcmV0OworfQorCiAvKioKICAqIGlu dGVsX2d1Y191Y29kZV9sb2FkKCkgLSBsb2FkIEd1QyB1Q29kZSBpbnRvIHRoZSBkZXZpY2UKICAq IEBkZXY6CWRybSBkZXZpY2UKQEAgLTQxNyw5ICs0MzUsMzYgQEAgaW50IGludGVsX2d1Y191Y29k ZV9sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaWYgKGVycikKIAkJZ290byBmYWlsOwog CisJLyoKKwkgKiBXYUVuYWJsZXVLZXJuZWxIZWFkZXJWYWxpZEZpeDpza2wsYnh0CisJICogRm9y IEJYVCwgdGhpcyBpcyBvbmx5IHVwdG8gQjAgYnV0IGJlbG93IFdBIGlzIHJlcXVpcmVkIGZvciBs YXRlcgorCSAqIHN0ZXBwaW5ncyBhbHNvIHNvIHRoaXMgaXMgZXh0ZW5kZWQgYXMgd2VsbC4KKwkg Ki8KKwkvKiBXYUVuYWJsZUd1Q0Jvb3RIYXNoQ2hlY2tOb3RTZXQ6c2tsLGJ4dCAqLwogCWVyciA9 IGd1Y191Y29kZV94ZmVyKGRldl9wcml2KTsKLQlpZiAoZXJyKQotCQlnb3RvIGZhaWw7CisJaWYg KGVycikgeworCQlpbnQgcmV0cmllcyA9IDM7CisKKwkJRFJNX0VSUk9SKCJHdUMgZncgbG9hZCBm YWlsZWQsIGVycj0lZCwgYXR0ZW1wdGluZyByZXNldCBhbmQgcmV0cnlcbiIsIGVycik7CisKKwkJ d2hpbGUgKHJldHJpZXMtLSkgeworCQkJZXJyID0gaTkxNV9yZXNldF9ndWMoZGV2X3ByaXYpOwor CQkJaWYgKGVycikKKwkJCQlicmVhazsKKworCQkJZXJyID0gZ3VjX3Vjb2RlX3hmZXIoZGV2X3By aXYpOworCQkJaWYgKCFlcnIpIHsKKwkJCQlEUk1fREVCVUdfRFJJVkVSKCJHdUMgZncgcmVsb2Fk IHN1Y2NlZWRlZCBhZnRlciByZXNldFxuIik7CisJCQkJYnJlYWs7CisJCQl9CisJCQlEUk1fREVC VUdfRFJJVkVSKCJHdUMgZncgcmVsb2FkIHJldHJpZXMgbGVmdDogJWRcbiIsIHJldHJpZXMpOwor CQl9CisKKwkJaWYgKGVycikgeworCQkJRFJNX0VSUk9SKCJHdUMgZncgcmVsb2FkIGF0dGVtcHQg ZmFpbGVkLCByZXQ9JWRcbiIsIGVycik7CisJCQlnb3RvIGZhaWw7CisJCX0KKwl9CiAKIAlndWNf ZnctPmd1Y19md19sb2FkX3N0YXR1cyA9IEdVQ19GSVJNV0FSRV9TVUNDRVNTOwogCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3VuY29yZS5jCmluZGV4IDgwZTM4ZDUuLjkyYmU3NmEgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3VuY29yZS5jCkBAIC0xNjQ3LDYgKzE2NDcsMjUgQEAgYm9vbCBpbnRlbF9o YXNfZ3B1X3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJcmV0dXJuIGludGVsX2dldF9n cHVfcmVzZXQoZGV2KSAhPSBOVUxMOwogfQogCitpbnQgaW50ZWxfZ3VjX3Jlc2V0KHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3sKKwlpbnQgcmV0OworCXVuc2lnbmVkIGxvbmcg aXJxZmxhZ3M7CisKKwlpZiAoIWk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uKQorCQlyZXR1cm4g LUVJTlZBTDsKKworCWludGVsX3VuY29yZV9mb3JjZXdha2VfZ2V0KGRldl9wcml2LCBGT1JDRVdB S0VfQUxMKTsKKwlzcGluX2xvY2tfaXJxc2F2ZSgmZGV2X3ByaXYtPnVuY29yZS5sb2NrLCBpcnFm bGFncyk7CisKKwlyZXQgPSBnZW42X2RvbWFpbl9yZXNldChkZXZfcHJpdiwgR0VOOV9HUkRPTV9H VUMpOworCisJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmZGV2X3ByaXYtPnVuY29yZS5sb2NrLCBp cnFmbGFncyk7CisJaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9wdXQoZGV2X3ByaXYsIEZPUkNFV0FL RV9BTEwpOworCisJcmV0dXJuIHJldDsKK30KKwogYm9vbCBpbnRlbF91bmNvcmVfdW5jbGFpbWVk X21taW8oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCXJldHVybiBjaGVj a19mb3JfdW5jbGFpbWVkX21taW8oZGV2X3ByaXYpOwotLSAKMS45LjEKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=