1 |
commit: bbfab546bd200ea52bed26d55ab0cdc7e92c0a82 |
2 |
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 25 13:37:05 2018 +0000 |
4 |
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 25 13:37:05 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=bbfab546 |
7 |
|
8 |
Linux patch 4.15.13 |
9 |
|
10 |
0000_README | 4 + |
11 |
1012_linux-4.15.13.patch | 2806 ++++++++++++++++++++++++++++++++++++++++++++++ |
12 |
2 files changed, 2810 insertions(+) |
13 |
|
14 |
diff --git a/0000_README b/0000_README |
15 |
index 2ad5c9b..2b51c4d 100644 |
16 |
--- a/0000_README |
17 |
+++ b/0000_README |
18 |
@@ -91,6 +91,10 @@ Patch: 1011_linux-4.15.12.patch |
19 |
From: http://www.kernel.org |
20 |
Desc: Linux 4.15.12 |
21 |
|
22 |
+Patch: 1012_linux-4.15.13.patch |
23 |
+From: http://www.kernel.org |
24 |
+Desc: Linux 4.15.13 |
25 |
+ |
26 |
Patch: 1500_XATTR_USER_PREFIX.patch |
27 |
From: https://bugs.gentoo.org/show_bug.cgi?id=470644 |
28 |
Desc: Support for namespace user.pax.* on tmpfs. |
29 |
|
30 |
diff --git a/1012_linux-4.15.13.patch b/1012_linux-4.15.13.patch |
31 |
new file mode 100644 |
32 |
index 0000000..5685162 |
33 |
--- /dev/null |
34 |
+++ b/1012_linux-4.15.13.patch |
35 |
@@ -0,0 +1,2806 @@ |
36 |
+diff --git a/Documentation/devicetree/bindings/display/panel/toppoly,td028ttec1.txt b/Documentation/devicetree/bindings/display/panel/toppoly,td028ttec1.txt |
37 |
+deleted file mode 100644 |
38 |
+index 7175dc3740ac..000000000000 |
39 |
+--- a/Documentation/devicetree/bindings/display/panel/toppoly,td028ttec1.txt |
40 |
++++ /dev/null |
41 |
+@@ -1,30 +0,0 @@ |
42 |
+-Toppoly TD028TTEC1 Panel |
43 |
+-======================== |
44 |
+- |
45 |
+-Required properties: |
46 |
+-- compatible: "toppoly,td028ttec1" |
47 |
+- |
48 |
+-Optional properties: |
49 |
+-- label: a symbolic name for the panel |
50 |
+- |
51 |
+-Required nodes: |
52 |
+-- Video port for DPI input |
53 |
+- |
54 |
+-Example |
55 |
+-------- |
56 |
+- |
57 |
+-lcd-panel: td028ttec1@0 { |
58 |
+- compatible = "toppoly,td028ttec1"; |
59 |
+- reg = <0>; |
60 |
+- spi-max-frequency = <100000>; |
61 |
+- spi-cpol; |
62 |
+- spi-cpha; |
63 |
+- |
64 |
+- label = "lcd"; |
65 |
+- port { |
66 |
+- lcd_in: endpoint { |
67 |
+- remote-endpoint = <&dpi_out>; |
68 |
+- }; |
69 |
+- }; |
70 |
+-}; |
71 |
+- |
72 |
+diff --git a/Documentation/devicetree/bindings/display/panel/toshiba,lt089ac29000.txt b/Documentation/devicetree/bindings/display/panel/toshiba,lt089ac29000.txt |
73 |
+index 4c0caaf246c9..89826116628c 100644 |
74 |
+--- a/Documentation/devicetree/bindings/display/panel/toshiba,lt089ac29000.txt |
75 |
++++ b/Documentation/devicetree/bindings/display/panel/toshiba,lt089ac29000.txt |
76 |
+@@ -1,7 +1,7 @@ |
77 |
+ Toshiba 8.9" WXGA (1280x768) TFT LCD panel |
78 |
+ |
79 |
+ Required properties: |
80 |
+-- compatible: should be "toshiba,lt089ac29000.txt" |
81 |
++- compatible: should be "toshiba,lt089ac29000" |
82 |
+ - power-supply: as specified in the base binding |
83 |
+ |
84 |
+ This binding is compatible with the simple-panel binding, which is specified |
85 |
+diff --git a/Documentation/devicetree/bindings/display/panel/tpo,td028ttec1.txt b/Documentation/devicetree/bindings/display/panel/tpo,td028ttec1.txt |
86 |
+new file mode 100644 |
87 |
+index 000000000000..ed34253d9fb1 |
88 |
+--- /dev/null |
89 |
++++ b/Documentation/devicetree/bindings/display/panel/tpo,td028ttec1.txt |
90 |
+@@ -0,0 +1,30 @@ |
91 |
++Toppoly TD028TTEC1 Panel |
92 |
++======================== |
93 |
++ |
94 |
++Required properties: |
95 |
++- compatible: "tpo,td028ttec1" |
96 |
++ |
97 |
++Optional properties: |
98 |
++- label: a symbolic name for the panel |
99 |
++ |
100 |
++Required nodes: |
101 |
++- Video port for DPI input |
102 |
++ |
103 |
++Example |
104 |
++------- |
105 |
++ |
106 |
++lcd-panel: td028ttec1@0 { |
107 |
++ compatible = "tpo,td028ttec1"; |
108 |
++ reg = <0>; |
109 |
++ spi-max-frequency = <100000>; |
110 |
++ spi-cpol; |
111 |
++ spi-cpha; |
112 |
++ |
113 |
++ label = "lcd"; |
114 |
++ port { |
115 |
++ lcd_in: endpoint { |
116 |
++ remote-endpoint = <&dpi_out>; |
117 |
++ }; |
118 |
++ }; |
119 |
++}; |
120 |
++ |
121 |
+diff --git a/Makefile b/Makefile |
122 |
+index 2e6ba1553dff..82245e654d10 100644 |
123 |
+--- a/Makefile |
124 |
++++ b/Makefile |
125 |
+@@ -1,7 +1,7 @@ |
126 |
+ # SPDX-License-Identifier: GPL-2.0 |
127 |
+ VERSION = 4 |
128 |
+ PATCHLEVEL = 15 |
129 |
+-SUBLEVEL = 12 |
130 |
++SUBLEVEL = 13 |
131 |
+ EXTRAVERSION = |
132 |
+ NAME = Fearless Coyote |
133 |
+ |
134 |
+diff --git a/arch/alpha/kernel/console.c b/arch/alpha/kernel/console.c |
135 |
+index 8e9a41966881..5476279329a6 100644 |
136 |
+--- a/arch/alpha/kernel/console.c |
137 |
++++ b/arch/alpha/kernel/console.c |
138 |
+@@ -21,6 +21,7 @@ |
139 |
+ struct pci_controller *pci_vga_hose; |
140 |
+ static struct resource alpha_vga = { |
141 |
+ .name = "alpha-vga+", |
142 |
++ .flags = IORESOURCE_IO, |
143 |
+ .start = 0x3C0, |
144 |
+ .end = 0x3DF |
145 |
+ }; |
146 |
+diff --git a/arch/arm/boot/dts/aspeed-ast2500-evb.dts b/arch/arm/boot/dts/aspeed-ast2500-evb.dts |
147 |
+index 602bc10fdaf4..7472ed355d4b 100644 |
148 |
+--- a/arch/arm/boot/dts/aspeed-ast2500-evb.dts |
149 |
++++ b/arch/arm/boot/dts/aspeed-ast2500-evb.dts |
150 |
+@@ -16,7 +16,7 @@ |
151 |
+ bootargs = "console=ttyS4,115200 earlyprintk"; |
152 |
+ }; |
153 |
+ |
154 |
+- memory { |
155 |
++ memory@80000000 { |
156 |
+ reg = <0x80000000 0x20000000>; |
157 |
+ }; |
158 |
+ }; |
159 |
+diff --git a/drivers/bluetooth/btqcomsmd.c b/drivers/bluetooth/btqcomsmd.c |
160 |
+index 663bed63b871..2c9a5fc9137d 100644 |
161 |
+--- a/drivers/bluetooth/btqcomsmd.c |
162 |
++++ b/drivers/bluetooth/btqcomsmd.c |
163 |
+@@ -88,7 +88,8 @@ static int btqcomsmd_send(struct hci_dev *hdev, struct sk_buff *skb) |
164 |
+ break; |
165 |
+ } |
166 |
+ |
167 |
+- kfree_skb(skb); |
168 |
++ if (!ret) |
169 |
++ kfree_skb(skb); |
170 |
+ |
171 |
+ return ret; |
172 |
+ } |
173 |
+diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c |
174 |
+index bbd7db7384e6..05ec530b8a3a 100644 |
175 |
+--- a/drivers/bluetooth/hci_qca.c |
176 |
++++ b/drivers/bluetooth/hci_qca.c |
177 |
+@@ -932,6 +932,9 @@ static int qca_setup(struct hci_uart *hu) |
178 |
+ if (!ret) { |
179 |
+ set_bit(STATE_IN_BAND_SLEEP_ENABLED, &qca->flags); |
180 |
+ qca_debugfs_init(hdev); |
181 |
++ } else if (ret == -ENOENT) { |
182 |
++ /* No patch/nvm-config found, run with original fw/config */ |
183 |
++ ret = 0; |
184 |
+ } |
185 |
+ |
186 |
+ /* Setup bdaddr */ |
187 |
+diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c |
188 |
+index 657b8770b6b9..91bb98c42a1c 100644 |
189 |
+--- a/drivers/char/hw_random/core.c |
190 |
++++ b/drivers/char/hw_random/core.c |
191 |
+@@ -306,6 +306,10 @@ static int enable_best_rng(void) |
192 |
+ ret = ((new_rng == current_rng) ? 0 : set_current_rng(new_rng)); |
193 |
+ if (!ret) |
194 |
+ cur_rng_set_by_user = 0; |
195 |
++ } else { |
196 |
++ drop_current_rng(); |
197 |
++ cur_rng_set_by_user = 0; |
198 |
++ ret = 0; |
199 |
+ } |
200 |
+ |
201 |
+ return ret; |
202 |
+diff --git a/drivers/char/mem.c b/drivers/char/mem.c |
203 |
+index 6aefe5370e5b..052011bcf100 100644 |
204 |
+--- a/drivers/char/mem.c |
205 |
++++ b/drivers/char/mem.c |
206 |
+@@ -107,6 +107,8 @@ static ssize_t read_mem(struct file *file, char __user *buf, |
207 |
+ phys_addr_t p = *ppos; |
208 |
+ ssize_t read, sz; |
209 |
+ void *ptr; |
210 |
++ char *bounce; |
211 |
++ int err; |
212 |
+ |
213 |
+ if (p != *ppos) |
214 |
+ return 0; |
215 |
+@@ -129,15 +131,22 @@ static ssize_t read_mem(struct file *file, char __user *buf, |
216 |
+ } |
217 |
+ #endif |
218 |
+ |
219 |
++ bounce = kmalloc(PAGE_SIZE, GFP_KERNEL); |
220 |
++ if (!bounce) |
221 |
++ return -ENOMEM; |
222 |
++ |
223 |
+ while (count > 0) { |
224 |
+ unsigned long remaining; |
225 |
+ int allowed; |
226 |
+ |
227 |
+ sz = size_inside_page(p, count); |
228 |
+ |
229 |
++ err = -EPERM; |
230 |
+ allowed = page_is_allowed(p >> PAGE_SHIFT); |
231 |
+ if (!allowed) |
232 |
+- return -EPERM; |
233 |
++ goto failed; |
234 |
++ |
235 |
++ err = -EFAULT; |
236 |
+ if (allowed == 2) { |
237 |
+ /* Show zeros for restricted memory. */ |
238 |
+ remaining = clear_user(buf, sz); |
239 |
+@@ -149,24 +158,32 @@ static ssize_t read_mem(struct file *file, char __user *buf, |
240 |
+ */ |
241 |
+ ptr = xlate_dev_mem_ptr(p); |
242 |
+ if (!ptr) |
243 |
+- return -EFAULT; |
244 |
+- |
245 |
+- remaining = copy_to_user(buf, ptr, sz); |
246 |
++ goto failed; |
247 |
+ |
248 |
++ err = probe_kernel_read(bounce, ptr, sz); |
249 |
+ unxlate_dev_mem_ptr(p, ptr); |
250 |
++ if (err) |
251 |
++ goto failed; |
252 |
++ |
253 |
++ remaining = copy_to_user(buf, bounce, sz); |
254 |
+ } |
255 |
+ |
256 |
+ if (remaining) |
257 |
+- return -EFAULT; |
258 |
++ goto failed; |
259 |
+ |
260 |
+ buf += sz; |
261 |
+ p += sz; |
262 |
+ count -= sz; |
263 |
+ read += sz; |
264 |
+ } |
265 |
++ kfree(bounce); |
266 |
+ |
267 |
+ *ppos += read; |
268 |
+ return read; |
269 |
++ |
270 |
++failed: |
271 |
++ kfree(bounce); |
272 |
++ return err; |
273 |
+ } |
274 |
+ |
275 |
+ static ssize_t write_mem(struct file *file, const char __user *buf, |
276 |
+diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c |
277 |
+index 775af473fe11..5c2b26de303e 100644 |
278 |
+--- a/drivers/clk/at91/pmc.c |
279 |
++++ b/drivers/clk/at91/pmc.c |
280 |
+@@ -107,10 +107,20 @@ static int pmc_suspend(void) |
281 |
+ return 0; |
282 |
+ } |
283 |
+ |
284 |
++static bool pmc_ready(unsigned int mask) |
285 |
++{ |
286 |
++ unsigned int status; |
287 |
++ |
288 |
++ regmap_read(pmcreg, AT91_PMC_SR, &status); |
289 |
++ |
290 |
++ return ((status & mask) == mask) ? 1 : 0; |
291 |
++} |
292 |
++ |
293 |
+ static void pmc_resume(void) |
294 |
+ { |
295 |
+- int i, ret = 0; |
296 |
++ int i; |
297 |
+ u32 tmp; |
298 |
++ u32 mask = AT91_PMC_MCKRDY | AT91_PMC_LOCKA; |
299 |
+ |
300 |
+ regmap_read(pmcreg, AT91_PMC_MCKR, &tmp); |
301 |
+ if (pmc_cache.mckr != tmp) |
302 |
+@@ -134,13 +144,11 @@ static void pmc_resume(void) |
303 |
+ AT91_PMC_PCR_CMD); |
304 |
+ } |
305 |
+ |
306 |
+- if (pmc_cache.uckr & AT91_PMC_UPLLEN) { |
307 |
+- ret = regmap_read_poll_timeout(pmcreg, AT91_PMC_SR, tmp, |
308 |
+- !(tmp & AT91_PMC_LOCKU), |
309 |
+- 10, 5000); |
310 |
+- if (ret) |
311 |
+- pr_crit("USB PLL didn't lock when resuming\n"); |
312 |
+- } |
313 |
++ if (pmc_cache.uckr & AT91_PMC_UPLLEN) |
314 |
++ mask |= AT91_PMC_LOCKU; |
315 |
++ |
316 |
++ while (!pmc_ready(mask)) |
317 |
++ cpu_relax(); |
318 |
+ } |
319 |
+ |
320 |
+ static struct syscore_ops pmc_syscore_ops = { |
321 |
+diff --git a/drivers/clk/clk-axi-clkgen.c b/drivers/clk/clk-axi-clkgen.c |
322 |
+index 5e918e7afaba..95a6e9834392 100644 |
323 |
+--- a/drivers/clk/clk-axi-clkgen.c |
324 |
++++ b/drivers/clk/clk-axi-clkgen.c |
325 |
+@@ -40,6 +40,10 @@ |
326 |
+ #define MMCM_REG_FILTER1 0x4e |
327 |
+ #define MMCM_REG_FILTER2 0x4f |
328 |
+ |
329 |
++#define MMCM_CLKOUT_NOCOUNT BIT(6) |
330 |
++ |
331 |
++#define MMCM_CLK_DIV_NOCOUNT BIT(12) |
332 |
++ |
333 |
+ struct axi_clkgen { |
334 |
+ void __iomem *base; |
335 |
+ struct clk_hw clk_hw; |
336 |
+@@ -315,12 +319,27 @@ static unsigned long axi_clkgen_recalc_rate(struct clk_hw *clk_hw, |
337 |
+ unsigned int reg; |
338 |
+ unsigned long long tmp; |
339 |
+ |
340 |
+- axi_clkgen_mmcm_read(axi_clkgen, MMCM_REG_CLKOUT0_1, ®); |
341 |
+- dout = (reg & 0x3f) + ((reg >> 6) & 0x3f); |
342 |
++ axi_clkgen_mmcm_read(axi_clkgen, MMCM_REG_CLKOUT0_2, ®); |
343 |
++ if (reg & MMCM_CLKOUT_NOCOUNT) { |
344 |
++ dout = 1; |
345 |
++ } else { |
346 |
++ axi_clkgen_mmcm_read(axi_clkgen, MMCM_REG_CLKOUT0_1, ®); |
347 |
++ dout = (reg & 0x3f) + ((reg >> 6) & 0x3f); |
348 |
++ } |
349 |
++ |
350 |
+ axi_clkgen_mmcm_read(axi_clkgen, MMCM_REG_CLK_DIV, ®); |
351 |
+- d = (reg & 0x3f) + ((reg >> 6) & 0x3f); |
352 |
+- axi_clkgen_mmcm_read(axi_clkgen, MMCM_REG_CLK_FB1, ®); |
353 |
+- m = (reg & 0x3f) + ((reg >> 6) & 0x3f); |
354 |
++ if (reg & MMCM_CLK_DIV_NOCOUNT) |
355 |
++ d = 1; |
356 |
++ else |
357 |
++ d = (reg & 0x3f) + ((reg >> 6) & 0x3f); |
358 |
++ |
359 |
++ axi_clkgen_mmcm_read(axi_clkgen, MMCM_REG_CLK_FB2, ®); |
360 |
++ if (reg & MMCM_CLKOUT_NOCOUNT) { |
361 |
++ m = 1; |
362 |
++ } else { |
363 |
++ axi_clkgen_mmcm_read(axi_clkgen, MMCM_REG_CLK_FB1, ®); |
364 |
++ m = (reg & 0x3f) + ((reg >> 6) & 0x3f); |
365 |
++ } |
366 |
+ |
367 |
+ if (d == 0 || dout == 0) |
368 |
+ return 0; |
369 |
+diff --git a/drivers/clk/clk-si5351.c b/drivers/clk/clk-si5351.c |
370 |
+index 20d90769cced..653b0f38d475 100644 |
371 |
+--- a/drivers/clk/clk-si5351.c |
372 |
++++ b/drivers/clk/clk-si5351.c |
373 |
+@@ -72,7 +72,7 @@ static const char * const si5351_input_names[] = { |
374 |
+ "xtal", "clkin" |
375 |
+ }; |
376 |
+ static const char * const si5351_pll_names[] = { |
377 |
+- "plla", "pllb", "vxco" |
378 |
++ "si5351_plla", "si5351_pllb", "si5351_vxco" |
379 |
+ }; |
380 |
+ static const char * const si5351_msynth_names[] = { |
381 |
+ "ms0", "ms1", "ms2", "ms3", "ms4", "ms5", "ms6", "ms7" |
382 |
+diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c |
383 |
+index b56c11f51baf..7782c3e4abba 100644 |
384 |
+--- a/drivers/clk/clk.c |
385 |
++++ b/drivers/clk/clk.c |
386 |
+@@ -1642,16 +1642,37 @@ static void clk_change_rate(struct clk_core *core) |
387 |
+ clk_pm_runtime_put(core); |
388 |
+ } |
389 |
+ |
390 |
++static unsigned long clk_core_req_round_rate_nolock(struct clk_core *core, |
391 |
++ unsigned long req_rate) |
392 |
++{ |
393 |
++ int ret; |
394 |
++ struct clk_rate_request req; |
395 |
++ |
396 |
++ lockdep_assert_held(&prepare_lock); |
397 |
++ |
398 |
++ if (!core) |
399 |
++ return 0; |
400 |
++ |
401 |
++ clk_core_get_boundaries(core, &req.min_rate, &req.max_rate); |
402 |
++ req.rate = req_rate; |
403 |
++ |
404 |
++ ret = clk_core_round_rate_nolock(core, &req); |
405 |
++ |
406 |
++ return ret ? 0 : req.rate; |
407 |
++} |
408 |
++ |
409 |
+ static int clk_core_set_rate_nolock(struct clk_core *core, |
410 |
+ unsigned long req_rate) |
411 |
+ { |
412 |
+ struct clk_core *top, *fail_clk; |
413 |
+- unsigned long rate = req_rate; |
414 |
++ unsigned long rate; |
415 |
+ int ret = 0; |
416 |
+ |
417 |
+ if (!core) |
418 |
+ return 0; |
419 |
+ |
420 |
++ rate = clk_core_req_round_rate_nolock(core, req_rate); |
421 |
++ |
422 |
+ /* bail early if nothing to do */ |
423 |
+ if (rate == clk_core_get_rate_nolock(core)) |
424 |
+ return 0; |
425 |
+@@ -1660,7 +1681,7 @@ static int clk_core_set_rate_nolock(struct clk_core *core, |
426 |
+ return -EBUSY; |
427 |
+ |
428 |
+ /* calculate new rates and get the topmost changed clock */ |
429 |
+- top = clk_calc_new_rates(core, rate); |
430 |
++ top = clk_calc_new_rates(core, req_rate); |
431 |
+ if (!top) |
432 |
+ return -EINVAL; |
433 |
+ |
434 |
+@@ -2570,6 +2591,21 @@ static int __clk_core_init(struct clk_core *core) |
435 |
+ rate = 0; |
436 |
+ core->rate = core->req_rate = rate; |
437 |
+ |
438 |
++ /* |
439 |
++ * Enable CLK_IS_CRITICAL clocks so newly added critical clocks |
440 |
++ * don't get accidentally disabled when walking the orphan tree and |
441 |
++ * reparenting clocks |
442 |
++ */ |
443 |
++ if (core->flags & CLK_IS_CRITICAL) { |
444 |
++ unsigned long flags; |
445 |
++ |
446 |
++ clk_core_prepare(core); |
447 |
++ |
448 |
++ flags = clk_enable_lock(); |
449 |
++ clk_core_enable(core); |
450 |
++ clk_enable_unlock(flags); |
451 |
++ } |
452 |
++ |
453 |
+ /* |
454 |
+ * walk the list of orphan clocks and reparent any that newly finds a |
455 |
+ * parent. |
456 |
+@@ -2578,10 +2614,13 @@ static int __clk_core_init(struct clk_core *core) |
457 |
+ struct clk_core *parent = __clk_init_parent(orphan); |
458 |
+ |
459 |
+ /* |
460 |
+- * we could call __clk_set_parent, but that would result in a |
461 |
+- * redundant call to the .set_rate op, if it exists |
462 |
++ * We need to use __clk_set_parent_before() and _after() to |
463 |
++ * to properly migrate any prepare/enable count of the orphan |
464 |
++ * clock. This is important for CLK_IS_CRITICAL clocks, which |
465 |
++ * are enabled during init but might not have a parent yet. |
466 |
+ */ |
467 |
+ if (parent) { |
468 |
++ /* update the clk tree topology */ |
469 |
+ __clk_set_parent_before(orphan, parent); |
470 |
+ __clk_set_parent_after(orphan, parent, NULL); |
471 |
+ __clk_recalc_accuracies(orphan); |
472 |
+@@ -2600,16 +2639,6 @@ static int __clk_core_init(struct clk_core *core) |
473 |
+ if (core->ops->init) |
474 |
+ core->ops->init(core->hw); |
475 |
+ |
476 |
+- if (core->flags & CLK_IS_CRITICAL) { |
477 |
+- unsigned long flags; |
478 |
+- |
479 |
+- clk_core_prepare(core); |
480 |
+- |
481 |
+- flags = clk_enable_lock(); |
482 |
+- clk_core_enable(core); |
483 |
+- clk_enable_unlock(flags); |
484 |
+- } |
485 |
+- |
486 |
+ kref_init(&core->ref); |
487 |
+ out: |
488 |
+ clk_pm_runtime_put(core); |
489 |
+@@ -2684,7 +2713,13 @@ struct clk *clk_register(struct device *dev, struct clk_hw *hw) |
490 |
+ ret = -ENOMEM; |
491 |
+ goto fail_name; |
492 |
+ } |
493 |
++ |
494 |
++ if (WARN_ON(!hw->init->ops)) { |
495 |
++ ret = -EINVAL; |
496 |
++ goto fail_ops; |
497 |
++ } |
498 |
+ core->ops = hw->init->ops; |
499 |
++ |
500 |
+ if (dev && pm_runtime_enabled(dev)) |
501 |
+ core->dev = dev; |
502 |
+ if (dev && dev->driver) |
503 |
+@@ -2746,6 +2781,7 @@ struct clk *clk_register(struct device *dev, struct clk_hw *hw) |
504 |
+ kfree_const(core->parent_names[i]); |
505 |
+ kfree(core->parent_names); |
506 |
+ fail_parent_names: |
507 |
++fail_ops: |
508 |
+ kfree_const(core->name); |
509 |
+ fail_name: |
510 |
+ kfree(core); |
511 |
+diff --git a/drivers/cpufreq/longhaul.c b/drivers/cpufreq/longhaul.c |
512 |
+index d5e27bc7585a..859a62ea6120 100644 |
513 |
+--- a/drivers/cpufreq/longhaul.c |
514 |
++++ b/drivers/cpufreq/longhaul.c |
515 |
+@@ -894,7 +894,7 @@ static int longhaul_cpu_init(struct cpufreq_policy *policy) |
516 |
+ if ((longhaul_version != TYPE_LONGHAUL_V1) && (scale_voltage != 0)) |
517 |
+ longhaul_setup_voltagescaling(); |
518 |
+ |
519 |
+- policy->cpuinfo.transition_latency = 200000; /* nsec */ |
520 |
++ policy->transition_delay_us = 200000; /* usec */ |
521 |
+ |
522 |
+ return cpufreq_table_validate_and_show(policy, longhaul_table); |
523 |
+ } |
524 |
+diff --git a/drivers/crypto/axis/artpec6_crypto.c b/drivers/crypto/axis/artpec6_crypto.c |
525 |
+index 456278440863..22df6b55e172 100644 |
526 |
+--- a/drivers/crypto/axis/artpec6_crypto.c |
527 |
++++ b/drivers/crypto/axis/artpec6_crypto.c |
528 |
+@@ -22,6 +22,7 @@ |
529 |
+ #include <linux/slab.h> |
530 |
+ |
531 |
+ #include <crypto/aes.h> |
532 |
++#include <crypto/gcm.h> |
533 |
+ #include <crypto/internal/aead.h> |
534 |
+ #include <crypto/internal/hash.h> |
535 |
+ #include <crypto/internal/skcipher.h> |
536 |
+@@ -1934,7 +1935,7 @@ static int artpec6_crypto_prepare_aead(struct aead_request *areq) |
537 |
+ |
538 |
+ memcpy(req_ctx->hw_ctx.J0, areq->iv, crypto_aead_ivsize(cipher)); |
539 |
+ // The HW omits the initial increment of the counter field. |
540 |
+- crypto_inc(req_ctx->hw_ctx.J0+12, 4); |
541 |
++ memcpy(req_ctx->hw_ctx.J0 + GCM_AES_IV_SIZE, "\x00\x00\x00\x01", 4); |
542 |
+ |
543 |
+ ret = artpec6_crypto_setup_out_descr(common, &req_ctx->hw_ctx, |
544 |
+ sizeof(struct artpec6_crypto_aead_hw_ctx), false, false); |
545 |
+@@ -2956,7 +2957,7 @@ static struct aead_alg aead_algos[] = { |
546 |
+ .setkey = artpec6_crypto_aead_set_key, |
547 |
+ .encrypt = artpec6_crypto_aead_encrypt, |
548 |
+ .decrypt = artpec6_crypto_aead_decrypt, |
549 |
+- .ivsize = AES_BLOCK_SIZE, |
550 |
++ .ivsize = GCM_AES_IV_SIZE, |
551 |
+ .maxauthsize = AES_BLOCK_SIZE, |
552 |
+ |
553 |
+ .base = { |
554 |
+diff --git a/drivers/dma/ti-dma-crossbar.c b/drivers/dma/ti-dma-crossbar.c |
555 |
+index 7df910e7c348..9272b173c746 100644 |
556 |
+--- a/drivers/dma/ti-dma-crossbar.c |
557 |
++++ b/drivers/dma/ti-dma-crossbar.c |
558 |
+@@ -54,7 +54,15 @@ struct ti_am335x_xbar_map { |
559 |
+ |
560 |
+ static inline void ti_am335x_xbar_write(void __iomem *iomem, int event, u8 val) |
561 |
+ { |
562 |
+- writeb_relaxed(val, iomem + event); |
563 |
++ /* |
564 |
++ * TPCC_EVT_MUX_60_63 register layout is different than the |
565 |
++ * rest, in the sense, that event 63 is mapped to lowest byte |
566 |
++ * and event 60 is mapped to highest, handle it separately. |
567 |
++ */ |
568 |
++ if (event >= 60 && event <= 63) |
569 |
++ writeb_relaxed(val, iomem + (63 - event % 4)); |
570 |
++ else |
571 |
++ writeb_relaxed(val, iomem + event); |
572 |
+ } |
573 |
+ |
574 |
+ static void ti_am335x_xbar_free(struct device *dev, void *route_data) |
575 |
+diff --git a/drivers/dma/xilinx/zynqmp_dma.c b/drivers/dma/xilinx/zynqmp_dma.c |
576 |
+index 1ee1241ca797..5cc8ed31f26b 100644 |
577 |
+--- a/drivers/dma/xilinx/zynqmp_dma.c |
578 |
++++ b/drivers/dma/xilinx/zynqmp_dma.c |
579 |
+@@ -838,7 +838,8 @@ static void zynqmp_dma_chan_remove(struct zynqmp_dma_chan *chan) |
580 |
+ if (!chan) |
581 |
+ return; |
582 |
+ |
583 |
+- devm_free_irq(chan->zdev->dev, chan->irq, chan); |
584 |
++ if (chan->irq) |
585 |
++ devm_free_irq(chan->zdev->dev, chan->irq, chan); |
586 |
+ tasklet_kill(&chan->tasklet); |
587 |
+ list_del(&chan->common.device_node); |
588 |
+ clk_disable_unprepare(chan->clk_apb); |
589 |
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h |
590 |
+index b18c2b96691f..522a8742a60b 100644 |
591 |
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h |
592 |
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h |
593 |
+@@ -187,6 +187,7 @@ struct amdgpu_ring { |
594 |
+ uint64_t eop_gpu_addr; |
595 |
+ u32 doorbell_index; |
596 |
+ bool use_doorbell; |
597 |
++ bool use_pollmem; |
598 |
+ unsigned wptr_offs; |
599 |
+ unsigned fence_offs; |
600 |
+ uint64_t current_ctx; |
601 |
+diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c |
602 |
+index 6d06f8eb659f..cc4fc2e43b7b 100644 |
603 |
+--- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c |
604 |
++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c |
605 |
+@@ -355,7 +355,7 @@ static uint64_t sdma_v3_0_ring_get_wptr(struct amdgpu_ring *ring) |
606 |
+ struct amdgpu_device *adev = ring->adev; |
607 |
+ u32 wptr; |
608 |
+ |
609 |
+- if (ring->use_doorbell) { |
610 |
++ if (ring->use_doorbell || ring->use_pollmem) { |
611 |
+ /* XXX check if swapping is necessary on BE */ |
612 |
+ wptr = ring->adev->wb.wb[ring->wptr_offs] >> 2; |
613 |
+ } else { |
614 |
+@@ -380,10 +380,13 @@ static void sdma_v3_0_ring_set_wptr(struct amdgpu_ring *ring) |
615 |
+ |
616 |
+ if (ring->use_doorbell) { |
617 |
+ u32 *wb = (u32 *)&adev->wb.wb[ring->wptr_offs]; |
618 |
+- |
619 |
+ /* XXX check if swapping is necessary on BE */ |
620 |
+ WRITE_ONCE(*wb, (lower_32_bits(ring->wptr) << 2)); |
621 |
+ WDOORBELL32(ring->doorbell_index, lower_32_bits(ring->wptr) << 2); |
622 |
++ } else if (ring->use_pollmem) { |
623 |
++ u32 *wb = (u32 *)&adev->wb.wb[ring->wptr_offs]; |
624 |
++ |
625 |
++ WRITE_ONCE(*wb, (lower_32_bits(ring->wptr) << 2)); |
626 |
+ } else { |
627 |
+ int me = (ring == &ring->adev->sdma.instance[0].ring) ? 0 : 1; |
628 |
+ |
629 |
+@@ -718,10 +721,14 @@ static int sdma_v3_0_gfx_resume(struct amdgpu_device *adev) |
630 |
+ WREG32(mmSDMA0_GFX_RB_WPTR_POLL_ADDR_HI + sdma_offsets[i], |
631 |
+ upper_32_bits(wptr_gpu_addr)); |
632 |
+ wptr_poll_cntl = RREG32(mmSDMA0_GFX_RB_WPTR_POLL_CNTL + sdma_offsets[i]); |
633 |
+- if (amdgpu_sriov_vf(adev)) |
634 |
+- wptr_poll_cntl = REG_SET_FIELD(wptr_poll_cntl, SDMA0_GFX_RB_WPTR_POLL_CNTL, F32_POLL_ENABLE, 1); |
635 |
++ if (ring->use_pollmem) |
636 |
++ wptr_poll_cntl = REG_SET_FIELD(wptr_poll_cntl, |
637 |
++ SDMA0_GFX_RB_WPTR_POLL_CNTL, |
638 |
++ ENABLE, 1); |
639 |
+ else |
640 |
+- wptr_poll_cntl = REG_SET_FIELD(wptr_poll_cntl, SDMA0_GFX_RB_WPTR_POLL_CNTL, F32_POLL_ENABLE, 0); |
641 |
++ wptr_poll_cntl = REG_SET_FIELD(wptr_poll_cntl, |
642 |
++ SDMA0_GFX_RB_WPTR_POLL_CNTL, |
643 |
++ ENABLE, 0); |
644 |
+ WREG32(mmSDMA0_GFX_RB_WPTR_POLL_CNTL + sdma_offsets[i], wptr_poll_cntl); |
645 |
+ |
646 |
+ /* enable DMA RB */ |
647 |
+@@ -1203,9 +1210,13 @@ static int sdma_v3_0_sw_init(void *handle) |
648 |
+ for (i = 0; i < adev->sdma.num_instances; i++) { |
649 |
+ ring = &adev->sdma.instance[i].ring; |
650 |
+ ring->ring_obj = NULL; |
651 |
+- ring->use_doorbell = true; |
652 |
+- ring->doorbell_index = (i == 0) ? |
653 |
+- AMDGPU_DOORBELL_sDMA_ENGINE0 : AMDGPU_DOORBELL_sDMA_ENGINE1; |
654 |
++ if (!amdgpu_sriov_vf(adev)) { |
655 |
++ ring->use_doorbell = true; |
656 |
++ ring->doorbell_index = (i == 0) ? |
657 |
++ AMDGPU_DOORBELL_sDMA_ENGINE0 : AMDGPU_DOORBELL_sDMA_ENGINE1; |
658 |
++ } else { |
659 |
++ ring->use_pollmem = true; |
660 |
++ } |
661 |
+ |
662 |
+ sprintf(ring->name, "sdma%d", i); |
663 |
+ r = amdgpu_ring_init(adev, ring, 1024, |
664 |
+diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c |
665 |
+index 81fe6d6740ce..07376de9ff4c 100644 |
666 |
+--- a/drivers/gpu/drm/msm/msm_gem.c |
667 |
++++ b/drivers/gpu/drm/msm/msm_gem.c |
668 |
+@@ -93,14 +93,17 @@ static struct page **get_pages(struct drm_gem_object *obj) |
669 |
+ return p; |
670 |
+ } |
671 |
+ |
672 |
++ msm_obj->pages = p; |
673 |
++ |
674 |
+ msm_obj->sgt = drm_prime_pages_to_sg(p, npages); |
675 |
+ if (IS_ERR(msm_obj->sgt)) { |
676 |
++ void *ptr = ERR_CAST(msm_obj->sgt); |
677 |
++ |
678 |
+ dev_err(dev->dev, "failed to allocate sgt\n"); |
679 |
+- return ERR_CAST(msm_obj->sgt); |
680 |
++ msm_obj->sgt = NULL; |
681 |
++ return ptr; |
682 |
+ } |
683 |
+ |
684 |
+- msm_obj->pages = p; |
685 |
+- |
686 |
+ /* For non-cached buffers, ensure the new pages are clean |
687 |
+ * because display controller, GPU, etc. are not coherent: |
688 |
+ */ |
689 |
+@@ -135,7 +138,10 @@ static void put_pages(struct drm_gem_object *obj) |
690 |
+ if (msm_obj->flags & (MSM_BO_WC|MSM_BO_UNCACHED)) |
691 |
+ dma_unmap_sg(obj->dev->dev, msm_obj->sgt->sgl, |
692 |
+ msm_obj->sgt->nents, DMA_BIDIRECTIONAL); |
693 |
+- sg_free_table(msm_obj->sgt); |
694 |
++ |
695 |
++ if (msm_obj->sgt) |
696 |
++ sg_free_table(msm_obj->sgt); |
697 |
++ |
698 |
+ kfree(msm_obj->sgt); |
699 |
+ |
700 |
+ if (use_pages(obj)) |
701 |
+diff --git a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c |
702 |
+index 0a38a0e8c925..a0dfa14f4fab 100644 |
703 |
+--- a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c |
704 |
++++ b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c |
705 |
+@@ -452,6 +452,8 @@ static int td028ttec1_panel_remove(struct spi_device *spi) |
706 |
+ } |
707 |
+ |
708 |
+ static const struct of_device_id td028ttec1_of_match[] = { |
709 |
++ { .compatible = "omapdss,tpo,td028ttec1", }, |
710 |
++ /* keep to not break older DTB */ |
711 |
+ { .compatible = "omapdss,toppoly,td028ttec1", }, |
712 |
+ {}, |
713 |
+ }; |
714 |
+@@ -471,6 +473,7 @@ static struct spi_driver td028ttec1_spi_driver = { |
715 |
+ |
716 |
+ module_spi_driver(td028ttec1_spi_driver); |
717 |
+ |
718 |
++MODULE_ALIAS("spi:tpo,td028ttec1"); |
719 |
+ MODULE_ALIAS("spi:toppoly,td028ttec1"); |
720 |
+ MODULE_AUTHOR("H. Nikolaus Schaller <hns@×××××××××.com>"); |
721 |
+ MODULE_DESCRIPTION("Toppoly TD028TTEC1 panel driver"); |
722 |
+diff --git a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c |
723 |
+index c60a85e82c6d..fd05f7e9f43f 100644 |
724 |
+--- a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c |
725 |
++++ b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c |
726 |
+@@ -298,7 +298,12 @@ static int dmm_txn_commit(struct dmm_txn *txn, bool wait) |
727 |
+ msecs_to_jiffies(100))) { |
728 |
+ dev_err(dmm->dev, "timed out waiting for done\n"); |
729 |
+ ret = -ETIMEDOUT; |
730 |
++ goto cleanup; |
731 |
+ } |
732 |
++ |
733 |
++ /* Check the engine status before continue */ |
734 |
++ ret = wait_status(engine, DMM_PATSTATUS_READY | |
735 |
++ DMM_PATSTATUS_VALID | DMM_PATSTATUS_DONE); |
736 |
+ } |
737 |
+ |
738 |
+ cleanup: |
739 |
+diff --git a/drivers/gpu/drm/tilcdc/tilcdc_regs.h b/drivers/gpu/drm/tilcdc/tilcdc_regs.h |
740 |
+index 9d528c0a67a4..5048ebb86835 100644 |
741 |
+--- a/drivers/gpu/drm/tilcdc/tilcdc_regs.h |
742 |
++++ b/drivers/gpu/drm/tilcdc/tilcdc_regs.h |
743 |
+@@ -133,7 +133,7 @@ static inline void tilcdc_write64(struct drm_device *dev, u32 reg, u64 data) |
744 |
+ struct tilcdc_drm_private *priv = dev->dev_private; |
745 |
+ volatile void __iomem *addr = priv->mmio + reg; |
746 |
+ |
747 |
+-#ifdef iowrite64 |
748 |
++#if defined(iowrite64) && !defined(iowrite64_is_nonatomic) |
749 |
+ iowrite64(data, addr); |
750 |
+ #else |
751 |
+ __iowmb(); |
752 |
+diff --git a/drivers/hwtracing/coresight/coresight-tpiu.c b/drivers/hwtracing/coresight/coresight-tpiu.c |
753 |
+index bef49a3a5ca7..4b46c494be5e 100644 |
754 |
+--- a/drivers/hwtracing/coresight/coresight-tpiu.c |
755 |
++++ b/drivers/hwtracing/coresight/coresight-tpiu.c |
756 |
+@@ -46,8 +46,11 @@ |
757 |
+ #define TPIU_ITATBCTR0 0xef8 |
758 |
+ |
759 |
+ /** register definition **/ |
760 |
++/* FFSR - 0x300 */ |
761 |
++#define FFSR_FT_STOPPED BIT(1) |
762 |
+ /* FFCR - 0x304 */ |
763 |
+ #define FFCR_FON_MAN BIT(6) |
764 |
++#define FFCR_STOP_FI BIT(12) |
765 |
+ |
766 |
+ /** |
767 |
+ * @base: memory mapped base address for this component. |
768 |
+@@ -85,10 +88,14 @@ static void tpiu_disable_hw(struct tpiu_drvdata *drvdata) |
769 |
+ { |
770 |
+ CS_UNLOCK(drvdata->base); |
771 |
+ |
772 |
+- /* Clear formatter controle reg. */ |
773 |
+- writel_relaxed(0x0, drvdata->base + TPIU_FFCR); |
774 |
++ /* Clear formatter and stop on flush */ |
775 |
++ writel_relaxed(FFCR_STOP_FI, drvdata->base + TPIU_FFCR); |
776 |
+ /* Generate manual flush */ |
777 |
+- writel_relaxed(FFCR_FON_MAN, drvdata->base + TPIU_FFCR); |
778 |
++ writel_relaxed(FFCR_STOP_FI | FFCR_FON_MAN, drvdata->base + TPIU_FFCR); |
779 |
++ /* Wait for flush to complete */ |
780 |
++ coresight_timeout(drvdata->base, TPIU_FFCR, FFCR_FON_MAN, 0); |
781 |
++ /* Wait for formatter to stop */ |
782 |
++ coresight_timeout(drvdata->base, TPIU_FFSR, FFSR_FT_STOPPED, 1); |
783 |
+ |
784 |
+ CS_LOCK(drvdata->base); |
785 |
+ } |
786 |
+diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c |
787 |
+index 6294a7001d33..67aece2f5d8d 100644 |
788 |
+--- a/drivers/infiniband/core/cma.c |
789 |
++++ b/drivers/infiniband/core/cma.c |
790 |
+@@ -3013,7 +3013,8 @@ static int cma_port_is_unique(struct rdma_bind_list *bind_list, |
791 |
+ continue; |
792 |
+ |
793 |
+ /* different dest port -> unique */ |
794 |
+- if (!cma_any_port(cur_daddr) && |
795 |
++ if (!cma_any_port(daddr) && |
796 |
++ !cma_any_port(cur_daddr) && |
797 |
+ (dport != cur_dport)) |
798 |
+ continue; |
799 |
+ |
800 |
+@@ -3024,7 +3025,8 @@ static int cma_port_is_unique(struct rdma_bind_list *bind_list, |
801 |
+ continue; |
802 |
+ |
803 |
+ /* different dst address -> unique */ |
804 |
+- if (!cma_any_addr(cur_daddr) && |
805 |
++ if (!cma_any_addr(daddr) && |
806 |
++ !cma_any_addr(cur_daddr) && |
807 |
+ cma_addr_cmp(daddr, cur_daddr)) |
808 |
+ continue; |
809 |
+ |
810 |
+@@ -3322,13 +3324,13 @@ int rdma_bind_addr(struct rdma_cm_id *id, struct sockaddr *addr) |
811 |
+ } |
812 |
+ #endif |
813 |
+ } |
814 |
++ daddr = cma_dst_addr(id_priv); |
815 |
++ daddr->sa_family = addr->sa_family; |
816 |
++ |
817 |
+ ret = cma_get_port(id_priv); |
818 |
+ if (ret) |
819 |
+ goto err2; |
820 |
+ |
821 |
+- daddr = cma_dst_addr(id_priv); |
822 |
+- daddr->sa_family = addr->sa_family; |
823 |
+- |
824 |
+ return 0; |
825 |
+ err2: |
826 |
+ if (id_priv->cma_dev) |
827 |
+@@ -4114,6 +4116,9 @@ int rdma_join_multicast(struct rdma_cm_id *id, struct sockaddr *addr, |
828 |
+ struct cma_multicast *mc; |
829 |
+ int ret; |
830 |
+ |
831 |
++ if (!id->device) |
832 |
++ return -EINVAL; |
833 |
++ |
834 |
+ id_priv = container_of(id, struct rdma_id_private, id); |
835 |
+ if (!cma_comp(id_priv, RDMA_CM_ADDR_BOUND) && |
836 |
+ !cma_comp(id_priv, RDMA_CM_ADDR_RESOLVED)) |
837 |
+@@ -4432,7 +4437,7 @@ static int cma_get_id_stats(struct sk_buff *skb, struct netlink_callback *cb) |
838 |
+ RDMA_NL_RDMA_CM_ATTR_SRC_ADDR)) |
839 |
+ goto out; |
840 |
+ if (ibnl_put_attr(skb, nlh, |
841 |
+- rdma_addr_size(cma_src_addr(id_priv)), |
842 |
++ rdma_addr_size(cma_dst_addr(id_priv)), |
843 |
+ cma_dst_addr(id_priv), |
844 |
+ RDMA_NL_RDMA_CM_ATTR_DST_ADDR)) |
845 |
+ goto out; |
846 |
+diff --git a/drivers/infiniband/core/iwpm_util.c b/drivers/infiniband/core/iwpm_util.c |
847 |
+index 3c4faadb8cdd..81528f64061a 100644 |
848 |
+--- a/drivers/infiniband/core/iwpm_util.c |
849 |
++++ b/drivers/infiniband/core/iwpm_util.c |
850 |
+@@ -654,6 +654,7 @@ int iwpm_send_mapinfo(u8 nl_client, int iwpm_pid) |
851 |
+ } |
852 |
+ skb_num++; |
853 |
+ spin_lock_irqsave(&iwpm_mapinfo_lock, flags); |
854 |
++ ret = -EINVAL; |
855 |
+ for (i = 0; i < IWPM_MAPINFO_HASH_SIZE; i++) { |
856 |
+ hlist_for_each_entry(map_info, &iwpm_hash_bucket[i], |
857 |
+ hlist_node) { |
858 |
+diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c |
859 |
+index c8b3a45e9edc..77ca9da570a2 100644 |
860 |
+--- a/drivers/infiniband/core/ucma.c |
861 |
++++ b/drivers/infiniband/core/ucma.c |
862 |
+@@ -1348,7 +1348,7 @@ static ssize_t ucma_process_join(struct ucma_file *file, |
863 |
+ return -ENOSPC; |
864 |
+ |
865 |
+ addr = (struct sockaddr *) &cmd->addr; |
866 |
+- if (!cmd->addr_size || (cmd->addr_size != rdma_addr_size(addr))) |
867 |
++ if (cmd->addr_size != rdma_addr_size(addr)) |
868 |
+ return -EINVAL; |
869 |
+ |
870 |
+ if (cmd->join_flags == RDMA_MC_JOIN_FLAG_FULLMEMBER) |
871 |
+@@ -1416,6 +1416,9 @@ static ssize_t ucma_join_ip_multicast(struct ucma_file *file, |
872 |
+ join_cmd.uid = cmd.uid; |
873 |
+ join_cmd.id = cmd.id; |
874 |
+ join_cmd.addr_size = rdma_addr_size((struct sockaddr *) &cmd.addr); |
875 |
++ if (!join_cmd.addr_size) |
876 |
++ return -EINVAL; |
877 |
++ |
878 |
+ join_cmd.join_flags = RDMA_MC_JOIN_FLAG_FULLMEMBER; |
879 |
+ memcpy(&join_cmd.addr, &cmd.addr, join_cmd.addr_size); |
880 |
+ |
881 |
+@@ -1431,6 +1434,9 @@ static ssize_t ucma_join_multicast(struct ucma_file *file, |
882 |
+ if (copy_from_user(&cmd, inbuf, sizeof(cmd))) |
883 |
+ return -EFAULT; |
884 |
+ |
885 |
++ if (!rdma_addr_size((struct sockaddr *)&cmd.addr)) |
886 |
++ return -EINVAL; |
887 |
++ |
888 |
+ return ucma_process_join(file, &cmd, out_len); |
889 |
+ } |
890 |
+ |
891 |
+diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c |
892 |
+index 130606c3b07c..9a4e899d94b3 100644 |
893 |
+--- a/drivers/infiniband/core/umem.c |
894 |
++++ b/drivers/infiniband/core/umem.c |
895 |
+@@ -352,7 +352,7 @@ int ib_umem_copy_from(void *dst, struct ib_umem *umem, size_t offset, |
896 |
+ return -EINVAL; |
897 |
+ } |
898 |
+ |
899 |
+- ret = sg_pcopy_to_buffer(umem->sg_head.sgl, umem->nmap, dst, length, |
900 |
++ ret = sg_pcopy_to_buffer(umem->sg_head.sgl, umem->npages, dst, length, |
901 |
+ offset + ib_umem_offset(umem)); |
902 |
+ |
903 |
+ if (ret < 0) |
904 |
+diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c |
905 |
+index cffe5966aef9..47b39c3e9812 100644 |
906 |
+--- a/drivers/infiniband/hw/mlx5/qp.c |
907 |
++++ b/drivers/infiniband/hw/mlx5/qp.c |
908 |
+@@ -1130,7 +1130,7 @@ static void destroy_raw_packet_qp_sq(struct mlx5_ib_dev *dev, |
909 |
+ ib_umem_release(sq->ubuffer.umem); |
910 |
+ } |
911 |
+ |
912 |
+-static int get_rq_pas_size(void *qpc) |
913 |
++static size_t get_rq_pas_size(void *qpc) |
914 |
+ { |
915 |
+ u32 log_page_size = MLX5_GET(qpc, qpc, log_page_size) + 12; |
916 |
+ u32 log_rq_stride = MLX5_GET(qpc, qpc, log_rq_stride); |
917 |
+@@ -1146,7 +1146,8 @@ static int get_rq_pas_size(void *qpc) |
918 |
+ } |
919 |
+ |
920 |
+ static int create_raw_packet_qp_rq(struct mlx5_ib_dev *dev, |
921 |
+- struct mlx5_ib_rq *rq, void *qpin) |
922 |
++ struct mlx5_ib_rq *rq, void *qpin, |
923 |
++ size_t qpinlen) |
924 |
+ { |
925 |
+ struct mlx5_ib_qp *mqp = rq->base.container_mibqp; |
926 |
+ __be64 *pas; |
927 |
+@@ -1155,9 +1156,12 @@ static int create_raw_packet_qp_rq(struct mlx5_ib_dev *dev, |
928 |
+ void *rqc; |
929 |
+ void *wq; |
930 |
+ void *qpc = MLX5_ADDR_OF(create_qp_in, qpin, qpc); |
931 |
+- int inlen; |
932 |
++ size_t rq_pas_size = get_rq_pas_size(qpc); |
933 |
++ size_t inlen; |
934 |
+ int err; |
935 |
+- u32 rq_pas_size = get_rq_pas_size(qpc); |
936 |
++ |
937 |
++ if (qpinlen < rq_pas_size + MLX5_BYTE_OFF(create_qp_in, pas)) |
938 |
++ return -EINVAL; |
939 |
+ |
940 |
+ inlen = MLX5_ST_SZ_BYTES(create_rq_in) + rq_pas_size; |
941 |
+ in = kvzalloc(inlen, GFP_KERNEL); |
942 |
+@@ -1246,7 +1250,7 @@ static void destroy_raw_packet_qp_tir(struct mlx5_ib_dev *dev, |
943 |
+ } |
944 |
+ |
945 |
+ static int create_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp, |
946 |
+- u32 *in, |
947 |
++ u32 *in, size_t inlen, |
948 |
+ struct ib_pd *pd) |
949 |
+ { |
950 |
+ struct mlx5_ib_raw_packet_qp *raw_packet_qp = &qp->raw_packet_qp; |
951 |
+@@ -1278,7 +1282,7 @@ static int create_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp, |
952 |
+ rq->flags |= MLX5_IB_RQ_CVLAN_STRIPPING; |
953 |
+ if (qp->flags & MLX5_IB_QP_PCI_WRITE_END_PADDING) |
954 |
+ rq->flags |= MLX5_IB_RQ_PCI_WRITE_END_PADDING; |
955 |
+- err = create_raw_packet_qp_rq(dev, rq, in); |
956 |
++ err = create_raw_packet_qp_rq(dev, rq, in, inlen); |
957 |
+ if (err) |
958 |
+ goto err_destroy_sq; |
959 |
+ |
960 |
+@@ -1836,11 +1840,16 @@ static int create_qp_common(struct mlx5_ib_dev *dev, struct ib_pd *pd, |
961 |
+ } |
962 |
+ } |
963 |
+ |
964 |
++ if (inlen < 0) { |
965 |
++ err = -EINVAL; |
966 |
++ goto err; |
967 |
++ } |
968 |
++ |
969 |
+ if (init_attr->qp_type == IB_QPT_RAW_PACKET || |
970 |
+ qp->flags & MLX5_IB_QP_UNDERLAY) { |
971 |
+ qp->raw_packet_qp.sq.ubuffer.buf_addr = ucmd.sq_buf_addr; |
972 |
+ raw_packet_qp_copy_info(qp, &qp->raw_packet_qp); |
973 |
+- err = create_raw_packet_qp(dev, qp, in, pd); |
974 |
++ err = create_raw_packet_qp(dev, qp, in, inlen, pd); |
975 |
+ } else { |
976 |
+ err = mlx5_core_create_qp(dev->mdev, &base->mqp, in, inlen); |
977 |
+ } |
978 |
+diff --git a/drivers/infiniband/hw/mlx5/srq.c b/drivers/infiniband/hw/mlx5/srq.c |
979 |
+index 6d5fadad9090..3c7522d025f2 100644 |
980 |
+--- a/drivers/infiniband/hw/mlx5/srq.c |
981 |
++++ b/drivers/infiniband/hw/mlx5/srq.c |
982 |
+@@ -241,8 +241,8 @@ struct ib_srq *mlx5_ib_create_srq(struct ib_pd *pd, |
983 |
+ { |
984 |
+ struct mlx5_ib_dev *dev = to_mdev(pd->device); |
985 |
+ struct mlx5_ib_srq *srq; |
986 |
+- int desc_size; |
987 |
+- int buf_size; |
988 |
++ size_t desc_size; |
989 |
++ size_t buf_size; |
990 |
+ int err; |
991 |
+ struct mlx5_srq_attr in = {0}; |
992 |
+ __u32 max_srq_wqes = 1 << MLX5_CAP_GEN(dev->mdev, log_max_srq_sz); |
993 |
+@@ -266,15 +266,18 @@ struct ib_srq *mlx5_ib_create_srq(struct ib_pd *pd, |
994 |
+ |
995 |
+ desc_size = sizeof(struct mlx5_wqe_srq_next_seg) + |
996 |
+ srq->msrq.max_gs * sizeof(struct mlx5_wqe_data_seg); |
997 |
++ if (desc_size == 0 || srq->msrq.max_gs > desc_size) |
998 |
++ return ERR_PTR(-EINVAL); |
999 |
+ desc_size = roundup_pow_of_two(desc_size); |
1000 |
+- desc_size = max_t(int, 32, desc_size); |
1001 |
++ desc_size = max_t(size_t, 32, desc_size); |
1002 |
++ if (desc_size < sizeof(struct mlx5_wqe_srq_next_seg)) |
1003 |
++ return ERR_PTR(-EINVAL); |
1004 |
+ srq->msrq.max_avail_gather = (desc_size - sizeof(struct mlx5_wqe_srq_next_seg)) / |
1005 |
+ sizeof(struct mlx5_wqe_data_seg); |
1006 |
+ srq->msrq.wqe_shift = ilog2(desc_size); |
1007 |
+ buf_size = srq->msrq.max * desc_size; |
1008 |
+- mlx5_ib_dbg(dev, "desc_size 0x%x, req wr 0x%x, srq size 0x%x, max_gs 0x%x, max_avail_gather 0x%x\n", |
1009 |
+- desc_size, init_attr->attr.max_wr, srq->msrq.max, srq->msrq.max_gs, |
1010 |
+- srq->msrq.max_avail_gather); |
1011 |
++ if (buf_size < desc_size) |
1012 |
++ return ERR_PTR(-EINVAL); |
1013 |
+ in.type = init_attr->srq_type; |
1014 |
+ |
1015 |
+ if (pd->uobject) |
1016 |
+diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_stats.c b/drivers/infiniband/hw/ocrdma/ocrdma_stats.c |
1017 |
+index e528d7acb7f6..fb78b16ce671 100644 |
1018 |
+--- a/drivers/infiniband/hw/ocrdma/ocrdma_stats.c |
1019 |
++++ b/drivers/infiniband/hw/ocrdma/ocrdma_stats.c |
1020 |
+@@ -834,7 +834,7 @@ void ocrdma_add_port_stats(struct ocrdma_dev *dev) |
1021 |
+ |
1022 |
+ dev->reset_stats.type = OCRDMA_RESET_STATS; |
1023 |
+ dev->reset_stats.dev = dev; |
1024 |
+- if (!debugfs_create_file("reset_stats", S_IRUSR, dev->dir, |
1025 |
++ if (!debugfs_create_file("reset_stats", 0200, dev->dir, |
1026 |
+ &dev->reset_stats, &ocrdma_dbg_ops)) |
1027 |
+ goto err; |
1028 |
+ |
1029 |
+diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c |
1030 |
+index e529622cefad..28b0f0a82039 100644 |
1031 |
+--- a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c |
1032 |
++++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c |
1033 |
+@@ -114,6 +114,7 @@ struct ib_cq *pvrdma_create_cq(struct ib_device *ibdev, |
1034 |
+ union pvrdma_cmd_resp rsp; |
1035 |
+ struct pvrdma_cmd_create_cq *cmd = &req.create_cq; |
1036 |
+ struct pvrdma_cmd_create_cq_resp *resp = &rsp.create_cq_resp; |
1037 |
++ struct pvrdma_create_cq_resp cq_resp = {0}; |
1038 |
+ struct pvrdma_create_cq ucmd; |
1039 |
+ |
1040 |
+ BUILD_BUG_ON(sizeof(struct pvrdma_cqe) != 64); |
1041 |
+@@ -198,6 +199,7 @@ struct ib_cq *pvrdma_create_cq(struct ib_device *ibdev, |
1042 |
+ |
1043 |
+ cq->ibcq.cqe = resp->cqe; |
1044 |
+ cq->cq_handle = resp->cq_handle; |
1045 |
++ cq_resp.cqn = resp->cq_handle; |
1046 |
+ spin_lock_irqsave(&dev->cq_tbl_lock, flags); |
1047 |
+ dev->cq_tbl[cq->cq_handle % dev->dsr->caps.max_cq] = cq; |
1048 |
+ spin_unlock_irqrestore(&dev->cq_tbl_lock, flags); |
1049 |
+@@ -206,7 +208,7 @@ struct ib_cq *pvrdma_create_cq(struct ib_device *ibdev, |
1050 |
+ cq->uar = &(to_vucontext(context)->uar); |
1051 |
+ |
1052 |
+ /* Copy udata back. */ |
1053 |
+- if (ib_copy_to_udata(udata, &cq->cq_handle, sizeof(__u32))) { |
1054 |
++ if (ib_copy_to_udata(udata, &cq_resp, sizeof(cq_resp))) { |
1055 |
+ dev_warn(&dev->pdev->dev, |
1056 |
+ "failed to copy back udata\n"); |
1057 |
+ pvrdma_destroy_cq(&cq->ibcq); |
1058 |
+diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c |
1059 |
+index 5acebb1ef631..af235967a9c2 100644 |
1060 |
+--- a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c |
1061 |
++++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c |
1062 |
+@@ -113,6 +113,7 @@ struct ib_srq *pvrdma_create_srq(struct ib_pd *pd, |
1063 |
+ union pvrdma_cmd_resp rsp; |
1064 |
+ struct pvrdma_cmd_create_srq *cmd = &req.create_srq; |
1065 |
+ struct pvrdma_cmd_create_srq_resp *resp = &rsp.create_srq_resp; |
1066 |
++ struct pvrdma_create_srq_resp srq_resp = {0}; |
1067 |
+ struct pvrdma_create_srq ucmd; |
1068 |
+ unsigned long flags; |
1069 |
+ int ret; |
1070 |
+@@ -204,12 +205,13 @@ struct ib_srq *pvrdma_create_srq(struct ib_pd *pd, |
1071 |
+ } |
1072 |
+ |
1073 |
+ srq->srq_handle = resp->srqn; |
1074 |
++ srq_resp.srqn = resp->srqn; |
1075 |
+ spin_lock_irqsave(&dev->srq_tbl_lock, flags); |
1076 |
+ dev->srq_tbl[srq->srq_handle % dev->dsr->caps.max_srq] = srq; |
1077 |
+ spin_unlock_irqrestore(&dev->srq_tbl_lock, flags); |
1078 |
+ |
1079 |
+ /* Copy udata back. */ |
1080 |
+- if (ib_copy_to_udata(udata, &srq->srq_handle, sizeof(__u32))) { |
1081 |
++ if (ib_copy_to_udata(udata, &srq_resp, sizeof(srq_resp))) { |
1082 |
+ dev_warn(&dev->pdev->dev, "failed to copy back udata\n"); |
1083 |
+ pvrdma_destroy_srq(&srq->ibsrq); |
1084 |
+ return ERR_PTR(-EINVAL); |
1085 |
+diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c |
1086 |
+index 16b96616ef7e..a51463cd2f37 100644 |
1087 |
+--- a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c |
1088 |
++++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c |
1089 |
+@@ -447,6 +447,7 @@ struct ib_pd *pvrdma_alloc_pd(struct ib_device *ibdev, |
1090 |
+ union pvrdma_cmd_resp rsp; |
1091 |
+ struct pvrdma_cmd_create_pd *cmd = &req.create_pd; |
1092 |
+ struct pvrdma_cmd_create_pd_resp *resp = &rsp.create_pd_resp; |
1093 |
++ struct pvrdma_alloc_pd_resp pd_resp = {0}; |
1094 |
+ int ret; |
1095 |
+ void *ptr; |
1096 |
+ |
1097 |
+@@ -475,9 +476,10 @@ struct ib_pd *pvrdma_alloc_pd(struct ib_device *ibdev, |
1098 |
+ pd->privileged = !context; |
1099 |
+ pd->pd_handle = resp->pd_handle; |
1100 |
+ pd->pdn = resp->pd_handle; |
1101 |
++ pd_resp.pdn = resp->pd_handle; |
1102 |
+ |
1103 |
+ if (context) { |
1104 |
+- if (ib_copy_to_udata(udata, &pd->pdn, sizeof(__u32))) { |
1105 |
++ if (ib_copy_to_udata(udata, &pd_resp, sizeof(pd_resp))) { |
1106 |
+ dev_warn(&dev->pdev->dev, |
1107 |
+ "failed to copy back protection domain\n"); |
1108 |
+ pvrdma_dealloc_pd(&pd->ibpd); |
1109 |
+diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c |
1110 |
+index 8880351df179..160c5d9bca4c 100644 |
1111 |
+--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c |
1112 |
++++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c |
1113 |
+@@ -775,6 +775,22 @@ static void path_rec_completion(int status, |
1114 |
+ spin_lock_irqsave(&priv->lock, flags); |
1115 |
+ |
1116 |
+ if (!IS_ERR_OR_NULL(ah)) { |
1117 |
++ /* |
1118 |
++ * pathrec.dgid is used as the database key from the LLADDR, |
1119 |
++ * it must remain unchanged even if the SA returns a different |
1120 |
++ * GID to use in the AH. |
1121 |
++ */ |
1122 |
++ if (memcmp(pathrec->dgid.raw, path->pathrec.dgid.raw, |
1123 |
++ sizeof(union ib_gid))) { |
1124 |
++ ipoib_dbg( |
1125 |
++ priv, |
1126 |
++ "%s got PathRec for gid %pI6 while asked for %pI6\n", |
1127 |
++ dev->name, pathrec->dgid.raw, |
1128 |
++ path->pathrec.dgid.raw); |
1129 |
++ memcpy(pathrec->dgid.raw, path->pathrec.dgid.raw, |
1130 |
++ sizeof(union ib_gid)); |
1131 |
++ } |
1132 |
++ |
1133 |
+ path->pathrec = *pathrec; |
1134 |
+ |
1135 |
+ old_ah = path->ah; |
1136 |
+@@ -2207,8 +2223,10 @@ static struct net_device *ipoib_add_port(const char *format, |
1137 |
+ int result = -ENOMEM; |
1138 |
+ |
1139 |
+ priv = ipoib_intf_alloc(hca, port, format); |
1140 |
+- if (!priv) |
1141 |
++ if (!priv) { |
1142 |
++ pr_warn("%s, %d: ipoib_intf_alloc failed\n", hca->name, port); |
1143 |
+ goto alloc_mem_failed; |
1144 |
++ } |
1145 |
+ |
1146 |
+ SET_NETDEV_DEV(priv->dev, hca->dev.parent); |
1147 |
+ priv->dev->dev_id = port - 1; |
1148 |
+@@ -2337,8 +2355,7 @@ static void ipoib_add_one(struct ib_device *device) |
1149 |
+ } |
1150 |
+ |
1151 |
+ if (!count) { |
1152 |
+- pr_err("Failed to init port, removing it\n"); |
1153 |
+- ipoib_remove_one(device, dev_list); |
1154 |
++ kfree(dev_list); |
1155 |
+ return; |
1156 |
+ } |
1157 |
+ |
1158 |
+diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c |
1159 |
+index 1b02283ce20e..fff40b097947 100644 |
1160 |
+--- a/drivers/infiniband/ulp/isert/ib_isert.c |
1161 |
++++ b/drivers/infiniband/ulp/isert/ib_isert.c |
1162 |
+@@ -2124,6 +2124,9 @@ isert_rdma_rw_ctx_post(struct isert_cmd *cmd, struct isert_conn *conn, |
1163 |
+ u32 rkey, offset; |
1164 |
+ int ret; |
1165 |
+ |
1166 |
++ if (cmd->ctx_init_done) |
1167 |
++ goto rdma_ctx_post; |
1168 |
++ |
1169 |
+ if (dir == DMA_FROM_DEVICE) { |
1170 |
+ addr = cmd->write_va; |
1171 |
+ rkey = cmd->write_stag; |
1172 |
+@@ -2151,11 +2154,15 @@ isert_rdma_rw_ctx_post(struct isert_cmd *cmd, struct isert_conn *conn, |
1173 |
+ se_cmd->t_data_sg, se_cmd->t_data_nents, |
1174 |
+ offset, addr, rkey, dir); |
1175 |
+ } |
1176 |
++ |
1177 |
+ if (ret < 0) { |
1178 |
+ isert_err("Cmd: %p failed to prepare RDMA res\n", cmd); |
1179 |
+ return ret; |
1180 |
+ } |
1181 |
+ |
1182 |
++ cmd->ctx_init_done = true; |
1183 |
++ |
1184 |
++rdma_ctx_post: |
1185 |
+ ret = rdma_rw_ctx_post(&cmd->rw, conn->qp, port_num, cqe, chain_wr); |
1186 |
+ if (ret < 0) |
1187 |
+ isert_err("Cmd: %p failed to post RDMA res\n", cmd); |
1188 |
+diff --git a/drivers/infiniband/ulp/isert/ib_isert.h b/drivers/infiniband/ulp/isert/ib_isert.h |
1189 |
+index d6fd248320ae..3b296bac4f60 100644 |
1190 |
+--- a/drivers/infiniband/ulp/isert/ib_isert.h |
1191 |
++++ b/drivers/infiniband/ulp/isert/ib_isert.h |
1192 |
+@@ -126,6 +126,7 @@ struct isert_cmd { |
1193 |
+ struct rdma_rw_ctx rw; |
1194 |
+ struct work_struct comp_work; |
1195 |
+ struct scatterlist sg; |
1196 |
++ bool ctx_init_done; |
1197 |
+ }; |
1198 |
+ |
1199 |
+ static inline struct isert_cmd *tx_desc_to_cmd(struct iser_tx_desc *desc) |
1200 |
+diff --git a/drivers/iommu/intel-svm.c b/drivers/iommu/intel-svm.c |
1201 |
+index ed1cf7c5a43b..6643277e321e 100644 |
1202 |
+--- a/drivers/iommu/intel-svm.c |
1203 |
++++ b/drivers/iommu/intel-svm.c |
1204 |
+@@ -129,6 +129,7 @@ int intel_svm_enable_prq(struct intel_iommu *iommu) |
1205 |
+ pr_err("IOMMU: %s: Failed to request IRQ for page request queue\n", |
1206 |
+ iommu->name); |
1207 |
+ dmar_free_hwirq(irq); |
1208 |
++ iommu->pr_irq = 0; |
1209 |
+ goto err; |
1210 |
+ } |
1211 |
+ dmar_writeq(iommu->reg + DMAR_PQH_REG, 0ULL); |
1212 |
+@@ -144,9 +145,11 @@ int intel_svm_finish_prq(struct intel_iommu *iommu) |
1213 |
+ dmar_writeq(iommu->reg + DMAR_PQT_REG, 0ULL); |
1214 |
+ dmar_writeq(iommu->reg + DMAR_PQA_REG, 0ULL); |
1215 |
+ |
1216 |
+- free_irq(iommu->pr_irq, iommu); |
1217 |
+- dmar_free_hwirq(iommu->pr_irq); |
1218 |
+- iommu->pr_irq = 0; |
1219 |
++ if (iommu->pr_irq) { |
1220 |
++ free_irq(iommu->pr_irq, iommu); |
1221 |
++ dmar_free_hwirq(iommu->pr_irq); |
1222 |
++ iommu->pr_irq = 0; |
1223 |
++ } |
1224 |
+ |
1225 |
+ free_pages((unsigned long)iommu->prq, PRQ_ORDER); |
1226 |
+ iommu->prq = NULL; |
1227 |
+diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c |
1228 |
+index 41d9c513b7e8..539399dac551 100644 |
1229 |
+--- a/drivers/media/dvb-frontends/si2168.c |
1230 |
++++ b/drivers/media/dvb-frontends/si2168.c |
1231 |
+@@ -14,6 +14,8 @@ |
1232 |
+ * GNU General Public License for more details. |
1233 |
+ */ |
1234 |
+ |
1235 |
++#include <linux/delay.h> |
1236 |
++ |
1237 |
+ #include "si2168_priv.h" |
1238 |
+ |
1239 |
+ static const struct dvb_frontend_ops si2168_ops; |
1240 |
+@@ -435,6 +437,7 @@ static int si2168_init(struct dvb_frontend *fe) |
1241 |
+ if (ret) |
1242 |
+ goto err; |
1243 |
+ |
1244 |
++ udelay(100); |
1245 |
+ memcpy(cmd.args, "\x85", 1); |
1246 |
+ cmd.wlen = 1; |
1247 |
+ cmd.rlen = 1; |
1248 |
+diff --git a/drivers/media/pci/bt8xx/bt878.c b/drivers/media/pci/bt8xx/bt878.c |
1249 |
+index a5f52137d306..d4bc78b4fcb5 100644 |
1250 |
+--- a/drivers/media/pci/bt8xx/bt878.c |
1251 |
++++ b/drivers/media/pci/bt8xx/bt878.c |
1252 |
+@@ -422,8 +422,7 @@ static int bt878_probe(struct pci_dev *dev, const struct pci_device_id *pci_id) |
1253 |
+ bt878_num); |
1254 |
+ if (bt878_num >= BT878_MAX) { |
1255 |
+ printk(KERN_ERR "bt878: Too many devices inserted\n"); |
1256 |
+- result = -ENOMEM; |
1257 |
+- goto fail0; |
1258 |
++ return -ENOMEM; |
1259 |
+ } |
1260 |
+ if (pci_enable_device(dev)) |
1261 |
+ return -EIO; |
1262 |
+diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c |
1263 |
+index e45916f69def..a288d58fd29c 100644 |
1264 |
+--- a/drivers/media/platform/davinci/vpif_capture.c |
1265 |
++++ b/drivers/media/platform/davinci/vpif_capture.c |
1266 |
+@@ -1397,9 +1397,9 @@ static int vpif_async_bound(struct v4l2_async_notifier *notifier, |
1267 |
+ vpif_obj.config->chan_config->inputs[i].subdev_name = |
1268 |
+ (char *)to_of_node(subdev->fwnode)->full_name; |
1269 |
+ vpif_dbg(2, debug, |
1270 |
+- "%s: setting input %d subdev_name = %pOF\n", |
1271 |
++ "%s: setting input %d subdev_name = %s\n", |
1272 |
+ __func__, i, |
1273 |
+- to_of_node(subdev->fwnode)); |
1274 |
++ vpif_obj.config->chan_config->inputs[i].subdev_name); |
1275 |
+ return 0; |
1276 |
+ } |
1277 |
+ } |
1278 |
+diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c |
1279 |
+index bc68dbbcaec1..cac27ad510de 100644 |
1280 |
+--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c |
1281 |
++++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c |
1282 |
+@@ -1309,6 +1309,12 @@ static int s5p_mfc_probe(struct platform_device *pdev) |
1283 |
+ goto err_dma; |
1284 |
+ } |
1285 |
+ |
1286 |
++ /* |
1287 |
++ * Load fails if fs isn't mounted. Try loading anyway. |
1288 |
++ * _open() will load it, it it fails now. Ignore failure. |
1289 |
++ */ |
1290 |
++ s5p_mfc_load_firmware(dev); |
1291 |
++ |
1292 |
+ mutex_init(&dev->mfc_mutex); |
1293 |
+ init_waitqueue_head(&dev->queue); |
1294 |
+ dev->hw_lock = 0; |
1295 |
+diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h |
1296 |
+index 4220914529b2..76119a8cc477 100644 |
1297 |
+--- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h |
1298 |
++++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h |
1299 |
+@@ -290,6 +290,8 @@ struct s5p_mfc_priv_buf { |
1300 |
+ * @mfc_cmds: cmd structure holding HW commands function pointers |
1301 |
+ * @mfc_regs: structure holding MFC registers |
1302 |
+ * @fw_ver: loaded firmware sub-version |
1303 |
++ * @fw_get_done flag set when request_firmware() is complete and |
1304 |
++ * copied into fw_buf |
1305 |
+ * risc_on: flag indicates RISC is on or off |
1306 |
+ * |
1307 |
+ */ |
1308 |
+@@ -336,6 +338,7 @@ struct s5p_mfc_dev { |
1309 |
+ struct s5p_mfc_hw_cmds *mfc_cmds; |
1310 |
+ const struct s5p_mfc_regs *mfc_regs; |
1311 |
+ enum s5p_mfc_fw_ver fw_ver; |
1312 |
++ bool fw_get_done; |
1313 |
+ bool risc_on; /* indicates if RISC is on or off */ |
1314 |
+ }; |
1315 |
+ |
1316 |
+diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c |
1317 |
+index 69ef9c23a99a..d94e59e79fe9 100644 |
1318 |
+--- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c |
1319 |
++++ b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c |
1320 |
+@@ -55,6 +55,9 @@ int s5p_mfc_load_firmware(struct s5p_mfc_dev *dev) |
1321 |
+ * into kernel. */ |
1322 |
+ mfc_debug_enter(); |
1323 |
+ |
1324 |
++ if (dev->fw_get_done) |
1325 |
++ return 0; |
1326 |
++ |
1327 |
+ for (i = MFC_FW_MAX_VERSIONS - 1; i >= 0; i--) { |
1328 |
+ if (!dev->variant->fw_name[i]) |
1329 |
+ continue; |
1330 |
+@@ -82,6 +85,7 @@ int s5p_mfc_load_firmware(struct s5p_mfc_dev *dev) |
1331 |
+ } |
1332 |
+ memcpy(dev->fw_buf.virt, fw_blob->data, fw_blob->size); |
1333 |
+ wmb(); |
1334 |
++ dev->fw_get_done = true; |
1335 |
+ release_firmware(fw_blob); |
1336 |
+ mfc_debug_leave(); |
1337 |
+ return 0; |
1338 |
+@@ -93,6 +97,7 @@ int s5p_mfc_release_firmware(struct s5p_mfc_dev *dev) |
1339 |
+ /* Before calling this function one has to make sure |
1340 |
+ * that MFC is no longer processing */ |
1341 |
+ s5p_mfc_release_priv_buf(dev, &dev->fw_buf); |
1342 |
++ dev->fw_get_done = false; |
1343 |
+ return 0; |
1344 |
+ } |
1345 |
+ |
1346 |
+diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c |
1347 |
+index a0acee7671b1..8bd19e61846d 100644 |
1348 |
+--- a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c |
1349 |
++++ b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c |
1350 |
+@@ -83,7 +83,7 @@ static void c8sectpfe_timer_interrupt(struct timer_list *t) |
1351 |
+ static void channel_swdemux_tsklet(unsigned long data) |
1352 |
+ { |
1353 |
+ struct channel_info *channel = (struct channel_info *)data; |
1354 |
+- struct c8sectpfei *fei = channel->fei; |
1355 |
++ struct c8sectpfei *fei; |
1356 |
+ unsigned long wp, rp; |
1357 |
+ int pos, num_packets, n, size; |
1358 |
+ u8 *buf; |
1359 |
+@@ -91,6 +91,8 @@ static void channel_swdemux_tsklet(unsigned long data) |
1360 |
+ if (unlikely(!channel || !channel->irec)) |
1361 |
+ return; |
1362 |
+ |
1363 |
++ fei = channel->fei; |
1364 |
++ |
1365 |
+ wp = readl(channel->irec + DMA_PRDS_BUSWP_TP(0)); |
1366 |
+ rp = readl(channel->irec + DMA_PRDS_BUSRP_TP(0)); |
1367 |
+ |
1368 |
+diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c |
1369 |
+index ccfa98af1dd3..b737a9540331 100644 |
1370 |
+--- a/drivers/mmc/core/block.c |
1371 |
++++ b/drivers/mmc/core/block.c |
1372 |
+@@ -2623,6 +2623,7 @@ static int mmc_ext_csd_open(struct inode *inode, struct file *filp) |
1373 |
+ |
1374 |
+ if (n != EXT_CSD_STR_LEN) { |
1375 |
+ err = -EINVAL; |
1376 |
++ kfree(ext_csd); |
1377 |
+ goto out_free; |
1378 |
+ } |
1379 |
+ |
1380 |
+diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c |
1381 |
+index 1f0f44f4dd5f..af194640dbc6 100644 |
1382 |
+--- a/drivers/mmc/core/core.c |
1383 |
++++ b/drivers/mmc/core/core.c |
1384 |
+@@ -2959,6 +2959,14 @@ static int mmc_pm_notify(struct notifier_block *notify_block, |
1385 |
+ if (!err) |
1386 |
+ break; |
1387 |
+ |
1388 |
++ if (!mmc_card_is_removable(host)) { |
1389 |
++ dev_warn(mmc_dev(host), |
1390 |
++ "pre_suspend failed for non-removable host: " |
1391 |
++ "%d\n", err); |
1392 |
++ /* Avoid removing non-removable hosts */ |
1393 |
++ break; |
1394 |
++ } |
1395 |
++ |
1396 |
+ /* Calling bus_ops->remove() with a claimed host can deadlock */ |
1397 |
+ host->bus_ops->remove(host); |
1398 |
+ mmc_claim_host(host); |
1399 |
+diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c |
1400 |
+index 0842bbc2d7ad..4d0791f6ec23 100644 |
1401 |
+--- a/drivers/mmc/host/sdhci-xenon.c |
1402 |
++++ b/drivers/mmc/host/sdhci-xenon.c |
1403 |
+@@ -230,7 +230,14 @@ static void xenon_set_power(struct sdhci_host *host, unsigned char mode, |
1404 |
+ mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd); |
1405 |
+ } |
1406 |
+ |
1407 |
++static void xenon_voltage_switch(struct sdhci_host *host) |
1408 |
++{ |
1409 |
++ /* Wait for 5ms after set 1.8V signal enable bit */ |
1410 |
++ usleep_range(5000, 5500); |
1411 |
++} |
1412 |
++ |
1413 |
+ static const struct sdhci_ops sdhci_xenon_ops = { |
1414 |
++ .voltage_switch = xenon_voltage_switch, |
1415 |
+ .set_clock = sdhci_set_clock, |
1416 |
+ .set_power = xenon_set_power, |
1417 |
+ .set_bus_width = sdhci_set_bus_width, |
1418 |
+diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h |
1419 |
+index 88ddfb92122b..c2653ac499e1 100644 |
1420 |
+--- a/drivers/net/hyperv/hyperv_net.h |
1421 |
++++ b/drivers/net/hyperv/hyperv_net.h |
1422 |
+@@ -635,14 +635,27 @@ struct nvsp_message { |
1423 |
+ #define NETVSC_MTU 65535 |
1424 |
+ #define NETVSC_MTU_MIN ETH_MIN_MTU |
1425 |
+ |
1426 |
+-#define NETVSC_RECEIVE_BUFFER_SIZE (1024*1024*16) /* 16MB */ |
1427 |
+-#define NETVSC_RECEIVE_BUFFER_SIZE_LEGACY (1024*1024*15) /* 15MB */ |
1428 |
+-#define NETVSC_SEND_BUFFER_SIZE (1024 * 1024 * 15) /* 15MB */ |
1429 |
++/* Max buffer sizes allowed by a host */ |
1430 |
++#define NETVSC_RECEIVE_BUFFER_SIZE (1024 * 1024 * 31) /* 31MB */ |
1431 |
++#define NETVSC_RECEIVE_BUFFER_SIZE_LEGACY (1024 * 1024 * 15) /* 15MB */ |
1432 |
++#define NETVSC_RECEIVE_BUFFER_DEFAULT (1024 * 1024 * 16) |
1433 |
++ |
1434 |
++#define NETVSC_SEND_BUFFER_SIZE (1024 * 1024 * 15) /* 15MB */ |
1435 |
++#define NETVSC_SEND_BUFFER_DEFAULT (1024 * 1024) |
1436 |
++ |
1437 |
+ #define NETVSC_INVALID_INDEX -1 |
1438 |
+ |
1439 |
+ #define NETVSC_SEND_SECTION_SIZE 6144 |
1440 |
+ #define NETVSC_RECV_SECTION_SIZE 1728 |
1441 |
+ |
1442 |
++/* Default size of TX buf: 1MB, RX buf: 16MB */ |
1443 |
++#define NETVSC_MIN_TX_SECTIONS 10 |
1444 |
++#define NETVSC_DEFAULT_TX (NETVSC_SEND_BUFFER_DEFAULT \ |
1445 |
++ / NETVSC_SEND_SECTION_SIZE) |
1446 |
++#define NETVSC_MIN_RX_SECTIONS 10 |
1447 |
++#define NETVSC_DEFAULT_RX (NETVSC_RECEIVE_BUFFER_DEFAULT \ |
1448 |
++ / NETVSC_RECV_SECTION_SIZE) |
1449 |
++ |
1450 |
+ #define NETVSC_RECEIVE_BUFFER_ID 0xcafe |
1451 |
+ #define NETVSC_SEND_BUFFER_ID 0 |
1452 |
+ |
1453 |
+diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c |
1454 |
+index bfc79698b8f4..1e4f512fb90d 100644 |
1455 |
+--- a/drivers/net/hyperv/netvsc.c |
1456 |
++++ b/drivers/net/hyperv/netvsc.c |
1457 |
+@@ -267,6 +267,11 @@ static int netvsc_init_buf(struct hv_device *device, |
1458 |
+ buf_size = device_info->recv_sections * device_info->recv_section_size; |
1459 |
+ buf_size = roundup(buf_size, PAGE_SIZE); |
1460 |
+ |
1461 |
++ /* Legacy hosts only allow smaller receive buffer */ |
1462 |
++ if (net_device->nvsp_version <= NVSP_PROTOCOL_VERSION_2) |
1463 |
++ buf_size = min_t(unsigned int, buf_size, |
1464 |
++ NETVSC_RECEIVE_BUFFER_SIZE_LEGACY); |
1465 |
++ |
1466 |
+ net_device->recv_buf = vzalloc(buf_size); |
1467 |
+ if (!net_device->recv_buf) { |
1468 |
+ netdev_err(ndev, |
1469 |
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c |
1470 |
+index 5129647d420c..dde3251da004 100644 |
1471 |
+--- a/drivers/net/hyperv/netvsc_drv.c |
1472 |
++++ b/drivers/net/hyperv/netvsc_drv.c |
1473 |
+@@ -46,10 +46,6 @@ |
1474 |
+ #include "hyperv_net.h" |
1475 |
+ |
1476 |
+ #define RING_SIZE_MIN 64 |
1477 |
+-#define NETVSC_MIN_TX_SECTIONS 10 |
1478 |
+-#define NETVSC_DEFAULT_TX 192 /* ~1M */ |
1479 |
+-#define NETVSC_MIN_RX_SECTIONS 10 /* ~64K */ |
1480 |
+-#define NETVSC_DEFAULT_RX 10485 /* Max ~16M */ |
1481 |
+ |
1482 |
+ #define LINKCHANGE_INT (2 * HZ) |
1483 |
+ #define VF_TAKEOVER_INT (HZ / 10) |
1484 |
+diff --git a/drivers/net/phy/meson-gxl.c b/drivers/net/phy/meson-gxl.c |
1485 |
+index 842eb871a6e3..f431c83ba0b5 100644 |
1486 |
+--- a/drivers/net/phy/meson-gxl.c |
1487 |
++++ b/drivers/net/phy/meson-gxl.c |
1488 |
+@@ -26,27 +26,53 @@ |
1489 |
+ |
1490 |
+ static int meson_gxl_config_init(struct phy_device *phydev) |
1491 |
+ { |
1492 |
++ int ret; |
1493 |
++ |
1494 |
+ /* Enable Analog and DSP register Bank access by */ |
1495 |
+- phy_write(phydev, 0x14, 0x0000); |
1496 |
+- phy_write(phydev, 0x14, 0x0400); |
1497 |
+- phy_write(phydev, 0x14, 0x0000); |
1498 |
+- phy_write(phydev, 0x14, 0x0400); |
1499 |
++ ret = phy_write(phydev, 0x14, 0x0000); |
1500 |
++ if (ret) |
1501 |
++ return ret; |
1502 |
++ ret = phy_write(phydev, 0x14, 0x0400); |
1503 |
++ if (ret) |
1504 |
++ return ret; |
1505 |
++ ret = phy_write(phydev, 0x14, 0x0000); |
1506 |
++ if (ret) |
1507 |
++ return ret; |
1508 |
++ ret = phy_write(phydev, 0x14, 0x0400); |
1509 |
++ if (ret) |
1510 |
++ return ret; |
1511 |
+ |
1512 |
+ /* Write Analog register 23 */ |
1513 |
+- phy_write(phydev, 0x17, 0x8E0D); |
1514 |
+- phy_write(phydev, 0x14, 0x4417); |
1515 |
++ ret = phy_write(phydev, 0x17, 0x8E0D); |
1516 |
++ if (ret) |
1517 |
++ return ret; |
1518 |
++ ret = phy_write(phydev, 0x14, 0x4417); |
1519 |
++ if (ret) |
1520 |
++ return ret; |
1521 |
+ |
1522 |
+ /* Enable fractional PLL */ |
1523 |
+- phy_write(phydev, 0x17, 0x0005); |
1524 |
+- phy_write(phydev, 0x14, 0x5C1B); |
1525 |
++ ret = phy_write(phydev, 0x17, 0x0005); |
1526 |
++ if (ret) |
1527 |
++ return ret; |
1528 |
++ ret = phy_write(phydev, 0x14, 0x5C1B); |
1529 |
++ if (ret) |
1530 |
++ return ret; |
1531 |
+ |
1532 |
+ /* Program fraction FR_PLL_DIV1 */ |
1533 |
+- phy_write(phydev, 0x17, 0x029A); |
1534 |
+- phy_write(phydev, 0x14, 0x5C1D); |
1535 |
++ ret = phy_write(phydev, 0x17, 0x029A); |
1536 |
++ if (ret) |
1537 |
++ return ret; |
1538 |
++ ret = phy_write(phydev, 0x14, 0x5C1D); |
1539 |
++ if (ret) |
1540 |
++ return ret; |
1541 |
+ |
1542 |
+ /* Program fraction FR_PLL_DIV1 */ |
1543 |
+- phy_write(phydev, 0x17, 0xAAAA); |
1544 |
+- phy_write(phydev, 0x14, 0x5C1C); |
1545 |
++ ret = phy_write(phydev, 0x17, 0xAAAA); |
1546 |
++ if (ret) |
1547 |
++ return ret; |
1548 |
++ ret = phy_write(phydev, 0x14, 0x5C1C); |
1549 |
++ if (ret) |
1550 |
++ return ret; |
1551 |
+ |
1552 |
+ return 0; |
1553 |
+ } |
1554 |
+diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c |
1555 |
+index 9dfc1c4c954f..10b77ac781ca 100644 |
1556 |
+--- a/drivers/net/phy/sfp.c |
1557 |
++++ b/drivers/net/phy/sfp.c |
1558 |
+@@ -315,12 +315,12 @@ static void sfp_sm_probe_phy(struct sfp *sfp) |
1559 |
+ msleep(T_PHY_RESET_MS); |
1560 |
+ |
1561 |
+ phy = mdiobus_scan(sfp->i2c_mii, SFP_PHY_ADDR); |
1562 |
+- if (IS_ERR(phy)) { |
1563 |
+- dev_err(sfp->dev, "mdiobus scan returned %ld\n", PTR_ERR(phy)); |
1564 |
++ if (phy == ERR_PTR(-ENODEV)) { |
1565 |
++ dev_info(sfp->dev, "no PHY detected\n"); |
1566 |
+ return; |
1567 |
+ } |
1568 |
+- if (!phy) { |
1569 |
+- dev_info(sfp->dev, "no PHY detected\n"); |
1570 |
++ if (IS_ERR(phy)) { |
1571 |
++ dev_err(sfp->dev, "mdiobus scan returned %ld\n", PTR_ERR(phy)); |
1572 |
+ return; |
1573 |
+ } |
1574 |
+ |
1575 |
+@@ -683,20 +683,19 @@ static int sfp_module_eeprom(struct sfp *sfp, struct ethtool_eeprom *ee, |
1576 |
+ len = min_t(unsigned int, last, ETH_MODULE_SFF_8079_LEN); |
1577 |
+ len -= first; |
1578 |
+ |
1579 |
+- ret = sfp->read(sfp, false, first, data, len); |
1580 |
++ ret = sfp_read(sfp, false, first, data, len); |
1581 |
+ if (ret < 0) |
1582 |
+ return ret; |
1583 |
+ |
1584 |
+ first += len; |
1585 |
+ data += len; |
1586 |
+ } |
1587 |
+- if (first >= ETH_MODULE_SFF_8079_LEN && |
1588 |
+- first < ETH_MODULE_SFF_8472_LEN) { |
1589 |
++ if (first < ETH_MODULE_SFF_8472_LEN && last > ETH_MODULE_SFF_8079_LEN) { |
1590 |
+ len = min_t(unsigned int, last, ETH_MODULE_SFF_8472_LEN); |
1591 |
+ len -= first; |
1592 |
+ first -= ETH_MODULE_SFF_8079_LEN; |
1593 |
+ |
1594 |
+- ret = sfp->read(sfp, true, first, data, len); |
1595 |
++ ret = sfp_read(sfp, true, first, data, len); |
1596 |
+ if (ret < 0) |
1597 |
+ return ret; |
1598 |
+ } |
1599 |
+diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c |
1600 |
+index e7114c34fe4b..76ac48095c29 100644 |
1601 |
+--- a/drivers/net/usb/qmi_wwan.c |
1602 |
++++ b/drivers/net/usb/qmi_wwan.c |
1603 |
+@@ -826,7 +826,7 @@ static int qmi_wwan_resume(struct usb_interface *intf) |
1604 |
+ |
1605 |
+ static const struct driver_info qmi_wwan_info = { |
1606 |
+ .description = "WWAN/QMI device", |
1607 |
+- .flags = FLAG_WWAN, |
1608 |
++ .flags = FLAG_WWAN | FLAG_SEND_ZLP, |
1609 |
+ .bind = qmi_wwan_bind, |
1610 |
+ .unbind = qmi_wwan_unbind, |
1611 |
+ .manage_power = qmi_wwan_manage_power, |
1612 |
+@@ -835,7 +835,7 @@ static const struct driver_info qmi_wwan_info = { |
1613 |
+ |
1614 |
+ static const struct driver_info qmi_wwan_info_quirk_dtr = { |
1615 |
+ .description = "WWAN/QMI device", |
1616 |
+- .flags = FLAG_WWAN, |
1617 |
++ .flags = FLAG_WWAN | FLAG_SEND_ZLP, |
1618 |
+ .bind = qmi_wwan_bind, |
1619 |
+ .unbind = qmi_wwan_unbind, |
1620 |
+ .manage_power = qmi_wwan_manage_power, |
1621 |
+diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c |
1622 |
+index c6460e7f6d78..397a5b6b50b1 100644 |
1623 |
+--- a/drivers/net/wireless/ath/ath10k/mac.c |
1624 |
++++ b/drivers/net/wireless/ath/ath10k/mac.c |
1625 |
+@@ -2563,7 +2563,7 @@ static void ath10k_peer_assoc_h_qos(struct ath10k *ar, |
1626 |
+ } |
1627 |
+ break; |
1628 |
+ case WMI_VDEV_TYPE_STA: |
1629 |
+- if (vif->bss_conf.qos) |
1630 |
++ if (sta->wme) |
1631 |
+ arg->peer_flags |= arvif->ar->wmi.peer_flags->qos; |
1632 |
+ break; |
1633 |
+ case WMI_VDEV_TYPE_IBSS: |
1634 |
+diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c |
1635 |
+index cad2272ae21b..704741d6f495 100644 |
1636 |
+--- a/drivers/net/wireless/realtek/rtlwifi/base.c |
1637 |
++++ b/drivers/net/wireless/realtek/rtlwifi/base.c |
1638 |
+@@ -1726,7 +1726,7 @@ int rtl_tx_agg_oper(struct ieee80211_hw *hw, |
1639 |
+ void rtl_rx_ampdu_apply(struct rtl_priv *rtlpriv) |
1640 |
+ { |
1641 |
+ struct rtl_btc_ops *btc_ops = rtlpriv->btcoexist.btc_ops; |
1642 |
+- u8 reject_agg, ctrl_agg_size = 0, agg_size; |
1643 |
++ u8 reject_agg = 0, ctrl_agg_size = 0, agg_size = 0; |
1644 |
+ |
1645 |
+ if (rtlpriv->cfg->ops->get_btc_status()) |
1646 |
+ btc_ops->btc_get_ampdu_cfg(rtlpriv, &reject_agg, |
1647 |
+diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.c b/drivers/net/wireless/realtek/rtlwifi/pci.c |
1648 |
+index c2575b0b9440..1b7715fd13b1 100644 |
1649 |
+--- a/drivers/net/wireless/realtek/rtlwifi/pci.c |
1650 |
++++ b/drivers/net/wireless/realtek/rtlwifi/pci.c |
1651 |
+@@ -1555,7 +1555,14 @@ int rtl_pci_reset_trx_ring(struct ieee80211_hw *hw) |
1652 |
+ dev_kfree_skb_irq(skb); |
1653 |
+ ring->idx = (ring->idx + 1) % ring->entries; |
1654 |
+ } |
1655 |
++ |
1656 |
++ if (rtlpriv->use_new_trx_flow) { |
1657 |
++ rtlpci->tx_ring[i].cur_tx_rp = 0; |
1658 |
++ rtlpci->tx_ring[i].cur_tx_wp = 0; |
1659 |
++ } |
1660 |
++ |
1661 |
+ ring->idx = 0; |
1662 |
++ ring->entries = rtlpci->txringcount[i]; |
1663 |
+ } |
1664 |
+ } |
1665 |
+ spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags); |
1666 |
+diff --git a/drivers/pci/dwc/pcie-designware-ep.c b/drivers/pci/dwc/pcie-designware-ep.c |
1667 |
+index d53d5f168363..7c621877a939 100644 |
1668 |
+--- a/drivers/pci/dwc/pcie-designware-ep.c |
1669 |
++++ b/drivers/pci/dwc/pcie-designware-ep.c |
1670 |
+@@ -197,20 +197,14 @@ static int dw_pcie_ep_map_addr(struct pci_epc *epc, phys_addr_t addr, |
1671 |
+ static int dw_pcie_ep_get_msi(struct pci_epc *epc) |
1672 |
+ { |
1673 |
+ int val; |
1674 |
+- u32 lower_addr; |
1675 |
+- u32 upper_addr; |
1676 |
+ struct dw_pcie_ep *ep = epc_get_drvdata(epc); |
1677 |
+ struct dw_pcie *pci = to_dw_pcie_from_ep(ep); |
1678 |
+ |
1679 |
+- val = dw_pcie_readb_dbi(pci, MSI_MESSAGE_CONTROL); |
1680 |
+- val = (val & MSI_CAP_MME_MASK) >> MSI_CAP_MME_SHIFT; |
1681 |
+- |
1682 |
+- lower_addr = dw_pcie_readl_dbi(pci, MSI_MESSAGE_ADDR_L32); |
1683 |
+- upper_addr = dw_pcie_readl_dbi(pci, MSI_MESSAGE_ADDR_U32); |
1684 |
+- |
1685 |
+- if (!(lower_addr || upper_addr)) |
1686 |
++ val = dw_pcie_readw_dbi(pci, MSI_MESSAGE_CONTROL); |
1687 |
++ if (!(val & MSI_CAP_MSI_EN_MASK)) |
1688 |
+ return -EINVAL; |
1689 |
+ |
1690 |
++ val = (val & MSI_CAP_MME_MASK) >> MSI_CAP_MME_SHIFT; |
1691 |
+ return val; |
1692 |
+ } |
1693 |
+ |
1694 |
+diff --git a/drivers/pci/dwc/pcie-designware.h b/drivers/pci/dwc/pcie-designware.h |
1695 |
+index e5d9d77b778e..cb493bcae8b4 100644 |
1696 |
+--- a/drivers/pci/dwc/pcie-designware.h |
1697 |
++++ b/drivers/pci/dwc/pcie-designware.h |
1698 |
+@@ -101,6 +101,7 @@ |
1699 |
+ #define MSI_MESSAGE_CONTROL 0x52 |
1700 |
+ #define MSI_CAP_MMC_SHIFT 1 |
1701 |
+ #define MSI_CAP_MME_SHIFT 4 |
1702 |
++#define MSI_CAP_MSI_EN_MASK 0x1 |
1703 |
+ #define MSI_CAP_MME_MASK (7 << MSI_CAP_MME_SHIFT) |
1704 |
+ #define MSI_MESSAGE_ADDR_L32 0x54 |
1705 |
+ #define MSI_MESSAGE_ADDR_U32 0x58 |
1706 |
+diff --git a/drivers/pci/endpoint/pci-ep-cfs.c b/drivers/pci/endpoint/pci-ep-cfs.c |
1707 |
+index 4f74386c1ced..5508cd32afcd 100644 |
1708 |
+--- a/drivers/pci/endpoint/pci-ep-cfs.c |
1709 |
++++ b/drivers/pci/endpoint/pci-ep-cfs.c |
1710 |
+@@ -109,7 +109,10 @@ static int pci_epc_epf_link(struct config_item *epc_item, |
1711 |
+ goto err_add_epf; |
1712 |
+ |
1713 |
+ func_no = find_first_zero_bit(&epc_group->function_num_map, |
1714 |
+- sizeof(epc_group->function_num_map)); |
1715 |
++ BITS_PER_LONG); |
1716 |
++ if (func_no >= BITS_PER_LONG) |
1717 |
++ return -EINVAL; |
1718 |
++ |
1719 |
+ set_bit(func_no, &epc_group->function_num_map); |
1720 |
+ epf->func_no = func_no; |
1721 |
+ |
1722 |
+diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c |
1723 |
+index 52ab3cb0a0bf..95ca4a1feba4 100644 |
1724 |
+--- a/drivers/pci/host/pcie-rcar.c |
1725 |
++++ b/drivers/pci/host/pcie-rcar.c |
1726 |
+@@ -1123,7 +1123,9 @@ static int rcar_pcie_probe(struct platform_device *pdev) |
1727 |
+ |
1728 |
+ INIT_LIST_HEAD(&pcie->resources); |
1729 |
+ |
1730 |
+- rcar_pcie_parse_request_of_pci_ranges(pcie); |
1731 |
++ err = rcar_pcie_parse_request_of_pci_ranges(pcie); |
1732 |
++ if (err) |
1733 |
++ goto err_free_bridge; |
1734 |
+ |
1735 |
+ err = rcar_pcie_get_resources(pcie); |
1736 |
+ if (err < 0) { |
1737 |
+@@ -1178,6 +1180,7 @@ static int rcar_pcie_probe(struct platform_device *pdev) |
1738 |
+ |
1739 |
+ err_free_resource_list: |
1740 |
+ pci_free_resource_list(&pcie->resources); |
1741 |
++err_free_bridge: |
1742 |
+ pci_free_host_bridge(bridge); |
1743 |
+ |
1744 |
+ return err; |
1745 |
+diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c |
1746 |
+index 9783e10da3a9..3b9b4d50cd98 100644 |
1747 |
+--- a/drivers/pci/pcie/aspm.c |
1748 |
++++ b/drivers/pci/pcie/aspm.c |
1749 |
+@@ -43,18 +43,6 @@ |
1750 |
+ #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1 | \ |
1751 |
+ ASPM_STATE_L1SS) |
1752 |
+ |
1753 |
+-/* |
1754 |
+- * When L1 substates are enabled, the LTR L1.2 threshold is a timing parameter |
1755 |
+- * that decides whether L1.1 or L1.2 is entered (Refer PCIe spec for details). |
1756 |
+- * Not sure is there is a way to "calculate" this on the fly, but maybe we |
1757 |
+- * could turn it into a parameter in future. This value has been taken from |
1758 |
+- * the following files from Intel's coreboot (which is the only code I found |
1759 |
+- * to have used this): |
1760 |
+- * https://www.coreboot.org/pipermail/coreboot-gerrit/2015-March/021134.html |
1761 |
+- * https://review.coreboot.org/#/c/8832/ |
1762 |
+- */ |
1763 |
+-#define LTR_L1_2_THRESHOLD_BITS ((1 << 21) | (1 << 23) | (1 << 30)) |
1764 |
+- |
1765 |
+ struct aspm_latency { |
1766 |
+ u32 l0s; /* L0s latency (nsec) */ |
1767 |
+ u32 l1; /* L1 latency (nsec) */ |
1768 |
+@@ -333,6 +321,32 @@ static u32 calc_l1ss_pwron(struct pci_dev *pdev, u32 scale, u32 val) |
1769 |
+ return 0; |
1770 |
+ } |
1771 |
+ |
1772 |
++static void encode_l12_threshold(u32 threshold_us, u32 *scale, u32 *value) |
1773 |
++{ |
1774 |
++ u64 threshold_ns = threshold_us * 1000; |
1775 |
++ |
1776 |
++ /* See PCIe r3.1, sec 7.33.3 and sec 6.18 */ |
1777 |
++ if (threshold_ns < 32) { |
1778 |
++ *scale = 0; |
1779 |
++ *value = threshold_ns; |
1780 |
++ } else if (threshold_ns < 1024) { |
1781 |
++ *scale = 1; |
1782 |
++ *value = threshold_ns >> 5; |
1783 |
++ } else if (threshold_ns < 32768) { |
1784 |
++ *scale = 2; |
1785 |
++ *value = threshold_ns >> 10; |
1786 |
++ } else if (threshold_ns < 1048576) { |
1787 |
++ *scale = 3; |
1788 |
++ *value = threshold_ns >> 15; |
1789 |
++ } else if (threshold_ns < 33554432) { |
1790 |
++ *scale = 4; |
1791 |
++ *value = threshold_ns >> 20; |
1792 |
++ } else { |
1793 |
++ *scale = 5; |
1794 |
++ *value = threshold_ns >> 25; |
1795 |
++ } |
1796 |
++} |
1797 |
++ |
1798 |
+ struct aspm_register_info { |
1799 |
+ u32 support:2; |
1800 |
+ u32 enabled:2; |
1801 |
+@@ -443,6 +457,7 @@ static void aspm_calc_l1ss_info(struct pcie_link_state *link, |
1802 |
+ struct aspm_register_info *dwreg) |
1803 |
+ { |
1804 |
+ u32 val1, val2, scale1, scale2; |
1805 |
++ u32 t_common_mode, t_power_on, l1_2_threshold, scale, value; |
1806 |
+ |
1807 |
+ link->l1ss.up_cap_ptr = upreg->l1ss_cap_ptr; |
1808 |
+ link->l1ss.dw_cap_ptr = dwreg->l1ss_cap_ptr; |
1809 |
+@@ -454,16 +469,7 @@ static void aspm_calc_l1ss_info(struct pcie_link_state *link, |
1810 |
+ /* Choose the greater of the two Port Common_Mode_Restore_Times */ |
1811 |
+ val1 = (upreg->l1ss_cap & PCI_L1SS_CAP_CM_RESTORE_TIME) >> 8; |
1812 |
+ val2 = (dwreg->l1ss_cap & PCI_L1SS_CAP_CM_RESTORE_TIME) >> 8; |
1813 |
+- if (val1 > val2) |
1814 |
+- link->l1ss.ctl1 |= val1 << 8; |
1815 |
+- else |
1816 |
+- link->l1ss.ctl1 |= val2 << 8; |
1817 |
+- |
1818 |
+- /* |
1819 |
+- * We currently use LTR L1.2 threshold to be fixed constant picked from |
1820 |
+- * Intel's coreboot. |
1821 |
+- */ |
1822 |
+- link->l1ss.ctl1 |= LTR_L1_2_THRESHOLD_BITS; |
1823 |
++ t_common_mode = max(val1, val2); |
1824 |
+ |
1825 |
+ /* Choose the greater of the two Port T_POWER_ON times */ |
1826 |
+ val1 = (upreg->l1ss_cap & PCI_L1SS_CAP_P_PWR_ON_VALUE) >> 19; |
1827 |
+@@ -472,10 +478,27 @@ static void aspm_calc_l1ss_info(struct pcie_link_state *link, |
1828 |
+ scale2 = (dwreg->l1ss_cap & PCI_L1SS_CAP_P_PWR_ON_SCALE) >> 16; |
1829 |
+ |
1830 |
+ if (calc_l1ss_pwron(link->pdev, scale1, val1) > |
1831 |
+- calc_l1ss_pwron(link->downstream, scale2, val2)) |
1832 |
++ calc_l1ss_pwron(link->downstream, scale2, val2)) { |
1833 |
+ link->l1ss.ctl2 |= scale1 | (val1 << 3); |
1834 |
+- else |
1835 |
++ t_power_on = calc_l1ss_pwron(link->pdev, scale1, val1); |
1836 |
++ } else { |
1837 |
+ link->l1ss.ctl2 |= scale2 | (val2 << 3); |
1838 |
++ t_power_on = calc_l1ss_pwron(link->downstream, scale2, val2); |
1839 |
++ } |
1840 |
++ |
1841 |
++ /* |
1842 |
++ * Set LTR_L1.2_THRESHOLD to the time required to transition the |
1843 |
++ * Link from L0 to L1.2 and back to L0 so we enter L1.2 only if |
1844 |
++ * downstream devices report (via LTR) that they can tolerate at |
1845 |
++ * least that much latency. |
1846 |
++ * |
1847 |
++ * Based on PCIe r3.1, sec 5.5.3.3.1, Figures 5-16 and 5-17, and |
1848 |
++ * Table 5-11. T(POWER_OFF) is at most 2us and T(L1.2) is at |
1849 |
++ * least 4us. |
1850 |
++ */ |
1851 |
++ l1_2_threshold = 2 + 4 + t_common_mode + t_power_on; |
1852 |
++ encode_l12_threshold(l1_2_threshold, &scale, &value); |
1853 |
++ link->l1ss.ctl1 |= t_common_mode << 8 | scale << 29 | value << 16; |
1854 |
+ } |
1855 |
+ |
1856 |
+ static void pcie_aspm_cap_init(struct pcie_link_state *link, int blacklist) |
1857 |
+diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c |
1858 |
+index 4c8d5b23e4d0..2c0dbfcff3e6 100644 |
1859 |
+--- a/drivers/pinctrl/core.c |
1860 |
++++ b/drivers/pinctrl/core.c |
1861 |
+@@ -1189,19 +1189,16 @@ struct pinctrl_state *pinctrl_lookup_state(struct pinctrl *p, |
1862 |
+ EXPORT_SYMBOL_GPL(pinctrl_lookup_state); |
1863 |
+ |
1864 |
+ /** |
1865 |
+- * pinctrl_select_state() - select/activate/program a pinctrl state to HW |
1866 |
++ * pinctrl_commit_state() - select/activate/program a pinctrl state to HW |
1867 |
+ * @p: the pinctrl handle for the device that requests configuration |
1868 |
+ * @state: the state handle to select/activate/program |
1869 |
+ */ |
1870 |
+-int pinctrl_select_state(struct pinctrl *p, struct pinctrl_state *state) |
1871 |
++static int pinctrl_commit_state(struct pinctrl *p, struct pinctrl_state *state) |
1872 |
+ { |
1873 |
+ struct pinctrl_setting *setting, *setting2; |
1874 |
+ struct pinctrl_state *old_state = p->state; |
1875 |
+ int ret; |
1876 |
+ |
1877 |
+- if (p->state == state) |
1878 |
+- return 0; |
1879 |
+- |
1880 |
+ if (p->state) { |
1881 |
+ /* |
1882 |
+ * For each pinmux setting in the old state, forget SW's record |
1883 |
+@@ -1265,6 +1262,19 @@ int pinctrl_select_state(struct pinctrl *p, struct pinctrl_state *state) |
1884 |
+ |
1885 |
+ return ret; |
1886 |
+ } |
1887 |
++ |
1888 |
++/** |
1889 |
++ * pinctrl_select_state() - select/activate/program a pinctrl state to HW |
1890 |
++ * @p: the pinctrl handle for the device that requests configuration |
1891 |
++ * @state: the state handle to select/activate/program |
1892 |
++ */ |
1893 |
++int pinctrl_select_state(struct pinctrl *p, struct pinctrl_state *state) |
1894 |
++{ |
1895 |
++ if (p->state == state) |
1896 |
++ return 0; |
1897 |
++ |
1898 |
++ return pinctrl_commit_state(p, state); |
1899 |
++} |
1900 |
+ EXPORT_SYMBOL_GPL(pinctrl_select_state); |
1901 |
+ |
1902 |
+ static void devm_pinctrl_release(struct device *dev, void *res) |
1903 |
+@@ -1430,7 +1440,7 @@ void pinctrl_unregister_map(const struct pinctrl_map *map) |
1904 |
+ int pinctrl_force_sleep(struct pinctrl_dev *pctldev) |
1905 |
+ { |
1906 |
+ if (!IS_ERR(pctldev->p) && !IS_ERR(pctldev->hog_sleep)) |
1907 |
+- return pinctrl_select_state(pctldev->p, pctldev->hog_sleep); |
1908 |
++ return pinctrl_commit_state(pctldev->p, pctldev->hog_sleep); |
1909 |
+ return 0; |
1910 |
+ } |
1911 |
+ EXPORT_SYMBOL_GPL(pinctrl_force_sleep); |
1912 |
+@@ -1442,7 +1452,7 @@ EXPORT_SYMBOL_GPL(pinctrl_force_sleep); |
1913 |
+ int pinctrl_force_default(struct pinctrl_dev *pctldev) |
1914 |
+ { |
1915 |
+ if (!IS_ERR(pctldev->p) && !IS_ERR(pctldev->hog_default)) |
1916 |
+- return pinctrl_select_state(pctldev->p, pctldev->hog_default); |
1917 |
++ return pinctrl_commit_state(pctldev->p, pctldev->hog_default); |
1918 |
+ return 0; |
1919 |
+ } |
1920 |
+ EXPORT_SYMBOL_GPL(pinctrl_force_default); |
1921 |
+diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c |
1922 |
+index 2ba17548ad5b..073de6a9ed34 100644 |
1923 |
+--- a/drivers/pinctrl/pinctrl-rockchip.c |
1924 |
++++ b/drivers/pinctrl/pinctrl-rockchip.c |
1925 |
+@@ -2014,8 +2014,16 @@ static int rockchip_gpio_get_direction(struct gpio_chip *chip, unsigned offset) |
1926 |
+ { |
1927 |
+ struct rockchip_pin_bank *bank = gpiochip_get_data(chip); |
1928 |
+ u32 data; |
1929 |
++ int ret; |
1930 |
+ |
1931 |
++ ret = clk_enable(bank->clk); |
1932 |
++ if (ret < 0) { |
1933 |
++ dev_err(bank->drvdata->dev, |
1934 |
++ "failed to enable clock for bank %s\n", bank->name); |
1935 |
++ return ret; |
1936 |
++ } |
1937 |
+ data = readl_relaxed(bank->reg_base + GPIO_SWPORT_DDR); |
1938 |
++ clk_disable(bank->clk); |
1939 |
+ |
1940 |
+ return !(data & BIT(offset)); |
1941 |
+ } |
1942 |
+diff --git a/drivers/platform/chrome/cros_ec_proto.c b/drivers/platform/chrome/cros_ec_proto.c |
1943 |
+index 8dfa7fcb1248..e7bbdf947bbc 100644 |
1944 |
+--- a/drivers/platform/chrome/cros_ec_proto.c |
1945 |
++++ b/drivers/platform/chrome/cros_ec_proto.c |
1946 |
+@@ -60,12 +60,14 @@ static int send_command(struct cros_ec_device *ec_dev, |
1947 |
+ struct cros_ec_command *msg) |
1948 |
+ { |
1949 |
+ int ret; |
1950 |
++ int (*xfer_fxn)(struct cros_ec_device *ec, struct cros_ec_command *msg); |
1951 |
+ |
1952 |
+ if (ec_dev->proto_version > 2) |
1953 |
+- ret = ec_dev->pkt_xfer(ec_dev, msg); |
1954 |
++ xfer_fxn = ec_dev->pkt_xfer; |
1955 |
+ else |
1956 |
+- ret = ec_dev->cmd_xfer(ec_dev, msg); |
1957 |
++ xfer_fxn = ec_dev->cmd_xfer; |
1958 |
+ |
1959 |
++ ret = (*xfer_fxn)(ec_dev, msg); |
1960 |
+ if (msg->result == EC_RES_IN_PROGRESS) { |
1961 |
+ int i; |
1962 |
+ struct cros_ec_command *status_msg; |
1963 |
+@@ -88,7 +90,7 @@ static int send_command(struct cros_ec_device *ec_dev, |
1964 |
+ for (i = 0; i < EC_COMMAND_RETRIES; i++) { |
1965 |
+ usleep_range(10000, 11000); |
1966 |
+ |
1967 |
+- ret = ec_dev->cmd_xfer(ec_dev, status_msg); |
1968 |
++ ret = (*xfer_fxn)(ec_dev, status_msg); |
1969 |
+ if (ret < 0) |
1970 |
+ break; |
1971 |
+ |
1972 |
+diff --git a/drivers/platform/chrome/cros_ec_sysfs.c b/drivers/platform/chrome/cros_ec_sysfs.c |
1973 |
+index f3baf9973989..24f1630a8b3f 100644 |
1974 |
+--- a/drivers/platform/chrome/cros_ec_sysfs.c |
1975 |
++++ b/drivers/platform/chrome/cros_ec_sysfs.c |
1976 |
+@@ -187,7 +187,7 @@ static ssize_t show_ec_version(struct device *dev, |
1977 |
+ count += scnprintf(buf + count, PAGE_SIZE - count, |
1978 |
+ "Build info: EC error %d\n", msg->result); |
1979 |
+ else { |
1980 |
+- msg->data[sizeof(msg->data) - 1] = '\0'; |
1981 |
++ msg->data[EC_HOST_PARAM_SIZE - 1] = '\0'; |
1982 |
+ count += scnprintf(buf + count, PAGE_SIZE - count, |
1983 |
+ "Build info: %s\n", msg->data); |
1984 |
+ } |
1985 |
+diff --git a/drivers/rtc/rtc-ac100.c b/drivers/rtc/rtc-ac100.c |
1986 |
+index 9e336184491c..0e358d4b6738 100644 |
1987 |
+--- a/drivers/rtc/rtc-ac100.c |
1988 |
++++ b/drivers/rtc/rtc-ac100.c |
1989 |
+@@ -567,6 +567,12 @@ static int ac100_rtc_probe(struct platform_device *pdev) |
1990 |
+ return chip->irq; |
1991 |
+ } |
1992 |
+ |
1993 |
++ chip->rtc = devm_rtc_allocate_device(&pdev->dev); |
1994 |
++ if (IS_ERR(chip->rtc)) |
1995 |
++ return PTR_ERR(chip->rtc); |
1996 |
++ |
1997 |
++ chip->rtc->ops = &ac100_rtc_ops; |
1998 |
++ |
1999 |
+ ret = devm_request_threaded_irq(&pdev->dev, chip->irq, NULL, |
2000 |
+ ac100_rtc_irq, |
2001 |
+ IRQF_SHARED | IRQF_ONESHOT, |
2002 |
+@@ -586,17 +592,16 @@ static int ac100_rtc_probe(struct platform_device *pdev) |
2003 |
+ /* clear counter alarm pending interrupts */ |
2004 |
+ regmap_write(chip->regmap, AC100_ALM_INT_STA, AC100_ALM_INT_ENABLE); |
2005 |
+ |
2006 |
+- chip->rtc = devm_rtc_device_register(&pdev->dev, "rtc-ac100", |
2007 |
+- &ac100_rtc_ops, THIS_MODULE); |
2008 |
+- if (IS_ERR(chip->rtc)) { |
2009 |
+- dev_err(&pdev->dev, "unable to register device\n"); |
2010 |
+- return PTR_ERR(chip->rtc); |
2011 |
+- } |
2012 |
+- |
2013 |
+ ret = ac100_rtc_register_clks(chip); |
2014 |
+ if (ret) |
2015 |
+ return ret; |
2016 |
+ |
2017 |
++ ret = rtc_register_device(chip->rtc); |
2018 |
++ if (ret) { |
2019 |
++ dev_err(&pdev->dev, "unable to register device\n"); |
2020 |
++ return ret; |
2021 |
++ } |
2022 |
++ |
2023 |
+ dev_info(&pdev->dev, "RTC enabled\n"); |
2024 |
+ |
2025 |
+ return 0; |
2026 |
+diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c |
2027 |
+index f77673ab4a84..3a8ec82e685a 100644 |
2028 |
+--- a/drivers/scsi/lpfc/lpfc_ct.c |
2029 |
++++ b/drivers/scsi/lpfc/lpfc_ct.c |
2030 |
+@@ -471,6 +471,7 @@ lpfc_prep_node_fc4type(struct lpfc_vport *vport, uint32_t Did, uint8_t fc4_type) |
2031 |
+ "Parse GID_FTrsp: did:x%x flg:x%x x%x", |
2032 |
+ Did, ndlp->nlp_flag, vport->fc_flag); |
2033 |
+ |
2034 |
++ ndlp->nlp_fc4_type &= ~(NLP_FC4_FCP | NLP_FC4_NVME); |
2035 |
+ /* By default, the driver expects to support FCP FC4 */ |
2036 |
+ if (fc4_type == FC_TYPE_FCP) |
2037 |
+ ndlp->nlp_fc4_type |= NLP_FC4_FCP; |
2038 |
+diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c |
2039 |
+index 39d5b146202e..537ee0c44198 100644 |
2040 |
+--- a/drivers/scsi/lpfc/lpfc_els.c |
2041 |
++++ b/drivers/scsi/lpfc/lpfc_els.c |
2042 |
+@@ -2088,6 +2088,10 @@ lpfc_cmpl_els_prli(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, |
2043 |
+ ndlp = (struct lpfc_nodelist *) cmdiocb->context1; |
2044 |
+ spin_lock_irq(shost->host_lock); |
2045 |
+ ndlp->nlp_flag &= ~NLP_PRLI_SND; |
2046 |
++ |
2047 |
++ /* Driver supports multiple FC4 types. Counters matter. */ |
2048 |
++ vport->fc_prli_sent--; |
2049 |
++ ndlp->fc4_prli_sent--; |
2050 |
+ spin_unlock_irq(shost->host_lock); |
2051 |
+ |
2052 |
+ lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_ELS_CMD, |
2053 |
+@@ -2095,9 +2099,6 @@ lpfc_cmpl_els_prli(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, |
2054 |
+ irsp->ulpStatus, irsp->un.ulpWord[4], |
2055 |
+ ndlp->nlp_DID); |
2056 |
+ |
2057 |
+- /* Ddriver supports multiple FC4 types. Counters matter. */ |
2058 |
+- vport->fc_prli_sent--; |
2059 |
+- |
2060 |
+ /* PRLI completes to NPort <nlp_DID> */ |
2061 |
+ lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS, |
2062 |
+ "0103 PRLI completes to NPort x%06x " |
2063 |
+@@ -2111,7 +2112,6 @@ lpfc_cmpl_els_prli(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, |
2064 |
+ |
2065 |
+ if (irsp->ulpStatus) { |
2066 |
+ /* Check for retry */ |
2067 |
+- ndlp->fc4_prli_sent--; |
2068 |
+ if (lpfc_els_retry(phba, cmdiocb, rspiocb)) { |
2069 |
+ /* ELS command is being retried */ |
2070 |
+ goto out; |
2071 |
+@@ -2190,6 +2190,15 @@ lpfc_issue_els_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, |
2072 |
+ ndlp->nlp_fc4_type |= NLP_FC4_NVME; |
2073 |
+ local_nlp_type = ndlp->nlp_fc4_type; |
2074 |
+ |
2075 |
++ /* This routine will issue 1 or 2 PRLIs, so zero all the ndlp |
2076 |
++ * fields here before any of them can complete. |
2077 |
++ */ |
2078 |
++ ndlp->nlp_type &= ~(NLP_FCP_TARGET | NLP_FCP_INITIATOR); |
2079 |
++ ndlp->nlp_type &= ~(NLP_NVME_TARGET | NLP_NVME_INITIATOR); |
2080 |
++ ndlp->nlp_fcp_info &= ~NLP_FCP_2_DEVICE; |
2081 |
++ ndlp->nlp_flag &= ~NLP_FIRSTBURST; |
2082 |
++ ndlp->nvme_fb_size = 0; |
2083 |
++ |
2084 |
+ send_next_prli: |
2085 |
+ if (local_nlp_type & NLP_FC4_FCP) { |
2086 |
+ /* Payload is 4 + 16 = 20 x14 bytes. */ |
2087 |
+@@ -2298,6 +2307,13 @@ lpfc_issue_els_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, |
2088 |
+ elsiocb->iocb_cmpl = lpfc_cmpl_els_prli; |
2089 |
+ spin_lock_irq(shost->host_lock); |
2090 |
+ ndlp->nlp_flag |= NLP_PRLI_SND; |
2091 |
++ |
2092 |
++ /* The vport counters are used for lpfc_scan_finished, but |
2093 |
++ * the ndlp is used to track outstanding PRLIs for different |
2094 |
++ * FC4 types. |
2095 |
++ */ |
2096 |
++ vport->fc_prli_sent++; |
2097 |
++ ndlp->fc4_prli_sent++; |
2098 |
+ spin_unlock_irq(shost->host_lock); |
2099 |
+ if (lpfc_sli_issue_iocb(phba, LPFC_ELS_RING, elsiocb, 0) == |
2100 |
+ IOCB_ERROR) { |
2101 |
+@@ -2308,12 +2324,6 @@ lpfc_issue_els_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, |
2102 |
+ return 1; |
2103 |
+ } |
2104 |
+ |
2105 |
+- /* The vport counters are used for lpfc_scan_finished, but |
2106 |
+- * the ndlp is used to track outstanding PRLIs for different |
2107 |
+- * FC4 types. |
2108 |
+- */ |
2109 |
+- vport->fc_prli_sent++; |
2110 |
+- ndlp->fc4_prli_sent++; |
2111 |
+ |
2112 |
+ /* The driver supports 2 FC4 types. Make sure |
2113 |
+ * a PRLI is issued for all types before exiting. |
2114 |
+diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c |
2115 |
+index b6957d944b9a..d489f6827cc1 100644 |
2116 |
+--- a/drivers/scsi/lpfc/lpfc_nportdisc.c |
2117 |
++++ b/drivers/scsi/lpfc/lpfc_nportdisc.c |
2118 |
+@@ -390,6 +390,11 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, |
2119 |
+ break; |
2120 |
+ } |
2121 |
+ |
2122 |
++ ndlp->nlp_type &= ~(NLP_FCP_TARGET | NLP_FCP_INITIATOR); |
2123 |
++ ndlp->nlp_type &= ~(NLP_NVME_TARGET | NLP_NVME_INITIATOR); |
2124 |
++ ndlp->nlp_fcp_info &= ~NLP_FCP_2_DEVICE; |
2125 |
++ ndlp->nlp_flag &= ~NLP_FIRSTBURST; |
2126 |
++ |
2127 |
+ /* Check for Nport to NPort pt2pt protocol */ |
2128 |
+ if ((vport->fc_flag & FC_PT2PT) && |
2129 |
+ !(vport->fc_flag & FC_PT2PT_PLOGI)) { |
2130 |
+@@ -742,9 +747,6 @@ lpfc_rcv_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, |
2131 |
+ lp = (uint32_t *) pcmd->virt; |
2132 |
+ npr = (PRLI *) ((uint8_t *) lp + sizeof (uint32_t)); |
2133 |
+ |
2134 |
+- ndlp->nlp_type &= ~(NLP_FCP_TARGET | NLP_FCP_INITIATOR); |
2135 |
+- ndlp->nlp_fcp_info &= ~NLP_FCP_2_DEVICE; |
2136 |
+- ndlp->nlp_flag &= ~NLP_FIRSTBURST; |
2137 |
+ if ((npr->prliType == PRLI_FCP_TYPE) || |
2138 |
+ (npr->prliType == PRLI_NVME_TYPE)) { |
2139 |
+ if (npr->initiatorFunc) { |
2140 |
+@@ -769,8 +771,12 @@ lpfc_rcv_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, |
2141 |
+ * type. Target mode does not issue gft_id so doesn't get |
2142 |
+ * the fc4 type set until now. |
2143 |
+ */ |
2144 |
+- if ((phba->nvmet_support) && (npr->prliType == PRLI_NVME_TYPE)) |
2145 |
++ if (phba->nvmet_support && (npr->prliType == PRLI_NVME_TYPE)) { |
2146 |
+ ndlp->nlp_fc4_type |= NLP_FC4_NVME; |
2147 |
++ lpfc_nlp_set_state(vport, ndlp, NLP_STE_UNMAPPED_NODE); |
2148 |
++ } |
2149 |
++ if (npr->prliType == PRLI_FCP_TYPE) |
2150 |
++ ndlp->nlp_fc4_type |= NLP_FC4_FCP; |
2151 |
+ } |
2152 |
+ if (rport) { |
2153 |
+ /* We need to update the rport role values */ |
2154 |
+@@ -1552,7 +1558,6 @@ lpfc_rcv_prli_reglogin_issue(struct lpfc_vport *vport, |
2155 |
+ if (ndlp->nlp_flag & NLP_RPI_REGISTERED) { |
2156 |
+ lpfc_rcv_prli(vport, ndlp, cmdiocb); |
2157 |
+ lpfc_els_rsp_prli_acc(vport, cmdiocb, ndlp); |
2158 |
+- lpfc_nlp_set_state(vport, ndlp, NLP_STE_UNMAPPED_NODE); |
2159 |
+ } else { |
2160 |
+ /* RPI registration has not completed. Reject the PRLI |
2161 |
+ * to prevent an illegal state transition when the |
2162 |
+@@ -1564,10 +1569,11 @@ lpfc_rcv_prli_reglogin_issue(struct lpfc_vport *vport, |
2163 |
+ ndlp->nlp_rpi, ndlp->nlp_state, |
2164 |
+ ndlp->nlp_flag); |
2165 |
+ memset(&stat, 0, sizeof(struct ls_rjt)); |
2166 |
+- stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC; |
2167 |
+- stat.un.b.lsRjtRsnCodeExp = LSEXP_CMD_IN_PROGRESS; |
2168 |
++ stat.un.b.lsRjtRsnCode = LSRJT_LOGICAL_BSY; |
2169 |
++ stat.un.b.lsRjtRsnCodeExp = LSEXP_NOTHING_MORE; |
2170 |
+ lpfc_els_rsp_reject(vport, stat.un.lsRjtError, cmdiocb, |
2171 |
+ ndlp, NULL); |
2172 |
++ return ndlp->nlp_state; |
2173 |
+ } |
2174 |
+ } else { |
2175 |
+ /* Initiator mode. */ |
2176 |
+@@ -1922,13 +1928,6 @@ lpfc_cmpl_prli_prli_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, |
2177 |
+ return ndlp->nlp_state; |
2178 |
+ } |
2179 |
+ |
2180 |
+- /* Check out PRLI rsp */ |
2181 |
+- ndlp->nlp_type &= ~(NLP_FCP_TARGET | NLP_FCP_INITIATOR); |
2182 |
+- ndlp->nlp_fcp_info &= ~NLP_FCP_2_DEVICE; |
2183 |
+- |
2184 |
+- /* NVME or FCP first burst must be negotiated for each PRLI. */ |
2185 |
+- ndlp->nlp_flag &= ~NLP_FIRSTBURST; |
2186 |
+- ndlp->nvme_fb_size = 0; |
2187 |
+ if (npr && (npr->acceptRspCode == PRLI_REQ_EXECUTED) && |
2188 |
+ (npr->prliType == PRLI_FCP_TYPE)) { |
2189 |
+ lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME_DISC, |
2190 |
+@@ -1945,8 +1944,6 @@ lpfc_cmpl_prli_prli_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, |
2191 |
+ if (npr->Retry) |
2192 |
+ ndlp->nlp_fcp_info |= NLP_FCP_2_DEVICE; |
2193 |
+ |
2194 |
+- /* PRLI completed. Decrement count. */ |
2195 |
+- ndlp->fc4_prli_sent--; |
2196 |
+ } else if (nvpr && |
2197 |
+ (bf_get_be32(prli_acc_rsp_code, nvpr) == |
2198 |
+ PRLI_REQ_EXECUTED) && |
2199 |
+@@ -1991,8 +1988,6 @@ lpfc_cmpl_prli_prli_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, |
2200 |
+ be32_to_cpu(nvpr->word5), |
2201 |
+ ndlp->nlp_flag, ndlp->nlp_fcp_info, |
2202 |
+ ndlp->nlp_type); |
2203 |
+- /* PRLI completed. Decrement count. */ |
2204 |
+- ndlp->fc4_prli_sent--; |
2205 |
+ } |
2206 |
+ if (!(ndlp->nlp_type & NLP_FCP_TARGET) && |
2207 |
+ (vport->port_type == LPFC_NPIV_PORT) && |
2208 |
+@@ -2016,7 +2011,8 @@ lpfc_cmpl_prli_prli_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, |
2209 |
+ ndlp->nlp_prev_state = NLP_STE_PRLI_ISSUE; |
2210 |
+ if (ndlp->nlp_type & (NLP_FCP_TARGET | NLP_NVME_TARGET)) |
2211 |
+ lpfc_nlp_set_state(vport, ndlp, NLP_STE_MAPPED_NODE); |
2212 |
+- else |
2213 |
++ else if (ndlp->nlp_type & |
2214 |
++ (NLP_FCP_INITIATOR | NLP_NVME_INITIATOR)) |
2215 |
+ lpfc_nlp_set_state(vport, ndlp, NLP_STE_UNMAPPED_NODE); |
2216 |
+ } else |
2217 |
+ lpfc_printf_vlog(vport, |
2218 |
+diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c |
2219 |
+index 65dc4fea6352..be2992509b8c 100644 |
2220 |
+--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c |
2221 |
++++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c |
2222 |
+@@ -216,36 +216,30 @@ inline void megasas_return_cmd_fusion(struct megasas_instance *instance, |
2223 |
+ /** |
2224 |
+ * megasas_fire_cmd_fusion - Sends command to the FW |
2225 |
+ * @instance: Adapter soft state |
2226 |
+- * @req_desc: 32bit or 64bit Request descriptor |
2227 |
++ * @req_desc: 64bit Request descriptor |
2228 |
+ * |
2229 |
+- * Perform PCI Write. Ventura supports 32 bit Descriptor. |
2230 |
+- * Prior to Ventura (12G) MR controller supports 64 bit Descriptor. |
2231 |
++ * Perform PCI Write. |
2232 |
+ */ |
2233 |
+ |
2234 |
+ static void |
2235 |
+ megasas_fire_cmd_fusion(struct megasas_instance *instance, |
2236 |
+ union MEGASAS_REQUEST_DESCRIPTOR_UNION *req_desc) |
2237 |
+ { |
2238 |
+- if (instance->adapter_type == VENTURA_SERIES) |
2239 |
+- writel(le32_to_cpu(req_desc->u.low), |
2240 |
+- &instance->reg_set->inbound_single_queue_port); |
2241 |
+- else { |
2242 |
+ #if defined(writeq) && defined(CONFIG_64BIT) |
2243 |
+- u64 req_data = (((u64)le32_to_cpu(req_desc->u.high) << 32) | |
2244 |
+- le32_to_cpu(req_desc->u.low)); |
2245 |
++ u64 req_data = (((u64)le32_to_cpu(req_desc->u.high) << 32) | |
2246 |
++ le32_to_cpu(req_desc->u.low)); |
2247 |
+ |
2248 |
+- writeq(req_data, &instance->reg_set->inbound_low_queue_port); |
2249 |
++ writeq(req_data, &instance->reg_set->inbound_low_queue_port); |
2250 |
+ #else |
2251 |
+- unsigned long flags; |
2252 |
+- spin_lock_irqsave(&instance->hba_lock, flags); |
2253 |
+- writel(le32_to_cpu(req_desc->u.low), |
2254 |
+- &instance->reg_set->inbound_low_queue_port); |
2255 |
+- writel(le32_to_cpu(req_desc->u.high), |
2256 |
+- &instance->reg_set->inbound_high_queue_port); |
2257 |
+- mmiowb(); |
2258 |
+- spin_unlock_irqrestore(&instance->hba_lock, flags); |
2259 |
++ unsigned long flags; |
2260 |
++ spin_lock_irqsave(&instance->hba_lock, flags); |
2261 |
++ writel(le32_to_cpu(req_desc->u.low), |
2262 |
++ &instance->reg_set->inbound_low_queue_port); |
2263 |
++ writel(le32_to_cpu(req_desc->u.high), |
2264 |
++ &instance->reg_set->inbound_high_queue_port); |
2265 |
++ mmiowb(); |
2266 |
++ spin_unlock_irqrestore(&instance->hba_lock, flags); |
2267 |
+ #endif |
2268 |
+- } |
2269 |
+ } |
2270 |
+ |
2271 |
+ /** |
2272 |
+@@ -982,7 +976,6 @@ megasas_ioc_init_fusion(struct megasas_instance *instance) |
2273 |
+ const char *sys_info; |
2274 |
+ MFI_CAPABILITIES *drv_ops; |
2275 |
+ u32 scratch_pad_2; |
2276 |
+- unsigned long flags; |
2277 |
+ struct timeval tv; |
2278 |
+ bool cur_fw_64bit_dma_capable; |
2279 |
+ |
2280 |
+@@ -1121,14 +1114,7 @@ megasas_ioc_init_fusion(struct megasas_instance *instance) |
2281 |
+ break; |
2282 |
+ } |
2283 |
+ |
2284 |
+- /* For Ventura also IOC INIT required 64 bit Descriptor write. */ |
2285 |
+- spin_lock_irqsave(&instance->hba_lock, flags); |
2286 |
+- writel(le32_to_cpu(req_desc.u.low), |
2287 |
+- &instance->reg_set->inbound_low_queue_port); |
2288 |
+- writel(le32_to_cpu(req_desc.u.high), |
2289 |
+- &instance->reg_set->inbound_high_queue_port); |
2290 |
+- mmiowb(); |
2291 |
+- spin_unlock_irqrestore(&instance->hba_lock, flags); |
2292 |
++ megasas_fire_cmd_fusion(instance, &req_desc); |
2293 |
+ |
2294 |
+ wait_and_poll(instance, cmd, MFI_POLL_TIMEOUT_SECS); |
2295 |
+ |
2296 |
+diff --git a/drivers/soc/qcom/smsm.c b/drivers/soc/qcom/smsm.c |
2297 |
+index 403bea9d546b..50214b620865 100644 |
2298 |
+--- a/drivers/soc/qcom/smsm.c |
2299 |
++++ b/drivers/soc/qcom/smsm.c |
2300 |
+@@ -496,8 +496,10 @@ static int qcom_smsm_probe(struct platform_device *pdev) |
2301 |
+ if (!smsm->hosts) |
2302 |
+ return -ENOMEM; |
2303 |
+ |
2304 |
+- local_node = of_find_node_with_property(of_node_get(pdev->dev.of_node), |
2305 |
+- "#qcom,smem-state-cells"); |
2306 |
++ for_each_child_of_node(pdev->dev.of_node, local_node) { |
2307 |
++ if (of_find_property(local_node, "#qcom,smem-state-cells", NULL)) |
2308 |
++ break; |
2309 |
++ } |
2310 |
+ if (!local_node) { |
2311 |
+ dev_err(&pdev->dev, "no state entry\n"); |
2312 |
+ return -EINVAL; |
2313 |
+diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c |
2314 |
+index fcd261f98b9f..bf34e9b238af 100644 |
2315 |
+--- a/drivers/spi/spi-sh-msiof.c |
2316 |
++++ b/drivers/spi/spi-sh-msiof.c |
2317 |
+@@ -55,6 +55,8 @@ struct sh_msiof_spi_priv { |
2318 |
+ void *rx_dma_page; |
2319 |
+ dma_addr_t tx_dma_addr; |
2320 |
+ dma_addr_t rx_dma_addr; |
2321 |
++ bool native_cs_inited; |
2322 |
++ bool native_cs_high; |
2323 |
+ bool slave_aborted; |
2324 |
+ }; |
2325 |
+ |
2326 |
+@@ -528,8 +530,7 @@ static int sh_msiof_spi_setup(struct spi_device *spi) |
2327 |
+ { |
2328 |
+ struct device_node *np = spi->master->dev.of_node; |
2329 |
+ struct sh_msiof_spi_priv *p = spi_master_get_devdata(spi->master); |
2330 |
+- |
2331 |
+- pm_runtime_get_sync(&p->pdev->dev); |
2332 |
++ u32 clr, set, tmp; |
2333 |
+ |
2334 |
+ if (!np) { |
2335 |
+ /* |
2336 |
+@@ -539,19 +540,31 @@ static int sh_msiof_spi_setup(struct spi_device *spi) |
2337 |
+ spi->cs_gpio = (uintptr_t)spi->controller_data; |
2338 |
+ } |
2339 |
+ |
2340 |
+- /* Configure pins before deasserting CS */ |
2341 |
+- sh_msiof_spi_set_pin_regs(p, !!(spi->mode & SPI_CPOL), |
2342 |
+- !!(spi->mode & SPI_CPHA), |
2343 |
+- !!(spi->mode & SPI_3WIRE), |
2344 |
+- !!(spi->mode & SPI_LSB_FIRST), |
2345 |
+- !!(spi->mode & SPI_CS_HIGH)); |
2346 |
+- |
2347 |
+- if (spi->cs_gpio >= 0) |
2348 |
++ if (spi->cs_gpio >= 0) { |
2349 |
+ gpio_set_value(spi->cs_gpio, !(spi->mode & SPI_CS_HIGH)); |
2350 |
++ return 0; |
2351 |
++ } |
2352 |
+ |
2353 |
++ if (spi_controller_is_slave(p->master)) |
2354 |
++ return 0; |
2355 |
+ |
2356 |
+- pm_runtime_put(&p->pdev->dev); |
2357 |
++ if (p->native_cs_inited && |
2358 |
++ (p->native_cs_high == !!(spi->mode & SPI_CS_HIGH))) |
2359 |
++ return 0; |
2360 |
+ |
2361 |
++ /* Configure native chip select mode/polarity early */ |
2362 |
++ clr = MDR1_SYNCMD_MASK; |
2363 |
++ set = MDR1_TRMD | TMDR1_PCON | MDR1_SYNCMD_SPI; |
2364 |
++ if (spi->mode & SPI_CS_HIGH) |
2365 |
++ clr |= BIT(MDR1_SYNCAC_SHIFT); |
2366 |
++ else |
2367 |
++ set |= BIT(MDR1_SYNCAC_SHIFT); |
2368 |
++ pm_runtime_get_sync(&p->pdev->dev); |
2369 |
++ tmp = sh_msiof_read(p, TMDR1) & ~clr; |
2370 |
++ sh_msiof_write(p, TMDR1, tmp | set); |
2371 |
++ pm_runtime_put(&p->pdev->dev); |
2372 |
++ p->native_cs_high = spi->mode & SPI_CS_HIGH; |
2373 |
++ p->native_cs_inited = true; |
2374 |
+ return 0; |
2375 |
+ } |
2376 |
+ |
2377 |
+diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c |
2378 |
+index d9941b0c468d..893b2836089c 100644 |
2379 |
+--- a/drivers/staging/android/ashmem.c |
2380 |
++++ b/drivers/staging/android/ashmem.c |
2381 |
+@@ -709,16 +709,14 @@ static int ashmem_pin_unpin(struct ashmem_area *asma, unsigned long cmd, |
2382 |
+ size_t pgstart, pgend; |
2383 |
+ int ret = -EINVAL; |
2384 |
+ |
2385 |
++ if (unlikely(copy_from_user(&pin, p, sizeof(pin)))) |
2386 |
++ return -EFAULT; |
2387 |
++ |
2388 |
+ mutex_lock(&ashmem_mutex); |
2389 |
+ |
2390 |
+ if (unlikely(!asma->file)) |
2391 |
+ goto out_unlock; |
2392 |
+ |
2393 |
+- if (unlikely(copy_from_user(&pin, p, sizeof(pin)))) { |
2394 |
+- ret = -EFAULT; |
2395 |
+- goto out_unlock; |
2396 |
+- } |
2397 |
+- |
2398 |
+ /* per custom, you can pass zero for len to mean "everything onward" */ |
2399 |
+ if (!pin.len) |
2400 |
+ pin.len = PAGE_ALIGN(asma->size) - pin.offset; |
2401 |
+diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig |
2402 |
+index cc2b4d9433ed..b811442c5ce6 100644 |
2403 |
+--- a/drivers/tty/Kconfig |
2404 |
++++ b/drivers/tty/Kconfig |
2405 |
+@@ -394,10 +394,14 @@ config GOLDFISH_TTY |
2406 |
+ depends on GOLDFISH |
2407 |
+ select SERIAL_CORE |
2408 |
+ select SERIAL_CORE_CONSOLE |
2409 |
+- select SERIAL_EARLYCON |
2410 |
+ help |
2411 |
+ Console and system TTY driver for the Goldfish virtual platform. |
2412 |
+ |
2413 |
++config GOLDFISH_TTY_EARLY_CONSOLE |
2414 |
++ bool |
2415 |
++ default y if GOLDFISH_TTY=y |
2416 |
++ select SERIAL_EARLYCON |
2417 |
++ |
2418 |
+ config DA_TTY |
2419 |
+ bool "DA TTY" |
2420 |
+ depends on METAG_DA |
2421 |
+diff --git a/drivers/tty/goldfish.c b/drivers/tty/goldfish.c |
2422 |
+index 7f657bb5113c..1c1bd0afcd48 100644 |
2423 |
+--- a/drivers/tty/goldfish.c |
2424 |
++++ b/drivers/tty/goldfish.c |
2425 |
+@@ -433,6 +433,7 @@ static int goldfish_tty_remove(struct platform_device *pdev) |
2426 |
+ return 0; |
2427 |
+ } |
2428 |
+ |
2429 |
++#ifdef CONFIG_GOLDFISH_TTY_EARLY_CONSOLE |
2430 |
+ static void gf_early_console_putchar(struct uart_port *port, int ch) |
2431 |
+ { |
2432 |
+ __raw_writel(ch, port->membase); |
2433 |
+@@ -456,6 +457,7 @@ static int __init gf_earlycon_setup(struct earlycon_device *device, |
2434 |
+ } |
2435 |
+ |
2436 |
+ OF_EARLYCON_DECLARE(early_gf_tty, "google,goldfish-tty", gf_earlycon_setup); |
2437 |
++#endif |
2438 |
+ |
2439 |
+ static const struct of_device_id goldfish_tty_of_match[] = { |
2440 |
+ { .compatible = "google,goldfish-tty", }, |
2441 |
+diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c |
2442 |
+index 7070203e3157..cd1b94a0f451 100644 |
2443 |
+--- a/drivers/tty/serial/8250/8250_dw.c |
2444 |
++++ b/drivers/tty/serial/8250/8250_dw.c |
2445 |
+@@ -509,7 +509,8 @@ static int dw8250_probe(struct platform_device *pdev) |
2446 |
+ /* If no clock rate is defined, fail. */ |
2447 |
+ if (!p->uartclk) { |
2448 |
+ dev_err(dev, "clock rate not defined\n"); |
2449 |
+- return -EINVAL; |
2450 |
++ err = -EINVAL; |
2451 |
++ goto err_clk; |
2452 |
+ } |
2453 |
+ |
2454 |
+ data->pclk = devm_clk_get(dev, "apb_pclk"); |
2455 |
+diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c |
2456 |
+index 38850672c57e..a93f77ab3da0 100644 |
2457 |
+--- a/drivers/tty/serial/8250/8250_pci.c |
2458 |
++++ b/drivers/tty/serial/8250/8250_pci.c |
2459 |
+@@ -3387,11 +3387,9 @@ static int serial_pci_is_class_communication(struct pci_dev *dev) |
2460 |
+ /* |
2461 |
+ * If it is not a communications device or the programming |
2462 |
+ * interface is greater than 6, give up. |
2463 |
+- * |
2464 |
+- * (Should we try to make guesses for multiport serial devices |
2465 |
+- * later?) |
2466 |
+ */ |
2467 |
+ if ((((dev->class >> 8) != PCI_CLASS_COMMUNICATION_SERIAL) && |
2468 |
++ ((dev->class >> 8) != PCI_CLASS_COMMUNICATION_MULTISERIAL) && |
2469 |
+ ((dev->class >> 8) != PCI_CLASS_COMMUNICATION_MODEM)) || |
2470 |
+ (dev->class & 0xff) > 6) |
2471 |
+ return -ENODEV; |
2472 |
+@@ -3428,6 +3426,12 @@ serial_pci_guess_board(struct pci_dev *dev, struct pciserial_board *board) |
2473 |
+ { |
2474 |
+ int num_iomem, num_port, first_port = -1, i; |
2475 |
+ |
2476 |
++ /* |
2477 |
++ * Should we try to make guesses for multiport serial devices later? |
2478 |
++ */ |
2479 |
++ if ((dev->class >> 8) == PCI_CLASS_COMMUNICATION_MULTISERIAL) |
2480 |
++ return -ENODEV; |
2481 |
++ |
2482 |
+ num_iomem = num_port = 0; |
2483 |
+ for (i = 0; i < PCI_NUM_BAR_RESOURCES; i++) { |
2484 |
+ if (pci_resource_flags(dev, i) & IORESOURCE_IO) { |
2485 |
+diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c |
2486 |
+index 4b506f2d3522..688bd25aa6b0 100644 |
2487 |
+--- a/drivers/tty/tty_io.c |
2488 |
++++ b/drivers/tty/tty_io.c |
2489 |
+@@ -1482,6 +1482,8 @@ static void release_tty(struct tty_struct *tty, int idx) |
2490 |
+ if (tty->link) |
2491 |
+ tty->link->port->itty = NULL; |
2492 |
+ tty_buffer_cancel_work(tty->port); |
2493 |
++ if (tty->link) |
2494 |
++ tty_buffer_cancel_work(tty->link->port); |
2495 |
+ |
2496 |
+ tty_kref_put(tty->link); |
2497 |
+ tty_kref_put(tty); |
2498 |
+diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c |
2499 |
+index 445b1dc5d441..a17ba1465815 100644 |
2500 |
+--- a/drivers/video/console/vgacon.c |
2501 |
++++ b/drivers/video/console/vgacon.c |
2502 |
+@@ -422,7 +422,10 @@ static const char *vgacon_startup(void) |
2503 |
+ vga_video_port_val = VGA_CRT_DM; |
2504 |
+ if ((screen_info.orig_video_ega_bx & 0xff) != 0x10) { |
2505 |
+ static struct resource ega_console_resource = |
2506 |
+- { .name = "ega", .start = 0x3B0, .end = 0x3BF }; |
2507 |
++ { .name = "ega", |
2508 |
++ .flags = IORESOURCE_IO, |
2509 |
++ .start = 0x3B0, |
2510 |
++ .end = 0x3BF }; |
2511 |
+ vga_video_type = VIDEO_TYPE_EGAM; |
2512 |
+ vga_vram_size = 0x8000; |
2513 |
+ display_desc = "EGA+"; |
2514 |
+@@ -430,9 +433,15 @@ static const char *vgacon_startup(void) |
2515 |
+ &ega_console_resource); |
2516 |
+ } else { |
2517 |
+ static struct resource mda1_console_resource = |
2518 |
+- { .name = "mda", .start = 0x3B0, .end = 0x3BB }; |
2519 |
++ { .name = "mda", |
2520 |
++ .flags = IORESOURCE_IO, |
2521 |
++ .start = 0x3B0, |
2522 |
++ .end = 0x3BB }; |
2523 |
+ static struct resource mda2_console_resource = |
2524 |
+- { .name = "mda", .start = 0x3BF, .end = 0x3BF }; |
2525 |
++ { .name = "mda", |
2526 |
++ .flags = IORESOURCE_IO, |
2527 |
++ .start = 0x3BF, |
2528 |
++ .end = 0x3BF }; |
2529 |
+ vga_video_type = VIDEO_TYPE_MDA; |
2530 |
+ vga_vram_size = 0x2000; |
2531 |
+ display_desc = "*MDA"; |
2532 |
+@@ -454,15 +463,21 @@ static const char *vgacon_startup(void) |
2533 |
+ vga_vram_size = 0x8000; |
2534 |
+ |
2535 |
+ if (!screen_info.orig_video_isVGA) { |
2536 |
+- static struct resource ega_console_resource |
2537 |
+- = { .name = "ega", .start = 0x3C0, .end = 0x3DF }; |
2538 |
++ static struct resource ega_console_resource = |
2539 |
++ { .name = "ega", |
2540 |
++ .flags = IORESOURCE_IO, |
2541 |
++ .start = 0x3C0, |
2542 |
++ .end = 0x3DF }; |
2543 |
+ vga_video_type = VIDEO_TYPE_EGAC; |
2544 |
+ display_desc = "EGA"; |
2545 |
+ request_resource(&ioport_resource, |
2546 |
+ &ega_console_resource); |
2547 |
+ } else { |
2548 |
+- static struct resource vga_console_resource |
2549 |
+- = { .name = "vga+", .start = 0x3C0, .end = 0x3DF }; |
2550 |
++ static struct resource vga_console_resource = |
2551 |
++ { .name = "vga+", |
2552 |
++ .flags = IORESOURCE_IO, |
2553 |
++ .start = 0x3C0, |
2554 |
++ .end = 0x3DF }; |
2555 |
+ vga_video_type = VIDEO_TYPE_VGAC; |
2556 |
+ display_desc = "VGA+"; |
2557 |
+ request_resource(&ioport_resource, |
2558 |
+@@ -494,7 +509,10 @@ static const char *vgacon_startup(void) |
2559 |
+ } |
2560 |
+ } else { |
2561 |
+ static struct resource cga_console_resource = |
2562 |
+- { .name = "cga", .start = 0x3D4, .end = 0x3D5 }; |
2563 |
++ { .name = "cga", |
2564 |
++ .flags = IORESOURCE_IO, |
2565 |
++ .start = 0x3D4, |
2566 |
++ .end = 0x3D5 }; |
2567 |
+ vga_video_type = VIDEO_TYPE_CGA; |
2568 |
+ vga_vram_size = 0x2000; |
2569 |
+ display_desc = "*CGA"; |
2570 |
+diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c |
2571 |
+index 57e9e146ff74..4aeb908f2d1e 100644 |
2572 |
+--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c |
2573 |
++++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c |
2574 |
+@@ -455,6 +455,8 @@ static int td028ttec1_panel_remove(struct spi_device *spi) |
2575 |
+ } |
2576 |
+ |
2577 |
+ static const struct of_device_id td028ttec1_of_match[] = { |
2578 |
++ { .compatible = "omapdss,tpo,td028ttec1", }, |
2579 |
++ /* keep to not break older DTB */ |
2580 |
+ { .compatible = "omapdss,toppoly,td028ttec1", }, |
2581 |
+ {}, |
2582 |
+ }; |
2583 |
+@@ -474,6 +476,7 @@ static struct spi_driver td028ttec1_spi_driver = { |
2584 |
+ |
2585 |
+ module_spi_driver(td028ttec1_spi_driver); |
2586 |
+ |
2587 |
++MODULE_ALIAS("spi:tpo,td028ttec1"); |
2588 |
+ MODULE_ALIAS("spi:toppoly,td028ttec1"); |
2589 |
+ MODULE_AUTHOR("H. Nikolaus Schaller <hns@×××××××××.com>"); |
2590 |
+ MODULE_DESCRIPTION("Toppoly TD028TTEC1 panel driver"); |
2591 |
+diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c |
2592 |
+index 1e971a50d7fb..95b96f3cb36f 100644 |
2593 |
+--- a/drivers/watchdog/watchdog_dev.c |
2594 |
++++ b/drivers/watchdog/watchdog_dev.c |
2595 |
+@@ -769,6 +769,7 @@ static int watchdog_open(struct inode *inode, struct file *file) |
2596 |
+ { |
2597 |
+ struct watchdog_core_data *wd_data; |
2598 |
+ struct watchdog_device *wdd; |
2599 |
++ bool hw_running; |
2600 |
+ int err; |
2601 |
+ |
2602 |
+ /* Get the corresponding watchdog device */ |
2603 |
+@@ -788,7 +789,8 @@ static int watchdog_open(struct inode *inode, struct file *file) |
2604 |
+ * If the /dev/watchdog device is open, we don't want the module |
2605 |
+ * to be unloaded. |
2606 |
+ */ |
2607 |
+- if (!watchdog_hw_running(wdd) && !try_module_get(wdd->ops->owner)) { |
2608 |
++ hw_running = watchdog_hw_running(wdd); |
2609 |
++ if (!hw_running && !try_module_get(wdd->ops->owner)) { |
2610 |
+ err = -EBUSY; |
2611 |
+ goto out_clear; |
2612 |
+ } |
2613 |
+@@ -799,7 +801,7 @@ static int watchdog_open(struct inode *inode, struct file *file) |
2614 |
+ |
2615 |
+ file->private_data = wd_data; |
2616 |
+ |
2617 |
+- if (!watchdog_hw_running(wdd)) |
2618 |
++ if (!hw_running) |
2619 |
+ kref_get(&wd_data->kref); |
2620 |
+ |
2621 |
+ /* dev/watchdog is a virtual (and thus non-seekable) filesystem */ |
2622 |
+@@ -965,14 +967,13 @@ static int watchdog_cdev_register(struct watchdog_device *wdd, dev_t devno) |
2623 |
+ * and schedule an immediate ping. |
2624 |
+ */ |
2625 |
+ if (watchdog_hw_running(wdd)) { |
2626 |
+- if (handle_boot_enabled) { |
2627 |
+- __module_get(wdd->ops->owner); |
2628 |
+- kref_get(&wd_data->kref); |
2629 |
++ __module_get(wdd->ops->owner); |
2630 |
++ kref_get(&wd_data->kref); |
2631 |
++ if (handle_boot_enabled) |
2632 |
+ queue_delayed_work(watchdog_wq, &wd_data->work, 0); |
2633 |
+- } else { |
2634 |
++ else |
2635 |
+ pr_info("watchdog%d running and kernel based pre-userspace handler disabled\n", |
2636 |
+- wdd->id); |
2637 |
+- } |
2638 |
++ wdd->id); |
2639 |
+ } |
2640 |
+ |
2641 |
+ return 0; |
2642 |
+diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c |
2643 |
+index 008ea0b627d0..effeeb4f556f 100644 |
2644 |
+--- a/fs/nfsd/nfs4proc.c |
2645 |
++++ b/fs/nfsd/nfs4proc.c |
2646 |
+@@ -1363,14 +1363,14 @@ nfsd4_layoutget(struct svc_rqst *rqstp, |
2647 |
+ const struct nfsd4_layout_ops *ops; |
2648 |
+ struct nfs4_layout_stateid *ls; |
2649 |
+ __be32 nfserr; |
2650 |
+- int accmode; |
2651 |
++ int accmode = NFSD_MAY_READ_IF_EXEC; |
2652 |
+ |
2653 |
+ switch (lgp->lg_seg.iomode) { |
2654 |
+ case IOMODE_READ: |
2655 |
+- accmode = NFSD_MAY_READ; |
2656 |
++ accmode |= NFSD_MAY_READ; |
2657 |
+ break; |
2658 |
+ case IOMODE_RW: |
2659 |
+- accmode = NFSD_MAY_READ | NFSD_MAY_WRITE; |
2660 |
++ accmode |= NFSD_MAY_READ | NFSD_MAY_WRITE; |
2661 |
+ break; |
2662 |
+ default: |
2663 |
+ dprintk("%s: invalid iomode %d\n", |
2664 |
+diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h |
2665 |
+index b82c4ae92411..c8198ed8b180 100644 |
2666 |
+--- a/include/linux/mlx5/driver.h |
2667 |
++++ b/include/linux/mlx5/driver.h |
2668 |
+@@ -442,8 +442,8 @@ struct mlx5_core_srq { |
2669 |
+ struct mlx5_core_rsc_common common; /* must be first */ |
2670 |
+ u32 srqn; |
2671 |
+ int max; |
2672 |
+- int max_gs; |
2673 |
+- int max_avail_gather; |
2674 |
++ size_t max_gs; |
2675 |
++ size_t max_avail_gather; |
2676 |
+ int wqe_shift; |
2677 |
+ void (*event) (struct mlx5_core_srq *, enum mlx5_event); |
2678 |
+ |
2679 |
+diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h |
2680 |
+index 4c223ab30293..04b2f613dd06 100644 |
2681 |
+--- a/include/uapi/linux/bpf.h |
2682 |
++++ b/include/uapi/linux/bpf.h |
2683 |
+@@ -995,7 +995,8 @@ struct bpf_perf_event_value { |
2684 |
+ #define BPF_DEVCG_DEV_CHAR (1ULL << 1) |
2685 |
+ |
2686 |
+ struct bpf_cgroup_dev_ctx { |
2687 |
+- __u32 access_type; /* (access << 16) | type */ |
2688 |
++ /* access_type encoded as (BPF_DEVCG_ACC_* << 16) | BPF_DEVCG_DEV_* */ |
2689 |
++ __u32 access_type; |
2690 |
+ __u32 major; |
2691 |
+ __u32 minor; |
2692 |
+ }; |
2693 |
+diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c |
2694 |
+index b789ab78d28f..c1c0b60d3f2f 100644 |
2695 |
+--- a/kernel/bpf/cgroup.c |
2696 |
++++ b/kernel/bpf/cgroup.c |
2697 |
+@@ -568,6 +568,8 @@ static bool cgroup_dev_is_valid_access(int off, int size, |
2698 |
+ enum bpf_access_type type, |
2699 |
+ struct bpf_insn_access_aux *info) |
2700 |
+ { |
2701 |
++ const int size_default = sizeof(__u32); |
2702 |
++ |
2703 |
+ if (type == BPF_WRITE) |
2704 |
+ return false; |
2705 |
+ |
2706 |
+@@ -576,8 +578,17 @@ static bool cgroup_dev_is_valid_access(int off, int size, |
2707 |
+ /* The verifier guarantees that size > 0. */ |
2708 |
+ if (off % size != 0) |
2709 |
+ return false; |
2710 |
+- if (size != sizeof(__u32)) |
2711 |
+- return false; |
2712 |
++ |
2713 |
++ switch (off) { |
2714 |
++ case bpf_ctx_range(struct bpf_cgroup_dev_ctx, access_type): |
2715 |
++ bpf_ctx_record_field_size(info, size_default); |
2716 |
++ if (!bpf_ctx_narrow_access_ok(off, size, size_default)) |
2717 |
++ return false; |
2718 |
++ break; |
2719 |
++ default: |
2720 |
++ if (size != size_default) |
2721 |
++ return false; |
2722 |
++ } |
2723 |
+ |
2724 |
+ return true; |
2725 |
+ } |
2726 |
+diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c |
2727 |
+index 45ffd3d045d2..01bbbfe2c2a7 100644 |
2728 |
+--- a/net/ipv4/ip_gre.c |
2729 |
++++ b/net/ipv4/ip_gre.c |
2730 |
+@@ -303,8 +303,10 @@ static int erspan_rcv(struct sk_buff *skb, struct tnl_ptk_info *tpi, |
2731 |
+ return PACKET_REJECT; |
2732 |
+ |
2733 |
+ md = ip_tunnel_info_opts(&tun_dst->u.tun_info); |
2734 |
+- if (!md) |
2735 |
++ if (!md) { |
2736 |
++ dst_release((struct dst_entry *)tun_dst); |
2737 |
+ return PACKET_REJECT; |
2738 |
++ } |
2739 |
+ |
2740 |
+ md->index = index; |
2741 |
+ info = &tun_dst->u.tun_info; |
2742 |
+@@ -408,11 +410,13 @@ static int gre_rcv(struct sk_buff *skb) |
2743 |
+ if (unlikely(tpi.proto == htons(ETH_P_ERSPAN))) { |
2744 |
+ if (erspan_rcv(skb, &tpi, hdr_len) == PACKET_RCVD) |
2745 |
+ return 0; |
2746 |
++ goto out; |
2747 |
+ } |
2748 |
+ |
2749 |
+ if (ipgre_rcv(skb, &tpi, hdr_len) == PACKET_RCVD) |
2750 |
+ return 0; |
2751 |
+ |
2752 |
++out: |
2753 |
+ icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); |
2754 |
+ drop: |
2755 |
+ kfree_skb(skb); |
2756 |
+diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c |
2757 |
+index 580912de16c2..871c7e28cccf 100644 |
2758 |
+--- a/net/ipv4/tcp_output.c |
2759 |
++++ b/net/ipv4/tcp_output.c |
2760 |
+@@ -2440,15 +2440,12 @@ bool tcp_schedule_loss_probe(struct sock *sk, bool advancing_rto) |
2761 |
+ |
2762 |
+ early_retrans = sock_net(sk)->ipv4.sysctl_tcp_early_retrans; |
2763 |
+ /* Schedule a loss probe in 2*RTT for SACK capable connections |
2764 |
+- * in Open state, that are either limited by cwnd or application. |
2765 |
++ * not in loss recovery, that are either limited by cwnd or application. |
2766 |
+ */ |
2767 |
+ if ((early_retrans != 3 && early_retrans != 4) || |
2768 |
+ !tp->packets_out || !tcp_is_sack(tp) || |
2769 |
+- icsk->icsk_ca_state != TCP_CA_Open) |
2770 |
+- return false; |
2771 |
+- |
2772 |
+- if ((tp->snd_cwnd > tcp_packets_in_flight(tp)) && |
2773 |
+- !tcp_write_queue_empty(sk)) |
2774 |
++ (icsk->icsk_ca_state != TCP_CA_Open && |
2775 |
++ icsk->icsk_ca_state != TCP_CA_CWR)) |
2776 |
+ return false; |
2777 |
+ |
2778 |
+ /* Probe timeout is 2*rtt. Add minimum RTO to account |
2779 |
+diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c |
2780 |
+index 8c184f84f353..fa3ae1cb50d3 100644 |
2781 |
+--- a/net/ipv6/ip6_vti.c |
2782 |
++++ b/net/ipv6/ip6_vti.c |
2783 |
+@@ -626,6 +626,7 @@ static void vti6_link_config(struct ip6_tnl *t) |
2784 |
+ { |
2785 |
+ struct net_device *dev = t->dev; |
2786 |
+ struct __ip6_tnl_parm *p = &t->parms; |
2787 |
++ struct net_device *tdev = NULL; |
2788 |
+ |
2789 |
+ memcpy(dev->dev_addr, &p->laddr, sizeof(struct in6_addr)); |
2790 |
+ memcpy(dev->broadcast, &p->raddr, sizeof(struct in6_addr)); |
2791 |
+@@ -638,6 +639,25 @@ static void vti6_link_config(struct ip6_tnl *t) |
2792 |
+ dev->flags |= IFF_POINTOPOINT; |
2793 |
+ else |
2794 |
+ dev->flags &= ~IFF_POINTOPOINT; |
2795 |
++ |
2796 |
++ if (p->flags & IP6_TNL_F_CAP_XMIT) { |
2797 |
++ int strict = (ipv6_addr_type(&p->raddr) & |
2798 |
++ (IPV6_ADDR_MULTICAST | IPV6_ADDR_LINKLOCAL)); |
2799 |
++ struct rt6_info *rt = rt6_lookup(t->net, |
2800 |
++ &p->raddr, &p->laddr, |
2801 |
++ p->link, strict); |
2802 |
++ |
2803 |
++ if (rt) |
2804 |
++ tdev = rt->dst.dev; |
2805 |
++ ip6_rt_put(rt); |
2806 |
++ } |
2807 |
++ |
2808 |
++ if (!tdev && p->link) |
2809 |
++ tdev = __dev_get_by_index(t->net, p->link); |
2810 |
++ |
2811 |
++ if (tdev) |
2812 |
++ dev->mtu = max_t(int, tdev->mtu - dev->hard_header_len, |
2813 |
++ IPV6_MIN_MTU); |
2814 |
+ } |
2815 |
+ |
2816 |
+ /** |
2817 |
+diff --git a/security/Kconfig b/security/Kconfig |
2818 |
+index b0cb9a5f9448..3709db95027f 100644 |
2819 |
+--- a/security/Kconfig |
2820 |
++++ b/security/Kconfig |
2821 |
+@@ -154,6 +154,7 @@ config HARDENED_USERCOPY |
2822 |
+ bool "Harden memory copies between kernel and userspace" |
2823 |
+ depends on HAVE_HARDENED_USERCOPY_ALLOCATOR |
2824 |
+ select BUG |
2825 |
++ imply STRICT_DEVMEM |
2826 |
+ help |
2827 |
+ This option checks for obviously wrong memory regions when |
2828 |
+ copying memory to/from the kernel (via copy_to_user() and |
2829 |
+diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c |
2830 |
+index 5aa45f89da93..cda652a12880 100644 |
2831 |
+--- a/tools/lib/bpf/libbpf.c |
2832 |
++++ b/tools/lib/bpf/libbpf.c |
2833 |
+@@ -387,6 +387,8 @@ bpf_object__init_prog_names(struct bpf_object *obj) |
2834 |
+ continue; |
2835 |
+ if (sym.st_shndx != prog->idx) |
2836 |
+ continue; |
2837 |
++ if (GELF_ST_BIND(sym.st_info) != STB_GLOBAL) |
2838 |
++ continue; |
2839 |
+ |
2840 |
+ name = elf_strptr(obj->efile.elf, |
2841 |
+ obj->efile.strtabidx, |