From: Michal Wajdeczko Subject: [PATCH v4] drm/i915: Add Guc/HuC firmware details to error state Date: Fri, 20 Oct 2017 17:33:44 +0000 Message-ID: <20171020173344.26384-1-michal.wajdeczko@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 ESMTPS id 8B39C6E221 for ; Fri, 20 Oct 2017 17:34:30 +0000 (UTC) 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 List-Id: intel-gfx@lists.freedesktop.org SW5jbHVkZSBHdUMgYW5kIEh1QyBmaXJtd2FyZSBkZXRhaWxzIGluIGNhcHR1cmVkIGVycm9yIHN0 YXRlCnRvIHByb3ZpZGUgYWRkaXRpb25hbCBkZWJ1ZyBpbmZvcm1hdGlvbi4gVG8gcmV1c2UgZXhp c3RpbmcKdWMgZmlybXdhcmUgcHJldHR5IHByaW50ZXIsIGludHJvZHVjZSBuZXcgZHJtLXByaW50 ZXIgdmFyaWFudAp0aGF0IHdvcmtzIHdpdGggb3VyIGk5MTVfZXJyb3Jfc3RhdGVfYnVmIG91dHB1 dC4gQWxzbyB1cGRhdGUKdWMgZmlybXdhcmUgcHJldHR5IHByaW50ZXIgdG8gYWNjZXB0IGNvbnN0 IGlucHV0LgoKdjI6IGRvbid0IHJlbHkgb24gY3VycmVudCBjYXBzIChDaHJpcykKICAgIGR1bXAg Y29ycmVjdCBmdyBpbmZvIChNaWNoYWwpCnYzOiBzaW1wbGlmeSBjYXB0dXJlIG9mIGN1c3RvbSBw YXRocyAoQ2hyaXMpCnY0OiBpbXByb3ZlICd3aHknIGNvbW1lbnQgKEpvb25hcykKICAgIHRyaW0g b3V0cHV0IGlmIG5vIGZ3IHBhdGggKE1pY2hhbCkKICAgIGdyb3VwIGNvZGUgYXJvdW5kIHVjIGVy cm9yIHN0YXRlIChNaWNoYWwpCgpTdWdnZXN0ZWQtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hy aXMtd2lsc29uLmNvLnVrPgpTaWduZWQtb2ZmLWJ5OiBNaWNoYWwgV2FqZGVjemtvIDxtaWNoYWwu d2FqZGVjemtvQGludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29u LmNvLnVrPgpDYzogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwu Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgfCAgNSArKysK IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMgfCA2MyArKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWNfZncu YyAgICB8ICA2ICsrKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjX2Z3LmggICAgfCAg MiArLQogNCBmaWxlcyBjaGFuZ2VkLCA3NCBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDliY2YxZDEuLjkwYTZmMWEgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuaApAQCAtOTExLDYgKzkxMSwxMSBAQCBzdHJ1Y3QgaTkxNV9ncHVfc3RhdGUg ewogCXN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBkZXZpY2VfaW5mbzsKIAlzdHJ1Y3QgaTkxNV9w YXJhbXMgcGFyYW1zOwogCisJc3RydWN0IGk5MTVfZXJyb3JfdWMgeworCQlzdHJ1Y3QgaW50ZWxf dWNfZncgZ3VjX2Z3OworCQlzdHJ1Y3QgaW50ZWxfdWNfZncgaHVjX2Z3OworCX0gdWM7CisKIAkv KiBHZW5lcmljIHJlZ2lzdGVyIHN0YXRlICovCiAJdTMyIGVpcjsKIAl1MzIgcGd0YmxfZXI7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwppbmRleCA2NTNmYjY5Li4yMzhmYjU0IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKQEAgLTMwLDYgKzMwLDggQEAKICNp bmNsdWRlIDxnZW5lcmF0ZWQvdXRzcmVsZWFzZS5oPgogI2luY2x1ZGUgPGxpbnV4L3N0b3BfbWFj aGluZS5oPgogI2luY2x1ZGUgPGxpbnV4L3psaWIuaD4KKyNpbmNsdWRlIDxkcm0vZHJtX3ByaW50 Lmg+CisKICNpbmNsdWRlICJpOTE1X2Rydi5oIgogCiBzdGF0aWMgY29uc3QgY2hhciAqZW5naW5l X3N0cihpbnQgZW5naW5lKQpAQCAtMTc1LDYgKzE3NywyMSBAQCBzdGF0aWMgdm9pZCBpOTE1X2Vy cm9yX3B1dHMoc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiAqZSwKICNkZWZpbmUgZXJy X3ByaW50ZihlLCAuLi4pIGk5MTVfZXJyb3JfcHJpbnRmKGUsIF9fVkFfQVJHU19fKQogI2RlZmlu ZSBlcnJfcHV0cyhlLCBzKSBpOTE1X2Vycm9yX3B1dHMoZSwgcykKIAorc3RhdGljIHZvaWQgX19p OTE1X3ByaW50Zm5fZXJyb3Ioc3RydWN0IGRybV9wcmludGVyICpwLCBzdHJ1Y3QgdmFfZm9ybWF0 ICp2YWYpCit7CisJaTkxNV9lcnJvcl92cHJpbnRmKHAtPmFyZywgdmFmLT5mbXQsICp2YWYtPnZh KTsKK30KKworc3RhdGljIGlubGluZSBzdHJ1Y3QgZHJtX3ByaW50ZXIKK2k5MTVfZXJyb3JfcHJp bnRlcihzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGVfYnVmICplKQoreworCXN0cnVjdCBkcm1f cHJpbnRlciBwID0geworCQkucHJpbnRmbiA9IF9faTkxNV9wcmludGZuX2Vycm9yLAorCQkuYXJn ID0gZSwKKwl9OworCXJldHVybiBwOworfQorCiAjaWZkZWYgQ09ORklHX0RSTV9JOTE1X0NPTVBS RVNTX0VSUk9SCiAKIHN0cnVjdCBjb21wcmVzcyB7CkBAIC01ODksMTEgKzYwNiwyNiBAQCBzdGF0 aWMgdm9pZCBlcnJfcHJpbnRfcGNpaWQoc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiAq bSwKIAkJICAgcGRldi0+c3Vic3lzdGVtX2RldmljZSk7CiB9CiAKK3N0YXRpYyB2b2lkIGVycl9w cmludF91YyhzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGVfYnVmICptLAorCQkJIGNvbnN0IHN0 cnVjdCBpOTE1X2Vycm9yX3VjICplcnJvcl91YykKK3sKKwlzdHJ1Y3QgZHJtX3ByaW50ZXIgcCA9 IGk5MTVfZXJyb3JfcHJpbnRlcihtKTsKKwljb25zdCBzdHJ1Y3QgaTkxNV9ncHVfc3RhdGUgKmVy cm9yID0KKwkJY29udGFpbmVyX29mKGVycm9yX3VjLCB0eXBlb2YoKmVycm9yKSwgdWMpOworCisJ aWYgKCFlcnJvci0+ZGV2aWNlX2luZm8uaGFzX2d1YykKKwkJcmV0dXJuOworCisJaW50ZWxfdWNf ZndfZHVtcCgmZXJyb3JfdWMtPmd1Y19mdywgJnApOworCWludGVsX3VjX2Z3X2R1bXAoJmVycm9y X3VjLT5odWNfZncsICZwKTsKK30KKwogaW50IGk5MTVfZXJyb3Jfc3RhdGVfdG9fc3RyKHN0cnVj dCBkcm1faTkxNV9lcnJvcl9zdGF0ZV9idWYgKm0sCiAJCQkgICAgY29uc3Qgc3RydWN0IGk5MTVf Z3B1X3N0YXRlICplcnJvcikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSBtLT5pOTE1OwogCXN0cnVjdCBkcm1faTkxNV9lcnJvcl9vYmplY3QgKm9iajsKKwogCWludCBp LCBqOwogCiAJaWYgKCFlcnJvcikgewpAQCAtNzczLDYgKzgwNSw3IEBAIGludCBpOTE1X2Vycm9y X3N0YXRlX3RvX3N0cihzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGVfYnVmICptLAogCiAJZXJy X3ByaW50X2NhcGFiaWxpdGllcyhtLCAmZXJyb3ItPmRldmljZV9pbmZvKTsKIAllcnJfcHJpbnRf cGFyYW1zKG0sICZlcnJvci0+cGFyYW1zKTsKKwllcnJfcHJpbnRfdWMobSwgJmVycm9yLT51Yyk7 CiAKIAlpZiAobS0+Ynl0ZXMgPT0gMCAmJiBtLT5lcnIpCiAJCXJldHVybiBtLT5lcnI7CkBAIC04 MzEsNiArODY0LDEyIEBAIHN0YXRpYyBfX2Fsd2F5c19pbmxpbmUgdm9pZCBmcmVlX3BhcmFtKGNv bnN0IGNoYXIgKnR5cGUsIHZvaWQgKngpCiAJCWtmcmVlKCoodm9pZCAqKil4KTsKIH0KIAorc3Rh dGljIHZvaWQgY2xlYW51cF91Y19zdGF0ZShjb25zdCBzdHJ1Y3QgaTkxNV9lcnJvcl91YyAqZXJy b3JfdWMpCit7CisJa2ZyZWUoZXJyb3JfdWMtPmd1Y19mdy5wYXRoKTsKKwlrZnJlZShlcnJvcl91 Yy0+aHVjX2Z3LnBhdGgpOworfQorCiB2b2lkIF9faTkxNV9ncHVfc3RhdGVfZnJlZShzdHJ1Y3Qg a3JlZiAqZXJyb3JfcmVmKQogewogCXN0cnVjdCBpOTE1X2dwdV9zdGF0ZSAqZXJyb3IgPQpAQCAt ODcwLDYgKzkwOSw4IEBAIHZvaWQgX19pOTE1X2dwdV9zdGF0ZV9mcmVlKHN0cnVjdCBrcmVmICpl cnJvcl9yZWYpCiAJSTkxNV9QQVJBTVNfRk9SX0VBQ0goRlJFRSk7CiAjdW5kZWYgRlJFRQogCisJ Y2xlYW51cF91Y19zdGF0ZSgmZXJyb3ItPnVjKTsKKwogCWtmcmVlKGVycm9yKTsKIH0KIApAQCAt MTU1OSw2ICsxNjAwLDI2IEBAIHN0YXRpYyB2b2lkIGk5MTVfY2FwdHVyZV9waW5uZWRfYnVmZmVy cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJZXJyb3ItPnBpbm5lZF9ibyA9 IGJvOwogfQogCitzdGF0aWMgdm9pZCBjYXB0dXJlX3VjX3N0YXRlKHN0cnVjdCBpOTE1X2dwdV9z dGF0ZSAqZXJyb3IpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUgPSBlcnJvci0+ aTkxNTsKKwlzdHJ1Y3QgaTkxNV9lcnJvcl91YyAqZXJyb3JfdWMgPSAmZXJyb3ItPnVjOworCisJ LyogQ2FwdHVyaW5nIHVDIHN0YXRlIHdvbid0IGJlIHVzZWZ1bCBpZiB0aGVyZSBpcyBubyBHdUMg Ki8KKwlpZiAoIWVycm9yLT5kZXZpY2VfaW5mby5oYXNfZ3VjKQorCQlyZXR1cm47CisKKwllcnJv cl91Yy0+Z3VjX2Z3ID0gaTkxNS0+Z3VjLmZ3OworCWVycm9yX3VjLT5odWNfZncgPSBpOTE1LT5o dWMuZnc7CisKKwkvKiBOb24tZGVmYXVsdCBmaXJtd2FyZSBwYXRocyB3aWxsIGJlIHNwZWNpZmll ZCBieSB0aGUgbW9kcGFyYW0uCisJICogQXMgbW9kcGFyYW1zIGFyZSBnZW5lcmFsbHkgYWNjZXNp YmxlIGZyb20gdGhlIHVzZXJzcGFjZSBtYWtlCisJICogZXhwbGljaXQgY29waWVzIG9mIHRoZSBm aXJtd2FyZSBwYXRocy4KKwkgKi8KKwllcnJvcl91Yy0+Z3VjX2Z3LnBhdGggPSBrc3RyZHVwKGk5 MTUtPmd1Yy5mdy5wYXRoLCBHRlBfQVRPTUlDKTsKKwllcnJvcl91Yy0+aHVjX2Z3LnBhdGggPSBr c3RyZHVwKGk5MTUtPmh1Yy5mdy5wYXRoLCBHRlBfQVRPTUlDKTsKK30KKwogc3RhdGljIHZvaWQg aTkxNV9nZW1fY2FwdHVyZV9ndWNfbG9nX2J1ZmZlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsCiAJCQkJCSAgICBzdHJ1Y3QgaTkxNV9ncHVfc3RhdGUgKmVycm9yKQogewpAQCAt MTcxMCw2ICsxNzcxLDggQEAgc3RhdGljIGludCBjYXB0dXJlKHZvaWQgKmRhdGEpCiAJSTkxNV9Q QVJBTVNfRk9SX0VBQ0goRFVQKTsKICN1bmRlZiBEVVAKIAorCWNhcHR1cmVfdWNfc3RhdGUoZXJy b3IpOworCiAJaTkxNV9jYXB0dXJlX2dlbl9zdGF0ZShlcnJvci0+aTkxNSwgZXJyb3IpOwogCWk5 MTVfY2FwdHVyZV9yZWdfc3RhdGUoZXJyb3ItPmk5MTUsIGVycm9yKTsKIAlpOTE1X2dlbV9yZWNv cmRfZmVuY2VzKGVycm9yLT5pOTE1LCBlcnJvcik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF91Y19mdy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWNfZncu YwppbmRleCA5NzM4ODhlLi43OWE4Nzk3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF91Y19mdy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjX2Z3LmMK QEAgLTI5OSwxMCArMjk5LDE0IEBAIHZvaWQgaW50ZWxfdWNfZndfZmluaShzdHJ1Y3QgaW50ZWxf dWNfZncgKnVjX2Z3KQogICoKICAqIFByZXR0eSBwcmludGVyIGZvciB1QyBmaXJtd2FyZS4KICAq Lwotdm9pZCBpbnRlbF91Y19md19kdW1wKHN0cnVjdCBpbnRlbF91Y19mdyAqdWNfZncsIHN0cnVj dCBkcm1fcHJpbnRlciAqcCkKK3ZvaWQgaW50ZWxfdWNfZndfZHVtcChjb25zdCBzdHJ1Y3QgaW50 ZWxfdWNfZncgKnVjX2Z3LCBzdHJ1Y3QgZHJtX3ByaW50ZXIgKnApCiB7CiAJZHJtX3ByaW50Zihw LCAiJXMgZmlybXdhcmU6ICVzXG4iLAogCQkgICBpbnRlbF91Y19md190eXBlX3JlcHIodWNfZnct PnR5cGUpLCB1Y19mdy0+cGF0aCk7CisKKwlpZiAoIXVjX2Z3LT5wYXRoKQorCQlyZXR1cm47CisK IAlkcm1fcHJpbnRmKHAsICJcdHN0YXR1czogZmV0Y2ggJXMsIGxvYWQgJXNcbiIsCiAJCSAgIGlu dGVsX3VjX2Z3X3N0YXR1c19yZXByKHVjX2Z3LT5mZXRjaF9zdGF0dXMpLAogCQkgICBpbnRlbF91 Y19md19zdGF0dXNfcmVwcih1Y19mdy0+bG9hZF9zdGF0dXMpKTsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjX2Z3LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF91Y19mdy5oCmluZGV4IDEzMjkwMzYuLjUzOTRkOWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3VjX2Z3LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf dWNfZncuaApAQCAtMTE2LDYgKzExNiw2IEBAIGludCBpbnRlbF91Y19md191cGxvYWQoc3RydWN0 IGludGVsX3VjX2Z3ICp1Y19mdywKIAkJICAgICAgIGludCAoKnhmZXIpKHN0cnVjdCBpbnRlbF91 Y19mdyAqdWNfZncsCiAJCQkJICAgc3RydWN0IGk5MTVfdm1hICp2bWEpKTsKIHZvaWQgaW50ZWxf dWNfZndfZmluaShzdHJ1Y3QgaW50ZWxfdWNfZncgKnVjX2Z3KTsKLXZvaWQgaW50ZWxfdWNfZndf ZHVtcChzdHJ1Y3QgaW50ZWxfdWNfZncgKnVjX2Z3LCBzdHJ1Y3QgZHJtX3ByaW50ZXIgKnApOwor dm9pZCBpbnRlbF91Y19md19kdW1wKGNvbnN0IHN0cnVjdCBpbnRlbF91Y19mdyAqdWNfZncsIHN0 cnVjdCBkcm1fcHJpbnRlciAqcCk7CiAKICNlbmRpZgotLSAKMi43LjQKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=