[PATCH v3 00/40] ARM: mm: Add generic macros for declaring various CPU structs

[dave.martin@linaro.org (Dave Martin)]

Hi all,

I'd like to see these patches merged at the next merge window, if 
possible.

Now that we're at -rc5, Will Deacon offered to merge these patches via
his tree.

If anyone has any outstanding comments or objections on these patches,
please speak up now.

Once again, if anyone has an opportunity to test on their CPU and config,
it would be appreciated.

Thanks
---Dave

On Thu, Jun 23, 2011 at 06:50:08PM +0100, Dave Martin wrote:
> This series adds macros for declaring some CPU-related structured
> defined in assembler, and ports the various processors, cache and
> tlb implementations to use the macros.
> 
> Where multiple proc_info structures are defined by a single source
> file, the common elements are collapsed out of these by defining
> and invoking an additional local macro for this purpose.
> 
> A primary goal for this series is to introduce no API or binary
> changes except for fixing the few obvious bugs which became apparent
> when working on the series.
> 
> NOTE: There is an overlap between this series and Will/Pawel's patches
> to include Cortex-A5 support (see
> http://lists.arm.linux.org.uk/lurker/message/20110617.081930.2ed0934d.en.html).
> Will has agreed to merge with my series in his tree so that it can all
> be pulled from there, providing that my series has been accepted by
> the community.
> 
> 
> Anyone with an interest in any of the arch/arm/mm/{proc,cache,tlb}-*.S
> files is invited to comment and/or test.
> 
> In particular, I'd like review from anyone interested in the mohawk or
> xscale processor families, since this series causes non-trivial
> "fixes" in both of these files.  (xscale may be fixed by this series;
> mohawk is only partially fixed and still won't work unless a bit of
> extra work is done to define a suitable flush_icache_all function.
> 
> Detailed notes follow.
> 
> Cheers
> ---Dave
> 
> 
> 
> General notes:
> 
>   - This patch supersedes Peter Chubb's patch for the typo in
>     proc-arm7tdmi.S (see
> http://lists.arm.linux.org.uk/lurker/message/20110530.235513.4e1a0d16.en.html),
> which I believe hasn't been merged.  If it has merged or is
> pending, I can easily rebase on top of it.
> 
>   - *_processor_functions structures are not referenced outside
>     the proc-*.S in which they are defined and could all be
>     demoted to local scope.  To minimise breakage risk, I've left
>     these global for now.
> 
>   - Some cache_fns structures are not referenced outside the file
>     in which they are defined and could be local.  To simplify
>     the macro definition, these are currently all made global:
>     this should be harmless.
> 
>   - Placement of the structures in sections appears somewhat
>     inconsistent at present.  Possibly, everything should move
>     to __CPUINITRODATA.  Currently, the data is mostly spread
>     between __INIT, __TEXT and __INITDATA.  To avoid unintended
>     breakage, this series does not automatically switch sections
>     in the macros, leaving the preexisting section assignments
>     completely unchanged for now.
> 
>   - This series introduces a few lines slightly longer than 80
>     characters.  I don't think that splitting these lines will
>     do a lot to help readability, but this can be done if
>     people prefer.
> 
> Except as described below, I have confirmed that there is no change
> in the objects which get built from any of these files, by diffing
> disassembly and symbol tables, and by comparing binary section
> dumps.  (Debug info sections do generally change, but this is
> expected since they naturally depend on the exact characteristics
> of the source code.  They don't end up in the kernel image.)
> 
> Under these criteria, the cache-*.S and tlb-*.S files are exactly
> equivalent to the unpatched versions.
> 
> proc-*.S files change in the following ways: (mostly minor)
> 
>         proc-arm1020    a.cp. ..
>         proc-arm1020e   a.cp. ..
>         proc-arm1022    a.cp. ..
>         proc-arm1022    a.cp. ..
>         proc-arm6_7     ..... ..
>         proc-arm720     ..... ..
>         proc-arm740     a.... Z.
>         proc-arm7tdmi   .n..u Z. 1
>         proc-arm920     a.cp. ..
>         proc-arm922     a.cp. ..
>         proc-arm925     a.cp. .. 2
>         proc-arm926     a.cp. ..
>         proc-arm940     ..c.. Z.
>         proc-arm946     ..c.. Z.
>         proc-arm9tdmi   ....u ..
>         proc-fa526      a..p. ..
>         proc-feroceon   a.cp. ..
>         proc-mohawk     a.c.. .X 34
>         proc-sa110      ..... ..
>         proc-sa1100     ..... ..
>         proc-v6         ..... ..
>         proc-v7         .n... ..
>         proc-xsc3       ..c.. ..
>         proc-xscale     ..c.. .X 5
> 
> Legend:
> 
> a       section alignment of .proc.info.init and/or .init.data increased
>         from 1 to 4
> 
> n	one or more name string symbols promoted to STT_OBJECT
> c       one or mote cache_fns symbols structured promoted to STT_OBJECT
> p       one or more processor_functions symbols promoted to global scope
> 
> u       undefined symbol no longer referenced by .size
>         directive (typo fix)
> 
> Z       missing string terminator added to one of more name
>         strings.  In principle, the missing terminator could lead
>         to overruns.  In practice, the effect appears to get hidden
>         by .align directives; but it's safer to add them anyway.
> 
> X       missing flush_icache_all entry inserted at the start of
>         one or more cache_fns structures.  The extra field was
>         created in:
> 
>             commit 81d11955 (ARM: 6405/1: Handle
>             __flush_icache_all for CONFIG_SMP_ON_UP),
> 
>         breaking various proc-*.S.  Some were fixed by subsequent
>         patches, e.g.
> 
>             commit c8c90860 (ARM: 6466/1: implement
>             flush_icache_all for the rest of the CPUs).
> 
>         A few proc-*.S files appear to have been missed.
> 
> Processor-specific notes:
> 
> 1       proc-arm7tdmi: spurious undefined symbol
>         cpu_s3c4510b (caused by misspelled .type directive)
>         eliminated
> 
> 2       proc-arm925: size of __arm915_proc_info and
>         __arm925_proc_info symbols changed (typo'd duplicate .size
>         directive in original)
> 
> 3       proc-mohawk: mohawk_processor_functions became
>         STT_OBJECT (missing .type directive in original)
> 
> 4       proc-mohawk: missing mohawk_flush_icache_all now
>         referenced and needs to be defined to un-break this file
>         ** needs review **
> 
> 5       proc-xscale: missing flush_icache_all funtion in
>         xscale_80200_A0_A1_cache_fns assumed to be the same as for
>         xscale_cache_fns **needs review**
> 
> ---
> ------------------------------------------------------------------------
> 
> Dave Martin (40):
>   Subject: ARM: mm: prop-macros Add generic proc/cache/tlb struct
>     definition macros
>   Subject: ARM: assembler.h: Add string declaration macro
>   Subject: ARM: mm: cache-fa: Use the new processor struct macros
>   Subject: ARM: mm: cache-v3: Use the new processor struct macros
>   Subject: ARM: mm: cache-v4: Use the new processor struct macros
>   Subject: ARM: mm: cache-v4wb: Use the new processor struct macros
>   Subject: ARM: mm: cache-v4wt: Use the new processor struct macros
>   Subject: ARM: mm: cache-v6: Use the new processor struct macros
>   Subject: ARM: mm: cache-v7: Use the new processor struct macros
>   Subject: ARM: mm: proc-arm1020: Use the new processor struct macros
>   Subject: ARM: mm: proc-arm1020e: Use the new processor struct macros
>   Subject: ARM: mm: proc-arm1022: Use the new processor struct macros
>   Subject: ARM: mm: proc-arm1026: Use the new processor struct macros
>   Subject: ARM: mm: proc-arm6_7: Use the new processor struct macros
>   Subject: ARM: mm: proc-arm720: Use the new processor struct macros
>   Subject: ARM: mm: proc-arm740: Use the new processor struct macros
>   Subject: ARM: mm: proc-arm7tdmi: Use the new processor struct macros
>   Subject: ARM: mm: proc-arm920: Use the new processor struct macros
>   Subject: ARM: mm: proc-arm922: Use the new processor struct macros
>   Subject: ARM: mm: proc-arm925: Use the new processor struct macros
>   Subject: ARM: mm: proc-arm926: Use the new processor struct macros
>   Subject: ARM: mm: proc-arm940: Use the new processor struct macros
>   Subject: ARM: mm: proc-arm946: Use the new processor struct macros
>   Subject: ARM: mm: proc-arm9tdmi: Use the new processor struct macros
>   Subject: ARM: mm: proc-fa526: Use the new processor struct macros
>   Subject: ARM: mm: proc-feroceon: Use the new processor struct macros
>   Subject: ARM: mm: proc-mohawk: Use the new processor struct macros
>   Subject: ARM: mm: proc-sa110: Use the new processor struct macros
>   Subject: ARM: mm: proc-sa1100: Use the new processor struct macros
>   Subject: ARM: mm: proc-v6: Use the new processor struct macros
>   Subject: ARM: mm: proc-v7: Use the new processor struct macros
>   Subject: ARM: mm: proc-xsc3: Use new generic struct definition macros
>   Subject: ARM: mm: proc-xscale: Use new generic struct definition
>     macros
>   Subject: ARM: mm: tlb-fa: Use the new processor struct macros
>   Subject: ARM: mm: tlb-v3: Use the new processor struct macros
>   Subject: ARM: mm: tlb-v4: Use the new processor struct macros
>   Subject: ARM: mm: tlb-v4wb: Use the new processor struct macros
>   Subject: ARM: mm: tlb-v4wbi: Use the new processor struct macros
>   Subject: ARM: mm: tlb-v6: Use the new processor struct macros
>   Subject: ARM: mm: tlb-v7: Use the new processor struct macros
> 
>  arch/arm/include/asm/assembler.h |    8 +
>  arch/arm/mm/cache-fa.S           |   15 +-
>  arch/arm/mm/cache-v3.S           |   15 +-
>  arch/arm/mm/cache-v4.S           |   15 +-
>  arch/arm/mm/cache-v4wb.S         |   15 +-
>  arch/arm/mm/cache-v4wt.S         |   15 +-
>  arch/arm/mm/cache-v6.S           |   15 +-
>  arch/arm/mm/cache-v7.S           |   15 +-
>  arch/arm/mm/proc-arm1020.S       |   45 +---
>  arch/arm/mm/proc-arm1020e.S      |   52 +----
>  arch/arm/mm/proc-arm1022.S       |   52 +----
>  arch/arm/mm/proc-arm1026.S       |   53 +----
>  arch/arm/mm/proc-arm6_7.S        |  166 +++-----------
>  arch/arm/mm/proc-arm720.S        |   85 ++------
>  arch/arm/mm/proc-arm740.S        |   42 +---
>  arch/arm/mm/proc-arm7tdmi.S      |  216 +++--------------
>  arch/arm/mm/proc-arm920.S        |   53 +----
>  arch/arm/mm/proc-arm922.S        |   53 +----
>  arch/arm/mm/proc-arm925.S        |   88 ++------
>  arch/arm/mm/proc-arm926.S        |   51 +----
>  arch/arm/mm/proc-arm940.S        |   51 +----
>  arch/arm/mm/proc-arm946.S        |   53 +----
>  arch/arm/mm/proc-arm9tdmi.S      |   78 ++-----
>  arch/arm/mm/proc-fa526.S         |   38 +---
>  arch/arm/mm/proc-feroceon.S      |  186 +++------------
>  arch/arm/mm/proc-macros.S        |   76 ++++++
>  arch/arm/mm/proc-mohawk.S        |   50 +----
>  arch/arm/mm/proc-sa110.S         |   39 +---
>  arch/arm/mm/proc-sa1100.S        |   84 ++------
>  arch/arm/mm/proc-v6.S            |   34 +---
>  arch/arm/mm/proc-v7.S            |   31 +--
>  arch/arm/mm/proc-xsc3.S          |   90 ++------
>  arch/arm/mm/proc-xscale.S        |  484 +++++---------------------------------
>  arch/arm/mm/tlb-fa.S             |    8 +-
>  arch/arm/mm/tlb-v3.S             |    8 +-
>  arch/arm/mm/tlb-v4.S             |    8 +-
>  arch/arm/mm/tlb-v4wb.S           |    8 +-
>  arch/arm/mm/tlb-v4wbi.S          |    8 +-
>  arch/arm/mm/tlb-v6.S             |    8 +-
>  arch/arm/mm/tlb-v7.S             |    9 +-
>  40 files changed, 452 insertions(+), 1968 deletions(-)
> 
> -- 
> 1.7.4.1
>