mirror of
https://github.com/torvalds/linux.git
synced 2026-07-18 03:27:34 +02:00
26ef5c0957
The ppc32 and ppc64 versions of cacheflush.h were almost identical. The two versions of cache.h are fairly similar, except for a bunch of register definitions in the ppc32 version which probably belong better elsewhere. This patch, therefore, merges both headers. Notable points: - there are several functions in cacheflush.h which exist only on ppc32 or only on ppc64. These are handled by #ifdef for now, but these should probably be consolidated, along with the actual code behind them later. - Confusingly, both ppc32 and ppc64 have a flush_dcache_range(), but they're subtly different: it uses dcbf on ppc32 and dcbst on ppc64, ppc64 has a flush_inval_dcache_range() which uses dcbf. These too should be merged and consolidated later. - Also flush_dcache_range() was defined in cacheflush.h on ppc64, and in cache.h on ppc32. In the merged version it's in cacheflush.h - On ppc32 flush_icache_range() is a normal function from misc.S. On ppc64, it was wrapper, testing a feature bit before calling __flush_icache_range() which does the actual flush. This patch takes the ppc64 approach, which amounts to no change on ppc32, since CPU_FTR_COHERENT_ICACHE will never be set there, but does mean renaming flush_icache_range() to __flush_icache_range() in arch/ppc/kernel/misc.S and arch/powerpc/kernel/misc_32.S - The PReP register info from asm-ppc/cache.h has moved to arch/ppc/platforms/prep_setup.c - The 8xx register info from asm-ppc/cache.h has moved to a new asm-powerpc/reg_8xx.h, included from reg.h - flush_dcache_all() was defined on ppc32 (only), but was never called (although it was exported). Thus this patch removes it from cacheflush.h and from ARCH=powerpc (misc_32.S) entirely. It's left in ARCH=ppc for now, with the prototype moved to ppc_ksyms.c. Built for Walnut (ARCH=ppc), 32-bit multiplatform (pmac, CHRP and PReP ARCH=ppc, pmac and CHRP ARCH=powerpc). Built and booted on POWER5 LPAR (ARCH=powerpc and ARCH=ppc64). Built for 32-bit powermac (ARCH=ppc and ARCH=powerpc). Built and booted on POWER5 LPAR (ARCH=powerpc and ARCH=ppc64). Built and booted on G5 (ARCH=powerpc) Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org> |
||
|---|---|---|
| .. | ||
| 8xx_immap.h | ||
| amigahw.h | ||
| amigaints.h | ||
| amigappc.h | ||
| amigayle.h | ||
| amipcmcia.h | ||
| ans-lcd.h | ||
| bootinfo.h | ||
| bootx.h | ||
| bseip.h | ||
| btext.h | ||
| commproc.h | ||
| cpm2.h | ||
| delay.h | ||
| dma-mapping.h | ||
| floppy.h | ||
| gg2.h | ||
| gt64260_defs.h | ||
| gt64260.h | ||
| harrier.h | ||
| hawk_defs.h | ||
| hawk.h | ||
| highmem.h | ||
| hydra.h | ||
| ibm_ocp_pci.h | ||
| ibm_ocp.h | ||
| ibm4xx.h | ||
| ibm44x.h | ||
| ibm403.h | ||
| ibm405.h | ||
| immap_85xx.h | ||
| immap_cpm2.h | ||
| io.h | ||
| ipic.h | ||
| kgdb.h | ||
| m48t35.h | ||
| m8260_pci.h | ||
| machdep.h | ||
| md.h | ||
| mk48t59.h | ||
| mmu_context.h | ||
| mmu.h | ||
| mpc8xx.h | ||
| mpc10x.h | ||
| mpc52xx_psc.h | ||
| mpc52xx.h | ||
| mpc83xx.h | ||
| mpc85xx.h | ||
| mpc8260_pci9.h | ||
| mpc8260.h | ||
| mv64x60_defs.h | ||
| mv64x60.h | ||
| nvram.h | ||
| ocp_ids.h | ||
| ocp.h | ||
| open_pic.h | ||
| page.h | ||
| pc_serial.h | ||
| pci-bridge.h | ||
| pci.h | ||
| pgalloc.h | ||
| pgtable.h | ||
| pnp.h | ||
| ppc_sys.h | ||
| ppc4xx_dma.h | ||
| ppc4xx_pic.h | ||
| ppcboot.h | ||
| prep_nvram.h | ||
| prom.h | ||
| raven.h | ||
| reg_booke.h | ||
| residual.h | ||
| rheap.h | ||
| rio.h | ||
| rtc.h | ||
| serial.h | ||
| smp.h | ||
| spinlock.h | ||
| suspend.h | ||
| system.h | ||
| time.h | ||
| todc.h | ||
| traps.h | ||
| xparameters.h | ||
| zorro.h | ||