From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH v3 1/2] drm/i915: Make sandybridge_pcode_read() deal with the second data register Date: Fri, 3 May 2019 22:08:30 +0300 Message-ID: <20190503190831.1759-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9A141898BE for ; Fri, 3 May 2019 19:08:34 +0000 (UTC) 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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClRo ZSBwY29kZSBtYWlsYm94IGhhcyB0d28gZGF0YSByZWdpc3RlcnMuIFNvIGZhciB3ZSd2ZSBvbmx5 IGV2ZXIgdXNlZAp0aGUgb25lLCBidXQgdGhhdCdzIGFib3V0IHRvIGNoYW5nZS4gRXhwb3NlIHRo ZSBzZWNvbmQgZGF0YSByZWdpc3RlciB0bwp0aGUgY2FsbGVycyBvZiBzYW5keWJyaWRnZV9wY29k ZV9yZWFkKCkuCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFA bGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5j ICAgfCAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAgIHwgMTIg KysrKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zaWRlYmFuZC5jIHwgMTUg KysrKysrKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zaWRlYmFuZC5oIHwg IDMgKystCiA0IGZpbGVzIGNoYW5nZWQsIDIwIGluc2VydGlvbnMoKyksIDE0IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKaW5kZXggMTRjZDgzZTllYThiLi4yMDMw ODhmNmYyNjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCkBAIC0xNDk0LDcgKzE0 OTQsNyBAQCBzdGF0aWMgaW50IGdlbjZfZHJwY19pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSkKIAog CWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpIDw9IDcpCiAJCXNhbmR5YnJpZGdlX3Bjb2RlX3JlYWQo ZGV2X3ByaXYsIEdFTjZfUENPREVfUkVBRF9SQzZWSURTLAotCQkJCSAgICAgICAmcmM2dmlkcyk7 CisJCQkJICAgICAgICZyYzZ2aWRzLCBOVUxMKTsKIAogCXNlcV9wcmludGYobSwgIlJDMWUgRW5h YmxlZDogJXNcbiIsCiAJCSAgIHllc25vKHJjY3RsMSAmIEdFTjZfUkNfQ1RMX1JDMWVfRU5BQkxF KSk7CkBAIC0xNzc3LDcgKzE3NzcsNyBAQCBzdGF0aWMgaW50IGk5MTVfcmluZ19mcmVxX3RhYmxl KHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqdW51c2VkKQogCQlpYV9mcmVxID0gZ3B1X2ZyZXE7 CiAJCXNhbmR5YnJpZGdlX3Bjb2RlX3JlYWQoZGV2X3ByaXYsCiAJCQkJICAgICAgIEdFTjZfUENP REVfUkVBRF9NSU5fRlJFUV9UQUJMRSwKLQkJCQkgICAgICAgJmlhX2ZyZXEpOworCQkJCSAgICAg ICAmaWFfZnJlcSwgTlVMTCk7CiAJCXNlcV9wcmludGYobSwgIiVkXHRcdCVkXHRcdFx0XHQlZFxu IiwKIAkJCSAgIGludGVsX2dwdV9mcmVxKGRldl9wcml2LCAoZ3B1X2ZyZXEgKgogCQkJCQkJICAg ICAoSVNfR0VOOV9CQyhkZXZfcHJpdikgfHwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IGVm OWZjNzdmODE2Mi4uYjA0M2E5NmUxMjNjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTI4 MjIsNyArMjgyMiw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3JlYWRfd21fbGF0ZW5jeShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCXZhbCA9IDA7IC8qIGRhdGEwIHRvIGJlIHBy b2dyYW1tZWQgdG8gMCBmb3IgZmlyc3Qgc2V0ICovCiAJCXJldCA9IHNhbmR5YnJpZGdlX3Bjb2Rl X3JlYWQoZGV2X3ByaXYsCiAJCQkJCSAgICAgR0VOOV9QQ09ERV9SRUFEX01FTV9MQVRFTkNZLAot CQkJCQkgICAgICZ2YWwpOworCQkJCQkgICAgICZ2YWwsIE5VTEwpOwogCiAJCWlmIChyZXQpIHsK IAkJCURSTV9FUlJPUigiU0tMIE1haWxib3ggcmVhZCBlcnJvciA9ICVkXG4iLCByZXQpOwpAQCAt Mjg0MSw3ICsyODQxLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfcmVhZF93bV9sYXRlbmN5KHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJdmFsID0gMTsgLyogZGF0YTAgdG8gYmUg cHJvZ3JhbW1lZCB0byAxIGZvciBzZWNvbmQgc2V0ICovCiAJCXJldCA9IHNhbmR5YnJpZGdlX3Bj b2RlX3JlYWQoZGV2X3ByaXYsCiAJCQkJCSAgICAgR0VOOV9QQ09ERV9SRUFEX01FTV9MQVRFTkNZ LAotCQkJCQkgICAgICZ2YWwpOworCQkJCQkgICAgICZ2YWwsIE5VTEwpOwogCQlpZiAocmV0KSB7 CiAJCQlEUk1fRVJST1IoIlNLTCBNYWlsYm94IHJlYWQgZXJyb3IgPSAlZFxuIiwgcmV0KTsKIAkJ CXJldHVybjsKQEAgLTcwNjEsNyArNzA2MSw3IEBAIHN0YXRpYyB2b2lkIGdlbjZfaW5pdF9ycHNf ZnJlcXVlbmNpZXMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiAJCWlmIChz YW5keWJyaWRnZV9wY29kZV9yZWFkKGRldl9wcml2LAogCQkJCQkgICBIU1dfUENPREVfRFlOQU1J Q19EVVRZX0NZQ0xFX0NPTlRST0wsCi0JCQkJCSAgICZkZGNjX3N0YXR1cykgPT0gMCkKKwkJCQkJ ICAgJmRkY2Nfc3RhdHVzLCBOVUxMKSA9PSAwKQogCQkJcnBzLT5lZmZpY2llbnRfZnJlcSA9CiAJ CQkJY2xhbXBfdCh1OCwKIAkJCQkJKChkZGNjX3N0YXR1cyA+PiA4KSAmIDB4ZmYpLApAQCAtNzQw OCw3ICs3NDA4LDggQEAgc3RhdGljIHZvaWQgZ2VuNl9lbmFibGVfcmM2KHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIAkJICAgR0VONl9SQ19DVExfSFdfRU5BQkxFKTsKIAogCXJj NnZpZHMgPSAwOwotCXJldCA9IHNhbmR5YnJpZGdlX3Bjb2RlX3JlYWQoZGV2X3ByaXYsIEdFTjZf UENPREVfUkVBRF9SQzZWSURTLCAmcmM2dmlkcyk7CisJcmV0ID0gc2FuZHlicmlkZ2VfcGNvZGVf cmVhZChkZXZfcHJpdiwgR0VONl9QQ09ERV9SRUFEX1JDNlZJRFMsCisJCQkJICAgICAmcmM2dmlk cywgTlVMTCk7CiAJaWYgKElTX0dFTihkZXZfcHJpdiwgNikgJiYgcmV0KSB7CiAJCURSTV9ERUJV R19EUklWRVIoIkNvdWxkbid0IGNoZWNrIGZvciBCSU9TIHdvcmthcm91bmRcbiIpOwogCX0gZWxz ZSBpZiAoSVNfR0VOKGRldl9wcml2LCA2KSAmJiAoR0VONl9ERUNPREVfUkM2X1ZJRChyYzZ2aWRz ICYgMHhmZikgPCA0NTApKSB7CkBAIC04NTU1LDcgKzg1NTYsOCBAQCB2b2lkIGludGVsX2luaXRf Z3RfcG93ZXJzYXZlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkgICAgSVNf SVZZQlJJREdFKGRldl9wcml2KSB8fCBJU19IQVNXRUxMKGRldl9wcml2KSkgewogCQl1MzIgcGFy YW1zID0gMDsKIAotCQlzYW5keWJyaWRnZV9wY29kZV9yZWFkKGRldl9wcml2LCBHRU42X1JFQURf T0NfUEFSQU1TLCAmcGFyYW1zKTsKKwkJc2FuZHlicmlkZ2VfcGNvZGVfcmVhZChkZXZfcHJpdiwg R0VONl9SRUFEX09DX1BBUkFNUywKKwkJCQkgICAgICAgJnBhcmFtcywgTlVMTCk7CiAJCWlmIChw YXJhbXMgJiBCSVQoMzEpKSB7IC8qIE9DIHN1cHBvcnRlZCAqLwogCQkJRFJNX0RFQlVHX0RSSVZF UigiT3ZlcmNsb2NraW5nIHN1cHBvcnRlZCwgbWF4OiAlZE1Ieiwgb3ZlcmNsb2NrOiAlZE1Ielxu IiwKIAkJCQkJIChycHMtPm1heF9mcmVxICYgMHhmZikgKiA1MCwKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3NpZGViYW5kLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9zaWRlYmFuZC5jCmluZGV4IDg3YjVhMTRjN2NhOC4uYTExNTYyNWU5ODBjIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zaWRlYmFuZC5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3NpZGViYW5kLmMKQEAgLTM3NCw3ICszNzQsNyBAQCBzdGF0aWMg aW5saW5lIGludCBnZW43X2NoZWNrX21haWxib3hfc3RhdHVzKHUzMiBtYm94KQogfQogCiBzdGF0 aWMgaW50IF9fc2FuZHlicmlkZ2VfcGNvZGVfcncoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5 MTUsCi0JCQkJICB1MzIgbWJveCwgdTMyICp2YWwsCisJCQkJICB1MzIgbWJveCwgdTMyICp2YWws IHUzMiAqdmFsMSwKIAkJCQkgIGludCBmYXN0X3RpbWVvdXRfdXMsCiAJCQkJICBpbnQgc2xvd190 aW1lb3V0X21zLAogCQkJCSAgYm9vbCBpc19yZWFkKQpAQCAtMzkzLDcgKzM5Myw3IEBAIHN0YXRp YyBpbnQgX19zYW5keWJyaWRnZV9wY29kZV9ydyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkx NSwKIAkJcmV0dXJuIC1FQUdBSU47CiAKIAlpbnRlbF91bmNvcmVfd3JpdGVfZncodW5jb3JlLCBH RU42X1BDT0RFX0RBVEEsICp2YWwpOwotCWludGVsX3VuY29yZV93cml0ZV9mdyh1bmNvcmUsIEdF TjZfUENPREVfREFUQTEsIDApOworCWludGVsX3VuY29yZV93cml0ZV9mdyh1bmNvcmUsIEdFTjZf UENPREVfREFUQTEsIHZhbDEgPyAqdmFsMSA6IDApOwogCWludGVsX3VuY29yZV93cml0ZV9mdyh1 bmNvcmUsCiAJCQkgICAgICBHRU42X1BDT0RFX01BSUxCT1gsIEdFTjZfUENPREVfUkVBRFkgfCBt Ym94KTsKIApAQCAtNDA3LDYgKzQwNyw4IEBAIHN0YXRpYyBpbnQgX19zYW5keWJyaWRnZV9wY29k ZV9ydyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwKIAogCWlmIChpc19yZWFkKQogCQkq dmFsID0gaW50ZWxfdW5jb3JlX3JlYWRfZncodW5jb3JlLCBHRU42X1BDT0RFX0RBVEEpOworCWlm IChpc19yZWFkICYmIHZhbDEpCisJCSp2YWwxID0gaW50ZWxfdW5jb3JlX3JlYWRfZncodW5jb3Jl LCBHRU42X1BDT0RFX0RBVEExKTsKIAogCWlmIChJTlRFTF9HRU4oaTkxNSkgPiA2KQogCQlyZXR1 cm4gZ2VuN19jaGVja19tYWlsYm94X3N0YXR1cyhtYm94KTsKQEAgLTQxNCwxMiArNDE2LDEzIEBA IHN0YXRpYyBpbnQgX19zYW5keWJyaWRnZV9wY29kZV9ydyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqaTkxNSwKIAkJcmV0dXJuIGdlbjZfY2hlY2tfbWFpbGJveF9zdGF0dXMobWJveCk7CiB9CiAK LWludCBzYW5keWJyaWRnZV9wY29kZV9yZWFkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1 LCB1MzIgbWJveCwgdTMyICp2YWwpCitpbnQgc2FuZHlicmlkZ2VfcGNvZGVfcmVhZChzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwgdTMyIG1ib3gsCisJCQkgICB1MzIgKnZhbCwgdTMyICp2 YWwxKQogewogCWludCBlcnI7CiAKIAltdXRleF9sb2NrKCZpOTE1LT5zYl9sb2NrKTsKLQllcnIg PSBfX3NhbmR5YnJpZGdlX3Bjb2RlX3J3KGk5MTUsIG1ib3gsIHZhbCwKKwllcnIgPSBfX3NhbmR5 YnJpZGdlX3Bjb2RlX3J3KGk5MTUsIG1ib3gsIHZhbCwgdmFsMSwKIAkJCQkgICAgIDUwMCwgMCwK IAkJCQkgICAgIHRydWUpOwogCW11dGV4X3VubG9jaygmaTkxNS0+c2JfbG9jayk7CkBAIC00NDAs NyArNDQzLDcgQEAgaW50IHNhbmR5YnJpZGdlX3Bjb2RlX3dyaXRlX3RpbWVvdXQoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmk5MTUsCiAJaW50IGVycjsKIAogCW11dGV4X2xvY2soJmk5MTUtPnNi X2xvY2spOwotCWVyciA9IF9fc2FuZHlicmlkZ2VfcGNvZGVfcncoaTkxNSwgbWJveCwgJnZhbCwK KwllcnIgPSBfX3NhbmR5YnJpZGdlX3Bjb2RlX3J3KGk5MTUsIG1ib3gsICZ2YWwsIE5VTEwsCiAJ CQkJICAgICBmYXN0X3RpbWVvdXRfdXMsIHNsb3dfdGltZW91dF9tcywKIAkJCQkgICAgIGZhbHNl KTsKIAltdXRleF91bmxvY2soJmk5MTUtPnNiX2xvY2spOwpAQCAtNDU3LDcgKzQ2MCw3IEBAIHN0 YXRpYyBib29sIHNrbF9wY29kZV90cnlfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq aTkxNSwgdTMyIG1ib3gsCiAJCQkJICB1MzIgcmVxdWVzdCwgdTMyIHJlcGx5X21hc2ssIHUzMiBy ZXBseSwKIAkJCQkgIHUzMiAqc3RhdHVzKQogewotCSpzdGF0dXMgPSBfX3NhbmR5YnJpZGdlX3Bj b2RlX3J3KGk5MTUsIG1ib3gsICZyZXF1ZXN0LAorCSpzdGF0dXMgPSBfX3NhbmR5YnJpZGdlX3Bj b2RlX3J3KGk5MTUsIG1ib3gsICZyZXF1ZXN0LCBOVUxMLAogCQkJCQkgNTAwLCAwLAogCQkJCQkg dHJ1ZSk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3NpZGViYW5k LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zaWRlYmFuZC5oCmluZGV4IGEwOTA3ZTJj NDk5Mi4uN2ZiOTU3NDVhNDQ0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9zaWRlYmFuZC5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3NpZGViYW5kLmgK QEAgLTEyNyw3ICsxMjcsOCBAQCB1MzIgaW50ZWxfc2JpX3JlYWQoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmk5MTUsIHUxNiByZWcsCiB2b2lkIGludGVsX3NiaV93cml0ZShzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqaTkxNSwgdTE2IHJlZywgdTMyIHZhbHVlLAogCQkgICAgIGVudW0gaW50ZWxf c2JpX2Rlc3RpbmF0aW9uIGRlc3RpbmF0aW9uKTsKIAotaW50IHNhbmR5YnJpZGdlX3Bjb2RlX3Jl YWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsIHUzMiBtYm94LCB1MzIgKnZhbCk7Citp bnQgc2FuZHlicmlkZ2VfcGNvZGVfcmVhZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwg dTMyIG1ib3gsCisJCQkgICB1MzIgKnZhbCwgdTMyICp2YWwxKTsKIGludCBzYW5keWJyaWRnZV9w Y29kZV93cml0ZV90aW1lb3V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LCB1MzIgbWJv eCwKIAkJCQkgICAgdTMyIHZhbCwgaW50IGZhc3RfdGltZW91dF91cywKIAkJCQkgICAgaW50IHNs b3dfdGltZW91dF9tcyk7Ci0tIAoyLjIxLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeA==