From: Michel Thierry Subject: [PATCH v6 15/20] drm/i915: Watchdog timeout: Pass GuC shared data structure during param load Date: Tue, 18 Apr 2017 13:23:30 -0700 Message-ID: <20170418202335.35232-16-michel.thierry@intel.com> References: <20170418202335.35232-1-michel.thierry@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 E14F56E0C4 for ; Tue, 18 Apr 2017 20:23:36 +0000 (UTC) In-Reply-To: <20170418202335.35232-1-michel.thierry@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 Rm9yIHdhdGNoZG9nIC8gbWVkaWEgcmVzZXQsIHRoZSBmaXJtd2FyZSBtdXN0IGtub3cgdGhlIGFk ZHJlc3Mgb2YgdGhlIHNoYXJlZApkYXRhIHBhZ2UgKHRoZSBmaXJzdCBwYWdlIG9mIHRoZSBkZWZh dWx0IGNvbnRleHQpLgoKVGhpcyBpbmZvcm1hdGlvbiBzaG91bGQgYmUgaW4gRFdPUkQgOSBvZiB0 aGUgR1VDX0NUTCBzdHJ1Y3R1cmUuCgp2MjogVXNlIGd1Y19nZ3R0X29mZnNldCAoQ2hyaXMpLgpT dG9yZSB0aGUgZ2d0dCBvZmZzZXQgb2YgdGhlIGRlZmF1bHQgY3R4IGFzIHdlIG5lZWRlZCBmb3IK c3VzcGVuZC9yZXN1bWUvcmVzZXQgKERhbmllbGUpLgoKQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNA Y2hyaXMtd2lsc29uLmNvLnVrPgpDYzogRGFuaWVsZSBDZXJhb2xvIFNwdXJpbyA8ZGFuaWVsZS5j ZXJhb2xvc3B1cmlvQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogTWljaGVsIFRoaWVycnkgPG1p Y2hlbC50aGllcnJ5QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1 Y19zdWJtaXNzaW9uLmMgfCAyMSArKysrKystLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2d1Y19md2lmLmggICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9ndWNfbG9hZGVyLmMgICAgfCAxMSArKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfdWMuaCAgICAgICAgICAgIHwgIDIgKysKIDQgZmlsZXMgY2hhbmdlZCwgMjAg aW5zZXJ0aW9ucygrKSwgMTYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9ndWNfc3VibWlzc2lvbi5jCmluZGV4IGM4MDY3YWVhYjZmNC4uNThkNmM1NzBhMTg4IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCkBAIC0xMzY0LDcgKzEz NjQsNiBAQCB2b2lkIGk5MTVfZ3VjX3N1Ym1pc3Npb25fcmVlbmFibGVfZW5naW5lKHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIGludCBpbnRlbF9ndWNfc3VzcGVuZChzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJc3RydWN0IGludGVsX2d1YyAqZ3VjID0gJmRl dl9wcml2LT5ndWM7Ci0Jc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eDsKIAl1MzIgZGF0YVsz XTsKIAogCWlmIChndWMtPmZ3LmxvYWRfc3RhdHVzICE9IElOVEVMX1VDX0ZJUk1XQVJFX1NVQ0NF U1MpCkBAIC0xMzcyLDEzICsxMzcxLDExIEBAIGludCBpbnRlbF9ndWNfc3VzcGVuZChzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIAlnZW45X2Rpc2FibGVfZ3VjX2ludGVycnVw dHMoZGV2X3ByaXYpOwogCi0JY3R4ID0gZGV2X3ByaXYtPmtlcm5lbF9jb250ZXh0OwotCiAJZGF0 YVswXSA9IElOVEVMX0dVQ19BQ1RJT05fRU5URVJfU19TVEFURTsKIAkvKiBhbnkgdmFsdWUgZ3Jl YXRlciB0aGFuIEdVQ19QT1dFUl9EMCAqLwogCWRhdGFbMV0gPSBHVUNfUE9XRVJfRDE7Ci0JLyog Zmlyc3QgcGFnZSBpcyBzaGFyZWQgZGF0YSB3aXRoIEd1QyAqLwotCWRhdGFbMl0gPSBndWNfZ2d0 dF9vZmZzZXQoY3R4LT5lbmdpbmVbUkNTXS5zdGF0ZSk7CisJLyogZmlyc3QgcGFnZSBvZiBkZWZh dWx0IGN0eCBpcyBzaGFyZWQgZGF0YSB3aXRoIEd1QyAqLworCWRhdGFbMl0gPSBndWMtPnNoYXJl ZF9kYXRhX29mZnNldDsKIAogCXJldHVybiBpbnRlbF9ndWNfc2VuZChndWMsIGRhdGEsIEFSUkFZ X1NJWkUoZGF0YSkpOwogfQpAQCAtMTM5MCw3ICsxMzg3LDYgQEAgaW50IGludGVsX2d1Y19zdXNw ZW5kKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIGludCBpbnRlbF9ndWNfcmVz dW1lKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlzdHJ1Y3QgaW50ZWxf Z3VjICpndWMgPSAmZGV2X3ByaXYtPmd1YzsKLQlzdHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAqY3R4 OwogCXUzMiBkYXRhWzNdOwogCiAJaWYgKGd1Yy0+ZncubG9hZF9zdGF0dXMgIT0gSU5URUxfVUNf RklSTVdBUkVfU1VDQ0VTUykKQEAgLTEzOTksMTIgKzEzOTUsMTAgQEAgaW50IGludGVsX2d1Y19y ZXN1bWUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWlmIChpOTE1Lmd1Y19s b2dfbGV2ZWwgPj0gMCkKIAkJZ2VuOV9lbmFibGVfZ3VjX2ludGVycnVwdHMoZGV2X3ByaXYpOwog Ci0JY3R4ID0gZGV2X3ByaXYtPmtlcm5lbF9jb250ZXh0OwotCiAJZGF0YVswXSA9IElOVEVMX0dV Q19BQ1RJT05fRVhJVF9TX1NUQVRFOwogCWRhdGFbMV0gPSBHVUNfUE9XRVJfRDA7Ci0JLyogZmly c3QgcGFnZSBpcyBzaGFyZWQgZGF0YSB3aXRoIEd1QyAqLwotCWRhdGFbMl0gPSBndWNfZ2d0dF9v ZmZzZXQoY3R4LT5lbmdpbmVbUkNTXS5zdGF0ZSk7CisJLyogZmlyc3QgcGFnZSBvZiBkZWZhdWx0 IGN0eCBpcyBzaGFyZWQgZGF0YSB3aXRoIEd1QyAqLworCWRhdGFbMl0gPSBndWMtPnNoYXJlZF9k YXRhX29mZnNldDsKIAogCXJldHVybiBpbnRlbF9ndWNfc2VuZChndWMsIGRhdGEsIEFSUkFZX1NJ WkUoZGF0YSkpOwogfQpAQCAtMTQxMywxNCArMTQwNywxMSBAQCBpbnQgaTkxNV9ndWNfcmVzZXRf ZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBlbmdpbmUtPmk5MTU7CiAJc3RydWN0IGludGVsX2d1YyAq Z3VjID0gJmRldl9wcml2LT5ndWM7Ci0Jc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eDsKIAl1 MzIgZGF0YVs3XTsKIAogCWlmICghaTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24pCiAJCXJldHVy biAwOwogCi0JY3R4ID0gZGV2X3ByaXYtPmtlcm5lbF9jb250ZXh0OwotCiAJLyoKIAkgKiBUaGUg YWZmZWN0ZWQgY29udGV4dCByZXBvcnQgaXMgcG9wdWxhdGVkIGJ5IEd1QyBhbmQgaXMgcHJvdmlk ZWQKIAkgKiB0byB0aGUgZHJpdmVyIHVzaW5nIHRoZSBzaGFyZWQgcGFnZS4gV2UgcmVxdWVzdCBm b3IgaXQgYnV0IGRvbid0CkBAIC0xNDMyLDggKzE0MjMsOCBAQCBpbnQgaTkxNV9ndWNfcmVzZXRf ZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlkYXRhWzNdID0gMDsKIAlk YXRhWzRdID0gMDsKIAlkYXRhWzVdID0gZ3VjLT5leGVjYnVmX2NsaWVudC0+c3RhZ2VfaWQ7Ci0J LyogZmlyc3QgcGFnZSBpcyBzaGFyZWQgZGF0YSB3aXRoIEd1QyAqLwotCWRhdGFbNl0gPSBndWNf Z2d0dF9vZmZzZXQoY3R4LT5lbmdpbmVbUkNTXS5zdGF0ZSk7CisJLyogZmlyc3QgcGFnZSBvZiBk ZWZhdWx0IGN0eCBpcyBzaGFyZWQgZGF0YSB3aXRoIEd1QyAqLworCWRhdGFbNl0gPSBndWMtPnNo YXJlZF9kYXRhX29mZnNldDsKIAogCXJldHVybiBpbnRlbF9ndWNfc2VuZChndWMsIGRhdGEsIEFS UkFZX1NJWkUoZGF0YSkpOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZ3VjX2Z3aWYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19md2lmLmgKaW5k ZXggMDgxZjJjZjYxNGU2Li5hMmQwY2JhMmY4YjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2d1Y19md2lmLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf Z3VjX2Z3aWYuaApAQCAtMTM1LDcgKzEzNSw3IEBACiAjZGVmaW5lICAgR1VDX0FEU19BRERSX1NI SUZUCQkxMQogI2RlZmluZSAgIEdVQ19BRFNfQUREUl9NQVNLCQkweGZmZmZmODAwCiAKLSNkZWZp bmUgR1VDX0NUTF9SU1JWRAkJCTkKKyNkZWZpbmUgR1VDX0NUTF9TSEFSRURfREFUQQkJOQogCiAj ZGVmaW5lIEdVQ19DVExfTUFYX0RXT1JEUwkJKFNPRlRfU0NSQVRDSF9DT1VOVCAtIDIpIC8qIFsx Li4xNF0gKi8KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xv YWRlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCmluZGV4IGQ5 MDQ1YjZlODk3Yi4uOGNkNWMyYmY5NTEwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9ndWNfbG9hZGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3Vj X2xvYWRlci5jCkBAIC0xMDgsNiArMTA4LDcgQEAgc3RhdGljIHZvaWQgZ3VjX3BhcmFtc19pbml0 KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlzdHJ1Y3QgaW50ZWxfZ3Vj ICpndWMgPSAmZGV2X3ByaXYtPmd1YzsKIAl1MzIgcGFyYW1zW0dVQ19DVExfTUFYX0RXT1JEU107 CisJc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eDsKIAlpbnQgaTsKIAogCW1lbXNldCgmcGFy YW1zLCAwLCBzaXplb2YocGFyYW1zKSk7CkBAIC0xNTYsNiArMTU3LDE2IEBAIHN0YXRpYyB2b2lk IGd1Y19wYXJhbXNfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCXBh cmFtc1tHVUNfQ1RMX0ZFQVRVUkVdICY9IH5HVUNfQ1RMX0RJU0FCTEVfU0NIRURVTEVSOwogCX0K IAorCS8qCisJICogRm9yIHdhdGNoZG9nIC8gbWVkaWEgcmVzZXQsIEd1QyBtdXN0IGtub3cgdGhl IGFkZHJlc3Mgb2YgdGhlIHNoYXJlZAorCSAqIGRhdGEgcGFnZSwgd2hpY2ggaXMgdGhlIGZpcnN0 IHBhZ2Ugb2YgdGhlIGRlZmF1bHQgY29udGV4dC4KKwkgKiBXZSB3aWxsIGFsc28gdXNlIHRoaXMg cGFnZSBpbiBzZXZlcmFsIHBsYWNlcyAoc3VzcGVuZC9yZXN1bWUvcmVzZXQpLAorCSAqIHNvIHNh dmUgdGhlIGdndHQgb2Zmc2V0LgorCSAqLworCWN0eCA9IGRldl9wcml2LT5rZXJuZWxfY29udGV4 dDsKKwlndWMtPnNoYXJlZF9kYXRhX29mZnNldCA9IGd1Y19nZ3R0X29mZnNldChjdHgtPmVuZ2lu ZVtSQ1NdLnN0YXRlKTsKKwlwYXJhbXNbR1VDX0NUTF9TSEFSRURfREFUQV0gPSBndWMtPnNoYXJl ZF9kYXRhX29mZnNldDsKKwogCUk5MTVfV1JJVEUoU09GVF9TQ1JBVENIKDApLCAwKTsKIAogCWZv ciAoaSA9IDA7IGkgPCBHVUNfQ1RMX01BWF9EV09SRFM7IGkrKykKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91 Yy5oCmluZGV4IGEzNDhkMDhjZTIyNy4uYzY4NmYyMDA4MmQ3IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3VjLmgKQEAgLTE5NSw2ICsxOTUsOCBAQCBzdHJ1Y3QgaW50ZWxfZ3VjIHsKIAlERUNMQVJFX0JJ VE1BUChkb29yYmVsbF9iaXRtYXAsIEdVQ19OVU1fRE9PUkJFTExTKTsKIAl1aW50MzJfdCBkYl9j YWNoZWxpbmU7CQkvKiBDeWNsaWMgY291bnRlciBtb2QgcGFnZXNpemUJKi8KIAorCXVpbnQzMl90 IHNoYXJlZF9kYXRhX29mZnNldDsJLyogRmlyc3QgcGFnZSBvZiBkZWZhdWx0IGN0eCAqLworCiAJ LyogQWN0aW9uIHN0YXR1cyAmIHN0YXRpc3RpY3MgKi8KIAl1aW50NjRfdCBhY3Rpb25fY291bnQ7 CQkvKiBUb3RhbCBjb21tYW5kcyBpc3N1ZWQJKi8KIAl1aW50MzJfdCBhY3Rpb25fY21kOwkJLyog TGFzdCBjb21tYW5kIHdvcmQJCSovCi0tIAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=