From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arun Siluvery Subject: [PATCH 4/5] drm/i915/error: improve CSB reporting Date: Thu, 28 Jan 2016 19:01:23 +0000 Message-ID: <1454007684-16777-5-git-send-email-arun.siluvery@linux.intel.com> References: <1454007684-16777-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 6296B6E3BE for ; Thu, 28 Jan 2016 11:01:45 -0800 (PST) In-Reply-To: <1454007684-16777-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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KCnYyOiBhZGQgc2Vw YXJhdG9ycyBmb3IgcmVhZGFiaWxpdHkKCkZvcjogVklaLTIwMjEKU2lnbmVkLW9mZi1ieTogRGF2 ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogQXJ1biBT aWx1dmVyeSA8YXJ1bi5zaWx1dmVyeUBsaW51eC5pbnRlbC5jb20+ICh2MikKU2lnbmVkLW9mZi1i eTogQXJ1biBTaWx1dmVyeSA8YXJ1bi5zaWx1dmVyeUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICB8ICA0ICstCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jIHwgODcgKysrKysrKysrKysrKysrKysrKysrKysrLS0t LS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgNjMgaW5zZXJ0aW9ucygrKSwgMjggZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggMjM5YWFlZC4uNGIxOTlhNCAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oCkBAIC01NjEsNiArNTYxLDggQEAgc3RydWN0IGRybV9pOTE1X2Vy cm9yX3N0YXRlIHsKIAkJdTMyIGV4ZWNsaXN0X2NzYls2XTsKIAkJdTMyIGV4ZWNsaXN0X2N0eFs2 XTsKIAorCQl1NjQgY3R4X2Rlc2M7CisKIAkJc3RydWN0IGRybV9pOTE1X2Vycm9yX29iamVjdCB7 CiAJCQlpbnQgcGFnZV9jb3VudDsKIAkJCXU2NCBndHRfb2Zmc2V0OwpAQCAtNTY4LDcgKzU3MCw3 IEBAIHN0cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0ZSB7CiAJCX0gKnJlcV9yaW5nYnVmZmVyLCAq aHdfcmluZ2J1ZmZlciwgKmJhdGNoYnVmZmVyLCAqd2FfYmF0Y2hidWZmZXIsICpjdHgsICpod3Nf cGFnZTsKIAogCQlzdHJ1Y3QgZHJtX2k5MTVfZXJyb3JfcmVxdWVzdCB7Ci0JCQl1aW50NjRfdCBj dHhfZGVzYzsKKwkJCXU2NCBjdHhfZGVzYzsKIAkJCWxvbmcgamlmZmllczsKIAkJCXUzMiBzZXFu bzsKIAkJCXUzMiB0YWlsOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n cHVfZXJyb3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKaW5kZXgg YTg4MTYwYy4uOGIxYTFjMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n cHVfZXJyb3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCkBA IC0zMDUsMzEgKzMwNSw2MCBAQCBzdGF0aWMgdm9pZCBpOTE1X3JpbmdfZXJyb3Jfc3RhdGUoc3Ry dWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiAqbSwKIAkJICAgaGFuZ2NoZWNrX2FjdGlvbl90 b19zdHIocmluZy0+aGFuZ2NoZWNrX2FjdGlvbiksCiAJCSAgIHJpbmctPmhhbmdjaGVja19zY29y ZSk7CiAKLQllcnJfcHJpbnRmKG0sICIgIEVYRUNMSVNUX1NUQVRVUzogMHglMDh4XG4iLCByaW5n LT5leGVjbGlzdF9zdGF0dXMpOwotCWVycl9wcmludGYobSwgIiAgRVhFQ0xJU1RfQ1RYX0lEOiAw eCUwOHhcbiIsIHJpbmctPmV4ZWNsaXN0X2N0eF9pZCk7Ci0JZXJyX3ByaW50ZihtLCAiICBFWEVD TElTVF9DU0JQVFI6IDB4JTA4eFxuIiwgcmluZy0+ZXhlY2xpc3RfY3NiX3Jhd19wb2ludGVyKTsK LQllcnJfcHJpbnRmKG0sICIgIEVYRUNMSVNUX0NTQl9XUjogMHglMDh4XG4iLCByaW5nLT5leGVj bGlzdF9jc2Jfd3JpdGVfcG9pbnRlcik7Ci0JZXJyX3ByaW50ZihtLCAiICBFWEVDTElTVF9DU0Jf UkQ6IDB4JTA4eFxuIiwgcmluZy0+ZXhlY2xpc3RfY3NiX3JlYWRfcG9pbnRlcik7CisJeworCQl1 MzIgY3NiX3JkID0gKHJpbmctPmV4ZWNsaXN0X2NzYl9yYXdfcG9pbnRlciA+PiA4KSAmIDc7CisK KwkJZXJyX3ByaW50ZihtLCAiICBFWEVDTElTVF9TVEFUVVM6IDB4JTA4eFxuIiwgcmluZy0+ZXhl Y2xpc3Rfc3RhdHVzKTsKKwkJZXJyX3ByaW50ZihtLCAiICBFWEVDTElTVF9DVFhfSUQ6IDB4JTA4 eFxuIiwgcmluZy0+ZXhlY2xpc3RfY3R4X2lkKTsKKwkJZXJyX3ByaW50ZihtLCAiICBFWEVDTElT VF9DU0JQVFI6IDB4JTA4eFxuIiwgcmluZy0+ZXhlY2xpc3RfY3NiX3Jhd19wb2ludGVyKTsKKwkJ ZXJyX3ByaW50ZihtLCAiICBFWEVDTElTVF9DU0JfV1I6ICVkXG4iLCByaW5nLT5leGVjbGlzdF9j c2Jfd3JpdGVfcG9pbnRlcik7CisJCWVycl9wcmludGYobSwgIiAgRVhFQ0xJU1RfQ1NCX1JEOiAl ZFxuIiwgY3NiX3JkKTsKKwkJZXJyX3ByaW50ZihtLCAiICBFWEVDTElTVF9TV0xfUkQ6ICVkXG4i LCByaW5nLT5leGVjbGlzdF9jc2JfcmVhZF9wb2ludGVyKTsKKworCQlmb3IgKGkgPSAxOyBpIDw9 IDY7ICsraSkgeworCQkJaW50IG4gPSAocmluZy0+ZXhlY2xpc3RfY3NiX3dyaXRlX3BvaW50ZXIg KyBpKSAlIDY7CisJCQl1MzIgY3R4aWQgPSByaW5nLT5leGVjbGlzdF9jdHhbbl07CisJCQl1MzIg Y3NiID0gcmluZy0+ZXhlY2xpc3RfY3NiW25dOworCQkJdTMyIHRhZyA9IDA7CisJCQljaGFyIGRv dCA9ICcuJzsKKwkJCWVycl9wcmludGYobSwgIiAgRVhFQ0xJU1RfQ1RYL0NTQlslZF06ICIsIG4p OworCisJCQlpZiAoY3R4aWQgJiYgaTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24pIHsKKwkJCQkv KiBHdUMgQ3R4SUQgaXMgcmluZyArIGZsYWdzICsgKGxyY2EgPj4gMTIpICovCisJCQkJdGFnID0g KChyaW5nX2lkeCA8PCA5KSB8IDEpOworCQkJfQorCQkJaWYgKChjdHhpZCA+PiAyMCkgIT0gdGFn KQorCQkJCWRvdCA9ICc/JzsJCS8qIGZsYWcgdW5leHBlY3RlZCB2YWx1ZSAqLworCQkJZXJyX3By aW50ZihtLCAiMHglMDN4JWMlMDV4IC8gIiwKKwkJCQljdHhpZCA+PiAyMCwgZG90LCBjdHhpZCAm IDB4MDAwZmZmZmYpOwogCisvKiBDU0Igc3RhdHVzIGJpdHMgKi8KICNkZWZpbmUgR0VOOF9DVFhf U1RBVFVTX0lETEVfQUNUSVZFCSgxIDw8IDApCiAjZGVmaW5lIEdFTjhfQ1RYX1NUQVRVU19QUkVF TVBURUQJKDEgPDwgMSkKICNkZWZpbmUgR0VOOF9DVFhfU1RBVFVTX0VMRU1FTlRfU1dJVENICSgx IDw8IDIpCiAjZGVmaW5lIEdFTjhfQ1RYX1NUQVRVU19BQ1RJVkVfSURMRQkoMSA8PCAzKQogI2Rl ZmluZSBHRU44X0NUWF9TVEFUVVNfQ09NUExFVEUJKDEgPDwgNCkKICNkZWZpbmUgR0VOOF9DVFhf U1RBVFVTX0xJVEVfUkVTVE9SRQkoMSA8PCAxNSkKLQotCWZvciAoaSA9IDE7IGkgPD0gNjsgKytp KSB7Ci0JCWludCBuID0gKHJpbmctPmV4ZWNsaXN0X2NzYl93cml0ZV9wb2ludGVyICsgaSkgJSA2 OwotCQl1MzIgY3NiID0gcmluZy0+ZXhlY2xpc3RfY3NiW25dOwotCQllcnJfcHJpbnRmKG0sICIg IEVYRUNMSVNUX0NUWC9DU0JbJWRdOiAgMHglMDh4ICAweCUwOHggICIsCi0JCQluLCByaW5nLT5l eGVjbGlzdF9jdHhbbl0sIGNzYik7Ci0JCWVycl9wcmludGYobSwgIiVzICVzICVzICVzICVzICVz XG4iLAotCQkJY3NiICYgR0VOOF9DVFhfU1RBVFVTX0lETEVfQUNUSVZFCT8gIkktPkEiIDogIiAg ICAiLAotCQkJY3NiICYgR0VOOF9DVFhfU1RBVFVTX1BSRUVNUFRFRAkJPyAiUFJNVCIgOiAiICAg ICIsCi0JCQljc2IgJiBHRU44X0NUWF9TVEFUVVNfRUxFTUVOVF9TV0lUQ0gJPyAiRUxTVyIgOiAi ICAgICIsCi0JCQljc2IgJiBHRU44X0NUWF9TVEFUVVNfQUNUSVZFX0lETEUJPyAiQS0+SSIgOiAi ICAgICIsCi0JCQljc2IgJiBHRU44X0NUWF9TVEFUVVNfQ09NUExFVEUJCT8gIkRPTkUiIDogIiAg ICAiLAotCQkJY3NiICYgR0VOOF9DVFhfU1RBVFVTX0xJVEVfUkVTVE9SRQk/ICJMSVRFIiA6ICIg ICAgIik7CisjZGVmaW5lIEdFTjhfQ1RYX1NUQVRVU19VTktOT1dOCQkofjB4MDAwMDgwMWYpCS8q IGFueSBvdGhlciAqLworCisJCQllcnJfcHJpbnRmKG0sICIweCUwOHggfCAlcyB8ICVzIHwgJXMg fCAlcyB8ICVzIHwgJXMgfCAlc1xuIiwKKwkJCQljc2IsCisJCQkJY3NiICYgR0VOOF9DVFhfU1RB VFVTX0lETEVfQUNUSVZFCT8gIkktPkEiIDogIiAgICAiLAorCQkJCWNzYiAmIEdFTjhfQ1RYX1NU QVRVU19QUkVFTVBURUQJCT8gIlBSTVQiIDogIiAgICAiLAorCQkJCWNzYiAmIEdFTjhfQ1RYX1NU QVRVU19FTEVNRU5UX1NXSVRDSAk/ICJFTFNXIiA6ICIgICAgIiwKKwkJCQljc2IgJiBHRU44X0NU WF9TVEFUVVNfQUNUSVZFX0lETEUJPyAiQS0+SSIgOiAiICAgICIsCisJCQkJY3NiICYgR0VOOF9D VFhfU1RBVFVTX0NPTVBMRVRFCQk/ICJET05FIiA6ICIgICAgIiwKKwkJCQljc2IgJiBHRU44X0NU WF9TVEFUVVNfTElURV9SRVNUT1JFCT8gIkxJVEUiIDogIiAgICAiLAorCQkJCWNzYiAmIEdFTjhf Q1RYX1NUQVRVU19VTktOT1dOCQk/ICIgKz8gIiA6ICIgICAgIik7CisKKwkJCWlmIChpICE9IDYp IHsKKwkJCQlpZiAobiA9PSBjc2JfcmQpCisJCQkJCWVycl9wcmludGYobSwgIiAgICAgICAgICAg ICAgICAgICpSRCpcbiIpOworCQkJCWVsc2UgaWYgKG4gPT0gcmluZy0+ZXhlY2xpc3RfY3NiX3Jl YWRfcG9pbnRlciAmJgorCQkJCQkgIWk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uKQorCQkJCQll cnJfcHJpbnRmKG0sICIgICAgICAgICAgICAgICAgICAqU1cqXG4iKTsKKwkJCX0KKwkJfQogCX0K IH0KIApAQCAtNDk1LDkgKzUyNCwxMSBAQCBpbnQgaTkxNV9lcnJvcl9zdGF0ZV90b19zdHIoc3Ry dWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiAqbSwKIAkJfQogCiAJCWlmICgob2JqID0gZXJy b3ItPnJpbmdbaV0ucmVxX3JpbmdidWZmZXIpKSB7Ci0JCQllcnJfcHJpbnRmKG0sICIlcyAtLS0g cmluZ2J1ZmZlciA9IDB4JTA4eFxuIiwKKwkJCWVycl9wcmludGYobSwgIiVzIC0tLSByaW5nYnVm ZmVyID0gMHglMDh4IChjdHhfZGVzYyAweCUwOHhfJTA4eClcbiIsCiAJCQkJICAgZGV2X3ByaXYt PnJpbmdbaV0ubmFtZSwKLQkJCQkgICBsb3dlcl8zMl9iaXRzKG9iai0+Z3R0X29mZnNldCkpOwor CQkJCSAgIGxvd2VyXzMyX2JpdHMob2JqLT5ndHRfb2Zmc2V0KSwKKwkJCQkgICB1cHBlcl8zMl9i aXRzKGVycm9yLT5yaW5nW2ldLmN0eF9kZXNjKSwKKwkJCQkgICBsb3dlcl8zMl9iaXRzKGVycm9y LT5yaW5nW2ldLmN0eF9kZXNjKSk7CiAJCQlwcmludF9lcnJvcl9vYmoobSwgb2JqKTsKIAkJfQog CkBAIC0xMDA5LDggKzEwNDAsNiBAQCBzdGF0aWMgdm9pZCBpOTE1X3JlY29yZF9yaW5nX3N0YXRl KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCXUzMiBzdGF0dXNfcG9pbnRlciA9IEk5MTVfUkVB RChSSU5HX0NPTlRFWFRfU1RBVFVTX1BUUihyaW5nKSk7CiAJCXU4IHdyaXRlX3BvaW50ZXIgPSBz dGF0dXNfcG9pbnRlciAmIDB4MDc7CiAJCXU4IHJlYWRfcG9pbnRlciA9IHJpbmctPm5leHRfY29u dGV4dF9zdGF0dXNfYnVmZmVyOwotCQlpZiAocmVhZF9wb2ludGVyID4gd3JpdGVfcG9pbnRlcikK LQkJCXdyaXRlX3BvaW50ZXIgKz0gNjsKIAogCQllcmluZy0+ZXhlY2xpc3Rfc3RhdHVzID0gSTkx NV9SRUFEKFJJTkdfRVhFQ0xJU1RfU1RBVFVTX0xPKHJpbmcpKTsKIAkJZXJpbmctPmV4ZWNsaXN0 X2N0eF9pZCA9IEk5MTVfUkVBRChSSU5HX0VYRUNMSVNUX1NUQVRVU19ISShyaW5nKSk7CkBAIC0x MDYwLDYgKzEwODksNyBAQCBzdGF0aWMgdm9pZCBpOTE1X2dlbV9yZWNvcmRfcmluZ3Moc3RydWN0 IGRybV9kZXZpY2UgKmRldiwKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVz dDsKKwl1NjQgY3R4X2Rlc2M7CiAJaW50IGksIGNvdW50OwogCiAJZm9yIChpID0gMDsgaSA8IEk5 MTVfTlVNX1JJTkdTOyBpKyspIHsKQEAgLTExMTYsMTYgKzExNDYsMTkgQEAgc3RhdGljIHZvaWQg aTkxNV9nZW1fcmVjb3JkX3JpbmdzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkgKiBmb3Ig aXQgdG8gYmUgdXNlZnVsIChlLmcuIGR1bXAgdGhlIGNvbnRleHQgYmVpbmcKIAkJCSAqIGV4ZWN1 dGVkKS4KIAkJCSAqLwotCQkJaWYgKHJlcXVlc3QpCi0JCQkJcmJ1ZiA9IHJlcXVlc3QtPmN0eC0+ ZW5naW5lW3JpbmctPmlkXS5yaW5nYnVmOwotCQkJZWxzZQotCQkJCXJidWYgPSBkZXZfcHJpdi0+ a2VybmVsX2NvbnRleHQtPmVuZ2luZVtyaW5nLT5pZF0ucmluZ2J1ZjsKLQkJfSBlbHNlCisJCQlz dHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4ID0gKHJlcXVlc3QgPyByZXF1ZXN0LT5jdHggOgorCQkJ CQkJICAgICBkZXZfcHJpdi0+a2VybmVsX2NvbnRleHQpOworCQkJY3R4X2Rlc2MgPSBpbnRlbF9s cl9jb250ZXh0X2Rlc2NyaXB0b3IoY3R4LCByaW5nKTsKKwkJCXJidWYgPSBjdHgtPmVuZ2luZVty aW5nLT5pZF0ucmluZ2J1ZjsKKwkJfSBlbHNlIHsKKwkJCWN0eF9kZXNjID0gMDsKIAkJCXJidWYg PSByaW5nLT5idWZmZXI7CisJCX0KIAogCQllcnJvci0+cmluZ1tpXS5jcHVfcmluZ19oZWFkID0g cmJ1Zi0+aGVhZDsKIAkJZXJyb3ItPnJpbmdbaV0uY3B1X3JpbmdfdGFpbCA9IHJidWYtPnRhaWw7 CiAKKwkJZXJyb3ItPnJpbmdbaV0uY3R4X2Rlc2MgPSBjdHhfZGVzYzsKIAkJZXJyb3ItPnJpbmdb aV0ucmVxX3JpbmdidWZmZXIgPQogCQkJaTkxNV9lcnJvcl9nZ3R0X29iamVjdF9jcmVhdGUoZGV2 X3ByaXYsIHJidWYtPm9iaik7CiAKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=