From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 09/21] drm/i915: Make i915_check_and_clear_faults take uncore Date: Thu, 6 Jun 2019 10:36:27 +0100 Message-ID: <20190606093639.9372-10-tvrtko.ursulin@linux.intel.com> References: <20190606093639.9372-1-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 01D9A895C4 for ; Thu, 6 Jun 2019 09:36:59 +0000 (UTC) In-Reply-To: <20190606093639.9372-1-tvrtko.ursulin@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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkNvbnRpbnVp bmcgdGhlIGNvbnZlcnNpb24gYW5kIGVsaW1pbmF0aW9uIG9mIGltcGxpY2l0IGRldl9wcml2LgoK U2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4K U3VnZ2VzdGVkLWJ5OiBSb2RyaWdvIFZpdmkgPHJvZHJpZ28udml2aUBpbnRlbC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3QvaW50ZWxfZW5naW5lX2NzLmMgfCAgMiArLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyAgICAgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgICAgICAgfCAzNCArKysrKysrKysrKystLS0tLS0tLS0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggICAgICAgfCAgMiArLQogNCBm aWxlcyBjaGFuZ2VkLCAyMSBpbnNlcnRpb25zKCspLCAxOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRlbF9lbmdpbmVfY3MuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2d0L2ludGVsX2VuZ2luZV9jcy5jCmluZGV4IDBlOWI3NGY1MjUwMy4uMzU1 NGQwZGQ3YjFhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRlbF9lbmdp bmVfY3MuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRlbF9lbmdpbmVfY3MuYwpA QCAtNDUzLDcgKzQ1Myw3IEBAIGludCBpbnRlbF9lbmdpbmVzX2luaXRfbW1pbyhzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqaTkxNSkKIAogCVJVTlRJTUVfSU5GTyhpOTE1KS0+bnVtX2VuZ2luZXMg PSBod2VpZ2h0MzIobWFzayk7CiAKLQlpOTE1X2NoZWNrX2FuZF9jbGVhcl9mYXVsdHMoaTkxNSk7 CisJaTkxNV9jaGVja19hbmRfY2xlYXJfZmF1bHRzKCZpOTE1LT51bmNvcmUpOwogCiAJaW50ZWxf c2V0dXBfZW5naW5lX2NhcGFiaWxpdGllcyhpOTE1KTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMK aW5kZXggMWFmNjc1MWUxYjM2Li43MmFjZDViYzUxMDEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu YwpAQCAtMjM0MCw3ICsyMzQwLDcgQEAgc3RhdGljIGludCBpOTE1X2RybV9yZXN1bWVfZWFybHko c3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCWludGVsX3VuY29yZV9yZXN1bWVfZWFybHkoJmRl dl9wcml2LT51bmNvcmUpOwogCi0JaTkxNV9jaGVja19hbmRfY2xlYXJfZmF1bHRzKGRldl9wcml2 KTsKKwlpOTE1X2NoZWNrX2FuZF9jbGVhcl9mYXVsdHMoJmRldl9wcml2LT51bmNvcmUpOwogCiAJ aWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gMTEgfHwgSVNfR0VOOV9MUChkZXZfcHJpdikpIHsK IAkJZ2VuOV9zYW5pdGl6ZV9kY19zdGF0ZShkZXZfcHJpdik7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2d0dC5jCmluZGV4IDNiYTk3MGYyZGIyOC4uMGNlY2M0M2E2NGIwIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAtMjI5OSwxNCArMjI5OSwxNCBAQCBzdGF0aWMgYm9vbCBu ZWVkc19pZGxlX21hcHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCXJldHVy biBJU19HRU4oZGV2X3ByaXYsIDUpICYmIElTX01PQklMRShkZXZfcHJpdikgJiYgaW50ZWxfdnRk X2FjdGl2ZSgpOwogfQogCi1zdGF0aWMgdm9pZCBnZW42X2NoZWNrX2ZhdWx0cyhzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCitzdGF0aWMgdm9pZCBnZW42X2NoZWNrX2ZhdWx0cyhz dHJ1Y3QgaW50ZWxfdW5jb3JlICp1bmNvcmUpCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAq ZW5naW5lOwogCWVudW0gaW50ZWxfZW5naW5lX2lkIGlkOwotCXUzMiBmYXVsdDsKIAotCWZvcl9l YWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2LCBpZCkgewotCQlmYXVsdCA9IEdFTjZfUklOR19G QVVMVF9SRUdfUkVBRChlbmdpbmUpOworCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIHVuY29yZV90 b19pOTE1KHVuY29yZSksIGlkKSB7CisJCXUzMiBmYXVsdCA9IEdFTjZfUklOR19GQVVMVF9SRUdf UkVBRChlbmdpbmUpOworCiAJCWlmIChmYXVsdCAmIFJJTkdfRkFVTFRfVkFMSUQpIHsKIAkJCURS TV9ERUJVR19EUklWRVIoIlVuZXhwZWN0ZWQgZmF1bHRcbiIKIAkJCQkJICJcdEFkZHI6IDB4JTA4 bHhcbiIKQEAgLTIzMjEsMTYgKzIzMjEsMTYgQEAgc3RhdGljIHZvaWQgZ2VuNl9jaGVja19mYXVs dHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCX0KIH0KIAotc3RhdGljIHZv aWQgZ2VuOF9jaGVja19mYXVsdHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQor c3RhdGljIHZvaWQgZ2VuOF9jaGVja19mYXVsdHMoc3RydWN0IGludGVsX3VuY29yZSAqdW5jb3Jl KQogewotCXUzMiBmYXVsdCA9IEk5MTVfUkVBRChHRU44X1JJTkdfRkFVTFRfUkVHKTsKKwl1MzIg ZmF1bHQgPSBpbnRlbF91bmNvcmVfcmVhZCh1bmNvcmUsIEdFTjhfUklOR19GQVVMVF9SRUcpOwog CiAJaWYgKGZhdWx0ICYgUklOR19GQVVMVF9WQUxJRCkgewogCQl1MzIgZmF1bHRfZGF0YTAsIGZh dWx0X2RhdGExOwogCQl1NjQgZmF1bHRfYWRkcjsKIAotCQlmYXVsdF9kYXRhMCA9IEk5MTVfUkVB RChHRU44X0ZBVUxUX1RMQl9EQVRBMCk7Ci0JCWZhdWx0X2RhdGExID0gSTkxNV9SRUFEKEdFTjhf RkFVTFRfVExCX0RBVEExKTsKKwkJZmF1bHRfZGF0YTAgPSBpbnRlbF91bmNvcmVfcmVhZCh1bmNv cmUsIEdFTjhfRkFVTFRfVExCX0RBVEEwKTsKKwkJZmF1bHRfZGF0YTEgPSBpbnRlbF91bmNvcmVf cmVhZCh1bmNvcmUsIEdFTjhfRkFVTFRfVExCX0RBVEExKTsKIAkJZmF1bHRfYWRkciA9ICgodTY0 KShmYXVsdF9kYXRhMSAmIEZBVUxUX1ZBX0hJR0hfQklUUykgPDwgNDQpIHwKIAkJCSAgICAgKCh1 NjQpZmF1bHRfZGF0YTAgPDwgMTIpOwogCkBAIC0yMzQ5LDE3ICsyMzQ5LDE5IEBAIHN0YXRpYyB2 b2lkIGdlbjhfY2hlY2tfZmF1bHRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK IAl9CiB9CiAKLXZvaWQgaTkxNV9jaGVja19hbmRfY2xlYXJfZmF1bHRzKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKK3ZvaWQgaTkxNV9jaGVja19hbmRfY2xlYXJfZmF1bHRzKHN0 cnVjdCBpbnRlbF91bmNvcmUgKnVuY29yZSkKIHsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq aTkxNSA9IHVuY29yZV90b19pOTE1KHVuY29yZSk7CisKIAkvKiBGcm9tIEdFTjggb253YXJkcyB3 ZSBvbmx5IGhhdmUgb25lICdBbGwgRW5naW5lIEZhdWx0IFJlZ2lzdGVyJyAqLwotCWlmIChJTlRF TF9HRU4oZGV2X3ByaXYpID49IDgpCi0JCWdlbjhfY2hlY2tfZmF1bHRzKGRldl9wcml2KTsKLQll bHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDYpCi0JCWdlbjZfY2hlY2tfZmF1bHRzKGRl dl9wcml2KTsKKwlpZiAoSU5URUxfR0VOKGk5MTUpID49IDgpCisJCWdlbjhfY2hlY2tfZmF1bHRz KHVuY29yZSk7CisJZWxzZSBpZiAoSU5URUxfR0VOKGk5MTUpID49IDYpCisJCWdlbjZfY2hlY2tf ZmF1bHRzKHVuY29yZSk7CiAJZWxzZQogCQlyZXR1cm47CiAKLQl1bmNvcmVfY2xlYXJfZXJyb3Jf cmVnaXN0ZXJzKCZkZXZfcHJpdi0+dW5jb3JlLCBBTExfRU5HSU5FUyk7CisJdW5jb3JlX2NsZWFy X2Vycm9yX3JlZ2lzdGVycyh1bmNvcmUsIEFMTF9FTkdJTkVTKTsKIH0KIAogdm9pZCBpOTE1X2dl bV9zdXNwZW5kX2d0dF9tYXBwaW5ncyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CkBAIC0yMzcyLDcgKzIzNzQsNyBAQCB2b2lkIGk5MTVfZ2VtX3N1c3BlbmRfZ3R0X21hcHBpbmdz KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlpZiAoSU5URUxfR0VOKGRldl9w cml2KSA8IDYpCiAJCXJldHVybjsKIAotCWk5MTVfY2hlY2tfYW5kX2NsZWFyX2ZhdWx0cyhkZXZf cHJpdik7CisJaTkxNV9jaGVja19hbmRfY2xlYXJfZmF1bHRzKCZkZXZfcHJpdi0+dW5jb3JlKTsK IAogCWdndHQtPnZtLmNsZWFyX3JhbmdlKCZnZ3R0LT52bSwgMCwgZ2d0dC0+dm0udG90YWwpOwog CkBAIC0zNjUwLDcgKzM2NTIsNyBAQCB2b2lkIGk5MTVfZ2VtX3Jlc3RvcmVfZ3R0X21hcHBpbmdz KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlzdHJ1Y3QgaTkxNV9nZ3R0ICpn Z3R0ID0gJmRldl9wcml2LT5nZ3R0OwogCXN0cnVjdCBpOTE1X3ZtYSAqdm1hLCAqdm47CiAKLQlp OTE1X2NoZWNrX2FuZF9jbGVhcl9mYXVsdHMoZGV2X3ByaXYpOworCWk5MTVfY2hlY2tfYW5kX2Ns ZWFyX2ZhdWx0cygmZGV2X3ByaXYtPnVuY29yZSk7CiAKIAltdXRleF9sb2NrKCZnZ3R0LT52bS5t dXRleCk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5o IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKaW5kZXggMTUyYTAzNTYwYzIy Li45YWM3MDE5ODgwMzAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2d0dC5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCkBAIC02NDks NyArNjQ5LDcgQEAgaW50IGdlbjZfcHBndHRfcGluKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpiYXNl KTsKIHZvaWQgZ2VuNl9wcGd0dF91bnBpbihzdHJ1Y3QgaTkxNV9od19wcGd0dCAqYmFzZSk7CiB2 b2lkIGdlbjZfcHBndHRfdW5waW5fYWxsKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpiYXNlKTsKIAot dm9pZCBpOTE1X2NoZWNrX2FuZF9jbGVhcl9mYXVsdHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KTsKK3ZvaWQgaTkxNV9jaGVja19hbmRfY2xlYXJfZmF1bHRzKHN0cnVjdCBpbnRl bF91bmNvcmUgKnVuY29yZSk7CiB2b2lkIGk5MTVfZ2VtX3N1c3BlbmRfZ3R0X21hcHBpbmdzKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiB2b2lkIGk5MTVfZ2VtX3Jlc3RvcmVf Z3R0X21hcHBpbmdzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiAKLS0gCjIu MjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4