domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: refresh patches for kernel 3.18

Browse Source 
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 43536
This commit is contained in:
Hauke Mehrtens
2014-12-07 16:12:44 +00:00
parent 8e738da02c
commit 563f963b1b
12 changed files with 45 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
target/linux/brcm47xx/patches-3.18/159-cpu_fixes.patch
View File

@@ -58,10 +58,10 @@
static inline void protected_writeback_dcache_line(unsigned long addr)
{
+ BCM4710_DUMMY_RREG();
protected_cache_op(Hit_Writeback_Inv_D, addr);
}
@@ -462,8 +481,51 @@ static inline void invalidate_tcache_pag
#ifdef CONFIG_EVA
protected_cachee_op(Hit_Writeback_Inv_D, addr);
#else
@@ -466,8 +485,51 @@ static inline void invalidate_tcache_pag
: "r" (base), \
"i" (op));
@@ -114,7 +114,7 @@
static inline void extra##blast_##pfx##cache##lsize(void) \
{ \
unsigned long start = INDEX_BASE; \
@@ -475,6 +537,7 @@ static inline void extra##blast_##pfx##c
@@ -479,6 +541,7 @@ static inline void extra##blast_##pfx##c
\
__##pfx##flush_prologue \
\
@@ -122,7 +122,7 @@
for (ws = 0; ws < ws_end; ws += ws_inc) \
for (addr = start; addr < end; addr += lsize * 32) \
cache##lsize##_unroll32(addr|ws, indexop); \
@@ -489,6 +552,7 @@ static inline void extra##blast_##pfx##c
@@ -493,6 +556,7 @@ static inline void extra##blast_##pfx##c
\
__##pfx##flush_prologue \
\
@@ -130,7 +130,7 @@
do { \
cache##lsize##_unroll32(start, hitop); \
start += lsize * 32; \
@@ -507,6 +571,8 @@ static inline void extra##blast_##pfx##c
@@ -511,6 +575,8 @@ static inline void extra##blast_##pfx##c
current_cpu_data.desc.waybit; \
unsigned long ws, addr; \
\
@@ -139,7 +139,7 @@
__##pfx##flush_prologue \
\
for (ws = 0; ws < ws_end; ws += ws_inc) \
@@ -516,26 +582,26 @@ static inline void extra##blast_##pfx##c
@@ -520,26 +586,26 @@ static inline void extra##blast_##pfx##c
__##pfx##flush_epilogue \
}
@@ -186,7 +186,7 @@
#define __BUILD_BLAST_USER_CACHE(pfx, desc, indexop, hitop, lsize) \
static inline void blast_##pfx##cache##lsize##_user_page(unsigned long page) \
@@ -564,17 +630,19 @@ __BUILD_BLAST_USER_CACHE(d, dcache, Inde
@@ -568,17 +634,19 @@ __BUILD_BLAST_USER_CACHE(d, dcache, Inde
__BUILD_BLAST_USER_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 64)
/* build blast_xxx_range, protected_blast_xxx_range */
@@ -207,7 +207,7 @@
prot##cache_op(hitop, addr); \
if (addr == aend) \
break; \
@@ -586,8 +654,8 @@ static inline void prot##extra##blast_##
@@ -590,8 +658,8 @@ static inline void prot##extra##blast_##
#ifndef CONFIG_EVA
@@ -218,7 +218,7 @@
#else
@@ -624,14 +692,14 @@ __BUILD_PROT_BLAST_CACHE_RANGE(d, dcache
@@ -628,14 +696,14 @@ __BUILD_PROT_BLAST_CACHE_RANGE(d, dcache
__BUILD_PROT_BLAST_CACHE_RANGE(i, icache, Hit_Invalidate_I)
#endif

7
target/linux/brcm47xx/patches-3.18/400-mtd-bcm47xxpart-lower-minimal-blocksize-to-4Ki-from-.patch
View File

@@ -19,11 +19,9 @@ Any objections?
drivers/mtd/bcm47xxpart.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c
index dfd57a0..948f535 100644
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
@@ -95,8 +95,12 @@ static int bcm47xxpart_parse(struct mtd_info *master,
@@ -95,8 +95,12 @@ static int bcm47xxpart_parse(struct mtd_
int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, };
bool found_nvram = false;
@@ -38,6 +36,3 @@ index dfd57a0..948f535 100644
/* Alloc */
parts = kzalloc(sizeof(struct mtd_partition) * BCM47XXPART_MAX_PARTS,
--
1.8.4.5

11
target/linux/brcm47xx/patches-3.18/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch
View File

@@ -11,8 +11,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
drivers/bcma/driver_chipcommon_sflash.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/drivers/bcma/driver_chipcommon_sflash.c b/drivers/bcma/driver_chipcommon_sflash.c
index 7e11ef4..25d9e17 100644
--- a/drivers/bcma/driver_chipcommon_sflash.c
+++ b/drivers/bcma/driver_chipcommon_sflash.c
@@ -9,6 +9,7 @@
@@ -23,7 +21,7 @@ index 7e11ef4..25d9e17 100644
static struct resource bcma_sflash_resource = {
.name = "bcma_sflash",
@@ -41,6 +42,13 @@ static const struct bcma_sflash_tbl_e bcma_sflash_st_tbl[] = {
@@ -41,6 +42,13 @@ static const struct bcma_sflash_tbl_e bc
{ NULL },
};
@@ -37,7 +35,7 @@ index 7e11ef4..25d9e17 100644
static const struct bcma_sflash_tbl_e bcma_sflash_sst_tbl[] = {
{ "SST25WF512", 1, 0x1000, 16, },
{ "SST25VF512", 0x48, 0x1000, 16, },
@@ -84,6 +92,23 @@ static void bcma_sflash_cmd(struct bcma_drv_cc *cc, u32 opcode)
@@ -84,6 +92,23 @@ static void bcma_sflash_cmd(struct bcma_
bcma_err(cc->core->bus, "SFLASH control command failed (timeout)!\n");
}
@@ -61,7 +59,7 @@ index 7e11ef4..25d9e17 100644
/* Initialize serial flash access */
int bcma_sflash_init(struct bcma_drv_cc *cc)
{
@@ -114,6 +139,10 @@ int bcma_sflash_init(struct bcma_drv_cc *cc)
@@ -114,6 +139,10 @@ int bcma_sflash_init(struct bcma_drv_cc
case 0x13:
return -ENOTSUPP;
default:
@@ -72,6 +70,3 @@ index 7e11ef4..25d9e17 100644
for (e = bcma_sflash_st_tbl; e->name; e++) {
if (e->id == id)
break;
--
1.8.4.5

2
target/linux/brcm47xx/patches-3.18/920-cache-wround.patch
View File

@@ -86,7 +86,7 @@
build_get_pgde32(p, wr.r1, wr.r2); /* get pgd in ptr */
#endif
@@ -1894,6 +1900,9 @@ build_r4000_tlbchange_handler_tail(u32 *
@@ -1902,6 +1908,9 @@ build_r4000_tlbchange_handler_tail(u32 *
build_tlb_write_entry(p, l, r, tlb_indexed);
uasm_l_leave(l, *p);
build_restore_work_registers(p);