From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Subject: [PATCH 08/11] drm/i915/uc: Simplify firmware path
	handling
Date: Tue, 14 Mar 2017 15:28:12 +0100
Message-ID: <20170314142815.17440-9-arkadiusz.hiler@intel.com>
References: <20170314142815.17440-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 mga02.intel.com (mga02.intel.com [134.134.136.20])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 164B26E77E
 for <intel-gfx@lists.freedesktop.org>; Tue, 14 Mar 2017 14:28:37 +0000 (UTC)
In-Reply-To: <20170314142815.17440-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
aW5nIHN0YW5kYXJkIChKLiBMYWh0aW5lbikKdjU6IG5vbi10cml2aWFsIHJlYmFzZQp2NjogcmVt
b3ZlIHBhdGggY2hlY2ssIHdlIGFyZSBjaGVja2luZyBmZXRjaCBzdGF0dXMgKE0uIFdhamRlY3pr
bykKCkNjOiBBbnVzaGEgU3JpdmF0c2EgPGFudXNoYS5zcml2YXRzYUBpbnRlbC5jb20+CkNjOiBU
dnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpDYzogTWljaGFsIFdpbmlh
cnNraSA8bWljaGFsLndpbmlhcnNraUBpbnRlbC5jb20+CkNjOiBNaWNoYWwgV2FqZGVjemtvIDxt
aWNoYWwud2FqZGVjemtvQGludGVsLmNvbT4KQ2M6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxh
aHRpbmVuQGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogQXJrYWRpdXN6IEhpbGVyIDxh
cmthZGl1c3ouaGlsZXJAaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogVHZydGtvIFVyc3VsaW4gPHR2
cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n
dWNfbG9hZGVyLmMgfCAzNiArKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1Yy5jICAgICAgICB8IDIxICsrKysrKy0tLS0tLS0tLS0t
LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMgICAgICAgICB8ICA0ICsrKy0KIDMg
ZmlsZXMgY2hhbmdlZCwgMjAgaW5zZXJ0aW9ucygrKSwgNDEgZGVsZXRpb25zKC0pCgpkaWZmIC0t
Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jIGIvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCmluZGV4IDBhMjljMWIuLmQ3MzFmNjggMTAw
NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYworKysgYi9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKQEAgLTM2OCwxMyArMzY4LDYg
QEAgaW50IGludGVsX2d1Y19pbml0X2h3KHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIAkJaW50ZWxf
dWNfZndfc3RhdHVzX3JlcHIoZ3VjLT5mdy5mZXRjaF9zdGF0dXMpLAogCQlpbnRlbF91Y19md19z
dGF0dXNfcmVwcihndWMtPmZ3LmxvYWRfc3RhdHVzKSk7CiAKLQlpZiAoIWZ3X3BhdGgpIHsKLQkJ
cmV0dXJuIC1FTlhJTzsKLQl9IGVsc2UgaWYgKCpmd19wYXRoID09ICdcMCcpIHsKLQkJV0FSTigx
LCAiTm8gR3VDIGZpcm13YXJlIGtub3duIGZvciB0aGlzIHBsYXRmb3JtIVxuIik7Ci0JCXJldHVy
biAtRU5PREVWOwotCX0KLQogCWlmIChndWMtPmZ3LmZldGNoX3N0YXR1cyAhPSBJTlRFTF9VQ19G
SVJNV0FSRV9TVUNDRVNTKQogCQlyZXR1cm4gLUVJTzsKIApAQCAtMzk5LDcgKzM5Miw2IEBAIGlu
dCBpbnRlbF9ndWNfaW5pdF9odyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAJcmV0dXJuIDA7CiB9
CiAKLQogLyoqCiAgKiBpbnRlbF9ndWNfaW5pdF9mdygpIC0gc2VsZWN0IGFuZCBwcmVwYXJlIGZp
cm13YXJlIGZvciBsb2FkaW5nCiAgKiBAZ3VjOglpbnRlbF9ndWMgc3RydWN0CkBAIC00MTIsMzcg
KzQwNCwzMSBAQCBpbnQgaW50ZWxfZ3VjX2luaXRfaHcoc3RydWN0IGludGVsX2d1YyAqZ3VjKQog
dm9pZCBpbnRlbF9ndWNfaW5pdF9mdyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiB7CiAJc3RydWN0
IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZ3VjX3RvX2k5MTUoZ3VjKTsKLQljb25zdCBj
aGFyICpmd19wYXRoOworCisJZ3VjLT5mdy5wYXRoID0gTlVMTDsKKwlndWMtPmZ3LmZldGNoX3N0
YXR1cyA9IElOVEVMX1VDX0ZJUk1XQVJFX05PTkU7CisJZ3VjLT5mdy5sb2FkX3N0YXR1cyA9IElO
VEVMX1VDX0ZJUk1XQVJFX05PTkU7CisJZ3VjLT5mdy5mdyA9IElOVEVMX1VDX0ZXX1RZUEVfR1VD
OwogCiAJaWYgKElTX1NLWUxBS0UoZGV2X3ByaXYpKSB7Ci0JCWZ3X3BhdGggPSBJOTE1X1NLTF9H
VUNfVUNPREU7CisJCWd1Yy0+ZncucGF0aCA9IEk5MTVfU0tMX0dVQ19VQ09ERTsKIAkJZ3VjLT5m
dy5tYWpvcl92ZXJfd2FudGVkID0gU0tMX0ZXX01BSk9SOwogCQlndWMtPmZ3Lm1pbm9yX3Zlcl93
YW50ZWQgPSBTS0xfRldfTUlOT1I7CiAJfSBlbHNlIGlmIChJU19CUk9YVE9OKGRldl9wcml2KSkg
ewotCQlmd19wYXRoID0gSTkxNV9CWFRfR1VDX1VDT0RFOworCQlndWMtPmZ3LnBhdGggPSBJOTE1
X0JYVF9HVUNfVUNPREU7CiAJCWd1Yy0+ZncubWFqb3JfdmVyX3dhbnRlZCA9IEJYVF9GV19NQUpP
UjsKIAkJZ3VjLT5mdy5taW5vcl92ZXJfd2FudGVkID0gQlhUX0ZXX01JTk9SOwogCX0gZWxzZSBp
ZiAoSVNfS0FCWUxBS0UoZGV2X3ByaXYpKSB7Ci0JCWZ3X3BhdGggPSBJOTE1X0tCTF9HVUNfVUNP
REU7CisJCWd1Yy0+ZncucGF0aCA9IEk5MTVfS0JMX0dVQ19VQ09ERTsKIAkJZ3VjLT5mdy5tYWpv
cl92ZXJfd2FudGVkID0gS0JMX0ZXX01BSk9SOwogCQlndWMtPmZ3Lm1pbm9yX3Zlcl93YW50ZWQg
PSBLQkxfRldfTUlOT1I7CiAJfSBlbHNlIHsKLQkJZndfcGF0aCA9ICIiOwkvKiB1bmtub3duIGRl
dmljZSAqLworCQlEUk1fRVJST1IoIk5vIEd1QyBmaXJtd2FyZSBrbm93biBmb3IgcGxhdGZvcm0g
d2l0aCBHdUMhXG4iKTsKKwkJaTkxNS5lbmFibGVfZ3VjX2xvYWRpbmcgPSAwOworCQlyZXR1cm47
CiAJfQogCi0JZ3VjLT5mdy5wYXRoID0gZndfcGF0aDsKLQlndWMtPmZ3LmZldGNoX3N0YXR1cyA9
IElOVEVMX1VDX0ZJUk1XQVJFX05PTkU7Ci0JZ3VjLT5mdy5sb2FkX3N0YXR1cyA9IElOVEVMX1VD
X0ZJUk1XQVJFX05PTkU7Ci0KLQlpZiAoZndfcGF0aCA9PSBOVUxMKQotCQlyZXR1cm47Ci0JaWYg
KCpmd19wYXRoID09ICdcMCcpCi0JCXJldHVybjsKLQotCWd1Yy0+ZncuZmV0Y2hfc3RhdHVzID0g
SU5URUxfVUNfRklSTVdBUkVfUEVORElORzsKLQlEUk1fREVCVUdfRFJJVkVSKCJHdUMgZmlybXdh
cmUgcGVuZGluZywgcGF0aCAlc1xuIiwgZndfcGF0aCk7CiAJaW50ZWxfdWNfcHJlcGFyZV9mdyhk
ZXZfcHJpdiwgJmd1Yy0+ZncpOwotCS8qIHN0YXR1cyBtdXN0IG5vdyBiZSBGQUlMIG9yIFNVQ0NF
U1MgKi8KIH0KIAogLyoqCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9o
dWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1Yy5jCmluZGV4IDE2OGFhYjEuLjVm
YWRkNTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1Yy5jCisrKyBi
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1Yy5jCkBAIC0xNTUsNyArMTU1LDYgQEAgc3Rh
dGljIGludCBodWNfdWNvZGVfeGZlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp
CiB2b2lkIGludGVsX2h1Y19pbml0X2Z3KHN0cnVjdCBpbnRlbF9odWMgKmh1YykKIHsKIAlzdHJ1
Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBodWNfdG9faTkxNShodWMpOwotCWNvbnN0
IGNoYXIgKmZ3X3BhdGggPSBOVUxMOwogCiAJaHVjLT5mdy5wYXRoID0gTlVMTDsKIAlodWMtPmZ3
LmZldGNoX3N0YXR1cyA9IElOVEVMX1VDX0ZJUk1XQVJFX05PTkU7CkBAIC0xNjMsMjkgKzE2Miwy
MSBAQCB2b2lkIGludGVsX2h1Y19pbml0X2Z3KHN0cnVjdCBpbnRlbF9odWMgKmh1YykKIAlodWMt
PmZ3LmZ3ID0gSU5URUxfVUNfRldfVFlQRV9IVUM7CiAKIAlpZiAoSVNfU0tZTEFLRShkZXZfcHJp
dikpIHsKLQkJZndfcGF0aCA9IEk5MTVfU0tMX0hVQ19VQ09ERTsKKwkJaHVjLT5mdy5wYXRoID0g
STkxNV9TS0xfSFVDX1VDT0RFOwogCQlodWMtPmZ3Lm1ham9yX3Zlcl93YW50ZWQgPSBTS0xfSFVD
X0ZXX01BSk9SOwogCQlodWMtPmZ3Lm1pbm9yX3Zlcl93YW50ZWQgPSBTS0xfSFVDX0ZXX01JTk9S
OwogCX0gZWxzZSBpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikpIHsKLQkJZndfcGF0aCA9IEk5MTVf
QlhUX0hVQ19VQ09ERTsKKwkJaHVjLT5mdy5wYXRoID0gSTkxNV9CWFRfSFVDX1VDT0RFOwogCQlo
dWMtPmZ3Lm1ham9yX3Zlcl93YW50ZWQgPSBCWFRfSFVDX0ZXX01BSk9SOwogCQlodWMtPmZ3Lm1p
bm9yX3Zlcl93YW50ZWQgPSBCWFRfSFVDX0ZXX01JTk9SOwogCX0gZWxzZSBpZiAoSVNfS0FCWUxB
S0UoZGV2X3ByaXYpKSB7Ci0JCWZ3X3BhdGggPSBJOTE1X0tCTF9IVUNfVUNPREU7CisJCWh1Yy0+
ZncucGF0aCA9IEk5MTVfS0JMX0hVQ19VQ09ERTsKIAkJaHVjLT5mdy5tYWpvcl92ZXJfd2FudGVk
ID0gS0JMX0hVQ19GV19NQUpPUjsKIAkJaHVjLT5mdy5taW5vcl92ZXJfd2FudGVkID0gS0JMX0hV
Q19GV19NSU5PUjsKLQl9Ci0KLQlodWMtPmZ3LnBhdGggPSBmd19wYXRoOwotCi0JaWYgKGZ3X3Bh
dGggPT0gTlVMTCkKKwl9IGVsc2UgeworCQlEUk1fRVJST1IoIk5vIEh1QyBmaXJtd2FyZSBrbm93
biBmb3IgcGxhdGZvcm0gd2l0aCBIdUMhXG4iKTsKIAkJcmV0dXJuOwotCi0JaHVjLT5mdy5mZXRj
aF9zdGF0dXMgPSBJTlRFTF9VQ19GSVJNV0FSRV9QRU5ESU5HOwotCi0JRFJNX0RFQlVHX0RSSVZF
UigiSHVDIGZpcm13YXJlIHBlbmRpbmcsIHBhdGggJXNcbiIsIGZ3X3BhdGgpOwotCi0JV0FSTiho
dWMtPmZ3LnBhdGggPT0gTlVMTCwgIkh1QyBwcmVzZW50IGJ1dCBubyBmdyBwYXRoXG4iKTsKKwl9
CiAKIAlpbnRlbF91Y19wcmVwYXJlX2Z3KGRldl9wcml2LCAmaHVjLT5mdyk7CiB9CmRpZmYgLS1n
aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfdWMuYwppbmRleCA2OWYyMWNjLi40Yjg1YTBmIDEwMDY0NAotLS0gYS9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs
X3VjLmMKQEAgLTI2OCw4ICsyNjgsMTAgQEAgdm9pZCBpbnRlbF91Y19wcmVwYXJlX2Z3KHN0cnVj
dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlzaXplX3Qgc2l6ZTsKIAlpbnQgZXJyOwog
CisJdWNfZnctPmZldGNoX3N0YXR1cyA9IElOVEVMX1VDX0ZJUk1XQVJFX1BFTkRJTkc7CisKIAlE
Uk1fREVCVUdfRFJJVkVSKCJiZWZvcmUgcmVxdWVzdGluZyBmaXJtd2FyZTogdUMgZncgZmV0Y2gg
c3RhdHVzICVzXG4iLAotCQlpbnRlbF91Y19md19zdGF0dXNfcmVwcih1Y19mdy0+ZmV0Y2hfc3Rh
dHVzKSk7CisJCQkgaW50ZWxfdWNfZndfc3RhdHVzX3JlcHIodWNfZnctPmZldGNoX3N0YXR1cykp
OwogCiAJZXJyID0gcmVxdWVzdF9maXJtd2FyZSgmZncsIHVjX2Z3LT5wYXRoLCAmcGRldi0+ZGV2
KTsKIAlpZiAoZXJyKQotLSAKMi45LjMKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy
ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp
bmZvL2ludGVsLWdmeAo=