From: Yunwei Zhang Subject: [PATCH v2 1/3] drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads Date: Fri, 18 May 2018 11:12:32 -0700 Message-ID: <1526667152-9371-1-git-send-email-yunwei.zhang@intel.com> References: <1526331868-14768-1-git-send-email-yunwei.zhang@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5D9B36EE9D for ; Fri, 18 May 2018 18:20:56 +0000 (UTC) In-Reply-To: <1526331868-14768-1-git-send-email-yunwei.zhang@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 V2FQcm9ncmFtTWdzckZvckNvcnJlY3RTbGljZVNwZWNpZmljTW1pb1JlYWRzIGRpY3RhdGUgdGhh dCBiZWZvcmUgYW55IE1NSU8KcmVhZCBpbnRvIFNsaWNlL1N1YnNsaWNlIHNwZWNpZmljIHJlZ2lz dGVycywgTUNSIHBhY2tldCBjb250cm9sCnJlZ2lzdGVyKDB4RkRDKSBuZWVkcyB0byBiZSBwcm9n cmFtbWVkIHRvIHBvaW50IHRvIGFueSBlbmFibGVkCnNsaWNlL3N1YnNsaWNlIHBhaXIuIE90aGVy d2lzZSwgaW5jb3JyZWN0IHZhbHVlIHdpbGwgYmUgcmV0dXJuZWQuCgpIb3dldmVyLCB0aGF0IG1l YW5zIGVhY2ggc3Vic2VxdWVudCBNTUlPIHJlYWQgd2lsbCBiZSBmb3J3YXJkZWQgdG8gYQpzcGVj aWZpYyBzbGljZS9zdWJzbGljZSBjb21iaW5hdGlvbiBhcyByZWFkIGlzIHVuaWNhc3QuIFRoaXMg aXMgT0sgc2luY2UKc2xpY2Uvc3Vic2xpY2Ugc3BlY2lmaWMgcmVnaXN0ZXIgdmFsdWVzIGFyZSBj b25zaXN0ZW50IGluIGFsbW9zdCBhbGwgY2FzZXMKYWNyb3NzIHNsaWNlL3N1YnNsaWNlLiBUaGVy ZSBhcmUgcmFyZSBvY2Nhc2lvbnMgc3VjaCBhcyBJTlNURE9ORSB0aGF0IHRoaXMKdmFsdWUgd2ls bCBiZSBkZXBlbmRlbnQgb24gc2xpY2Uvc3Vic2xpY2UgY29tYm8sIGluIHN1Y2ggY2FzZXMsIHdl IG5lZWQgdG8KcHJvZ3JhbSAweEZEQyBhbmQgcmVjb3ZlciB0aGlzIGFmdGVyLiBUaGlzIGlzIGFs cmVhZHkgY292ZXJlZCBieQpyZWFkX3N1YnNsaWNlX3JlZy4KCkFsc28sIDB4RkRDIHdpbGwgbG9z ZSBpdHMgaW5mb3JtYXRpb24gYWZ0ZXIgVERSL2VuZ2luZSByZXNldC9wb3dlciBzdGF0ZQpjaGFu Z2UuCgpSZWZlcmVuY2VzOiBIU0QjMTQwNTU4Njg0MCwgQlNJRCMwNTc1Cgp2MjoKIC0gdXNlIGZs cygpIGluc3RlYWQgb2YgZmluZF9sYXN0X2JpdCgpIChDaHJpcykKIC0gYWRkZWQgSU5URUxfU1NF VSB0byBleHRyYWN0IHNzZXUgZnJvbSBkZXZpY2UgaW5mby4gKENocmlzKQp2MzoKIC0gcmViYXNl IG9uIGxhdGVzdCB0aXAKdjU6CiAtIEFkZGVkIHJlZmVyZW5jZXMgKE1pa2EpCiAtIENoYW5nZSB0 aGUgb3JkZXJlZCBvZiBwYXNzaW5nIGFyZ3VtZW50cyBhbmQgZXRjLiAoVXJzdWxpbikKdjc6CiAt IE1vdmVkIFdBIGV4cGxhbmF0aW9uIENvbW1lbnRzKE9zY2FyKQogLSBSZWJhc2VkLgp2ODoKIC0g UmVuYW1lZCBzYW5pdGl6ZV9tY3IgdG8gY2FsY3VsYXRlX3Nfc3Nfc2VsZWN0LiAoT3NjYXIpCiAt IGNhbGN1bGF0ZSBzL3NzIHNlbGVjdG9yIGluc3RlYWQgb2Ygd2hvbGUgbWNyLiAoT3NjYXIpCgpD YzogT3NjYXIgTWF0ZW8gPG9zY2FyLm1hdGVvQGludGVsLmNvbT4KQ2M6IE1pY2hlbCBUaGllcnJ5 IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20+CkNjOiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5s YWh0aW5lbkBsaW51eC5pbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdp bHNvbi5jby51az4KQ2M6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAbGludXguaW50ZWwu Y29tPgpDYzogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGxpbnV4LmludGVsLmNvbT4K U2lnbmVkLW9mZi1ieTogWXVud2VpIFpoYW5nIDx5dW53ZWkuemhhbmdAaW50ZWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICAgfCAgMiArKwogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMgICB8IDMzICsrKysrKysrKysrKysrKysr KysrKysrKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93b3JrYXJvdW5kcy5j IHwgMzIgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogMyBmaWxlcyBjaGFuZ2VkLCA2 MiBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmlu ZGV4IGUzM2MzODAuLmU2OTc3ODUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjc0NCw2 ICsyNzQ0LDggQEAgaW50IHZsdl9mb3JjZV9nZnhfY2xvY2soc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LCBib29sIG9uKTsKIGludCBpbnRlbF9lbmdpbmVzX2luaXRfbW1pbyhzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogaW50IGludGVsX2VuZ2luZXNfaW5pdChz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogCit1MzIgaW50ZWxfY2FsY3VsYXRl X3Nfc3Nfc2VsZWN0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CisKIC8qIGlu dGVsX2hvdHBsdWcuYyAqLwogdm9pZCBpbnRlbF9ocGRfaXJxX2hhbmRsZXIoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJICAgdTMyIHBpbl9tYXNrLCB1MzIgbG9uZ19tYXNr KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMKaW5kZXggMjZmOWY4YS4uNTEx OTc1ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMKQEAgLTgxOSwxMiAr ODE5LDMyIEBAIGNvbnN0IGNoYXIgKmk5MTVfY2FjaGVfbGV2ZWxfc3RyKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICppOTE1LCBpbnQgdHlwZSkKIAl9CiB9CiAKK3UzMiBpbnRlbF9jYWxjdWxhdGVf c19zc19zZWxlY3Qoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQoreworCWNvbnN0 IHN0cnVjdCBzc2V1X2Rldl9pbmZvICpzc2V1ID0gJihJTlRFTF9JTkZPKGRldl9wcml2KS0+c3Nl dSk7CisJdTMyIG1jcl9zX3NzX21hc2s7CisJdTMyIG1jcl9zX3NzX3NlbGVjdDsKKwl1MzIgc2xp Y2UgPSBmbHMoc3NldS0+c2xpY2VfbWFzayk7CisJdTMyIHN1YnNsaWNlID0gZmxzKHNzZXUtPnN1 YnNsaWNlX21hc2tbc2xpY2VdKTsKKworCW1jcl9zX3NzX21hc2sgPSBHRU44X01DUl9TTElDRV9N QVNLIHwgR0VOOF9NQ1JfU1VCU0xJQ0VfTUFTSzsKKworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYp ID09IDEwKQorCQltY3Jfc19zc19zZWxlY3QgPSBHRU44X01DUl9TTElDRShzbGljZSkgfAorCQkJ CSAgR0VOOF9NQ1JfU1VCU0xJQ0Uoc3Vic2xpY2UpOworCWVsc2UKKwkJbWNyX3Nfc3Nfc2VsZWN0 ID0gMDsKKworCXJldHVybiBtY3Jfc19zc19zZWxlY3Q7Cit9CisKIHN0YXRpYyBpbmxpbmUgdWlu dDMyX3QKIHJlYWRfc3Vic2xpY2VfcmVnKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwgaW50IHNsaWNlLAogCQkgIGludCBzdWJzbGljZSwgaTkxNV9yZWdfdCByZWcpCiB7CiAJdWlu dDMyX3QgbWNyX3NsaWNlX3N1YnNsaWNlX21hc2s7CiAJdWludDMyX3QgbWNyX3NsaWNlX3N1YnNs aWNlX3NlbGVjdDsKKwl1aW50MzJfdCBkZWZhdWx0X21jcl9zX3NzX3NlbGVjdDsKIAl1aW50MzJf dCBtY3I7CiAJdWludDMyX3QgcmV0OwogCWVudW0gZm9yY2V3YWtlX2RvbWFpbnMgZndfZG9tYWlu czsKQEAgLTg0MSw2ICs4NjEsOCBAQCByZWFkX3N1YnNsaWNlX3JlZyhzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsIGludCBzbGljZSwKIAkJCQkJICAgIEdFTjhfTUNSX1NVQlNMSUNF KHN1YnNsaWNlKTsKIAl9CiAKKwlkZWZhdWx0X21jcl9zX3NzX3NlbGVjdCA9IGludGVsX2NhbGN1 bGF0ZV9zX3NzX3NlbGVjdChkZXZfcHJpdik7CisKIAlmd19kb21haW5zID0gaW50ZWxfdW5jb3Jl X2ZvcmNld2FrZV9mb3JfcmVnKGRldl9wcml2LCByZWcsCiAJCQkJCQkgICAgRldfUkVHX1JFQUQp OwogCWZ3X2RvbWFpbnMgfD0gaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9mb3JfcmVnKGRldl9wcml2 LApAQCAtODUxLDExICs4NzMsMTAgQEAgcmVhZF9zdWJzbGljZV9yZWcoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LCBpbnQgc2xpY2UsCiAJaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9n ZXRfX2xvY2tlZChkZXZfcHJpdiwgZndfZG9tYWlucyk7CiAKIAltY3IgPSBJOTE1X1JFQURfRlco R0VOOF9NQ1JfU0VMRUNUT1IpOwotCS8qCi0JICogVGhlIEhXIGV4cGVjdHMgdGhlIHNsaWNlIGFu ZCBzdWJsaWNlIHNlbGVjdG9ycyB0byBiZSByZXNldCB0byAwCi0JICogYWZ0ZXIgcmVhZGluZyBv dXQgdGhlIHJlZ2lzdGVycy4KLQkgKi8KLQlXQVJOX09OX09OQ0UobWNyICYgbWNyX3NsaWNlX3N1 YnNsaWNlX21hc2spOworCisJV0FSTl9PTl9PTkNFKChtY3IgJiBtY3Jfc2xpY2Vfc3Vic2xpY2Vf bWFzaykgIT0KKwkJICAgICBkZWZhdWx0X21jcl9zX3NzX3NlbGVjdCk7CisKIAltY3IgJj0gfm1j cl9zbGljZV9zdWJzbGljZV9tYXNrOwogCW1jciB8PSBtY3Jfc2xpY2Vfc3Vic2xpY2Vfc2VsZWN0 OwogCUk5MTVfV1JJVEVfRlcoR0VOOF9NQ1JfU0VMRUNUT1IsIG1jcik7CkBAIC04NjMsNiArODg0 LDggQEAgcmVhZF9zdWJzbGljZV9yZWcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 LCBpbnQgc2xpY2UsCiAJcmV0ID0gSTkxNV9SRUFEX0ZXKHJlZyk7CiAKIAltY3IgJj0gfm1jcl9z bGljZV9zdWJzbGljZV9tYXNrOworCW1jciB8PSBkZWZhdWx0X21jcl9zX3NzX3NlbGVjdDsKKwog CUk5MTVfV1JJVEVfRlcoR0VOOF9NQ1JfU0VMRUNUT1IsIG1jcik7CiAKIAlpbnRlbF91bmNvcmVf Zm9yY2V3YWtlX3B1dF9fbG9ja2VkKGRldl9wcml2LCBmd19kb21haW5zKTsKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3dvcmthcm91bmRzLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF93b3JrYXJvdW5kcy5jCmluZGV4IDJkZjM1MzguLmQ4MTQzNjggMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3dvcmthcm91bmRzLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfd29ya2Fyb3VuZHMuYwpAQCAtNjcyLDggKzY3Miw0MCBA QCBzdGF0aWMgdm9pZCBjZmxfZ3Rfd29ya2Fyb3VuZHNfYXBwbHkoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogCQkgICBHQU1UX0VDT19FTkFCTEVfSU5fUExBQ0VfREVDT01QUkVT Uyk7CiB9CiAKK3N0YXRpYyB2b2lkIHdhX2luaXRfbWNyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKK3sKKwl1MzIgbWNyOworCXUzMiBtY3Jfc2xpY2Vfc3Vic2xpY2VfbWFzazsK KworCW1jciA9IEk5MTVfUkVBRChHRU44X01DUl9TRUxFQ1RPUik7CisKKwlpZiAoSU5URUxfR0VO KGRldl9wcml2KSA+PSAxMSkKKwkJbWNyX3NsaWNlX3N1YnNsaWNlX21hc2sgPSBHRU4xMV9NQ1Jf U0xJQ0VfTUFTSyB8CisJCQkJCSAgR0VOMTFfTUNSX1NVQlNMSUNFX01BU0s7CisJZWxzZQorCQlt Y3Jfc2xpY2Vfc3Vic2xpY2VfbWFzayA9IEdFTjhfTUNSX1NMSUNFX01BU0sgfAorCQkJCQkgIEdF TjhfTUNSX1NVQlNMSUNFX01BU0s7CisJLyoKKwkgKiBXYVByb2dyYW1NZ3NyRm9yQ29ycmVjdFNs aWNlU3BlY2lmaWNNbWlvUmVhZHM6Y25sCisJICogQmVmb3JlIGFueSBNTUlPIHJlYWQgaW50byBz bGljZS9zdWJzbGljZSBzcGVjaWZpYyByZWdpc3RlcnMsIE1DUgorCSAqIHBhY2tldCBjb250cm9s IHJlZ2lzdGVyIG5lZWRzIHRvIGJlIHByb2dyYW1tZWQgdG8gcG9pbnQgdG8gYW55CisJICogZW5h YmxlZCBzL3NzIHBhaXIuIE90aGVyd2lzZSwgaW5jb3JyZWN0IHZhbHVlcyB3aWxsIGJlIHJldHVy bmVkLgorCSAqIFRoaXMgbWVhbnMgZWFjaCBzdWJzZXF1ZW50IE1NSU8gcmVhZCB3aWxsIGJlIGZv cndhcmRlZCB0byBhbgorCSAqIHNwZWNpZmljIHMvc3MgY29tYmluYXRpb24sIGJ1dCB0aGlzIGlz IE9LIHNpbmNlIHRoZXNlIHJlZ2lzdGVycworCSAqIGFyZSBjb25zaXN0ZW50IGFjcm9zcyBzL3Nz IGluIGFsbW9zdCBhbGwgY2FzZXMuIEluIHRoZSByYXJlCisJICogb2NjYXNpb25zLCBzdWNoIGFz IElOU1RET05FLCB3aGVyZSB0aGlzIHZhbHVlIGlzIGRlcGVuZGVudAorCSAqIG9uIHMvc3MgY29t Ym8sIHRoZSByZWFkIHNob3VsZCBiZSBkb25lIHdpdGggcmVhZF9zdWJzbGljZV9yZWcuCisJICov CisJbWNyICY9IH5tY3Jfc2xpY2Vfc3Vic2xpY2VfbWFzazsKKwltY3IgfD0gaW50ZWxfY2FsY3Vs YXRlX3Nfc3Nfc2VsZWN0KGRldl9wcml2KTsKKwlJOTE1X1dSSVRFKEdFTjhfTUNSX1NFTEVDVE9S LCBtY3IpOworfQorCiBzdGF0aWMgdm9pZCBjbmxfZ3Rfd29ya2Fyb3VuZHNfYXBwbHkoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogeworCS8qIFdhUHJvZ3JhbU1nc3JGb3JDb3Jy ZWN0U2xpY2VTcGVjaWZpY01taW9SZWFkczogY25sICovCisJd2FfaW5pdF9tY3IoZGV2X3ByaXYp OworCiAJLyogV2FEaXNhYmxlSTJtQ3ljbGVPbldSUG9ydDpjbmwgKHByZS1wcm9kKSAqLwogCWlm IChJU19DTkxfUkVWSUQoZGV2X3ByaXYsIENOTF9SRVZJRF9CMCwgQ05MX1JFVklEX0IwKSkKIAkJ STkxNV9XUklURShHQU1UX0NIS05fQklUX1JFRywKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK