* [U-Boot] [PATCH] sh: delete an unused source file
@ 2014-03-31 4:09 Masahiro Yamada
2014-03-31 5:46 ` Nobuhiro Iwamatsu
0 siblings, 1 reply; 5+ messages in thread
From: Masahiro Yamada @ 2014-03-31 4:09 UTC (permalink / raw)
To: u-boot
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
---
arch/sh/cpu/sh2/cache.c | 96 -------------------------------------------------
1 file changed, 96 deletions(-)
delete mode 100644 arch/sh/cpu/sh2/cache.c
diff --git a/arch/sh/cpu/sh2/cache.c b/arch/sh/cpu/sh2/cache.c
deleted file mode 100644
index 8093e98..0000000
--- a/arch/sh/cpu/sh2/cache.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * (C) Copyright 2007
- * Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
- *
- * Copyright (C) 2007, 2008 Nobobuhiro Iwamatsu <iwamatsu@nigauri.org>
- * Copyright (C) 2008 Renesas Solutions Corp.
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#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)
-
-#define CACHE_VALID 1
-#define CACHE_UPDATED 2
-
-static inline void cache_wback_all(void)
-{
- unsigned long addr, data, i, j;
-
- jump_to_P2();
- for (i = 0; i < CACHE_OC_NUM_ENTRIES; i++) {
- for (j = 0; j < CACHE_OC_NUM_WAYS; j++) {
- addr = CACHE_OC_ADDRESS_ARRAY
- | (j << CACHE_OC_WAY_SHIFT)
- | (i << CACHE_OC_ENTRY_SHIFT);
- data = inl(addr);
- if (data & CACHE_UPDATED) {
- data &= ~CACHE_UPDATED;
- outl(data, addr);
- }
- }
- }
- back_to_P1();
-}
-
-
-#define CACHE_ENABLE 0
-#define CACHE_DISABLE 1
-
-int cache_control(unsigned int cmd)
-{
- unsigned long ccr;
-
- jump_to_P2();
- ccr = inl(CCR);
-
- if (ccr & CCR_CACHE_ENABLE)
- cache_wback_all();
-
- if (cmd == CACHE_DISABLE)
- outl(CCR_CACHE_STOP, CCR);
- else
- outl(CCR_CACHE_INIT, CCR);
- back_to_P1();
-
- return 0;
-}
--
1.8.3.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] sh: delete an unused source file
2014-03-31 4:09 [U-Boot] [PATCH] sh: delete an unused source file Masahiro Yamada
@ 2014-03-31 5:46 ` Nobuhiro Iwamatsu
2014-03-31 6:02 ` Nobuhiro Iwamatsu
0 siblings, 1 reply; 5+ messages in thread
From: Nobuhiro Iwamatsu @ 2014-03-31 5:46 UTC (permalink / raw)
To: u-boot
2014-03-31 13:09 GMT+09:00 Masahiro Yamada <yamada.m@jp.panasonic.com>:
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> ---
> arch/sh/cpu/sh2/cache.c | 96 -------------------------------------------------
> 1 file changed, 96 deletions(-)
> delete mode 100644 arch/sh/cpu/sh2/cache.c
>
> diff --git a/arch/sh/cpu/sh2/cache.c b/arch/sh/cpu/sh2/cache.c
> deleted file mode 100644
> index 8093e98..0000000
> --- a/arch/sh/cpu/sh2/cache.c
> +++ /dev/null
> @@ -1,96 +0,0 @@
> -/*
> - * (C) Copyright 2007
> - * Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
> - *
> - * Copyright (C) 2007, 2008 Nobobuhiro Iwamatsu <iwamatsu@nigauri.org>
> - * Copyright (C) 2008 Renesas Solutions Corp.
> - *
> - * SPDX-License-Identifier: GPL-2.0+
> - */
> -
> -#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)
> -
> -#define CACHE_VALID 1
> -#define CACHE_UPDATED 2
> -
> -static inline void cache_wback_all(void)
> -{
> - unsigned long addr, data, i, j;
> -
> - jump_to_P2();
> - for (i = 0; i < CACHE_OC_NUM_ENTRIES; i++) {
> - for (j = 0; j < CACHE_OC_NUM_WAYS; j++) {
> - addr = CACHE_OC_ADDRESS_ARRAY
> - | (j << CACHE_OC_WAY_SHIFT)
> - | (i << CACHE_OC_ENTRY_SHIFT);
> - data = inl(addr);
> - if (data & CACHE_UPDATED) {
> - data &= ~CACHE_UPDATED;
> - outl(data, addr);
> - }
> - }
> - }
> - back_to_P1();
> -}
> -
> -
> -#define CACHE_ENABLE 0
> -#define CACHE_DISABLE 1
> -
> -int cache_control(unsigned int cmd)
> -{
> - unsigned long ccr;
> -
> - jump_to_P2();
> - ccr = inl(CCR);
> -
> - if (ccr & CCR_CACHE_ENABLE)
> - cache_wback_all();
> -
> - if (cmd == CACHE_DISABLE)
> - outl(CCR_CACHE_STOP, CCR);
> - else
> - outl(CCR_CACHE_INIT, CCR);
> - back_to_P1();
> -
> - return 0;
> -}
> --
> 1.8.3.2
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
--
Nobuhiro Iwamatsu
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] sh: delete an unused source file
2014-03-31 5:46 ` Nobuhiro Iwamatsu
@ 2014-03-31 6:02 ` Nobuhiro Iwamatsu
2014-04-28 8:00 ` Masahiro Yamada
0 siblings, 1 reply; 5+ messages in thread
From: Nobuhiro Iwamatsu @ 2014-03-31 6:02 UTC (permalink / raw)
To: u-boot
Applied to u-boot-sh.git.
Thanks!
Nobuhiro
2014-03-31 14:46 GMT+09:00 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>:
> 2014-03-31 13:09 GMT+09:00 Masahiro Yamada <yamada.m@jp.panasonic.com>:
>> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
>> Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
>
> Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
>
>> ---
>> arch/sh/cpu/sh2/cache.c | 96 -------------------------------------------------
>> 1 file changed, 96 deletions(-)
>> delete mode 100644 arch/sh/cpu/sh2/cache.c
>>
>> diff --git a/arch/sh/cpu/sh2/cache.c b/arch/sh/cpu/sh2/cache.c
>> deleted file mode 100644
>> index 8093e98..0000000
>> --- a/arch/sh/cpu/sh2/cache.c
>> +++ /dev/null
>> @@ -1,96 +0,0 @@
>> -/*
>> - * (C) Copyright 2007
>> - * Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
>> - *
>> - * Copyright (C) 2007, 2008 Nobobuhiro Iwamatsu <iwamatsu@nigauri.org>
>> - * Copyright (C) 2008 Renesas Solutions Corp.
>> - *
>> - * SPDX-License-Identifier: GPL-2.0+
>> - */
>> -
>> -#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)
>> -
>> -#define CACHE_VALID 1
>> -#define CACHE_UPDATED 2
>> -
>> -static inline void cache_wback_all(void)
>> -{
>> - unsigned long addr, data, i, j;
>> -
>> - jump_to_P2();
>> - for (i = 0; i < CACHE_OC_NUM_ENTRIES; i++) {
>> - for (j = 0; j < CACHE_OC_NUM_WAYS; j++) {
>> - addr = CACHE_OC_ADDRESS_ARRAY
>> - | (j << CACHE_OC_WAY_SHIFT)
>> - | (i << CACHE_OC_ENTRY_SHIFT);
>> - data = inl(addr);
>> - if (data & CACHE_UPDATED) {
>> - data &= ~CACHE_UPDATED;
>> - outl(data, addr);
>> - }
>> - }
>> - }
>> - back_to_P1();
>> -}
>> -
>> -
>> -#define CACHE_ENABLE 0
>> -#define CACHE_DISABLE 1
>> -
>> -int cache_control(unsigned int cmd)
>> -{
>> - unsigned long ccr;
>> -
>> - jump_to_P2();
>> - ccr = inl(CCR);
>> -
>> - if (ccr & CCR_CACHE_ENABLE)
>> - cache_wback_all();
>> -
>> - if (cmd == CACHE_DISABLE)
>> - outl(CCR_CACHE_STOP, CCR);
>> - else
>> - outl(CCR_CACHE_INIT, CCR);
>> - back_to_P1();
>> -
>> - return 0;
>> -}
>> --
>> 1.8.3.2
>>
>> _______________________________________________
>> U-Boot mailing list
>> U-Boot at lists.denx.de
>> http://lists.denx.de/mailman/listinfo/u-boot
>
>
>
> --
> Nobuhiro Iwamatsu
--
Nobuhiro Iwamatsu
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] sh: delete an unused source file
2014-03-31 6:02 ` Nobuhiro Iwamatsu
@ 2014-04-28 8:00 ` Masahiro Yamada
2014-05-08 8:52 ` Nobuhiro Iwamatsu
0 siblings, 1 reply; 5+ messages in thread
From: Masahiro Yamada @ 2014-04-28 8:00 UTC (permalink / raw)
To: u-boot
Hi Nobuhiro,
On Mon, 31 Mar 2014 15:02:24 +0900
Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> wrote:
> Applied to u-boot-sh.git.
> Thanks!
>
> Nobuhiro
>
> 2014-03-31 14:46 GMT+09:00 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>:
> > 2014-03-31 13:09 GMT+09:00 Masahiro Yamada <yamada.m@jp.panasonic.com>:
> >> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> >> Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
> >
> > Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
This patch went to u-boot-sh/next but it has not been synced with
the mainline.
Could you send a pull-request of u-boot-sh/next ?
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] sh: delete an unused source file
2014-04-28 8:00 ` Masahiro Yamada
@ 2014-05-08 8:52 ` Nobuhiro Iwamatsu
0 siblings, 0 replies; 5+ messages in thread
From: Nobuhiro Iwamatsu @ 2014-05-08 8:52 UTC (permalink / raw)
To: u-boot
Hi,
Sorry, reply was late.
This was already applied into u-boot/master.
Thanks!
Nobuhiro
2014-04-28 17:00 GMT+09:00 Masahiro Yamada <yamada.m@jp.panasonic.com>:
> Hi Nobuhiro,
>
> On Mon, 31 Mar 2014 15:02:24 +0900
> Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> wrote:
>
>> Applied to u-boot-sh.git.
>> Thanks!
>>
>> Nobuhiro
>>
>> 2014-03-31 14:46 GMT+09:00 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>:
>> > 2014-03-31 13:09 GMT+09:00 Masahiro Yamada <yamada.m@jp.panasonic.com>:
>> >> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
>> >> Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
>> >
>> > Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
>
>
> This patch went to u-boot-sh/next but it has not been synced with
> the mainline.
>
> Could you send a pull-request of u-boot-sh/next ?
>
> Best Regards
> Masahiro Yamada
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
--
Nobuhiro Iwamatsu
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-05-08 8:52 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-31 4:09 [U-Boot] [PATCH] sh: delete an unused source file Masahiro Yamada
2014-03-31 5:46 ` Nobuhiro Iwamatsu
2014-03-31 6:02 ` Nobuhiro Iwamatsu
2014-04-28 8:00 ` Masahiro Yamada
2014-05-08 8:52 ` Nobuhiro Iwamatsu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.