From: Arkadiusz Hiler Subject: [PATCH 08/10] drm/i915/uc: Simplify firmware path handling Date: Tue, 7 Mar 2017 16:24:58 +0100 Message-ID: <20170307152500.6760-9-arkadiusz.hiler@intel.com> References: <20170307152500.6760-1-arkadiusz.hiler@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5DF186E72F for ; Tue, 7 Mar 2017 15:25:36 +0000 (UTC) In-Reply-To: <20170307152500.6760-1-arkadiusz.hiler@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 Q3VycmVudGx5IGZ3LT5wYXRoIHZhbHVlcyBjYW4gcmVwcmVzZW50IG9uZSBvZiB0aHJlZSBwb3Nz aWJsZSBzdGF0ZXM6CgogMSkgTlVMTCAtIGRldmljZSB3aXRob3V0IHRoZSB1QwogMikgJ1wwJyAt IGRldmljZSB3aXRoIHRoZSB1QyBidXQgaGF2ZSBubyBmaXJtd2FyZQogMykgZWxzZSAtIGRldmlj ZSB3aXRoIHRoZSB1QyBhbmQgd2UgaGF2ZSBmaXJtd2FyZQoKU2Vjb25kIGNhc2UgaXMgdXNlZCBv bmx5IHRvIFdBUk4gYXQgYSBsYXRlciBzdGFnZS4KCldlIGNhbiBXQVJOIHJpZ2h0IGF3YXkgYW5k IG1lcmdlIGNhc2VzIDEgYW5kIDIuCgpDb2RlIGNhbiBiZSBldmVuIGZ1cnRoZXIgc2ltcGxpZmll ZCBhbmQgY29tbW9uIChIdUMvR3VDIGxvZ2ljKSBoYXBwZW5pbmcKcmlnaHQgYmVmb3JlIHRoZSBm ZXRjaCBjYW4gYmUgb2ZmbG9hZGVkIHRvIHRoZSBjb21tb24gZnVuY3Rpb24uCgp2MjogZmV3ZXIg dGVtcG9yYXJ5IHZhcmlhYmxlcywgbW9yZSBzdHJhaWdodGZvcndhcmQgZmxvdyAoTS4gV2FqZGVj emtvKQp2MzogRFJNX0VSUk9SIGluc3RlYWQgb2YgV0FSTiAoTS4gV2FqZGVjemtvKQp2NDogY29k aW5nIHN0YW5kYXJkIChKLiBMYWh0aW5lbikKdjU6IG5vbi10cml2aWFsIHJlYmFzZQoKQ2M6IEFu dXNoYSBTcml2YXRzYSA8YW51c2hhLnNyaXZhdHNhQGludGVsLmNvbT4KQ2M6IFR2cnRrbyBVcnN1 bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CkNjOiBNaWNoYWwgV2luaWFyc2tpIDxtaWNo YWwud2luaWFyc2tpQGludGVsLmNvbT4KQ2M6IE1pY2hhbCBXYWpkZWN6a28gPG1pY2hhbC53YWpk ZWN6a29AaW50ZWwuY29tPgpDYzogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGlu dXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBBcmthZGl1c3ogSGlsZXIgPGFya2FkaXVzei5o aWxlckBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRl ci5jIHwgMzUgKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9odWMuYyAgICAgICAgfCAyMSArKysrKystLS0tLS0tLS0tLS0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYyAgICAgICAgIHwgIDQgKysrLQogMyBmaWxlcyBj aGFuZ2VkLCAyMSBpbnNlcnRpb25zKCspLCAzOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKaW5kZXggZjYzZTdlOC4uYTM2YWFiYSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYwpAQCAtNDMyLDEyICs0MzIsOCBAQCBpbnQg aW50ZWxfZ3VjX2luaXRfaHcoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogCQlpbnRlbF91Y19md19z dGF0dXNfcmVwcihndWMtPmZ3LmZldGNoX3N0YXR1cyksCiAJCWludGVsX3VjX2Z3X3N0YXR1c19y ZXByKGd1Yy0+ZncubG9hZF9zdGF0dXMpKTsKIAotCWlmICghZndfcGF0aCkgeworCWlmICghZndf cGF0aCkKIAkJcmV0dXJuIC1FTlhJTzsKLQl9IGVsc2UgaWYgKCpmd19wYXRoID09ICdcMCcpIHsK LQkJV0FSTigxLCAiTm8gR3VDIGZpcm13YXJlIGtub3duIGZvciB0aGlzIHBsYXRmb3JtIVxuIik7 Ci0JCXJldHVybiAtRU5PREVWOwotCX0KIAogCWlmIChndWMtPmZ3LmZldGNoX3N0YXR1cyAhPSBJ TlRFTF9VQ19GSVJNV0FSRV9TVUNDRVNTKQogCQlyZXR1cm4gLUVJTzsKQEAgLTQ2Myw3ICs0NTks NiBAQCBpbnQgaW50ZWxfZ3VjX2luaXRfaHcoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogCXJldHVy biAwOwogfQogCi0KIC8qKgogICogaW50ZWxfZ3VjX2luaXRfZncoKSAtIHNlbGVjdCBhbmQgcHJl cGFyZSBmaXJtd2FyZSBmb3IgbG9hZGluZwogICogQGd1YzoJaW50ZWxfZ3VjIHN0cnVjdApAQCAt NDc2LDM3ICs0NzEsMzEgQEAgaW50IGludGVsX2d1Y19pbml0X2h3KHN0cnVjdCBpbnRlbF9ndWMg Kmd1YykKIHZvaWQgaW50ZWxfZ3VjX2luaXRfZncoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogewog CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGd1Y190b19pOTE1KGd1Yyk7Ci0J Y29uc3QgY2hhciAqZndfcGF0aDsKKworCWd1Yy0+ZncucGF0aCA9IE5VTEw7CisJZ3VjLT5mdy5m ZXRjaF9zdGF0dXMgPSBJTlRFTF9VQ19GSVJNV0FSRV9OT05FOworCWd1Yy0+ZncubG9hZF9zdGF0 dXMgPSBJTlRFTF9VQ19GSVJNV0FSRV9OT05FOworCWd1Yy0+ZncuZncgPSBJTlRFTF9VQ19GV19U WVBFX0dVQzsKIAogCWlmIChJU19TS1lMQUtFKGRldl9wcml2KSkgewotCQlmd19wYXRoID0gSTkx NV9TS0xfR1VDX1VDT0RFOworCQlndWMtPmZ3LnBhdGggPSBJOTE1X1NLTF9HVUNfVUNPREU7CiAJ CWd1Yy0+ZncubWFqb3JfdmVyX3dhbnRlZCA9IFNLTF9GV19NQUpPUjsKIAkJZ3VjLT5mdy5taW5v cl92ZXJfd2FudGVkID0gU0tMX0ZXX01JTk9SOwogCX0gZWxzZSBpZiAoSVNfQlJPWFRPTihkZXZf cHJpdikpIHsKLQkJZndfcGF0aCA9IEk5MTVfQlhUX0dVQ19VQ09ERTsKKwkJZ3VjLT5mdy5wYXRo ID0gSTkxNV9CWFRfR1VDX1VDT0RFOwogCQlndWMtPmZ3Lm1ham9yX3Zlcl93YW50ZWQgPSBCWFRf RldfTUFKT1I7CiAJCWd1Yy0+ZncubWlub3JfdmVyX3dhbnRlZCA9IEJYVF9GV19NSU5PUjsKIAl9 IGVsc2UgaWYgKElTX0tBQllMQUtFKGRldl9wcml2KSkgewotCQlmd19wYXRoID0gSTkxNV9LQkxf R1VDX1VDT0RFOworCQlndWMtPmZ3LnBhdGggPSBJOTE1X0tCTF9HVUNfVUNPREU7CiAJCWd1Yy0+ ZncubWFqb3JfdmVyX3dhbnRlZCA9IEtCTF9GV19NQUpPUjsKIAkJZ3VjLT5mdy5taW5vcl92ZXJf d2FudGVkID0gS0JMX0ZXX01JTk9SOwogCX0gZWxzZSB7Ci0JCWZ3X3BhdGggPSAiIjsJLyogdW5r bm93biBkZXZpY2UgKi8KKwkJRFJNX0VSUk9SKCJObyBHdUMgZmlybXdhcmUga25vd24gZm9yIHBs YXRmb3JtIHdpdGggR3VDIVxuIik7CisJCWk5MTUuZW5hYmxlX2d1Y19sb2FkaW5nID0gMDsKKwkJ cmV0dXJuOwogCX0KIAotCWd1Yy0+ZncucGF0aCA9IGZ3X3BhdGg7Ci0JZ3VjLT5mdy5mZXRjaF9z dGF0dXMgPSBJTlRFTF9VQ19GSVJNV0FSRV9OT05FOwotCWd1Yy0+ZncubG9hZF9zdGF0dXMgPSBJ TlRFTF9VQ19GSVJNV0FSRV9OT05FOwotCi0JaWYgKGZ3X3BhdGggPT0gTlVMTCkKLQkJcmV0dXJu OwotCWlmICgqZndfcGF0aCA9PSAnXDAnKQotCQlyZXR1cm47Ci0KLQlndWMtPmZ3LmZldGNoX3N0 YXR1cyA9IElOVEVMX1VDX0ZJUk1XQVJFX1BFTkRJTkc7Ci0JRFJNX0RFQlVHX0RSSVZFUigiR3VD IGZpcm13YXJlIHBlbmRpbmcsIHBhdGggJXNcbiIsIGZ3X3BhdGgpOwogCWludGVsX3VjX3ByZXBh cmVfZncoZGV2X3ByaXYsICZndWMtPmZ3KTsKLQkvKiBzdGF0dXMgbXVzdCBub3cgYmUgRkFJTCBv ciBTVUNDRVNTICovCiB9CiAKIC8qKgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfaHVjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9odWMuYwppbmRleCAxNjhh YWIxLi41ZmFkZDU1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9odWMu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9odWMuYwpAQCAtMTU1LDcgKzE1NSw2 IEBAIHN0YXRpYyBpbnQgaHVjX3Vjb2RlX3hmZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQogdm9pZCBpbnRlbF9odWNfaW5pdF9mdyhzdHJ1Y3QgaW50ZWxfaHVjICpodWMpCiB7 CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gaHVjX3RvX2k5MTUoaHVjKTsK LQljb25zdCBjaGFyICpmd19wYXRoID0gTlVMTDsKIAogCWh1Yy0+ZncucGF0aCA9IE5VTEw7CiAJ aHVjLT5mdy5mZXRjaF9zdGF0dXMgPSBJTlRFTF9VQ19GSVJNV0FSRV9OT05FOwpAQCAtMTYzLDI5 ICsxNjIsMjEgQEAgdm9pZCBpbnRlbF9odWNfaW5pdF9mdyhzdHJ1Y3QgaW50ZWxfaHVjICpodWMp CiAJaHVjLT5mdy5mdyA9IElOVEVMX1VDX0ZXX1RZUEVfSFVDOwogCiAJaWYgKElTX1NLWUxBS0Uo ZGV2X3ByaXYpKSB7Ci0JCWZ3X3BhdGggPSBJOTE1X1NLTF9IVUNfVUNPREU7CisJCWh1Yy0+Zncu cGF0aCA9IEk5MTVfU0tMX0hVQ19VQ09ERTsKIAkJaHVjLT5mdy5tYWpvcl92ZXJfd2FudGVkID0g U0tMX0hVQ19GV19NQUpPUjsKIAkJaHVjLT5mdy5taW5vcl92ZXJfd2FudGVkID0gU0tMX0hVQ19G V19NSU5PUjsKIAl9IGVsc2UgaWYgKElTX0JST1hUT04oZGV2X3ByaXYpKSB7Ci0JCWZ3X3BhdGgg PSBJOTE1X0JYVF9IVUNfVUNPREU7CisJCWh1Yy0+ZncucGF0aCA9IEk5MTVfQlhUX0hVQ19VQ09E RTsKIAkJaHVjLT5mdy5tYWpvcl92ZXJfd2FudGVkID0gQlhUX0hVQ19GV19NQUpPUjsKIAkJaHVj LT5mdy5taW5vcl92ZXJfd2FudGVkID0gQlhUX0hVQ19GV19NSU5PUjsKIAl9IGVsc2UgaWYgKElT X0tBQllMQUtFKGRldl9wcml2KSkgewotCQlmd19wYXRoID0gSTkxNV9LQkxfSFVDX1VDT0RFOwor CQlodWMtPmZ3LnBhdGggPSBJOTE1X0tCTF9IVUNfVUNPREU7CiAJCWh1Yy0+ZncubWFqb3JfdmVy X3dhbnRlZCA9IEtCTF9IVUNfRldfTUFKT1I7CiAJCWh1Yy0+ZncubWlub3JfdmVyX3dhbnRlZCA9 IEtCTF9IVUNfRldfTUlOT1I7Ci0JfQotCi0JaHVjLT5mdy5wYXRoID0gZndfcGF0aDsKLQotCWlm IChmd19wYXRoID09IE5VTEwpCisJfSBlbHNlIHsKKwkJRFJNX0VSUk9SKCJObyBIdUMgZmlybXdh cmUga25vd24gZm9yIHBsYXRmb3JtIHdpdGggSHVDIVxuIik7CiAJCXJldHVybjsKLQotCWh1Yy0+ ZncuZmV0Y2hfc3RhdHVzID0gSU5URUxfVUNfRklSTVdBUkVfUEVORElORzsKLQotCURSTV9ERUJV R19EUklWRVIoIkh1QyBmaXJtd2FyZSBwZW5kaW5nLCBwYXRoICVzXG4iLCBmd19wYXRoKTsKLQot CVdBUk4oaHVjLT5mdy5wYXRoID09IE5VTEwsICJIdUMgcHJlc2VudCBidXQgbm8gZncgcGF0aFxu Iik7CisJfQogCiAJaW50ZWxfdWNfcHJlcGFyZV9mdyhkZXZfcHJpdiwgJmh1Yy0+ZncpOwogfQpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3VjLmMKaW5kZXggNTk4OGYwMC4uN2Y5YWFkNyAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF91Yy5jCkBAIC0yNzEsOCArMjcxLDEwIEBAIHZvaWQgaW50ZWxfdWNfcHJlcGFyZV9m dyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJc2l6ZV90IHNpemU7CiAJaW50 IGVycjsKIAorCXVjX2Z3LT5mZXRjaF9zdGF0dXMgPSBJTlRFTF9VQ19GSVJNV0FSRV9QRU5ESU5H OworCiAJRFJNX0RFQlVHX0RSSVZFUigiYmVmb3JlIHJlcXVlc3RpbmcgZmlybXdhcmU6IHVDIGZ3 IGZldGNoIHN0YXR1cyAlc1xuIiwKLQkJaW50ZWxfdWNfZndfc3RhdHVzX3JlcHIodWNfZnctPmZl dGNoX3N0YXR1cykpOworCQkJIGludGVsX3VjX2Z3X3N0YXR1c19yZXByKHVjX2Z3LT5mZXRjaF9z dGF0dXMpKTsKIAogCWVyciA9IHJlcXVlc3RfZmlybXdhcmUoJmZ3LCB1Y19mdy0+cGF0aCwgJnBk ZXYtPmRldik7CiAJaWYgKGVycikKLS0gCjIuOS4zCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK