Contents of /trunk/kernel-magellan/patches-3.12/0102-3.12.3-all-fixes.patch
Parent Directory | Revision Log
Revision 2383 -
(show annotations)
(download)
Tue Jan 28 08:28:52 2014 UTC (10 years, 8 months ago) by niro
File size: 288365 byte(s)
Tue Jan 28 08:28:52 2014 UTC (10 years, 8 months ago) by niro
File size: 288365 byte(s)
-linux-3.12.3
1 | diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt |
2 | index 9d4c1d18..fb78e60a 100644 |
3 | --- a/Documentation/sysctl/kernel.txt |
4 | +++ b/Documentation/sysctl/kernel.txt |
5 | @@ -290,13 +290,24 @@ Default value is "/sbin/hotplug". |
6 | kptr_restrict: |
7 | |
8 | This toggle indicates whether restrictions are placed on |
9 | -exposing kernel addresses via /proc and other interfaces. When |
10 | -kptr_restrict is set to (0), there are no restrictions. When |
11 | -kptr_restrict is set to (1), the default, kernel pointers |
12 | -printed using the %pK format specifier will be replaced with 0's |
13 | -unless the user has CAP_SYSLOG. When kptr_restrict is set to |
14 | -(2), kernel pointers printed using %pK will be replaced with 0's |
15 | -regardless of privileges. |
16 | +exposing kernel addresses via /proc and other interfaces. |
17 | + |
18 | +When kptr_restrict is set to (0), the default, there are no restrictions. |
19 | + |
20 | +When kptr_restrict is set to (1), kernel pointers printed using the %pK |
21 | +format specifier will be replaced with 0's unless the user has CAP_SYSLOG |
22 | +and effective user and group ids are equal to the real ids. This is |
23 | +because %pK checks are done at read() time rather than open() time, so |
24 | +if permissions are elevated between the open() and the read() (e.g via |
25 | +a setuid binary) then %pK will not leak kernel pointers to unprivileged |
26 | +users. Note, this is a temporary solution only. The correct long-term |
27 | +solution is to do the permission checks at open() time. Consider removing |
28 | +world read permissions from files that use %pK, and using dmesg_restrict |
29 | +to protect against uses of %pK in dmesg(8) if leaking kernel pointer |
30 | +values to unprivileged users is a concern. |
31 | + |
32 | +When kptr_restrict is set to (2), kernel pointers printed using |
33 | +%pK will be replaced with 0's regardless of privileges. |
34 | |
35 | ============================================================== |
36 | |
37 | diff --git a/Makefile b/Makefile |
38 | index e6e72b62..b28bc57d 100644 |
39 | --- a/Makefile |
40 | +++ b/Makefile |
41 | @@ -1,6 +1,6 @@ |
42 | VERSION = 3 |
43 | PATCHLEVEL = 12 |
44 | -SUBLEVEL = 2 |
45 | +SUBLEVEL = 3 |
46 | EXTRAVERSION = |
47 | NAME = One Giant Leap for Frogkind |
48 | |
49 | diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi |
50 | index 1e12aeff..aa537ed1 100644 |
51 | --- a/arch/arm/boot/dts/bcm2835.dtsi |
52 | +++ b/arch/arm/boot/dts/bcm2835.dtsi |
53 | @@ -85,6 +85,8 @@ |
54 | reg = <0x7e205000 0x1000>; |
55 | interrupts = <2 21>; |
56 | clocks = <&clk_i2c>; |
57 | + #address-cells = <1>; |
58 | + #size-cells = <0>; |
59 | status = "disabled"; |
60 | }; |
61 | |
62 | @@ -93,6 +95,8 @@ |
63 | reg = <0x7e804000 0x1000>; |
64 | interrupts = <2 21>; |
65 | clocks = <&clk_i2c>; |
66 | + #address-cells = <1>; |
67 | + #size-cells = <0>; |
68 | status = "disabled"; |
69 | }; |
70 | |
71 | diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi |
72 | index dc259e8b..9b186ac0 100644 |
73 | --- a/arch/arm/boot/dts/cros5250-common.dtsi |
74 | +++ b/arch/arm/boot/dts/cros5250-common.dtsi |
75 | @@ -27,6 +27,13 @@ |
76 | i2c2_bus: i2c2-bus { |
77 | samsung,pin-pud = <0>; |
78 | }; |
79 | + |
80 | + max77686_irq: max77686-irq { |
81 | + samsung,pins = "gpx3-2"; |
82 | + samsung,pin-function = <0>; |
83 | + samsung,pin-pud = <0>; |
84 | + samsung,pin-drv = <0>; |
85 | + }; |
86 | }; |
87 | |
88 | i2c@12C60000 { |
89 | @@ -35,6 +42,11 @@ |
90 | |
91 | max77686@09 { |
92 | compatible = "maxim,max77686"; |
93 | + interrupt-parent = <&gpx3>; |
94 | + interrupts = <2 0>; |
95 | + pinctrl-names = "default"; |
96 | + pinctrl-0 = <&max77686_irq>; |
97 | + wakeup-source; |
98 | reg = <0x09>; |
99 | |
100 | voltage-regulators { |
101 | diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S |
102 | index 9cbe70c8..ec3e5cf4 100644 |
103 | --- a/arch/arm/kernel/entry-armv.S |
104 | +++ b/arch/arm/kernel/entry-armv.S |
105 | @@ -192,6 +192,7 @@ __dabt_svc: |
106 | svc_entry |
107 | mov r2, sp |
108 | dabt_helper |
109 | + THUMB( ldr r5, [sp, #S_PSR] ) @ potentially updated CPSR |
110 | svc_exit r5 @ return from exception |
111 | UNWIND(.fnend ) |
112 | ENDPROC(__dabt_svc) |
113 | diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile |
114 | index 3b0a9538..e0fda04e 100644 |
115 | --- a/arch/arm/mach-at91/Makefile |
116 | +++ b/arch/arm/mach-at91/Makefile |
117 | @@ -2,7 +2,7 @@ |
118 | # Makefile for the linux kernel. |
119 | # |
120 | |
121 | -obj-y := irq.o gpio.o setup.o |
122 | +obj-y := irq.o gpio.o setup.o sysirq_mask.o |
123 | obj-m := |
124 | obj-n := |
125 | obj- := |
126 | diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c |
127 | index 5de6074b..ae10d14d 100644 |
128 | --- a/arch/arm/mach-at91/at91sam9260.c |
129 | +++ b/arch/arm/mach-at91/at91sam9260.c |
130 | @@ -349,6 +349,8 @@ static void __init at91sam9260_initialize(void) |
131 | arm_pm_idle = at91sam9_idle; |
132 | arm_pm_restart = at91sam9_alt_restart; |
133 | |
134 | + at91_sysirq_mask_rtt(AT91SAM9260_BASE_RTT); |
135 | + |
136 | /* Register GPIO subsystem */ |
137 | at91_gpio_init(at91sam9260_gpio, 3); |
138 | } |
139 | diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c |
140 | index 0e079324..e761e74a 100644 |
141 | --- a/arch/arm/mach-at91/at91sam9261.c |
142 | +++ b/arch/arm/mach-at91/at91sam9261.c |
143 | @@ -291,6 +291,8 @@ static void __init at91sam9261_initialize(void) |
144 | arm_pm_idle = at91sam9_idle; |
145 | arm_pm_restart = at91sam9_alt_restart; |
146 | |
147 | + at91_sysirq_mask_rtt(AT91SAM9261_BASE_RTT); |
148 | + |
149 | /* Register GPIO subsystem */ |
150 | at91_gpio_init(at91sam9261_gpio, 3); |
151 | } |
152 | diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c |
153 | index 6ce7d185..e6fed625 100644 |
154 | --- a/arch/arm/mach-at91/at91sam9263.c |
155 | +++ b/arch/arm/mach-at91/at91sam9263.c |
156 | @@ -328,6 +328,9 @@ static void __init at91sam9263_initialize(void) |
157 | arm_pm_idle = at91sam9_idle; |
158 | arm_pm_restart = at91sam9_alt_restart; |
159 | |
160 | + at91_sysirq_mask_rtt(AT91SAM9263_BASE_RTT0); |
161 | + at91_sysirq_mask_rtt(AT91SAM9263_BASE_RTT1); |
162 | + |
163 | /* Register GPIO subsystem */ |
164 | at91_gpio_init(at91sam9263_gpio, 5); |
165 | } |
166 | diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c |
167 | index 474ee04d..9f7a97c8 100644 |
168 | --- a/arch/arm/mach-at91/at91sam9g45.c |
169 | +++ b/arch/arm/mach-at91/at91sam9g45.c |
170 | @@ -377,6 +377,9 @@ static void __init at91sam9g45_initialize(void) |
171 | arm_pm_idle = at91sam9_idle; |
172 | arm_pm_restart = at91sam9g45_restart; |
173 | |
174 | + at91_sysirq_mask_rtc(AT91SAM9G45_BASE_RTC); |
175 | + at91_sysirq_mask_rtt(AT91SAM9G45_BASE_RTT); |
176 | + |
177 | /* Register GPIO subsystem */ |
178 | at91_gpio_init(at91sam9g45_gpio, 5); |
179 | } |
180 | diff --git a/arch/arm/mach-at91/at91sam9n12.c b/arch/arm/mach-at91/at91sam9n12.c |
181 | index c7d670d1..4d6001c3 100644 |
182 | --- a/arch/arm/mach-at91/at91sam9n12.c |
183 | +++ b/arch/arm/mach-at91/at91sam9n12.c |
184 | @@ -223,7 +223,13 @@ static void __init at91sam9n12_map_io(void) |
185 | at91_init_sram(0, AT91SAM9N12_SRAM_BASE, AT91SAM9N12_SRAM_SIZE); |
186 | } |
187 | |
188 | +static void __init at91sam9n12_initialize(void) |
189 | +{ |
190 | + at91_sysirq_mask_rtc(AT91SAM9N12_BASE_RTC); |
191 | +} |
192 | + |
193 | AT91_SOC_START(at91sam9n12) |
194 | .map_io = at91sam9n12_map_io, |
195 | .register_clocks = at91sam9n12_register_clocks, |
196 | + .init = at91sam9n12_initialize, |
197 | AT91_SOC_END |
198 | diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c |
199 | index d4ec0d9a..301e1728 100644 |
200 | --- a/arch/arm/mach-at91/at91sam9rl.c |
201 | +++ b/arch/arm/mach-at91/at91sam9rl.c |
202 | @@ -294,6 +294,9 @@ static void __init at91sam9rl_initialize(void) |
203 | arm_pm_idle = at91sam9_idle; |
204 | arm_pm_restart = at91sam9_alt_restart; |
205 | |
206 | + at91_sysirq_mask_rtc(AT91SAM9RL_BASE_RTC); |
207 | + at91_sysirq_mask_rtt(AT91SAM9RL_BASE_RTT); |
208 | + |
209 | /* Register GPIO subsystem */ |
210 | at91_gpio_init(at91sam9rl_gpio, 4); |
211 | } |
212 | diff --git a/arch/arm/mach-at91/at91sam9x5.c b/arch/arm/mach-at91/at91sam9x5.c |
213 | index 916e5a14..e8a2e075 100644 |
214 | --- a/arch/arm/mach-at91/at91sam9x5.c |
215 | +++ b/arch/arm/mach-at91/at91sam9x5.c |
216 | @@ -322,6 +322,11 @@ static void __init at91sam9x5_map_io(void) |
217 | at91_init_sram(0, AT91SAM9X5_SRAM_BASE, AT91SAM9X5_SRAM_SIZE); |
218 | } |
219 | |
220 | +static void __init at91sam9x5_initialize(void) |
221 | +{ |
222 | + at91_sysirq_mask_rtc(AT91SAM9X5_BASE_RTC); |
223 | +} |
224 | + |
225 | /* -------------------------------------------------------------------- |
226 | * Interrupt initialization |
227 | * -------------------------------------------------------------------- */ |
228 | @@ -329,4 +334,5 @@ static void __init at91sam9x5_map_io(void) |
229 | AT91_SOC_START(at91sam9x5) |
230 | .map_io = at91sam9x5_map_io, |
231 | .register_clocks = at91sam9x5_register_clocks, |
232 | + .init = at91sam9x5_initialize, |
233 | AT91_SOC_END |
234 | diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h |
235 | index dc6e2f5f..26dee3ce 100644 |
236 | --- a/arch/arm/mach-at91/generic.h |
237 | +++ b/arch/arm/mach-at91/generic.h |
238 | @@ -34,6 +34,8 @@ extern int __init at91_aic_of_init(struct device_node *node, |
239 | struct device_node *parent); |
240 | extern int __init at91_aic5_of_init(struct device_node *node, |
241 | struct device_node *parent); |
242 | +extern void __init at91_sysirq_mask_rtc(u32 rtc_base); |
243 | +extern void __init at91_sysirq_mask_rtt(u32 rtt_base); |
244 | |
245 | |
246 | /* Timer */ |
247 | diff --git a/arch/arm/mach-at91/include/mach/at91sam9n12.h b/arch/arm/mach-at91/include/mach/at91sam9n12.h |
248 | index d374b87c..0151bcf6 100644 |
249 | --- a/arch/arm/mach-at91/include/mach/at91sam9n12.h |
250 | +++ b/arch/arm/mach-at91/include/mach/at91sam9n12.h |
251 | @@ -49,6 +49,11 @@ |
252 | #define AT91SAM9N12_BASE_USART3 0xf8028000 |
253 | |
254 | /* |
255 | + * System Peripherals |
256 | + */ |
257 | +#define AT91SAM9N12_BASE_RTC 0xfffffeb0 |
258 | + |
259 | +/* |
260 | * Internal Memory. |
261 | */ |
262 | #define AT91SAM9N12_SRAM_BASE 0x00300000 /* Internal SRAM base address */ |
263 | diff --git a/arch/arm/mach-at91/include/mach/at91sam9x5.h b/arch/arm/mach-at91/include/mach/at91sam9x5.h |
264 | index c75ee19b..2fc76c49 100644 |
265 | --- a/arch/arm/mach-at91/include/mach/at91sam9x5.h |
266 | +++ b/arch/arm/mach-at91/include/mach/at91sam9x5.h |
267 | @@ -55,6 +55,11 @@ |
268 | #define AT91SAM9X5_BASE_USART2 0xf8024000 |
269 | |
270 | /* |
271 | + * System Peripherals |
272 | + */ |
273 | +#define AT91SAM9X5_BASE_RTC 0xfffffeb0 |
274 | + |
275 | +/* |
276 | * Internal Memory. |
277 | */ |
278 | #define AT91SAM9X5_SRAM_BASE 0x00300000 /* Internal SRAM base address */ |
279 | diff --git a/arch/arm/mach-at91/include/mach/sama5d3.h b/arch/arm/mach-at91/include/mach/sama5d3.h |
280 | index 31096a8a..25613d8c 100644 |
281 | --- a/arch/arm/mach-at91/include/mach/sama5d3.h |
282 | +++ b/arch/arm/mach-at91/include/mach/sama5d3.h |
283 | @@ -73,6 +73,11 @@ |
284 | #define SAMA5D3_BASE_USART3 0xf8024000 |
285 | |
286 | /* |
287 | + * System Peripherals |
288 | + */ |
289 | +#define SAMA5D3_BASE_RTC 0xfffffeb0 |
290 | + |
291 | +/* |
292 | * Internal Memory |
293 | */ |
294 | #define SAMA5D3_SRAM_BASE 0x00300000 /* Internal SRAM base address */ |
295 | diff --git a/arch/arm/mach-at91/sama5d3.c b/arch/arm/mach-at91/sama5d3.c |
296 | index 40127971..3ea86428 100644 |
297 | --- a/arch/arm/mach-at91/sama5d3.c |
298 | +++ b/arch/arm/mach-at91/sama5d3.c |
299 | @@ -371,7 +371,13 @@ static void __init sama5d3_map_io(void) |
300 | at91_init_sram(0, SAMA5D3_SRAM_BASE, SAMA5D3_SRAM_SIZE); |
301 | } |
302 | |
303 | +static void __init sama5d3_initialize(void) |
304 | +{ |
305 | + at91_sysirq_mask_rtc(SAMA5D3_BASE_RTC); |
306 | +} |
307 | + |
308 | AT91_SOC_START(sama5d3) |
309 | .map_io = sama5d3_map_io, |
310 | .register_clocks = sama5d3_register_clocks, |
311 | + .init = sama5d3_initialize, |
312 | AT91_SOC_END |
313 | diff --git a/arch/arm/mach-at91/sysirq_mask.c b/arch/arm/mach-at91/sysirq_mask.c |
314 | new file mode 100644 |
315 | index 00000000..2ba694f9 |
316 | --- /dev/null |
317 | +++ b/arch/arm/mach-at91/sysirq_mask.c |
318 | @@ -0,0 +1,71 @@ |
319 | +/* |
320 | + * sysirq_mask.c - System-interrupt masking |
321 | + * |
322 | + * Copyright (C) 2013 Johan Hovold <jhovold@gmail.com> |
323 | + * |
324 | + * Functions to disable system interrupts from backup-powered peripherals. |
325 | + * |
326 | + * The RTC and RTT-peripherals are generally powered by backup power (VDDBU) |
327 | + * and are not reset on wake-up, user, watchdog or software reset. This means |
328 | + * that their interrupts may be enabled during early boot (e.g. after a user |
329 | + * reset). |
330 | + * |
331 | + * As the RTC and RTT share the system-interrupt line with the PIT, an |
332 | + * interrupt occurring before a handler has been installed would lead to the |
333 | + * system interrupt being disabled and prevent the system from booting. |
334 | + * |
335 | + * This program is free software; you can redistribute it and/or modify |
336 | + * it under the terms of the GNU General Public License as published by |
337 | + * the Free Software Foundation; either version 2 of the License, or |
338 | + * (at your option) any later version. |
339 | + */ |
340 | + |
341 | +#include <linux/io.h> |
342 | +#include <mach/at91_rtt.h> |
343 | + |
344 | +#include "generic.h" |
345 | + |
346 | +#define AT91_RTC_IDR 0x24 /* Interrupt Disable Register */ |
347 | +#define AT91_RTC_IMR 0x28 /* Interrupt Mask Register */ |
348 | + |
349 | +void __init at91_sysirq_mask_rtc(u32 rtc_base) |
350 | +{ |
351 | + void __iomem *base; |
352 | + u32 mask; |
353 | + |
354 | + base = ioremap(rtc_base, 64); |
355 | + if (!base) |
356 | + return; |
357 | + |
358 | + mask = readl_relaxed(base + AT91_RTC_IMR); |
359 | + if (mask) { |
360 | + pr_info("AT91: Disabling rtc irq\n"); |
361 | + writel_relaxed(mask, base + AT91_RTC_IDR); |
362 | + (void)readl_relaxed(base + AT91_RTC_IMR); /* flush */ |
363 | + } |
364 | + |
365 | + iounmap(base); |
366 | +} |
367 | + |
368 | +void __init at91_sysirq_mask_rtt(u32 rtt_base) |
369 | +{ |
370 | + void __iomem *base; |
371 | + void __iomem *reg; |
372 | + u32 mode; |
373 | + |
374 | + base = ioremap(rtt_base, 16); |
375 | + if (!base) |
376 | + return; |
377 | + |
378 | + reg = base + AT91_RTT_MR; |
379 | + |
380 | + mode = readl_relaxed(reg); |
381 | + if (mode & (AT91_RTT_ALMIEN | AT91_RTT_RTTINCIEN)) { |
382 | + pr_info("AT91: Disabling rtt irq\n"); |
383 | + mode &= ~(AT91_RTT_ALMIEN | AT91_RTT_RTTINCIEN); |
384 | + writel_relaxed(mode, reg); |
385 | + (void)readl_relaxed(reg); /* flush */ |
386 | + } |
387 | + |
388 | + iounmap(base); |
389 | +} |
390 | diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c |
391 | index 9181a241..ef85ac49 100644 |
392 | --- a/arch/arm/mach-imx/clk-imx6q.c |
393 | +++ b/arch/arm/mach-imx/clk-imx6q.c |
394 | @@ -428,7 +428,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) |
395 | clk[asrc_podf] = imx_clk_divider("asrc_podf", "asrc_pred", base + 0x30, 9, 3); |
396 | clk[spdif_pred] = imx_clk_divider("spdif_pred", "spdif_sel", base + 0x30, 25, 3); |
397 | clk[spdif_podf] = imx_clk_divider("spdif_podf", "spdif_pred", base + 0x30, 22, 3); |
398 | - clk[can_root] = imx_clk_divider("can_root", "pll3_usb_otg", base + 0x20, 2, 6); |
399 | + clk[can_root] = imx_clk_divider("can_root", "pll3_60m", base + 0x20, 2, 6); |
400 | clk[ecspi_root] = imx_clk_divider("ecspi_root", "pll3_60m", base + 0x38, 19, 6); |
401 | clk[gpu2d_core_podf] = imx_clk_divider("gpu2d_core_podf", "gpu2d_core_sel", base + 0x18, 23, 3); |
402 | clk[gpu3d_core_podf] = imx_clk_divider("gpu3d_core_podf", "gpu3d_core_sel", base + 0x18, 26, 3); |
403 | diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c |
404 | index 8c60fcb0..2f4c9248 100644 |
405 | --- a/arch/arm/mach-integrator/integrator_cp.c |
406 | +++ b/arch/arm/mach-integrator/integrator_cp.c |
407 | @@ -199,7 +199,8 @@ static struct mmci_platform_data mmc_data = { |
408 | static void cp_clcd_enable(struct clcd_fb *fb) |
409 | { |
410 | struct fb_var_screeninfo *var = &fb->fb.var; |
411 | - u32 val = CM_CTRL_STATIC1 | CM_CTRL_STATIC2; |
412 | + u32 val = CM_CTRL_STATIC1 | CM_CTRL_STATIC2 |
413 | + | CM_CTRL_LCDEN0 | CM_CTRL_LCDEN1; |
414 | |
415 | if (var->bits_per_pixel <= 8 || |
416 | (var->bits_per_pixel == 16 && var->green.length == 5)) |
417 | diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c |
418 | index 3926f370..e022a869 100644 |
419 | --- a/arch/arm/mach-omap2/irq.c |
420 | +++ b/arch/arm/mach-omap2/irq.c |
421 | @@ -233,7 +233,7 @@ static inline void omap_intc_handle_irq(void __iomem *base_addr, struct pt_regs |
422 | goto out; |
423 | |
424 | irqnr = readl_relaxed(base_addr + 0xd8); |
425 | -#ifdef CONFIG_SOC_TI81XX |
426 | +#if IS_ENABLED(CONFIG_SOC_TI81XX) || IS_ENABLED(CONFIG_SOC_AM33XX) |
427 | if (irqnr) |
428 | goto out; |
429 | irqnr = readl_relaxed(base_addr + 0xf8); |
430 | diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c |
431 | index b69dd9ab..53f07358 100644 |
432 | --- a/arch/arm/mach-omap2/omap_device.c |
433 | +++ b/arch/arm/mach-omap2/omap_device.c |
434 | @@ -621,6 +621,7 @@ static int _od_suspend_noirq(struct device *dev) |
435 | |
436 | if (!ret && !pm_runtime_status_suspended(dev)) { |
437 | if (pm_generic_runtime_suspend(dev) == 0) { |
438 | + pm_runtime_set_suspended(dev); |
439 | omap_device_idle(pdev); |
440 | od->flags |= OMAP_DEVICE_SUSPENDED; |
441 | } |
442 | @@ -634,10 +635,18 @@ static int _od_resume_noirq(struct device *dev) |
443 | struct platform_device *pdev = to_platform_device(dev); |
444 | struct omap_device *od = to_omap_device(pdev); |
445 | |
446 | - if ((od->flags & OMAP_DEVICE_SUSPENDED) && |
447 | - !pm_runtime_status_suspended(dev)) { |
448 | + if (od->flags & OMAP_DEVICE_SUSPENDED) { |
449 | od->flags &= ~OMAP_DEVICE_SUSPENDED; |
450 | omap_device_enable(pdev); |
451 | + /* |
452 | + * XXX: we run before core runtime pm has resumed itself. At |
453 | + * this point in time, we just restore the runtime pm state and |
454 | + * considering symmetric operations in resume, we donot expect |
455 | + * to fail. If we failed, something changed in core runtime_pm |
456 | + * framework OR some device driver messed things up, hence, WARN |
457 | + */ |
458 | + WARN(pm_runtime_set_active(dev), |
459 | + "Could not set %s runtime state active\n", dev_name(dev)); |
460 | pm_generic_runtime_resume(dev); |
461 | } |
462 | |
463 | diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c |
464 | index e838ba27..c9808c68 100644 |
465 | --- a/arch/arm/mach-sa1100/assabet.c |
466 | +++ b/arch/arm/mach-sa1100/assabet.c |
467 | @@ -512,6 +512,9 @@ static void __init assabet_map_io(void) |
468 | * Its called GPCLKR0 in my SA1110 manual. |
469 | */ |
470 | Ser1SDCR0 |= SDCR0_SUS; |
471 | + MSC1 = (MSC1 & ~0xffff) | |
472 | + MSC_NonBrst | MSC_32BitStMem | |
473 | + MSC_RdAcc(2) | MSC_WrAcc(2) | MSC_Rec(0); |
474 | |
475 | if (!machine_has_neponset()) |
476 | sa1100_register_uart_fns(&assabet_port_fns); |
477 | diff --git a/arch/arm/mm/extable.c b/arch/arm/mm/extable.c |
478 | index 9d285626..312e15e6 100644 |
479 | --- a/arch/arm/mm/extable.c |
480 | +++ b/arch/arm/mm/extable.c |
481 | @@ -9,8 +9,13 @@ int fixup_exception(struct pt_regs *regs) |
482 | const struct exception_table_entry *fixup; |
483 | |
484 | fixup = search_exception_tables(instruction_pointer(regs)); |
485 | - if (fixup) |
486 | + if (fixup) { |
487 | regs->ARM_pc = fixup->fixup; |
488 | +#ifdef CONFIG_THUMB2_KERNEL |
489 | + /* Clear the IT state to avoid nasty surprises in the fixup */ |
490 | + regs->ARM_cpsr &= ~PSR_IT_MASK; |
491 | +#endif |
492 | + } |
493 | |
494 | return fixup != NULL; |
495 | } |
496 | diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h |
497 | index f0bebc5e..0b27b657 100644 |
498 | --- a/arch/arm64/include/asm/pgtable.h |
499 | +++ b/arch/arm64/include/asm/pgtable.h |
500 | @@ -25,10 +25,11 @@ |
501 | * Software defined PTE bits definition. |
502 | */ |
503 | #define PTE_VALID (_AT(pteval_t, 1) << 0) |
504 | -#define PTE_PROT_NONE (_AT(pteval_t, 1) << 2) /* only when !PTE_VALID */ |
505 | -#define PTE_FILE (_AT(pteval_t, 1) << 3) /* only when !pte_present() */ |
506 | +#define PTE_FILE (_AT(pteval_t, 1) << 2) /* only when !pte_present() */ |
507 | #define PTE_DIRTY (_AT(pteval_t, 1) << 55) |
508 | #define PTE_SPECIAL (_AT(pteval_t, 1) << 56) |
509 | + /* bit 57 for PMD_SECT_SPLITTING */ |
510 | +#define PTE_PROT_NONE (_AT(pteval_t, 1) << 58) /* only when !PTE_VALID */ |
511 | |
512 | /* |
513 | * VMALLOC and SPARSEMEM_VMEMMAP ranges. |
514 | @@ -357,18 +358,20 @@ extern pgd_t idmap_pg_dir[PTRS_PER_PGD]; |
515 | |
516 | /* |
517 | * Encode and decode a swap entry: |
518 | - * bits 0, 2: present (must both be zero) |
519 | - * bit 3: PTE_FILE |
520 | - * bits 4-8: swap type |
521 | - * bits 9-63: swap offset |
522 | + * bits 0-1: present (must be zero) |
523 | + * bit 2: PTE_FILE |
524 | + * bits 3-8: swap type |
525 | + * bits 9-57: swap offset |
526 | */ |
527 | -#define __SWP_TYPE_SHIFT 4 |
528 | +#define __SWP_TYPE_SHIFT 3 |
529 | #define __SWP_TYPE_BITS 6 |
530 | +#define __SWP_OFFSET_BITS 49 |
531 | #define __SWP_TYPE_MASK ((1 << __SWP_TYPE_BITS) - 1) |
532 | #define __SWP_OFFSET_SHIFT (__SWP_TYPE_BITS + __SWP_TYPE_SHIFT) |
533 | +#define __SWP_OFFSET_MASK ((1UL << __SWP_OFFSET_BITS) - 1) |
534 | |
535 | #define __swp_type(x) (((x).val >> __SWP_TYPE_SHIFT) & __SWP_TYPE_MASK) |
536 | -#define __swp_offset(x) ((x).val >> __SWP_OFFSET_SHIFT) |
537 | +#define __swp_offset(x) (((x).val >> __SWP_OFFSET_SHIFT) & __SWP_OFFSET_MASK) |
538 | #define __swp_entry(type,offset) ((swp_entry_t) { ((type) << __SWP_TYPE_SHIFT) | ((offset) << __SWP_OFFSET_SHIFT) }) |
539 | |
540 | #define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) }) |
541 | @@ -382,15 +385,15 @@ extern pgd_t idmap_pg_dir[PTRS_PER_PGD]; |
542 | |
543 | /* |
544 | * Encode and decode a file entry: |
545 | - * bits 0, 2: present (must both be zero) |
546 | - * bit 3: PTE_FILE |
547 | - * bits 4-63: file offset / PAGE_SIZE |
548 | + * bits 0-1: present (must be zero) |
549 | + * bit 2: PTE_FILE |
550 | + * bits 3-57: file offset / PAGE_SIZE |
551 | */ |
552 | #define pte_file(pte) (pte_val(pte) & PTE_FILE) |
553 | -#define pte_to_pgoff(x) (pte_val(x) >> 4) |
554 | -#define pgoff_to_pte(x) __pte(((x) << 4) | PTE_FILE) |
555 | +#define pte_to_pgoff(x) (pte_val(x) >> 3) |
556 | +#define pgoff_to_pte(x) __pte(((x) << 3) | PTE_FILE) |
557 | |
558 | -#define PTE_FILE_MAX_BITS 60 |
559 | +#define PTE_FILE_MAX_BITS 55 |
560 | |
561 | extern int kern_addr_valid(unsigned long addr); |
562 | |
563 | diff --git a/arch/avr32/boot/u-boot/head.S b/arch/avr32/boot/u-boot/head.S |
564 | index 4488fa27..2ffc298f 100644 |
565 | --- a/arch/avr32/boot/u-boot/head.S |
566 | +++ b/arch/avr32/boot/u-boot/head.S |
567 | @@ -8,6 +8,8 @@ |
568 | * published by the Free Software Foundation. |
569 | */ |
570 | #include <asm/setup.h> |
571 | +#include <asm/thread_info.h> |
572 | +#include <asm/sysreg.h> |
573 | |
574 | /* |
575 | * The kernel is loaded where we want it to be and all caches |
576 | @@ -20,11 +22,6 @@ |
577 | .section .init.text,"ax" |
578 | .global _start |
579 | _start: |
580 | - /* Check if the boot loader actually provided a tag table */ |
581 | - lddpc r0, magic_number |
582 | - cp.w r12, r0 |
583 | - brne no_tag_table |
584 | - |
585 | /* Initialize .bss */ |
586 | lddpc r2, bss_start_addr |
587 | lddpc r3, end_addr |
588 | @@ -34,6 +31,25 @@ _start: |
589 | cp r2, r3 |
590 | brlo 1b |
591 | |
592 | + /* Initialize status register */ |
593 | + lddpc r0, init_sr |
594 | + mtsr SYSREG_SR, r0 |
595 | + |
596 | + /* Set initial stack pointer */ |
597 | + lddpc sp, stack_addr |
598 | + sub sp, -THREAD_SIZE |
599 | + |
600 | +#ifdef CONFIG_FRAME_POINTER |
601 | + /* Mark last stack frame */ |
602 | + mov lr, 0 |
603 | + mov r7, 0 |
604 | +#endif |
605 | + |
606 | + /* Check if the boot loader actually provided a tag table */ |
607 | + lddpc r0, magic_number |
608 | + cp.w r12, r0 |
609 | + brne no_tag_table |
610 | + |
611 | /* |
612 | * Save the tag table address for later use. This must be done |
613 | * _after_ .bss has been initialized... |
614 | @@ -53,8 +69,15 @@ bss_start_addr: |
615 | .long __bss_start |
616 | end_addr: |
617 | .long _end |
618 | +init_sr: |
619 | + .long 0x007f0000 /* Supervisor mode, everything masked */ |
620 | +stack_addr: |
621 | + .long init_thread_union |
622 | +panic_addr: |
623 | + .long panic |
624 | |
625 | no_tag_table: |
626 | sub r12, pc, (. - 2f) |
627 | - bral panic |
628 | + /* branch to panic() which can be far away with that construct */ |
629 | + lddpc pc, panic_addr |
630 | 2: .asciz "Boot loader didn't provide correct magic number\n" |
631 | diff --git a/arch/avr32/kernel/entry-avr32b.S b/arch/avr32/kernel/entry-avr32b.S |
632 | index 9899d3cc..7301f480 100644 |
633 | --- a/arch/avr32/kernel/entry-avr32b.S |
634 | +++ b/arch/avr32/kernel/entry-avr32b.S |
635 | @@ -401,9 +401,10 @@ handle_critical: |
636 | /* We should never get here... */ |
637 | bad_return: |
638 | sub r12, pc, (. - 1f) |
639 | - bral panic |
640 | + lddpc pc, 2f |
641 | .align 2 |
642 | 1: .asciz "Return from critical exception!" |
643 | +2: .long panic |
644 | |
645 | .align 1 |
646 | do_bus_error_write: |
647 | diff --git a/arch/avr32/kernel/head.S b/arch/avr32/kernel/head.S |
648 | index 6163bd0a..59eae6df 100644 |
649 | --- a/arch/avr32/kernel/head.S |
650 | +++ b/arch/avr32/kernel/head.S |
651 | @@ -10,33 +10,13 @@ |
652 | #include <linux/linkage.h> |
653 | |
654 | #include <asm/page.h> |
655 | -#include <asm/thread_info.h> |
656 | -#include <asm/sysreg.h> |
657 | |
658 | .section .init.text,"ax" |
659 | .global kernel_entry |
660 | kernel_entry: |
661 | - /* Initialize status register */ |
662 | - lddpc r0, init_sr |
663 | - mtsr SYSREG_SR, r0 |
664 | - |
665 | - /* Set initial stack pointer */ |
666 | - lddpc sp, stack_addr |
667 | - sub sp, -THREAD_SIZE |
668 | - |
669 | -#ifdef CONFIG_FRAME_POINTER |
670 | - /* Mark last stack frame */ |
671 | - mov lr, 0 |
672 | - mov r7, 0 |
673 | -#endif |
674 | - |
675 | /* Start the show */ |
676 | lddpc pc, kernel_start_addr |
677 | |
678 | .align 2 |
679 | -init_sr: |
680 | - .long 0x007f0000 /* Supervisor mode, everything masked */ |
681 | -stack_addr: |
682 | - .long init_thread_union |
683 | kernel_start_addr: |
684 | .long start_kernel |
685 | diff --git a/arch/parisc/include/asm/socket.h b/arch/parisc/include/asm/socket.h |
686 | new file mode 100644 |
687 | index 00000000..748016cb |
688 | --- /dev/null |
689 | +++ b/arch/parisc/include/asm/socket.h |
690 | @@ -0,0 +1,11 @@ |
691 | +#ifndef _ASM_SOCKET_H |
692 | +#define _ASM_SOCKET_H |
693 | + |
694 | +#include <uapi/asm/socket.h> |
695 | + |
696 | +/* O_NONBLOCK clashes with the bits used for socket types. Therefore we |
697 | + * have to define SOCK_NONBLOCK to a different value here. |
698 | + */ |
699 | +#define SOCK_NONBLOCK 0x40000000 |
700 | + |
701 | +#endif /* _ASM_SOCKET_H */ |
702 | diff --git a/arch/parisc/include/uapi/asm/socket.h b/arch/parisc/include/uapi/asm/socket.h |
703 | index 71700e63..9f2174f4 100644 |
704 | --- a/arch/parisc/include/uapi/asm/socket.h |
705 | +++ b/arch/parisc/include/uapi/asm/socket.h |
706 | @@ -1,5 +1,5 @@ |
707 | -#ifndef _ASM_SOCKET_H |
708 | -#define _ASM_SOCKET_H |
709 | +#ifndef _UAPI_ASM_SOCKET_H |
710 | +#define _UAPI_ASM_SOCKET_H |
711 | |
712 | #include <asm/sockios.h> |
713 | |
714 | @@ -75,9 +75,4 @@ |
715 | |
716 | #define SO_BUSY_POLL 0x4027 |
717 | |
718 | -/* O_NONBLOCK clashes with the bits used for socket types. Therefore we |
719 | - * have to define SOCK_NONBLOCK to a different value here. |
720 | - */ |
721 | -#define SOCK_NONBLOCK 0x40000000 |
722 | - |
723 | -#endif /* _ASM_SOCKET_H */ |
724 | +#endif /* _UAPI_ASM_SOCKET_H */ |
725 | diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c |
726 | index 36d49e6b..fea2dba1 100644 |
727 | --- a/arch/powerpc/kernel/signal_32.c |
728 | +++ b/arch/powerpc/kernel/signal_32.c |
729 | @@ -445,6 +445,12 @@ static int save_user_regs(struct pt_regs *regs, struct mcontext __user *frame, |
730 | #endif /* CONFIG_ALTIVEC */ |
731 | if (copy_fpr_to_user(&frame->mc_fregs, current)) |
732 | return 1; |
733 | + |
734 | + /* |
735 | + * Clear the MSR VSX bit to indicate there is no valid state attached |
736 | + * to this context, except in the specific case below where we set it. |
737 | + */ |
738 | + msr &= ~MSR_VSX; |
739 | #ifdef CONFIG_VSX |
740 | /* |
741 | * Copy VSR 0-31 upper half from thread_struct to local |
742 | @@ -457,15 +463,7 @@ static int save_user_regs(struct pt_regs *regs, struct mcontext __user *frame, |
743 | if (copy_vsx_to_user(&frame->mc_vsregs, current)) |
744 | return 1; |
745 | msr |= MSR_VSX; |
746 | - } else if (!ctx_has_vsx_region) |
747 | - /* |
748 | - * With a small context structure we can't hold the VSX |
749 | - * registers, hence clear the MSR value to indicate the state |
750 | - * was not saved. |
751 | - */ |
752 | - msr &= ~MSR_VSX; |
753 | - |
754 | - |
755 | + } |
756 | #endif /* CONFIG_VSX */ |
757 | #ifdef CONFIG_SPE |
758 | /* save spe registers */ |
759 | diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c |
760 | index f93ec283..1e7ba881 100644 |
761 | --- a/arch/powerpc/kernel/signal_64.c |
762 | +++ b/arch/powerpc/kernel/signal_64.c |
763 | @@ -121,6 +121,12 @@ static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, |
764 | flush_fp_to_thread(current); |
765 | /* copy fpr regs and fpscr */ |
766 | err |= copy_fpr_to_user(&sc->fp_regs, current); |
767 | + |
768 | + /* |
769 | + * Clear the MSR VSX bit to indicate there is no valid state attached |
770 | + * to this context, except in the specific case below where we set it. |
771 | + */ |
772 | + msr &= ~MSR_VSX; |
773 | #ifdef CONFIG_VSX |
774 | /* |
775 | * Copy VSX low doubleword to local buffer for formatting, |
776 | diff --git a/arch/s390/lib/uaccess_pt.c b/arch/s390/lib/uaccess_pt.c |
777 | index 1694d738..26588fdc 100644 |
778 | --- a/arch/s390/lib/uaccess_pt.c |
779 | +++ b/arch/s390/lib/uaccess_pt.c |
780 | @@ -78,11 +78,14 @@ static size_t copy_in_kernel(size_t count, void __user *to, |
781 | * contains the (negative) exception code. |
782 | */ |
783 | #ifdef CONFIG_64BIT |
784 | + |
785 | static unsigned long follow_table(struct mm_struct *mm, |
786 | unsigned long address, int write) |
787 | { |
788 | unsigned long *table = (unsigned long *)__pa(mm->pgd); |
789 | |
790 | + if (unlikely(address > mm->context.asce_limit - 1)) |
791 | + return -0x38UL; |
792 | switch (mm->context.asce_bits & _ASCE_TYPE_MASK) { |
793 | case _ASCE_TYPE_REGION1: |
794 | table = table + ((address >> 53) & 0x7ff); |
795 | diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c |
796 | index 1fa8be40..122f737a 100644 |
797 | --- a/arch/sh/boards/mach-ecovec24/setup.c |
798 | +++ b/arch/sh/boards/mach-ecovec24/setup.c |
799 | @@ -15,6 +15,7 @@ |
800 | #include <linux/mmc/sh_mmcif.h> |
801 | #include <linux/mmc/sh_mobile_sdhi.h> |
802 | #include <linux/mtd/physmap.h> |
803 | +#include <linux/mfd/tmio.h> |
804 | #include <linux/gpio.h> |
805 | #include <linux/interrupt.h> |
806 | #include <linux/io.h> |
807 | diff --git a/block/blk-core.c b/block/blk-core.c |
808 | index 5e00b5a5..0c611d89 100644 |
809 | --- a/block/blk-core.c |
810 | +++ b/block/blk-core.c |
811 | @@ -645,10 +645,12 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id) |
812 | __set_bit(QUEUE_FLAG_BYPASS, &q->queue_flags); |
813 | |
814 | if (blkcg_init_queue(q)) |
815 | - goto fail_id; |
816 | + goto fail_bdi; |
817 | |
818 | return q; |
819 | |
820 | +fail_bdi: |
821 | + bdi_destroy(&q->backing_dev_info); |
822 | fail_id: |
823 | ida_simple_remove(&blk_queue_ida, q->id); |
824 | fail_q: |
825 | diff --git a/crypto/asymmetric_keys/x509_public_key.c b/crypto/asymmetric_keys/x509_public_key.c |
826 | index 06007f0e..52222a2f 100644 |
827 | --- a/crypto/asymmetric_keys/x509_public_key.c |
828 | +++ b/crypto/asymmetric_keys/x509_public_key.c |
829 | @@ -106,7 +106,6 @@ error_no_sig: |
830 | static int x509_key_preparse(struct key_preparsed_payload *prep) |
831 | { |
832 | struct x509_certificate *cert; |
833 | - struct tm now; |
834 | size_t srlen, sulen; |
835 | char *desc = NULL; |
836 | int ret; |
837 | @@ -137,43 +136,6 @@ static int x509_key_preparse(struct key_preparsed_payload *prep) |
838 | goto error_free_cert; |
839 | } |
840 | |
841 | - time_to_tm(CURRENT_TIME.tv_sec, 0, &now); |
842 | - pr_devel("Now: %04ld-%02d-%02d %02d:%02d:%02d\n", |
843 | - now.tm_year + 1900, now.tm_mon + 1, now.tm_mday, |
844 | - now.tm_hour, now.tm_min, now.tm_sec); |
845 | - if (now.tm_year < cert->valid_from.tm_year || |
846 | - (now.tm_year == cert->valid_from.tm_year && |
847 | - (now.tm_mon < cert->valid_from.tm_mon || |
848 | - (now.tm_mon == cert->valid_from.tm_mon && |
849 | - (now.tm_mday < cert->valid_from.tm_mday || |
850 | - (now.tm_mday == cert->valid_from.tm_mday && |
851 | - (now.tm_hour < cert->valid_from.tm_hour || |
852 | - (now.tm_hour == cert->valid_from.tm_hour && |
853 | - (now.tm_min < cert->valid_from.tm_min || |
854 | - (now.tm_min == cert->valid_from.tm_min && |
855 | - (now.tm_sec < cert->valid_from.tm_sec |
856 | - ))))))))))) { |
857 | - pr_warn("Cert %s is not yet valid\n", cert->fingerprint); |
858 | - ret = -EKEYREJECTED; |
859 | - goto error_free_cert; |
860 | - } |
861 | - if (now.tm_year > cert->valid_to.tm_year || |
862 | - (now.tm_year == cert->valid_to.tm_year && |
863 | - (now.tm_mon > cert->valid_to.tm_mon || |
864 | - (now.tm_mon == cert->valid_to.tm_mon && |
865 | - (now.tm_mday > cert->valid_to.tm_mday || |
866 | - (now.tm_mday == cert->valid_to.tm_mday && |
867 | - (now.tm_hour > cert->valid_to.tm_hour || |
868 | - (now.tm_hour == cert->valid_to.tm_hour && |
869 | - (now.tm_min > cert->valid_to.tm_min || |
870 | - (now.tm_min == cert->valid_to.tm_min && |
871 | - (now.tm_sec > cert->valid_to.tm_sec |
872 | - ))))))))))) { |
873 | - pr_warn("Cert %s has expired\n", cert->fingerprint); |
874 | - ret = -EKEYEXPIRED; |
875 | - goto error_free_cert; |
876 | - } |
877 | - |
878 | cert->pub->algo = x509_public_key_algorithms[cert->pkey_algo]; |
879 | cert->pub->id_type = PKEY_ID_X509; |
880 | |
881 | diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c |
882 | index d7e53ea5..79de26ed 100644 |
883 | --- a/drivers/acpi/pci_root.c |
884 | +++ b/drivers/acpi/pci_root.c |
885 | @@ -63,6 +63,9 @@ static struct acpi_scan_handler pci_root_handler = { |
886 | .ids = root_device_ids, |
887 | .attach = acpi_pci_root_add, |
888 | .detach = acpi_pci_root_remove, |
889 | + .hotplug = { |
890 | + .ignore = true, |
891 | + }, |
892 | }; |
893 | |
894 | static DEFINE_MUTEX(osc_lock); |
895 | diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c |
896 | index 3601738e..d047771c 100644 |
897 | --- a/drivers/acpi/scan.c |
898 | +++ b/drivers/acpi/scan.c |
899 | @@ -1812,7 +1812,7 @@ static void acpi_scan_init_hotplug(acpi_handle handle, int type) |
900 | */ |
901 | list_for_each_entry(hwid, &pnp.ids, list) { |
902 | handler = acpi_scan_match_handler(hwid->id, NULL); |
903 | - if (handler) { |
904 | + if (handler && !handler->hotplug.ignore) { |
905 | acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY, |
906 | acpi_hotplug_notify_cb, handler); |
907 | break; |
908 | diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c |
909 | index 8e28f923..14f1e950 100644 |
910 | --- a/drivers/ata/ahci.c |
911 | +++ b/drivers/ata/ahci.c |
912 | @@ -292,6 +292,10 @@ static const struct pci_device_id ahci_pci_tbl[] = { |
913 | { PCI_VDEVICE(INTEL, 0x8d66), board_ahci }, /* Wellsburg RAID */ |
914 | { PCI_VDEVICE(INTEL, 0x8d6e), board_ahci }, /* Wellsburg RAID */ |
915 | { PCI_VDEVICE(INTEL, 0x23a3), board_ahci }, /* Coleto Creek AHCI */ |
916 | + { PCI_VDEVICE(INTEL, 0x9c83), board_ahci }, /* Wildcat Point-LP AHCI */ |
917 | + { PCI_VDEVICE(INTEL, 0x9c85), board_ahci }, /* Wildcat Point-LP RAID */ |
918 | + { PCI_VDEVICE(INTEL, 0x9c87), board_ahci }, /* Wildcat Point-LP RAID */ |
919 | + { PCI_VDEVICE(INTEL, 0x9c8f), board_ahci }, /* Wildcat Point-LP RAID */ |
920 | |
921 | /* JMicron 360/1/3/5/6, match class to avoid IDE function */ |
922 | { PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, |
923 | @@ -431,6 +435,8 @@ static const struct pci_device_id ahci_pci_tbl[] = { |
924 | .driver_data = board_ahci_yes_fbs }, /* 88se9172 on some Gigabyte */ |
925 | { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x91a3), |
926 | .driver_data = board_ahci_yes_fbs }, |
927 | + { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9230), |
928 | + .driver_data = board_ahci_yes_fbs }, |
929 | |
930 | /* Promise */ |
931 | { PCI_VDEVICE(PROMISE, 0x3f20), board_ahci }, /* PDC42819 */ |
932 | diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c |
933 | index aaac4fb0..cfb74470 100644 |
934 | --- a/drivers/ata/libahci.c |
935 | +++ b/drivers/ata/libahci.c |
936 | @@ -1275,9 +1275,11 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class, |
937 | { |
938 | struct ata_port *ap = link->ap; |
939 | struct ahci_host_priv *hpriv = ap->host->private_data; |
940 | + struct ahci_port_priv *pp = ap->private_data; |
941 | const char *reason = NULL; |
942 | unsigned long now, msecs; |
943 | struct ata_taskfile tf; |
944 | + bool fbs_disabled = false; |
945 | int rc; |
946 | |
947 | DPRINTK("ENTER\n"); |
948 | @@ -1287,6 +1289,16 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class, |
949 | if (rc && rc != -EOPNOTSUPP) |
950 | ata_link_warn(link, "failed to reset engine (errno=%d)\n", rc); |
951 | |
952 | + /* |
953 | + * According to AHCI-1.2 9.3.9: if FBS is enable, software shall |
954 | + * clear PxFBS.EN to '0' prior to issuing software reset to devices |
955 | + * that is attached to port multiplier. |
956 | + */ |
957 | + if (!ata_is_host_link(link) && pp->fbs_enabled) { |
958 | + ahci_disable_fbs(ap); |
959 | + fbs_disabled = true; |
960 | + } |
961 | + |
962 | ata_tf_init(link->device, &tf); |
963 | |
964 | /* issue the first D2H Register FIS */ |
965 | @@ -1327,6 +1339,10 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class, |
966 | } else |
967 | *class = ahci_dev_classify(ap); |
968 | |
969 | + /* re-enable FBS if disabled before */ |
970 | + if (fbs_disabled) |
971 | + ahci_enable_fbs(ap); |
972 | + |
973 | DPRINTK("EXIT, class=%u\n", *class); |
974 | return 0; |
975 | |
976 | diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c |
977 | index 83b1a9fb..81a94a39 100644 |
978 | --- a/drivers/ata/libata-core.c |
979 | +++ b/drivers/ata/libata-core.c |
980 | @@ -4126,6 +4126,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { |
981 | { "TORiSAN DVD-ROM DRD-N216", NULL, ATA_HORKAGE_MAX_SEC_128 }, |
982 | { "QUANTUM DAT DAT72-000", NULL, ATA_HORKAGE_ATAPI_MOD16_DMA }, |
983 | { "Slimtype DVD A DS8A8SH", NULL, ATA_HORKAGE_MAX_SEC_LBA48 }, |
984 | + { "Slimtype DVD A DS8A9SH", NULL, ATA_HORKAGE_MAX_SEC_LBA48 }, |
985 | |
986 | /* Devices we expect to fail diagnostics */ |
987 | |
988 | diff --git a/drivers/ata/libata-transport.c b/drivers/ata/libata-transport.c |
989 | index 150a917f..e37413228 100644 |
990 | --- a/drivers/ata/libata-transport.c |
991 | +++ b/drivers/ata/libata-transport.c |
992 | @@ -321,25 +321,25 @@ int ata_tport_add(struct device *parent, |
993 | /* |
994 | * ATA link attributes |
995 | */ |
996 | +static int noop(int x) { return x; } |
997 | |
998 | - |
999 | -#define ata_link_show_linkspeed(field) \ |
1000 | +#define ata_link_show_linkspeed(field, format) \ |
1001 | static ssize_t \ |
1002 | show_ata_link_##field(struct device *dev, \ |
1003 | struct device_attribute *attr, char *buf) \ |
1004 | { \ |
1005 | struct ata_link *link = transport_class_to_link(dev); \ |
1006 | \ |
1007 | - return sprintf(buf,"%s\n", sata_spd_string(fls(link->field))); \ |
1008 | + return sprintf(buf, "%s\n", sata_spd_string(format(link->field))); \ |
1009 | } |
1010 | |
1011 | -#define ata_link_linkspeed_attr(field) \ |
1012 | - ata_link_show_linkspeed(field) \ |
1013 | +#define ata_link_linkspeed_attr(field, format) \ |
1014 | + ata_link_show_linkspeed(field, format) \ |
1015 | static DEVICE_ATTR(field, S_IRUGO, show_ata_link_##field, NULL) |
1016 | |
1017 | -ata_link_linkspeed_attr(hw_sata_spd_limit); |
1018 | -ata_link_linkspeed_attr(sata_spd_limit); |
1019 | -ata_link_linkspeed_attr(sata_spd); |
1020 | +ata_link_linkspeed_attr(hw_sata_spd_limit, fls); |
1021 | +ata_link_linkspeed_attr(sata_spd_limit, fls); |
1022 | +ata_link_linkspeed_attr(sata_spd, noop); |
1023 | |
1024 | |
1025 | static DECLARE_TRANSPORT_CLASS(ata_link_class, |
1026 | diff --git a/drivers/base/dd.c b/drivers/base/dd.c |
1027 | index 35fa3689..06051767 100644 |
1028 | --- a/drivers/base/dd.c |
1029 | +++ b/drivers/base/dd.c |
1030 | @@ -499,7 +499,7 @@ static void __device_release_driver(struct device *dev) |
1031 | BUS_NOTIFY_UNBIND_DRIVER, |
1032 | dev); |
1033 | |
1034 | - pm_runtime_put(dev); |
1035 | + pm_runtime_put_sync(dev); |
1036 | |
1037 | if (dev->bus && dev->bus->remove) |
1038 | dev->bus->remove(dev); |
1039 | diff --git a/drivers/block/loop.c b/drivers/block/loop.c |
1040 | index 2f036ca4..c8dac730 100644 |
1041 | --- a/drivers/block/loop.c |
1042 | +++ b/drivers/block/loop.c |
1043 | @@ -894,13 +894,6 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode, |
1044 | |
1045 | bio_list_init(&lo->lo_bio_list); |
1046 | |
1047 | - /* |
1048 | - * set queue make_request_fn, and add limits based on lower level |
1049 | - * device |
1050 | - */ |
1051 | - blk_queue_make_request(lo->lo_queue, loop_make_request); |
1052 | - lo->lo_queue->queuedata = lo; |
1053 | - |
1054 | if (!(lo_flags & LO_FLAGS_READ_ONLY) && file->f_op->fsync) |
1055 | blk_queue_flush(lo->lo_queue, REQ_FLUSH); |
1056 | |
1057 | @@ -1618,6 +1611,8 @@ static int loop_add(struct loop_device **l, int i) |
1058 | if (!lo) |
1059 | goto out; |
1060 | |
1061 | + lo->lo_state = Lo_unbound; |
1062 | + |
1063 | /* allocate id, if @id >= 0, we're requesting that specific id */ |
1064 | if (i >= 0) { |
1065 | err = idr_alloc(&loop_index_idr, lo, i, i + 1, GFP_KERNEL); |
1066 | @@ -1633,7 +1628,13 @@ static int loop_add(struct loop_device **l, int i) |
1067 | err = -ENOMEM; |
1068 | lo->lo_queue = blk_alloc_queue(GFP_KERNEL); |
1069 | if (!lo->lo_queue) |
1070 | - goto out_free_dev; |
1071 | + goto out_free_idr; |
1072 | + |
1073 | + /* |
1074 | + * set queue make_request_fn |
1075 | + */ |
1076 | + blk_queue_make_request(lo->lo_queue, loop_make_request); |
1077 | + lo->lo_queue->queuedata = lo; |
1078 | |
1079 | disk = lo->lo_disk = alloc_disk(1 << part_shift); |
1080 | if (!disk) |
1081 | @@ -1678,6 +1679,8 @@ static int loop_add(struct loop_device **l, int i) |
1082 | |
1083 | out_free_queue: |
1084 | blk_cleanup_queue(lo->lo_queue); |
1085 | +out_free_idr: |
1086 | + idr_remove(&loop_index_idr, i); |
1087 | out_free_dev: |
1088 | kfree(lo); |
1089 | out: |
1090 | diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c |
1091 | index bf4b9d28..6620b73d 100644 |
1092 | --- a/drivers/block/xen-blkback/blkback.c |
1093 | +++ b/drivers/block/xen-blkback/blkback.c |
1094 | @@ -887,6 +887,8 @@ static int dispatch_discard_io(struct xen_blkif *blkif, |
1095 | unsigned long secure; |
1096 | struct phys_req preq; |
1097 | |
1098 | + xen_blkif_get(blkif); |
1099 | + |
1100 | preq.sector_number = req->u.discard.sector_number; |
1101 | preq.nr_sects = req->u.discard.nr_sectors; |
1102 | |
1103 | @@ -899,7 +901,6 @@ static int dispatch_discard_io(struct xen_blkif *blkif, |
1104 | } |
1105 | blkif->st_ds_req++; |
1106 | |
1107 | - xen_blkif_get(blkif); |
1108 | secure = (blkif->vbd.discard_secure && |
1109 | (req->u.discard.flag & BLKIF_DISCARD_SECURE)) ? |
1110 | BLKDEV_DISCARD_SECURE : 0; |
1111 | diff --git a/drivers/cpufreq/highbank-cpufreq.c b/drivers/cpufreq/highbank-cpufreq.c |
1112 | index 794123fc..bf8902a0 100644 |
1113 | --- a/drivers/cpufreq/highbank-cpufreq.c |
1114 | +++ b/drivers/cpufreq/highbank-cpufreq.c |
1115 | @@ -66,7 +66,8 @@ static int hb_cpufreq_driver_init(void) |
1116 | struct device_node *np; |
1117 | int ret; |
1118 | |
1119 | - if (!of_machine_is_compatible("calxeda,highbank")) |
1120 | + if ((!of_machine_is_compatible("calxeda,highbank")) && |
1121 | + (!of_machine_is_compatible("calxeda,ecx-2000"))) |
1122 | return -ENODEV; |
1123 | |
1124 | cpu_dev = get_cpu_device(0); |
1125 | diff --git a/drivers/dma/ioat/dma_v3.c b/drivers/dma/ioat/dma_v3.c |
1126 | index d8ececaf..3efc4dcf 100644 |
1127 | --- a/drivers/dma/ioat/dma_v3.c |
1128 | +++ b/drivers/dma/ioat/dma_v3.c |
1129 | @@ -87,13 +87,6 @@ static const u8 pq_idx_to_field[] = { 1, 4, 5, 0, 1, 2, 4, 5 }; |
1130 | static const u8 pq16_idx_to_field[] = { 1, 4, 1, 2, 3, 4, 5, 6, 7, |
1131 | 0, 1, 2, 3, 4, 5, 6 }; |
1132 | |
1133 | -/* |
1134 | - * technically sources 1 and 2 do not require SED, but the op will have |
1135 | - * at least 9 descriptors so that's irrelevant. |
1136 | - */ |
1137 | -static const u8 pq16_idx_to_sed[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, |
1138 | - 1, 1, 1, 1, 1, 1, 1 }; |
1139 | - |
1140 | static void ioat3_eh(struct ioat2_dma_chan *ioat); |
1141 | |
1142 | static dma_addr_t xor_get_src(struct ioat_raw_descriptor *descs[2], int idx) |
1143 | @@ -135,12 +128,6 @@ static void pq_set_src(struct ioat_raw_descriptor *descs[2], |
1144 | pq->coef[idx] = coef; |
1145 | } |
1146 | |
1147 | -static int sed_get_pq16_pool_idx(int src_cnt) |
1148 | -{ |
1149 | - |
1150 | - return pq16_idx_to_sed[src_cnt]; |
1151 | -} |
1152 | - |
1153 | static bool is_jf_ioat(struct pci_dev *pdev) |
1154 | { |
1155 | switch (pdev->device) { |
1156 | @@ -1129,9 +1116,6 @@ __ioat3_prep_pq16_lock(struct dma_chan *c, enum sum_check_flags *result, |
1157 | u8 op; |
1158 | int i, s, idx, num_descs; |
1159 | |
1160 | - /* this function only handles src_cnt 9 - 16 */ |
1161 | - BUG_ON(src_cnt < 9); |
1162 | - |
1163 | /* this function is only called with 9-16 sources */ |
1164 | op = result ? IOAT_OP_PQ_VAL_16S : IOAT_OP_PQ_16S; |
1165 | |
1166 | @@ -1159,8 +1143,7 @@ __ioat3_prep_pq16_lock(struct dma_chan *c, enum sum_check_flags *result, |
1167 | |
1168 | descs[0] = (struct ioat_raw_descriptor *) pq; |
1169 | |
1170 | - desc->sed = ioat3_alloc_sed(device, |
1171 | - sed_get_pq16_pool_idx(src_cnt)); |
1172 | + desc->sed = ioat3_alloc_sed(device, (src_cnt-2) >> 3); |
1173 | if (!desc->sed) { |
1174 | dev_err(to_dev(chan), |
1175 | "%s: no free sed entries\n", __func__); |
1176 | @@ -1218,13 +1201,21 @@ __ioat3_prep_pq16_lock(struct dma_chan *c, enum sum_check_flags *result, |
1177 | return &desc->txd; |
1178 | } |
1179 | |
1180 | +static int src_cnt_flags(unsigned int src_cnt, unsigned long flags) |
1181 | +{ |
1182 | + if (dmaf_p_disabled_continue(flags)) |
1183 | + return src_cnt + 1; |
1184 | + else if (dmaf_continue(flags)) |
1185 | + return src_cnt + 3; |
1186 | + else |
1187 | + return src_cnt; |
1188 | +} |
1189 | + |
1190 | static struct dma_async_tx_descriptor * |
1191 | ioat3_prep_pq(struct dma_chan *chan, dma_addr_t *dst, dma_addr_t *src, |
1192 | unsigned int src_cnt, const unsigned char *scf, size_t len, |
1193 | unsigned long flags) |
1194 | { |
1195 | - struct dma_device *dma = chan->device; |
1196 | - |
1197 | /* specify valid address for disabled result */ |
1198 | if (flags & DMA_PREP_PQ_DISABLE_P) |
1199 | dst[0] = dst[1]; |
1200 | @@ -1244,7 +1235,7 @@ ioat3_prep_pq(struct dma_chan *chan, dma_addr_t *dst, dma_addr_t *src, |
1201 | single_source_coef[0] = scf[0]; |
1202 | single_source_coef[1] = 0; |
1203 | |
1204 | - return (src_cnt > 8) && (dma->max_pq > 8) ? |
1205 | + return src_cnt_flags(src_cnt, flags) > 8 ? |
1206 | __ioat3_prep_pq16_lock(chan, NULL, dst, single_source, |
1207 | 2, single_source_coef, len, |
1208 | flags) : |
1209 | @@ -1252,7 +1243,7 @@ ioat3_prep_pq(struct dma_chan *chan, dma_addr_t *dst, dma_addr_t *src, |
1210 | single_source_coef, len, flags); |
1211 | |
1212 | } else { |
1213 | - return (src_cnt > 8) && (dma->max_pq > 8) ? |
1214 | + return src_cnt_flags(src_cnt, flags) > 8 ? |
1215 | __ioat3_prep_pq16_lock(chan, NULL, dst, src, src_cnt, |
1216 | scf, len, flags) : |
1217 | __ioat3_prep_pq_lock(chan, NULL, dst, src, src_cnt, |
1218 | @@ -1265,8 +1256,6 @@ ioat3_prep_pq_val(struct dma_chan *chan, dma_addr_t *pq, dma_addr_t *src, |
1219 | unsigned int src_cnt, const unsigned char *scf, size_t len, |
1220 | enum sum_check_flags *pqres, unsigned long flags) |
1221 | { |
1222 | - struct dma_device *dma = chan->device; |
1223 | - |
1224 | /* specify valid address for disabled result */ |
1225 | if (flags & DMA_PREP_PQ_DISABLE_P) |
1226 | pq[0] = pq[1]; |
1227 | @@ -1278,7 +1267,7 @@ ioat3_prep_pq_val(struct dma_chan *chan, dma_addr_t *pq, dma_addr_t *src, |
1228 | */ |
1229 | *pqres = 0; |
1230 | |
1231 | - return (src_cnt > 8) && (dma->max_pq > 8) ? |
1232 | + return src_cnt_flags(src_cnt, flags) > 8 ? |
1233 | __ioat3_prep_pq16_lock(chan, pqres, pq, src, src_cnt, scf, len, |
1234 | flags) : |
1235 | __ioat3_prep_pq_lock(chan, pqres, pq, src, src_cnt, scf, len, |
1236 | @@ -1289,7 +1278,6 @@ static struct dma_async_tx_descriptor * |
1237 | ioat3_prep_pqxor(struct dma_chan *chan, dma_addr_t dst, dma_addr_t *src, |
1238 | unsigned int src_cnt, size_t len, unsigned long flags) |
1239 | { |
1240 | - struct dma_device *dma = chan->device; |
1241 | unsigned char scf[src_cnt]; |
1242 | dma_addr_t pq[2]; |
1243 | |
1244 | @@ -1298,7 +1286,7 @@ ioat3_prep_pqxor(struct dma_chan *chan, dma_addr_t dst, dma_addr_t *src, |
1245 | flags |= DMA_PREP_PQ_DISABLE_Q; |
1246 | pq[1] = dst; /* specify valid address for disabled result */ |
1247 | |
1248 | - return (src_cnt > 8) && (dma->max_pq > 8) ? |
1249 | + return src_cnt_flags(src_cnt, flags) > 8 ? |
1250 | __ioat3_prep_pq16_lock(chan, NULL, pq, src, src_cnt, scf, len, |
1251 | flags) : |
1252 | __ioat3_prep_pq_lock(chan, NULL, pq, src, src_cnt, scf, len, |
1253 | @@ -1310,7 +1298,6 @@ ioat3_prep_pqxor_val(struct dma_chan *chan, dma_addr_t *src, |
1254 | unsigned int src_cnt, size_t len, |
1255 | enum sum_check_flags *result, unsigned long flags) |
1256 | { |
1257 | - struct dma_device *dma = chan->device; |
1258 | unsigned char scf[src_cnt]; |
1259 | dma_addr_t pq[2]; |
1260 | |
1261 | @@ -1324,8 +1311,7 @@ ioat3_prep_pqxor_val(struct dma_chan *chan, dma_addr_t *src, |
1262 | flags |= DMA_PREP_PQ_DISABLE_Q; |
1263 | pq[1] = pq[0]; /* specify valid address for disabled result */ |
1264 | |
1265 | - |
1266 | - return (src_cnt > 8) && (dma->max_pq > 8) ? |
1267 | + return src_cnt_flags(src_cnt, flags) > 8 ? |
1268 | __ioat3_prep_pq16_lock(chan, result, pq, &src[1], src_cnt - 1, |
1269 | scf, len, flags) : |
1270 | __ioat3_prep_pq_lock(chan, result, pq, &src[1], src_cnt - 1, |
1271 | @@ -1545,6 +1531,8 @@ static int ioat_xor_val_self_test(struct ioatdma_device *device) |
1272 | goto free_resources; |
1273 | } |
1274 | |
1275 | + memset(page_address(dest), 0, PAGE_SIZE); |
1276 | + |
1277 | /* test for non-zero parity sum */ |
1278 | op = IOAT_OP_XOR_VAL; |
1279 | |
1280 | diff --git a/drivers/edac/highbank_l2_edac.c b/drivers/edac/highbank_l2_edac.c |
1281 | index c2bd8c6a..10d3d298 100644 |
1282 | --- a/drivers/edac/highbank_l2_edac.c |
1283 | +++ b/drivers/edac/highbank_l2_edac.c |
1284 | @@ -90,28 +90,30 @@ static int highbank_l2_err_probe(struct platform_device *pdev) |
1285 | goto err; |
1286 | } |
1287 | |
1288 | + dci->mod_name = dev_name(&pdev->dev); |
1289 | + dci->dev_name = dev_name(&pdev->dev); |
1290 | + |
1291 | + if (edac_device_add_device(dci)) |
1292 | + goto err; |
1293 | + |
1294 | drvdata->db_irq = platform_get_irq(pdev, 0); |
1295 | res = devm_request_irq(&pdev->dev, drvdata->db_irq, |
1296 | highbank_l2_err_handler, |
1297 | 0, dev_name(&pdev->dev), dci); |
1298 | if (res < 0) |
1299 | - goto err; |
1300 | + goto err2; |
1301 | |
1302 | drvdata->sb_irq = platform_get_irq(pdev, 1); |
1303 | res = devm_request_irq(&pdev->dev, drvdata->sb_irq, |
1304 | highbank_l2_err_handler, |
1305 | 0, dev_name(&pdev->dev), dci); |
1306 | if (res < 0) |
1307 | - goto err; |
1308 | - |
1309 | - dci->mod_name = dev_name(&pdev->dev); |
1310 | - dci->dev_name = dev_name(&pdev->dev); |
1311 | - |
1312 | - if (edac_device_add_device(dci)) |
1313 | - goto err; |
1314 | + goto err2; |
1315 | |
1316 | devres_close_group(&pdev->dev, NULL); |
1317 | return 0; |
1318 | +err2: |
1319 | + edac_device_del_device(&pdev->dev); |
1320 | err: |
1321 | devres_release_group(&pdev->dev, NULL); |
1322 | edac_device_free_ctl_info(dci); |
1323 | diff --git a/drivers/edac/highbank_mc_edac.c b/drivers/edac/highbank_mc_edac.c |
1324 | index 4695dd2d..7a783075 100644 |
1325 | --- a/drivers/edac/highbank_mc_edac.c |
1326 | +++ b/drivers/edac/highbank_mc_edac.c |
1327 | @@ -189,14 +189,6 @@ static int highbank_mc_probe(struct platform_device *pdev) |
1328 | goto err; |
1329 | } |
1330 | |
1331 | - irq = platform_get_irq(pdev, 0); |
1332 | - res = devm_request_irq(&pdev->dev, irq, highbank_mc_err_handler, |
1333 | - 0, dev_name(&pdev->dev), mci); |
1334 | - if (res < 0) { |
1335 | - dev_err(&pdev->dev, "Unable to request irq %d\n", irq); |
1336 | - goto err; |
1337 | - } |
1338 | - |
1339 | mci->mtype_cap = MEM_FLAG_DDR3; |
1340 | mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED; |
1341 | mci->edac_cap = EDAC_FLAG_SECDED; |
1342 | @@ -217,10 +209,20 @@ static int highbank_mc_probe(struct platform_device *pdev) |
1343 | if (res < 0) |
1344 | goto err; |
1345 | |
1346 | + irq = platform_get_irq(pdev, 0); |
1347 | + res = devm_request_irq(&pdev->dev, irq, highbank_mc_err_handler, |
1348 | + 0, dev_name(&pdev->dev), mci); |
1349 | + if (res < 0) { |
1350 | + dev_err(&pdev->dev, "Unable to request irq %d\n", irq); |
1351 | + goto err2; |
1352 | + } |
1353 | + |
1354 | highbank_mc_create_debugfs_nodes(mci); |
1355 | |
1356 | devres_close_group(&pdev->dev, NULL); |
1357 | return 0; |
1358 | +err2: |
1359 | + edac_mc_del_mc(&pdev->dev); |
1360 | err: |
1361 | devres_release_group(&pdev->dev, NULL); |
1362 | edac_mc_free(mci); |
1363 | diff --git a/drivers/gpio/gpio-msm-v2.c b/drivers/gpio/gpio-msm-v2.c |
1364 | index f7a0cc4d..7b373009 100644 |
1365 | --- a/drivers/gpio/gpio-msm-v2.c |
1366 | +++ b/drivers/gpio/gpio-msm-v2.c |
1367 | @@ -102,7 +102,7 @@ struct msm_gpio_dev { |
1368 | DECLARE_BITMAP(wake_irqs, MAX_NR_GPIO); |
1369 | DECLARE_BITMAP(dual_edge_irqs, MAX_NR_GPIO); |
1370 | struct irq_domain *domain; |
1371 | - unsigned int summary_irq; |
1372 | + int summary_irq; |
1373 | void __iomem *msm_tlmm_base; |
1374 | }; |
1375 | |
1376 | diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c |
1377 | index 3c3321f9..db312904 100644 |
1378 | --- a/drivers/gpio/gpio-mvebu.c |
1379 | +++ b/drivers/gpio/gpio-mvebu.c |
1380 | @@ -79,7 +79,7 @@ struct mvebu_gpio_chip { |
1381 | spinlock_t lock; |
1382 | void __iomem *membase; |
1383 | void __iomem *percpu_membase; |
1384 | - unsigned int irqbase; |
1385 | + int irqbase; |
1386 | struct irq_domain *domain; |
1387 | int soc_variant; |
1388 | }; |
1389 | diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c |
1390 | index 4274e2e7..e925ca2e 100644 |
1391 | --- a/drivers/gpio/gpio-pl061.c |
1392 | +++ b/drivers/gpio/gpio-pl061.c |
1393 | @@ -286,11 +286,6 @@ static int pl061_probe(struct amba_device *adev, const struct amba_id *id) |
1394 | if (!chip->base) |
1395 | return -ENOMEM; |
1396 | |
1397 | - chip->domain = irq_domain_add_simple(adev->dev.of_node, PL061_GPIO_NR, |
1398 | - irq_base, &pl061_domain_ops, chip); |
1399 | - if (!chip->domain) |
1400 | - return -ENODEV; |
1401 | - |
1402 | spin_lock_init(&chip->lock); |
1403 | |
1404 | chip->gc.request = pl061_gpio_request; |
1405 | @@ -320,6 +315,11 @@ static int pl061_probe(struct amba_device *adev, const struct amba_id *id) |
1406 | irq_set_chained_handler(irq, pl061_irq_handler); |
1407 | irq_set_handler_data(irq, chip); |
1408 | |
1409 | + chip->domain = irq_domain_add_simple(adev->dev.of_node, PL061_GPIO_NR, |
1410 | + irq_base, &pl061_domain_ops, chip); |
1411 | + if (!chip->domain) |
1412 | + return -ENODEV; |
1413 | + |
1414 | for (i = 0; i < PL061_GPIO_NR; i++) { |
1415 | if (pdata) { |
1416 | if (pdata->directions & (1 << i)) |
1417 | diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c |
1418 | index 6038966a..8f64b670 100644 |
1419 | --- a/drivers/gpio/gpio-rcar.c |
1420 | +++ b/drivers/gpio/gpio-rcar.c |
1421 | @@ -380,7 +380,7 @@ static int gpio_rcar_probe(struct platform_device *pdev) |
1422 | if (!p->irq_domain) { |
1423 | ret = -ENXIO; |
1424 | dev_err(&pdev->dev, "cannot initialize irq domain\n"); |
1425 | - goto err1; |
1426 | + goto err0; |
1427 | } |
1428 | |
1429 | if (devm_request_irq(&pdev->dev, irq->start, |
1430 | diff --git a/drivers/gpio/gpio-twl4030.c b/drivers/gpio/gpio-twl4030.c |
1431 | index d8e4f6ef..db2de1a2 100644 |
1432 | --- a/drivers/gpio/gpio-twl4030.c |
1433 | +++ b/drivers/gpio/gpio-twl4030.c |
1434 | @@ -354,17 +354,18 @@ static void twl_set(struct gpio_chip *chip, unsigned offset, int value) |
1435 | static int twl_direction_out(struct gpio_chip *chip, unsigned offset, int value) |
1436 | { |
1437 | struct gpio_twl4030_priv *priv = to_gpio_twl4030(chip); |
1438 | + int ret = -EINVAL; |
1439 | |
1440 | mutex_lock(&priv->mutex); |
1441 | if (offset < TWL4030_GPIO_MAX) |
1442 | - twl4030_set_gpio_dataout(offset, value); |
1443 | + ret = twl4030_set_gpio_direction(offset, 0); |
1444 | |
1445 | priv->direction |= BIT(offset); |
1446 | mutex_unlock(&priv->mutex); |
1447 | |
1448 | twl_set(chip, offset, value); |
1449 | |
1450 | - return 0; |
1451 | + return ret; |
1452 | } |
1453 | |
1454 | static int twl_to_irq(struct gpio_chip *chip, unsigned offset) |
1455 | diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c |
1456 | index b53fff84..a069b5e2 100644 |
1457 | --- a/drivers/gpu/drm/i915/intel_ddi.c |
1458 | +++ b/drivers/gpu/drm/i915/intel_ddi.c |
1459 | @@ -1285,6 +1285,26 @@ void intel_ddi_get_config(struct intel_encoder *encoder, |
1460 | default: |
1461 | break; |
1462 | } |
1463 | + |
1464 | + if (encoder->type == INTEL_OUTPUT_EDP && dev_priv->vbt.edp_bpp && |
1465 | + pipe_config->pipe_bpp > dev_priv->vbt.edp_bpp) { |
1466 | + /* |
1467 | + * This is a big fat ugly hack. |
1468 | + * |
1469 | + * Some machines in UEFI boot mode provide us a VBT that has 18 |
1470 | + * bpp and 1.62 GHz link bandwidth for eDP, which for reasons |
1471 | + * unknown we fail to light up. Yet the same BIOS boots up with |
1472 | + * 24 bpp and 2.7 GHz link. Use the same bpp as the BIOS uses as |
1473 | + * max, not what it tells us to use. |
1474 | + * |
1475 | + * Note: This will still be broken if the eDP panel is not lit |
1476 | + * up by the BIOS, and thus we can't get the mode at module |
1477 | + * load. |
1478 | + */ |
1479 | + DRM_DEBUG_KMS("pipe has %d bpp for eDP panel, overriding BIOS-provided max %d bpp\n", |
1480 | + pipe_config->pipe_bpp, dev_priv->vbt.edp_bpp); |
1481 | + dev_priv->vbt.edp_bpp = pipe_config->pipe_bpp; |
1482 | + } |
1483 | } |
1484 | |
1485 | static void intel_ddi_destroy(struct drm_encoder *encoder) |
1486 | diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c |
1487 | index d78d33f9..333aa1bc 100644 |
1488 | --- a/drivers/gpu/drm/i915/intel_display.c |
1489 | +++ b/drivers/gpu/drm/i915/intel_display.c |
1490 | @@ -6770,7 +6770,9 @@ static void i9xx_update_cursor(struct drm_crtc *crtc, u32 base) |
1491 | intel_crtc->cursor_visible = visible; |
1492 | } |
1493 | /* and commit changes on next vblank */ |
1494 | + POSTING_READ(CURCNTR(pipe)); |
1495 | I915_WRITE(CURBASE(pipe), base); |
1496 | + POSTING_READ(CURBASE(pipe)); |
1497 | } |
1498 | |
1499 | static void ivb_update_cursor(struct drm_crtc *crtc, u32 base) |
1500 | @@ -6799,7 +6801,9 @@ static void ivb_update_cursor(struct drm_crtc *crtc, u32 base) |
1501 | intel_crtc->cursor_visible = visible; |
1502 | } |
1503 | /* and commit changes on next vblank */ |
1504 | + POSTING_READ(CURCNTR_IVB(pipe)); |
1505 | I915_WRITE(CURBASE_IVB(pipe), base); |
1506 | + POSTING_READ(CURBASE_IVB(pipe)); |
1507 | } |
1508 | |
1509 | /* If no-part of the cursor is visible on the framebuffer, then the GPU may hang... */ |
1510 | diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c |
1511 | index 7fa7df54..922cacc1 100644 |
1512 | --- a/drivers/gpu/drm/i915/intel_dvo.c |
1513 | +++ b/drivers/gpu/drm/i915/intel_dvo.c |
1514 | @@ -171,11 +171,16 @@ static void intel_enable_dvo(struct intel_encoder *encoder) |
1515 | { |
1516 | struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; |
1517 | struct intel_dvo *intel_dvo = enc_to_dvo(encoder); |
1518 | + struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); |
1519 | u32 dvo_reg = intel_dvo->dev.dvo_reg; |
1520 | u32 temp = I915_READ(dvo_reg); |
1521 | |
1522 | I915_WRITE(dvo_reg, temp | DVO_ENABLE); |
1523 | I915_READ(dvo_reg); |
1524 | + intel_dvo->dev.dev_ops->mode_set(&intel_dvo->dev, |
1525 | + &crtc->config.requested_mode, |
1526 | + &crtc->config.adjusted_mode); |
1527 | + |
1528 | intel_dvo->dev.dev_ops->dpms(&intel_dvo->dev, true); |
1529 | } |
1530 | |
1531 | @@ -184,6 +189,7 @@ static void intel_dvo_dpms(struct drm_connector *connector, int mode) |
1532 | { |
1533 | struct intel_dvo *intel_dvo = intel_attached_dvo(connector); |
1534 | struct drm_crtc *crtc; |
1535 | + struct intel_crtc_config *config; |
1536 | |
1537 | /* dvo supports only 2 dpms states. */ |
1538 | if (mode != DRM_MODE_DPMS_ON) |
1539 | @@ -204,10 +210,16 @@ static void intel_dvo_dpms(struct drm_connector *connector, int mode) |
1540 | /* We call connector dpms manually below in case pipe dpms doesn't |
1541 | * change due to cloning. */ |
1542 | if (mode == DRM_MODE_DPMS_ON) { |
1543 | + config = &to_intel_crtc(crtc)->config; |
1544 | + |
1545 | intel_dvo->base.connectors_active = true; |
1546 | |
1547 | intel_crtc_update_dpms(crtc); |
1548 | |
1549 | + intel_dvo->dev.dev_ops->mode_set(&intel_dvo->dev, |
1550 | + &config->requested_mode, |
1551 | + &config->adjusted_mode); |
1552 | + |
1553 | intel_dvo->dev.dev_ops->dpms(&intel_dvo->dev, true); |
1554 | } else { |
1555 | intel_dvo->dev.dev_ops->dpms(&intel_dvo->dev, false); |
1556 | @@ -299,10 +311,6 @@ static void intel_dvo_mode_set(struct intel_encoder *encoder) |
1557 | break; |
1558 | } |
1559 | |
1560 | - intel_dvo->dev.dev_ops->mode_set(&intel_dvo->dev, |
1561 | - &crtc->config.requested_mode, |
1562 | - adjusted_mode); |
1563 | - |
1564 | /* Save the data order, since I don't know what it should be set to. */ |
1565 | dvo_val = I915_READ(dvo_reg) & |
1566 | (DVO_PRESERVE_MASK | DVO_DATA_ORDER_GBRG); |
1567 | diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c |
1568 | index 8649f1c3..ee7d6491 100644 |
1569 | --- a/drivers/gpu/drm/i915/intel_uncore.c |
1570 | +++ b/drivers/gpu/drm/i915/intel_uncore.c |
1571 | @@ -204,6 +204,19 @@ static void vlv_force_wake_put(struct drm_i915_private *dev_priv) |
1572 | gen6_gt_check_fifodbg(dev_priv); |
1573 | } |
1574 | |
1575 | +static void intel_uncore_forcewake_reset(struct drm_device *dev) |
1576 | +{ |
1577 | + struct drm_i915_private *dev_priv = dev->dev_private; |
1578 | + |
1579 | + if (IS_VALLEYVIEW(dev)) { |
1580 | + vlv_force_wake_reset(dev_priv); |
1581 | + } else if (INTEL_INFO(dev)->gen >= 6) { |
1582 | + __gen6_gt_force_wake_reset(dev_priv); |
1583 | + if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev)) |
1584 | + __gen6_gt_force_wake_mt_reset(dev_priv); |
1585 | + } |
1586 | +} |
1587 | + |
1588 | void intel_uncore_early_sanitize(struct drm_device *dev) |
1589 | { |
1590 | struct drm_i915_private *dev_priv = dev->dev_private; |
1591 | @@ -259,19 +272,8 @@ void intel_uncore_init(struct drm_device *dev) |
1592 | dev_priv->uncore.funcs.force_wake_put = |
1593 | __gen6_gt_force_wake_put; |
1594 | } |
1595 | -} |
1596 | |
1597 | -static void intel_uncore_forcewake_reset(struct drm_device *dev) |
1598 | -{ |
1599 | - struct drm_i915_private *dev_priv = dev->dev_private; |
1600 | - |
1601 | - if (IS_VALLEYVIEW(dev)) { |
1602 | - vlv_force_wake_reset(dev_priv); |
1603 | - } else if (INTEL_INFO(dev)->gen >= 6) { |
1604 | - __gen6_gt_force_wake_reset(dev_priv); |
1605 | - if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev)) |
1606 | - __gen6_gt_force_wake_mt_reset(dev_priv); |
1607 | - } |
1608 | + intel_uncore_forcewake_reset(dev); |
1609 | } |
1610 | |
1611 | void intel_uncore_sanitize(struct drm_device *dev) |
1612 | diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c |
1613 | index f32b7123..d2dfdf76 100644 |
1614 | --- a/drivers/gpu/drm/nouveau/nouveau_gem.c |
1615 | +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c |
1616 | @@ -317,7 +317,8 @@ validate_fini_list(struct list_head *list, struct nouveau_fence *fence, |
1617 | list_for_each_safe(entry, tmp, list) { |
1618 | nvbo = list_entry(entry, struct nouveau_bo, entry); |
1619 | |
1620 | - nouveau_bo_fence(nvbo, fence); |
1621 | + if (likely(fence)) |
1622 | + nouveau_bo_fence(nvbo, fence); |
1623 | |
1624 | if (unlikely(nvbo->validate_mapped)) { |
1625 | ttm_bo_kunmap(&nvbo->kmap); |
1626 | diff --git a/drivers/gpu/drm/qxl/qxl_fb.c b/drivers/gpu/drm/qxl/qxl_fb.c |
1627 | index 88722f23..f437b30c 100644 |
1628 | --- a/drivers/gpu/drm/qxl/qxl_fb.c |
1629 | +++ b/drivers/gpu/drm/qxl/qxl_fb.c |
1630 | @@ -108,7 +108,7 @@ static void qxl_fb_dirty_flush(struct fb_info *info) |
1631 | u32 x1, x2, y1, y2; |
1632 | |
1633 | /* TODO: hard coding 32 bpp */ |
1634 | - int stride = qfbdev->qfb.base.pitches[0] * 4; |
1635 | + int stride = qfbdev->qfb.base.pitches[0]; |
1636 | |
1637 | x1 = qfbdev->dirty.x1; |
1638 | x2 = qfbdev->dirty.x2; |
1639 | diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c |
1640 | index 0109a964..821ab7b9 100644 |
1641 | --- a/drivers/gpu/drm/qxl/qxl_release.c |
1642 | +++ b/drivers/gpu/drm/qxl/qxl_release.c |
1643 | @@ -92,6 +92,7 @@ qxl_release_free(struct qxl_device *qdev, |
1644 | - DRM_FILE_OFFSET); |
1645 | qxl_fence_remove_release(&bo->fence, release->id); |
1646 | qxl_bo_unref(&bo); |
1647 | + kfree(entry); |
1648 | } |
1649 | spin_lock(&qdev->release_idr_lock); |
1650 | idr_remove(&qdev->release_idr, release->id); |
1651 | diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c |
1652 | index bf87f6d4..86d9ee08 100644 |
1653 | --- a/drivers/gpu/drm/radeon/atombios_crtc.c |
1654 | +++ b/drivers/gpu/drm/radeon/atombios_crtc.c |
1655 | @@ -1753,7 +1753,7 @@ static int radeon_atom_pick_pll(struct drm_crtc *crtc) |
1656 | if (pll != ATOM_PPLL_INVALID) |
1657 | return pll; |
1658 | } |
1659 | - } else { |
1660 | + } else if (!ASIC_IS_DCE41(rdev)) { /* Don't share PLLs on DCE4.1 chips */ |
1661 | /* use the same PPLL for all monitors with the same clock */ |
1662 | pll = radeon_get_shared_nondp_ppll(crtc); |
1663 | if (pll != ATOM_PPLL_INVALID) |
1664 | diff --git a/drivers/gpu/drm/radeon/atombios_i2c.c b/drivers/gpu/drm/radeon/atombios_i2c.c |
1665 | index deaf98cd..0652ee0a 100644 |
1666 | --- a/drivers/gpu/drm/radeon/atombios_i2c.c |
1667 | +++ b/drivers/gpu/drm/radeon/atombios_i2c.c |
1668 | @@ -56,8 +56,10 @@ static int radeon_process_i2c_ch(struct radeon_i2c_chan *chan, |
1669 | return -EINVAL; |
1670 | } |
1671 | args.ucRegIndex = buf[0]; |
1672 | - if (num > 1) |
1673 | - memcpy(&out, &buf[1], num - 1); |
1674 | + if (num > 1) { |
1675 | + num--; |
1676 | + memcpy(&out, &buf[1], num); |
1677 | + } |
1678 | args.lpI2CDataOut = cpu_to_le16(out); |
1679 | } else { |
1680 | if (num > ATOM_MAX_HW_I2C_READ) { |
1681 | diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c |
1682 | index 8f7e0453..5720e66d 100644 |
1683 | --- a/drivers/gpu/drm/radeon/radeon_asic.c |
1684 | +++ b/drivers/gpu/drm/radeon/radeon_asic.c |
1685 | @@ -2019,6 +2019,8 @@ static struct radeon_asic ci_asic = { |
1686 | .bandwidth_update = &dce8_bandwidth_update, |
1687 | .get_vblank_counter = &evergreen_get_vblank_counter, |
1688 | .wait_for_vblank = &dce4_wait_for_vblank, |
1689 | + .set_backlight_level = &atombios_set_backlight_level, |
1690 | + .get_backlight_level = &atombios_get_backlight_level, |
1691 | .hdmi_enable = &evergreen_hdmi_enable, |
1692 | .hdmi_setmode = &evergreen_hdmi_setmode, |
1693 | }, |
1694 | @@ -2119,6 +2121,8 @@ static struct radeon_asic kv_asic = { |
1695 | .bandwidth_update = &dce8_bandwidth_update, |
1696 | .get_vblank_counter = &evergreen_get_vblank_counter, |
1697 | .wait_for_vblank = &dce4_wait_for_vblank, |
1698 | + .set_backlight_level = &atombios_set_backlight_level, |
1699 | + .get_backlight_level = &atombios_get_backlight_level, |
1700 | .hdmi_enable = &evergreen_hdmi_enable, |
1701 | .hdmi_setmode = &evergreen_hdmi_setmode, |
1702 | }, |
1703 | diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c |
1704 | index b990b1a2..3b1de72b 100644 |
1705 | --- a/drivers/gpu/drm/radeon/radeon_gart.c |
1706 | +++ b/drivers/gpu/drm/radeon/radeon_gart.c |
1707 | @@ -1156,6 +1156,8 @@ int radeon_vm_bo_update_pte(struct radeon_device *rdev, |
1708 | return -ENOMEM; |
1709 | |
1710 | r = radeon_ib_get(rdev, ridx, &ib, NULL, ndw * 4); |
1711 | + if (r) |
1712 | + return r; |
1713 | ib.length_dw = 0; |
1714 | |
1715 | r = radeon_vm_update_pdes(rdev, vm, &ib, bo_va->soffset, bo_va->eoffset); |
1716 | diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c |
1717 | index 7cb178a3..bc73021d 100644 |
1718 | --- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c |
1719 | +++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c |
1720 | @@ -422,6 +422,7 @@ int radeon_crtc_do_set_base(struct drm_crtc *crtc, |
1721 | /* Pin framebuffer & get tilling informations */ |
1722 | obj = radeon_fb->obj; |
1723 | rbo = gem_to_radeon_bo(obj); |
1724 | +retry: |
1725 | r = radeon_bo_reserve(rbo, false); |
1726 | if (unlikely(r != 0)) |
1727 | return r; |
1728 | @@ -430,6 +431,33 @@ int radeon_crtc_do_set_base(struct drm_crtc *crtc, |
1729 | &base); |
1730 | if (unlikely(r != 0)) { |
1731 | radeon_bo_unreserve(rbo); |
1732 | + |
1733 | + /* On old GPU like RN50 with little vram pining can fails because |
1734 | + * current fb is taking all space needed. So instead of unpining |
1735 | + * the old buffer after pining the new one, first unpin old one |
1736 | + * and then retry pining new one. |
1737 | + * |
1738 | + * As only master can set mode only master can pin and it is |
1739 | + * unlikely the master client will race with itself especialy |
1740 | + * on those old gpu with single crtc. |
1741 | + * |
1742 | + * We don't shutdown the display controller because new buffer |
1743 | + * will end up in same spot. |
1744 | + */ |
1745 | + if (!atomic && fb && fb != crtc->fb) { |
1746 | + struct radeon_bo *old_rbo; |
1747 | + unsigned long nsize, osize; |
1748 | + |
1749 | + old_rbo = gem_to_radeon_bo(to_radeon_framebuffer(fb)->obj); |
1750 | + osize = radeon_bo_size(old_rbo); |
1751 | + nsize = radeon_bo_size(rbo); |
1752 | + if (nsize <= osize && !radeon_bo_reserve(old_rbo, false)) { |
1753 | + radeon_bo_unpin(old_rbo); |
1754 | + radeon_bo_unreserve(old_rbo); |
1755 | + fb = NULL; |
1756 | + goto retry; |
1757 | + } |
1758 | + } |
1759 | return -EINVAL; |
1760 | } |
1761 | radeon_bo_get_tiling_flags(rbo, &tiling_flags, NULL); |
1762 | diff --git a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeon/radeon_uvd.c |
1763 | index 308eff5b..ab0a1724 100644 |
1764 | --- a/drivers/gpu/drm/radeon/radeon_uvd.c |
1765 | +++ b/drivers/gpu/drm/radeon/radeon_uvd.c |
1766 | @@ -240,6 +240,8 @@ void radeon_uvd_free_handles(struct radeon_device *rdev, struct drm_file *filp) |
1767 | if (handle != 0 && rdev->uvd.filp[i] == filp) { |
1768 | struct radeon_fence *fence; |
1769 | |
1770 | + radeon_uvd_note_usage(rdev); |
1771 | + |
1772 | r = radeon_uvd_get_destroy_msg(rdev, |
1773 | R600_RING_TYPE_UVD_INDEX, handle, &fence); |
1774 | if (r) { |
1775 | @@ -620,7 +622,7 @@ static int radeon_uvd_send_msg(struct radeon_device *rdev, |
1776 | if (r) |
1777 | goto err; |
1778 | |
1779 | - r = radeon_ib_get(rdev, ring, &ib, NULL, 16); |
1780 | + r = radeon_ib_get(rdev, ring, &ib, NULL, 64); |
1781 | if (r) |
1782 | goto err; |
1783 | |
1784 | diff --git a/drivers/gpu/drm/radeon/sid.h b/drivers/gpu/drm/radeon/sid.h |
1785 | index 7e2e0ea6..6e23019c 100644 |
1786 | --- a/drivers/gpu/drm/radeon/sid.h |
1787 | +++ b/drivers/gpu/drm/radeon/sid.h |
1788 | @@ -478,7 +478,7 @@ |
1789 | #define STATE3_MASK (0x1f << 15) |
1790 | #define STATE3_SHIFT 15 |
1791 | |
1792 | -#define MC_SEQ_TRAIN_WAKEUP_CNTL 0x2808 |
1793 | +#define MC_SEQ_TRAIN_WAKEUP_CNTL 0x28e8 |
1794 | #define TRAIN_DONE_D0 (1 << 30) |
1795 | #define TRAIN_DONE_D1 (1 << 31) |
1796 | |
1797 | diff --git a/drivers/gpu/drm/radeon/trinity_dpm.c b/drivers/gpu/drm/radeon/trinity_dpm.c |
1798 | index 9364129b..d700698a 100644 |
1799 | --- a/drivers/gpu/drm/radeon/trinity_dpm.c |
1800 | +++ b/drivers/gpu/drm/radeon/trinity_dpm.c |
1801 | @@ -1873,9 +1873,9 @@ int trinity_dpm_init(struct radeon_device *rdev) |
1802 | pi->enable_sclk_ds = true; |
1803 | pi->enable_gfx_power_gating = true; |
1804 | pi->enable_gfx_clock_gating = true; |
1805 | - pi->enable_mg_clock_gating = true; |
1806 | - pi->enable_gfx_dynamic_mgpg = true; /* ??? */ |
1807 | - pi->override_dynamic_mgpg = true; |
1808 | + pi->enable_mg_clock_gating = false; |
1809 | + pi->enable_gfx_dynamic_mgpg = false; |
1810 | + pi->override_dynamic_mgpg = false; |
1811 | pi->enable_auto_thermal_throttling = true; |
1812 | pi->voltage_drop_in_dce = false; /* need to restructure dpm/modeset interaction */ |
1813 | pi->uvd_dpm = true; /* ??? */ |
1814 | diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c |
1815 | index f1a857ec..72980532 100644 |
1816 | --- a/drivers/gpu/drm/ttm/ttm_bo.c |
1817 | +++ b/drivers/gpu/drm/ttm/ttm_bo.c |
1818 | @@ -986,24 +986,32 @@ out_unlock: |
1819 | return ret; |
1820 | } |
1821 | |
1822 | -static int ttm_bo_mem_compat(struct ttm_placement *placement, |
1823 | - struct ttm_mem_reg *mem) |
1824 | +static bool ttm_bo_mem_compat(struct ttm_placement *placement, |
1825 | + struct ttm_mem_reg *mem, |
1826 | + uint32_t *new_flags) |
1827 | { |
1828 | int i; |
1829 | |
1830 | if (mem->mm_node && placement->lpfn != 0 && |
1831 | (mem->start < placement->fpfn || |
1832 | mem->start + mem->num_pages > placement->lpfn)) |
1833 | - return -1; |
1834 | + return false; |
1835 | |
1836 | for (i = 0; i < placement->num_placement; i++) { |
1837 | - if ((placement->placement[i] & mem->placement & |
1838 | - TTM_PL_MASK_CACHING) && |
1839 | - (placement->placement[i] & mem->placement & |
1840 | - TTM_PL_MASK_MEM)) |
1841 | - return i; |
1842 | + *new_flags = placement->placement[i]; |
1843 | + if ((*new_flags & mem->placement & TTM_PL_MASK_CACHING) && |
1844 | + (*new_flags & mem->placement & TTM_PL_MASK_MEM)) |
1845 | + return true; |
1846 | + } |
1847 | + |
1848 | + for (i = 0; i < placement->num_busy_placement; i++) { |
1849 | + *new_flags = placement->busy_placement[i]; |
1850 | + if ((*new_flags & mem->placement & TTM_PL_MASK_CACHING) && |
1851 | + (*new_flags & mem->placement & TTM_PL_MASK_MEM)) |
1852 | + return true; |
1853 | } |
1854 | - return -1; |
1855 | + |
1856 | + return false; |
1857 | } |
1858 | |
1859 | int ttm_bo_validate(struct ttm_buffer_object *bo, |
1860 | @@ -1012,6 +1020,7 @@ int ttm_bo_validate(struct ttm_buffer_object *bo, |
1861 | bool no_wait_gpu) |
1862 | { |
1863 | int ret; |
1864 | + uint32_t new_flags; |
1865 | |
1866 | lockdep_assert_held(&bo->resv->lock.base); |
1867 | /* Check that range is valid */ |
1868 | @@ -1022,8 +1031,7 @@ int ttm_bo_validate(struct ttm_buffer_object *bo, |
1869 | /* |
1870 | * Check whether we need to move buffer. |
1871 | */ |
1872 | - ret = ttm_bo_mem_compat(placement, &bo->mem); |
1873 | - if (ret < 0) { |
1874 | + if (!ttm_bo_mem_compat(placement, &bo->mem, &new_flags)) { |
1875 | ret = ttm_bo_move_buffer(bo, placement, interruptible, |
1876 | no_wait_gpu); |
1877 | if (ret) |
1878 | @@ -1033,7 +1041,7 @@ int ttm_bo_validate(struct ttm_buffer_object *bo, |
1879 | * Use the access and other non-mapping-related flag bits from |
1880 | * the compatible memory placement flags to the active flags |
1881 | */ |
1882 | - ttm_flag_masked(&bo->mem.placement, placement->placement[ret], |
1883 | + ttm_flag_masked(&bo->mem.placement, new_flags, |
1884 | ~TTM_PL_MASK_MEMTYPE); |
1885 | } |
1886 | /* |
1887 | diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c |
1888 | index 7cc904d3..4834c463 100644 |
1889 | --- a/drivers/gpu/drm/ttm/ttm_bo_util.c |
1890 | +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c |
1891 | @@ -343,19 +343,25 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo, |
1892 | if (ret) |
1893 | goto out; |
1894 | |
1895 | + /* |
1896 | + * Single TTM move. NOP. |
1897 | + */ |
1898 | if (old_iomap == NULL && new_iomap == NULL) |
1899 | goto out2; |
1900 | + |
1901 | + /* |
1902 | + * Move nonexistent data. NOP. |
1903 | + */ |
1904 | if (old_iomap == NULL && ttm == NULL) |
1905 | goto out2; |
1906 | |
1907 | - if (ttm->state == tt_unpopulated) { |
1908 | + /* |
1909 | + * TTM might be null for moves within the same region. |
1910 | + */ |
1911 | + if (ttm && ttm->state == tt_unpopulated) { |
1912 | ret = ttm->bdev->driver->ttm_tt_populate(ttm); |
1913 | - if (ret) { |
1914 | - /* if we fail here don't nuke the mm node |
1915 | - * as the bo still owns it */ |
1916 | - old_copy.mm_node = NULL; |
1917 | + if (ret) |
1918 | goto out1; |
1919 | - } |
1920 | } |
1921 | |
1922 | add = 0; |
1923 | @@ -381,11 +387,8 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo, |
1924 | prot); |
1925 | } else |
1926 | ret = ttm_copy_io_page(new_iomap, old_iomap, page); |
1927 | - if (ret) { |
1928 | - /* failing here, means keep old copy as-is */ |
1929 | - old_copy.mm_node = NULL; |
1930 | + if (ret) |
1931 | goto out1; |
1932 | - } |
1933 | } |
1934 | mb(); |
1935 | out2: |
1936 | @@ -403,7 +406,12 @@ out1: |
1937 | ttm_mem_reg_iounmap(bdev, old_mem, new_iomap); |
1938 | out: |
1939 | ttm_mem_reg_iounmap(bdev, &old_copy, old_iomap); |
1940 | - ttm_bo_mem_put(bo, &old_copy); |
1941 | + |
1942 | + /* |
1943 | + * On error, keep the mm node! |
1944 | + */ |
1945 | + if (!ret) |
1946 | + ttm_bo_mem_put(bo, &old_copy); |
1947 | return ret; |
1948 | } |
1949 | EXPORT_SYMBOL(ttm_bo_move_memcpy); |
1950 | diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c |
1951 | index 37fb4bef..252501a5 100644 |
1952 | --- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c |
1953 | +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c |
1954 | @@ -32,6 +32,8 @@ |
1955 | #include <drm/drmP.h> |
1956 | #include "vmwgfx_resource_priv.h" |
1957 | |
1958 | +#define VMW_RES_EVICT_ERR_COUNT 10 |
1959 | + |
1960 | struct vmw_user_dma_buffer { |
1961 | struct ttm_base_object base; |
1962 | struct vmw_dma_buffer dma; |
1963 | @@ -1091,8 +1093,9 @@ vmw_resource_backoff_reservation(struct ww_acquire_ctx *ticket, |
1964 | * to a backup buffer. |
1965 | * |
1966 | * @res: The resource to evict. |
1967 | + * @interruptible: Whether to wait interruptible. |
1968 | */ |
1969 | -int vmw_resource_do_evict(struct vmw_resource *res) |
1970 | +int vmw_resource_do_evict(struct vmw_resource *res, bool interruptible) |
1971 | { |
1972 | struct ttm_validate_buffer val_buf; |
1973 | const struct vmw_res_func *func = res->func; |
1974 | @@ -1102,7 +1105,8 @@ int vmw_resource_do_evict(struct vmw_resource *res) |
1975 | BUG_ON(!func->may_evict); |
1976 | |
1977 | val_buf.bo = NULL; |
1978 | - ret = vmw_resource_check_buffer(res, &ticket, true, &val_buf); |
1979 | + ret = vmw_resource_check_buffer(res, &ticket, interruptible, |
1980 | + &val_buf); |
1981 | if (unlikely(ret != 0)) |
1982 | return ret; |
1983 | |
1984 | @@ -1141,6 +1145,7 @@ int vmw_resource_validate(struct vmw_resource *res) |
1985 | struct vmw_private *dev_priv = res->dev_priv; |
1986 | struct list_head *lru_list = &dev_priv->res_lru[res->func->res_type]; |
1987 | struct ttm_validate_buffer val_buf; |
1988 | + unsigned err_count = 0; |
1989 | |
1990 | if (likely(!res->func->may_evict)) |
1991 | return 0; |
1992 | @@ -1155,7 +1160,7 @@ int vmw_resource_validate(struct vmw_resource *res) |
1993 | |
1994 | write_lock(&dev_priv->resource_lock); |
1995 | if (list_empty(lru_list) || !res->func->may_evict) { |
1996 | - DRM_ERROR("Out of device device id entries " |
1997 | + DRM_ERROR("Out of device device resources " |
1998 | "for %s.\n", res->func->type_name); |
1999 | ret = -EBUSY; |
2000 | write_unlock(&dev_priv->resource_lock); |
2001 | @@ -1168,7 +1173,19 @@ int vmw_resource_validate(struct vmw_resource *res) |
2002 | list_del_init(&evict_res->lru_head); |
2003 | |
2004 | write_unlock(&dev_priv->resource_lock); |
2005 | - vmw_resource_do_evict(evict_res); |
2006 | + |
2007 | + ret = vmw_resource_do_evict(evict_res, true); |
2008 | + if (unlikely(ret != 0)) { |
2009 | + write_lock(&dev_priv->resource_lock); |
2010 | + list_add_tail(&evict_res->lru_head, lru_list); |
2011 | + write_unlock(&dev_priv->resource_lock); |
2012 | + if (ret == -ERESTARTSYS || |
2013 | + ++err_count > VMW_RES_EVICT_ERR_COUNT) { |
2014 | + vmw_resource_unreference(&evict_res); |
2015 | + goto out_no_validate; |
2016 | + } |
2017 | + } |
2018 | + |
2019 | vmw_resource_unreference(&evict_res); |
2020 | } while (1); |
2021 | |
2022 | @@ -1253,13 +1270,15 @@ bool vmw_resource_needs_backup(const struct vmw_resource *res) |
2023 | * @type: The resource type to evict |
2024 | * |
2025 | * To avoid thrashing starvation or as part of the hibernation sequence, |
2026 | - * evict all evictable resources of a specific type. |
2027 | + * try to evict all evictable resources of a specific type. |
2028 | */ |
2029 | static void vmw_resource_evict_type(struct vmw_private *dev_priv, |
2030 | enum vmw_res_type type) |
2031 | { |
2032 | struct list_head *lru_list = &dev_priv->res_lru[type]; |
2033 | struct vmw_resource *evict_res; |
2034 | + unsigned err_count = 0; |
2035 | + int ret; |
2036 | |
2037 | do { |
2038 | write_lock(&dev_priv->resource_lock); |
2039 | @@ -1272,7 +1291,18 @@ static void vmw_resource_evict_type(struct vmw_private *dev_priv, |
2040 | lru_head)); |
2041 | list_del_init(&evict_res->lru_head); |
2042 | write_unlock(&dev_priv->resource_lock); |
2043 | - vmw_resource_do_evict(evict_res); |
2044 | + |
2045 | + ret = vmw_resource_do_evict(evict_res, false); |
2046 | + if (unlikely(ret != 0)) { |
2047 | + write_lock(&dev_priv->resource_lock); |
2048 | + list_add_tail(&evict_res->lru_head, lru_list); |
2049 | + write_unlock(&dev_priv->resource_lock); |
2050 | + if (++err_count > VMW_RES_EVICT_ERR_COUNT) { |
2051 | + vmw_resource_unreference(&evict_res); |
2052 | + return; |
2053 | + } |
2054 | + } |
2055 | + |
2056 | vmw_resource_unreference(&evict_res); |
2057 | } while (1); |
2058 | |
2059 | diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig |
2060 | index c91d5471..1fc15699 100644 |
2061 | --- a/drivers/hid/Kconfig |
2062 | +++ b/drivers/hid/Kconfig |
2063 | @@ -242,6 +242,7 @@ config HID_HOLTEK |
2064 | - Tracer Sniper TRM-503 / NOVA Gaming Slider X200 / |
2065 | Zalman ZM-GM1 |
2066 | - SHARKOON DarkGlider Gaming mouse |
2067 | + - LEETGION Hellion Gaming Mouse |
2068 | |
2069 | config HOLTEK_FF |
2070 | bool "Holtek On Line Grip force feedback support" |
2071 | @@ -369,12 +370,14 @@ config LOGITECH_FF |
2072 | force feedback. |
2073 | |
2074 | config LOGIRUMBLEPAD2_FF |
2075 | - bool "Logitech RumblePad/Rumblepad 2 force feedback support" |
2076 | + bool "Logitech force feedback support (variant 2)" |
2077 | depends on HID_LOGITECH |
2078 | select INPUT_FF_MEMLESS |
2079 | help |
2080 | - Say Y here if you want to enable force feedback support for Logitech |
2081 | - RumblePad and Rumblepad 2 devices. |
2082 | + Say Y here if you want to enable force feedback support for: |
2083 | + - Logitech RumblePad |
2084 | + - Logitech Rumblepad 2 |
2085 | + - Logitech Formula Vibration Feedback Wheel |
2086 | |
2087 | config LOGIG940_FF |
2088 | bool "Logitech Flight System G940 force feedback support" |
2089 | @@ -453,9 +456,11 @@ config HID_MULTITOUCH |
2090 | - Pixcir dual touch panels |
2091 | - Quanta panels |
2092 | - eGalax dual-touch panels, including the Joojoo and Wetab tablets |
2093 | + - SiS multitouch panels |
2094 | - Stantum multitouch panels |
2095 | - Touch International Panels |
2096 | - Unitec Panels |
2097 | + - Wistron optical touch panels |
2098 | - XAT optical touch panels |
2099 | - Xiroku optical touch panels |
2100 | - Zytronic touch panels |
2101 | diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c |
2102 | index 881cf7b4..3b219b95 100644 |
2103 | --- a/drivers/hid/hid-apple.c |
2104 | +++ b/drivers/hid/hid-apple.c |
2105 | @@ -46,6 +46,12 @@ module_param(iso_layout, uint, 0644); |
2106 | MODULE_PARM_DESC(iso_layout, "Enable/Disable hardcoded ISO-layout of the keyboard. " |
2107 | "(0 = disabled, [1] = enabled)"); |
2108 | |
2109 | +static unsigned int swap_opt_cmd = 0; |
2110 | +module_param(swap_opt_cmd, uint, 0644); |
2111 | +MODULE_PARM_DESC(swap_opt_cmd, "Swap the Option (\"Alt\") and Command (\"Flag\") keys. " |
2112 | + "(For people who want to keep Windows PC keyboard muscle memory. " |
2113 | + "[0] = as-is, Mac layout. 1 = swapped, Windows layout.)"); |
2114 | + |
2115 | struct apple_sc { |
2116 | unsigned long quirks; |
2117 | unsigned int fn_on; |
2118 | @@ -150,6 +156,14 @@ static const struct apple_key_translation apple_iso_keyboard[] = { |
2119 | { } |
2120 | }; |
2121 | |
2122 | +static const struct apple_key_translation swapped_option_cmd_keys[] = { |
2123 | + { KEY_LEFTALT, KEY_LEFTMETA }, |
2124 | + { KEY_LEFTMETA, KEY_LEFTALT }, |
2125 | + { KEY_RIGHTALT, KEY_RIGHTMETA }, |
2126 | + { KEY_RIGHTMETA,KEY_RIGHTALT }, |
2127 | + { } |
2128 | +}; |
2129 | + |
2130 | static const struct apple_key_translation *apple_find_translation( |
2131 | const struct apple_key_translation *table, u16 from) |
2132 | { |
2133 | @@ -242,6 +256,14 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, |
2134 | } |
2135 | } |
2136 | |
2137 | + if (swap_opt_cmd) { |
2138 | + trans = apple_find_translation(swapped_option_cmd_keys, usage->code); |
2139 | + if (trans) { |
2140 | + input_event(input, usage->type, trans->to, value); |
2141 | + return 1; |
2142 | + } |
2143 | + } |
2144 | + |
2145 | return 0; |
2146 | } |
2147 | |
2148 | diff --git a/drivers/hid/hid-axff.c b/drivers/hid/hid-axff.c |
2149 | index 64ab94a5..a594e478 100644 |
2150 | --- a/drivers/hid/hid-axff.c |
2151 | +++ b/drivers/hid/hid-axff.c |
2152 | @@ -95,7 +95,7 @@ static int axff_init(struct hid_device *hid) |
2153 | } |
2154 | } |
2155 | |
2156 | - if (field_count < 4) { |
2157 | + if (field_count < 4 && hid->product != 0xf705) { |
2158 | hid_err(hid, "not enough fields in the report: %d\n", |
2159 | field_count); |
2160 | return -ENODEV; |
2161 | @@ -180,6 +180,7 @@ static void ax_remove(struct hid_device *hdev) |
2162 | |
2163 | static const struct hid_device_id ax_devices[] = { |
2164 | { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802), }, |
2165 | + { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0xf705), }, |
2166 | { } |
2167 | }; |
2168 | MODULE_DEVICE_TABLE(hid, ax_devices); |
2169 | diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c |
2170 | index e80da623..c08b5c14 100644 |
2171 | --- a/drivers/hid/hid-core.c |
2172 | +++ b/drivers/hid/hid-core.c |
2173 | @@ -1605,6 +1605,7 @@ static const struct hid_device_id hid_have_special_driver[] = { |
2174 | { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) }, |
2175 | { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_RP_649) }, |
2176 | { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) }, |
2177 | + { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0xf705) }, |
2178 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) }, |
2179 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICMOUSE) }, |
2180 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICTRACKPAD) }, |
2181 | @@ -1716,6 +1717,7 @@ static const struct hid_device_id hid_have_special_driver[] = { |
2182 | { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD) }, |
2183 | { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A) }, |
2184 | { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067) }, |
2185 | + { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A072) }, |
2186 | { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081) }, |
2187 | { HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_580) }, |
2188 | { HID_USB_DEVICE(USB_VENDOR_ID_JESS2, USB_DEVICE_ID_JESS2_COLOR_RUMBLE_PAD) }, |
2189 | @@ -1754,6 +1756,7 @@ static const struct hid_device_id hid_have_special_driver[] = { |
2190 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_FLIGHT_SYSTEM_G940) }, |
2191 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL) }, |
2192 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2) }, |
2193 | + { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_VIBRATION_WHEEL) }, |
2194 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_DFP_WHEEL) }, |
2195 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_DFGT_WHEEL) }, |
2196 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL) }, |
2197 | @@ -1801,12 +1804,14 @@ static const struct hid_device_id hid_have_special_driver[] = { |
2198 | { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) }, |
2199 | { HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_KEYBOARD) }, |
2200 | #if IS_ENABLED(CONFIG_HID_ROCCAT) |
2201 | - { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONE) }, |
2202 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_ARVO) }, |
2203 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_ISKU) }, |
2204 | + { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_ISKUFX) }, |
2205 | + { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONE) }, |
2206 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONEPLUS) }, |
2207 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONEPURE) }, |
2208 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONEPURE_OPTICAL) }, |
2209 | + { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONEXTD) }, |
2210 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KOVAPLUS) }, |
2211 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_LUA) }, |
2212 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_PYRA_WIRED) }, |
2213 | @@ -1816,6 +1821,8 @@ static const struct hid_device_id hid_have_special_driver[] = { |
2214 | { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_PS1000) }, |
2215 | { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) }, |
2216 | { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) }, |
2217 | + { HID_USB_DEVICE(USB_VENDOR_ID_SIS2_TOUCH, USB_DEVICE_ID_SIS9200_TOUCH) }, |
2218 | + { HID_USB_DEVICE(USB_VENDOR_ID_SIS2_TOUCH, USB_DEVICE_ID_SIS817_TOUCH) }, |
2219 | { HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) }, |
2220 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_BUZZ_CONTROLLER) }, |
2221 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER) }, |
2222 | @@ -2376,15 +2383,6 @@ bool hid_ignore(struct hid_device *hdev) |
2223 | hdev->type == HID_TYPE_USBNONE) |
2224 | return true; |
2225 | break; |
2226 | - case USB_VENDOR_ID_DWAV: |
2227 | - /* These are handled by usbtouchscreen. hdev->type is probably |
2228 | - * HID_TYPE_USBNONE, but we say !HID_TYPE_USBMOUSE to match |
2229 | - * usbtouchscreen. */ |
2230 | - if ((hdev->product == USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER || |
2231 | - hdev->product == USB_DEVICE_ID_DWAV_TOUCHCONTROLLER) && |
2232 | - hdev->type != HID_TYPE_USBMOUSE) |
2233 | - return true; |
2234 | - break; |
2235 | case USB_VENDOR_ID_VELLEMAN: |
2236 | /* These are not HID devices. They are handled by comedi. */ |
2237 | if ((hdev->product >= USB_DEVICE_ID_VELLEMAN_K8055_FIRST && |
2238 | diff --git a/drivers/hid/hid-holtek-mouse.c b/drivers/hid/hid-holtek-mouse.c |
2239 | index e696566c..0caa676d 100644 |
2240 | --- a/drivers/hid/hid-holtek-mouse.c |
2241 | +++ b/drivers/hid/hid-holtek-mouse.c |
2242 | @@ -28,6 +28,7 @@ |
2243 | * - USB ID 04d9:a04a, sold as Tracer Sniper TRM-503, NOVA Gaming Slider X200 |
2244 | * and Zalman ZM-GM1 |
2245 | * - USB ID 04d9:a081, sold as SHARKOON DarkGlider Gaming mouse |
2246 | + * - USB ID 04d9:a072, sold as LEETGION Hellion Gaming Mouse |
2247 | */ |
2248 | |
2249 | static __u8 *holtek_mouse_report_fixup(struct hid_device *hdev, __u8 *rdesc, |
2250 | @@ -40,6 +41,7 @@ static __u8 *holtek_mouse_report_fixup(struct hid_device *hdev, __u8 *rdesc, |
2251 | * 0x2fff, so they don't exceed HID_MAX_USAGES */ |
2252 | switch (hdev->product) { |
2253 | case USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067: |
2254 | + case USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A072: |
2255 | if (*rsize >= 122 && rdesc[115] == 0xff && rdesc[116] == 0x7f |
2256 | && rdesc[120] == 0xff && rdesc[121] == 0x7f) { |
2257 | hid_info(hdev, "Fixing up report descriptor\n"); |
2258 | @@ -66,6 +68,8 @@ static const struct hid_device_id holtek_mouse_devices[] = { |
2259 | { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, |
2260 | USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A) }, |
2261 | { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, |
2262 | + USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A072) }, |
2263 | + { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, |
2264 | USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081) }, |
2265 | { } |
2266 | }; |
2267 | diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h |
2268 | index f0296a50..9480b425 100644 |
2269 | --- a/drivers/hid/hid-ids.h |
2270 | +++ b/drivers/hid/hid-ids.h |
2271 | @@ -332,6 +332,11 @@ |
2272 | #define USB_VENDOR_ID_GENERAL_TOUCH 0x0dfc |
2273 | #define USB_DEVICE_ID_GENERAL_TOUCH_WIN7_TWOFINGERS 0x0003 |
2274 | #define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PWT_TENFINGERS 0x0100 |
2275 | +#define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_0101 0x0101 |
2276 | +#define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_0102 0x0102 |
2277 | +#define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_0106 0x0106 |
2278 | +#define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_010A 0x010a |
2279 | +#define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_E100 0xe100 |
2280 | |
2281 | #define USB_VENDOR_ID_GLAB 0x06c2 |
2282 | #define USB_DEVICE_ID_4_PHIDGETSERVO_30 0x0038 |
2283 | @@ -448,8 +453,9 @@ |
2284 | |
2285 | #define USB_VENDOR_ID_HOLTEK_ALT 0x04d9 |
2286 | #define USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD 0xa055 |
2287 | -#define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067 0xa067 |
2288 | #define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A 0xa04a |
2289 | +#define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067 0xa067 |
2290 | +#define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A072 0xa072 |
2291 | #define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081 0xa081 |
2292 | |
2293 | #define USB_VENDOR_ID_IMATION 0x0718 |
2294 | @@ -571,6 +577,7 @@ |
2295 | #define USB_DEVICE_ID_DINOVO_EDGE 0xc714 |
2296 | #define USB_DEVICE_ID_DINOVO_MINI 0xc71f |
2297 | #define USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2 0xca03 |
2298 | +#define USB_DEVICE_ID_LOGITECH_VIBRATION_WHEEL 0xca04 |
2299 | |
2300 | #define USB_VENDOR_ID_LUMIO 0x202e |
2301 | #define USB_DEVICE_ID_CRYSTALTOUCH 0x0006 |
2302 | @@ -745,6 +752,10 @@ |
2303 | #define USB_VENDOR_ID_SIGMATEL 0x066F |
2304 | #define USB_DEVICE_ID_SIGMATEL_STMP3780 0x3780 |
2305 | |
2306 | +#define USB_VENDOR_ID_SIS2_TOUCH 0x0457 |
2307 | +#define USB_DEVICE_ID_SIS9200_TOUCH 0x9200 |
2308 | +#define USB_DEVICE_ID_SIS817_TOUCH 0x0817 |
2309 | + |
2310 | #define USB_VENDOR_ID_SKYCABLE 0x1223 |
2311 | #define USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER 0x3F07 |
2312 | |
2313 | @@ -888,6 +899,9 @@ |
2314 | #define USB_DEVICE_ID_SUPER_DUAL_BOX_PRO 0x8802 |
2315 | #define USB_DEVICE_ID_SUPER_JOY_BOX_5_PRO 0x8804 |
2316 | |
2317 | +#define USB_VENDOR_ID_WISTRON 0x0fb8 |
2318 | +#define USB_DEVICE_ID_WISTRON_OPTICAL_TOUCH 0x1109 |
2319 | + |
2320 | #define USB_VENDOR_ID_X_TENSIONS 0x1ae7 |
2321 | #define USB_DEVICE_ID_SPEEDLINK_VAD_CEZANNE 0x9001 |
2322 | |
2323 | diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c |
2324 | index 6f12ecd3..1bfd292c 100644 |
2325 | --- a/drivers/hid/hid-lg.c |
2326 | +++ b/drivers/hid/hid-lg.c |
2327 | @@ -45,6 +45,7 @@ |
2328 | /* Size of the original descriptors of the Driving Force (and Pro) wheels */ |
2329 | #define DF_RDESC_ORIG_SIZE 130 |
2330 | #define DFP_RDESC_ORIG_SIZE 97 |
2331 | +#define FV_RDESC_ORIG_SIZE 130 |
2332 | #define MOMO_RDESC_ORIG_SIZE 87 |
2333 | |
2334 | /* Fixed report descriptors for Logitech Driving Force (and Pro) |
2335 | @@ -170,6 +171,73 @@ static __u8 dfp_rdesc_fixed[] = { |
2336 | 0xC0 /* End Collection */ |
2337 | }; |
2338 | |
2339 | +static __u8 fv_rdesc_fixed[] = { |
2340 | +0x05, 0x01, /* Usage Page (Desktop), */ |
2341 | +0x09, 0x04, /* Usage (Joystik), */ |
2342 | +0xA1, 0x01, /* Collection (Application), */ |
2343 | +0xA1, 0x02, /* Collection (Logical), */ |
2344 | +0x95, 0x01, /* Report Count (1), */ |
2345 | +0x75, 0x0A, /* Report Size (10), */ |
2346 | +0x15, 0x00, /* Logical Minimum (0), */ |
2347 | +0x26, 0xFF, 0x03, /* Logical Maximum (1023), */ |
2348 | +0x35, 0x00, /* Physical Minimum (0), */ |
2349 | +0x46, 0xFF, 0x03, /* Physical Maximum (1023), */ |
2350 | +0x09, 0x30, /* Usage (X), */ |
2351 | +0x81, 0x02, /* Input (Variable), */ |
2352 | +0x95, 0x0C, /* Report Count (12), */ |
2353 | +0x75, 0x01, /* Report Size (1), */ |
2354 | +0x25, 0x01, /* Logical Maximum (1), */ |
2355 | +0x45, 0x01, /* Physical Maximum (1), */ |
2356 | +0x05, 0x09, /* Usage Page (Button), */ |
2357 | +0x19, 0x01, /* Usage Minimum (01h), */ |
2358 | +0x29, 0x0C, /* Usage Maximum (0Ch), */ |
2359 | +0x81, 0x02, /* Input (Variable), */ |
2360 | +0x95, 0x02, /* Report Count (2), */ |
2361 | +0x06, 0x00, 0xFF, /* Usage Page (FF00h), */ |
2362 | +0x09, 0x01, /* Usage (01h), */ |
2363 | +0x81, 0x02, /* Input (Variable), */ |
2364 | +0x09, 0x02, /* Usage (02h), */ |
2365 | +0x26, 0xFF, 0x00, /* Logical Maximum (255), */ |
2366 | +0x46, 0xFF, 0x00, /* Physical Maximum (255), */ |
2367 | +0x95, 0x01, /* Report Count (1), */ |
2368 | +0x75, 0x08, /* Report Size (8), */ |
2369 | +0x81, 0x02, /* Input (Variable), */ |
2370 | +0x05, 0x01, /* Usage Page (Desktop), */ |
2371 | +0x25, 0x07, /* Logical Maximum (7), */ |
2372 | +0x46, 0x3B, 0x01, /* Physical Maximum (315), */ |
2373 | +0x75, 0x04, /* Report Size (4), */ |
2374 | +0x65, 0x14, /* Unit (Degrees), */ |
2375 | +0x09, 0x39, /* Usage (Hat Switch), */ |
2376 | +0x81, 0x42, /* Input (Variable, Null State), */ |
2377 | +0x75, 0x01, /* Report Size (1), */ |
2378 | +0x95, 0x04, /* Report Count (4), */ |
2379 | +0x65, 0x00, /* Unit, */ |
2380 | +0x06, 0x00, 0xFF, /* Usage Page (FF00h), */ |
2381 | +0x09, 0x01, /* Usage (01h), */ |
2382 | +0x25, 0x01, /* Logical Maximum (1), */ |
2383 | +0x45, 0x01, /* Physical Maximum (1), */ |
2384 | +0x81, 0x02, /* Input (Variable), */ |
2385 | +0x05, 0x01, /* Usage Page (Desktop), */ |
2386 | +0x95, 0x01, /* Report Count (1), */ |
2387 | +0x75, 0x08, /* Report Size (8), */ |
2388 | +0x26, 0xFF, 0x00, /* Logical Maximum (255), */ |
2389 | +0x46, 0xFF, 0x00, /* Physical Maximum (255), */ |
2390 | +0x09, 0x31, /* Usage (Y), */ |
2391 | +0x81, 0x02, /* Input (Variable), */ |
2392 | +0x09, 0x32, /* Usage (Z), */ |
2393 | +0x81, 0x02, /* Input (Variable), */ |
2394 | +0xC0, /* End Collection, */ |
2395 | +0xA1, 0x02, /* Collection (Logical), */ |
2396 | +0x26, 0xFF, 0x00, /* Logical Maximum (255), */ |
2397 | +0x46, 0xFF, 0x00, /* Physical Maximum (255), */ |
2398 | +0x95, 0x07, /* Report Count (7), */ |
2399 | +0x75, 0x08, /* Report Size (8), */ |
2400 | +0x09, 0x03, /* Usage (03h), */ |
2401 | +0x91, 0x02, /* Output (Variable), */ |
2402 | +0xC0, /* End Collection, */ |
2403 | +0xC0 /* End Collection */ |
2404 | +}; |
2405 | + |
2406 | static __u8 momo_rdesc_fixed[] = { |
2407 | 0x05, 0x01, /* Usage Page (Desktop), */ |
2408 | 0x09, 0x04, /* Usage (Joystik), */ |
2409 | @@ -275,6 +343,15 @@ static __u8 *lg_report_fixup(struct hid_device *hdev, __u8 *rdesc, |
2410 | } |
2411 | break; |
2412 | |
2413 | + case USB_DEVICE_ID_LOGITECH_VIBRATION_WHEEL: |
2414 | + if (*rsize == FV_RDESC_ORIG_SIZE) { |
2415 | + hid_info(hdev, |
2416 | + "fixing up Logitech Formula Vibration report descriptor\n"); |
2417 | + rdesc = fv_rdesc_fixed; |
2418 | + *rsize = sizeof(fv_rdesc_fixed); |
2419 | + } |
2420 | + break; |
2421 | + |
2422 | case USB_DEVICE_ID_LOGITECH_DFP_WHEEL: |
2423 | if (*rsize == DFP_RDESC_ORIG_SIZE) { |
2424 | hid_info(hdev, |
2425 | @@ -492,6 +569,7 @@ static int lg_input_mapped(struct hid_device *hdev, struct hid_input *hi, |
2426 | case USB_DEVICE_ID_LOGITECH_G27_WHEEL: |
2427 | case USB_DEVICE_ID_LOGITECH_WII_WHEEL: |
2428 | case USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2: |
2429 | + case USB_DEVICE_ID_LOGITECH_VIBRATION_WHEEL: |
2430 | field->application = HID_GD_MULTIAXIS; |
2431 | break; |
2432 | default: |
2433 | @@ -639,6 +717,8 @@ static const struct hid_device_id lg_devices[] = { |
2434 | .driver_data = LG_NOGET | LG_FF4 }, |
2435 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2), |
2436 | .driver_data = LG_FF4 }, |
2437 | + { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_VIBRATION_WHEEL), |
2438 | + .driver_data = LG_FF2 }, |
2439 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL), |
2440 | .driver_data = LG_FF4 }, |
2441 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_DFGT_WHEEL), |
2442 | diff --git a/drivers/hid/hid-lg2ff.c b/drivers/hid/hid-lg2ff.c |
2443 | index 1a42eaa6..0e3fb1a7 100644 |
2444 | --- a/drivers/hid/hid-lg2ff.c |
2445 | +++ b/drivers/hid/hid-lg2ff.c |
2446 | @@ -95,7 +95,7 @@ int lg2ff_init(struct hid_device *hid) |
2447 | |
2448 | hid_hw_request(hid, report, HID_REQ_SET_REPORT); |
2449 | |
2450 | - hid_info(hid, "Force feedback for Logitech RumblePad/Rumblepad 2 by Anssi Hannula <anssi.hannula@gmail.com>\n"); |
2451 | + hid_info(hid, "Force feedback for Logitech variant 2 rumble devices by Anssi Hannula <anssi.hannula@gmail.com>\n"); |
2452 | |
2453 | return 0; |
2454 | } |
2455 | diff --git a/drivers/hid/hid-lg4ff.c b/drivers/hid/hid-lg4ff.c |
2456 | index 8782fe1a..49f6cc0f 100644 |
2457 | --- a/drivers/hid/hid-lg4ff.c |
2458 | +++ b/drivers/hid/hid-lg4ff.c |
2459 | @@ -218,12 +218,46 @@ static void hid_lg4ff_set_autocenter_default(struct input_dev *dev, u16 magnitud |
2460 | struct list_head *report_list = &hid->report_enum[HID_OUTPUT_REPORT].report_list; |
2461 | struct hid_report *report = list_entry(report_list->next, struct hid_report, list); |
2462 | __s32 *value = report->field[0]->value; |
2463 | + __u32 expand_a, expand_b; |
2464 | + |
2465 | + /* De-activate Auto-Center */ |
2466 | + if (magnitude == 0) { |
2467 | + value[0] = 0xf5; |
2468 | + value[1] = 0x00; |
2469 | + value[2] = 0x00; |
2470 | + value[3] = 0x00; |
2471 | + value[4] = 0x00; |
2472 | + value[5] = 0x00; |
2473 | + value[6] = 0x00; |
2474 | + |
2475 | + hid_hw_request(hid, report, HID_REQ_SET_REPORT); |
2476 | + return; |
2477 | + } |
2478 | + |
2479 | + if (magnitude <= 0xaaaa) { |
2480 | + expand_a = 0x0c * magnitude; |
2481 | + expand_b = 0x80 * magnitude; |
2482 | + } else { |
2483 | + expand_a = (0x0c * 0xaaaa) + 0x06 * (magnitude - 0xaaaa); |
2484 | + expand_b = (0x80 * 0xaaaa) + 0xff * (magnitude - 0xaaaa); |
2485 | + } |
2486 | |
2487 | value[0] = 0xfe; |
2488 | value[1] = 0x0d; |
2489 | - value[2] = magnitude >> 13; |
2490 | - value[3] = magnitude >> 13; |
2491 | - value[4] = magnitude >> 8; |
2492 | + value[2] = expand_a / 0xaaaa; |
2493 | + value[3] = expand_a / 0xaaaa; |
2494 | + value[4] = expand_b / 0xaaaa; |
2495 | + value[5] = 0x00; |
2496 | + value[6] = 0x00; |
2497 | + |
2498 | + hid_hw_request(hid, report, HID_REQ_SET_REPORT); |
2499 | + |
2500 | + /* Activate Auto-Center */ |
2501 | + value[0] = 0x14; |
2502 | + value[1] = 0x00; |
2503 | + value[2] = 0x00; |
2504 | + value[3] = 0x00; |
2505 | + value[4] = 0x00; |
2506 | value[5] = 0x00; |
2507 | value[6] = 0x00; |
2508 | |
2509 | diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c |
2510 | index 5e5fe1b8..d83b1e8b 100644 |
2511 | --- a/drivers/hid/hid-multitouch.c |
2512 | +++ b/drivers/hid/hid-multitouch.c |
2513 | @@ -250,12 +250,12 @@ static struct mt_class mt_classes[] = { |
2514 | { .name = MT_CLS_GENERALTOUCH_TWOFINGERS, |
2515 | .quirks = MT_QUIRK_NOT_SEEN_MEANS_UP | |
2516 | MT_QUIRK_VALID_IS_INRANGE | |
2517 | - MT_QUIRK_SLOT_IS_CONTACTNUMBER, |
2518 | + MT_QUIRK_SLOT_IS_CONTACTID, |
2519 | .maxcontacts = 2 |
2520 | }, |
2521 | { .name = MT_CLS_GENERALTOUCH_PWT_TENFINGERS, |
2522 | .quirks = MT_QUIRK_NOT_SEEN_MEANS_UP | |
2523 | - MT_QUIRK_SLOT_IS_CONTACTNUMBER |
2524 | + MT_QUIRK_SLOT_IS_CONTACTID |
2525 | }, |
2526 | |
2527 | { .name = MT_CLS_FLATFROG, |
2528 | @@ -1173,6 +1173,21 @@ static const struct hid_device_id mt_devices[] = { |
2529 | { .driver_data = MT_CLS_GENERALTOUCH_PWT_TENFINGERS, |
2530 | MT_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, |
2531 | USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PWT_TENFINGERS) }, |
2532 | + { .driver_data = MT_CLS_GENERALTOUCH_TWOFINGERS, |
2533 | + MT_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, |
2534 | + USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_0101) }, |
2535 | + { .driver_data = MT_CLS_GENERALTOUCH_PWT_TENFINGERS, |
2536 | + MT_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, |
2537 | + USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_0102) }, |
2538 | + { .driver_data = MT_CLS_GENERALTOUCH_PWT_TENFINGERS, |
2539 | + MT_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, |
2540 | + USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_0106) }, |
2541 | + { .driver_data = MT_CLS_GENERALTOUCH_PWT_TENFINGERS, |
2542 | + MT_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, |
2543 | + USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_010A) }, |
2544 | + { .driver_data = MT_CLS_GENERALTOUCH_PWT_TENFINGERS, |
2545 | + MT_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, |
2546 | + USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_E100) }, |
2547 | |
2548 | /* Gametel game controller */ |
2549 | { .driver_data = MT_CLS_NSMU, |
2550 | @@ -1284,6 +1299,14 @@ static const struct hid_device_id mt_devices[] = { |
2551 | MT_USB_DEVICE(USB_VENDOR_ID_QUANTA, |
2552 | USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008) }, |
2553 | |
2554 | + /* SiS panels */ |
2555 | + { .driver_data = MT_CLS_DEFAULT, |
2556 | + HID_USB_DEVICE(USB_VENDOR_ID_SIS2_TOUCH, |
2557 | + USB_DEVICE_ID_SIS9200_TOUCH) }, |
2558 | + { .driver_data = MT_CLS_DEFAULT, |
2559 | + HID_USB_DEVICE(USB_VENDOR_ID_SIS2_TOUCH, |
2560 | + USB_DEVICE_ID_SIS817_TOUCH) }, |
2561 | + |
2562 | /* Stantum panels */ |
2563 | { .driver_data = MT_CLS_CONFIDENCE, |
2564 | MT_USB_DEVICE(USB_VENDOR_ID_STANTUM, |
2565 | @@ -1312,6 +1335,12 @@ static const struct hid_device_id mt_devices[] = { |
2566 | { .driver_data = MT_CLS_NSMU, |
2567 | MT_USB_DEVICE(USB_VENDOR_ID_UNITEC, |
2568 | USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19) }, |
2569 | + |
2570 | + /* Wistron panels */ |
2571 | + { .driver_data = MT_CLS_NSMU, |
2572 | + MT_USB_DEVICE(USB_VENDOR_ID_WISTRON, |
2573 | + USB_DEVICE_ID_WISTRON_OPTICAL_TOUCH) }, |
2574 | + |
2575 | /* XAT */ |
2576 | { .driver_data = MT_CLS_NSMU, |
2577 | MT_USB_DEVICE(USB_VENDOR_ID_XAT, |
2578 | diff --git a/drivers/hid/hid-roccat-common.c b/drivers/hid/hid-roccat-common.c |
2579 | index 74f70403..e8408999 100644 |
2580 | --- a/drivers/hid/hid-roccat-common.c |
2581 | +++ b/drivers/hid/hid-roccat-common.c |
2582 | @@ -65,10 +65,11 @@ int roccat_common2_send(struct usb_device *usb_dev, uint report_id, |
2583 | EXPORT_SYMBOL_GPL(roccat_common2_send); |
2584 | |
2585 | enum roccat_common2_control_states { |
2586 | - ROCCAT_COMMON_CONTROL_STATUS_OVERLOAD = 0, |
2587 | + ROCCAT_COMMON_CONTROL_STATUS_CRITICAL = 0, |
2588 | ROCCAT_COMMON_CONTROL_STATUS_OK = 1, |
2589 | ROCCAT_COMMON_CONTROL_STATUS_INVALID = 2, |
2590 | - ROCCAT_COMMON_CONTROL_STATUS_WAIT = 3, |
2591 | + ROCCAT_COMMON_CONTROL_STATUS_BUSY = 3, |
2592 | + ROCCAT_COMMON_CONTROL_STATUS_CRITICAL_NEW = 4, |
2593 | }; |
2594 | |
2595 | static int roccat_common2_receive_control_status(struct usb_device *usb_dev) |
2596 | @@ -88,13 +89,12 @@ static int roccat_common2_receive_control_status(struct usb_device *usb_dev) |
2597 | switch (control.value) { |
2598 | case ROCCAT_COMMON_CONTROL_STATUS_OK: |
2599 | return 0; |
2600 | - case ROCCAT_COMMON_CONTROL_STATUS_WAIT: |
2601 | + case ROCCAT_COMMON_CONTROL_STATUS_BUSY: |
2602 | msleep(500); |
2603 | continue; |
2604 | case ROCCAT_COMMON_CONTROL_STATUS_INVALID: |
2605 | - |
2606 | - case ROCCAT_COMMON_CONTROL_STATUS_OVERLOAD: |
2607 | - /* seems to be critical - replug necessary */ |
2608 | + case ROCCAT_COMMON_CONTROL_STATUS_CRITICAL: |
2609 | + case ROCCAT_COMMON_CONTROL_STATUS_CRITICAL_NEW: |
2610 | return -EINVAL; |
2611 | default: |
2612 | dev_err(&usb_dev->dev, |
2613 | diff --git a/drivers/hid/hid-roccat-kovaplus.c b/drivers/hid/hid-roccat-kovaplus.c |
2614 | index 0c8e1ef0..96604771 100644 |
2615 | --- a/drivers/hid/hid-roccat-kovaplus.c |
2616 | +++ b/drivers/hid/hid-roccat-kovaplus.c |
2617 | @@ -554,9 +554,13 @@ static void kovaplus_keep_values_up_to_date(struct kovaplus_device *kovaplus, |
2618 | break; |
2619 | case KOVAPLUS_MOUSE_REPORT_BUTTON_TYPE_CPI: |
2620 | kovaplus->actual_cpi = kovaplus_convert_event_cpi(button_report->data1); |
2621 | + break; |
2622 | case KOVAPLUS_MOUSE_REPORT_BUTTON_TYPE_SENSITIVITY: |
2623 | kovaplus->actual_x_sensitivity = button_report->data1; |
2624 | kovaplus->actual_y_sensitivity = button_report->data2; |
2625 | + break; |
2626 | + default: |
2627 | + break; |
2628 | } |
2629 | } |
2630 | |
2631 | diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c |
2632 | index 10e15810..9e4cdca5 100644 |
2633 | --- a/drivers/hid/hid-sensor-hub.c |
2634 | +++ b/drivers/hid/hid-sensor-hub.c |
2635 | @@ -326,7 +326,8 @@ int sensor_hub_input_get_attribute_info(struct hid_sensor_hub_device *hsdev, |
2636 | field->logical == attr_usage_id) { |
2637 | sensor_hub_fill_attr_info(info, i, report->id, |
2638 | field->unit, field->unit_exponent, |
2639 | - field->report_size); |
2640 | + field->report_size * |
2641 | + field->report_count); |
2642 | ret = 0; |
2643 | } else { |
2644 | for (j = 0; j < field->maxusage; ++j) { |
2645 | @@ -338,7 +339,8 @@ int sensor_hub_input_get_attribute_info(struct hid_sensor_hub_device *hsdev, |
2646 | i, report->id, |
2647 | field->unit, |
2648 | field->unit_exponent, |
2649 | - field->report_size); |
2650 | + field->report_size * |
2651 | + field->report_count); |
2652 | ret = 0; |
2653 | break; |
2654 | } |
2655 | @@ -425,9 +427,10 @@ static int sensor_hub_raw_event(struct hid_device *hdev, |
2656 | hid_dbg(hdev, "%d collection_index:%x hid:%x sz:%x\n", |
2657 | i, report->field[i]->usage->collection_index, |
2658 | report->field[i]->usage->hid, |
2659 | - report->field[i]->report_size/8); |
2660 | - |
2661 | - sz = report->field[i]->report_size/8; |
2662 | + (report->field[i]->report_size * |
2663 | + report->field[i]->report_count)/8); |
2664 | + sz = (report->field[i]->report_size * |
2665 | + report->field[i]->report_count)/8; |
2666 | if (pdata->pending.status && pdata->pending.attr_usage_id == |
2667 | report->field[i]->usage->hid) { |
2668 | hid_dbg(hdev, "data was pending ...\n"); |
2669 | diff --git a/drivers/hid/hid-wiimote-modules.c b/drivers/hid/hid-wiimote-modules.c |
2670 | index 71adf9e6..e30567af 100644 |
2671 | --- a/drivers/hid/hid-wiimote-modules.c |
2672 | +++ b/drivers/hid/hid-wiimote-modules.c |
2673 | @@ -1656,9 +1656,9 @@ static void wiimod_pro_in_ext(struct wiimote_data *wdata, const __u8 *ext) |
2674 | ry = (ext[6] & 0xff) | ((ext[7] & 0x0f) << 8); |
2675 | |
2676 | input_report_abs(wdata->extension.input, ABS_X, lx - 0x800); |
2677 | - input_report_abs(wdata->extension.input, ABS_Y, ly - 0x800); |
2678 | + input_report_abs(wdata->extension.input, ABS_Y, 0x800 - ly); |
2679 | input_report_abs(wdata->extension.input, ABS_RX, rx - 0x800); |
2680 | - input_report_abs(wdata->extension.input, ABS_RY, ry - 0x800); |
2681 | + input_report_abs(wdata->extension.input, ABS_RY, 0x800 - ry); |
2682 | |
2683 | input_report_key(wdata->extension.input, |
2684 | wiimod_pro_map[WIIMOD_PRO_KEY_RIGHT], |
2685 | diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c |
2686 | index 93b00d76..cedc6da9 100644 |
2687 | --- a/drivers/hid/uhid.c |
2688 | +++ b/drivers/hid/uhid.c |
2689 | @@ -287,7 +287,7 @@ static int uhid_event_from_user(const char __user *buffer, size_t len, |
2690 | */ |
2691 | struct uhid_create_req_compat *compat; |
2692 | |
2693 | - compat = kmalloc(sizeof(*compat), GFP_KERNEL); |
2694 | + compat = kzalloc(sizeof(*compat), GFP_KERNEL); |
2695 | if (!compat) |
2696 | return -ENOMEM; |
2697 | |
2698 | diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c |
2699 | index 3fca3be0..0db9a672 100644 |
2700 | --- a/drivers/hid/usbhid/hid-quirks.c |
2701 | +++ b/drivers/hid/usbhid/hid-quirks.c |
2702 | @@ -84,6 +84,8 @@ static const struct hid_blacklist { |
2703 | { USB_VENDOR_ID_REALTEK, USB_DEVICE_ID_REALTEK_READER, HID_QUIRK_NO_INIT_REPORTS }, |
2704 | { USB_VENDOR_ID_SENNHEISER, USB_DEVICE_ID_SENNHEISER_BTD500USB, HID_QUIRK_NOGET }, |
2705 | { USB_VENDOR_ID_SIGMATEL, USB_DEVICE_ID_SIGMATEL_STMP3780, HID_QUIRK_NOGET }, |
2706 | + { USB_VENDOR_ID_SIS2_TOUCH, USB_DEVICE_ID_SIS9200_TOUCH, HID_QUIRK_NOGET }, |
2707 | + { USB_VENDOR_ID_SIS2_TOUCH, USB_DEVICE_ID_SIS817_TOUCH, HID_QUIRK_NOGET }, |
2708 | { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET }, |
2709 | { USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_1, HID_QUIRK_NOGET }, |
2710 | { USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_2, HID_QUIRK_NOGET }, |
2711 | diff --git a/drivers/i2c/busses/i2c-wmt.c b/drivers/i2c/busses/i2c-wmt.c |
2712 | index c65da3d9..4bf9507c 100644 |
2713 | --- a/drivers/i2c/busses/i2c-wmt.c |
2714 | +++ b/drivers/i2c/busses/i2c-wmt.c |
2715 | @@ -349,6 +349,7 @@ static int wmt_i2c_reset_hardware(struct wmt_i2c_dev *i2c_dev) |
2716 | err = clk_set_rate(i2c_dev->clk, 20000000); |
2717 | if (err) { |
2718 | dev_err(i2c_dev->dev, "failed to set clock = 20Mhz\n"); |
2719 | + clk_disable_unprepare(i2c_dev->clk); |
2720 | return err; |
2721 | } |
2722 | |
2723 | diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c |
2724 | index a764da77..f821facb 100644 |
2725 | --- a/drivers/i2c/muxes/i2c-mux-gpio.c |
2726 | +++ b/drivers/i2c/muxes/i2c-mux-gpio.c |
2727 | @@ -30,15 +30,15 @@ static void i2c_mux_gpio_set(const struct gpiomux *mux, unsigned val) |
2728 | int i; |
2729 | |
2730 | for (i = 0; i < mux->data.n_gpios; i++) |
2731 | - gpio_set_value(mux->gpio_base + mux->data.gpios[i], |
2732 | - val & (1 << i)); |
2733 | + gpio_set_value_cansleep(mux->gpio_base + mux->data.gpios[i], |
2734 | + val & (1 << i)); |
2735 | } |
2736 | |
2737 | static int i2c_mux_gpio_select(struct i2c_adapter *adap, void *data, u32 chan) |
2738 | { |
2739 | struct gpiomux *mux = data; |
2740 | |
2741 | - i2c_mux_gpio_set(mux, mux->data.values[chan]); |
2742 | + i2c_mux_gpio_set(mux, chan); |
2743 | |
2744 | return 0; |
2745 | } |
2746 | @@ -228,7 +228,7 @@ static int i2c_mux_gpio_probe(struct platform_device *pdev) |
2747 | unsigned int class = mux->data.classes ? mux->data.classes[i] : 0; |
2748 | |
2749 | mux->adap[i] = i2c_add_mux_adapter(parent, &pdev->dev, mux, nr, |
2750 | - i, class, |
2751 | + mux->data.values[i], class, |
2752 | i2c_mux_gpio_select, deselect); |
2753 | if (!mux->adap[i]) { |
2754 | ret = -ENODEV; |
2755 | diff --git a/drivers/iio/accel/kxsd9.c b/drivers/iio/accel/kxsd9.c |
2756 | index 709c1325..34277153 100644 |
2757 | --- a/drivers/iio/accel/kxsd9.c |
2758 | +++ b/drivers/iio/accel/kxsd9.c |
2759 | @@ -112,9 +112,10 @@ static int kxsd9_read(struct iio_dev *indio_dev, u8 address) |
2760 | mutex_lock(&st->buf_lock); |
2761 | st->tx[0] = KXSD9_READ(address); |
2762 | ret = spi_sync_transfer(st->us, xfers, ARRAY_SIZE(xfers)); |
2763 | - if (ret) |
2764 | - return ret; |
2765 | - return (((u16)(st->rx[0])) << 8) | (st->rx[1] & 0xF0); |
2766 | + if (!ret) |
2767 | + ret = (((u16)(st->rx[0])) << 8) | (st->rx[1] & 0xF0); |
2768 | + mutex_unlock(&st->buf_lock); |
2769 | + return ret; |
2770 | } |
2771 | |
2772 | static IIO_CONST_ATTR(accel_scale_available, |
2773 | diff --git a/drivers/infiniband/hw/ipath/ipath_user_sdma.c b/drivers/infiniband/hw/ipath/ipath_user_sdma.c |
2774 | index f5cb13b2..cc04b7ba 100644 |
2775 | --- a/drivers/infiniband/hw/ipath/ipath_user_sdma.c |
2776 | +++ b/drivers/infiniband/hw/ipath/ipath_user_sdma.c |
2777 | @@ -280,9 +280,7 @@ static int ipath_user_sdma_pin_pages(const struct ipath_devdata *dd, |
2778 | int j; |
2779 | int ret; |
2780 | |
2781 | - ret = get_user_pages(current, current->mm, addr, |
2782 | - npages, 0, 1, pages, NULL); |
2783 | - |
2784 | + ret = get_user_pages_fast(addr, npages, 0, pages); |
2785 | if (ret != npages) { |
2786 | int i; |
2787 | |
2788 | @@ -811,10 +809,7 @@ int ipath_user_sdma_writev(struct ipath_devdata *dd, |
2789 | while (dim) { |
2790 | const int mxp = 8; |
2791 | |
2792 | - down_write(¤t->mm->mmap_sem); |
2793 | ret = ipath_user_sdma_queue_pkts(dd, pq, &list, iov, dim, mxp); |
2794 | - up_write(¤t->mm->mmap_sem); |
2795 | - |
2796 | if (ret <= 0) |
2797 | goto done_unlock; |
2798 | else { |
2799 | diff --git a/drivers/infiniband/hw/qib/qib_iba7322.c b/drivers/infiniband/hw/qib/qib_iba7322.c |
2800 | index 016e7429..5bfc02f4 100644 |
2801 | --- a/drivers/infiniband/hw/qib/qib_iba7322.c |
2802 | +++ b/drivers/infiniband/hw/qib/qib_iba7322.c |
2803 | @@ -6190,21 +6190,20 @@ static int setup_txselect(const char *str, struct kernel_param *kp) |
2804 | { |
2805 | struct qib_devdata *dd; |
2806 | unsigned long val; |
2807 | - int ret; |
2808 | - |
2809 | + char *n; |
2810 | if (strlen(str) >= MAX_ATTEN_LEN) { |
2811 | pr_info("txselect_values string too long\n"); |
2812 | return -ENOSPC; |
2813 | } |
2814 | - ret = kstrtoul(str, 0, &val); |
2815 | - if (ret || val >= (TXDDS_TABLE_SZ + TXDDS_EXTRA_SZ + |
2816 | + val = simple_strtoul(str, &n, 0); |
2817 | + if (n == str || val >= (TXDDS_TABLE_SZ + TXDDS_EXTRA_SZ + |
2818 | TXDDS_MFG_SZ)) { |
2819 | pr_info("txselect_values must start with a number < %d\n", |
2820 | TXDDS_TABLE_SZ + TXDDS_EXTRA_SZ + TXDDS_MFG_SZ); |
2821 | - return ret ? ret : -EINVAL; |
2822 | + return -EINVAL; |
2823 | } |
2824 | - |
2825 | strcpy(txselect_list, str); |
2826 | + |
2827 | list_for_each_entry(dd, &qib_dev_list, list) |
2828 | if (dd->deviceid == PCI_DEVICE_ID_QLOGIC_IB_7322) |
2829 | set_no_qsfp_atten(dd, 1); |
2830 | diff --git a/drivers/infiniband/hw/qib/qib_user_sdma.c b/drivers/infiniband/hw/qib/qib_user_sdma.c |
2831 | index d0a0ea0c..165aee2c 100644 |
2832 | --- a/drivers/infiniband/hw/qib/qib_user_sdma.c |
2833 | +++ b/drivers/infiniband/hw/qib/qib_user_sdma.c |
2834 | @@ -594,8 +594,7 @@ static int qib_user_sdma_pin_pages(const struct qib_devdata *dd, |
2835 | else |
2836 | j = npages; |
2837 | |
2838 | - ret = get_user_pages(current, current->mm, addr, |
2839 | - j, 0, 1, pages, NULL); |
2840 | + ret = get_user_pages_fast(addr, j, 0, pages); |
2841 | if (ret != j) { |
2842 | i = 0; |
2843 | j = ret; |
2844 | @@ -1294,11 +1293,8 @@ int qib_user_sdma_writev(struct qib_ctxtdata *rcd, |
2845 | int mxp = 8; |
2846 | int ndesc = 0; |
2847 | |
2848 | - down_write(¤t->mm->mmap_sem); |
2849 | ret = qib_user_sdma_queue_pkts(dd, ppd, pq, |
2850 | iov, dim, &list, &mxp, &ndesc); |
2851 | - up_write(¤t->mm->mmap_sem); |
2852 | - |
2853 | if (ret < 0) |
2854 | goto done_unlock; |
2855 | else { |
2856 | diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c |
2857 | index 6df23502..db5d0a31 100644 |
2858 | --- a/drivers/infiniband/ulp/isert/ib_isert.c |
2859 | +++ b/drivers/infiniband/ulp/isert/ib_isert.c |
2860 | @@ -1991,8 +1991,6 @@ isert_map_rdma(struct iscsi_conn *conn, struct iscsi_cmd *cmd, |
2861 | |
2862 | if (wr->iser_ib_op == ISER_IB_RDMA_WRITE) { |
2863 | data_left = se_cmd->data_length; |
2864 | - iscsit_increment_maxcmdsn(cmd, conn->sess); |
2865 | - cmd->stat_sn = conn->stat_sn++; |
2866 | } else { |
2867 | sg_off = cmd->write_data_done / PAGE_SIZE; |
2868 | data_left = se_cmd->data_length - cmd->write_data_done; |
2869 | @@ -2204,8 +2202,6 @@ isert_reg_rdma_frwr(struct iscsi_conn *conn, struct iscsi_cmd *cmd, |
2870 | |
2871 | if (wr->iser_ib_op == ISER_IB_RDMA_WRITE) { |
2872 | data_left = se_cmd->data_length; |
2873 | - iscsit_increment_maxcmdsn(cmd, conn->sess); |
2874 | - cmd->stat_sn = conn->stat_sn++; |
2875 | } else { |
2876 | sg_off = cmd->write_data_done / PAGE_SIZE; |
2877 | data_left = se_cmd->data_length - cmd->write_data_done; |
2878 | @@ -2259,18 +2255,26 @@ isert_reg_rdma_frwr(struct iscsi_conn *conn, struct iscsi_cmd *cmd, |
2879 | data_len = min(data_left, rdma_write_max); |
2880 | wr->cur_rdma_length = data_len; |
2881 | |
2882 | - spin_lock_irqsave(&isert_conn->conn_lock, flags); |
2883 | - fr_desc = list_first_entry(&isert_conn->conn_frwr_pool, |
2884 | - struct fast_reg_descriptor, list); |
2885 | - list_del(&fr_desc->list); |
2886 | - spin_unlock_irqrestore(&isert_conn->conn_lock, flags); |
2887 | - wr->fr_desc = fr_desc; |
2888 | + /* if there is a single dma entry, dma mr is sufficient */ |
2889 | + if (count == 1) { |
2890 | + ib_sge->addr = ib_sg_dma_address(ib_dev, &sg_start[0]); |
2891 | + ib_sge->length = ib_sg_dma_len(ib_dev, &sg_start[0]); |
2892 | + ib_sge->lkey = isert_conn->conn_mr->lkey; |
2893 | + wr->fr_desc = NULL; |
2894 | + } else { |
2895 | + spin_lock_irqsave(&isert_conn->conn_lock, flags); |
2896 | + fr_desc = list_first_entry(&isert_conn->conn_frwr_pool, |
2897 | + struct fast_reg_descriptor, list); |
2898 | + list_del(&fr_desc->list); |
2899 | + spin_unlock_irqrestore(&isert_conn->conn_lock, flags); |
2900 | + wr->fr_desc = fr_desc; |
2901 | |
2902 | - ret = isert_fast_reg_mr(fr_desc, isert_cmd, isert_conn, |
2903 | - ib_sge, offset, data_len); |
2904 | - if (ret) { |
2905 | - list_add_tail(&fr_desc->list, &isert_conn->conn_frwr_pool); |
2906 | - goto unmap_sg; |
2907 | + ret = isert_fast_reg_mr(fr_desc, isert_cmd, isert_conn, |
2908 | + ib_sge, offset, data_len); |
2909 | + if (ret) { |
2910 | + list_add_tail(&fr_desc->list, &isert_conn->conn_frwr_pool); |
2911 | + goto unmap_sg; |
2912 | + } |
2913 | } |
2914 | |
2915 | return 0; |
2916 | @@ -2306,7 +2310,7 @@ isert_put_datain(struct iscsi_conn *conn, struct iscsi_cmd *cmd) |
2917 | * Build isert_conn->tx_desc for iSCSI response PDU and attach |
2918 | */ |
2919 | isert_create_send_desc(isert_conn, isert_cmd, &isert_cmd->tx_desc); |
2920 | - iscsit_build_rsp_pdu(cmd, conn, false, (struct iscsi_scsi_rsp *) |
2921 | + iscsit_build_rsp_pdu(cmd, conn, true, (struct iscsi_scsi_rsp *) |
2922 | &isert_cmd->tx_desc.iscsi_header); |
2923 | isert_init_tx_hdrs(isert_conn, &isert_cmd->tx_desc); |
2924 | isert_init_send_wr(isert_cmd, &isert_cmd->tx_desc.send_wr); |
2925 | diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c |
2926 | index f93baf82..17b58f4f 100644 |
2927 | --- a/drivers/infiniband/ulp/srp/ib_srp.c |
2928 | +++ b/drivers/infiniband/ulp/srp/ib_srp.c |
2929 | @@ -534,6 +534,11 @@ static void srp_remove_target(struct srp_target_port *target) |
2930 | ib_destroy_cm_id(target->cm_id); |
2931 | srp_free_target_ib(target); |
2932 | srp_free_req_data(target); |
2933 | + |
2934 | + spin_lock(&target->srp_host->target_lock); |
2935 | + list_del(&target->list); |
2936 | + spin_unlock(&target->srp_host->target_lock); |
2937 | + |
2938 | scsi_host_put(target->scsi_host); |
2939 | } |
2940 | |
2941 | @@ -545,10 +550,6 @@ static void srp_remove_work(struct work_struct *work) |
2942 | WARN_ON_ONCE(target->state != SRP_TARGET_REMOVED); |
2943 | |
2944 | srp_remove_target(target); |
2945 | - |
2946 | - spin_lock(&target->srp_host->target_lock); |
2947 | - list_del(&target->list); |
2948 | - spin_unlock(&target->srp_host->target_lock); |
2949 | } |
2950 | |
2951 | static void srp_rport_delete(struct srp_rport *rport) |
2952 | @@ -1302,14 +1303,13 @@ static void srp_handle_recv(struct srp_target_port *target, struct ib_wc *wc) |
2953 | PFX "Recv failed with error code %d\n", res); |
2954 | } |
2955 | |
2956 | -static void srp_handle_qp_err(enum ib_wc_status wc_status, |
2957 | - enum ib_wc_opcode wc_opcode, |
2958 | +static void srp_handle_qp_err(enum ib_wc_status wc_status, bool send_err, |
2959 | struct srp_target_port *target) |
2960 | { |
2961 | if (target->connected && !target->qp_in_error) { |
2962 | shost_printk(KERN_ERR, target->scsi_host, |
2963 | PFX "failed %s status %d\n", |
2964 | - wc_opcode & IB_WC_RECV ? "receive" : "send", |
2965 | + send_err ? "send" : "receive", |
2966 | wc_status); |
2967 | } |
2968 | target->qp_in_error = true; |
2969 | @@ -1325,7 +1325,7 @@ static void srp_recv_completion(struct ib_cq *cq, void *target_ptr) |
2970 | if (likely(wc.status == IB_WC_SUCCESS)) { |
2971 | srp_handle_recv(target, &wc); |
2972 | } else { |
2973 | - srp_handle_qp_err(wc.status, wc.opcode, target); |
2974 | + srp_handle_qp_err(wc.status, false, target); |
2975 | } |
2976 | } |
2977 | } |
2978 | @@ -1341,7 +1341,7 @@ static void srp_send_completion(struct ib_cq *cq, void *target_ptr) |
2979 | iu = (struct srp_iu *) (uintptr_t) wc.wr_id; |
2980 | list_add(&iu->list, &target->free_tx); |
2981 | } else { |
2982 | - srp_handle_qp_err(wc.status, wc.opcode, target); |
2983 | + srp_handle_qp_err(wc.status, true, target); |
2984 | } |
2985 | } |
2986 | } |
2987 | @@ -1751,7 +1751,7 @@ static int srp_abort(struct scsi_cmnd *scmnd) |
2988 | shost_printk(KERN_ERR, target->scsi_host, "SRP abort called\n"); |
2989 | |
2990 | if (!req || !srp_claim_req(target, req, scmnd)) |
2991 | - return FAILED; |
2992 | + return SUCCESS; |
2993 | if (srp_send_tsk_mgmt(target, req->index, scmnd->device->lun, |
2994 | SRP_TSK_ABORT_TASK) == 0) |
2995 | ret = SUCCESS; |
2996 | diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c |
2997 | index b6ded17b..a06e1255 100644 |
2998 | --- a/drivers/input/evdev.c |
2999 | +++ b/drivers/input/evdev.c |
3000 | @@ -18,6 +18,8 @@ |
3001 | #include <linux/poll.h> |
3002 | #include <linux/sched.h> |
3003 | #include <linux/slab.h> |
3004 | +#include <linux/vmalloc.h> |
3005 | +#include <linux/mm.h> |
3006 | #include <linux/module.h> |
3007 | #include <linux/init.h> |
3008 | #include <linux/input/mt.h> |
3009 | @@ -369,7 +371,11 @@ static int evdev_release(struct inode *inode, struct file *file) |
3010 | mutex_unlock(&evdev->mutex); |
3011 | |
3012 | evdev_detach_client(evdev, client); |
3013 | - kfree(client); |
3014 | + |
3015 | + if (is_vmalloc_addr(client)) |
3016 | + vfree(client); |
3017 | + else |
3018 | + kfree(client); |
3019 | |
3020 | evdev_close_device(evdev); |
3021 | |
3022 | @@ -389,12 +395,14 @@ static int evdev_open(struct inode *inode, struct file *file) |
3023 | { |
3024 | struct evdev *evdev = container_of(inode->i_cdev, struct evdev, cdev); |
3025 | unsigned int bufsize = evdev_compute_buffer_size(evdev->handle.dev); |
3026 | + unsigned int size = sizeof(struct evdev_client) + |
3027 | + bufsize * sizeof(struct input_event); |
3028 | struct evdev_client *client; |
3029 | int error; |
3030 | |
3031 | - client = kzalloc(sizeof(struct evdev_client) + |
3032 | - bufsize * sizeof(struct input_event), |
3033 | - GFP_KERNEL); |
3034 | + client = kzalloc(size, GFP_KERNEL | __GFP_NOWARN); |
3035 | + if (!client) |
3036 | + client = vzalloc(size); |
3037 | if (!client) |
3038 | return -ENOMEM; |
3039 | |
3040 | diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c |
3041 | index 83658472..7c5d72a6 100644 |
3042 | --- a/drivers/input/mouse/alps.c |
3043 | +++ b/drivers/input/mouse/alps.c |
3044 | @@ -103,7 +103,6 @@ static const struct alps_model_info alps_model_data[] = { |
3045 | /* Dell Latitude E5500, E6400, E6500, Precision M4400 */ |
3046 | { { 0x62, 0x02, 0x14 }, 0x00, ALPS_PROTO_V2, 0xcf, 0xcf, |
3047 | ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED }, |
3048 | - { { 0x73, 0x00, 0x14 }, 0x00, ALPS_PROTO_V2, 0xcf, 0xcf, ALPS_DUALPOINT }, /* Dell XT2 */ |
3049 | { { 0x73, 0x02, 0x50 }, 0x00, ALPS_PROTO_V2, 0xcf, 0xcf, ALPS_FOUR_BUTTONS }, /* Dell Vostro 1400 */ |
3050 | { { 0x52, 0x01, 0x14 }, 0x00, ALPS_PROTO_V2, 0xff, 0xff, |
3051 | ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED }, /* Toshiba Tecra A11-11L */ |
3052 | diff --git a/drivers/input/mouse/cypress_ps2.c b/drivers/input/mouse/cypress_ps2.c |
3053 | index f51765ff..888a81a7 100644 |
3054 | --- a/drivers/input/mouse/cypress_ps2.c |
3055 | +++ b/drivers/input/mouse/cypress_ps2.c |
3056 | @@ -439,7 +439,7 @@ static int cypress_get_finger_count(unsigned char header_byte) |
3057 | case 2: return 5; |
3058 | default: |
3059 | /* Invalid contact (e.g. palm). Ignore it. */ |
3060 | - return -1; |
3061 | + return 0; |
3062 | } |
3063 | } |
3064 | |
3065 | @@ -452,17 +452,10 @@ static int cypress_parse_packet(struct psmouse *psmouse, |
3066 | { |
3067 | unsigned char *packet = psmouse->packet; |
3068 | unsigned char header_byte = packet[0]; |
3069 | - int contact_cnt; |
3070 | |
3071 | memset(report_data, 0, sizeof(struct cytp_report_data)); |
3072 | |
3073 | - contact_cnt = cypress_get_finger_count(header_byte); |
3074 | - |
3075 | - if (contact_cnt < 0) /* e.g. palm detect */ |
3076 | - return -EINVAL; |
3077 | - |
3078 | - report_data->contact_cnt = contact_cnt; |
3079 | - |
3080 | + report_data->contact_cnt = cypress_get_finger_count(header_byte); |
3081 | report_data->tap = (header_byte & ABS_MULTIFINGER_TAP) ? 1 : 0; |
3082 | |
3083 | if (report_data->contact_cnt == 1) { |
3084 | @@ -535,11 +528,9 @@ static void cypress_process_packet(struct psmouse *psmouse, bool zero_pkt) |
3085 | int slots[CYTP_MAX_MT_SLOTS]; |
3086 | int n; |
3087 | |
3088 | - if (cypress_parse_packet(psmouse, cytp, &report_data)) |
3089 | - return; |
3090 | + cypress_parse_packet(psmouse, cytp, &report_data); |
3091 | |
3092 | n = report_data.contact_cnt; |
3093 | - |
3094 | if (n > CYTP_MAX_MT_SLOTS) |
3095 | n = CYTP_MAX_MT_SLOTS; |
3096 | |
3097 | @@ -605,10 +596,6 @@ static psmouse_ret_t cypress_validate_byte(struct psmouse *psmouse) |
3098 | return PSMOUSE_BAD_DATA; |
3099 | |
3100 | contact_cnt = cypress_get_finger_count(packet[0]); |
3101 | - |
3102 | - if (contact_cnt < 0) |
3103 | - return PSMOUSE_BAD_DATA; |
3104 | - |
3105 | if (cytp->mode & CYTP_BIT_ABS_NO_PRESSURE) |
3106 | cypress_set_packet_size(psmouse, contact_cnt == 2 ? 7 : 4); |
3107 | else |
3108 | diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h |
3109 | index 5f306f79..0ec9abbe 100644 |
3110 | --- a/drivers/input/serio/i8042-x86ia64io.h |
3111 | +++ b/drivers/input/serio/i8042-x86ia64io.h |
3112 | @@ -765,6 +765,7 @@ static struct pnp_device_id pnp_kbd_devids[] = { |
3113 | { .id = "CPQA0D7", .driver_data = 0 }, |
3114 | { .id = "", }, |
3115 | }; |
3116 | +MODULE_DEVICE_TABLE(pnp, pnp_kbd_devids); |
3117 | |
3118 | static struct pnp_driver i8042_pnp_kbd_driver = { |
3119 | .name = "i8042 kbd", |
3120 | @@ -786,6 +787,7 @@ static struct pnp_device_id pnp_aux_devids[] = { |
3121 | { .id = "SYN0801", .driver_data = 0 }, |
3122 | { .id = "", }, |
3123 | }; |
3124 | +MODULE_DEVICE_TABLE(pnp, pnp_aux_devids); |
3125 | |
3126 | static struct pnp_driver i8042_pnp_aux_driver = { |
3127 | .name = "i8042 aux", |
3128 | diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c |
3129 | index 721fdb35..ae4b6b90 100644 |
3130 | --- a/drivers/input/touchscreen/usbtouchscreen.c |
3131 | +++ b/drivers/input/touchscreen/usbtouchscreen.c |
3132 | @@ -146,12 +146,10 @@ enum { |
3133 | |
3134 | #define USB_DEVICE_HID_CLASS(vend, prod) \ |
3135 | .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS \ |
3136 | - | USB_DEVICE_ID_MATCH_INT_PROTOCOL \ |
3137 | | USB_DEVICE_ID_MATCH_DEVICE, \ |
3138 | .idVendor = (vend), \ |
3139 | .idProduct = (prod), \ |
3140 | - .bInterfaceClass = USB_INTERFACE_CLASS_HID, \ |
3141 | - .bInterfaceProtocol = USB_INTERFACE_PROTOCOL_MOUSE |
3142 | + .bInterfaceClass = USB_INTERFACE_CLASS_HID |
3143 | |
3144 | static const struct usb_device_id usbtouch_devices[] = { |
3145 | #ifdef CONFIG_TOUCHSCREEN_USB_EGALAX |
3146 | diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c |
3147 | index f42fc7ed..d1734d9d 100644 |
3148 | --- a/drivers/md/bcache/btree.c |
3149 | +++ b/drivers/md/bcache/btree.c |
3150 | @@ -1742,6 +1742,9 @@ static bool fix_overlapping_extents(struct btree *b, |
3151 | if (bkey_cmp(insert, k) < 0) { |
3152 | bch_cut_front(insert, k); |
3153 | } else { |
3154 | + if (bkey_cmp(&START_KEY(insert), &START_KEY(k)) > 0) |
3155 | + old_offset = KEY_START(insert); |
3156 | + |
3157 | if (bkey_written(b, k) && |
3158 | bkey_cmp(&START_KEY(insert), &START_KEY(k)) <= 0) { |
3159 | /* |
3160 | @@ -1803,6 +1806,10 @@ static bool btree_insert_key(struct btree *b, struct btree_op *op, |
3161 | if (fix_overlapping_extents(b, k, &iter, op)) |
3162 | return false; |
3163 | |
3164 | + if (KEY_DIRTY(k)) |
3165 | + bcache_dev_sectors_dirty_add(b->c, KEY_INODE(k), |
3166 | + KEY_START(k), KEY_SIZE(k)); |
3167 | + |
3168 | while (m != end(i) && |
3169 | bkey_cmp(k, &START_KEY(m)) > 0) |
3170 | prev = m, m = bkey_next(m); |
3171 | @@ -1831,10 +1838,6 @@ static bool btree_insert_key(struct btree *b, struct btree_op *op, |
3172 | insert: shift_keys(b, m, k); |
3173 | copy: bkey_copy(m, k); |
3174 | merged: |
3175 | - if (KEY_DIRTY(k)) |
3176 | - bcache_dev_sectors_dirty_add(b->c, KEY_INODE(k), |
3177 | - KEY_START(k), KEY_SIZE(k)); |
3178 | - |
3179 | bch_check_keys(b, "%u for %s", status, op_type(op)); |
3180 | |
3181 | if (b->level && !KEY_OFFSET(k)) |
3182 | diff --git a/drivers/md/dm-cache-target.c b/drivers/md/dm-cache-target.c |
3183 | index 29569768..ea3e4b4f 100644 |
3184 | --- a/drivers/md/dm-cache-target.c |
3185 | +++ b/drivers/md/dm-cache-target.c |
3186 | @@ -148,6 +148,9 @@ struct cache { |
3187 | wait_queue_head_t migration_wait; |
3188 | atomic_t nr_migrations; |
3189 | |
3190 | + wait_queue_head_t quiescing_wait; |
3191 | + atomic_t quiescing_ack; |
3192 | + |
3193 | /* |
3194 | * cache_size entries, dirty if set |
3195 | */ |
3196 | @@ -748,8 +751,9 @@ static void cell_defer(struct cache *cache, struct dm_bio_prison_cell *cell, |
3197 | |
3198 | static void cleanup_migration(struct dm_cache_migration *mg) |
3199 | { |
3200 | - dec_nr_migrations(mg->cache); |
3201 | + struct cache *cache = mg->cache; |
3202 | free_migration(mg); |
3203 | + dec_nr_migrations(cache); |
3204 | } |
3205 | |
3206 | static void migration_failure(struct dm_cache_migration *mg) |
3207 | @@ -1346,34 +1350,51 @@ static void writeback_some_dirty_blocks(struct cache *cache) |
3208 | /*---------------------------------------------------------------- |
3209 | * Main worker loop |
3210 | *--------------------------------------------------------------*/ |
3211 | -static void start_quiescing(struct cache *cache) |
3212 | +static bool is_quiescing(struct cache *cache) |
3213 | { |
3214 | + int r; |
3215 | unsigned long flags; |
3216 | |
3217 | spin_lock_irqsave(&cache->lock, flags); |
3218 | - cache->quiescing = 1; |
3219 | + r = cache->quiescing; |
3220 | spin_unlock_irqrestore(&cache->lock, flags); |
3221 | + |
3222 | + return r; |
3223 | } |
3224 | |
3225 | -static void stop_quiescing(struct cache *cache) |
3226 | +static void ack_quiescing(struct cache *cache) |
3227 | +{ |
3228 | + if (is_quiescing(cache)) { |
3229 | + atomic_inc(&cache->quiescing_ack); |
3230 | + wake_up(&cache->quiescing_wait); |
3231 | + } |
3232 | +} |
3233 | + |
3234 | +static void wait_for_quiescing_ack(struct cache *cache) |
3235 | +{ |
3236 | + wait_event(cache->quiescing_wait, atomic_read(&cache->quiescing_ack)); |
3237 | +} |
3238 | + |
3239 | +static void start_quiescing(struct cache *cache) |
3240 | { |
3241 | unsigned long flags; |
3242 | |
3243 | spin_lock_irqsave(&cache->lock, flags); |
3244 | - cache->quiescing = 0; |
3245 | + cache->quiescing = true; |
3246 | spin_unlock_irqrestore(&cache->lock, flags); |
3247 | + |
3248 | + wait_for_quiescing_ack(cache); |
3249 | } |
3250 | |
3251 | -static bool is_quiescing(struct cache *cache) |
3252 | +static void stop_quiescing(struct cache *cache) |
3253 | { |
3254 | - int r; |
3255 | unsigned long flags; |
3256 | |
3257 | spin_lock_irqsave(&cache->lock, flags); |
3258 | - r = cache->quiescing; |
3259 | + cache->quiescing = false; |
3260 | spin_unlock_irqrestore(&cache->lock, flags); |
3261 | |
3262 | - return r; |
3263 | + atomic_set(&cache->quiescing_ack, 0); |
3264 | } |
3265 | |
3266 | static void wait_for_migrations(struct cache *cache) |
3267 | @@ -1420,16 +1441,15 @@ static void do_worker(struct work_struct *ws) |
3268 | struct cache *cache = container_of(ws, struct cache, worker); |
3269 | |
3270 | do { |
3271 | - if (!is_quiescing(cache)) |
3272 | + if (!is_quiescing(cache)) { |
3273 | + writeback_some_dirty_blocks(cache); |
3274 | + process_deferred_writethrough_bios(cache); |
3275 | process_deferred_bios(cache); |
3276 | + } |
3277 | |
3278 | process_migrations(cache, &cache->quiesced_migrations, issue_copy); |
3279 | process_migrations(cache, &cache->completed_migrations, complete_migration); |
3280 | |
3281 | - writeback_some_dirty_blocks(cache); |
3282 | - |
3283 | - process_deferred_writethrough_bios(cache); |
3284 | - |
3285 | if (commit_if_needed(cache)) { |
3286 | process_deferred_flush_bios(cache, false); |
3287 | |
3288 | @@ -1442,6 +1462,9 @@ static void do_worker(struct work_struct *ws) |
3289 | process_migrations(cache, &cache->need_commit_migrations, |
3290 | migration_success_post_commit); |
3291 | } |
3292 | + |
3293 | + ack_quiescing(cache); |
3294 | + |
3295 | } while (more_work(cache)); |
3296 | } |
3297 | |
3298 | @@ -2005,6 +2028,9 @@ static int cache_create(struct cache_args *ca, struct cache **result) |
3299 | atomic_set(&cache->nr_migrations, 0); |
3300 | init_waitqueue_head(&cache->migration_wait); |
3301 | |
3302 | + init_waitqueue_head(&cache->quiescing_wait); |
3303 | + atomic_set(&cache->quiescing_ack, 0); |
3304 | + |
3305 | r = -ENOMEM; |
3306 | cache->nr_dirty = 0; |
3307 | cache->dirty_bitset = alloc_bitset(from_cblock(cache->cache_size)); |
3308 | diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c |
3309 | index de570a55..799e479d 100644 |
3310 | --- a/drivers/md/dm-mpath.c |
3311 | +++ b/drivers/md/dm-mpath.c |
3312 | @@ -87,6 +87,7 @@ struct multipath { |
3313 | unsigned queue_if_no_path:1; /* Queue I/O if last path fails? */ |
3314 | unsigned saved_queue_if_no_path:1; /* Saved state during suspension */ |
3315 | unsigned retain_attached_hw_handler:1; /* If there's already a hw_handler present, don't change it. */ |
3316 | + unsigned pg_init_disabled:1; /* pg_init is not currently allowed */ |
3317 | |
3318 | unsigned pg_init_retries; /* Number of times to retry pg_init */ |
3319 | unsigned pg_init_count; /* Number of times pg_init called */ |
3320 | @@ -497,7 +498,8 @@ static void process_queued_ios(struct work_struct *work) |
3321 | (!pgpath && !m->queue_if_no_path)) |
3322 | must_queue = 0; |
3323 | |
3324 | - if (m->pg_init_required && !m->pg_init_in_progress && pgpath) |
3325 | + if (m->pg_init_required && !m->pg_init_in_progress && pgpath && |
3326 | + !m->pg_init_disabled) |
3327 | __pg_init_all_paths(m); |
3328 | |
3329 | spin_unlock_irqrestore(&m->lock, flags); |
3330 | @@ -942,10 +944,20 @@ static void multipath_wait_for_pg_init_completion(struct multipath *m) |
3331 | |
3332 | static void flush_multipath_work(struct multipath *m) |
3333 | { |
3334 | + unsigned long flags; |
3335 | + |
3336 | + spin_lock_irqsave(&m->lock, flags); |
3337 | + m->pg_init_disabled = 1; |
3338 | + spin_unlock_irqrestore(&m->lock, flags); |
3339 | + |
3340 | flush_workqueue(kmpath_handlerd); |
3341 | multipath_wait_for_pg_init_completion(m); |
3342 | flush_workqueue(kmultipathd); |
3343 | flush_work(&m->trigger_event); |
3344 | + |
3345 | + spin_lock_irqsave(&m->lock, flags); |
3346 | + m->pg_init_disabled = 0; |
3347 | + spin_unlock_irqrestore(&m->lock, flags); |
3348 | } |
3349 | |
3350 | static void multipath_dtr(struct dm_target *ti) |
3351 | @@ -1164,7 +1176,7 @@ static int pg_init_limit_reached(struct multipath *m, struct pgpath *pgpath) |
3352 | |
3353 | spin_lock_irqsave(&m->lock, flags); |
3354 | |
3355 | - if (m->pg_init_count <= m->pg_init_retries) |
3356 | + if (m->pg_init_count <= m->pg_init_retries && !m->pg_init_disabled) |
3357 | m->pg_init_required = 1; |
3358 | else |
3359 | limit_reached = 1; |
3360 | @@ -1714,7 +1726,7 @@ out: |
3361 | *---------------------------------------------------------------*/ |
3362 | static struct target_type multipath_target = { |
3363 | .name = "multipath", |
3364 | - .version = {1, 5, 1}, |
3365 | + .version = {1, 6, 0}, |
3366 | .module = THIS_MODULE, |
3367 | .ctr = multipath_ctr, |
3368 | .dtr = multipath_dtr, |
3369 | diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c |
3370 | index 8f878353..41d907b5 100644 |
3371 | --- a/drivers/md/dm-table.c |
3372 | +++ b/drivers/md/dm-table.c |
3373 | @@ -545,14 +545,28 @@ static int adjoin(struct dm_table *table, struct dm_target *ti) |
3374 | |
3375 | /* |
3376 | * Used to dynamically allocate the arg array. |
3377 | + * |
3378 | + * We do first allocation with GFP_NOIO because dm-mpath and dm-thin must |
3379 | + * process messages even if some device is suspended. These messages have a |
3380 | + * small fixed number of arguments. |
3381 | + * |
3382 | + * On the other hand, dm-switch needs to process bulk data using messages and |
3383 | + * excessive use of GFP_NOIO could cause trouble. |
3384 | */ |
3385 | static char **realloc_argv(unsigned *array_size, char **old_argv) |
3386 | { |
3387 | char **argv; |
3388 | unsigned new_size; |
3389 | + gfp_t gfp; |
3390 | |
3391 | - new_size = *array_size ? *array_size * 2 : 64; |
3392 | - argv = kmalloc(new_size * sizeof(*argv), GFP_KERNEL); |
3393 | + if (*array_size) { |
3394 | + new_size = *array_size * 2; |
3395 | + gfp = GFP_KERNEL; |
3396 | + } else { |
3397 | + new_size = 8; |
3398 | + gfp = GFP_NOIO; |
3399 | + } |
3400 | + argv = kmalloc(new_size * sizeof(*argv), gfp); |
3401 | if (argv) { |
3402 | memcpy(argv, old_argv, *array_size * sizeof(*argv)); |
3403 | *array_size = new_size; |
3404 | diff --git a/drivers/md/md.c b/drivers/md/md.c |
3405 | index 561a65f8..ba46d974 100644 |
3406 | --- a/drivers/md/md.c |
3407 | +++ b/drivers/md/md.c |
3408 | @@ -3620,6 +3620,7 @@ level_store(struct mddev *mddev, const char *buf, size_t len) |
3409 | mddev->in_sync = 1; |
3410 | del_timer_sync(&mddev->safemode_timer); |
3411 | } |
3412 | + blk_set_stacking_limits(&mddev->queue->limits); |
3413 | pers->run(mddev); |
3414 | set_bit(MD_CHANGE_DEVS, &mddev->flags); |
3415 | mddev_resume(mddev); |
3416 | @@ -7791,7 +7792,7 @@ void md_check_recovery(struct mddev *mddev) |
3417 | if (mddev->ro && !test_bit(MD_RECOVERY_NEEDED, &mddev->recovery)) |
3418 | return; |
3419 | if ( ! ( |
3420 | - (mddev->flags & ~ (1<<MD_CHANGE_PENDING)) || |
3421 | + (mddev->flags & MD_UPDATE_SB_FLAGS & ~ (1<<MD_CHANGE_PENDING)) || |
3422 | test_bit(MD_RECOVERY_NEEDED, &mddev->recovery) || |
3423 | test_bit(MD_RECOVERY_DONE, &mddev->recovery) || |
3424 | (mddev->external == 0 && mddev->safemode == 1) || |
3425 | diff --git a/drivers/md/persistent-data/dm-array.c b/drivers/md/persistent-data/dm-array.c |
3426 | index 172147eb..af96e24e 100644 |
3427 | --- a/drivers/md/persistent-data/dm-array.c |
3428 | +++ b/drivers/md/persistent-data/dm-array.c |
3429 | @@ -509,15 +509,18 @@ static int grow_add_tail_block(struct resize *resize) |
3430 | static int grow_needs_more_blocks(struct resize *resize) |
3431 | { |
3432 | int r; |
3433 | + unsigned old_nr_blocks = resize->old_nr_full_blocks; |
3434 | |
3435 | if (resize->old_nr_entries_in_last_block > 0) { |
3436 | + old_nr_blocks++; |
3437 | + |
3438 | r = grow_extend_tail_block(resize, resize->max_entries); |
3439 | if (r) |
3440 | return r; |
3441 | } |
3442 | |
3443 | r = insert_full_ablocks(resize->info, resize->size_of_block, |
3444 | - resize->old_nr_full_blocks, |
3445 | + old_nr_blocks, |
3446 | resize->new_nr_full_blocks, |
3447 | resize->max_entries, resize->value, |
3448 | &resize->root); |
3449 | diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c |
3450 | index f8b90684..e4109f61 100644 |
3451 | --- a/drivers/md/raid5.c |
3452 | +++ b/drivers/md/raid5.c |
3453 | @@ -340,7 +340,8 @@ static void release_stripe(struct stripe_head *sh) |
3454 | unsigned long flags; |
3455 | bool wakeup; |
3456 | |
3457 | - if (test_and_set_bit(STRIPE_ON_RELEASE_LIST, &sh->state)) |
3458 | + if (unlikely(!conf->mddev->thread) || |
3459 | + test_and_set_bit(STRIPE_ON_RELEASE_LIST, &sh->state)) |
3460 | goto slow_path; |
3461 | wakeup = llist_add(&sh->release_list, &conf->released_stripes); |
3462 | if (wakeup) |
3463 | @@ -5239,6 +5240,9 @@ raid5_store_group_thread_cnt(struct mddev *mddev, const char *page, size_t len) |
3464 | old_groups = conf->worker_groups; |
3465 | old_group_cnt = conf->worker_cnt_per_group; |
3466 | |
3467 | + if (old_groups) |
3468 | + flush_workqueue(raid5_wq); |
3469 | + |
3470 | conf->worker_groups = NULL; |
3471 | err = alloc_thread_groups(conf, new); |
3472 | if (err) { |
3473 | diff --git a/drivers/media/dvb-frontends/af9013.c b/drivers/media/dvb-frontends/af9013.c |
3474 | index a204f282..fb504f1e 100644 |
3475 | --- a/drivers/media/dvb-frontends/af9013.c |
3476 | +++ b/drivers/media/dvb-frontends/af9013.c |
3477 | @@ -24,6 +24,9 @@ |
3478 | |
3479 | #include "af9013_priv.h" |
3480 | |
3481 | +/* Max transfer size done by I2C transfer functions */ |
3482 | +#define MAX_XFER_SIZE 64 |
3483 | + |
3484 | struct af9013_state { |
3485 | struct i2c_adapter *i2c; |
3486 | struct dvb_frontend fe; |
3487 | @@ -50,16 +53,23 @@ static int af9013_wr_regs_i2c(struct af9013_state *priv, u8 mbox, u16 reg, |
3488 | const u8 *val, int len) |
3489 | { |
3490 | int ret; |
3491 | - u8 buf[3+len]; |
3492 | + u8 buf[MAX_XFER_SIZE]; |
3493 | struct i2c_msg msg[1] = { |
3494 | { |
3495 | .addr = priv->config.i2c_addr, |
3496 | .flags = 0, |
3497 | - .len = sizeof(buf), |
3498 | + .len = 3 + len, |
3499 | .buf = buf, |
3500 | } |
3501 | }; |
3502 | |
3503 | + if (3 + len > sizeof(buf)) { |
3504 | + dev_warn(&priv->i2c->dev, |
3505 | + "%s: i2c wr reg=%04x: len=%d is too big!\n", |
3506 | + KBUILD_MODNAME, reg, len); |
3507 | + return -EINVAL; |
3508 | + } |
3509 | + |
3510 | buf[0] = (reg >> 8) & 0xff; |
3511 | buf[1] = (reg >> 0) & 0xff; |
3512 | buf[2] = mbox; |
3513 | diff --git a/drivers/media/dvb-frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c |
3514 | index a777b4b9..30ee5905 100644 |
3515 | --- a/drivers/media/dvb-frontends/af9033.c |
3516 | +++ b/drivers/media/dvb-frontends/af9033.c |
3517 | @@ -21,6 +21,9 @@ |
3518 | |
3519 | #include "af9033_priv.h" |
3520 | |
3521 | +/* Max transfer size done by I2C transfer functions */ |
3522 | +#define MAX_XFER_SIZE 64 |
3523 | + |
3524 | struct af9033_state { |
3525 | struct i2c_adapter *i2c; |
3526 | struct dvb_frontend fe; |
3527 | @@ -40,16 +43,23 @@ static int af9033_wr_regs(struct af9033_state *state, u32 reg, const u8 *val, |
3528 | int len) |
3529 | { |
3530 | int ret; |
3531 | - u8 buf[3 + len]; |
3532 | + u8 buf[MAX_XFER_SIZE]; |
3533 | struct i2c_msg msg[1] = { |
3534 | { |
3535 | .addr = state->cfg.i2c_addr, |
3536 | .flags = 0, |
3537 | - .len = sizeof(buf), |
3538 | + .len = 3 + len, |
3539 | .buf = buf, |
3540 | } |
3541 | }; |
3542 | |
3543 | + if (3 + len > sizeof(buf)) { |
3544 | + dev_warn(&state->i2c->dev, |
3545 | + "%s: i2c wr reg=%04x: len=%d is too big!\n", |
3546 | + KBUILD_MODNAME, reg, len); |
3547 | + return -EINVAL; |
3548 | + } |
3549 | + |
3550 | buf[0] = (reg >> 16) & 0xff; |
3551 | buf[1] = (reg >> 8) & 0xff; |
3552 | buf[2] = (reg >> 0) & 0xff; |
3553 | @@ -161,7 +171,14 @@ static int af9033_wr_reg_val_tab(struct af9033_state *state, |
3554 | const struct reg_val *tab, int tab_len) |
3555 | { |
3556 | int ret, i, j; |
3557 | - u8 buf[tab_len]; |
3558 | + u8 buf[MAX_XFER_SIZE]; |
3559 | + |
3560 | + if (tab_len > sizeof(buf)) { |
3561 | + dev_warn(&state->i2c->dev, |
3562 | + "%s: i2c wr len=%d is too big!\n", |
3563 | + KBUILD_MODNAME, tab_len); |
3564 | + return -EINVAL; |
3565 | + } |
3566 | |
3567 | dev_dbg(&state->i2c->dev, "%s: tab_len=%d\n", __func__, tab_len); |
3568 | |
3569 | diff --git a/drivers/media/dvb-frontends/bcm3510.c b/drivers/media/dvb-frontends/bcm3510.c |
3570 | index 1b77909c..39a29dd2 100644 |
3571 | --- a/drivers/media/dvb-frontends/bcm3510.c |
3572 | +++ b/drivers/media/dvb-frontends/bcm3510.c |
3573 | @@ -44,6 +44,9 @@ |
3574 | #include "bcm3510.h" |
3575 | #include "bcm3510_priv.h" |
3576 | |
3577 | +/* Max transfer size done by bcm3510_do_hab_cmd() function */ |
3578 | +#define MAX_XFER_SIZE 128 |
3579 | + |
3580 | struct bcm3510_state { |
3581 | |
3582 | struct i2c_adapter* i2c; |
3583 | @@ -201,9 +204,19 @@ static int bcm3510_hab_send_request(struct bcm3510_state *st, u8 *buf, int len) |
3584 | |
3585 | static int bcm3510_do_hab_cmd(struct bcm3510_state *st, u8 cmd, u8 msgid, u8 *obuf, u8 olen, u8 *ibuf, u8 ilen) |
3586 | { |
3587 | - u8 ob[olen+2],ib[ilen+2]; |
3588 | + u8 ob[MAX_XFER_SIZE], ib[MAX_XFER_SIZE]; |
3589 | int ret = 0; |
3590 | |
3591 | + if (ilen + 2 > sizeof(ib)) { |
3592 | + deb_hab("do_hab_cmd: ilen=%d is too big!\n", ilen); |
3593 | + return -EINVAL; |
3594 | + } |
3595 | + |
3596 | + if (olen + 2 > sizeof(ob)) { |
3597 | + deb_hab("do_hab_cmd: olen=%d is too big!\n", olen); |
3598 | + return -EINVAL; |
3599 | + } |
3600 | + |
3601 | ob[0] = cmd; |
3602 | ob[1] = msgid; |
3603 | memcpy(&ob[2],obuf,olen); |
3604 | diff --git a/drivers/media/dvb-frontends/cxd2820r_core.c b/drivers/media/dvb-frontends/cxd2820r_core.c |
3605 | index 7ca5c69d..51447a04 100644 |
3606 | --- a/drivers/media/dvb-frontends/cxd2820r_core.c |
3607 | +++ b/drivers/media/dvb-frontends/cxd2820r_core.c |
3608 | @@ -21,12 +21,15 @@ |
3609 | |
3610 | #include "cxd2820r_priv.h" |
3611 | |
3612 | +/* Max transfer size done by I2C transfer functions */ |
3613 | +#define MAX_XFER_SIZE 64 |
3614 | + |
3615 | /* write multiple registers */ |
3616 | static int cxd2820r_wr_regs_i2c(struct cxd2820r_priv *priv, u8 i2c, u8 reg, |
3617 | u8 *val, int len) |
3618 | { |
3619 | int ret; |
3620 | - u8 buf[len+1]; |
3621 | + u8 buf[MAX_XFER_SIZE]; |
3622 | struct i2c_msg msg[1] = { |
3623 | { |
3624 | .addr = i2c, |
3625 | @@ -36,6 +39,13 @@ static int cxd2820r_wr_regs_i2c(struct cxd2820r_priv *priv, u8 i2c, u8 reg, |
3626 | } |
3627 | }; |
3628 | |
3629 | + if (1 + len > sizeof(buf)) { |
3630 | + dev_warn(&priv->i2c->dev, |
3631 | + "%s: i2c wr reg=%04x: len=%d is too big!\n", |
3632 | + KBUILD_MODNAME, reg, len); |
3633 | + return -EINVAL; |
3634 | + } |
3635 | + |
3636 | buf[0] = reg; |
3637 | memcpy(&buf[1], val, len); |
3638 | |
3639 | @@ -55,7 +65,7 @@ static int cxd2820r_rd_regs_i2c(struct cxd2820r_priv *priv, u8 i2c, u8 reg, |
3640 | u8 *val, int len) |
3641 | { |
3642 | int ret; |
3643 | - u8 buf[len]; |
3644 | + u8 buf[MAX_XFER_SIZE]; |
3645 | struct i2c_msg msg[2] = { |
3646 | { |
3647 | .addr = i2c, |
3648 | @@ -70,6 +80,13 @@ static int cxd2820r_rd_regs_i2c(struct cxd2820r_priv *priv, u8 i2c, u8 reg, |
3649 | } |
3650 | }; |
3651 | |
3652 | + if (len > sizeof(buf)) { |
3653 | + dev_warn(&priv->i2c->dev, |
3654 | + "%s: i2c wr reg=%04x: len=%d is too big!\n", |
3655 | + KBUILD_MODNAME, reg, len); |
3656 | + return -EINVAL; |
3657 | + } |
3658 | + |
3659 | ret = i2c_transfer(priv->i2c, msg, 2); |
3660 | if (ret == 2) { |
3661 | memcpy(val, buf, len); |
3662 | diff --git a/drivers/media/dvb-frontends/itd1000.c b/drivers/media/dvb-frontends/itd1000.c |
3663 | index c1c3400b..cadcae4c 100644 |
3664 | --- a/drivers/media/dvb-frontends/itd1000.c |
3665 | +++ b/drivers/media/dvb-frontends/itd1000.c |
3666 | @@ -31,6 +31,9 @@ |
3667 | #include "itd1000.h" |
3668 | #include "itd1000_priv.h" |
3669 | |
3670 | +/* Max transfer size done by I2C transfer functions */ |
3671 | +#define MAX_XFER_SIZE 64 |
3672 | + |
3673 | static int debug; |
3674 | module_param(debug, int, 0644); |
3675 | MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off)."); |
3676 | @@ -52,10 +55,18 @@ MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off)."); |
3677 | /* don't write more than one byte with flexcop behind */ |
3678 | static int itd1000_write_regs(struct itd1000_state *state, u8 reg, u8 v[], u8 len) |
3679 | { |
3680 | - u8 buf[1+len]; |
3681 | + u8 buf[MAX_XFER_SIZE]; |
3682 | struct i2c_msg msg = { |
3683 | .addr = state->cfg->i2c_address, .flags = 0, .buf = buf, .len = len+1 |
3684 | }; |
3685 | + |
3686 | + if (1 + len > sizeof(buf)) { |
3687 | + printk(KERN_WARNING |
3688 | + "itd1000: i2c wr reg=%04x: len=%d is too big!\n", |
3689 | + reg, len); |
3690 | + return -EINVAL; |
3691 | + } |
3692 | + |
3693 | buf[0] = reg; |
3694 | memcpy(&buf[1], v, len); |
3695 | |
3696 | diff --git a/drivers/media/dvb-frontends/mt312.c b/drivers/media/dvb-frontends/mt312.c |
3697 | index ec388c1d..a74ac0dd 100644 |
3698 | --- a/drivers/media/dvb-frontends/mt312.c |
3699 | +++ b/drivers/media/dvb-frontends/mt312.c |
3700 | @@ -36,6 +36,8 @@ |
3701 | #include "mt312_priv.h" |
3702 | #include "mt312.h" |
3703 | |
3704 | +/* Max transfer size done by I2C transfer functions */ |
3705 | +#define MAX_XFER_SIZE 64 |
3706 | |
3707 | struct mt312_state { |
3708 | struct i2c_adapter *i2c; |
3709 | @@ -96,9 +98,15 @@ static int mt312_write(struct mt312_state *state, const enum mt312_reg_addr reg, |
3710 | const u8 *src, const size_t count) |
3711 | { |
3712 | int ret; |
3713 | - u8 buf[count + 1]; |
3714 | + u8 buf[MAX_XFER_SIZE]; |
3715 | struct i2c_msg msg; |
3716 | |
3717 | + if (1 + count > sizeof(buf)) { |
3718 | + printk(KERN_WARNING |
3719 | + "mt312: write: len=%zd is too big!\n", count); |
3720 | + return -EINVAL; |
3721 | + } |
3722 | + |
3723 | if (debug) { |
3724 | int i; |
3725 | dprintk("W(%d):", reg & 0x7f); |
3726 | diff --git a/drivers/media/dvb-frontends/nxt200x.c b/drivers/media/dvb-frontends/nxt200x.c |
3727 | index 8e288940..fbca9856 100644 |
3728 | --- a/drivers/media/dvb-frontends/nxt200x.c |
3729 | +++ b/drivers/media/dvb-frontends/nxt200x.c |
3730 | @@ -39,6 +39,9 @@ |
3731 | */ |
3732 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
3733 | |
3734 | +/* Max transfer size done by I2C transfer functions */ |
3735 | +#define MAX_XFER_SIZE 64 |
3736 | + |
3737 | #define NXT2002_DEFAULT_FIRMWARE "dvb-fe-nxt2002.fw" |
3738 | #define NXT2004_DEFAULT_FIRMWARE "dvb-fe-nxt2004.fw" |
3739 | #define CRC_CCIT_MASK 0x1021 |
3740 | @@ -95,10 +98,16 @@ static int i2c_readbytes(struct nxt200x_state *state, u8 addr, u8 *buf, u8 len) |
3741 | static int nxt200x_writebytes (struct nxt200x_state* state, u8 reg, |
3742 | const u8 *buf, u8 len) |
3743 | { |
3744 | - u8 buf2 [len+1]; |
3745 | + u8 buf2[MAX_XFER_SIZE]; |
3746 | int err; |
3747 | struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf2, .len = len + 1 }; |
3748 | |
3749 | + if (1 + len > sizeof(buf2)) { |
3750 | + pr_warn("%s: i2c wr reg=%04x: len=%d is too big!\n", |
3751 | + __func__, reg, len); |
3752 | + return -EINVAL; |
3753 | + } |
3754 | + |
3755 | buf2[0] = reg; |
3756 | memcpy(&buf2[1], buf, len); |
3757 | |
3758 | diff --git a/drivers/media/dvb-frontends/rtl2830.c b/drivers/media/dvb-frontends/rtl2830.c |
3759 | index 362d26d1..7efb796c 100644 |
3760 | --- a/drivers/media/dvb-frontends/rtl2830.c |
3761 | +++ b/drivers/media/dvb-frontends/rtl2830.c |
3762 | @@ -27,20 +27,30 @@ |
3763 | |
3764 | #include "rtl2830_priv.h" |
3765 | |
3766 | +/* Max transfer size done by I2C transfer functions */ |
3767 | +#define MAX_XFER_SIZE 64 |
3768 | + |
3769 | /* write multiple hardware registers */ |
3770 | static int rtl2830_wr(struct rtl2830_priv *priv, u8 reg, const u8 *val, int len) |
3771 | { |
3772 | int ret; |
3773 | - u8 buf[1+len]; |
3774 | + u8 buf[MAX_XFER_SIZE]; |
3775 | struct i2c_msg msg[1] = { |
3776 | { |
3777 | .addr = priv->cfg.i2c_addr, |
3778 | .flags = 0, |
3779 | - .len = 1+len, |
3780 | + .len = 1 + len, |
3781 | .buf = buf, |
3782 | } |
3783 | }; |
3784 | |
3785 | + if (1 + len > sizeof(buf)) { |
3786 | + dev_warn(&priv->i2c->dev, |
3787 | + "%s: i2c wr reg=%04x: len=%d is too big!\n", |
3788 | + KBUILD_MODNAME, reg, len); |
3789 | + return -EINVAL; |
3790 | + } |
3791 | + |
3792 | buf[0] = reg; |
3793 | memcpy(&buf[1], val, len); |
3794 | |
3795 | diff --git a/drivers/media/dvb-frontends/rtl2832.c b/drivers/media/dvb-frontends/rtl2832.c |
3796 | index facb8484..b8dd0a13 100644 |
3797 | --- a/drivers/media/dvb-frontends/rtl2832.c |
3798 | +++ b/drivers/media/dvb-frontends/rtl2832.c |
3799 | @@ -22,6 +22,9 @@ |
3800 | #include "dvb_math.h" |
3801 | #include <linux/bitops.h> |
3802 | |
3803 | +/* Max transfer size done by I2C transfer functions */ |
3804 | +#define MAX_XFER_SIZE 64 |
3805 | + |
3806 | int rtl2832_debug; |
3807 | module_param_named(debug, rtl2832_debug, int, 0644); |
3808 | MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off)."); |
3809 | @@ -162,16 +165,23 @@ static const struct rtl2832_reg_entry registers[] = { |
3810 | static int rtl2832_wr(struct rtl2832_priv *priv, u8 reg, u8 *val, int len) |
3811 | { |
3812 | int ret; |
3813 | - u8 buf[1+len]; |
3814 | + u8 buf[MAX_XFER_SIZE]; |
3815 | struct i2c_msg msg[1] = { |
3816 | { |
3817 | .addr = priv->cfg.i2c_addr, |
3818 | .flags = 0, |
3819 | - .len = 1+len, |
3820 | + .len = 1 + len, |
3821 | .buf = buf, |
3822 | } |
3823 | }; |
3824 | |
3825 | + if (1 + len > sizeof(buf)) { |
3826 | + dev_warn(&priv->i2c->dev, |
3827 | + "%s: i2c wr reg=%04x: len=%d is too big!\n", |
3828 | + KBUILD_MODNAME, reg, len); |
3829 | + return -EINVAL; |
3830 | + } |
3831 | + |
3832 | buf[0] = reg; |
3833 | memcpy(&buf[1], val, len); |
3834 | |
3835 | diff --git a/drivers/media/dvb-frontends/s5h1420.c b/drivers/media/dvb-frontends/s5h1420.c |
3836 | index e2fec9eb..93eeaf71 100644 |
3837 | --- a/drivers/media/dvb-frontends/s5h1420.c |
3838 | +++ b/drivers/media/dvb-frontends/s5h1420.c |
3839 | @@ -836,9 +836,16 @@ static u32 s5h1420_tuner_i2c_func(struct i2c_adapter *adapter) |
3840 | static int s5h1420_tuner_i2c_tuner_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msg[], int num) |
3841 | { |
3842 | struct s5h1420_state *state = i2c_get_adapdata(i2c_adap); |
3843 | - struct i2c_msg m[1 + num]; |
3844 | + struct i2c_msg m[3]; |
3845 | u8 tx_open[2] = { CON_1, state->CON_1_val | 1 }; /* repeater stops once there was a stop condition */ |
3846 | |
3847 | + if (1 + num > ARRAY_SIZE(m)) { |
3848 | + printk(KERN_WARNING |
3849 | + "%s: i2c xfer: num=%d is too big!\n", |
3850 | + KBUILD_MODNAME, num); |
3851 | + return -EOPNOTSUPP; |
3852 | + } |
3853 | + |
3854 | memset(m, 0, sizeof(struct i2c_msg) * (1 + num)); |
3855 | |
3856 | m[0].addr = state->config->demod_address; |
3857 | @@ -847,7 +854,7 @@ static int s5h1420_tuner_i2c_tuner_xfer(struct i2c_adapter *i2c_adap, struct i2c |
3858 | |
3859 | memcpy(&m[1], msg, sizeof(struct i2c_msg) * num); |
3860 | |
3861 | - return i2c_transfer(state->i2c, m, 1+num) == 1 + num ? num : -EIO; |
3862 | + return i2c_transfer(state->i2c, m, 1 + num) == 1 + num ? num : -EIO; |
3863 | } |
3864 | |
3865 | static struct i2c_algorithm s5h1420_tuner_i2c_algo = { |
3866 | diff --git a/drivers/media/dvb-frontends/stb0899_drv.c b/drivers/media/dvb-frontends/stb0899_drv.c |
3867 | index 3dd5714e..07cd5ea7 100644 |
3868 | --- a/drivers/media/dvb-frontends/stb0899_drv.c |
3869 | +++ b/drivers/media/dvb-frontends/stb0899_drv.c |
3870 | @@ -32,6 +32,9 @@ |
3871 | #include "stb0899_priv.h" |
3872 | #include "stb0899_reg.h" |
3873 | |
3874 | +/* Max transfer size done by I2C transfer functions */ |
3875 | +#define MAX_XFER_SIZE 64 |
3876 | + |
3877 | static unsigned int verbose = 0;//1; |
3878 | module_param(verbose, int, 0644); |
3879 | |
3880 | @@ -499,7 +502,7 @@ err: |
3881 | int stb0899_write_regs(struct stb0899_state *state, unsigned int reg, u8 *data, u32 count) |
3882 | { |
3883 | int ret; |
3884 | - u8 buf[2 + count]; |
3885 | + u8 buf[MAX_XFER_SIZE]; |
3886 | struct i2c_msg i2c_msg = { |
3887 | .addr = state->config->demod_address, |
3888 | .flags = 0, |
3889 | @@ -507,6 +510,13 @@ int stb0899_write_regs(struct stb0899_state *state, unsigned int reg, u8 *data, |
3890 | .len = 2 + count |
3891 | }; |
3892 | |
3893 | + if (2 + count > sizeof(buf)) { |
3894 | + printk(KERN_WARNING |
3895 | + "%s: i2c wr reg=%04x: len=%d is too big!\n", |
3896 | + KBUILD_MODNAME, reg, count); |
3897 | + return -EINVAL; |
3898 | + } |
3899 | + |
3900 | buf[0] = reg >> 8; |
3901 | buf[1] = reg & 0xff; |
3902 | memcpy(&buf[2], data, count); |
3903 | diff --git a/drivers/media/dvb-frontends/stb6100.c b/drivers/media/dvb-frontends/stb6100.c |
3904 | index 45f9523f..cea175d1 100644 |
3905 | --- a/drivers/media/dvb-frontends/stb6100.c |
3906 | +++ b/drivers/media/dvb-frontends/stb6100.c |
3907 | @@ -31,6 +31,8 @@ |
3908 | static unsigned int verbose; |
3909 | module_param(verbose, int, 0644); |
3910 | |
3911 | +/* Max transfer size done by I2C transfer functions */ |
3912 | +#define MAX_XFER_SIZE 64 |
3913 | |
3914 | #define FE_ERROR 0 |
3915 | #define FE_NOTICE 1 |
3916 | @@ -183,7 +185,7 @@ static int stb6100_read_reg(struct stb6100_state *state, u8 reg) |
3917 | static int stb6100_write_reg_range(struct stb6100_state *state, u8 buf[], int start, int len) |
3918 | { |
3919 | int rc; |
3920 | - u8 cmdbuf[len + 1]; |
3921 | + u8 cmdbuf[MAX_XFER_SIZE]; |
3922 | struct i2c_msg msg = { |
3923 | .addr = state->config->tuner_address, |
3924 | .flags = 0, |
3925 | @@ -191,6 +193,13 @@ static int stb6100_write_reg_range(struct stb6100_state *state, u8 buf[], int st |
3926 | .len = len + 1 |
3927 | }; |
3928 | |
3929 | + if (1 + len > sizeof(buf)) { |
3930 | + printk(KERN_WARNING |
3931 | + "%s: i2c wr: len=%d is too big!\n", |
3932 | + KBUILD_MODNAME, len); |
3933 | + return -EINVAL; |
3934 | + } |
3935 | + |
3936 | if (unlikely(start < 1 || start + len > STB6100_NUMREGS)) { |
3937 | dprintk(verbose, FE_ERROR, 1, "Invalid register range %d:%d", |
3938 | start, len); |
3939 | diff --git a/drivers/media/dvb-frontends/stv0367.c b/drivers/media/dvb-frontends/stv0367.c |
3940 | index 7b6dba3c..45877273 100644 |
3941 | --- a/drivers/media/dvb-frontends/stv0367.c |
3942 | +++ b/drivers/media/dvb-frontends/stv0367.c |
3943 | @@ -33,6 +33,9 @@ |
3944 | #include "stv0367_regs.h" |
3945 | #include "stv0367_priv.h" |
3946 | |
3947 | +/* Max transfer size done by I2C transfer functions */ |
3948 | +#define MAX_XFER_SIZE 64 |
3949 | + |
3950 | static int stvdebug; |
3951 | module_param_named(debug, stvdebug, int, 0644); |
3952 | |
3953 | @@ -767,7 +770,7 @@ static struct st_register def0367cab[STV0367CAB_NBREGS] = { |
3954 | static |
3955 | int stv0367_writeregs(struct stv0367_state *state, u16 reg, u8 *data, int len) |
3956 | { |
3957 | - u8 buf[len + 2]; |
3958 | + u8 buf[MAX_XFER_SIZE]; |
3959 | struct i2c_msg msg = { |
3960 | .addr = state->config->demod_address, |
3961 | .flags = 0, |
3962 | @@ -776,6 +779,14 @@ int stv0367_writeregs(struct stv0367_state *state, u16 reg, u8 *data, int len) |
3963 | }; |
3964 | int ret; |
3965 | |
3966 | + if (2 + len > sizeof(buf)) { |
3967 | + printk(KERN_WARNING |
3968 | + "%s: i2c wr reg=%04x: len=%d is too big!\n", |
3969 | + KBUILD_MODNAME, reg, len); |
3970 | + return -EINVAL; |
3971 | + } |
3972 | + |
3973 | + |
3974 | buf[0] = MSB(reg); |
3975 | buf[1] = LSB(reg); |
3976 | memcpy(buf + 2, data, len); |
3977 | diff --git a/drivers/media/dvb-frontends/stv090x.c b/drivers/media/dvb-frontends/stv090x.c |
3978 | index 56d470ad..23e872f8 100644 |
3979 | --- a/drivers/media/dvb-frontends/stv090x.c |
3980 | +++ b/drivers/media/dvb-frontends/stv090x.c |
3981 | @@ -35,6 +35,9 @@ |
3982 | #include "stv090x.h" |
3983 | #include "stv090x_priv.h" |
3984 | |
3985 | +/* Max transfer size done by I2C transfer functions */ |
3986 | +#define MAX_XFER_SIZE 64 |
3987 | + |
3988 | static unsigned int verbose; |
3989 | module_param(verbose, int, 0644); |
3990 | |
3991 | @@ -722,9 +725,16 @@ static int stv090x_write_regs(struct stv090x_state *state, unsigned int reg, u8 |
3992 | { |
3993 | const struct stv090x_config *config = state->config; |
3994 | int ret; |
3995 | - u8 buf[2 + count]; |
3996 | + u8 buf[MAX_XFER_SIZE]; |
3997 | struct i2c_msg i2c_msg = { .addr = config->address, .flags = 0, .buf = buf, .len = 2 + count }; |
3998 | |
3999 | + if (2 + count > sizeof(buf)) { |
4000 | + printk(KERN_WARNING |
4001 | + "%s: i2c wr reg=%04x: len=%d is too big!\n", |
4002 | + KBUILD_MODNAME, reg, count); |
4003 | + return -EINVAL; |
4004 | + } |
4005 | + |
4006 | buf[0] = reg >> 8; |
4007 | buf[1] = reg & 0xff; |
4008 | memcpy(&buf[2], data, count); |
4009 | diff --git a/drivers/media/dvb-frontends/stv6110.c b/drivers/media/dvb-frontends/stv6110.c |
4010 | index 20b5fa92..b1425830 100644 |
4011 | --- a/drivers/media/dvb-frontends/stv6110.c |
4012 | +++ b/drivers/media/dvb-frontends/stv6110.c |
4013 | @@ -30,6 +30,9 @@ |
4014 | |
4015 | #include "stv6110.h" |
4016 | |
4017 | +/* Max transfer size done by I2C transfer functions */ |
4018 | +#define MAX_XFER_SIZE 64 |
4019 | + |
4020 | static int debug; |
4021 | |
4022 | struct stv6110_priv { |
4023 | @@ -68,7 +71,7 @@ static int stv6110_write_regs(struct dvb_frontend *fe, u8 buf[], |
4024 | { |
4025 | struct stv6110_priv *priv = fe->tuner_priv; |
4026 | int rc; |
4027 | - u8 cmdbuf[len + 1]; |
4028 | + u8 cmdbuf[MAX_XFER_SIZE]; |
4029 | struct i2c_msg msg = { |
4030 | .addr = priv->i2c_address, |
4031 | .flags = 0, |
4032 | @@ -78,6 +81,13 @@ static int stv6110_write_regs(struct dvb_frontend *fe, u8 buf[], |
4033 | |
4034 | dprintk("%s\n", __func__); |
4035 | |
4036 | + if (1 + len > sizeof(cmdbuf)) { |
4037 | + printk(KERN_WARNING |
4038 | + "%s: i2c wr: len=%d is too big!\n", |
4039 | + KBUILD_MODNAME, len); |
4040 | + return -EINVAL; |
4041 | + } |
4042 | + |
4043 | if (start + len > 8) |
4044 | return -EINVAL; |
4045 | |
4046 | diff --git a/drivers/media/dvb-frontends/stv6110x.c b/drivers/media/dvb-frontends/stv6110x.c |
4047 | index f36cab12..e66154e5 100644 |
4048 | --- a/drivers/media/dvb-frontends/stv6110x.c |
4049 | +++ b/drivers/media/dvb-frontends/stv6110x.c |
4050 | @@ -32,6 +32,9 @@ |
4051 | #include "stv6110x.h" |
4052 | #include "stv6110x_priv.h" |
4053 | |
4054 | +/* Max transfer size done by I2C transfer functions */ |
4055 | +#define MAX_XFER_SIZE 64 |
4056 | + |
4057 | static unsigned int verbose; |
4058 | module_param(verbose, int, 0644); |
4059 | MODULE_PARM_DESC(verbose, "Set Verbosity level"); |
4060 | @@ -61,7 +64,8 @@ static int stv6110x_write_regs(struct stv6110x_state *stv6110x, int start, u8 da |
4061 | { |
4062 | int ret; |
4063 | const struct stv6110x_config *config = stv6110x->config; |
4064 | - u8 buf[len + 1]; |
4065 | + u8 buf[MAX_XFER_SIZE]; |
4066 | + |
4067 | struct i2c_msg msg = { |
4068 | .addr = config->addr, |
4069 | .flags = 0, |
4070 | @@ -69,6 +73,13 @@ static int stv6110x_write_regs(struct stv6110x_state *stv6110x, int start, u8 da |
4071 | .len = len + 1 |
4072 | }; |
4073 | |
4074 | + if (1 + len > sizeof(buf)) { |
4075 | + printk(KERN_WARNING |
4076 | + "%s: i2c wr: len=%d is too big!\n", |
4077 | + KBUILD_MODNAME, len); |
4078 | + return -EINVAL; |
4079 | + } |
4080 | + |
4081 | if (start + len > 8) |
4082 | return -EINVAL; |
4083 | |
4084 | diff --git a/drivers/media/dvb-frontends/tda10071.c b/drivers/media/dvb-frontends/tda10071.c |
4085 | index e79749cf..8ad3a57c 100644 |
4086 | --- a/drivers/media/dvb-frontends/tda10071.c |
4087 | +++ b/drivers/media/dvb-frontends/tda10071.c |
4088 | @@ -20,6 +20,9 @@ |
4089 | |
4090 | #include "tda10071_priv.h" |
4091 | |
4092 | +/* Max transfer size done by I2C transfer functions */ |
4093 | +#define MAX_XFER_SIZE 64 |
4094 | + |
4095 | static struct dvb_frontend_ops tda10071_ops; |
4096 | |
4097 | /* write multiple registers */ |
4098 | @@ -27,16 +30,23 @@ static int tda10071_wr_regs(struct tda10071_priv *priv, u8 reg, u8 *val, |
4099 | int len) |
4100 | { |
4101 | int ret; |
4102 | - u8 buf[len+1]; |
4103 | + u8 buf[MAX_XFER_SIZE]; |
4104 | struct i2c_msg msg[1] = { |
4105 | { |
4106 | .addr = priv->cfg.demod_i2c_addr, |
4107 | .flags = 0, |
4108 | - .len = sizeof(buf), |
4109 | + .len = 1 + len, |
4110 | .buf = buf, |
4111 | } |
4112 | }; |
4113 | |
4114 | + if (1 + len > sizeof(buf)) { |
4115 | + dev_warn(&priv->i2c->dev, |
4116 | + "%s: i2c wr reg=%04x: len=%d is too big!\n", |
4117 | + KBUILD_MODNAME, reg, len); |
4118 | + return -EINVAL; |
4119 | + } |
4120 | + |
4121 | buf[0] = reg; |
4122 | memcpy(&buf[1], val, len); |
4123 | |
4124 | @@ -56,7 +66,7 @@ static int tda10071_rd_regs(struct tda10071_priv *priv, u8 reg, u8 *val, |
4125 | int len) |
4126 | { |
4127 | int ret; |
4128 | - u8 buf[len]; |
4129 | + u8 buf[MAX_XFER_SIZE]; |
4130 | struct i2c_msg msg[2] = { |
4131 | { |
4132 | .addr = priv->cfg.demod_i2c_addr, |
4133 | @@ -66,11 +76,18 @@ static int tda10071_rd_regs(struct tda10071_priv *priv, u8 reg, u8 *val, |
4134 | }, { |
4135 | .addr = priv->cfg.demod_i2c_addr, |
4136 | .flags = I2C_M_RD, |
4137 | - .len = sizeof(buf), |
4138 | + .len = len, |
4139 | .buf = buf, |
4140 | } |
4141 | }; |
4142 | |
4143 | + if (len > sizeof(buf)) { |
4144 | + dev_warn(&priv->i2c->dev, |
4145 | + "%s: i2c wr reg=%04x: len=%d is too big!\n", |
4146 | + KBUILD_MODNAME, reg, len); |
4147 | + return -EINVAL; |
4148 | + } |
4149 | + |
4150 | ret = i2c_transfer(priv->i2c, msg, 2); |
4151 | if (ret == 2) { |
4152 | memcpy(val, buf, len); |
4153 | diff --git a/drivers/media/dvb-frontends/tda18271c2dd.c b/drivers/media/dvb-frontends/tda18271c2dd.c |
4154 | index d281f77d..2c54586a 100644 |
4155 | --- a/drivers/media/dvb-frontends/tda18271c2dd.c |
4156 | +++ b/drivers/media/dvb-frontends/tda18271c2dd.c |
4157 | @@ -34,6 +34,9 @@ |
4158 | #include "dvb_frontend.h" |
4159 | #include "tda18271c2dd.h" |
4160 | |
4161 | +/* Max transfer size done by I2C transfer functions */ |
4162 | +#define MAX_XFER_SIZE 64 |
4163 | + |
4164 | struct SStandardParam { |
4165 | s32 m_IFFrequency; |
4166 | u32 m_BandWidth; |
4167 | @@ -139,11 +142,18 @@ static int i2c_write(struct i2c_adapter *adap, u8 adr, u8 *data, int len) |
4168 | static int WriteRegs(struct tda_state *state, |
4169 | u8 SubAddr, u8 *Regs, u16 nRegs) |
4170 | { |
4171 | - u8 data[nRegs+1]; |
4172 | + u8 data[MAX_XFER_SIZE]; |
4173 | + |
4174 | + if (1 + nRegs > sizeof(data)) { |
4175 | + printk(KERN_WARNING |
4176 | + "%s: i2c wr: len=%d is too big!\n", |
4177 | + KBUILD_MODNAME, nRegs); |
4178 | + return -EINVAL; |
4179 | + } |
4180 | |
4181 | data[0] = SubAddr; |
4182 | memcpy(data + 1, Regs, nRegs); |
4183 | - return i2c_write(state->i2c, state->adr, data, nRegs+1); |
4184 | + return i2c_write(state->i2c, state->adr, data, nRegs + 1); |
4185 | } |
4186 | |
4187 | static int WriteReg(struct tda_state *state, u8 SubAddr, u8 Reg) |
4188 | diff --git a/drivers/media/dvb-frontends/zl10039.c b/drivers/media/dvb-frontends/zl10039.c |
4189 | index eff9c5fd..91b6b2e9 100644 |
4190 | --- a/drivers/media/dvb-frontends/zl10039.c |
4191 | +++ b/drivers/media/dvb-frontends/zl10039.c |
4192 | @@ -30,6 +30,9 @@ |
4193 | |
4194 | static int debug; |
4195 | |
4196 | +/* Max transfer size done by I2C transfer functions */ |
4197 | +#define MAX_XFER_SIZE 64 |
4198 | + |
4199 | #define dprintk(args...) \ |
4200 | do { \ |
4201 | if (debug) \ |
4202 | @@ -98,7 +101,7 @@ static int zl10039_write(struct zl10039_state *state, |
4203 | const enum zl10039_reg_addr reg, const u8 *src, |
4204 | const size_t count) |
4205 | { |
4206 | - u8 buf[count + 1]; |
4207 | + u8 buf[MAX_XFER_SIZE]; |
4208 | struct i2c_msg msg = { |
4209 | .addr = state->i2c_addr, |
4210 | .flags = 0, |
4211 | @@ -106,6 +109,13 @@ static int zl10039_write(struct zl10039_state *state, |
4212 | .len = count + 1, |
4213 | }; |
4214 | |
4215 | + if (1 + count > sizeof(buf)) { |
4216 | + printk(KERN_WARNING |
4217 | + "%s: i2c wr reg=%04x: len=%zd is too big!\n", |
4218 | + KBUILD_MODNAME, reg, count); |
4219 | + return -EINVAL; |
4220 | + } |
4221 | + |
4222 | dprintk("%s\n", __func__); |
4223 | /* Write register address and data in one go */ |
4224 | buf[0] = reg; |
4225 | diff --git a/drivers/media/pci/cx18/cx18-driver.c b/drivers/media/pci/cx18/cx18-driver.c |
4226 | index 004d8ace..6386ced9 100644 |
4227 | --- a/drivers/media/pci/cx18/cx18-driver.c |
4228 | +++ b/drivers/media/pci/cx18/cx18-driver.c |
4229 | @@ -324,23 +324,24 @@ static void cx18_eeprom_dump(struct cx18 *cx, unsigned char *eedata, int len) |
4230 | /* Hauppauge card? get values from tveeprom */ |
4231 | void cx18_read_eeprom(struct cx18 *cx, struct tveeprom *tv) |
4232 | { |
4233 | - struct i2c_client c; |
4234 | + struct i2c_client *c; |
4235 | u8 eedata[256]; |
4236 | |
4237 | - memset(&c, 0, sizeof(c)); |
4238 | - strlcpy(c.name, "cx18 tveeprom tmp", sizeof(c.name)); |
4239 | - c.adapter = &cx->i2c_adap[0]; |
4240 | - c.addr = 0xA0 >> 1; |
4241 | + c = kzalloc(sizeof(*c), GFP_KERNEL); |
4242 | + |
4243 | + strlcpy(c->name, "cx18 tveeprom tmp", sizeof(c->name)); |
4244 | + c->adapter = &cx->i2c_adap[0]; |
4245 | + c->addr = 0xa0 >> 1; |
4246 | |
4247 | memset(tv, 0, sizeof(*tv)); |
4248 | - if (tveeprom_read(&c, eedata, sizeof(eedata))) |
4249 | - return; |
4250 | + if (tveeprom_read(c, eedata, sizeof(eedata))) |
4251 | + goto ret; |
4252 | |
4253 | switch (cx->card->type) { |
4254 | case CX18_CARD_HVR_1600_ESMT: |
4255 | case CX18_CARD_HVR_1600_SAMSUNG: |
4256 | case CX18_CARD_HVR_1600_S5H1411: |
4257 | - tveeprom_hauppauge_analog(&c, tv, eedata); |
4258 | + tveeprom_hauppauge_analog(c, tv, eedata); |
4259 | break; |
4260 | case CX18_CARD_YUAN_MPC718: |
4261 | case CX18_CARD_GOTVIEW_PCI_DVD3: |
4262 | @@ -354,6 +355,9 @@ void cx18_read_eeprom(struct cx18 *cx, struct tveeprom *tv) |
4263 | cx18_eeprom_dump(cx, eedata, sizeof(eedata)); |
4264 | break; |
4265 | } |
4266 | + |
4267 | +ret: |
4268 | + kfree(c); |
4269 | } |
4270 | |
4271 | static void cx18_process_eeprom(struct cx18 *cx) |
4272 | diff --git a/drivers/media/pci/cx23885/cimax2.c b/drivers/media/pci/cx23885/cimax2.c |
4273 | index 73448491..16fa7ea4 100644 |
4274 | --- a/drivers/media/pci/cx23885/cimax2.c |
4275 | +++ b/drivers/media/pci/cx23885/cimax2.c |
4276 | @@ -26,6 +26,10 @@ |
4277 | #include "cx23885.h" |
4278 | #include "cimax2.h" |
4279 | #include "dvb_ca_en50221.h" |
4280 | + |
4281 | +/* Max transfer size done by I2C transfer functions */ |
4282 | +#define MAX_XFER_SIZE 64 |
4283 | + |
4284 | /**** Bit definitions for MC417_RWD and MC417_OEN registers *** |
4285 | bits 31-16 |
4286 | +-----------+ |
4287 | @@ -125,7 +129,7 @@ static int netup_write_i2c(struct i2c_adapter *i2c_adap, u8 addr, u8 reg, |
4288 | u8 *buf, int len) |
4289 | { |
4290 | int ret; |
4291 | - u8 buffer[len + 1]; |
4292 | + u8 buffer[MAX_XFER_SIZE]; |
4293 | |
4294 | struct i2c_msg msg = { |
4295 | .addr = addr, |
4296 | @@ -134,6 +138,13 @@ static int netup_write_i2c(struct i2c_adapter *i2c_adap, u8 addr, u8 reg, |
4297 | .len = len + 1 |
4298 | }; |
4299 | |
4300 | + if (1 + len > sizeof(buffer)) { |
4301 | + printk(KERN_WARNING |
4302 | + "%s: i2c wr reg=%04x: len=%d is too big!\n", |
4303 | + KBUILD_MODNAME, reg, len); |
4304 | + return -EINVAL; |
4305 | + } |
4306 | + |
4307 | buffer[0] = reg; |
4308 | memcpy(&buffer[1], buf, len); |
4309 | |
4310 | diff --git a/drivers/media/pci/ttpci/av7110_hw.c b/drivers/media/pci/ttpci/av7110_hw.c |
4311 | index f1cbfe52..6299d5da 100644 |
4312 | --- a/drivers/media/pci/ttpci/av7110_hw.c |
4313 | +++ b/drivers/media/pci/ttpci/av7110_hw.c |
4314 | @@ -22,7 +22,7 @@ |
4315 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
4316 | * Or, point your browser to http://www.gnu.org/copyleft/gpl.html |
4317 | * |
4318 | - * the project's page is at http://www.linuxtv.org/ |
4319 | + * the project's page is at http://www.linuxtv.org/ |
4320 | */ |
4321 | |
4322 | /* for debugging ARM communication: */ |
4323 | @@ -40,6 +40,14 @@ |
4324 | |
4325 | #define _NOHANDSHAKE |
4326 | |
4327 | +/* |
4328 | + * Max transfer size done by av7110_fw_cmd() |
4329 | + * |
4330 | + * The maximum size passed to this function is 6 bytes. The buffer also |
4331 | + * uses two additional ones for type and size. So, 8 bytes is enough. |
4332 | + */ |
4333 | +#define MAX_XFER_SIZE 8 |
4334 | + |
4335 | /**************************************************************************** |
4336 | * DEBI functions |
4337 | ****************************************************************************/ |
4338 | @@ -488,11 +496,18 @@ static int av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length) |
4339 | int av7110_fw_cmd(struct av7110 *av7110, int type, int com, int num, ...) |
4340 | { |
4341 | va_list args; |
4342 | - u16 buf[num + 2]; |
4343 | + u16 buf[MAX_XFER_SIZE]; |
4344 | int i, ret; |
4345 | |
4346 | // dprintk(4, "%p\n", av7110); |
4347 | |
4348 | + if (2 + num > sizeof(buf)) { |
4349 | + printk(KERN_WARNING |
4350 | + "%s: %s len=%d is too big!\n", |
4351 | + KBUILD_MODNAME, __func__, num); |
4352 | + return -EINVAL; |
4353 | + } |
4354 | + |
4355 | buf[0] = ((type << 8) | com); |
4356 | buf[1] = num; |
4357 | |
4358 | diff --git a/drivers/media/tuners/e4000.c b/drivers/media/tuners/e4000.c |
4359 | index 6c96e489..72971a8d 100644 |
4360 | --- a/drivers/media/tuners/e4000.c |
4361 | +++ b/drivers/media/tuners/e4000.c |
4362 | @@ -21,20 +21,30 @@ |
4363 | #include "e4000_priv.h" |
4364 | #include <linux/math64.h> |
4365 | |
4366 | +/* Max transfer size done by I2C transfer functions */ |
4367 | +#define MAX_XFER_SIZE 64 |
4368 | + |
4369 | /* write multiple registers */ |
4370 | static int e4000_wr_regs(struct e4000_priv *priv, u8 reg, u8 *val, int len) |
4371 | { |
4372 | int ret; |
4373 | - u8 buf[1 + len]; |
4374 | + u8 buf[MAX_XFER_SIZE]; |
4375 | struct i2c_msg msg[1] = { |
4376 | { |
4377 | .addr = priv->cfg->i2c_addr, |
4378 | .flags = 0, |
4379 | - .len = sizeof(buf), |
4380 | + .len = 1 + len, |
4381 | .buf = buf, |
4382 | } |
4383 | }; |
4384 | |
4385 | + if (1 + len > sizeof(buf)) { |
4386 | + dev_warn(&priv->i2c->dev, |
4387 | + "%s: i2c wr reg=%04x: len=%d is too big!\n", |
4388 | + KBUILD_MODNAME, reg, len); |
4389 | + return -EINVAL; |
4390 | + } |
4391 | + |
4392 | buf[0] = reg; |
4393 | memcpy(&buf[1], val, len); |
4394 | |
4395 | @@ -54,7 +64,7 @@ static int e4000_wr_regs(struct e4000_priv *priv, u8 reg, u8 *val, int len) |
4396 | static int e4000_rd_regs(struct e4000_priv *priv, u8 reg, u8 *val, int len) |
4397 | { |
4398 | int ret; |
4399 | - u8 buf[len]; |
4400 | + u8 buf[MAX_XFER_SIZE]; |
4401 | struct i2c_msg msg[2] = { |
4402 | { |
4403 | .addr = priv->cfg->i2c_addr, |
4404 | @@ -64,11 +74,18 @@ static int e4000_rd_regs(struct e4000_priv *priv, u8 reg, u8 *val, int len) |
4405 | }, { |
4406 | .addr = priv->cfg->i2c_addr, |
4407 | .flags = I2C_M_RD, |
4408 | - .len = sizeof(buf), |
4409 | + .len = len, |
4410 | .buf = buf, |
4411 | } |
4412 | }; |
4413 | |
4414 | + if (len > sizeof(buf)) { |
4415 | + dev_warn(&priv->i2c->dev, |
4416 | + "%s: i2c rd reg=%04x: len=%d is too big!\n", |
4417 | + KBUILD_MODNAME, reg, len); |
4418 | + return -EINVAL; |
4419 | + } |
4420 | + |
4421 | ret = i2c_transfer(priv->i2c, msg, 2); |
4422 | if (ret == 2) { |
4423 | memcpy(val, buf, len); |
4424 | diff --git a/drivers/media/tuners/fc2580.c b/drivers/media/tuners/fc2580.c |
4425 | index 81f38aae..3aecaf46 100644 |
4426 | --- a/drivers/media/tuners/fc2580.c |
4427 | +++ b/drivers/media/tuners/fc2580.c |
4428 | @@ -20,6 +20,9 @@ |
4429 | |
4430 | #include "fc2580_priv.h" |
4431 | |
4432 | +/* Max transfer size done by I2C transfer functions */ |
4433 | +#define MAX_XFER_SIZE 64 |
4434 | + |
4435 | /* |
4436 | * TODO: |
4437 | * I2C write and read works only for one single register. Multiple registers |
4438 | @@ -41,16 +44,23 @@ |
4439 | static int fc2580_wr_regs(struct fc2580_priv *priv, u8 reg, u8 *val, int len) |
4440 | { |
4441 | int ret; |
4442 | - u8 buf[1 + len]; |
4443 | + u8 buf[MAX_XFER_SIZE]; |
4444 | struct i2c_msg msg[1] = { |
4445 | { |
4446 | .addr = priv->cfg->i2c_addr, |
4447 | .flags = 0, |
4448 | - .len = sizeof(buf), |
4449 | + .len = 1 + len, |
4450 | .buf = buf, |
4451 | } |
4452 | }; |
4453 | |
4454 | + if (1 + len > sizeof(buf)) { |
4455 | + dev_warn(&priv->i2c->dev, |
4456 | + "%s: i2c wr reg=%04x: len=%d is too big!\n", |
4457 | + KBUILD_MODNAME, reg, len); |
4458 | + return -EINVAL; |
4459 | + } |
4460 | + |
4461 | buf[0] = reg; |
4462 | memcpy(&buf[1], val, len); |
4463 | |
4464 | @@ -69,7 +79,7 @@ static int fc2580_wr_regs(struct fc2580_priv *priv, u8 reg, u8 *val, int len) |
4465 | static int fc2580_rd_regs(struct fc2580_priv *priv, u8 reg, u8 *val, int len) |
4466 | { |
4467 | int ret; |
4468 | - u8 buf[len]; |
4469 | + u8 buf[MAX_XFER_SIZE]; |
4470 | struct i2c_msg msg[2] = { |
4471 | { |
4472 | .addr = priv->cfg->i2c_addr, |
4473 | @@ -79,11 +89,18 @@ static int fc2580_rd_regs(struct fc2580_priv *priv, u8 reg, u8 *val, int len) |
4474 | }, { |
4475 | .addr = priv->cfg->i2c_addr, |
4476 | .flags = I2C_M_RD, |
4477 | - .len = sizeof(buf), |
4478 | + .len = len, |
4479 | .buf = buf, |
4480 | } |
4481 | }; |
4482 | |
4483 | + if (len > sizeof(buf)) { |
4484 | + dev_warn(&priv->i2c->dev, |
4485 | + "%s: i2c rd reg=%04x: len=%d is too big!\n", |
4486 | + KBUILD_MODNAME, reg, len); |
4487 | + return -EINVAL; |
4488 | + } |
4489 | + |
4490 | ret = i2c_transfer(priv->i2c, msg, 2); |
4491 | if (ret == 2) { |
4492 | memcpy(val, buf, len); |
4493 | diff --git a/drivers/media/tuners/tda18212.c b/drivers/media/tuners/tda18212.c |
4494 | index e4a84ee2..abe256e1 100644 |
4495 | --- a/drivers/media/tuners/tda18212.c |
4496 | +++ b/drivers/media/tuners/tda18212.c |
4497 | @@ -20,6 +20,9 @@ |
4498 | |
4499 | #include "tda18212.h" |
4500 | |
4501 | +/* Max transfer size done by I2C transfer functions */ |
4502 | +#define MAX_XFER_SIZE 64 |
4503 | + |
4504 | struct tda18212_priv { |
4505 | struct tda18212_config *cfg; |
4506 | struct i2c_adapter *i2c; |
4507 | @@ -32,16 +35,23 @@ static int tda18212_wr_regs(struct tda18212_priv *priv, u8 reg, u8 *val, |
4508 | int len) |
4509 | { |
4510 | int ret; |
4511 | - u8 buf[len+1]; |
4512 | + u8 buf[MAX_XFER_SIZE]; |
4513 | struct i2c_msg msg[1] = { |
4514 | { |
4515 | .addr = priv->cfg->i2c_address, |
4516 | .flags = 0, |
4517 | - .len = sizeof(buf), |
4518 | + .len = 1 + len, |
4519 | .buf = buf, |
4520 | } |
4521 | }; |
4522 | |
4523 | + if (1 + len > sizeof(buf)) { |
4524 | + dev_warn(&priv->i2c->dev, |
4525 | + "%s: i2c wr reg=%04x: len=%d is too big!\n", |
4526 | + KBUILD_MODNAME, reg, len); |
4527 | + return -EINVAL; |
4528 | + } |
4529 | + |
4530 | buf[0] = reg; |
4531 | memcpy(&buf[1], val, len); |
4532 | |
4533 | @@ -61,7 +71,7 @@ static int tda18212_rd_regs(struct tda18212_priv *priv, u8 reg, u8 *val, |
4534 | int len) |
4535 | { |
4536 | int ret; |
4537 | - u8 buf[len]; |
4538 | + u8 buf[MAX_XFER_SIZE]; |
4539 | struct i2c_msg msg[2] = { |
4540 | { |
4541 | .addr = priv->cfg->i2c_address, |
4542 | @@ -71,11 +81,18 @@ static int tda18212_rd_regs(struct tda18212_priv *priv, u8 reg, u8 *val, |
4543 | }, { |
4544 | .addr = priv->cfg->i2c_address, |
4545 | .flags = I2C_M_RD, |
4546 | - .len = sizeof(buf), |
4547 | + .len = len, |
4548 | .buf = buf, |
4549 | } |
4550 | }; |
4551 | |
4552 | + if (len > sizeof(buf)) { |
4553 | + dev_warn(&priv->i2c->dev, |
4554 | + "%s: i2c rd reg=%04x: len=%d is too big!\n", |
4555 | + KBUILD_MODNAME, reg, len); |
4556 | + return -EINVAL; |
4557 | + } |
4558 | + |
4559 | ret = i2c_transfer(priv->i2c, msg, 2); |
4560 | if (ret == 2) { |
4561 | memcpy(val, buf, len); |
4562 | diff --git a/drivers/media/tuners/tda18218.c b/drivers/media/tuners/tda18218.c |
4563 | index 2d31aeb6..9300e936 100644 |
4564 | --- a/drivers/media/tuners/tda18218.c |
4565 | +++ b/drivers/media/tuners/tda18218.c |
4566 | @@ -20,11 +20,14 @@ |
4567 | |
4568 | #include "tda18218_priv.h" |
4569 | |
4570 | +/* Max transfer size done by I2C transfer functions */ |
4571 | +#define MAX_XFER_SIZE 64 |
4572 | + |
4573 | /* write multiple registers */ |
4574 | static int tda18218_wr_regs(struct tda18218_priv *priv, u8 reg, u8 *val, u8 len) |
4575 | { |
4576 | int ret = 0, len2, remaining; |
4577 | - u8 buf[1 + len]; |
4578 | + u8 buf[MAX_XFER_SIZE]; |
4579 | struct i2c_msg msg[1] = { |
4580 | { |
4581 | .addr = priv->cfg->i2c_address, |
4582 | @@ -33,6 +36,13 @@ static int tda18218_wr_regs(struct tda18218_priv *priv, u8 reg, u8 *val, u8 len) |
4583 | } |
4584 | }; |
4585 | |
4586 | + if (1 + len > sizeof(buf)) { |
4587 | + dev_warn(&priv->i2c->dev, |
4588 | + "%s: i2c wr reg=%04x: len=%d is too big!\n", |
4589 | + KBUILD_MODNAME, reg, len); |
4590 | + return -EINVAL; |
4591 | + } |
4592 | + |
4593 | for (remaining = len; remaining > 0; |
4594 | remaining -= (priv->cfg->i2c_wr_max - 1)) { |
4595 | len2 = remaining; |
4596 | @@ -63,7 +73,7 @@ static int tda18218_wr_regs(struct tda18218_priv *priv, u8 reg, u8 *val, u8 len) |
4597 | static int tda18218_rd_regs(struct tda18218_priv *priv, u8 reg, u8 *val, u8 len) |
4598 | { |
4599 | int ret; |
4600 | - u8 buf[reg+len]; /* we must start read always from reg 0x00 */ |
4601 | + u8 buf[MAX_XFER_SIZE]; /* we must start read always from reg 0x00 */ |
4602 | struct i2c_msg msg[2] = { |
4603 | { |
4604 | .addr = priv->cfg->i2c_address, |
4605 | @@ -73,11 +83,18 @@ static int tda18218_rd_regs(struct tda18218_priv *priv, u8 reg, u8 *val, u8 len) |
4606 | }, { |
4607 | .addr = priv->cfg->i2c_address, |
4608 | .flags = I2C_M_RD, |
4609 | - .len = sizeof(buf), |
4610 | + .len = reg + len, |
4611 | .buf = buf, |
4612 | } |
4613 | }; |
4614 | |
4615 | + if (reg + len > sizeof(buf)) { |
4616 | + dev_warn(&priv->i2c->dev, |
4617 | + "%s: i2c wr reg=%04x: len=%d is too big!\n", |
4618 | + KBUILD_MODNAME, reg, len); |
4619 | + return -EINVAL; |
4620 | + } |
4621 | + |
4622 | ret = i2c_transfer(priv->i2c, msg, 2); |
4623 | if (ret == 2) { |
4624 | memcpy(val, &buf[reg], len); |
4625 | diff --git a/drivers/media/tuners/tuner-xc2028.c b/drivers/media/tuners/tuner-xc2028.c |
4626 | index 878d2c4d..9771cd83 100644 |
4627 | --- a/drivers/media/tuners/tuner-xc2028.c |
4628 | +++ b/drivers/media/tuners/tuner-xc2028.c |
4629 | @@ -24,6 +24,9 @@ |
4630 | #include <linux/dvb/frontend.h> |
4631 | #include "dvb_frontend.h" |
4632 | |
4633 | +/* Max transfer size done by I2C transfer functions */ |
4634 | +#define MAX_XFER_SIZE 80 |
4635 | + |
4636 | /* Registers (Write-only) */ |
4637 | #define XREG_INIT 0x00 |
4638 | #define XREG_RF_FREQ 0x02 |
4639 | @@ -547,7 +550,10 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type, |
4640 | { |
4641 | struct xc2028_data *priv = fe->tuner_priv; |
4642 | int pos, rc; |
4643 | - unsigned char *p, *endp, buf[priv->ctrl.max_len]; |
4644 | + unsigned char *p, *endp, buf[MAX_XFER_SIZE]; |
4645 | + |
4646 | + if (priv->ctrl.max_len > sizeof(buf)) |
4647 | + priv->ctrl.max_len = sizeof(buf); |
4648 | |
4649 | tuner_dbg("%s called\n", __func__); |
4650 | |
4651 | diff --git a/drivers/media/usb/dvb-usb-v2/af9015.c b/drivers/media/usb/dvb-usb-v2/af9015.c |
4652 | index d556042c..da47d239 100644 |
4653 | --- a/drivers/media/usb/dvb-usb-v2/af9015.c |
4654 | +++ b/drivers/media/usb/dvb-usb-v2/af9015.c |
4655 | @@ -397,12 +397,13 @@ error: |
4656 | return ret; |
4657 | } |
4658 | |
4659 | +#define AF9015_EEPROM_SIZE 256 |
4660 | + |
4661 | /* hash (and dump) eeprom */ |
4662 | static int af9015_eeprom_hash(struct dvb_usb_device *d) |
4663 | { |
4664 | struct af9015_state *state = d_to_priv(d); |
4665 | int ret, i; |
4666 | - static const unsigned int AF9015_EEPROM_SIZE = 256; |
4667 | u8 buf[AF9015_EEPROM_SIZE]; |
4668 | struct req_t req = {READ_I2C, AF9015_I2C_EEPROM, 0, 0, 1, 1, NULL}; |
4669 | |
4670 | diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c |
4671 | index 1ea17dc2..c8fcd784 100644 |
4672 | --- a/drivers/media/usb/dvb-usb-v2/af9035.c |
4673 | +++ b/drivers/media/usb/dvb-usb-v2/af9035.c |
4674 | @@ -21,6 +21,9 @@ |
4675 | |
4676 | #include "af9035.h" |
4677 | |
4678 | +/* Max transfer size done by I2C transfer functions */ |
4679 | +#define MAX_XFER_SIZE 64 |
4680 | + |
4681 | DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); |
4682 | |
4683 | static u16 af9035_checksum(const u8 *buf, size_t len) |
4684 | @@ -126,10 +129,16 @@ exit: |
4685 | /* write multiple registers */ |
4686 | static int af9035_wr_regs(struct dvb_usb_device *d, u32 reg, u8 *val, int len) |
4687 | { |
4688 | - u8 wbuf[6 + len]; |
4689 | + u8 wbuf[MAX_XFER_SIZE]; |
4690 | u8 mbox = (reg >> 16) & 0xff; |
4691 | struct usb_req req = { CMD_MEM_WR, mbox, sizeof(wbuf), wbuf, 0, NULL }; |
4692 | |
4693 | + if (6 + len > sizeof(wbuf)) { |
4694 | + dev_warn(&d->udev->dev, "%s: i2c wr: len=%d is too big!\n", |
4695 | + KBUILD_MODNAME, len); |
4696 | + return -EOPNOTSUPP; |
4697 | + } |
4698 | + |
4699 | wbuf[0] = len; |
4700 | wbuf[1] = 2; |
4701 | wbuf[2] = 0; |
4702 | @@ -228,9 +237,16 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap, |
4703 | msg[1].len); |
4704 | } else { |
4705 | /* I2C */ |
4706 | - u8 buf[5 + msg[0].len]; |
4707 | + u8 buf[MAX_XFER_SIZE]; |
4708 | struct usb_req req = { CMD_I2C_RD, 0, sizeof(buf), |
4709 | buf, msg[1].len, msg[1].buf }; |
4710 | + |
4711 | + if (5 + msg[0].len > sizeof(buf)) { |
4712 | + dev_warn(&d->udev->dev, |
4713 | + "%s: i2c xfer: len=%d is too big!\n", |
4714 | + KBUILD_MODNAME, msg[0].len); |
4715 | + return -EOPNOTSUPP; |
4716 | + } |
4717 | req.mbox |= ((msg[0].addr & 0x80) >> 3); |
4718 | buf[0] = msg[1].len; |
4719 | buf[1] = msg[0].addr << 1; |
4720 | @@ -257,9 +273,16 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap, |
4721 | msg[0].len - 3); |
4722 | } else { |
4723 | /* I2C */ |
4724 | - u8 buf[5 + msg[0].len]; |
4725 | + u8 buf[MAX_XFER_SIZE]; |
4726 | struct usb_req req = { CMD_I2C_WR, 0, sizeof(buf), buf, |
4727 | 0, NULL }; |
4728 | + |
4729 | + if (5 + msg[0].len > sizeof(buf)) { |
4730 | + dev_warn(&d->udev->dev, |
4731 | + "%s: i2c xfer: len=%d is too big!\n", |
4732 | + KBUILD_MODNAME, msg[0].len); |
4733 | + return -EOPNOTSUPP; |
4734 | + } |
4735 | req.mbox |= ((msg[0].addr & 0x80) >> 3); |
4736 | buf[0] = msg[0].len; |
4737 | buf[1] = msg[0].addr << 1; |
4738 | diff --git a/drivers/media/usb/dvb-usb-v2/mxl111sf.c b/drivers/media/usb/dvb-usb-v2/mxl111sf.c |
4739 | index e97964ef..2627553f 100644 |
4740 | --- a/drivers/media/usb/dvb-usb-v2/mxl111sf.c |
4741 | +++ b/drivers/media/usb/dvb-usb-v2/mxl111sf.c |
4742 | @@ -23,6 +23,9 @@ |
4743 | #include "lgdt3305.h" |
4744 | #include "lg2160.h" |
4745 | |
4746 | +/* Max transfer size done by I2C transfer functions */ |
4747 | +#define MAX_XFER_SIZE 64 |
4748 | + |
4749 | int dvb_usb_mxl111sf_debug; |
4750 | module_param_named(debug, dvb_usb_mxl111sf_debug, int, 0644); |
4751 | MODULE_PARM_DESC(debug, "set debugging level " |
4752 | @@ -57,7 +60,12 @@ int mxl111sf_ctrl_msg(struct dvb_usb_device *d, |
4753 | { |
4754 | int wo = (rbuf == NULL || rlen == 0); /* write-only */ |
4755 | int ret; |
4756 | - u8 sndbuf[1+wlen]; |
4757 | + u8 sndbuf[MAX_XFER_SIZE]; |
4758 | + |
4759 | + if (1 + wlen > sizeof(sndbuf)) { |
4760 | + pr_warn("%s: len=%d is too big!\n", __func__, wlen); |
4761 | + return -EOPNOTSUPP; |
4762 | + } |
4763 | |
4764 | pr_debug("%s(wlen = %d, rlen = %d)\n", __func__, wlen, rlen); |
4765 | |
4766 | diff --git a/drivers/media/usb/dvb-usb/cxusb.c b/drivers/media/usb/dvb-usb/cxusb.c |
4767 | index 3940bb0f..20e345d9 100644 |
4768 | --- a/drivers/media/usb/dvb-usb/cxusb.c |
4769 | +++ b/drivers/media/usb/dvb-usb/cxusb.c |
4770 | @@ -43,6 +43,9 @@ |
4771 | #include "lgs8gxx.h" |
4772 | #include "atbm8830.h" |
4773 | |
4774 | +/* Max transfer size done by I2C transfer functions */ |
4775 | +#define MAX_XFER_SIZE 64 |
4776 | + |
4777 | /* debug */ |
4778 | static int dvb_usb_cxusb_debug; |
4779 | module_param_named(debug, dvb_usb_cxusb_debug, int, 0644); |
4780 | @@ -57,7 +60,14 @@ static int cxusb_ctrl_msg(struct dvb_usb_device *d, |
4781 | u8 cmd, u8 *wbuf, int wlen, u8 *rbuf, int rlen) |
4782 | { |
4783 | int wo = (rbuf == NULL || rlen == 0); /* write-only */ |
4784 | - u8 sndbuf[1+wlen]; |
4785 | + u8 sndbuf[MAX_XFER_SIZE]; |
4786 | + |
4787 | + if (1 + wlen > sizeof(sndbuf)) { |
4788 | + warn("i2c wr: len=%d is too big!\n", |
4789 | + wlen); |
4790 | + return -EOPNOTSUPP; |
4791 | + } |
4792 | + |
4793 | memset(sndbuf, 0, 1+wlen); |
4794 | |
4795 | sndbuf[0] = cmd; |
4796 | @@ -158,7 +168,13 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], |
4797 | |
4798 | if (msg[i].flags & I2C_M_RD) { |
4799 | /* read only */ |
4800 | - u8 obuf[3], ibuf[1+msg[i].len]; |
4801 | + u8 obuf[3], ibuf[MAX_XFER_SIZE]; |
4802 | + |
4803 | + if (1 + msg[i].len > sizeof(ibuf)) { |
4804 | + warn("i2c rd: len=%d is too big!\n", |
4805 | + msg[i].len); |
4806 | + return -EOPNOTSUPP; |
4807 | + } |
4808 | obuf[0] = 0; |
4809 | obuf[1] = msg[i].len; |
4810 | obuf[2] = msg[i].addr; |
4811 | @@ -172,7 +188,18 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], |
4812 | } else if (i+1 < num && (msg[i+1].flags & I2C_M_RD) && |
4813 | msg[i].addr == msg[i+1].addr) { |
4814 | /* write to then read from same address */ |
4815 | - u8 obuf[3+msg[i].len], ibuf[1+msg[i+1].len]; |
4816 | + u8 obuf[MAX_XFER_SIZE], ibuf[MAX_XFER_SIZE]; |
4817 | + |
4818 | + if (3 + msg[i].len > sizeof(obuf)) { |
4819 | + warn("i2c wr: len=%d is too big!\n", |
4820 | + msg[i].len); |
4821 | + return -EOPNOTSUPP; |
4822 | + } |
4823 | + if (1 + msg[i + 1].len > sizeof(ibuf)) { |
4824 | + warn("i2c rd: len=%d is too big!\n", |
4825 | + msg[i + 1].len); |
4826 | + return -EOPNOTSUPP; |
4827 | + } |
4828 | obuf[0] = msg[i].len; |
4829 | obuf[1] = msg[i+1].len; |
4830 | obuf[2] = msg[i].addr; |
4831 | @@ -191,7 +218,13 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], |
4832 | i++; |
4833 | } else { |
4834 | /* write only */ |
4835 | - u8 obuf[2+msg[i].len], ibuf; |
4836 | + u8 obuf[MAX_XFER_SIZE], ibuf; |
4837 | + |
4838 | + if (2 + msg[i].len > sizeof(obuf)) { |
4839 | + warn("i2c wr: len=%d is too big!\n", |
4840 | + msg[i].len); |
4841 | + return -EOPNOTSUPP; |
4842 | + } |
4843 | obuf[0] = msg[i].addr; |
4844 | obuf[1] = msg[i].len; |
4845 | memcpy(&obuf[2], msg[i].buf, msg[i].len); |
4846 | diff --git a/drivers/media/usb/dvb-usb/dibusb-common.c b/drivers/media/usb/dvb-usb/dibusb-common.c |
4847 | index c2dded92..6d68af0c 100644 |
4848 | --- a/drivers/media/usb/dvb-usb/dibusb-common.c |
4849 | +++ b/drivers/media/usb/dvb-usb/dibusb-common.c |
4850 | @@ -12,6 +12,9 @@ |
4851 | #include <linux/kconfig.h> |
4852 | #include "dibusb.h" |
4853 | |
4854 | +/* Max transfer size done by I2C transfer functions */ |
4855 | +#define MAX_XFER_SIZE 64 |
4856 | + |
4857 | static int debug; |
4858 | module_param(debug, int, 0644); |
4859 | MODULE_PARM_DESC(debug, "set debugging level (1=info (|-able))." DVB_USB_DEBUG_STATUS); |
4860 | @@ -105,11 +108,16 @@ EXPORT_SYMBOL(dibusb2_0_power_ctrl); |
4861 | static int dibusb_i2c_msg(struct dvb_usb_device *d, u8 addr, |
4862 | u8 *wbuf, u16 wlen, u8 *rbuf, u16 rlen) |
4863 | { |
4864 | - u8 sndbuf[wlen+4]; /* lead(1) devaddr,direction(1) addr(2) data(wlen) (len(2) (when reading)) */ |
4865 | + u8 sndbuf[MAX_XFER_SIZE]; /* lead(1) devaddr,direction(1) addr(2) data(wlen) (len(2) (when reading)) */ |
4866 | /* write only ? */ |
4867 | int wo = (rbuf == NULL || rlen == 0), |
4868 | len = 2 + wlen + (wo ? 0 : 2); |
4869 | |
4870 | + if (4 + wlen > sizeof(sndbuf)) { |
4871 | + warn("i2c wr: len=%d is too big!\n", wlen); |
4872 | + return -EOPNOTSUPP; |
4873 | + } |
4874 | + |
4875 | sndbuf[0] = wo ? DIBUSB_REQ_I2C_WRITE : DIBUSB_REQ_I2C_READ; |
4876 | sndbuf[1] = (addr << 1) | (wo ? 0 : 1); |
4877 | |
4878 | diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c |
4879 | index 6e237b6d..71b22f5a 100644 |
4880 | --- a/drivers/media/usb/dvb-usb/dw2102.c |
4881 | +++ b/drivers/media/usb/dvb-usb/dw2102.c |
4882 | @@ -30,6 +30,9 @@ |
4883 | #include "stb6100_proc.h" |
4884 | #include "m88rs2000.h" |
4885 | |
4886 | +/* Max transfer size done by I2C transfer functions */ |
4887 | +#define MAX_XFER_SIZE 64 |
4888 | + |
4889 | #ifndef USB_PID_DW2102 |
4890 | #define USB_PID_DW2102 0x2102 |
4891 | #endif |
4892 | @@ -308,7 +311,14 @@ static int dw2102_earda_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg ms |
4893 | case 2: { |
4894 | /* read */ |
4895 | /* first write first register number */ |
4896 | - u8 ibuf[msg[1].len + 2], obuf[3]; |
4897 | + u8 ibuf[MAX_XFER_SIZE], obuf[3]; |
4898 | + |
4899 | + if (2 + msg[1].len > sizeof(ibuf)) { |
4900 | + warn("i2c rd: len=%d is too big!\n", |
4901 | + msg[1].len); |
4902 | + return -EOPNOTSUPP; |
4903 | + } |
4904 | + |
4905 | obuf[0] = msg[0].addr << 1; |
4906 | obuf[1] = msg[0].len; |
4907 | obuf[2] = msg[0].buf[0]; |
4908 | @@ -325,7 +335,14 @@ static int dw2102_earda_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg ms |
4909 | switch (msg[0].addr) { |
4910 | case 0x68: { |
4911 | /* write to register */ |
4912 | - u8 obuf[msg[0].len + 2]; |
4913 | + u8 obuf[MAX_XFER_SIZE]; |
4914 | + |
4915 | + if (2 + msg[0].len > sizeof(obuf)) { |
4916 | + warn("i2c wr: len=%d is too big!\n", |
4917 | + msg[1].len); |
4918 | + return -EOPNOTSUPP; |
4919 | + } |
4920 | + |
4921 | obuf[0] = msg[0].addr << 1; |
4922 | obuf[1] = msg[0].len; |
4923 | memcpy(obuf + 2, msg[0].buf, msg[0].len); |
4924 | @@ -335,7 +352,14 @@ static int dw2102_earda_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg ms |
4925 | } |
4926 | case 0x61: { |
4927 | /* write to tuner */ |
4928 | - u8 obuf[msg[0].len + 2]; |
4929 | + u8 obuf[MAX_XFER_SIZE]; |
4930 | + |
4931 | + if (2 + msg[0].len > sizeof(obuf)) { |
4932 | + warn("i2c wr: len=%d is too big!\n", |
4933 | + msg[1].len); |
4934 | + return -EOPNOTSUPP; |
4935 | + } |
4936 | + |
4937 | obuf[0] = msg[0].addr << 1; |
4938 | obuf[1] = msg[0].len; |
4939 | memcpy(obuf + 2, msg[0].buf, msg[0].len); |
4940 | @@ -401,7 +425,14 @@ static int dw2104_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], i |
4941 | default: { |
4942 | if (msg[j].flags == I2C_M_RD) { |
4943 | /* read registers */ |
4944 | - u8 ibuf[msg[j].len + 2]; |
4945 | + u8 ibuf[MAX_XFER_SIZE]; |
4946 | + |
4947 | + if (2 + msg[j].len > sizeof(ibuf)) { |
4948 | + warn("i2c rd: len=%d is too big!\n", |
4949 | + msg[j].len); |
4950 | + return -EOPNOTSUPP; |
4951 | + } |
4952 | + |
4953 | dw210x_op_rw(d->udev, 0xc3, |
4954 | (msg[j].addr << 1) + 1, 0, |
4955 | ibuf, msg[j].len + 2, |
4956 | @@ -430,7 +461,14 @@ static int dw2104_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], i |
4957 | } while (len > 0); |
4958 | } else { |
4959 | /* write registers */ |
4960 | - u8 obuf[msg[j].len + 2]; |
4961 | + u8 obuf[MAX_XFER_SIZE]; |
4962 | + |
4963 | + if (2 + msg[j].len > sizeof(obuf)) { |
4964 | + warn("i2c wr: len=%d is too big!\n", |
4965 | + msg[j].len); |
4966 | + return -EOPNOTSUPP; |
4967 | + } |
4968 | + |
4969 | obuf[0] = msg[j].addr << 1; |
4970 | obuf[1] = msg[j].len; |
4971 | memcpy(obuf + 2, msg[j].buf, msg[j].len); |
4972 | @@ -463,7 +501,13 @@ static int dw3101_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], |
4973 | case 2: { |
4974 | /* read */ |
4975 | /* first write first register number */ |
4976 | - u8 ibuf[msg[1].len + 2], obuf[3]; |
4977 | + u8 ibuf[MAX_XFER_SIZE], obuf[3]; |
4978 | + |
4979 | + if (2 + msg[1].len > sizeof(ibuf)) { |
4980 | + warn("i2c rd: len=%d is too big!\n", |
4981 | + msg[1].len); |
4982 | + return -EOPNOTSUPP; |
4983 | + } |
4984 | obuf[0] = msg[0].addr << 1; |
4985 | obuf[1] = msg[0].len; |
4986 | obuf[2] = msg[0].buf[0]; |
4987 | @@ -481,7 +525,13 @@ static int dw3101_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], |
4988 | case 0x60: |
4989 | case 0x0c: { |
4990 | /* write to register */ |
4991 | - u8 obuf[msg[0].len + 2]; |
4992 | + u8 obuf[MAX_XFER_SIZE]; |
4993 | + |
4994 | + if (2 + msg[0].len > sizeof(obuf)) { |
4995 | + warn("i2c wr: len=%d is too big!\n", |
4996 | + msg[0].len); |
4997 | + return -EOPNOTSUPP; |
4998 | + } |
4999 | obuf[0] = msg[0].addr << 1; |
5000 | obuf[1] = msg[0].len; |
5001 | memcpy(obuf + 2, msg[0].buf, msg[0].len); |
5002 | @@ -563,7 +613,14 @@ static int s6x0_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], |
5003 | default: { |
5004 | if (msg[j].flags == I2C_M_RD) { |
5005 | /* read registers */ |
5006 | - u8 ibuf[msg[j].len]; |
5007 | + u8 ibuf[MAX_XFER_SIZE]; |
5008 | + |
5009 | + if (msg[j].len > sizeof(ibuf)) { |
5010 | + warn("i2c rd: len=%d is too big!\n", |
5011 | + msg[j].len); |
5012 | + return -EOPNOTSUPP; |
5013 | + } |
5014 | + |
5015 | dw210x_op_rw(d->udev, 0x91, 0, 0, |
5016 | ibuf, msg[j].len, |
5017 | DW210X_READ_MSG); |
5018 | @@ -590,7 +647,14 @@ static int s6x0_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], |
5019 | } while (len > 0); |
5020 | } else if (j < (num - 1)) { |
5021 | /* write register addr before read */ |
5022 | - u8 obuf[msg[j].len + 2]; |
5023 | + u8 obuf[MAX_XFER_SIZE]; |
5024 | + |
5025 | + if (2 + msg[j].len > sizeof(obuf)) { |
5026 | + warn("i2c wr: len=%d is too big!\n", |
5027 | + msg[j].len); |
5028 | + return -EOPNOTSUPP; |
5029 | + } |
5030 | + |
5031 | obuf[0] = msg[j + 1].len; |
5032 | obuf[1] = (msg[j].addr << 1); |
5033 | memcpy(obuf + 2, msg[j].buf, msg[j].len); |
5034 | @@ -602,7 +666,13 @@ static int s6x0_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], |
5035 | break; |
5036 | } else { |
5037 | /* write registers */ |
5038 | - u8 obuf[msg[j].len + 2]; |
5039 | + u8 obuf[MAX_XFER_SIZE]; |
5040 | + |
5041 | + if (2 + msg[j].len > sizeof(obuf)) { |
5042 | + warn("i2c wr: len=%d is too big!\n", |
5043 | + msg[j].len); |
5044 | + return -EOPNOTSUPP; |
5045 | + } |
5046 | obuf[0] = msg[j].len + 1; |
5047 | obuf[1] = (msg[j].addr << 1); |
5048 | memcpy(obuf + 2, msg[j].buf, msg[j].len); |
5049 | diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c |
5050 | index c85d69da..85a6a341 100644 |
5051 | --- a/drivers/media/v4l2-core/v4l2-async.c |
5052 | +++ b/drivers/media/v4l2-core/v4l2-async.c |
5053 | @@ -189,30 +189,53 @@ void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier) |
5054 | struct v4l2_subdev *sd, *tmp; |
5055 | unsigned int notif_n_subdev = notifier->num_subdevs; |
5056 | unsigned int n_subdev = min(notif_n_subdev, V4L2_MAX_SUBDEVS); |
5057 | - struct device *dev[n_subdev]; |
5058 | + struct device **dev; |
5059 | int i = 0; |
5060 | |
5061 | if (!notifier->v4l2_dev) |
5062 | return; |
5063 | |
5064 | + dev = kmalloc(n_subdev * sizeof(*dev), GFP_KERNEL); |
5065 | + if (!dev) { |
5066 | + dev_err(notifier->v4l2_dev->dev, |
5067 | + "Failed to allocate device cache!\n"); |
5068 | + } |
5069 | + |
5070 | mutex_lock(&list_lock); |
5071 | |
5072 | list_del(¬ifier->list); |
5073 | |
5074 | list_for_each_entry_safe(sd, tmp, ¬ifier->done, async_list) { |
5075 | - dev[i] = get_device(sd->dev); |
5076 | + struct device *d; |
5077 | + |
5078 | + d = get_device(sd->dev); |
5079 | |
5080 | v4l2_async_cleanup(sd); |
5081 | |
5082 | /* If we handled USB devices, we'd have to lock the parent too */ |
5083 | - device_release_driver(dev[i++]); |
5084 | + device_release_driver(d); |
5085 | |
5086 | if (notifier->unbind) |
5087 | notifier->unbind(notifier, sd, sd->asd); |
5088 | + |
5089 | + /* |
5090 | + * Store device at the device cache, in order to call |
5091 | + * put_device() on the final step |
5092 | + */ |
5093 | + if (dev) |
5094 | + dev[i++] = d; |
5095 | + else |
5096 | + put_device(d); |
5097 | } |
5098 | |
5099 | mutex_unlock(&list_lock); |
5100 | |
5101 | + /* |
5102 | + * Call device_attach() to reprobe devices |
5103 | + * |
5104 | + * NOTE: If dev allocation fails, i is 0, and the whole loop won't be |
5105 | + * executed. |
5106 | + */ |
5107 | while (i--) { |
5108 | struct device *d = dev[i]; |
5109 | |
5110 | @@ -228,6 +251,7 @@ void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier) |
5111 | } |
5112 | put_device(d); |
5113 | } |
5114 | + kfree(dev); |
5115 | |
5116 | notifier->v4l2_dev = NULL; |
5117 | |
5118 | diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c |
5119 | index 9483bc84..e775bfbc 100644 |
5120 | --- a/drivers/mfd/lpc_ich.c |
5121 | +++ b/drivers/mfd/lpc_ich.c |
5122 | @@ -53,6 +53,7 @@ |
5123 | * document number TBD : Wellsburg |
5124 | * document number TBD : Avoton SoC |
5125 | * document number TBD : Coleto Creek |
5126 | + * document number TBD : Wildcat Point-LP |
5127 | */ |
5128 | |
5129 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
5130 | @@ -211,6 +212,7 @@ enum lpc_chipsets { |
5131 | LPC_WBG, /* Wellsburg */ |
5132 | LPC_AVN, /* Avoton SoC */ |
5133 | LPC_COLETO, /* Coleto Creek */ |
5134 | + LPC_WPT_LP, /* Wildcat Point-LP */ |
5135 | }; |
5136 | |
5137 | static struct lpc_ich_info lpc_chipset_info[] = { |
5138 | @@ -503,6 +505,10 @@ static struct lpc_ich_info lpc_chipset_info[] = { |
5139 | .name = "Coleto Creek", |
5140 | .iTCO_version = 2, |
5141 | }, |
5142 | + [LPC_WPT_LP] = { |
5143 | + .name = "Lynx Point_LP", |
5144 | + .iTCO_version = 2, |
5145 | + }, |
5146 | }; |
5147 | |
5148 | /* |
5149 | @@ -721,6 +727,13 @@ static DEFINE_PCI_DEVICE_TABLE(lpc_ich_ids) = { |
5150 | { PCI_VDEVICE(INTEL, 0x1f3a), LPC_AVN}, |
5151 | { PCI_VDEVICE(INTEL, 0x1f3b), LPC_AVN}, |
5152 | { PCI_VDEVICE(INTEL, 0x2390), LPC_COLETO}, |
5153 | + { PCI_VDEVICE(INTEL, 0x9cc1), LPC_WPT_LP}, |
5154 | + { PCI_VDEVICE(INTEL, 0x9cc2), LPC_WPT_LP}, |
5155 | + { PCI_VDEVICE(INTEL, 0x9cc3), LPC_WPT_LP}, |
5156 | + { PCI_VDEVICE(INTEL, 0x9cc5), LPC_WPT_LP}, |
5157 | + { PCI_VDEVICE(INTEL, 0x9cc6), LPC_WPT_LP}, |
5158 | + { PCI_VDEVICE(INTEL, 0x9cc7), LPC_WPT_LP}, |
5159 | + { PCI_VDEVICE(INTEL, 0x9cc9), LPC_WPT_LP}, |
5160 | { 0, }, /* End of list */ |
5161 | }; |
5162 | MODULE_DEVICE_TABLE(pci, lpc_ich_ids); |
5163 | diff --git a/drivers/mfd/rts5249.c b/drivers/mfd/rts5249.c |
5164 | index 3b835f59..573de7bf 100644 |
5165 | --- a/drivers/mfd/rts5249.c |
5166 | +++ b/drivers/mfd/rts5249.c |
5167 | @@ -130,13 +130,57 @@ static int rts5249_optimize_phy(struct rtsx_pcr *pcr) |
5168 | { |
5169 | int err; |
5170 | |
5171 | - err = rtsx_pci_write_phy_register(pcr, PHY_REG_REV, 0xFE46); |
5172 | + err = rtsx_pci_write_phy_register(pcr, PHY_REG_REV, |
5173 | + PHY_REG_REV_RESV | PHY_REG_REV_RXIDLE_LATCHED | |
5174 | + PHY_REG_REV_P1_EN | PHY_REG_REV_RXIDLE_EN | |
5175 | + PHY_REG_REV_RX_PWST | PHY_REG_REV_CLKREQ_DLY_TIMER_1_0 | |
5176 | + PHY_REG_REV_STOP_CLKRD | PHY_REG_REV_STOP_CLKWR); |
5177 | if (err < 0) |
5178 | return err; |
5179 | |
5180 | msleep(1); |
5181 | |
5182 | - return rtsx_pci_write_phy_register(pcr, PHY_BPCR, 0x05C0); |
5183 | + err = rtsx_pci_write_phy_register(pcr, PHY_BPCR, |
5184 | + PHY_BPCR_IBRXSEL | PHY_BPCR_IBTXSEL | |
5185 | + PHY_BPCR_IB_FILTER | PHY_BPCR_CMIRROR_EN); |
5186 | + if (err < 0) |
5187 | + return err; |
5188 | + err = rtsx_pci_write_phy_register(pcr, PHY_PCR, |
5189 | + PHY_PCR_FORCE_CODE | PHY_PCR_OOBS_CALI_50 | |
5190 | + PHY_PCR_OOBS_VCM_08 | PHY_PCR_OOBS_SEN_90 | |
5191 | + PHY_PCR_RSSI_EN); |
5192 | + if (err < 0) |
5193 | + return err; |
5194 | + err = rtsx_pci_write_phy_register(pcr, PHY_RCR2, |
5195 | + PHY_RCR2_EMPHASE_EN | PHY_RCR2_NADJR | |
5196 | + PHY_RCR2_CDR_CP_10 | PHY_RCR2_CDR_SR_2 | |
5197 | + PHY_RCR2_FREQSEL_12 | PHY_RCR2_CPADJEN | |
5198 | + PHY_RCR2_CDR_SC_8 | PHY_RCR2_CALIB_LATE); |
5199 | + if (err < 0) |
5200 | + return err; |
5201 | + err = rtsx_pci_write_phy_register(pcr, PHY_FLD4, |
5202 | + PHY_FLD4_FLDEN_SEL | PHY_FLD4_REQ_REF | |
5203 | + PHY_FLD4_RXAMP_OFF | PHY_FLD4_REQ_ADDA | |
5204 | + PHY_FLD4_BER_COUNT | PHY_FLD4_BER_TIMER | |
5205 | + PHY_FLD4_BER_CHK_EN); |
5206 | + if (err < 0) |
5207 | + return err; |
5208 | + err = rtsx_pci_write_phy_register(pcr, PHY_RDR, PHY_RDR_RXDSEL_1_9); |
5209 | + if (err < 0) |
5210 | + return err; |
5211 | + err = rtsx_pci_write_phy_register(pcr, PHY_RCR1, |
5212 | + PHY_RCR1_ADP_TIME | PHY_RCR1_VCO_COARSE); |
5213 | + if (err < 0) |
5214 | + return err; |
5215 | + err = rtsx_pci_write_phy_register(pcr, PHY_FLD3, |
5216 | + PHY_FLD3_TIMER_4 | PHY_FLD3_TIMER_6 | |
5217 | + PHY_FLD3_RXDELINK); |
5218 | + if (err < 0) |
5219 | + return err; |
5220 | + return rtsx_pci_write_phy_register(pcr, PHY_TUNE, |
5221 | + PHY_TUNE_TUNEREF_1_0 | PHY_TUNE_VBGSEL_1252 | |
5222 | + PHY_TUNE_SDBUS_33 | PHY_TUNE_TUNED18 | |
5223 | + PHY_TUNE_TUNED12); |
5224 | } |
5225 | |
5226 | static int rts5249_turn_on_led(struct rtsx_pcr *pcr) |
5227 | diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c |
5228 | index 69e438ee..92c18779 100644 |
5229 | --- a/drivers/mmc/host/atmel-mci.c |
5230 | +++ b/drivers/mmc/host/atmel-mci.c |
5231 | @@ -589,6 +589,13 @@ static void atmci_timeout_timer(unsigned long data) |
5232 | if (host->mrq->cmd->data) { |
5233 | host->mrq->cmd->data->error = -ETIMEDOUT; |
5234 | host->data = NULL; |
5235 | + /* |
5236 | + * With some SDIO modules, sometimes DMA transfer hangs. If |
5237 | + * stop_transfer() is not called then the DMA request is not |
5238 | + * removed, following ones are queued and never computed. |
5239 | + */ |
5240 | + if (host->state == STATE_DATA_XFER) |
5241 | + host->stop_transfer(host); |
5242 | } else { |
5243 | host->mrq->cmd->error = -ETIMEDOUT; |
5244 | host->cmd = NULL; |
5245 | @@ -1803,12 +1810,14 @@ static void atmci_tasklet_func(unsigned long priv) |
5246 | if (unlikely(status)) { |
5247 | host->stop_transfer(host); |
5248 | host->data = NULL; |
5249 | - if (status & ATMCI_DTOE) { |
5250 | - data->error = -ETIMEDOUT; |
5251 | - } else if (status & ATMCI_DCRCE) { |
5252 | - data->error = -EILSEQ; |
5253 | - } else { |
5254 | - data->error = -EIO; |
5255 | + if (data) { |
5256 | + if (status & ATMCI_DTOE) { |
5257 | + data->error = -ETIMEDOUT; |
5258 | + } else if (status & ATMCI_DCRCE) { |
5259 | + data->error = -EILSEQ; |
5260 | + } else { |
5261 | + data->error = -EIO; |
5262 | + } |
5263 | } |
5264 | } |
5265 | |
5266 | diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c |
5267 | index 6bc9618a..f111f04f 100644 |
5268 | --- a/drivers/mtd/devices/m25p80.c |
5269 | +++ b/drivers/mtd/devices/m25p80.c |
5270 | @@ -78,7 +78,7 @@ |
5271 | |
5272 | /* Define max times to check status register before we give up. */ |
5273 | #define MAX_READY_WAIT_JIFFIES (40 * HZ) /* M25P16 specs 40s max chip erase */ |
5274 | -#define MAX_CMD_SIZE 5 |
5275 | +#define MAX_CMD_SIZE 6 |
5276 | |
5277 | #define JEDEC_MFR(_jedec_id) ((_jedec_id) >> 16) |
5278 | |
5279 | @@ -992,15 +992,13 @@ static int m25p_probe(struct spi_device *spi) |
5280 | } |
5281 | } |
5282 | |
5283 | - flash = kzalloc(sizeof *flash, GFP_KERNEL); |
5284 | + flash = devm_kzalloc(&spi->dev, sizeof(*flash), GFP_KERNEL); |
5285 | if (!flash) |
5286 | return -ENOMEM; |
5287 | - flash->command = kmalloc(MAX_CMD_SIZE + (flash->fast_read ? 1 : 0), |
5288 | - GFP_KERNEL); |
5289 | - if (!flash->command) { |
5290 | - kfree(flash); |
5291 | + |
5292 | + flash->command = devm_kzalloc(&spi->dev, MAX_CMD_SIZE, GFP_KERNEL); |
5293 | + if (!flash->command) |
5294 | return -ENOMEM; |
5295 | - } |
5296 | |
5297 | flash->spi = spi; |
5298 | mutex_init(&flash->lock); |
5299 | @@ -1133,14 +1131,10 @@ static int m25p_probe(struct spi_device *spi) |
5300 | static int m25p_remove(struct spi_device *spi) |
5301 | { |
5302 | struct m25p *flash = spi_get_drvdata(spi); |
5303 | - int status; |
5304 | |
5305 | /* Clean up MTD stuff. */ |
5306 | - status = mtd_device_unregister(&flash->mtd); |
5307 | - if (status == 0) { |
5308 | - kfree(flash->command); |
5309 | - kfree(flash); |
5310 | - } |
5311 | + mtd_device_unregister(&flash->mtd); |
5312 | + |
5313 | return 0; |
5314 | } |
5315 | |
5316 | diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c |
5317 | index 060feeaf..9be07922 100644 |
5318 | --- a/drivers/mtd/nand/atmel_nand.c |
5319 | +++ b/drivers/mtd/nand/atmel_nand.c |
5320 | @@ -2177,7 +2177,6 @@ err_no_card: |
5321 | if (host->dma_chan) |
5322 | dma_release_channel(host->dma_chan); |
5323 | err_nand_ioremap: |
5324 | - platform_driver_unregister(&atmel_nand_nfc_driver); |
5325 | return res; |
5326 | } |
5327 | |
5328 | diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c |
5329 | index a9830ff8..a9260178 100644 |
5330 | --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c |
5331 | +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c |
5332 | @@ -392,8 +392,6 @@ static void dma_irq_callback(void *param) |
5333 | struct gpmi_nand_data *this = param; |
5334 | struct completion *dma_c = &this->dma_done; |
5335 | |
5336 | - complete(dma_c); |
5337 | - |
5338 | switch (this->dma_type) { |
5339 | case DMA_FOR_COMMAND: |
5340 | dma_unmap_sg(this->dev, &this->cmd_sgl, 1, DMA_TO_DEVICE); |
5341 | @@ -418,6 +416,8 @@ static void dma_irq_callback(void *param) |
5342 | default: |
5343 | pr_err("in wrong DMA operation.\n"); |
5344 | } |
5345 | + |
5346 | + complete(dma_c); |
5347 | } |
5348 | |
5349 | int start_dma_without_bch_irq(struct gpmi_nand_data *this, |
5350 | @@ -1568,8 +1568,6 @@ static int gpmi_set_geometry(struct gpmi_nand_data *this) |
5351 | |
5352 | static int gpmi_pre_bbt_scan(struct gpmi_nand_data *this) |
5353 | { |
5354 | - int ret; |
5355 | - |
5356 | /* Set up swap_block_mark, must be set before the gpmi_set_geometry() */ |
5357 | if (GPMI_IS_MX23(this)) |
5358 | this->swap_block_mark = false; |
5359 | @@ -1577,12 +1575,8 @@ static int gpmi_pre_bbt_scan(struct gpmi_nand_data *this) |
5360 | this->swap_block_mark = true; |
5361 | |
5362 | /* Set up the medium geometry */ |
5363 | - ret = gpmi_set_geometry(this); |
5364 | - if (ret) |
5365 | - return ret; |
5366 | + return gpmi_set_geometry(this); |
5367 | |
5368 | - /* NAND boot init, depends on the gpmi_set_geometry(). */ |
5369 | - return nand_boot_init(this); |
5370 | } |
5371 | |
5372 | static void gpmi_nfc_exit(struct gpmi_nand_data *this) |
5373 | @@ -1672,10 +1666,16 @@ static int gpmi_nfc_init(struct gpmi_nand_data *this) |
5374 | if (ret) |
5375 | goto err_out; |
5376 | |
5377 | + chip->options |= NAND_SKIP_BBTSCAN; |
5378 | ret = nand_scan_tail(mtd); |
5379 | if (ret) |
5380 | goto err_out; |
5381 | |
5382 | + ret = nand_boot_init(this); |
5383 | + if (ret) |
5384 | + goto err_out; |
5385 | + chip->scan_bbt(mtd); |
5386 | + |
5387 | ppdata.of_node = this->pdev->dev.of_node; |
5388 | ret = mtd_device_parse_register(mtd, NULL, &ppdata, NULL, 0); |
5389 | if (ret) |
5390 | diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c |
5391 | index d340b2f1..d92d94bb 100644 |
5392 | --- a/drivers/mtd/nand/nand_base.c |
5393 | +++ b/drivers/mtd/nand/nand_base.c |
5394 | @@ -2981,10 +2981,21 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip, |
5395 | sanitize_string(p->model, sizeof(p->model)); |
5396 | if (!mtd->name) |
5397 | mtd->name = p->model; |
5398 | + |
5399 | mtd->writesize = le32_to_cpu(p->byte_per_page); |
5400 | - mtd->erasesize = le32_to_cpu(p->pages_per_block) * mtd->writesize; |
5401 | + |
5402 | + /* |
5403 | + * pages_per_block and blocks_per_lun may not be a power-of-2 size |
5404 | + * (don't ask me who thought of this...). MTD assumes that these |
5405 | + * dimensions will be power-of-2, so just truncate the remaining area. |
5406 | + */ |
5407 | + mtd->erasesize = 1 << (fls(le32_to_cpu(p->pages_per_block)) - 1); |
5408 | + mtd->erasesize *= mtd->writesize; |
5409 | + |
5410 | mtd->oobsize = le16_to_cpu(p->spare_bytes_per_page); |
5411 | - chip->chipsize = le32_to_cpu(p->blocks_per_lun); |
5412 | + |
5413 | + /* See erasesize comment */ |
5414 | + chip->chipsize = 1 << (fls(le32_to_cpu(p->blocks_per_lun)) - 1); |
5415 | chip->chipsize *= (uint64_t)mtd->erasesize * p->lun_count; |
5416 | |
5417 | if (onfi_feature(chip) & ONFI_FEATURE_16_BIT_BUS) |
5418 | diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c |
5419 | index 48161ede..69f58b07 100644 |
5420 | --- a/drivers/net/wireless/ath/ath5k/base.c |
5421 | +++ b/drivers/net/wireless/ath/ath5k/base.c |
5422 | @@ -1663,15 +1663,15 @@ ath5k_tx_frame_completed(struct ath5k_hw *ah, struct sk_buff *skb, |
5423 | ah->stats.tx_bytes_count += skb->len; |
5424 | info = IEEE80211_SKB_CB(skb); |
5425 | |
5426 | + size = min_t(int, sizeof(info->status.rates), sizeof(bf->rates)); |
5427 | + memcpy(info->status.rates, bf->rates, size); |
5428 | + |
5429 | tries[0] = info->status.rates[0].count; |
5430 | tries[1] = info->status.rates[1].count; |
5431 | tries[2] = info->status.rates[2].count; |
5432 | |
5433 | ieee80211_tx_info_clear_status(info); |
5434 | |
5435 | - size = min_t(int, sizeof(info->status.rates), sizeof(bf->rates)); |
5436 | - memcpy(info->status.rates, bf->rates, size); |
5437 | - |
5438 | for (i = 0; i < ts->ts_final_idx; i++) { |
5439 | struct ieee80211_tx_rate *r = |
5440 | &info->status.rates[i]; |
5441 | diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c |
5442 | index 1576104e..9bf88987 100644 |
5443 | --- a/drivers/net/wireless/mwifiex/sdio.c |
5444 | +++ b/drivers/net/wireless/mwifiex/sdio.c |
5445 | @@ -1029,7 +1029,10 @@ static int mwifiex_decode_rx_packet(struct mwifiex_adapter *adapter, |
5446 | struct sk_buff *skb, u32 upld_typ) |
5447 | { |
5448 | u8 *cmd_buf; |
5449 | + __le16 *curr_ptr = (__le16 *)skb->data; |
5450 | + u16 pkt_len = le16_to_cpu(*curr_ptr); |
5451 | |
5452 | + skb_trim(skb, pkt_len); |
5453 | skb_pull(skb, INTF_HEADER_LEN); |
5454 | |
5455 | switch (upld_typ) { |
5456 | diff --git a/drivers/net/wireless/mwifiex/uap_txrx.c b/drivers/net/wireless/mwifiex/uap_txrx.c |
5457 | index 1cfe5a73..92f76d65 100644 |
5458 | --- a/drivers/net/wireless/mwifiex/uap_txrx.c |
5459 | +++ b/drivers/net/wireless/mwifiex/uap_txrx.c |
5460 | @@ -97,6 +97,7 @@ static void mwifiex_uap_queue_bridged_pkt(struct mwifiex_private *priv, |
5461 | struct mwifiex_txinfo *tx_info; |
5462 | int hdr_chop; |
5463 | struct timeval tv; |
5464 | + struct ethhdr *p_ethhdr; |
5465 | u8 rfc1042_eth_hdr[ETH_ALEN] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 }; |
5466 | |
5467 | uap_rx_pd = (struct uap_rxpd *)(skb->data); |
5468 | @@ -112,14 +113,36 @@ static void mwifiex_uap_queue_bridged_pkt(struct mwifiex_private *priv, |
5469 | } |
5470 | |
5471 | if (!memcmp(&rx_pkt_hdr->rfc1042_hdr, |
5472 | - rfc1042_eth_hdr, sizeof(rfc1042_eth_hdr))) |
5473 | + rfc1042_eth_hdr, sizeof(rfc1042_eth_hdr))) { |
5474 | + /* Replace the 803 header and rfc1042 header (llc/snap) with |
5475 | + * an Ethernet II header, keep the src/dst and snap_type |
5476 | + * (ethertype). |
5477 | + * |
5478 | + * The firmware only passes up SNAP frames converting all RX |
5479 | + * data from 802.11 to 802.2/LLC/SNAP frames. |
5480 | + * |
5481 | + * To create the Ethernet II, just move the src, dst address |
5482 | + * right before the snap_type. |
5483 | + */ |
5484 | + p_ethhdr = (struct ethhdr *) |
5485 | + ((u8 *)(&rx_pkt_hdr->eth803_hdr) |
5486 | + + sizeof(rx_pkt_hdr->eth803_hdr) |
5487 | + + sizeof(rx_pkt_hdr->rfc1042_hdr) |
5488 | + - sizeof(rx_pkt_hdr->eth803_hdr.h_dest) |
5489 | + - sizeof(rx_pkt_hdr->eth803_hdr.h_source) |
5490 | + - sizeof(rx_pkt_hdr->rfc1042_hdr.snap_type)); |
5491 | + memcpy(p_ethhdr->h_source, rx_pkt_hdr->eth803_hdr.h_source, |
5492 | + sizeof(p_ethhdr->h_source)); |
5493 | + memcpy(p_ethhdr->h_dest, rx_pkt_hdr->eth803_hdr.h_dest, |
5494 | + sizeof(p_ethhdr->h_dest)); |
5495 | /* Chop off the rxpd + the excess memory from |
5496 | * 802.2/llc/snap header that was removed. |
5497 | */ |
5498 | - hdr_chop = (u8 *)eth_hdr - (u8 *)uap_rx_pd; |
5499 | - else |
5500 | + hdr_chop = (u8 *)p_ethhdr - (u8 *)uap_rx_pd; |
5501 | + } else { |
5502 | /* Chop off the rxpd */ |
5503 | hdr_chop = (u8 *)&rx_pkt_hdr->eth803_hdr - (u8 *)uap_rx_pd; |
5504 | + } |
5505 | |
5506 | /* Chop off the leading header bytes so the it points |
5507 | * to the start of either the reconstructed EthII frame |
5508 | diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c |
5509 | index 5970ff6f..d498b02f 100644 |
5510 | --- a/drivers/net/wireless/prism54/islpci_dev.c |
5511 | +++ b/drivers/net/wireless/prism54/islpci_dev.c |
5512 | @@ -811,6 +811,10 @@ static const struct net_device_ops islpci_netdev_ops = { |
5513 | .ndo_validate_addr = eth_validate_addr, |
5514 | }; |
5515 | |
5516 | +static struct device_type wlan_type = { |
5517 | + .name = "wlan", |
5518 | +}; |
5519 | + |
5520 | struct net_device * |
5521 | islpci_setup(struct pci_dev *pdev) |
5522 | { |
5523 | @@ -821,9 +825,8 @@ islpci_setup(struct pci_dev *pdev) |
5524 | return ndev; |
5525 | |
5526 | pci_set_drvdata(pdev, ndev); |
5527 | -#if defined(SET_NETDEV_DEV) |
5528 | SET_NETDEV_DEV(ndev, &pdev->dev); |
5529 | -#endif |
5530 | + SET_NETDEV_DEVTYPE(ndev, &wlan_type); |
5531 | |
5532 | /* setup the structure members */ |
5533 | ndev->base_addr = pci_resource_start(pdev, 0); |
5534 | diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c |
5535 | index 3d53a09d..38ed9a3e 100644 |
5536 | --- a/drivers/net/wireless/rt2x00/rt2400pci.c |
5537 | +++ b/drivers/net/wireless/rt2x00/rt2400pci.c |
5538 | @@ -1261,7 +1261,7 @@ static void rt2400pci_fill_rxdone(struct queue_entry *entry, |
5539 | */ |
5540 | rxdesc->timestamp = ((u64)rx_high << 32) | rx_low; |
5541 | rxdesc->signal = rt2x00_get_field32(word2, RXD_W2_SIGNAL) & ~0x08; |
5542 | - rxdesc->rssi = rt2x00_get_field32(word2, RXD_W3_RSSI) - |
5543 | + rxdesc->rssi = rt2x00_get_field32(word3, RXD_W3_RSSI) - |
5544 | entry->queue->rt2x00dev->rssi_offset; |
5545 | rxdesc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT); |
5546 | |
5547 | diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c |
5548 | index 8bb4a9a0..9fa90a25 100644 |
5549 | --- a/drivers/net/wireless/rtlwifi/base.c |
5550 | +++ b/drivers/net/wireless/rtlwifi/base.c |
5551 | @@ -37,6 +37,7 @@ |
5552 | |
5553 | #include <linux/ip.h> |
5554 | #include <linux/module.h> |
5555 | +#include <linux/udp.h> |
5556 | |
5557 | /* |
5558 | *NOTICE!!!: This file will be very big, we should |
5559 | @@ -1074,64 +1075,52 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx) |
5560 | if (!ieee80211_is_data(fc)) |
5561 | return false; |
5562 | |
5563 | + ip = (const struct iphdr *)(skb->data + mac_hdr_len + |
5564 | + SNAP_SIZE + PROTOC_TYPE_SIZE); |
5565 | + ether_type = be16_to_cpup((__be16 *) |
5566 | + (skb->data + mac_hdr_len + SNAP_SIZE)); |
5567 | |
5568 | - ip = (struct iphdr *)((u8 *) skb->data + mac_hdr_len + |
5569 | - SNAP_SIZE + PROTOC_TYPE_SIZE); |
5570 | - ether_type = *(u16 *) ((u8 *) skb->data + mac_hdr_len + SNAP_SIZE); |
5571 | - /* ether_type = ntohs(ether_type); */ |
5572 | - |
5573 | - if (ETH_P_IP == ether_type) { |
5574 | - if (IPPROTO_UDP == ip->protocol) { |
5575 | - struct udphdr *udp = (struct udphdr *)((u8 *) ip + |
5576 | - (ip->ihl << 2)); |
5577 | - if (((((u8 *) udp)[1] == 68) && |
5578 | - (((u8 *) udp)[3] == 67)) || |
5579 | - ((((u8 *) udp)[1] == 67) && |
5580 | - (((u8 *) udp)[3] == 68))) { |
5581 | - /* |
5582 | - * 68 : UDP BOOTP client |
5583 | - * 67 : UDP BOOTP server |
5584 | - */ |
5585 | - RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), |
5586 | - DBG_DMESG, "dhcp %s !!\n", |
5587 | - is_tx ? "Tx" : "Rx"); |
5588 | - |
5589 | - if (is_tx) { |
5590 | - rtlpriv->enter_ps = false; |
5591 | - schedule_work(&rtlpriv-> |
5592 | - works.lps_change_work); |
5593 | - ppsc->last_delaylps_stamp_jiffies = |
5594 | - jiffies; |
5595 | - } |
5596 | + switch (ether_type) { |
5597 | + case ETH_P_IP: { |
5598 | + struct udphdr *udp; |
5599 | + u16 src; |
5600 | + u16 dst; |
5601 | |
5602 | - return true; |
5603 | - } |
5604 | - } |
5605 | - } else if (ETH_P_ARP == ether_type) { |
5606 | - if (is_tx) { |
5607 | - rtlpriv->enter_ps = false; |
5608 | - schedule_work(&rtlpriv->works.lps_change_work); |
5609 | - ppsc->last_delaylps_stamp_jiffies = jiffies; |
5610 | - } |
5611 | + if (ip->protocol != IPPROTO_UDP) |
5612 | + return false; |
5613 | + udp = (struct udphdr *)((u8 *)ip + (ip->ihl << 2)); |
5614 | + src = be16_to_cpu(udp->source); |
5615 | + dst = be16_to_cpu(udp->dest); |
5616 | |
5617 | - return true; |
5618 | - } else if (ETH_P_PAE == ether_type) { |
5619 | + /* If this case involves port 68 (UDP BOOTP client) connecting |
5620 | + * with port 67 (UDP BOOTP server), then return true so that |
5621 | + * the lowest speed is used. |
5622 | + */ |
5623 | + if (!((src == 68 && dst == 67) || (src == 67 && dst == 68))) |
5624 | + return false; |
5625 | + |
5626 | + RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG, |
5627 | + "dhcp %s !!\n", is_tx ? "Tx" : "Rx"); |
5628 | + break; |
5629 | + } |
5630 | + case ETH_P_ARP: |
5631 | + break; |
5632 | + case ETH_P_PAE: |
5633 | RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG, |
5634 | "802.1X %s EAPOL pkt!!\n", is_tx ? "Tx" : "Rx"); |
5635 | - |
5636 | - if (is_tx) { |
5637 | - rtlpriv->enter_ps = false; |
5638 | - schedule_work(&rtlpriv->works.lps_change_work); |
5639 | - ppsc->last_delaylps_stamp_jiffies = jiffies; |
5640 | - } |
5641 | - |
5642 | - return true; |
5643 | - } else if (ETH_P_IPV6 == ether_type) { |
5644 | - /* IPv6 */ |
5645 | - return true; |
5646 | + break; |
5647 | + case ETH_P_IPV6: |
5648 | + /* TODO: Is this right? */ |
5649 | + return false; |
5650 | + default: |
5651 | + return false; |
5652 | } |
5653 | - |
5654 | - return false; |
5655 | + if (is_tx) { |
5656 | + rtlpriv->enter_ps = false; |
5657 | + schedule_work(&rtlpriv->works.lps_change_work); |
5658 | + ppsc->last_delaylps_stamp_jiffies = jiffies; |
5659 | + } |
5660 | + return true; |
5661 | } |
5662 | EXPORT_SYMBOL_GPL(rtl_is_special_data); |
5663 | |
5664 | diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c |
5665 | index b68cae30..e06971be 100644 |
5666 | --- a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c |
5667 | +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c |
5668 | @@ -143,6 +143,7 @@ static void _rtl88ee_set_fw_clock_on(struct ieee80211_hw *hw, |
5669 | } else { |
5670 | rtlhal->fw_clk_change_in_progress = false; |
5671 | spin_unlock_bh(&rtlpriv->locks.fw_ps_lock); |
5672 | + break; |
5673 | } |
5674 | } |
5675 | |
5676 | diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c |
5677 | index da4f5871..2c68c138 100644 |
5678 | --- a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c |
5679 | +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c |
5680 | @@ -778,7 +778,7 @@ static long _rtl92c_signal_scale_mapping(struct ieee80211_hw *hw, |
5681 | |
5682 | static void _rtl92c_query_rxphystatus(struct ieee80211_hw *hw, |
5683 | struct rtl_stats *pstats, |
5684 | - struct rx_desc_92c *pdesc, |
5685 | + struct rx_desc_92c *p_desc, |
5686 | struct rx_fwinfo_92c *p_drvinfo, |
5687 | bool packet_match_bssid, |
5688 | bool packet_toself, |
5689 | @@ -793,11 +793,11 @@ static void _rtl92c_query_rxphystatus(struct ieee80211_hw *hw, |
5690 | u32 rssi, total_rssi = 0; |
5691 | bool in_powersavemode = false; |
5692 | bool is_cck_rate; |
5693 | + u8 *pdesc = (u8 *)p_desc; |
5694 | |
5695 | - is_cck_rate = RX_HAL_IS_CCK_RATE(pdesc); |
5696 | + is_cck_rate = RX_HAL_IS_CCK_RATE(p_desc); |
5697 | pstats->packet_matchbssid = packet_match_bssid; |
5698 | pstats->packet_toself = packet_toself; |
5699 | - pstats->is_cck = is_cck_rate; |
5700 | pstats->packet_beacon = packet_beacon; |
5701 | pstats->is_cck = is_cck_rate; |
5702 | pstats->RX_SIGQ[0] = -1; |
5703 | diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c |
5704 | index 5a060e53..5c52a8ac 100644 |
5705 | --- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c |
5706 | +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c |
5707 | @@ -303,10 +303,10 @@ out: |
5708 | bool rtl92cu_rx_query_desc(struct ieee80211_hw *hw, |
5709 | struct rtl_stats *stats, |
5710 | struct ieee80211_rx_status *rx_status, |
5711 | - u8 *p_desc, struct sk_buff *skb) |
5712 | + u8 *pdesc, struct sk_buff *skb) |
5713 | { |
5714 | struct rx_fwinfo_92c *p_drvinfo; |
5715 | - struct rx_desc_92c *pdesc = (struct rx_desc_92c *)p_desc; |
5716 | + struct rx_desc_92c *p_desc = (struct rx_desc_92c *)pdesc; |
5717 | u32 phystatus = GET_RX_DESC_PHY_STATUS(pdesc); |
5718 | |
5719 | stats->length = (u16) GET_RX_DESC_PKT_LEN(pdesc); |
5720 | @@ -345,11 +345,11 @@ bool rtl92cu_rx_query_desc(struct ieee80211_hw *hw, |
5721 | if (phystatus) { |
5722 | p_drvinfo = (struct rx_fwinfo_92c *)(skb->data + |
5723 | stats->rx_bufshift); |
5724 | - rtl92c_translate_rx_signal_stuff(hw, skb, stats, pdesc, |
5725 | + rtl92c_translate_rx_signal_stuff(hw, skb, stats, p_desc, |
5726 | p_drvinfo); |
5727 | } |
5728 | /*rx_status->qual = stats->signal; */ |
5729 | - rx_status->signal = stats->rssi + 10; |
5730 | + rx_status->signal = stats->recvsignalpower + 10; |
5731 | /*rx_status->noise = -stats->noise; */ |
5732 | return true; |
5733 | } |
5734 | diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/trx.c b/drivers/net/wireless/rtlwifi/rtl8192de/trx.c |
5735 | index b8ec718a..542394c8 100644 |
5736 | --- a/drivers/net/wireless/rtlwifi/rtl8192de/trx.c |
5737 | +++ b/drivers/net/wireless/rtlwifi/rtl8192de/trx.c |
5738 | @@ -525,7 +525,7 @@ bool rtl92de_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats, |
5739 | p_drvinfo); |
5740 | } |
5741 | /*rx_status->qual = stats->signal; */ |
5742 | - rx_status->signal = stats->rssi + 10; |
5743 | + rx_status->signal = stats->recvsignalpower + 10; |
5744 | /*rx_status->noise = -stats->noise; */ |
5745 | return true; |
5746 | } |
5747 | diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/rf.c b/drivers/net/wireless/rtlwifi/rtl8192se/rf.c |
5748 | index 5061f1db..92d38ab3 100644 |
5749 | --- a/drivers/net/wireless/rtlwifi/rtl8192se/rf.c |
5750 | +++ b/drivers/net/wireless/rtlwifi/rtl8192se/rf.c |
5751 | @@ -265,7 +265,7 @@ static void _rtl92s_get_txpower_writeval_byregulatory(struct ieee80211_hw *hw, |
5752 | rtlefuse->pwrgroup_ht40 |
5753 | [RF90_PATH_A][chnl - 1]) { |
5754 | pwrdiff_limit[i] = |
5755 | - rtlefuse->pwrgroup_ht20 |
5756 | + rtlefuse->pwrgroup_ht40 |
5757 | [RF90_PATH_A][chnl - 1]; |
5758 | } |
5759 | } else { |
5760 | diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c |
5761 | index c7095118..7d0f2e20 100644 |
5762 | --- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c |
5763 | +++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c |
5764 | @@ -329,7 +329,7 @@ bool rtl92se_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats, |
5765 | } |
5766 | |
5767 | /*rx_status->qual = stats->signal; */ |
5768 | - rx_status->signal = stats->rssi + 10; |
5769 | + rx_status->signal = stats->recvsignalpower + 10; |
5770 | /*rx_status->noise = -stats->noise; */ |
5771 | |
5772 | return true; |
5773 | diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h |
5774 | index 70325874..ad9c37a4 100644 |
5775 | --- a/drivers/net/wireless/rtlwifi/wifi.h |
5776 | +++ b/drivers/net/wireless/rtlwifi/wifi.h |
5777 | @@ -77,11 +77,7 @@ |
5778 | #define RTL_SLOT_TIME_9 9 |
5779 | #define RTL_SLOT_TIME_20 20 |
5780 | |
5781 | -/*related with tcp/ip. */ |
5782 | -/*if_ehther.h*/ |
5783 | -#define ETH_P_PAE 0x888E /*Port Access Entity (IEEE 802.1X) */ |
5784 | -#define ETH_P_IP 0x0800 /*Internet Protocol packet */ |
5785 | -#define ETH_P_ARP 0x0806 /*Address Resolution packet */ |
5786 | +/*related to tcp/ip. */ |
5787 | #define SNAP_SIZE 6 |
5788 | #define PROTOC_TYPE_SIZE 2 |
5789 | |
5790 | diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c |
5791 | index 696caed5..ce8acc71 100644 |
5792 | --- a/drivers/pci/pcie/portdrv_pci.c |
5793 | +++ b/drivers/pci/pcie/portdrv_pci.c |
5794 | @@ -223,7 +223,6 @@ static int pcie_portdrv_probe(struct pci_dev *dev, |
5795 | static void pcie_portdrv_remove(struct pci_dev *dev) |
5796 | { |
5797 | pcie_port_device_remove(dev); |
5798 | - pci_disable_device(dev); |
5799 | } |
5800 | |
5801 | static int error_detected_iter(struct device *device, void *data) |
5802 | diff --git a/drivers/pinctrl/mvebu/pinctrl-dove.c b/drivers/pinctrl/mvebu/pinctrl-dove.c |
5803 | index 29f7e4fc..360b9b23 100644 |
5804 | --- a/drivers/pinctrl/mvebu/pinctrl-dove.c |
5805 | +++ b/drivers/pinctrl/mvebu/pinctrl-dove.c |
5806 | @@ -335,7 +335,7 @@ static int dove_twsi_ctrl_set(struct mvebu_mpp_ctrl *ctrl, |
5807 | unsigned long gcfg2 = readl(DOVE_GLOBAL_CONFIG_2); |
5808 | |
5809 | gcfg1 &= ~DOVE_TWSI_ENABLE_OPTION1; |
5810 | - gcfg2 &= ~(DOVE_TWSI_ENABLE_OPTION2 | DOVE_TWSI_ENABLE_OPTION2); |
5811 | + gcfg2 &= ~(DOVE_TWSI_ENABLE_OPTION2 | DOVE_TWSI_ENABLE_OPTION3); |
5812 | |
5813 | switch (config) { |
5814 | case 1: |
5815 | diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c |
5816 | index 13ec195f..3484dd29 100644 |
5817 | --- a/drivers/platform/x86/sony-laptop.c |
5818 | +++ b/drivers/platform/x86/sony-laptop.c |
5819 | @@ -140,7 +140,6 @@ MODULE_PARM_DESC(kbd_backlight_timeout, |
5820 | "on the model (default: no change from current value)"); |
5821 | |
5822 | #ifdef CONFIG_PM_SLEEP |
5823 | -static void sony_nc_kbd_backlight_resume(void); |
5824 | static void sony_nc_thermal_resume(void); |
5825 | #endif |
5826 | static int sony_nc_kbd_backlight_setup(struct platform_device *pd, |
5827 | @@ -1486,13 +1485,6 @@ static void sony_nc_function_resume(void) |
5828 | case 0x0135: |
5829 | sony_nc_rfkill_update(); |
5830 | break; |
5831 | - case 0x0137: |
5832 | - case 0x0143: |
5833 | - case 0x014b: |
5834 | - case 0x014c: |
5835 | - case 0x0163: |
5836 | - sony_nc_kbd_backlight_resume(); |
5837 | - break; |
5838 | default: |
5839 | continue; |
5840 | } |
5841 | @@ -1894,25 +1886,6 @@ static void sony_nc_kbd_backlight_cleanup(struct platform_device *pd) |
5842 | } |
5843 | } |
5844 | |
5845 | -#ifdef CONFIG_PM_SLEEP |
5846 | -static void sony_nc_kbd_backlight_resume(void) |
5847 | -{ |
5848 | - int ignore = 0; |
5849 | - |
5850 | - if (!kbdbl_ctl) |
5851 | - return; |
5852 | - |
5853 | - if (kbdbl_ctl->mode == 0) |
5854 | - sony_call_snc_handle(kbdbl_ctl->handle, kbdbl_ctl->base, |
5855 | - &ignore); |
5856 | - |
5857 | - if (kbdbl_ctl->timeout != 0) |
5858 | - sony_call_snc_handle(kbdbl_ctl->handle, |
5859 | - (kbdbl_ctl->base + 0x200) | |
5860 | - (kbdbl_ctl->timeout << 0x10), &ignore); |
5861 | -} |
5862 | -#endif |
5863 | - |
5864 | struct battery_care_control { |
5865 | struct device_attribute attrs[2]; |
5866 | unsigned int handle; |
5867 | diff --git a/drivers/regulator/pfuze100-regulator.c b/drivers/regulator/pfuze100-regulator.c |
5868 | index ba67b2c4..032df379 100644 |
5869 | --- a/drivers/regulator/pfuze100-regulator.c |
5870 | +++ b/drivers/regulator/pfuze100-regulator.c |
5871 | @@ -308,9 +308,15 @@ static int pfuze_identify(struct pfuze_chip *pfuze_chip) |
5872 | if (ret) |
5873 | return ret; |
5874 | |
5875 | - if (value & 0x0f) { |
5876 | - dev_warn(pfuze_chip->dev, "Illegal ID: %x\n", value); |
5877 | - return -ENODEV; |
5878 | + switch (value & 0x0f) { |
5879 | + /* Freescale misprogrammed 1-3% of parts prior to week 8 of 2013 as ID=8 */ |
5880 | + case 0x8: |
5881 | + dev_info(pfuze_chip->dev, "Assuming misprogrammed ID=0x8"); |
5882 | + case 0x0: |
5883 | + break; |
5884 | + default: |
5885 | + dev_warn(pfuze_chip->dev, "Illegal ID: %x\n", value); |
5886 | + return -ENODEV; |
5887 | } |
5888 | |
5889 | ret = regmap_read(pfuze_chip->regmap, PFUZE100_REVID, &value); |
5890 | diff --git a/drivers/regulator/ti-abb-regulator.c b/drivers/regulator/ti-abb-regulator.c |
5891 | index 20c271d4..b993ec57 100644 |
5892 | --- a/drivers/regulator/ti-abb-regulator.c |
5893 | +++ b/drivers/regulator/ti-abb-regulator.c |
5894 | @@ -615,7 +615,7 @@ static int ti_abb_init_table(struct device *dev, struct ti_abb *abb, |
5895 | pname, *volt_table, vset_mask); |
5896 | continue; |
5897 | } |
5898 | - info->vset = efuse_val & vset_mask >> __ffs(vset_mask); |
5899 | + info->vset = (efuse_val & vset_mask) >> __ffs(vset_mask); |
5900 | dev_dbg(dev, "[%d]v=%d vset=%x\n", i, *volt_table, info->vset); |
5901 | check_abb: |
5902 | switch (info->opp_sel) { |
5903 | diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c |
5904 | index 0a328d0d..bd8c09e7 100644 |
5905 | --- a/drivers/s390/net/qeth_core_main.c |
5906 | +++ b/drivers/s390/net/qeth_core_main.c |
5907 | @@ -4451,7 +4451,7 @@ int qeth_snmp_command(struct qeth_card *card, char __user *udata) |
5908 | struct qeth_cmd_buffer *iob; |
5909 | struct qeth_ipa_cmd *cmd; |
5910 | struct qeth_snmp_ureq *ureq; |
5911 | - int req_len; |
5912 | + unsigned int req_len; |
5913 | struct qeth_arp_query_info qinfo = {0, }; |
5914 | int rc = 0; |
5915 | |
5916 | @@ -4467,6 +4467,10 @@ int qeth_snmp_command(struct qeth_card *card, char __user *udata) |
5917 | /* skip 4 bytes (data_len struct member) to get req_len */ |
5918 | if (copy_from_user(&req_len, udata + sizeof(int), sizeof(int))) |
5919 | return -EFAULT; |
5920 | + if (req_len > (QETH_BUFSIZE - IPA_PDU_HEADER_SIZE - |
5921 | + sizeof(struct qeth_ipacmd_hdr) - |
5922 | + sizeof(struct qeth_ipacmd_setadpparms_hdr))) |
5923 | + return -EINVAL; |
5924 | ureq = memdup_user(udata, req_len + sizeof(struct qeth_snmp_ureq_hdr)); |
5925 | if (IS_ERR(ureq)) { |
5926 | QETH_CARD_TEXT(card, 2, "snmpnome"); |
5927 | diff --git a/drivers/staging/lustre/lustre/ptlrpc/pinger.c b/drivers/staging/lustre/lustre/ptlrpc/pinger.c |
5928 | index 5dec771d..4d340f4a 100644 |
5929 | --- a/drivers/staging/lustre/lustre/ptlrpc/pinger.c |
5930 | +++ b/drivers/staging/lustre/lustre/ptlrpc/pinger.c |
5931 | @@ -409,8 +409,8 @@ int ptlrpc_stop_pinger(void) |
5932 | struct l_wait_info lwi = { 0 }; |
5933 | int rc = 0; |
5934 | |
5935 | - if (!thread_is_init(&pinger_thread) && |
5936 | - !thread_is_stopped(&pinger_thread)) |
5937 | + if (thread_is_init(&pinger_thread) || |
5938 | + thread_is_stopped(&pinger_thread)) |
5939 | return -EALREADY; |
5940 | |
5941 | ptlrpc_pinger_remove_timeouts(); |
5942 | diff --git a/drivers/staging/media/lirc/lirc_zilog.c b/drivers/staging/media/lirc/lirc_zilog.c |
5943 | index 11d5338b..0feeaadf 100644 |
5944 | --- a/drivers/staging/media/lirc/lirc_zilog.c |
5945 | +++ b/drivers/staging/media/lirc/lirc_zilog.c |
5946 | @@ -61,6 +61,9 @@ |
5947 | #include <media/lirc_dev.h> |
5948 | #include <media/lirc.h> |
5949 | |
5950 | +/* Max transfer size done by I2C transfer functions */ |
5951 | +#define MAX_XFER_SIZE 64 |
5952 | + |
5953 | struct IR; |
5954 | |
5955 | struct IR_rx { |
5956 | @@ -941,7 +944,14 @@ static ssize_t read(struct file *filep, char *outbuf, size_t n, loff_t *ppos) |
5957 | schedule(); |
5958 | set_current_state(TASK_INTERRUPTIBLE); |
5959 | } else { |
5960 | - unsigned char buf[rbuf->chunk_size]; |
5961 | + unsigned char buf[MAX_XFER_SIZE]; |
5962 | + |
5963 | + if (rbuf->chunk_size > sizeof(buf)) { |
5964 | + zilog_error("chunk_size is too big (%d)!\n", |
5965 | + rbuf->chunk_size); |
5966 | + ret = -EINVAL; |
5967 | + break; |
5968 | + } |
5969 | m = lirc_buffer_read(rbuf, buf); |
5970 | if (m == rbuf->chunk_size) { |
5971 | ret = copy_to_user((void *)outbuf+written, buf, |
5972 | diff --git a/drivers/staging/rtl8188eu/core/rtw_ap.c b/drivers/staging/rtl8188eu/core/rtw_ap.c |
5973 | index 2c73823d..2a13a41f 100644 |
5974 | --- a/drivers/staging/rtl8188eu/core/rtw_ap.c |
5975 | +++ b/drivers/staging/rtl8188eu/core/rtw_ap.c |
5976 | @@ -1115,6 +1115,9 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) |
5977 | return _FAIL; |
5978 | } |
5979 | |
5980 | + /* fix bug of flush_cam_entry at STOP AP mode */ |
5981 | + psta->state |= WIFI_AP_STATE; |
5982 | + rtw_indicate_connect(padapter); |
5983 | pmlmepriv->cur_network.join_res = true;/* for check if already set beacon */ |
5984 | return ret; |
5985 | } |
5986 | diff --git a/drivers/staging/tidspbridge/Kconfig b/drivers/staging/tidspbridge/Kconfig |
5987 | index 165b918b..1b6d581c 100644 |
5988 | --- a/drivers/staging/tidspbridge/Kconfig |
5989 | +++ b/drivers/staging/tidspbridge/Kconfig |
5990 | @@ -4,7 +4,7 @@ |
5991 | |
5992 | menuconfig TIDSPBRIDGE |
5993 | tristate "DSP Bridge driver" |
5994 | - depends on ARCH_OMAP3 && !ARCH_MULTIPLATFORM |
5995 | + depends on ARCH_OMAP3 && !ARCH_MULTIPLATFORM && BROKEN |
5996 | select MAILBOX |
5997 | select OMAP2PLUS_MBOX |
5998 | help |
5999 | diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c |
6000 | index 1e8b8412..4aa5ef54 100644 |
6001 | --- a/drivers/staging/vt6656/baseband.c |
6002 | +++ b/drivers/staging/vt6656/baseband.c |
6003 | @@ -939,6 +939,7 @@ int BBbVT3184Init(struct vnt_private *pDevice) |
6004 | u8 * pbyAgc; |
6005 | u16 wLengthAgc; |
6006 | u8 abyArray[256]; |
6007 | + u8 data; |
6008 | |
6009 | ntStatus = CONTROLnsRequestIn(pDevice, |
6010 | MESSAGE_TYPE_READ, |
6011 | @@ -1104,6 +1105,16 @@ else { |
6012 | ControlvWriteByte(pDevice,MESSAGE_REQUEST_BBREG,0x0D,0x01); |
6013 | |
6014 | RFbRFTableDownload(pDevice); |
6015 | + |
6016 | + /* Fix for TX USB resets from vendors driver */ |
6017 | + CONTROLnsRequestIn(pDevice, MESSAGE_TYPE_READ, USB_REG4, |
6018 | + MESSAGE_REQUEST_MEM, sizeof(data), &data); |
6019 | + |
6020 | + data |= 0x2; |
6021 | + |
6022 | + CONTROLnsRequestOut(pDevice, MESSAGE_TYPE_WRITE, USB_REG4, |
6023 | + MESSAGE_REQUEST_MEM, sizeof(data), &data); |
6024 | + |
6025 | return true;//ntStatus; |
6026 | } |
6027 | |
6028 | diff --git a/drivers/staging/vt6656/rndis.h b/drivers/staging/vt6656/rndis.h |
6029 | index 5e073062..5cf5e732 100644 |
6030 | --- a/drivers/staging/vt6656/rndis.h |
6031 | +++ b/drivers/staging/vt6656/rndis.h |
6032 | @@ -66,6 +66,8 @@ |
6033 | |
6034 | #define VIAUSB20_PACKET_HEADER 0x04 |
6035 | |
6036 | +#define USB_REG4 0x604 |
6037 | + |
6038 | typedef struct _CMD_MESSAGE |
6039 | { |
6040 | u8 byData[256]; |
6041 | diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c |
6042 | index 012ba15e..e06ec439 100644 |
6043 | --- a/drivers/staging/zram/zram_drv.c |
6044 | +++ b/drivers/staging/zram/zram_drv.c |
6045 | @@ -652,21 +652,30 @@ static ssize_t reset_store(struct device *dev, |
6046 | return -ENOMEM; |
6047 | |
6048 | /* Do not reset an active device! */ |
6049 | - if (bdev->bd_holders) |
6050 | - return -EBUSY; |
6051 | + if (bdev->bd_holders) { |
6052 | + ret = -EBUSY; |
6053 | + goto out; |
6054 | + } |
6055 | |
6056 | ret = kstrtou16(buf, 10, &do_reset); |
6057 | if (ret) |
6058 | - return ret; |
6059 | + goto out; |
6060 | |
6061 | - if (!do_reset) |
6062 | - return -EINVAL; |
6063 | + if (!do_reset) { |
6064 | + ret = -EINVAL; |
6065 | + goto out; |
6066 | + } |
6067 | |
6068 | /* Make sure all pending I/O is finished */ |
6069 | fsync_bdev(bdev); |
6070 | + bdput(bdev); |
6071 | |
6072 | zram_reset_device(zram, true); |
6073 | return len; |
6074 | + |
6075 | +out: |
6076 | + bdput(bdev); |
6077 | + return ret; |
6078 | } |
6079 | |
6080 | static void __zram_make_request(struct zram *zram, struct bio *bio, int rw) |
6081 | diff --git a/drivers/staging/zsmalloc/zsmalloc-main.c b/drivers/staging/zsmalloc/zsmalloc-main.c |
6082 | index 1a67537d..3b950e5a 100644 |
6083 | --- a/drivers/staging/zsmalloc/zsmalloc-main.c |
6084 | +++ b/drivers/staging/zsmalloc/zsmalloc-main.c |
6085 | @@ -430,7 +430,12 @@ static struct page *get_next_page(struct page *page) |
6086 | return next; |
6087 | } |
6088 | |
6089 | -/* Encode <page, obj_idx> as a single handle value */ |
6090 | +/* |
6091 | + * Encode <page, obj_idx> as a single handle value. |
6092 | + * On hardware platforms with physical memory starting at 0x0 the pfn |
6093 | + * could be 0 so we ensure that the handle will never be 0 by adjusting the |
6094 | + * encoded obj_idx value before encoding. |
6095 | + */ |
6096 | static void *obj_location_to_handle(struct page *page, unsigned long obj_idx) |
6097 | { |
6098 | unsigned long handle; |
6099 | @@ -441,17 +446,21 @@ static void *obj_location_to_handle(struct page *page, unsigned long obj_idx) |
6100 | } |
6101 | |
6102 | handle = page_to_pfn(page) << OBJ_INDEX_BITS; |
6103 | - handle |= (obj_idx & OBJ_INDEX_MASK); |
6104 | + handle |= ((obj_idx + 1) & OBJ_INDEX_MASK); |
6105 | |
6106 | return (void *)handle; |
6107 | } |
6108 | |
6109 | -/* Decode <page, obj_idx> pair from the given object handle */ |
6110 | +/* |
6111 | + * Decode <page, obj_idx> pair from the given object handle. We adjust the |
6112 | + * decoded obj_idx back to its original value since it was adjusted in |
6113 | + * obj_location_to_handle(). |
6114 | + */ |
6115 | static void obj_handle_to_location(unsigned long handle, struct page **page, |
6116 | unsigned long *obj_idx) |
6117 | { |
6118 | *page = pfn_to_page(handle >> OBJ_INDEX_BITS); |
6119 | - *obj_idx = handle & OBJ_INDEX_MASK; |
6120 | + *obj_idx = (handle & OBJ_INDEX_MASK) - 1; |
6121 | } |
6122 | |
6123 | static unsigned long obj_idx_to_offset(struct page *page, |
6124 | diff --git a/drivers/target/iscsi/iscsi_target_auth.c b/drivers/target/iscsi/iscsi_target_auth.c |
6125 | index 7505fddc..3e801885 100644 |
6126 | --- a/drivers/target/iscsi/iscsi_target_auth.c |
6127 | +++ b/drivers/target/iscsi/iscsi_target_auth.c |
6128 | @@ -146,6 +146,7 @@ static int chap_server_compute_md5( |
6129 | unsigned char client_digest[MD5_SIGNATURE_SIZE]; |
6130 | unsigned char server_digest[MD5_SIGNATURE_SIZE]; |
6131 | unsigned char chap_n[MAX_CHAP_N_SIZE], chap_r[MAX_RESPONSE_LENGTH]; |
6132 | + size_t compare_len; |
6133 | struct iscsi_chap *chap = conn->auth_protocol; |
6134 | struct crypto_hash *tfm; |
6135 | struct hash_desc desc; |
6136 | @@ -184,7 +185,9 @@ static int chap_server_compute_md5( |
6137 | goto out; |
6138 | } |
6139 | |
6140 | - if (memcmp(chap_n, auth->userid, strlen(auth->userid)) != 0) { |
6141 | + /* Include the terminating NULL in the compare */ |
6142 | + compare_len = strlen(auth->userid) + 1; |
6143 | + if (strncmp(chap_n, auth->userid, compare_len) != 0) { |
6144 | pr_err("CHAP_N values do not match!\n"); |
6145 | goto out; |
6146 | } |
6147 | diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c |
6148 | index fd145259..8a1bd1af 100644 |
6149 | --- a/drivers/target/iscsi/iscsi_target_configfs.c |
6150 | +++ b/drivers/target/iscsi/iscsi_target_configfs.c |
6151 | @@ -1784,6 +1784,11 @@ static int lio_queue_status(struct se_cmd *se_cmd) |
6152 | struct iscsi_cmd *cmd = container_of(se_cmd, struct iscsi_cmd, se_cmd); |
6153 | |
6154 | cmd->i_state = ISTATE_SEND_STATUS; |
6155 | + |
6156 | + if (cmd->se_cmd.scsi_status || cmd->sense_reason) { |
6157 | + iscsit_add_cmd_to_response_queue(cmd, cmd->conn, cmd->i_state); |
6158 | + return 0; |
6159 | + } |
6160 | cmd->conn->conn_transport->iscsit_queue_status(cmd->conn, cmd); |
6161 | |
6162 | return 0; |
6163 | diff --git a/drivers/target/iscsi/iscsi_target_device.c b/drivers/target/iscsi/iscsi_target_device.c |
6164 | index 6c7a5104..7087c736 100644 |
6165 | --- a/drivers/target/iscsi/iscsi_target_device.c |
6166 | +++ b/drivers/target/iscsi/iscsi_target_device.c |
6167 | @@ -58,11 +58,7 @@ void iscsit_increment_maxcmdsn(struct iscsi_cmd *cmd, struct iscsi_session *sess |
6168 | |
6169 | cmd->maxcmdsn_inc = 1; |
6170 | |
6171 | - if (!mutex_trylock(&sess->cmdsn_mutex)) { |
6172 | - sess->max_cmd_sn += 1; |
6173 | - pr_debug("Updated MaxCmdSN to 0x%08x\n", sess->max_cmd_sn); |
6174 | - return; |
6175 | - } |
6176 | + mutex_lock(&sess->cmdsn_mutex); |
6177 | sess->max_cmd_sn += 1; |
6178 | pr_debug("Updated MaxCmdSN to 0x%08x\n", sess->max_cmd_sn); |
6179 | mutex_unlock(&sess->cmdsn_mutex); |
6180 | diff --git a/drivers/target/iscsi/iscsi_target_nego.c b/drivers/target/iscsi/iscsi_target_nego.c |
6181 | index ef6d836a..a972145d 100644 |
6182 | --- a/drivers/target/iscsi/iscsi_target_nego.c |
6183 | +++ b/drivers/target/iscsi/iscsi_target_nego.c |
6184 | @@ -88,7 +88,7 @@ int extract_param( |
6185 | if (len < 0) |
6186 | return -1; |
6187 | |
6188 | - if (len > max_length) { |
6189 | + if (len >= max_length) { |
6190 | pr_err("Length of input: %d exceeds max_length:" |
6191 | " %d\n", len, max_length); |
6192 | return -1; |
6193 | diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c |
6194 | index 81e945ee..0b0009b5 100644 |
6195 | --- a/drivers/target/target_core_transport.c |
6196 | +++ b/drivers/target/target_core_transport.c |
6197 | @@ -2910,6 +2910,7 @@ int transport_check_aborted_status(struct se_cmd *cmd, int send_status) |
6198 | cmd->t_task_cdb[0], cmd->se_tfo->get_task_tag(cmd)); |
6199 | |
6200 | cmd->se_cmd_flags |= SCF_SENT_DELAYED_TAS; |
6201 | + cmd->scsi_status = SAM_STAT_TASK_ABORTED; |
6202 | trace_target_cmd_complete(cmd); |
6203 | cmd->se_tfo->queue_status(cmd); |
6204 | |
6205 | @@ -2938,6 +2939,7 @@ void transport_send_task_abort(struct se_cmd *cmd) |
6206 | if (cmd->se_tfo->write_pending_status(cmd) != 0) { |
6207 | cmd->transport_state |= CMD_T_ABORTED; |
6208 | smp_mb__after_atomic_inc(); |
6209 | + return; |
6210 | } |
6211 | } |
6212 | cmd->scsi_status = SAM_STAT_TASK_ABORTED; |
6213 | diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c |
6214 | index 7a744b69..ff582933 100644 |
6215 | --- a/drivers/tty/n_tty.c |
6216 | +++ b/drivers/tty/n_tty.c |
6217 | @@ -767,8 +767,8 @@ static size_t __process_echoes(struct tty_struct *tty) |
6218 | * of echo overrun before the next commit), then discard enough |
6219 | * data at the tail to prevent a subsequent overrun */ |
6220 | while (ldata->echo_commit - tail >= ECHO_DISCARD_WATERMARK) { |
6221 | - if (echo_buf(ldata, tail == ECHO_OP_START)) { |
6222 | - if (echo_buf(ldata, tail) == ECHO_OP_ERASE_TAB) |
6223 | + if (echo_buf(ldata, tail) == ECHO_OP_START) { |
6224 | + if (echo_buf(ldata, tail + 1) == ECHO_OP_ERASE_TAB) |
6225 | tail += 3; |
6226 | else |
6227 | tail += 2; |
6228 | @@ -2005,7 +2005,10 @@ static int canon_copy_from_read_buf(struct tty_struct *tty, |
6229 | found = 1; |
6230 | |
6231 | size = N_TTY_BUF_SIZE - tail; |
6232 | - n = (found + eol + size) & (N_TTY_BUF_SIZE - 1); |
6233 | + n = eol - tail; |
6234 | + if (n > 4096) |
6235 | + n += 4096; |
6236 | + n += found; |
6237 | c = n; |
6238 | |
6239 | if (found && read_buf(ldata, eol) == __DISABLED_CHAR) { |
6240 | @@ -2250,6 +2253,9 @@ static ssize_t n_tty_read(struct tty_struct *tty, struct file *file, |
6241 | if (time) |
6242 | timeout = time; |
6243 | } |
6244 | + n_tty_set_room(tty); |
6245 | + up_read(&tty->termios_rwsem); |
6246 | + |
6247 | mutex_unlock(&ldata->atomic_read_lock); |
6248 | remove_wait_queue(&tty->read_wait, &wait); |
6249 | |
6250 | @@ -2260,8 +2266,6 @@ static ssize_t n_tty_read(struct tty_struct *tty, struct file *file, |
6251 | if (b - buf) |
6252 | retval = b - buf; |
6253 | |
6254 | - n_tty_set_room(tty); |
6255 | - up_read(&tty->termios_rwsem); |
6256 | return retval; |
6257 | } |
6258 | |
6259 | diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c |
6260 | index 3a1a01af..c74a00ad 100644 |
6261 | --- a/drivers/tty/tty_io.c |
6262 | +++ b/drivers/tty/tty_io.c |
6263 | @@ -2086,6 +2086,7 @@ retry_open: |
6264 | filp->f_op = &tty_fops; |
6265 | goto retry_open; |
6266 | } |
6267 | + clear_bit(TTY_HUPPED, &tty->flags); |
6268 | tty_unlock(tty); |
6269 | |
6270 | |
6271 | diff --git a/drivers/video/backlight/atmel-pwm-bl.c b/drivers/video/backlight/atmel-pwm-bl.c |
6272 | index f7447f70..d18da911 100644 |
6273 | --- a/drivers/video/backlight/atmel-pwm-bl.c |
6274 | +++ b/drivers/video/backlight/atmel-pwm-bl.c |
6275 | @@ -70,7 +70,7 @@ static int atmel_pwm_bl_set_intensity(struct backlight_device *bd) |
6276 | static int atmel_pwm_bl_get_intensity(struct backlight_device *bd) |
6277 | { |
6278 | struct atmel_pwm_bl *pwmbl = bl_get_data(bd); |
6279 | - u8 intensity; |
6280 | + u32 intensity; |
6281 | |
6282 | if (pwmbl->pdata->pwm_active_low) { |
6283 | intensity = pwm_channel_readl(&pwmbl->pwmc, PWM_CDTY) - |
6284 | @@ -80,7 +80,7 @@ static int atmel_pwm_bl_get_intensity(struct backlight_device *bd) |
6285 | pwm_channel_readl(&pwmbl->pwmc, PWM_CDTY); |
6286 | } |
6287 | |
6288 | - return intensity; |
6289 | + return intensity & 0xffff; |
6290 | } |
6291 | |
6292 | static int atmel_pwm_bl_init_pwm(struct atmel_pwm_bl *pwmbl) |
6293 | @@ -206,8 +206,10 @@ static int atmel_pwm_bl_remove(struct platform_device *pdev) |
6294 | { |
6295 | struct atmel_pwm_bl *pwmbl = platform_get_drvdata(pdev); |
6296 | |
6297 | - if (pwmbl->gpio_on != -1) |
6298 | - gpio_set_value(pwmbl->gpio_on, 0); |
6299 | + if (pwmbl->gpio_on != -1) { |
6300 | + gpio_set_value(pwmbl->gpio_on, |
6301 | + 0 ^ pwmbl->pdata->on_active_low); |
6302 | + } |
6303 | pwm_channel_disable(&pwmbl->pwmc); |
6304 | pwm_channel_free(&pwmbl->pwmc); |
6305 | backlight_device_unregister(pwmbl->bldev); |
6306 | diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c |
6307 | index 35687fd5..4ad24f2c 100644 |
6308 | --- a/drivers/video/console/sticore.c |
6309 | +++ b/drivers/video/console/sticore.c |
6310 | @@ -3,7 +3,7 @@ |
6311 | * core code for console driver using HP's STI firmware |
6312 | * |
6313 | * Copyright (C) 2000 Philipp Rumpf <prumpf@tux.org> |
6314 | - * Copyright (C) 2001-2003 Helge Deller <deller@gmx.de> |
6315 | + * Copyright (C) 2001-2013 Helge Deller <deller@gmx.de> |
6316 | * Copyright (C) 2001-2002 Thomas Bogendoerfer <tsbogend@alpha.franken.de> |
6317 | * |
6318 | * TODO: |
6319 | @@ -30,7 +30,7 @@ |
6320 | |
6321 | #include "../sticore.h" |
6322 | |
6323 | -#define STI_DRIVERVERSION "Version 0.9a" |
6324 | +#define STI_DRIVERVERSION "Version 0.9b" |
6325 | |
6326 | static struct sti_struct *default_sti __read_mostly; |
6327 | |
6328 | @@ -73,28 +73,34 @@ static const struct sti_init_flags default_init_flags = { |
6329 | |
6330 | static int sti_init_graph(struct sti_struct *sti) |
6331 | { |
6332 | - struct sti_init_inptr_ext inptr_ext = { 0, }; |
6333 | - struct sti_init_inptr inptr = { |
6334 | - .text_planes = 3, /* # of text planes (max 3 for STI) */ |
6335 | - .ext_ptr = STI_PTR(&inptr_ext) |
6336 | - }; |
6337 | - struct sti_init_outptr outptr = { 0, }; |
6338 | + struct sti_init_inptr *inptr = &sti->sti_data->init_inptr; |
6339 | + struct sti_init_inptr_ext *inptr_ext = &sti->sti_data->init_inptr_ext; |
6340 | + struct sti_init_outptr *outptr = &sti->sti_data->init_outptr; |
6341 | unsigned long flags; |
6342 | - int ret; |
6343 | + int ret, err; |
6344 | |
6345 | spin_lock_irqsave(&sti->lock, flags); |
6346 | |
6347 | - ret = STI_CALL(sti->init_graph, &default_init_flags, &inptr, |
6348 | - &outptr, sti->glob_cfg); |
6349 | + memset(inptr, 0, sizeof(*inptr)); |
6350 | + inptr->text_planes = 3; /* # of text planes (max 3 for STI) */ |
6351 | + memset(inptr_ext, 0, sizeof(*inptr_ext)); |
6352 | + inptr->ext_ptr = STI_PTR(inptr_ext); |
6353 | + outptr->errno = 0; |
6354 | + |
6355 | + ret = sti_call(sti, sti->init_graph, &default_init_flags, inptr, |
6356 | + outptr, sti->glob_cfg); |
6357 | + |
6358 | + if (ret >= 0) |
6359 | + sti->text_planes = outptr->text_planes; |
6360 | + err = outptr->errno; |
6361 | |
6362 | spin_unlock_irqrestore(&sti->lock, flags); |
6363 | |
6364 | if (ret < 0) { |
6365 | - printk(KERN_ERR "STI init_graph failed (ret %d, errno %d)\n",ret,outptr.errno); |
6366 | + pr_err("STI init_graph failed (ret %d, errno %d)\n", ret, err); |
6367 | return -1; |
6368 | } |
6369 | |
6370 | - sti->text_planes = outptr.text_planes; |
6371 | return 0; |
6372 | } |
6373 | |
6374 | @@ -104,16 +110,18 @@ static const struct sti_conf_flags default_conf_flags = { |
6375 | |
6376 | static void sti_inq_conf(struct sti_struct *sti) |
6377 | { |
6378 | - struct sti_conf_inptr inptr = { 0, }; |
6379 | + struct sti_conf_inptr *inptr = &sti->sti_data->inq_inptr; |
6380 | + struct sti_conf_outptr *outptr = &sti->sti_data->inq_outptr; |
6381 | unsigned long flags; |
6382 | s32 ret; |
6383 | |
6384 | - sti->outptr.ext_ptr = STI_PTR(&sti->outptr_ext); |
6385 | + outptr->ext_ptr = STI_PTR(&sti->sti_data->inq_outptr_ext); |
6386 | |
6387 | do { |
6388 | spin_lock_irqsave(&sti->lock, flags); |
6389 | - ret = STI_CALL(sti->inq_conf, &default_conf_flags, |
6390 | - &inptr, &sti->outptr, sti->glob_cfg); |
6391 | + memset(inptr, 0, sizeof(*inptr)); |
6392 | + ret = sti_call(sti, sti->inq_conf, &default_conf_flags, |
6393 | + inptr, outptr, sti->glob_cfg); |
6394 | spin_unlock_irqrestore(&sti->lock, flags); |
6395 | } while (ret == 1); |
6396 | } |
6397 | @@ -126,7 +134,8 @@ static const struct sti_font_flags default_font_flags = { |
6398 | void |
6399 | sti_putc(struct sti_struct *sti, int c, int y, int x) |
6400 | { |
6401 | - struct sti_font_inptr inptr = { |
6402 | + struct sti_font_inptr *inptr = &sti->sti_data->font_inptr; |
6403 | + struct sti_font_inptr inptr_default = { |
6404 | .font_start_addr= STI_PTR(sti->font->raw), |
6405 | .index = c_index(sti, c), |
6406 | .fg_color = c_fg(sti, c), |
6407 | @@ -134,14 +143,15 @@ sti_putc(struct sti_struct *sti, int c, int y, int x) |
6408 | .dest_x = x * sti->font_width, |
6409 | .dest_y = y * sti->font_height, |
6410 | }; |
6411 | - struct sti_font_outptr outptr = { 0, }; |
6412 | + struct sti_font_outptr *outptr = &sti->sti_data->font_outptr; |
6413 | s32 ret; |
6414 | unsigned long flags; |
6415 | |
6416 | do { |
6417 | spin_lock_irqsave(&sti->lock, flags); |
6418 | - ret = STI_CALL(sti->font_unpmv, &default_font_flags, |
6419 | - &inptr, &outptr, sti->glob_cfg); |
6420 | + *inptr = inptr_default; |
6421 | + ret = sti_call(sti, sti->font_unpmv, &default_font_flags, |
6422 | + inptr, outptr, sti->glob_cfg); |
6423 | spin_unlock_irqrestore(&sti->lock, flags); |
6424 | } while (ret == 1); |
6425 | } |
6426 | @@ -156,7 +166,8 @@ void |
6427 | sti_set(struct sti_struct *sti, int src_y, int src_x, |
6428 | int height, int width, u8 color) |
6429 | { |
6430 | - struct sti_blkmv_inptr inptr = { |
6431 | + struct sti_blkmv_inptr *inptr = &sti->sti_data->blkmv_inptr; |
6432 | + struct sti_blkmv_inptr inptr_default = { |
6433 | .fg_color = color, |
6434 | .bg_color = color, |
6435 | .src_x = src_x, |
6436 | @@ -166,14 +177,15 @@ sti_set(struct sti_struct *sti, int src_y, int src_x, |
6437 | .width = width, |
6438 | .height = height, |
6439 | }; |
6440 | - struct sti_blkmv_outptr outptr = { 0, }; |
6441 | + struct sti_blkmv_outptr *outptr = &sti->sti_data->blkmv_outptr; |
6442 | s32 ret; |
6443 | unsigned long flags; |
6444 | |
6445 | do { |
6446 | spin_lock_irqsave(&sti->lock, flags); |
6447 | - ret = STI_CALL(sti->block_move, &clear_blkmv_flags, |
6448 | - &inptr, &outptr, sti->glob_cfg); |
6449 | + *inptr = inptr_default; |
6450 | + ret = sti_call(sti, sti->block_move, &clear_blkmv_flags, |
6451 | + inptr, outptr, sti->glob_cfg); |
6452 | spin_unlock_irqrestore(&sti->lock, flags); |
6453 | } while (ret == 1); |
6454 | } |
6455 | @@ -182,7 +194,8 @@ void |
6456 | sti_clear(struct sti_struct *sti, int src_y, int src_x, |
6457 | int height, int width, int c) |
6458 | { |
6459 | - struct sti_blkmv_inptr inptr = { |
6460 | + struct sti_blkmv_inptr *inptr = &sti->sti_data->blkmv_inptr; |
6461 | + struct sti_blkmv_inptr inptr_default = { |
6462 | .fg_color = c_fg(sti, c), |
6463 | .bg_color = c_bg(sti, c), |
6464 | .src_x = src_x * sti->font_width, |
6465 | @@ -192,14 +205,15 @@ sti_clear(struct sti_struct *sti, int src_y, int src_x, |
6466 | .width = width * sti->font_width, |
6467 | .height = height* sti->font_height, |
6468 | }; |
6469 | - struct sti_blkmv_outptr outptr = { 0, }; |
6470 | + struct sti_blkmv_outptr *outptr = &sti->sti_data->blkmv_outptr; |
6471 | s32 ret; |
6472 | unsigned long flags; |
6473 | |
6474 | do { |
6475 | spin_lock_irqsave(&sti->lock, flags); |
6476 | - ret = STI_CALL(sti->block_move, &clear_blkmv_flags, |
6477 | - &inptr, &outptr, sti->glob_cfg); |
6478 | + *inptr = inptr_default; |
6479 | + ret = sti_call(sti, sti->block_move, &clear_blkmv_flags, |
6480 | + inptr, outptr, sti->glob_cfg); |
6481 | spin_unlock_irqrestore(&sti->lock, flags); |
6482 | } while (ret == 1); |
6483 | } |
6484 | @@ -212,7 +226,8 @@ void |
6485 | sti_bmove(struct sti_struct *sti, int src_y, int src_x, |
6486 | int dst_y, int dst_x, int height, int width) |
6487 | { |
6488 | - struct sti_blkmv_inptr inptr = { |
6489 | + struct sti_blkmv_inptr *inptr = &sti->sti_data->blkmv_inptr; |
6490 | + struct sti_blkmv_inptr inptr_default = { |
6491 | .src_x = src_x * sti->font_width, |
6492 | .src_y = src_y * sti->font_height, |
6493 | .dest_x = dst_x * sti->font_width, |
6494 | @@ -220,14 +235,15 @@ sti_bmove(struct sti_struct *sti, int src_y, int src_x, |
6495 | .width = width * sti->font_width, |
6496 | .height = height* sti->font_height, |
6497 | }; |
6498 | - struct sti_blkmv_outptr outptr = { 0, }; |
6499 | + struct sti_blkmv_outptr *outptr = &sti->sti_data->blkmv_outptr; |
6500 | s32 ret; |
6501 | unsigned long flags; |
6502 | |
6503 | do { |
6504 | spin_lock_irqsave(&sti->lock, flags); |
6505 | - ret = STI_CALL(sti->block_move, &default_blkmv_flags, |
6506 | - &inptr, &outptr, sti->glob_cfg); |
6507 | + *inptr = inptr_default; |
6508 | + ret = sti_call(sti, sti->block_move, &default_blkmv_flags, |
6509 | + inptr, outptr, sti->glob_cfg); |
6510 | spin_unlock_irqrestore(&sti->lock, flags); |
6511 | } while (ret == 1); |
6512 | } |
6513 | @@ -284,7 +300,7 @@ __setup("sti=", sti_setup); |
6514 | |
6515 | |
6516 | |
6517 | -static char *font_name[MAX_STI_ROMS] = { "VGA8x16", }; |
6518 | +static char *font_name[MAX_STI_ROMS]; |
6519 | static int font_index[MAX_STI_ROMS], |
6520 | font_height[MAX_STI_ROMS], |
6521 | font_width[MAX_STI_ROMS]; |
6522 | @@ -389,10 +405,10 @@ static void sti_dump_outptr(struct sti_struct *sti) |
6523 | "%d used bits\n" |
6524 | "%d planes\n" |
6525 | "attributes %08x\n", |
6526 | - sti->outptr.bits_per_pixel, |
6527 | - sti->outptr.bits_used, |
6528 | - sti->outptr.planes, |
6529 | - sti->outptr.attributes)); |
6530 | + sti->sti_data->inq_outptr.bits_per_pixel, |
6531 | + sti->sti_data->inq_outptr.bits_used, |
6532 | + sti->sti_data->inq_outptr.planes, |
6533 | + sti->sti_data->inq_outptr.attributes)); |
6534 | } |
6535 | |
6536 | static int sti_init_glob_cfg(struct sti_struct *sti, unsigned long rom_address, |
6537 | @@ -402,24 +418,21 @@ static int sti_init_glob_cfg(struct sti_struct *sti, unsigned long rom_address, |
6538 | struct sti_glob_cfg_ext *glob_cfg_ext; |
6539 | void *save_addr; |
6540 | void *sti_mem_addr; |
6541 | - const int save_addr_size = 1024; /* XXX */ |
6542 | - int i; |
6543 | + int i, size; |
6544 | |
6545 | - if (!sti->sti_mem_request) |
6546 | + if (sti->sti_mem_request < 256) |
6547 | sti->sti_mem_request = 256; /* STI default */ |
6548 | |
6549 | - glob_cfg = kzalloc(sizeof(*sti->glob_cfg), GFP_KERNEL); |
6550 | - glob_cfg_ext = kzalloc(sizeof(*glob_cfg_ext), GFP_KERNEL); |
6551 | - save_addr = kzalloc(save_addr_size, GFP_KERNEL); |
6552 | - sti_mem_addr = kzalloc(sti->sti_mem_request, GFP_KERNEL); |
6553 | + size = sizeof(struct sti_all_data) + sti->sti_mem_request - 256; |
6554 | |
6555 | - if (!(glob_cfg && glob_cfg_ext && save_addr && sti_mem_addr)) { |
6556 | - kfree(glob_cfg); |
6557 | - kfree(glob_cfg_ext); |
6558 | - kfree(save_addr); |
6559 | - kfree(sti_mem_addr); |
6560 | + sti->sti_data = kzalloc(size, STI_LOWMEM); |
6561 | + if (!sti->sti_data) |
6562 | return -ENOMEM; |
6563 | - } |
6564 | + |
6565 | + glob_cfg = &sti->sti_data->glob_cfg; |
6566 | + glob_cfg_ext = &sti->sti_data->glob_cfg_ext; |
6567 | + save_addr = &sti->sti_data->save_addr; |
6568 | + sti_mem_addr = &sti->sti_data->sti_mem_addr; |
6569 | |
6570 | glob_cfg->ext_ptr = STI_PTR(glob_cfg_ext); |
6571 | glob_cfg->save_addr = STI_PTR(save_addr); |
6572 | @@ -475,32 +488,31 @@ static int sti_init_glob_cfg(struct sti_struct *sti, unsigned long rom_address, |
6573 | return 0; |
6574 | } |
6575 | |
6576 | -#ifdef CONFIG_FB |
6577 | +#ifdef CONFIG_FONTS |
6578 | static struct sti_cooked_font * |
6579 | sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name) |
6580 | { |
6581 | - const struct font_desc *fbfont; |
6582 | + const struct font_desc *fbfont = NULL; |
6583 | unsigned int size, bpc; |
6584 | void *dest; |
6585 | struct sti_rom_font *nf; |
6586 | struct sti_cooked_font *cooked_font; |
6587 | |
6588 | - if (!fbfont_name || !strlen(fbfont_name)) |
6589 | - return NULL; |
6590 | - fbfont = find_font(fbfont_name); |
6591 | + if (fbfont_name && strlen(fbfont_name)) |
6592 | + fbfont = find_font(fbfont_name); |
6593 | if (!fbfont) |
6594 | fbfont = get_default_font(1024,768, ~(u32)0, ~(u32)0); |
6595 | if (!fbfont) |
6596 | return NULL; |
6597 | |
6598 | - DPRINTK((KERN_DEBUG "selected %dx%d fb-font %s\n", |
6599 | - fbfont->width, fbfont->height, fbfont->name)); |
6600 | + pr_info("STI selected %dx%d framebuffer font %s for sticon\n", |
6601 | + fbfont->width, fbfont->height, fbfont->name); |
6602 | |
6603 | bpc = ((fbfont->width+7)/8) * fbfont->height; |
6604 | size = bpc * 256; |
6605 | size += sizeof(struct sti_rom_font); |
6606 | |
6607 | - nf = kzalloc(size, GFP_KERNEL); |
6608 | + nf = kzalloc(size, STI_LOWMEM); |
6609 | if (!nf) |
6610 | return NULL; |
6611 | |
6612 | @@ -637,7 +649,7 @@ static void *sti_bmode_font_raw(struct sti_cooked_font *f) |
6613 | unsigned char *n, *p, *q; |
6614 | int size = f->raw->bytes_per_char*256+sizeof(struct sti_rom_font); |
6615 | |
6616 | - n = kzalloc (4*size, GFP_KERNEL); |
6617 | + n = kzalloc(4*size, STI_LOWMEM); |
6618 | if (!n) |
6619 | return NULL; |
6620 | p = n + 3; |
6621 | @@ -673,7 +685,7 @@ static struct sti_rom *sti_get_bmode_rom (unsigned long address) |
6622 | sti_bmode_rom_copy(address + BMODE_LAST_ADDR_OFFS, sizeof(size), &size); |
6623 | |
6624 | size = (size+3) / 4; |
6625 | - raw = kmalloc(size, GFP_KERNEL); |
6626 | + raw = kmalloc(size, STI_LOWMEM); |
6627 | if (raw) { |
6628 | sti_bmode_rom_copy(address, size, raw); |
6629 | memmove (&raw->res004, &raw->type[0], 0x3c); |
6630 | @@ -707,7 +719,7 @@ static struct sti_rom *sti_get_wmode_rom(unsigned long address) |
6631 | /* read the ROM size directly from the struct in ROM */ |
6632 | size = gsc_readl(address + offsetof(struct sti_rom,last_addr)); |
6633 | |
6634 | - raw = kmalloc(size, GFP_KERNEL); |
6635 | + raw = kmalloc(size, STI_LOWMEM); |
6636 | if (raw) |
6637 | sti_rom_copy(address, size, raw); |
6638 | |
6639 | @@ -743,6 +755,10 @@ static int sti_read_rom(int wordmode, struct sti_struct *sti, |
6640 | |
6641 | address = (unsigned long) STI_PTR(raw); |
6642 | |
6643 | + pr_info("STI ROM supports 32 %sbit firmware functions.\n", |
6644 | + raw->alt_code_type == ALT_CODE_TYPE_PA_RISC_64 |
6645 | + ? "and 64 " : ""); |
6646 | + |
6647 | sti->font_unpmv = address + (raw->font_unpmv & 0x03ffffff); |
6648 | sti->block_move = address + (raw->block_move & 0x03ffffff); |
6649 | sti->init_graph = address + (raw->init_graph & 0x03ffffff); |
6650 | @@ -901,7 +917,8 @@ test_rom: |
6651 | sti_dump_globcfg(sti->glob_cfg, sti->sti_mem_request); |
6652 | sti_dump_outptr(sti); |
6653 | |
6654 | - printk(KERN_INFO " graphics card name: %s\n", sti->outptr.dev_name ); |
6655 | + pr_info(" graphics card name: %s\n", |
6656 | + sti->sti_data->inq_outptr.dev_name); |
6657 | |
6658 | sti_roms[num_sti_roms] = sti; |
6659 | num_sti_roms++; |
6660 | @@ -1073,6 +1090,29 @@ struct sti_struct * sti_get_rom(unsigned int index) |
6661 | } |
6662 | EXPORT_SYMBOL(sti_get_rom); |
6663 | |
6664 | + |
6665 | +int sti_call(const struct sti_struct *sti, unsigned long func, |
6666 | + const void *flags, void *inptr, void *outptr, |
6667 | + struct sti_glob_cfg *glob_cfg) |
6668 | +{ |
6669 | + unsigned long _flags = STI_PTR(flags); |
6670 | + unsigned long _inptr = STI_PTR(inptr); |
6671 | + unsigned long _outptr = STI_PTR(outptr); |
6672 | + unsigned long _glob_cfg = STI_PTR(glob_cfg); |
6673 | + int ret; |
6674 | + |
6675 | +#ifdef CONFIG_64BIT |
6676 | + /* Check for overflow when using 32bit STI on 64bit kernel. */ |
6677 | + if (WARN_ONCE(_flags>>32 || _inptr>>32 || _outptr>>32 || _glob_cfg>>32, |
6678 | + "Out of 32bit-range pointers!")) |
6679 | + return -1; |
6680 | +#endif |
6681 | + |
6682 | + ret = pdc_sti_call(func, _flags, _inptr, _outptr, _glob_cfg); |
6683 | + |
6684 | + return ret; |
6685 | +} |
6686 | + |
6687 | MODULE_AUTHOR("Philipp Rumpf, Helge Deller, Thomas Bogendoerfer"); |
6688 | MODULE_DESCRIPTION("Core STI driver for HP's NGLE series graphics cards in HP PARISC machines"); |
6689 | MODULE_LICENSE("GPL v2"); |
6690 | diff --git a/drivers/video/sticore.h b/drivers/video/sticore.h |
6691 | index addf7b61..af161953 100644 |
6692 | --- a/drivers/video/sticore.h |
6693 | +++ b/drivers/video/sticore.h |
6694 | @@ -18,6 +18,9 @@ |
6695 | #define STI_FONT_HPROMAN8 1 |
6696 | #define STI_FONT_KANA8 2 |
6697 | |
6698 | +#define ALT_CODE_TYPE_UNKNOWN 0x00 /* alt code type values */ |
6699 | +#define ALT_CODE_TYPE_PA_RISC_64 0x01 |
6700 | + |
6701 | /* The latency of the STI functions cannot really be reduced by setting |
6702 | * this to 0; STI doesn't seem to be designed to allow calling a different |
6703 | * function (or the same function with different arguments) after a |
6704 | @@ -40,14 +43,6 @@ |
6705 | |
6706 | #define STI_PTR(p) ( virt_to_phys(p) ) |
6707 | #define PTR_STI(p) ( phys_to_virt((unsigned long)p) ) |
6708 | -#define STI_CALL(func, flags, inptr, outptr, glob_cfg) \ |
6709 | - ({ \ |
6710 | - pdc_sti_call( func, STI_PTR(flags), \ |
6711 | - STI_PTR(inptr), \ |
6712 | - STI_PTR(outptr), \ |
6713 | - STI_PTR(glob_cfg)); \ |
6714 | - }) |
6715 | - |
6716 | |
6717 | #define sti_onscreen_x(sti) (sti->glob_cfg->onscreen_x) |
6718 | #define sti_onscreen_y(sti) (sti->glob_cfg->onscreen_y) |
6719 | @@ -56,6 +51,12 @@ |
6720 | #define sti_font_x(sti) (PTR_STI(sti->font)->width) |
6721 | #define sti_font_y(sti) (PTR_STI(sti->font)->height) |
6722 | |
6723 | +#ifdef CONFIG_64BIT |
6724 | +#define STI_LOWMEM (GFP_KERNEL | GFP_DMA) |
6725 | +#else |
6726 | +#define STI_LOWMEM (GFP_KERNEL) |
6727 | +#endif |
6728 | + |
6729 | |
6730 | /* STI function configuration structs */ |
6731 | |
6732 | @@ -306,6 +307,34 @@ struct sti_blkmv_outptr { |
6733 | }; |
6734 | |
6735 | |
6736 | +/* sti_all_data is an internal struct which needs to be allocated in |
6737 | + * low memory (< 4GB) if STI is used with 32bit STI on a 64bit kernel */ |
6738 | + |
6739 | +struct sti_all_data { |
6740 | + struct sti_glob_cfg glob_cfg; |
6741 | + struct sti_glob_cfg_ext glob_cfg_ext; |
6742 | + |
6743 | + struct sti_conf_inptr inq_inptr; |
6744 | + struct sti_conf_outptr inq_outptr; /* configuration */ |
6745 | + struct sti_conf_outptr_ext inq_outptr_ext; |
6746 | + |
6747 | + struct sti_init_inptr_ext init_inptr_ext; |
6748 | + struct sti_init_inptr init_inptr; |
6749 | + struct sti_init_outptr init_outptr; |
6750 | + |
6751 | + struct sti_blkmv_inptr blkmv_inptr; |
6752 | + struct sti_blkmv_outptr blkmv_outptr; |
6753 | + |
6754 | + struct sti_font_inptr font_inptr; |
6755 | + struct sti_font_outptr font_outptr; |
6756 | + |
6757 | + /* leave as last entries */ |
6758 | + unsigned long save_addr[1024 / sizeof(unsigned long)]; |
6759 | + /* min 256 bytes which is STI default, max sti->sti_mem_request */ |
6760 | + unsigned long sti_mem_addr[256 / sizeof(unsigned long)]; |
6761 | + /* do not add something below here ! */ |
6762 | +}; |
6763 | + |
6764 | /* internal generic STI struct */ |
6765 | |
6766 | struct sti_struct { |
6767 | @@ -330,11 +359,9 @@ struct sti_struct { |
6768 | region_t regions[STI_REGION_MAX]; |
6769 | unsigned long regions_phys[STI_REGION_MAX]; |
6770 | |
6771 | - struct sti_glob_cfg *glob_cfg; |
6772 | - struct sti_cooked_font *font; /* ptr to selected font (cooked) */ |
6773 | + struct sti_glob_cfg *glob_cfg; /* points into sti_all_data */ |
6774 | |
6775 | - struct sti_conf_outptr outptr; /* configuration */ |
6776 | - struct sti_conf_outptr_ext outptr_ext; |
6777 | + struct sti_cooked_font *font; /* ptr to selected font (cooked) */ |
6778 | |
6779 | struct pci_dev *pd; |
6780 | |
6781 | @@ -343,6 +370,9 @@ struct sti_struct { |
6782 | |
6783 | /* pointer to the fb_info where this STI device is used */ |
6784 | struct fb_info *info; |
6785 | + |
6786 | + /* pointer to all internal data */ |
6787 | + struct sti_all_data *sti_data; |
6788 | }; |
6789 | |
6790 | |
6791 | @@ -350,6 +380,14 @@ struct sti_struct { |
6792 | |
6793 | struct sti_struct *sti_get_rom(unsigned int index); /* 0: default sti */ |
6794 | |
6795 | + |
6796 | +/* sticore main function to call STI firmware */ |
6797 | + |
6798 | +int sti_call(const struct sti_struct *sti, unsigned long func, |
6799 | + const void *flags, void *inptr, void *outptr, |
6800 | + struct sti_glob_cfg *glob_cfg); |
6801 | + |
6802 | + |
6803 | /* functions to call the STI ROM directly */ |
6804 | |
6805 | void sti_putc(struct sti_struct *sti, int c, int y, int x); |
6806 | diff --git a/drivers/video/stifb.c b/drivers/video/stifb.c |
6807 | index 876648e1..019a1fee 100644 |
6808 | --- a/drivers/video/stifb.c |
6809 | +++ b/drivers/video/stifb.c |
6810 | @@ -1101,6 +1101,7 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref) |
6811 | var = &info->var; |
6812 | |
6813 | fb->sti = sti; |
6814 | + dev_name = sti->sti_data->inq_outptr.dev_name; |
6815 | /* store upper 32bits of the graphics id */ |
6816 | fb->id = fb->sti->graphics_id[0]; |
6817 | |
6818 | @@ -1114,11 +1115,11 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref) |
6819 | Since this driver only supports standard mode, we check |
6820 | if the device name contains the string "DX" and tell the |
6821 | user how to reconfigure the card. */ |
6822 | - if (strstr(sti->outptr.dev_name, "DX")) { |
6823 | + if (strstr(dev_name, "DX")) { |
6824 | printk(KERN_WARNING |
6825 | "WARNING: stifb framebuffer driver does not support '%s' in double-buffer mode.\n" |
6826 | "WARNING: Please disable the double-buffer mode in IPL menu (the PARISC-BIOS).\n", |
6827 | - sti->outptr.dev_name); |
6828 | + dev_name); |
6829 | goto out_err0; |
6830 | } |
6831 | /* fall though */ |
6832 | @@ -1130,7 +1131,7 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref) |
6833 | break; |
6834 | default: |
6835 | printk(KERN_WARNING "stifb: '%s' (id: 0x%08x) not supported.\n", |
6836 | - sti->outptr.dev_name, fb->id); |
6837 | + dev_name, fb->id); |
6838 | goto out_err0; |
6839 | } |
6840 | |
6841 | @@ -1154,7 +1155,6 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref) |
6842 | fb->id = S9000_ID_A1659A; |
6843 | break; |
6844 | case S9000_ID_TIMBER: /* HP9000/710 Any (may be a grayscale device) */ |
6845 | - dev_name = fb->sti->outptr.dev_name; |
6846 | if (strstr(dev_name, "GRAYSCALE") || |
6847 | strstr(dev_name, "Grayscale") || |
6848 | strstr(dev_name, "grayscale")) |
6849 | @@ -1290,7 +1290,7 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref) |
6850 | var->xres, |
6851 | var->yres, |
6852 | var->bits_per_pixel, |
6853 | - sti->outptr.dev_name, |
6854 | + dev_name, |
6855 | fb->id, |
6856 | fix->mmio_start); |
6857 | |
6858 | diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h |
6859 | index 52b6f6c2..c8e03f8d 100644 |
6860 | --- a/fs/cifs/cifsglob.h |
6861 | +++ b/fs/cifs/cifsglob.h |
6862 | @@ -261,7 +261,7 @@ struct smb_version_operations { |
6863 | /* query path data from the server */ |
6864 | int (*query_path_info)(const unsigned int, struct cifs_tcon *, |
6865 | struct cifs_sb_info *, const char *, |
6866 | - FILE_ALL_INFO *, bool *); |
6867 | + FILE_ALL_INFO *, bool *, bool *); |
6868 | /* query file data from the server */ |
6869 | int (*query_file_info)(const unsigned int, struct cifs_tcon *, |
6870 | struct cifs_fid *, FILE_ALL_INFO *); |
6871 | diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c |
6872 | index ccd31ab8..5f1f3285 100644 |
6873 | --- a/fs/cifs/cifssmb.c |
6874 | +++ b/fs/cifs/cifssmb.c |
6875 | @@ -3315,11 +3315,13 @@ static __u16 ACL_to_cifs_posix(char *parm_data, const char *pACL, |
6876 | return 0; |
6877 | } |
6878 | cifs_acl->version = cpu_to_le16(1); |
6879 | - if (acl_type == ACL_TYPE_ACCESS) |
6880 | + if (acl_type == ACL_TYPE_ACCESS) { |
6881 | cifs_acl->access_entry_count = cpu_to_le16(count); |
6882 | - else if (acl_type == ACL_TYPE_DEFAULT) |
6883 | + cifs_acl->default_entry_count = __constant_cpu_to_le16(0xFFFF); |
6884 | + } else if (acl_type == ACL_TYPE_DEFAULT) { |
6885 | cifs_acl->default_entry_count = cpu_to_le16(count); |
6886 | - else { |
6887 | + cifs_acl->access_entry_count = __constant_cpu_to_le16(0xFFFF); |
6888 | + } else { |
6889 | cifs_dbg(FYI, "unknown ACL type %d\n", acl_type); |
6890 | return 0; |
6891 | } |
6892 | diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c |
6893 | index 867b7cdc..36f9ebb9 100644 |
6894 | --- a/fs/cifs/inode.c |
6895 | +++ b/fs/cifs/inode.c |
6896 | @@ -542,7 +542,8 @@ static int cifs_sfu_mode(struct cifs_fattr *fattr, const unsigned char *path, |
6897 | /* Fill a cifs_fattr struct with info from FILE_ALL_INFO */ |
6898 | static void |
6899 | cifs_all_info_to_fattr(struct cifs_fattr *fattr, FILE_ALL_INFO *info, |
6900 | - struct cifs_sb_info *cifs_sb, bool adjust_tz) |
6901 | + struct cifs_sb_info *cifs_sb, bool adjust_tz, |
6902 | + bool symlink) |
6903 | { |
6904 | struct cifs_tcon *tcon = cifs_sb_master_tcon(cifs_sb); |
6905 | |
6906 | @@ -569,7 +570,11 @@ cifs_all_info_to_fattr(struct cifs_fattr *fattr, FILE_ALL_INFO *info, |
6907 | fattr->cf_createtime = le64_to_cpu(info->CreationTime); |
6908 | |
6909 | fattr->cf_nlink = le32_to_cpu(info->NumberOfLinks); |
6910 | - if (fattr->cf_cifsattrs & ATTR_DIRECTORY) { |
6911 | + |
6912 | + if (symlink) { |
6913 | + fattr->cf_mode = S_IFLNK; |
6914 | + fattr->cf_dtype = DT_LNK; |
6915 | + } else if (fattr->cf_cifsattrs & ATTR_DIRECTORY) { |
6916 | fattr->cf_mode = S_IFDIR | cifs_sb->mnt_dir_mode; |
6917 | fattr->cf_dtype = DT_DIR; |
6918 | /* |
6919 | @@ -578,10 +583,6 @@ cifs_all_info_to_fattr(struct cifs_fattr *fattr, FILE_ALL_INFO *info, |
6920 | */ |
6921 | if (!tcon->unix_ext) |
6922 | fattr->cf_flags |= CIFS_FATTR_UNKNOWN_NLINK; |
6923 | - } else if (fattr->cf_cifsattrs & ATTR_REPARSE) { |
6924 | - fattr->cf_mode = S_IFLNK; |
6925 | - fattr->cf_dtype = DT_LNK; |
6926 | - fattr->cf_nlink = le32_to_cpu(info->NumberOfLinks); |
6927 | } else { |
6928 | fattr->cf_mode = S_IFREG | cifs_sb->mnt_file_mode; |
6929 | fattr->cf_dtype = DT_REG; |
6930 | @@ -626,7 +627,8 @@ cifs_get_file_info(struct file *filp) |
6931 | rc = server->ops->query_file_info(xid, tcon, &cfile->fid, &find_data); |
6932 | switch (rc) { |
6933 | case 0: |
6934 | - cifs_all_info_to_fattr(&fattr, &find_data, cifs_sb, false); |
6935 | + cifs_all_info_to_fattr(&fattr, &find_data, cifs_sb, false, |
6936 | + false); |
6937 | break; |
6938 | case -EREMOTE: |
6939 | cifs_create_dfs_fattr(&fattr, inode->i_sb); |
6940 | @@ -673,6 +675,7 @@ cifs_get_inode_info(struct inode **inode, const char *full_path, |
6941 | bool adjust_tz = false; |
6942 | struct cifs_fattr fattr; |
6943 | struct cifs_search_info *srchinf = NULL; |
6944 | + bool symlink = false; |
6945 | |
6946 | tlink = cifs_sb_tlink(cifs_sb); |
6947 | if (IS_ERR(tlink)) |
6948 | @@ -702,12 +705,12 @@ cifs_get_inode_info(struct inode **inode, const char *full_path, |
6949 | } |
6950 | data = (FILE_ALL_INFO *)buf; |
6951 | rc = server->ops->query_path_info(xid, tcon, cifs_sb, full_path, |
6952 | - data, &adjust_tz); |
6953 | + data, &adjust_tz, &symlink); |
6954 | } |
6955 | |
6956 | if (!rc) { |
6957 | - cifs_all_info_to_fattr(&fattr, (FILE_ALL_INFO *)data, cifs_sb, |
6958 | - adjust_tz); |
6959 | + cifs_all_info_to_fattr(&fattr, data, cifs_sb, adjust_tz, |
6960 | + symlink); |
6961 | } else if (rc == -EREMOTE) { |
6962 | cifs_create_dfs_fattr(&fattr, sb); |
6963 | rc = 0; |
6964 | diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c |
6965 | index 53a75f3d..5940ecab 100644 |
6966 | --- a/fs/cifs/readdir.c |
6967 | +++ b/fs/cifs/readdir.c |
6968 | @@ -134,22 +134,6 @@ out: |
6969 | dput(dentry); |
6970 | } |
6971 | |
6972 | -/* |
6973 | - * Is it possible that this directory might turn out to be a DFS referral |
6974 | - * once we go to try and use it? |
6975 | - */ |
6976 | -static bool |
6977 | -cifs_dfs_is_possible(struct cifs_sb_info *cifs_sb) |
6978 | -{ |
6979 | -#ifdef CONFIG_CIFS_DFS_UPCALL |
6980 | - struct cifs_tcon *tcon = cifs_sb_master_tcon(cifs_sb); |
6981 | - |
6982 | - if (tcon->Flags & SMB_SHARE_IS_IN_DFS) |
6983 | - return true; |
6984 | -#endif |
6985 | - return false; |
6986 | -} |
6987 | - |
6988 | static void |
6989 | cifs_fill_common_info(struct cifs_fattr *fattr, struct cifs_sb_info *cifs_sb) |
6990 | { |
6991 | @@ -159,27 +143,19 @@ cifs_fill_common_info(struct cifs_fattr *fattr, struct cifs_sb_info *cifs_sb) |
6992 | if (fattr->cf_cifsattrs & ATTR_DIRECTORY) { |
6993 | fattr->cf_mode = S_IFDIR | cifs_sb->mnt_dir_mode; |
6994 | fattr->cf_dtype = DT_DIR; |
6995 | - /* |
6996 | - * Windows CIFS servers generally make DFS referrals look |
6997 | - * like directories in FIND_* responses with the reparse |
6998 | - * attribute flag also set (since DFS junctions are |
6999 | - * reparse points). We must revalidate at least these |
7000 | - * directory inodes before trying to use them (if |
7001 | - * they are DFS we will get PATH_NOT_COVERED back |
7002 | - * when queried directly and can then try to connect |
7003 | - * to the DFS target) |
7004 | - */ |
7005 | - if (cifs_dfs_is_possible(cifs_sb) && |
7006 | - (fattr->cf_cifsattrs & ATTR_REPARSE)) |
7007 | - fattr->cf_flags |= CIFS_FATTR_NEED_REVAL; |
7008 | - } else if (fattr->cf_cifsattrs & ATTR_REPARSE) { |
7009 | - fattr->cf_mode = S_IFLNK; |
7010 | - fattr->cf_dtype = DT_LNK; |
7011 | } else { |
7012 | fattr->cf_mode = S_IFREG | cifs_sb->mnt_file_mode; |
7013 | fattr->cf_dtype = DT_REG; |
7014 | } |
7015 | |
7016 | + /* |
7017 | + * We need to revalidate it further to make a decision about whether it |
7018 | + * is a symbolic link, DFS referral or a reparse point with a direct |
7019 | + * access like junctions, deduplicated files, NFS symlinks. |
7020 | + */ |
7021 | + if (fattr->cf_cifsattrs & ATTR_REPARSE) |
7022 | + fattr->cf_flags |= CIFS_FATTR_NEED_REVAL; |
7023 | + |
7024 | /* non-unix readdir doesn't provide nlink */ |
7025 | fattr->cf_flags |= CIFS_FATTR_UNKNOWN_NLINK; |
7026 | |
7027 | diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c |
7028 | index 8233b174..e50554b7 100644 |
7029 | --- a/fs/cifs/smb1ops.c |
7030 | +++ b/fs/cifs/smb1ops.c |
7031 | @@ -534,10 +534,12 @@ cifs_is_path_accessible(const unsigned int xid, struct cifs_tcon *tcon, |
7032 | static int |
7033 | cifs_query_path_info(const unsigned int xid, struct cifs_tcon *tcon, |
7034 | struct cifs_sb_info *cifs_sb, const char *full_path, |
7035 | - FILE_ALL_INFO *data, bool *adjustTZ) |
7036 | + FILE_ALL_INFO *data, bool *adjustTZ, bool *symlink) |
7037 | { |
7038 | int rc; |
7039 | |
7040 | + *symlink = false; |
7041 | + |
7042 | /* could do find first instead but this returns more info */ |
7043 | rc = CIFSSMBQPathInfo(xid, tcon, full_path, data, 0 /* not legacy */, |
7044 | cifs_sb->local_nls, cifs_sb->mnt_cifs_flags & |
7045 | @@ -554,6 +556,23 @@ cifs_query_path_info(const unsigned int xid, struct cifs_tcon *tcon, |
7046 | CIFS_MOUNT_MAP_SPECIAL_CHR); |
7047 | *adjustTZ = true; |
7048 | } |
7049 | + |
7050 | + if (!rc && (le32_to_cpu(data->Attributes) & ATTR_REPARSE)) { |
7051 | + int tmprc; |
7052 | + int oplock = 0; |
7053 | + __u16 netfid; |
7054 | + |
7055 | + /* Need to check if this is a symbolic link or not */ |
7056 | + tmprc = CIFSSMBOpen(xid, tcon, full_path, FILE_OPEN, |
7057 | + FILE_READ_ATTRIBUTES, 0, &netfid, &oplock, |
7058 | + NULL, cifs_sb->local_nls, |
7059 | + cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR); |
7060 | + if (tmprc == -EOPNOTSUPP) |
7061 | + *symlink = true; |
7062 | + else |
7063 | + CIFSSMBClose(xid, tcon, netfid); |
7064 | + } |
7065 | + |
7066 | return rc; |
7067 | } |
7068 | |
7069 | diff --git a/fs/cifs/smb2inode.c b/fs/cifs/smb2inode.c |
7070 | index 78ff88c4..84c012a6 100644 |
7071 | --- a/fs/cifs/smb2inode.c |
7072 | +++ b/fs/cifs/smb2inode.c |
7073 | @@ -123,12 +123,13 @@ move_smb2_info_to_cifs(FILE_ALL_INFO *dst, struct smb2_file_all_info *src) |
7074 | int |
7075 | smb2_query_path_info(const unsigned int xid, struct cifs_tcon *tcon, |
7076 | struct cifs_sb_info *cifs_sb, const char *full_path, |
7077 | - FILE_ALL_INFO *data, bool *adjust_tz) |
7078 | + FILE_ALL_INFO *data, bool *adjust_tz, bool *symlink) |
7079 | { |
7080 | int rc; |
7081 | struct smb2_file_all_info *smb2_data; |
7082 | |
7083 | *adjust_tz = false; |
7084 | + *symlink = false; |
7085 | |
7086 | smb2_data = kzalloc(sizeof(struct smb2_file_all_info) + MAX_NAME * 2, |
7087 | GFP_KERNEL); |
7088 | @@ -136,9 +137,16 @@ smb2_query_path_info(const unsigned int xid, struct cifs_tcon *tcon, |
7089 | return -ENOMEM; |
7090 | |
7091 | rc = smb2_open_op_close(xid, tcon, cifs_sb, full_path, |
7092 | - FILE_READ_ATTRIBUTES, FILE_OPEN, |
7093 | - OPEN_REPARSE_POINT, smb2_data, |
7094 | - SMB2_OP_QUERY_INFO); |
7095 | + FILE_READ_ATTRIBUTES, FILE_OPEN, 0, |
7096 | + smb2_data, SMB2_OP_QUERY_INFO); |
7097 | + if (rc == -EOPNOTSUPP) { |
7098 | + *symlink = true; |
7099 | + /* Failed on a symbolic link - query a reparse point info */ |
7100 | + rc = smb2_open_op_close(xid, tcon, cifs_sb, full_path, |
7101 | + FILE_READ_ATTRIBUTES, FILE_OPEN, |
7102 | + OPEN_REPARSE_POINT, smb2_data, |
7103 | + SMB2_OP_QUERY_INFO); |
7104 | + } |
7105 | if (rc) |
7106 | goto out; |
7107 | |
7108 | diff --git a/fs/cifs/smb2proto.h b/fs/cifs/smb2proto.h |
7109 | index e3fb4801..7db5db0e 100644 |
7110 | --- a/fs/cifs/smb2proto.h |
7111 | +++ b/fs/cifs/smb2proto.h |
7112 | @@ -61,7 +61,7 @@ extern void move_smb2_info_to_cifs(FILE_ALL_INFO *dst, |
7113 | extern int smb2_query_path_info(const unsigned int xid, struct cifs_tcon *tcon, |
7114 | struct cifs_sb_info *cifs_sb, |
7115 | const char *full_path, FILE_ALL_INFO *data, |
7116 | - bool *adjust_tz); |
7117 | + bool *adjust_tz, bool *symlink); |
7118 | extern int smb2_set_path_size(const unsigned int xid, struct cifs_tcon *tcon, |
7119 | const char *full_path, __u64 size, |
7120 | struct cifs_sb_info *cifs_sb, bool set_alloc); |
7121 | diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c |
7122 | index 073d30b9..a726b9f2 100644 |
7123 | --- a/fs/devpts/inode.c |
7124 | +++ b/fs/devpts/inode.c |
7125 | @@ -498,6 +498,7 @@ static void devpts_kill_sb(struct super_block *sb) |
7126 | { |
7127 | struct pts_fs_info *fsi = DEVPTS_SB(sb); |
7128 | |
7129 | + ida_destroy(&fsi->allocated_ptys); |
7130 | kfree(fsi); |
7131 | kill_litter_super(sb); |
7132 | } |
7133 | diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c |
7134 | index 03e9bebb..1423c481 100644 |
7135 | --- a/fs/ext4/xattr.c |
7136 | +++ b/fs/ext4/xattr.c |
7137 | @@ -1352,6 +1352,7 @@ retry: |
7138 | new_extra_isize = s_min_extra_isize; |
7139 | kfree(is); is = NULL; |
7140 | kfree(bs); bs = NULL; |
7141 | + brelse(bh); |
7142 | goto retry; |
7143 | } |
7144 | error = -1; |
7145 | diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c |
7146 | index 968d4c56..12987666 100644 |
7147 | --- a/fs/gfs2/inode.c |
7148 | +++ b/fs/gfs2/inode.c |
7149 | @@ -1168,8 +1168,11 @@ static int gfs2_atomic_open(struct inode *dir, struct dentry *dentry, |
7150 | if (d != NULL) |
7151 | dentry = d; |
7152 | if (dentry->d_inode) { |
7153 | - if (!(*opened & FILE_OPENED)) |
7154 | + if (!(*opened & FILE_OPENED)) { |
7155 | + if (d == NULL) |
7156 | + dget(dentry); |
7157 | return finish_no_open(file, dentry); |
7158 | + } |
7159 | dput(d); |
7160 | return 0; |
7161 | } |
7162 | diff --git a/fs/namei.c b/fs/namei.c |
7163 | index caa28051..23ac50f4 100644 |
7164 | --- a/fs/namei.c |
7165 | +++ b/fs/namei.c |
7166 | @@ -2468,6 +2468,7 @@ static int may_delete(struct inode *dir,struct dentry *victim,int isdir) |
7167 | */ |
7168 | static inline int may_create(struct inode *dir, struct dentry *child) |
7169 | { |
7170 | + audit_inode_child(dir, child, AUDIT_TYPE_CHILD_CREATE); |
7171 | if (child->d_inode) |
7172 | return -EEXIST; |
7173 | if (IS_DEADDIR(dir)) |
7174 | diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h |
7175 | index d9019821..26115778 100644 |
7176 | --- a/include/acpi/acpi_bus.h |
7177 | +++ b/include/acpi/acpi_bus.h |
7178 | @@ -100,6 +100,7 @@ enum acpi_hotplug_mode { |
7179 | struct acpi_hotplug_profile { |
7180 | struct kobject kobj; |
7181 | bool enabled:1; |
7182 | + bool ignore:1; |
7183 | enum acpi_hotplug_mode mode; |
7184 | }; |
7185 | |
7186 | diff --git a/include/linux/mfd/rtsx_pci.h b/include/linux/mfd/rtsx_pci.h |
7187 | index d1382dfb..0ce77210 100644 |
7188 | --- a/include/linux/mfd/rtsx_pci.h |
7189 | +++ b/include/linux/mfd/rtsx_pci.h |
7190 | @@ -756,6 +756,59 @@ |
7191 | #define PCR_SETTING_REG2 0x814 |
7192 | #define PCR_SETTING_REG3 0x747 |
7193 | |
7194 | +/* Phy bits */ |
7195 | +#define PHY_PCR_FORCE_CODE 0xB000 |
7196 | +#define PHY_PCR_OOBS_CALI_50 0x0800 |
7197 | +#define PHY_PCR_OOBS_VCM_08 0x0200 |
7198 | +#define PHY_PCR_OOBS_SEN_90 0x0040 |
7199 | +#define PHY_PCR_RSSI_EN 0x0002 |
7200 | + |
7201 | +#define PHY_RCR1_ADP_TIME 0x0100 |
7202 | +#define PHY_RCR1_VCO_COARSE 0x001F |
7203 | + |
7204 | +#define PHY_RCR2_EMPHASE_EN 0x8000 |
7205 | +#define PHY_RCR2_NADJR 0x4000 |
7206 | +#define PHY_RCR2_CDR_CP_10 0x0400 |
7207 | +#define PHY_RCR2_CDR_SR_2 0x0100 |
7208 | +#define PHY_RCR2_FREQSEL_12 0x0040 |
7209 | +#define PHY_RCR2_CPADJEN 0x0020 |
7210 | +#define PHY_RCR2_CDR_SC_8 0x0008 |
7211 | +#define PHY_RCR2_CALIB_LATE 0x0002 |
7212 | + |
7213 | +#define PHY_RDR_RXDSEL_1_9 0x4000 |
7214 | + |
7215 | +#define PHY_TUNE_TUNEREF_1_0 0x4000 |
7216 | +#define PHY_TUNE_VBGSEL_1252 0x0C00 |
7217 | +#define PHY_TUNE_SDBUS_33 0x0200 |
7218 | +#define PHY_TUNE_TUNED18 0x01C0 |
7219 | +#define PHY_TUNE_TUNED12 0X0020 |
7220 | + |
7221 | +#define PHY_BPCR_IBRXSEL 0x0400 |
7222 | +#define PHY_BPCR_IBTXSEL 0x0100 |
7223 | +#define PHY_BPCR_IB_FILTER 0x0080 |
7224 | +#define PHY_BPCR_CMIRROR_EN 0x0040 |
7225 | + |
7226 | +#define PHY_REG_REV_RESV 0xE000 |
7227 | +#define PHY_REG_REV_RXIDLE_LATCHED 0x1000 |
7228 | +#define PHY_REG_REV_P1_EN 0x0800 |
7229 | +#define PHY_REG_REV_RXIDLE_EN 0x0400 |
7230 | +#define PHY_REG_REV_CLKREQ_DLY_TIMER_1_0 0x0040 |
7231 | +#define PHY_REG_REV_STOP_CLKRD 0x0020 |
7232 | +#define PHY_REG_REV_RX_PWST 0x0008 |
7233 | +#define PHY_REG_REV_STOP_CLKWR 0x0004 |
7234 | + |
7235 | +#define PHY_FLD3_TIMER_4 0x7800 |
7236 | +#define PHY_FLD3_TIMER_6 0x00E0 |
7237 | +#define PHY_FLD3_RXDELINK 0x0004 |
7238 | + |
7239 | +#define PHY_FLD4_FLDEN_SEL 0x4000 |
7240 | +#define PHY_FLD4_REQ_REF 0x2000 |
7241 | +#define PHY_FLD4_RXAMP_OFF 0x1000 |
7242 | +#define PHY_FLD4_REQ_ADDA 0x0800 |
7243 | +#define PHY_FLD4_BER_COUNT 0x00E0 |
7244 | +#define PHY_FLD4_BER_TIMER 0x000A |
7245 | +#define PHY_FLD4_BER_CHK_EN 0x0001 |
7246 | + |
7247 | #define rtsx_pci_init_cmd(pcr) ((pcr)->ci = 0) |
7248 | |
7249 | struct rtsx_pcr; |
7250 | diff --git a/include/linux/msg.h b/include/linux/msg.h |
7251 | index 391af8d1..e21f9d44 100644 |
7252 | --- a/include/linux/msg.h |
7253 | +++ b/include/linux/msg.h |
7254 | @@ -6,9 +6,9 @@ |
7255 | |
7256 | /* one msg_msg structure for each message */ |
7257 | struct msg_msg { |
7258 | - struct list_head m_list; |
7259 | - long m_type; |
7260 | - int m_ts; /* message text size */ |
7261 | + struct list_head m_list; |
7262 | + long m_type; |
7263 | + size_t m_ts; /* message text size */ |
7264 | struct msg_msgseg* next; |
7265 | void *security; |
7266 | /* the actual message follows immediately */ |
7267 | diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h |
7268 | index 4b02512e..5f487d77 100644 |
7269 | --- a/include/linux/mtd/map.h |
7270 | +++ b/include/linux/mtd/map.h |
7271 | @@ -365,7 +365,7 @@ static inline map_word map_word_load_partial(struct map_info *map, map_word orig |
7272 | bitpos = (map_bankwidth(map)-1-i)*8; |
7273 | #endif |
7274 | orig.x[0] &= ~(0xff << bitpos); |
7275 | - orig.x[0] |= buf[i-start] << bitpos; |
7276 | + orig.x[0] |= (unsigned long)buf[i-start] << bitpos; |
7277 | } |
7278 | } |
7279 | return orig; |
7280 | @@ -384,7 +384,7 @@ static inline map_word map_word_ff(struct map_info *map) |
7281 | |
7282 | if (map_bankwidth(map) < MAP_FF_LIMIT) { |
7283 | int bw = 8 * map_bankwidth(map); |
7284 | - r.x[0] = (1 << bw) - 1; |
7285 | + r.x[0] = (1UL << bw) - 1; |
7286 | } else { |
7287 | for (i=0; i<map_words(map); i++) |
7288 | r.x[i] = ~0UL; |
7289 | diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h |
7290 | index aa870a4d..57e75ae9 100644 |
7291 | --- a/include/linux/rbtree.h |
7292 | +++ b/include/linux/rbtree.h |
7293 | @@ -85,6 +85,11 @@ static inline void rb_link_node(struct rb_node * node, struct rb_node * parent, |
7294 | *rb_link = node; |
7295 | } |
7296 | |
7297 | +#define rb_entry_safe(ptr, type, member) \ |
7298 | + ({ typeof(ptr) ____ptr = (ptr); \ |
7299 | + ____ptr ? rb_entry(____ptr, type, member) : NULL; \ |
7300 | + }) |
7301 | + |
7302 | /** |
7303 | * rbtree_postorder_for_each_entry_safe - iterate over rb_root in post order of |
7304 | * given type safe against removal of rb_node entry |
7305 | @@ -95,12 +100,9 @@ static inline void rb_link_node(struct rb_node * node, struct rb_node * parent, |
7306 | * @field: the name of the rb_node field within 'type'. |
7307 | */ |
7308 | #define rbtree_postorder_for_each_entry_safe(pos, n, root, field) \ |
7309 | - for (pos = rb_entry(rb_first_postorder(root), typeof(*pos), field),\ |
7310 | - n = rb_entry(rb_next_postorder(&pos->field), \ |
7311 | - typeof(*pos), field); \ |
7312 | - &pos->field; \ |
7313 | - pos = n, \ |
7314 | - n = rb_entry(rb_next_postorder(&pos->field), \ |
7315 | - typeof(*pos), field)) |
7316 | + for (pos = rb_entry_safe(rb_first_postorder(root), typeof(*pos), field); \ |
7317 | + pos && ({ n = rb_entry_safe(rb_next_postorder(&pos->field), \ |
7318 | + typeof(*pos), field); 1; }); \ |
7319 | + pos = n) |
7320 | |
7321 | #endif /* _LINUX_RBTREE_H */ |
7322 | diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h |
7323 | index 5c7ab17c..712ea360 100644 |
7324 | --- a/include/trace/ftrace.h |
7325 | +++ b/include/trace/ftrace.h |
7326 | @@ -372,7 +372,8 @@ ftrace_define_fields_##call(struct ftrace_event_call *event_call) \ |
7327 | __data_size += (len) * sizeof(type); |
7328 | |
7329 | #undef __string |
7330 | -#define __string(item, src) __dynamic_array(char, item, strlen(src) + 1) |
7331 | +#define __string(item, src) __dynamic_array(char, item, \ |
7332 | + strlen((src) ? (const char *)(src) : "(null)") + 1) |
7333 | |
7334 | #undef DECLARE_EVENT_CLASS |
7335 | #define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print) \ |
7336 | @@ -502,7 +503,7 @@ static inline notrace int ftrace_get_offsets_##call( \ |
7337 | |
7338 | #undef __assign_str |
7339 | #define __assign_str(dst, src) \ |
7340 | - strcpy(__get_str(dst), src); |
7341 | + strcpy(__get_str(dst), (src) ? (const char *)(src) : "(null)"); |
7342 | |
7343 | #undef TP_fast_assign |
7344 | #define TP_fast_assign(args...) args |
7345 | diff --git a/ipc/msgutil.c b/ipc/msgutil.c |
7346 | index 491e71f2..7e709597 100644 |
7347 | --- a/ipc/msgutil.c |
7348 | +++ b/ipc/msgutil.c |
7349 | @@ -41,15 +41,15 @@ struct msg_msgseg { |
7350 | /* the next part of the message follows immediately */ |
7351 | }; |
7352 | |
7353 | -#define DATALEN_MSG (int)(PAGE_SIZE-sizeof(struct msg_msg)) |
7354 | -#define DATALEN_SEG (int)(PAGE_SIZE-sizeof(struct msg_msgseg)) |
7355 | +#define DATALEN_MSG ((size_t)PAGE_SIZE-sizeof(struct msg_msg)) |
7356 | +#define DATALEN_SEG ((size_t)PAGE_SIZE-sizeof(struct msg_msgseg)) |
7357 | |
7358 | |
7359 | -static struct msg_msg *alloc_msg(int len) |
7360 | +static struct msg_msg *alloc_msg(size_t len) |
7361 | { |
7362 | struct msg_msg *msg; |
7363 | struct msg_msgseg **pseg; |
7364 | - int alen; |
7365 | + size_t alen; |
7366 | |
7367 | alen = min(len, DATALEN_MSG); |
7368 | msg = kmalloc(sizeof(*msg) + alen, GFP_KERNEL); |
7369 | @@ -80,12 +80,12 @@ out_err: |
7370 | return NULL; |
7371 | } |
7372 | |
7373 | -struct msg_msg *load_msg(const void __user *src, int len) |
7374 | +struct msg_msg *load_msg(const void __user *src, size_t len) |
7375 | { |
7376 | struct msg_msg *msg; |
7377 | struct msg_msgseg *seg; |
7378 | int err = -EFAULT; |
7379 | - int alen; |
7380 | + size_t alen; |
7381 | |
7382 | msg = alloc_msg(len); |
7383 | if (msg == NULL) |
7384 | @@ -117,8 +117,8 @@ out_err: |
7385 | struct msg_msg *copy_msg(struct msg_msg *src, struct msg_msg *dst) |
7386 | { |
7387 | struct msg_msgseg *dst_pseg, *src_pseg; |
7388 | - int len = src->m_ts; |
7389 | - int alen; |
7390 | + size_t len = src->m_ts; |
7391 | + size_t alen; |
7392 | |
7393 | BUG_ON(dst == NULL); |
7394 | if (src->m_ts > dst->m_ts) |
7395 | @@ -147,9 +147,9 @@ struct msg_msg *copy_msg(struct msg_msg *src, struct msg_msg *dst) |
7396 | return ERR_PTR(-ENOSYS); |
7397 | } |
7398 | #endif |
7399 | -int store_msg(void __user *dest, struct msg_msg *msg, int len) |
7400 | +int store_msg(void __user *dest, struct msg_msg *msg, size_t len) |
7401 | { |
7402 | - int alen; |
7403 | + size_t alen; |
7404 | struct msg_msgseg *seg; |
7405 | |
7406 | alen = min(len, DATALEN_MSG); |
7407 | diff --git a/ipc/util.h b/ipc/util.h |
7408 | index f2f5036f..59d78aa9 100644 |
7409 | --- a/ipc/util.h |
7410 | +++ b/ipc/util.h |
7411 | @@ -148,9 +148,9 @@ int ipc_parse_version (int *cmd); |
7412 | #endif |
7413 | |
7414 | extern void free_msg(struct msg_msg *msg); |
7415 | -extern struct msg_msg *load_msg(const void __user *src, int len); |
7416 | +extern struct msg_msg *load_msg(const void __user *src, size_t len); |
7417 | extern struct msg_msg *copy_msg(struct msg_msg *src, struct msg_msg *dst); |
7418 | -extern int store_msg(void __user *dest, struct msg_msg *msg, int len); |
7419 | +extern int store_msg(void __user *dest, struct msg_msg *msg, size_t len); |
7420 | |
7421 | extern void recompute_msgmni(struct ipc_namespace *); |
7422 | |
7423 | diff --git a/kernel/audit.c b/kernel/audit.c |
7424 | index 7b0e23a7..7ddfd8a0 100644 |
7425 | --- a/kernel/audit.c |
7426 | +++ b/kernel/audit.c |
7427 | @@ -613,7 +613,7 @@ static int audit_log_common_recv_msg(struct audit_buffer **ab, u16 msg_type) |
7428 | int rc = 0; |
7429 | uid_t uid = from_kuid(&init_user_ns, current_uid()); |
7430 | |
7431 | - if (!audit_enabled) { |
7432 | + if (!audit_enabled && msg_type != AUDIT_USER_AVC) { |
7433 | *ab = NULL; |
7434 | return rc; |
7435 | } |
7436 | @@ -659,6 +659,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) |
7437 | |
7438 | switch (msg_type) { |
7439 | case AUDIT_GET: |
7440 | + status_set.mask = 0; |
7441 | status_set.enabled = audit_enabled; |
7442 | status_set.failure = audit_failure; |
7443 | status_set.pid = audit_pid; |
7444 | @@ -670,7 +671,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) |
7445 | &status_set, sizeof(status_set)); |
7446 | break; |
7447 | case AUDIT_SET: |
7448 | - if (nlh->nlmsg_len < sizeof(struct audit_status)) |
7449 | + if (nlmsg_len(nlh) < sizeof(struct audit_status)) |
7450 | return -EINVAL; |
7451 | status_get = (struct audit_status *)data; |
7452 | if (status_get->mask & AUDIT_STATUS_ENABLED) { |
7453 | @@ -832,7 +833,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) |
7454 | |
7455 | memset(&s, 0, sizeof(s)); |
7456 | /* guard against past and future API changes */ |
7457 | - memcpy(&s, data, min(sizeof(s), (size_t)nlh->nlmsg_len)); |
7458 | + memcpy(&s, data, min_t(size_t, sizeof(s), nlmsg_len(nlh))); |
7459 | if ((s.enabled != 0 && s.enabled != 1) || |
7460 | (s.log_passwd != 0 && s.log_passwd != 1)) |
7461 | return -EINVAL; |
7462 | @@ -1536,6 +1537,26 @@ void audit_log_name(struct audit_context *context, struct audit_names *n, |
7463 | } |
7464 | } |
7465 | |
7466 | + /* log the audit_names record type */ |
7467 | + audit_log_format(ab, " nametype="); |
7468 | + switch(n->type) { |
7469 | + case AUDIT_TYPE_NORMAL: |
7470 | + audit_log_format(ab, "NORMAL"); |
7471 | + break; |
7472 | + case AUDIT_TYPE_PARENT: |
7473 | + audit_log_format(ab, "PARENT"); |
7474 | + break; |
7475 | + case AUDIT_TYPE_CHILD_DELETE: |
7476 | + audit_log_format(ab, "DELETE"); |
7477 | + break; |
7478 | + case AUDIT_TYPE_CHILD_CREATE: |
7479 | + audit_log_format(ab, "CREATE"); |
7480 | + break; |
7481 | + default: |
7482 | + audit_log_format(ab, "UNKNOWN"); |
7483 | + break; |
7484 | + } |
7485 | + |
7486 | audit_log_fcaps(ab, n); |
7487 | audit_log_end(ab); |
7488 | } |
7489 | diff --git a/kernel/cgroup.c b/kernel/cgroup.c |
7490 | index 8bd9cfdc..5c9127dc 100644 |
7491 | --- a/kernel/cgroup.c |
7492 | +++ b/kernel/cgroup.c |
7493 | @@ -90,6 +90,14 @@ static DEFINE_MUTEX(cgroup_mutex); |
7494 | static DEFINE_MUTEX(cgroup_root_mutex); |
7495 | |
7496 | /* |
7497 | + * cgroup destruction makes heavy use of work items and there can be a lot |
7498 | + * of concurrent destructions. Use a separate workqueue so that cgroup |
7499 | + * destruction work items don't end up filling up max_active of system_wq |
7500 | + * which may lead to deadlock. |
7501 | + */ |
7502 | +static struct workqueue_struct *cgroup_destroy_wq; |
7503 | + |
7504 | +/* |
7505 | * Generate an array of cgroup subsystem pointers. At boot time, this is |
7506 | * populated with the built in subsystems, and modular subsystems are |
7507 | * registered after that. The mutable section of this array is protected by |
7508 | @@ -223,6 +231,7 @@ static void cgroup_destroy_css_killed(struct cgroup *cgrp); |
7509 | static int cgroup_destroy_locked(struct cgroup *cgrp); |
7510 | static int cgroup_addrm_files(struct cgroup *cgrp, struct cftype cfts[], |
7511 | bool is_add); |
7512 | +static int cgroup_file_release(struct inode *inode, struct file *file); |
7513 | |
7514 | /** |
7515 | * cgroup_css - obtain a cgroup's css for the specified subsystem |
7516 | @@ -908,7 +917,7 @@ static void cgroup_free_rcu(struct rcu_head *head) |
7517 | struct cgroup *cgrp = container_of(head, struct cgroup, rcu_head); |
7518 | |
7519 | INIT_WORK(&cgrp->destroy_work, cgroup_free_fn); |
7520 | - schedule_work(&cgrp->destroy_work); |
7521 | + queue_work(cgroup_destroy_wq, &cgrp->destroy_work); |
7522 | } |
7523 | |
7524 | static void cgroup_diput(struct dentry *dentry, struct inode *inode) |
7525 | @@ -2463,7 +2472,7 @@ static const struct file_operations cgroup_seqfile_operations = { |
7526 | .read = seq_read, |
7527 | .write = cgroup_file_write, |
7528 | .llseek = seq_lseek, |
7529 | - .release = single_release, |
7530 | + .release = cgroup_file_release, |
7531 | }; |
7532 | |
7533 | static int cgroup_file_open(struct inode *inode, struct file *file) |
7534 | @@ -2524,6 +2533,8 @@ static int cgroup_file_release(struct inode *inode, struct file *file) |
7535 | ret = cft->release(inode, file); |
7536 | if (css->ss) |
7537 | css_put(css); |
7538 | + if (file->f_op == &cgroup_seqfile_operations) |
7539 | + single_release(inode, file); |
7540 | return ret; |
7541 | } |
7542 | |
7543 | @@ -4306,7 +4317,7 @@ static void css_free_rcu_fn(struct rcu_head *rcu_head) |
7544 | * css_put(). dput() requires process context which we don't have. |
7545 | */ |
7546 | INIT_WORK(&css->destroy_work, css_free_work_fn); |
7547 | - schedule_work(&css->destroy_work); |
7548 | + queue_work(cgroup_destroy_wq, &css->destroy_work); |
7549 | } |
7550 | |
7551 | static void css_release(struct percpu_ref *ref) |
7552 | @@ -4603,7 +4614,7 @@ static void css_killed_ref_fn(struct percpu_ref *ref) |
7553 | container_of(ref, struct cgroup_subsys_state, refcnt); |
7554 | |
7555 | INIT_WORK(&css->destroy_work, css_killed_work_fn); |
7556 | - schedule_work(&css->destroy_work); |
7557 | + queue_work(cgroup_destroy_wq, &css->destroy_work); |
7558 | } |
7559 | |
7560 | /** |
7561 | @@ -5139,6 +5150,22 @@ out: |
7562 | return err; |
7563 | } |
7564 | |
7565 | +static int __init cgroup_wq_init(void) |
7566 | +{ |
7567 | + /* |
7568 | + * There isn't much point in executing destruction path in |
7569 | + * parallel. Good chunk is serialized with cgroup_mutex anyway. |
7570 | + * Use 1 for @max_active. |
7571 | + * |
7572 | + * We would prefer to do this in cgroup_init() above, but that |
7573 | + * is called before init_workqueues(): so leave this until after. |
7574 | + */ |
7575 | + cgroup_destroy_wq = alloc_workqueue("cgroup_destroy", 0, 1); |
7576 | + BUG_ON(!cgroup_destroy_wq); |
7577 | + return 0; |
7578 | +} |
7579 | +core_initcall(cgroup_wq_init); |
7580 | + |
7581 | /* |
7582 | * proc_cgroup_show() |
7583 | * - Print task's cgroup paths into seq_file, one line for each hierarchy |
7584 | diff --git a/kernel/cpuset.c b/kernel/cpuset.c |
7585 | index 6bf981e1..4772034b 100644 |
7586 | --- a/kernel/cpuset.c |
7587 | +++ b/kernel/cpuset.c |
7588 | @@ -1033,8 +1033,10 @@ static void cpuset_change_task_nodemask(struct task_struct *tsk, |
7589 | need_loop = task_has_mempolicy(tsk) || |
7590 | !nodes_intersects(*newmems, tsk->mems_allowed); |
7591 | |
7592 | - if (need_loop) |
7593 | + if (need_loop) { |
7594 | + local_irq_disable(); |
7595 | write_seqcount_begin(&tsk->mems_allowed_seq); |
7596 | + } |
7597 | |
7598 | nodes_or(tsk->mems_allowed, tsk->mems_allowed, *newmems); |
7599 | mpol_rebind_task(tsk, newmems, MPOL_REBIND_STEP1); |
7600 | @@ -1042,8 +1044,10 @@ static void cpuset_change_task_nodemask(struct task_struct *tsk, |
7601 | mpol_rebind_task(tsk, newmems, MPOL_REBIND_STEP2); |
7602 | tsk->mems_allowed = *newmems; |
7603 | |
7604 | - if (need_loop) |
7605 | + if (need_loop) { |
7606 | write_seqcount_end(&tsk->mems_allowed_seq); |
7607 | + local_irq_enable(); |
7608 | + } |
7609 | |
7610 | task_unlock(tsk); |
7611 | } |
7612 | diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c |
7613 | index 514bcfd8..3e59f951 100644 |
7614 | --- a/kernel/irq/manage.c |
7615 | +++ b/kernel/irq/manage.c |
7616 | @@ -956,7 +956,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) |
7617 | goto out_mput; |
7618 | } |
7619 | |
7620 | - sched_setscheduler(t, SCHED_FIFO, ¶m); |
7621 | + sched_setscheduler_nocheck(t, SCHED_FIFO, ¶m); |
7622 | |
7623 | /* |
7624 | * We keep the reference to the task struct even if |
7625 | diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c |
7626 | index 98c3b34a..b38109e2 100644 |
7627 | --- a/kernel/power/snapshot.c |
7628 | +++ b/kernel/power/snapshot.c |
7629 | @@ -792,7 +792,8 @@ void free_basic_memory_bitmaps(void) |
7630 | { |
7631 | struct memory_bitmap *bm1, *bm2; |
7632 | |
7633 | - BUG_ON(!(forbidden_pages_map && free_pages_map)); |
7634 | + if (WARN_ON(!(forbidden_pages_map && free_pages_map))) |
7635 | + return; |
7636 | |
7637 | bm1 = forbidden_pages_map; |
7638 | bm2 = free_pages_map; |
7639 | @@ -1402,7 +1403,11 @@ int hibernate_preallocate_memory(void) |
7640 | * highmem and non-highmem zones separately. |
7641 | */ |
7642 | pages_highmem = preallocate_image_highmem(highmem / 2); |
7643 | - alloc = (count - max_size) - pages_highmem; |
7644 | + alloc = count - max_size; |
7645 | + if (alloc > pages_highmem) |
7646 | + alloc -= pages_highmem; |
7647 | + else |
7648 | + alloc = 0; |
7649 | pages = preallocate_image_memory(alloc, avail_normal); |
7650 | if (pages < alloc) { |
7651 | /* We have exhausted non-highmem pages, try highmem. */ |
7652 | diff --git a/kernel/power/user.c b/kernel/power/user.c |
7653 | index 957f0616..ffc931c3 100644 |
7654 | --- a/kernel/power/user.c |
7655 | +++ b/kernel/power/user.c |
7656 | @@ -70,6 +70,7 @@ static int snapshot_open(struct inode *inode, struct file *filp) |
7657 | data->swap = swsusp_resume_device ? |
7658 | swap_type_of(swsusp_resume_device, 0, NULL) : -1; |
7659 | data->mode = O_RDONLY; |
7660 | + data->free_bitmaps = false; |
7661 | error = pm_notifier_call_chain(PM_HIBERNATION_PREPARE); |
7662 | if (error) |
7663 | pm_notifier_call_chain(PM_POST_HIBERNATION); |
7664 | diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c |
7665 | index eec50fce..88c9c65a 100644 |
7666 | --- a/kernel/time/alarmtimer.c |
7667 | +++ b/kernel/time/alarmtimer.c |
7668 | @@ -490,7 +490,7 @@ static int alarm_clock_getres(const clockid_t which_clock, struct timespec *tp) |
7669 | clockid_t baseid = alarm_bases[clock2alarm(which_clock)].base_clockid; |
7670 | |
7671 | if (!alarmtimer_get_rtcdev()) |
7672 | - return -ENOTSUPP; |
7673 | + return -EINVAL; |
7674 | |
7675 | return hrtimer_get_res(baseid, tp); |
7676 | } |
7677 | @@ -507,7 +507,7 @@ static int alarm_clock_get(clockid_t which_clock, struct timespec *tp) |
7678 | struct alarm_base *base = &alarm_bases[clock2alarm(which_clock)]; |
7679 | |
7680 | if (!alarmtimer_get_rtcdev()) |
7681 | - return -ENOTSUPP; |
7682 | + return -EINVAL; |
7683 | |
7684 | *tp = ktime_to_timespec(base->gettime()); |
7685 | return 0; |
7686 | diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c |
7687 | index 03cf44ac..f3bd09ee 100644 |
7688 | --- a/kernel/trace/ftrace.c |
7689 | +++ b/kernel/trace/ftrace.c |
7690 | @@ -367,9 +367,6 @@ static int remove_ftrace_list_ops(struct ftrace_ops **list, |
7691 | |
7692 | static int __register_ftrace_function(struct ftrace_ops *ops) |
7693 | { |
7694 | - if (unlikely(ftrace_disabled)) |
7695 | - return -ENODEV; |
7696 | - |
7697 | if (FTRACE_WARN_ON(ops == &global_ops)) |
7698 | return -EINVAL; |
7699 | |
7700 | @@ -428,9 +425,6 @@ static int __unregister_ftrace_function(struct ftrace_ops *ops) |
7701 | { |
7702 | int ret; |
7703 | |
7704 | - if (ftrace_disabled) |
7705 | - return -ENODEV; |
7706 | - |
7707 | if (WARN_ON(!(ops->flags & FTRACE_OPS_FL_ENABLED))) |
7708 | return -EBUSY; |
7709 | |
7710 | @@ -2088,10 +2082,15 @@ static void ftrace_startup_enable(int command) |
7711 | static int ftrace_startup(struct ftrace_ops *ops, int command) |
7712 | { |
7713 | bool hash_enable = true; |
7714 | + int ret; |
7715 | |
7716 | if (unlikely(ftrace_disabled)) |
7717 | return -ENODEV; |
7718 | |
7719 | + ret = __register_ftrace_function(ops); |
7720 | + if (ret) |
7721 | + return ret; |
7722 | + |
7723 | ftrace_start_up++; |
7724 | command |= FTRACE_UPDATE_CALLS; |
7725 | |
7726 | @@ -2113,12 +2112,17 @@ static int ftrace_startup(struct ftrace_ops *ops, int command) |
7727 | return 0; |
7728 | } |
7729 | |
7730 | -static void ftrace_shutdown(struct ftrace_ops *ops, int command) |
7731 | +static int ftrace_shutdown(struct ftrace_ops *ops, int command) |
7732 | { |
7733 | bool hash_disable = true; |
7734 | + int ret; |
7735 | |
7736 | if (unlikely(ftrace_disabled)) |
7737 | - return; |
7738 | + return -ENODEV; |
7739 | + |
7740 | + ret = __unregister_ftrace_function(ops); |
7741 | + if (ret) |
7742 | + return ret; |
7743 | |
7744 | ftrace_start_up--; |
7745 | /* |
7746 | @@ -2153,9 +2157,10 @@ static void ftrace_shutdown(struct ftrace_ops *ops, int command) |
7747 | } |
7748 | |
7749 | if (!command || !ftrace_enabled) |
7750 | - return; |
7751 | + return 0; |
7752 | |
7753 | ftrace_run_update_code(command); |
7754 | + return 0; |
7755 | } |
7756 | |
7757 | static void ftrace_startup_sysctl(void) |
7758 | @@ -3060,16 +3065,13 @@ static void __enable_ftrace_function_probe(void) |
7759 | if (i == FTRACE_FUNC_HASHSIZE) |
7760 | return; |
7761 | |
7762 | - ret = __register_ftrace_function(&trace_probe_ops); |
7763 | - if (!ret) |
7764 | - ret = ftrace_startup(&trace_probe_ops, 0); |
7765 | + ret = ftrace_startup(&trace_probe_ops, 0); |
7766 | |
7767 | ftrace_probe_registered = 1; |
7768 | } |
7769 | |
7770 | static void __disable_ftrace_function_probe(void) |
7771 | { |
7772 | - int ret; |
7773 | int i; |
7774 | |
7775 | if (!ftrace_probe_registered) |
7776 | @@ -3082,9 +3084,7 @@ static void __disable_ftrace_function_probe(void) |
7777 | } |
7778 | |
7779 | /* no more funcs left */ |
7780 | - ret = __unregister_ftrace_function(&trace_probe_ops); |
7781 | - if (!ret) |
7782 | - ftrace_shutdown(&trace_probe_ops, 0); |
7783 | + ftrace_shutdown(&trace_probe_ops, 0); |
7784 | |
7785 | ftrace_probe_registered = 0; |
7786 | } |
7787 | @@ -4290,12 +4290,15 @@ core_initcall(ftrace_nodyn_init); |
7788 | static inline int ftrace_init_dyn_debugfs(struct dentry *d_tracer) { return 0; } |
7789 | static inline void ftrace_startup_enable(int command) { } |
7790 | /* Keep as macros so we do not need to define the commands */ |
7791 | -# define ftrace_startup(ops, command) \ |
7792 | - ({ \ |
7793 | - (ops)->flags |= FTRACE_OPS_FL_ENABLED; \ |
7794 | - 0; \ |
7795 | +# define ftrace_startup(ops, command) \ |
7796 | + ({ \ |
7797 | + int ___ret = __register_ftrace_function(ops); \ |
7798 | + if (!___ret) \ |
7799 | + (ops)->flags |= FTRACE_OPS_FL_ENABLED; \ |
7800 | + ___ret; \ |
7801 | }) |
7802 | -# define ftrace_shutdown(ops, command) do { } while (0) |
7803 | +# define ftrace_shutdown(ops, command) __unregister_ftrace_function(ops) |
7804 | + |
7805 | # define ftrace_startup_sysctl() do { } while (0) |
7806 | # define ftrace_shutdown_sysctl() do { } while (0) |
7807 | |
7808 | @@ -4695,9 +4698,7 @@ int register_ftrace_function(struct ftrace_ops *ops) |
7809 | |
7810 | mutex_lock(&ftrace_lock); |
7811 | |
7812 | - ret = __register_ftrace_function(ops); |
7813 | - if (!ret) |
7814 | - ret = ftrace_startup(ops, 0); |
7815 | + ret = ftrace_startup(ops, 0); |
7816 | |
7817 | mutex_unlock(&ftrace_lock); |
7818 | |
7819 | @@ -4716,9 +4717,7 @@ int unregister_ftrace_function(struct ftrace_ops *ops) |
7820 | int ret; |
7821 | |
7822 | mutex_lock(&ftrace_lock); |
7823 | - ret = __unregister_ftrace_function(ops); |
7824 | - if (!ret) |
7825 | - ftrace_shutdown(ops, 0); |
7826 | + ret = ftrace_shutdown(ops, 0); |
7827 | mutex_unlock(&ftrace_lock); |
7828 | |
7829 | return ret; |
7830 | @@ -4912,6 +4911,13 @@ ftrace_suspend_notifier_call(struct notifier_block *bl, unsigned long state, |
7831 | return NOTIFY_DONE; |
7832 | } |
7833 | |
7834 | +/* Just a place holder for function graph */ |
7835 | +static struct ftrace_ops fgraph_ops __read_mostly = { |
7836 | + .func = ftrace_stub, |
7837 | + .flags = FTRACE_OPS_FL_STUB | FTRACE_OPS_FL_GLOBAL | |
7838 | + FTRACE_OPS_FL_RECURSION_SAFE, |
7839 | +}; |
7840 | + |
7841 | int register_ftrace_graph(trace_func_graph_ret_t retfunc, |
7842 | trace_func_graph_ent_t entryfunc) |
7843 | { |
7844 | @@ -4938,7 +4944,7 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc, |
7845 | ftrace_graph_return = retfunc; |
7846 | ftrace_graph_entry = entryfunc; |
7847 | |
7848 | - ret = ftrace_startup(&global_ops, FTRACE_START_FUNC_RET); |
7849 | + ret = ftrace_startup(&fgraph_ops, FTRACE_START_FUNC_RET); |
7850 | |
7851 | out: |
7852 | mutex_unlock(&ftrace_lock); |
7853 | @@ -4955,7 +4961,7 @@ void unregister_ftrace_graph(void) |
7854 | ftrace_graph_active--; |
7855 | ftrace_graph_return = (trace_func_graph_ret_t)ftrace_stub; |
7856 | ftrace_graph_entry = ftrace_graph_entry_stub; |
7857 | - ftrace_shutdown(&global_ops, FTRACE_STOP_FUNC_RET); |
7858 | + ftrace_shutdown(&fgraph_ops, FTRACE_STOP_FUNC_RET); |
7859 | unregister_pm_notifier(&ftrace_suspend_notifier); |
7860 | unregister_trace_sched_switch(ftrace_graph_probe_sched_switch, NULL); |
7861 | |
7862 | diff --git a/kernel/workqueue.c b/kernel/workqueue.c |
7863 | index 987293d0..93c26528 100644 |
7864 | --- a/kernel/workqueue.c |
7865 | +++ b/kernel/workqueue.c |
7866 | @@ -305,6 +305,9 @@ static DEFINE_HASHTABLE(unbound_pool_hash, UNBOUND_POOL_HASH_ORDER); |
7867 | /* I: attributes used when instantiating standard unbound pools on demand */ |
7868 | static struct workqueue_attrs *unbound_std_wq_attrs[NR_STD_WORKER_POOLS]; |
7869 | |
7870 | +/* I: attributes used when instantiating ordered pools on demand */ |
7871 | +static struct workqueue_attrs *ordered_wq_attrs[NR_STD_WORKER_POOLS]; |
7872 | + |
7873 | struct workqueue_struct *system_wq __read_mostly; |
7874 | EXPORT_SYMBOL(system_wq); |
7875 | struct workqueue_struct *system_highpri_wq __read_mostly; |
7876 | @@ -4106,7 +4109,7 @@ out_unlock: |
7877 | static int alloc_and_link_pwqs(struct workqueue_struct *wq) |
7878 | { |
7879 | bool highpri = wq->flags & WQ_HIGHPRI; |
7880 | - int cpu; |
7881 | + int cpu, ret; |
7882 | |
7883 | if (!(wq->flags & WQ_UNBOUND)) { |
7884 | wq->cpu_pwqs = alloc_percpu(struct pool_workqueue); |
7885 | @@ -4126,6 +4129,13 @@ static int alloc_and_link_pwqs(struct workqueue_struct *wq) |
7886 | mutex_unlock(&wq->mutex); |
7887 | } |
7888 | return 0; |
7889 | + } else if (wq->flags & __WQ_ORDERED) { |
7890 | + ret = apply_workqueue_attrs(wq, ordered_wq_attrs[highpri]); |
7891 | + /* there should only be single pwq for ordering guarantee */ |
7892 | + WARN(!ret && (wq->pwqs.next != &wq->dfl_pwq->pwqs_node || |
7893 | + wq->pwqs.prev != &wq->dfl_pwq->pwqs_node), |
7894 | + "ordering guarantee broken for workqueue %s\n", wq->name); |
7895 | + return ret; |
7896 | } else { |
7897 | return apply_workqueue_attrs(wq, unbound_std_wq_attrs[highpri]); |
7898 | } |
7899 | @@ -5051,13 +5061,23 @@ static int __init init_workqueues(void) |
7900 | } |
7901 | } |
7902 | |
7903 | - /* create default unbound wq attrs */ |
7904 | + /* create default unbound and ordered wq attrs */ |
7905 | for (i = 0; i < NR_STD_WORKER_POOLS; i++) { |
7906 | struct workqueue_attrs *attrs; |
7907 | |
7908 | BUG_ON(!(attrs = alloc_workqueue_attrs(GFP_KERNEL))); |
7909 | attrs->nice = std_nice[i]; |
7910 | unbound_std_wq_attrs[i] = attrs; |
7911 | + |
7912 | + /* |
7913 | + * An ordered wq should have only one pwq as ordering is |
7914 | + * guaranteed by max_active which is enforced by pwqs. |
7915 | + * Turn off NUMA so that dfl_pwq is used for all nodes. |
7916 | + */ |
7917 | + BUG_ON(!(attrs = alloc_workqueue_attrs(GFP_KERNEL))); |
7918 | + attrs->nice = std_nice[i]; |
7919 | + attrs->no_numa = true; |
7920 | + ordered_wq_attrs[i] = attrs; |
7921 | } |
7922 | |
7923 | system_wq = alloc_workqueue("events", 0, 0); |
7924 | diff --git a/lib/vsprintf.c b/lib/vsprintf.c |
7925 | index 26559bdb..d76555c4 100644 |
7926 | --- a/lib/vsprintf.c |
7927 | +++ b/lib/vsprintf.c |
7928 | @@ -27,6 +27,7 @@ |
7929 | #include <linux/uaccess.h> |
7930 | #include <linux/ioport.h> |
7931 | #include <linux/dcache.h> |
7932 | +#include <linux/cred.h> |
7933 | #include <net/addrconf.h> |
7934 | |
7935 | #include <asm/page.h> /* for PAGE_SIZE */ |
7936 | @@ -1312,11 +1313,37 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, |
7937 | spec.field_width = default_width; |
7938 | return string(buf, end, "pK-error", spec); |
7939 | } |
7940 | - if (!((kptr_restrict == 0) || |
7941 | - (kptr_restrict == 1 && |
7942 | - has_capability_noaudit(current, CAP_SYSLOG)))) |
7943 | + |
7944 | + switch (kptr_restrict) { |
7945 | + case 0: |
7946 | + /* Always print %pK values */ |
7947 | + break; |
7948 | + case 1: { |
7949 | + /* |
7950 | + * Only print the real pointer value if the current |
7951 | + * process has CAP_SYSLOG and is running with the |
7952 | + * same credentials it started with. This is because |
7953 | + * access to files is checked at open() time, but %pK |
7954 | + * checks permission at read() time. We don't want to |
7955 | + * leak pointer values if a binary opens a file using |
7956 | + * %pK and then elevates privileges before reading it. |
7957 | + */ |
7958 | + const struct cred *cred = current_cred(); |
7959 | + |
7960 | + if (!has_capability_noaudit(current, CAP_SYSLOG) || |
7961 | + !uid_eq(cred->euid, cred->uid) || |
7962 | + !gid_eq(cred->egid, cred->gid)) |
7963 | + ptr = NULL; |
7964 | + break; |
7965 | + } |
7966 | + case 2: |
7967 | + default: |
7968 | + /* Always print 0's for %pK */ |
7969 | ptr = NULL; |
7970 | + break; |
7971 | + } |
7972 | break; |
7973 | + |
7974 | case 'N': |
7975 | switch (fmt[1]) { |
7976 | case 'F': |
7977 | diff --git a/mm/mmap.c b/mm/mmap.c |
7978 | index 9d548512..362e5f13 100644 |
7979 | --- a/mm/mmap.c |
7980 | +++ b/mm/mmap.c |
7981 | @@ -1856,7 +1856,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, |
7982 | struct vm_area_struct *vma; |
7983 | struct vm_unmapped_area_info info; |
7984 | |
7985 | - if (len > TASK_SIZE) |
7986 | + if (len > TASK_SIZE - mmap_min_addr) |
7987 | return -ENOMEM; |
7988 | |
7989 | if (flags & MAP_FIXED) |
7990 | @@ -1865,7 +1865,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, |
7991 | if (addr) { |
7992 | addr = PAGE_ALIGN(addr); |
7993 | vma = find_vma(mm, addr); |
7994 | - if (TASK_SIZE - len >= addr && |
7995 | + if (TASK_SIZE - len >= addr && addr >= mmap_min_addr && |
7996 | (!vma || addr + len <= vma->vm_start)) |
7997 | return addr; |
7998 | } |
7999 | @@ -1895,7 +1895,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, |
8000 | struct vm_unmapped_area_info info; |
8001 | |
8002 | /* requested length too big for entire address space */ |
8003 | - if (len > TASK_SIZE) |
8004 | + if (len > TASK_SIZE - mmap_min_addr) |
8005 | return -ENOMEM; |
8006 | |
8007 | if (flags & MAP_FIXED) |
8008 | @@ -1905,14 +1905,14 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, |
8009 | if (addr) { |
8010 | addr = PAGE_ALIGN(addr); |
8011 | vma = find_vma(mm, addr); |
8012 | - if (TASK_SIZE - len >= addr && |
8013 | + if (TASK_SIZE - len >= addr && addr >= mmap_min_addr && |
8014 | (!vma || addr + len <= vma->vm_start)) |
8015 | return addr; |
8016 | } |
8017 | |
8018 | info.flags = VM_UNMAPPED_AREA_TOPDOWN; |
8019 | info.length = len; |
8020 | - info.low_limit = PAGE_SIZE; |
8021 | + info.low_limit = max(PAGE_SIZE, mmap_min_addr); |
8022 | info.high_limit = mm->mmap_base; |
8023 | info.align_mask = 0; |
8024 | addr = vm_unmapped_area(&info); |
8025 | diff --git a/mm/zswap.c b/mm/zswap.c |
8026 | index d93510c6..6b862518 100644 |
8027 | --- a/mm/zswap.c |
8028 | +++ b/mm/zswap.c |
8029 | @@ -387,7 +387,7 @@ static void zswap_free_entry(struct zswap_tree *tree, struct zswap_entry *entry) |
8030 | enum zswap_get_swap_ret { |
8031 | ZSWAP_SWAPCACHE_NEW, |
8032 | ZSWAP_SWAPCACHE_EXIST, |
8033 | - ZSWAP_SWAPCACHE_NOMEM |
8034 | + ZSWAP_SWAPCACHE_FAIL, |
8035 | }; |
8036 | |
8037 | /* |
8038 | @@ -401,9 +401,10 @@ enum zswap_get_swap_ret { |
8039 | * added to the swap cache, and returned in retpage. |
8040 | * |
8041 | * If success, the swap cache page is returned in retpage |
8042 | - * Returns 0 if page was already in the swap cache, page is not locked |
8043 | - * Returns 1 if the new page needs to be populated, page is locked |
8044 | - * Returns <0 on error |
8045 | + * Returns ZSWAP_SWAPCACHE_EXIST if page was already in the swap cache |
8046 | + * Returns ZSWAP_SWAPCACHE_NEW if the new page needs to be populated, |
8047 | + * the new page is added to swapcache and locked |
8048 | + * Returns ZSWAP_SWAPCACHE_FAIL on error |
8049 | */ |
8050 | static int zswap_get_swap_cache_page(swp_entry_t entry, |
8051 | struct page **retpage) |
8052 | @@ -475,7 +476,7 @@ static int zswap_get_swap_cache_page(swp_entry_t entry, |
8053 | if (new_page) |
8054 | page_cache_release(new_page); |
8055 | if (!found_page) |
8056 | - return ZSWAP_SWAPCACHE_NOMEM; |
8057 | + return ZSWAP_SWAPCACHE_FAIL; |
8058 | *retpage = found_page; |
8059 | return ZSWAP_SWAPCACHE_EXIST; |
8060 | } |
8061 | @@ -529,11 +530,11 @@ static int zswap_writeback_entry(struct zbud_pool *pool, unsigned long handle) |
8062 | |
8063 | /* try to allocate swap cache page */ |
8064 | switch (zswap_get_swap_cache_page(swpentry, &page)) { |
8065 | - case ZSWAP_SWAPCACHE_NOMEM: /* no memory */ |
8066 | + case ZSWAP_SWAPCACHE_FAIL: /* no memory or invalidate happened */ |
8067 | ret = -ENOMEM; |
8068 | goto fail; |
8069 | |
8070 | - case ZSWAP_SWAPCACHE_EXIST: /* page is unlocked */ |
8071 | + case ZSWAP_SWAPCACHE_EXIST: |
8072 | /* page is already in the swap cache, ignore for now */ |
8073 | page_cache_release(page); |
8074 | ret = -EEXIST; |
8075 | @@ -591,7 +592,12 @@ static int zswap_writeback_entry(struct zbud_pool *pool, unsigned long handle) |
8076 | |
8077 | fail: |
8078 | spin_lock(&tree->lock); |
8079 | - zswap_entry_put(entry); |
8080 | + refcount = zswap_entry_put(entry); |
8081 | + if (refcount <= 0) { |
8082 | + /* invalidate happened, consider writeback as success */ |
8083 | + zswap_free_entry(tree, entry); |
8084 | + ret = 0; |
8085 | + } |
8086 | spin_unlock(&tree->lock); |
8087 | return ret; |
8088 | } |
8089 | diff --git a/net/wireless/scan.c b/net/wireless/scan.c |
8090 | index eeb71480..d4397eba 100644 |
8091 | --- a/net/wireless/scan.c |
8092 | +++ b/net/wireless/scan.c |
8093 | @@ -254,10 +254,10 @@ void __cfg80211_sched_scan_results(struct work_struct *wk) |
8094 | rdev = container_of(wk, struct cfg80211_registered_device, |
8095 | sched_scan_results_wk); |
8096 | |
8097 | - request = rdev->sched_scan_req; |
8098 | - |
8099 | rtnl_lock(); |
8100 | |
8101 | + request = rdev->sched_scan_req; |
8102 | + |
8103 | /* we don't have sched_scan_req anymore if the scan is stopping */ |
8104 | if (request) { |
8105 | if (request->flags & NL80211_SCAN_FLAG_FLUSH) { |
8106 | diff --git a/security/selinux/netlabel.c b/security/selinux/netlabel.c |
8107 | index da4b8b23..6235d052 100644 |
8108 | --- a/security/selinux/netlabel.c |
8109 | +++ b/security/selinux/netlabel.c |
8110 | @@ -442,8 +442,7 @@ int selinux_netlbl_socket_connect(struct sock *sk, struct sockaddr *addr) |
8111 | sksec->nlbl_state != NLBL_CONNLABELED) |
8112 | return 0; |
8113 | |
8114 | - local_bh_disable(); |
8115 | - bh_lock_sock_nested(sk); |
8116 | + lock_sock(sk); |
8117 | |
8118 | /* connected sockets are allowed to disconnect when the address family |
8119 | * is set to AF_UNSPEC, if that is what is happening we want to reset |
8120 | @@ -464,7 +463,6 @@ int selinux_netlbl_socket_connect(struct sock *sk, struct sockaddr *addr) |
8121 | sksec->nlbl_state = NLBL_CONNLABELED; |
8122 | |
8123 | socket_connect_return: |
8124 | - bh_unlock_sock(sk); |
8125 | - local_bh_enable(); |
8126 | + release_sock(sk); |
8127 | return rc; |
8128 | } |
8129 | diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c |
8130 | index 3067ed4f..c4671d00 100644 |
8131 | --- a/sound/pci/hda/hda_generic.c |
8132 | +++ b/sound/pci/hda/hda_generic.c |
8133 | @@ -2506,12 +2506,8 @@ static int create_out_jack_modes(struct hda_codec *codec, int num_pins, |
8134 | |
8135 | for (i = 0; i < num_pins; i++) { |
8136 | hda_nid_t pin = pins[i]; |
8137 | - if (pin == spec->hp_mic_pin) { |
8138 | - int ret = create_hp_mic_jack_mode(codec, pin); |
8139 | - if (ret < 0) |
8140 | - return ret; |
8141 | + if (pin == spec->hp_mic_pin) |
8142 | continue; |
8143 | - } |
8144 | if (get_out_jack_num_items(codec, pin) > 1) { |
8145 | struct snd_kcontrol_new *knew; |
8146 | char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; |
8147 | @@ -2764,7 +2760,7 @@ static int hp_mic_jack_mode_put(struct snd_kcontrol *kcontrol, |
8148 | val &= ~(AC_PINCTL_VREFEN | PIN_HP); |
8149 | val |= get_vref_idx(vref_caps, idx) | PIN_IN; |
8150 | } else |
8151 | - val = snd_hda_get_default_vref(codec, nid); |
8152 | + val = snd_hda_get_default_vref(codec, nid) | PIN_IN; |
8153 | } |
8154 | snd_hda_set_pin_ctl_cache(codec, nid, val); |
8155 | call_hp_automute(codec, NULL); |
8156 | @@ -2784,9 +2780,6 @@ static int create_hp_mic_jack_mode(struct hda_codec *codec, hda_nid_t pin) |
8157 | struct hda_gen_spec *spec = codec->spec; |
8158 | struct snd_kcontrol_new *knew; |
8159 | |
8160 | - if (get_out_jack_num_items(codec, pin) <= 1 && |
8161 | - get_in_jack_num_items(codec, pin) <= 1) |
8162 | - return 0; /* no need */ |
8163 | knew = snd_hda_gen_add_kctl(spec, "Headphone Mic Jack Mode", |
8164 | &hp_mic_jack_mode_enum); |
8165 | if (!knew) |
8166 | @@ -2815,6 +2808,42 @@ static int add_loopback_list(struct hda_gen_spec *spec, hda_nid_t mix, int idx) |
8167 | return 0; |
8168 | } |
8169 | |
8170 | +/* return true if either a volume or a mute amp is found for the given |
8171 | + * aamix path; the amp has to be either in the mixer node or its direct leaf |
8172 | + */ |
8173 | +static bool look_for_mix_leaf_ctls(struct hda_codec *codec, hda_nid_t mix_nid, |
8174 | + hda_nid_t pin, unsigned int *mix_val, |
8175 | + unsigned int *mute_val) |
8176 | +{ |
8177 | + int idx, num_conns; |
8178 | + const hda_nid_t *list; |
8179 | + hda_nid_t nid; |
8180 | + |
8181 | + idx = snd_hda_get_conn_index(codec, mix_nid, pin, true); |
8182 | + if (idx < 0) |
8183 | + return false; |
8184 | + |
8185 | + *mix_val = *mute_val = 0; |
8186 | + if (nid_has_volume(codec, mix_nid, HDA_INPUT)) |
8187 | + *mix_val = HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT); |
8188 | + if (nid_has_mute(codec, mix_nid, HDA_INPUT)) |
8189 | + *mute_val = HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT); |
8190 | + if (*mix_val && *mute_val) |
8191 | + return true; |
8192 | + |
8193 | + /* check leaf node */ |
8194 | + num_conns = snd_hda_get_conn_list(codec, mix_nid, &list); |
8195 | + if (num_conns < idx) |
8196 | + return false; |
8197 | + nid = list[idx]; |
8198 | + if (!*mix_val && nid_has_volume(codec, nid, HDA_OUTPUT)) |
8199 | + *mix_val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT); |
8200 | + if (!*mute_val && nid_has_mute(codec, nid, HDA_OUTPUT)) |
8201 | + *mute_val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT); |
8202 | + |
8203 | + return *mix_val || *mute_val; |
8204 | +} |
8205 | + |
8206 | /* create input playback/capture controls for the given pin */ |
8207 | static int new_analog_input(struct hda_codec *codec, int input_idx, |
8208 | hda_nid_t pin, const char *ctlname, int ctlidx, |
8209 | @@ -2822,12 +2851,11 @@ static int new_analog_input(struct hda_codec *codec, int input_idx, |
8210 | { |
8211 | struct hda_gen_spec *spec = codec->spec; |
8212 | struct nid_path *path; |
8213 | - unsigned int val; |
8214 | + unsigned int mix_val, mute_val; |
8215 | int err, idx; |
8216 | |
8217 | - if (!nid_has_volume(codec, mix_nid, HDA_INPUT) && |
8218 | - !nid_has_mute(codec, mix_nid, HDA_INPUT)) |
8219 | - return 0; /* no need for analog loopback */ |
8220 | + if (!look_for_mix_leaf_ctls(codec, mix_nid, pin, &mix_val, &mute_val)) |
8221 | + return 0; |
8222 | |
8223 | path = snd_hda_add_new_path(codec, pin, mix_nid, 0); |
8224 | if (!path) |
8225 | @@ -2836,20 +2864,18 @@ static int new_analog_input(struct hda_codec *codec, int input_idx, |
8226 | spec->loopback_paths[input_idx] = snd_hda_get_path_idx(codec, path); |
8227 | |
8228 | idx = path->idx[path->depth - 1]; |
8229 | - if (nid_has_volume(codec, mix_nid, HDA_INPUT)) { |
8230 | - val = HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT); |
8231 | - err = __add_pb_vol_ctrl(spec, HDA_CTL_WIDGET_VOL, ctlname, ctlidx, val); |
8232 | + if (mix_val) { |
8233 | + err = __add_pb_vol_ctrl(spec, HDA_CTL_WIDGET_VOL, ctlname, ctlidx, mix_val); |
8234 | if (err < 0) |
8235 | return err; |
8236 | - path->ctls[NID_PATH_VOL_CTL] = val; |
8237 | + path->ctls[NID_PATH_VOL_CTL] = mix_val; |
8238 | } |
8239 | |
8240 | - if (nid_has_mute(codec, mix_nid, HDA_INPUT)) { |
8241 | - val = HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT); |
8242 | - err = __add_pb_sw_ctrl(spec, HDA_CTL_WIDGET_MUTE, ctlname, ctlidx, val); |
8243 | + if (mute_val) { |
8244 | + err = __add_pb_sw_ctrl(spec, HDA_CTL_WIDGET_MUTE, ctlname, ctlidx, mute_val); |
8245 | if (err < 0) |
8246 | return err; |
8247 | - path->ctls[NID_PATH_MUTE_CTL] = val; |
8248 | + path->ctls[NID_PATH_MUTE_CTL] = mute_val; |
8249 | } |
8250 | |
8251 | path->active = true; |
8252 | @@ -4383,6 +4409,17 @@ int snd_hda_gen_parse_auto_config(struct hda_codec *codec, |
8253 | if (err < 0) |
8254 | return err; |
8255 | |
8256 | + /* create "Headphone Mic Jack Mode" if no input selection is |
8257 | + * available (or user specifies add_jack_modes hint) |
8258 | + */ |
8259 | + if (spec->hp_mic_pin && |
8260 | + (spec->auto_mic || spec->input_mux.num_items == 1 || |
8261 | + spec->add_jack_modes)) { |
8262 | + err = create_hp_mic_jack_mode(codec, spec->hp_mic_pin); |
8263 | + if (err < 0) |
8264 | + return err; |
8265 | + } |
8266 | + |
8267 | if (spec->add_jack_modes) { |
8268 | if (cfg->line_out_type != AUTO_PIN_SPEAKER_OUT) { |
8269 | err = create_out_jack_modes(codec, cfg->line_outs, |
8270 | diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c |
8271 | index 2f39631f..f0f54829 100644 |
8272 | --- a/sound/pci/hda/patch_realtek.c |
8273 | +++ b/sound/pci/hda/patch_realtek.c |
8274 | @@ -1771,6 +1771,7 @@ enum { |
8275 | ALC889_FIXUP_IMAC91_VREF, |
8276 | ALC882_FIXUP_INV_DMIC, |
8277 | ALC882_FIXUP_NO_PRIMARY_HP, |
8278 | + ALC887_FIXUP_ASUS_BASS, |
8279 | }; |
8280 | |
8281 | static void alc889_fixup_coef(struct hda_codec *codec, |
8282 | @@ -2094,6 +2095,13 @@ static const struct hda_fixup alc882_fixups[] = { |
8283 | .type = HDA_FIXUP_FUNC, |
8284 | .v.func = alc882_fixup_no_primary_hp, |
8285 | }, |
8286 | + [ALC887_FIXUP_ASUS_BASS] = { |
8287 | + .type = HDA_FIXUP_PINS, |
8288 | + .v.pins = (const struct hda_pintbl[]) { |
8289 | + {0x16, 0x99130130}, /* bass speaker */ |
8290 | + {} |
8291 | + }, |
8292 | + }, |
8293 | }; |
8294 | |
8295 | static const struct snd_pci_quirk alc882_fixup_tbl[] = { |
8296 | @@ -2127,6 +2135,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { |
8297 | SND_PCI_QUIRK(0x1043, 0x1873, "ASUS W90V", ALC882_FIXUP_ASUS_W90V), |
8298 | SND_PCI_QUIRK(0x1043, 0x1971, "Asus W2JC", ALC882_FIXUP_ASUS_W2JC), |
8299 | SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_FIXUP_EEE1601), |
8300 | + SND_PCI_QUIRK(0x1043, 0x84bc, "ASUS ET2700", ALC887_FIXUP_ASUS_BASS), |
8301 | SND_PCI_QUIRK(0x104d, 0x9047, "Sony Vaio TT", ALC889_FIXUP_VAIO_TT), |
8302 | SND_PCI_QUIRK(0x104d, 0x905a, "Sony Vaio Z", ALC882_FIXUP_NO_PRIMARY_HP), |
8303 | SND_PCI_QUIRK(0x104d, 0x9043, "Sony Vaio VGC-LN51JGB", ALC882_FIXUP_NO_PRIMARY_HP), |
8304 | @@ -4864,6 +4873,7 @@ static int patch_alc662(struct hda_codec *codec) |
8305 | case 0x10ec0272: |
8306 | case 0x10ec0663: |
8307 | case 0x10ec0665: |
8308 | + case 0x10ec0668: |
8309 | set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT); |
8310 | break; |
8311 | case 0x10ec0273: |
8312 | @@ -4921,6 +4931,7 @@ static int patch_alc680(struct hda_codec *codec) |
8313 | */ |
8314 | static const struct hda_codec_preset snd_hda_preset_realtek[] = { |
8315 | { .id = 0x10ec0221, .name = "ALC221", .patch = patch_alc269 }, |
8316 | + { .id = 0x10ec0231, .name = "ALC231", .patch = patch_alc269 }, |
8317 | { .id = 0x10ec0233, .name = "ALC233", .patch = patch_alc269 }, |
8318 | { .id = 0x10ec0255, .name = "ALC255", .patch = patch_alc269 }, |
8319 | { .id = 0x10ec0260, .name = "ALC260", .patch = patch_alc260 }, |
8320 | diff --git a/sound/soc/blackfin/bf5xx-i2s.c b/sound/soc/blackfin/bf5xx-i2s.c |
8321 | index 9a174fc4..39d77483 100644 |
8322 | --- a/sound/soc/blackfin/bf5xx-i2s.c |
8323 | +++ b/sound/soc/blackfin/bf5xx-i2s.c |
8324 | @@ -121,6 +121,7 @@ static int bf5xx_i2s_hw_params(struct snd_pcm_substream *substream, |
8325 | bf5xx_i2s->tcr2 |= 7; |
8326 | bf5xx_i2s->rcr2 |= 7; |
8327 | sport_handle->wdsize = 1; |
8328 | + break; |
8329 | case SNDRV_PCM_FORMAT_S16_LE: |
8330 | bf5xx_i2s->tcr2 |= 15; |
8331 | bf5xx_i2s->rcr2 |= 15; |
8332 | diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c |
8333 | index 2d037870..687565d0 100644 |
8334 | --- a/sound/soc/codecs/ak4642.c |
8335 | +++ b/sound/soc/codecs/ak4642.c |
8336 | @@ -257,7 +257,7 @@ static int ak4642_dai_startup(struct snd_pcm_substream *substream, |
8337 | * This operation came from example code of |
8338 | * "ASAHI KASEI AK4642" (japanese) manual p94. |
8339 | */ |
8340 | - snd_soc_write(codec, SG_SL1, PMMP | MGAIN0); |
8341 | + snd_soc_update_bits(codec, SG_SL1, PMMP | MGAIN0, PMMP | MGAIN0); |
8342 | snd_soc_write(codec, TIMER, ZTM(0x3) | WTM(0x3)); |
8343 | snd_soc_write(codec, ALC_CTL1, ALC | LMTH0); |
8344 | snd_soc_update_bits(codec, PW_MGMT1, PMADL, PMADL); |
8345 | diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c |
8346 | index 657808ba..f38ed4d2 100644 |
8347 | --- a/sound/soc/codecs/arizona.c |
8348 | +++ b/sound/soc/codecs/arizona.c |
8349 | @@ -1525,6 +1525,8 @@ static void arizona_enable_fll(struct arizona_fll *fll, |
8350 | try_wait_for_completion(&fll->ok); |
8351 | |
8352 | regmap_update_bits(arizona->regmap, fll->base + 1, |
8353 | + ARIZONA_FLL1_FREERUN, 0); |
8354 | + regmap_update_bits(arizona->regmap, fll->base + 1, |
8355 | ARIZONA_FLL1_ENA, ARIZONA_FLL1_ENA); |
8356 | if (fll->ref_src >= 0 && fll->sync_src >= 0 && |
8357 | fll->ref_src != fll->sync_src) |
8358 | @@ -1543,6 +1545,8 @@ static void arizona_disable_fll(struct arizona_fll *fll) |
8359 | struct arizona *arizona = fll->arizona; |
8360 | bool change; |
8361 | |
8362 | + regmap_update_bits(arizona->regmap, fll->base + 1, |
8363 | + ARIZONA_FLL1_FREERUN, ARIZONA_FLL1_FREERUN); |
8364 | regmap_update_bits_check(arizona->regmap, fll->base + 1, |
8365 | ARIZONA_FLL1_ENA, 0, &change); |
8366 | regmap_update_bits(arizona->regmap, fll->base + 0x11, |
8367 | diff --git a/sound/soc/codecs/cs42l52.h b/sound/soc/codecs/cs42l52.h |
8368 | index 4277012c..a935d738 100644 |
8369 | --- a/sound/soc/codecs/cs42l52.h |
8370 | +++ b/sound/soc/codecs/cs42l52.h |
8371 | @@ -179,7 +179,7 @@ |
8372 | #define CS42L52_MICB_CTL 0x11 |
8373 | #define CS42L52_MIC_CTL_MIC_SEL_MASK 0xBF |
8374 | #define CS42L52_MIC_CTL_MIC_SEL_SHIFT 6 |
8375 | -#define CS42L52_MIC_CTL_TYPE_MASK 0xDF |
8376 | +#define CS42L52_MIC_CTL_TYPE_MASK 0x20 |
8377 | #define CS42L52_MIC_CTL_TYPE_SHIFT 5 |
8378 | |
8379 | |
8380 | diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c |
8381 | index bbd64384..0048ce5b 100644 |
8382 | --- a/sound/soc/codecs/wm5110.c |
8383 | +++ b/sound/soc/codecs/wm5110.c |
8384 | @@ -37,6 +37,47 @@ struct wm5110_priv { |
8385 | struct arizona_fll fll[2]; |
8386 | }; |
8387 | |
8388 | +static const struct reg_default wm5110_sysclk_revd_patch[] = { |
8389 | + { 0x3093, 0x1001 }, |
8390 | + { 0x30E3, 0x1301 }, |
8391 | + { 0x3133, 0x1201 }, |
8392 | + { 0x3183, 0x1501 }, |
8393 | + { 0x31D3, 0x1401 }, |
8394 | +}; |
8395 | + |
8396 | +static int wm5110_sysclk_ev(struct snd_soc_dapm_widget *w, |
8397 | + struct snd_kcontrol *kcontrol, int event) |
8398 | +{ |
8399 | + struct snd_soc_codec *codec = w->codec; |
8400 | + struct arizona *arizona = dev_get_drvdata(codec->dev->parent); |
8401 | + struct regmap *regmap = codec->control_data; |
8402 | + const struct reg_default *patch = NULL; |
8403 | + int i, patch_size; |
8404 | + |
8405 | + switch (arizona->rev) { |
8406 | + case 3: |
8407 | + patch = wm5110_sysclk_revd_patch; |
8408 | + patch_size = ARRAY_SIZE(wm5110_sysclk_revd_patch); |
8409 | + break; |
8410 | + default: |
8411 | + return 0; |
8412 | + } |
8413 | + |
8414 | + switch (event) { |
8415 | + case SND_SOC_DAPM_POST_PMU: |
8416 | + if (patch) |
8417 | + for (i = 0; i < patch_size; i++) |
8418 | + regmap_write(regmap, patch[i].reg, |
8419 | + patch[i].def); |
8420 | + break; |
8421 | + |
8422 | + default: |
8423 | + break; |
8424 | + } |
8425 | + |
8426 | + return 0; |
8427 | +} |
8428 | + |
8429 | static DECLARE_TLV_DB_SCALE(ana_tlv, 0, 100, 0); |
8430 | static DECLARE_TLV_DB_SCALE(eq_tlv, -1200, 100, 0); |
8431 | static DECLARE_TLV_DB_SCALE(digital_tlv, -6400, 50, 0); |
8432 | @@ -400,7 +441,7 @@ static const struct snd_kcontrol_new wm5110_aec_loopback_mux = |
8433 | |
8434 | static const struct snd_soc_dapm_widget wm5110_dapm_widgets[] = { |
8435 | SND_SOC_DAPM_SUPPLY("SYSCLK", ARIZONA_SYSTEM_CLOCK_1, ARIZONA_SYSCLK_ENA_SHIFT, |
8436 | - 0, NULL, 0), |
8437 | + 0, wm5110_sysclk_ev, SND_SOC_DAPM_POST_PMU), |
8438 | SND_SOC_DAPM_SUPPLY("ASYNCCLK", ARIZONA_ASYNC_CLOCK_1, |
8439 | ARIZONA_ASYNC_CLK_ENA_SHIFT, 0, NULL, 0), |
8440 | SND_SOC_DAPM_SUPPLY("OPCLK", ARIZONA_OUTPUT_SYSTEM_CLOCK, |
8441 | diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c |
8442 | index 11d80f3b..871f8518 100644 |
8443 | --- a/sound/soc/codecs/wm8962.c |
8444 | +++ b/sound/soc/codecs/wm8962.c |
8445 | @@ -3722,6 +3722,8 @@ static int wm8962_i2c_probe(struct i2c_client *i2c, |
8446 | if (ret < 0) |
8447 | goto err_enable; |
8448 | |
8449 | + regcache_cache_only(wm8962->regmap, true); |
8450 | + |
8451 | /* The drivers should power up as needed */ |
8452 | regulator_bulk_disable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies); |
8453 | |
8454 | diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c |
8455 | index b38f3506..60b6b593 100644 |
8456 | --- a/sound/soc/codecs/wm_adsp.c |
8457 | +++ b/sound/soc/codecs/wm_adsp.c |
8458 | @@ -1062,6 +1062,7 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp) |
8459 | if (i + 1 < algs) { |
8460 | region->len = be32_to_cpu(adsp1_alg[i + 1].dm); |
8461 | region->len -= be32_to_cpu(adsp1_alg[i].dm); |
8462 | + region->len *= 4; |
8463 | wm_adsp_create_control(dsp, region); |
8464 | } else { |
8465 | adsp_warn(dsp, "Missing length info for region DM with ID %x\n", |
8466 | @@ -1079,6 +1080,7 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp) |
8467 | if (i + 1 < algs) { |
8468 | region->len = be32_to_cpu(adsp1_alg[i + 1].zm); |
8469 | region->len -= be32_to_cpu(adsp1_alg[i].zm); |
8470 | + region->len *= 4; |
8471 | wm_adsp_create_control(dsp, region); |
8472 | } else { |
8473 | adsp_warn(dsp, "Missing length info for region ZM with ID %x\n", |
8474 | @@ -1108,6 +1110,7 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp) |
8475 | if (i + 1 < algs) { |
8476 | region->len = be32_to_cpu(adsp2_alg[i + 1].xm); |
8477 | region->len -= be32_to_cpu(adsp2_alg[i].xm); |
8478 | + region->len *= 4; |
8479 | wm_adsp_create_control(dsp, region); |
8480 | } else { |
8481 | adsp_warn(dsp, "Missing length info for region XM with ID %x\n", |
8482 | @@ -1125,6 +1128,7 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp) |
8483 | if (i + 1 < algs) { |
8484 | region->len = be32_to_cpu(adsp2_alg[i + 1].ym); |
8485 | region->len -= be32_to_cpu(adsp2_alg[i].ym); |
8486 | + region->len *= 4; |
8487 | wm_adsp_create_control(dsp, region); |
8488 | } else { |
8489 | adsp_warn(dsp, "Missing length info for region YM with ID %x\n", |
8490 | @@ -1142,6 +1146,7 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp) |
8491 | if (i + 1 < algs) { |
8492 | region->len = be32_to_cpu(adsp2_alg[i + 1].zm); |
8493 | region->len -= be32_to_cpu(adsp2_alg[i].zm); |
8494 | + region->len *= 4; |
8495 | wm_adsp_create_control(dsp, region); |
8496 | } else { |
8497 | adsp_warn(dsp, "Missing length info for region ZM with ID %x\n", |
8498 | diff --git a/sound/soc/fsl/imx-pcm-fiq.c b/sound/soc/fsl/imx-pcm-fiq.c |
8499 | index 34043c55..2fc872b2 100644 |
8500 | --- a/sound/soc/fsl/imx-pcm-fiq.c |
8501 | +++ b/sound/soc/fsl/imx-pcm-fiq.c |
8502 | @@ -44,7 +44,8 @@ struct imx_pcm_runtime_data { |
8503 | struct hrtimer hrt; |
8504 | int poll_time_ns; |
8505 | struct snd_pcm_substream *substream; |
8506 | - atomic_t running; |
8507 | + atomic_t playing; |
8508 | + atomic_t capturing; |
8509 | }; |
8510 | |
8511 | static enum hrtimer_restart snd_hrtimer_callback(struct hrtimer *hrt) |
8512 | @@ -56,7 +57,7 @@ static enum hrtimer_restart snd_hrtimer_callback(struct hrtimer *hrt) |
8513 | struct pt_regs regs; |
8514 | unsigned long delta; |
8515 | |
8516 | - if (!atomic_read(&iprtd->running)) |
8517 | + if (!atomic_read(&iprtd->playing) && !atomic_read(&iprtd->capturing)) |
8518 | return HRTIMER_NORESTART; |
8519 | |
8520 | get_fiq_regs(®s); |
8521 | @@ -124,7 +125,6 @@ static int snd_imx_pcm_prepare(struct snd_pcm_substream *substream) |
8522 | return 0; |
8523 | } |
8524 | |
8525 | -static int fiq_enable; |
8526 | static int imx_pcm_fiq; |
8527 | |
8528 | static int snd_imx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) |
8529 | @@ -136,23 +136,27 @@ static int snd_imx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) |
8530 | case SNDRV_PCM_TRIGGER_START: |
8531 | case SNDRV_PCM_TRIGGER_RESUME: |
8532 | case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: |
8533 | - atomic_set(&iprtd->running, 1); |
8534 | + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) |
8535 | + atomic_set(&iprtd->playing, 1); |
8536 | + else |
8537 | + atomic_set(&iprtd->capturing, 1); |
8538 | hrtimer_start(&iprtd->hrt, ns_to_ktime(iprtd->poll_time_ns), |
8539 | HRTIMER_MODE_REL); |
8540 | - if (++fiq_enable == 1) |
8541 | - enable_fiq(imx_pcm_fiq); |
8542 | - |
8543 | + enable_fiq(imx_pcm_fiq); |
8544 | break; |
8545 | |
8546 | case SNDRV_PCM_TRIGGER_STOP: |
8547 | case SNDRV_PCM_TRIGGER_SUSPEND: |
8548 | case SNDRV_PCM_TRIGGER_PAUSE_PUSH: |
8549 | - atomic_set(&iprtd->running, 0); |
8550 | - |
8551 | - if (--fiq_enable == 0) |
8552 | + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) |
8553 | + atomic_set(&iprtd->playing, 0); |
8554 | + else |
8555 | + atomic_set(&iprtd->capturing, 0); |
8556 | + if (!atomic_read(&iprtd->playing) && |
8557 | + !atomic_read(&iprtd->capturing)) |
8558 | disable_fiq(imx_pcm_fiq); |
8559 | - |
8560 | break; |
8561 | + |
8562 | default: |
8563 | return -EINVAL; |
8564 | } |
8565 | @@ -200,7 +204,8 @@ static int snd_imx_open(struct snd_pcm_substream *substream) |
8566 | |
8567 | iprtd->substream = substream; |
8568 | |
8569 | - atomic_set(&iprtd->running, 0); |
8570 | + atomic_set(&iprtd->playing, 0); |
8571 | + atomic_set(&iprtd->capturing, 0); |
8572 | hrtimer_init(&iprtd->hrt, CLOCK_MONOTONIC, HRTIMER_MODE_REL); |
8573 | iprtd->hrt.function = snd_hrtimer_callback; |
8574 | |
8575 | diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c |
8576 | index 0a193281..78f4c92e 100644 |
8577 | --- a/tools/perf/ui/hist.c |
8578 | +++ b/tools/perf/ui/hist.c |
8579 | @@ -117,7 +117,7 @@ static int hpp__color_##_type(struct perf_hpp_fmt *fmt __maybe_unused, \ |
8580 | struct perf_hpp *hpp, struct hist_entry *he) \ |
8581 | { \ |
8582 | return __hpp__fmt(hpp, he, he_get_##_field, " %6.2f%%", \ |
8583 | - (hpp_snprint_fn)percent_color_snprintf, true); \ |
8584 | + percent_color_snprintf, true); \ |
8585 | } |
8586 | |
8587 | #define __HPP_ENTRY_PERCENT_FN(_type, _field) \ |
8588 | diff --git a/tools/perf/util/color.c b/tools/perf/util/color.c |
8589 | index 11e46da1..66e44a50 100644 |
8590 | --- a/tools/perf/util/color.c |
8591 | +++ b/tools/perf/util/color.c |
8592 | @@ -318,8 +318,15 @@ int percent_color_fprintf(FILE *fp, const char *fmt, double percent) |
8593 | return r; |
8594 | } |
8595 | |
8596 | -int percent_color_snprintf(char *bf, size_t size, const char *fmt, double percent) |
8597 | +int percent_color_snprintf(char *bf, size_t size, const char *fmt, ...) |
8598 | { |
8599 | - const char *color = get_percent_color(percent); |
8600 | + va_list args; |
8601 | + double percent; |
8602 | + const char *color; |
8603 | + |
8604 | + va_start(args, fmt); |
8605 | + percent = va_arg(args, double); |
8606 | + va_end(args); |
8607 | + color = get_percent_color(percent); |
8608 | return color_snprintf(bf, size, color, fmt, percent); |
8609 | } |
8610 | diff --git a/tools/perf/util/color.h b/tools/perf/util/color.h |
8611 | index dea082b7..fced3840 100644 |
8612 | --- a/tools/perf/util/color.h |
8613 | +++ b/tools/perf/util/color.h |
8614 | @@ -39,7 +39,7 @@ int color_fprintf(FILE *fp, const char *color, const char *fmt, ...); |
8615 | int color_snprintf(char *bf, size_t size, const char *color, const char *fmt, ...); |
8616 | int color_fprintf_ln(FILE *fp, const char *color, const char *fmt, ...); |
8617 | int color_fwrite_lines(FILE *fp, const char *color, size_t count, const char *buf); |
8618 | -int percent_color_snprintf(char *bf, size_t size, const char *fmt, double percent); |
8619 | +int percent_color_snprintf(char *bf, size_t size, const char *fmt, ...); |
8620 | int percent_color_fprintf(FILE *fp, const char *fmt, double percent); |
8621 | const char *get_percent_color(double percent); |
8622 | |
8623 | diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c |
8624 | index 49096ea5..1ae1b082 100644 |
8625 | --- a/tools/perf/util/event.c |
8626 | +++ b/tools/perf/util/event.c |
8627 | @@ -212,8 +212,10 @@ static int perf_event__synthesize_mmap_events(struct perf_tool *tool, |
8628 | &event->mmap.start, &event->mmap.len, prot, |
8629 | &event->mmap.pgoff, |
8630 | execname); |
8631 | - |
8632 | - if (n != 5) |
8633 | + /* |
8634 | + * Anon maps don't have the execname. |
8635 | + */ |
8636 | + if (n < 4) |
8637 | continue; |
8638 | |
8639 | if (prot[2] != 'x') |