From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Subject: [PATCH 8/8] drm/i915/uc: Simplify firwmare path handling
Date: Fri, 17 Feb 2017 14:05:57 +0100
Message-ID: <20170217130557.6710-9-arkadiusz.hiler@intel.com>
References: <20170217130557.6710-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 1E1806ECFB
 for <intel-gfx@lists.freedesktop.org>; Fri, 17 Feb 2017 13:06:21 +0000 (UTC)
In-Reply-To: <20170217130557.6710-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
emtvKQoKQ2M6IEFudXNoYSBTcml2YXRzYSA8YW51c2hhLnNyaXZhdHNhQGludGVsLmNvbT4KQ2M6
IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CkNjOiBNaWNoYWwgV2lu
aWFyc2tpIDxtaWNoYWwud2luaWFyc2tpQGludGVsLmNvbT4KQ2M6IE1pY2hhbCBXYWpkZWN6a28g
PG1pY2hhbC53YWpkZWN6a29AaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBBcmthZGl1c3ogSGls
ZXIgPGFya2FkaXVzei5oaWxlckBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfZ3VjX2xvYWRlci5jIHwgMzkgKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0t
CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9odWMuYyAgICAgICAgfCAyMCArKysrKy0tLS0t
LS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYyAgICAgICAgIHwgIDUgKysr
LS0KIDMgZmlsZXMgY2hhbmdlZCwgMjIgaW5zZXJ0aW9ucygrKSwgNDIgZGVsZXRpb25zKC0pCgpk
aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jIGIvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCmluZGV4IDU0OWEyNTQuLmFhZGUx
ODUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYwor
KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKQEAgLTQzMywxMiAr
NDMzLDggQEAgaW50IGludGVsX2d1Y19pbml0X2h3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk
ZXZfcHJpdikKIAkJaW50ZWxfdWNfZndfc3RhdHVzX3JlcHIoZ3VjX2Z3LT5sb2FkX3N0YXR1cykp
OwogCiAJaWYgKGZ3X3BhdGggPT0gTlVMTCkgewotCQkvKiBEZXZpY2UgaXMga25vd24gdG8gaGF2
ZSBubyB1Q29kZSAoZS5nLiBubyBHdUMpICovCisJCS8qIFdlIGRvIG5vdCBoYXZlIHVDb2RlIGZv
ciB0aGUgZGV2aWNlICovCiAJCXJldHVybiAtRU5YSU87Ci0JfSBlbHNlIGlmICgqZndfcGF0aCA9
PSAnXDAnKSB7Ci0JCS8qIERldmljZSBoYXMgYSBHdUMgYnV0IHdlIGRvbid0IGtub3cgd2hhdCBm
L3cgdG8gbG9hZD8gKi8KLQkJV0FSTigxLCAiTm8gR3VDIGZpcm13YXJlIGtub3duIGZvciB0aGlz
IHBsYXRmb3JtIVxuIik7Ci0JCXJldHVybiAtRU5PREVWOwogCX0KIAogCS8qIEZldGNoIGZhaWxl
ZCwgb3IgYWxyZWFkeSBmZXRjaGVkIGJ1dCBmYWlsZWQgdG8gbG9hZD8gKi8KQEAgLTQ3NCw3ICs0
NzAsNiBAQCBpbnQgaW50ZWxfZ3VjX2luaXRfaHcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl
dl9wcml2KQogCXJldHVybiAwOwogfQogCi0KIC8qKgogICogaW50ZWxfZ3VjX2ZldGNoX2Z3KCkg
LSBkZXRlcm1pbmUgYW5kIGZldGNoIGZpcm13YXJlCiAgKiBAZ3VjOglpbnRlbF9ndWMgc3RydWN0
CkBAIC00ODcsMzkgKzQ4MiwzMSBAQCBpbnQgaW50ZWxfZ3VjX2luaXRfaHcoc3RydWN0IGRybV9p
OTE1X3ByaXZhdGUgKmRldl9wcml2KQogdm9pZCBpbnRlbF9ndWNfZmV0Y2hfZncoc3RydWN0IGlu
dGVsX2d1YyAqZ3VjKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGd1
Y190b19pOTE1KGd1Yyk7Ci0JY29uc3QgY2hhciAqZndfcGF0aDsKIAotCWlmICghSEFTX0dVQ19V
Q09ERShkZXZfcHJpdikpIHsKLQkJZndfcGF0aCA9IE5VTEw7Ci0JfSBlbHNlIGlmIChJU19TS1lM
QUtFKGRldl9wcml2KSkgewotCQlmd19wYXRoID0gSTkxNV9TS0xfR1VDX1VDT0RFOworCWd1Yy0+
ZncucGF0aCA9IE5VTEw7CisJZ3VjLT5mdy5mZXRjaF9zdGF0dXMgPSBJTlRFTF9VQ19GSVJNV0FS
RV9OT05FOworCWd1Yy0+ZncubG9hZF9zdGF0dXMgPSBJTlRFTF9VQ19GSVJNV0FSRV9OT05FOwor
CWd1Yy0+ZncuZncgPSBJTlRFTF9VQ19GV19UWVBFX0dVQzsKKworCWlmIChJU19TS1lMQUtFKGRl
dl9wcml2KSkgeworCQlndWMtPmZ3LnBhdGggPSBJOTE1X1NLTF9HVUNfVUNPREU7CiAJCWd1Yy0+
ZncubWFqb3JfdmVyX3dhbnRlZCA9IFNLTF9GV19NQUpPUjsKIAkJZ3VjLT5mdy5taW5vcl92ZXJf
d2FudGVkID0gU0tMX0ZXX01JTk9SOwogCX0gZWxzZSBpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikp
IHsKLQkJZndfcGF0aCA9IEk5MTVfQlhUX0dVQ19VQ09ERTsKKwkJZ3VjLT5mdy5wYXRoID0gSTkx
NV9CWFRfR1VDX1VDT0RFOwogCQlndWMtPmZ3Lm1ham9yX3Zlcl93YW50ZWQgPSBCWFRfRldfTUFK
T1I7CiAJCWd1Yy0+ZncubWlub3JfdmVyX3dhbnRlZCA9IEJYVF9GV19NSU5PUjsKIAl9IGVsc2Ug
aWYgKElTX0tBQllMQUtFKGRldl9wcml2KSkgewotCQlmd19wYXRoID0gSTkxNV9LQkxfR1VDX1VD
T0RFOworCQlndWMtPmZ3LnBhdGggPSBJOTE1X0tCTF9HVUNfVUNPREU7CiAJCWd1Yy0+ZncubWFq
b3JfdmVyX3dhbnRlZCA9IEtCTF9GV19NQUpPUjsKIAkJZ3VjLT5mdy5taW5vcl92ZXJfd2FudGVk
ID0gS0JMX0ZXX01JTk9SOwogCX0gZWxzZSB7Ci0JCWZ3X3BhdGggPSAiIjsJLyogdW5rbm93biBk
ZXZpY2UgKi8KKwkJV0FSTigxLCAiTm8gR3VDIGZpcm13YXJlIGtub3duIGZvciBwbGF0Zm9ybSB3
aXRoIEd1QyFcbiIpOworCQlpOTE1LmVuYWJsZV9ndWNfbG9hZGluZyA9IDA7CisJCXJldHVybjsK
IAl9CiAKLQlndWMtPmZ3LnBhdGggPSBmd19wYXRoOwotCWd1Yy0+ZncuZmV0Y2hfc3RhdHVzID0g
SU5URUxfVUNfRklSTVdBUkVfTk9ORTsKLQlndWMtPmZ3LmxvYWRfc3RhdHVzID0gSU5URUxfVUNf
RklSTVdBUkVfTk9ORTsKLQotCWlmIChmd19wYXRoID09IE5VTEwpCi0JCXJldHVybjsKLQlpZiAo
KmZ3X3BhdGggPT0gJ1wwJykKLQkJcmV0dXJuOwotCi0JZ3VjLT5mdy5mZXRjaF9zdGF0dXMgPSBJ
TlRFTF9VQ19GSVJNV0FSRV9QRU5ESU5HOwotCURSTV9ERUJVR19EUklWRVIoIkd1QyBmaXJtd2Fy
ZSBwZW5kaW5nLCBwYXRoICVzXG4iLCBmd19wYXRoKTsKIAlndWMtPmZ3LmZldGNoKGRldl9wcml2
LCAmZ3VjLT5mdyk7Ci0JLyogc3RhdHVzIG11c3Qgbm93IGJlIEZBSUwgb3IgU1VDQ0VTUyAqLwog
fQogCiAvKioKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1Yy5jIGIv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMKaW5kZXggNzUyNzk4OC4uYzk0ZTIyZiAx
MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMKKysrIGIvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMKQEAgLTE1NSwzNyArMTU1LDI5IEBAIHN0YXRpYyBp
bnQgaHVjX3Vjb2RlX3hmZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogdm9p
ZCBpbnRlbF9odWNfZmV0Y2hfZncoc3RydWN0IGludGVsX2h1YyAqaHVjKQogewogCXN0cnVjdCBk
cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGh1Y190b19pOTE1KGh1Yyk7Ci0JY29uc3QgY2hh
ciAqZndfcGF0aCA9IE5VTEw7CiAKIAlodWMtPmZ3LnBhdGggPSBOVUxMOwogCWh1Yy0+ZncuZmV0
Y2hfc3RhdHVzID0gSU5URUxfVUNfRklSTVdBUkVfTk9ORTsKIAlodWMtPmZ3LmxvYWRfc3RhdHVz
ID0gSU5URUxfVUNfRklSTVdBUkVfTk9ORTsKIAlodWMtPmZ3LmZ3ID0gSU5URUxfVUNfRldfVFlQ
RV9IVUM7CiAKLQlpZiAoIUhBU19IVUNfVUNPREUoZGV2X3ByaXYpKQotCQlyZXR1cm47Ci0KIAlp
ZiAoSVNfU0tZTEFLRShkZXZfcHJpdikpIHsKLQkJZndfcGF0aCA9IEk5MTVfU0tMX0hVQ19VQ09E
RTsKKwkJaHVjLT5mdy5wYXRoID0gSTkxNV9TS0xfSFVDX1VDT0RFOwogCQlodWMtPmZ3Lm1ham9y
X3Zlcl93YW50ZWQgPSBTS0xfSFVDX0ZXX01BSk9SOwogCQlodWMtPmZ3Lm1pbm9yX3Zlcl93YW50
ZWQgPSBTS0xfSFVDX0ZXX01JTk9SOwogCX0gZWxzZSBpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikp
IHsKLQkJZndfcGF0aCA9IEk5MTVfQlhUX0hVQ19VQ09ERTsKKwkJaHVjLT5mdy5wYXRoID0gSTkx
NV9CWFRfSFVDX1VDT0RFOwogCQlodWMtPmZ3Lm1ham9yX3Zlcl93YW50ZWQgPSBCWFRfSFVDX0ZX
X01BSk9SOwogCQlodWMtPmZ3Lm1pbm9yX3Zlcl93YW50ZWQgPSBCWFRfSFVDX0ZXX01JTk9SOwog
CX0gZWxzZSBpZiAoSVNfS0FCWUxBS0UoZGV2X3ByaXYpKSB7Ci0JCWZ3X3BhdGggPSBJOTE1X0tC
TF9IVUNfVUNPREU7CisJCWh1Yy0+ZncucGF0aCA9IEk5MTVfS0JMX0hVQ19VQ09ERTsKIAkJaHVj
LT5mdy5tYWpvcl92ZXJfd2FudGVkID0gS0JMX0hVQ19GV19NQUpPUjsKIAkJaHVjLT5mdy5taW5v
cl92ZXJfd2FudGVkID0gS0JMX0hVQ19GV19NSU5PUjsKKwl9IGVsc2UgeworCQlXQVJOKDEsICJO
byBIdUMgZmlybXdhcmUga25vd24gZm9yIHBsYXRmb3JtIHdpdGggSHVDIVxuIik7CisJCXJldHVy
bjsKIAl9CiAKLQlodWMtPmZ3LnBhdGggPSBmd19wYXRoOwotCWh1Yy0+ZncuZmV0Y2hfc3RhdHVz
ID0gSU5URUxfVUNfRklSTVdBUkVfUEVORElORzsKLQotCURSTV9ERUJVR19EUklWRVIoIkh1QyBm
aXJtd2FyZSBwZW5kaW5nLCBwYXRoICVzXG4iLCBmd19wYXRoKTsKLQotCVdBUk4oaHVjLT5mdy5w
YXRoID09IE5VTEwsICJIdUMgcHJlc2VudCBidXQgbm8gZncgcGF0aFxuIik7Ci0KIAlodWMtPmZ3
LmZldGNoKGRldl9wcml2LCAmaHVjLT5mdyk7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX3VjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jCmlu
ZGV4IDJiYjQ5YjcuLjZmMmQzZjYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX3VjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYwpAQCAtMjY3LDgg
KzI2Nyw5IEBAIHN0YXRpYyB2b2lkIHVjX2ZldGNoX2Z3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl
ICpkZXZfcHJpdiwKIAlzaXplX3Qgc2l6ZTsKIAlpbnQgZXJyOwogCi0JRFJNX0RFQlVHX0RSSVZF
UigiYmVmb3JlIHJlcXVlc3RpbmcgZmlybXdhcmU6IHVDIGZ3IGZldGNoIHN0YXR1cyAlc1xuIiwK
LQkJaW50ZWxfdWNfZndfc3RhdHVzX3JlcHIodWNfZnctPmZldGNoX3N0YXR1cykpOworCXVjX2Z3
LT5mZXRjaF9zdGF0dXMgPSBJTlRFTF9VQ19GSVJNV0FSRV9QRU5ESU5HOworCisJRFJNX0RFQlVH
X0RSSVZFUigidUMgZmlybXdhcmUgcGVuZGluZywgcGF0aCAlc1xuIiwgdWNfZnctPnBhdGgpOwog
CiAJZXJyID0gcmVxdWVzdF9maXJtd2FyZSgmZncsIHVjX2Z3LT5wYXRoLCAmcGRldi0+ZGV2KTsK
IAlpZiAoZXJyKQotLSAKMi45LjMKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk
ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv
L2ludGVsLWdmeAo=