From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Luis R. Rodriguez" Subject: [PATCH v6 07/14] firmware: port built-in section to linker table Date: Mon, 9 Jan 2017 06:58:25 -0800 Message-ID: <20170109145833.11502-8-mcgrof@kernel.org> References: <20161222023811.21246-1-mcgrof@kernel.org> <20170109145833.11502-1-mcgrof@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170109145833.11502-1-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, acme@redhat.com, tglx@linutronix.de, mingo@redhat.com, jpoimboe@redhat.com, bp@alien8.de, npiggin@gmail.com, 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, dalias@libc.org, linux@arm.linux.org.uk 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, wangnan0@huawei.com, 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, joro@8bytes.org, x86@kernel.org, fontana@sharpeleven.org, dsahern@gmail.com, linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com, dvhart@infradead.org, dwmw2@infradead.org, linux@roeck-us.net, linux-xtensa@linux-xtensa.org, pali.rohar@gmail.com, Mike Frysinger , keescook@chromium.org, arnd@ List-Id: linux-arch.vger.kernel.org VGhpcyBwb3J0cyBidWlsdC1pbiBmaXJtd2FyZSB0byB1c2UgbGlua2VyIHRhYmxlcywKdGhpcyBy ZXBsYWNlcyB0aGUgY3VzdG9tIHNlY3Rpb24gc29sdXRpb24gd2l0aCBhCmdlbmVyaWMgc29sdXRp b24uCgpUaGlzIGFsc28gZGVtb3MgdGhlIHVzZSBvZiB0aGUgLnJvZGF0YSBsaW5rZXIgdGFibGUu CgpUZXN0ZWQgd2l0aCAwIGJ1aWx0LWluIGZpcm13YXJlLCAxIGFuZCAyIGJ1aWx0LWluCmZpcm13 YXJlcyBzdWNjZXNzZnVsbHkuCgp2NjogcmVuYW1lIHRhYmxlIG1hY3JvIGFzIHN1Z2dlc3RlZCBi eSBBbmR5IFNoZXZjaGVua28KCnY1OgoKbyBzaW5jZSB3ZSBkcm9wcGVkIFNFQ1RJT05fT1JERVJf QU5ZLCB1c2UgJ2FueScgb3JkZXIgbGV2ZWwgZXhwbGljaXRseQoKdjQ6CgpvIHdvcmsgYXJvdW5k IGM2eCB0b29sY2hhaW4gYnVnIGJ5IHVzaW5nIFNFQ1RJT05fVEJMX1JPCgpvIGZpeCBjb21waWxh dGlvbiBvbiBibGFja2ZpbgoKdjM6Cm8gZXhwbGljaXRseSBpbmNsdWRlIHRhYmxlcy5oIGFzIHdl IG5vIGxvbmdlciBpbmNsdWRlCiAgdGFibGVzLmggZnJvbSBzZWN0aW9ucy5oCgpvIHVzZSBuZXcg c2VjdGlvbl90YmxfYXNtdHlwZSgpIGhlbHBlciBvbiBmaXJtd2FyZS9NYWtlZmlsZQogIHRvIGVu YWJsZSBoYXZpbmcgdG8gdW5mb2xkIHRoaW5ncyBvbiBvdXIgb3duLgoKdjI6IGludHJvZHVjZWQg dGhpcyBmaWxlIGluIHRoaXMgdmVyc2lvbiBvZiB0aGUgc2VyaWVzCgpDYzogQmFycnkgU29uZyA8 YmFycnkuc29uZ0BhbmFsb2cuY29tPgpDYzogTWlrZSBGcnlzaW5nZXIgPHZhcGllckBnZW50b28u b3JnPgpDYzogU3RldmVuIE1pYW8gPHJlYWxtejZAZ21haWwuY29tPgpDYzogTWljaGFlbCBNYXR6 IDxtYXR6QHN1c2UuZGU+CkNjOiBHdWVudGVyIFJvZWNrIDxsaW51eEByb2Vjay11cy5uZXQ+CkNj OiBGZW5nZ3VhbmcgV3UgPGZlbmdndWFuZy53dUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEx1 aXMgUi4gUm9kcmlndWV6IDxtY2dyb2ZAa2VybmVsLm9yZz4KLS0tCiBhcmNoL3g4Ni9rZXJuZWwv Y3B1L21pY3JvY29kZS9jb3JlLmMgfCAgOCArKysrLS0tLQogZHJpdmVycy9iYXNlL2Zpcm13YXJl X2NsYXNzLmMgICAgICAgIHwgMTIgKysrKysrLS0tLS0tCiBmaXJtd2FyZS9NYWtlZmlsZSAgICAg ICAgICAgICAgICAgICAgfCAgMyArKy0KIGluY2x1ZGUvYXNtLWdlbmVyaWMvdm1saW51eC5sZHMu aCAgICB8ICA3IC0tLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgMTgg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvYXJjaC94ODYva2VybmVsL2NwdS9taWNyb2NvZGUv Y29yZS5jIGIvYXJjaC94ODYva2VybmVsL2NwdS9taWNyb2NvZGUvY29yZS5jCmluZGV4IDJhZjY5 ZDI3ZGE2Mi4uMmM1MDA0MzQzYjQ1IDEwMDY0NAotLS0gYS9hcmNoL3g4Ni9rZXJuZWwvY3B1L21p Y3JvY29kZS9jb3JlLmMKKysrIGIvYXJjaC94ODYva2VybmVsL2NwdS9taWNyb2NvZGUvY29yZS5j CkBAIC0zMSw2ICszMSw3IEBACiAjaW5jbHVkZSA8bGludXgvY3B1Lmg+CiAjaW5jbHVkZSA8bGlu dXgvZnMuaD4KICNpbmNsdWRlIDxsaW51eC9tbS5oPgorI2luY2x1ZGUgPGxpbnV4L3RhYmxlcy5o PgogCiAjaW5jbHVkZSA8YXNtL21pY3JvY29kZV9pbnRlbC5oPgogI2luY2x1ZGUgPGFzbS9jcHVf ZGV2aWNlX2lkLmg+CkBAIC0xMTAsMTUgKzExMSwxNCBAQCBzdGF0aWMgYm9vbCBfX2luaXQgY2hl Y2tfbG9hZGVyX2Rpc2FibGVkX2JzcCh2b2lkKQogCXJldHVybiAqcmVzOwogfQogCi1leHRlcm4g c3RydWN0IGJ1aWx0aW5fZncgX19zdGFydF9idWlsdGluX2Z3W107Ci1leHRlcm4gc3RydWN0IGJ1 aWx0aW5fZncgX19lbmRfYnVpbHRpbl9md1tdOworREVDTEFSRV9MSU5LVEFCTEVfUk8oc3RydWN0 IGJ1aWx0aW5fZncsIGJ1aWx0aW5fZncpOwogCiBib29sIGdldF9idWlsdGluX2Zpcm13YXJlKHN0 cnVjdCBjcGlvX2RhdGEgKmNkLCBjb25zdCBjaGFyICpuYW1lKQogewogI2lmZGVmIENPTkZJR19G V19MT0FERVIKLQlzdHJ1Y3QgYnVpbHRpbl9mdyAqYl9mdzsKKwljb25zdCBzdHJ1Y3QgYnVpbHRp bl9mdyAqYl9mdzsKIAotCWZvciAoYl9mdyA9IF9fc3RhcnRfYnVpbHRpbl9mdzsgYl9mdyAhPSBf X2VuZF9idWlsdGluX2Z3OyBiX2Z3KyspIHsKKwlsaW5rdGFibGVfZm9yX2VhY2goYl9mdywgYnVp bHRpbl9mdykgewogCQlpZiAoIXN0cmNtcChuYW1lLCBiX2Z3LT5uYW1lKSkgewogCQkJY2QtPnNp emUgPSBiX2Z3LT5zaXplOwogCQkJY2QtPmRhdGEgPSBiX2Z3LT5kYXRhOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9iYXNlL2Zpcm13YXJlX2NsYXNzLmMgYi9kcml2ZXJzL2Jhc2UvZmlybXdhcmVfY2xh c3MuYwppbmRleCA0NDk3ZDI2MzIwOWYuLmI5YWMzNDhlOGQzMyAxMDA2NDQKLS0tIGEvZHJpdmVy cy9iYXNlL2Zpcm13YXJlX2NsYXNzLmMKKysrIGIvZHJpdmVycy9iYXNlL2Zpcm13YXJlX2NsYXNz LmMKQEAgLTMxLDYgKzMxLDcgQEAKICNpbmNsdWRlIDxsaW51eC9yZWJvb3QuaD4KICNpbmNsdWRl IDxsaW51eC9zZWN1cml0eS5oPgogI2luY2x1ZGUgPGxpbnV4L3N3YWl0Lmg+CisjaW5jbHVkZSA8 bGludXgvdGFibGVzLmg+CiAKICNpbmNsdWRlIDxnZW5lcmF0ZWQvdXRzcmVsZWFzZS5oPgogCkBA IC00NCwxNSArNDUsMTQgQEAgTU9EVUxFX0xJQ0VOU0UoIkdQTCIpOwogCiAjaWZkZWYgQ09ORklH X0ZXX0xPQURFUgogCi1leHRlcm4gc3RydWN0IGJ1aWx0aW5fZncgX19zdGFydF9idWlsdGluX2Z3 W107Ci1leHRlcm4gc3RydWN0IGJ1aWx0aW5fZncgX19lbmRfYnVpbHRpbl9md1tdOworREVGSU5F X0xJTktUQUJMRV9STyhzdHJ1Y3QgYnVpbHRpbl9mdywgYnVpbHRpbl9mdyk7CiAKIHN0YXRpYyBi b29sIGZ3X2dldF9idWlsdGluX2Zpcm13YXJlKHN0cnVjdCBmaXJtd2FyZSAqZncsIGNvbnN0IGNo YXIgKm5hbWUsCiAJCQkJICAgIHZvaWQgKmJ1Ziwgc2l6ZV90IHNpemUpCiB7Ci0Jc3RydWN0IGJ1 aWx0aW5fZncgKmJfZnc7CisJY29uc3Qgc3RydWN0IGJ1aWx0aW5fZncgKmJfZnc7CiAKLQlmb3Ig KGJfZncgPSBfX3N0YXJ0X2J1aWx0aW5fZnc7IGJfZncgIT0gX19lbmRfYnVpbHRpbl9mdzsgYl9m dysrKSB7CisJbGlua3RhYmxlX2Zvcl9lYWNoKGJfZncsIGJ1aWx0aW5fZncpIHsKIAkJaWYgKHN0 cmNtcChuYW1lLCBiX2Z3LT5uYW1lKSA9PSAwKSB7CiAJCQlmdy0+c2l6ZSA9IGJfZnctPnNpemU7 CiAJCQlmdy0+ZGF0YSA9IGJfZnctPmRhdGE7CkBAIC02OCw5ICs2OCw5IEBAIHN0YXRpYyBib29s IGZ3X2dldF9idWlsdGluX2Zpcm13YXJlKHN0cnVjdCBmaXJtd2FyZSAqZncsIGNvbnN0IGNoYXIg Km5hbWUsCiAKIHN0YXRpYyBib29sIGZ3X2lzX2J1aWx0aW5fZmlybXdhcmUoY29uc3Qgc3RydWN0 IGZpcm13YXJlICpmdykKIHsKLQlzdHJ1Y3QgYnVpbHRpbl9mdyAqYl9mdzsKKwljb25zdCBzdHJ1 Y3QgYnVpbHRpbl9mdyAqYl9mdzsKIAotCWZvciAoYl9mdyA9IF9fc3RhcnRfYnVpbHRpbl9mdzsg Yl9mdyAhPSBfX2VuZF9idWlsdGluX2Z3OyBiX2Z3KyspCisJbGlua3RhYmxlX2Zvcl9lYWNoKGJf ZncsIGJ1aWx0aW5fZncpCiAJCWlmIChmdy0+ZGF0YSA9PSBiX2Z3LT5kYXRhKQogCQkJcmV0dXJu IHRydWU7CiAKZGlmZiAtLWdpdCBhL2Zpcm13YXJlL01ha2VmaWxlIGIvZmlybXdhcmUvTWFrZWZp bGUKaW5kZXggZmEzZTgxYzJhOTdiLi45YzhjYWUxNDRlZGUgMTAwNjQ0Ci0tLSBhL2Zpcm13YXJl L01ha2VmaWxlCisrKyBiL2Zpcm13YXJlL01ha2VmaWxlCkBAIC0xNTUsNiArMTU1LDcgQEAgcXVp ZXRfY21kX2Z3YmluID0gTUtfRlcgICAkQAogCQkgIEFTTV9BTElHTj0kKGlmICQoQ09ORklHXzY0 QklUKSwzLDIpOwkJCSAgICAgXAogCQkgIFBST0dCSVRTPSQoaWYgJChDT05GSUdfQVJNKSwlLEAp cHJvZ2JpdHM7CQkgICAgIFwKIAkJICBlY2hvICIvKiBHZW5lcmF0ZWQgYnkgZmlybXdhcmUvTWFr ZWZpbGUgKi8iCQk+ICRAO1wKKwkJICBlY2hvICJcI2luY2x1ZGUgPGFzbS90YWJsZXMuaD4iCQkJ Pj4kQDtcCiAJCSAgZWNobyAiICAgIC5zZWN0aW9uIC5yb2RhdGEiCQkJCT4+JEA7XAogCQkgIGVj aG8gIiAgICAucDJhbGlnbiAkJHtBU01fQUxJR059IgkJCT4+JEA7XAogCQkgIGVjaG8gIl9md18k JHtGV1NUUn1fYmluOiIJCQkJPj4kQDtcCkBAIC0xNjQsNyArMTY1LDcgQEAgcXVpZXRfY21kX2Z3 YmluID0gTUtfRlcgICAkQAogCQkgIGVjaG8gIiAgICAucDJhbGlnbiAkJHtBU01fQUxJR059IgkJ CT4+JEA7XAogCQkgIGVjaG8gIl9md18kJHtGV1NUUn1fbmFtZToiCQkJCT4+JEA7XAogCQkgIGVj aG8gIiAgICAuc3RyaW5nIFwiJCRGV05BTUVcIiIJCQk+PiRAO1wKLQkJICBlY2hvICIgICAgLnNl Y3Rpb24gLmJ1aWx0aW5fZncsXCJhXCIsJCR7UFJPR0JJVFN9Igk+PiRAO1wKKwkJICBlY2hvICIg ICAgc2V0X3NlY3Rpb25fdGJsX3R5cGUoU0VDVElPTl9UQkxfUk8sIGJ1aWx0aW5fZncsIGFueSwg YSwkJHtQUk9HQklUU30pIiA+PiRAO1wKIAkJICBlY2hvICIgICAgLnAyYWxpZ24gJCR7QVNNX0FM SUdOfSIJCQk+PiRAO1wKIAkJICBlY2hvICIgICAgJCR7QVNNX1dPUkR9IF9md18kJHtGV1NUUn1f bmFtZSIJCT4+JEA7XAogCQkgIGVjaG8gIiAgICAkJHtBU01fV09SRH0gX2Z3XyQke0ZXU1RSfV9i aW4iCQk+PiRAO1wKZGlmZiAtLWdpdCBhL2luY2x1ZGUvYXNtLWdlbmVyaWMvdm1saW51eC5sZHMu aCBiL2luY2x1ZGUvYXNtLWdlbmVyaWMvdm1saW51eC5sZHMuaAppbmRleCBjZTFlOWEzMTBhZGEu LjhhNTMyNWQ3NTkzMiAxMDA2NDQKLS0tIGEvaW5jbHVkZS9hc20tZ2VuZXJpYy92bWxpbnV4Lmxk cy5oCisrKyBiL2luY2x1ZGUvYXNtLWdlbmVyaWMvdm1saW51eC5sZHMuaApAQCAtMzI0LDEzICsz MjQsNiBAQAogCQlWTUxJTlVYX1NZTUJPTChfX2VuZF9wY2lfZml4dXBzX3N1c3BlbmRfbGF0ZSkg PSAuOwlcCiAJfQkJCQkJCQkJXAogCQkJCQkJCQkJXAotCS8qIEJ1aWx0LWluIGZpcm13YXJlIGJs b2JzICovCQkJCQlcCi0JLmJ1aWx0aW5fZncgICAgICAgIDogQVQoQUREUiguYnVpbHRpbl9mdykg LSBMT0FEX09GRlNFVCkgewlcCi0JCVZNTElOVVhfU1lNQk9MKF9fc3RhcnRfYnVpbHRpbl9mdykg PSAuOwkJCVwKLQkJS0VFUCgqKC5idWlsdGluX2Z3KSkJCQkJCVwKLQkJVk1MSU5VWF9TWU1CT0wo X19lbmRfYnVpbHRpbl9mdykgPSAuOwkJCVwKLQl9CQkJCQkJCQlcCi0JCQkJCQkJCQlcCiAJVFJB Q0VEQVRBCQkJCQkJCVwKIAkJCQkJCQkJCVwKIAkvKiBLZXJuZWwgc3ltYm9sIHRhYmxlOiBOb3Jt YWwgc3ltYm9scyAqLwkJCVwKLS0gCjIuMTEuMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxp c3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.kernel.org ([198.145.29.136]:52778 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935591AbdAIO7T (ORCPT ); Mon, 9 Jan 2017 09:59:19 -0500 From: "Luis R. Rodriguez" Subject: [PATCH v6 07/14] firmware: port built-in section to linker table Date: Mon, 9 Jan 2017 06:58:25 -0800 Message-ID: <20170109145833.11502-8-mcgrof@kernel.org> In-Reply-To: <20170109145833.11502-1-mcgrof@kernel.org> References: <20161222023811.21246-1-mcgrof@kernel.org> <20170109145833.11502-1-mcgrof@kernel.org> Sender: linux-arch-owner@vger.kernel.org List-ID: To: hpa@zytor.com, acme@redhat.com, tglx@linutronix.de, mingo@redhat.com, jpoimboe@redhat.com, bp@alien8.de, npiggin@gmail.com, 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, dalias@libc.org, linux@arm.linux.org.uk Cc: x86@kernel.org, luto@amacapital.net, keescook@chromium.org, linux@roeck-us.net, 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, 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, jolsa@kernel.org, msalter@redhat.com, chris@zankel.net, jcmvbkbc@gmail.com, linux-xtensa@linux-xtensa.org, adrian.hunter@intel.com, dsahern@gmail.com, namhyung@kernel.org, wangnan0@huawei.com, dmitry.torokhov@gmail.com, joro@8bytes.org, paulus@samba.org, mpe@ellerman.id.au, James.Bottomley@HansenPartnership.com, "Luis R. Rodriguez" , Barry Song , Mike Frysinger , Michael Matz , Fengguang Wu Message-ID: <20170109145825.fjeIR5xtYE8moCAqCZJI5Q4FzTqzA3LjmPikfbBky6k@z> 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 linker table. Tested with 0 built-in firmware, 1 and 2 built-in firmwares successfully. v6: rename table macro as suggested by Andy Shevchenko v5: o since we dropped SECTION_ORDER_ANY, use 'any' order level explicitly 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 2af69d27da62..2c5004343b45 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 @@ -110,15 +111,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 4497d263209f..b9ac348e8d33 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -31,6 +31,7 @@ #include #include #include +#include #include @@ -44,15 +45,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; @@ -68,9 +68,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..9c8cae144ede 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, 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 ce1e9a310ada..8a5325d75932 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -324,13 +324,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) = .; \ - KEEP(*(.builtin_fw)) \ - VMLINUX_SYMBOL(__end_builtin_fw) = .; \ - } \ - \ TRACEDATA \ \ /* Kernel symbol table: Normal symbols */ \ -- 2.11.0