From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: [PATCH v2 2/3] drm/i915/csr: keep max firmware size together with firmare name and version Date: Thu, 6 Sep 2018 13:40:32 +0300 Message-ID: <20180906104033.20872-2-jani.nikula@intel.com> References: <20180906104033.20872-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id F057E6E689 for ; Thu, 6 Sep 2018 10:41:08 +0000 (UTC) In-Reply-To: <20180906104033.20872-1-jani.nikula@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 Cc: jani.nikula@intel.com List-Id: intel-gfx@lists.freedesktop.org TW92ZSBtYXggZmlybXdhcmUgc2l6ZSB0byB0aGUgc2FtZSBpZiBsYWRkZXIgd2l0aCBmaXJtd2Fy ZSBuYW1lIGFuZApyZXF1aXJlZCB2ZXJzaW9uLiBUaGlzIGFsbG93cyB1cyB0byBkZXRlY3QgdGhl IG1pc3NpbmcgbWF4IHNpemUgZm9yIGEKcGxhdGZvcm0gd2l0aG91dCBhY3R1YWxseSBsb2FkaW5n IHRoZSBmaXJtd2FyZSwgYW5kIG1ha2VzIHRoZSB3aG9sZQp0aGluZyBlYXNpZXIgdG8gbWFpbnRh aW4uCgpXZSBuZWVkIHRvIG1vdmUgdGhlIHBvd2VyIGdldCBlYXJsaWVyIHRvIGFsbG93IGZvciBl YXJseSByZXR1cm4gaW4gdGhlCm1pc3NpbmcgcGxhdGZvcm0gY2FzZS4gV2hpbGUgYXQgaXQsIGV4 dGVuZCB0aGUgY29tbWVudCBvbiB3aHkgd2UgcmV0dXJuCndpdGggdGhlIHJlZmVyZW5jZSBoZWxk IG9uIGVycm9ycy4KCldlIGFsc28gbmVlZCB0byBtb3ZlIHRoZSBtb2R1bGUgcGFyYW1ldGVyIG92 ZXJyaWRlIGxhdGVyIHRvIHJldXNlIHRoZQptYXggZmlybXdhcmUgc2l6ZSwgd2hpY2ggaXMgaW5k ZXBlbmRlbnQgb2YgdGhlIG92ZXJyaWRlLiBOb3RlIGhvdyB0aGlzCndvcmtzIHdpdGggZ2VuIDEx KyB3aGljaCBkb24ndCBoYXZlIGEgc3BlY2lmaWVkIGZpcm13YXJlIGJsb2IgeWV0LCBidXQKZG8g aGF2ZSBhIG1heGltdW0gc2l6ZS4KCnYyOiBBZGQgY29tbWVudCBvbiB3aHkgd2UgbGVhayB0aGUg d2FrZXJlZiBvbiBlcnJvcnMgKENocmlzKQoKUmV2aWV3ZWQtYnk6IENocmlzIFdpbHNvbiA8Y2hy aXNAY2hyaXMtd2lsc29uLmNvLnVrPgpTaWduZWQtb2ZmLWJ5OiBKYW5pIE5pa3VsYSA8amFuaS5u aWt1bGFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggIHwg IDMgKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jc3IuYyB8IDQ1ICsrKysrKysrKysr KysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMjggaW5zZXJ0 aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggMzY4 MDY2MDEwZjk0Li42MjQ0NGY0YzNjOGUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtNDY1 LDggKzQ2NSw5IEBAIHN0cnVjdCBpbnRlbF9jc3IgewogCXN0cnVjdCB3b3JrX3N0cnVjdCB3b3Jr OwogCWNvbnN0IGNoYXIgKmZ3X3BhdGg7CiAJdWludDMyX3QgcmVxdWlyZWRfdmVyc2lvbjsKKwl1 aW50MzJfdCBtYXhfZndfc2l6ZTsgLyogYnl0ZXMgKi8KIAl1aW50MzJfdCAqZG1jX3BheWxvYWQ7 Ci0JdWludDMyX3QgZG1jX2Z3X3NpemU7CisJdWludDMyX3QgZG1jX2Z3X3NpemU7IC8qIGR3b3Jk cyAqLwogCXVpbnQzMl90IHZlcnNpb247CiAJdWludDMyX3QgbW1pb19jb3VudDsKIAlpOTE1X3Jl Z190IG1taW9hZGRyWzhdOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf Y3NyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jc3IuYwppbmRleCA5YTYwYmI5Y2M0 NDMuLmY2YWQ5NGQ4YjQ0MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf Y3NyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3NyLmMKQEAgLTI4MSw3ICsy ODEsNiBAQCBzdGF0aWMgdWludDMyX3QgKnBhcnNlX2Nzcl9mdyhzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsCiAJc3RydWN0IGludGVsX2NzciAqY3NyID0gJmRldl9wcml2LT5jc3I7 CiAJY29uc3Qgc3RydWN0IHN0ZXBwaW5nX2luZm8gKnNpID0gaW50ZWxfZ2V0X3N0ZXBwaW5nX2lu Zm8oZGV2X3ByaXYpOwogCXVpbnQzMl90IGRtY19vZmZzZXQgPSBDU1JfREVGQVVMVF9GV19PRkZT RVQsIHJlYWRjb3VudCA9IDAsIG5ieXRlczsKLQl1aW50MzJfdCBtYXhfZndfc2l6ZSA9IDA7CiAJ dWludDMyX3QgaTsKIAl1aW50MzJfdCAqZG1jX3BheWxvYWQ7CiAKQEAgLTM3OCwxNSArMzc3LDcg QEAgc3RhdGljIHVpbnQzMl90ICpwYXJzZV9jc3JfZncoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LAogCiAJLyogZndfc2l6ZSBpcyBpbiBkd29yZHMsIHNvIG11bHRpcGxpZWQgYnkg NCB0byBjb252ZXJ0IGludG8gYnl0ZXMuICovCiAJbmJ5dGVzID0gZG1jX2hlYWRlci0+Zndfc2l6 ZSAqIDQ7Ci0JaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gMTEpCi0JCW1heF9md19zaXplID0g SUNMX0NTUl9NQVhfRldfU0laRTsKLQllbHNlIGlmIChJU19DQU5OT05MQUtFKGRldl9wcml2KSB8 fCBJU19HRU1JTklMQUtFKGRldl9wcml2KSkKLQkJbWF4X2Z3X3NpemUgPSBHTEtfQ1NSX01BWF9G V19TSVpFOwotCWVsc2UgaWYgKElTX0dFTjkoZGV2X3ByaXYpKQotCQltYXhfZndfc2l6ZSA9IEJY VF9DU1JfTUFYX0ZXX1NJWkU7Ci0JZWxzZQotCQlNSVNTSU5HX0NBU0UoSU5URUxfUkVWSUQoZGV2 X3ByaXYpKTsKLQlpZiAobmJ5dGVzID4gbWF4X2Z3X3NpemUpIHsKKwlpZiAobmJ5dGVzID4gY3Ny LT5tYXhfZndfc2l6ZSkgewogCQlEUk1fRVJST1IoIkRNQyBGVyB0b28gYmlnICgldSBieXRlcylc biIsIG5ieXRlcyk7CiAJCXJldHVybiBOVUxMOwogCX0KQEAgLTQ1MSwzMiArNDQyLDQ4IEBAIHZv aWQgaW50ZWxfY3NyX3Vjb2RlX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQogCWlmICghSEFTX0NTUihkZXZfcHJpdikpCiAJCXJldHVybjsKIAotCWlmIChpOTE1X21vZHBh cmFtcy5kbWNfZmlybXdhcmVfcGF0aCkgewotCQljc3ItPmZ3X3BhdGggPSBpOTE1X21vZHBhcmFt cy5kbWNfZmlybXdhcmVfcGF0aDsKLQkJLyogQnlwYXNzIHZlcnNpb24gY2hlY2sgZm9yIGZpcm13 YXJlIG92ZXJyaWRlLiAqLwotCQljc3ItPnJlcXVpcmVkX3ZlcnNpb24gPSAwOworCS8qCisJICog T2J0YWluIGEgcnVudGltZSBwbSByZWZlcmVuY2UsIHVudGlsIENTUiBpcyBsb2FkZWQsIHRvIGF2 b2lkIGVudGVyaW5nCisJICogcnVudGltZS1zdXNwZW5kLgorCSAqCisJICogT24gZXJyb3IsIHdl IHJldHVybiB3aXRoIHRoZSBycG0gd2FrZXJlZiBoZWxkIHRvIHByZXZlbnQgcnVudGltZQorCSAq IHN1c3BlbmQgYXMgcnVudGltZSBzdXNwZW5kICpyZXF1aXJlcyogYSB3b3JraW5nIENTUiBmb3Ig d2hhdGV2ZXIKKwkgKiByZWFzb24uCisJICovCisJaW50ZWxfZGlzcGxheV9wb3dlcl9nZXQoZGV2 X3ByaXYsIFBPV0VSX0RPTUFJTl9JTklUKTsKKworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49 IDExKSB7CisJCWNzci0+bWF4X2Z3X3NpemUgPSBJQ0xfQ1NSX01BWF9GV19TSVpFOwogCX0gZWxz ZSBpZiAoSVNfQ0FOTk9OTEFLRShkZXZfcHJpdikpIHsKIAkJY3NyLT5md19wYXRoID0gSTkxNV9D U1JfQ05MOwogCQljc3ItPnJlcXVpcmVkX3ZlcnNpb24gPSBDTkxfQ1NSX1ZFUlNJT05fUkVRVUlS RUQ7CisJCWNzci0+bWF4X2Z3X3NpemUgPSBHTEtfQ1NSX01BWF9GV19TSVpFOwogCX0gZWxzZSBp ZiAoSVNfR0VNSU5JTEFLRShkZXZfcHJpdikpIHsKIAkJY3NyLT5md19wYXRoID0gSTkxNV9DU1Jf R0xLOwogCQljc3ItPnJlcXVpcmVkX3ZlcnNpb24gPSBHTEtfQ1NSX1ZFUlNJT05fUkVRVUlSRUQ7 CisJCWNzci0+bWF4X2Z3X3NpemUgPSBHTEtfQ1NSX01BWF9GV19TSVpFOwogCX0gZWxzZSBpZiAo SVNfS0FCWUxBS0UoZGV2X3ByaXYpIHx8IElTX0NPRkZFRUxBS0UoZGV2X3ByaXYpKSB7CiAJCWNz ci0+ZndfcGF0aCA9IEk5MTVfQ1NSX0tCTDsKIAkJY3NyLT5yZXF1aXJlZF92ZXJzaW9uID0gS0JM X0NTUl9WRVJTSU9OX1JFUVVJUkVEOworCQljc3ItPm1heF9md19zaXplID0gQlhUX0NTUl9NQVhf RldfU0laRTsKIAl9IGVsc2UgaWYgKElTX1NLWUxBS0UoZGV2X3ByaXYpKSB7CiAJCWNzci0+Zndf cGF0aCA9IEk5MTVfQ1NSX1NLTDsKIAkJY3NyLT5yZXF1aXJlZF92ZXJzaW9uID0gU0tMX0NTUl9W RVJTSU9OX1JFUVVJUkVEOworCQljc3ItPm1heF9md19zaXplID0gQlhUX0NTUl9NQVhfRldfU0la RTsKIAl9IGVsc2UgaWYgKElTX0JST1hUT04oZGV2X3ByaXYpKSB7CiAJCWNzci0+ZndfcGF0aCA9 IEk5MTVfQ1NSX0JYVDsKIAkJY3NyLT5yZXF1aXJlZF92ZXJzaW9uID0gQlhUX0NTUl9WRVJTSU9O X1JFUVVJUkVEOworCQljc3ItPm1heF9md19zaXplID0gQlhUX0NTUl9NQVhfRldfU0laRTsKKwl9 IGVsc2UgeworCQlNSVNTSU5HX0NBU0UoSU5URUxfUkVWSUQoZGV2X3ByaXYpKTsKKwkJcmV0dXJu OwogCX0KIAotCS8qCi0JICogT2J0YWluIGEgcnVudGltZSBwbSByZWZlcmVuY2UsIHVudGlsIENT UiBpcyBsb2FkZWQsCi0JICogdG8gYXZvaWQgZW50ZXJpbmcgcnVudGltZS1zdXNwZW5kLgotCSAq LwotCWludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0KGRldl9wcml2LCBQT1dFUl9ET01BSU5fSU5JVCk7 CisJaWYgKGk5MTVfbW9kcGFyYW1zLmRtY19maXJtd2FyZV9wYXRoKSB7CisJCWNzci0+ZndfcGF0 aCA9IGk5MTVfbW9kcGFyYW1zLmRtY19maXJtd2FyZV9wYXRoOworCQkvKiBCeXBhc3MgdmVyc2lv biBjaGVjayBmb3IgZmlybXdhcmUgb3ZlcnJpZGUuICovCisJCWNzci0+cmVxdWlyZWRfdmVyc2lv biA9IDA7CisJfQogCiAJaWYgKGNzci0+ZndfcGF0aCA9PSBOVUxMKSB7CiAJCURSTV9ERUJVR19L TVMoIk5vIGtub3duIENTUiBmaXJtd2FyZSBmb3IgcGxhdGZvcm0sIGRpc2FibGluZyBydW50aW1l IFBNXG4iKTsKLS0gCjIuMTEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v aW50ZWwtZ2Z4Cg==