From: Jani Nikula Subject: [PATCH v3 2/3] drm/i915/csr: keep max firmware size together with firmare name and version Date: Wed, 26 Sep 2018 16:34:13 +0300 Message-ID: <20180926133414.22073-2-jani.nikula@intel.com> References: <20180926133414.22073-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id B25E66E457 for ; Wed, 26 Sep 2018 13:35:12 +0000 (UTC) In-Reply-To: <20180926133414.22073-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 ZXBlbmRlbnQgb2YgdGhlIG92ZXJyaWRlLgoKdjI6IEFkZCBjb21tZW50IG9uIHdoeSB3ZSBsZWFr IHRoZSB3YWtlcmVmIG9uIGVycm9ycyAoQ2hyaXMpCgp2MzogUmViYXNlCgpSZXZpZXdlZC1ieTog Q2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ICMgdjIKU2lnbmVkLW9mZi1i eTogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oICB8ICAzICsrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf Y3NyLmMgfCA0NiArKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiAyIGZp bGVzIGNoYW5nZWQsIDI4IGluc2VydGlvbnMoKyksIDIxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCmluZGV4IDM3ZjVmY2YxNjQ0ZC4uOWUxODVmMGE4MjJhIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmgKQEAgLTQ2Niw4ICs0NjYsOSBAQCBzdHJ1Y3QgaW50ZWxfY3NyIHsKIAlz dHJ1Y3Qgd29ya19zdHJ1Y3Qgd29yazsKIAljb25zdCBjaGFyICpmd19wYXRoOwogCXVpbnQzMl90 IHJlcXVpcmVkX3ZlcnNpb247CisJdWludDMyX3QgbWF4X2Z3X3NpemU7IC8qIGJ5dGVzICovCiAJ dWludDMyX3QgKmRtY19wYXlsb2FkOwotCXVpbnQzMl90IGRtY19md19zaXplOworCXVpbnQzMl90 IGRtY19md19zaXplOyAvKiBkd29yZHMgKi8KIAl1aW50MzJfdCB2ZXJzaW9uOwogCXVpbnQzMl90 IG1taW9fY291bnQ7CiAJaTkxNV9yZWdfdCBtbWlvYWRkcls4XTsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Nzci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf Y3NyLmMKaW5kZXggZWUyNzdlYzMzOTk2Li5iM2EwODRjNDhhOTQgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Nzci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Nzci5jCkBAIC0yODQsNyArMjg0LDYgQEAgc3RhdGljIHVpbnQzMl90ICpwYXJzZV9jc3Jf Zncoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCXN0cnVjdCBpbnRlbF9jc3Ig KmNzciA9ICZkZXZfcHJpdi0+Y3NyOwogCWNvbnN0IHN0cnVjdCBzdGVwcGluZ19pbmZvICpzaSA9 IGludGVsX2dldF9zdGVwcGluZ19pbmZvKGRldl9wcml2KTsKIAl1aW50MzJfdCBkbWNfb2Zmc2V0 ID0gQ1NSX0RFRkFVTFRfRldfT0ZGU0VULCByZWFkY291bnQgPSAwLCBuYnl0ZXM7Ci0JdWludDMy X3QgbWF4X2Z3X3NpemUgPSAwOwogCXVpbnQzMl90IGk7CiAJdWludDMyX3QgKmRtY19wYXlsb2Fk OwogCkBAIC0zODEsMTUgKzM4MCw3IEBAIHN0YXRpYyB1aW50MzJfdCAqcGFyc2VfY3NyX2Z3KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAogCS8qIGZ3X3NpemUgaXMgaW4gZHdv cmRzLCBzbyBtdWx0aXBsaWVkIGJ5IDQgdG8gY29udmVydCBpbnRvIGJ5dGVzLiAqLwogCW5ieXRl cyA9IGRtY19oZWFkZXItPmZ3X3NpemUgKiA0OwotCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49 IDExKQotCQltYXhfZndfc2l6ZSA9IElDTF9DU1JfTUFYX0ZXX1NJWkU7Ci0JZWxzZSBpZiAoSVNf Q0FOTk9OTEFLRShkZXZfcHJpdikgfHwgSVNfR0VNSU5JTEFLRShkZXZfcHJpdikpCi0JCW1heF9m d19zaXplID0gR0xLX0NTUl9NQVhfRldfU0laRTsKLQllbHNlIGlmIChJU19HRU45KGRldl9wcml2 KSkKLQkJbWF4X2Z3X3NpemUgPSBCWFRfQ1NSX01BWF9GV19TSVpFOwotCWVsc2UKLQkJTUlTU0lO R19DQVNFKElOVEVMX1JFVklEKGRldl9wcml2KSk7Ci0JaWYgKG5ieXRlcyA+IG1heF9md19zaXpl KSB7CisJaWYgKG5ieXRlcyA+IGNzci0+bWF4X2Z3X3NpemUpIHsKIAkJRFJNX0VSUk9SKCJETUMg RlcgdG9vIGJpZyAoJXUgYnl0ZXMpXG4iLCBuYnl0ZXMpOwogCQlyZXR1cm4gTlVMTDsKIAl9CkBA IC00NTQsMzUgKzQ0NSw1MCBAQCB2b2lkIGludGVsX2Nzcl91Y29kZV9pbml0KHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlpZiAoIUhBU19DU1IoZGV2X3ByaXYpKQogCQlyZXR1 cm47CiAKLQlpZiAoaTkxNV9tb2RwYXJhbXMuZG1jX2Zpcm13YXJlX3BhdGgpIHsKLQkJY3NyLT5m d19wYXRoID0gaTkxNV9tb2RwYXJhbXMuZG1jX2Zpcm13YXJlX3BhdGg7Ci0JCS8qIEJ5cGFzcyB2 ZXJzaW9uIGNoZWNrIGZvciBmaXJtd2FyZSBvdmVycmlkZS4gKi8KLQkJY3NyLT5yZXF1aXJlZF92 ZXJzaW9uID0gMDsKLQl9IGVsc2UgaWYgKElTX0lDRUxBS0UoZGV2X3ByaXYpKSB7CisJLyoKKwkg KiBPYnRhaW4gYSBydW50aW1lIHBtIHJlZmVyZW5jZSwgdW50aWwgQ1NSIGlzIGxvYWRlZCwgdG8g YXZvaWQgZW50ZXJpbmcKKwkgKiBydW50aW1lLXN1c3BlbmQuCisJICoKKwkgKiBPbiBlcnJvciwg d2UgcmV0dXJuIHdpdGggdGhlIHJwbSB3YWtlcmVmIGhlbGQgdG8gcHJldmVudCBydW50aW1lCisJ ICogc3VzcGVuZCBhcyBydW50aW1lIHN1c3BlbmQgKnJlcXVpcmVzKiBhIHdvcmtpbmcgQ1NSIGZv ciB3aGF0ZXZlcgorCSAqIHJlYXNvbi4KKwkgKi8KKwlpbnRlbF9kaXNwbGF5X3Bvd2VyX2dldChk ZXZfcHJpdiwgUE9XRVJfRE9NQUlOX0lOSVQpOworCisJaWYgKElTX0lDRUxBS0UoZGV2X3ByaXYp KSB7CiAJCWNzci0+ZndfcGF0aCA9IEk5MTVfQ1NSX0lDTDsKIAkJY3NyLT5yZXF1aXJlZF92ZXJz aW9uID0gSUNMX0NTUl9WRVJTSU9OX1JFUVVJUkVEOworCQljc3ItPm1heF9md19zaXplID0gSUNM X0NTUl9NQVhfRldfU0laRTsKIAl9IGVsc2UgaWYgKElTX0NBTk5PTkxBS0UoZGV2X3ByaXYpKSB7 CiAJCWNzci0+ZndfcGF0aCA9IEk5MTVfQ1NSX0NOTDsKIAkJY3NyLT5yZXF1aXJlZF92ZXJzaW9u ID0gQ05MX0NTUl9WRVJTSU9OX1JFUVVJUkVEOworCQljc3ItPm1heF9md19zaXplID0gR0xLX0NT Ul9NQVhfRldfU0laRTsKIAl9IGVsc2UgaWYgKElTX0dFTUlOSUxBS0UoZGV2X3ByaXYpKSB7CiAJ CWNzci0+ZndfcGF0aCA9IEk5MTVfQ1NSX0dMSzsKIAkJY3NyLT5yZXF1aXJlZF92ZXJzaW9uID0g R0xLX0NTUl9WRVJTSU9OX1JFUVVJUkVEOworCQljc3ItPm1heF9md19zaXplID0gR0xLX0NTUl9N QVhfRldfU0laRTsKIAl9IGVsc2UgaWYgKElTX0tBQllMQUtFKGRldl9wcml2KSB8fCBJU19DT0ZG RUVMQUtFKGRldl9wcml2KSkgewogCQljc3ItPmZ3X3BhdGggPSBJOTE1X0NTUl9LQkw7CiAJCWNz ci0+cmVxdWlyZWRfdmVyc2lvbiA9IEtCTF9DU1JfVkVSU0lPTl9SRVFVSVJFRDsKKwkJY3NyLT5t YXhfZndfc2l6ZSA9IEJYVF9DU1JfTUFYX0ZXX1NJWkU7CiAJfSBlbHNlIGlmIChJU19TS1lMQUtF KGRldl9wcml2KSkgewogCQljc3ItPmZ3X3BhdGggPSBJOTE1X0NTUl9TS0w7CiAJCWNzci0+cmVx dWlyZWRfdmVyc2lvbiA9IFNLTF9DU1JfVkVSU0lPTl9SRVFVSVJFRDsKKwkJY3NyLT5tYXhfZndf c2l6ZSA9IEJYVF9DU1JfTUFYX0ZXX1NJWkU7CiAJfSBlbHNlIGlmIChJU19CUk9YVE9OKGRldl9w cml2KSkgewogCQljc3ItPmZ3X3BhdGggPSBJOTE1X0NTUl9CWFQ7CiAJCWNzci0+cmVxdWlyZWRf dmVyc2lvbiA9IEJYVF9DU1JfVkVSU0lPTl9SRVFVSVJFRDsKKwkJY3NyLT5tYXhfZndfc2l6ZSA9 IEJYVF9DU1JfTUFYX0ZXX1NJWkU7CisJfSBlbHNlIHsKKwkJTUlTU0lOR19DQVNFKElOVEVMX1JF VklEKGRldl9wcml2KSk7CisJCXJldHVybjsKIAl9CiAKLQkvKgotCSAqIE9idGFpbiBhIHJ1bnRp bWUgcG0gcmVmZXJlbmNlLCB1bnRpbCBDU1IgaXMgbG9hZGVkLAotCSAqIHRvIGF2b2lkIGVudGVy aW5nIHJ1bnRpbWUtc3VzcGVuZC4KLQkgKi8KLQlpbnRlbF9kaXNwbGF5X3Bvd2VyX2dldChkZXZf cHJpdiwgUE9XRVJfRE9NQUlOX0lOSVQpOworCWlmIChpOTE1X21vZHBhcmFtcy5kbWNfZmlybXdh cmVfcGF0aCkgeworCQljc3ItPmZ3X3BhdGggPSBpOTE1X21vZHBhcmFtcy5kbWNfZmlybXdhcmVf cGF0aDsKKwkJLyogQnlwYXNzIHZlcnNpb24gY2hlY2sgZm9yIGZpcm13YXJlIG92ZXJyaWRlLiAq LworCQljc3ItPnJlcXVpcmVkX3ZlcnNpb24gPSAwOworCX0KIAogCWlmIChjc3ItPmZ3X3BhdGgg PT0gTlVMTCkgewogCQlEUk1fREVCVUdfS01TKCJObyBrbm93biBDU1IgZmlybXdhcmUgZm9yIHBs YXRmb3JtLCBkaXNhYmxpbmcgcnVudGltZSBQTVxuIik7Ci0tIAoyLjExLjAKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=