| Message ID | 20161127221536.9577-5-vz@mleia.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On 27 November 2016 at 15:15, Vladimir Zapolskiy <vz@mleia.com> wrote: > Both jump_to_P2() and back_to_P1() functions are found in asm/system.h > header file and functionally they are the same, don't redefine them. > > Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> > --- > arch/sh/cpu/sh4/cache.c | 39 ++------------------------------------- > 1 file changed, 2 insertions(+), 37 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On Mon, Nov 28, 2016 at 12:15:16AM +0200, Vladimir Zapolskiy wrote: > Both jump_to_P2() and back_to_P1() functions are found in asm/system.h > header file and functionally they are the same, don't redefine them. > > Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> > Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot/master, thanks!
diff --git a/arch/sh/cpu/sh4/cache.c b/arch/sh/cpu/sh4/cache.c index b3e5fd5..50695b6 100644 --- a/arch/sh/cpu/sh4/cache.c +++ b/arch/sh/cpu/sh4/cache.c @@ -7,44 +7,9 @@ #include <common.h> #include <command.h> -#include <asm/processor.h> #include <asm/io.h> - -/* - * Jump to P2 area. - * When handling TLB or caches, we need to do it from P2 area. - */ -#define jump_to_P2() \ - do { \ - unsigned long __dummy; \ - __asm__ __volatile__( \ - "mov.l 1f, %0\n\t" \ - "or %1, %0\n\t" \ - "jmp @%0\n\t" \ - " nop\n\t" \ - ".balign 4\n" \ - "1: .long 2f\n" \ - "2:" \ - : "=&r" (__dummy) \ - : "r" (0x20000000)); \ - } while (0) - -/* - * Back to P1 area. - */ -#define back_to_P1() \ - do { \ - unsigned long __dummy; \ - __asm__ __volatile__( \ - "nop;nop;nop;nop;nop;nop;nop\n\t" \ - "mov.l 1f, %0\n\t" \ - "jmp @%0\n\t" \ - " nop\n\t" \ - ".balign 4\n" \ - "1: .long 2f\n" \ - "2:" \ - : "=&r" (__dummy)); \ - } while (0) +#include <asm/processor.h> +#include <asm/system.h> #define CACHE_VALID 1 #define CACHE_UPDATED 2
Both jump_to_P2() and back_to_P1() functions are found in asm/system.h header file and functionally they are the same, don't redefine them. Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> --- arch/sh/cpu/sh4/cache.c | 39 ++------------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-)