From mboxrd@z Thu Jan 1 00:00:00 1970 From: mcgrof@kernel.org Subject: [PATCH v4 10/16] firmware: port built-in section to linker table Date: Fri, 19 Aug 2016 14:32:59 -0700 Message-ID: <1471642385-5629-11-git-send-email-mcgrof@kernel.org> References: <1471642385-5629-1-git-send-email-mcgrof@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1471642385-5629-1-git-send-email-mcgrof@kernel.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, jpoimboe@redhat.com, bp@alien8.de, linux@arm.linux.org.uk, mhiramat@kernel.org, masami.hiramatsu.pt@hitachi.com, jbaron@akamai.com, heiko.carstens@de.ibm.com, ananth@linux.vnet.ibm.com, anil.s.keshavamurthy@intel.com, davem@davemloft.net, realmz6@gmail.com Cc: gnomes@lxorguk.ukuu.org.uk, linux-ia64@vger.kernel.org, jkosina@suse.cz, benh@kernel.crashing.org, ming.lei@canonical.com, linux@rasmusvillemoes.dk, platform-driver-x86@vger.kernel.org, James.Bottomley@HansenPartnership.com, paul.gortmaker@windriver.com, paulus@samba.org, sparclinux@vger.kernel.org, Michael Matz , Barry Song , mchehab@osg.samsung.com, linux-arch@vger.kernel.org, markus.heiser@darmarit.de, xen-devel@lists.xensource.com, msalter@redhat.com, linux-sh@vger.kernel.org, mpe@ellerman.id.au, x86@kernel.org, fontana@sharpeleven.org, linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com, dvhart@infradead.org, dwmw2@infradead.org, Guenter Roeck , linux-xtensa@linux-xtensa.org, pali.rohar@gmail.com, Mike Frysinger , keescook@chromium.org, arnd@arndb.de, jani.nikula@intel.com, will.dea List-Id: linux-arch.vger.kernel.org RnJvbTogIkx1aXMgUi4gUm9kcmlndWV6IiA8bWNncm9mQGtlcm5lbC5vcmc+CgpUaGlzIHBvcnRz IGJ1aWx0LWluIGZpcm13YXJlIHRvIHVzZSBsaW5rZXIgdGFibGVzLAp0aGlzIHJlcGxhY2VzIHRo ZSBjdXN0b20gc2VjdGlvbiBzb2x1dGlvbiB3aXRoIGEKZ2VuZXJpYyBzb2x1dGlvbi4KClRoaXMg YWxzbyBkZW1vcyB0aGUgdXNlIG9mIHRoZSAucm9kYXRhIChTRUNUSU9OX1JPKQpsaW5rZXIgdGFi bGVzLgoKVGVzdGVkIHdpdGggMCBidWlsdC1pbiBmaXJtd2FyZSwgMSBhbmQgMiBidWlsdC1pbgpm aXJtd2FyZXMgc3VjY2Vzc2Z1bGx5LgoKdjQ6CgpvIHdvcmsgYXJvdW5kIGM2eCB0b29sY2hhaW4g YnVnIGJ5IHVzaW5nIFNFQ1RJT05fVEJMX1JPCgpvIGZpeCBjb21waWxhdGlvbiBvbiBibGFja2Zp bgoKdjM6Cm8gZXhwbGljaXRseSBpbmNsdWRlIHRhYmxlcy5oIGFzIHdlIG5vIGxvbmdlciBpbmNs dWRlCiAgdGFibGVzLmggZnJvbSBzZWN0aW9ucy5oCgpvIHVzZSBuZXcgc2VjdGlvbl90YmxfYXNt dHlwZSgpIGhlbHBlciBvbiBmaXJtd2FyZS9NYWtlZmlsZQogIHRvIGVuYWJsZSBoYXZpbmcgdG8g dW5mb2xkIHRoaW5ncyBvbiBvdXIgb3duLgoKdjI6IGludHJvZHVjZWQgdGhpcyBmaWxlIGluIHRo aXMgdmVyc2lvbiBvZiB0aGUgc2VyaWVzCgpDYzogQmFycnkgU29uZyA8YmFycnkuc29uZ0BhbmFs b2cuY29tPgpDYzogTWlrZSBGcnlzaW5nZXIgPHZhcGllckBnZW50b28ub3JnPgpDYzogU3RldmVu IE1pYW8gPHJlYWxtejZAZ21haWwuY29tPgpDYzogTWljaGFlbCBNYXR6IDxtYXR6QHN1c2UuZGU+ CkNjOiBHdWVudGVyIFJvZWNrIDxsaW51eEByb2Vjay11cy5uZXQ+CkNjOiBGZW5nZ3VhbmcgV3Ug PGZlbmdndWFuZy53dUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEx1aXMgUi4gUm9kcmlndWV6 IDxtY2dyb2ZAa2VybmVsLm9yZz4KLS0tCiBhcmNoL3g4Ni9rZXJuZWwvY3B1L21pY3JvY29kZS9j b3JlLmMgfCAgOCArKysrLS0tLQogZHJpdmVycy9iYXNlL2Zpcm13YXJlX2NsYXNzLmMgICAgICAg IHwgMTIgKysrKysrLS0tLS0tCiBmaXJtd2FyZS9NYWtlZmlsZSAgICAgICAgICAgICAgICAgICAg fCAgMyArKy0KIGluY2x1ZGUvYXNtLWdlbmVyaWMvdm1saW51eC5sZHMuaCAgICB8ICA3IC0tLS0t LS0KIDQgZmlsZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgMTggZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvYXJjaC94ODYva2VybmVsL2NwdS9taWNyb2NvZGUvY29yZS5jIGIvYXJjaC94 ODYva2VybmVsL2NwdS9taWNyb2NvZGUvY29yZS5jCmluZGV4IGRmMDRiMmQwMzNmNi4uM2U3YzA4 ZDk5NjAxIDEwMDY0NAotLS0gYS9hcmNoL3g4Ni9rZXJuZWwvY3B1L21pY3JvY29kZS9jb3JlLmMK KysrIGIvYXJjaC94ODYva2VybmVsL2NwdS9taWNyb2NvZGUvY29yZS5jCkBAIC0zMSw2ICszMSw3 IEBACiAjaW5jbHVkZSA8bGludXgvY3B1Lmg+CiAjaW5jbHVkZSA8bGludXgvZnMuaD4KICNpbmNs dWRlIDxsaW51eC9tbS5oPgorI2luY2x1ZGUgPGxpbnV4L3RhYmxlcy5oPgogCiAjaW5jbHVkZSA8 YXNtL21pY3JvY29kZV9pbnRlbC5oPgogI2luY2x1ZGUgPGFzbS9jcHVfZGV2aWNlX2lkLmg+CkBA IC05MSwxNSArOTIsMTQgQEAgc3RhdGljIGJvb2wgX19pbml0IGNoZWNrX2xvYWRlcl9kaXNhYmxl ZF9ic3Aodm9pZCkKIAlyZXR1cm4gKnJlczsKIH0KIAotZXh0ZXJuIHN0cnVjdCBidWlsdGluX2Z3 IF9fc3RhcnRfYnVpbHRpbl9md1tdOwotZXh0ZXJuIHN0cnVjdCBidWlsdGluX2Z3IF9fZW5kX2J1 aWx0aW5fZndbXTsKK0RFQ0xBUkVfTElOS1RBQkxFX1JPKHN0cnVjdCBidWlsdGluX2Z3LCBidWls dGluX2Z3KTsKIAogYm9vbCBnZXRfYnVpbHRpbl9maXJtd2FyZShzdHJ1Y3QgY3Bpb19kYXRhICpj ZCwgY29uc3QgY2hhciAqbmFtZSkKIHsKICNpZmRlZiBDT05GSUdfRldfTE9BREVSCi0Jc3RydWN0 IGJ1aWx0aW5fZncgKmJfZnc7CisJY29uc3Qgc3RydWN0IGJ1aWx0aW5fZncgKmJfZnc7CiAKLQlm b3IgKGJfZncgPSBfX3N0YXJ0X2J1aWx0aW5fZnc7IGJfZncgIT0gX19lbmRfYnVpbHRpbl9mdzsg Yl9mdysrKSB7CisJTElOS1RBQkxFX0ZPUl9FQUNIKGJfZncsIGJ1aWx0aW5fZncpIHsKIAkJaWYg KCFzdHJjbXAobmFtZSwgYl9mdy0+bmFtZSkpIHsKIAkJCWNkLT5zaXplID0gYl9mdy0+c2l6ZTsK IAkJCWNkLT5kYXRhID0gYl9mdy0+ZGF0YTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvYmFzZS9maXJt d2FyZV9jbGFzcy5jIGIvZHJpdmVycy9iYXNlL2Zpcm13YXJlX2NsYXNzLmMKaW5kZXggMjJkMTc2 MGE0Mjc4Li44ZmJmMDNjM2U0YzIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvYmFzZS9maXJtd2FyZV9j bGFzcy5jCisrKyBiL2RyaXZlcnMvYmFzZS9maXJtd2FyZV9jbGFzcy5jCkBAIC0zMCw2ICszMCw3 IEBACiAjaW5jbHVkZSA8bGludXgvc3lzY29yZV9vcHMuaD4KICNpbmNsdWRlIDxsaW51eC9yZWJv b3QuaD4KICNpbmNsdWRlIDxsaW51eC9zZWN1cml0eS5oPgorI2luY2x1ZGUgPGxpbnV4L3RhYmxl cy5oPgogCiAjaW5jbHVkZSA8Z2VuZXJhdGVkL3V0c3JlbGVhc2UuaD4KIApAQCAtNDMsMTUgKzQ0 LDE0IEBAIE1PRFVMRV9MSUNFTlNFKCJHUEwiKTsKIAogI2lmZGVmIENPTkZJR19GV19MT0FERVIK IAotZXh0ZXJuIHN0cnVjdCBidWlsdGluX2Z3IF9fc3RhcnRfYnVpbHRpbl9md1tdOwotZXh0ZXJu IHN0cnVjdCBidWlsdGluX2Z3IF9fZW5kX2J1aWx0aW5fZndbXTsKK0RFRklORV9MSU5LVEFCTEVf Uk8oc3RydWN0IGJ1aWx0aW5fZncsIGJ1aWx0aW5fZncpOwogCiBzdGF0aWMgYm9vbCBmd19nZXRf YnVpbHRpbl9maXJtd2FyZShzdHJ1Y3QgZmlybXdhcmUgKmZ3LCBjb25zdCBjaGFyICpuYW1lLAog CQkJCSAgICB2b2lkICpidWYsIHNpemVfdCBzaXplKQogewotCXN0cnVjdCBidWlsdGluX2Z3ICpi X2Z3OworCWNvbnN0IHN0cnVjdCBidWlsdGluX2Z3ICpiX2Z3OwogCi0JZm9yIChiX2Z3ID0gX19z dGFydF9idWlsdGluX2Z3OyBiX2Z3ICE9IF9fZW5kX2J1aWx0aW5fZnc7IGJfZncrKykgeworCUxJ TktUQUJMRV9GT1JfRUFDSChiX2Z3LCBidWlsdGluX2Z3KSB7CiAJCWlmIChzdHJjbXAobmFtZSwg Yl9mdy0+bmFtZSkgPT0gMCkgewogCQkJZnctPnNpemUgPSBiX2Z3LT5zaXplOwogCQkJZnctPmRh dGEgPSBiX2Z3LT5kYXRhOwpAQCAtNjcsOSArNjcsOSBAQCBzdGF0aWMgYm9vbCBmd19nZXRfYnVp bHRpbl9maXJtd2FyZShzdHJ1Y3QgZmlybXdhcmUgKmZ3LCBjb25zdCBjaGFyICpuYW1lLAogCiBz dGF0aWMgYm9vbCBmd19pc19idWlsdGluX2Zpcm13YXJlKGNvbnN0IHN0cnVjdCBmaXJtd2FyZSAq ZncpCiB7Ci0Jc3RydWN0IGJ1aWx0aW5fZncgKmJfZnc7CisJY29uc3Qgc3RydWN0IGJ1aWx0aW5f ZncgKmJfZnc7CiAKLQlmb3IgKGJfZncgPSBfX3N0YXJ0X2J1aWx0aW5fZnc7IGJfZncgIT0gX19l bmRfYnVpbHRpbl9mdzsgYl9mdysrKQorCUxJTktUQUJMRV9GT1JfRUFDSChiX2Z3LCBidWlsdGlu X2Z3KQogCQlpZiAoZnctPmRhdGEgPT0gYl9mdy0+ZGF0YSkKIAkJCXJldHVybiB0cnVlOwogCmRp ZmYgLS1naXQgYS9maXJtd2FyZS9NYWtlZmlsZSBiL2Zpcm13YXJlL01ha2VmaWxlCmluZGV4IGZh M2U4MWMyYTk3Yi4uOWU3MDFiZjRjZWQyIDEwMDY0NAotLS0gYS9maXJtd2FyZS9NYWtlZmlsZQor KysgYi9maXJtd2FyZS9NYWtlZmlsZQpAQCAtMTU1LDYgKzE1NSw3IEBAIHF1aWV0X2NtZF9md2Jp biA9IE1LX0ZXICAgJEAKIAkJICBBU01fQUxJR049JChpZiAkKENPTkZJR182NEJJVCksMywyKTsJ CQkgICAgIFwKIAkJICBQUk9HQklUUz0kKGlmICQoQ09ORklHX0FSTSksJSxAKXByb2diaXRzOwkJ ICAgICBcCiAJCSAgZWNobyAiLyogR2VuZXJhdGVkIGJ5IGZpcm13YXJlL01ha2VmaWxlICovIgkJ PiAkQDtcCisJCSAgZWNobyAiXCNpbmNsdWRlIDxhc20vdGFibGVzLmg+IgkJCT4+JEA7XAogCQkg IGVjaG8gIiAgICAuc2VjdGlvbiAucm9kYXRhIgkJCQk+PiRAO1wKIAkJICBlY2hvICIgICAgLnAy YWxpZ24gJCR7QVNNX0FMSUdOfSIJCQk+PiRAO1wKIAkJICBlY2hvICJfZndfJCR7RldTVFJ9X2Jp bjoiCQkJCT4+JEA7XApAQCAtMTY0LDcgKzE2NSw3IEBAIHF1aWV0X2NtZF9md2JpbiA9IE1LX0ZX ICAgJEAKIAkJICBlY2hvICIgICAgLnAyYWxpZ24gJCR7QVNNX0FMSUdOfSIJCQk+PiRAO1wKIAkJ ICBlY2hvICJfZndfJCR7RldTVFJ9X25hbWU6IgkJCQk+PiRAO1wKIAkJICBlY2hvICIgICAgLnN0 cmluZyBcIiQkRldOQU1FXCIiCQkJPj4kQDtcCi0JCSAgZWNobyAiICAgIC5zZWN0aW9uIC5idWls dGluX2Z3LFwiYVwiLCQke1BST0dCSVRTfSIJPj4kQDtcCisJCSAgZWNobyAiICAgIHNldF9zZWN0 aW9uX3RibF90eXBlKFNFQ1RJT05fVEJMX1JPLCBidWlsdGluX2Z3LCBTRUNUSU9OX09SREVSX0FO WSwgYSwkJHtQUk9HQklUU30pIiA+PiRAO1wKIAkJICBlY2hvICIgICAgLnAyYWxpZ24gJCR7QVNN X0FMSUdOfSIJCQk+PiRAO1wKIAkJICBlY2hvICIgICAgJCR7QVNNX1dPUkR9IF9md18kJHtGV1NU Un1fbmFtZSIJCT4+JEA7XAogCQkgIGVjaG8gIiAgICAkJHtBU01fV09SRH0gX2Z3XyQke0ZXU1RS fV9iaW4iCQk+PiRAO1wKZGlmZiAtLWdpdCBhL2luY2x1ZGUvYXNtLWdlbmVyaWMvdm1saW51eC5s ZHMuaCBiL2luY2x1ZGUvYXNtLWdlbmVyaWMvdm1saW51eC5sZHMuaAppbmRleCA0YjZhM2Q4MjA4 ODMuLjI0MTM0NDRjMDQ4ZCAxMDA2NDQKLS0tIGEvaW5jbHVkZS9hc20tZ2VuZXJpYy92bWxpbnV4 Lmxkcy5oCisrKyBiL2luY2x1ZGUvYXNtLWdlbmVyaWMvdm1saW51eC5sZHMuaApAQCAtMzE2LDEz ICszMTYsNiBAQAogCQlWTUxJTlVYX1NZTUJPTChfX2VuZF9wY2lfZml4dXBzX3N1c3BlbmRfbGF0 ZSkgPSAuOwlcCiAJfQkJCQkJCQkJXAogCQkJCQkJCQkJXAotCS8qIEJ1aWx0LWluIGZpcm13YXJl IGJsb2JzICovCQkJCQlcCi0JLmJ1aWx0aW5fZncgICAgICAgIDogQVQoQUREUiguYnVpbHRpbl9m dykgLSBMT0FEX09GRlNFVCkgewlcCi0JCVZNTElOVVhfU1lNQk9MKF9fc3RhcnRfYnVpbHRpbl9m dykgPSAuOwkJCVwKLQkJKiguYnVpbHRpbl9mdykJCQkJCQlcCi0JCVZNTElOVVhfU1lNQk9MKF9f ZW5kX2J1aWx0aW5fZncpID0gLjsJCQlcCi0JfQkJCQkJCQkJXAotCQkJCQkJCQkJXAogCVRSQUNF REFUQQkJCQkJCQlcCiAJCQkJCQkJCQlcCiAJLyogS2VybmVsIHN5bWJvbCB0YWJsZTogTm9ybWFs IHN5bWJvbHMgKi8JCQlcCi0tIAoyLjkuMgoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3Rz Lnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.kernel.org ([198.145.29.136]:38578 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755045AbcHSVey (ORCPT ); Fri, 19 Aug 2016 17:34:54 -0400 From: mcgrof@kernel.org Subject: [PATCH v4 10/16] firmware: port built-in section to linker table Date: Fri, 19 Aug 2016 14:32:59 -0700 Message-ID: <1471642385-5629-11-git-send-email-mcgrof@kernel.org> In-Reply-To: <1471642385-5629-1-git-send-email-mcgrof@kernel.org> References: <1471642385-5629-1-git-send-email-mcgrof@kernel.org> Sender: linux-arch-owner@vger.kernel.org List-ID: To: hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, jpoimboe@redhat.com, bp@alien8.de, linux@arm.linux.org.uk, mhiramat@kernel.org, masami.hiramatsu.pt@hitachi.com, jbaron@akamai.com, heiko.carstens@de.ibm.com, ananth@linux.vnet.ibm.com, anil.s.keshavamurthy@intel.com, davem@davemloft.net, realmz6@gmail.com Cc: x86@kernel.org, luto@amacapital.net, keescook@chromium.org, torvalds@linux-foundation.org, gregkh@linuxfoundation.org, rusty@rustcorp.com.au, gnomes@lxorguk.ukuu.org.uk, alan@linux.intel.com, dwmw2@infradead.org, arnd@arndb.de, ming.lei@canonical.com, linux-arch@vger.kernel.org, benh@kernel.crashing.org, ananth@in.ibm.com, pebolle@tiscali.nl, fontana@sharpeleven.org, david.vrabel@citrix.com, konrad.wilk@oracle.com, mcb30@ipxe.org, jgross@suse.com, andrew.cooper3@citrix.com, andriy.shevchenko@linux.intel.com, paul.gortmaker@windriver.com, xen-devel@lists.xensource.com, ak@linux.intel.com, pali.rohar@gmail.com, dvhart@infradead.org, platform-driver-x86@vger.kernel.org, mmarek@suse.com, linux@rasmusvillemoes.dk, jkosina@suse.cz, korea.drzix@gmail.com, linux-kbuild@vger.kernel.org, tony.luck@intel.com, akpm@linux-foundation.org, linux-ia64@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, catalin.marinas@arm.com, will.deacon@arm.com, rostedt@goodmis.org, jani.nikula@intel.com, mchehab@osg.samsung.com, markus.heiser@darmarit.de, acme@redhat.com, jolsa@kernel.org, msalter@redhat.com, chris@zankel.net, jcmvbkbc@gmail.com, linux-xtensa@linux-xtensa.org, paulus@samba.org, mpe@ellerman.id.au, James.Bottomley@HansenPartnership.com, "Luis R. Rodriguez" , Barry Song , Mike Frysinger , Michael Matz , Guenter Roeck , Fengguang Wu Message-ID: <20160819213259.chMZnh7hOOpPHvex3a01qI2dOxKRgygaN6rUuQMVubM@z> From: "Luis R. Rodriguez" This ports built-in firmware to use linker tables, this replaces the custom section solution with a generic solution. This also demos the use of the .rodata (SECTION_RO) linker tables. Tested with 0 built-in firmware, 1 and 2 built-in firmwares successfully. v4: o work around c6x toolchain bug by using SECTION_TBL_RO o fix compilation on blackfin v3: o explicitly include tables.h as we no longer include tables.h from sections.h o use new section_tbl_asmtype() helper on firmware/Makefile to enable having to unfold things on our own. v2: introduced this file in this version of the series Cc: Barry Song Cc: Mike Frysinger Cc: Steven Miao Cc: Michael Matz Cc: Guenter Roeck Cc: Fengguang Wu Signed-off-by: Luis R. Rodriguez --- arch/x86/kernel/cpu/microcode/core.c | 8 ++++---- drivers/base/firmware_class.c | 12 ++++++------ firmware/Makefile | 3 ++- include/asm-generic/vmlinux.lds.h | 7 ------- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c index df04b2d033f6..3e7c08d99601 100644 --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -91,15 +92,14 @@ static bool __init check_loader_disabled_bsp(void) return *res; } -extern struct builtin_fw __start_builtin_fw[]; -extern struct builtin_fw __end_builtin_fw[]; +DECLARE_LINKTABLE_RO(struct builtin_fw, builtin_fw); bool get_builtin_firmware(struct cpio_data *cd, const char *name) { #ifdef CONFIG_FW_LOADER - struct builtin_fw *b_fw; + const struct builtin_fw *b_fw; - for (b_fw = __start_builtin_fw; b_fw != __end_builtin_fw; b_fw++) { + LINKTABLE_FOR_EACH(b_fw, builtin_fw) { if (!strcmp(name, b_fw->name)) { cd->size = b_fw->size; cd->data = b_fw->data; diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 22d1760a4278..8fbf03c3e4c2 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -30,6 +30,7 @@ #include #include #include +#include #include @@ -43,15 +44,14 @@ MODULE_LICENSE("GPL"); #ifdef CONFIG_FW_LOADER -extern struct builtin_fw __start_builtin_fw[]; -extern struct builtin_fw __end_builtin_fw[]; +DEFINE_LINKTABLE_RO(struct builtin_fw, builtin_fw); static bool fw_get_builtin_firmware(struct firmware *fw, const char *name, void *buf, size_t size) { - struct builtin_fw *b_fw; + const struct builtin_fw *b_fw; - for (b_fw = __start_builtin_fw; b_fw != __end_builtin_fw; b_fw++) { + LINKTABLE_FOR_EACH(b_fw, builtin_fw) { if (strcmp(name, b_fw->name) == 0) { fw->size = b_fw->size; fw->data = b_fw->data; @@ -67,9 +67,9 @@ static bool fw_get_builtin_firmware(struct firmware *fw, const char *name, static bool fw_is_builtin_firmware(const struct firmware *fw) { - struct builtin_fw *b_fw; + const struct builtin_fw *b_fw; - for (b_fw = __start_builtin_fw; b_fw != __end_builtin_fw; b_fw++) + LINKTABLE_FOR_EACH(b_fw, builtin_fw) if (fw->data == b_fw->data) return true; diff --git a/firmware/Makefile b/firmware/Makefile index fa3e81c2a97b..9e701bf4ced2 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -155,6 +155,7 @@ quiet_cmd_fwbin = MK_FW $@ ASM_ALIGN=$(if $(CONFIG_64BIT),3,2); \ PROGBITS=$(if $(CONFIG_ARM),%,@)progbits; \ echo "/* Generated by firmware/Makefile */" > $@;\ + echo "\#include " >>$@;\ echo " .section .rodata" >>$@;\ echo " .p2align $${ASM_ALIGN}" >>$@;\ echo "_fw_$${FWSTR}_bin:" >>$@;\ @@ -164,7 +165,7 @@ quiet_cmd_fwbin = MK_FW $@ echo " .p2align $${ASM_ALIGN}" >>$@;\ echo "_fw_$${FWSTR}_name:" >>$@;\ echo " .string \"$$FWNAME\"" >>$@;\ - echo " .section .builtin_fw,\"a\",$${PROGBITS}" >>$@;\ + echo " set_section_tbl_type(SECTION_TBL_RO, builtin_fw, SECTION_ORDER_ANY, a,$${PROGBITS})" >>$@;\ echo " .p2align $${ASM_ALIGN}" >>$@;\ echo " $${ASM_WORD} _fw_$${FWSTR}_name" >>$@;\ echo " $${ASM_WORD} _fw_$${FWSTR}_bin" >>$@;\ diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 4b6a3d820883..2413444c048d 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -316,13 +316,6 @@ VMLINUX_SYMBOL(__end_pci_fixups_suspend_late) = .; \ } \ \ - /* Built-in firmware blobs */ \ - .builtin_fw : AT(ADDR(.builtin_fw) - LOAD_OFFSET) { \ - VMLINUX_SYMBOL(__start_builtin_fw) = .; \ - *(.builtin_fw) \ - VMLINUX_SYMBOL(__end_builtin_fw) = .; \ - } \ - \ TRACEDATA \ \ /* Kernel symbol table: Normal symbols */ \ -- 2.9.2