Annotation of /trunk/kernel-alx-legacy/patches-4.9/0198-4.9.99-all-fixes.patch
Parent Directory | Revision Log
Revision 3608 -
(hide annotations)
(download)
Fri Aug 14 07:34:29 2020 UTC (4 years, 1 month ago) by niro
File size: 87167 byte(s)
Fri Aug 14 07:34:29 2020 UTC (4 years, 1 month ago) by niro
File size: 87167 byte(s)
-added kerenl-alx-legacy pkg
1 | niro | 3608 | diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt |
2 | index 1f5eab4ef88f..e46c14fac9da 100644 | ||
3 | --- a/Documentation/virtual/kvm/api.txt | ||
4 | +++ b/Documentation/virtual/kvm/api.txt | ||
5 | @@ -2118,6 +2118,9 @@ ARM 32-bit VFP control registers have the following id bit patterns: | ||
6 | ARM 64-bit FP registers have the following id bit patterns: | ||
7 | 0x4030 0000 0012 0 <regno:12> | ||
8 | |||
9 | +ARM firmware pseudo-registers have the following bit pattern: | ||
10 | + 0x4030 0000 0014 <regno:16> | ||
11 | + | ||
12 | |||
13 | arm64 registers are mapped using the lower 32 bits. The upper 16 of | ||
14 | that is the register group type, or coprocessor number: | ||
15 | @@ -2134,6 +2137,9 @@ arm64 CCSIDR registers are demultiplexed by CSSELR value: | ||
16 | arm64 system registers have the following id bit patterns: | ||
17 | 0x6030 0000 0013 <op0:2> <op1:3> <crn:4> <crm:4> <op2:3> | ||
18 | |||
19 | +arm64 firmware pseudo-registers have the following bit pattern: | ||
20 | + 0x6030 0000 0014 <regno:16> | ||
21 | + | ||
22 | |||
23 | MIPS registers are mapped using the lower 32 bits. The upper 16 of that is | ||
24 | the register group type: | ||
25 | @@ -2656,7 +2662,8 @@ Possible features: | ||
26 | and execute guest code when KVM_RUN is called. | ||
27 | - KVM_ARM_VCPU_EL1_32BIT: Starts the CPU in a 32bit mode. | ||
28 | Depends on KVM_CAP_ARM_EL1_32BIT (arm64 only). | ||
29 | - - KVM_ARM_VCPU_PSCI_0_2: Emulate PSCI v0.2 for the CPU. | ||
30 | + - KVM_ARM_VCPU_PSCI_0_2: Emulate PSCI v0.2 (or a future revision | ||
31 | + backward compatible with v0.2) for the CPU. | ||
32 | Depends on KVM_CAP_ARM_PSCI_0_2. | ||
33 | - KVM_ARM_VCPU_PMU_V3: Emulate PMUv3 for the CPU. | ||
34 | Depends on KVM_CAP_ARM_PMU_V3. | ||
35 | diff --git a/Documentation/virtual/kvm/arm/psci.txt b/Documentation/virtual/kvm/arm/psci.txt | ||
36 | new file mode 100644 | ||
37 | index 000000000000..aafdab887b04 | ||
38 | --- /dev/null | ||
39 | +++ b/Documentation/virtual/kvm/arm/psci.txt | ||
40 | @@ -0,0 +1,30 @@ | ||
41 | +KVM implements the PSCI (Power State Coordination Interface) | ||
42 | +specification in order to provide services such as CPU on/off, reset | ||
43 | +and power-off to the guest. | ||
44 | + | ||
45 | +The PSCI specification is regularly updated to provide new features, | ||
46 | +and KVM implements these updates if they make sense from a virtualization | ||
47 | +point of view. | ||
48 | + | ||
49 | +This means that a guest booted on two different versions of KVM can | ||
50 | +observe two different "firmware" revisions. This could cause issues if | ||
51 | +a given guest is tied to a particular PSCI revision (unlikely), or if | ||
52 | +a migration causes a different PSCI version to be exposed out of the | ||
53 | +blue to an unsuspecting guest. | ||
54 | + | ||
55 | +In order to remedy this situation, KVM exposes a set of "firmware | ||
56 | +pseudo-registers" that can be manipulated using the GET/SET_ONE_REG | ||
57 | +interface. These registers can be saved/restored by userspace, and set | ||
58 | +to a convenient value if required. | ||
59 | + | ||
60 | +The following register is defined: | ||
61 | + | ||
62 | +* KVM_REG_ARM_PSCI_VERSION: | ||
63 | + | ||
64 | + - Only valid if the vcpu has the KVM_ARM_VCPU_PSCI_0_2 feature set | ||
65 | + (and thus has already been initialized) | ||
66 | + - Returns the current PSCI version on GET_ONE_REG (defaulting to the | ||
67 | + highest PSCI version implemented by KVM and compatible with v0.2) | ||
68 | + - Allows any PSCI version implemented by KVM and compatible with | ||
69 | + v0.2 to be set with SET_ONE_REG | ||
70 | + - Affects the whole VM (even if the register view is per-vcpu) | ||
71 | diff --git a/Makefile b/Makefile | ||
72 | index 96d770488ae6..d51e99f4a987 100644 | ||
73 | --- a/Makefile | ||
74 | +++ b/Makefile | ||
75 | @@ -1,6 +1,6 @@ | ||
76 | VERSION = 4 | ||
77 | PATCHLEVEL = 9 | ||
78 | -SUBLEVEL = 98 | ||
79 | +SUBLEVEL = 99 | ||
80 | EXTRAVERSION = | ||
81 | NAME = Roaring Lionus | ||
82 | |||
83 | diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h | ||
84 | index 9fe1043e72d2..f4dab20ac9f3 100644 | ||
85 | --- a/arch/arm/include/asm/kvm_host.h | ||
86 | +++ b/arch/arm/include/asm/kvm_host.h | ||
87 | @@ -78,6 +78,9 @@ struct kvm_arch { | ||
88 | /* Interrupt controller */ | ||
89 | struct vgic_dist vgic; | ||
90 | int max_vcpus; | ||
91 | + | ||
92 | + /* Mandated version of PSCI */ | ||
93 | + u32 psci_version; | ||
94 | }; | ||
95 | |||
96 | #define KVM_NR_MEM_OBJS 40 | ||
97 | diff --git a/arch/arm/include/uapi/asm/kvm.h b/arch/arm/include/uapi/asm/kvm.h | ||
98 | index b38c10c73579..0b8cf31d8416 100644 | ||
99 | --- a/arch/arm/include/uapi/asm/kvm.h | ||
100 | +++ b/arch/arm/include/uapi/asm/kvm.h | ||
101 | @@ -173,6 +173,12 @@ struct kvm_arch_memory_slot { | ||
102 | #define KVM_REG_ARM_VFP_FPINST 0x1009 | ||
103 | #define KVM_REG_ARM_VFP_FPINST2 0x100A | ||
104 | |||
105 | +/* KVM-as-firmware specific pseudo-registers */ | ||
106 | +#define KVM_REG_ARM_FW (0x0014 << KVM_REG_ARM_COPROC_SHIFT) | ||
107 | +#define KVM_REG_ARM_FW_REG(r) (KVM_REG_ARM | KVM_REG_SIZE_U64 | \ | ||
108 | + KVM_REG_ARM_FW | ((r) & 0xffff)) | ||
109 | +#define KVM_REG_ARM_PSCI_VERSION KVM_REG_ARM_FW_REG(0) | ||
110 | + | ||
111 | /* Device Control API: ARM VGIC */ | ||
112 | #define KVM_DEV_ARM_VGIC_GRP_ADDR 0 | ||
113 | #define KVM_DEV_ARM_VGIC_GRP_DIST_REGS 1 | ||
114 | diff --git a/arch/arm/kvm/guest.c b/arch/arm/kvm/guest.c | ||
115 | index 9aca92074f85..630117d2e8bd 100644 | ||
116 | --- a/arch/arm/kvm/guest.c | ||
117 | +++ b/arch/arm/kvm/guest.c | ||
118 | @@ -22,6 +22,7 @@ | ||
119 | #include <linux/module.h> | ||
120 | #include <linux/vmalloc.h> | ||
121 | #include <linux/fs.h> | ||
122 | +#include <kvm/arm_psci.h> | ||
123 | #include <asm/cputype.h> | ||
124 | #include <asm/uaccess.h> | ||
125 | #include <asm/kvm.h> | ||
126 | @@ -176,6 +177,7 @@ static unsigned long num_core_regs(void) | ||
127 | unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu) | ||
128 | { | ||
129 | return num_core_regs() + kvm_arm_num_coproc_regs(vcpu) | ||
130 | + + kvm_arm_get_fw_num_regs(vcpu) | ||
131 | + NUM_TIMER_REGS; | ||
132 | } | ||
133 | |||
134 | @@ -196,6 +198,11 @@ int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindices) | ||
135 | uindices++; | ||
136 | } | ||
137 | |||
138 | + ret = kvm_arm_copy_fw_reg_indices(vcpu, uindices); | ||
139 | + if (ret) | ||
140 | + return ret; | ||
141 | + uindices += kvm_arm_get_fw_num_regs(vcpu); | ||
142 | + | ||
143 | ret = copy_timer_indices(vcpu, uindices); | ||
144 | if (ret) | ||
145 | return ret; | ||
146 | @@ -214,6 +221,9 @@ int kvm_arm_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) | ||
147 | if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_CORE) | ||
148 | return get_core_reg(vcpu, reg); | ||
149 | |||
150 | + if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_FW) | ||
151 | + return kvm_arm_get_fw_reg(vcpu, reg); | ||
152 | + | ||
153 | if (is_timer_reg(reg->id)) | ||
154 | return get_timer_reg(vcpu, reg); | ||
155 | |||
156 | @@ -230,6 +240,9 @@ int kvm_arm_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) | ||
157 | if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_CORE) | ||
158 | return set_core_reg(vcpu, reg); | ||
159 | |||
160 | + if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_FW) | ||
161 | + return kvm_arm_set_fw_reg(vcpu, reg); | ||
162 | + | ||
163 | if (is_timer_reg(reg->id)) | ||
164 | return set_timer_reg(vcpu, reg); | ||
165 | |||
166 | diff --git a/arch/arm/kvm/psci.c b/arch/arm/kvm/psci.c | ||
167 | index 3d962257c166..8a9c654f4f87 100644 | ||
168 | --- a/arch/arm/kvm/psci.c | ||
169 | +++ b/arch/arm/kvm/psci.c | ||
170 | @@ -18,6 +18,7 @@ | ||
171 | #include <linux/arm-smccc.h> | ||
172 | #include <linux/preempt.h> | ||
173 | #include <linux/kvm_host.h> | ||
174 | +#include <linux/uaccess.h> | ||
175 | #include <linux/wait.h> | ||
176 | |||
177 | #include <asm/cputype.h> | ||
178 | @@ -425,3 +426,62 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu) | ||
179 | smccc_set_retval(vcpu, val, 0, 0, 0); | ||
180 | return 1; | ||
181 | } | ||
182 | + | ||
183 | +int kvm_arm_get_fw_num_regs(struct kvm_vcpu *vcpu) | ||
184 | +{ | ||
185 | + return 1; /* PSCI version */ | ||
186 | +} | ||
187 | + | ||
188 | +int kvm_arm_copy_fw_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindices) | ||
189 | +{ | ||
190 | + if (put_user(KVM_REG_ARM_PSCI_VERSION, uindices)) | ||
191 | + return -EFAULT; | ||
192 | + | ||
193 | + return 0; | ||
194 | +} | ||
195 | + | ||
196 | +int kvm_arm_get_fw_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) | ||
197 | +{ | ||
198 | + if (reg->id == KVM_REG_ARM_PSCI_VERSION) { | ||
199 | + void __user *uaddr = (void __user *)(long)reg->addr; | ||
200 | + u64 val; | ||
201 | + | ||
202 | + val = kvm_psci_version(vcpu, vcpu->kvm); | ||
203 | + if (copy_to_user(uaddr, &val, KVM_REG_SIZE(reg->id))) | ||
204 | + return -EFAULT; | ||
205 | + | ||
206 | + return 0; | ||
207 | + } | ||
208 | + | ||
209 | + return -EINVAL; | ||
210 | +} | ||
211 | + | ||
212 | +int kvm_arm_set_fw_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) | ||
213 | +{ | ||
214 | + if (reg->id == KVM_REG_ARM_PSCI_VERSION) { | ||
215 | + void __user *uaddr = (void __user *)(long)reg->addr; | ||
216 | + bool wants_02; | ||
217 | + u64 val; | ||
218 | + | ||
219 | + if (copy_from_user(&val, uaddr, KVM_REG_SIZE(reg->id))) | ||
220 | + return -EFAULT; | ||
221 | + | ||
222 | + wants_02 = test_bit(KVM_ARM_VCPU_PSCI_0_2, vcpu->arch.features); | ||
223 | + | ||
224 | + switch (val) { | ||
225 | + case KVM_ARM_PSCI_0_1: | ||
226 | + if (wants_02) | ||
227 | + return -EINVAL; | ||
228 | + vcpu->kvm->arch.psci_version = val; | ||
229 | + return 0; | ||
230 | + case KVM_ARM_PSCI_0_2: | ||
231 | + case KVM_ARM_PSCI_1_0: | ||
232 | + if (!wants_02) | ||
233 | + return -EINVAL; | ||
234 | + vcpu->kvm->arch.psci_version = val; | ||
235 | + return 0; | ||
236 | + } | ||
237 | + } | ||
238 | + | ||
239 | + return -EINVAL; | ||
240 | +} | ||
241 | diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h | ||
242 | index 37d56e85036e..0a33ea304e63 100644 | ||
243 | --- a/arch/arm64/include/asm/kvm_host.h | ||
244 | +++ b/arch/arm64/include/asm/kvm_host.h | ||
245 | @@ -73,6 +73,9 @@ struct kvm_arch { | ||
246 | |||
247 | /* Timer */ | ||
248 | struct arch_timer_kvm timer; | ||
249 | + | ||
250 | + /* Mandated version of PSCI */ | ||
251 | + u32 psci_version; | ||
252 | }; | ||
253 | |||
254 | #define KVM_NR_MEM_OBJS 40 | ||
255 | diff --git a/arch/arm64/include/uapi/asm/kvm.h b/arch/arm64/include/uapi/asm/kvm.h | ||
256 | index 3051f86a9b5f..702de7a2b024 100644 | ||
257 | --- a/arch/arm64/include/uapi/asm/kvm.h | ||
258 | +++ b/arch/arm64/include/uapi/asm/kvm.h | ||
259 | @@ -195,6 +195,12 @@ struct kvm_arch_memory_slot { | ||
260 | #define KVM_REG_ARM_TIMER_CNT ARM64_SYS_REG(3, 3, 14, 3, 2) | ||
261 | #define KVM_REG_ARM_TIMER_CVAL ARM64_SYS_REG(3, 3, 14, 0, 2) | ||
262 | |||
263 | +/* KVM-as-firmware specific pseudo-registers */ | ||
264 | +#define KVM_REG_ARM_FW (0x0014 << KVM_REG_ARM_COPROC_SHIFT) | ||
265 | +#define KVM_REG_ARM_FW_REG(r) (KVM_REG_ARM64 | KVM_REG_SIZE_U64 | \ | ||
266 | + KVM_REG_ARM_FW | ((r) & 0xffff)) | ||
267 | +#define KVM_REG_ARM_PSCI_VERSION KVM_REG_ARM_FW_REG(0) | ||
268 | + | ||
269 | /* Device Control API: ARM VGIC */ | ||
270 | #define KVM_DEV_ARM_VGIC_GRP_ADDR 0 | ||
271 | #define KVM_DEV_ARM_VGIC_GRP_DIST_REGS 1 | ||
272 | diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c | ||
273 | index 3f9e15722473..d3e0a2ffb383 100644 | ||
274 | --- a/arch/arm64/kvm/guest.c | ||
275 | +++ b/arch/arm64/kvm/guest.c | ||
276 | @@ -25,6 +25,7 @@ | ||
277 | #include <linux/module.h> | ||
278 | #include <linux/vmalloc.h> | ||
279 | #include <linux/fs.h> | ||
280 | +#include <kvm/arm_psci.h> | ||
281 | #include <asm/cputype.h> | ||
282 | #include <asm/uaccess.h> | ||
283 | #include <asm/kvm.h> | ||
284 | @@ -205,7 +206,7 @@ static int get_timer_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) | ||
285 | unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu) | ||
286 | { | ||
287 | return num_core_regs() + kvm_arm_num_sys_reg_descs(vcpu) | ||
288 | - + NUM_TIMER_REGS; | ||
289 | + + kvm_arm_get_fw_num_regs(vcpu) + NUM_TIMER_REGS; | ||
290 | } | ||
291 | |||
292 | /** | ||
293 | @@ -225,6 +226,11 @@ int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindices) | ||
294 | uindices++; | ||
295 | } | ||
296 | |||
297 | + ret = kvm_arm_copy_fw_reg_indices(vcpu, uindices); | ||
298 | + if (ret) | ||
299 | + return ret; | ||
300 | + uindices += kvm_arm_get_fw_num_regs(vcpu); | ||
301 | + | ||
302 | ret = copy_timer_indices(vcpu, uindices); | ||
303 | if (ret) | ||
304 | return ret; | ||
305 | @@ -243,6 +249,9 @@ int kvm_arm_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) | ||
306 | if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_CORE) | ||
307 | return get_core_reg(vcpu, reg); | ||
308 | |||
309 | + if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_FW) | ||
310 | + return kvm_arm_get_fw_reg(vcpu, reg); | ||
311 | + | ||
312 | if (is_timer_reg(reg->id)) | ||
313 | return get_timer_reg(vcpu, reg); | ||
314 | |||
315 | @@ -259,6 +268,9 @@ int kvm_arm_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) | ||
316 | if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_CORE) | ||
317 | return set_core_reg(vcpu, reg); | ||
318 | |||
319 | + if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_FW) | ||
320 | + return kvm_arm_set_fw_reg(vcpu, reg); | ||
321 | + | ||
322 | if (is_timer_reg(reg->id)) | ||
323 | return set_timer_reg(vcpu, reg); | ||
324 | |||
325 | diff --git a/arch/s390/include/asm/facility.h b/arch/s390/include/asm/facility.h | ||
326 | index 7a8a1457dbb8..5811e7849a2e 100644 | ||
327 | --- a/arch/s390/include/asm/facility.h | ||
328 | +++ b/arch/s390/include/asm/facility.h | ||
329 | @@ -15,7 +15,7 @@ | ||
330 | #include <linux/preempt.h> | ||
331 | #include <asm/lowcore.h> | ||
332 | |||
333 | -#define MAX_FACILITY_BIT (256*8) /* stfle_fac_list has 256 bytes */ | ||
334 | +#define MAX_FACILITY_BIT (sizeof(((struct lowcore *)0)->stfle_fac_list) * 8) | ||
335 | |||
336 | static inline void __set_facility(unsigned long nr, void *facilities) | ||
337 | { | ||
338 | diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c | ||
339 | index 42c060c7ae15..7c71722be395 100644 | ||
340 | --- a/drivers/crypto/talitos.c | ||
341 | +++ b/drivers/crypto/talitos.c | ||
342 | @@ -1116,10 +1116,10 @@ static int sg_to_link_tbl_offset(struct scatterlist *sg, int sg_count, | ||
343 | return count; | ||
344 | } | ||
345 | |||
346 | -int talitos_sg_map(struct device *dev, struct scatterlist *src, | ||
347 | - unsigned int len, struct talitos_edesc *edesc, | ||
348 | - struct talitos_ptr *ptr, | ||
349 | - int sg_count, unsigned int offset, int tbl_off) | ||
350 | +static int talitos_sg_map_ext(struct device *dev, struct scatterlist *src, | ||
351 | + unsigned int len, struct talitos_edesc *edesc, | ||
352 | + struct talitos_ptr *ptr, int sg_count, | ||
353 | + unsigned int offset, int tbl_off, int elen) | ||
354 | { | ||
355 | struct talitos_private *priv = dev_get_drvdata(dev); | ||
356 | bool is_sec1 = has_ftr_sec1(priv); | ||
357 | @@ -1130,7 +1130,7 @@ int talitos_sg_map(struct device *dev, struct scatterlist *src, | ||
358 | } | ||
359 | |||
360 | to_talitos_ptr_len(ptr, len, is_sec1); | ||
361 | - to_talitos_ptr_ext_set(ptr, 0, is_sec1); | ||
362 | + to_talitos_ptr_ext_set(ptr, elen, is_sec1); | ||
363 | |||
364 | if (sg_count == 1) { | ||
365 | to_talitos_ptr(ptr, sg_dma_address(src) + offset, is_sec1); | ||
366 | @@ -1140,7 +1140,7 @@ int talitos_sg_map(struct device *dev, struct scatterlist *src, | ||
367 | to_talitos_ptr(ptr, edesc->dma_link_tbl + offset, is_sec1); | ||
368 | return sg_count; | ||
369 | } | ||
370 | - sg_count = sg_to_link_tbl_offset(src, sg_count, offset, len, | ||
371 | + sg_count = sg_to_link_tbl_offset(src, sg_count, offset, len + elen, | ||
372 | &edesc->link_tbl[tbl_off]); | ||
373 | if (sg_count == 1) { | ||
374 | /* Only one segment now, so no link tbl needed*/ | ||
375 | @@ -1154,6 +1154,15 @@ int talitos_sg_map(struct device *dev, struct scatterlist *src, | ||
376 | return sg_count; | ||
377 | } | ||
378 | |||
379 | +static int talitos_sg_map(struct device *dev, struct scatterlist *src, | ||
380 | + unsigned int len, struct talitos_edesc *edesc, | ||
381 | + struct talitos_ptr *ptr, int sg_count, | ||
382 | + unsigned int offset, int tbl_off) | ||
383 | +{ | ||
384 | + return talitos_sg_map_ext(dev, src, len, edesc, ptr, sg_count, offset, | ||
385 | + tbl_off, 0); | ||
386 | +} | ||
387 | + | ||
388 | /* | ||
389 | * fill in and submit ipsec_esp descriptor | ||
390 | */ | ||
391 | @@ -1171,7 +1180,7 @@ static int ipsec_esp(struct talitos_edesc *edesc, struct aead_request *areq, | ||
392 | unsigned int ivsize = crypto_aead_ivsize(aead); | ||
393 | int tbl_off = 0; | ||
394 | int sg_count, ret; | ||
395 | - int sg_link_tbl_len; | ||
396 | + int elen = 0; | ||
397 | bool sync_needed = false; | ||
398 | struct talitos_private *priv = dev_get_drvdata(dev); | ||
399 | bool is_sec1 = has_ftr_sec1(priv); | ||
400 | @@ -1225,20 +1234,12 @@ static int ipsec_esp(struct talitos_edesc *edesc, struct aead_request *areq, | ||
401 | * extent is bytes of HMAC postpended to ciphertext, | ||
402 | * typically 12 for ipsec | ||
403 | */ | ||
404 | - to_talitos_ptr_len(&desc->ptr[4], cryptlen, is_sec1); | ||
405 | - to_talitos_ptr_ext_set(&desc->ptr[4], 0, is_sec1); | ||
406 | - | ||
407 | - sg_link_tbl_len = cryptlen; | ||
408 | - | ||
409 | - if (desc->hdr & DESC_HDR_TYPE_IPSEC_ESP) { | ||
410 | - to_talitos_ptr_ext_set(&desc->ptr[4], authsize, is_sec1); | ||
411 | - | ||
412 | - if (edesc->desc.hdr & DESC_HDR_MODE1_MDEU_CICV) | ||
413 | - sg_link_tbl_len += authsize; | ||
414 | - } | ||
415 | + if ((desc->hdr & DESC_HDR_TYPE_IPSEC_ESP) && | ||
416 | + (desc->hdr & DESC_HDR_MODE1_MDEU_CICV)) | ||
417 | + elen = authsize; | ||
418 | |||
419 | - ret = talitos_sg_map(dev, areq->src, sg_link_tbl_len, edesc, | ||
420 | - &desc->ptr[4], sg_count, areq->assoclen, tbl_off); | ||
421 | + ret = talitos_sg_map_ext(dev, areq->src, cryptlen, edesc, &desc->ptr[4], | ||
422 | + sg_count, areq->assoclen, tbl_off, elen); | ||
423 | |||
424 | if (ret > 1) { | ||
425 | tbl_off += ret; | ||
426 | diff --git a/drivers/gpu/drm/bridge/dumb-vga-dac.c b/drivers/gpu/drm/bridge/dumb-vga-dac.c | ||
427 | index afec232185a7..cfd80bc510b6 100644 | ||
428 | --- a/drivers/gpu/drm/bridge/dumb-vga-dac.c | ||
429 | +++ b/drivers/gpu/drm/bridge/dumb-vga-dac.c | ||
430 | @@ -53,7 +53,9 @@ static int dumb_vga_get_modes(struct drm_connector *connector) | ||
431 | } | ||
432 | |||
433 | drm_mode_connector_update_edid_property(connector, edid); | ||
434 | - return drm_add_edid_modes(connector, edid); | ||
435 | + ret = drm_add_edid_modes(connector, edid); | ||
436 | + kfree(edid); | ||
437 | + return ret; | ||
438 | |||
439 | fallback: | ||
440 | /* | ||
441 | diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | ||
442 | index 87086af42114..33ca24ab983e 100644 | ||
443 | --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | ||
444 | +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | ||
445 | @@ -2014,6 +2014,7 @@ void vmw_kms_helper_resource_finish(struct vmw_validation_ctx *ctx, | ||
446 | vmw_kms_helper_buffer_finish(res->dev_priv, NULL, ctx->buf, | ||
447 | out_fence, NULL); | ||
448 | |||
449 | + vmw_dmabuf_unreference(&ctx->buf); | ||
450 | vmw_resource_unreserve(res, false, NULL, 0); | ||
451 | mutex_unlock(&res->dev_priv->cmdbuf_mutex); | ||
452 | } | ||
453 | diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c | ||
454 | index cb79d171d1e4..f2f1c9fec0b1 100644 | ||
455 | --- a/drivers/infiniband/core/ucma.c | ||
456 | +++ b/drivers/infiniband/core/ucma.c | ||
457 | @@ -676,7 +676,7 @@ static ssize_t ucma_resolve_ip(struct ucma_file *file, | ||
458 | if (copy_from_user(&cmd, inbuf, sizeof(cmd))) | ||
459 | return -EFAULT; | ||
460 | |||
461 | - if (!rdma_addr_size_in6(&cmd.src_addr) || | ||
462 | + if ((cmd.src_addr.sin6_family && !rdma_addr_size_in6(&cmd.src_addr)) || | ||
463 | !rdma_addr_size_in6(&cmd.dst_addr)) | ||
464 | return -EINVAL; | ||
465 | |||
466 | diff --git a/drivers/infiniband/hw/cxgb4/device.c b/drivers/infiniband/hw/cxgb4/device.c | ||
467 | index b85a1a983e07..9e0f2ccf1d10 100644 | ||
468 | --- a/drivers/infiniband/hw/cxgb4/device.c | ||
469 | +++ b/drivers/infiniband/hw/cxgb4/device.c | ||
470 | @@ -856,6 +856,11 @@ static int c4iw_rdev_open(struct c4iw_rdev *rdev) | ||
471 | |||
472 | rdev->status_page->db_off = 0; | ||
473 | |||
474 | + init_completion(&rdev->rqt_compl); | ||
475 | + init_completion(&rdev->pbl_compl); | ||
476 | + kref_init(&rdev->rqt_kref); | ||
477 | + kref_init(&rdev->pbl_kref); | ||
478 | + | ||
479 | return 0; | ||
480 | err_free_status_page: | ||
481 | free_page((unsigned long)rdev->status_page); | ||
482 | @@ -872,12 +877,14 @@ static int c4iw_rdev_open(struct c4iw_rdev *rdev) | ||
483 | |||
484 | static void c4iw_rdev_close(struct c4iw_rdev *rdev) | ||
485 | { | ||
486 | - destroy_workqueue(rdev->free_workq); | ||
487 | kfree(rdev->wr_log); | ||
488 | free_page((unsigned long)rdev->status_page); | ||
489 | c4iw_pblpool_destroy(rdev); | ||
490 | c4iw_rqtpool_destroy(rdev); | ||
491 | + wait_for_completion(&rdev->pbl_compl); | ||
492 | + wait_for_completion(&rdev->rqt_compl); | ||
493 | c4iw_destroy_resource(&rdev->resource); | ||
494 | + destroy_workqueue(rdev->free_workq); | ||
495 | } | ||
496 | |||
497 | static void c4iw_dealloc(struct uld_ctx *ctx) | ||
498 | diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h | ||
499 | index 7d540667dad2..896dff7a6cee 100644 | ||
500 | --- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h | ||
501 | +++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h | ||
502 | @@ -186,6 +186,10 @@ struct c4iw_rdev { | ||
503 | struct wr_log_entry *wr_log; | ||
504 | int wr_log_size; | ||
505 | struct workqueue_struct *free_workq; | ||
506 | + struct completion rqt_compl; | ||
507 | + struct completion pbl_compl; | ||
508 | + struct kref rqt_kref; | ||
509 | + struct kref pbl_kref; | ||
510 | }; | ||
511 | |||
512 | static inline int c4iw_fatal_error(struct c4iw_rdev *rdev) | ||
513 | diff --git a/drivers/infiniband/hw/cxgb4/resource.c b/drivers/infiniband/hw/cxgb4/resource.c | ||
514 | index 67df71a7012e..803c677e21cd 100644 | ||
515 | --- a/drivers/infiniband/hw/cxgb4/resource.c | ||
516 | +++ b/drivers/infiniband/hw/cxgb4/resource.c | ||
517 | @@ -260,12 +260,22 @@ u32 c4iw_pblpool_alloc(struct c4iw_rdev *rdev, int size) | ||
518 | rdev->stats.pbl.cur += roundup(size, 1 << MIN_PBL_SHIFT); | ||
519 | if (rdev->stats.pbl.cur > rdev->stats.pbl.max) | ||
520 | rdev->stats.pbl.max = rdev->stats.pbl.cur; | ||
521 | + kref_get(&rdev->pbl_kref); | ||
522 | } else | ||
523 | rdev->stats.pbl.fail++; | ||
524 | mutex_unlock(&rdev->stats.lock); | ||
525 | return (u32)addr; | ||
526 | } | ||
527 | |||
528 | +static void destroy_pblpool(struct kref *kref) | ||
529 | +{ | ||
530 | + struct c4iw_rdev *rdev; | ||
531 | + | ||
532 | + rdev = container_of(kref, struct c4iw_rdev, pbl_kref); | ||
533 | + gen_pool_destroy(rdev->pbl_pool); | ||
534 | + complete(&rdev->pbl_compl); | ||
535 | +} | ||
536 | + | ||
537 | void c4iw_pblpool_free(struct c4iw_rdev *rdev, u32 addr, int size) | ||
538 | { | ||
539 | PDBG("%s addr 0x%x size %d\n", __func__, addr, size); | ||
540 | @@ -273,6 +283,7 @@ void c4iw_pblpool_free(struct c4iw_rdev *rdev, u32 addr, int size) | ||
541 | rdev->stats.pbl.cur -= roundup(size, 1 << MIN_PBL_SHIFT); | ||
542 | mutex_unlock(&rdev->stats.lock); | ||
543 | gen_pool_free(rdev->pbl_pool, (unsigned long)addr, size); | ||
544 | + kref_put(&rdev->pbl_kref, destroy_pblpool); | ||
545 | } | ||
546 | |||
547 | int c4iw_pblpool_create(struct c4iw_rdev *rdev) | ||
548 | @@ -312,7 +323,7 @@ int c4iw_pblpool_create(struct c4iw_rdev *rdev) | ||
549 | |||
550 | void c4iw_pblpool_destroy(struct c4iw_rdev *rdev) | ||
551 | { | ||
552 | - gen_pool_destroy(rdev->pbl_pool); | ||
553 | + kref_put(&rdev->pbl_kref, destroy_pblpool); | ||
554 | } | ||
555 | |||
556 | /* | ||
557 | @@ -333,12 +344,22 @@ u32 c4iw_rqtpool_alloc(struct c4iw_rdev *rdev, int size) | ||
558 | rdev->stats.rqt.cur += roundup(size << 6, 1 << MIN_RQT_SHIFT); | ||
559 | if (rdev->stats.rqt.cur > rdev->stats.rqt.max) | ||
560 | rdev->stats.rqt.max = rdev->stats.rqt.cur; | ||
561 | + kref_get(&rdev->rqt_kref); | ||
562 | } else | ||
563 | rdev->stats.rqt.fail++; | ||
564 | mutex_unlock(&rdev->stats.lock); | ||
565 | return (u32)addr; | ||
566 | } | ||
567 | |||
568 | +static void destroy_rqtpool(struct kref *kref) | ||
569 | +{ | ||
570 | + struct c4iw_rdev *rdev; | ||
571 | + | ||
572 | + rdev = container_of(kref, struct c4iw_rdev, rqt_kref); | ||
573 | + gen_pool_destroy(rdev->rqt_pool); | ||
574 | + complete(&rdev->rqt_compl); | ||
575 | +} | ||
576 | + | ||
577 | void c4iw_rqtpool_free(struct c4iw_rdev *rdev, u32 addr, int size) | ||
578 | { | ||
579 | PDBG("%s addr 0x%x size %d\n", __func__, addr, size << 6); | ||
580 | @@ -346,6 +367,7 @@ void c4iw_rqtpool_free(struct c4iw_rdev *rdev, u32 addr, int size) | ||
581 | rdev->stats.rqt.cur -= roundup(size << 6, 1 << MIN_RQT_SHIFT); | ||
582 | mutex_unlock(&rdev->stats.lock); | ||
583 | gen_pool_free(rdev->rqt_pool, (unsigned long)addr, size << 6); | ||
584 | + kref_put(&rdev->rqt_kref, destroy_rqtpool); | ||
585 | } | ||
586 | |||
587 | int c4iw_rqtpool_create(struct c4iw_rdev *rdev) | ||
588 | @@ -383,7 +405,7 @@ int c4iw_rqtpool_create(struct c4iw_rdev *rdev) | ||
589 | |||
590 | void c4iw_rqtpool_destroy(struct c4iw_rdev *rdev) | ||
591 | { | ||
592 | - gen_pool_destroy(rdev->rqt_pool); | ||
593 | + kref_put(&rdev->rqt_kref, destroy_rqtpool); | ||
594 | } | ||
595 | |||
596 | /* | ||
597 | diff --git a/drivers/infiniband/hw/hfi1/init.c b/drivers/infiniband/hw/hfi1/init.c | ||
598 | index 84a97f3f9299..ae1f90ddd4e8 100644 | ||
599 | --- a/drivers/infiniband/hw/hfi1/init.c | ||
600 | +++ b/drivers/infiniband/hw/hfi1/init.c | ||
601 | @@ -1049,6 +1049,8 @@ struct hfi1_devdata *hfi1_alloc_devdata(struct pci_dev *pdev, size_t extra) | ||
602 | return ERR_PTR(-ENOMEM); | ||
603 | dd->num_pports = nports; | ||
604 | dd->pport = (struct hfi1_pportdata *)(dd + 1); | ||
605 | + dd->pcidev = pdev; | ||
606 | + pci_set_drvdata(pdev, dd); | ||
607 | |||
608 | INIT_LIST_HEAD(&dd->list); | ||
609 | idr_preload(GFP_KERNEL); | ||
610 | diff --git a/drivers/infiniband/hw/hfi1/pcie.c b/drivers/infiniband/hw/hfi1/pcie.c | ||
611 | index 335613a1a46a..717626046ee5 100644 | ||
612 | --- a/drivers/infiniband/hw/hfi1/pcie.c | ||
613 | +++ b/drivers/infiniband/hw/hfi1/pcie.c | ||
614 | @@ -162,9 +162,6 @@ int hfi1_pcie_ddinit(struct hfi1_devdata *dd, struct pci_dev *pdev) | ||
615 | unsigned long len; | ||
616 | resource_size_t addr; | ||
617 | |||
618 | - dd->pcidev = pdev; | ||
619 | - pci_set_drvdata(pdev, dd); | ||
620 | - | ||
621 | addr = pci_resource_start(pdev, 0); | ||
622 | len = pci_resource_len(pdev, 0); | ||
623 | |||
624 | diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c | ||
625 | index 5b8909d1b55e..3cdcbfbd6a79 100644 | ||
626 | --- a/drivers/infiniband/hw/mlx5/qp.c | ||
627 | +++ b/drivers/infiniband/hw/mlx5/qp.c | ||
628 | @@ -253,7 +253,11 @@ static int set_rq_size(struct mlx5_ib_dev *dev, struct ib_qp_cap *cap, | ||
629 | } else { | ||
630 | if (ucmd) { | ||
631 | qp->rq.wqe_cnt = ucmd->rq_wqe_count; | ||
632 | + if (ucmd->rq_wqe_shift > BITS_PER_BYTE * sizeof(ucmd->rq_wqe_shift)) | ||
633 | + return -EINVAL; | ||
634 | qp->rq.wqe_shift = ucmd->rq_wqe_shift; | ||
635 | + if ((1 << qp->rq.wqe_shift) / sizeof(struct mlx5_wqe_data_seg) < qp->wq_sig) | ||
636 | + return -EINVAL; | ||
637 | qp->rq.max_gs = (1 << qp->rq.wqe_shift) / sizeof(struct mlx5_wqe_data_seg) - qp->wq_sig; | ||
638 | qp->rq.max_post = qp->rq.wqe_cnt; | ||
639 | } else { | ||
640 | @@ -2164,18 +2168,18 @@ enum { | ||
641 | |||
642 | static int ib_rate_to_mlx5(struct mlx5_ib_dev *dev, u8 rate) | ||
643 | { | ||
644 | - if (rate == IB_RATE_PORT_CURRENT) { | ||
645 | + if (rate == IB_RATE_PORT_CURRENT) | ||
646 | return 0; | ||
647 | - } else if (rate < IB_RATE_2_5_GBPS || rate > IB_RATE_300_GBPS) { | ||
648 | + | ||
649 | + if (rate < IB_RATE_2_5_GBPS || rate > IB_RATE_300_GBPS) | ||
650 | return -EINVAL; | ||
651 | - } else { | ||
652 | - while (rate != IB_RATE_2_5_GBPS && | ||
653 | - !(1 << (rate + MLX5_STAT_RATE_OFFSET) & | ||
654 | - MLX5_CAP_GEN(dev->mdev, stat_rate_support))) | ||
655 | - --rate; | ||
656 | - } | ||
657 | |||
658 | - return rate + MLX5_STAT_RATE_OFFSET; | ||
659 | + while (rate != IB_RATE_PORT_CURRENT && | ||
660 | + !(1 << (rate + MLX5_STAT_RATE_OFFSET) & | ||
661 | + MLX5_CAP_GEN(dev->mdev, stat_rate_support))) | ||
662 | + --rate; | ||
663 | + | ||
664 | + return rate ? rate + MLX5_STAT_RATE_OFFSET : rate; | ||
665 | } | ||
666 | |||
667 | static int modify_raw_packet_eth_prio(struct mlx5_core_dev *dev, | ||
668 | diff --git a/drivers/input/input-leds.c b/drivers/input/input-leds.c | ||
669 | index 766bf2660116..5f04b2d94635 100644 | ||
670 | --- a/drivers/input/input-leds.c | ||
671 | +++ b/drivers/input/input-leds.c | ||
672 | @@ -88,6 +88,7 @@ static int input_leds_connect(struct input_handler *handler, | ||
673 | const struct input_device_id *id) | ||
674 | { | ||
675 | struct input_leds *leds; | ||
676 | + struct input_led *led; | ||
677 | unsigned int num_leds; | ||
678 | unsigned int led_code; | ||
679 | int led_no; | ||
680 | @@ -119,14 +120,13 @@ static int input_leds_connect(struct input_handler *handler, | ||
681 | |||
682 | led_no = 0; | ||
683 | for_each_set_bit(led_code, dev->ledbit, LED_CNT) { | ||
684 | - struct input_led *led = &leds->leds[led_no]; | ||
685 | + if (!input_led_info[led_code].name) | ||
686 | + continue; | ||
687 | |||
688 | + led = &leds->leds[led_no]; | ||
689 | led->handle = &leds->handle; | ||
690 | led->code = led_code; | ||
691 | |||
692 | - if (!input_led_info[led_code].name) | ||
693 | - continue; | ||
694 | - | ||
695 | led->cdev.name = kasprintf(GFP_KERNEL, "%s::%s", | ||
696 | dev_name(&dev->dev), | ||
697 | input_led_info[led_code].name); | ||
698 | diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c | ||
699 | index e5d185fe69b9..26132402fdf9 100644 | ||
700 | --- a/drivers/input/touchscreen/atmel_mxt_ts.c | ||
701 | +++ b/drivers/input/touchscreen/atmel_mxt_ts.c | ||
702 | @@ -3027,6 +3027,15 @@ static const struct dmi_system_id mxt_dmi_table[] = { | ||
703 | }, | ||
704 | .driver_data = samus_platform_data, | ||
705 | }, | ||
706 | + { | ||
707 | + /* Samsung Chromebook Pro */ | ||
708 | + .ident = "Samsung Chromebook Pro", | ||
709 | + .matches = { | ||
710 | + DMI_MATCH(DMI_SYS_VENDOR, "Google"), | ||
711 | + DMI_MATCH(DMI_PRODUCT_NAME, "Caroline"), | ||
712 | + }, | ||
713 | + .driver_data = samus_platform_data, | ||
714 | + }, | ||
715 | { | ||
716 | /* Other Google Chromebooks */ | ||
717 | .ident = "Chromebook", | ||
718 | diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c | ||
719 | index 973e90fb4a24..1029bd234c22 100644 | ||
720 | --- a/drivers/net/usb/qmi_wwan.c | ||
721 | +++ b/drivers/net/usb/qmi_wwan.c | ||
722 | @@ -803,6 +803,7 @@ static const struct usb_device_id products[] = { | ||
723 | {QMI_FIXED_INTF(0x05c6, 0x9080, 8)}, | ||
724 | {QMI_FIXED_INTF(0x05c6, 0x9083, 3)}, | ||
725 | {QMI_FIXED_INTF(0x05c6, 0x9084, 4)}, | ||
726 | + {QMI_FIXED_INTF(0x05c6, 0x90b2, 3)}, /* ublox R410M */ | ||
727 | {QMI_FIXED_INTF(0x05c6, 0x920d, 0)}, | ||
728 | {QMI_FIXED_INTF(0x05c6, 0x920d, 5)}, | ||
729 | {QMI_QUIRK_SET_DTR(0x05c6, 0x9625, 4)}, /* YUGA CLM920-NC5 */ | ||
730 | diff --git a/drivers/platform/x86/asus-wireless.c b/drivers/platform/x86/asus-wireless.c | ||
731 | index 18716025b1db..c0983281fca4 100644 | ||
732 | --- a/drivers/platform/x86/asus-wireless.c | ||
733 | +++ b/drivers/platform/x86/asus-wireless.c | ||
734 | @@ -145,8 +145,10 @@ static int asus_wireless_remove(struct acpi_device *adev) | ||
735 | { | ||
736 | struct asus_wireless_data *data = acpi_driver_data(adev); | ||
737 | |||
738 | - if (data->wq) | ||
739 | + if (data->wq) { | ||
740 | + devm_led_classdev_unregister(&adev->dev, &data->led); | ||
741 | destroy_workqueue(data->wq); | ||
742 | + } | ||
743 | return 0; | ||
744 | } | ||
745 | |||
746 | diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c | ||
747 | index f575a33974fa..ecadc27eea48 100644 | ||
748 | --- a/drivers/tty/serial/imx.c | ||
749 | +++ b/drivers/tty/serial/imx.c | ||
750 | @@ -2145,7 +2145,9 @@ static int serial_imx_probe(struct platform_device *pdev) | ||
751 | * and DCD (when they are outputs) or enables the respective | ||
752 | * irqs. So set this bit early, i.e. before requesting irqs. | ||
753 | */ | ||
754 | - writel(UFCR_DCEDTE, sport->port.membase + UFCR); | ||
755 | + reg = readl(sport->port.membase + UFCR); | ||
756 | + if (!(reg & UFCR_DCEDTE)) | ||
757 | + writel(reg | UFCR_DCEDTE, sport->port.membase + UFCR); | ||
758 | |||
759 | /* | ||
760 | * Disable UCR3_RI and UCR3_DCD irqs. They are also not | ||
761 | @@ -2156,7 +2158,15 @@ static int serial_imx_probe(struct platform_device *pdev) | ||
762 | sport->port.membase + UCR3); | ||
763 | |||
764 | } else { | ||
765 | - writel(0, sport->port.membase + UFCR); | ||
766 | + unsigned long ucr3 = UCR3_DSR; | ||
767 | + | ||
768 | + reg = readl(sport->port.membase + UFCR); | ||
769 | + if (reg & UFCR_DCEDTE) | ||
770 | + writel(reg & ~UFCR_DCEDTE, sport->port.membase + UFCR); | ||
771 | + | ||
772 | + if (!is_imx1_uart(sport)) | ||
773 | + ucr3 |= IMX21_UCR3_RXDMUXSEL | UCR3_ADNIMP; | ||
774 | + writel(ucr3, sport->port.membase + UCR3); | ||
775 | } | ||
776 | |||
777 | clk_disable_unprepare(sport->clk_ipg); | ||
778 | diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c | ||
779 | index 7c54a19b20e0..5e6136d2ed71 100644 | ||
780 | --- a/drivers/usb/core/config.c | ||
781 | +++ b/drivers/usb/core/config.c | ||
782 | @@ -186,7 +186,9 @@ static const unsigned short full_speed_maxpacket_maxes[4] = { | ||
783 | static const unsigned short high_speed_maxpacket_maxes[4] = { | ||
784 | [USB_ENDPOINT_XFER_CONTROL] = 64, | ||
785 | [USB_ENDPOINT_XFER_ISOC] = 1024, | ||
786 | - [USB_ENDPOINT_XFER_BULK] = 512, | ||
787 | + | ||
788 | + /* Bulk should be 512, but some devices use 1024: we will warn below */ | ||
789 | + [USB_ENDPOINT_XFER_BULK] = 1024, | ||
790 | [USB_ENDPOINT_XFER_INT] = 1024, | ||
791 | }; | ||
792 | static const unsigned short super_speed_maxpacket_maxes[4] = { | ||
793 | diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c | ||
794 | index a55173c9e564..f1219f6d58a9 100644 | ||
795 | --- a/drivers/usb/musb/musb_gadget.c | ||
796 | +++ b/drivers/usb/musb/musb_gadget.c | ||
797 | @@ -442,7 +442,6 @@ void musb_g_tx(struct musb *musb, u8 epnum) | ||
798 | req = next_request(musb_ep); | ||
799 | request = &req->request; | ||
800 | |||
801 | - trace_musb_req_tx(req); | ||
802 | csr = musb_readw(epio, MUSB_TXCSR); | ||
803 | musb_dbg(musb, "<== %s, txcsr %04x", musb_ep->end_point.name, csr); | ||
804 | |||
805 | @@ -481,6 +480,8 @@ void musb_g_tx(struct musb *musb, u8 epnum) | ||
806 | u8 is_dma = 0; | ||
807 | bool short_packet = false; | ||
808 | |||
809 | + trace_musb_req_tx(req); | ||
810 | + | ||
811 | if (dma && (csr & MUSB_TXCSR_DMAENAB)) { | ||
812 | is_dma = 1; | ||
813 | csr |= MUSB_TXCSR_P_WZC_BITS; | ||
814 | diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c | ||
815 | index 43033895e8f6..e2bc91585b4f 100644 | ||
816 | --- a/drivers/usb/musb/musb_host.c | ||
817 | +++ b/drivers/usb/musb/musb_host.c | ||
818 | @@ -1023,7 +1023,9 @@ static void musb_bulk_nak_timeout(struct musb *musb, struct musb_hw_ep *ep, | ||
819 | /* set tx_reinit and schedule the next qh */ | ||
820 | ep->tx_reinit = 1; | ||
821 | } | ||
822 | - musb_start_urb(musb, is_in, next_qh); | ||
823 | + | ||
824 | + if (next_qh) | ||
825 | + musb_start_urb(musb, is_in, next_qh); | ||
826 | } | ||
827 | } | ||
828 | |||
829 | diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c | ||
830 | index 1799aa058a5b..d982c455e18e 100644 | ||
831 | --- a/drivers/usb/serial/option.c | ||
832 | +++ b/drivers/usb/serial/option.c | ||
833 | @@ -236,6 +236,8 @@ static void option_instat_callback(struct urb *urb); | ||
834 | /* These Quectel products use Qualcomm's vendor ID */ | ||
835 | #define QUECTEL_PRODUCT_UC20 0x9003 | ||
836 | #define QUECTEL_PRODUCT_UC15 0x9090 | ||
837 | +/* These u-blox products use Qualcomm's vendor ID */ | ||
838 | +#define UBLOX_PRODUCT_R410M 0x90b2 | ||
839 | /* These Yuga products use Qualcomm's vendor ID */ | ||
840 | #define YUGA_PRODUCT_CLM920_NC5 0x9625 | ||
841 | |||
842 | @@ -244,6 +246,7 @@ static void option_instat_callback(struct urb *urb); | ||
843 | #define QUECTEL_PRODUCT_EC21 0x0121 | ||
844 | #define QUECTEL_PRODUCT_EC25 0x0125 | ||
845 | #define QUECTEL_PRODUCT_BG96 0x0296 | ||
846 | +#define QUECTEL_PRODUCT_EP06 0x0306 | ||
847 | |||
848 | #define CMOTECH_VENDOR_ID 0x16d8 | ||
849 | #define CMOTECH_PRODUCT_6001 0x6001 | ||
850 | @@ -550,147 +553,15 @@ static void option_instat_callback(struct urb *urb); | ||
851 | #define WETELECOM_PRODUCT_6802 0x6802 | ||
852 | #define WETELECOM_PRODUCT_WMD300 0x6803 | ||
853 | |||
854 | -struct option_blacklist_info { | ||
855 | - /* bitmask of interface numbers blacklisted for send_setup */ | ||
856 | - const unsigned long sendsetup; | ||
857 | - /* bitmask of interface numbers that are reserved */ | ||
858 | - const unsigned long reserved; | ||
859 | -}; | ||
860 | - | ||
861 | -static const struct option_blacklist_info four_g_w14_blacklist = { | ||
862 | - .sendsetup = BIT(0) | BIT(1), | ||
863 | -}; | ||
864 | - | ||
865 | -static const struct option_blacklist_info four_g_w100_blacklist = { | ||
866 | - .sendsetup = BIT(1) | BIT(2), | ||
867 | - .reserved = BIT(3), | ||
868 | -}; | ||
869 | - | ||
870 | -static const struct option_blacklist_info alcatel_x200_blacklist = { | ||
871 | - .sendsetup = BIT(0) | BIT(1), | ||
872 | - .reserved = BIT(4), | ||
873 | -}; | ||
874 | - | ||
875 | -static const struct option_blacklist_info zte_0037_blacklist = { | ||
876 | - .sendsetup = BIT(0) | BIT(1), | ||
877 | -}; | ||
878 | - | ||
879 | -static const struct option_blacklist_info zte_k3765_z_blacklist = { | ||
880 | - .sendsetup = BIT(0) | BIT(1) | BIT(2), | ||
881 | - .reserved = BIT(4), | ||
882 | -}; | ||
883 | - | ||
884 | -static const struct option_blacklist_info zte_ad3812_z_blacklist = { | ||
885 | - .sendsetup = BIT(0) | BIT(1) | BIT(2), | ||
886 | -}; | ||
887 | - | ||
888 | -static const struct option_blacklist_info zte_mc2718_z_blacklist = { | ||
889 | - .sendsetup = BIT(1) | BIT(2) | BIT(3) | BIT(4), | ||
890 | -}; | ||
891 | - | ||
892 | -static const struct option_blacklist_info zte_mc2716_z_blacklist = { | ||
893 | - .sendsetup = BIT(1) | BIT(2) | BIT(3), | ||
894 | -}; | ||
895 | - | ||
896 | -static const struct option_blacklist_info zte_me3620_mbim_blacklist = { | ||
897 | - .reserved = BIT(2) | BIT(3) | BIT(4), | ||
898 | -}; | ||
899 | - | ||
900 | -static const struct option_blacklist_info zte_me3620_xl_blacklist = { | ||
901 | - .reserved = BIT(3) | BIT(4) | BIT(5), | ||
902 | -}; | ||
903 | - | ||
904 | -static const struct option_blacklist_info zte_zm8620_x_blacklist = { | ||
905 | - .reserved = BIT(3) | BIT(4) | BIT(5), | ||
906 | -}; | ||
907 | - | ||
908 | -static const struct option_blacklist_info huawei_cdc12_blacklist = { | ||
909 | - .reserved = BIT(1) | BIT(2), | ||
910 | -}; | ||
911 | - | ||
912 | -static const struct option_blacklist_info net_intf0_blacklist = { | ||
913 | - .reserved = BIT(0), | ||
914 | -}; | ||
915 | |||
916 | -static const struct option_blacklist_info net_intf1_blacklist = { | ||
917 | - .reserved = BIT(1), | ||
918 | -}; | ||
919 | +/* Device flags */ | ||
920 | |||
921 | -static const struct option_blacklist_info net_intf2_blacklist = { | ||
922 | - .reserved = BIT(2), | ||
923 | -}; | ||
924 | +/* Interface does not support modem-control requests */ | ||
925 | +#define NCTRL(ifnum) ((BIT(ifnum) & 0xff) << 8) | ||
926 | |||
927 | -static const struct option_blacklist_info net_intf3_blacklist = { | ||
928 | - .reserved = BIT(3), | ||
929 | -}; | ||
930 | +/* Interface is reserved */ | ||
931 | +#define RSVD(ifnum) ((BIT(ifnum) & 0xff) << 0) | ||
932 | |||
933 | -static const struct option_blacklist_info net_intf4_blacklist = { | ||
934 | - .reserved = BIT(4), | ||
935 | -}; | ||
936 | - | ||
937 | -static const struct option_blacklist_info net_intf5_blacklist = { | ||
938 | - .reserved = BIT(5), | ||
939 | -}; | ||
940 | - | ||
941 | -static const struct option_blacklist_info net_intf6_blacklist = { | ||
942 | - .reserved = BIT(6), | ||
943 | -}; | ||
944 | - | ||
945 | -static const struct option_blacklist_info zte_mf626_blacklist = { | ||
946 | - .sendsetup = BIT(0) | BIT(1), | ||
947 | - .reserved = BIT(4), | ||
948 | -}; | ||
949 | - | ||
950 | -static const struct option_blacklist_info zte_1255_blacklist = { | ||
951 | - .reserved = BIT(3) | BIT(4), | ||
952 | -}; | ||
953 | - | ||
954 | -static const struct option_blacklist_info simcom_sim7100e_blacklist = { | ||
955 | - .reserved = BIT(5) | BIT(6), | ||
956 | -}; | ||
957 | - | ||
958 | -static const struct option_blacklist_info telit_me910_blacklist = { | ||
959 | - .sendsetup = BIT(0), | ||
960 | - .reserved = BIT(1) | BIT(3), | ||
961 | -}; | ||
962 | - | ||
963 | -static const struct option_blacklist_info telit_me910_dual_modem_blacklist = { | ||
964 | - .sendsetup = BIT(0), | ||
965 | - .reserved = BIT(3), | ||
966 | -}; | ||
967 | - | ||
968 | -static const struct option_blacklist_info telit_le910_blacklist = { | ||
969 | - .sendsetup = BIT(0), | ||
970 | - .reserved = BIT(1) | BIT(2), | ||
971 | -}; | ||
972 | - | ||
973 | -static const struct option_blacklist_info telit_le920_blacklist = { | ||
974 | - .sendsetup = BIT(0), | ||
975 | - .reserved = BIT(1) | BIT(5), | ||
976 | -}; | ||
977 | - | ||
978 | -static const struct option_blacklist_info telit_le920a4_blacklist_1 = { | ||
979 | - .sendsetup = BIT(0), | ||
980 | - .reserved = BIT(1), | ||
981 | -}; | ||
982 | - | ||
983 | -static const struct option_blacklist_info telit_le922_blacklist_usbcfg0 = { | ||
984 | - .sendsetup = BIT(2), | ||
985 | - .reserved = BIT(0) | BIT(1) | BIT(3), | ||
986 | -}; | ||
987 | - | ||
988 | -static const struct option_blacklist_info telit_le922_blacklist_usbcfg3 = { | ||
989 | - .sendsetup = BIT(0), | ||
990 | - .reserved = BIT(1) | BIT(2) | BIT(3), | ||
991 | -}; | ||
992 | - | ||
993 | -static const struct option_blacklist_info cinterion_rmnet2_blacklist = { | ||
994 | - .reserved = BIT(4) | BIT(5), | ||
995 | -}; | ||
996 | - | ||
997 | -static const struct option_blacklist_info yuga_clm920_nc5_blacklist = { | ||
998 | - .reserved = BIT(1) | BIT(4), | ||
999 | -}; | ||
1000 | |||
1001 | static const struct usb_device_id option_ids[] = { | ||
1002 | { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, | ||
1003 | @@ -724,26 +595,26 @@ static const struct usb_device_id option_ids[] = { | ||
1004 | { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GKE) }, | ||
1005 | { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) }, | ||
1006 | { USB_DEVICE(QUANTA_VENDOR_ID, 0xea42), | ||
1007 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1008 | + .driver_info = RSVD(4) }, | ||
1009 | { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c05, USB_CLASS_COMM, 0x02, 0xff) }, | ||
1010 | { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c1f, USB_CLASS_COMM, 0x02, 0xff) }, | ||
1011 | { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c23, USB_CLASS_COMM, 0x02, 0xff) }, | ||
1012 | { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173, 0xff, 0xff, 0xff), | ||
1013 | - .driver_info = (kernel_ulong_t) &net_intf1_blacklist }, | ||
1014 | + .driver_info = RSVD(1) }, | ||
1015 | { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173S6, 0xff, 0xff, 0xff), | ||
1016 | - .driver_info = (kernel_ulong_t) &net_intf1_blacklist }, | ||
1017 | + .driver_info = RSVD(1) }, | ||
1018 | { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1750, 0xff, 0xff, 0xff), | ||
1019 | - .driver_info = (kernel_ulong_t) &net_intf2_blacklist }, | ||
1020 | + .driver_info = RSVD(2) }, | ||
1021 | { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1441, USB_CLASS_COMM, 0x02, 0xff) }, | ||
1022 | { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1442, USB_CLASS_COMM, 0x02, 0xff) }, | ||
1023 | { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff), | ||
1024 | - .driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist }, | ||
1025 | + .driver_info = RSVD(1) | RSVD(2) }, | ||
1026 | { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff), | ||
1027 | - .driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist }, | ||
1028 | + .driver_info = RSVD(1) | RSVD(2) }, | ||
1029 | { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x14ac, 0xff, 0xff, 0xff), /* Huawei E1820 */ | ||
1030 | - .driver_info = (kernel_ulong_t) &net_intf1_blacklist }, | ||
1031 | + .driver_info = RSVD(1) }, | ||
1032 | { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4605, 0xff, 0xff, 0xff), | ||
1033 | - .driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist }, | ||
1034 | + .driver_info = RSVD(1) | RSVD(2) }, | ||
1035 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0xff, 0xff) }, | ||
1036 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x01) }, | ||
1037 | { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x02) }, | ||
1038 | @@ -1188,65 +1059,70 @@ static const struct usb_device_id option_ids[] = { | ||
1039 | { USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC680) }, | ||
1040 | { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6000)}, /* ZTE AC8700 */ | ||
1041 | { USB_DEVICE_AND_INTERFACE_INFO(QUALCOMM_VENDOR_ID, 0x6001, 0xff, 0xff, 0xff), /* 4G LTE usb-modem U901 */ | ||
1042 | - .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, | ||
1043 | + .driver_info = RSVD(3) }, | ||
1044 | { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */ | ||
1045 | { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */ | ||
1046 | { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000)}, /* SIMCom SIM5218 */ | ||
1047 | /* Quectel products using Qualcomm vendor ID */ | ||
1048 | { USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)}, | ||
1049 | { USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20), | ||
1050 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1051 | + .driver_info = RSVD(4) }, | ||
1052 | /* Yuga products use Qualcomm vendor ID */ | ||
1053 | { USB_DEVICE(QUALCOMM_VENDOR_ID, YUGA_PRODUCT_CLM920_NC5), | ||
1054 | - .driver_info = (kernel_ulong_t)&yuga_clm920_nc5_blacklist }, | ||
1055 | + .driver_info = RSVD(1) | RSVD(4) }, | ||
1056 | + /* u-blox products using Qualcomm vendor ID */ | ||
1057 | + { USB_DEVICE(QUALCOMM_VENDOR_ID, UBLOX_PRODUCT_R410M), | ||
1058 | + .driver_info = RSVD(1) | RSVD(3) }, | ||
1059 | /* Quectel products using Quectel vendor ID */ | ||
1060 | { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC21), | ||
1061 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1062 | + .driver_info = RSVD(4) }, | ||
1063 | { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC25), | ||
1064 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1065 | + .driver_info = RSVD(4) }, | ||
1066 | { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96), | ||
1067 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1068 | + .driver_info = RSVD(4) }, | ||
1069 | + { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06), | ||
1070 | + .driver_info = RSVD(4) | RSVD(5) }, | ||
1071 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6001) }, | ||
1072 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CMU_300) }, | ||
1073 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6003), | ||
1074 | - .driver_info = (kernel_ulong_t)&net_intf0_blacklist }, | ||
1075 | + .driver_info = RSVD(0) }, | ||
1076 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6004) }, | ||
1077 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6005) }, | ||
1078 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CGU_628A) }, | ||
1079 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CHE_628S), | ||
1080 | - .driver_info = (kernel_ulong_t)&net_intf0_blacklist }, | ||
1081 | + .driver_info = RSVD(0) }, | ||
1082 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CMU_301), | ||
1083 | - .driver_info = (kernel_ulong_t)&net_intf0_blacklist }, | ||
1084 | + .driver_info = RSVD(0) }, | ||
1085 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CHU_628), | ||
1086 | - .driver_info = (kernel_ulong_t)&net_intf0_blacklist }, | ||
1087 | + .driver_info = RSVD(0) }, | ||
1088 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CHU_628S) }, | ||
1089 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CDU_680) }, | ||
1090 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CDU_685A) }, | ||
1091 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CHU_720S), | ||
1092 | - .driver_info = (kernel_ulong_t)&net_intf0_blacklist }, | ||
1093 | + .driver_info = RSVD(0) }, | ||
1094 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_7002), | ||
1095 | - .driver_info = (kernel_ulong_t)&net_intf0_blacklist }, | ||
1096 | + .driver_info = RSVD(0) }, | ||
1097 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CHU_629K), | ||
1098 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1099 | + .driver_info = RSVD(4) }, | ||
1100 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_7004), | ||
1101 | - .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, | ||
1102 | + .driver_info = RSVD(3) }, | ||
1103 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_7005) }, | ||
1104 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CGU_629), | ||
1105 | - .driver_info = (kernel_ulong_t)&net_intf5_blacklist }, | ||
1106 | + .driver_info = RSVD(5) }, | ||
1107 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CHU_629S), | ||
1108 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1109 | + .driver_info = RSVD(4) }, | ||
1110 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CHU_720I), | ||
1111 | - .driver_info = (kernel_ulong_t)&net_intf0_blacklist }, | ||
1112 | + .driver_info = RSVD(0) }, | ||
1113 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_7212), | ||
1114 | - .driver_info = (kernel_ulong_t)&net_intf0_blacklist }, | ||
1115 | + .driver_info = RSVD(0) }, | ||
1116 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_7213), | ||
1117 | - .driver_info = (kernel_ulong_t)&net_intf0_blacklist }, | ||
1118 | + .driver_info = RSVD(0) }, | ||
1119 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_7251), | ||
1120 | - .driver_info = (kernel_ulong_t)&net_intf1_blacklist }, | ||
1121 | + .driver_info = RSVD(1) }, | ||
1122 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_7252), | ||
1123 | - .driver_info = (kernel_ulong_t)&net_intf1_blacklist }, | ||
1124 | + .driver_info = RSVD(1) }, | ||
1125 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_7253), | ||
1126 | - .driver_info = (kernel_ulong_t)&net_intf1_blacklist }, | ||
1127 | + .driver_info = RSVD(1) }, | ||
1128 | { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864E) }, | ||
1129 | { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864G) }, | ||
1130 | { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_CC864_DUAL) }, | ||
1131 | @@ -1254,38 +1130,38 @@ static const struct usb_device_id option_ids[] = { | ||
1132 | { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_DE910_DUAL) }, | ||
1133 | { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UE910_V2) }, | ||
1134 | { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG0), | ||
1135 | - .driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg0 }, | ||
1136 | + .driver_info = RSVD(0) | RSVD(1) | NCTRL(2) | RSVD(3) }, | ||
1137 | { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG1), | ||
1138 | - .driver_info = (kernel_ulong_t)&telit_le910_blacklist }, | ||
1139 | + .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) }, | ||
1140 | { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG2), | ||
1141 | - .driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg3 }, | ||
1142 | + .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) | RSVD(3) }, | ||
1143 | { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG3), | ||
1144 | - .driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg3 }, | ||
1145 | + .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) | RSVD(3) }, | ||
1146 | { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG5, 0xff), | ||
1147 | - .driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg0 }, | ||
1148 | + .driver_info = RSVD(0) | RSVD(1) | NCTRL(2) | RSVD(3) }, | ||
1149 | { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910), | ||
1150 | - .driver_info = (kernel_ulong_t)&telit_me910_blacklist }, | ||
1151 | + .driver_info = NCTRL(0) | RSVD(1) | RSVD(3) }, | ||
1152 | { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910_DUAL_MODEM), | ||
1153 | - .driver_info = (kernel_ulong_t)&telit_me910_dual_modem_blacklist }, | ||
1154 | + .driver_info = NCTRL(0) | RSVD(3) }, | ||
1155 | { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE910), | ||
1156 | - .driver_info = (kernel_ulong_t)&telit_le910_blacklist }, | ||
1157 | + .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) }, | ||
1158 | { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE910_USBCFG4), | ||
1159 | - .driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg3 }, | ||
1160 | + .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) | RSVD(3) }, | ||
1161 | { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920), | ||
1162 | - .driver_info = (kernel_ulong_t)&telit_le920_blacklist }, | ||
1163 | + .driver_info = NCTRL(0) | RSVD(1) | RSVD(5) }, | ||
1164 | { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1207) }, | ||
1165 | { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1208), | ||
1166 | - .driver_info = (kernel_ulong_t)&telit_le920a4_blacklist_1 }, | ||
1167 | + .driver_info = NCTRL(0) | RSVD(1) }, | ||
1168 | { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1211), | ||
1169 | - .driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg3 }, | ||
1170 | + .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) | RSVD(3) }, | ||
1171 | { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1212), | ||
1172 | - .driver_info = (kernel_ulong_t)&telit_le920a4_blacklist_1 }, | ||
1173 | + .driver_info = NCTRL(0) | RSVD(1) }, | ||
1174 | { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1213, 0xff) }, | ||
1175 | { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1214), | ||
1176 | - .driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg3 }, | ||
1177 | + .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) | RSVD(3) }, | ||
1178 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622, 0xff, 0xff, 0xff) }, /* ZTE WCDMA products */ | ||
1179 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0002, 0xff, 0xff, 0xff), | ||
1180 | - .driver_info = (kernel_ulong_t)&net_intf1_blacklist }, | ||
1181 | + .driver_info = RSVD(1) }, | ||
1182 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0003, 0xff, 0xff, 0xff) }, | ||
1183 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0004, 0xff, 0xff, 0xff) }, | ||
1184 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0005, 0xff, 0xff, 0xff) }, | ||
1185 | @@ -1301,58 +1177,58 @@ static const struct usb_device_id option_ids[] = { | ||
1186 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0010, 0xff, 0xff, 0xff) }, | ||
1187 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0011, 0xff, 0xff, 0xff) }, | ||
1188 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0012, 0xff, 0xff, 0xff), | ||
1189 | - .driver_info = (kernel_ulong_t)&net_intf1_blacklist }, | ||
1190 | + .driver_info = RSVD(1) }, | ||
1191 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0013, 0xff, 0xff, 0xff) }, | ||
1192 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628, 0xff, 0xff, 0xff) }, | ||
1193 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0016, 0xff, 0xff, 0xff) }, | ||
1194 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0017, 0xff, 0xff, 0xff), | ||
1195 | - .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, | ||
1196 | + .driver_info = RSVD(3) }, | ||
1197 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0018, 0xff, 0xff, 0xff) }, | ||
1198 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0019, 0xff, 0xff, 0xff), | ||
1199 | - .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, | ||
1200 | + .driver_info = RSVD(3) }, | ||
1201 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0020, 0xff, 0xff, 0xff) }, | ||
1202 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0021, 0xff, 0xff, 0xff), | ||
1203 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1204 | + .driver_info = RSVD(4) }, | ||
1205 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0022, 0xff, 0xff, 0xff) }, | ||
1206 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0023, 0xff, 0xff, 0xff) }, | ||
1207 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0024, 0xff, 0xff, 0xff) }, | ||
1208 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0025, 0xff, 0xff, 0xff), | ||
1209 | - .driver_info = (kernel_ulong_t)&net_intf1_blacklist }, | ||
1210 | + .driver_info = RSVD(1) }, | ||
1211 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0028, 0xff, 0xff, 0xff) }, | ||
1212 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0029, 0xff, 0xff, 0xff) }, | ||
1213 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0030, 0xff, 0xff, 0xff) }, | ||
1214 | - { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF626, 0xff, | ||
1215 | - 0xff, 0xff), .driver_info = (kernel_ulong_t)&zte_mf626_blacklist }, | ||
1216 | + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF626, 0xff, 0xff, 0xff), | ||
1217 | + .driver_info = NCTRL(0) | NCTRL(1) | RSVD(4) }, | ||
1218 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0032, 0xff, 0xff, 0xff) }, | ||
1219 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0033, 0xff, 0xff, 0xff) }, | ||
1220 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0034, 0xff, 0xff, 0xff) }, | ||
1221 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0037, 0xff, 0xff, 0xff), | ||
1222 | - .driver_info = (kernel_ulong_t)&zte_0037_blacklist }, | ||
1223 | + .driver_info = NCTRL(0) | NCTRL(1) }, | ||
1224 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0038, 0xff, 0xff, 0xff) }, | ||
1225 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0039, 0xff, 0xff, 0xff) }, | ||
1226 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0040, 0xff, 0xff, 0xff) }, | ||
1227 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0042, 0xff, 0xff, 0xff), | ||
1228 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1229 | + .driver_info = RSVD(4) }, | ||
1230 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0043, 0xff, 0xff, 0xff) }, | ||
1231 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0044, 0xff, 0xff, 0xff) }, | ||
1232 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0048, 0xff, 0xff, 0xff) }, | ||
1233 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0049, 0xff, 0xff, 0xff), | ||
1234 | - .driver_info = (kernel_ulong_t)&net_intf5_blacklist }, | ||
1235 | + .driver_info = RSVD(5) }, | ||
1236 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0050, 0xff, 0xff, 0xff) }, | ||
1237 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0051, 0xff, 0xff, 0xff) }, | ||
1238 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0052, 0xff, 0xff, 0xff), | ||
1239 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1240 | + .driver_info = RSVD(4) }, | ||
1241 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0054, 0xff, 0xff, 0xff) }, | ||
1242 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0055, 0xff, 0xff, 0xff), | ||
1243 | - .driver_info = (kernel_ulong_t)&net_intf1_blacklist }, | ||
1244 | + .driver_info = RSVD(1) }, | ||
1245 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0056, 0xff, 0xff, 0xff) }, | ||
1246 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0057, 0xff, 0xff, 0xff) }, | ||
1247 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0058, 0xff, 0xff, 0xff), | ||
1248 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1249 | + .driver_info = RSVD(4) }, | ||
1250 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0061, 0xff, 0xff, 0xff) }, | ||
1251 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0062, 0xff, 0xff, 0xff) }, | ||
1252 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0063, 0xff, 0xff, 0xff), | ||
1253 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1254 | + .driver_info = RSVD(4) }, | ||
1255 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0064, 0xff, 0xff, 0xff) }, | ||
1256 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0065, 0xff, 0xff, 0xff) }, | ||
1257 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0066, 0xff, 0xff, 0xff) }, | ||
1258 | @@ -1377,26 +1253,26 @@ static const struct usb_device_id option_ids[] = { | ||
1259 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0096, 0xff, 0xff, 0xff) }, | ||
1260 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0097, 0xff, 0xff, 0xff) }, | ||
1261 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0104, 0xff, 0xff, 0xff), | ||
1262 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1263 | + .driver_info = RSVD(4) }, | ||
1264 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0105, 0xff, 0xff, 0xff) }, | ||
1265 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0106, 0xff, 0xff, 0xff) }, | ||
1266 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0108, 0xff, 0xff, 0xff) }, | ||
1267 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0113, 0xff, 0xff, 0xff), | ||
1268 | - .driver_info = (kernel_ulong_t)&net_intf5_blacklist }, | ||
1269 | + .driver_info = RSVD(5) }, | ||
1270 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0117, 0xff, 0xff, 0xff) }, | ||
1271 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0118, 0xff, 0xff, 0xff), | ||
1272 | - .driver_info = (kernel_ulong_t)&net_intf5_blacklist }, | ||
1273 | + .driver_info = RSVD(5) }, | ||
1274 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0121, 0xff, 0xff, 0xff), | ||
1275 | - .driver_info = (kernel_ulong_t)&net_intf5_blacklist }, | ||
1276 | + .driver_info = RSVD(5) }, | ||
1277 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0122, 0xff, 0xff, 0xff) }, | ||
1278 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0123, 0xff, 0xff, 0xff), | ||
1279 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1280 | + .driver_info = RSVD(4) }, | ||
1281 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0124, 0xff, 0xff, 0xff), | ||
1282 | - .driver_info = (kernel_ulong_t)&net_intf5_blacklist }, | ||
1283 | + .driver_info = RSVD(5) }, | ||
1284 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0125, 0xff, 0xff, 0xff), | ||
1285 | - .driver_info = (kernel_ulong_t)&net_intf6_blacklist }, | ||
1286 | + .driver_info = RSVD(6) }, | ||
1287 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0126, 0xff, 0xff, 0xff), | ||
1288 | - .driver_info = (kernel_ulong_t)&net_intf5_blacklist }, | ||
1289 | + .driver_info = RSVD(5) }, | ||
1290 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0128, 0xff, 0xff, 0xff) }, | ||
1291 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0135, 0xff, 0xff, 0xff) }, | ||
1292 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0136, 0xff, 0xff, 0xff) }, | ||
1293 | @@ -1412,50 +1288,50 @@ static const struct usb_device_id option_ids[] = { | ||
1294 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0155, 0xff, 0xff, 0xff) }, | ||
1295 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0156, 0xff, 0xff, 0xff) }, | ||
1296 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0157, 0xff, 0xff, 0xff), | ||
1297 | - .driver_info = (kernel_ulong_t)&net_intf5_blacklist }, | ||
1298 | + .driver_info = RSVD(5) }, | ||
1299 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0158, 0xff, 0xff, 0xff), | ||
1300 | - .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, | ||
1301 | + .driver_info = RSVD(3) }, | ||
1302 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0159, 0xff, 0xff, 0xff) }, | ||
1303 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0161, 0xff, 0xff, 0xff) }, | ||
1304 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0162, 0xff, 0xff, 0xff) }, | ||
1305 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0164, 0xff, 0xff, 0xff) }, | ||
1306 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0165, 0xff, 0xff, 0xff) }, | ||
1307 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0167, 0xff, 0xff, 0xff), | ||
1308 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1309 | + .driver_info = RSVD(4) }, | ||
1310 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0189, 0xff, 0xff, 0xff) }, | ||
1311 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0191, 0xff, 0xff, 0xff), /* ZTE EuFi890 */ | ||
1312 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1313 | + .driver_info = RSVD(4) }, | ||
1314 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0196, 0xff, 0xff, 0xff) }, | ||
1315 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0197, 0xff, 0xff, 0xff) }, | ||
1316 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0199, 0xff, 0xff, 0xff), /* ZTE MF820S */ | ||
1317 | - .driver_info = (kernel_ulong_t)&net_intf1_blacklist }, | ||
1318 | + .driver_info = RSVD(1) }, | ||
1319 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0200, 0xff, 0xff, 0xff) }, | ||
1320 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0201, 0xff, 0xff, 0xff) }, | ||
1321 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0254, 0xff, 0xff, 0xff) }, | ||
1322 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0257, 0xff, 0xff, 0xff), /* ZTE MF821 */ | ||
1323 | - .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, | ||
1324 | + .driver_info = RSVD(3) }, | ||
1325 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0265, 0xff, 0xff, 0xff), /* ONDA MT8205 */ | ||
1326 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1327 | + .driver_info = RSVD(4) }, | ||
1328 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0284, 0xff, 0xff, 0xff), /* ZTE MF880 */ | ||
1329 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1330 | + .driver_info = RSVD(4) }, | ||
1331 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0317, 0xff, 0xff, 0xff) }, | ||
1332 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0326, 0xff, 0xff, 0xff), | ||
1333 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1334 | + .driver_info = RSVD(4) }, | ||
1335 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0330, 0xff, 0xff, 0xff) }, | ||
1336 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0395, 0xff, 0xff, 0xff) }, | ||
1337 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0412, 0xff, 0xff, 0xff), /* Telewell TW-LTE 4G */ | ||
1338 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1339 | + .driver_info = RSVD(4) }, | ||
1340 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0414, 0xff, 0xff, 0xff) }, | ||
1341 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0417, 0xff, 0xff, 0xff) }, | ||
1342 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1008, 0xff, 0xff, 0xff), | ||
1343 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1344 | + .driver_info = RSVD(4) }, | ||
1345 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1010, 0xff, 0xff, 0xff), | ||
1346 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1347 | + .driver_info = RSVD(4) }, | ||
1348 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1012, 0xff, 0xff, 0xff), | ||
1349 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1350 | + .driver_info = RSVD(4) }, | ||
1351 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1018, 0xff, 0xff, 0xff) }, | ||
1352 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1021, 0xff, 0xff, 0xff), | ||
1353 | - .driver_info = (kernel_ulong_t)&net_intf2_blacklist }, | ||
1354 | + .driver_info = RSVD(2) }, | ||
1355 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1057, 0xff, 0xff, 0xff) }, | ||
1356 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1058, 0xff, 0xff, 0xff) }, | ||
1357 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1059, 0xff, 0xff, 0xff) }, | ||
1358 | @@ -1572,23 +1448,23 @@ static const struct usb_device_id option_ids[] = { | ||
1359 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1170, 0xff, 0xff, 0xff) }, | ||
1360 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1244, 0xff, 0xff, 0xff) }, | ||
1361 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1245, 0xff, 0xff, 0xff), | ||
1362 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1363 | + .driver_info = RSVD(4) }, | ||
1364 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1246, 0xff, 0xff, 0xff) }, | ||
1365 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1247, 0xff, 0xff, 0xff), | ||
1366 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1367 | + .driver_info = RSVD(4) }, | ||
1368 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1248, 0xff, 0xff, 0xff) }, | ||
1369 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1249, 0xff, 0xff, 0xff) }, | ||
1370 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1250, 0xff, 0xff, 0xff) }, | ||
1371 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1251, 0xff, 0xff, 0xff) }, | ||
1372 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1252, 0xff, 0xff, 0xff), | ||
1373 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1374 | + .driver_info = RSVD(4) }, | ||
1375 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1253, 0xff, 0xff, 0xff) }, | ||
1376 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1254, 0xff, 0xff, 0xff), | ||
1377 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1378 | + .driver_info = RSVD(4) }, | ||
1379 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1255, 0xff, 0xff, 0xff), | ||
1380 | - .driver_info = (kernel_ulong_t)&zte_1255_blacklist }, | ||
1381 | + .driver_info = RSVD(3) | RSVD(4) }, | ||
1382 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1256, 0xff, 0xff, 0xff), | ||
1383 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1384 | + .driver_info = RSVD(4) }, | ||
1385 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1257, 0xff, 0xff, 0xff) }, | ||
1386 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1258, 0xff, 0xff, 0xff) }, | ||
1387 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1259, 0xff, 0xff, 0xff) }, | ||
1388 | @@ -1603,7 +1479,7 @@ static const struct usb_device_id option_ids[] = { | ||
1389 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1268, 0xff, 0xff, 0xff) }, | ||
1390 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1269, 0xff, 0xff, 0xff) }, | ||
1391 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1270, 0xff, 0xff, 0xff), | ||
1392 | - .driver_info = (kernel_ulong_t)&net_intf5_blacklist }, | ||
1393 | + .driver_info = RSVD(5) }, | ||
1394 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1271, 0xff, 0xff, 0xff) }, | ||
1395 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1272, 0xff, 0xff, 0xff) }, | ||
1396 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1273, 0xff, 0xff, 0xff) }, | ||
1397 | @@ -1639,17 +1515,17 @@ static const struct usb_device_id option_ids[] = { | ||
1398 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1303, 0xff, 0xff, 0xff) }, | ||
1399 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1333, 0xff, 0xff, 0xff) }, | ||
1400 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1401, 0xff, 0xff, 0xff), | ||
1401 | - .driver_info = (kernel_ulong_t)&net_intf2_blacklist }, | ||
1402 | + .driver_info = RSVD(2) }, | ||
1403 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1402, 0xff, 0xff, 0xff), | ||
1404 | - .driver_info = (kernel_ulong_t)&net_intf2_blacklist }, | ||
1405 | + .driver_info = RSVD(2) }, | ||
1406 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1424, 0xff, 0xff, 0xff), | ||
1407 | - .driver_info = (kernel_ulong_t)&net_intf2_blacklist }, | ||
1408 | + .driver_info = RSVD(2) }, | ||
1409 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1425, 0xff, 0xff, 0xff), | ||
1410 | - .driver_info = (kernel_ulong_t)&net_intf2_blacklist }, | ||
1411 | + .driver_info = RSVD(2) }, | ||
1412 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1426, 0xff, 0xff, 0xff), /* ZTE MF91 */ | ||
1413 | - .driver_info = (kernel_ulong_t)&net_intf2_blacklist }, | ||
1414 | + .driver_info = RSVD(2) }, | ||
1415 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1428, 0xff, 0xff, 0xff), /* Telewell TW-LTE 4G v2 */ | ||
1416 | - .driver_info = (kernel_ulong_t)&net_intf2_blacklist }, | ||
1417 | + .driver_info = RSVD(2) }, | ||
1418 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1533, 0xff, 0xff, 0xff) }, | ||
1419 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1534, 0xff, 0xff, 0xff) }, | ||
1420 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1535, 0xff, 0xff, 0xff) }, | ||
1421 | @@ -1667,8 +1543,8 @@ static const struct usb_device_id option_ids[] = { | ||
1422 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1596, 0xff, 0xff, 0xff) }, | ||
1423 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1598, 0xff, 0xff, 0xff) }, | ||
1424 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1600, 0xff, 0xff, 0xff) }, | ||
1425 | - { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x2002, 0xff, | ||
1426 | - 0xff, 0xff), .driver_info = (kernel_ulong_t)&zte_k3765_z_blacklist }, | ||
1427 | + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x2002, 0xff, 0xff, 0xff), | ||
1428 | + .driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | RSVD(4) }, | ||
1429 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x2003, 0xff, 0xff, 0xff) }, | ||
1430 | |||
1431 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0014, 0xff, 0xff, 0xff) }, /* ZTE CDMA products */ | ||
1432 | @@ -1679,20 +1555,20 @@ static const struct usb_device_id option_ids[] = { | ||
1433 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0073, 0xff, 0xff, 0xff) }, | ||
1434 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0094, 0xff, 0xff, 0xff) }, | ||
1435 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0130, 0xff, 0xff, 0xff), | ||
1436 | - .driver_info = (kernel_ulong_t)&net_intf1_blacklist }, | ||
1437 | + .driver_info = RSVD(1) }, | ||
1438 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0133, 0xff, 0xff, 0xff), | ||
1439 | - .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, | ||
1440 | + .driver_info = RSVD(3) }, | ||
1441 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0141, 0xff, 0xff, 0xff), | ||
1442 | - .driver_info = (kernel_ulong_t)&net_intf5_blacklist }, | ||
1443 | + .driver_info = RSVD(5) }, | ||
1444 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0147, 0xff, 0xff, 0xff) }, | ||
1445 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0152, 0xff, 0xff, 0xff) }, | ||
1446 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0168, 0xff, 0xff, 0xff), | ||
1447 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1448 | + .driver_info = RSVD(4) }, | ||
1449 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0170, 0xff, 0xff, 0xff) }, | ||
1450 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0176, 0xff, 0xff, 0xff), | ||
1451 | - .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, | ||
1452 | + .driver_info = RSVD(3) }, | ||
1453 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0178, 0xff, 0xff, 0xff), | ||
1454 | - .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, | ||
1455 | + .driver_info = RSVD(3) }, | ||
1456 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff42, 0xff, 0xff, 0xff) }, | ||
1457 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff43, 0xff, 0xff, 0xff) }, | ||
1458 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff44, 0xff, 0xff, 0xff) }, | ||
1459 | @@ -1844,19 +1720,19 @@ static const struct usb_device_id option_ids[] = { | ||
1460 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC2726, 0xff, 0xff, 0xff) }, | ||
1461 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710T, 0xff, 0xff, 0xff) }, | ||
1462 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MC2718, 0xff, 0xff, 0xff), | ||
1463 | - .driver_info = (kernel_ulong_t)&zte_mc2718_z_blacklist }, | ||
1464 | + .driver_info = NCTRL(1) | NCTRL(2) | NCTRL(3) | NCTRL(4) }, | ||
1465 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AD3812, 0xff, 0xff, 0xff), | ||
1466 | - .driver_info = (kernel_ulong_t)&zte_ad3812_z_blacklist }, | ||
1467 | + .driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) }, | ||
1468 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MC2716, 0xff, 0xff, 0xff), | ||
1469 | - .driver_info = (kernel_ulong_t)&zte_mc2716_z_blacklist }, | ||
1470 | + .driver_info = NCTRL(1) | NCTRL(2) | NCTRL(3) }, | ||
1471 | { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_ME3620_L), | ||
1472 | - .driver_info = (kernel_ulong_t)&zte_me3620_xl_blacklist }, | ||
1473 | + .driver_info = RSVD(3) | RSVD(4) | RSVD(5) }, | ||
1474 | { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_ME3620_MBIM), | ||
1475 | - .driver_info = (kernel_ulong_t)&zte_me3620_mbim_blacklist }, | ||
1476 | + .driver_info = RSVD(2) | RSVD(3) | RSVD(4) }, | ||
1477 | { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_ME3620_X), | ||
1478 | - .driver_info = (kernel_ulong_t)&zte_me3620_xl_blacklist }, | ||
1479 | + .driver_info = RSVD(3) | RSVD(4) | RSVD(5) }, | ||
1480 | { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_ZM8620_X), | ||
1481 | - .driver_info = (kernel_ulong_t)&zte_zm8620_x_blacklist }, | ||
1482 | + .driver_info = RSVD(3) | RSVD(4) | RSVD(5) }, | ||
1483 | { USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x02, 0x01) }, | ||
1484 | { USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x02, 0x05) }, | ||
1485 | { USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x86, 0x10) }, | ||
1486 | @@ -1876,37 +1752,34 @@ static const struct usb_device_id option_ids[] = { | ||
1487 | { USB_DEVICE(ALINK_VENDOR_ID, ALINK_PRODUCT_PH300) }, | ||
1488 | { USB_DEVICE_AND_INTERFACE_INFO(ALINK_VENDOR_ID, ALINK_PRODUCT_3GU, 0xff, 0xff, 0xff) }, | ||
1489 | { USB_DEVICE(ALINK_VENDOR_ID, SIMCOM_PRODUCT_SIM7100E), | ||
1490 | - .driver_info = (kernel_ulong_t)&simcom_sim7100e_blacklist }, | ||
1491 | + .driver_info = RSVD(5) | RSVD(6) }, | ||
1492 | { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S_X200), | ||
1493 | - .driver_info = (kernel_ulong_t)&alcatel_x200_blacklist | ||
1494 | - }, | ||
1495 | + .driver_info = NCTRL(0) | NCTRL(1) | RSVD(4) }, | ||
1496 | { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D), | ||
1497 | - .driver_info = (kernel_ulong_t)&net_intf6_blacklist }, | ||
1498 | + .driver_info = RSVD(6) }, | ||
1499 | { USB_DEVICE(ALCATEL_VENDOR_ID, 0x0052), | ||
1500 | - .driver_info = (kernel_ulong_t)&net_intf6_blacklist }, | ||
1501 | + .driver_info = RSVD(6) }, | ||
1502 | { USB_DEVICE(ALCATEL_VENDOR_ID, 0x00b6), | ||
1503 | - .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, | ||
1504 | + .driver_info = RSVD(3) }, | ||
1505 | { USB_DEVICE(ALCATEL_VENDOR_ID, 0x00b7), | ||
1506 | - .driver_info = (kernel_ulong_t)&net_intf5_blacklist }, | ||
1507 | + .driver_info = RSVD(5) }, | ||
1508 | { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_L100V), | ||
1509 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1510 | + .driver_info = RSVD(4) }, | ||
1511 | { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_L800MA), | ||
1512 | - .driver_info = (kernel_ulong_t)&net_intf2_blacklist }, | ||
1513 | + .driver_info = RSVD(2) }, | ||
1514 | { USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) }, | ||
1515 | { USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) }, | ||
1516 | { USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14), | ||
1517 | - .driver_info = (kernel_ulong_t)&four_g_w14_blacklist | ||
1518 | - }, | ||
1519 | + .driver_info = NCTRL(0) | NCTRL(1) }, | ||
1520 | { USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W100), | ||
1521 | - .driver_info = (kernel_ulong_t)&four_g_w100_blacklist | ||
1522 | - }, | ||
1523 | + .driver_info = NCTRL(1) | NCTRL(2) | RSVD(3) }, | ||
1524 | {USB_DEVICE(LONGCHEER_VENDOR_ID, FUJISOFT_PRODUCT_FS040U), | ||
1525 | - .driver_info = (kernel_ulong_t)&net_intf3_blacklist}, | ||
1526 | + .driver_info = RSVD(3)}, | ||
1527 | { USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, SPEEDUP_PRODUCT_SU9800, 0xff) }, | ||
1528 | { USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, 0x9801, 0xff), | ||
1529 | - .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, | ||
1530 | + .driver_info = RSVD(3) }, | ||
1531 | { USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, 0x9803, 0xff), | ||
1532 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1533 | + .driver_info = RSVD(4) }, | ||
1534 | { USB_DEVICE(LONGCHEER_VENDOR_ID, ZOOM_PRODUCT_4597) }, | ||
1535 | { USB_DEVICE(LONGCHEER_VENDOR_ID, IBALL_3_5G_CONNECT) }, | ||
1536 | { USB_DEVICE(HAIER_VENDOR_ID, HAIER_PRODUCT_CE100) }, | ||
1537 | @@ -1932,14 +1805,14 @@ static const struct usb_device_id option_ids[] = { | ||
1538 | { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EU3_E) }, | ||
1539 | { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EU3_P) }, | ||
1540 | { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PH8), | ||
1541 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1542 | + .driver_info = RSVD(4) }, | ||
1543 | { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX, 0xff) }, | ||
1544 | { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PLXX), | ||
1545 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1546 | + .driver_info = RSVD(4) }, | ||
1547 | { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PH8_2RMNET, 0xff), | ||
1548 | - .driver_info = (kernel_ulong_t)&cinterion_rmnet2_blacklist }, | ||
1549 | + .driver_info = RSVD(4) | RSVD(5) }, | ||
1550 | { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PH8_AUDIO, 0xff), | ||
1551 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1552 | + .driver_info = RSVD(4) }, | ||
1553 | { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX_2RMNET, 0xff) }, | ||
1554 | { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX_AUDIO, 0xff) }, | ||
1555 | { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) }, | ||
1556 | @@ -1949,20 +1822,20 @@ static const struct usb_device_id option_ids[] = { | ||
1557 | { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) }, /* HC28 enumerates with Siemens or Cinterion VID depending on FW revision */ | ||
1558 | { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) }, | ||
1559 | { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100), | ||
1560 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1561 | + .driver_info = RSVD(4) }, | ||
1562 | { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD120), | ||
1563 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1564 | + .driver_info = RSVD(4) }, | ||
1565 | { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD140), | ||
1566 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1567 | + .driver_info = RSVD(4) }, | ||
1568 | { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD145) }, | ||
1569 | { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD155), | ||
1570 | - .driver_info = (kernel_ulong_t)&net_intf6_blacklist }, | ||
1571 | + .driver_info = RSVD(6) }, | ||
1572 | { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD200), | ||
1573 | - .driver_info = (kernel_ulong_t)&net_intf6_blacklist }, | ||
1574 | + .driver_info = RSVD(6) }, | ||
1575 | { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD160), | ||
1576 | - .driver_info = (kernel_ulong_t)&net_intf6_blacklist }, | ||
1577 | + .driver_info = RSVD(6) }, | ||
1578 | { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD500), | ||
1579 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1580 | + .driver_info = RSVD(4) }, | ||
1581 | { USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */ | ||
1582 | { USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_GT_B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /* Samsung GT-B3730 LTE USB modem.*/ | ||
1583 | { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CEM600) }, | ||
1584 | @@ -2039,9 +1912,9 @@ static const struct usb_device_id option_ids[] = { | ||
1585 | { USB_DEVICE(PETATEL_VENDOR_ID, PETATEL_PRODUCT_NP10T_600E) }, | ||
1586 | { USB_DEVICE_AND_INTERFACE_INFO(TPLINK_VENDOR_ID, TPLINK_PRODUCT_LTE, 0xff, 0x00, 0x00) }, /* TP-Link LTE Module */ | ||
1587 | { USB_DEVICE(TPLINK_VENDOR_ID, TPLINK_PRODUCT_MA180), | ||
1588 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1589 | + .driver_info = RSVD(4) }, | ||
1590 | { USB_DEVICE(TPLINK_VENDOR_ID, 0x9000), /* TP-Link MA260 */ | ||
1591 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1592 | + .driver_info = RSVD(4) }, | ||
1593 | { USB_DEVICE(CHANGHONG_VENDOR_ID, CHANGHONG_PRODUCT_CH690) }, | ||
1594 | { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d01, 0xff, 0x02, 0x01) }, /* D-Link DWM-156 (variant) */ | ||
1595 | { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d01, 0xff, 0x00, 0x00) }, /* D-Link DWM-156 (variant) */ | ||
1596 | @@ -2052,9 +1925,9 @@ static const struct usb_device_id option_ids[] = { | ||
1597 | { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d04, 0xff) }, /* D-Link DWM-158 */ | ||
1598 | { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d0e, 0xff) }, /* D-Link DWM-157 C1 */ | ||
1599 | { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e19, 0xff), /* D-Link DWM-221 B1 */ | ||
1600 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1601 | + .driver_info = RSVD(4) }, | ||
1602 | { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e35, 0xff), /* D-Link DWM-222 */ | ||
1603 | - .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
1604 | + .driver_info = RSVD(4) }, | ||
1605 | { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */ | ||
1606 | { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */ | ||
1607 | { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x7e11, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/A3 */ | ||
1608 | @@ -2114,7 +1987,7 @@ static int option_probe(struct usb_serial *serial, | ||
1609 | struct usb_interface_descriptor *iface_desc = | ||
1610 | &serial->interface->cur_altsetting->desc; | ||
1611 | struct usb_device_descriptor *dev_desc = &serial->dev->descriptor; | ||
1612 | - const struct option_blacklist_info *blacklist; | ||
1613 | + unsigned long device_flags = id->driver_info; | ||
1614 | |||
1615 | /* Never bind to the CD-Rom emulation interface */ | ||
1616 | if (iface_desc->bInterfaceClass == 0x08) | ||
1617 | @@ -2125,9 +1998,7 @@ static int option_probe(struct usb_serial *serial, | ||
1618 | * the same class/subclass/protocol as the serial interfaces. Look at | ||
1619 | * the Windows driver .INF files for reserved interface numbers. | ||
1620 | */ | ||
1621 | - blacklist = (void *)id->driver_info; | ||
1622 | - if (blacklist && test_bit(iface_desc->bInterfaceNumber, | ||
1623 | - &blacklist->reserved)) | ||
1624 | + if (device_flags & RSVD(iface_desc->bInterfaceNumber)) | ||
1625 | return -ENODEV; | ||
1626 | /* | ||
1627 | * Don't bind network interface on Samsung GT-B3730, it is handled by | ||
1628 | @@ -2138,8 +2009,8 @@ static int option_probe(struct usb_serial *serial, | ||
1629 | iface_desc->bInterfaceClass != USB_CLASS_CDC_DATA) | ||
1630 | return -ENODEV; | ||
1631 | |||
1632 | - /* Store the blacklist info so we can use it during attach. */ | ||
1633 | - usb_set_serial_data(serial, (void *)blacklist); | ||
1634 | + /* Store the device flags so we can use them during attach. */ | ||
1635 | + usb_set_serial_data(serial, (void *)device_flags); | ||
1636 | |||
1637 | return 0; | ||
1638 | } | ||
1639 | @@ -2147,22 +2018,21 @@ static int option_probe(struct usb_serial *serial, | ||
1640 | static int option_attach(struct usb_serial *serial) | ||
1641 | { | ||
1642 | struct usb_interface_descriptor *iface_desc; | ||
1643 | - const struct option_blacklist_info *blacklist; | ||
1644 | struct usb_wwan_intf_private *data; | ||
1645 | + unsigned long device_flags; | ||
1646 | |||
1647 | data = kzalloc(sizeof(struct usb_wwan_intf_private), GFP_KERNEL); | ||
1648 | if (!data) | ||
1649 | return -ENOMEM; | ||
1650 | |||
1651 | - /* Retrieve blacklist info stored at probe. */ | ||
1652 | - blacklist = usb_get_serial_data(serial); | ||
1653 | + /* Retrieve device flags stored at probe. */ | ||
1654 | + device_flags = (unsigned long)usb_get_serial_data(serial); | ||
1655 | |||
1656 | iface_desc = &serial->interface->cur_altsetting->desc; | ||
1657 | |||
1658 | - if (!blacklist || !test_bit(iface_desc->bInterfaceNumber, | ||
1659 | - &blacklist->sendsetup)) { | ||
1660 | + if (!(device_flags & NCTRL(iface_desc->bInterfaceNumber))) | ||
1661 | data->use_send_setup = 1; | ||
1662 | - } | ||
1663 | + | ||
1664 | spin_lock_init(&data->susp_lock); | ||
1665 | |||
1666 | usb_set_serial_data(serial, data); | ||
1667 | diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c | ||
1668 | index 337a0be89fcf..dbc3801b43eb 100644 | ||
1669 | --- a/drivers/usb/serial/visor.c | ||
1670 | +++ b/drivers/usb/serial/visor.c | ||
1671 | @@ -338,47 +338,48 @@ static int palm_os_3_probe(struct usb_serial *serial, | ||
1672 | goto exit; | ||
1673 | } | ||
1674 | |||
1675 | - if (retval == sizeof(*connection_info)) { | ||
1676 | - connection_info = (struct visor_connection_info *) | ||
1677 | - transfer_buffer; | ||
1678 | - | ||
1679 | - num_ports = le16_to_cpu(connection_info->num_ports); | ||
1680 | - for (i = 0; i < num_ports; ++i) { | ||
1681 | - switch ( | ||
1682 | - connection_info->connections[i].port_function_id) { | ||
1683 | - case VISOR_FUNCTION_GENERIC: | ||
1684 | - string = "Generic"; | ||
1685 | - break; | ||
1686 | - case VISOR_FUNCTION_DEBUGGER: | ||
1687 | - string = "Debugger"; | ||
1688 | - break; | ||
1689 | - case VISOR_FUNCTION_HOTSYNC: | ||
1690 | - string = "HotSync"; | ||
1691 | - break; | ||
1692 | - case VISOR_FUNCTION_CONSOLE: | ||
1693 | - string = "Console"; | ||
1694 | - break; | ||
1695 | - case VISOR_FUNCTION_REMOTE_FILE_SYS: | ||
1696 | - string = "Remote File System"; | ||
1697 | - break; | ||
1698 | - default: | ||
1699 | - string = "unknown"; | ||
1700 | - break; | ||
1701 | - } | ||
1702 | - dev_info(dev, "%s: port %d, is for %s use\n", | ||
1703 | - serial->type->description, | ||
1704 | - connection_info->connections[i].port, string); | ||
1705 | - } | ||
1706 | + if (retval != sizeof(*connection_info)) { | ||
1707 | + dev_err(dev, "Invalid connection information received from device\n"); | ||
1708 | + retval = -ENODEV; | ||
1709 | + goto exit; | ||
1710 | } | ||
1711 | - /* | ||
1712 | - * Handle devices that report invalid stuff here. | ||
1713 | - */ | ||
1714 | + | ||
1715 | + connection_info = (struct visor_connection_info *)transfer_buffer; | ||
1716 | + | ||
1717 | + num_ports = le16_to_cpu(connection_info->num_ports); | ||
1718 | + | ||
1719 | + /* Handle devices that report invalid stuff here. */ | ||
1720 | if (num_ports == 0 || num_ports > 2) { | ||
1721 | dev_warn(dev, "%s: No valid connect info available\n", | ||
1722 | serial->type->description); | ||
1723 | num_ports = 2; | ||
1724 | } | ||
1725 | |||
1726 | + for (i = 0; i < num_ports; ++i) { | ||
1727 | + switch (connection_info->connections[i].port_function_id) { | ||
1728 | + case VISOR_FUNCTION_GENERIC: | ||
1729 | + string = "Generic"; | ||
1730 | + break; | ||
1731 | + case VISOR_FUNCTION_DEBUGGER: | ||
1732 | + string = "Debugger"; | ||
1733 | + break; | ||
1734 | + case VISOR_FUNCTION_HOTSYNC: | ||
1735 | + string = "HotSync"; | ||
1736 | + break; | ||
1737 | + case VISOR_FUNCTION_CONSOLE: | ||
1738 | + string = "Console"; | ||
1739 | + break; | ||
1740 | + case VISOR_FUNCTION_REMOTE_FILE_SYS: | ||
1741 | + string = "Remote File System"; | ||
1742 | + break; | ||
1743 | + default: | ||
1744 | + string = "unknown"; | ||
1745 | + break; | ||
1746 | + } | ||
1747 | + dev_info(dev, "%s: port %d, is for %s use\n", | ||
1748 | + serial->type->description, | ||
1749 | + connection_info->connections[i].port, string); | ||
1750 | + } | ||
1751 | dev_info(dev, "%s: Number of ports: %d\n", serial->type->description, | ||
1752 | num_ports); | ||
1753 | |||
1754 | diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c | ||
1755 | index 362c6b4c1186..1410835eebe2 100644 | ||
1756 | --- a/fs/xfs/xfs_file.c | ||
1757 | +++ b/fs/xfs/xfs_file.c | ||
1758 | @@ -846,22 +846,26 @@ xfs_file_fallocate( | ||
1759 | if (error) | ||
1760 | goto out_unlock; | ||
1761 | } else if (mode & FALLOC_FL_INSERT_RANGE) { | ||
1762 | - unsigned int blksize_mask = i_blocksize(inode) - 1; | ||
1763 | + unsigned int blksize_mask = i_blocksize(inode) - 1; | ||
1764 | + loff_t isize = i_size_read(inode); | ||
1765 | |||
1766 | - new_size = i_size_read(inode) + len; | ||
1767 | if (offset & blksize_mask || len & blksize_mask) { | ||
1768 | error = -EINVAL; | ||
1769 | goto out_unlock; | ||
1770 | } | ||
1771 | |||
1772 | - /* check the new inode size does not wrap through zero */ | ||
1773 | - if (new_size > inode->i_sb->s_maxbytes) { | ||
1774 | + /* | ||
1775 | + * New inode size must not exceed ->s_maxbytes, accounting for | ||
1776 | + * possible signed overflow. | ||
1777 | + */ | ||
1778 | + if (inode->i_sb->s_maxbytes - isize < len) { | ||
1779 | error = -EFBIG; | ||
1780 | goto out_unlock; | ||
1781 | } | ||
1782 | + new_size = isize + len; | ||
1783 | |||
1784 | /* Offset should be less than i_size */ | ||
1785 | - if (offset >= i_size_read(inode)) { | ||
1786 | + if (offset >= isize) { | ||
1787 | error = -EINVAL; | ||
1788 | goto out_unlock; | ||
1789 | } | ||
1790 | diff --git a/include/kvm/arm_psci.h b/include/kvm/arm_psci.h | ||
1791 | index e518e4e3dfb5..4b1548129fa2 100644 | ||
1792 | --- a/include/kvm/arm_psci.h | ||
1793 | +++ b/include/kvm/arm_psci.h | ||
1794 | @@ -37,10 +37,15 @@ static inline int kvm_psci_version(struct kvm_vcpu *vcpu, struct kvm *kvm) | ||
1795 | * Our PSCI implementation stays the same across versions from | ||
1796 | * v0.2 onward, only adding the few mandatory functions (such | ||
1797 | * as FEATURES with 1.0) that are required by newer | ||
1798 | - * revisions. It is thus safe to return the latest. | ||
1799 | + * revisions. It is thus safe to return the latest, unless | ||
1800 | + * userspace has instructed us otherwise. | ||
1801 | */ | ||
1802 | - if (test_bit(KVM_ARM_VCPU_PSCI_0_2, vcpu->arch.features)) | ||
1803 | + if (test_bit(KVM_ARM_VCPU_PSCI_0_2, vcpu->arch.features)) { | ||
1804 | + if (vcpu->kvm->arch.psci_version) | ||
1805 | + return vcpu->kvm->arch.psci_version; | ||
1806 | + | ||
1807 | return KVM_ARM_PSCI_LATEST; | ||
1808 | + } | ||
1809 | |||
1810 | return KVM_ARM_PSCI_0_1; | ||
1811 | } | ||
1812 | @@ -48,4 +53,11 @@ static inline int kvm_psci_version(struct kvm_vcpu *vcpu, struct kvm *kvm) | ||
1813 | |||
1814 | int kvm_hvc_call_handler(struct kvm_vcpu *vcpu); | ||
1815 | |||
1816 | +struct kvm_one_reg; | ||
1817 | + | ||
1818 | +int kvm_arm_get_fw_num_regs(struct kvm_vcpu *vcpu); | ||
1819 | +int kvm_arm_copy_fw_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindices); | ||
1820 | +int kvm_arm_get_fw_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg); | ||
1821 | +int kvm_arm_set_fw_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg); | ||
1822 | + | ||
1823 | #endif /* __KVM_ARM_PSCI_H__ */ | ||
1824 | diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c | ||
1825 | index a38119e4a427..eb43f7e219f9 100644 | ||
1826 | --- a/kernel/bpf/arraymap.c | ||
1827 | +++ b/kernel/bpf/arraymap.c | ||
1828 | @@ -190,7 +190,7 @@ int bpf_percpu_array_copy(struct bpf_map *map, void *key, void *value) | ||
1829 | static int array_map_get_next_key(struct bpf_map *map, void *key, void *next_key) | ||
1830 | { | ||
1831 | struct bpf_array *array = container_of(map, struct bpf_array, map); | ||
1832 | - u32 index = *(u32 *)key; | ||
1833 | + u32 index = key ? *(u32 *)key : U32_MAX; | ||
1834 | u32 *next = (u32 *)next_key; | ||
1835 | |||
1836 | if (index >= array->map.max_entries) { | ||
1837 | diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c | ||
1838 | index ad2f0ed75471..a36a532c056d 100644 | ||
1839 | --- a/kernel/bpf/hashtab.c | ||
1840 | +++ b/kernel/bpf/hashtab.c | ||
1841 | @@ -326,12 +326,15 @@ static int htab_map_get_next_key(struct bpf_map *map, void *key, void *next_key) | ||
1842 | struct hlist_head *head; | ||
1843 | struct htab_elem *l, *next_l; | ||
1844 | u32 hash, key_size; | ||
1845 | - int i; | ||
1846 | + int i = 0; | ||
1847 | |||
1848 | WARN_ON_ONCE(!rcu_read_lock_held()); | ||
1849 | |||
1850 | key_size = map->key_size; | ||
1851 | |||
1852 | + if (!key) | ||
1853 | + goto find_first_elem; | ||
1854 | + | ||
1855 | hash = htab_map_hash(key, key_size); | ||
1856 | |||
1857 | head = select_bucket(htab, hash); | ||
1858 | @@ -339,10 +342,8 @@ static int htab_map_get_next_key(struct bpf_map *map, void *key, void *next_key) | ||
1859 | /* lookup the key */ | ||
1860 | l = lookup_elem_raw(head, hash, key, key_size); | ||
1861 | |||
1862 | - if (!l) { | ||
1863 | - i = 0; | ||
1864 | + if (!l) | ||
1865 | goto find_first_elem; | ||
1866 | - } | ||
1867 | |||
1868 | /* key was found, get next key in the same bucket */ | ||
1869 | next_l = hlist_entry_safe(rcu_dereference_raw(hlist_next_rcu(&l->hash_node)), | ||
1870 | diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c | ||
1871 | index f8b4e3e16cef..ca7e277e8b5f 100644 | ||
1872 | --- a/kernel/bpf/syscall.c | ||
1873 | +++ b/kernel/bpf/syscall.c | ||
1874 | @@ -508,14 +508,18 @@ static int map_get_next_key(union bpf_attr *attr) | ||
1875 | if (IS_ERR(map)) | ||
1876 | return PTR_ERR(map); | ||
1877 | |||
1878 | - err = -ENOMEM; | ||
1879 | - key = kmalloc(map->key_size, GFP_USER); | ||
1880 | - if (!key) | ||
1881 | - goto err_put; | ||
1882 | - | ||
1883 | - err = -EFAULT; | ||
1884 | - if (copy_from_user(key, ukey, map->key_size) != 0) | ||
1885 | - goto free_key; | ||
1886 | + if (ukey) { | ||
1887 | + err = -ENOMEM; | ||
1888 | + key = kmalloc(map->key_size, GFP_USER); | ||
1889 | + if (!key) | ||
1890 | + goto err_put; | ||
1891 | + | ||
1892 | + err = -EFAULT; | ||
1893 | + if (copy_from_user(key, ukey, map->key_size) != 0) | ||
1894 | + goto free_key; | ||
1895 | + } else { | ||
1896 | + key = NULL; | ||
1897 | + } | ||
1898 | |||
1899 | err = -ENOMEM; | ||
1900 | next_key = kmalloc(map->key_size, GFP_USER); | ||
1901 | diff --git a/kernel/events/core.c b/kernel/events/core.c | ||
1902 | index b1d6b9888fba..cbc51826cb94 100644 | ||
1903 | --- a/kernel/events/core.c | ||
1904 | +++ b/kernel/events/core.c | ||
1905 | @@ -453,7 +453,7 @@ int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write, | ||
1906 | void __user *buffer, size_t *lenp, | ||
1907 | loff_t *ppos) | ||
1908 | { | ||
1909 | - int ret = proc_dointvec(table, write, buffer, lenp, ppos); | ||
1910 | + int ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos); | ||
1911 | |||
1912 | if (ret || !write) | ||
1913 | return ret; | ||
1914 | diff --git a/kernel/tracepoint.c b/kernel/tracepoint.c | ||
1915 | index d0639d917899..c8e7cc0e6ff6 100644 | ||
1916 | --- a/kernel/tracepoint.c | ||
1917 | +++ b/kernel/tracepoint.c | ||
1918 | @@ -202,7 +202,7 @@ static int tracepoint_add_func(struct tracepoint *tp, | ||
1919 | lockdep_is_held(&tracepoints_mutex)); | ||
1920 | old = func_add(&tp_funcs, func, prio); | ||
1921 | if (IS_ERR(old)) { | ||
1922 | - WARN_ON_ONCE(1); | ||
1923 | + WARN_ON_ONCE(PTR_ERR(old) != -ENOMEM); | ||
1924 | return PTR_ERR(old); | ||
1925 | } | ||
1926 | |||
1927 | @@ -235,7 +235,7 @@ static int tracepoint_remove_func(struct tracepoint *tp, | ||
1928 | lockdep_is_held(&tracepoints_mutex)); | ||
1929 | old = func_remove(&tp_funcs, func); | ||
1930 | if (IS_ERR(old)) { | ||
1931 | - WARN_ON_ONCE(1); | ||
1932 | + WARN_ON_ONCE(PTR_ERR(old) != -ENOMEM); | ||
1933 | return PTR_ERR(old); | ||
1934 | } | ||
1935 | |||
1936 | diff --git a/mm/percpu.c b/mm/percpu.c | ||
1937 | index f014cebbf405..3794cfc88689 100644 | ||
1938 | --- a/mm/percpu.c | ||
1939 | +++ b/mm/percpu.c | ||
1940 | @@ -70,6 +70,7 @@ | ||
1941 | #include <linux/vmalloc.h> | ||
1942 | #include <linux/workqueue.h> | ||
1943 | #include <linux/kmemleak.h> | ||
1944 | +#include <linux/sched.h> | ||
1945 | |||
1946 | #include <asm/cacheflush.h> | ||
1947 | #include <asm/sections.h> | ||
1948 | diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c | ||
1949 | index 1f64ab0c2a95..7ae080bae15c 100644 | ||
1950 | --- a/sound/core/pcm_compat.c | ||
1951 | +++ b/sound/core/pcm_compat.c | ||
1952 | @@ -426,6 +426,8 @@ static int snd_pcm_ioctl_xfern_compat(struct snd_pcm_substream *substream, | ||
1953 | return -ENOTTY; | ||
1954 | if (substream->stream != dir) | ||
1955 | return -EINVAL; | ||
1956 | + if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN) | ||
1957 | + return -EBADFD; | ||
1958 | |||
1959 | if ((ch = substream->runtime->channels) > 128) | ||
1960 | return -EINVAL; | ||
1961 | diff --git a/sound/core/seq/seq_virmidi.c b/sound/core/seq/seq_virmidi.c | ||
1962 | index 200764948ed1..8bdc4c961f04 100644 | ||
1963 | --- a/sound/core/seq/seq_virmidi.c | ||
1964 | +++ b/sound/core/seq/seq_virmidi.c | ||
1965 | @@ -174,12 +174,12 @@ static void snd_virmidi_output_trigger(struct snd_rawmidi_substream *substream, | ||
1966 | } | ||
1967 | return; | ||
1968 | } | ||
1969 | + spin_lock_irqsave(&substream->runtime->lock, flags); | ||
1970 | if (vmidi->event.type != SNDRV_SEQ_EVENT_NONE) { | ||
1971 | if (snd_seq_kernel_client_dispatch(vmidi->client, &vmidi->event, in_atomic(), 0) < 0) | ||
1972 | - return; | ||
1973 | + goto out; | ||
1974 | vmidi->event.type = SNDRV_SEQ_EVENT_NONE; | ||
1975 | } | ||
1976 | - spin_lock_irqsave(&substream->runtime->lock, flags); | ||
1977 | while (1) { | ||
1978 | count = __snd_rawmidi_transmit_peek(substream, buf, sizeof(buf)); | ||
1979 | if (count <= 0) | ||
1980 | diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c | ||
1981 | index dc91002d1e0d..847f70348d4d 100644 | ||
1982 | --- a/sound/drivers/aloop.c | ||
1983 | +++ b/sound/drivers/aloop.c | ||
1984 | @@ -296,6 +296,8 @@ static int loopback_trigger(struct snd_pcm_substream *substream, int cmd) | ||
1985 | cable->pause |= stream; | ||
1986 | loopback_timer_stop(dpcm); | ||
1987 | spin_unlock(&cable->lock); | ||
1988 | + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) | ||
1989 | + loopback_active_notify(dpcm); | ||
1990 | break; | ||
1991 | case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: | ||
1992 | case SNDRV_PCM_TRIGGER_RESUME: | ||
1993 | @@ -304,6 +306,8 @@ static int loopback_trigger(struct snd_pcm_substream *substream, int cmd) | ||
1994 | cable->pause &= ~stream; | ||
1995 | loopback_timer_start(dpcm); | ||
1996 | spin_unlock(&cable->lock); | ||
1997 | + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) | ||
1998 | + loopback_active_notify(dpcm); | ||
1999 | break; | ||
2000 | default: | ||
2001 | return -EINVAL; | ||
2002 | @@ -828,9 +832,11 @@ static int loopback_rate_shift_get(struct snd_kcontrol *kcontrol, | ||
2003 | { | ||
2004 | struct loopback *loopback = snd_kcontrol_chip(kcontrol); | ||
2005 | |||
2006 | + mutex_lock(&loopback->cable_lock); | ||
2007 | ucontrol->value.integer.value[0] = | ||
2008 | loopback->setup[kcontrol->id.subdevice] | ||
2009 | [kcontrol->id.device].rate_shift; | ||
2010 | + mutex_unlock(&loopback->cable_lock); | ||
2011 | return 0; | ||
2012 | } | ||
2013 | |||
2014 | @@ -862,9 +868,11 @@ static int loopback_notify_get(struct snd_kcontrol *kcontrol, | ||
2015 | { | ||
2016 | struct loopback *loopback = snd_kcontrol_chip(kcontrol); | ||
2017 | |||
2018 | + mutex_lock(&loopback->cable_lock); | ||
2019 | ucontrol->value.integer.value[0] = | ||
2020 | loopback->setup[kcontrol->id.subdevice] | ||
2021 | [kcontrol->id.device].notify; | ||
2022 | + mutex_unlock(&loopback->cable_lock); | ||
2023 | return 0; | ||
2024 | } | ||
2025 | |||
2026 | @@ -876,12 +884,14 @@ static int loopback_notify_put(struct snd_kcontrol *kcontrol, | ||
2027 | int change = 0; | ||
2028 | |||
2029 | val = ucontrol->value.integer.value[0] ? 1 : 0; | ||
2030 | + mutex_lock(&loopback->cable_lock); | ||
2031 | if (val != loopback->setup[kcontrol->id.subdevice] | ||
2032 | [kcontrol->id.device].notify) { | ||
2033 | loopback->setup[kcontrol->id.subdevice] | ||
2034 | [kcontrol->id.device].notify = val; | ||
2035 | change = 1; | ||
2036 | } | ||
2037 | + mutex_unlock(&loopback->cable_lock); | ||
2038 | return change; | ||
2039 | } | ||
2040 | |||
2041 | @@ -889,13 +899,18 @@ static int loopback_active_get(struct snd_kcontrol *kcontrol, | ||
2042 | struct snd_ctl_elem_value *ucontrol) | ||
2043 | { | ||
2044 | struct loopback *loopback = snd_kcontrol_chip(kcontrol); | ||
2045 | - struct loopback_cable *cable = loopback->cables | ||
2046 | - [kcontrol->id.subdevice][kcontrol->id.device ^ 1]; | ||
2047 | + struct loopback_cable *cable; | ||
2048 | + | ||
2049 | unsigned int val = 0; | ||
2050 | |||
2051 | - if (cable != NULL) | ||
2052 | - val = (cable->running & (1 << SNDRV_PCM_STREAM_PLAYBACK)) ? | ||
2053 | - 1 : 0; | ||
2054 | + mutex_lock(&loopback->cable_lock); | ||
2055 | + cable = loopback->cables[kcontrol->id.subdevice][kcontrol->id.device ^ 1]; | ||
2056 | + if (cable != NULL) { | ||
2057 | + unsigned int running = cable->running ^ cable->pause; | ||
2058 | + | ||
2059 | + val = (running & (1 << SNDRV_PCM_STREAM_PLAYBACK)) ? 1 : 0; | ||
2060 | + } | ||
2061 | + mutex_unlock(&loopback->cable_lock); | ||
2062 | ucontrol->value.integer.value[0] = val; | ||
2063 | return 0; | ||
2064 | } | ||
2065 | @@ -938,9 +953,11 @@ static int loopback_rate_get(struct snd_kcontrol *kcontrol, | ||
2066 | { | ||
2067 | struct loopback *loopback = snd_kcontrol_chip(kcontrol); | ||
2068 | |||
2069 | + mutex_lock(&loopback->cable_lock); | ||
2070 | ucontrol->value.integer.value[0] = | ||
2071 | loopback->setup[kcontrol->id.subdevice] | ||
2072 | [kcontrol->id.device].rate; | ||
2073 | + mutex_unlock(&loopback->cable_lock); | ||
2074 | return 0; | ||
2075 | } | ||
2076 | |||
2077 | @@ -960,9 +977,11 @@ static int loopback_channels_get(struct snd_kcontrol *kcontrol, | ||
2078 | { | ||
2079 | struct loopback *loopback = snd_kcontrol_chip(kcontrol); | ||
2080 | |||
2081 | + mutex_lock(&loopback->cable_lock); | ||
2082 | ucontrol->value.integer.value[0] = | ||
2083 | loopback->setup[kcontrol->id.subdevice] | ||
2084 | [kcontrol->id.device].channels; | ||
2085 | + mutex_unlock(&loopback->cable_lock); | ||
2086 | return 0; | ||
2087 | } | ||
2088 | |||
2089 | diff --git a/tools/testing/selftests/firmware/fw_filesystem.sh b/tools/testing/selftests/firmware/fw_filesystem.sh | ||
2090 | index 17e16fcaa0cc..99d7f13a5637 100755 | ||
2091 | --- a/tools/testing/selftests/firmware/fw_filesystem.sh | ||
2092 | +++ b/tools/testing/selftests/firmware/fw_filesystem.sh | ||
2093 | @@ -29,9 +29,11 @@ test_finish() | ||
2094 | echo "$OLD_TIMEOUT" >/sys/class/firmware/timeout | ||
2095 | fi | ||
2096 | if [ "$OLD_FWPATH" = "" ]; then | ||
2097 | - OLD_FWPATH=" " | ||
2098 | + # A zero-length write won't work; write a null byte | ||
2099 | + printf '\000' >/sys/module/firmware_class/parameters/path | ||
2100 | + else | ||
2101 | + echo -n "$OLD_FWPATH" >/sys/module/firmware_class/parameters/path | ||
2102 | fi | ||
2103 | - echo -n "$OLD_FWPATH" >/sys/module/firmware_class/parameters/path | ||
2104 | rm -f "$FW" | ||
2105 | rmdir "$FWPATH" | ||
2106 | } |