refresh patches

[openwrt.git] / target / linux / brcm47xx / patches-2.6.30 / 920-cache-wround.patch

diff --git a/target/linux/brcm47xx/patches-2.6.30/920-cache-wround.patch b/target/linux/brcm47xx/patches-2.6.30/920-cache-wround.patch
index 7bf4a24..e9b37e7 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.30/920-cache-wround.patch
+++ b/target/linux/brcm47xx/patches-2.6.30/920-cache-wround.patch
@@ -1,5 +1,5 @@
---- a/arch/mips/include/asm/r4kcache.h         2008-12-03 14:06:48.000000000 +0100
-+++ b/arch/mips/include/asm/r4kcache.h         2008-12-05 08:16:03.000000000 +0100
+--- a/arch/mips/include/asm/r4kcache.h
++++ b/arch/mips/include/asm/r4kcache.h

 @@ -20,10 +20,25 @@
  #ifdef CONFIG_BCM47XX
  #include <asm/paccess.h>
 @@ -20,10 +20,25 @@
  #ifdef CONFIG_BCM47XX
  #include <asm/paccess.h>


@@ -29,9 +29,9 @@
  #else
  #define BCM4710_DUMMY_RREG()
  
  #else
  #define BCM4710_DUMMY_RREG()
  

---- a/arch/mips/mm/tlbex.c     2008-12-03 17:39:32.000000000 +0100
-+++ b/arch/mips/mm/tlbex.c     2008-12-03 17:11:43.000000000 +0100
-@@ -547,6 +547,9 @@
+--- a/arch/mips/mm/tlbex.c
++++ b/arch/mips/mm/tlbex.c
+@@ -544,6 +544,9 @@ build_get_pgde32(u32 **p, unsigned int t

  #endif
        uasm_i_addu(p, ptr, tmp, ptr);
  #else
  #endif
        uasm_i_addu(p, ptr, tmp, ptr);
  #else


@@ -41,7 +41,7 @@
        UASM_i_LA_mostly(p, ptr, pgdc);
  #endif
        uasm_i_mfc0(p, tmp, C0_BADVADDR); /* get faulting address */
        UASM_i_LA_mostly(p, ptr, pgdc);
  #endif
        uasm_i_mfc0(p, tmp, C0_BADVADDR); /* get faulting address */

-@@ -677,12 +680,12 @@
+@@ -674,12 +677,12 @@ static void __cpuinit build_r4000_tlb_re

                /* No need for uasm_i_nop */
        }
  
                /* No need for uasm_i_nop */
        }
  


@@ -57,7 +57,7 @@
        build_get_pgde32(&p, K0, K1); /* get pgd in K1 */
  #endif
  
        build_get_pgde32(&p, K0, K1); /* get pgd in K1 */
  #endif
  

-@@ -690,6 +693,9 @@
+@@ -687,6 +690,9 @@ static void __cpuinit build_r4000_tlb_re

        build_update_entries(&p, K0, K1);
        build_tlb_write_entry(&p, &l, &r, tlb_random);
        uasm_l_leave(&l, p);
        build_update_entries(&p, K0, K1);
        build_tlb_write_entry(&p, &l, &r, tlb_random);
        uasm_l_leave(&l, p);


@@ -67,7 +67,7 @@
        uasm_i_eret(&p); /* return from trap */
  
  #ifdef CONFIG_64BIT
        uasm_i_eret(&p); /* return from trap */
  
  #ifdef CONFIG_64BIT

-@@ -1087,12 +1093,12 @@
+@@ -1084,12 +1090,12 @@ build_r4000_tlbchange_handler_head(u32 *

                                   struct uasm_reloc **r, unsigned int pte,
                                   unsigned int ptr)
  {
                                   struct uasm_reloc **r, unsigned int pte,
                                   unsigned int ptr)
  {


@@ -83,7 +83,7 @@
        build_get_pgde32(p, pte, ptr); /* get pgd in ptr */
  #endif
  
        build_get_pgde32(p, pte, ptr); /* get pgd in ptr */
  #endif
  

-@@ -1120,6 +1126,9 @@
+@@ -1117,6 +1123,9 @@ build_r4000_tlbchange_handler_tail(u32 *

        build_update_entries(p, tmp, ptr);
        build_tlb_write_entry(p, l, r, tlb_indexed);
        uasm_l_leave(l, *p);
        build_update_entries(p, tmp, ptr);
        build_tlb_write_entry(p, l, r, tlb_indexed);
        uasm_l_leave(l, *p);


@@ -93,11 +93,11 @@
        uasm_i_eret(p); /* return from trap */
  
  #ifdef CONFIG_64BIT
        uasm_i_eret(p); /* return from trap */
  
  #ifdef CONFIG_64BIT

---- a/arch/mips/kernel/genex.S 2008-11-16 15:33:32.000000000 +0100
-+++ b/arch/mips/kernel/genex.S 2008-12-05 07:14:52.000000000 +0100
-@@ -21,6 +21,19 @@
- #include <asm/war.h>
+--- a/arch/mips/kernel/genex.S
++++ b/arch/mips/kernel/genex.S
+@@ -22,6 +22,19 @@

  #include <asm/page.h>
  #include <asm/page.h>

+ #include <asm/thread_info.h>

  
 +#ifdef CONFIG_BCM47XX
 +# ifdef eret
  
 +#ifdef CONFIG_BCM47XX
 +# ifdef eret


@@ -115,7 +115,7 @@
  #define PANIC_PIC(msg)                                        \
                .set push;                              \
                .set    reorder;                        \
  #define PANIC_PIC(msg)                                        \
                .set push;                              \
                .set    reorder;                        \

-@@ -53,7 +66,6 @@
+@@ -54,7 +67,6 @@ NESTED(except_vec3_generic, 0, sp)

        .set    noat
  #ifdef CONFIG_BCM47XX
        nop
        .set    noat
  #ifdef CONFIG_BCM47XX
        nop


@@ -123,7 +123,7 @@
  #endif
  #if R5432_CP0_INTERRUPT_WAR
        mfc0    k0, CP0_INDEX
  #endif
  #if R5432_CP0_INTERRUPT_WAR
        mfc0    k0, CP0_INDEX

-@@ -78,6 +90,9 @@
+@@ -79,6 +91,9 @@ NESTED(except_vec3_r4000, 0, sp)

        .set    push
        .set    mips3
        .set    noat
        .set    push
        .set    mips3
        .set    noat