From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arun Siluvery <arun.siluvery@linux.intel.com>
Subject: [PATCH 2/2] drm/i915/guc: Reset GuC and retry on
	firmware load failure
Date: Tue,  1 Mar 2016 17:14:39 +0000
Message-ID: <1456852479-9375-3-git-send-email-arun.siluvery@linux.intel.com>
References: <1456852479-9375-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga04.intel.com (mga04.intel.com [192.55.52.120])
 by gabe.freedesktop.org (Postfix) with ESMTP id 6665A6E6FD
 for <intel-gfx@lists.freedesktop.org>; Tue,  1 Mar 2016 17:14:53 +0000 (UTC)
In-Reply-To: <1456852479-9375-1-git-send-email-arun.siluvery@linux.intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
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
OTE1L2ludGVsX3VuY29yZS5jICAgICB8IDE3ICsrKysrKysrKysrKwogNSBmaWxlcyBjaGFuZ2Vk
LCA2NyBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o
CmluZGV4IDU1ZGFkZmMuLjNlNWEyZTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjc0
Miw2ICsyNzQyLDcgQEAgZXh0ZXJuIGxvbmcgaTkxNV9jb21wYXRfaW9jdGwoc3RydWN0IGZpbGUg
KmZpbHAsIHVuc2lnbmVkIGludCBjbWQsCiAjZW5kaWYKIGV4dGVybiBpbnQgaW50ZWxfZ3B1X3Jl
c2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogZXh0ZXJuIGludCBpbnRlbF9lbmdpbmVfcmVz
ZXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKK2V4dGVybiBpbnQgaW50ZWxfZ3Vj
X3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiBleHRlcm4gYm9vbCBp
bnRlbF9oYXNfZ3B1X3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogZXh0ZXJuIGludCBp
OTE1X3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogZXh0ZXJuIHVuc2lnbmVkIGxvbmcg
aTkxNV9jaGlwc2V0X3ZhbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwpkaWZm
IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfcmVnLmggYi9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pOTE1X2d1Y19yZWcuaAppbmRleCBlNGJhNTgyLi45NGNlZWU1IDEwMDY0NAot
LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19yZWcuaAorKysgYi9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pOTE1X2d1Y19yZWcuaApAQCAtMjcsNiArMjcsNyBAQAogLyogRGVmaW5pdGlv
bnMgb2YgR3VDIEgvVyByZWdpc3RlcnMsIGJpdHMsIGV0YyAqLwogCiAjZGVmaW5lIEdVQ19TVEFU
VVMJCQlfTU1JTygweGMwMDApCisjZGVmaW5lICAgR1NfTUlBX0lOX1JFU0VUCQkoMSA8PCAwKQog
I2RlZmluZSAgIEdTX0JPT1RST01fU0hJRlQJCTEKICNkZWZpbmUgICBHU19CT09UUk9NX01BU0sJ
CSAgKDB4N0YgPDwgR1NfQk9PVFJPTV9TSElGVCkKICNkZWZpbmUgICBHU19CT09UUk9NX1JTQV9G
QUlMRUQJCSAgKDB4NTAgPDwgR1NfQk9PVFJPTV9TSElGVCkKZGlmZiAtLWdpdCBhL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2k5MTVfcmVnLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5o
CmluZGV4IGE3OThlNDAuLjQ0OTZmYzcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2k5MTVfcmVnLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaApAQCAtMTY2
LDYgKzE2Niw3IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpOTE1X21taW9fcmVnX3ZhbGlkKGk5MTVf
cmVnX3QgcmVnKQogI2RlZmluZSAgR0VONl9HUkRPTV9CTFQJCQkoMSA8PCAzKQogI2RlZmluZSAg
R0VONl9HUkRPTV9WRUNTCQkoMSA8PCA0KQogI2RlZmluZSAgR0VOOF9HUkRPTV9NRURJQTIJCSgx
IDw8IDcpCisjZGVmaW5lICBHRU45X0dSRE9NX0dVQwkJICAgICAgICAoMSA8PCA1KQogCiAjZGVm
aW5lIFJJTkdfUFBfRElSX0JBU0UocmluZykJCV9NTUlPKChyaW5nKS0+bW1pb19iYXNlKzB4MjI4
KQogI2RlZmluZSBSSU5HX1BQX0RJUl9CQVNFX1JFQUQocmluZykJX01NSU8oKHJpbmcpLT5tbWlv
X2Jhc2UrMHg1MTgpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNf
bG9hZGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKaW5kZXgg
ODJhM2MwMy4uZjljYjgxNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
Z3VjX2xvYWRlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIu
YwpAQCAtMzUzLDYgKzM1MywyNCBAQCBzdGF0aWMgaW50IGd1Y191Y29kZV94ZmVyKHN0cnVjdCBk
cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlyZXR1cm4gcmV0OwogfQogCitzdGF0aWMgaW50
IGk5MTVfcmVzZXRfZ3VjKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3sKKwlp
bnQgcmV0OworCXUzMiBndWNfc3RhdHVzOworCisJcmV0ID0gaW50ZWxfZ3VjX3Jlc2V0KGRldl9w
cml2KTsKKwlpZiAocmV0KSB7CisJCURSTV9FUlJPUigiR3VDIHJlc2V0IGZhaWxlZCwgcmV0ID0g
JWRcbiIsIHJldCk7CisJCXJldHVybiByZXQ7CisJfQorCisJZ3VjX3N0YXR1cyA9IEk5MTVfUkVB
RChHVUNfU1RBVFVTKTsKKwlXQVJOKCEoZ3VjX3N0YXR1cyAmIEdTX01JQV9JTl9SRVNFVCksCisJ
ICAgICAiR3VDIHN0YXR1czogMHgleCwgTUlBIGNvcmUgZXhwZWN0ZWQgdG8gYmUgaW4gcmVzZXRc
biIsIGd1Y19zdGF0dXMpOworCisJcmV0dXJuIHJldDsKK30KKwogLyoqCiAgKiBpbnRlbF9ndWNf
dWNvZGVfbG9hZCgpIC0gbG9hZCBHdUMgdUNvZGUgaW50byB0aGUgZGV2aWNlCiAgKiBAZGV2Oglk
cm0gZGV2aWNlCkBAIC00MTcsOSArNDM1LDM2IEBAIGludCBpbnRlbF9ndWNfdWNvZGVfbG9hZChz
dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmIChlcnIpCiAJCWdvdG8gZmFpbDsKIAorCS8qCisJ
ICogV2FFbmFibGV1S2VybmVsSGVhZGVyVmFsaWRGaXg6c2tsLGJ4dAorCSAqIEZvciBCWFQsIHRo
aXMgaXMgb25seSB1cHRvIEIwIGJ1dCBiZWxvdyBXQSBpcyByZXF1aXJlZCBmb3IgbGF0ZXIKKwkg
KiBzdGVwcGluZ3MgYWxzbyBzbyB0aGlzIGlzIGV4dGVuZGVkIGFzIHdlbGwuCisJICovCisJLyog
V2FFbmFibGVHdUNCb290SGFzaENoZWNrTm90U2V0OnNrbCxieHQgKi8KIAllcnIgPSBndWNfdWNv
ZGVfeGZlcihkZXZfcHJpdik7Ci0JaWYgKGVycikKLQkJZ290byBmYWlsOworCWlmIChlcnIpIHsK
KwkJaW50IHJldHJpZXMgPSAzOworCisJCURSTV9FUlJPUigiR3VDIGZ3IGxvYWQgZmFpbGVkLCBl
cnI9JWQsIGF0dGVtcHRpbmcgcmVzZXQgYW5kIHJldHJ5XG4iLCBlcnIpOworCisJCXdoaWxlIChy
ZXRyaWVzLS0pIHsKKwkJCWVyciA9IGk5MTVfcmVzZXRfZ3VjKGRldl9wcml2KTsKKwkJCWlmIChl
cnIpCisJCQkJYnJlYWs7CisKKwkJCWVyciA9IGd1Y191Y29kZV94ZmVyKGRldl9wcml2KTsKKwkJ
CWlmICghZXJyKSB7CisJCQkJRFJNX0RFQlVHX0RSSVZFUigiR3VDIGZ3IHJlbG9hZCBzdWNjZWVk
ZWQgYWZ0ZXIgcmVzZXRcbiIpOworCQkJCWJyZWFrOworCQkJfQorCQkJRFJNX0RFQlVHX0RSSVZF
UigiR3VDIGZ3IHJlbG9hZCByZXRyaWVzIGxlZnQ6ICVkXG4iLCByZXRyaWVzKTsKKwkJfQorCisJ
CWlmIChlcnIpIHsKKwkJCURSTV9FUlJPUigiR3VDIGZ3IHJlbG9hZCBhdHRlbXB0IGZhaWxlZCwg
cmV0PSVkXG4iLCBlcnIpOworCQkJZ290byBmYWlsOworCQl9CisJfQogCiAJZ3VjX2Z3LT5ndWNf
ZndfbG9hZF9zdGF0dXMgPSBHVUNfRklSTVdBUkVfU1VDQ0VTUzsKIApkaWZmIC0tZ2l0IGEvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF91bmNvcmUuYwppbmRleCBkMDAzYjc4Li4xOTIyMGI5IDEwMDY0NAotLS0gYS9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF91bmNvcmUuYwpAQCAtMTY4Myw2ICsxNjgzLDIzIEBAIGludCBpbnRlbF9lbmdpbmVfcmVz
ZXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCXJldHVybiBnZW44X2RvX2VuZ2lu
ZV9yZXNldChlbmdpbmUpOwogfQogCitpbnQgaW50ZWxfZ3VjX3Jlc2V0KHN0cnVjdCBkcm1faTkx
NV9wcml2YXRlICpkZXZfcHJpdikKK3sKKwlpbnQgcmV0OworCisJaWYgKCFpOTE1LmVuYWJsZV9n
dWNfc3VibWlzc2lvbikKKwkJcmV0dXJuIC1FSU5WQUw7CisKKwlpbnRlbF91bmNvcmVfZm9yY2V3
YWtlX2dldChkZXZfcHJpdiwgRk9SQ0VXQUtFX0FMTCk7CisKKwlfX3Jhd19pOTE1X3dyaXRlMzIo
ZGV2X3ByaXYsIEdFTjZfR0RSU1QsIEdFTjlfR1JET01fR1VDKTsKKwlyZXQgPSB3YWl0X2Zvcl9l
bmdpbmVfcmVzZXQoZGV2X3ByaXYsIEdFTjlfR1JET01fR1VDKTsKKworCWludGVsX3VuY29yZV9m
b3JjZXdha2VfcHV0KGRldl9wcml2LCBGT1JDRVdBS0VfQUxMKTsKKworCXJldHVybiByZXQ7Cit9
CisKIGJvb2wgaW50ZWxfdW5jb3JlX3VuY2xhaW1lZF9tbWlvKHN0cnVjdCBkcm1faTkxNV9wcml2
YXRlICpkZXZfcHJpdikKIHsKIAlyZXR1cm4gY2hlY2tfZm9yX3VuY2xhaW1lZF9tbWlvKGRldl9w
cml2KTsKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv
cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl
bC1nZngK