From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel Thierry Subject: [PATCH v7 15/20] drm/i915: Watchdog timeout: Pass GuC shared data structure during param load Date: Thu, 27 Apr 2017 16:12:55 -0700 Message-ID: <20170427231300.32841-16-michel.thierry@intel.com> References: <20170427231300.32841-1-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3DE7F6E195 for ; Thu, 27 Apr 2017 23:13:03 +0000 (UTC) In-Reply-To: <20170427231300.32841-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 ZXJhb2xvc3B1cmlvQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IERhbmllbGUgQ2VyYW9sbyBTcHVy aW8gPGRhbmllbGUuY2VyYW9sb3NwdXJpb0BpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IE1pY2hl bCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIHwgMjEgKysrKysrLS0tLS0tLS0tLS0tLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZndpZi5oICAgICAgfCAgMiArLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jICAgIHwgMTEgKysrKysrKysrKysKIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmggICAgICAgICAgICB8ICAyICsrCiA0IGZpbGVz IGNoYW5nZWQsIDIwIGluc2VydGlvbnMoKyksIDE2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwppbmRleCA1NzgxNWVkZmM0ZGYuLjk3Mzky ZTFjMDRkMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlz c2lvbi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwpA QCAtMTM3MCw3ICsxMzcwLDYgQEAgdm9pZCBpOTE1X2d1Y19zdWJtaXNzaW9uX3JlZW5hYmxlX2Vu Z2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiBpbnQgaW50ZWxfZ3VjX3N1c3Bl bmQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCXN0cnVjdCBpbnRlbF9n dWMgKmd1YyA9ICZkZXZfcHJpdi0+Z3VjOwotCXN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpjdHg7 CiAJdTMyIGRhdGFbM107CiAKIAlpZiAoZ3VjLT5mdy5sb2FkX3N0YXR1cyAhPSBJTlRFTF9VQ19G SVJNV0FSRV9TVUNDRVNTKQpAQCAtMTM3OCwxMyArMTM3NywxMSBAQCBpbnQgaW50ZWxfZ3VjX3N1 c3BlbmQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiAJZ2VuOV9kaXNhYmxl X2d1Y19pbnRlcnJ1cHRzKGRldl9wcml2KTsKIAotCWN0eCA9IGRldl9wcml2LT5rZXJuZWxfY29u dGV4dDsKLQogCWRhdGFbMF0gPSBJTlRFTF9HVUNfQUNUSU9OX0VOVEVSX1NfU1RBVEU7CiAJLyog YW55IHZhbHVlIGdyZWF0ZXIgdGhhbiBHVUNfUE9XRVJfRDAgKi8KIAlkYXRhWzFdID0gR1VDX1BP V0VSX0QxOwotCS8qIGZpcnN0IHBhZ2UgaXMgc2hhcmVkIGRhdGEgd2l0aCBHdUMgKi8KLQlkYXRh WzJdID0gZ3VjX2dndHRfb2Zmc2V0KGN0eC0+ZW5naW5lW1JDU10uc3RhdGUpOworCS8qIGZpcnN0 IHBhZ2Ugb2YgZGVmYXVsdCBjdHggaXMgc2hhcmVkIGRhdGEgd2l0aCBHdUMgKi8KKwlkYXRhWzJd ID0gZ3VjLT5zaGFyZWRfZGF0YV9vZmZzZXQ7CiAKIAlyZXR1cm4gaW50ZWxfZ3VjX3NlbmQoZ3Vj LCBkYXRhLCBBUlJBWV9TSVpFKGRhdGEpKTsKIH0KQEAgLTEzOTYsNyArMTM5Myw2IEBAIGludCBp bnRlbF9ndWNfc3VzcGVuZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiBpbnQg aW50ZWxfZ3VjX3Jlc3VtZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJ c3RydWN0IGludGVsX2d1YyAqZ3VjID0gJmRldl9wcml2LT5ndWM7Ci0Jc3RydWN0IGk5MTVfZ2Vt X2NvbnRleHQgKmN0eDsKIAl1MzIgZGF0YVszXTsKIAogCWlmIChndWMtPmZ3LmxvYWRfc3RhdHVz ICE9IElOVEVMX1VDX0ZJUk1XQVJFX1NVQ0NFU1MpCkBAIC0xNDA1LDEyICsxNDAxLDEwIEBAIGlu dCBpbnRlbF9ndWNfcmVzdW1lKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlp ZiAoaTkxNS5ndWNfbG9nX2xldmVsID49IDApCiAJCWdlbjlfZW5hYmxlX2d1Y19pbnRlcnJ1cHRz KGRldl9wcml2KTsKIAotCWN0eCA9IGRldl9wcml2LT5rZXJuZWxfY29udGV4dDsKLQogCWRhdGFb MF0gPSBJTlRFTF9HVUNfQUNUSU9OX0VYSVRfU19TVEFURTsKIAlkYXRhWzFdID0gR1VDX1BPV0VS X0QwOwotCS8qIGZpcnN0IHBhZ2UgaXMgc2hhcmVkIGRhdGEgd2l0aCBHdUMgKi8KLQlkYXRhWzJd ID0gZ3VjX2dndHRfb2Zmc2V0KGN0eC0+ZW5naW5lW1JDU10uc3RhdGUpOworCS8qIGZpcnN0IHBh Z2Ugb2YgZGVmYXVsdCBjdHggaXMgc2hhcmVkIGRhdGEgd2l0aCBHdUMgKi8KKwlkYXRhWzJdID0g Z3VjLT5zaGFyZWRfZGF0YV9vZmZzZXQ7CiAKIAlyZXR1cm4gaW50ZWxfZ3VjX3NlbmQoZ3VjLCBk YXRhLCBBUlJBWV9TSVpFKGRhdGEpKTsKIH0KQEAgLTE0MTksMTQgKzE0MTMsMTEgQEAgaW50IGk5 MTVfZ3VjX3Jlc2V0X2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CiAJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZW5naW5lLT5pOTE1OwogCXN0cnVj dCBpbnRlbF9ndWMgKmd1YyA9ICZkZXZfcHJpdi0+Z3VjOwotCXN0cnVjdCBpOTE1X2dlbV9jb250 ZXh0ICpjdHg7CiAJdTMyIGRhdGFbN107CiAKIAlpZiAoIWk5MTUuZW5hYmxlX2d1Y19zdWJtaXNz aW9uKQogCQlyZXR1cm4gMDsKIAotCWN0eCA9IGRldl9wcml2LT5rZXJuZWxfY29udGV4dDsKLQog CS8qCiAJICogVGhlIGFmZmVjdGVkIGNvbnRleHQgcmVwb3J0IGlzIHBvcHVsYXRlZCBieSBHdUMg YW5kIGlzIHByb3ZpZGVkCiAJICogdG8gdGhlIGRyaXZlciB1c2luZyB0aGUgc2hhcmVkIHBhZ2Uu IFdlIHJlcXVlc3QgZm9yIGl0IGJ1dCBkb24ndApAQCAtMTQzOCw4ICsxNDI5LDggQEAgaW50IGk5 MTVfZ3VjX3Jlc2V0X2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJZGF0 YVszXSA9IDA7CiAJZGF0YVs0XSA9IDA7CiAJZGF0YVs1XSA9IGd1Yy0+ZXhlY2J1Zl9jbGllbnQt PnN0YWdlX2lkOwotCS8qIGZpcnN0IHBhZ2UgaXMgc2hhcmVkIGRhdGEgd2l0aCBHdUMgKi8KLQlk YXRhWzZdID0gZ3VjX2dndHRfb2Zmc2V0KGN0eC0+ZW5naW5lW1JDU10uc3RhdGUpOworCS8qIGZp cnN0IHBhZ2Ugb2YgZGVmYXVsdCBjdHggaXMgc2hhcmVkIGRhdGEgd2l0aCBHdUMgKi8KKwlkYXRh WzZdID0gZ3VjLT5zaGFyZWRfZGF0YV9vZmZzZXQ7CiAKIAlyZXR1cm4gaW50ZWxfZ3VjX3NlbmQo Z3VjLCBkYXRhLCBBUlJBWV9TSVpFKGRhdGEpKTsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2d1Y19md2lmLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n dWNfZndpZi5oCmluZGV4IDA4MWYyY2Y2MTRlNi4uYTJkMGNiYTJmOGI5IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZndpZi5oCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2d1Y19md2lmLmgKQEAgLTEzNSw3ICsxMzUsNyBAQAogI2RlZmluZSAgIEdV Q19BRFNfQUREUl9TSElGVAkJMTEKICNkZWZpbmUgICBHVUNfQURTX0FERFJfTUFTSwkJMHhmZmZm ZjgwMAogCi0jZGVmaW5lIEdVQ19DVExfUlNSVkQJCQk5CisjZGVmaW5lIEdVQ19DVExfU0hBUkVE X0RBVEEJCTkKIAogI2RlZmluZSBHVUNfQ1RMX01BWF9EV09SRFMJCShTT0ZUX1NDUkFUQ0hfQ09V TlQgLSAyKSAvKiBbMS4uMTRdICovCiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2d1Y19sb2FkZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2Fk ZXIuYwppbmRleCBkOTA0NWI2ZTg5N2IuLjhjZDVjMmJmOTUxMCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2d1Y19sb2FkZXIuYwpAQCAtMTA4LDYgKzEwOCw3IEBAIHN0YXRpYyB2b2lkIGd1 Y19wYXJhbXNfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJc3Ry dWN0IGludGVsX2d1YyAqZ3VjID0gJmRldl9wcml2LT5ndWM7CiAJdTMyIHBhcmFtc1tHVUNfQ1RM X01BWF9EV09SRFNdOworCXN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpjdHg7CiAJaW50IGk7CiAK IAltZW1zZXQoJnBhcmFtcywgMCwgc2l6ZW9mKHBhcmFtcykpOwpAQCAtMTU2LDYgKzE1NywxNiBA QCBzdGF0aWMgdm9pZCBndWNfcGFyYW1zX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQogCQlwYXJhbXNbR1VDX0NUTF9GRUFUVVJFXSAmPSB+R1VDX0NUTF9ESVNBQkxFX1ND SEVEVUxFUjsKIAl9CiAKKwkvKgorCSAqIEZvciB3YXRjaGRvZyAvIG1lZGlhIHJlc2V0LCBHdUMg bXVzdCBrbm93IHRoZSBhZGRyZXNzIG9mIHRoZSBzaGFyZWQKKwkgKiBkYXRhIHBhZ2UsIHdoaWNo IGlzIHRoZSBmaXJzdCBwYWdlIG9mIHRoZSBkZWZhdWx0IGNvbnRleHQuCisJICogV2Ugd2lsbCBh bHNvIHVzZSB0aGlzIHBhZ2UgaW4gc2V2ZXJhbCBwbGFjZXMgKHN1c3BlbmQvcmVzdW1lL3Jlc2V0 KSwKKwkgKiBzbyBzYXZlIHRoZSBnZ3R0IG9mZnNldC4KKwkgKi8KKwljdHggPSBkZXZfcHJpdi0+ a2VybmVsX2NvbnRleHQ7CisJZ3VjLT5zaGFyZWRfZGF0YV9vZmZzZXQgPSBndWNfZ2d0dF9vZmZz ZXQoY3R4LT5lbmdpbmVbUkNTXS5zdGF0ZSk7CisJcGFyYW1zW0dVQ19DVExfU0hBUkVEX0RBVEFd ID0gZ3VjLT5zaGFyZWRfZGF0YV9vZmZzZXQ7CisKIAlJOTE1X1dSSVRFKFNPRlRfU0NSQVRDSCgw KSwgMCk7CiAKIAlmb3IgKGkgPSAwOyBpIDwgR1VDX0NUTF9NQVhfRFdPUkRTOyBpKyspCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfdWMuaAppbmRleCBhMzQ4ZDA4Y2UyMjcuLmM2ODZmMjAwODJkNyAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF91Yy5oCkBAIC0xOTUsNiArMTk1LDggQEAgc3RydWN0IGludGVsX2d1YyB7 CiAJREVDTEFSRV9CSVRNQVAoZG9vcmJlbGxfYml0bWFwLCBHVUNfTlVNX0RPT1JCRUxMUyk7CiAJ dWludDMyX3QgZGJfY2FjaGVsaW5lOwkJLyogQ3ljbGljIGNvdW50ZXIgbW9kIHBhZ2VzaXplCSov CiAKKwl1aW50MzJfdCBzaGFyZWRfZGF0YV9vZmZzZXQ7CS8qIEZpcnN0IHBhZ2Ugb2YgZGVmYXVs dCBjdHggKi8KKwogCS8qIEFjdGlvbiBzdGF0dXMgJiBzdGF0aXN0aWNzICovCiAJdWludDY0X3Qg YWN0aW9uX2NvdW50OwkJLyogVG90YWwgY29tbWFuZHMgaXNzdWVkCSovCiAJdWludDMyX3QgYWN0 aW9uX2NtZDsJCS8qIExhc3QgY29tbWFuZCB3b3JkCQkqLwotLSAKMi4xMS4wCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK