From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michal Wajdeczko Subject: [PATCH v3 1/8] drm/i915/huc: Move firmware selection to init_early Date: Tue, 5 Dec 2017 16:38:37 +0000 Message-ID: <20171205163844.41264-1-michal.wajdeczko@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id C40316E045 for ; Tue, 5 Dec 2017 16:38:54 +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 RG9pbmcgSHVDIGZpcm13YXJlIHBhdGggc2VsZWN0aW9uIGZyb20gc2FuaXRpemVfb3B0aW9ucyBm dW5jdGlvbgppcyBub3QgcGVyZmVjdCwgd2hpbGUgdGhlcmUgaXMgbm8gcHJvYmxlbSB3aXRoIGRv aW5nIHNvIGR1cmluZwplYXJseSBpbml0IHN0YWdlIGFzIHdlIGFscmVhZHkgaGF2ZSBhbGwgbmVl ZGVkIGRhdGEuCgpTaWduZWQtb2ZmLWJ5OiBNaWNoYWwgV2FqZGVjemtvIDxtaWNoYWwud2FqZGVj emtvQGludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVr PgpDYzogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgpD YzogU2FnYXIgQXJ1biBLYW1ibGUgPHNhZ2FyLmEua2FtYmxlQGludGVsLmNvbT4KUmV2aWV3ZWQt Ynk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggIHwgIDMgKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2h1Yy5jIHwgNjAgKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmggfCAgMiArLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfdWMuYyAgfCAgNCArLS0KIDQgZmlsZXMgY2hhbmdlZCwgNDIgaW5zZXJ0aW9u cygrKSwgMjcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggNTk0ZmQx NC4uYmQ0ZWVhNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0zMjM0LDYgKzMyMzQsOSBA QCBpbnRlbF9pbmZvKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKICNk ZWZpbmUgSEFTX0dVQ19DVChkZXZfcHJpdikJKChkZXZfcHJpdiktPmluZm8uaGFzX2d1Y19jdCkK ICNkZWZpbmUgSEFTX0dVQ19VQ09ERShkZXZfcHJpdikJKEhBU19HVUMoZGV2X3ByaXYpKQogI2Rl ZmluZSBIQVNfR1VDX1NDSEVEKGRldl9wcml2KQkoSEFTX0dVQyhkZXZfcHJpdikpCisKKy8qIEZv ciBub3csIGFueXRoaW5nIHdpdGggYSBHdUMgaGFzIGFsc28gSHVDICovCisjZGVmaW5lIEhBU19I VUMoZGV2X3ByaXYpCShIQVNfR1VDKGRldl9wcml2KSkKICNkZWZpbmUgSEFTX0hVQ19VQ09ERShk ZXZfcHJpdikJKEhBU19HVUMoZGV2X3ByaXYpKQogCiAjZGVmaW5lIEhBU19SRVNPVVJDRV9TVFJF QU1FUihkZXZfcHJpdikgKChkZXZfcHJpdiktPmluZm8uaGFzX3Jlc291cmNlX3N0cmVhbWVyKQpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9odWMuYwppbmRleCA5OGQxNzI1Li42ZDBlMDUwIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9odWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9odWMuYwpAQCAtNzcsNDMgKzc3LDU3IEBAIE1PRFVMRV9GSVJNV0FSRShJOTE1 X0tCTF9IVUNfVUNPREUpOwogI2RlZmluZSBJOTE1X0dMS19IVUNfVUNPREUgSFVDX0ZXX1BBVEgo Z2xrLCBHTEtfSFVDX0ZXX01BSk9SLCBcCiAJR0xLX0hVQ19GV19NSU5PUiwgR0xLX0JMRF9OVU0p CiAKLS8qKgotICogaW50ZWxfaHVjX3NlbGVjdF9mdygpIC0gc2VsZWN0cyBIdUMgZmlybXdhcmUg Zm9yIGxvYWRpbmcKLSAqIEBodWM6CWludGVsX2h1YyBzdHJ1Y3QKLSAqLwotdm9pZCBpbnRlbF9o dWNfc2VsZWN0X2Z3KHN0cnVjdCBpbnRlbF9odWMgKmh1YykKK3N0YXRpYyB2b2lkIGh1Y19md19z ZWxlY3Qoc3RydWN0IGludGVsX3VjX2Z3ICpodWNfZncpCiB7CisJc3RydWN0IGludGVsX2h1YyAq aHVjID0gY29udGFpbmVyX29mKGh1Y19mdywgc3RydWN0IGludGVsX2h1YywgZncpOwogCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGh1Y190b19pOTE1KGh1Yyk7CiAKLQlpbnRl bF91Y19md19pbml0KCZodWMtPmZ3LCBJTlRFTF9VQ19GV19UWVBFX0hVQyk7CisJR0VNX0JVR19P TihodWNfZnctPnR5cGUgIT0gSU5URUxfVUNfRldfVFlQRV9IVUMpOworCisJaWYgKCFIQVNfSFVD KGRldl9wcml2KSkKKwkJcmV0dXJuOwogCiAJaWYgKGk5MTVfbW9kcGFyYW1zLmh1Y19maXJtd2Fy ZV9wYXRoKSB7Ci0JCWh1Yy0+ZncucGF0aCA9IGk5MTVfbW9kcGFyYW1zLmh1Y19maXJtd2FyZV9w YXRoOwotCQlodWMtPmZ3Lm1ham9yX3Zlcl93YW50ZWQgPSAwOwotCQlodWMtPmZ3Lm1pbm9yX3Zl cl93YW50ZWQgPSAwOworCQlodWNfZnctPnBhdGggPSBpOTE1X21vZHBhcmFtcy5odWNfZmlybXdh cmVfcGF0aDsKKwkJaHVjX2Z3LT5tYWpvcl92ZXJfd2FudGVkID0gMDsKKwkJaHVjX2Z3LT5taW5v cl92ZXJfd2FudGVkID0gMDsKIAl9IGVsc2UgaWYgKElTX1NLWUxBS0UoZGV2X3ByaXYpKSB7Ci0J CWh1Yy0+ZncucGF0aCA9IEk5MTVfU0tMX0hVQ19VQ09ERTsKLQkJaHVjLT5mdy5tYWpvcl92ZXJf d2FudGVkID0gU0tMX0hVQ19GV19NQUpPUjsKLQkJaHVjLT5mdy5taW5vcl92ZXJfd2FudGVkID0g U0tMX0hVQ19GV19NSU5PUjsKKwkJaHVjX2Z3LT5wYXRoID0gSTkxNV9TS0xfSFVDX1VDT0RFOwor CQlodWNfZnctPm1ham9yX3Zlcl93YW50ZWQgPSBTS0xfSFVDX0ZXX01BSk9SOworCQlodWNfZnct Pm1pbm9yX3Zlcl93YW50ZWQgPSBTS0xfSFVDX0ZXX01JTk9SOwogCX0gZWxzZSBpZiAoSVNfQlJP WFRPTihkZXZfcHJpdikpIHsKLQkJaHVjLT5mdy5wYXRoID0gSTkxNV9CWFRfSFVDX1VDT0RFOwot CQlodWMtPmZ3Lm1ham9yX3Zlcl93YW50ZWQgPSBCWFRfSFVDX0ZXX01BSk9SOwotCQlodWMtPmZ3 Lm1pbm9yX3Zlcl93YW50ZWQgPSBCWFRfSFVDX0ZXX01JTk9SOworCQlodWNfZnctPnBhdGggPSBJ OTE1X0JYVF9IVUNfVUNPREU7CisJCWh1Y19mdy0+bWFqb3JfdmVyX3dhbnRlZCA9IEJYVF9IVUNf RldfTUFKT1I7CisJCWh1Y19mdy0+bWlub3JfdmVyX3dhbnRlZCA9IEJYVF9IVUNfRldfTUlOT1I7 CiAJfSBlbHNlIGlmIChJU19LQUJZTEFLRShkZXZfcHJpdikgfHwgSVNfQ09GRkVFTEFLRShkZXZf cHJpdikpIHsKLQkJaHVjLT5mdy5wYXRoID0gSTkxNV9LQkxfSFVDX1VDT0RFOwotCQlodWMtPmZ3 Lm1ham9yX3Zlcl93YW50ZWQgPSBLQkxfSFVDX0ZXX01BSk9SOwotCQlodWMtPmZ3Lm1pbm9yX3Zl cl93YW50ZWQgPSBLQkxfSFVDX0ZXX01JTk9SOworCQlodWNfZnctPnBhdGggPSBJOTE1X0tCTF9I VUNfVUNPREU7CisJCWh1Y19mdy0+bWFqb3JfdmVyX3dhbnRlZCA9IEtCTF9IVUNfRldfTUFKT1I7 CisJCWh1Y19mdy0+bWlub3JfdmVyX3dhbnRlZCA9IEtCTF9IVUNfRldfTUlOT1I7CiAJfSBlbHNl IGlmIChJU19HRU1JTklMQUtFKGRldl9wcml2KSkgewotCQlodWMtPmZ3LnBhdGggPSBJOTE1X0dM S19IVUNfVUNPREU7Ci0JCWh1Yy0+ZncubWFqb3JfdmVyX3dhbnRlZCA9IEdMS19IVUNfRldfTUFK T1I7Ci0JCWh1Yy0+ZncubWlub3JfdmVyX3dhbnRlZCA9IEdMS19IVUNfRldfTUlOT1I7CisJCWh1 Y19mdy0+cGF0aCA9IEk5MTVfR0xLX0hVQ19VQ09ERTsKKwkJaHVjX2Z3LT5tYWpvcl92ZXJfd2Fu dGVkID0gR0xLX0hVQ19GV19NQUpPUjsKKwkJaHVjX2Z3LT5taW5vcl92ZXJfd2FudGVkID0gR0xL X0hVQ19GV19NSU5PUjsKIAl9IGVsc2UgewotCQlEUk1fRVJST1IoIk5vIEh1QyBmaXJtd2FyZSBr bm93biBmb3IgcGxhdGZvcm0gd2l0aCBIdUMhXG4iKTsKLQkJcmV0dXJuOworCQlEUk1fV0FSTigi JXM6IE5vIGZpcm13YXJlIGtub3duIGZvciB0aGlzIHBsYXRmb3JtIVxuIiwKKwkJCSBpbnRlbF91 Y19md190eXBlX3JlcHIoaHVjX2Z3LT50eXBlKSk7CiAJfQogfQogCiAvKioKKyAqIGludGVsX2h1 Y19pbml0X2Vhcmx5KCkgLSBpbml0aWFsaXplcyBIdUMgc3RydWN0CisgKiBAaHVjOiBpbnRlbF9o dWMgc3RydWN0CisgKgorICogT24gcGxhdGZvcm1zIHdpdGggSHVDIHNlbGVjdHMgZmlybXdhcmUg Zm9yIHVwbG9hZGluZworICovCit2b2lkIGludGVsX2h1Y19pbml0X2Vhcmx5KHN0cnVjdCBpbnRl bF9odWMgKmh1YykKK3sKKwlzdHJ1Y3QgaW50ZWxfdWNfZncgKmh1Y19mdyA9ICZodWMtPmZ3Owor CisJaW50ZWxfdWNfZndfaW5pdChodWNfZncsIElOVEVMX1VDX0ZXX1RZUEVfSFVDKTsKKwlodWNf Zndfc2VsZWN0KGh1Y19mdyk7Cit9CisKKy8qKgogICogaHVjX3Vjb2RlX3hmZXIoKSAtIERNQSdz IHRoZSBmaXJtd2FyZQogICogQGRldl9wcml2OiB0aGUgZHJtX2k5MTVfcHJpdmF0ZSBkZXZpY2UK ICAqCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9odWMuaCBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1Yy5oCmluZGV4IGFhYTM4YjkuLjNkNzU3YmMgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1Yy5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2h1Yy5oCkBAIC0zNCw3ICszNCw3IEBAIHN0cnVjdCBpbnRlbF9odWMg ewogCS8qIEh1Qy1zcGVjaWZpYyBhZGRpdGlvbnMgKi8KIH07CiAKLXZvaWQgaW50ZWxfaHVjX3Nl bGVjdF9mdyhzdHJ1Y3QgaW50ZWxfaHVjICpodWMpOwordm9pZCBpbnRlbF9odWNfaW5pdF9lYXJs eShzdHJ1Y3QgaW50ZWxfaHVjICpodWMpOwogdm9pZCBpbnRlbF9odWNfaW5pdF9odyhzdHJ1Y3Qg aW50ZWxfaHVjICpodWMpOwogdm9pZCBpbnRlbF9odWNfYXV0aChzdHJ1Y3QgaW50ZWxfaHVjICpo dWMpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYwppbmRleCAxZTJhMzBhLi45NWI1MjRjIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3VjLmMKQEAgLTY1LDkgKzY1LDYgQEAgdm9pZCBpbnRlbF91Y19zYW5p dGl6ZV9vcHRpb25zKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogCS8qIFZl cmlmeSBmaXJtd2FyZSB2ZXJzaW9uICovCiAJaWYgKGk5MTVfbW9kcGFyYW1zLmVuYWJsZV9ndWNf bG9hZGluZykgewotCQlpZiAoSEFTX0hVQ19VQ09ERShkZXZfcHJpdikpCi0JCQlpbnRlbF9odWNf c2VsZWN0X2Z3KCZkZXZfcHJpdi0+aHVjKTsKLQogCQlpZiAoaW50ZWxfZ3VjX2Z3X3NlbGVjdCgm ZGV2X3ByaXYtPmd1YykpCiAJCQlpOTE1X21vZHBhcmFtcy5lbmFibGVfZ3VjX2xvYWRpbmcgPSAw OwogCX0KQEAgLTg0LDYgKzgxLDcgQEAgdm9pZCBpbnRlbF91Y19zYW5pdGl6ZV9vcHRpb25zKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHZvaWQgaW50ZWxfdWNfaW5pdF9lYXJs eShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJaW50ZWxfZ3VjX2luaXRf ZWFybHkoJmRldl9wcml2LT5ndWMpOworCWludGVsX2h1Y19pbml0X2Vhcmx5KCZkZXZfcHJpdi0+ aHVjKTsKIH0KIAogdm9pZCBpbnRlbF91Y19pbml0X2Z3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK