move L2 cache enable/disable function to cache.c in the omap3 SoC directory
Kim
PATCH 1/1 move L2 cache enable/disable function to cache.c in the omap3 SoC directory
---
The omap3 L2 cache enable/disable function in the cpu/arm_cortexa8/cpu.c moved to cpu/arm_cortexa8/omap3/cache.c. Because, it must be CortexA8 ARCH generic code below the cpu/arm_cortexa8.
This patches fixes the First issue in the following
http://lists.denx.de/pipermail/u-boot/2009-May/053433.html
The Second issue is fixed by
http://lists.denx.de/pipermail/u-boot/2009-May/053490.html
cpu/arm_cortexa8/cpu.c | 70 ++--------------------------- cpu/arm_cortexa8/omap3/Makefile | 2 +- cpu/arm_cortexa8/omap3/board.c | 5 +- cpu/arm_cortexa8/omap3/cache.c | 96 +++++++++++++++++++++++++++++++++++++++ include/asm-arm/cache.h | 31 +++++++++++++ 5 files changed, 135 insertions(+), 69 deletions(-) create mode 100644 cpu/arm_cortexa8/omap3/cache.c create mode 100644 include/asm-arm/cache.h
cpu/arm_cortexa8/cpu.c +4 -66
@@ -33,17 +33,13 @@#include <common.h> #include <command.h> -#include <asm/arch/sys_proto.h> #include <asm/system.h> +#include <asm/cache.h> #ifdef CONFIG_USE_IRQ DECLARE_GLOBAL_DATA_PTR ;#endif -#ifndef CONFIG_L2_OFF -void l2cache_disable (void ); -#endif -static void cache_flush (void );int cpu_init (void )
@@ -80,7 +76,7 @@ int cleanup_before_linux(void)#ifndef CONFIG_L2_OFF /* turn off L2 cache */ -l2cache_disable (); +l2_cache_disable ();/* invalidate L2 cache also */ v7_flush_dcache_all (get_device_type ());#endif
@@ -89,72 +85,14 @@ int cleanup_before_linux(void) asm("mcr p15, 0, %0, c7, c10, 4" : :"r" (i));#ifndef CONFIG_L2_OFF -l2cache_enable (); +l2_cache_enable ();#endif return 0 ; } -void l2cache_enable () -{ -unsigned long i; -volatile unsigned int j; - -/* ES2 onwards we can disable/enable L2 ourselves */ -if (get_cpu_rev () >=CPU_3XX_ES20 ) { - __asm__ __volatile__("mrc p15, 0, %0, c1, c0, 1" :"=r" (i)); - __asm__ __volatile__("orr %0, %0, #0x2" :"=r" (i)); - __asm__ __volatile__("mcr p15, 0, %0, c1, c0, 1" :"=r" (i)); - }else { -/* Save r0, r12 and restore them after usage */ - __asm__ __volatile__("mov %0, r12" :"=r" (j)); - __asm__ __volatile__("mov %0, r0" :"=r" (i)); - -/* -* GP Device ROM code API usage here -* r12 = AUXCR Write function and r0 value -*/ - __asm__ __volatile__("mov r12, #0x3" ); - __asm__ __volatile__("mrc p15, 0, r0, c1, c0, 1" ); - __asm__ __volatile__("orr r0, r0, #0x2" ); -/* SMI instruction to call ROM Code API */ - __asm__ __volatile__(".word 0xE1600070" ); - __asm__ __volatile__("mov r0, %0" :"=r" (i)); - __asm__ __volatile__("mov r12, %0" :"=r" (j)); - } - -} - -void l2cache_disable () -{ -unsigned long i; -volatile unsigned int j; - -/* ES2 onwards we can disable/enable L2 ourselves */ -if (get_cpu_rev () >=CPU_3XX_ES20 ) { - __asm__ __volatile__("mrc p15, 0, %0, c1, c0, 1" :"=r" (i)); - __asm__ __volatile__("bic %0, %0, #0x2" :"=r" (i)); - __asm__ __volatile__("mcr p15, 0, %0, c1, c0, 1" :"=r" (i)); - }else { -/* Save r0, r12 and restore them after usage */ - __asm__ __volatile__("mov %0, r12" :"=r" (j)); - __asm__ __volatile__("mov %0, r0" :"=r" (i)); - -/* -* GP Device ROM code API usage here -* r12 = AUXCR Write function and r0 value -*/ - __asm__ __volatile__("mov r12, #0x3" ); - __asm__ __volatile__("mrc p15, 0, r0, c1, c0, 1" ); - __asm__ __volatile__("bic r0, r0, #0x2" ); -/* SMI instruction to call ROM Code API */ - __asm__ __volatile__(".word 0xE1600070" ); - __asm__ __volatile__("mov r0, %0" :"=r" (i)); - __asm__ __volatile__("mov r12, %0" :"=r" (j)); - } -} -static void cache_flush (void ) { asm ("mcr p15, 0, %0, c7, c5, 0" : :"r" (0 )); } +
cpu/arm_cortexa8/omap3/Makefile +1 -1
@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(SOC).a SOBJS := lowlevel_init.o -COBJS := sys_info.o board.o clock.o interrupts.o mem.o syslib.o +COBJS := sys_info.o board.o clock.o interrupts.o mem.o syslib.o cache.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS))
cpu/arm_cortexa8/omap3/board.c +3 -2
@@ -36,6 +36,7 @@#include <asm/io.h> #include <asm/arch/sys_proto.h> #include <asm/arch/mem.h> +#include <asm/cache.h> extern omap3_sysinfo sysinfo;
@@ -206,9 +207,9 @@ void s_init(void)#endif #ifdef CONFIG_L2_OFF -l2cache_disable (); +l2_cache_disable ();#else -l2cache_enable (); +l2_cache_enable ();#endif /* * Writing to AuxCR in U-boot using SMI for GP DEV
cpu/arm_cortexa8/omap3/cache.c new file +96 -0
96 lines not on this page · raw message
include/asm-arm/cache.h new file +31 -0
@@ -0,0 +1,31 @@ +/* +* (C) Copyright 2008 Texas Insturments +* +* (C) Copyright 2002 +* Sysgo Real-Time Solutions, GmbH <www.elinos.com> +* Marius Groeger <[email protected]> +* +* (C) Copyright 2002 +* Gary Jennejohn, DENX Software Engineering, <[email protected]> +* +* See file CREDITS for list of people who contributed to this +* project. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, +* MA 02111-1307 USA +*/ + +void l2_cache_enable (void ); +void l2_cache_disable (void );
Signature · 1 line
1.5.6.3
Jean-Christophe PLAGNIOL-VILLARD
AppliedPATCH 1/1 move L2 cache enable/disable function to cache.c in the omap3 SoC directory
Quoted 17 lines · Heung Jun
CC Dirk Behme <[email protected]>Signed-off-by HeungJun, Kim <[email protected]>---
The omap3 L2 cache enable/disable function in the
cpu/arm_cortexa8/cpu.cmoved tocpu/arm_cortexa8/omap3/cache.c. Because, it must be CortexA8 ARCH generic code below the cpu/arm_cortexa8.This patches fixes the First issue in the following
http://lists.denx.de/pipermail/u-boot/2009-May/053433.html
The Second issue is fixed by
Quoted 8 lines
cpu/arm_cortexa8/cpu.c | 70 ++--------------------------- cpu/arm_cortexa8/omap3/Makefile | 2 +- cpu/arm_cortexa8/omap3/board.c | 5 +- cpu/arm_cortexa8/omap3/cache.c | 96 +++++++++++++++++++++++++++++++++++++++ include/asm-arm/cache.h | 31 +++++++++++++ 5 files changed, 135 insertions(+), 69 deletions(-) create mode 100644 cpu/arm_cortexa8/omap3/cache.c create mode 100644 include/asm-arm/cache.h
applied to arm/next with manual merge
for your next please do base your code on the arm/next
Best Regards,
J.
PATCH 1/1 move L2 cache enable/disable function to cache.c in the omap3 SoC directory
Dear Jean-Christophe,
Quoted 26 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 17 lines · Heung Jun
CC Dirk Behme <[email protected]>Signed-off-by HeungJun, Kim <[email protected]>---
The omap3 L2 cache enable/disable function in the
cpu/arm_cortexa8/cpu.cmoved tocpu/arm_cortexa8/omap3/cache.c. Because, it must be CortexA8 ARCH generic code below the cpu/arm_cortexa8.This patches fixes the First issue in the following
http://lists.denx.de/pipermail/u-boot/2009-May/053433.html
The Second issue is fixed by
Quoted 8 lines
cpu/arm_cortexa8/cpu.c | 70 ++--------------------------- cpu/arm_cortexa8/omap3/Makefile | 2 +- cpu/arm_cortexa8/omap3/board.c | 5 +- cpu/arm_cortexa8/omap3/cache.c | 96 +++++++++++++++++++++++++++++++++++++++ include/asm-arm/cache.h | 31 +++++++++++++ 5 files changed, 135 insertions(+), 69 deletions(-) create mode 100644 cpu/arm_cortexa8/omap3/cache.c create mode 100644 include/asm-arm/cache.h
Quoted 3 lines
applied to arm/next with manual merge
for your next please do base your code on the arm/next
Yes, I noticed this, too.
Thanks for manual merge,
Dirk