2010-06-30 16:02:19

by Christoph Egger

[permalink] [raw]
Subject: [PATCH 26/33] Removing dead XSCALE_CACHE_ERRATA

XSCALE_CACHE_ERRATA doesn't exist in Kconfig, therefore removing all
references for it from the source code.

Signed-off-by: Christoph Egger <[email protected]>
---
arch/arm/mach-pxa/sleep.S | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-pxa/sleep.S b/arch/arm/mach-pxa/sleep.S
index 2ed95f3..52c30b0 100644
--- a/arch/arm/mach-pxa/sleep.S
+++ b/arch/arm/mach-pxa/sleep.S
@@ -339,10 +339,6 @@ ENTRY(pxa_cpu_resume)
mcr p15, 0, r1, c8, c7, 0 @ invalidate I & D TLBs
mcr p15, 0, r1, c7, c7, 0 @ invalidate I & D caches, BTB

-#ifdef CONFIG_XSCALE_CACHE_ERRATA
- bic r9, r9, #0x0004 @ see cpu_xscale_proc_init
-#endif
-
mcr p14, 0, r3, c6, c0, 0 @ clock configuration, turbo mode.
mcr p15, 0, r4, c15, c1, 0 @ CP access reg
mcr p15, 0, r5, c13, c0, 0 @ PID
@@ -368,9 +364,6 @@ sleep_save_sp:

.text
resume_after_mmu:
-#ifdef CONFIG_XSCALE_CACHE_ERRATA
- bl cpu_xscale_proc_init
-#endif
ldmfd sp!, {r2, r3}
#ifndef CONFIG_IWMMXT
mar acc0, r2, r3
--
1.7.0.4


2010-07-01 04:26:04

by Eric Miao

[permalink] [raw]
Subject: Re: [PATCH 26/33] Removing dead XSCALE_CACHE_ERRATA

On Thu, Jul 1, 2010 at 12:02 AM, Christoph Egger <[email protected]> wrote:
> XSCALE_CACHE_ERRATA doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
> Signed-off-by: Christoph Egger <[email protected]>

Acked-by: Eric Miao <[email protected]>

It's not been there since 2.6, found some references in 2.4 kernel though. And
I doubt anyone has encountered this issue in real products on market.

> ---
>  arch/arm/mach-pxa/sleep.S |    7 -------
>  1 files changed, 0 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/sleep.S b/arch/arm/mach-pxa/sleep.S
> index 2ed95f3..52c30b0 100644
> --- a/arch/arm/mach-pxa/sleep.S
> +++ b/arch/arm/mach-pxa/sleep.S
> @@ -339,10 +339,6 @@ ENTRY(pxa_cpu_resume)
>        mcr     p15, 0, r1, c8, c7, 0           @ invalidate I & D TLBs
>        mcr     p15, 0, r1, c7, c7, 0           @ invalidate I & D caches, BTB
>
> -#ifdef CONFIG_XSCALE_CACHE_ERRATA
> -       bic     r9, r9, #0x0004                 @ see cpu_xscale_proc_init
> -#endif
> -
>        mcr     p14, 0, r3, c6, c0, 0           @ clock configuration, turbo mode.
>        mcr     p15, 0, r4, c15, c1, 0          @ CP access reg
>        mcr     p15, 0, r5, c13, c0, 0          @ PID
> @@ -368,9 +364,6 @@ sleep_save_sp:
>
>        .text
>  resume_after_mmu:
> -#ifdef CONFIG_XSCALE_CACHE_ERRATA
> -       bl      cpu_xscale_proc_init
> -#endif
>        ldmfd   sp!, {r2, r3}
>  #ifndef CONFIG_IWMMXT
>        mar     acc0, r2, r3
> --
> 1.7.0.4
>
>

2010-07-04 15:57:10

by Eric Miao

[permalink] [raw]
Subject: Re: [PATCH 26/33] Removing dead XSCALE_CACHE_ERRATA

On Thu, Jul 1, 2010 at 12:25 PM, Eric Miao <[email protected]> wrote:
> On Thu, Jul 1, 2010 at 12:02 AM, Christoph Egger <[email protected]> wrote:
>> XSCALE_CACHE_ERRATA doesn't exist in Kconfig, therefore removing all
>> references for it from the source code.
>>
>> Signed-off-by: Christoph Egger <[email protected]>
>
> Acked-by: Eric Miao <[email protected]>
>
> It's not been there since 2.6, found some references in 2.4 kernel though. And
> I doubt anyone has encountered this issue in real products on market.
>

Applied.