From: Albert ARIBAUD Date: Mon, 25 Feb 2013 00:59:00 +0000 (+0000) Subject: Refactor linker-generated arrays X-Git-Tag: submit/tizen/20160318.071304~105 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=698aa79c9d5fa1ff2f6fe1bb00e54a6fa761b93c;p=profile%2Fcommon%2Fplatform%2Fkernel%2Fu-boot-artik.git Refactor linker-generated arrays Refactor linker-generated array code so that symbols which were previously linker-generated are now compiler- generated. This causes relocation records of type R_ARM_ABS32 to become R_ARM_RELATIVE, which makes code which uses LGA able to run before relocation as well as after. Note: this affects more than ARM targets, as linker- lists span possibly all target architectures, notably PowerPC. Conflicts: arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds arch/arm/cpu/armv7/omap-common/u-boot-spl.lds board/ait/cam_enc_4xx/u-boot-spl.lds board/davinci/da8xxevm/u-boot-spl-da850evm.lds board/davinci/da8xxevm/u-boot-spl-hawk.lds board/vpac270/u-boot-spl.lds Signed-off-by: Albert ARIBAUD Conflicts: .gitignore Makefile arch/arm/cpu/arm920t/ep93xx/u-boot.lds arch/arm/cpu/armv7/am33xx/u-boot-spl.lds arch/arm/cpu/ixp/u-boot.lds arch/arm/cpu/u-boot.lds arch/avr32/cpu/u-boot.lds arch/blackfin/cpu/u-boot.lds arch/mips/cpu/u-boot.lds arch/nds32/cpu/n1213/u-boot.lds arch/nios2/cpu/u-boot.lds arch/powerpc/cpu/74xx_7xx/u-boot.lds arch/powerpc/cpu/mpc512x/u-boot.lds arch/powerpc/cpu/mpc5xx/u-boot.lds arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds arch/powerpc/cpu/mpc5xxx/u-boot.lds arch/powerpc/cpu/mpc8220/u-boot.lds arch/powerpc/cpu/mpc824x/u-boot.lds arch/powerpc/cpu/mpc8260/u-boot.lds arch/powerpc/cpu/mpc83xx/u-boot.lds arch/powerpc/cpu/mpc85xx/u-boot-nand.lds arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds arch/powerpc/cpu/mpc85xx/u-boot.lds arch/powerpc/cpu/mpc86xx/u-boot.lds arch/powerpc/cpu/ppc4xx/u-boot.lds arch/sandbox/cpu/u-boot.lds arch/sh/cpu/sh2/u-boot.lds arch/sh/cpu/sh3/u-boot.lds arch/sh/cpu/sh4/u-boot.lds arch/x86/cpu/u-boot.lds board/BuS/EB+MCF-EV123/u-boot.lds board/LEOX/elpt860/u-boot.lds board/RPXClassic/u-boot.lds board/RPXClassic/u-boot.lds.debug board/RPXlite/u-boot.lds board/RPXlite/u-boot.lds.debug board/RPXlite_dw/u-boot.lds board/RPXlite_dw/u-boot.lds.debug board/RRvision/u-boot.lds board/actux1/u-boot.lds board/actux2/u-boot.lds board/actux3/u-boot.lds board/adder/u-boot.lds board/altera/nios2-generic/u-boot.lds board/amcc/acadia/u-boot-nand.lds board/amcc/bamboo/u-boot-nand.lds board/amcc/canyonlands/u-boot-nand.lds board/amcc/kilauea/u-boot-nand.lds board/amcc/sequoia/u-boot-nand.lds board/amcc/sequoia/u-boot-ram.lds board/astro/mcf5373l/u-boot.lds board/cobra5272/u-boot.lds board/cogent/u-boot.lds board/cogent/u-boot.lds.debug board/cray/L1/u-boot.lds.debug board/dave/PPChameleonEVB/u-boot.lds board/dvlhost/u-boot.lds board/eltec/mhpc/u-boot.lds board/eltec/mhpc/u-boot.lds.debug board/emk/top860/u-boot.lds board/ep88x/u-boot.lds board/esd/dasa_sim/u-boot.lds board/esd/pmc440/u-boot-nand.lds board/esd/tasreg/u-boot.lds board/esteem192e/u-boot.lds board/evb64260/u-boot.lds board/fads/u-boot.lds board/flagadm/u-boot.lds board/flagadm/u-boot.lds.debug board/freescale/m5208evbe/u-boot.lds board/freescale/m52277evb/u-boot.lds board/freescale/m5235evb/u-boot.lds board/freescale/m5249evb/u-boot.lds board/freescale/m5253demo/u-boot.lds board/freescale/m5253evbe/u-boot.lds board/freescale/m5271evb/u-boot.lds board/freescale/m5272c3/u-boot.lds board/freescale/m5275evb/u-boot.lds board/freescale/m5282evb/u-boot.lds board/freescale/m53017evb/u-boot.lds board/freescale/m5329evb/u-boot.lds board/freescale/m5373evb/u-boot.lds board/freescale/m54451evb/u-boot.lds board/freescale/m54455evb/u-boot.lds board/freescale/m547xevb/u-boot.lds board/freescale/m548xevb/u-boot.lds board/freescale/mx31ads/u-boot.lds board/gaisler/gr_cpci_ax2000/u-boot.lds board/gaisler/gr_ep2s60/u-boot.lds board/gaisler/gr_xc3s_1500/u-boot.lds board/gaisler/grsim/u-boot.lds board/gaisler/grsim_leon2/u-boot.lds board/gen860t/u-boot-flashenv.lds board/gen860t/u-boot.lds board/genietv/u-boot.lds board/genietv/u-boot.lds.debug board/hermes/u-boot.lds board/hermes/u-boot.lds.debug board/hymod/u-boot.lds board/hymod/u-boot.lds.debug board/icu862/u-boot.lds board/icu862/u-boot.lds.debug board/idmr/u-boot.lds board/ip860/u-boot.lds board/ip860/u-boot.lds.debug board/ivm/u-boot.lds board/ivm/u-boot.lds.debug board/korat/u-boot-F7FC.lds board/kup/kup4k/u-boot.lds board/kup/kup4k/u-boot.lds.debug board/kup/kup4x/u-boot.lds board/kup/kup4x/u-boot.lds.debug board/lwmon/u-boot.lds board/lwmon/u-boot.lds.debug board/manroland/uc100/u-boot.lds board/matrix_vision/mvsmr/u-boot.lds board/mbx8xx/u-boot.lds board/mbx8xx/u-boot.lds.debug board/ml2/u-boot.lds board/mousse/u-boot.lds board/mpl/pip405/u-boot.lds.debug board/mvblue/u-boot.lds board/netphone/u-boot.lds board/netphone/u-boot.lds.debug board/netta/u-boot.lds board/netta/u-boot.lds.debug board/netta2/u-boot.lds board/netta2/u-boot.lds.debug board/netvia/u-boot.lds board/netvia/u-boot.lds.debug board/nx823/u-boot.lds board/nx823/u-boot.lds.debug board/openrisc/openrisc-generic/u-boot.lds board/quantum/u-boot.lds board/r360mpi/u-boot.lds board/rbc823/u-boot.lds board/renesas/sh7752evb/u-boot.lds board/renesas/sh7757lcr/u-boot.lds board/rsdproto/u-boot.lds board/samsung/smdk5250/smdk5250-uboot-spl.lds board/samsung/smdk6400/u-boot-nand.lds board/sandburst/karef/u-boot.lds.debug board/sandburst/metrobox/u-boot.lds.debug board/sandpoint/u-boot.lds board/sixnet/u-boot.lds board/snmc/qs850/u-boot.lds board/snmc/qs860t/u-boot.lds board/spc1920/u-boot.lds board/spd8xx/u-boot.lds board/spd8xx/u-boot.lds.debug board/stx/stxxtc/u-boot.lds board/stx/stxxtc/u-boot.lds.debug board/svm_sc8xx/u-boot.lds board/tqc/tqm8xx/u-boot.lds board/v37/u-boot.lds board/w7o/u-boot.lds.debug board/xes/xpedite1000/u-boot.lds.debug board/xilinx/microblaze-generic/u-boot.lds common/cmd_help.c doc/README.commands include/command.h include/env_callback.h nand_spl/board/freescale/mpc8536ds/Makefile nand_spl/board/freescale/mpc8569mds/Makefile nand_spl/board/freescale/mpc8572ds/Makefile nand_spl/board/freescale/mx31pdk/Makefile nand_spl/board/freescale/mx31pdk/u-boot.lds nand_spl/board/freescale/p1010rdb/Makefile nand_spl/board/freescale/p1023rds/Makefile nand_spl/board/freescale/p1_p2_rdb/Makefile nand_spl/board/karo/tx25/Makefile nand_spl/board/karo/tx25/u-boot.lds nand_spl/board/samsung/smdk6400/u-boot.lds --- diff --git a/include/linker_lists.h b/include/linker_lists.h index 0b405d78e..6c28bf961 100644 --- a/include/linker_lists.h +++ b/include/linker_lists.h @@ -13,6 +13,96 @@ * published by the Free Software Foundation; either version 2 of * the License, or (at your option) any later version. */ + +/* + * There is no use in including this from ASM files, but that happens + * anyway, e.g. PPC kgdb.S includes command.h which incluse us. + * So just don't define anything when included from ASM. + */ + +#if !defined(__ASSEMBLY__) + +/** + * A linker list is constructed by grouping together linker input + * sections, each containning one entry of the list. Each input section + * contains a constant initialized variable which holds the entry's + * content. Linker list input sections are constructed from the list + * and entry names, plus a prefix which allows grouping all lists + * together. Assuming _list and _entry are the list and entry names, + * then the corresponding input section name is + * + * _u_boot_list + _2_ + @_list + _2_ + @_entry + * + * and the C variable name is + * + * .u_boot_list_ + 2_ + @_list + _2_ + @_entry + * + * This ensures uniqueness for both input section and C variable name. + * + * Note that the names differ only in the first character, "." for the + * setion and "_" for the variable, so that the linker cannot confuse + * section and symbol names. From now on, both names will be referred + * to as + * + * %u_boot_list_ + 2_ + @_list + _2_ + @_entry + * + * Entry variables need never be referred to directly. + * + * The naming scheme for input sections allows grouping all linker lists + * into a single linker output section and grouping all entries for a + * single list. + * + * Note the two '_2_' constant components in the names: their presence + * allows putting a start and end symbols around a list, by mapping + * these symbols to sections names with components "1" (before) and + * "3" (after) instead of "2" (within). + * Start and end symbols for a list can generally be defined as + * + * %u_boot_list_2_ + @_list + _1_... + * %u_boot_list_2_ + @_list + _3_... + * + * Start and end symbols for the whole of the linker lists area can be + * defined as + * + * %u_boot_list_1_... + * %u_boot_list_3_... + * + * Here is an example of the sorted sections which result from a list + * "array" made up of three entries : "first", "second" and "third", + * iterated at least once. + * + * .u_boot_list_2_array_1 + * .u_boot_list_2_array_2_first + * .u_boot_list_2_array_2_second + * .u_boot_list_2_array_2_third + * .u_boot_list_2_array_3 + * + * If lists must be divided into sublists (e.g. for iterating only on + * part of a list), one can simply give the list a name of the form + * 'outer_2_inner', where 'outer' is the global list name and 'inner' + * is the sub-list name. Iterators for the whole list should use the + * global list name ("outer"); iterators for only a sub-list should use + * the full sub-list name ("outer_2_inner"). + * + * Here is an example of the sections generated from a global list + * named "drivers", two sub-lists named "i2c" and "pci", and iterators + * defined for the whole list and each sub-list: + * + * %u_boot_list_2_drivers_1 + * %u_boot_list_2_drivers_2_i2c_1 + * %u_boot_list_2_drivers_2_i2c_2_first + * %u_boot_list_2_drivers_2_i2c_2_first + * %u_boot_list_2_drivers_2_i2c_2_second + * %u_boot_list_2_drivers_2_i2c_2_third + * %u_boot_list_2_drivers_2_i2c_3 + * %u_boot_list_2_drivers_2_pci_1 + * %u_boot_list_2_drivers_2_pci_2_first + * %u_boot_list_2_drivers_2_pci_2_second + * %u_boot_list_2_drivers_2_pci_2_third + * %u_boot_list_2_drivers_2_pci_3 + * %u_boot_list_2_drivers_3 + */ + #ifndef __LINKER_LISTS_H__ #define __LINKER_LISTS_H__ @@ -20,43 +110,28 @@ * ll_entry_declare() - Declare linker-generated array entry * @_type: Data type of the entry * @_name: Name of the entry - * @_section_u: Subsection of u_boot_list in which this entry is placed - * (with underscores instead of dots, for name concatenation) - * @_section_d: Subsection of u_boot_list in which this entry is placed - * (with dots, for section concatenation) + * @_list: name of the list. Should contain only characters allowed + * in a C variable name! * * This macro declares a variable that is placed into a linker-generated * array. This is a basic building block for more advanced use of linker- * generated arrays. The user is expected to build their own macro wrapper * around this one. * - * A variable declared using this macro must be compile-time initialized - * and is as such placed into subsection of special section, .u_boot_list. - * The subsection is specified by the _section_[u,d] parameter, see below. - * The base name of the variable is _name, yet the actual variable is - * declared as concatenation of - * - * %_u_boot_list_ + @_section_u + _ + @_name - * - * which ensures name uniqueness. This variable shall never be refered - * directly though. + * A variable declared using this macro must be compile-time initialized. * * Special precaution must be made when using this macro: - * 1) The _type must not contain the "static" keyword, otherwise the entry - * is not generated. * - * 2) The @_section_u and @_section_d variables must match, the only difference - * is that in @_section_u is every dot "." character present in @_section_d - * replaced by a single underscore "_" character in @_section_u. The actual - * purpose of these parameters is to select proper subsection in the global - * .u_boot_list section. + * 1) The _type must not contain the "static" keyword, otherwise the + * entry is generated and can be iterated but is listed in the map + * file and cannot be retrieved by name. * - * 3) In case a section is declared that contains some array elements AND a - * subsection of this section is declared and contains some elements, it is - * imperative that the elements are of the same type. + * 2) In case a section is declared that contains some array elements AND + * a subsection of this section is declared and contains some elements, + * it is imperative that the elements are of the same type. * * 4) In case an outer section is declared that contains some array elements - * AND am inner subsection of this section is declared and contains some + * AND an inner subsection of this section is declared and contains some * elements, then when traversing the outer section, even the elements of * the inner sections are present in the array. * @@ -66,39 +141,71 @@ * .y = 4, * }; */ -#define ll_entry_declare(_type, _name, _section_u, _section_d) \ - _type _u_boot_list_##_section_u##_##_name __attribute__(( \ - unused, aligned(4), \ - section(".u_boot_list."#_section_d"."#_name))) +#define ll_entry_declare(_type, _name, _list) \ + _type _u_boot_list_2_##_list##_2_##_name __aligned(4) \ + __attribute__((unused, \ + section(".u_boot_list_2_"#_list"_2_"#_name))) + +/** + * We need a 0-byte-size type for iterator symbols, and the compiler + * does not allow defining objects of C type 'void'. Using an empty + * struct is allowed by the compiler, but causes gcc versions 4.4 and + * below to complain about aliasing. Therefore we use the next best + * thing: zero-sized arrays, which are both 0-byte-size and exempt from + * aliasing warnings. + */ /** * ll_entry_start() - Point to first entry of linker-generated array * @_type: Data type of the entry - * @_section_u: Subsection of u_boot_list in which this entry is placed - * (with underscores instead of dots) + * @_list: Name of the list in which this entry is placed * * This function returns (_type *) pointer to the very first entry of a * linker-generated array placed into subsection of .u_boot_list section - * specified by _section_u argument. + * specified by _list argument. + * + * Since this macro defines an array start symbol, its leftmost index + * must be 2 and its rightmost index must be 1. * * Example: * struct my_sub_cmd *msc = ll_entry_start(struct my_sub_cmd, cmd_sub); */ -#define ll_entry_start(_type, _section_u) \ - ({ \ - extern _type _u_boot_list_##_section_u##__start; \ - _type *_ll_result = &_u_boot_list_##_section_u##__start;\ - _ll_result; \ - }) +#define ll_entry_start(_type, _list) \ +({ \ + static char start[0] __aligned(4) __attribute__((unused, \ + section(".u_boot_list_2_"#_list"_1"))); \ + (_type *)&start; \ +}) /** - * ll_entry_count() - Return the number of elements in linker-generated array + * ll_entry_end() - Point after last entry of linker-generated array * @_type: Data type of the entry - * @_section_u: Subsection of u_boot_list in which this entry is placed + * @_list: Name of the list in which this entry is placed * (with underscores instead of dots) * + * This function returns (_type *) pointer after the very last entry of + * a linker-generated array placed into subsection of .u_boot_list + * section specified by _list argument. + * + * Since this macro defines an array end symbol, its leftmost index + * must be 2 and its rightmost index must be 3. + * + * Example: + * struct my_sub_cmd *msc = ll_entry_end(struct my_sub_cmd, cmd_sub); + */ +#define ll_entry_end(_type, _list) \ +({ \ + static char end[0] __aligned(4) __attribute__((unused, \ + section(".u_boot_list_2_"#_list"_3"))); \ + (_type *)&end; \ +}) +/** + * ll_entry_count() - Return the number of elements in linker-generated array + * @_type: Data type of the entry + * @_list: Name of the list of which the number of elements is computed + * * This function returns the number of elements of a linker-generated array - * placed into subsection of .u_boot_list section specified by _section_u + * placed into subsection of .u_boot_list section specified by _list * argument. The result is of an unsigned int type. * * Example: @@ -108,23 +215,19 @@ * for (i = 0; i < count; i++, msc++) * printf("Entry %i, x=%i y=%i\n", i, msc->x, msc->y); */ -#define ll_entry_count(_type, _section_u) \ +#define ll_entry_count(_type, _list) \ ({ \ - extern _type _u_boot_list_##_section_u##__start; \ - extern _type _u_boot_list_##_section_u##__end; \ - unsigned int _ll_result = \ - &_u_boot_list_##_section_u##__end - \ - &_u_boot_list_##_section_u##__start; \ + _type *start = ll_entry_start(_type, _list); \ + _type *end = ll_entry_end(_type, _list); \ + unsigned int _ll_result = end - start; \ _ll_result; \ }) - /** * ll_entry_get() - Retrieve entry from linker-generated array by name * @_type: Data type of the entry * @_name: Name of the entry - * @_section_u: Subsection of u_boot_list in which this entry is placed - * (with underscores instead of dots) + * @_list: Name of the list in which this entry is placed * * This function returns a pointer to a particular entry in LG-array * identified by the subsection of u_boot_list where the entry resides @@ -138,11 +241,54 @@ * ... * struct my_sub_cmd *c = ll_entry_get(struct my_sub_cmd, my_sub_cmd, cmd_sub); */ -#define ll_entry_get(_type, _name, _section_u) \ +#define ll_entry_get(_type, _name, _list) \ ({ \ - extern _type _u_boot_list_##_section_u##_##_name; \ - _type *_ll_result = &_u_boot_list_##_section_u##_##_name;\ + extern _type _u_boot_list_2_##_list##_2_##_name; \ + _type *_ll_result = \ + &_u_boot_list_2_##_list##_2_##_name; \ _ll_result; \ }) +/** + * ll_start() - Point to first entry of first linker-generated array + * @_type: Data type of the entry + * + * This function returns (_type *) pointer to the very first entry of + * the very first linker-generated array. + * + * Since this macro defines the start of the linker-generated arrays, + * its leftmost index must be 1. + * + * Example: + * struct my_sub_cmd *msc = ll_start(struct my_sub_cmd); + */ +#define ll_start(_type) \ +({ \ + static char start[0] __aligned(4) __attribute__((unused, \ + section(".u_boot_list_1"))); \ + (_type *)&start; \ +}) + +/** + * ll_entry_end() - Point after last entry of last linker-generated array + * @_type: Data type of the entry + * + * This function returns (_type *) pointer after the very last entry of + * the very last linker-generated array. + * + * Since this macro defines the end of the linker-generated arrays, + * its leftmost index must be 3. + * + * Example: + * struct my_sub_cmd *msc = ll_end(struct my_sub_cmd); + */ +#define ll_end(_type) \ +({ \ + static char end[0] __aligned(4) __attribute__((unused, \ + section(".u_boot_list_3"))); \ + (_type *)&end; \ +}) + +#endif /* __ASSEMBLY__ */ + #endif /* __LINKER_LISTS_H__ */