From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Subject: [PATCH 08/10] drm/i915/uc: Simplify firmware path
	handling
Date: Fri, 24 Feb 2017 16:40:02 +0100
Message-ID: <20170224154004.17821-9-arkadiusz.hiler@intel.com>
References: <20170224154004.17821-1-arkadiusz.hiler@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga05.intel.com (mga05.intel.com [192.55.52.43])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 6694D6ECC6
 for <intel-gfx@lists.freedesktop.org>; Fri, 24 Feb 2017 15:40:37 +0000 (UTC)
In-Reply-To: <20170224154004.17821-1-arkadiusz.hiler@intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

Q3VycmVudGx5IGZ3LT5wYXRoIHZhbHVlcyBjYW4gcmVwcmVzZW50IG9uZSBvZiB0aHJlZSBwb3Nz
aWJsZSBzdGF0ZXM6CgogMSkgTlVMTCAtIGRldmljZSB3aXRob3V0IHRoZSB1QwogMikgJ1wwJyAt
IGRldmljZSB3aXRoIHRoZSB1QyBidXQgaGF2ZSBubyBmaXJtd2FyZQogMykgZWxzZSAtIGRldmlj
ZSB3aXRoIHRoZSB1QyBhbmQgd2UgaGF2ZSBmaXJtd2FyZQoKU2Vjb25kIGNhc2UgaXMgdXNlZCBv
bmx5IHRvIFdBUk4gYXQgYSBsYXRlciBzdGFnZS4KCldlIGNhbiBXQVJOIHJpZ2h0IGF3YXkgYW5k
IG1lcmdlIGNhc2VzIDEgYW5kIDIuCgpDb2RlIGNhbiBiZSBldmVuIGZ1cnRoZXIgc2ltcGxpZmll
ZCBhbmQgY29tbW9uIChIdUMvR3VDIGxvZ2ljKSBoYXBwZW5pbmcKcmlnaHQgYmVmb3JlIHRoZSBm
ZXRjaCBjYW4gYmUgb2ZmbG9hZGVkIHRvIHRoZSBjb21tb24gZnVuY3Rpb24uCgp2MjogZmV3ZXIg
dGVtcG9yYXJ5IHZhcmlhYmxlcywgbW9yZSBzdHJhaWdodGZvcndhcmQgZmxvdyAoTS4gV2FqZGVj
emtvKQp2MzogRFJNX0VSUk9SIGluc3RlYWQgb2YgV0FSTiAoTS4gV2FqZGVjemtvKQp2NDogY29k
aW5nIHN0YW5kYXJkIChKLiBMYWh0aW5lbikKCkNjOiBBbnVzaGEgU3JpdmF0c2EgPGFudXNoYS5z
cml2YXRzYUBpbnRlbC5jb20+CkNjOiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50
ZWwuY29tPgpDYzogTWljaGFsIFdpbmlhcnNraSA8bWljaGFsLndpbmlhcnNraUBpbnRlbC5jb20+
CkNjOiBNaWNoYWwgV2FqZGVjemtvIDxtaWNoYWwud2FqZGVjemtvQGludGVsLmNvbT4KQ2M6IEpv
b25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9m
Zi1ieTogQXJrYWRpdXN6IEhpbGVyIDxhcmthZGl1c3ouaGlsZXJAaW50ZWwuY29tPgotLS0KIGRy
aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYyB8IDM5ICsrKysrKysrKysrLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMgICAg
ICAgIHwgMjAgKysrKystLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Vj
LmMgICAgICAgICB8ICA0ICsrKy0KIDMgZmlsZXMgY2hhbmdlZCwgMjIgaW5zZXJ0aW9ucygrKSwg
NDEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
Z3VjX2xvYWRlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCmlu
ZGV4IDhlOWEyZTI5Li42NGY1MGJkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9ndWNfbG9hZGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xv
YWRlci5jCkBAIC00MzIsMTIgKzQzMiw4IEBAIGludCBpbnRlbF9ndWNfaW5pdF9odyhzdHJ1Y3Qg
ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCWludGVsX3VjX2Z3X3N0YXR1c19yZXByKGd1
Y19mdy0+ZmV0Y2hfc3RhdHVzKSwKIAkJaW50ZWxfdWNfZndfc3RhdHVzX3JlcHIoZ3VjX2Z3LT5s
b2FkX3N0YXR1cykpOwogCi0JaWYgKCFmd19wYXRoKSB7CisJaWYgKCFmd19wYXRoKQogCQlyZXR1
cm4gLUVOWElPOwotCX0gZWxzZSBpZiAoKmZ3X3BhdGggPT0gJ1wwJykgewotCQlXQVJOKDEsICJO
byBHdUMgZmlybXdhcmUga25vd24gZm9yIHRoaXMgcGxhdGZvcm0hXG4iKTsKLQkJcmV0dXJuIC1F
Tk9ERVY7Ci0JfQogCiAJaWYgKGd1Y19mdy0+ZmV0Y2hfc3RhdHVzICE9IElOVEVMX1VDX0ZJUk1X
QVJFX1NVQ0NFU1MpCiAJCXJldHVybiAtRUlPOwpAQCAtNDcwLDcgKzQ2Niw2IEBAIGludCBpbnRl
bF9ndWNfaW5pdF9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJcmV0dXJu
IDA7CiB9CiAKLQogLyoqCiAgKiBpbnRlbF9ndWNfaW5pdF9mdygpIC0gc2VsZWN0IGFuZCBwcmVw
YXJlIGZpcm13YXJlIGZvciBsb2FkaW5nCiAgKiBAZ3VjOglpbnRlbF9ndWMgc3RydWN0CkBAIC00
ODMsMzkgKzQ3OCwzMSBAQCBpbnQgaW50ZWxfZ3VjX2luaXRfaHcoc3RydWN0IGRybV9pOTE1X3By
aXZhdGUgKmRldl9wcml2KQogdm9pZCBpbnRlbF9ndWNfaW5pdF9mdyhzdHJ1Y3QgaW50ZWxfZ3Vj
ICpndWMpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZ3VjX3RvX2k5
MTUoZ3VjKTsKLQljb25zdCBjaGFyICpmd19wYXRoOwogCi0JaWYgKCFIQVNfR1VDX1VDT0RFKGRl
dl9wcml2KSkgewotCQlmd19wYXRoID0gTlVMTDsKLQl9IGVsc2UgaWYgKElTX1NLWUxBS0UoZGV2
X3ByaXYpKSB7Ci0JCWZ3X3BhdGggPSBJOTE1X1NLTF9HVUNfVUNPREU7CisJZ3VjLT5mdy5wYXRo
ID0gTlVMTDsKKwlndWMtPmZ3LmZldGNoX3N0YXR1cyA9IElOVEVMX1VDX0ZJUk1XQVJFX05PTkU7
CisJZ3VjLT5mdy5sb2FkX3N0YXR1cyA9IElOVEVMX1VDX0ZJUk1XQVJFX05PTkU7CisJZ3VjLT5m
dy5mdyA9IElOVEVMX1VDX0ZXX1RZUEVfR1VDOworCisJaWYgKElTX1NLWUxBS0UoZGV2X3ByaXYp
KSB7CisJCWd1Yy0+ZncucGF0aCA9IEk5MTVfU0tMX0dVQ19VQ09ERTsKIAkJZ3VjLT5mdy5tYWpv
cl92ZXJfd2FudGVkID0gU0tMX0ZXX01BSk9SOwogCQlndWMtPmZ3Lm1pbm9yX3Zlcl93YW50ZWQg
PSBTS0xfRldfTUlOT1I7CiAJfSBlbHNlIGlmIChJU19CUk9YVE9OKGRldl9wcml2KSkgewotCQlm
d19wYXRoID0gSTkxNV9CWFRfR1VDX1VDT0RFOworCQlndWMtPmZ3LnBhdGggPSBJOTE1X0JYVF9H
VUNfVUNPREU7CiAJCWd1Yy0+ZncubWFqb3JfdmVyX3dhbnRlZCA9IEJYVF9GV19NQUpPUjsKIAkJ
Z3VjLT5mdy5taW5vcl92ZXJfd2FudGVkID0gQlhUX0ZXX01JTk9SOwogCX0gZWxzZSBpZiAoSVNf
S0FCWUxBS0UoZGV2X3ByaXYpKSB7Ci0JCWZ3X3BhdGggPSBJOTE1X0tCTF9HVUNfVUNPREU7CisJ
CWd1Yy0+ZncucGF0aCA9IEk5MTVfS0JMX0dVQ19VQ09ERTsKIAkJZ3VjLT5mdy5tYWpvcl92ZXJf
d2FudGVkID0gS0JMX0ZXX01BSk9SOwogCQlndWMtPmZ3Lm1pbm9yX3Zlcl93YW50ZWQgPSBLQkxf
RldfTUlOT1I7CiAJfSBlbHNlIHsKLQkJZndfcGF0aCA9ICIiOwkvKiB1bmtub3duIGRldmljZSAq
LworCQlEUk1fRVJST1IoIk5vIEd1QyBmaXJtd2FyZSBrbm93biBmb3IgcGxhdGZvcm0gd2l0aCBH
dUMhXG4iKTsKKwkJaTkxNS5lbmFibGVfZ3VjX2xvYWRpbmcgPSAwOworCQlyZXR1cm47CiAJfQog
Ci0JZ3VjLT5mdy5wYXRoID0gZndfcGF0aDsKLQlndWMtPmZ3LmZldGNoX3N0YXR1cyA9IElOVEVM
X1VDX0ZJUk1XQVJFX05PTkU7Ci0JZ3VjLT5mdy5sb2FkX3N0YXR1cyA9IElOVEVMX1VDX0ZJUk1X
QVJFX05PTkU7Ci0KLQlpZiAoZndfcGF0aCA9PSBOVUxMKQotCQlyZXR1cm47Ci0JaWYgKCpmd19w
YXRoID09ICdcMCcpCi0JCXJldHVybjsKLQotCWd1Yy0+ZncuZmV0Y2hfc3RhdHVzID0gSU5URUxf
VUNfRklSTVdBUkVfUEVORElORzsKLQlEUk1fREVCVUdfRFJJVkVSKCJHdUMgZmlybXdhcmUgcGVu
ZGluZywgcGF0aCAlc1xuIiwgZndfcGF0aCk7CiAJaW50ZWxfdWNfcHJlcGFyZV9mdyhkZXZfcHJp
diwgJmd1Yy0+ZncpOwotCS8qIHN0YXR1cyBtdXN0IG5vdyBiZSBGQUlMIG9yIFNVQ0NFU1MgKi8K
IH0KIAogLyoqCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9odWMuYyBi
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1Yy5jCmluZGV4IDZmMDgxMWMuLjc1N2Y2MTgg
MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1Yy5jCisrKyBiL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1Yy5jCkBAIC0xNTUsMzcgKzE1NSwyOSBAQCBzdGF0aWMg
aW50IGh1Y191Y29kZV94ZmVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHZv
aWQgaW50ZWxfaHVjX2luaXRfZncoc3RydWN0IGludGVsX2h1YyAqaHVjKQogewogCXN0cnVjdCBk
cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGh1Y190b19pOTE1KGh1Yyk7Ci0JY29uc3QgY2hh
ciAqZndfcGF0aCA9IE5VTEw7CiAKIAlodWMtPmZ3LnBhdGggPSBOVUxMOwogCWh1Yy0+ZncuZmV0
Y2hfc3RhdHVzID0gSU5URUxfVUNfRklSTVdBUkVfTk9ORTsKIAlodWMtPmZ3LmxvYWRfc3RhdHVz
ID0gSU5URUxfVUNfRklSTVdBUkVfTk9ORTsKIAlodWMtPmZ3LmZ3ID0gSU5URUxfVUNfRldfVFlQ
RV9IVUM7CiAKLQlpZiAoIUhBU19IVUNfVUNPREUoZGV2X3ByaXYpKQotCQlyZXR1cm47Ci0KIAlp
ZiAoSVNfU0tZTEFLRShkZXZfcHJpdikpIHsKLQkJZndfcGF0aCA9IEk5MTVfU0tMX0hVQ19VQ09E
RTsKKwkJaHVjLT5mdy5wYXRoID0gSTkxNV9TS0xfSFVDX1VDT0RFOwogCQlodWMtPmZ3Lm1ham9y
X3Zlcl93YW50ZWQgPSBTS0xfSFVDX0ZXX01BSk9SOwogCQlodWMtPmZ3Lm1pbm9yX3Zlcl93YW50
ZWQgPSBTS0xfSFVDX0ZXX01JTk9SOwogCX0gZWxzZSBpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikp
IHsKLQkJZndfcGF0aCA9IEk5MTVfQlhUX0hVQ19VQ09ERTsKKwkJaHVjLT5mdy5wYXRoID0gSTkx
NV9CWFRfSFVDX1VDT0RFOwogCQlodWMtPmZ3Lm1ham9yX3Zlcl93YW50ZWQgPSBCWFRfSFVDX0ZX
X01BSk9SOwogCQlodWMtPmZ3Lm1pbm9yX3Zlcl93YW50ZWQgPSBCWFRfSFVDX0ZXX01JTk9SOwog
CX0gZWxzZSBpZiAoSVNfS0FCWUxBS0UoZGV2X3ByaXYpKSB7Ci0JCWZ3X3BhdGggPSBJOTE1X0tC
TF9IVUNfVUNPREU7CisJCWh1Yy0+ZncucGF0aCA9IEk5MTVfS0JMX0hVQ19VQ09ERTsKIAkJaHVj
LT5mdy5tYWpvcl92ZXJfd2FudGVkID0gS0JMX0hVQ19GV19NQUpPUjsKIAkJaHVjLT5mdy5taW5v
cl92ZXJfd2FudGVkID0gS0JMX0hVQ19GV19NSU5PUjsKKwl9IGVsc2UgeworCQlEUk1fRVJST1Io
Ik5vIEh1QyBmaXJtd2FyZSBrbm93biBmb3IgcGxhdGZvcm0gd2l0aCBIdUMhXG4iKTsKKwkJcmV0
dXJuOwogCX0KIAotCWh1Yy0+ZncucGF0aCA9IGZ3X3BhdGg7Ci0JaHVjLT5mdy5mZXRjaF9zdGF0
dXMgPSBJTlRFTF9VQ19GSVJNV0FSRV9QRU5ESU5HOwotCi0JRFJNX0RFQlVHX0RSSVZFUigiSHVD
IGZpcm13YXJlIHBlbmRpbmcsIHBhdGggJXNcbiIsIGZ3X3BhdGgpOwotCi0JV0FSTihodWMtPmZ3
LnBhdGggPT0gTlVMTCwgIkh1QyBwcmVzZW50IGJ1dCBubyBmdyBwYXRoXG4iKTsKLQogCWludGVs
X3VjX3ByZXBhcmVfZncoZGV2X3ByaXYsICZodWMtPmZ3KTsKIH0KIApkaWZmIC0tZ2l0IGEvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs
X3VjLmMKaW5kZXggNzA5Zjk2NC4uYWM5YWQ1OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfdWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jCkBA
IC0yNjcsOCArMjY3LDEwIEBAIHZvaWQgaW50ZWxfdWNfcHJlcGFyZV9mdyhzdHJ1Y3QgZHJtX2k5
MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJc2l6ZV90IHNpemU7CiAJaW50IGVycjsKIAorCXVjX2Z3
LT5mZXRjaF9zdGF0dXMgPSBJTlRFTF9VQ19GSVJNV0FSRV9QRU5ESU5HOworCiAJRFJNX0RFQlVH
X0RSSVZFUigiYmVmb3JlIHJlcXVlc3RpbmcgZmlybXdhcmU6IHVDIGZ3IGZldGNoIHN0YXR1cyAl
c1xuIiwKLQkJaW50ZWxfdWNfZndfc3RhdHVzX3JlcHIodWNfZnctPmZldGNoX3N0YXR1cykpOwor
CQkJIGludGVsX3VjX2Z3X3N0YXR1c19yZXByKHVjX2Z3LT5mZXRjaF9zdGF0dXMpKTsKIAogCWVy
ciA9IHJlcXVlc3RfZmlybXdhcmUoJmZ3LCB1Y19mdy0+cGF0aCwgJnBkZXYtPmRldik7CiAJaWYg
KGVycikKLS0gCjIuOS4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv
cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl
bC1nZngK