From 644ec6f9883638c7147adeac1c59db2a82fd1b7b Mon Sep 17 00:00:00 2001 From: rmilecki Date: Mon, 1 Jun 2015 06:11:26 +0000 Subject: [PATCH] kernel: backport ssb fix for WRT350N v1 (BCM4705) reboots MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45865 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../linux/brcm47xx/patches-4.0/159-cpu_fixes.patch | 32 +++++++++++----------- .../280-activate_ssb_support_in_usb.patch | 2 +- .../brcm47xx/patches-4.0/300-fork_cacheflush.patch | 2 +- .../patches-4.0/976-ssb_increase_pci_delay.patch | 2 +- .../generic/patches-3.18/020-ssb_update.patch | 9 +++--- .../linux/generic/patches-4.0/020-ssb_update.patch | 9 +++--- 6 files changed, 29 insertions(+), 27 deletions(-) diff --git a/target/linux/brcm47xx/patches-4.0/159-cpu_fixes.patch b/target/linux/brcm47xx/patches-4.0/159-cpu_fixes.patch index 214534577e..38c64318f1 100644 --- a/target/linux/brcm47xx/patches-4.0/159-cpu_fixes.patch +++ b/target/linux/brcm47xx/patches-4.0/159-cpu_fixes.patch @@ -1,6 +1,6 @@ --- a/arch/mips/include/asm/r4kcache.h +++ b/arch/mips/include/asm/r4kcache.h -@@ -23,6 +23,20 @@ +@@ -25,6 +25,20 @@ extern void (*r4k_blast_dcache)(void); extern void (*r4k_blast_icache)(void); @@ -21,7 +21,7 @@ /* * This macro return a properly sign-extended address suitable as base address * for indexed cache operations. Two issues here: -@@ -96,6 +110,7 @@ static inline void flush_icache_line_ind +@@ -98,6 +112,7 @@ static inline void flush_icache_line_ind static inline void flush_dcache_line_indexed(unsigned long addr) { __dflush_prologue @@ -29,7 +29,7 @@ cache_op(Index_Writeback_Inv_D, addr); __dflush_epilogue } -@@ -123,6 +138,7 @@ static inline void flush_icache_line(uns +@@ -125,6 +140,7 @@ static inline void flush_icache_line(uns static inline void flush_dcache_line(unsigned long addr) { __dflush_prologue @@ -37,7 +37,7 @@ cache_op(Hit_Writeback_Inv_D, addr); __dflush_epilogue } -@@ -130,6 +146,7 @@ static inline void flush_dcache_line(uns +@@ -132,6 +148,7 @@ static inline void flush_dcache_line(uns static inline void invalidate_dcache_line(unsigned long addr) { __dflush_prologue @@ -45,7 +45,7 @@ cache_op(Hit_Invalidate_D, addr); __dflush_epilogue } -@@ -185,6 +202,7 @@ static inline void protected_flush_icach +@@ -187,6 +204,7 @@ static inline void protected_flush_icach #ifdef CONFIG_EVA protected_cachee_op(Hit_Invalidate_I, addr); #else @@ -53,7 +53,7 @@ protected_cache_op(Hit_Invalidate_I, addr); #endif break; -@@ -199,6 +217,7 @@ static inline void protected_flush_icach +@@ -201,6 +219,7 @@ static inline void protected_flush_icach */ static inline void protected_writeback_dcache_line(unsigned long addr) { @@ -61,7 +61,7 @@ #ifdef CONFIG_EVA protected_cachee_op(Hit_Writeback_Inv_D, addr); #else -@@ -553,8 +572,51 @@ static inline void invalidate_tcache_pag +@@ -554,8 +573,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; \ -@@ -566,6 +628,7 @@ static inline void extra##blast_##pfx##c +@@ -567,6 +629,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); \ -@@ -580,6 +643,7 @@ static inline void extra##blast_##pfx##c +@@ -581,6 +644,7 @@ static inline void extra##blast_##pfx##c \ __##pfx##flush_prologue \ \ @@ -130,7 +130,7 @@ do { \ cache##lsize##_unroll32(start, hitop); \ start += lsize * 32; \ -@@ -598,6 +662,8 @@ static inline void extra##blast_##pfx##c +@@ -599,6 +663,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) \ -@@ -607,26 +673,26 @@ static inline void extra##blast_##pfx##c +@@ -608,26 +674,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) \ -@@ -655,17 +721,19 @@ __BUILD_BLAST_USER_CACHE(d, dcache, Inde +@@ -656,17 +722,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; \ -@@ -677,8 +745,8 @@ static inline void prot##extra##blast_## +@@ -678,8 +746,8 @@ static inline void prot##extra##blast_## #ifndef CONFIG_EVA @@ -218,7 +218,7 @@ #else -@@ -715,14 +783,14 @@ __BUILD_PROT_BLAST_CACHE_RANGE(d, dcache +@@ -716,14 +784,14 @@ __BUILD_PROT_BLAST_CACHE_RANGE(d, dcache __BUILD_PROT_BLAST_CACHE_RANGE(i, icache, Hit_Invalidate_I) #endif @@ -369,7 +369,7 @@ /* --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c -@@ -1286,6 +1286,9 @@ static void build_r4000_tlb_refill_handl +@@ -1269,6 +1269,9 @@ static void build_r4000_tlb_refill_handl /* No need for uasm_i_nop */ } @@ -379,7 +379,7 @@ #ifdef CONFIG_64BIT build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */ #else -@@ -1848,6 +1851,9 @@ build_r4000_tlbchange_handler_head(u32 * +@@ -1831,6 +1834,9 @@ build_r4000_tlbchange_handler_head(u32 * { struct work_registers wr = build_get_work_registers(p); diff --git a/target/linux/brcm47xx/patches-4.0/280-activate_ssb_support_in_usb.patch b/target/linux/brcm47xx/patches-4.0/280-activate_ssb_support_in_usb.patch index c44131f2fe..c4082ab464 100644 --- a/target/linux/brcm47xx/patches-4.0/280-activate_ssb_support_in_usb.patch +++ b/target/linux/brcm47xx/patches-4.0/280-activate_ssb_support_in_usb.patch @@ -15,7 +15,7 @@ This prevents the options from being delete with make kernel_oldconfig. the memory. This only works with the Broadcom SoCs from the --- a/drivers/ssb/Kconfig +++ b/drivers/ssb/Kconfig -@@ -146,6 +146,7 @@ config SSB_SFLASH +@@ -147,6 +147,7 @@ config SSB_SFLASH config SSB_EMBEDDED bool depends on SSB_DRIVER_MIPS && SSB_PCICORE_HOSTMODE diff --git a/target/linux/brcm47xx/patches-4.0/300-fork_cacheflush.patch b/target/linux/brcm47xx/patches-4.0/300-fork_cacheflush.patch index 686fb1b945..0f79debc6b 100644 --- a/target/linux/brcm47xx/patches-4.0/300-fork_cacheflush.patch +++ b/target/linux/brcm47xx/patches-4.0/300-fork_cacheflush.patch @@ -1,6 +1,6 @@ --- a/arch/mips/include/asm/cacheflush.h +++ b/arch/mips/include/asm/cacheflush.h -@@ -32,7 +32,7 @@ +@@ -46,7 +46,7 @@ extern void (*flush_cache_all)(void); extern void (*__flush_cache_all)(void); extern void (*flush_cache_mm)(struct mm_struct *mm); diff --git a/target/linux/brcm47xx/patches-4.0/976-ssb_increase_pci_delay.patch b/target/linux/brcm47xx/patches-4.0/976-ssb_increase_pci_delay.patch index bf932729e9..90bda515eb 100644 --- a/target/linux/brcm47xx/patches-4.0/976-ssb_increase_pci_delay.patch +++ b/target/linux/brcm47xx/patches-4.0/976-ssb_increase_pci_delay.patch @@ -1,6 +1,6 @@ --- a/drivers/ssb/driver_pcicore.c +++ b/drivers/ssb/driver_pcicore.c -@@ -388,7 +388,7 @@ static void ssb_pcicore_init_hostmode(st +@@ -389,7 +389,7 @@ static void ssb_pcicore_init_hostmode(st set_io_port_base(ssb_pcicore_controller.io_map_base); /* Give some time to the PCI controller to configure itself with the new * values. Not waiting at this point causes crashes of the machine. */ diff --git a/target/linux/generic/patches-3.18/020-ssb_update.patch b/target/linux/generic/patches-3.18/020-ssb_update.patch index 7afba07763..f94d160fc6 100644 --- a/target/linux/generic/patches-3.18/020-ssb_update.patch +++ b/target/linux/generic/patches-3.18/020-ssb_update.patch @@ -78,18 +78,19 @@ } --- a/drivers/ssb/driver_pcicore.c +++ b/drivers/ssb/driver_pcicore.c -@@ -357,6 +357,15 @@ static void ssb_pcicore_init_hostmode(st +@@ -357,6 +357,16 @@ static void ssb_pcicore_init_hostmode(st pcicore_write32(pc, SSB_PCICORE_SBTOPCI2, SSB_PCICORE_SBTOPCI_MEM | SSB_PCI_DMA); + /* + * Accessing PCI config without a proper delay after devices reset (not -+ * GPIO reset) was causing reboots on WRT300N v1.0. ++ * GPIO reset) was causing reboots on WRT300N v1.0 (BCM4704). + * Tested delay 850 us lowered reboot chance to 50-80%, 1000 us fixed it + * completely. Flushing all writes was also tested but with no luck. ++ * The same problem was reported for WRT350N v1 (BCM4705), so we just ++ * sleep here unconditionally. + */ -+ if (pc->dev->bus->chip_id == 0x4704) -+ usleep_range(1000, 2000); ++ usleep_range(1000, 2000); + /* Enable PCI bridge BAR0 prefetch and burst */ val = PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY; diff --git a/target/linux/generic/patches-4.0/020-ssb_update.patch b/target/linux/generic/patches-4.0/020-ssb_update.patch index 946cb3b106..d7e15aea42 100644 --- a/target/linux/generic/patches-4.0/020-ssb_update.patch +++ b/target/linux/generic/patches-4.0/020-ssb_update.patch @@ -1,17 +1,18 @@ --- a/drivers/ssb/driver_pcicore.c +++ b/drivers/ssb/driver_pcicore.c -@@ -357,6 +357,15 @@ static void ssb_pcicore_init_hostmode(st +@@ -357,6 +357,16 @@ static void ssb_pcicore_init_hostmode(st pcicore_write32(pc, SSB_PCICORE_SBTOPCI2, SSB_PCICORE_SBTOPCI_MEM | SSB_PCI_DMA); + /* + * Accessing PCI config without a proper delay after devices reset (not -+ * GPIO reset) was causing reboots on WRT300N v1.0. ++ * GPIO reset) was causing reboots on WRT300N v1.0 (BCM4704). + * Tested delay 850 us lowered reboot chance to 50-80%, 1000 us fixed it + * completely. Flushing all writes was also tested but with no luck. ++ * The same problem was reported for WRT350N v1 (BCM4705), so we just ++ * sleep here unconditionally. + */ -+ if (pc->dev->bus->chip_id == 0x4704) -+ usleep_range(1000, 2000); ++ usleep_range(1000, 2000); + /* Enable PCI bridge BAR0 prefetch and burst */ val = PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY; -- 2.11.0