Contents of /trunk/kernel-alx/patches-4.14/0165-4.14.66-all-fixes.patch
Parent Directory | Revision Log
Revision 3238 -
(show annotations)
(download)
Fri Nov 9 12:14:58 2018 UTC (5 years, 7 months ago) by niro
File size: 23618 byte(s)
Fri Nov 9 12:14:58 2018 UTC (5 years, 7 months ago) by niro
File size: 23618 byte(s)
-added up to patches-4.14.79
1 | diff --git a/Makefile b/Makefile |
2 | index 7995690ff1aa..e69d0d091742 100644 |
3 | --- a/Makefile |
4 | +++ b/Makefile |
5 | @@ -1,7 +1,7 @@ |
6 | # SPDX-License-Identifier: GPL-2.0 |
7 | VERSION = 4 |
8 | PATCHLEVEL = 14 |
9 | -SUBLEVEL = 65 |
10 | +SUBLEVEL = 66 |
11 | EXTRAVERSION = |
12 | NAME = Petit Gorille |
13 | |
14 | diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c |
15 | index 2ef0ad6a33d6..7a0af16f86f2 100644 |
16 | --- a/drivers/acpi/sleep.c |
17 | +++ b/drivers/acpi/sleep.c |
18 | @@ -338,6 +338,14 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = { |
19 | DMI_MATCH(DMI_PRODUCT_NAME, "K54HR"), |
20 | }, |
21 | }, |
22 | + { |
23 | + .callback = init_nvs_save_s3, |
24 | + .ident = "Asus 1025C", |
25 | + .matches = { |
26 | + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), |
27 | + DMI_MATCH(DMI_PRODUCT_NAME, "1025C"), |
28 | + }, |
29 | + }, |
30 | /* |
31 | * https://bugzilla.kernel.org/show_bug.cgi?id=189431 |
32 | * Lenovo G50-45 is a platform later than 2012, but needs nvs memory |
33 | diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c |
34 | index 38a5bb764c7b..598724ffde4e 100644 |
35 | --- a/drivers/isdn/i4l/isdn_common.c |
36 | +++ b/drivers/isdn/i4l/isdn_common.c |
37 | @@ -1640,13 +1640,7 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg) |
38 | } else |
39 | return -EINVAL; |
40 | case IIOCDBGVAR: |
41 | - if (arg) { |
42 | - if (copy_to_user(argp, &dev, sizeof(ulong))) |
43 | - return -EFAULT; |
44 | - return 0; |
45 | - } else |
46 | - return -EINVAL; |
47 | - break; |
48 | + return -EINVAL; |
49 | default: |
50 | if ((cmd & IIOCDRVCTL) == IIOCDRVCTL) |
51 | cmd = ((cmd >> _IOC_NRSHIFT) & _IOC_NRMASK) & ISDN_DRVIOCTL_MASK; |
52 | diff --git a/drivers/misc/sram.c b/drivers/misc/sram.c |
53 | index fc0415771c00..4dd0d868ff88 100644 |
54 | --- a/drivers/misc/sram.c |
55 | +++ b/drivers/misc/sram.c |
56 | @@ -407,13 +407,20 @@ static int sram_probe(struct platform_device *pdev) |
57 | if (init_func) { |
58 | ret = init_func(); |
59 | if (ret) |
60 | - return ret; |
61 | + goto err_disable_clk; |
62 | } |
63 | |
64 | dev_dbg(sram->dev, "SRAM pool: %zu KiB @ 0x%p\n", |
65 | gen_pool_size(sram->pool) / 1024, sram->virt_base); |
66 | |
67 | return 0; |
68 | + |
69 | +err_disable_clk: |
70 | + if (sram->clk) |
71 | + clk_disable_unprepare(sram->clk); |
72 | + sram_free_partitions(sram); |
73 | + |
74 | + return ret; |
75 | } |
76 | |
77 | static int sram_remove(struct platform_device *pdev) |
78 | diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c |
79 | index 36fddb199160..f4b3554b0b67 100644 |
80 | --- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c |
81 | +++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c |
82 | @@ -752,7 +752,7 @@ static int hw_atl_b0_hw_packet_filter_set(struct aq_hw_s *self, |
83 | |
84 | rpfl2promiscuous_mode_en_set(self, IS_FILTER_ENABLED(IFF_PROMISC)); |
85 | rpfl2multicast_flr_en_set(self, |
86 | - IS_FILTER_ENABLED(IFF_MULTICAST), 0); |
87 | + IS_FILTER_ENABLED(IFF_ALLMULTI), 0); |
88 | |
89 | rpfl2_accept_all_mc_packets_set(self, |
90 | IS_FILTER_ENABLED(IFF_ALLMULTI)); |
91 | diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c |
92 | index 3015789265dd..27c5b2b46b8d 100644 |
93 | --- a/drivers/tty/serial/8250/8250_dw.c |
94 | +++ b/drivers/tty/serial/8250/8250_dw.c |
95 | @@ -260,7 +260,7 @@ static void dw8250_set_termios(struct uart_port *p, struct ktermios *termios, |
96 | long rate; |
97 | int ret; |
98 | |
99 | - if (IS_ERR(d->clk) || !old) |
100 | + if (IS_ERR(d->clk)) |
101 | goto out; |
102 | |
103 | clk_disable_unprepare(d->clk); |
104 | @@ -672,6 +672,7 @@ static const struct acpi_device_id dw8250_acpi_match[] = { |
105 | { "APMC0D08", 0}, |
106 | { "AMD0020", 0 }, |
107 | { "AMDI0020", 0 }, |
108 | + { "BRCM2032", 0 }, |
109 | { "HISI0031", 0 }, |
110 | { }, |
111 | }; |
112 | diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c |
113 | index e0aa5f03004c..411b4b03457b 100644 |
114 | --- a/drivers/tty/serial/8250/8250_exar.c |
115 | +++ b/drivers/tty/serial/8250/8250_exar.c |
116 | @@ -436,7 +436,11 @@ static irqreturn_t exar_misc_handler(int irq, void *data) |
117 | struct exar8250 *priv = data; |
118 | |
119 | /* Clear all PCI interrupts by reading INT0. No effect on IIR */ |
120 | - ioread8(priv->virt + UART_EXAR_INT0); |
121 | + readb(priv->virt + UART_EXAR_INT0); |
122 | + |
123 | + /* Clear INT0 for Expansion Interface slave ports, too */ |
124 | + if (priv->board->num_ports > 8) |
125 | + readb(priv->virt + 0x2000 + UART_EXAR_INT0); |
126 | |
127 | return IRQ_HANDLED; |
128 | } |
129 | diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c |
130 | index be456ea27ab2..ecf3d631bc09 100644 |
131 | --- a/drivers/tty/serial/8250/8250_port.c |
132 | +++ b/drivers/tty/serial/8250/8250_port.c |
133 | @@ -94,8 +94,7 @@ static const struct serial8250_config uart_config[] = { |
134 | .name = "16550A", |
135 | .fifo_size = 16, |
136 | .tx_loadsz = 16, |
137 | - .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10 | |
138 | - UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT, |
139 | + .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10, |
140 | .rxtrig_bytes = {1, 4, 8, 14}, |
141 | .flags = UART_CAP_FIFO, |
142 | }, |
143 | diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c |
144 | index d4124551fb56..0600dadd6a0c 100644 |
145 | --- a/drivers/usb/serial/option.c |
146 | +++ b/drivers/usb/serial/option.c |
147 | @@ -199,6 +199,8 @@ static void option_instat_callback(struct urb *urb); |
148 | #define DELL_PRODUCT_5800_V2_MINICARD_VZW 0x8196 /* Novatel E362 */ |
149 | #define DELL_PRODUCT_5804_MINICARD_ATT 0x819b /* Novatel E371 */ |
150 | |
151 | +#define DELL_PRODUCT_5821E 0x81d7 |
152 | + |
153 | #define KYOCERA_VENDOR_ID 0x0c88 |
154 | #define KYOCERA_PRODUCT_KPC650 0x17da |
155 | #define KYOCERA_PRODUCT_KPC680 0x180a |
156 | @@ -1033,6 +1035,8 @@ static const struct usb_device_id option_ids[] = { |
157 | { USB_DEVICE_AND_INTERFACE_INFO(DELL_VENDOR_ID, DELL_PRODUCT_5800_MINICARD_VZW, 0xff, 0xff, 0xff) }, |
158 | { USB_DEVICE_AND_INTERFACE_INFO(DELL_VENDOR_ID, DELL_PRODUCT_5800_V2_MINICARD_VZW, 0xff, 0xff, 0xff) }, |
159 | { USB_DEVICE_AND_INTERFACE_INFO(DELL_VENDOR_ID, DELL_PRODUCT_5804_MINICARD_ATT, 0xff, 0xff, 0xff) }, |
160 | + { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5821E), |
161 | + .driver_info = RSVD(0) | RSVD(1) | RSVD(6) }, |
162 | { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) }, /* ADU-E100, ADU-310 */ |
163 | { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) }, |
164 | { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_620UW) }, |
165 | diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c |
166 | index 34c5a75f98a7..2153e67eeeee 100644 |
167 | --- a/drivers/usb/serial/pl2303.c |
168 | +++ b/drivers/usb/serial/pl2303.c |
169 | @@ -55,6 +55,8 @@ static const struct usb_device_id id_table[] = { |
170 | .driver_info = PL2303_QUIRK_ENDPOINT_HACK }, |
171 | { USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_UC485), |
172 | .driver_info = PL2303_QUIRK_ENDPOINT_HACK }, |
173 | + { USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_UC232B), |
174 | + .driver_info = PL2303_QUIRK_ENDPOINT_HACK }, |
175 | { USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_ID2) }, |
176 | { USB_DEVICE(ATEN_VENDOR_ID2, ATEN_PRODUCT_ID) }, |
177 | { USB_DEVICE(ELCOM_VENDOR_ID, ELCOM_PRODUCT_ID) }, |
178 | diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h |
179 | index 123289085ee2..cec7141245ef 100644 |
180 | --- a/drivers/usb/serial/pl2303.h |
181 | +++ b/drivers/usb/serial/pl2303.h |
182 | @@ -29,6 +29,7 @@ |
183 | #define ATEN_VENDOR_ID2 0x0547 |
184 | #define ATEN_PRODUCT_ID 0x2008 |
185 | #define ATEN_PRODUCT_UC485 0x2021 |
186 | +#define ATEN_PRODUCT_UC232B 0x2022 |
187 | #define ATEN_PRODUCT_ID2 0x2118 |
188 | |
189 | #define IODATA_VENDOR_ID 0x04bb |
190 | diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c |
191 | index 4c4ac4705ac0..a9c5564b6b65 100644 |
192 | --- a/drivers/usb/serial/sierra.c |
193 | +++ b/drivers/usb/serial/sierra.c |
194 | @@ -773,9 +773,9 @@ static void sierra_close(struct usb_serial_port *port) |
195 | kfree(urb->transfer_buffer); |
196 | usb_free_urb(urb); |
197 | usb_autopm_put_interface_async(serial->interface); |
198 | - spin_lock(&portdata->lock); |
199 | + spin_lock_irq(&portdata->lock); |
200 | portdata->outstanding_urbs--; |
201 | - spin_unlock(&portdata->lock); |
202 | + spin_unlock_irq(&portdata->lock); |
203 | } |
204 | |
205 | sierra_stop_rx_urbs(port); |
206 | diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c |
207 | index 244e5256c526..3cf74f54c7a1 100644 |
208 | --- a/drivers/vhost/vhost.c |
209 | +++ b/drivers/vhost/vhost.c |
210 | @@ -1578,9 +1578,12 @@ int vhost_init_device_iotlb(struct vhost_dev *d, bool enabled) |
211 | d->iotlb = niotlb; |
212 | |
213 | for (i = 0; i < d->nvqs; ++i) { |
214 | - mutex_lock(&d->vqs[i]->mutex); |
215 | - d->vqs[i]->iotlb = niotlb; |
216 | - mutex_unlock(&d->vqs[i]->mutex); |
217 | + struct vhost_virtqueue *vq = d->vqs[i]; |
218 | + |
219 | + mutex_lock(&vq->mutex); |
220 | + vq->iotlb = niotlb; |
221 | + __vhost_vq_meta_reset(vq); |
222 | + mutex_unlock(&vq->mutex); |
223 | } |
224 | |
225 | vhost_umem_clean(oiotlb); |
226 | diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h |
227 | index f9fb566e75cf..5fb3f6361090 100644 |
228 | --- a/include/net/af_vsock.h |
229 | +++ b/include/net/af_vsock.h |
230 | @@ -62,7 +62,8 @@ struct vsock_sock { |
231 | struct list_head pending_links; |
232 | struct list_head accept_queue; |
233 | bool rejected; |
234 | - struct delayed_work dwork; |
235 | + struct delayed_work connect_work; |
236 | + struct delayed_work pending_work; |
237 | struct delayed_work close_work; |
238 | bool close_work_scheduled; |
239 | u32 peer_shutdown; |
240 | @@ -75,7 +76,6 @@ struct vsock_sock { |
241 | |
242 | s64 vsock_stream_has_data(struct vsock_sock *vsk); |
243 | s64 vsock_stream_has_space(struct vsock_sock *vsk); |
244 | -void vsock_pending_work(struct work_struct *work); |
245 | struct sock *__vsock_create(struct net *net, |
246 | struct socket *sock, |
247 | struct sock *parent, |
248 | diff --git a/include/net/llc.h b/include/net/llc.h |
249 | index dc35f25eb679..890a87318014 100644 |
250 | --- a/include/net/llc.h |
251 | +++ b/include/net/llc.h |
252 | @@ -116,6 +116,11 @@ static inline void llc_sap_hold(struct llc_sap *sap) |
253 | refcount_inc(&sap->refcnt); |
254 | } |
255 | |
256 | +static inline bool llc_sap_hold_safe(struct llc_sap *sap) |
257 | +{ |
258 | + return refcount_inc_not_zero(&sap->refcnt); |
259 | +} |
260 | + |
261 | void llc_sap_close(struct llc_sap *sap); |
262 | |
263 | static inline void llc_sap_put(struct llc_sap *sap) |
264 | diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c |
265 | index 795e920a3281..81fe3949c158 100644 |
266 | --- a/net/bluetooth/sco.c |
267 | +++ b/net/bluetooth/sco.c |
268 | @@ -393,7 +393,8 @@ static void sco_sock_cleanup_listen(struct sock *parent) |
269 | */ |
270 | static void sco_sock_kill(struct sock *sk) |
271 | { |
272 | - if (!sock_flag(sk, SOCK_ZAPPED) || sk->sk_socket) |
273 | + if (!sock_flag(sk, SOCK_ZAPPED) || sk->sk_socket || |
274 | + sock_flag(sk, SOCK_DEAD)) |
275 | return; |
276 | |
277 | BT_DBG("sk %p state %d", sk, sk->sk_state); |
278 | diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c |
279 | index 3887bc115762..fc31c02d616c 100644 |
280 | --- a/net/dccp/ccids/ccid2.c |
281 | +++ b/net/dccp/ccids/ccid2.c |
282 | @@ -228,14 +228,16 @@ static void ccid2_cwnd_restart(struct sock *sk, const u32 now) |
283 | struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk); |
284 | u32 cwnd = hc->tx_cwnd, restart_cwnd, |
285 | iwnd = rfc3390_bytes_to_packets(dccp_sk(sk)->dccps_mss_cache); |
286 | + s32 delta = now - hc->tx_lsndtime; |
287 | |
288 | hc->tx_ssthresh = max(hc->tx_ssthresh, (cwnd >> 1) + (cwnd >> 2)); |
289 | |
290 | /* don't reduce cwnd below the initial window (IW) */ |
291 | restart_cwnd = min(cwnd, iwnd); |
292 | - cwnd >>= (now - hc->tx_lsndtime) / hc->tx_rto; |
293 | - hc->tx_cwnd = max(cwnd, restart_cwnd); |
294 | |
295 | + while ((delta -= hc->tx_rto) >= 0 && cwnd > restart_cwnd) |
296 | + cwnd >>= 1; |
297 | + hc->tx_cwnd = max(cwnd, restart_cwnd); |
298 | hc->tx_cwnd_stamp = now; |
299 | hc->tx_cwnd_used = 0; |
300 | |
301 | diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c |
302 | index 84ee2eb88121..ee8dbd228fe2 100644 |
303 | --- a/net/ipv6/ip6_tunnel.c |
304 | +++ b/net/ipv6/ip6_tunnel.c |
305 | @@ -1134,12 +1134,8 @@ route_lookup: |
306 | max_headroom += 8; |
307 | mtu -= 8; |
308 | } |
309 | - if (skb->protocol == htons(ETH_P_IPV6)) { |
310 | - if (mtu < IPV6_MIN_MTU) |
311 | - mtu = IPV6_MIN_MTU; |
312 | - } else if (mtu < 576) { |
313 | - mtu = 576; |
314 | - } |
315 | + mtu = max(mtu, skb->protocol == htons(ETH_P_IPV6) ? |
316 | + IPV6_MIN_MTU : IPV4_MIN_MTU); |
317 | |
318 | skb_dst_update_pmtu(skb, mtu); |
319 | if (skb->len - t->tun_hlen - eth_hlen > mtu && !skb_is_gso(skb)) { |
320 | diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c |
321 | index 316869df91e8..5c87f1d3e525 100644 |
322 | --- a/net/l2tp/l2tp_core.c |
323 | +++ b/net/l2tp/l2tp_core.c |
324 | @@ -1211,7 +1211,7 @@ int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len |
325 | |
326 | /* Get routing info from the tunnel socket */ |
327 | skb_dst_drop(skb); |
328 | - skb_dst_set(skb, dst_clone(__sk_dst_check(sk, 0))); |
329 | + skb_dst_set(skb, sk_dst_check(sk, 0)); |
330 | |
331 | inet = inet_sk(sk); |
332 | fl = &inet->cork.fl; |
333 | diff --git a/net/llc/llc_core.c b/net/llc/llc_core.c |
334 | index 89041260784c..260b3dc1b4a2 100644 |
335 | --- a/net/llc/llc_core.c |
336 | +++ b/net/llc/llc_core.c |
337 | @@ -73,8 +73,8 @@ struct llc_sap *llc_sap_find(unsigned char sap_value) |
338 | |
339 | rcu_read_lock_bh(); |
340 | sap = __llc_sap_find(sap_value); |
341 | - if (sap) |
342 | - llc_sap_hold(sap); |
343 | + if (!sap || !llc_sap_hold_safe(sap)) |
344 | + sap = NULL; |
345 | rcu_read_unlock_bh(); |
346 | return sap; |
347 | } |
348 | diff --git a/net/sched/cls_matchall.c b/net/sched/cls_matchall.c |
349 | index 3684153cd8a9..6499aecfbfc4 100644 |
350 | --- a/net/sched/cls_matchall.c |
351 | +++ b/net/sched/cls_matchall.c |
352 | @@ -112,6 +112,8 @@ static void mall_destroy(struct tcf_proto *tp) |
353 | if (!head) |
354 | return; |
355 | |
356 | + tcf_unbind_filter(tp, &head->res); |
357 | + |
358 | if (tc_should_offload(dev, head->flags)) |
359 | mall_destroy_hw_filter(tp, head, (unsigned long) head); |
360 | |
361 | diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c |
362 | index a76937ee0b2d..52829fdc280b 100644 |
363 | --- a/net/sched/cls_tcindex.c |
364 | +++ b/net/sched/cls_tcindex.c |
365 | @@ -464,11 +464,6 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base, |
366 | tcf_bind_filter(tp, &cr.res, base); |
367 | } |
368 | |
369 | - if (old_r) |
370 | - tcf_exts_change(&r->exts, &e); |
371 | - else |
372 | - tcf_exts_change(&cr.exts, &e); |
373 | - |
374 | if (old_r && old_r != r) { |
375 | err = tcindex_filter_result_init(old_r); |
376 | if (err < 0) { |
377 | @@ -479,12 +474,15 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base, |
378 | |
379 | oldp = p; |
380 | r->res = cr.res; |
381 | + tcf_exts_change(&r->exts, &e); |
382 | + |
383 | rcu_assign_pointer(tp->root, cp); |
384 | |
385 | if (r == &new_filter_result) { |
386 | struct tcindex_filter *nfp; |
387 | struct tcindex_filter __rcu **fp; |
388 | |
389 | + f->result.res = r->res; |
390 | tcf_exts_change(&f->result.exts, &r->exts); |
391 | |
392 | fp = cp->h + (handle % cp->hash); |
393 | diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c |
394 | index dfc8c51e4d74..f2fd556c1233 100644 |
395 | --- a/net/vmw_vsock/af_vsock.c |
396 | +++ b/net/vmw_vsock/af_vsock.c |
397 | @@ -449,14 +449,14 @@ static int vsock_send_shutdown(struct sock *sk, int mode) |
398 | return transport->shutdown(vsock_sk(sk), mode); |
399 | } |
400 | |
401 | -void vsock_pending_work(struct work_struct *work) |
402 | +static void vsock_pending_work(struct work_struct *work) |
403 | { |
404 | struct sock *sk; |
405 | struct sock *listener; |
406 | struct vsock_sock *vsk; |
407 | bool cleanup; |
408 | |
409 | - vsk = container_of(work, struct vsock_sock, dwork.work); |
410 | + vsk = container_of(work, struct vsock_sock, pending_work.work); |
411 | sk = sk_vsock(vsk); |
412 | listener = vsk->listener; |
413 | cleanup = true; |
414 | @@ -496,7 +496,6 @@ out: |
415 | sock_put(sk); |
416 | sock_put(listener); |
417 | } |
418 | -EXPORT_SYMBOL_GPL(vsock_pending_work); |
419 | |
420 | /**** SOCKET OPERATIONS ****/ |
421 | |
422 | @@ -595,6 +594,8 @@ static int __vsock_bind(struct sock *sk, struct sockaddr_vm *addr) |
423 | return retval; |
424 | } |
425 | |
426 | +static void vsock_connect_timeout(struct work_struct *work); |
427 | + |
428 | struct sock *__vsock_create(struct net *net, |
429 | struct socket *sock, |
430 | struct sock *parent, |
431 | @@ -637,6 +638,8 @@ struct sock *__vsock_create(struct net *net, |
432 | vsk->sent_request = false; |
433 | vsk->ignore_connecting_rst = false; |
434 | vsk->peer_shutdown = 0; |
435 | + INIT_DELAYED_WORK(&vsk->connect_work, vsock_connect_timeout); |
436 | + INIT_DELAYED_WORK(&vsk->pending_work, vsock_pending_work); |
437 | |
438 | psk = parent ? vsock_sk(parent) : NULL; |
439 | if (parent) { |
440 | @@ -1116,7 +1119,7 @@ static void vsock_connect_timeout(struct work_struct *work) |
441 | struct vsock_sock *vsk; |
442 | int cancel = 0; |
443 | |
444 | - vsk = container_of(work, struct vsock_sock, dwork.work); |
445 | + vsk = container_of(work, struct vsock_sock, connect_work.work); |
446 | sk = sk_vsock(vsk); |
447 | |
448 | lock_sock(sk); |
449 | @@ -1220,9 +1223,7 @@ static int vsock_stream_connect(struct socket *sock, struct sockaddr *addr, |
450 | * timeout fires. |
451 | */ |
452 | sock_hold(sk); |
453 | - INIT_DELAYED_WORK(&vsk->dwork, |
454 | - vsock_connect_timeout); |
455 | - schedule_delayed_work(&vsk->dwork, timeout); |
456 | + schedule_delayed_work(&vsk->connect_work, timeout); |
457 | |
458 | /* Skip ahead to preserve error code set above. */ |
459 | goto out_wait; |
460 | diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c |
461 | index 10ae7823a19d..d5be519b0271 100644 |
462 | --- a/net/vmw_vsock/vmci_transport.c |
463 | +++ b/net/vmw_vsock/vmci_transport.c |
464 | @@ -1091,8 +1091,7 @@ static int vmci_transport_recv_listen(struct sock *sk, |
465 | vpending->listener = sk; |
466 | sock_hold(sk); |
467 | sock_hold(pending); |
468 | - INIT_DELAYED_WORK(&vpending->dwork, vsock_pending_work); |
469 | - schedule_delayed_work(&vpending->dwork, HZ); |
470 | + schedule_delayed_work(&vpending->pending_work, HZ); |
471 | |
472 | out: |
473 | return err; |
474 | diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c |
475 | index 7f89d3c79a4b..753d5fc4b284 100644 |
476 | --- a/sound/core/memalloc.c |
477 | +++ b/sound/core/memalloc.c |
478 | @@ -242,16 +242,12 @@ int snd_dma_alloc_pages_fallback(int type, struct device *device, size_t size, |
479 | int err; |
480 | |
481 | while ((err = snd_dma_alloc_pages(type, device, size, dmab)) < 0) { |
482 | - size_t aligned_size; |
483 | if (err != -ENOMEM) |
484 | return err; |
485 | if (size <= PAGE_SIZE) |
486 | return -ENOMEM; |
487 | - aligned_size = PAGE_SIZE << get_order(size); |
488 | - if (size != aligned_size) |
489 | - size = aligned_size; |
490 | - else |
491 | - size >>= 1; |
492 | + size >>= 1; |
493 | + size = PAGE_SIZE << get_order(size); |
494 | } |
495 | if (! dmab->area) |
496 | return -ENOMEM; |
497 | diff --git a/sound/core/seq/seq_virmidi.c b/sound/core/seq/seq_virmidi.c |
498 | index 289ae6bb81d9..8ebbca554e99 100644 |
499 | --- a/sound/core/seq/seq_virmidi.c |
500 | +++ b/sound/core/seq/seq_virmidi.c |
501 | @@ -163,6 +163,7 @@ static void snd_virmidi_output_trigger(struct snd_rawmidi_substream *substream, |
502 | int count, res; |
503 | unsigned char buf[32], *pbuf; |
504 | unsigned long flags; |
505 | + bool check_resched = !in_atomic(); |
506 | |
507 | if (up) { |
508 | vmidi->trigger = 1; |
509 | @@ -200,6 +201,15 @@ static void snd_virmidi_output_trigger(struct snd_rawmidi_substream *substream, |
510 | vmidi->event.type = SNDRV_SEQ_EVENT_NONE; |
511 | } |
512 | } |
513 | + if (!check_resched) |
514 | + continue; |
515 | + /* do temporary unlock & cond_resched() for avoiding |
516 | + * CPU soft lockup, which may happen via a write from |
517 | + * a huge rawmidi buffer |
518 | + */ |
519 | + spin_unlock_irqrestore(&substream->runtime->lock, flags); |
520 | + cond_resched(); |
521 | + spin_lock_irqsave(&substream->runtime->lock, flags); |
522 | } |
523 | out: |
524 | spin_unlock_irqrestore(&substream->runtime->lock, flags); |
525 | diff --git a/sound/pci/cs5535audio/cs5535audio.h b/sound/pci/cs5535audio/cs5535audio.h |
526 | index f4fcdf93f3c8..d84620a0c26c 100644 |
527 | --- a/sound/pci/cs5535audio/cs5535audio.h |
528 | +++ b/sound/pci/cs5535audio/cs5535audio.h |
529 | @@ -67,9 +67,9 @@ struct cs5535audio_dma_ops { |
530 | }; |
531 | |
532 | struct cs5535audio_dma_desc { |
533 | - u32 addr; |
534 | - u16 size; |
535 | - u16 ctlreserved; |
536 | + __le32 addr; |
537 | + __le16 size; |
538 | + __le16 ctlreserved; |
539 | }; |
540 | |
541 | struct cs5535audio_dma { |
542 | diff --git a/sound/pci/cs5535audio/cs5535audio_pcm.c b/sound/pci/cs5535audio/cs5535audio_pcm.c |
543 | index ee7065f6e162..326caec854e1 100644 |
544 | --- a/sound/pci/cs5535audio/cs5535audio_pcm.c |
545 | +++ b/sound/pci/cs5535audio/cs5535audio_pcm.c |
546 | @@ -158,8 +158,8 @@ static int cs5535audio_build_dma_packets(struct cs5535audio *cs5535au, |
547 | lastdesc->addr = cpu_to_le32((u32) dma->desc_buf.addr); |
548 | lastdesc->size = 0; |
549 | lastdesc->ctlreserved = cpu_to_le16(PRD_JMP); |
550 | - jmpprd_addr = cpu_to_le32(lastdesc->addr + |
551 | - (sizeof(struct cs5535audio_dma_desc)*periods)); |
552 | + jmpprd_addr = (u32)dma->desc_buf.addr + |
553 | + sizeof(struct cs5535audio_dma_desc) * periods; |
554 | |
555 | dma->substream = substream; |
556 | dma->period_bytes = period_bytes; |
557 | diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c |
558 | index 62fbdbe74b93..22c13ad6a9ae 100644 |
559 | --- a/sound/pci/hda/hda_intel.c |
560 | +++ b/sound/pci/hda/hda_intel.c |
561 | @@ -2205,7 +2205,7 @@ out_free: |
562 | */ |
563 | static struct snd_pci_quirk power_save_blacklist[] = { |
564 | /* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */ |
565 | - SND_PCI_QUIRK(0x1849, 0x0c0c, "Asrock B85M-ITX", 0), |
566 | + SND_PCI_QUIRK(0x1849, 0xc892, "Asrock B85M-ITX", 0), |
567 | /* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */ |
568 | SND_PCI_QUIRK(0x1043, 0x8733, "Asus Prime X370-Pro", 0), |
569 | /* https://bugzilla.redhat.com/show_bug.cgi?id=1572975 */ |
570 | diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c |
571 | index 88ce2f1022e1..16197ad4512a 100644 |
572 | --- a/sound/pci/hda/patch_conexant.c |
573 | +++ b/sound/pci/hda/patch_conexant.c |
574 | @@ -211,6 +211,7 @@ static void cx_auto_reboot_notify(struct hda_codec *codec) |
575 | struct conexant_spec *spec = codec->spec; |
576 | |
577 | switch (codec->core.vendor_id) { |
578 | + case 0x14f12008: /* CX8200 */ |
579 | case 0x14f150f2: /* CX20722 */ |
580 | case 0x14f150f4: /* CX20724 */ |
581 | break; |
582 | @@ -218,13 +219,14 @@ static void cx_auto_reboot_notify(struct hda_codec *codec) |
583 | return; |
584 | } |
585 | |
586 | - /* Turn the CX20722 codec into D3 to avoid spurious noises |
587 | + /* Turn the problematic codec into D3 to avoid spurious noises |
588 | from the internal speaker during (and after) reboot */ |
589 | cx_auto_turn_eapd(codec, spec->num_eapds, spec->eapds, false); |
590 | |
591 | snd_hda_codec_set_power_to_all(codec, codec->core.afg, AC_PWRST_D3); |
592 | snd_hda_codec_write(codec, codec->core.afg, 0, |
593 | AC_VERB_SET_POWER_STATE, AC_PWRST_D3); |
594 | + msleep(10); |
595 | } |
596 | |
597 | static void cx_auto_free(struct hda_codec *codec) |
598 | diff --git a/sound/pci/vx222/vx222_ops.c b/sound/pci/vx222/vx222_ops.c |
599 | index d4298af6d3ee..c0d0bf44f365 100644 |
600 | --- a/sound/pci/vx222/vx222_ops.c |
601 | +++ b/sound/pci/vx222/vx222_ops.c |
602 | @@ -275,7 +275,7 @@ static void vx2_dma_write(struct vx_core *chip, struct snd_pcm_runtime *runtime, |
603 | length >>= 2; /* in 32bit words */ |
604 | /* Transfer using pseudo-dma. */ |
605 | for (; length > 0; length--) { |
606 | - outl(cpu_to_le32(*addr), port); |
607 | + outl(*addr, port); |
608 | addr++; |
609 | } |
610 | addr = (u32 *)runtime->dma_area; |
611 | @@ -285,7 +285,7 @@ static void vx2_dma_write(struct vx_core *chip, struct snd_pcm_runtime *runtime, |
612 | count >>= 2; /* in 32bit words */ |
613 | /* Transfer using pseudo-dma. */ |
614 | for (; count > 0; count--) { |
615 | - outl(cpu_to_le32(*addr), port); |
616 | + outl(*addr, port); |
617 | addr++; |
618 | } |
619 | |
620 | @@ -313,7 +313,7 @@ static void vx2_dma_read(struct vx_core *chip, struct snd_pcm_runtime *runtime, |
621 | length >>= 2; /* in 32bit words */ |
622 | /* Transfer using pseudo-dma. */ |
623 | for (; length > 0; length--) |
624 | - *addr++ = le32_to_cpu(inl(port)); |
625 | + *addr++ = inl(port); |
626 | addr = (u32 *)runtime->dma_area; |
627 | pipe->hw_ptr = 0; |
628 | } |
629 | @@ -321,7 +321,7 @@ static void vx2_dma_read(struct vx_core *chip, struct snd_pcm_runtime *runtime, |
630 | count >>= 2; /* in 32bit words */ |
631 | /* Transfer using pseudo-dma. */ |
632 | for (; count > 0; count--) |
633 | - *addr++ = le32_to_cpu(inl(port)); |
634 | + *addr++ = inl(port); |
635 | |
636 | vx2_release_pseudo_dma(chip); |
637 | } |
638 | diff --git a/sound/pcmcia/vx/vxp_ops.c b/sound/pcmcia/vx/vxp_ops.c |
639 | index 8cde40226355..4c4ef1fec69f 100644 |
640 | --- a/sound/pcmcia/vx/vxp_ops.c |
641 | +++ b/sound/pcmcia/vx/vxp_ops.c |
642 | @@ -375,7 +375,7 @@ static void vxp_dma_write(struct vx_core *chip, struct snd_pcm_runtime *runtime, |
643 | length >>= 1; /* in 16bit words */ |
644 | /* Transfer using pseudo-dma. */ |
645 | for (; length > 0; length--) { |
646 | - outw(cpu_to_le16(*addr), port); |
647 | + outw(*addr, port); |
648 | addr++; |
649 | } |
650 | addr = (unsigned short *)runtime->dma_area; |
651 | @@ -385,7 +385,7 @@ static void vxp_dma_write(struct vx_core *chip, struct snd_pcm_runtime *runtime, |
652 | count >>= 1; /* in 16bit words */ |
653 | /* Transfer using pseudo-dma. */ |
654 | for (; count > 0; count--) { |
655 | - outw(cpu_to_le16(*addr), port); |
656 | + outw(*addr, port); |
657 | addr++; |
658 | } |
659 | vx_release_pseudo_dma(chip); |
660 | @@ -417,7 +417,7 @@ static void vxp_dma_read(struct vx_core *chip, struct snd_pcm_runtime *runtime, |
661 | length >>= 1; /* in 16bit words */ |
662 | /* Transfer using pseudo-dma. */ |
663 | for (; length > 0; length--) |
664 | - *addr++ = le16_to_cpu(inw(port)); |
665 | + *addr++ = inw(port); |
666 | addr = (unsigned short *)runtime->dma_area; |
667 | pipe->hw_ptr = 0; |
668 | } |
669 | @@ -425,12 +425,12 @@ static void vxp_dma_read(struct vx_core *chip, struct snd_pcm_runtime *runtime, |
670 | count >>= 1; /* in 16bit words */ |
671 | /* Transfer using pseudo-dma. */ |
672 | for (; count > 1; count--) |
673 | - *addr++ = le16_to_cpu(inw(port)); |
674 | + *addr++ = inw(port); |
675 | /* Disable DMA */ |
676 | pchip->regDIALOG &= ~VXP_DLG_DMAREAD_SEL_MASK; |
677 | vx_outb(chip, DIALOG, pchip->regDIALOG); |
678 | /* Read the last word (16 bits) */ |
679 | - *addr = le16_to_cpu(inw(port)); |
680 | + *addr = inw(port); |
681 | /* Disable 16-bit accesses */ |
682 | pchip->regDIALOG &= ~VXP_DLG_DMA16_SEL_MASK; |
683 | vx_outb(chip, DIALOG, pchip->regDIALOG); |