bmips: update patches sent upstream
[openwrt/staging/dedeckeh.git] / target / linux / bmips / patches-5.15 / 202-mips-bmips-BCM6358-disable-ARCH_HAS_SYNC_DMA_FOR_CPU_ALL.patch
1 From f48c93e4c4b5dbad1c0fbd623fd68f55f1667527 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
3 Date: Fri, 10 Mar 2023 13:05:10 +0100
4 Subject: [PATCH] mips: bmips: BCM6358: disable arch_sync_dma_for_cpu_all() for
5 TP1
6 MIME-Version: 1.0
7 Content-Type: text/plain; charset=UTF-8
8 Content-Transfer-Encoding: 8bit
9
10 arch_sync_dma_for_cpu_all() causes kernel panics on BCM6358 with EHCI/OHCI:
11 [ 3.881739] usb 1-1: new high-speed USB device number 2 using ehci-platform
12 [ 3.895011] Reserved instruction in kernel code[#1]:
13 [ 3.900113] CPU: 0 PID: 1 Comm: init Not tainted 5.10.16 #0
14 [ 3.905829] $ 0 : 00000000 10008700 00000000 77d94060
15 [ 3.911238] $ 4 : 7fd1f088 00000000 81431cac 81431ca0
16 [ 3.916641] $ 8 : 00000000 ffffefff 8075cd34 00000000
17 [ 3.922043] $12 : 806f8d40 f3e812b7 00000000 000d9aaa
18 [ 3.927446] $16 : 7fd1f068 7fd1f080 7ff559b8 81428470
19 [ 3.932848] $20 : 00000000 00000000 55590000 77d70000
20 [ 3.938251] $24 : 00000018 00000010
21 [ 3.943655] $28 : 81430000 81431e60 81431f28 800157fc
22 [ 3.949058] Hi : 00000000
23 [ 3.952013] Lo : 00000000
24 [ 3.955019] epc : 80015808 setup_sigcontext+0x54/0x24c
25 [ 3.960464] ra : 800157fc setup_sigcontext+0x48/0x24c
26 [ 3.965913] Status: 10008703 KERNEL EXL IE
27 [ 3.970216] Cause : 00800028 (ExcCode 0a)
28 [ 3.974340] PrId : 0002a010 (Broadcom BMIPS4350)
29 [ 3.979170] Modules linked in: ohci_platform ohci_hcd fsl_mph_dr_of ehci_platform ehci_fsl ehci_hcd gpio_button_hotplug usbcore nls_base usb_common
30 [ 3.992907] Process init (pid: 1, threadinfo=(ptrval), task=(ptrval), tls=77e22ec8)
31 [ 4.000776] Stack : 81431ef4 7fd1f080 81431f28 81428470 7fd1f068 81431edc 7ff559b8 81428470
32 [ 4.009467] 81431f28 7fd1f080 55590000 77d70000 77d5498c 80015c70 806f0000 8063ae74
33 [ 4.018149] 08100002 81431f28 0000000a 08100002 81431f28 0000000a 77d6b418 00000003
34 [ 4.026831] ffffffff 80016414 80080734 81431ecc 81431ecc 00000001 00000000 04000000
35 [ 4.035512] 77d54874 00000000 00000000 00000000 00000000 00000012 00000002 00000000
36 [ 4.044196] ...
37 [ 4.046706] Call Trace:
38 [ 4.049238] [<80015808>] setup_sigcontext+0x54/0x24c
39 [ 4.054356] [<80015c70>] setup_frame+0xdc/0x124
40 [ 4.059015] [<80016414>] do_notify_resume+0x1dc/0x288
41 [ 4.064207] [<80011b50>] work_notifysig+0x10/0x18
42 [ 4.069036]
43 [ 4.070538] Code: 8fc300b4 00001025 26240008 <ac820000> ac830004 3c048063 0c0228aa 24846a00 26240010
44 [ 4.080686]
45 [ 4.082517] ---[ end trace 22a8edb41f5f983b ]---
46 [ 4.087374] Kernel panic - not syncing: Fatal exception
47 [ 4.092753] Rebooting in 1 seconds..
48
49 This only happens when booting from TP1 instead of TP0.
50
51 Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
52 ---
53 arch/mips/bmips/dma.c | 5 +++++
54 arch/mips/bmips/setup.c | 9 +++++++++
55 2 files changed, 14 insertions(+)
56
57 --- a/arch/mips/bmips/dma.c
58 +++ b/arch/mips/bmips/dma.c
59 @@ -64,11 +64,16 @@ phys_addr_t dma_to_phys(struct device *d
60 return dma_addr;
61 }
62
63 +int bmips_dma_sync_disable = 0;
64 +
65 void arch_sync_dma_for_cpu_all(void)
66 {
67 void __iomem *cbr = BMIPS_GET_CBR();
68 u32 cfg;
69
70 + if (bmips_dma_sync_disable)
71 + return;
72 +
73 if (boot_cpu_type() != CPU_BMIPS3300 &&
74 boot_cpu_type() != CPU_BMIPS4350 &&
75 boot_cpu_type() != CPU_BMIPS4380)
76 --- a/arch/mips/bmips/setup.c
77 +++ b/arch/mips/bmips/setup.c
78 @@ -89,6 +89,8 @@
79
80 #define DDR_CSEND_REG 0x8
81
82 +extern int bmips_dma_sync_disable;
83 +
84 static const unsigned long kbase = VMLINUX_LOAD_ADDRESS & 0xfff00000;
85
86 struct bmips_cpufreq {
87 @@ -168,6 +170,13 @@ static void bcm6358_quirks(void)
88 * disable SMP for now
89 */
90 bmips_smp_enabled = 0;
91 +
92 + /*
93 + * ARCH_HAS_SYNC_DMA_FOR_CPU_ALL causes kernel panics on BCM6358 when
94 + * booting from TP1
95 + */
96 + if (read_c0_brcm_cmt_local() & (1 << 31))
97 + bmips_dma_sync_disable = 1;
98 }
99
100 static void bcm6368_quirks(void)