On Tue, Jan 22, 2008 at 12:00:26AM +0000, Thiemo Seufer wrote: > This patch moves the micro-assembler in a separate implementation, as > it is useful for further run-time optimizations. The only change in > behaviour is cutting down printk noise at kernel startup time. > > Checkpatch complains about macro parameters which aren't protected by > parentheses. I believe this is a flaw in checkpatch, the paste operator > used in those macros won't work with parenthesised parameters. > > Tested on: > - Qemu 32-bit little endian > - BCM1480 64-bit big endian > > > Thiemo > > > --- > Split the micro-assembler from tlbex.c. > > Signed-off-by: Thiemo Seufer <ths@xxxxxxxxxxxx> Looks technically ok but conflicts with these 7 other patches which also touch arch/mips/mm/tlbex.c: Please keep all the stuff the stuff that should go into the commit message - and only that - above the "---" tearline. git-am will drop anything below it and friendly greetings, signatures etc. should not go into the log message so keep that below the tearoff line. commit 699a78e99f302003ae6d6090bf7f35eb69b772e0 Author: Manuel Lauss <mano@xxxxxxxxxxxxxxxxxxxxxxx> Date: Thu Dec 6 09:07:55 2007 +0100 [MIPS] Alchemy: Au1210/Au1250 CPU support This patch adds IDs for new Au1200 variants: Au1210 and Au1250. They are essentially identical to the Au1200 except for the Au1210 which has a different SoC-ID in the PRId register [bits 31:24]. The Au1250 is a "Au1200 V0.2". Signed-off-by: Manuel Lauss <mano@xxxxxxxxxxxxxxxxxxxxxxx> Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx> commit 56bccd5921f7b1160ddab0f9c3e9cc227ecd9aef Author: Franck Bui-Huu <fbuihuu@xxxxxxxxx> Date: Thu Oct 18 09:11:17 2007 +0200 [MIPS] tlbex.c: cleanup debug code Signed-off-by: Franck Bui-Huu <fbuihuu@xxxxxxxxx> Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx> commit 97432dc56d464006a62b1cd3ee6484828bde816c Author: Franck Bui-Huu <fbuihuu@xxxxxxxxx> Date: Thu Oct 18 09:11:16 2007 +0200 [MIPS] tlbex.c: use __cacheline_aligned instead of __tlb_handler_align Signed-off-by: Franck Bui-Huu <fbuihuu@xxxxxxxxx> Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx> commit 82e27810cd28e4322bd400640c8627ceacfc29f5 Author: Franck Bui-Huu <fbuihuu@xxxxxxxxx> Date: Thu Oct 18 09:11:15 2007 +0200 [MIPS] tlbex.c: cleanup include files Signed-off-by: Franck Bui-Huu <fbuihuu@xxxxxxxxx> Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx> commit b849ac81b87278c9b9e17aef8f4d82a30578ec93 Author: Franck Bui-Huu <fbuihuu@xxxxxxxxx> Date: Thu Oct 18 09:11:14 2007 +0200 [MIPS] tlbex.c: Cleanup __init usages. Signed-off-by: Franck Bui-Huu <fbuihuu@xxxxxxxxx> Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx> commit bf672b2f700d031d933c7dadcd9fae5edaa019b4 Author: Maciej W. Rozycki <macro@xxxxxxxxxxxxxx> Date: Tue Oct 23 12:43:25 2007 +0100 [MIPS] R4000/R4400 daddiu erratum workaround This complements the generic R4000/R4400 errata workaround code and adds bits for the daddiu problem. In most places it just modifies handwritten assembly code so that the assembler is allowed to use a temporary register as daddiu may now be treated as a macro that expands to a sequence of li and daddu. It is the AT register or, where AT is unavailable or used explicitly for another purpose, an explicitly-named register is selected, using the .set at=<reg> feature added recently to gas. This feature is only used if CONFIG_CPU_DADDI_WORKAROUNDS has been set, so if the workaround remains disabled, the required version of binutils stays unchanged. Similarly, daddiu instructions put in branch delay slots in noreorder fragments are now taken out of them and the assembler is allowed to reorder them itself as possible (which it does making the whole idea of scheduling them into delay slots manually questionable). Also in the very few places where such a simple conversion was not possible, a handcoded longer sequence is implemented. Other than that there are changes to code responsible for building the TLB fault and page clear/copy handlers to avoid daddiu as appropriate. These are only effective if the erratum is verified to be present at the run time. Finally there is a trivial update to __delay(), because it uses daddiu in a branch delay slot. Signed-off-by: Maciej W. Rozycki <macro@xxxxxxxxxxxxxx> Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx> commit 2d220349159729f143570673f8752aafd6d8da74 Author: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Date: Mon Jan 28 17:14:10 2008 +0000 [MIPS] tlbex: Cleanup handling of R2 hazards in TLB handlers. Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx> But I'm really happing to see the generalization we've been talking about to finally proceed. Ralf