| blob | 1c664a7f22d5c3a7d97c609c6a932c0cc71b26be |
1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
2 # T2 SDE: package/*/linux/hotfix-cont-sun-pci.patch
3 # Copyright (C) 2024 The T2 SDE Project
4 #
5 # This Copyright note is generated by scripts/Create-CopyPatch,
6 # more information can be found in the files COPYING and README.
7 #
8 # This patch file is dual-licensed. It is available under the license the
9 # patched project is licensed under, as long as it is an OpenSource license
10 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
11 # of the GNU General Public License version 2 as used by the T2 SDE.
12 # --- T2-COPYRIGHT-NOTE-END ---
14 Fix some more PCI logging printk to KERN_CONT correctly.
16 --- linux-6.10/arch/sparc/kernel/pci_psycho.c.vanilla 2024-09-25 19:23:27.753383017 +0200
17 +++ linux-6.10/arch/sparc/kernel/pci_psycho.c 2024-09-25 19:28:03.943384215 +0200
18 @@ -172,19 +172,19 @@
19 reported = 0;
20 if (afsr & PSYCHO_UEAFSR_SPIO) {
21 reported++;
22 - printk("(PIO)");
23 + printk(KERN_CONT "(PIO)");
24 }
25 if (afsr & PSYCHO_UEAFSR_SDRD) {
26 reported++;
27 - printk("(DMA Read)");
28 + printk(KERN_CONT "(DMA Read)");
29 }
30 if (afsr & PSYCHO_UEAFSR_SDWR) {
31 reported++;
32 - printk("(DMA Write)");
33 + printk(KERN_CONT "(DMA Write)");
34 }
35 if (!reported)
36 - printk("(none)");
37 - printk("]\n");
38 + printk(KERN_CONT "(none)");
39 + printk(KERN_CONT "]\n");
41 /* Interrogate both IOMMUs for error status. */
42 psycho_check_iommu_error(pbm, afsr, afar, UE_ERR);
43 @@ -257,19 +257,19 @@
44 reported = 0;
45 if (afsr & PSYCHO_CEAFSR_SPIO) {
46 reported++;
47 - printk("(PIO)");
48 + printk(KERN_CONT "(PIO)");
49 }
50 if (afsr & PSYCHO_CEAFSR_SDRD) {
51 reported++;
52 - printk("(DMA Read)");
53 + printk(KERN_CONT "(DMA Read)");
54 }
55 if (afsr & PSYCHO_CEAFSR_SDWR) {
56 reported++;
57 - printk("(DMA Write)");
58 + printk(KERN_CONT "(DMA Write)");
59 }
60 if (!reported)
61 - printk("(none)");
62 - printk("]\n");
63 + printk(KERN_CONT "(none)");
64 + printk(KERN_CONT "]\n");
66 return IRQ_HANDLED;
67 }
68 --- linux-6.10/arch/sparc/kernel/pci_sabre.c.vanilla 2024-09-25 19:23:27.763383016 +0200
69 +++ linux-6.10/arch/sparc/kernel/pci_sabre.c 2024-09-25 19:28:50.156717749 +0200
70 @@ -237,18 +237,18 @@
71 reported = 0;
72 if (afsr & SABRE_UEAFSR_SDRD) {
73 reported++;
74 - printk("(DMA Read)");
75 + printk(KERN_CONT "(DMA Read)");
76 }
77 if (afsr & SABRE_UEAFSR_SDWR) {
78 reported++;
79 - printk("(DMA Write)");
80 + printk(KERN_CONT "(DMA Write)");
81 }
82 if (afsr & SABRE_UEAFSR_SDTE) {
83 reported++;
84 - printk("(Translation Error)");
85 + printk(KERN_CONT "(Translation Error)");
86 }
87 if (!reported)
88 - printk("(none)");
89 + printk(KERN_CONT "(none)");
90 printk("]\n");
92 /* Interrogate IOMMU for error status. */
93 @@ -300,14 +300,14 @@
94 reported = 0;
95 if (afsr & SABRE_CEAFSR_SDRD) {
96 reported++;
97 - printk("(DMA Read)");
98 + printk(KERN_CONT "(DMA Read)");
99 }
100 if (afsr & SABRE_CEAFSR_SDWR) {
101 reported++;
102 - printk("(DMA Write)");
103 + printk(KERN_CONT "(DMA Write)");
104 }
105 if (!reported)
106 - printk("(none)");
107 + printk(KERN_CONT "(none)");
108 printk("]\n");
110 return IRQ_HANDLED;
111 --- linux-6.10/arch/sparc/kernel/pci_schizo.c.vanilla 2024-09-25 19:23:27.770049684 +0200
112 +++ linux-6.10/arch/sparc/kernel/pci_schizo.c 2024-09-25 19:32:02.060051916 +0200
113 @@ -427,15 +427,15 @@
114 reported = 0;
115 if (afsr & SCHIZO_UEAFSR_SPIO) {
116 reported++;
117 - printk("(PIO)");
118 + printk(KERN_CONT "(PIO)");
119 }
120 if (afsr & SCHIZO_UEAFSR_SDMA) {
121 reported++;
122 - printk("(DMA)");
123 + printk(KERN_CONT "(DMA)");
124 }
125 if (!reported)
126 - printk("(none)");
127 - printk("]\n");
128 + printk(KERN_CONT "(none)");
129 + printk(KERN_CONT "]\n");
131 /* Interrogate IOMMU for error status. */
132 schizo_check_iommu_error(pbm, UE_ERR);
133 @@ -519,15 +519,15 @@
134 reported = 0;
135 if (afsr & SCHIZO_CEAFSR_SPIO) {
136 reported++;
137 - printk("(PIO)");
138 + printk(KERN_CONT "(PIO)");
139 }
140 if (afsr & SCHIZO_CEAFSR_SDMA) {
141 reported++;
142 - printk("(DMA)");
143 + printk(KERN_CONT "(DMA)");
144 }
145 if (!reported)
146 - printk("(none)");
147 - printk("]\n");
148 + printk(KERN_CONT "(none)");
149 + printk(KERN_CONT "]\n");
151 return IRQ_HANDLED;
152 }
153 @@ -696,31 +696,31 @@
154 reported = 0;
155 if (afsr & SCHIZO_PCIAFSR_SMA) {
156 reported++;
157 - printk("(Master Abort)");
158 + printk(KERN_CONT "(Master Abort)");
159 }
160 if (afsr & SCHIZO_PCIAFSR_STA) {
161 reported++;
162 - printk("(Target Abort)");
163 + printk(KERN_CONT "(Target Abort)");
164 }
165 if (afsr & SCHIZO_PCIAFSR_SRTRY) {
166 reported++;
167 - printk("(Excessive Retries)");
168 + printk(KERN_CONT "(Excessive Retries)");
169 }
170 if (afsr & SCHIZO_PCIAFSR_SPERR) {
171 reported++;
172 - printk("(Parity Error)");
173 + printk(KERN_CONT "(Parity Error)");
174 }
175 if (afsr & SCHIZO_PCIAFSR_STTO) {
176 reported++;
177 - printk("(Timeout)");
178 + printk(KERN_CONT "(Timeout)");
179 }
180 if (afsr & SCHIZO_PCIAFSR_SUNUS) {
181 reported++;
182 - printk("(Bus Unusable)");
183 + printk(KERN_CONT "(Bus Unusable)");
184 }
185 if (!reported)
186 - printk("(none)");
187 - printk("]\n");
188 + printk(KERN_CONT "(none)");
189 + printk(KERN_CONT "]\n");
191 /* For the error types shown, scan PBM's PCI bus for devices
192 * which have logged that error type.