From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans de Goede Subject: [PATCH v3 4/4] drm/i915: Acquire PUNIT->PMIC bus for intel_uncore_forcewake_reset() Date: Mon, 14 Aug 2017 21:58:32 +0200 Message-ID: <20170814195832.20524-4-hdegoede@redhat.com> References: <20170814195832.20524-1-hdegoede@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170814195832.20524-1-hdegoede@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Vetter , Jani Nikula , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Imre Deak Cc: Hans de Goede , intel-gfx , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org aW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9yZXNldCgpIGRvZXMgZm9yY2V3YWtlIHB1dHMgYW5kIGdl dHMgYXMgc3VjaAp3ZSBuZWVkIHRvIG1ha2Ugc3VyZSB0aGF0IG5vLW9uZSB0cmllcyB0byBhY2Nl c3MgdGhlIFBVTklULT5QTUlDIGJ1cwoob24gc3lzdGVtcyB3aGVyZSB0aGlzIGJ1cyBpcyBzaGFy ZWQpIHdoaWxlIGl0IHJ1bnMsIG90aGVyd2lzZSBiYWQKdGhpbmdzIGhhcHBlbi4KCk5vcm1hbGx5 IHRoaXMgaXMgdGFrZW4gY2FyZSBvZiBieSB0aGUgaTkxNV9wbWljX2J1c19hY2Nlc3Nfbm90aWZp ZXIoKQp3aGljaCBkb2VzIGFuIGludGVsX3VuY29yZV9mb3JjZXdha2VfZ2V0KEZPUkNFV0FLRV9B TEwpIHdoZW4gc29tZSBvdGhlcgpkcml2ZXIgdHJpZXMgdG8gYWNjZXNzIHRoZSBQTUlDIGJ1cywg c28gdGhhdCBsYXRlciBmb3JjZXdha2UgZ2V0cyBhcmUKbm8tb3BzIChmb3IgdGhlIGR1cmF0aW9u IG9mIHRoZSBidXMgYWNjZXNzKS4KCkJ1dCBpbnRlbF91bmNvcmVfZm9yY2V3YWtlX3Jlc2V0IGdl dHMgY2FsbGVkIGluIDMgY2FzZXM6CjEpIEJlZm9yZSByZWdpc3RlcmluZyB0aGUgcG1pY19idXNf YWNjZXNzX25vdGlmaWVyCjIpIEFmdGVyIHVucmVnaXN0ZXJpbmcgdGhlIHBtaWNfYnVzX2FjY2Vz c19ub3RpZmllcgozKSBUbyByZXNldCBmb3JjZXdha2Ugc3RhdGUgb24gYSBHUFUgcmVzZXQKCklu IGFsbCAzIGNhc2VzIHRoZSBpOTE1X3BtaWNfYnVzX2FjY2Vzc19ub3RpZmllcigpIHByb3RlY3Rp b24gaXMKaW5zdWZmaWNpZW50LgoKVGhpcyBjb21taXQgZml4ZXMgdGhpcyByYWNlIGJ5IGNhbGxp bmcgaW9zZl9tYmlfcHVuaXRfYWNxdWlyZSgpIGJlZm9yZQpjYWxsaW5nIGludGVsX3VuY29yZV9m b3JjZXdha2VfcmVzZXQoKS4gSW4gdGhlIGNhc2Ugd2hlcmUgaXQgaXMgY2FsbGVkCmRpcmVjdGx5 IGFmdGVyIHVucmVnaXN0ZXJpbmcgdGhlIHBtaWNfYnVzX2FjY2Vzc19ub3RpZmllciwgd2UgbmVl ZCB0bwpob2xkIHRoZSBwdW5pdC1sb2NrIG92ZXIgYm90aCBjYWxscyB0byBhdm9pZCBhIHJhY2Ug d2hlcmUKaW50ZWxfdW5jb3JlX2Z3X3JlbGVhc2VfdGltZXIoKSBtYXkgZXhlY3V0ZSBiZXR3ZWVu IHRoZSAyIGNhbGxzLgoKVG8gYWxsb3cgaG9sZGluZyB0aGUgbG9jayBvdmVyIGJvdGggY2FsbHMg d2UgbmVlZCBhbiB1bmxvY2tlZAp2YXJpYW50IG9mIGlvc2ZfbWJpX3VucmVnaXN0ZXJfcG1pY19i dXNfYWNjZXNzX25vdGlmaWVyLiBTaW5jZQppbnRlbF91bmNvcmUuYyBpcyB0aGUgb25seSB1c2Vy IG9mIHRoaXMgZnVuY3Rpb24sIHdlIHNpbXBseQptb2RpZnkgaXQgaW4gdGhpcyBjb21taXQuIERv aW5nIHRoaXMgaW4gYSBzZXBhcmF0ZSBjb21taXQgd291bGQKcmVxdWlyZSBmaXJzdCBhZGRpbmcg YW4gdW5sb2NrZWQgdmFyaWFudCwgdGhlbiB0aGlzIGNvbW1pdCBhbmQKdGhlbiByZW1vdmluZyB0 aGUgdW51c2VkIG5vcm1hbCB2YXJpYW50LgoKU2lnbmVkLW9mZi1ieTogSGFucyBkZSBHb2VkZSA8 aGRlZ29lZGVAcmVkaGF0LmNvbT4KLS0tCkNoYW5nZXMgaW4gdjI6Ci1SZWJhc2Ugb24gY3VycmVu dCAoSnVseSA2dGggMjAxNykgZHJtLW5leHQKCkNoYW5nZXMgaW4gdjM6Ci1LZWVwIHB1bml0IGFj cXVpcmVkIC8gbG9ja2VkIG92ZXIgdGhlIHVucmVnaXN0ZXIgKyBmb3JjZXdha2VfcmVzZXQKIGNh bGwgY29tYm8gdG8gYXZvaWQgYSByYWNlIGhpdHRpbmcgYmV0d2VlbiB0aGUgMiBjYWxscwotVGhp cyByZXF1aXJlcyBtb2RpZnlpbmcgaW9zZl9tYmlfdW5yZWdpc3Rlcl9wbWljX2J1c19hY2Nlc3Nf bm90aWZpZXIKIHRvIG5vdCB0YWtlIHRoZSBsb2NrIGl0c2VsZiwgc2luY2Ugd2UgYXJlIHRoZSBv bmx5IHVzZXJzIHRoaXMgaXMgZG9uZQogaW4gdGhpcyBzYW1lIGNvbW1pdAotLS0KIGFyY2gveDg2 L2luY2x1ZGUvYXNtL2lvc2ZfbWJpLmggICAgIHwgMTAgKysrKysrKystLQogYXJjaC94ODYvcGxh dGZvcm0vaW50ZWwvaW9zZl9tYmkuYyAgfCAxNCArKysrKy0tLS0tLS0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMgfCAxNyArKysrKysrKysrKysrLS0tLQogMyBmaWxlcyBj aGFuZ2VkLCAyNiBpbnNlcnRpb25zKCspLCAxNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9h cmNoL3g4Ni9pbmNsdWRlL2FzbS9pb3NmX21iaS5oIGIvYXJjaC94ODYvaW5jbHVkZS9hc20vaW9z Zl9tYmkuaAppbmRleCBjMzEzY2FjMzZmNTYuLmY4ODQxYmIwNmQ5OCAxMDA2NDQKLS0tIGEvYXJj aC94ODYvaW5jbHVkZS9hc20vaW9zZl9tYmkuaAorKysgYi9hcmNoL3g4Ni9pbmNsdWRlL2FzbS9p b3NmX21iaS5oCkBAIC0xNDEsOSArMTQxLDE0IEBAIGludCBpb3NmX21iaV9yZWdpc3Rlcl9wbWlj X2J1c19hY2Nlc3Nfbm90aWZpZXIoc3RydWN0IG5vdGlmaWVyX2Jsb2NrICpuYik7CiAvKioKICAq IGlvc2ZfbWJpX3JlZ2lzdGVyX3BtaWNfYnVzX2FjY2Vzc19ub3RpZmllciAtIFVucmVnaXN0ZXIg UE1JQyBidXMgbm90aWZpZXIKICAqCisgKiBOb3RlIHRoZSBjYWxsZXIgbXVzdCBjYWxsIGlvc2Zf bWJpX3B1bml0X2FjcXVpcmUoKSBiZWZvcmUgY2FsbGluZyB0aGlzCisgKiB0byBlbnN1cmUgdGhl IGJ1cyBpcyBpbmFjdGl2ZSBiZWZvcmUgdW5yZWdpc3RlcmluZyAoYW5kIGNhbGwKKyAqIGlvc2Zf bWJpX3B1bml0X3JlbGVhc2UoKSBhZnRlcndhcmRzKS4KKyAqCiAgKiBAbmI6IG5vdGlmaWVyX2Js b2NrIHRvIHVucmVnaXN0ZXIKICAqLwotaW50IGlvc2ZfbWJpX3VucmVnaXN0ZXJfcG1pY19idXNf YWNjZXNzX25vdGlmaWVyKHN0cnVjdCBub3RpZmllcl9ibG9jayAqbmIpOworaW50IGlvc2ZfbWJp X3VucmVnaXN0ZXJfcG1pY19idXNfYWNjZXNzX25vdGlmaWVyX3VubG9ja2VkKAorCXN0cnVjdCBu b3RpZmllcl9ibG9jayAqbmIpOwogCiAvKioKICAqIGlvc2ZfbWJpX2NhbGxfcG1pY19idXNfYWNj ZXNzX25vdGlmaWVyX2NoYWluIC0gQ2FsbCBQTUlDIGJ1cyBub3RpZmllciBjaGFpbgpAQCAtMTkx LDcgKzE5Niw4IEBAIGludCBpb3NmX21iaV9yZWdpc3Rlcl9wbWljX2J1c19hY2Nlc3Nfbm90aWZp ZXIoc3RydWN0IG5vdGlmaWVyX2Jsb2NrICpuYikKIH0KIAogc3RhdGljIGlubGluZQotaW50IGlv c2ZfbWJpX3VucmVnaXN0ZXJfcG1pY19idXNfYWNjZXNzX25vdGlmaWVyKHN0cnVjdCBub3RpZmll cl9ibG9jayAqbmIpCitpbnQgaW9zZl9tYmlfdW5yZWdpc3Rlcl9wbWljX2J1c19hY2Nlc3Nfbm90 aWZpZXJfdW5sb2NrZWQoCisJc3RydWN0IG5vdGlmaWVyX2Jsb2NrICpuYikKIHsKIAlyZXR1cm4g MDsKIH0KZGlmZiAtLWdpdCBhL2FyY2gveDg2L3BsYXRmb3JtL2ludGVsL2lvc2ZfbWJpLmMgYi9h cmNoL3g4Ni9wbGF0Zm9ybS9pbnRlbC9pb3NmX21iaS5jCmluZGV4IGE5NTJhYzE5OTc0MS4uNTU5 NmEzZWMxYjg5IDEwMDY0NAotLS0gYS9hcmNoL3g4Ni9wbGF0Zm9ybS9pbnRlbC9pb3NmX21iaS5j CisrKyBiL2FyY2gveDg2L3BsYXRmb3JtL2ludGVsL2lvc2ZfbWJpLmMKQEAgLTIxOCwxOSArMjE4 LDE1IEBAIGludCBpb3NmX21iaV9yZWdpc3Rlcl9wbWljX2J1c19hY2Nlc3Nfbm90aWZpZXIoc3Ry dWN0IG5vdGlmaWVyX2Jsb2NrICpuYikKIH0KIEVYUE9SVF9TWU1CT0woaW9zZl9tYmlfcmVnaXN0 ZXJfcG1pY19idXNfYWNjZXNzX25vdGlmaWVyKTsKIAotaW50IGlvc2ZfbWJpX3VucmVnaXN0ZXJf cG1pY19idXNfYWNjZXNzX25vdGlmaWVyKHN0cnVjdCBub3RpZmllcl9ibG9jayAqbmIpCitpbnQg aW9zZl9tYmlfdW5yZWdpc3Rlcl9wbWljX2J1c19hY2Nlc3Nfbm90aWZpZXJfdW5sb2NrZWQoCisJ c3RydWN0IG5vdGlmaWVyX2Jsb2NrICpuYikKIHsKLQlpbnQgcmV0OworCVdBUk5fT04oIW11dGV4 X2lzX2xvY2tlZCgmaW9zZl9tYmlfcHVuaXRfbXV0ZXgpKTsKIAotCS8qIFdhaXQgZm9yIHRoZSBi dXMgdG8gZ28gaW5hY3RpdmUgYmVmb3JlIHVucmVnaXN0ZXJpbmcgKi8KLQltdXRleF9sb2NrKCZp b3NmX21iaV9wdW5pdF9tdXRleCk7Ci0JcmV0ID0gYmxvY2tpbmdfbm90aWZpZXJfY2hhaW5fdW5y ZWdpc3RlcigKKwlyZXR1cm4gYmxvY2tpbmdfbm90aWZpZXJfY2hhaW5fdW5yZWdpc3RlcigKIAkJ CQkmaW9zZl9tYmlfcG1pY19idXNfYWNjZXNzX25vdGlmaWVyLCBuYik7Ci0JbXV0ZXhfdW5sb2Nr KCZpb3NmX21iaV9wdW5pdF9tdXRleCk7Ci0KLQlyZXR1cm4gcmV0OwogfQotRVhQT1JUX1NZTUJP TChpb3NmX21iaV91bnJlZ2lzdGVyX3BtaWNfYnVzX2FjY2Vzc19ub3RpZmllcik7CitFWFBPUlRf U1lNQk9MKGlvc2ZfbWJpX3VucmVnaXN0ZXJfcG1pY19idXNfYWNjZXNzX25vdGlmaWVyX3VubG9j a2VkKTsKIAogaW50IGlvc2ZfbWJpX2NhbGxfcG1pY19idXNfYWNjZXNzX25vdGlmaWVyX2NoYWlu KHVuc2lnbmVkIGxvbmcgdmFsLCB2b2lkICp2KQogewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNv cmUuYwppbmRleCA1NjlkMTE1OTE4ZWIuLjdiZTYxNTA1MjBlZCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfdW5jb3JlLmMKQEAgLTIyOSw2ICsyMjksNyBAQCBpbnRlbF91bmNvcmVfZndfcmVsZWFz ZV90aW1lcihzdHJ1Y3QgaHJ0aW1lciAqdGltZXIpCiAJcmV0dXJuIEhSVElNRVJfTk9SRVNUQVJU OwogfQogCisvKiBOb3RlIGNhbGxlcnMgbXVzdCBoYXZlIGFjcXVpcmVkIHRoZSBQVU5JVC0+UE1J QyBidXMsIGJlZm9yZSBjYWxsaW5nIHRoaXMuICovCiBzdGF0aWMgdm9pZCBpbnRlbF91bmNvcmVf Zm9yY2V3YWtlX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkJ IGJvb2wgcmVzdG9yZSkKIHsKQEAgLTQxNiwxNCArNDE3LDE4IEBAIHN0YXRpYyB2b2lkIF9faW50 ZWxfdW5jb3JlX2Vhcmx5X3Nhbml0aXplKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKIAkJCQkgICBHVF9GSUZPX0NUTF9SQzZfUE9MSUNZX1NUQUxMKTsKIAl9CiAKKwlpb3NmX21i aV9wdW5pdF9hY3F1aXJlKCk7CiAJaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9yZXNldChkZXZfcHJp diwgcmVzdG9yZV9mb3JjZXdha2UpOworCWlvc2ZfbWJpX3B1bml0X3JlbGVhc2UoKTsKIH0KIAog dm9pZCBpbnRlbF91bmNvcmVfc3VzcGVuZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYpCiB7Ci0JaW9zZl9tYmlfdW5yZWdpc3Rlcl9wbWljX2J1c19hY2Nlc3Nfbm90aWZpZXIoCisJ aW9zZl9tYmlfcHVuaXRfYWNxdWlyZSgpOworCWlvc2ZfbWJpX3VucmVnaXN0ZXJfcG1pY19idXNf YWNjZXNzX25vdGlmaWVyX3VubG9ja2VkKAogCQkmZGV2X3ByaXYtPnVuY29yZS5wbWljX2J1c19h Y2Nlc3NfbmIpOwogCWludGVsX3VuY29yZV9mb3JjZXdha2VfcmVzZXQoZGV2X3ByaXYsIGZhbHNl KTsKKwlpb3NmX21iaV9wdW5pdF9yZWxlYXNlKCk7CiB9CiAKIHZvaWQgaW50ZWxfdW5jb3JlX3Jl c3VtZV9lYXJseShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCkBAIC0xMjQ2LDEy ICsxMjUxLDE0IEBAIHZvaWQgaW50ZWxfdW5jb3JlX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQogCiB2b2lkIGludGVsX3VuY29yZV9maW5pKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdikKIHsKLQlpb3NmX21iaV91bnJlZ2lzdGVyX3BtaWNfYnVzX2FjY2Vz c19ub3RpZmllcigKLQkJJmRldl9wcml2LT51bmNvcmUucG1pY19idXNfYWNjZXNzX25iKTsKLQog CS8qIFBhcmFub2lhOiBtYWtlIHN1cmUgd2UgaGF2ZSBkaXNhYmxlZCBldmVyeXRoaW5nIGJlZm9y ZSB3ZSBleGl0LiAqLwogCWludGVsX3VuY29yZV9zYW5pdGl6ZShkZXZfcHJpdik7CisKKwlpb3Nm X21iaV9wdW5pdF9hY3F1aXJlKCk7CisJaW9zZl9tYmlfdW5yZWdpc3Rlcl9wbWljX2J1c19hY2Nl c3Nfbm90aWZpZXJfdW5sb2NrZWQoCisJCSZkZXZfcHJpdi0+dW5jb3JlLnBtaWNfYnVzX2FjY2Vz c19uYik7CiAJaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9yZXNldChkZXZfcHJpdiwgZmFsc2UpOwor CWlvc2ZfbWJpX3B1bml0X3JlbGVhc2UoKTsKIH0KIAogI2RlZmluZSBHRU5fUkFOR0UobCwgaCkg R0VOTUFTSygoaCkgLSAxLCAobCkgLSAxKQpAQCAtMTUyNCw3ICsxNTMxLDkgQEAgc3RhdGljIGlu dCBnZW42X3Jlc2V0X2VuZ2luZXMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAog CiAJcmV0ID0gZ2VuNl9od19kb21haW5fcmVzZXQoZGV2X3ByaXYsIGh3X21hc2spOwogCisJaW9z Zl9tYmlfcHVuaXRfYWNxdWlyZSgpOwogCWludGVsX3VuY29yZV9mb3JjZXdha2VfcmVzZXQoZGV2 X3ByaXYsIHRydWUpOworCWlvc2ZfbWJpX3B1bml0X3JlbGVhc2UoKTsKIAogCXJldHVybiByZXQ7 CiB9Ci0tIAoyLjEzLjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1k ZXZlbAo=