From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arun Siluvery Subject: [PATCH v2 4/9] drm/i915/error: improve CSB reporting Date: Wed, 10 Feb 2016 15:50:05 +0000 Message-ID: <1455119410-17283-5-git-send-email-arun.siluvery@linux.intel.com> References: <1455119410-17283-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 538E16E71C for ; Wed, 10 Feb 2016 07:50:21 -0800 (PST) In-Reply-To: <1455119410-17283-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 RnJvbTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KCnYyOiBhZGQgc2Vw YXJhdG9ycyBmb3IgcmVhZGFiaWxpdHkKCkZvcjogVklaLTIwMjEKU2lnbmVkLW9mZi1ieTogRGF2 ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogQXJ1biBT aWx1dmVyeSA8YXJ1bi5zaWx1dmVyeUBsaW51eC5pbnRlbC5jb20+ICh2MikKLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgIHwgIDQgKy0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ3B1X2Vycm9yLmMgfCA3NyArKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0t LS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA1OCBpbnNlcnRpb25zKCspLCAyMyBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCBjYjhkZTQ5Li41NDk0NzhmIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmgKQEAgLTU2MSw2ICs1NjEsOCBAQCBzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jf c3RhdGUgewogCQl1MzIgZXhlY2xpc3RfY3NiWzZdOwogCQl1MzIgZXhlY2xpc3RfY3R4WzZdOwog CisJCXU2NCBjdHhfZGVzYzsKKwogCQlzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfb2JqZWN0IHsKIAkJ CWludCBwYWdlX2NvdW50OwogCQkJdTY0IGd0dF9vZmZzZXQ7CkBAIC01NjgsNyArNTcwLDcgQEAg c3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlIHsKIAkJfSAqcmVxX3JpbmdidWZmZXIsICpod19y aW5nYnVmZmVyLCAqYmF0Y2hidWZmZXIsICp3YV9iYXRjaGJ1ZmZlciwgKmN0eCwgKmh3c19wYWdl OwogCiAJCXN0cnVjdCBkcm1faTkxNV9lcnJvcl9yZXF1ZXN0IHsKLQkJCXVpbnQ2NF90IGN0eF9k ZXNjOworCQkJdTY0IGN0eF9kZXNjOwogCQkJbG9uZyBqaWZmaWVzOwogCQkJdTMyIHNlcW5vOwog CQkJdTMyIHRhaWw7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9l cnJvci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwppbmRleCBhYzgz ZjkxLi5iZGJjN2VkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9l cnJvci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKQEAgLTMw NiwzMSArMzA2LDU3IEBAIHN0YXRpYyB2b2lkIGk5MTVfcmluZ19lcnJvcl9zdGF0ZShzdHJ1Y3Qg ZHJtX2k5MTVfZXJyb3Jfc3RhdGVfYnVmICptLAogCQkgICByaW5nLT5oYW5nY2hlY2tfc2NvcmUp OwogCiAJaWYgKGk5MTUuZW5hYmxlX2V4ZWNsaXN0cykgeworCQl1MzIgY3NiX3JkID0gR0VOOF9D U0JfUkVBRF9QVFIocmluZy0+ZXhlY2xpc3RfY3NiX3Jhd19wb2ludGVyKTsKKwogCQllcnJfcHJp bnRmKG0sICIgIEVYRUNMSVNUX1NUQVRVUzogMHglMDh4XG4iLCByaW5nLT5leGVjbGlzdF9zdGF0 dXMpOwogCQllcnJfcHJpbnRmKG0sICIgIEVYRUNMSVNUX0NUWF9JRDogMHglMDh4XG4iLCByaW5n LT5leGVjbGlzdF9jdHhfaWQpOwogCQllcnJfcHJpbnRmKG0sICIgIEVYRUNMSVNUX0NTQlBUUjog MHglMDh4XG4iLCByaW5nLT5leGVjbGlzdF9jc2JfcmF3X3BvaW50ZXIpOwotCQllcnJfcHJpbnRm KG0sICIgIEVYRUNMSVNUX0NTQl9XUjogMHglMDh4XG4iLCByaW5nLT5leGVjbGlzdF9jc2Jfd3Jp dGVfcG9pbnRlcik7Ci0JCWVycl9wcmludGYobSwgIiAgRVhFQ0xJU1RfQ1NCX1JEOiAweCUwOHhc biIsIHJpbmctPmV4ZWNsaXN0X2NzYl9yZWFkX3BvaW50ZXIpOworCQllcnJfcHJpbnRmKG0sICIg IEVYRUNMSVNUX0NTQl9XUjogJWRcbiIsIHJpbmctPmV4ZWNsaXN0X2NzYl93cml0ZV9wb2ludGVy KTsKKwkJZXJyX3ByaW50ZihtLCAiICBFWEVDTElTVF9DU0JfUkQ6ICVkXG4iLCBjc2JfcmQpOwor CisJCWZvciAoaSA9IDE7IGkgPD0gR0VOOF9DU0JfRU5UUklFUzsgKytpKSB7CisJCQlpbnQgbiA9 IChyaW5nLT5leGVjbGlzdF9jc2Jfd3JpdGVfcG9pbnRlciArIGkpICUgR0VOOF9DU0JfRU5UUklF UzsKKwkJCXUzMiBjdHhpZCA9IHJpbmctPmV4ZWNsaXN0X2N0eFtuXTsKKwkJCXUzMiBjc2IgPSBy aW5nLT5leGVjbGlzdF9jc2Jbbl07CisJCQl1MzIgdGFnID0gMDsKKwkJCWNoYXIgZG90ID0gJy4n OworCQkJZXJyX3ByaW50ZihtLCAiICBFWEVDTElTVF9DVFgvQ1NCWyVkXTogIiwgbik7CisKKwkJ CWlmIChjdHhpZCAmJiBpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbikgeworCQkJCS8qIEd1QyBD dHhJRCBpcyByaW5nICsgZmxhZ3MgKyAobHJjYSA+PiAxMikgKi8KKwkJCQl0YWcgPSAoKHJpbmdf aWR4IDw8IDkpIHwgMSk7CisJCQl9CisJCQlpZiAoKGN0eGlkID4+IDIwKSAhPSB0YWcpCisJCQkJ ZG90ID0gJz8nOwkJLyogZmxhZyB1bmV4cGVjdGVkIHZhbHVlICovCisJCQllcnJfcHJpbnRmKG0s ICIweCUwM3glYyUwNXggLyAiLAorCQkJCWN0eGlkID4+IDIwLCBkb3QsIGN0eGlkICYgMHgwMDBm ZmZmZik7CiAKKy8qIENTQiBzdGF0dXMgYml0cyAqLwogI2RlZmluZSBHRU44X0NUWF9TVEFUVVNf SURMRV9BQ1RJVkUJKDEgPDwgMCkKICNkZWZpbmUgR0VOOF9DVFhfU1RBVFVTX1BSRUVNUFRFRAko MSA8PCAxKQogI2RlZmluZSBHRU44X0NUWF9TVEFUVVNfRUxFTUVOVF9TV0lUQ0gJKDEgPDwgMikK ICNkZWZpbmUgR0VOOF9DVFhfU1RBVFVTX0FDVElWRV9JRExFCSgxIDw8IDMpCiAjZGVmaW5lIEdF TjhfQ1RYX1NUQVRVU19DT01QTEVURQkoMSA8PCA0KQogI2RlZmluZSBHRU44X0NUWF9TVEFUVVNf TElURV9SRVNUT1JFCSgxIDw8IDE1KQotCi0JCWZvciAoaSA9IDE7IGkgPD0gR0VOOF9DU0JfRU5U UklFUzsgKytpKSB7Ci0JCQlpbnQgbiA9IChyaW5nLT5leGVjbGlzdF9jc2Jfd3JpdGVfcG9pbnRl ciArIGkpICUgR0VOOF9DU0JfRU5UUklFUzsKLQkJCXUzMiBjc2IgPSByaW5nLT5leGVjbGlzdF9j c2Jbbl07Ci0JCQllcnJfcHJpbnRmKG0sICIgIEVYRUNMSVNUX0NUWC9DU0JbJWRdOiAgMHglMDh4 ICAweCUwOHggICIsCi0JCQkJICAgbiwgcmluZy0+ZXhlY2xpc3RfY3R4W25dLCBjc2IpOwotCQkJ ZXJyX3ByaW50ZihtLCAiJXMgJXMgJXMgJXMgJXMgJXNcbiIsCi0JCQkJICAgY3NiICYgR0VOOF9D VFhfU1RBVFVTX0lETEVfQUNUSVZFCT8gIkktPkEiIDogIiAgICAiLAotCQkJCSAgIGNzYiAmIEdF TjhfQ1RYX1NUQVRVU19QUkVFTVBURUQJCT8gIlBSTVQiIDogIiAgICAiLAotCQkJCSAgIGNzYiAm IEdFTjhfQ1RYX1NUQVRVU19FTEVNRU5UX1NXSVRDSAk/ICJFTFNXIiA6ICIgICAgIiwKLQkJCQkg ICBjc2IgJiBHRU44X0NUWF9TVEFUVVNfQUNUSVZFX0lETEUJPyAiQS0+SSIgOiAiICAgICIsCi0J CQkJICAgY3NiICYgR0VOOF9DVFhfU1RBVFVTX0NPTVBMRVRFCQk/ICJET05FIiA6ICIgICAgIiwK LQkJCQkgICBjc2IgJiBHRU44X0NUWF9TVEFUVVNfTElURV9SRVNUT1JFCT8gIkxJVEUiIDogIiAg ICAiKTsKKyNkZWZpbmUgR0VOOF9DVFhfU1RBVFVTX1VOS05PV04JCSh+MHgwMDAwODAxZikJLyog YW55IG90aGVyICovCisKKwkJCWVycl9wcmludGYobSwgIjB4JTA4eCB8ICVzIHwgJXMgfCAlcyB8 ICVzIHwgJXMgfCAlcyB8ICVzXG4iLAorCQkJCWNzYiwKKwkJCQljc2IgJiBHRU44X0NUWF9TVEFU VVNfSURMRV9BQ1RJVkUJPyAiSS0+QSIgOiAiICAgICIsCisJCQkJY3NiICYgR0VOOF9DVFhfU1RB VFVTX1BSRUVNUFRFRAkJPyAiUFJNVCIgOiAiICAgICIsCisJCQkJY3NiICYgR0VOOF9DVFhfU1RB VFVTX0VMRU1FTlRfU1dJVENICT8gIkVMU1ciIDogIiAgICAiLAorCQkJCWNzYiAmIEdFTjhfQ1RY X1NUQVRVU19BQ1RJVkVfSURMRQk/ICJBLT5JIiA6ICIgICAgIiwKKwkJCQljc2IgJiBHRU44X0NU WF9TVEFUVVNfQ09NUExFVEUJCT8gIkRPTkUiIDogIiAgICAiLAorCQkJCWNzYiAmIEdFTjhfQ1RY X1NUQVRVU19MSVRFX1JFU1RPUkUJPyAiTElURSIgOiAiICAgICIsCisJCQkJY3NiICYgR0VOOF9D VFhfU1RBVFVTX1VOS05PV04JCT8gIiArPyAiIDogIiAgICAiKTsKKworCQkJaWYgKGkgIT0gNikg eworCQkJCWlmIChuID09IGNzYl9yZCkKKwkJCQkJZXJyX3ByaW50ZihtLCAiICAgICAgICAgICAg ICAgICAgKlJEKlxuIik7CisJCQkJZWxzZSBpZiAobiA9PSByaW5nLT5leGVjbGlzdF9jc2JfcmVh ZF9wb2ludGVyICYmCisJCQkJCSAhaTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24pCisJCQkJCWVy cl9wcmludGYobSwgIiAgICAgICAgICAgICAgICAgICpTVypcbiIpOworCQkJfQogCQl9CiAJfQog fQpAQCAtNDk3LDkgKzUyMywxMSBAQCBpbnQgaTkxNV9lcnJvcl9zdGF0ZV90b19zdHIoc3RydWN0 IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiAqbSwKIAkJfQogCiAJCWlmICgob2JqID0gZXJyb3It PnJpbmdbaV0ucmVxX3JpbmdidWZmZXIpKSB7Ci0JCQllcnJfcHJpbnRmKG0sICIlcyAtLS0gcmlu Z2J1ZmZlciA9IDB4JTA4eFxuIiwKKwkJCWVycl9wcmludGYobSwgIiVzIC0tLSByaW5nYnVmZmVy ID0gMHglMDh4IChjdHhfZGVzYyAweCUwOHhfJTA4eClcbiIsCiAJCQkJICAgZGV2X3ByaXYtPnJp bmdbaV0ubmFtZSwKLQkJCQkgICBsb3dlcl8zMl9iaXRzKG9iai0+Z3R0X29mZnNldCkpOworCQkJ CSAgIGxvd2VyXzMyX2JpdHMob2JqLT5ndHRfb2Zmc2V0KSwKKwkJCQkgICB1cHBlcl8zMl9iaXRz KGVycm9yLT5yaW5nW2ldLmN0eF9kZXNjKSwKKwkJCQkgICBsb3dlcl8zMl9iaXRzKGVycm9yLT5y aW5nW2ldLmN0eF9kZXNjKSk7CiAJCQlwcmludF9lcnJvcl9vYmoobSwgb2JqKTsKIAkJfQogCkBA IC0xMDExLDYgKzEwMzksNyBAQCBzdGF0aWMgdm9pZCBpOTE1X3JlY29yZF9yaW5nX3N0YXRlKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCXUzMiBzdGF0dXNfcG9pbnRlciA9IEk5MTVfUkVBRChS SU5HX0NPTlRFWFRfU1RBVFVTX1BUUihyaW5nKSk7CiAJCXU4IHdyaXRlX3BvaW50ZXIgPSBHRU44 X0NTQl9XUklURV9QVFIoc3RhdHVzX3BvaW50ZXIpOwogCQl1OCByZWFkX3BvaW50ZXIgPSByaW5n LT5uZXh0X2NvbnRleHRfc3RhdHVzX2J1ZmZlcjsKKwogCQlpZiAocmVhZF9wb2ludGVyID4gd3Jp dGVfcG9pbnRlcikKIAkJCXdyaXRlX3BvaW50ZXIgKz0gR0VOOF9DU0JfRU5UUklFUzsKIApAQCAt MTA2Miw2ICsxMDkxLDcgQEAgc3RhdGljIHZvaWQgaTkxNV9nZW1fcmVjb3JkX3JpbmdzKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVl c3Q7CisJdTY0IGN0eF9kZXNjOwogCWludCBpLCBjb3VudDsKIAogCWZvciAoaSA9IDA7IGkgPCBJ OTE1X05VTV9SSU5HUzsgaSsrKSB7CkBAIC0xMTE4LDE2ICsxMTQ4LDE5IEBAIHN0YXRpYyB2b2lk IGk5MTVfZ2VtX3JlY29yZF9yaW5ncyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJICogZm9y IGl0IHRvIGJlIHVzZWZ1bCAoZS5nLiBkdW1wIHRoZSBjb250ZXh0IGJlaW5nCiAJCQkgKiBleGVj dXRlZCkuCiAJCQkgKi8KLQkJCWlmIChyZXF1ZXN0KQotCQkJCXJidWYgPSByZXF1ZXN0LT5jdHgt PmVuZ2luZVtyaW5nLT5pZF0ucmluZ2J1ZjsKLQkJCWVsc2UKLQkJCQlyYnVmID0gZGV2X3ByaXYt Pmtlcm5lbF9jb250ZXh0LT5lbmdpbmVbcmluZy0+aWRdLnJpbmdidWY7Ci0JCX0gZWxzZQorCQkJ c3RydWN0IGludGVsX2NvbnRleHQgKmN0eCA9IChyZXF1ZXN0ID8gcmVxdWVzdC0+Y3R4IDoKKwkJ CQkJCSAgICAgZGV2X3ByaXYtPmtlcm5lbF9jb250ZXh0KTsKKwkJCWN0eF9kZXNjID0gaW50ZWxf bHJfY29udGV4dF9kZXNjcmlwdG9yKGN0eCwgcmluZyk7CisJCQlyYnVmID0gY3R4LT5lbmdpbmVb cmluZy0+aWRdLnJpbmdidWY7CisJCX0gZWxzZSB7CisJCQljdHhfZGVzYyA9IDA7CiAJCQlyYnVm ID0gcmluZy0+YnVmZmVyOworCQl9CiAKIAkJZXJyb3ItPnJpbmdbaV0uY3B1X3JpbmdfaGVhZCA9 IHJidWYtPmhlYWQ7CiAJCWVycm9yLT5yaW5nW2ldLmNwdV9yaW5nX3RhaWwgPSByYnVmLT50YWls OwogCisJCWVycm9yLT5yaW5nW2ldLmN0eF9kZXNjID0gY3R4X2Rlc2M7CiAJCWVycm9yLT5yaW5n W2ldLnJlcV9yaW5nYnVmZmVyID0KIAkJCWk5MTVfZXJyb3JfZ2d0dF9vYmplY3RfY3JlYXRlKGRl dl9wcml2LCByYnVmLT5vYmopOwogCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==