From mboxrd@z Thu Jan 1 00:00:00 1970 From: Fernando Pacheco Subject: [PATCH 1/2] drm/i915/guc: Provide mmio list to be saved/restored on engine reset Date: Fri, 22 Nov 2019 09:46:12 -0800 Message-ID: <20191122174613.16609-1-fernando.pacheco@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 70A756E2DC for ; Fri, 22 Nov 2019 17:51:33 +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 VGhlIGRyaXZlciBtdXN0IHByb3ZpZGUgR3VDIHdpdGggYSBsaXN0IG9mIG1taW8gcmVnaXN0ZXJz CnRoYXQgc2hvdWxkIGJlIHNhdmVkL3Jlc3RvcmVkIGR1cmluZyBhIEd1Qy1iYXNlZCBlbmdpbmUg cmVzZXQuCldlIHByb3ZpZGUgYSBtaW5pbWFsIHNldCBvZiByZWdpc3RlcnMgdGhhdCBzaG91bGQg Z2V0IHRoaW5ncwp3b3JraW5nIGFuZCBleHRlbmQgYXMgbmVlZGVkLgoKVGhlIG1taW8gbGlzdCBp cyBidWlsdCB1c2luZyBzZXBhcmF0ZSBsaXN0cyB3aXRoaW4gdGhlIGRyaXZlci4KSXQncyBwb3Nz aWJsZSB0aGF0IGF0IHNvbWUgcG9pbnQgd2UgbWF5IGF0dGVtcHQgdG8gYWRkIHRoZSBzYW1lCnJl Z2lzdGVyIG1vcmUgdGhhbiBvbmNlLiBEbyBub3QgY29uc2lkZXIgdGhpcyBhbiBlcnJvcjsgc2ls ZW50bHkKbW92ZSBvbiBpZiB0aGUgcmVnaXN0ZXIgaXMgYWxyZWFkeSBpbiB0aGUgbGlzdC4KClNp Z25lZC1vZmYtYnk6IEZlcm5hbmRvIFBhY2hlY28gPGZlcm5hbmRvLnBhY2hlY29AaW50ZWwuY29t PgpDYzogRGFuaWVsZSBDZXJhb2xvIFNwdXJpbyA8ZGFuaWVsZS5jZXJhb2xvc3B1cmlvQGludGVs LmNvbT4KQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3QvaW50ZWxfd29ya2Fyb3VuZHMuYyAgIHwgMjMgKysrLS0K IC4uLi9ncHUvZHJtL2k5MTUvZ3QvaW50ZWxfd29ya2Fyb3VuZHNfdHlwZXMuaCB8ICAxICsKIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2d0L3VjL2ludGVsX2d1Y19hZHMuYyAgICB8IDkwICsrKysrKysr KysrKysrKysrKy0KIDMgZmlsZXMgY2hhbmdlZCwgMTA3IGluc2VydGlvbnMoKyksIDcgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3QvaW50ZWxfd29ya2Fy b3VuZHMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d0L2ludGVsX3dvcmthcm91bmRzLmMKaW5k ZXggMjI2YmQ0Y2NjYjQ4Li45NjRkNmZlOGJmNWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2d0L2ludGVsX3dvcmthcm91bmRzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv Z3QvaW50ZWxfd29ya2Fyb3VuZHMuYwpAQCAtMTQ3LDIzICsxNDcsMzEgQEAgc3RhdGljIHZvaWQg X3dhX2FkZChzdHJ1Y3QgaTkxNV93YV9saXN0ICp3YWwsIGNvbnN0IHN0cnVjdCBpOTE1X3dhICp3 YSkKIH0KIAogc3RhdGljIHZvaWQKLXdhX3dyaXRlX21hc2tlZF9vcihzdHJ1Y3QgaTkxNV93YV9s aXN0ICp3YWwsIGk5MTVfcmVnX3QgcmVnLCB1MzIgbWFzaywKLQkJICAgdTMyIHZhbCkKK19fd2Ff d3JpdGVfbWFza2VkX29yKHN0cnVjdCBpOTE1X3dhX2xpc3QgKndhbCwgaTkxNV9yZWdfdCByZWcs IHUzMiBtYXNrLAorCQkgICAgIHUzMiB2YWwsIGJvb2wgbWFza2VkX2JpdHMpCiB7CiAJc3RydWN0 IGk5MTVfd2Egd2EgPSB7CiAJCS5yZWcgID0gcmVnLAogCQkubWFzayA9IG1hc2ssCiAJCS52YWwg ID0gdmFsLAogCQkucmVhZCA9IG1hc2ssCisJCS5tYXNrZWRfYml0cyA9IG1hc2tlZF9iaXRzLAog CX07CiAKIAlfd2FfYWRkKHdhbCwgJndhKTsKIH0KIAorc3RhdGljIHZvaWQKK3dhX3dyaXRlX21h c2tlZF9vcihzdHJ1Y3QgaTkxNV93YV9saXN0ICp3YWwsIGk5MTVfcmVnX3QgcmVnLCB1MzIgbWFz aywKKwkJICAgdTMyIHZhbCkKK3sKKwlfX3dhX3dyaXRlX21hc2tlZF9vcih3YWwsIHJlZywgbWFz aywgdmFsLCBmYWxzZSk7Cit9CisKIHN0YXRpYyB2b2lkCiB3YV9tYXNrZWRfZW4oc3RydWN0IGk5 MTVfd2FfbGlzdCAqd2FsLCBpOTE1X3JlZ190IHJlZywgdTMyIHZhbCkKIHsKLQl3YV93cml0ZV9t YXNrZWRfb3Iod2FsLCByZWcsIHZhbCwgX01BU0tFRF9CSVRfRU5BQkxFKHZhbCkpOworCV9fd2Ff d3JpdGVfbWFza2VkX29yKHdhbCwgcmVnLCB2YWwsIF9NQVNLRURfQklUX0VOQUJMRSh2YWwpLCB0 cnVlKTsKIH0KIAogc3RhdGljIHZvaWQKQEAgLTE3OSwxMyArMTg3LDE2IEBAIHdhX3dyaXRlX29y KHN0cnVjdCBpOTE1X3dhX2xpc3QgKndhbCwgaTkxNV9yZWdfdCByZWcsIHUzMiB2YWwpCiB9CiAK ICNkZWZpbmUgV0FfU0VUX0JJVF9NQVNLRUQoYWRkciwgbWFzaykgXAotCXdhX3dyaXRlX21hc2tl ZF9vcih3YWwsIChhZGRyKSwgKG1hc2spLCBfTUFTS0VEX0JJVF9FTkFCTEUobWFzaykpCisJX193 YV93cml0ZV9tYXNrZWRfb3Iod2FsLCAoYWRkciksIChtYXNrKSwgXAorCQkJICAgICBfTUFTS0VE X0JJVF9FTkFCTEUobWFzayksIHRydWUpCiAKICNkZWZpbmUgV0FfQ0xSX0JJVF9NQVNLRUQoYWRk ciwgbWFzaykgXAotCXdhX3dyaXRlX21hc2tlZF9vcih3YWwsIChhZGRyKSwgKG1hc2spLCBfTUFT S0VEX0JJVF9ESVNBQkxFKG1hc2spKQorCV9fd2Ffd3JpdGVfbWFza2VkX29yKHdhbCwgKGFkZHIp LCAobWFzayksIFwKKwkJCSAgICAgX01BU0tFRF9CSVRfRElTQUJMRShtYXNrKSwgdHJ1ZSkKIAog I2RlZmluZSBXQV9TRVRfRklFTERfTUFTS0VEKGFkZHIsIG1hc2ssIHZhbHVlKSBcCi0Jd2Ffd3Jp dGVfbWFza2VkX29yKHdhbCwgKGFkZHIpLCAobWFzayksIF9NQVNLRURfRklFTEQoKG1hc2spLCAo dmFsdWUpKSkKKwlfX3dhX3dyaXRlX21hc2tlZF9vcih3YWwsIChhZGRyKSwgKG1hc2spLCBcCisJ CQkgICAgIF9NQVNLRURfRklFTEQoKG1hc2spLCAodmFsdWUpKSwgdHJ1ZSkKIAogc3RhdGljIHZv aWQgZ2VuOF9jdHhfd29ya2Fyb3VuZHNfaW5pdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmUsCiAJCQkJICAgICAgc3RydWN0IGk5MTVfd2FfbGlzdCAqd2FsKQpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvZ3QvaW50ZWxfd29ya2Fyb3VuZHNfdHlwZXMuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2d0L2ludGVsX3dvcmthcm91bmRzX3R5cGVzLmgKaW5kZXggZTI3YWIxYjcx MGIzLi5hNDNkNWY5NjhmMmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d0L2lu dGVsX3dvcmthcm91bmRzX3R5cGVzLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3QvaW50 ZWxfd29ya2Fyb3VuZHNfdHlwZXMuaApAQCAtMTYsNiArMTYsNyBAQCBzdHJ1Y3QgaTkxNV93YSB7 CiAJdTMyCQltYXNrOwogCXUzMgkJdmFsOwogCXUzMgkJcmVhZDsKKwlib29sCQltYXNrZWRfYml0 czsKIH07CiAKIHN0cnVjdCBpOTE1X3dhX2xpc3QgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvZ3QvdWMvaW50ZWxfZ3VjX2Fkcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Qv dWMvaW50ZWxfZ3VjX2Fkcy5jCmluZGV4IGNhNjY3NGI4ZTAwYy4uMTc3Y2JmYmI0MGU3IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC91Yy9pbnRlbF9ndWNfYWRzLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3QvdWMvaW50ZWxfZ3VjX2Fkcy5jCkBAIC0zLDYgKzMsOCBA QAogICogQ29weXJpZ2h0IMKpIDIwMTQtMjAxOSBJbnRlbCBDb3Jwb3JhdGlvbgogICovCiAKKyNp bmNsdWRlIDxsaW51eC9ic2VhcmNoLmg+CisKICNpbmNsdWRlICJndC9pbnRlbF9ndC5oIgogI2lu Y2x1ZGUgImludGVsX2d1Y19hZHMuaCIKICNpbmNsdWRlICJpbnRlbF91Yy5oIgpAQCAtMTYsNiAr MTgsOSBAQAogICogaXRzIGludGVybmFsIHN0YXRlIGZvciBzbGVlcC4KICAqLwogCitzdGF0aWMg dm9pZCBndWNfbW1pb19yZWdfc3RhdGVfaW5pdChzdHJ1Y3QgZ3VjX21taW9fcmVnX3N0YXRlICpy ZWdfc3RhdGUsCisJCQkJICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CisKIHN0 YXRpYyB2b2lkIGd1Y19wb2xpY3lfaW5pdChzdHJ1Y3QgZ3VjX3BvbGljeSAqcG9saWN5KQogewog CXBvbGljeS0+ZXhlY3V0aW9uX3F1YW50dW0gPSBQT0xJQ1lfREVGQVVMVF9FWEVDVVRJT05fUVVB TlRVTV9VUzsKQEAgLTY3LDEyICs3MiwxOSBAQCBzdHJ1Y3QgX19ndWNfYWRzX2Jsb2IgewogCiBz dGF0aWMgdm9pZCBfX2d1Y19hZHNfaW5pdChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiB7Ci0Jc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZ3VjX3RvX2d0KGd1YyktPmk5MTU7CisJ c3RydWN0IGludGVsX2d0ICpndCA9IGd1Y190b19ndChndWMpOworCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IGd0LT5pOTE1OwogCXN0cnVjdCBfX2d1Y19hZHNfYmxvYiAqYmxv YiA9IGd1Yy0+YWRzX2Jsb2I7CiAJY29uc3QgdTMyIHNraXBwZWRfc2l6ZSA9IExSQ19QUEhXU1Bf U1ogKiBQQUdFX1NJWkUgKyBMUl9IV19DT05URVhUX1NJWkU7CisJc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqZW5naW5lOworCWVudW0gaW50ZWxfZW5naW5lX2lkIGlkOwogCXUzMiBiYXNlOwogCXU4 IGVuZ2luZV9jbGFzczsKIAorCS8qIEd1QyBtbWlvIHNhdmUvcmVzdG9yZSBsaXN0ICovCisJZm9y X2VhY2hfZW5naW5lKGVuZ2luZSwgZ3QsIGlkKQorCQlndWNfbW1pb19yZWdfc3RhdGVfaW5pdCgm YmxvYi0+cmVnX3N0YXRlLCBlbmdpbmUpOworCiAJLyogR3VDIHNjaGVkdWxpbmcgcG9saWNpZXMg Ki8KIAlndWNfcG9saWNpZXNfaW5pdCgmYmxvYi0+cG9saWNpZXMpOwogCkBAIC0xODIsMyArMTk0 LDc5IEBAIHZvaWQgaW50ZWxfZ3VjX2Fkc19yZXNldChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAJ CXJldHVybjsKIAlfX2d1Y19hZHNfaW5pdChndWMpOwogfQorCitzdGF0aWMgaW50IGd1Y19tbWlv X3JlZ19jbXAoY29uc3Qgdm9pZCAqYSwgY29uc3Qgdm9pZCAqYikKK3sKKwljb25zdCBzdHJ1Y3Qg Z3VjX21taW9fcmVnICpyYSA9IGE7CisJY29uc3Qgc3RydWN0IGd1Y19tbWlvX3JlZyAqcmIgPSBi OworCisJcmV0dXJuIChpbnQpcmEtPm9mZnNldCAtIChpbnQpcmItPm9mZnNldDsKK30KKworc3Rh dGljIHZvaWQgZ3VjX21taW9fcmVnX2FkZChzdHJ1Y3QgZ3VjX21taW9fcmVnc2V0ICpyZWdzZXQs CisJCQkgICAgIHUzMiBvZmZzZXQsIHUzMiBmbGFncykKK3sKKwl1MzIgY291bnQgPSByZWdzZXQt Pm51bWJlcl9vZl9yZWdpc3RlcnM7CisJc3RydWN0IGd1Y19tbWlvX3JlZyByZWcgPSB7CisJCS5v ZmZzZXQgPSBvZmZzZXQsCisJCS5mbGFncyA9IGZsYWdzLAorCX07CisJc3RydWN0IGd1Y19tbWlv X3JlZyAqc2xvdDsKKworCUdFTV9CVUdfT04oY291bnQgPj0gR1VDX1JFR1NFVF9NQVhfUkVHSVNU RVJTKTsKKworCWlmIChic2VhcmNoKCZyZWcsIHJlZ3NldC0+cmVnaXN0ZXJzLCBjb3VudCwKKwkJ ICAgIHNpemVvZihyZWcpLCBndWNfbW1pb19yZWdfY21wKSkKKwkJcmV0dXJuOworCisJc2xvdCA9 ICZyZWdzZXQtPnJlZ2lzdGVyc1tjb3VudF07CisJcmVnc2V0LT5udW1iZXJfb2ZfcmVnaXN0ZXJz Kys7CisJKnNsb3QgPSByZWc7CisKKwl3aGlsZSAoc2xvdC0tID4gcmVnc2V0LT5yZWdpc3RlcnMp IHsKKwkJR0VNX0JVR19PTihzbG90WzBdLm9mZnNldCA9PSBzbG90WzFdLm9mZnNldCk7CisJCWlm IChzbG90WzFdLm9mZnNldCA+IHNsb3RbMF0ub2Zmc2V0KQorCQkJYnJlYWs7CisKKwkJc3dhcChz bG90WzFdLCBzbG90WzBdKTsKKwl9Cit9CisKKyNkZWZpbmUgR1VDX01NSU9fUkVHX0FERChyZWdz ZXQsIHJlZywgbWFza2VkKSBcCisJZ3VjX21taW9fcmVnX2FkZChyZWdzZXQsIFwKKwkJCSBpOTE1 X21taW9fcmVnX29mZnNldCgocmVnKSksIFwKKwkJCSAobWFza2VkKSA/IEdVQ19SRUdTRVRfTUFT S0VEIDogMCkKKworc3RhdGljIHZvaWQgZ3VjX21taW9fcmVnc2V0X2luaXQoc3RydWN0IGd1Y19t bWlvX3JlZ3NldCAqcmVnc2V0LAorCQkJCSBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUp Cit7CisJY29uc3QgdTMyIGJhc2UgPSBlbmdpbmUtPm1taW9fYmFzZTsKKwlzdHJ1Y3QgaTkxNV93 YV9saXN0ICp3YWwgPSAmZW5naW5lLT53YV9saXN0OworCXN0cnVjdCBpOTE1X3dhICp3YTsKKwl1 bnNpZ25lZCBpbnQgaTsKKworCUdVQ19NTUlPX1JFR19BREQocmVnc2V0LCBSSU5HX01PREVfR0VO NyhiYXNlKSwgdHJ1ZSk7CisJR1VDX01NSU9fUkVHX0FERChyZWdzZXQsIFJJTkdfSFdTX1BHQShi YXNlKSwgZmFsc2UpOworCUdVQ19NTUlPX1JFR19BREQocmVnc2V0LCBSSU5HX0lNUihiYXNlKSwg ZmFsc2UpOworCisJZm9yIChpID0gMCwgd2EgPSB3YWwtPmxpc3Q7IGkgPCB3YWwtPmNvdW50OyBp KyssIHdhKyspCisJCUdVQ19NTUlPX1JFR19BREQocmVnc2V0LCB3YS0+cmVnLCB3YS0+bWFza2Vk X2JpdHMpOworCisJLyogQmUgZXh0cmEgcGFyYW5vaWQgYW5kIGluY2x1ZGUgYWxsIHdoaXRlbGlz dCByZWdpc3RlcnMuICovCisJZm9yIChpID0gMDsgaSA8IFJJTkdfTUFYX05PTlBSSVZfU0xPVFM7 IGkrKykKKwkJR1VDX01NSU9fUkVHX0FERChyZWdzZXQsCisJCQkJIFJJTkdfRk9SQ0VfVE9fTk9O UFJJVihiYXNlLCBpKSwKKwkJCQkgZmFsc2UpOworfQorCitzdGF0aWMgdm9pZCBndWNfbW1pb19y ZWdfc3RhdGVfaW5pdChzdHJ1Y3QgZ3VjX21taW9fcmVnX3N0YXRlICpyZWdfc3RhdGUsCisJCQkJ ICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3sKKwlzdHJ1Y3QgZ3VjX21taW9f cmVnc2V0ICpyZWdzZXQ7CisKKwlHRU1fQlVHX09OKGVuZ2luZS0+Y2xhc3MgPj0gR1VDX01BWF9F TkdJTkVfQ0xBU1NFUyk7CisJR0VNX0JVR19PTihlbmdpbmUtPmluc3RhbmNlID49IEdVQ19NQVhf SU5TVEFOQ0VTX1BFUl9DTEFTUyk7CisJcmVnc2V0ID0gJnJlZ19zdGF0ZS0+ZW5naW5lX3JlZ1tl bmdpbmUtPmNsYXNzXVtlbmdpbmUtPmluc3RhbmNlXTsKKworCWd1Y19tbWlvX3JlZ3NldF9pbml0 KHJlZ3NldCwgZW5naW5lKTsKK30KLS0gCjIuMjQuMAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01244C432C0 for ; Fri, 22 Nov 2019 17:51:35 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D2EEE20674 for ; Fri, 22 Nov 2019 17:51:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D2EEE20674 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7F0A36E2DC; Fri, 22 Nov 2019 17:51:34 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 70A756E2DC for ; Fri, 22 Nov 2019 17:51:33 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Nov 2019 09:51:33 -0800 X-IronPort-AV: E=Sophos;i="5.69,230,1571727600"; d="scan'208";a="197693725" Received: from unknown (HELO pachecof-ubuntu.fm.intel.com) ([10.1.27.26]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 22 Nov 2019 09:51:32 -0800 From: Fernando Pacheco To: intel-gfx@lists.freedesktop.org Date: Fri, 22 Nov 2019 09:46:12 -0800 Message-Id: <20191122174613.16609-1-fernando.pacheco@intel.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 1/2] drm/i915/guc: Provide mmio list to be saved/restored on engine reset X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Message-ID: <20191122174612.XsVYDPNsTfofoIjok4kypwmP3vqTGl6Sr68U8Y5idy4@z> VGhlIGRyaXZlciBtdXN0IHByb3ZpZGUgR3VDIHdpdGggYSBsaXN0IG9mIG1taW8gcmVnaXN0ZXJz CnRoYXQgc2hvdWxkIGJlIHNhdmVkL3Jlc3RvcmVkIGR1cmluZyBhIEd1Qy1iYXNlZCBlbmdpbmUg cmVzZXQuCldlIHByb3ZpZGUgYSBtaW5pbWFsIHNldCBvZiByZWdpc3RlcnMgdGhhdCBzaG91bGQg Z2V0IHRoaW5ncwp3b3JraW5nIGFuZCBleHRlbmQgYXMgbmVlZGVkLgoKVGhlIG1taW8gbGlzdCBp cyBidWlsdCB1c2luZyBzZXBhcmF0ZSBsaXN0cyB3aXRoaW4gdGhlIGRyaXZlci4KSXQncyBwb3Nz aWJsZSB0aGF0IGF0IHNvbWUgcG9pbnQgd2UgbWF5IGF0dGVtcHQgdG8gYWRkIHRoZSBzYW1lCnJl Z2lzdGVyIG1vcmUgdGhhbiBvbmNlLiBEbyBub3QgY29uc2lkZXIgdGhpcyBhbiBlcnJvcjsgc2ls ZW50bHkKbW92ZSBvbiBpZiB0aGUgcmVnaXN0ZXIgaXMgYWxyZWFkeSBpbiB0aGUgbGlzdC4KClNp Z25lZC1vZmYtYnk6IEZlcm5hbmRvIFBhY2hlY28gPGZlcm5hbmRvLnBhY2hlY29AaW50ZWwuY29t PgpDYzogRGFuaWVsZSBDZXJhb2xvIFNwdXJpbyA8ZGFuaWVsZS5jZXJhb2xvc3B1cmlvQGludGVs LmNvbT4KQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3QvaW50ZWxfd29ya2Fyb3VuZHMuYyAgIHwgMjMgKysrLS0K IC4uLi9ncHUvZHJtL2k5MTUvZ3QvaW50ZWxfd29ya2Fyb3VuZHNfdHlwZXMuaCB8ICAxICsKIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2d0L3VjL2ludGVsX2d1Y19hZHMuYyAgICB8IDkwICsrKysrKysr KysrKysrKysrKy0KIDMgZmlsZXMgY2hhbmdlZCwgMTA3IGluc2VydGlvbnMoKyksIDcgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3QvaW50ZWxfd29ya2Fy b3VuZHMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d0L2ludGVsX3dvcmthcm91bmRzLmMKaW5k ZXggMjI2YmQ0Y2NjYjQ4Li45NjRkNmZlOGJmNWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2d0L2ludGVsX3dvcmthcm91bmRzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv Z3QvaW50ZWxfd29ya2Fyb3VuZHMuYwpAQCAtMTQ3LDIzICsxNDcsMzEgQEAgc3RhdGljIHZvaWQg X3dhX2FkZChzdHJ1Y3QgaTkxNV93YV9saXN0ICp3YWwsIGNvbnN0IHN0cnVjdCBpOTE1X3dhICp3 YSkKIH0KIAogc3RhdGljIHZvaWQKLXdhX3dyaXRlX21hc2tlZF9vcihzdHJ1Y3QgaTkxNV93YV9s aXN0ICp3YWwsIGk5MTVfcmVnX3QgcmVnLCB1MzIgbWFzaywKLQkJICAgdTMyIHZhbCkKK19fd2Ff d3JpdGVfbWFza2VkX29yKHN0cnVjdCBpOTE1X3dhX2xpc3QgKndhbCwgaTkxNV9yZWdfdCByZWcs IHUzMiBtYXNrLAorCQkgICAgIHUzMiB2YWwsIGJvb2wgbWFza2VkX2JpdHMpCiB7CiAJc3RydWN0 IGk5MTVfd2Egd2EgPSB7CiAJCS5yZWcgID0gcmVnLAogCQkubWFzayA9IG1hc2ssCiAJCS52YWwg ID0gdmFsLAogCQkucmVhZCA9IG1hc2ssCisJCS5tYXNrZWRfYml0cyA9IG1hc2tlZF9iaXRzLAog CX07CiAKIAlfd2FfYWRkKHdhbCwgJndhKTsKIH0KIAorc3RhdGljIHZvaWQKK3dhX3dyaXRlX21h c2tlZF9vcihzdHJ1Y3QgaTkxNV93YV9saXN0ICp3YWwsIGk5MTVfcmVnX3QgcmVnLCB1MzIgbWFz aywKKwkJICAgdTMyIHZhbCkKK3sKKwlfX3dhX3dyaXRlX21hc2tlZF9vcih3YWwsIHJlZywgbWFz aywgdmFsLCBmYWxzZSk7Cit9CisKIHN0YXRpYyB2b2lkCiB3YV9tYXNrZWRfZW4oc3RydWN0IGk5 MTVfd2FfbGlzdCAqd2FsLCBpOTE1X3JlZ190IHJlZywgdTMyIHZhbCkKIHsKLQl3YV93cml0ZV9t YXNrZWRfb3Iod2FsLCByZWcsIHZhbCwgX01BU0tFRF9CSVRfRU5BQkxFKHZhbCkpOworCV9fd2Ff d3JpdGVfbWFza2VkX29yKHdhbCwgcmVnLCB2YWwsIF9NQVNLRURfQklUX0VOQUJMRSh2YWwpLCB0 cnVlKTsKIH0KIAogc3RhdGljIHZvaWQKQEAgLTE3OSwxMyArMTg3LDE2IEBAIHdhX3dyaXRlX29y KHN0cnVjdCBpOTE1X3dhX2xpc3QgKndhbCwgaTkxNV9yZWdfdCByZWcsIHUzMiB2YWwpCiB9CiAK ICNkZWZpbmUgV0FfU0VUX0JJVF9NQVNLRUQoYWRkciwgbWFzaykgXAotCXdhX3dyaXRlX21hc2tl ZF9vcih3YWwsIChhZGRyKSwgKG1hc2spLCBfTUFTS0VEX0JJVF9FTkFCTEUobWFzaykpCisJX193 YV93cml0ZV9tYXNrZWRfb3Iod2FsLCAoYWRkciksIChtYXNrKSwgXAorCQkJICAgICBfTUFTS0VE X0JJVF9FTkFCTEUobWFzayksIHRydWUpCiAKICNkZWZpbmUgV0FfQ0xSX0JJVF9NQVNLRUQoYWRk ciwgbWFzaykgXAotCXdhX3dyaXRlX21hc2tlZF9vcih3YWwsIChhZGRyKSwgKG1hc2spLCBfTUFT S0VEX0JJVF9ESVNBQkxFKG1hc2spKQorCV9fd2Ffd3JpdGVfbWFza2VkX29yKHdhbCwgKGFkZHIp LCAobWFzayksIFwKKwkJCSAgICAgX01BU0tFRF9CSVRfRElTQUJMRShtYXNrKSwgdHJ1ZSkKIAog I2RlZmluZSBXQV9TRVRfRklFTERfTUFTS0VEKGFkZHIsIG1hc2ssIHZhbHVlKSBcCi0Jd2Ffd3Jp dGVfbWFza2VkX29yKHdhbCwgKGFkZHIpLCAobWFzayksIF9NQVNLRURfRklFTEQoKG1hc2spLCAo dmFsdWUpKSkKKwlfX3dhX3dyaXRlX21hc2tlZF9vcih3YWwsIChhZGRyKSwgKG1hc2spLCBcCisJ CQkgICAgIF9NQVNLRURfRklFTEQoKG1hc2spLCAodmFsdWUpKSwgdHJ1ZSkKIAogc3RhdGljIHZv aWQgZ2VuOF9jdHhfd29ya2Fyb3VuZHNfaW5pdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmUsCiAJCQkJICAgICAgc3RydWN0IGk5MTVfd2FfbGlzdCAqd2FsKQpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvZ3QvaW50ZWxfd29ya2Fyb3VuZHNfdHlwZXMuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2d0L2ludGVsX3dvcmthcm91bmRzX3R5cGVzLmgKaW5kZXggZTI3YWIxYjcx MGIzLi5hNDNkNWY5NjhmMmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d0L2lu dGVsX3dvcmthcm91bmRzX3R5cGVzLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3QvaW50 ZWxfd29ya2Fyb3VuZHNfdHlwZXMuaApAQCAtMTYsNiArMTYsNyBAQCBzdHJ1Y3QgaTkxNV93YSB7 CiAJdTMyCQltYXNrOwogCXUzMgkJdmFsOwogCXUzMgkJcmVhZDsKKwlib29sCQltYXNrZWRfYml0 czsKIH07CiAKIHN0cnVjdCBpOTE1X3dhX2xpc3QgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvZ3QvdWMvaW50ZWxfZ3VjX2Fkcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Qv dWMvaW50ZWxfZ3VjX2Fkcy5jCmluZGV4IGNhNjY3NGI4ZTAwYy4uMTc3Y2JmYmI0MGU3IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC91Yy9pbnRlbF9ndWNfYWRzLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3QvdWMvaW50ZWxfZ3VjX2Fkcy5jCkBAIC0zLDYgKzMsOCBA QAogICogQ29weXJpZ2h0IMKpIDIwMTQtMjAxOSBJbnRlbCBDb3Jwb3JhdGlvbgogICovCiAKKyNp bmNsdWRlIDxsaW51eC9ic2VhcmNoLmg+CisKICNpbmNsdWRlICJndC9pbnRlbF9ndC5oIgogI2lu Y2x1ZGUgImludGVsX2d1Y19hZHMuaCIKICNpbmNsdWRlICJpbnRlbF91Yy5oIgpAQCAtMTYsNiAr MTgsOSBAQAogICogaXRzIGludGVybmFsIHN0YXRlIGZvciBzbGVlcC4KICAqLwogCitzdGF0aWMg dm9pZCBndWNfbW1pb19yZWdfc3RhdGVfaW5pdChzdHJ1Y3QgZ3VjX21taW9fcmVnX3N0YXRlICpy ZWdfc3RhdGUsCisJCQkJICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CisKIHN0 YXRpYyB2b2lkIGd1Y19wb2xpY3lfaW5pdChzdHJ1Y3QgZ3VjX3BvbGljeSAqcG9saWN5KQogewog CXBvbGljeS0+ZXhlY3V0aW9uX3F1YW50dW0gPSBQT0xJQ1lfREVGQVVMVF9FWEVDVVRJT05fUVVB TlRVTV9VUzsKQEAgLTY3LDEyICs3MiwxOSBAQCBzdHJ1Y3QgX19ndWNfYWRzX2Jsb2IgewogCiBz dGF0aWMgdm9pZCBfX2d1Y19hZHNfaW5pdChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiB7Ci0Jc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZ3VjX3RvX2d0KGd1YyktPmk5MTU7CisJ c3RydWN0IGludGVsX2d0ICpndCA9IGd1Y190b19ndChndWMpOworCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IGd0LT5pOTE1OwogCXN0cnVjdCBfX2d1Y19hZHNfYmxvYiAqYmxv YiA9IGd1Yy0+YWRzX2Jsb2I7CiAJY29uc3QgdTMyIHNraXBwZWRfc2l6ZSA9IExSQ19QUEhXU1Bf U1ogKiBQQUdFX1NJWkUgKyBMUl9IV19DT05URVhUX1NJWkU7CisJc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqZW5naW5lOworCWVudW0gaW50ZWxfZW5naW5lX2lkIGlkOwogCXUzMiBiYXNlOwogCXU4 IGVuZ2luZV9jbGFzczsKIAorCS8qIEd1QyBtbWlvIHNhdmUvcmVzdG9yZSBsaXN0ICovCisJZm9y X2VhY2hfZW5naW5lKGVuZ2luZSwgZ3QsIGlkKQorCQlndWNfbW1pb19yZWdfc3RhdGVfaW5pdCgm YmxvYi0+cmVnX3N0YXRlLCBlbmdpbmUpOworCiAJLyogR3VDIHNjaGVkdWxpbmcgcG9saWNpZXMg Ki8KIAlndWNfcG9saWNpZXNfaW5pdCgmYmxvYi0+cG9saWNpZXMpOwogCkBAIC0xODIsMyArMTk0 LDc5IEBAIHZvaWQgaW50ZWxfZ3VjX2Fkc19yZXNldChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAJ CXJldHVybjsKIAlfX2d1Y19hZHNfaW5pdChndWMpOwogfQorCitzdGF0aWMgaW50IGd1Y19tbWlv X3JlZ19jbXAoY29uc3Qgdm9pZCAqYSwgY29uc3Qgdm9pZCAqYikKK3sKKwljb25zdCBzdHJ1Y3Qg Z3VjX21taW9fcmVnICpyYSA9IGE7CisJY29uc3Qgc3RydWN0IGd1Y19tbWlvX3JlZyAqcmIgPSBi OworCisJcmV0dXJuIChpbnQpcmEtPm9mZnNldCAtIChpbnQpcmItPm9mZnNldDsKK30KKworc3Rh dGljIHZvaWQgZ3VjX21taW9fcmVnX2FkZChzdHJ1Y3QgZ3VjX21taW9fcmVnc2V0ICpyZWdzZXQs CisJCQkgICAgIHUzMiBvZmZzZXQsIHUzMiBmbGFncykKK3sKKwl1MzIgY291bnQgPSByZWdzZXQt Pm51bWJlcl9vZl9yZWdpc3RlcnM7CisJc3RydWN0IGd1Y19tbWlvX3JlZyByZWcgPSB7CisJCS5v ZmZzZXQgPSBvZmZzZXQsCisJCS5mbGFncyA9IGZsYWdzLAorCX07CisJc3RydWN0IGd1Y19tbWlv X3JlZyAqc2xvdDsKKworCUdFTV9CVUdfT04oY291bnQgPj0gR1VDX1JFR1NFVF9NQVhfUkVHSVNU RVJTKTsKKworCWlmIChic2VhcmNoKCZyZWcsIHJlZ3NldC0+cmVnaXN0ZXJzLCBjb3VudCwKKwkJ ICAgIHNpemVvZihyZWcpLCBndWNfbW1pb19yZWdfY21wKSkKKwkJcmV0dXJuOworCisJc2xvdCA9 ICZyZWdzZXQtPnJlZ2lzdGVyc1tjb3VudF07CisJcmVnc2V0LT5udW1iZXJfb2ZfcmVnaXN0ZXJz Kys7CisJKnNsb3QgPSByZWc7CisKKwl3aGlsZSAoc2xvdC0tID4gcmVnc2V0LT5yZWdpc3RlcnMp IHsKKwkJR0VNX0JVR19PTihzbG90WzBdLm9mZnNldCA9PSBzbG90WzFdLm9mZnNldCk7CisJCWlm IChzbG90WzFdLm9mZnNldCA+IHNsb3RbMF0ub2Zmc2V0KQorCQkJYnJlYWs7CisKKwkJc3dhcChz bG90WzFdLCBzbG90WzBdKTsKKwl9Cit9CisKKyNkZWZpbmUgR1VDX01NSU9fUkVHX0FERChyZWdz ZXQsIHJlZywgbWFza2VkKSBcCisJZ3VjX21taW9fcmVnX2FkZChyZWdzZXQsIFwKKwkJCSBpOTE1 X21taW9fcmVnX29mZnNldCgocmVnKSksIFwKKwkJCSAobWFza2VkKSA/IEdVQ19SRUdTRVRfTUFT S0VEIDogMCkKKworc3RhdGljIHZvaWQgZ3VjX21taW9fcmVnc2V0X2luaXQoc3RydWN0IGd1Y19t bWlvX3JlZ3NldCAqcmVnc2V0LAorCQkJCSBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUp Cit7CisJY29uc3QgdTMyIGJhc2UgPSBlbmdpbmUtPm1taW9fYmFzZTsKKwlzdHJ1Y3QgaTkxNV93 YV9saXN0ICp3YWwgPSAmZW5naW5lLT53YV9saXN0OworCXN0cnVjdCBpOTE1X3dhICp3YTsKKwl1 bnNpZ25lZCBpbnQgaTsKKworCUdVQ19NTUlPX1JFR19BREQocmVnc2V0LCBSSU5HX01PREVfR0VO NyhiYXNlKSwgdHJ1ZSk7CisJR1VDX01NSU9fUkVHX0FERChyZWdzZXQsIFJJTkdfSFdTX1BHQShi YXNlKSwgZmFsc2UpOworCUdVQ19NTUlPX1JFR19BREQocmVnc2V0LCBSSU5HX0lNUihiYXNlKSwg ZmFsc2UpOworCisJZm9yIChpID0gMCwgd2EgPSB3YWwtPmxpc3Q7IGkgPCB3YWwtPmNvdW50OyBp KyssIHdhKyspCisJCUdVQ19NTUlPX1JFR19BREQocmVnc2V0LCB3YS0+cmVnLCB3YS0+bWFza2Vk X2JpdHMpOworCisJLyogQmUgZXh0cmEgcGFyYW5vaWQgYW5kIGluY2x1ZGUgYWxsIHdoaXRlbGlz dCByZWdpc3RlcnMuICovCisJZm9yIChpID0gMDsgaSA8IFJJTkdfTUFYX05PTlBSSVZfU0xPVFM7 IGkrKykKKwkJR1VDX01NSU9fUkVHX0FERChyZWdzZXQsCisJCQkJIFJJTkdfRk9SQ0VfVE9fTk9O UFJJVihiYXNlLCBpKSwKKwkJCQkgZmFsc2UpOworfQorCitzdGF0aWMgdm9pZCBndWNfbW1pb19y ZWdfc3RhdGVfaW5pdChzdHJ1Y3QgZ3VjX21taW9fcmVnX3N0YXRlICpyZWdfc3RhdGUsCisJCQkJ ICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3sKKwlzdHJ1Y3QgZ3VjX21taW9f cmVnc2V0ICpyZWdzZXQ7CisKKwlHRU1fQlVHX09OKGVuZ2luZS0+Y2xhc3MgPj0gR1VDX01BWF9F TkdJTkVfQ0xBU1NFUyk7CisJR0VNX0JVR19PTihlbmdpbmUtPmluc3RhbmNlID49IEdVQ19NQVhf SU5TVEFOQ0VTX1BFUl9DTEFTUyk7CisJcmVnc2V0ID0gJnJlZ19zdGF0ZS0+ZW5naW5lX3JlZ1tl bmdpbmUtPmNsYXNzXVtlbmdpbmUtPmluc3RhbmNlXTsKKworCWd1Y19tbWlvX3JlZ3NldF9pbml0 KHJlZ3NldCwgZW5naW5lKTsKK30KLS0gCjIuMjQuMAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4