5.4.7-stable review
Subsystems (13)
Greg Kroah-Hartman
maintainerPATCH 315/434 crypto: virtio - deal with unsupported input sizes
In reply to Greg Kroah-HartmanFrom: Ard Biesheuvel <[email protected]>
[ Upstream commit 19c5da7d4a2662e85ea67d2d81df57e038fde3ab ]
Return -EINVAL for input sizes that are not a multiple of the AES block size, since they are not supported by our CBC chaining mode.
While at it, remove the pr_err() that reports unsupported key sizes being used: we shouldn't spam the kernel log with that.
--- drivers/crypto/virtio/virtio_crypto_algs.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/crypto/virtio/virtio_crypto_algs.c +10 -2
@@ -105,8 +105,6 @@ virtio_crypto_alg_validate_key(int key_len, uint32_t *alg) *alg =VIRTIO_CRYPTO_CIPHER_AES_CBC ;break ;default : -pr_err ("virtio_crypto: Unsupported key length: %d\n" , - key_len);return -EINVAL ; }return 0 ;
@@ -484,6 +482,11 @@ static int virtio_crypto_ablkcipher_encrypt(struct ablkcipher_request *req)/* Use the first data virtqueue as default */ struct data_queue *data_vq = &vcrypto->data_vq[0 ]; +if (!req->nbytes) +return 0 ; +if (req->nbytes %AES_BLOCK_SIZE ) +return -EINVAL ; + vc_req->dataq = data_vq; vc_req->alg_cb = virtio_crypto_dataq_sym_callback; vc_sym_req->ablkcipher_ctx = ctx;
@@ -504,6 +507,11 @@ static int virtio_crypto_ablkcipher_decrypt(struct ablkcipher_request *req)/* Use the first data virtqueue as default */ struct data_queue *data_vq = &vcrypto->data_vq[0 ]; +if (!req->nbytes) +return 0 ; +if (req->nbytes %AES_BLOCK_SIZE ) +return -EINVAL ; + vc_req->dataq = data_vq; vc_req->alg_cb = virtio_crypto_dataq_sym_callback; vc_sym_req->ablkcipher_ctx = ctx;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 10/434 net-sysfs: Call dev_hold always in rx_queue_add_kobject
In reply to Greg Kroah-HartmanFrom: Jouni Hogander <[email protected]>
[ Upstream commit ddd9b5e3e765d8ed5a35786a6cb00111713fe161 ]
Dev_hold has to be called always in rx_queue_add_kobject. Otherwise usage count drops below 0 in case of failure in kobject_init_and_add.
--- net/core/net-sysfs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
net/core/net-sysfs.c +5 -2
@@ -919,14 +919,17 @@ static int rx_queue_add_kobject(struct nstruct kobject *kobj = &queue->kobj;int error =0 ; +/* Kobject_put later will trigger rx_queue_release call which +* decreases dev refcount: Take that reference here +*/ +dev_hold (queue->dev); + kobj->kset = dev->queues_kset; error =kobject_init_and_add (kobj, &rx_queue_ktype,NULL ,"rx-%u" , index);if (error) goto err; -dev_hold (queue->dev); -if (dev->sysfs_rx_queue_group) { error =sysfs_create_group (kobj, dev->sysfs_rx_queue_group);if (error)
Greg Kroah-Hartman
maintainerPATCH 11/434 net: usb: lan78xx: Fix suspend/resume PHY register access error
In reply to Greg Kroah-HartmanFrom: Cristian Birsan <[email protected]>
[ Upstream commit 20032b63586ac6c28c936dff696981159913a13f ]
Lan78xx driver accesses the PHY registers through MDIO bus over USB connection. When performing a suspend/resume, the PHY registers can be accessed before the USB connection is resumed. This will generate an error and will prevent the device to resume correctly.
This patch adds the dependency between the MDIO bus and USB device to allow correct handling of suspend/resume.
--- drivers/net/usb/lan78xx.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/usb/lan78xx.c +1 -0
@@ -1808,6 +1808,7 @@ static int lan78xx_mdio_init(struct lan7 dev->mdiobus->read = lan78xx_mdiobus_read; dev->mdiobus->write = lan78xx_mdiobus_write; dev->mdiobus->name ="lan78xx-mdiobus" ; + dev->mdiobus->parent = &dev->udev->dev;snprintf (dev->mdiobus->id,MII_BUS_ID_SIZE ,"usb-%03d:%03d" , dev->udev->bus->busnum, dev->udev->devnum);
Greg Kroah-Hartman
maintainerPATCH 12/434 nfp: flower: fix stats id allocation
In reply to Greg Kroah-HartmanFrom: John Hurley <[email protected]>
[ Upstream commit 39f14c00b13c47186739a4cbc7a16e04d7fdbb60 ]
As flower rules are added, they are given a stats ID based on the number of rules that can be supported in firmware. Only after the initial allocation of all available IDs does the driver begin to reuse those that have been released.
The initial allocation of IDs was modified to account for multiple memory units on the offloaded device. However, this introduced a bug whereby the counter that controls the IDs could be decremented before the ID was assigned (where it is further decremented). This means that the stats ID could be assigned as -1/0xfffffff which is out of range.
Fix this by only decrementing the main counter after the current ID has been assigned.
--- drivers/net/ethernet/netronome/nfp/flower/metadata.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/ethernet/netronome/nfp/flower/metadata.c +6 -6
@@ -65,17 +65,17 @@ static int nfp_get_stats_entry(struct nf freed_stats_id = priv->stats_ring_size;/* Check for unallocated entries first. */ if (priv->stats_ids.init_unalloc >0 ) { -if (priv->active_mem_unit == priv->total_mem_units) { - priv->stats_ids.init_unalloc--; - priv->active_mem_unit =0 ; - } - *stats_context_id =FIELD_PREP (NFP_FL_STAT_ID_STAT , priv->stats_ids.init_unalloc -1 ) |FIELD_PREP (NFP_FL_STAT_ID_MU_NUM , priv->active_mem_unit); - priv->active_mem_unit++; + +if (++priv->active_mem_unit == priv->total_mem_units) { + priv->stats_ids.init_unalloc--; + priv->active_mem_unit =0 ; + } +return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 14/434 qede: Fix multicast mac configuration
In reply to Greg Kroah-HartmanFrom: Manish Chopra <[email protected]>
[ Upstream commit 0af67e49b018e7280a4227bfe7b6005bc9d3e442 ]
Driver doesn't accommodate the configuration for max number of multicast mac addresses, in such particular case it leaves the device with improper/invalid multicast configuration state, causing connectivity issues (in lacp bonding like scenarios).
--- drivers/net/ethernet/qlogic/qede/qede_filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/qlogic/qede/qede_filter.c +1 -1
@@ -1230,7 +1230,7 @@ qede_configure_mcast_filtering(struct nenetif_addr_lock_bh (ndev); mc_count =netdev_mc_count (ndev); -if (mc_count <64 ) { +if (mc_count <=64 ) {netdev_for_each_mc_addr (ha, ndev) {ether_addr_copy (temp, ha->addr); temp +=ETH_ALEN ;
Greg Kroah-Hartman
maintainerPATCH 16/434 sctp: fully initialize v4 addr in some functions
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
[ Upstream commit b6f3320b1d5267e7b583a6d0c88dda518101740c ]
Syzbot found a crash:
BUG: KMSAN: uninit-value in crc32_body lib/crc32.c:112 [inline]
BUG: KMSAN: uninit-value in crc32_le_generic lib/crc32.c:179 [inline]
BUG: KMSAN: uninit-value in __crc32c_le_base+0x4fa/0xd30 lib/crc32.c:202
Call Trace:
crc32_body lib/crc32.c:112 [inline]
crc32_le_generic lib/crc32.c:179 [inline]
__crc32c_le_base+0x4fa/0xd30 lib/crc32.c:202
chksum_update+0xb2/0x110 crypto/crc32c_generic.c:90
crypto_shash_update+0x4c5/0x530 crypto/shash.c:107
crc32c+0x150/0x220 lib/libcrc32c.c:47
sctp_csum_update+0x89/0xa0 include/net/sctp/checksum.h:36
__skb_checksum+0x1297/0x12a0 net/core/skbuff.c:2640
sctp_compute_cksum include/net/sctp/checksum.h:59 [inline]
sctp_packet_pack net/sctp/output.c:528 [inline]
sctp_packet_transmit+0x40fb/0x4250 net/sctp/output.c:597
sctp_outq_flush_transports net/sctp/outqueue.c:1146 [inline]
sctp_outq_flush+0x1823/0x5d80 net/sctp/outqueue.c:1194
sctp_outq_uncork+0xd0/0xf0 net/sctp/outqueue.c:757
sctp_cmd_interpreter net/sctp/sm_sideeffect.c:1781 [inline]
sctp_side_effects net/sctp/sm_sideeffect.c:1184 [inline]
sctp_do_sm+0x8fe1/0x9720 net/sctp/sm_sideeffect.c:1155
sctp_primitive_REQUESTHEARTBEAT+0x175/0x1a0 net/sctp/primitive.c:185
sctp_apply_peer_addr_params+0x212/0x1d40 net/sctp/socket.c:2433
sctp_setsockopt_peer_addr_params net/sctp/socket.c:2686 [inline]
sctp_setsockopt+0x189bb/0x19090 net/sctp/socket.c:4672The issue was caused by transport->ipaddr set with uninit addr param, which was passed by:
sctp_transport_init net/sctp/transport.c:47 [inline] sctp_transport_new+0x248/0xa00 net/sctp/transport.c:100 sctp_assoc_add_peer+0x5ba/0x2030 net/sctp/associola.c:611 sctp_process_param net/sctp/sm_make_chunk.c:2524 [inline]
where 'addr' is set by sctp_v4_from_addr_param(), and it doesn't initialize the padding of addr->v4.
Later when calling sctp_make_heartbeat(), hbinfo.daddr(=transport->ipaddr) will become the part of skb, and the issue occurs.
This patch is to fix it by initializing the padding of addr->v4 in sctp_v4_from_addr_param(), as well as other functions that do the similar thing, and these functions shouldn't trust that the caller initializes the memory, as Marcelo suggested.
--- net/sctp/protocol.c | 5 +++++ 1 file changed, 5 insertions(+)
net/sctp/protocol.c +5 -0
@@ -227,6 +227,7 @@ static void sctp_v4_from_skb(union sctp_ sa->sin_port = sh->dest; sa->sin_addr.s_addr =ip_hdr (skb)->daddr; } +memset (sa->sin_zero,0 ,sizeof (sa->sin_zero)); }/* Initialize an sctp_addr from a socket. */
@@ -235,6 +236,7 @@ static void sctp_v4_from_sk(union sctp_a addr->v4.sin_family =AF_INET ; addr->v4.sin_port =0 ; addr->v4.sin_addr.s_addr =inet_sk (sk)->inet_rcv_saddr; +memset (addr->v4.sin_zero,0 ,sizeof (addr->v4.sin_zero)); }/* Initialize sk->sk_rcv_saddr from sctp_addr. */
@@ -257,6 +259,7 @@ static void sctp_v4_from_addr_param(unio addr->v4.sin_family =AF_INET ; addr->v4.sin_port = port; addr->v4.sin_addr.s_addr = param->v4.addr.s_addr; +memset (addr->v4.sin_zero,0 ,sizeof (addr->v4.sin_zero)); }/* Initialize an address parameter from a sctp_addr and return the length
@@ -281,6 +284,7 @@ static void sctp_v4_dst_saddr(union sctp saddr->v4.sin_family =AF_INET ; saddr->v4.sin_port = port; saddr->v4.sin_addr.s_addr = fl4->saddr; +memset (saddr->v4.sin_zero,0 ,sizeof (saddr->v4.sin_zero)); }/* Compare two addresses exactly. */
@@ -303,6 +307,7 @@ static void sctp_v4_inaddr_any(union sct addr->v4.sin_family =AF_INET ; addr->v4.sin_addr.s_addr =htonl (INADDR_ANY ); addr->v4.sin_port = port; +memset (addr->v4.sin_zero,0 ,sizeof (addr->v4.sin_zero)); }/* Is this a wildcard address? */
Greg Kroah-Hartman
maintainerPATCH 15/434 sctp: fix memleak on err handling of stream initialization
In reply to Greg Kroah-HartmanFrom: Marcelo Ricardo Leitner <[email protected]>
[ Upstream commit 951c6db954a1adefab492f6da805decacabbd1a7 ]
syzbot reported a memory leak when an allocation fails within genradix_prealloc() for output streams. That's because genradix_prealloc() leaves initialized members initialized when the issue happens and SCTP stack will abort the current initialization but without cleaning up such members.
The fix here is to always call genradix_free() when genradix_prealloc() fails, for output and also input streams, as it suffers from the same issue.
--- net/sctp/stream.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
net/sctp/stream.c +6 -2
@@ -84,8 +84,10 @@ static int sctp_stream_alloc_out(structreturn 0 ; ret =genradix_prealloc (&stream->out, outcnt, gfp); -if (ret) +if (ret) { +genradix_free (&stream->out);return ret; + } stream->outcnt = outcnt;return 0 ;
@@ -100,8 +102,10 @@ static int sctp_stream_alloc_in(struct sreturn 0 ; ret =genradix_prealloc (&stream->in, incnt, gfp); -if (ret) +if (ret) { +genradix_free (&stream->in);return ret; + } stream->incnt = incnt;return 0 ;
Greg Kroah-Hartman
maintainerPATCH 3/434 mod_devicetable: fix PHY module format
In reply to Greg Kroah-HartmanFrom: Russell King <[email protected]>
[ Upstream commit d2ed49cf6c13e379c5819aa5ac20e1f9674ebc89 ]
When a PHY is probed, if the top bit is set, we end up requesting a module with the string "mdio:-10101110000000100101000101010001" - the top bit is printed to a signed -1 value. This leads to the module not being loaded.
Fix the module format string and the macro generating the values for it to ensure that we only print unsigned types and the top bit is always 0/1. We correctly end up with "mdio:10101110000000100101000101010001".
--- include/linux/mod_devicetable.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/mod_devicetable.h +2 -2
@@ -587,9 +587,9 @@ struct platform_device_id {#define MDIO_NAME_SIZE 32#define MDIO_MODULE_PREFIX "mdio:" -#define MDIO_ID_FMT "%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d" +#define MDIO_ID_FMT "%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u"#define MDIO_ID_ARGS (_id) \ - (_id)>>31, ((_id)>>30) & 1, ((_id)>>29) & 1, ((_id)>>28) & 1, \ + ((_id)>>31) & 1, ((_id)>>30) & 1, ((_id)>>29) & 1, ((_id)>>28) & 1, \ ((_id)>>27) & 1, ((_id)>>26) & 1, ((_id)>>25) & 1, ((_id)>>24) & 1, \ ((_id)>>23) & 1, ((_id)>>22) & 1, ((_id)>>21) & 1, ((_id)>>20) & 1, \ ((_id)>>19) & 1, ((_id)>>18) & 1, ((_id)>>17) & 1, ((_id)>>16) & 1, \
Greg Kroah-Hartman
maintainerPATCH 4/434 net: dst: Force 4-byte alignment of dst_metrics
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 258a980d1ec23e2c786e9536a7dd260bea74bae6 ]
When storing a pointer to a dst_metrics structure in dst_entry._metrics, two flags are added in the least significant bits of the pointer value. Hence this assumes all pointers to dst_metrics structures have at least 4-byte alignment.
However, on m68k, the minimum alignment of 32-bit values is 2 bytes, not 4 bytes. Hence in some kernel builds, dst_default_metrics may be only 2-byte aligned, leading to obscure boot warnings like:
WARNING: CPU: 0 PID: 7 at lib/refcount.c:28 refcount_warn_saturate+0x44/0x9a
refcount_t: underflow; use-after-free.
Modules linked in:
CPU: 0 PID: 7 Comm: ksoftirqd/0 Tainted: G W 5.5.0-rc2-atari-01448-g114a1a1038af891d-dirty #261
Stack from 10835e6c:
10835e6c 0038134f 00023fa6 00394b0f 0000001c 00000009 00321560 00023fea
00394b0f 0000001c 001a70f8 00000009 00000000 10835eb4 00000001 00000000
04208040 0000000a 00394b4a 10835ed4 00043aa8 001a70f8 00394b0f 0000001c
00000009 00394b4a 0026aba8 003215a4 00000003 00000000 0026d5a8 00000001
003215a4 003a4361 003238d6 000001f0 00000000 003215a4 10aa3b00 00025e84
003ddb00 10834000 002416a8 10aa3b00 00000000 00000080 000aa038 0004854a
Call Trace: [<00023fa6>] __warn+0xb2/0xb4
[<00023fea>] warn_slowpath_fmt+0x42/0x64
[<001a70f8>] refcount_warn_saturate+0x44/0x9a
[<00043aa8>] printk+0x0/0x18
[<001a70f8>] refcount_warn_saturate+0x44/0x9a
[<0026aba8>] refcount_sub_and_test.constprop.73+0x38/0x3e
[<0026d5a8>] ipv4_dst_destroy+0x5e/0x7e
[<00025e84>] __local_bh_enable_ip+0x0/0x8e
[<002416a8>] dst_destroy+0x40/0xaeFix this by forcing 4-byte alignment of all dst_metrics structures.
--- include/net/dst.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/dst.h +1 -1
@@ -82,7 +82,7 @@ struct dst_entry {struct dst_metrics {u32 metrics[RTAX_MAX ];refcount_t refcnt; -}; +}__aligned(4) ;/* Low pointer bits contain DST_METRICS_FLAGS */ extern const struct dst_metrics dst_default_metrics;u32 *dst_cow_metrics_generic (struct dst_entry *dst,unsigned long old);
Greg Kroah-Hartman
maintainerPATCH 6/434 net: hisilicon: Fix a BUG trigered by wrong bytes_compl
In reply to Greg Kroah-HartmanFrom: Jiangfeng Xiao <[email protected]>
[ Upstream commit 90b3b339364c76baa2436445401ea9ade040c216 ]
When doing stress test, we get the following trace:
kernel BUG at lib/dynamic_queue_limits.c:26!
Internal error: Oops - BUG: 0 [#1] SMP ARM Modules linked in: hip04_eth CPU: 0 PID: 2003 Comm: tDblStackPcap0 Tainted: G O L 4.4.197 #1 Hardware name: Hisilicon A15 task: c3637668 task.stack: de3bc000 PC is at dql_completed+0x18/0x154 LR is at hip04_tx_reclaim+0x110/0x174 [hip04_eth] pc : [<c041abfc>] lr : [<bf0003a8>] psr: 800f0313
sp : de3bdc2c ip : 00000000 fp : c020fb10
r10: 00000000 r9 : c39b4224 r8 : 00000001
r7 : 00000046 r6 : c39b4000 r5 : 0078f392 r4 : 0078f392 r3 : 00000047 r2 : 00000000 r1 : 00000046 r0 : df5d5c80
Flags: Nzcv IRQs on FIQs on Mode SVC_32 ISA ARM Segment user
Control: 32c5387d Table: 1e189b80 DAC: 55555555 Process tDblStackPcap0 (pid: 2003, stack limit = 0xde3bc190)
Stack: (0xde3bdc2c to 0xde3be000) [<c041abfc>] (dql_completed) from [<bf0003a8>] (hip04_tx_reclaim+0x110/0x174 [hip04_eth]) [<bf0003a8>] (hip04_tx_reclaim [hip04_eth]) from [<bf0012c0>] (hip04_rx_poll+0x20/0x388 [hip04_eth]) [<bf0012c0>] (hip04_rx_poll [hip04_eth]) from [<c04c8d9c>] (net_rx_action+0x120/0x374) [<c04c8d9c>] (net_rx_action) from [<c021eaf4>] (__do_softirq+0x218/0x318) [<c021eaf4>] (__do_softirq) from [<c021eea0>] (irq_exit+0x88/0xac) [<c021eea0>] (irq_exit) from [<c0240130>] (msa_irq_exit+0x11c/0x1d4) [<c0240130>] (msa_irq_exit) from [<c0267ba8>] (__handle_domain_irq+0x110/0x148) [<c0267ba8>] (__handle_domain_irq) from [<c0201588>] (gic_handle_irq+0xd4/0x118) [<c0201588>] (gic_handle_irq) from [<c0558360>] (__irq_svc+0x40/0x58) Exception stack(0xde3bdde0 to 0xde3bde28)
dde0: 00000000 00008001 c3637668 00000000 00000000 a00f0213 dd3627a0 c0af6380
de00: c086d380 a00f0213 c0a22a50 de3bde6c 00000002 de3bde30 c0558138 c055813c
de20: 600f0213 ffffffff
[<c0558360>] (__irq_svc) from [<c055813c>] (_raw_spin_unlock_irqrestore+0x44/0x54)
Kernel panic - not syncing: Fatal exception in interrupt
Pre-modification code:
int hip04_mac_start_xmit(struct sk_buff *skb, struct net_device *ndev) {
[...]
[1] priv->tx_head = TX_NEXT(tx_head);
[2] count++;
[3] netdev_sent_queue(ndev, skb->len);
[...]
}
An rx interrupt occurs if hip04_mac_start_xmit just executes to the line 2, tx_head has been updated, but corresponding 'skb->len' has not been added to dql_queue.
And then hip04_mac_interrupt->__napi_schedule->hip04_rx_poll->hip04_tx_reclaim
In hip04_tx_reclaim, because tx_head has been updated, bytes_compl will plus an additional "skb-> len"
which has not been added to dql_queue. And then
trigger the BUG_ON(bytes_compl > num_queued - dql->num_completed).
To solve the problem described above, we put
"netdev_sent_queue(ndev, skb->len);"
before
"priv->tx_head = TX_NEXT(tx_head);"
--- drivers/net/ethernet/hisilicon/hip04_eth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hip04_eth.c +1 -1
@@ -543,9 +543,9 @@ hip04_mac_start_xmit(struct sk_buff *skbskb_tx_timestamp (skb);hip04_set_xmit_desc (priv, phys); - priv->tx_head =TX_NEXT (tx_head); count++;netdev_sent_queue (ndev, skb->len); + priv->tx_head =TX_NEXT (tx_head); stats->tx_bytes += skb->len; stats->tx_packets++;
Greg Kroah-Hartman
maintainerPATCH 7/434 net: nfc: nci: fix a possible sleep-in-atomic-context bug in nci_uart_tty_receive()
In reply to Greg Kroah-HartmanFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit b7ac893652cafadcf669f78452329727e4e255cc ]
The kernel may sleep while holding a spinlock.
The function call path (from bottom to top) in Linux 4.19 is:
net/nfc/nci/uart.c, 349:
nci_skb_alloc in nci_uart_default_recv_bufnet/nfc/nci/uart.c, 255:
(FUNC_PTR)nci_uart_default_recv_buf in nci_uart_tty_receivenet/nfc/nci/uart.c, 254:
spin_lock in nci_uart_tty_receive
nci_skb_alloc(GFP_KERNEL) can sleep at runtime. (FUNC_PTR) means a function pointer is called.
To fix this bug, GFP_KERNEL is replaced with GFP_ATOMIC for nci_skb_alloc().
This bug is found by a static analysis tool STCheck written by myself.
--- net/nfc/nci/uart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/nfc/nci/uart.c +1 -1
@@ -346,7 +346,7 @@ static int nci_uart_default_recv_buf(str nu->rx_packet_len =-1 ; nu->rx_skb =nci_skb_alloc (nu->ndev,NCI_MAX_PACKET_SIZE , -GFP_KERNEL ); +GFP_ATOMIC );if (!nu->rx_skb)return -ENOMEM ; }
Greg Kroah-Hartman
maintainerPATCH 8/434 net: phy: ensure that phy IDs are correctly typed
In reply to Greg Kroah-HartmanFrom: Russell King <[email protected]>
[ Upstream commit 7d49a32a66d2215c5b3bf9bc67c9036ea9904111 ]
PHY IDs are 32-bit unsigned quantities. Ensure that they are always treated as such, and not passed around as "int"s.
--- drivers/net/phy/phy_device.c | 8 ++++---- include/linux/phy.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/net/phy/phy_device.c +4 -4
@@ -552,7 +552,7 @@ static const struct device_type mdio_bus .pm = MDIO_BUS_PHY_PM_OPS, }; -static int phy_request_driver_module (struct phy_device *dev,int phy_id) +static int phy_request_driver_module (struct phy_device *dev,u32 phy_id) {int ret;
@@ -564,15 +564,15 @@ static int phy_request_driver_module(str* then modprobe isn't available. */ if (IS_ENABLED (CONFIG_MODULES ) && ret <0 && ret != -ENOENT ) { -phydev_err (dev,"error %d loading PHY driver module for ID 0x%08x\n" , - ret, phy_id); +phydev_err (dev,"error %d loading PHY driver module for ID 0x%08lx\n" , + ret, (unsigned long )phy_id);return ret; }return 0 ; } -struct phy_device *phy_device_create (struct mii_bus *bus,int addr,int phy_id, +struct phy_device *phy_device_create (struct mii_bus *bus,int addr,u32 phy_id,bool is_c45,struct phy_c45_device_ids *c45_ids) {
include/linux/phy.h +1 -1
@@ -993,7 +993,7 @@ int phy_modify_paged_changed(struct phy_int phy_modify_paged (struct phy_device *phydev,int page,u32 regnum,u16 mask,u16 set); -struct phy_device *phy_device_create (struct mii_bus *bus,int addr,int phy_id, +struct phy_device *phy_device_create (struct mii_bus *bus,int addr,u32 phy_id,bool is_c45,struct phy_c45_device_ids *c45_ids);#if IS_ENABLED (CONFIG_PHYLIB )
Greg Kroah-Hartman
maintainerPATCH 5/434 net: gemini: Fix memory leak in gmac_setup_txqs
In reply to Greg Kroah-HartmanFrom: Navid Emamdoost <[email protected]>
[ Upstream commit f37f710353677639bc5d37ee785335994adf2529 ]
In the implementation of gmac_setup_txqs() the allocated desc_ring is leaked if TX queue base is not aligned. Release it via dma_free_coherent.
--- drivers/net/ethernet/cortina/gemini.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/cortina/gemini.c +2 -0
@@ -576,6 +576,8 @@ static int gmac_setup_txqs(struct net_deif (port->txq_dma_base & ~DMA_Q_BASE_MASK ) {dev_warn (geth->dev,"TX queue base is not aligned\n" ); +dma_free_coherent (geth->dev, len *sizeof (*desc_ring), + desc_ring, port->txq_dma_base);kfree (skb_tab);return -ENOMEM ; }
Greg Kroah-Hartman
maintainerPATCH 9/434 net: qlogic: Fix error paths in ql_alloc_large_buffers()
In reply to Greg Kroah-HartmanFrom: Ben Hutchings <[email protected]>
[ Upstream commit cad46039e4c99812db067c8ac22a864960e7acc4 ]
ql_alloc_large_buffers() has the usual RX buffer allocation loop where it allocates skbs and maps them for DMA. It also treats failure as a fatal error.
There are (at least) three bugs in the error paths:
1. ql_free_large_buffers() assumes that the lrg_buf[] entry for the first buffer that couldn't be allocated will have .skb == NULL. But the qla_buf[] array is not zero-initialised.
2. ql_free_large_buffers() DMA-unmaps all skbs in lrg_buf[]. This is incorrect for the last allocated skb, if DMA mapping failed.
3. Commit 1acb8f2a7a9f ("net: qlogic: Fix memory leak in ql_alloc_large_buffers") added a direct call to dev_kfree_skb_any() after the skb is recorded in lrg_buf[], so ql_free_large_buffers() will double-free it.
The bugs are somewhat inter-twined, so fix them all at once:
* Clear each entry in qla_buf[] before attempting to allocate an skb for it. This goes half-way to fixing bug 1.
* Set the .skb field only after the skb is DMA-mapped. This fixes the rest.
--- drivers/net/ethernet/qlogic/qla3xxx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/qlogic/qla3xxx.c +4 -4
@@ -2756,6 +2756,9 @@ static int ql_alloc_large_buffers(structint err;for (i =0 ; i < qdev->num_large_buffers; i++) { + lrg_buf_cb = &qdev->lrg_buf[i]; +memset (lrg_buf_cb,0 ,sizeof (struct ql_rcv_buf_cb )); + skb =netdev_alloc_skb (qdev->ndev, qdev->lrg_buffer_len);if (unlikely (!skb)) {
@@ -2766,11 +2769,7 @@ static int ql_alloc_large_buffers(structql_free_large_buffers (qdev);return -ENOMEM ; }else { - - lrg_buf_cb = &qdev->lrg_buf[i]; -memset (lrg_buf_cb,0 ,sizeof (struct ql_rcv_buf_cb )); lrg_buf_cb->index = i; - lrg_buf_cb->skb = skb;/* * We save some space to copy the ethhdr from first * buffer
@@ -2792,6 +2791,7 @@ static int ql_alloc_large_buffers(structreturn -ENOMEM ; } + lrg_buf_cb->skb = skb;dma_unmap_addr_set (lrg_buf_cb, mapaddr, map); dma_unmap_len_set(lrg_buf_cb, maplen, qdev->lrg_buffer_len -
Greg Kroah-Hartman
maintainercover 5.4.7-stable review
This is the start of the stable review cycle for the 5.4.7 release. There are 434 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Tue, 31 Dec 2019 17:25:52 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.7-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.4.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.4.7-rc1
Luca Coelho <[email protected]>
iwlwifi: pcie: move power gating workaround earlier in the flow
Mike Christie <[email protected]>
nbd: fix shutdown and recv work deadlock v2
Adrian Hunter <[email protected]>
mmc: sdhci: Add a quirk for broken command queuing
Adrian Hunter <[email protected]>
mmc: sdhci: Workaround broken command queuing on Intel GLK
Yangbo Lu <[email protected]>
mmc: sdhci-of-esdhc: fix P2020 errata handling
Faiz Abbas <[email protected]>
mmc: sdhci: Update the tuning failed messages to pr_debug level
Rasmus Villemoes <[email protected]>
mmc: sdhci-of-esdhc: Revert "mmc: sdhci-of-esdhc: add erratum A-009204 support"
Veerabhadrarao Badiganti <[email protected]>
mmc: sdhci-msm: Correct the offset and value for DDR_CONFIG register
Frederic Barrat <[email protected]>
ocxl: Fix concurrent AFU open and device removal
Christophe Leroy <[email protected]>
powerpc/irq: fix stack overflow verification
Srikar Dronamraju <[email protected]>
powerpc/vcpu: Assume dedicated processors as non-preempt
Jan H. Schönherr <[email protected]>
x86/mce: Fix possibly incorrect severity calculation on AMD
Yazen Ghannam <[email protected]>
x86/MCE/AMD: Allow Reserved types to be overwritten in smca_banks[]
Konstantin Khlebnikov <[email protected]>
x86/MCE/AMD: Do not use rdmsr_safe_on_cpu() in smca_configure()
Kai-Heng Feng <[email protected]>
x86/intel: Disable HPET on Intel Coffee Lake H platforms
Will Deacon <[email protected]>
KVM: arm64: Ensure 'params' is initialised when looking up sys register
Marc Zyngier <[email protected]>
KVM: arm/arm64: Properly handle faulting of device mappings
Jim Mattson <[email protected]>
kvm: x86: Host feature SSBD doesn't imply guest feature AMD_SSBD
Jim Mattson <[email protected]>
kvm: x86: Host feature SSBD doesn't imply guest feature SPEC_CTRL_SSBD
Marcus Comstedt <[email protected]>
KVM: PPC: Book3S HV: Fix regression on big endian hosts
Tejun Heo <[email protected]>
iocost: over-budget forced IOs should schedule async delay
Theodore Ts'o <[email protected]>
ext4: validate the debug_want_extra_isize mount option at parse time
Dan Carpenter <[email protected]>
ext4: unlock on error in ext4_expand_extra_isize()
Jan Kara <[email protected]>
ext4: check for directory entries too close to block end
Jan Kara <[email protected]>
ext4: fix ext4_empty_dir() for directories with holes
Peng Fan <[email protected]>
clk: imx: pll14xx: fix clk_pll14xx_wait_lock
Peng Fan <[email protected]>
clk: imx: clk-composite-8m: add lock to gate/mux
Peng Fan <[email protected]>
clk: imx: clk-imx7ulp: Add missing sentinel of ulp_div_table
Hans de Goede <[email protected]>
pinctrl: baytrail: Really serialize all register accesses
Yonghan Ye <[email protected]>
serial: sprd: Add clearing break interrupt operation
David Engraf <[email protected]>
tty/serial: atmel: fix out of range clock divider handling
Ian Abbott <[email protected]>
staging: comedi: gsc_hpdi: check dma_alloc_coherent() return value
Hans de Goede <[email protected]>
platform/x86: hp-wmi: Make buffer for HPWMI_FEATURE2_QUERY 128 bytes
Alexander Shishkin <[email protected]>
intel_th: msu: Fix window switching without windows
Alexander Shishkin <[email protected]>
intel_th: Fix freeing IRQs
Alexander Shishkin <[email protected]>
intel_th: pci: Add Elkhart Lake SOC support
Alexander Shishkin <[email protected]>
intel_th: pci: Add Comet Lake PCH-V support
Erkka Talvitie <[email protected]>
USB: EHCI: Do not return -EPIPE when hub is disconnected
Yang Shi <[email protected]>
mm: vmscan: protect shrinker idr replace with CONFIG_MEMCG
Eric Biggers <[email protected]>
KEYS: asymmetric: return ENOMEM if akcipher_request_alloc() fails
Rafael J. Wysocki <[email protected]>
cpufreq: Avoid leaving stale IRQ work items during CPU offline
Ard Biesheuvel <[email protected]>
efi/memreserve: Register reservations as 'reserved' in /proc/iomem
Christophe Leroy <[email protected]>
spi: fsl: use platform_get_irq() instead of of_irq_to_resource()
Christophe Leroy <[email protected]>
spi: fsl: don't map irq during probe
Suwan Kim <[email protected]>
usbip: Fix error path of vhci_recv_ret_submit()
Suwan Kim <[email protected]>
usbip: Fix receive error in vhci-hcd when using scatter-gather
Joakim Zhang <[email protected]>
can: flexcan: add low power enter/exit acknowledgment helper
Tony Lindgren <[email protected]>
ARM: dts: Fix vcsi regulator to be always-on for droid4 to prevent hangs
Sven Schnelle <[email protected]>
s390/ftrace: fix endless recursion in function_graph tracer
Yufen Yu <[email protected]>
md: avoid invalid memory access for array sb->dev_roles
Bernard Metzler <[email protected]>
RDMA/siw: Fix post_recv QP state locking
Bjorn Andersson <[email protected]>
ath10k: Revert "ath10k: add cleanup in ath10k_sta_state()"
Colin Ian King <[email protected]>
drm/amdgpu: fix uninitialized variable pasid_mapping_needed
Guenter Roeck <[email protected]>
usb: xhci: Fix build warning seen with CONFIG_PM=n
Charles Keepax <[email protected]>
spi: cadence: Correct handling of native chipselect
Charles Keepax <[email protected]>
spi: dw: Correct handling of native chipselect
Thadeu Lima de Souza Cascardo <[email protected]>
selftests: net: tls: remove recv_rcvbuf test
Xiaolong Huang <[email protected]>
can: kvaser_usb: kvaser_usb_leaf: Fix some info-leaks to USB devices
Joakim Zhang <[email protected]>
can: flexcan: poll MCR_LPM_ACK instead of GPR ACK for stop mode acknowledgment
Sean Nyekjaer <[email protected]>
can: flexcan: fix possible deadlock and out-of-order reception after wakeup
Oleksij Rempel <[email protected]>
can: j1939: j1939_sk_bind(): take priv after lock is held
Sean Nyekjaer <[email protected]>
can: m_can: tcan4x5x: add required delay after reset
Srinivas Neeli <[email protected]>
can: xilinx_can: Fix missing Rx can packets on CANFD2.0
Jerry Snitselaar <[email protected]>
iommu/vt-d: Allocate reserved region for ISA with correct permission
Alex Williamson <[email protected]>
iommu/vt-d: Set ISA bridge reserved region as relaxable
Lu Baolu <[email protected]>
iommu/vt-d: Fix dmar pte read access not set error
Jerry Snitselaar <[email protected]>
iommu: set group default domain before creating direct mappings
Eric Auger <[email protected]>
iommu: fix KASAN use-after-free in iommu_insert_resv_region
Tadeusz Struk <[email protected]>
tpm: fix invalid locking in NONBLOCKING mode
Jerry Snitselaar <[email protected]>
tpm_tis: reserve chip for duration of tpm_tis_core_init
Chaotian Jing <[email protected]>
mmc: mediatek: fix CMD_TA to 2 for MT8173 HS200/HS400 mode
Faiz Abbas <[email protected]>
Revert "mmc: sdhci: Fix incorrect switch to HS mode"
Omar Sandoval <[email protected]>
btrfs: don't prematurely free work in scrub_missing_raid56_worker()
Omar Sandoval <[email protected]>
btrfs: don't prematurely free work in reada_start_machine_worker()
Paul Burton <[email protected]>
MIPS: futex: Restore \n after sync instructions
Alexander Lobakin <[email protected]>
net: wireless: intel: iwlwifi: fix GRO_NORMAL packet stalling
Thomas Falcon <[email protected]>
ibmvnic: Fix completion structure initialization
Luke Starrett <[email protected]>
RDMA/bnxt_re: Fix chip number validation Broadcom's Gen P5 series
Yonghong Song <[email protected]>
bpf: Provide better register bounds after jmp32 instructions
Devesh Sharma <[email protected]>
RDMA/bnxt_re: Fix stat push into dma buffer on gen p5 devices
Devesh Sharma <[email protected]>
RDMA/bnxt_re: Fix missing le16_to_cpu
Quentin Monnet <[email protected]>
tools, bpf: Fix build for 'make -s tools/bpf O=<dir>'
Russell King <[email protected]>
net: phy: initialise phydev speed and duplex sanely
Brett Creeley <[email protected]>
ice: Fix setting coalesce to handle DCB configuration
Akeem G Abodunrin <[email protected]>
ice: Only disable VF state when freeing each VF resources
Sam Bobroff <[email protected]>
drm/amdgpu: fix bad DMA from INTERRUPT_CNTL2
Mike Rapoport <[email protected]>
mips: fix build when "48 bits virtual memory" is enabled
Hewenliang <[email protected]>
libtraceevent: Fix memory leakage in copy_filter_type
Michael Ellerman <[email protected]>
crypto: vmx - Avoid weird build failures
Thomas Pedersen <[email protected]>
mac80211: consider QoS Null frames for STA_NULLFUNC_ACKED
Corentin Labbe <[email protected]>
crypto: sun4i-ss - Fix 64-bit size_t warnings on sun4i-ss-hash.c
Herbert Xu <[email protected]>
crypto: sun4i-ss - Fix 64-bit size_t warnings
Thomas Richter <[email protected]>
s390/cpumf: Adjust registration of s390 PMU device drivers
Lorenzo Bianconi <[email protected]>
mt76: fix possible out-of-bound access in mt7615_fill_txs/mt7603_fill_txs
Grygorii Strashko <[email protected]>
net: ethernet: ti: ale: clean ale tbl on init and intf restart
Shengjiu Wang <[email protected]>
ASoC: soc-pcm: check symmetry before hw_params
Andy Shevchenko <[email protected]>
fbtft: Make sure string is NULL terminated
Johannes Berg <[email protected]>
iwlwifi: check kasprintf() return value
Michael Chan <[email protected]>
bnxt_en: Improve RX buffer error handling.
Vasily Gorbik <[email protected]>
s390/kasan: support memcpy_real with TRACE_IRQFLAGS
YueHaibing <[email protected]>
s390/crypto: Fix unsigned variable compared with zero
Alexey Budankov <[email protected]>
perf session: Fix decompression of PERF_RECORD_COMPRESSED records
Rafał Miłecki <[email protected]>
brcmfmac: remove monitor interface when detaching
Luigi Rizzo <[email protected]>
net-af_xdp: Use correct number of channels from ethtool
Adrian Hunter <[email protected]>
x86/insn: Add some Intel instructions to the opcode map
Hans de Goede <[email protected]>
ASoC: Intel: bytcr_rt5640: Update quirk for Acer Switch 10 SW5-012 2-in-1
Linus Walleij <[email protected]>
firmware_loader: Fix labels with comma for builtin firmware
Russell King <[email protected]>
net: phy: avoid matching all-ones clause 45 PHY IDs
Vasundhara Volam <[email protected]>
bnxt_en: Return proper error code for non-existent NVM variable
Yonghong Song <[email protected]>
selftests, bpf: Workaround an alu32 sub-register spilling issue
Jiri Benc <[email protected]>
selftests, bpf: Fix test_tc_tunnel hanging
Alexander Shishkin <[email protected]>
perf/core: Fix the mlock accounting, again
Chuhong Yuan <[email protected]>
ASoC: wm5100: add missed pm_runtime_disable
Chuhong Yuan <[email protected]>
spi: st-ssc4: add missed pm_runtime_disable
Chuhong Yuan <[email protected]>
ASoC: wm2200: add missed operations in remove and probe failure
Valentin Schneider <[email protected]>
sched/uclamp: Fix overzealous type replacement
Omar Sandoval <[email protected]>
btrfs: don't prematurely free work in run_ordered_work()
Omar Sandoval <[email protected]>
btrfs: don't prematurely free work in end_workqueue_fn()
Eugeniu Rosca <[email protected]>
mmc: tmio: Add MMC_CAP_ERASE to allow erase/discard/trim requests
Ard Biesheuvel <[email protected]>
crypto: virtio - deal with unsupported input sizes
Mika Westerberg <[email protected]>
xhci-pci: Allow host runtime PM as default also for Intel Ice Lake xHCI
Petar Penkov <[email protected]>
tun: fix data-race in gro_normal_list()
Chuhong Yuan <[email protected]>
spi: tegra20-slink: add missed clk_unprepare
Pascal Paillet <[email protected]>
regulator: core: Let boot-on regulators be powered off
Michael Walle <[email protected]>
ASoC: wm8904: fix regcache handling
Wang Xuerui <[email protected]>
iwlwifi: mvm: fix unaligned read of rx_pkt_status
Andrea Righi <[email protected]>
bcache: fix deadlock in bcache_allocator
Masami Hiramatsu <[email protected]>
tracing/kprobe: Check whether the non-suffixed symbol is notrace
Sergio Paracuellos <[email protected]>
MIPS: ralink: enable PCI support only if driver for mt7621 SoC is selected
Yuming Han <[email protected]>
tracing: use kvcalloc for tgid_map array allocation
Gal Pressman <[email protected]>
RDMA/efa: Clear the admin command buffer prior to its submission
Sergey Matyukevich <[email protected]>
qtnfmac: fix using skb after free
Lianbo Jiang <[email protected]>
x86/crash: Add a forward declaration of struct kimage
Sergey Matyukevich <[email protected]>
qtnfmac: fix invalid channel information output
Sergey Matyukevich <[email protected]>
qtnfmac: fix debugfs support for multiple cards
Viresh Kumar <[email protected]>
cpufreq: Register drivers only after CPU devices have been registered
Coly Li <[email protected]>
bcache: fix static checker warning in bcache_device_free()
Sudip Mukherjee <[email protected]>
parport: load lowlevel driver if ports not found
Eduard Hasenleithner <[email protected]>
nvme: Discard workaround for non-conformant devices
Mao Wenan <[email protected]>
net: ethernet: ti: Add dependency for TI_DAVINCI_EMAC
Ilya Leoshkevich <[email protected]>
s390/disassembler: don't hide instruction addresses
Heiner Kallweit <[email protected]>
r8169: respect EEE user setting when restarting network
Vladimir Oltean <[email protected]>
net: dsa: sja1105: Disallow management xmit during switch reset
Yu-Hsuan Hsu <[email protected]>
ASoC: Intel: kbl_rt5663_rt5514_max98927: Add dmic format constraint
Yonghong Song <[email protected]>
bpf, testing: Workaround a verifier failure for test_progs
Stefan Popa <[email protected]>
iio: dac: ad5446: Add support for new AD5600 DAC
Ben Zhang <[email protected]>
ASoC: rt5677: Mark reg RT5677_PWR_ANLG2 as volatile
Chuhong Yuan <[email protected]>
spi: pxa2xx: Add missed security checks
Hans Verkuil <[email protected]>
media: vim2m: media_device_cleanup was called too early
Hans Verkuil <[email protected]>
media: vicodec: media_device_cleanup was called too early
Robert Richter <[email protected]>
EDAC/ghes: Fix grain calculation
Gwendal Grignou <[email protected]>
iio: cros_ec_baro: set info_mask_shared_by_all_available field
Pi-Hsun Shih <[email protected]>
media: v4l2-ctrl: Lock main_hdl on operations of requests_queued.
Jernej Skrabec <[email protected]>
media: cedrus: Use helpers to access capture queue
Chuhong Yuan <[email protected]>
media: si470x-i2c: add missed operations in remove
Mitch Williams <[email protected]>
ice: delay less
Herbert Xu <[email protected]>
crypto: atmel - Fix authenc support when it is set to m
Pierre-Louis Bossart <[email protected]>
soundwire: intel: fix PDI/stream mapping for Bulk
Mike Isely <[email protected]>
media: pvrusb2: Fix oops on tear-down when radio support is not present
Masami Hiramatsu <[email protected]>
selftests: net: Fix printf format warnings on arm
Andrew Jeffery <[email protected]>
fsi: core: Fix small accesses and unaligned offsets via sysfs
Miaoqing Pan <[email protected]>
ath10k: fix get invalid tx rate for Mesh metric
Seung-Woo Kim <[email protected]>
media: exynos4-is: fix wrong mdev and v4l2 dev order in error path
Andrey Grodzovsky <[email protected]>
drm/amdgpu: Avoid accidental thread reactivation.
Masami Hiramatsu <[email protected]>
selftests: proc: Make va_max 1MB
Honglei Wang <[email protected]>
cgroup: freezer: don't change task and cgroups status unnecessarily
Ilya Leoshkevich <[email protected]>
s390/bpf: Use kvcalloc for addrs array
Andrii Nakryiko <[email protected]>
libbpf: Fix negative FD close() in xsk_setup_xdp_prog()
Masami Hiramatsu <[email protected]>
perf probe: Filter out instances except for inlined subroutine and subprogram
Masami Hiramatsu <[email protected]>
perf probe: Skip end-of-sequence and non statement lines
Masami Hiramatsu <[email protected]>
perf probe: Fix to show calling lines of inlined functions
Masami Hiramatsu <[email protected]>
perf probe: Return a better scope DIE if there is no best scope
Eric Dumazet <[email protected]>
net: avoid potential false sharing in neighbor related code
Masami Hiramatsu <[email protected]>
perf probe: Skip overlapped location on searching variables
Ian Rogers <[email protected]>
perf parse: If pmu configuration fails free terms
Jason Gunthorpe <[email protected]>
xen/gntdev: Use select for DMA_SHARED_BUFFER
Michal Swiatkowski <[email protected]>
ice: Check for null pointer dereference when setting rings
Pan Bian <[email protected]>
drm/amdgpu: fix potential double drop fence reference
Raul E Rangel <[email protected]>
drm/amd/powerplay: fix struct init in renoir_print_clk_levels
Hawking Zhang <[email protected]>
drm/amdgpu: disallow direct upload save restore list from gfx driver
Ian Rogers <[email protected]>
perf tools: Splice events onto evlist even on error
John Garry <[email protected]>
perf tools: Fix cross compile for ARM64
Masami Hiramatsu <[email protected]>
perf probe: Fix to probe a function which has no entry pc
James Clark <[email protected]>
libsubcmd: Use -O0 with DEBUG=1
Masami Hiramatsu <[email protected]>
perf probe: Fix to show inlined function callsite without entry_pc
Masami Hiramatsu <[email protected]>
perf probe: Fix to show ranges of variables in functions without entry_pc
Masami Hiramatsu <[email protected]>
perf probe: Fix to probe an inline function which has no entry pc
Masami Hiramatsu <[email protected]>
perf probe: Walk function lines in lexical blocks
Yunfeng Ye <[email protected]>
perf jevents: Fix resource leak in process_mapfile() and main()
Masami Hiramatsu <[email protected]>
perf probe: Fix to list probe event with correct line number
Leo Yan <[email protected]>
perf cs-etm: Fix definition of macro TO_CS_QUEUE_NR
Masami Hiramatsu <[email protected]>
perf probe: Fix to find range-only function instance
Ping-Ke Shih <[email protected]>
rtlwifi: fix memory leak in rtl92c_set_fw_rsvdpagepkt()
Sharat Masetty <[email protected]>
drm: msm: a6xx: fix debug bus register configuration
Kamal Heib <[email protected]>
RDMA/core: Fix return code when modify_port isn't supported
Takashi Iwai <[email protected]>
ALSA: timer: Limit max amount of slave instances
Pan Bian <[email protected]>
spi: img-spfi: fix potential double release
Manish Chopra <[email protected]>
bnx2x: Fix PF-VF communication over multi-cos queues.
Thor Thayer <[email protected]>
spi: dw: Fix Designware SPI loopback
Hans Verkuil <[email protected]>
media: vivid: media_device_cleanup was called too early
Ranjani Sridharan <[email protected]>
ASoC: SOF: topology: set trigger order for FE DAI link
Sebastian Reichel <[email protected]>
nvmem: core: fix nvmem_cell_write inline function
Lucas Stach <[email protected]>
nvmem: imx-ocotp: reset error status on probe
Fabio Estevam <[email protected]>
media: staging/imx: Use a shorter name for driver
Max Gurtovoy <[email protected]>
nvme: introduce "Command Aborted By host" status code
Vandana BN <[email protected]>
media: v4l2-core: fix touch support in v4l_g_fmt
Kangjie Lu <[email protected]>
media: rcar_drif: fix a memory disclosure
Ondrej Jirman <[email protected]>
cpufreq: sun50i: Fix CPU speed bin detection
Manjunath Patil <[email protected]>
ixgbe: protect TX timestamping from API misuse
Ben Dooks (Codethink) <[email protected]>
pinctrl: amd: fix __iomem annotation in amd_gpio_irq_handler()
Rajendra Nayak <[email protected]>
pinctrl: qcom: sc7180: Add missing tile info in SDC_QDSD_PINGROUP/UFS_RESET
Pierre-Louis Bossart <[email protected]>
ASoC: SOF: imx: fix reverse CONFIG_SND_SOC_SOF_OF dependency
Chuhong Yuan <[email protected]>
spi: sifive: disable clk when probe fails and remove
Takashi Iwai <[email protected]>
ALSA: pcm: Fix missing check of the new non-cached buffer type
Luiz Augusto von Dentz <[email protected]>
Bluetooth: Fix advertising duplicated flags
Toke Høiland-Jørgensen <[email protected]>
libbpf: Fix error handling in bpf_map__reuse_fd()
Alexandru Ardelean <[email protected]>
iio: dln2-adc: fix iio_triggered_buffer_postenable() position
Takashi Sakamoto <[email protected]>
ALSA: bebob: expand sleep just after breaking connections for protocol version 1
Geert Uytterhoeven <[email protected]>
pinctrl: sh-pfc: sh7734: Fix duplicate TCLK1_B
Vlad Buslov <[email protected]>
net/mlx5e: Verify that rule has at least one fwd/drop action
Darrick J. Wong <[email protected]>
loop: fix no-unmap write-zeroes request behavior
John Garry <[email protected]>
libata: Ensure ata_port probe has completed before detach
Yunsheng Lin <[email protected]>
net: hns3: add struct netdev_queue debug info for TX timeout
Gerald Schaefer <[email protected]>
s390/mm: add mm_pxd_folded() checks to pxd_free()
Ilya Leoshkevich <[email protected]>
s390: add error handling to perf_callchain_kernel
Heiko Carstens <[email protected]>
s390/time: ensure get_clock_monotonic() returns monotonic values
Stephan Gerhold <[email protected]>
phy: qcom-usb-hs: Fix extcon double register after power cycle
Biju Das <[email protected]>
phy: renesas: phy-rcar-gen2: Fix the array off by one warning
Kai Vehmanen <[email protected]>
ALSA: hda/hdmi - implement mst_no_extra_pcms flag
Mao Wenan <[email protected]>
net: dsa: LAN9303: select REGMAP when LAN9303 enable
Thierry Reding <[email protected]>
gpu: host1x: Allocate gather copy for host1x
Adham Abozaeid <[email protected]>
staging: wilc1000: check if device is initialzied before changing vif
Bart Van Assche <[email protected]>
RDMA/core: Set DMA parameters correctly
Michal Kalderon <[email protected]>
RDMA/qedr: Fix srqs xarray initialization
Colin Ian King <[email protected]>
RDMA/hns: Fix memory leak on 'context' on error return path
Michal Kalderon <[email protected]>
RDMA/qedr: Fix memory leak in user qp and mr
Hans de Goede <[email protected]>
ACPI: button: Add DMI quirk for Medion Akoya E2215T
Lingling Xu <[email protected]>
spi: sprd: adi: Add missing lock protection when rebooting
Peter Zijlstra <[email protected]>
ubsan, x86: Annotate and allow __ubsan_handle_shift_out_of_bounds() in uaccess regions
Dmitry Osipenko <[email protected]>
regulator: core: Release coupled_rdevs on regulator_init_coupling() error
Thierry Reding <[email protected]>
drm/tegra: sor: Use correct SOR index on Tegra210
Grygorii Strashko <[email protected]>
net: phy: dp83867: enable robust auto-mdix
Jaroslaw Gawin <[email protected]>
i40e: Wrong 'Advertised FEC modes' after set FEC to AUTO
Anthony Koo <[email protected]>
drm/amd/display: correctly populate dpp refclk in fpga
Nicholas Nunley <[email protected]>
i40e: initialize ITRN registers with correct values
Zhan liu <[email protected]>
drm/amd/display: setting the DIG_MODE to the correct value.
Yunfeng Ye <[email protected]>
arm64: psci: Reduce the waiting time for cpu_psci_cpu_kill()
Yazen Ghannam <[email protected]>
EDAC/amd64: Set grain per DIMM
Steven Price <[email protected]>
drm: Don't free jobs in wait_event_interruptible()
Guoqing Jiang <[email protected]>
md/bitmap: avoid race window between md_bitmap_resize and bitmap_file_clear_bit
Dan Carpenter <[email protected]>
staging: wilc1000: potential corruption in wilc_parse_join_bss_param()
Yufen Yu <[email protected]>
md: no longer compare spare disk superblock events in super_load
Sakari Ailus <[email protected]>
media: smiapp: Register sensor after enabling runtime PM on the device
Jae Hyun Yoo <[email protected]>
media: aspeed: clear garbage interrupts
Chuhong Yuan <[email protected]>
media: imx7-mipi-csis: Add a check for devm_regulator_get
Chuhong Yuan <[email protected]>
media: st-mipid02: add a check for devm_gpiod_get_optional
Benoit Parrot <[email protected]>
media: ov5640: Make 2592x1944 mode only available at 15 fps
Ricardo Ribalda Delgado <[email protected]>
media: ad5820: Define entity function
Janusz Krzysztofik <[email protected]>
media: ov6650: Fix stored frame interval not in sync with hardware
Lyude Paul <[email protected]>
drm/nouveau: Don't grab runtime PM refs for HPD IRQs
Jae Hyun Yoo <[email protected]>
media: aspeed: set hsync and vsync polarities to normal before starting mode detection
Paul Kocialkowski <[email protected]>
media: cedrus: Fix undefined shift with a SHIFT_AND_MASK_BITS macro
Thomas Gleixner <[email protected]>
x86/ioapic: Prevent inconsistent state when moving an interrupt
Corey Minyard <[email protected]>
ipmi: Don't allow device module unload when in use
Bernard Metzler <[email protected]>
RDMA/siw: Fix SQ/RQ drain logic
Chris Chiu <[email protected]>
rtl8xxxu: fix RTL8723BU connection failure issue after warm reboot
Kuninori Morimoto <[email protected]>
ASoC: soc-pcm: fixup dpcm_prune_paths() loop continue
Kangjie Lu <[email protected]>
drm/gma500: fix memory disclosures due to uninitialized bytes
Weihang Li <[email protected]>
RDMA/hns: Fix wrong parameters when initial mtt of srq->idx_que
Jian Shen <[email protected]>
net: hns3: log and clear hardware error after reset complete
Andrii Nakryiko <[email protected]>
selftests/bpf: Make a copy of subtest name
Leo Yan <[email protected]>
perf tests: Disable bp_signal testing for arm64
Tony Lindgren <[email protected]>
power: supply: cpcap-battery: Check voltage before orderly_poweroff
Chuhong Yuan <[email protected]>
staging: iio: ad9834: add a check for devm_clk_get
Kevin Wang <[email protected]>
drm/amdgpu: fix amdgpu trace event print string format error
joseph gravenor <[email protected]>
drm/amd/display: fix header for RN clk mgr
Dmytro Laktyushkin <[email protected]>
drm/amd/display: enable hostvm based on roimmu active for dcn2.1
Benjamin Berg <[email protected]>
x86/mce: Lower throttling MCE messages' priority to warning
Song Liu <[email protected]>
bpf/stackmap: Fix deadlock with rq_lock in bpf_get_stack()
Mattijs Korpershoek <[email protected]>
Bluetooth: hci_core: fix init for HCI_USER_CHANNEL
Szymon Janc <[email protected]>
Bluetooth: Workaround directed advertising bug in Broadcom controllers
Ben Dooks (Codethink) <[email protected]>
Bluetooth: missed cpu_to_le16 conversion in hci_init4_req
Arnd Bergmann <[email protected]>
Bluetooth: btusb: avoid unused function warning
Miquel Raynal <[email protected]>
iio: adc: max1027: Reset the device at probe time
Le Ma <[email protected]>
drm/amd/powerplay: avoid disabling ECC if RAS is enabled for VEGA20
Ingo Rohloff <[email protected]>
usb: usbfs: Suppress problematic bind and unbind uevents.
John Garry <[email protected]>
perf vendor events arm64: Fix Hisi hip08 DDRC PMU eventname
Leo Yan <[email protected]>
perf test: Avoid infinite loop for task exit case
Jin Yao <[email protected]>
perf report: Add warning when libunwind not compiled in
Leo Yan <[email protected]>
perf test: Report failure for mmap events
Daniel Kurtz <[email protected]>
drm/bridge: dw-hdmi: Restore audio when setting a mode
Ping-Ke Shih <[email protected]>
rtw88: coex: Set 4 slot mode for A2DP
Bjorn Andersson <[email protected]>
ath10k: Correct error handling of dma_map_single()
Sami Tolvanen <[email protected]>
x86/mm: Use the correct function type for native_set_fixmap()
Julian Parkin <[email protected]>
drm/amd/display: Program DWB watermarks from correct state
Stephan Gerhold <[email protected]>
extcon: sm5502: Reset registers during initialization
David Galiffi <[email protected]>
drm/amd/display: Fix dongle_caps containing stale information.
Sami Tolvanen <[email protected]>
syscalls/x86: Use the correct function type in SYSCALL_DEFINE0
Vitaly Prosyak <[email protected]>
drm/amd/display: add new active dongle to existent w/a
Benoit Parrot <[email protected]>
media: ti-vpe: vpe: fix a v4l2-compliance failure about invalid sizeimage
Josip Pavic <[email protected]>
drm/amd/display: wait for set pipe mcp command completion
Aric Cyr <[email protected]>
drm/amd/display: Properly round nominal frequency for SPD
Benoit Parrot <[email protected]>
media: ti-vpe: vpe: ensure buffers are cleaned up properly in abort cases
Benoit Parrot <[email protected]>
media: ti-vpe: vpe: fix a v4l2-compliance failure causing a kernel panic
Benoit Parrot <[email protected]>
media: ti-vpe: vpe: Make sure YUYV is set as default format
Benoit Parrot <[email protected]>
media: ti-vpe: vpe: fix a v4l2-compliance failure about frame sequence number
Benoit Parrot <[email protected]>
media: ti-vpe: vpe: fix a v4l2-compliance warning about invalid pixel format
Benoit Parrot <[email protected]>
media: ti-vpe: vpe: Fix Motion Vector vpdma stride
Kai Vehmanen <[email protected]>
ASoC: SOF: enable sync_write in hdac_bus
Srinivas Kandagatla <[email protected]>
misc: fastrpc: fix memory leak from miscdev->name
Ard Biesheuvel <[email protected]>
crypto: aegis128/simd - build 32-bit ARM for v8 architecture explicitly
Arnd Bergmann <[email protected]>
crypto: inside-secure - Fix a maybe-uninitialized warning
Christophe JAILLET <[email protected]>
media: cx88: Fix some error handling path in 'cx8800_initdev()'
Hangbin Liu <[email protected]>
team: call RCU read lock when walking the port_list
Ursula Braun <[email protected]>
net/smc: increase device refcount for added link group
Ilya Maximets <[email protected]>
libbpf: Fix passing uninitialized bytes to setsockopt
Andrii Nakryiko <[email protected]>
libbpf: Fix struct end padding in btf_dump
Andrii Nakryiko <[email protected]>
selftests/bpf: Fix btf_dump padding test case
Rodrigo Siqueira <[email protected]>
drm/drm_vblank: Change EINVAL by the correct errno
Navid Emamdoost <[email protected]>
mwifiex: pcie: Fix memory leak in mwifiex_pcie_init_evt_ring
Paul Burton <[email protected]>
MIPS: futex: Emit Loongson3 sync workarounds within asm
Oak Zeng <[email protected]>
drm/amdkfd: Fix MQD size calculation
Paul Burton <[email protected]>
MIPS: syscall: Emit Loongson3 sync workarounds within asm
Bart Van Assche <[email protected]>
block: Fix writeback throttling W=1 compiler warnings
Daniel T. Lee <[email protected]>
samples: pktgen: fix proc_cmd command result check logic
Matthias Kaehlcke <[email protected]>
drm/bridge: dw-hdmi: Refuse DDC/CI transfers on the internal I2C controller
Neil Armstrong <[email protected]>
media: meson/ao-cec: move cec_notifier_cec_adap_register after hw setup
Hans Verkuil <[email protected]>
media: cec-funcs.h: add status_req checks
Yang Yingliang <[email protected]>
media: flexcop-usb: fix NULL-ptr deref in flexcop_usb_transfer_init()
Alan Stern <[email protected]>
tools/memory-model: Fix data race detection for unordered store and load
Yizhuo <[email protected]>
regulator: max8907: Fix the usage of uninitialized variable in max8907_regulator_probe()
Tony Lindgren <[email protected]>
hwrng: omap3-rom - Call clk_disable_unprepare() on exit only if not idled
Ard Biesheuvel <[email protected]>
crypto: aegis128-neon - use Clang compatible cflags for ARM
Veeraiyan Chidambaram <[email protected]>
usb: renesas_usbhs: add suspend event support in gadget mode
Raul E Rangel <[email protected]>
drm/amd/display: fix struct init in update_bounding_box
Ping-Ke Shih <[email protected]>
rtw88: fix NSS of hw_cap
Stanimir Varbanov <[email protected]>
media: venus: Fix occasionally failures to suspend
Anthony Koo <[email protected]>
drm/amd/display: set minimum abm backlight level
Ivan Khoronzhuk <[email protected]>
selftests/bpf: Correct path to include msg + path
chen gong <[email protected]>
drm/amd/powerplay: A workaround to GPU RESET on APU
Arnd Bergmann <[email protected]>
x86/math-emu: Check __copy_from_user() result
Allen Pais <[email protected]>
drm/amdkfd: fix a potential NULL pointer dereference (v2)
Jagan Teki <[email protected]>
drm/sun4i: dsi: Fix TCON DRQ set bits
Will Deacon <[email protected]>
pinctrl: devicetree: Avoid taking direct reference to device name string
Nikola Cornij <[email protected]>
drm/amd/display: Set number of pipes to 1 if the second pipe was disabled
Shuah Khan <[email protected]>
media: vimc: Fix gpf in rmmod path when stream is active
Ben Greear <[email protected]>
ath10k: fix offchannel tx failure when no ath10k_mac_tx_frm_has_freq
Loic Poulain <[email protected]>
media: venus: core: Fix msm8996 frequency table
Nathan Chancellor <[email protected]>
tools/power/cpupower: Fix initializer override in hsw_ext_cstates
Janusz Krzysztofik <[email protected]>
media: ov6650: Fix stored crop rectangle not in sync with hardware
Janusz Krzysztofik <[email protected]>
media: ov6650: Fix stored frame format not in sync with hardware
Benoit Parrot <[email protected]>
media: i2c: ov2659: Fix missing 720p register config
Janusz Krzysztofik <[email protected]>
media: ov6650: Fix crop rectangle alignment not passed back
Benoit Parrot <[email protected]>
media: i2c: ov2659: fix s_stream return value
Janusz Krzysztofik <[email protected]>
media: ov6650: Fix control handler not freed on init error
YueHaibing <[email protected]>
media: max2175: Fix build error without CONFIG_REGMAP_I2C
Kefeng Wang <[email protected]>
media: vim2m: Fix BUG_ON in vim2m_device_release()
Jernej Skrabec <[email protected]>
media: vim2m: Fix abort issue
Christophe JAILLET <[email protected]>
media: seco-cec: Add a missing 'release_region()' in an error handling path
Hans Verkuil <[email protected]>
media: cedrus: fill in bus_info for media device
Benoit Parrot <[email protected]>
media: am437x-vpfe: Setting STD to current value is not an error
Navid Emamdoost <[email protected]>
spi: gpio: prevent memory leak in spi_gpio_probe
Mihail Atanassov <[email protected]>
drm/komeda: Workaround for broken FLIP_COMPLETE timestamps
Max Gurtovoy <[email protected]>
IB/iser: bound protection_sg size by data_sg size
Anilkumar Kolli <[email protected]>
ath10k: fix backtrace on coredump
Geert Uytterhoeven <[email protected]>
Revert "pinctrl: sh-pfc: r8a77990: Fix MOD_SEL1 bit31 when using SIM0_D"
Geert Uytterhoeven <[email protected]>
Revert "pinctrl: sh-pfc: r8a77990: Fix MOD_SEL1 bit30 when using SSI_SCK2 and SSI_WS2"
Allen Pais <[email protected]>
libertas: fix a potential NULL pointer dereference
Navid Emamdoost <[email protected]>
rtlwifi: prevent memory leak in rtl_usb_probe
Connor Kuehl <[email protected]>
staging: rtl8188eu: fix possible null dereference
Navid Emamdoost <[email protected]>
staging: rtl8192u: fix multiple memory leaks on error path
Neil Armstrong <[email protected]>
drm/meson: vclk: use the correct G12A frac max value
Lukasz Majewski <[email protected]>
spi: Add call to spi_slave_abort() function when spidev driver is released
Hauke Mehrtens <[email protected]>
ath10k: Check if station exists before forwarding tx airtime report
Martin Tsai <[email protected]>
drm/amd/display: Handle virtual signal type in disable_link()
Wenwen Wang <[email protected]>
ath10k: add cleanup in ath10k_sta_state()
Mikita Lipski <[email protected]>
drm/amd/display: Rebuild mapped resources after pipe split
Christian König <[email protected]>
drm/ttm: return -EBUSY on pipelining with no_gpu_wait (v2)
Christian König <[email protected]>
drm/amdgpu: grab the id mgr lock while accessing passid_mapping
Jack Zhang <[email protected]>
drm/amdgpu/sriov: add ring_stop before ring_create in psp v11 code
Krzysztof Wilczynski <[email protected]>
iio: light: bh1750: Resolve compiler warning and make code more readable
Andrea Merello <[email protected]>
iio: max31856: add missing of_node and parent references to iio_dev
Jaehyun Chung <[email protected]>
drm/amd/display: OTC underflow fix
Brian Masney <[email protected]>
drm/bridge: analogix-anx78xx: silence -EPROBE_DEFER warnings
Jing Zhou <[email protected]>
drm/amd/display: verify stream link before link test
Daniel Vetter <[email protected]>
drm: Use EOPNOTSUPP, not ENOTSUPP
Dariusz Marcinkiewicz <[email protected]>
drm: exynos: exynos_hdmi: use cec_notifier_conn_(un)register
Laurent Pinchart <[email protected]>
drm/panel: Add missing drm_panel_init() in panel drivers
Dan Carpenter <[email protected]>
drm/mipi-dbi: fix a loop in debugfs code
Sean Paul <[email protected]>
drm: mst: Fix query_payload ack reply struct
Gerd Hoffmann <[email protected]>
drm/virtio: switch virtio_gpu_wait_ioctl() to gem helper.
Dariusz Marcinkiewicz <[email protected]>
drm/vc4/vc4_hdmi: fill in connector info
Takashi Iwai <[email protected]>
ALSA: hda/ca0132 - Fix work handling in delayed HP detection
Takashi Iwai <[email protected]>
ALSA: hda/ca0132 - Avoid endless loop
Takashi Iwai <[email protected]>
ALSA: hda/ca0132 - Keep power on during processing DSP response
Takashi Iwai <[email protected]>
ALSA: pcm: Avoid possible info leaks from PCM stream buffers
Filipe Manana <[email protected]>
Btrfs: fix removal logic of the tree mod log that leads to use-after-free issues
Josef Bacik <[email protected]>
btrfs: handle ENOENT in btrfs_uuid_tree_iterate
Josef Bacik <[email protected]>
btrfs: do not leak reloc root if we fail to read the fs root
Josef Bacik <[email protected]>
btrfs: skip log replay on orphaned roots
Josef Bacik <[email protected]>
btrfs: abort transaction after failed inode updates in create_subvol
Anand Jain <[email protected]>
btrfs: send: remove WARN_ON for readonly mount
Filipe Manana <[email protected]>
Btrfs: fix missing data checksums after replaying a log tree
Dan Carpenter <[email protected]>
btrfs: return error pointer from alloc_test_extent_buffer
Filipe Manana <[email protected]>
Btrfs: make tree checker detect checksum items with overlapping ranges
Josef Bacik <[email protected]>
btrfs: do not call synchronize_srcu() in inode_tree_del
Josef Bacik <[email protected]>
btrfs: don't double lock the subvol_sem for rename exchange
Stephan Gerhold <[email protected]>
NFC: nxp-nci: Fix probing without ACPI
Florian Fainelli <[email protected]>
net: dsa: b53: Fix egress flooding settings
Padmanabhan Rajanbabu <[email protected]>
net: stmmac: platform: Fix MDIO init for platforms without PHY
Grygorii Strashko <[email protected]>
net: ethernet: ti: davinci_cpdma: fix warning "device driver frees DMA memory with different size"
Ido Schimmel <[email protected]>
mlxsw: spectrum_router: Remove unlikely user-triggerable warning
Ioana Ciornei <[email protected]>
dpaa2-ptp: fix double free of the ptp_qoriq IRQ
Arthur Kiyanovski <[email protected]>
net: ena: fix issues in setting interrupt moderation params in ethtool
Arthur Kiyanovski <[email protected]>
net: ena: fix default tx interrupt moderation interval
Eric Dumazet <[email protected]>
bonding: fix bond_neigh_init()
Eric Dumazet <[email protected]>
neighbour: remove neigh_cleanup() method
Ido Schimmel <[email protected]>
selftests: forwarding: Delete IPv6 address at the end
Xin Long <[email protected]>
sctp: fully initialize v4 addr in some functions
Marcelo Ricardo Leitner <[email protected]>
sctp: fix memleak on err handling of stream initialization
Manish Chopra <[email protected]>
qede: Fix multicast mac configuration
Manish Chopra <[email protected]>
qede: Disable hardware gro when xdp prog is installed
John Hurley <[email protected]>
nfp: flower: fix stats id allocation
Cristian Birsan <[email protected]>
net: usb: lan78xx: Fix suspend/resume PHY register access error
Jouni Hogander <[email protected]>
net-sysfs: Call dev_hold always in rx_queue_add_kobject
Ben Hutchings <[email protected]>
net: qlogic: Fix error paths in ql_alloc_large_buffers()
Russell King <[email protected]>
net: phy: ensure that phy IDs are correctly typed
Jia-Ju Bai <[email protected]>
net: nfc: nci: fix a possible sleep-in-atomic-context bug in nci_uart_tty_receive()
Jiangfeng Xiao <[email protected]>
net: hisilicon: Fix a BUG trigered by wrong bytes_compl
Navid Emamdoost <[email protected]>
net: gemini: Fix memory leak in gmac_setup_txqs
Geert Uytterhoeven <[email protected]>
net: dst: Force 4-byte alignment of dst_metrics
Russell King <[email protected]>
mod_devicetable: fix PHY module format
Chuhong Yuan <[email protected]>
fjes: fix missed check in fjes_acpi_add
Mao Wenan <[email protected]>
af_packet: set defaule value for tmo
-------------
Diffstat:
Makefile | 4 +- arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 4 +- arch/arm64/kernel/psci.c | 15 ++- arch/arm64/kvm/sys_regs.c | 5 +- arch/mips/include/asm/barrier.h | 13 +- arch/mips/include/asm/futex.h | 15 +-- arch/mips/include/asm/pgtable-64.h | 9 +- arch/mips/kernel/syscall.c | 3 +- arch/mips/ralink/Kconfig | 1 + arch/powerpc/include/asm/spinlock.h | 4 +- arch/powerpc/kernel/irq.c | 4 +- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 4 +- arch/powerpc/platforms/pseries/setup.c | 7 + arch/s390/crypto/sha_common.c | 7 +- arch/s390/include/asm/pgalloc.h | 16 ++- arch/s390/include/asm/timex.h | 16 ++- arch/s390/kernel/dis.c | 13 +- arch/s390/kernel/perf_cpum_cf.c | 21 ++- arch/s390/kernel/perf_cpum_cf_diag.c | 10 +- arch/s390/kernel/perf_event.c | 8 +- arch/s390/mm/maccess.c | 12 +- arch/s390/net/bpf_jit_comp.c | 5 +- arch/sh/include/cpu-sh4/cpu/sh7734.h | 2 +- arch/x86/include/asm/crash.h | 2 + arch/x86/include/asm/fixmap.h | 2 +- arch/x86/include/asm/syscall_wrapper.h | 23 ++-- arch/x86/kernel/apic/io_apic.c | 9 +- arch/x86/kernel/cpu/mce/amd.c | 4 +- arch/x86/kernel/cpu/mce/core.c | 2 +- arch/x86/kernel/cpu/mce/therm_throt.c | 2 +- arch/x86/kernel/early-quirks.c | 2 + arch/x86/kvm/cpuid.c | 6 +- arch/x86/lib/x86-opcode-map.txt | 18 ++- arch/x86/math-emu/fpu_system.h | 6 +- arch/x86/math-emu/reg_ld_str.c | 6 +- arch/x86/mm/pgtable.c | 4 +- block/blk-iocost.c | 13 +- crypto/Kconfig | 1 + crypto/Makefile | 2 +- crypto/asymmetric_keys/asym_tpm.c | 1 + crypto/asymmetric_keys/public_key.c | 1 + drivers/acpi/button.c | 11 ++ drivers/ata/libata-core.c | 3 + drivers/base/firmware_loader/builtin/Makefile | 3 +- drivers/block/loop.c | 26 ++-- drivers/block/nbd.c | 6 +- drivers/bluetooth/btusb.c | 5 +- drivers/char/hw_random/omap3-rom-rng.c | 3 +- drivers/char/ipmi/ipmi_msghandler.c | 23 +++- drivers/char/tpm/tpm-dev-common.c | 8 ++ drivers/char/tpm/tpm_tis_core.c | 35 ++--- drivers/clk/imx/clk-composite-8m.c | 2 + drivers/clk/imx/clk-imx7ulp.c | 1 + drivers/clk/imx/clk-pll14xx.c | 2 +- drivers/cpufreq/cpufreq.c | 7 + drivers/cpufreq/sun50i-cpufreq-nvmem.c | 25 ++-- drivers/crypto/atmel-aes.c | 18 +-- drivers/crypto/atmel-authenc.h | 2 +- drivers/crypto/atmel-sha.c | 2 +- drivers/crypto/inside-secure/safexcel.c | 2 + drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 22 ++-- drivers/crypto/sunxi-ss/sun4i-ss-hash.c | 12 +- drivers/crypto/virtio/virtio_crypto_algs.c | 12 +- drivers/crypto/vmx/Makefile | 6 +- drivers/edac/amd64_edac.c | 2 + drivers/edac/ghes_edac.c | 10 +- drivers/extcon/extcon-sm5502.c | 4 + drivers/extcon/extcon-sm5502.h | 2 + drivers/firmware/efi/efi.c | 28 +++- drivers/fsi/fsi-core.c | 31 ++++- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 10 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 18 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 12 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 61 +++++---- drivers/gpu/drm/amd/amdgpu/si_ih.c | 3 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 5 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 10 +- .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 17 ++- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 2 + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 3 +- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 4 +- drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 3 + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 5 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 4 + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 7 +- .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c | 40 +++--- drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 6 +- .../drm/amd/display/include/ddc_service_types.h | 2 + .../drm/amd/display/modules/freesync/freesync.c | 13 +- .../drm/amd/display/modules/power/power_helpers.c | 77 ++++++----- .../drm/amd/display/modules/power/power_helpers.h | 1 + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 5 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.c | 12 +- drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 4 +- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 + drivers/gpu/drm/bridge/analogix-anx78xx.c | 8 +- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 12 +- drivers/gpu/drm/drm_edid.c | 6 +- drivers/gpu/drm/drm_mipi_dbi.c | 5 +- drivers/gpu/drm/drm_vblank.c | 6 +- drivers/gpu/drm/exynos/exynos_hdmi.c | 31 +++-- drivers/gpu/drm/gma500/oaktrail_crtc.c | 2 + drivers/gpu/drm/meson/meson_vclk.c | 9 +- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 24 ++-- drivers/gpu/drm/nouveau/nouveau_connector.c | 33 ++--- .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 1 + drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 1 + drivers/gpu/drm/scheduler/sched_main.c | 43 ++++--- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 4 +- drivers/gpu/drm/tegra/sor.c | 5 + drivers/gpu/drm/ttm/ttm_bo.c | 44 ++++--- drivers/gpu/drm/vc4/vc4_hdmi.c | 13 +- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 28 ++-- drivers/gpu/host1x/job.c | 11 +- drivers/hwtracing/intel_th/core.c | 7 +- drivers/hwtracing/intel_th/intel_th.h | 2 + drivers/hwtracing/intel_th/msu.c | 14 +- drivers/hwtracing/intel_th/pci.c | 10 ++ drivers/iio/adc/dln2-adc.c | 20 ++- drivers/iio/adc/max1027.c | 8 ++ drivers/iio/dac/Kconfig | 4 +- drivers/iio/dac/ad5446.c | 6 + drivers/iio/light/bh1750.c | 4 +- drivers/iio/pressure/cros_ec_baro.c | 3 + drivers/iio/temperature/max31856.c | 2 + drivers/infiniband/core/device.c | 22 +++- drivers/infiniband/hw/bnxt_re/main.c | 9 +- drivers/infiniband/hw/bnxt_re/qplib_res.h | 8 +- drivers/infiniband/hw/efa/efa_com.c | 5 +- drivers/infiniband/hw/hns/hns_roce_restrack.c | 10 +- drivers/infiniband/hw/hns/hns_roce_srq.c | 24 ++-- drivers/infiniband/hw/qedr/main.c | 1 + drivers/infiniband/hw/qedr/verbs.c | 12 +- drivers/infiniband/sw/siw/siw_main.c | 20 --- drivers/infiniband/sw/siw/siw_verbs.c | 143 +++++++++++++++++---- drivers/infiniband/ulp/iser/iscsi_iser.c | 1 + drivers/iommu/intel-iommu.c | 12 +- drivers/iommu/iommu.c | 8 +- drivers/md/bcache/alloc.c | 5 +- drivers/md/bcache/bcache.h | 2 +- drivers/md/bcache/super.c | 51 ++++++-- drivers/md/md-bitmap.c | 2 +- drivers/md/md.c | 46 ++++++- drivers/media/i2c/Kconfig | 1 + drivers/media/i2c/ad5820.c | 1 + drivers/media/i2c/ov2659.c | 18 ++- drivers/media/i2c/ov5640.c | 5 + drivers/media/i2c/ov6650.c | 75 ++++++----- drivers/media/i2c/smiapp/smiapp-core.c | 12 +- drivers/media/i2c/st-mipid02.c | 5 + drivers/media/pci/cx88/cx88-video.c | 11 +- drivers/media/platform/am437x/am437x-vpfe.c | 4 + drivers/media/platform/aspeed-video.c | 12 ++ drivers/media/platform/exynos4-is/media-dev.c | 7 +- drivers/media/platform/meson/ao-cec-g12a.c | 36 +++--- drivers/media/platform/meson/ao-cec.c | 30 ++--- drivers/media/platform/qcom/venus/core.c | 9 +- drivers/media/platform/qcom/venus/hfi_venus.c | 6 + drivers/media/platform/rcar_drif.c | 1 + drivers/media/platform/seco-cec/seco-cec.c | 1 + drivers/media/platform/ti-vpe/vpdma.h | 1 + drivers/media/platform/ti-vpe/vpe.c | 52 ++++++-- drivers/media/platform/vicodec/vicodec-core.c | 4 +- drivers/media/platform/vim2m.c | 8 +- drivers/media/platform/vimc/vimc-common.c | 3 +- drivers/media/platform/vimc/vimc-debayer.c | 1 + drivers/media/platform/vimc/vimc-scaler.c | 1 + drivers/media/platform/vimc/vimc-sensor.c | 1 + drivers/media/platform/vivid/vivid-core.c | 4 +- drivers/media/radio/si470x/radio-si470x-i2c.c | 2 + drivers/media/usb/b2c2/flexcop-usb.c | 8 +- drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 9 +- drivers/media/v4l2-core/v4l2-ctrls.c | 7 + drivers/media/v4l2-core/v4l2-ioctl.c | 33 ++--- drivers/misc/fastrpc.c | 4 +- drivers/misc/ocxl/file.c | 23 ++-- drivers/mmc/host/mtk-sd.c | 2 + drivers/mmc/host/sdhci-msm.c | 28 ++-- drivers/mmc/host/sdhci-of-esdhc.c | 7 +- drivers/mmc/host/sdhci-pci-core.c | 10 +- drivers/mmc/host/sdhci.c | 11 +- drivers/mmc/host/sdhci.h | 2 + drivers/mmc/host/tmio_mmc_core.c | 2 +- drivers/net/bonding/bond_main.c | 39 +++--- drivers/net/can/flexcan.c | 73 ++++++----- drivers/net/can/m_can/tcan4x5x.c | 2 + drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 6 +- drivers/net/can/xilinx_can.c | 7 + drivers/net/dsa/Kconfig | 1 + drivers/net/dsa/b53/b53_common.c | 21 ++- drivers/net/dsa/sja1105/sja1105_main.c | 4 + drivers/net/ethernet/amazon/ena/ena_com.h | 2 +- drivers/net/ethernet/amazon/ena/ena_ethtool.c | 24 ++-- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 16 ++- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 8 +- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 9 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 2 + drivers/net/ethernet/cortina/gemini.c | 2 + drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c | 14 +- drivers/net/ethernet/hisilicon/hip04_eth.c | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 3 + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 3 + drivers/net/ethernet/ibm/ibmvnic.c | 19 +-- drivers/net/ethernet/intel/i40e/i40e_common.c | 13 +- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 32 ++--- drivers/net/ethernet/intel/i40e/i40e_main.c | 10 +- drivers/net/ethernet/intel/ice/ice_controlq.c | 2 +- drivers/net/ethernet/intel/ice/ice_controlq.h | 5 +- drivers/net/ethernet/intel/ice/ice_ethtool.c | 13 +- drivers/net/ethernet/intel/ice/ice_main.c | 18 ++- drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 12 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 3 +- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 6 + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 7 +- .../net/ethernet/netronome/nfp/flower/metadata.c | 12 +- drivers/net/ethernet/qlogic/qede/qede_filter.c | 2 +- drivers/net/ethernet/qlogic/qede/qede_main.c | 4 +- drivers/net/ethernet/qlogic/qla3xxx.c | 8 +- drivers/net/ethernet/realtek/r8169_main.c | 18 ++- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 +- drivers/net/ethernet/ti/Kconfig | 1 + drivers/net/ethernet/ti/cpsw_ale.c | 2 + drivers/net/ethernet/ti/davinci_cpdma.c | 5 +- drivers/net/fjes/fjes_main.c | 3 + drivers/net/phy/dp83867.c | 15 ++- drivers/net/phy/phy_device.c | 21 +-- drivers/net/team/team.c | 5 +- drivers/net/tun.c | 4 +- drivers/net/usb/lan78xx.c | 1 + drivers/net/wireless/ath/ath10k/coredump.c | 11 +- drivers/net/wireless/ath/ath10k/htt_rx.c | 2 +- drivers/net/wireless/ath/ath10k/mac.c | 26 ++-- drivers/net/wireless/ath/ath10k/txrx.c | 2 + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 5 + drivers/net/wireless/intel/iwlwifi/dvm/led.c | 3 + drivers/net/wireless/intel/iwlwifi/mvm/led.c | 3 + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 3 +- drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 13 +- .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 25 ---- drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 30 +++++ drivers/net/wireless/marvell/libertas/if_sdio.c | 5 + drivers/net/wireless/marvell/mwifiex/pcie.c | 5 +- drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 4 +- drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 4 +- drivers/net/wireless/quantenna/qtnfmac/commands.c | 6 +- drivers/net/wireless/quantenna/qtnfmac/event.c | 7 +- drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c | 6 +- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 1 + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 1 + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 3 + .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 2 + drivers/net/wireless/realtek/rtlwifi/usb.c | 5 +- drivers/net/wireless/realtek/rtw88/coex.c | 24 ++-- drivers/net/wireless/realtek/rtw88/main.c | 3 +- drivers/nfc/nxp-nci/i2c.c | 2 +- drivers/nvme/host/core.c | 14 +- drivers/nvme/host/multipath.c | 1 + drivers/nvmem/imx-ocotp.c | 4 + drivers/parport/share.c | 21 +++ drivers/phy/qualcomm/phy-qcom-usb-hs.c | 7 +- drivers/phy/renesas/phy-rcar-gen2.c | 5 +- drivers/pinctrl/devicetree.c | 25 +++- drivers/pinctrl/intel/pinctrl-baytrail.c | 81 ++++++------ drivers/pinctrl/pinctrl-amd.c | 3 +- drivers/pinctrl/qcom/pinctrl-sc7180.c | 18 +-- drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 25 ++-- drivers/pinctrl/sh-pfc/pfc-sh7734.c | 4 +- drivers/platform/x86/hp-wmi.c | 2 +- drivers/power/supply/cpcap-battery.c | 8 +- drivers/regulator/core.c | 5 +- drivers/regulator/max8907-regulator.c | 15 ++- drivers/soundwire/intel.c | 10 +- drivers/spi/spi-cadence.c | 6 +- drivers/spi/spi-dw.c | 8 +- drivers/spi/spi-fsl-spi.c | 7 +- drivers/spi/spi-gpio.c | 4 +- drivers/spi/spi-img-spfi.c | 2 + drivers/spi/spi-pxa2xx.c | 6 + drivers/spi/spi-sifive.c | 11 +- drivers/spi/spi-sprd-adi.c | 3 + drivers/spi/spi-st-ssc4.c | 3 + drivers/spi/spi-tegra20-slink.c | 5 +- drivers/spi/spidev.c | 3 + drivers/staging/comedi/drivers/gsc_hpdi.c | 10 ++ drivers/staging/fbtft/fbtft-core.c | 2 +- drivers/staging/iio/frequency/ad9834.c | 4 + drivers/staging/media/imx/imx-media-capture.c | 6 +- drivers/staging/media/imx/imx7-mipi-csis.c | 7 +- drivers/staging/media/sunxi/cedrus/cedrus.c | 2 + drivers/staging/media/sunxi/cedrus/cedrus.h | 8 +- drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 8 +- drivers/staging/media/sunxi/cedrus/cedrus_regs.h | 31 +++-- drivers/staging/mt7621-pci/Kconfig | 1 - drivers/staging/rtl8188eu/core/rtw_xmit.c | 4 +- drivers/staging/rtl8192u/r8192U_core.c | 17 ++- drivers/staging/wilc1000/wilc_hif.c | 2 + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 18 ++- drivers/tty/serial/atmel_serial.c | 43 ++++--- drivers/tty/serial/sprd_serial.c | 3 + drivers/usb/core/devio.c | 15 ++- drivers/usb/host/ehci-q.c | 13 +- drivers/usb/host/xhci-pci.c | 6 +- drivers/usb/renesas_usbhs/common.h | 3 +- drivers/usb/renesas_usbhs/mod_gadget.c | 12 +- drivers/usb/usbip/usbip_common.c | 3 + drivers/usb/usbip/vhci_rx.c | 13 +- drivers/xen/Kconfig | 3 +- fs/btrfs/async-thread.c | 56 ++++++-- fs/btrfs/ctree.c | 2 +- fs/btrfs/ctree.h | 2 +- fs/btrfs/disk-io.c | 2 +- fs/btrfs/extent-tree.c | 7 +- fs/btrfs/extent_io.c | 6 +- fs/btrfs/file-item.c | 7 +- fs/btrfs/inode.c | 12 +- fs/btrfs/ioctl.c | 10 +- fs/btrfs/reada.c | 10 +- fs/btrfs/relocation.c | 1 + fs/btrfs/scrub.c | 3 +- fs/btrfs/send.c | 6 - fs/btrfs/tests/free-space-tree-tests.c | 4 +- fs/btrfs/tests/qgroup-tests.c | 4 +- fs/btrfs/tree-checker.c | 18 ++- fs/btrfs/tree-log.c | 52 +++++++- fs/btrfs/uuid-tree.c | 2 + fs/ext4/dir.c | 5 + fs/ext4/inode.c | 4 +- fs/ext4/namei.c | 32 +++-- fs/ext4/super.c | 143 ++++++++++----------- include/drm/drm_dp_mst_helper.h | 2 +- include/linux/cpufreq.h | 11 -- include/linux/ipmi_smi.h | 12 +- include/linux/mod_devicetable.h | 4 +- include/linux/nvme.h | 1 + include/linux/nvmem-consumer.h | 2 +- include/linux/phy.h | 2 +- include/linux/sched/cpufreq.h | 3 + include/net/arp.h | 4 +- include/net/dst.h | 2 +- include/net/ndisc.h | 8 +- include/net/neighbour.h | 1 - include/net/sock.h | 12 +- include/sound/hda_codec.h | 1 + include/trace/events/wbt.h | 12 +- include/uapi/linux/cec-funcs.h | 6 +- kernel/bpf/stackmap.c | 7 +- kernel/bpf/verifier.c | 19 +++ kernel/cgroup/freezer.c | 9 ++ kernel/events/core.c | 6 +- kernel/sched/core.c | 6 +- kernel/sched/cpufreq.c | 18 +++ kernel/sched/cpufreq_schedutil.c | 8 +- kernel/sched/sched.h | 2 +- kernel/trace/trace.c | 2 +- kernel/trace/trace_kprobe.c | 27 +++- lib/ubsan.c | 5 +- mm/vmscan.c | 2 +- net/bluetooth/hci_conn.c | 8 ++ net/bluetooth/hci_core.c | 13 +- net/bluetooth/hci_request.c | 9 ++ net/can/j1939/socket.c | 10 +- net/core/neighbour.c | 3 - net/core/net-sysfs.c | 7 +- net/mac80211/status.c | 3 +- net/nfc/nci/uart.c | 2 +- net/packet/af_packet.c | 3 +- net/sctp/protocol.c | 5 + net/sctp/stream.c | 8 +- net/smc/smc_core.c | 9 +- samples/pktgen/functions.sh | 17 ++- sound/core/pcm_native.c | 7 +- sound/core/timer.c | 10 ++ sound/firewire/bebob/bebob_stream.c | 11 +- sound/pci/hda/patch_ca0132.c | 23 +++- sound/pci/hda/patch_hdmi.c | 19 ++- sound/soc/codecs/rt5677.c | 1 + sound/soc/codecs/wm2200.c | 5 + sound/soc/codecs/wm5100.c | 2 + sound/soc/codecs/wm8904.c | 1 + sound/soc/intel/boards/bytcr_rt5640.c | 10 +- .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 3 + sound/soc/soc-pcm.c | 14 +- sound/soc/sof/imx/Kconfig | 8 +- sound/soc/sof/intel/hda.c | 1 + sound/soc/sof/topology.c | 4 + tools/arch/x86/lib/x86-opcode-map.txt | 18 ++- tools/bpf/Makefile | 6 + tools/lib/bpf/btf_dump.c | 8 +- tools/lib/bpf/libbpf.c | 14 +- tools/lib/bpf/xsk.c | 14 +- tools/lib/subcmd/Makefile | 4 +- tools/lib/traceevent/parse-filter.c | 9 +- tools/memory-model/linux-kernel.cat | 2 +- tools/objtool/check.c | 1 + tools/perf/arch/arm64/util/sym-handling.c | 3 +- tools/perf/builtin-report.c | 7 + .../arch/arm64/hisilicon/hip08/uncore-ddrc.json | 2 +- tools/perf/pmu-events/jevents.c | 13 +- tools/perf/tests/bp_signal.c | 15 +-- tools/perf/tests/task-exit.c | 9 ++ tools/perf/util/cs-etm.c | 4 +- tools/perf/util/dwarf-aux.c | 56 ++++++-- tools/perf/util/parse-events.c | 26 +++- tools/perf/util/probe-finder.c | 45 ++++++- tools/perf/util/session.c | 44 ++++--- .../cpupower/utils/idle_monitor/hsw_ext_idle.c | 1 - tools/testing/selftests/bpf/cgroup_helpers.c | 2 +- .../bpf/progs/btf_dump_test_case_padding.c | 5 +- tools/testing/selftests/bpf/progs/test_seg6_loop.c | 4 +- .../selftests/bpf/progs/test_sysctl_loop1.c | 5 +- tools/testing/selftests/bpf/test_progs.c | 17 ++- tools/testing/selftests/bpf/test_tc_tunnel.sh | 5 + .../selftests/net/forwarding/router_bridge_vlan.sh | 2 +- tools/testing/selftests/net/so_txtime.c | 4 +- tools/testing/selftests/net/tls.c | 28 ---- tools/testing/selftests/net/udpgso.c | 3 +- tools/testing/selftests/net/udpgso_bench_tx.c | 3 +- .../selftests/proc/proc-self-map-files-002.c | 6 +- virt/kvm/arm/mmu.c | 21 ++- 425 files changed, 3076 insertions(+), 1511 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 28/434 btrfs: dont double lock the subvol_sem for rename exchange
From: Josef Bacik <[email protected]>
commit 943eb3bf25f4a7b745dd799e031be276aa104d82 upstream.
If we're rename exchanging two subvols we'll try to lock this lock twice, which is bad. Just lock once if either of the ino's are subvols.
--- fs/btrfs/inode.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
fs/btrfs/inode.c +4 -6
@@ -9535,9 +9535,8 @@ static int btrfs_rename_exchange(structbtrfs_init_log_ctx (&ctx_dest, new_inode);/* close the race window with snapshot create/destroy ioctl */ -if (old_ino ==BTRFS_FIRST_FREE_OBJECTID ) -down_read (&fs_info->subvol_sem); -if (new_ino ==BTRFS_FIRST_FREE_OBJECTID ) +if (old_ino ==BTRFS_FIRST_FREE_OBJECTID || + new_ino ==BTRFS_FIRST_FREE_OBJECTID )down_read (&fs_info->subvol_sem);/*
@@ -9771,9 +9770,8 @@ out_fail: ret = ret ? ret : ret2; } out_notrans: -if (new_ino ==BTRFS_FIRST_FREE_OBJECTID ) -up_read (&fs_info->subvol_sem); -if (old_ino ==BTRFS_FIRST_FREE_OBJECTID ) +if (new_ino ==BTRFS_FIRST_FREE_OBJECTID || + old_ino ==BTRFS_FIRST_FREE_OBJECTID )up_read (&fs_info->subvol_sem);ASSERT (list_empty (&ctx_root.list));
Greg Kroah-Hartman
maintainerPATCH 31/434 btrfs: return error pointer from alloc_test_extent_buffer
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit b6293c821ea8fa2a631a2112cd86cd435effeb8b upstream.
Callers of alloc_test_extent_buffer have not correctly interpreted the return value as error pointer, as alloc_test_extent_buffer should behave as alloc_extent_buffer. The self-tests were unaffected but btrfs_find_create_tree_block could call both functions and that would cause problems up in the call chain.
--- fs/btrfs/extent_io.c | 6 ++++-- fs/btrfs/tests/free-space-tree-tests.c | 4 ++-- fs/btrfs/tests/qgroup-tests.c | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-)
fs/btrfs/extent_io.c +4 -2
@@ -5066,12 +5066,14 @@ struct extent_buffer *alloc_test_extent_return eb; eb =alloc_dummy_extent_buffer (fs_info, start);if (!eb) -return NULL ; +return ERR_PTR (-ENOMEM ); eb->fs_info = fs_info; again: ret =radix_tree_preload (GFP_NOFS ); -if (ret) +if (ret) { + exists =ERR_PTR (ret); goto free_eb; + }spin_lock (&fs_info->buffer_lock); ret =radix_tree_insert (&fs_info->buffer_radix, start >>PAGE_SHIFT , eb);
fs/btrfs/tests/free-space-tree-tests.c +2 -2
@@ -463,9 +463,9 @@ static int run_test(test_func_t test_fun root->fs_info->tree_root = root; root->node =alloc_test_extent_buffer (root->fs_info, nodesize); -if (!root->node) { +if (IS_ERR (root->node)) {test_std_err (TEST_ALLOC_EXTENT_BUFFER ); - ret = -ENOMEM ; + ret =PTR_ERR (root->node); goto out; }btrfs_set_header_level (root->node,0 );
fs/btrfs/tests/qgroup-tests.c +2 -2
@@ -484,9 +484,9 @@ int btrfs_test_qgroups(u32 sectorsize, u* *cough*backref walking code*cough* */ root->node =alloc_test_extent_buffer (root->fs_info, nodesize); -if (!root->node) { +if (IS_ERR (root->node)) {test_err ("couldn't allocate dummy buffer" ); - ret = -ENOMEM ; + ret =PTR_ERR (root->node); goto out; }btrfs_set_header_level (root->node,0 );
Greg Kroah-Hartman
maintainerPATCH 27/434 NFC: nxp-nci: Fix probing without ACPI
In reply to Greg Kroah-HartmanFrom: Stephan Gerhold <[email protected]>
[ Upstream commit 868afbaca1e2a7923e48b5e8c07be34660525db5 ]
devm_acpi_dev_add_driver_gpios() returns -ENXIO if CONFIG_ACPI is disabled (e.g. on device tree platforms).
In this case, nxp-nci will silently fail to probe.
The other NFC drivers only log a debug message ifdevm_acpi_dev_add_driver_gpios() fails.
Do the same in nxp-nci to fix this problem.
--- drivers/nfc/nxp-nci/i2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nfc/nxp-nci/i2c.c +1 -1
@@ -278,7 +278,7 @@ static int nxp_nci_i2c_probe(struct i2c_ r =devm_acpi_dev_add_driver_gpios (dev, acpi_nxp_nci_gpios);if (r) -return r; +dev_dbg (dev,"Unable to add GPIO mapping table\n" ); phy->gpiod_en =devm_gpiod_get (dev,"enable" ,GPIOD_OUT_LOW );if (IS_ERR (phy->gpiod_en)) {
Greg Kroah-Hartman
maintainerPATCH 30/434 Btrfs: make tree checker detect checksum items with overlapping ranges
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit ad1d8c439978ede77cbf73cbdd11bafe810421a5 upstream.
Having checksum items, either on the checksums tree or in a log tree, that represent ranges that overlap each other is a sign of a corruption. Such case confuses the checksum lookup code and can result in not being able to find checksums or find stale checksums.
So add a check for such case.
This is motivated by a recent fix for a case where a log tree had checksum items covering ranges that overlap each other due to extent cloning, and resulted in missing checksums after replaying the log tree. It also helps detect past issues such as stale and outdated checksums due to overlapping, commit 27b9a8122ff71a ("Btrfs: fix csum tree corruption, duplicate and outdated checksums").
--- fs/btrfs/tree-checker.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
fs/btrfs/tree-checker.c +16 -2
@@ -243,7 +243,7 @@ static int check_extent_data_item(struct }static int check_csum_item (struct extent_buffer *leaf,struct btrfs_key *key, -int slot) +int slot,struct btrfs_key *prev_key) {struct btrfs_fs_info *fs_info = leaf->fs_info;u32 sectorsize = fs_info->sectorsize;
@@ -267,6 +267,20 @@ static int check_csum_item(struct extent btrfs_item_size_nr(leaf, slot), csumsize);return -EUCLEAN ; } +if (slot >0 && prev_key->type ==BTRFS_EXTENT_CSUM_KEY ) { +u64 prev_csum_end; +u32 prev_item_size; + + prev_item_size =btrfs_item_size_nr (leaf, slot -1 ); + prev_csum_end = (prev_item_size / csumsize) * sectorsize; + prev_csum_end += prev_key->offset; +if (prev_csum_end > key->offset) { +generic_err (leaf, slot -1 , +"csum end range (%llu) goes beyond the start range (%llu) of the next csum item" , + prev_csum_end, key->offset); +return -EUCLEAN ; + } + }return 0 ; }
@@ -1239,7 +1253,7 @@ static int check_leaf_item(struct extent ret =check_extent_data_item (leaf, key, slot, prev_key);break ;case BTRFS_EXTENT_CSUM_KEY : - ret =check_csum_item (leaf, key, slot); + ret =check_csum_item (leaf, key, slot, prev_key);break ;case BTRFS_DIR_ITEM_KEY :case BTRFS_DIR_INDEX_KEY :
Greg Kroah-Hartman
maintainerPATCH 34/434 btrfs: abort transaction after failed inode updates in create_subvol
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
commit c7e54b5102bf3614cadb9ca32d7be73bad6cecf0 upstream.
We can just abort the transaction here, and in fact do that for every other failure in this function except these two cases.
--- fs/btrfs/ioctl.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
fs/btrfs/ioctl.c +8 -2
@@ -705,11 +705,17 @@ static noinline int create_subvol(structbtrfs_i_size_write (BTRFS_I (dir), dir->i_size + namelen *2 ); ret =btrfs_update_inode (trans, root, dir); -BUG_ON (ret); +if (ret) { +btrfs_abort_transaction (trans, ret); + goto fail; + } ret =btrfs_add_root_ref (trans, objectid, root->root_key.objectid,btrfs_ino (BTRFS_I (dir)), index, name, namelen); -BUG_ON (ret); +if (ret) { +btrfs_abort_transaction (trans, ret); + goto fail; + } ret =btrfs_uuid_tree_add (trans, root_item->uuid,BTRFS_UUID_KEY_SUBVOL , objectid);
Greg Kroah-Hartman
maintainerPATCH 35/434 btrfs: skip log replay on orphaned roots
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
commit 9bc574de590510eff899c3ca8dbaf013566b5efe upstream.
My fsstress modifications coupled with generic/475 uncovered a failure to mount and replay the log if we hit a orphaned root. We do not want to replay the log for an orphan root, but it's completely legitimate to have an orphaned root with a log attached. Fix this by simply skipping replaying the log. We still need to pin it's root node so that we do not overwrite it while replaying other logs, as we re-read the log root at every stage of the replay.
--- fs/btrfs/tree-log.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)
fs/btrfs/tree-log.c +21 -2
@@ -6337,9 +6337,28 @@ again: wc.replay_dest =btrfs_read_fs_root_no_name (fs_info, &tmp_key);if (IS_ERR (wc.replay_dest)) { ret =PTR_ERR (wc.replay_dest); + +/* +* We didn't find the subvol, likely because it was +* deleted. This is ok, simply skip this log and go to +* the next one. +* +* We need to exclude the root because we can't have +* other log replays overwriting this log as we'll read +* it back in a few more times. This will keep our +* block from being modified, and we'll just bail for +* each subsequent pass. +*/ +if (ret == -ENOENT ) + ret =btrfs_pin_extent_for_log_replay (fs_info, + log->node->start, + log->node->len);free_extent_buffer (log->node);free_extent_buffer (log->commit_root);kfree (log); + +if (!ret) + goto next;btrfs_handle_fs_error (fs_info, ret,"Couldn't read target root for tree log recovery." ); goto error;
@@ -6371,7 +6390,6 @@ again: &root->highest_objectid); } - key.offset = found_key.offset -1 ; wc.replay_dest->log_root =NULL ;free_extent_buffer (log->node);free_extent_buffer (log->commit_root);
@@ -6379,9 +6397,10 @@ again:if (ret) goto error; - +next:if (found_key.offset ==0 )break ; + key.offset = found_key.offset -1 ; }btrfs_release_path (path);
Greg Kroah-Hartman
maintainerPATCH 36/434 btrfs: do not leak reloc root if we fail to read the fs root
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
commit ca1aa2818a53875cfdd175fb5e9a2984e997cce9 upstream.
If we fail to read the fs root corresponding with a reloc root we'll just break out and free the reloc roots. But we remove our current reloc_root from this list higher up, which means we'll leak this reloc_root. Fix this by adding ourselves back to the reloc_roots list so we are properly cleaned up.
--- fs/btrfs/relocation.c | 1 + 1 file changed, 1 insertion(+)
fs/btrfs/relocation.c +1 -0
@@ -4555,6 +4555,7 @@ int btrfs_recover_relocation(struct btrf fs_root =read_fs_root (fs_info, reloc_root->root_key.offset);if (IS_ERR (fs_root)) { err =PTR_ERR (fs_root); +list_add_tail (&reloc_root->root_list, &reloc_roots); goto out_free; }
Greg Kroah-Hartman
maintainerPATCH 37/434 btrfs: handle ENOENT in btrfs_uuid_tree_iterate
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
commit 714cd3e8cba6841220dce9063a7388a81de03825 upstream.
If we get an -ENOENT back from btrfs_uuid_iter_rem when iterating the uuid tree we'll just continue and do btrfs_next_item(). However we've done a btrfs_release_path() at this point and no longer have a valid path. So increment the key and go back and do a normal search.
--- fs/btrfs/uuid-tree.c | 2 ++ 1 file changed, 2 insertions(+)
fs/btrfs/uuid-tree.c +2 -0
@@ -324,6 +324,8 @@ again_search_slot: }if (ret <0 && ret != -ENOENT ) goto out; + key.offset++; + goto again_search_slot; } item_size -=sizeof (subid_le); offset +=sizeof (subid_le);
Greg Kroah-Hartman
maintainerPATCH 38/434 Btrfs: fix removal logic of the tree mod log that leads to use-after-free issues
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit 6609fee8897ac475378388238456c84298bff802 upstream.
When a tree mod log user no longer needs to use the tree it calls btrfs_put_tree_mod_seq() to remove itself from the list of users and delete all no longer used elements of the tree's red black tree, which should be all elements with a sequence number less then our equals to the caller's sequence number. However the logic is broken because it can delete and free elements from the red black tree that have a sequence number greater then the caller's sequence number:
1) At a point in time we have sequence numbers 1, 2, 3 and 4 in the tree mod log;
2) The task which got assigned the sequence number 1 calls btrfs_put_tree_mod_seq();
3) Sequence number 1 is deleted from the list of sequence numbers;
4) The current minimum sequence number is computed to be the sequence number 2;
5) A task using sequence number 2 is at tree_mod_log_rewind() and gets a pointer to one of its elements from the red black tree through a call to tree_mod_log_search();
6) The task with sequence number 1 iterates the red black tree of tree modification elements and deletes (and frees) all elements with a sequence number less then or equals to 2 (the computed minimum sequence number) - it ends up only leaving elements with sequence numbers of 3 and 4;
7) The task with sequence number 2 now uses the pointer to its element, already freed by the other task, at __tree_mod_log_rewind(), resulting in a use-after-free issue. When CONFIG_DEBUG_PAGEALLOC=y it produces a trace like the following:
[16804.546854] general protection fault: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC PTI [16804.547451] CPU: 0 PID: 28257 Comm: pool Tainted: G W 5.4.0-rc8-btrfs-next-51 #1 [16804.548059] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.0-0-ga698c8995f-prebuilt.qemu.org 04/01/2014 [16804.548666] RIP: 0010:rb_next+0x16/0x50 (...) [16804.550581] RSP: 0018:ffffb948418ef9b0 EFLAGS: 00010202 [16804.551227] RAX: 6b6b6b6b6b6b6b6b RBX: ffff90e0247f6600 RCX: 6b6b6b6b6b6b6b6b [16804.551873] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff90e0247f6600 [16804.552504] RBP: ffff90dffe0d4688 R08: 0000000000000001 R09: 0000000000000000 [16804.553136] R10: ffff90dffa4a0040 R11: 0000000000000000 R12: 000000000000002e [16804.553768] R13: ffff90e0247f6600 R14: 0000000000001663 R15: ffff90dff77862b8 [16804.554399] FS: 00007f4b197ae700(0000) GS:ffff90e036a00000(0000) knlGS:0000000000000000 [16804.555039] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [16804.555683] CR2: 00007f4b10022000 CR3: 00000002060e2004 CR4: 00000000003606f0 [16804.556336] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [16804.556968] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [16804.557583] Call Trace: [16804.558207] __tree_mod_log_rewind+0xbf/0x280 [btrfs] [16804.558835] btrfs_search_old_slot+0x105/0xd00 [btrfs] [16804.559468] resolve_indirect_refs+0x1eb/0xc70 [btrfs] [16804.560087] ? free_extent_buffer.part.19+0x5a/0xc0 [btrfs] [16804.560700] find_parent_nodes+0x388/0x1120 [btrfs] [16804.561310] btrfs_check_shared+0x115/0x1c0 [btrfs] [16804.561916] ? extent_fiemap+0x59d/0x6d0 [btrfs] [16804.562518] extent_fiemap+0x59d/0x6d0 [btrfs] [16804.563112] ? __might_fault+0x11/0x90 [16804.563706] do_vfs_ioctl+0x45a/0x700 [16804.564299] ksys_ioctl+0x70/0x80 [16804.564885] ? trace_hardirqs_off_thunk+0x1a/0x20 [16804.565461] __x64_sys_ioctl+0x16/0x20 [16804.566020] do_syscall_64+0x5c/0x250 [16804.566580] entry_SYSCALL_64_after_hwframe+0x49/0xbe [16804.567153] RIP: 0033:0x7f4b1ba2add7 (...) [16804.568907] RSP: 002b:00007f4b197adc88 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 [16804.569513] RAX: ffffffffffffffda RBX: 00007f4b100210d8 RCX: 00007f4b1ba2add7 [16804.570133] RDX: 00007f4b100210d8 RSI: 00000000c020660b RDI: 0000000000000003 [16804.570726] RBP: 000055de05a6cfe0 R08: 0000000000000000 R09: 00007f4b197add44 [16804.571314] R10: 0000000000000000 R11: 0000000000000246 R12: 00007f4b197add48 [16804.571905] R13: 00007f4b197add40 R14: 00007f4b100210d0 R15: 00007f4b197add50 (...) [16804.575623] ---[ end trace 87317359aad4ba50 ]---
Fix this by making btrfs_put_tree_mod_seq() skip deletion of elements that have a sequence number equals to the computed minimum sequence number, and not just elements with a sequence number greater then that minimum.
--- fs/btrfs/ctree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/ctree.c +1 -1
@@ -383,7 +383,7 @@ void btrfs_put_tree_mod_seq(struct btrfsfor (node =rb_first (tm_root); node; node = next) { next =rb_next (node); tm = rb_entry(node, struct tree_mod_elem, node); -if (tm->seq > min_seq) +if (tm->seq >= min_seq)continue ;rb_erase (node, tm_root);kfree (tm);
Greg Kroah-Hartman
maintainerPATCH 39/434 ALSA: pcm: Avoid possible info leaks from PCM stream buffers
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit add9d56d7b3781532208afbff5509d7382fb6efe upstream.
The current PCM code doesn't initialize explicitly the buffers allocated for PCM streams, hence it might leak some uninitialized kernel data or previous stream contents by mmapping or reading the buffer before actually starting the stream.
Since this is a common problem, this patch simply adds the clearance of the buffer data at hw_params callback. Although this does only zero-clear no matter which format is used, which doesn't mean the silence for some formats, but it should be OK because the intention is just to clear the previous data on the buffer.
--- sound/core/pcm_native.c | 4 ++++ 1 file changed, 4 insertions(+)
sound/core/pcm_native.c +4 -0
@@ -705,6 +705,10 @@ static int snd_pcm_hw_params(struct snd_while (runtime->boundary *2 <=LONG_MAX - runtime->buffer_size) runtime->boundary *=2 ; +/* clear the buffer for avoiding possible kernel info leaks */ +if (runtime->dma_area && !substream->ops->copy_user) +memset (runtime->dma_area,0 , runtime->dma_bytes); +snd_pcm_timer_resolution_change (substream);snd_pcm_set_state (substream,SNDRV_PCM_STATE_SETUP );
Greg Kroah-Hartman
maintainerPATCH 41/434 ALSA: hda/ca0132 - Avoid endless loop
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit cb04fc3b6b076f67d228a0b7d096c69ad486c09c upstream.
Introduce a timeout to dspio_clear_response_queue() so that it won't be caught in an endless loop even if the hardware doesn't respond properly.
--- sound/pci/hda/patch_ca0132.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
sound/pci/hda/patch_ca0132.c +3 -2
@@ -1809,13 +1809,14 @@ struct scp_msg {static void dspio_clear_response_queue (struct hda_codec *codec) { +unsigned long timeout = jiffies +msecs_to_jiffies (1000 );unsigned int dummy =0 ; -int status =-1 ; +int status;/* clear all from the response queue */ do { status =dspio_read (codec, &dummy); - }while (status ==0 ); + }while (status ==0 &&time_before (jiffies, timeout)); }static int dspio_get_response_data (struct hda_codec *codec)
Greg Kroah-Hartman
maintainerPATCH 42/434 ALSA: hda/ca0132 - Fix work handling in delayed HP detection
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 42fb6b1d41eb5905d77c06cad2e87b70289bdb76 upstream.
CA0132 has the delayed HP jack detection code that is invoked from the unsol handler, but it does a few weird things: it contains the cancel of a work inside the work handler, and yet it misses the cancel-sync call at (runtime-)suspend. This patch addresses those issues.
--- sound/pci/hda/patch_ca0132.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
sound/pci/hda/patch_ca0132.c +14 -2
@@ -7607,11 +7607,10 @@ static void hp_callback(struct hda_codec/* Delay enabling the HP amp, to let the mic-detection * state machine run. */ -cancel_delayed_work (&spec->unsol_hp_work); -schedule_delayed_work (&spec->unsol_hp_work,msecs_to_jiffies (500 )); tbl =snd_hda_jack_tbl_get (codec, cb->nid);if (tbl) tbl->block_report =1 ; +schedule_delayed_work (&spec->unsol_hp_work,msecs_to_jiffies (500 )); }static void amic_callback (struct hda_codec *codec,struct hda_jack_callback *cb)
@@ -8457,12 +8456,25 @@ static void ca0132_reboot_notify(struct codec->patch_ops.free (codec); } +#ifdef CONFIG_PM +static int ca0132_suspend (struct hda_codec *codec) +{ +struct ca0132_spec *spec = codec->spec; + +cancel_delayed_work_sync (&spec->unsol_hp_work); +return 0 ; +} +#endif +static const struct hda_codec_ops ca0132_patch_ops = { .build_controls = ca0132_build_controls, .build_pcms = ca0132_build_pcms, .init = ca0132_init, .free = ca0132_free, .unsol_event = snd_hda_jack_unsol_event, +#ifdef CONFIG_PM + .suspend = ca0132_suspend, +#endif .reboot_notify = ca0132_reboot_notify, };
Greg Kroah-Hartman
maintainerPATCH 45/434 drm: mst: Fix query_payload ack reply struct
In reply to Greg Kroah-HartmanFrom: Sean Paul <[email protected]>
[ Upstream commit 268de6530aa18fe5773062367fd119f0045f6e88 ]
Spec says[1] Allocated_PBN is 16 bits
[1]- DisplayPort 1.2 Spec, Section 2.11.9.8, Table 2-98
--- include/drm/drm_dp_mst_helper.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/drm/drm_dp_mst_helper.h +1 -1
@@ -334,7 +334,7 @@ struct drm_dp_resource_status_notify {struct drm_dp_query_payload_ack_reply {u8 port_number; -u8 allocated_pbn; +u16 allocated_pbn; };struct drm_dp_sideband_msg_req_body {
Signature · 8 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Greg Kroah-Hartman
maintainerPATCH 43/434 drm/vc4/vc4_hdmi: fill in connector info
In reply to Greg Kroah-HartmanFrom: Dariusz Marcinkiewicz <[email protected]>
[ Upstream commit 66c2dee4ae10a2d841c40b9dd9c7141eb23eee76 ]
Fill in the connector info, allowing userspace to associate the CEC device with the drm connector.
Tested on a Raspberry Pi 3B.
--- drivers/gpu/drm/vc4/vc4_hdmi.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/gpu/drm/vc4/vc4_hdmi.c +9 -4
@@ -1285,6 +1285,9 @@ static const struct cec_adap_ops vc4_hdmi_cec_adap_ops = {static int vc4_hdmi_bind (struct device *dev,struct device *master,void *data) { +#ifdef CONFIG_DRM_VC4_HDMI_CEC +struct cec_connector_info conn_info; +#endif struct platform_device *pdev =to_platform_device (dev);struct drm_device *drm =dev_get_drvdata (master);struct vc4_dev *vc4 = drm->dev_private;
@@ -1403,13 +1406,15 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)#ifdef CONFIG_DRM_VC4_HDMI_CEC hdmi->cec_adap =cec_allocate_adapter (&vc4_hdmi_cec_adap_ops, vc4,"vc4" , -CEC_CAP_TRANSMIT | -CEC_CAP_LOG_ADDRS | -CEC_CAP_PASSTHROUGH | -CEC_CAP_RC ,1 ); +CEC_CAP_DEFAULTS | +CEC_CAP_CONNECTOR_INFO ,1 ); ret =PTR_ERR_OR_ZERO (hdmi->cec_adap);if (ret <0 ) goto err_destroy_conn; + +cec_fill_conn_info_from_drm (&conn_info, hdmi->connector); +cec_s_conn_info (hdmi->cec_adap, &conn_info); +HDMI_WRITE (VC4_HDMI_CPU_MASK_SET ,0xffffffff ); value =HDMI_READ (VC4_HDMI_CEC_CNTRL_1 ); value &= ~VC4_HDMI_CEC_DIV_CLK_CNT_MASK ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 46/434 drm/mipi-dbi: fix a loop in debugfs code
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit d72cf01f410aa09868d98b672f3f92328c96b32d ]
This code will likely crash if we try to do a zero byte write. The code looks like this:
/* strip trailing whitespace */
for (i = count - 1; i > 0; i--)
if (isspace(buf[i]))
...We're writing zero bytes so count = 0. You would think that "count - 1" would be negative one, but because "i" is unsigned it is a large positive numer instead. The "i > 0" condition is true and the "buf[i]" access will be out of bounds.
The fix is to make "i" signed and now everything works as expected. The upper bound of "count" is capped in __kernel_write() at MAX_RW_COUNT so we don't have to worry about it being higher than INT_MAX.
--- drivers/gpu/drm/drm_mipi_dbi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/drm_mipi_dbi.c +1 -2
@@ -1187,8 +1187,7 @@ static ssize_t mipi_dbi_debugfs_command_write(struct file *file,struct mipi_dbi_dev *dbidev = m->private;u8 val, cmd =0 , parameters[64 ];char *buf, *pos, *token; -unsigned int i; -int ret, idx; +int i, ret, idx;if (!drm_dev_enter (&dbidev->drm, &idx))return -ENODEV ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 20/434 net: ena: fix default tx interrupt moderation interval
In reply to Greg Kroah-HartmanFrom: Arthur Kiyanovski <[email protected]>
[ Upstream commit 05785adf6e570a068adf0502b61fe2b521d7f0ca ]
Current default non-adaptive tx interrupt moderation interval is 196 us. This value is too high and might cause the tx queue to fill up.
In this commit we set the default non-adaptive tx interrupt moderation interval to 64 us in order to:
1. Reduce the probability of the queue filling-up (when compared to the current default value of 196 us).
2. Reduce unnecessary tx interrupt overhead (which happens if we set the default tx interval to 0).
We determined experimentally that 64 us is an optimal value that reduces interrupt rate by more than 20% without affecting performance.
--- drivers/net/ethernet/amazon/ena/ena_com.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/amazon/ena/ena_com.h +1 -1
@@ -72,7 +72,7 @@/*****************************************************************************/ /* ENA adaptive interrupt moderation settings */ -#define ENA_INTR_INITIAL_TX_INTERVAL_USECS 196 +#define ENA_INTR_INITIAL_TX_INTERVAL_USECS 64#define ENA_INTR_INITIAL_RX_INTERVAL_USECS 0#define ENA_DEFAULT_INTR_DELAY_RESOLUTION 1
Greg Kroah-Hartman
maintainerPATCH 47/434 drm/panel: Add missing drm_panel_init() in panel drivers
In reply to Greg Kroah-HartmanFrom: Laurent Pinchart <[email protected]>
[ Upstream commit 65abbda8ed7ca48c8807d6b04a77431b438fa659 ]
Panels must be initialised with drm_panel_init(). Add the missing function call in the panel-raspberrypi-touchscreen.c and panel-sitronix-st7789v.c drivers.
--- drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c | 1 + drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 1 + 2 files changed, 2 insertions(+)
drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c +1 -0
@@ -426,6 +426,7 @@ static int rpi_touchscreen_probe(struct i2c_client *i2c,return PTR_ERR (ts->dsi); } +drm_panel_init (&ts->base); ts->base.dev = dev; ts->base.funcs = &rpi_touchscreen_funcs;
drivers/gpu/drm/panel/panel-sitronix-st7789v.c +1 -0
@@ -381,6 +381,7 @@ static int st7789v_probe(struct spi_device *spi)spi_set_drvdata (spi, ctx); ctx->spi = spi; +drm_panel_init (&ctx->panel); ctx->panel.dev = &spi->dev; ctx->panel.funcs = &st7789v_drm_funcs;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 49/434 drm: Use EOPNOTSUPP, not ENOTSUPP
In reply to Greg Kroah-HartmanFrom: Daniel Vetter <[email protected]>
[ Upstream commit c7581a414d28413c1dd6d116d44859b5a52e0950 ]
- it's what we recommend in our docs:
https://dri.freedesktop.org/docs/drm/gpu/drm-uapi.html#recommended-ioctl-return-values
- it's the overwhelmingly used error code for "operation not supported", at least in drm core (slightly less so in drivers):
$ git grep EOPNOTSUPP -- drivers/gpu/drm/*c | wc -l 83 $ git grep ENOTSUPP -- drivers/gpu/drm/*c | wc -l 5
- include/linux/errno.h makes it fairly clear that these are for nfsv3 (plus they also have error codes above 512, which is the block with some special behaviour ...)
/* Defined for the NFSv3 protocol */
If the above isn't reflecting current practice, then I guess we should at least update the docs.
Noralf commented:
Ben Hutchings made this comment[1] in a thread about use of ENOTSUPP in drivers:
glibc's strerror() returns these strings for ENOTSUPP and EOPNOTSUPP respectively:
"Unknown error 524"
"Operation not supported"
So at least for errors returned to userspace EOPNOTSUPP makes sense.
José asked:
Quoted 1 line
Hopefully this will not break any userspace
None of the functions in drm_edid.c affected by this reach userspace, it's all driver internal.
Same for the mipi function, that error code should be handled by drivers. Drivers are supposed to remap "the hw is on fire" to EIO when reporting up to userspace, but I think if a driver sees this it would be a driver bug.
v2: Augment commit message with comments from Noralf and José
--- drivers/gpu/drm/drm_edid.c | 6 +++--- drivers/gpu/drm/drm_mipi_dbi.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/drm_edid.c +3 -3
@@ -3722,7 +3722,7 @@ cea_db_offsets(const u8 *cea, int *start, int *end)if (*end <4 || *end >127 )return -ERANGE ; }else { -return -ENOTSUPP ; +return -EOPNOTSUPP ; }return 0 ;
@@ -4191,7 +4191,7 @@ int drm_edid_to_sad(struct edid *edid, struct cea_sad **sads)if (cea_revision (cea) <3 ) {DRM_DEBUG_KMS ("SAD: wrong CEA revision\n" ); -return -ENOTSUPP ; +return -EOPNOTSUPP ; }if (cea_db_offsets (cea, &start, &end)) {
@@ -4252,7 +4252,7 @@ int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb)if (cea_revision (cea) <3 ) {DRM_DEBUG_KMS ("SAD: wrong CEA revision\n" ); -return -ENOTSUPP ; +return -EOPNOTSUPP ; }if (cea_db_offsets (cea, &start, &end)) {
drivers/gpu/drm/drm_mipi_dbi.c +1 -1
@@ -955,7 +955,7 @@ static int mipi_dbi_typec1_command(struct mipi_dbi *dbi, u8 *cmd,int ret;if (mipi_dbi_command_is_read (dbi, *cmd)) -return -ENOTSUPP ; +return -EOPNOTSUPP ;MIPI_DBI_DEBUG_COMMAND (*cmd, parameters, num);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 48/434 drm: exynos: exynos_hdmi: use cec_notifier_conn_(un)register
In reply to Greg Kroah-HartmanFrom: Dariusz Marcinkiewicz <[email protected]>
[ Upstream commit 71137bfd98973efb7b762ba168df077b87b34311 ]
Use the new cec_notifier_conn_(un)register() functions to (un)register the notifier for the HDMI connector, and fill in the cec_connector_info.
Changes since v7:
- err_runtime_disable -> err_rpm_disable
Changes since v2:
- removed unnecessary call to invalidate phys address before deregistering the notifier,
- use cec_notifier_phys_addr_invalidate instead of setting invalid address on a notifier.
--- drivers/gpu/drm/exynos/exynos_hdmi.c | 31 ++++++++++++++++------------ 1 file changed, 18 insertions(+), 13 deletions(-)
drivers/gpu/drm/exynos/exynos_hdmi.c +18 -13
@@ -852,6 +852,10 @@ static enum drm_connector_status hdmi_detect(struct drm_connector *connector,static void hdmi_connector_destroy (struct drm_connector *connector) { +struct hdmi_context *hdata =connector_to_hdmi (connector); + +cec_notifier_conn_unregister (hdata->notifier); +drm_connector_unregister (connector);drm_connector_cleanup (connector); }
@@ -935,6 +939,7 @@ static int hdmi_create_connector(struct drm_encoder *encoder) {struct hdmi_context *hdata =encoder_to_hdmi (encoder);struct drm_connector *connector = &hdata->connector; +struct cec_connector_info conn_info;int ret; connector->interlace_allowed = true;
@@ -957,6 +962,15 @@ static int hdmi_create_connector(struct drm_encoder *encoder)DRM_DEV_ERROR (hdata->dev,"Failed to attach bridge\n" ); } +cec_fill_conn_info_from_drm (&conn_info, connector); + + hdata->notifier =cec_notifier_conn_register (hdata->dev,NULL , + &conn_info); +if (!hdata->notifier) { + ret = -ENOMEM ; +DRM_DEV_ERROR (hdata->dev,"Failed to allocate CEC notifier\n" ); + } +return ret; }
@@ -1528,8 +1542,8 @@ static void hdmi_disable(struct drm_encoder *encoder)*/ mutex_unlock (&hdata->mutex);cancel_delayed_work (&hdata->hotplug_work); -cec_notifier_set_phys_addr (hdata->notifier, -CEC_PHYS_ADDR_INVALID ); +if (hdata->notifier) +cec_notifier_phys_addr_invalidate (hdata->notifier);return ; }
@@ -2006,12 +2020,6 @@ static int hdmi_probe(struct platform_device *pdev) } } - hdata->notifier =cec_notifier_get (&pdev->dev); -if (hdata->notifier ==NULL ) { - ret = -ENOMEM ; - goto err_hdmiphy; - } -pm_runtime_enable (dev); audio_infoframe = &hdata->audio.infoframe;
@@ -2023,7 +2031,7 @@ static int hdmi_probe(struct platform_device *pdev) ret =hdmi_register_audio_device (hdata);if (ret) - goto err_notifier_put; + goto err_rpm_disable; ret =component_add (&pdev->dev, &hdmi_component_ops);if (ret)
@@ -2034,8 +2042,7 @@ static int hdmi_probe(struct platform_device *pdev) err_unregister_audio:platform_device_unregister (hdata->audio.pdev); -err_notifier_put: -cec_notifier_put (hdata->notifier); +err_rpm_disable:pm_runtime_disable (dev); err_hdmiphy:
@@ -2054,12 +2061,10 @@ static int hdmi_remove(struct platform_device *pdev)struct hdmi_context *hdata =platform_get_drvdata (pdev);cancel_delayed_work_sync (&hdata->hotplug_work); -cec_notifier_set_phys_addr (hdata->notifier,CEC_PHYS_ADDR_INVALID );component_del (&pdev->dev, &hdmi_component_ops);platform_device_unregister (hdata->audio.pdev); -cec_notifier_put (hdata->notifier);pm_runtime_disable (&pdev->dev);if (!IS_ERR (hdata->reg_hdmi_en))
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 51/434 drm/bridge: analogix-anx78xx: silence -EPROBE_DEFER warnings
In reply to Greg Kroah-HartmanFrom: Brian Masney <[email protected]>
[ Upstream commit 2708e876272d89bbbff811d12834adbeef85f022 ]
Silence two warning messages that occur due to -EPROBE_DEFER errors to help cleanup the system boot log.
--- drivers/gpu/drm/bridge/analogix-anx78xx.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/bridge/analogix-anx78xx.c +6 -2
@@ -715,7 +715,9 @@ static int anx78xx_init_pdata(struct anx78xx *anx78xx)/* 1.0V digital core power regulator */ pdata->dvdd10 =devm_regulator_get (dev,"dvdd10" );if (IS_ERR (pdata->dvdd10)) { -DRM_ERROR ("DVDD10 regulator not found\n" ); +if (PTR_ERR (pdata->dvdd10) != -EPROBE_DEFER ) +DRM_ERROR ("DVDD10 regulator not found\n" ); +return PTR_ERR (pdata->dvdd10); }
@@ -1332,7 +1334,9 @@ static int anx78xx_i2c_probe(struct i2c_client *client, err =anx78xx_init_pdata (anx78xx);if (err) { -DRM_ERROR ("Failed to initialize pdata: %d\n" , err); +if (err != -EPROBE_DEFER ) +DRM_ERROR ("Failed to initialize pdata: %d\n" , err); +return err; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 53/434 iio: max31856: add missing of_node and parent references to iio_dev
In reply to Greg Kroah-HartmanFrom: Andrea Merello <[email protected]>
[ Upstream commit 505ea3ada665c466d0064b11b6e611b7f995517d ]
Adding missing indio_dev->dev.of_node references so that, in case multiple max31856 are present, users can get some clues to being able to distinguish each of them. While at it, add also the missing parent reference.
--- drivers/iio/temperature/max31856.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/iio/temperature/max31856.c +2 -0
@@ -284,6 +284,8 @@ static int max31856_probe(struct spi_device *spi)spi_set_drvdata (spi, indio_dev); indio_dev->info = &max31856_info; + indio_dev->dev.parent = &spi->dev; + indio_dev->dev.of_node = spi->dev.of_node; indio_dev->name = id->name; indio_dev->modes =INDIO_DIRECT_MODE ; indio_dev->channels = max31856_channels;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 55/434 drm/amdgpu/sriov: add ring_stop before ring_create in psp v11 code
In reply to Greg Kroah-HartmanFrom: Jack Zhang <[email protected]>
[ Upstream commit 51c0f58e9f6af3a387d14608033e6796a7ad90ee ]
psp v11 code missed ring stop in ring create function(VMR) while psp v3.1 code had the code. This will cause VM destroy1 fail and psp ring create fail.
For SIOV-VF, ring_stop should not be deleted in ring_create function.
--- drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 61 ++++++++++++++------------ 1 file changed, 34 insertions(+), 27 deletions(-)
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +34 -27
@@ -398,6 +398,34 @@ static bool psp_v11_0_support_vmr_ring(struct psp_context *psp)return false; } +static int psp_v11_0_ring_stop (struct psp_context *psp, +enum psp_ring_type ring_type) +{ +int ret =0 ; +struct amdgpu_device *adev = psp->adev; + +/* Write the ring destroy command*/ +if (psp_v11_0_support_vmr_ring (psp)) +WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_101, +GFX_CTRL_CMD_ID_DESTROY_GPCOM_RING ); +else +WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_64, +GFX_CTRL_CMD_ID_DESTROY_RINGS ); + +/* there might be handshake issue with hardware which needs delay */ +mdelay (20 ); + +/* Wait for response flag (bit 31) */ +if (psp_v11_0_support_vmr_ring (psp)) + ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_101), +0x80000000 ,0x80000000 , false); +else + ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), +0x80000000 ,0x80000000 , false); + +return ret; +} +static int psp_v11_0_ring_create (struct psp_context *psp,enum psp_ring_type ring_type) {
@@ -407,6 +435,12 @@ static int psp_v11_0_ring_create(struct psp_context *psp,struct amdgpu_device *adev = psp->adev;if (psp_v11_0_support_vmr_ring (psp)) { + ret =psp_v11_0_ring_stop (psp, ring_type); +if (ret) { +DRM_ERROR ("psp_v11_0_ring_stop_sriov failed!\n" ); +return ret; + } +/* Write low address of the ring to C2PMSG_102 */ psp_ring_reg =lower_32_bits (ring->ring_mem_mc_addr);WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_102, psp_ring_reg);
@@ -451,33 +485,6 @@ static int psp_v11_0_ring_create(struct psp_context *psp,return ret; } -static int psp_v11_0_ring_stop (struct psp_context *psp, -enum psp_ring_type ring_type) -{ -int ret =0 ; -struct amdgpu_device *adev = psp->adev; - -/* Write the ring destroy command*/ -if (psp_v11_0_support_vmr_ring (psp)) -WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_101, -GFX_CTRL_CMD_ID_DESTROY_GPCOM_RING ); -else -WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_64, -GFX_CTRL_CMD_ID_DESTROY_RINGS ); - -/* there might be handshake issue with hardware which needs delay */ -mdelay (20 ); - -/* Wait for response flag (bit 31) */ -if (psp_v11_0_support_vmr_ring (psp)) - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_101), -0x80000000 ,0x80000000 , false); -else - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), -0x80000000 ,0x80000000 , false); - -return ret; -}static int psp_v11_0_ring_destroy (struct psp_context *psp,enum psp_ring_type ring_type)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 21/434 net: ena: fix issues in setting interrupt moderation params in ethtool
In reply to Greg Kroah-HartmanFrom: Arthur Kiyanovski <[email protected]>
[ Upstream commit 41c53caa5a61ebc9221b71cc37f4a90549f1121d ]
Issue 1:
--------
Reproduction steps:
1. sudo ethtool -C eth0 rx-usecs 128
2. sudo ethtool -C eth0 adaptive-rx on
3. sudo ethtool -C eth0 adaptive-rx off
4. ethtool -c eth0
expected output: rx-usecs 128
actual output: rx-usecs 0
Reason for issue:
In stage 3, ethtool userspace calls first the ena_get_coalesce() handler to get the current value of all properties, and then the ena_set_coalesce() handler. When ena_get_coalesce() is called the adaptive interrupt moderation is still on. There is an if in the code that returns the rx_coalesce_usecs only if the adaptive interrupt moderation is off. And since it is still on, rx_coalesce_usecs is not set, meaning it stays 0.
Solution to issue:
Remove this if static interrupt moderation intervals have nothing to do with dynamic ones.
Issue 2:
--------
Reproduction steps:
1. sudo ethtool -C eth0 adaptive-rx on
2. sudo ethtool -C eth0 rx-usecs 128
3. ethtool -c eth0
expected output: rx-usecs 128
actual output: rx-usecs 0
Reason for issue:
In stage 2, when ena_set_coalesce() is called, the handler tests if rx adaptive interrupt moderation is on, and if it is, it returns before getting to the part in the function that sets the rx non-adaptive interrupt moderation interval.
Solution to issue:
Remove the return from the function when rx adaptive interrupt moderation is on.
Also cleaned up the fixed code in ena_set_coalesce by grouping together adaptive interrupt moderation toggling, and using && instead of nested ifs.
--- drivers/net/ethernet/amazon/ena/ena_ethtool.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-)
drivers/net/ethernet/amazon/ena/ena_ethtool.c +10 -14
@@ -315,10 +315,9 @@ static int ena_get_coalesce(struct net_dena_com_get_nonadaptive_moderation_interval_tx (ena_dev) * ena_dev->intr_delay_resolution; -if (!ena_com_get_adaptive_moderation_enabled (ena_dev)) - coalesce->rx_coalesce_usecs = -ena_com_get_nonadaptive_moderation_interval_rx (ena_dev) - * ena_dev->intr_delay_resolution; + coalesce->rx_coalesce_usecs = +ena_com_get_nonadaptive_moderation_interval_rx (ena_dev) + * ena_dev->intr_delay_resolution; coalesce->use_adaptive_rx_coalesce =ena_com_get_adaptive_moderation_enabled (ena_dev);
@@ -367,12 +366,6 @@ static int ena_set_coalesce(struct net_dena_update_tx_rings_intr_moderation (adapter); -if (coalesce->use_adaptive_rx_coalesce) { -if (!ena_com_get_adaptive_moderation_enabled (ena_dev)) -ena_com_enable_adaptive_moderation (ena_dev); -return 0 ; - } - rc =ena_com_update_nonadaptive_moderation_interval_rx (ena_dev, coalesce->rx_coalesce_usecs);if (rc)
@@ -380,10 +373,13 @@ static int ena_set_coalesce(struct net_dena_update_rx_rings_intr_moderation (adapter); -if (!coalesce->use_adaptive_rx_coalesce) { -if (ena_com_get_adaptive_moderation_enabled (ena_dev)) -ena_com_disable_adaptive_moderation (ena_dev); - } +if (coalesce->use_adaptive_rx_coalesce && + !ena_com_get_adaptive_moderation_enabled (ena_dev)) +ena_com_enable_adaptive_moderation (ena_dev); + +if (!coalesce->use_adaptive_rx_coalesce && +ena_com_get_adaptive_moderation_enabled (ena_dev)) +ena_com_disable_adaptive_moderation (ena_dev);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 57/434 drm/ttm: return -EBUSY on pipelining with no_gpu_wait (v2)
In reply to Greg Kroah-HartmanFrom: Christian König <[email protected]>
[ Upstream commit 3084cf46cf8110826a42de8c8ef30e8fa48974c2 ]
Setting the no_gpu_wait flag means that the allocate BO must be available immediately and we can't wait for any GPU operation to finish.
v2: squash in mem leak fix, rebase
--- drivers/gpu/drm/ttm/ttm_bo.c | 44 +++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 18 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +26 -18
@@ -926,7 +926,8 @@ EXPORT_SYMBOL(ttm_bo_mem_put);*/ static int ttm_bo_add_move_fence (struct ttm_buffer_object *bo,struct ttm_mem_type_manager *man, -struct ttm_mem_reg *mem) +struct ttm_mem_reg *mem, +bool no_wait_gpu) {struct dma_fence *fence;int ret;
@@ -935,19 +936,22 @@ static int ttm_bo_add_move_fence(struct ttm_buffer_object *bo, fence =dma_fence_get (man->move);spin_unlock (&man->move_lock); -if (fence) { -dma_resv_add_shared_fence (bo->base.resv, fence); +if (!fence) +return 0 ; - ret =dma_resv_reserve_shared (bo->base.resv,1 ); -if (unlikely (ret)) { -dma_fence_put (fence); -return ret; - } +if (no_wait_gpu) +return -EBUSY ; + +dma_resv_add_shared_fence (bo->base.resv, fence); -dma_fence_put (bo->moving); - bo->moving = fence; + ret =dma_resv_reserve_shared (bo->base.resv,1 ); +if (unlikely (ret)) { +dma_fence_put (fence); +return ret; } +dma_fence_put (bo->moving); + bo->moving = fence;return 0 ; }
@@ -978,7 +982,7 @@ static int ttm_bo_mem_force_space(struct ttm_buffer_object *bo,return ret; }while (1 ); -return ttm_bo_add_move_fence (bo, man, mem); +return ttm_bo_add_move_fence (bo, man, mem, ctx->no_wait_gpu); } static uint32_t ttm_bo_select_caching(struct ttm_mem_type_manager *man,
@@ -1120,14 +1124,18 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,if (unlikely (ret)) goto error; -if (mem->mm_node) { - ret =ttm_bo_add_move_fence (bo, man, mem); -if (unlikely (ret)) { - (*man->func->put_node)(man, mem); - goto error; - } -return 0 ; +if (!mem->mm_node) +continue ; + + ret =ttm_bo_add_move_fence (bo, man, mem, ctx->no_wait_gpu); +if (unlikely (ret)) { + (*man->func->put_node)(man, mem); +if (ret == -EBUSY ) +continue ; + + goto error; } +return 0 ; }for (i =0 ; i < placement->num_busy_placement; ++i) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 58/434 drm/amd/display: Rebuild mapped resources after pipe split
In reply to Greg Kroah-HartmanFrom: Mikita Lipski <[email protected]>
[ Upstream commit 387596ef2859c37d564ce15abddbc9063a132e2c ]
[why]
The issue is specific for linux, as on timings such as 8K@60 or 4K@144 DSC should be working in combination with ODM Combine in order to ensure that we can run those timings. The validation for those timings was passing, but when pipe split was happening second pipe wasn't being programmed.
[how]
Rebuild mapped resources if we split stream for ODM.
--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +1 -0
@@ -2474,6 +2474,7 @@ bool dcn20_fast_validate_bw( &context->res_ctx, dc->res_pool, pipe, hsplit_pipe)) goto validate_fail; +dcn20_build_mapped_resource (dc, context, pipe->stream); }else dcn20_split_stream_for_mpc( &context->res_ctx, dc->res_pool,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 23/434 mlxsw: spectrum_router: Remove unlikely user-triggerable warning
In reply to Greg Kroah-HartmanFrom: Ido Schimmel <[email protected]>
[ Upstream commit 62201c00c4679ad8f0730d6d925a5d23651dfad2 ]
In case the driver vetoes the addition of an IPv6 multipath route, the IPv6 stack will emit delete notifications for the sibling routes that were already added to the FIB trie. Since these siblings are not present in hardware, a warning will be generated.
Have the driver ignore notifications for routes it does not have.
--- drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +6 -1
@@ -5637,8 +5637,13 @@ static void mlxsw_sp_router_fib6_del(strif (mlxsw_sp_fib6_rt_should_ignore (rt))return ; +/* Multipath routes are first added to the FIB trie and only then +* notified. If we vetoed the addition, we will get a delete +* notification for a route we do not have. Therefore, do not warn if +* route was not found. +*/ fib6_entry =mlxsw_sp_fib6_entry_lookup (mlxsw_sp, rt); -if (WARN_ON (!fib6_entry)) +if (!fib6_entry)return ;/* If not all the nexthops are deleted, then only reduce the nexthop
Greg Kroah-Hartman
maintainerPATCH 22/434 dpaa2-ptp: fix double free of the ptp_qoriq IRQ
In reply to Greg Kroah-HartmanFrom: Ioana Ciornei <[email protected]>
[ Upstream commit daa6eb5a149519583c8a8cb31945f06417d21902 ]
Upon reusing the ptp_qoriq driver, the ptp_qoriq_free() function was used on the remove path to free any allocated resources. The ptp_qoriq IRQ is among these resources that are freed in ptp_qoriq_free() even though it is also a managed one (allocated using devm_request_threaded_irq).
Drop the resource managed version of requesting the IRQ in order to not trigger a double free of the interrupt as below:
[ 226.731005] Trying to free already-free IRQ 126 [ 226.735533] WARNING: CPU: 6 PID: 749 at kernel/irq/manage.c:1707 __free_irq+0x9c/0x2b8 [ 226.743435] Modules linked in: [ 226.746480] CPU: 6 PID: 749 Comm: bash Tainted: G W 5.4.0-03629-gfd7102c32b2c-dirty #912 [ 226.755857] Hardware name: NXP Layerscape LX2160ARDB (DT) [ 226.761244] pstate: 40000085 (nZcv daIf -PAN -UAO) [ 226.766022] pc : __free_irq+0x9c/0x2b8 [ 226.769758] lr : __free_irq+0x9c/0x2b8 [ 226.773493] sp : ffff8000125039f0 (...) [ 226.856275] Call trace: [ 226.858710] __free_irq+0x9c/0x2b8 [ 226.862098] free_irq+0x30/0x70 [ 226.865229] devm_irq_release+0x14/0x20 [ 226.869054] release_nodes+0x1b0/0x220 [ 226.872790] devres_release_all+0x34/0x50 [ 226.876790] device_release_driver_internal+0x100/0x1c0
--- drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c +8 -6
@@ -160,10 +160,10 @@ static int dpaa2_ptp_probe(struct fsl_mc irq = mc_dev->irqs[0 ]; ptp_qoriq->irq = irq->msi_desc->irq; - err =devm_request_threaded_irq (dev, ptp_qoriq->irq,NULL , - dpaa2_ptp_irq_handler_thread, -IRQF_NO_SUSPEND |IRQF_ONESHOT , -dev_name (dev), ptp_qoriq); + err =request_threaded_irq (ptp_qoriq->irq,NULL , + dpaa2_ptp_irq_handler_thread, +IRQF_NO_SUSPEND |IRQF_ONESHOT , +dev_name (dev), ptp_qoriq);if (err <0 ) {dev_err (dev,"devm_request_threaded_irq(): %d\n" , err); goto err_free_mc_irq;
@@ -173,18 +173,20 @@ static int dpaa2_ptp_probe(struct fsl_mc DPRTC_IRQ_INDEX, 1);if (err <0 ) {dev_err (dev,"dprtc_set_irq_enable(): %d\n" , err); - goto err_free_mc_irq; + goto err_free_threaded_irq; } err =ptp_qoriq_init (ptp_qoriq, base, &dpaa2_ptp_caps);if (err) - goto err_free_mc_irq; + goto err_free_threaded_irq; dpaa2_phc_index = ptp_qoriq->phc_index;dev_set_drvdata (dev, ptp_qoriq);return 0 ; +err_free_threaded_irq: +free_irq (ptp_qoriq->irq, ptp_qoriq); err_free_mc_irq:fsl_mc_free_irqs (mc_dev); err_unmap:
Greg Kroah-Hartman
maintainerPATCH 24/434 net: ethernet: ti: davinci_cpdma: fix warning "device driver frees DMA memory with different size"
In reply to Greg Kroah-HartmanFrom: Grygorii Strashko <[email protected]>
[ Upstream commit 8a2b22203f8596729c54eba221b4044351bfe167 ]
The TI CPSW(s) driver produces warning with DMA API debug options enabled:
WARNING: CPU: 0 PID: 1033 at kernel/dma/debug.c:1025 check_unmap+0x4a8/0x968 DMA-API: cpsw 48484000.ethernet: device driver frees DMA memory with different size [device address=0x00000000abc6aa02] [map size=64 bytes] [unmap size=42 bytes] CPU: 0 PID: 1033 Comm: ping Not tainted 5.3.0-dirty #41 Hardware name: Generic DRA72X (Flattened Device Tree) [<c0112c60>] (unwind_backtrace) from [<c010d270>] (show_stack+0x10/0x14) [<c010d270>] (show_stack) from [<c09bc564>] (dump_stack+0xd8/0x110) [<c09bc564>] (dump_stack) from [<c013b93c>] (__warn+0xe0/0x10c) [<c013b93c>] (__warn) from [<c013b9ac>] (warn_slowpath_fmt+0x44/0x6c) [<c013b9ac>] (warn_slowpath_fmt) from [<c01e0368>] (check_unmap+0x4a8/0x968) [<c01e0368>] (check_unmap) from [<c01e08a8>] (debug_dma_unmap_page+0x80/0x90) [<c01e08a8>] (debug_dma_unmap_page) from [<c0752414>] (__cpdma_chan_free+0x114/0x16c) [<c0752414>] (__cpdma_chan_free) from [<c07525c4>] (__cpdma_chan_process+0x158/0x17c) [<c07525c4>] (__cpdma_chan_process) from [<c0753690>] (cpdma_chan_process+0x3c/0x5c) [<c0753690>] (cpdma_chan_process) from [<c0758660>] (cpsw_tx_mq_poll+0x48/0x94) [<c0758660>] (cpsw_tx_mq_poll) from [<c0803018>] (net_rx_action+0x108/0x4e4) [<c0803018>] (net_rx_action) from [<c010230c>] (__do_softirq+0xec/0x598) [<c010230c>] (__do_softirq) from [<c0143914>] (do_softirq.part.4+0x68/0x74) [<c0143914>] (do_softirq.part.4) from [<c0143a44>] (__local_bh_enable_ip+0x124/0x17c) [<c0143a44>] (__local_bh_enable_ip) from [<c0871590>] (ip_finish_output2+0x294/0xb7c) [<c0871590>] (ip_finish_output2) from [<c0875440>] (ip_output+0x210/0x364) [<c0875440>] (ip_output) from [<c0875e2c>] (ip_send_skb+0x1c/0xf8) [<c0875e2c>] (ip_send_skb) from [<c08a7fd4>] (raw_sendmsg+0x9a8/0xc74) [<c08a7fd4>] (raw_sendmsg) from [<c07d6b90>] (sock_sendmsg+0x14/0x24) [<c07d6b90>] (sock_sendmsg) from [<c07d8260>] (__sys_sendto+0xbc/0x100) [<c07d8260>] (__sys_sendto) from [<c01011ac>] (__sys_trace_return+0x0/0x14) Exception stack(0xea9a7fa8 to 0xea9a7ff0)
...
The reason is that cpdma_chan_submit_si() now stores original buffer length (sw_len) in CPDMA descriptor instead of adjusted buffer length (hw_len) used to map the buffer.
Hence, fix an issue by passing correct buffer length in CPDMA descriptor.
--- drivers/net/ethernet/ti/davinci_cpdma.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/net/ethernet/ti/davinci_cpdma.c +2 -3
@@ -1018,7 +1018,6 @@ static int cpdma_chan_submit_si(struct sstruct cpdma_chan *chan = si->chan;struct cpdma_ctlr *ctlr = chan->ctlr;int len = si->len; -int swlen = len;struct cpdma_desc __iomem *desc;dma_addr_t buffer;u32 mode;
@@ -1046,7 +1045,6 @@ static int cpdma_chan_submit_si(struct sif (si->data_dma) { buffer = si->data_dma;dma_sync_single_for_device (ctlr->dev, buffer, len, chan->dir); - swlen |=CPDMA_DMA_EXT_MAP ; }else { buffer =dma_map_single (ctlr->dev, si->data_virt, len, chan->dir); ret =dma_mapping_error (ctlr->dev, buffer);
@@ -1065,7 +1063,8 @@ static int cpdma_chan_submit_si(struct swritel_relaxed (mode | len, &desc->hw_mode);writel_relaxed ((uintptr_t )si->token, &desc->sw_token);writel_relaxed (buffer, &desc->sw_buffer); -writel_relaxed (swlen, &desc->sw_len); +writel_relaxed (si->data_dma ? len |CPDMA_DMA_EXT_MAP : len, + &desc->sw_len);desc_read (desc, sw_len);__cpdma_chan_submit (chan, desc);
Greg Kroah-Hartman
maintainerPATCH 17/434 selftests: forwarding: Delete IPv6 address at the end
In reply to Greg Kroah-HartmanFrom: Ido Schimmel <[email protected]>
[ Upstream commit 65cb13986229cec02635a1ecbcd1e2dd18353201 ]
When creating the second host in h2_create(), two addresses are assigned to the interface, but only one is deleted. When running the test twice in a row the following error is observed:
$ ./router_bridge_vlan.sh TEST: ping [ OK ] TEST: ping6 [ OK ] TEST: vlan [ OK ] $ ./router_bridge_vlan.sh RTNETLINK answers: File exists TEST: ping [ OK ] TEST: ping6 [ OK ] TEST: vlan [ OK ]
Fix this by deleting the address during cleanup.
--- tools/testing/selftests/net/forwarding/router_bridge_vlan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/net/forwarding/router_bridge_vlan.sh +1 -1
@@ -36,7 +36,7 @@ h2_destroy() { ip -6 route del 2001:db8:1::/64 vrf v$h2 ip -4 route del 192.0.2.0/28 vrf v$h2 - simple_if_fini $h2 192.0.2.130/28 + simple_if_fini $h2 192.0.2.130/28 2001:db8:2::2/64 } router_create()
Greg Kroah-Hartman
maintainerPATCH 60/434 drm/amd/display: Handle virtual signal type in disable_link()
In reply to Greg Kroah-HartmanFrom: Martin Tsai <[email protected]>
[ Upstream commit 616f5b65f1c02d3d6ae370644670d14c57de2fd8 ]
[Why]
The new implementation changed the behavior to allow process setMode to DAL when DAL returns empty mode query for unplugged display. This will trigger additional disable_link().
When unplug HDMI from MST dock, driver will update stream->signal to "Virtual". disable_link() will call disable_output() if the signal type is not DP and induce other displays on MST dock show black screen.
[How]
Don't need to process disable_output() if the signal type is virtual.
--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +4 -2
@@ -2169,8 +2169,10 @@ static void disable_link(struct dc_link *link, enum signal_type signal) dp_set_fec_ready(link, false); }#endif - }else - link->link_enc->funcs->disable_output (link->link_enc, signal); + }else { +if (signal !=SIGNAL_TYPE_VIRTUAL ) + link->link_enc->funcs->disable_output (link->link_enc, signal); + }if (signal ==SIGNAL_TYPE_DISPLAY_PORT_MST ) {/* MST disable link only when no stream use the link */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 69/434 Revert "pinctrl: sh-pfc: r8a77990: Fix MOD_SEL1 bit31 when using SIM0_D"
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 7666dfd533d4c55733037775d47a8e3551b341a2 ]
This reverts commit e167d723e1a472d252e5c4baf823b77ce5543b05.
According to the R-Car Gen3 Hardware Manual Errata for Rev 1.00 of Aug 24, 2018, the SEL_SIMCARD_{0,1} definition was to be deleted. However, this errata merely fixed an accidental double definition in the Hardware User's Manual Rev. 1.00. The real definition is still present in later revisions of the manual (Rev. 1.50 and Rev. 2.00).
Hence revert the commit to recover the definition.
Based on a patch in the BSP by Takeshi Kihara
<[email protected]>.
--- drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/pinctrl/sh-pfc/pfc-r8a77990.c +5 -4
@@ -448,6 +448,7 @@ FM(IP12_31_28) IP12_31_28 FM(IP13_31_28) IP13_31_28 FM(IP14_31_28) IP14_31_28 FM#define MOD_SEL0_1_0 REV4(FM(SEL_SPEED_PULSE_IF_0), FM(SEL_SPEED_PULSE_IF_1), FM(SEL_SPEED_PULSE_IF_2), F_(0, 0))/* MOD_SEL1 */ /* 0 */ /* 1 */ /* 2 */ /* 3 */ /* 4 */ /* 5 */ /* 6 */ /* 7 */ +#define MOD_SEL1_31 FM(SEL_SIMCARD_0) FM(SEL_SIMCARD_1)#define MOD_SEL1_30 FM(SEL_SSI2_0) FM(SEL_SSI2_1)#define MOD_SEL1_29 FM(SEL_TIMER_TMU_0) FM(SEL_TIMER_TMU_1)#define MOD_SEL1_28 FM(SEL_USB_20_CH0_0) FM(SEL_USB_20_CH0_1)
@@ -469,6 +470,7 @@ FM(IP12_31_28) IP12_31_28 FM(IP13_31_28) IP13_31_28 FM(IP14_31_28) IP14_31_28 FM#define PINMUX_MOD_SELS \ \ + MOD_SEL1_31 \ MOD_SEL0_30_29 MOD_SEL1_30 \ MOD_SEL1_29 \ MOD_SEL0_28 MOD_SEL1_28 \
@@ -1197,7 +1199,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_MSEL (IP13_19_16 ,RIF0_D1_A ,SEL_DRIF0_0 ),PINMUX_IPSR_MSEL (IP13_19_16 ,SDA1_B ,SEL_I2C1_1 ),PINMUX_IPSR_MSEL (IP13_19_16 ,TCLK2_B ,SEL_TIMER_TMU_1 ), -PINMUX_IPSR_GPSR (IP13_19_16 ,SIM0_D_A ), +PINMUX_IPSR_MSEL (IP13_19_16 ,SIM0_D_A ,SEL_SIMCARD_0 ),PINMUX_IPSR_GPSR (IP13_23_20 ,MLB_DAT ), PINMUX_IPSR_MSEL(IP13_23_20, TX0_B, SEL_SCIF0_1),
@@ -1265,7 +1267,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP15_15_12 ,TPU0TO2 ),PINMUX_IPSR_MSEL (IP15_15_12 ,SDA1_D ,SEL_I2C1_3 ),PINMUX_IPSR_MSEL (IP15_15_12 ,FSO_CFE_1_N_B ,SEL_FSO_1 ), -PINMUX_IPSR_GPSR (IP15_15_12 ,SIM0_D_B ), +PINMUX_IPSR_MSEL (IP15_15_12 ,SIM0_D_B ,SEL_SIMCARD_1 ),PINMUX_IPSR_GPSR (IP15_19_16 ,SSI_SDATA6 ), PINMUX_IPSR_MSEL(IP15_19_16, HRTS2_N_A, SEL_HSCIF2_0),
@@ -4961,8 +4963,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = { GROUP(1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 2, 2, 2, 1, 1, 2, 1, 4), GROUP( - /* RESERVED 31 */ - 0, 0, + MOD_SEL1_31 MOD_SEL1_30 MOD_SEL1_29 MOD_SEL1_28
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 71/434 IB/iser: bound protection_sg size by data_sg size
In reply to Greg Kroah-HartmanFrom: Max Gurtovoy <[email protected]>
[ Upstream commit 7718cf03c3ce4b6ebd90107643ccd01c952a1fce ]
In case we don't set the sg_prot_tablesize, the scsi layer assign the default size (65535 entries). We should limit this size since we should take into consideration the underlaying device capability. This cap is considered when calculating the sg_tablesize. Otherwise, for example, we can get that /sys/block/sdb/queue/max_segments is 128 and /sys/block/sdb/queue/max_integrity_segments is 65535.
--- drivers/infiniband/ulp/iser/iscsi_iser.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/ulp/iser/iscsi_iser.c +1 -0
@@ -646,6 +646,7 @@ iscsi_iser_session_create(struct iscsi_endpoint *ep,if (ib_conn->pi_support) {u32 sig_caps = ib_dev->attrs.sig_prot_cap; + shost->sg_prot_tablesize = shost->sg_tablesize;scsi_host_set_prot (shost,iser_dif_prot_caps (sig_caps));scsi_host_set_guard (shost,SHOST_DIX_GUARD_IP |SHOST_DIX_GUARD_CRC );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 72/434 drm/komeda: Workaround for broken FLIP_COMPLETE timestamps
In reply to Greg Kroah-HartmanFrom: Mihail Atanassov <[email protected]>
[ Upstream commit f59769c52cd7d158df53487ec2936f5592073340 ]
When initially turning a crtc on, drm_reset_vblank_timestamp will set the vblank timestamp to 0 for any driver that doesn't provide a ->get_vblank_timestamp() hook.
Unfortunately, the FLIP_COMPLETE event depends on that timestamp, and the only way to regenerate a valid one is to have vblank interrupts enabled and have a valid in-ISR call to drm_crtc_handle_vblank.
Additionally, if the user doesn't request vblanks but _does_ request FLIP_COMPLETE events, we still don't have a good timestamp: it'll be the same stamp as the last vblank one.
Work around the issue by always enabling vblanks when the CRTC is on. Reducing the amount of time that PL0 has to be unmasked would be nice to fix at a later time.
Changes since v1 [https://patchwork.freedesktop.org/patch/331727/]:
- moved drm_crtc_vblank_put call to the ->atomic_disable() hook
--- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +2 -0
@@ -250,6 +250,7 @@ komeda_crtc_atomic_enable(struct drm_crtc *crtc, {komeda_crtc_prepare (to_kcrtc (crtc));drm_crtc_vblank_on (crtc); +WARN_ON (drm_crtc_vblank_get (crtc));komeda_crtc_do_flush (crtc, old); }
@@ -319,6 +320,7 @@ komeda_crtc_atomic_disable(struct drm_crtc *crtc, } } +drm_crtc_vblank_put (crtc);drm_crtc_vblank_off (crtc);komeda_crtc_unprepare (kcrtc); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 74/434 media: am437x-vpfe: Setting STD to current value is not an error
In reply to Greg Kroah-HartmanFrom: Benoit Parrot <[email protected]>
[ Upstream commit 13aa21cfe92ce9ebb51824029d89f19c33f81419 ]
VIDIOC_S_STD should not return an error if the value is identical to the current one.
This error was highlighted by the v4l2-compliance test.
--- drivers/media/platform/am437x/am437x-vpfe.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/media/platform/am437x/am437x-vpfe.c +4 -0
@@ -1830,6 +1830,10 @@ static int vpfe_s_std(struct file *file, void *priv, v4l2_std_id std_id)if (!(sdinfo->inputs[0 ].capabilities &V4L2_IN_CAP_STD ))return -ENODATA ; +/* if trying to set the same std then nothing to do */ +if (vpfe_standards[vpfe->std_index].std_id == std_id) +return 0 ; +/* If streaming is started, return error */ if (vb2_is_busy (&vpfe->buffer_queue)) {vpfe_err (vpfe,"%s device busy\n" , __func__);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 75/434 media: cedrus: fill in bus_info for media device
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit ae0688f659adb17ae6ae5710c886b20b5406e5c4 ]
Fixes this compliance warning:
$ v4l2-compliance -m0 v4l2-compliance SHA: b514d615166bdc0901a4c71261b87db31e89f464, 32 bits
Compliance test for cedrus device /dev/media0:
Media Driver Info:
Driver name : cedrus
Model : cedrus
Serial :
Bus info :
Media version : 5.3.0 Hardware revision: 0x00000000 (0)
Driver version : 5.3.0
Required ioctls:
warn: v4l2-test-media.cpp(51): empty bus_info
test MEDIA_IOC_DEVICE_INFO: OK
--- drivers/staging/media/sunxi/cedrus/cedrus.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/staging/media/sunxi/cedrus/cedrus.c +2 -0
@@ -357,6 +357,8 @@ static int cedrus_probe(struct platform_device *pdev) dev->mdev.dev = &pdev->dev;strscpy (dev->mdev.model,CEDRUS_NAME ,sizeof (dev->mdev.model)); +strscpy (dev->mdev.bus_info,"platform:" CEDRUS_NAME , +sizeof (dev->mdev.bus_info));media_device_init (&dev->mdev); dev->mdev.ops = &cedrus_m2m_media_ops;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 76/434 media: seco-cec: Add a missing release_region() in an error handling path
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit a9cc4cbcdfd378b65fd4e398800cfa14e3855042 ]
At the beginning of the probe function, we have a call to 'request_muxed_region(BRA_SMB_BASE_ADDR, 7, "CEC00001")()'
A corresponding 'release_region()' is performed in the remove function but is lacking in the error handling path.
Add it.
--- drivers/media/platform/seco-cec/seco-cec.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/platform/seco-cec/seco-cec.c +1 -0
@@ -675,6 +675,7 @@ err_notifier: err_delete_adapter:cec_delete_adapter (secocec->cec_adap); err: +release_region (BRA_SMB_BASE_ADDR ,7 );dev_err (dev,"%s device probe failed\n" ,dev_name (dev));return ret;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 77/434 media: vim2m: Fix abort issue
In reply to Greg Kroah-HartmanFrom: Jernej Skrabec <[email protected]>
[ Upstream commit c362f77a243bfd1daec21b6c36491c061ee2f31b ]
Currently, if start streaming -> stop streaming -> start streaming sequence is executed, driver will end job prematurely, if ctx->translen is higher than 1, because "aborting" flag is still set from previous stop streaming command.
Fix that by clearing "aborting" flag in start streaming handler.
--- drivers/media/platform/vim2m.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/platform/vim2m.c +3 -0
@@ -1073,6 +1073,9 @@ static int vim2m_start_streaming(struct vb2_queue *q, unsigned int count)if (!q_data)return -EINVAL ; +if (V4L2_TYPE_IS_OUTPUT (q->type)) + ctx->aborting =0 ; + q_data->sequence =0 ;return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 61/434 ath10k: Check if station exists before forwarding tx airtime report
In reply to Greg Kroah-HartmanFrom: Hauke Mehrtens <[email protected]>
[ Upstream commit b10f32672946ad638a430cc4289029b7acf8e979 ]
It looks like the FW on QCA9984 already reports the tx airtimes before the station is added to the peer entry. The peer entry is created in ath10k_peer_map_event() just with the vdev_id and the ethaddr, but not with a station entry, this is added later in ath10k_peer_create() in callbacks from mac80211.
When there is no sta added to the peer entry, this function fails because it calls ieee80211_sta_register_airtime() with NULL.
This was reported in OpenWrt some time ago:
https://bugs.openwrt.org/index.php?do=details&task_id=2414
This commit should fix this crash:
[ 75.991714] Unable to handle kernel paging request at virtual address fffff9e8 [ 75.991756] pgd = c0204000 [ 75.997955] [fffff9e8] *pgd=5fdfd861, *pte=00000000, *ppte=00000000 [ 76.000537] Internal error: Oops: 37 [#1] SMP ARM [ 76.006686] Modules linked in: pppoe ppp_async ath10k_pci ath10k_core ath pptp pppox ppp_mppe ppp_generic mac80211 iptable_nat ipt_REJECT ipt_MASQUERADE cfg80211 xt_time xt_tcpudp xt_tcpmss xt_statistic xt_state xt_recent xt_nat xt_multiport xt_mark xt_mac xt_limit xt_length xt_hl xt_helper xt_esp xt_ecn xt_dscp xt_conntrack xt_connmark xt_connlimit xt_connbytes xt_comment xt_TCPMSS xt_REDIRECT xt_LOG xt_HL xt_FLOWOFFLOAD xt_DSCP xt_CT xt_CLASSIFY usbserial slhc nf_reject_ipv4 nf_nat_redirect nf_nat_masquerade_ipv4 nf_conntrack_ipv4 nf_nat_ipv4 nf_log_ipv4 nf_flow_table_hw nf_flow_table nf_defrag_ipv4 nf_conntrack_rtcache nf_conntrack_netlink iptable_raw iptable_mangle iptable_filter ipt_ah ipt_ECN ip_tables crc_ccitt compat chaoskey fuse sch_cake sch_tbf sch_ingress sch_htb sch_hfsc em_u32 cls_u32 [ 76.059974] cls_tcindex cls_route cls_matchall cls_fw cls_flow cls_basic act_skbedit act_mirred ledtrig_usbport xt_set ip_set_list_set ip_set_hash_netportnet ip_set_hash_netport ip_set_hash_netnet ip_set_hash_netiface ip_set_hash_net ip_set_hash_mac ip_set_hash_ipportnet ip_set_hash_ipportip ip_set_hash_ipport ip_set_hash_ipmark ip_set_hash_ip ip_set_bitmap_port ip_set_bitmap_ipmac ip_set_bitmap_ip ip_set nfnetlink ip6table_nat nf_conntrack_ipv6 nf_defrag_ipv6 nf_nat_ipv6 ip6t_NPT ip6t_MASQUERADE nf_nat_masquerade_ipv6 nf_nat nf_conntrack nf_log_ipv6 nf_log_common ip6table_mangle ip6table_filter ip6_tables ip6t_REJECT x_tables nf_reject_ipv6 msdos ip_gre gre ifb sit tunnel4 ip_tunnel tun vfat fat hfsplus cifs nls_utf8 nls_iso8859_15 nls_iso8859_1 nls_cp850 nls_cp437 nls_cp1250 sha1_generic md5 md4 [ 76.130634] usb_storage leds_gpio xhci_plat_hcd xhci_pci xhci_hcd dwc3 dwc3_of_simple ohci_platform ohci_hcd phy_qcom_dwc3 ahci ehci_platform sd_mod ahci_platform libahci_platform libahci libata scsi_mod ehci_hcd gpio_button_hotplug ext4 mbcache jbd2 exfat crc32c_generic [ 76.154772] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 4.14.132 #0 [ 76.177001] Hardware name: Generic DT based system [ 76.182990] task: c0b06d80 task.stack: c0b00000 [ 76.187832] PC is at ieee80211_sta_register_airtime+0x24/0x148 [mac80211] [ 76.192211] LR is at ath10k_htt_t2h_msg_handler+0x678/0x10f4 [ath10k_core] [ 76.199052] pc : [<bf75bfac>] lr : [<bf83e8b0>] psr: a0000113 [ 76.205820] sp : c0b01d54 ip : 00000002 fp : bf869c0c [ 76.211981] r10: 0000003c r9 : dbdca138 r8 : 00060002 [ 76.217192] r7 : 00000000 r6 : dabe1150 r5 : 00000000 r4 : dbdc95c0 [ 76.222401] r3 : 00000000 r2 : 00060002 r1 : 00000000 r0 : 00000000 [ 76.229003] Flags: NzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none [ 76.235509] Control: 10c5787d Table: 5c94006a DAC: 00000051 [ 76.242716] Process swapper/0 (pid: 0, stack limit = 0xc0b00210) [ 76.248446] Stack: (0xc0b01d54 to 0xc0b02000) [ 76.254532] 1d40: dbdc95c0 00000000 dabe1150 [ 76.258808] 1d60: 00000001 dabe1150 dbdca138 0000003c bf869c0c bf83e8b0 00000002 c0314b10 [ 76.266969] 1d80: dbdc9c70 00000001 00000001 dabe114c 00010000 00000000 dbdcd724 bf88f3d8 [ 76.275126] 1da0: c0310d28 db393c00 dbdc95c0 00000000 c0b01dd0 c07fb4c4 dbdcd724 00000001 [ 76.283286] 1dc0: 00000022 bf88b09c db393c00 00000022 c0b01dd0 c0b01dd0 00000000 dbdcc5c0 [ 76.291445] 1de0: bf88f04c dbdcd654 dbdcd71c dbdc95c0 00000014 dbdcd724 dbdcc5c0 00000005 [ 76.299605] 1e00: 0004b400 bf85c360 00000000 bf87101c c0b01e24 00000006 00000000 dbdc95c0 [ 76.307764] 1e20: 00000001 00000040 0000012c c0b01e80 1cf51000 bf85c448 dbdcd440 dbdc95c0 [ 76.315925] 1e40: dbdca440 ffffa880 00000040 bf88cb68 dbdcd440 00000001 00000040 ffffa880 [ 76.324084] 1e60: c0b02d00 c06d72e0 dd990080 c0a3f080 c0b255dc c0b047e4 c090afac c090e80c [ 76.332244] 1e80: c0b01e80 c0b01e80 c0b01e88 c0b01e88 dd4cc200 00000000 00000003 c0b0208c [ 76.340405] 1ea0: c0b02080 40000003 ffffe000 00000100 c0b02080 c03015c8 00000000 00000001 [ 76.348564] 1ec0: dd408000 c0a38210 c0b2c7c0 0000000a ffffa880 c0b02d00 c07fb764 00200102 [ 76.356723] 1ee0: dd4cc268 c0a3e414 00000000 00000000 00000001 dd408000 de803000 00000000 [ 76.364883] 1f00: 00000000 c03247cc c0a3e414 c0368f1c c0b03f60 c0b153cc de80200c de802000 [ 76.373042] 1f20: c0b01f48 c0301488 c0308630 60000013 ffffffff c0b01f7c 00000000 c0b00000 [ 76.381204] 1f40: 00000000 c030c08c 00000001 00000000 00000000 c0315180 ffffe000 c0b03cc0 [ 76.389363] 1f60: c0b03c70 00000000 00000000 c0a2da28 00000000 00000000 c0b01f90 c0b01f98 [ 76.397522] 1f80: c030862c c0308630 60000013 ffffffff 00000051 00000000 ffffe000 c035dd18 [ 76.405681] 1fa0: 000000bf c0b03c40 00000000 c0b2c000 dddfce80 c035e060 c0b2c040 c0a00cf4 [ 76.413842] 1fc0: ffffffff ffffffff 00000000 c0a0067c c0a2da28 00000000 00000000 c0b2c1d4 [ 76.422001] 1fe0: c0b03c5c c0a2da24 c0b07ee0 4220406a 512f04d0 4220807c 00000000 00000000 [ 76.430335] [<bf75bfac>] (ieee80211_sta_register_airtime [mac80211]) from [<00000002>] (0x2) [ 76.438314] Code: e1cd81f0 e1a08002 e1cda1f8 e58de020 (e5102618) [ 76.446965] ---[ end trace 227a38ade964d642 ]---
--- drivers/net/wireless/ath/ath10k/htt_rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/htt_rx.c +1 -1
@@ -2726,7 +2726,7 @@ static void ath10k_htt_rx_tx_compl_ind(struct ath10k *ar,spin_lock_bh (&ar->data_lock); peer =ath10k_peer_find_by_id (ar, peer_id); -if (!peer) { +if (!peer || !peer->sta) {spin_unlock_bh (&ar->data_lock);rcu_read_unlock ();continue ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 79/434 media: max2175: Fix build error without CONFIG_REGMAP_I2C
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 36756fbff1e4a31d71d262ae6a04a20b38efa874 ]
If CONFIG_REGMAP_I2C is not set, building fails:
drivers/media/i2c/max2175.o: In function `max2175_probe':
max2175.c:(.text+0x1404): undefined reference to `__devm_regmap_init_i2c'
Select REGMAP_I2C to fix this.
--- drivers/media/i2c/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/media/i2c/Kconfig +1 -0
@@ -1113,6 +1113,7 @@ comment "SDR tuner chips" config SDR_MAX2175 tristate "Maxim 2175 RF to Bits tuner" depends on VIDEO_V4L2 && MEDIA_SDR_SUPPORT && I2C + select REGMAP_I2C help Support for Maxim 2175 tuner. It is an advanced analog/digital radio receiver with RF-to-Bits front-end designed for SDR solutions.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 80/434 media: ov6650: Fix control handler not freed on init error
In reply to Greg Kroah-HartmanFrom: Janusz Krzysztofik <[email protected]>
[ Upstream commit c404af950d14b71bfbf574a752b6c29d726baaba ]
Since commit afd9690c72c3 ("[media] ov6650: convert to the control framework"), if an error occurs during initialization of a control handler, resources possibly allocated to the handler are not freed before device initialiaton is aborted. Fix it.
--- drivers/media/i2c/ov6650.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/media/i2c/ov6650.c +8 -4
@@ -989,8 +989,10 @@ static int ov6650_probe(struct i2c_client *client, V4L2_CID_GAMMA, 0, 0xff, 1, 0x12); priv->subdev.ctrl_handler = &priv->hdl; -if (priv->hdl.error) -return priv->hdl.error; +if (priv->hdl.error) { + ret = priv->hdl.error; + goto ectlhdlfree; + }v4l2_ctrl_auto_cluster (2 , &priv->autogain,0 , true);v4l2_ctrl_auto_cluster (3 , &priv->autowb,0 , true);
@@ -1008,8 +1010,10 @@ static int ov6650_probe(struct i2c_client *client, priv->subdev.internal_ops = &ov6650_internal_ops; ret =v4l2_async_register_subdev (&priv->subdev); -if (ret) -v4l2_ctrl_handler_free (&priv->hdl); +if (!ret) +return 0 ; +ectlhdlfree: +v4l2_ctrl_handler_free (&priv->hdl);return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 82/434 media: ov6650: Fix crop rectangle alignment not passed back
In reply to Greg Kroah-HartmanFrom: Janusz Krzysztofik <[email protected]>
[ Upstream commit 7b188d6ba27a131e7934a51a14ece331c0491f18 ]
Commit 4f996594ceaf ("[media] v4l2: make vidioc_s_crop const") introduced a writable copy of constified user requested crop rectangle in order to be able to perform hardware alignments on it. Later on, commit 10d5509c8d50 ("[media] v4l2: remove g/s_crop from video ops") replaced s_crop() video operation using that const argument with set_selection() pad operation which had a corresponding argument not constified, however the original behavior of the driver was not restored. Since that time, any hardware alignment applied on a user requested crop rectangle is not passed back to the user calling .set_selection() as it should be.
Fix the issue by dropping the copy and replacing all references to it with references to the crop rectangle embedded in the user argument.
--- drivers/media/i2c/ov6650.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-)
drivers/media/i2c/ov6650.c +15 -16
@@ -465,38 +465,37 @@ static int ov6650_set_selection(struct v4l2_subdev *sd, {struct i2c_client *client =v4l2_get_subdevdata (sd);struct ov6650 *priv =to_ov6650 (client); -struct v4l2_rect rect = sel->r;int ret;if (sel->which !=V4L2_SUBDEV_FORMAT_ACTIVE || sel->target !=V4L2_SEL_TGT_CROP )return -EINVAL ; -v4l_bound_align_image (&rect.width,2 ,W_CIF ,1 , - &rect.height,2 ,H_CIF ,1 ,0 ); -v4l_bound_align_image (&rect.left,DEF_HSTRT <<1 , - (DEF_HSTRT <<1 ) +W_CIF - (__s32 )rect.width,1 , - &rect.top,DEF_VSTRT <<1 , - (DEF_VSTRT <<1 ) +H_CIF - (__s32 )rect.height,1 , -0 ); +v4l_bound_align_image (&sel->r.width,2 ,W_CIF ,1 , + &sel->r.height,2 ,H_CIF ,1 ,0 ); +v4l_bound_align_image (&sel->r.left,DEF_HSTRT <<1 , + (DEF_HSTRT <<1 ) +W_CIF - (__s32 )sel->r.width,1 , + &sel->r.top,DEF_VSTRT <<1 , + (DEF_VSTRT <<1 ) +H_CIF - (__s32 )sel->r.height, +1 ,0 ); - ret =ov6650_reg_write (client,REG_HSTRT , rect.left >>1 ); + ret =ov6650_reg_write (client,REG_HSTRT , sel->r.left >>1 );if (!ret) { - priv->rect.left = rect.left; + priv->rect.left = sel->r.left; ret =ov6650_reg_write (client,REG_HSTOP , - (rect.left + rect.width) >>1 ); + (sel->r.left + sel->r.width) >>1 ); }if (!ret) { - priv->rect.width = rect.width; - ret =ov6650_reg_write (client,REG_VSTRT , rect.top >>1 ); + priv->rect.width = sel->r.width; + ret =ov6650_reg_write (client,REG_VSTRT , sel->r.top >>1 ); }if (!ret) { - priv->rect.top = rect.top; + priv->rect.top = sel->r.top; ret =ov6650_reg_write (client,REG_VSTOP , - (rect.top + rect.height) >>1 ); + (sel->r.top + sel->r.height) >>1 ); }if (!ret) - priv->rect.height = rect.height; + priv->rect.height = sel->r.height;return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 84/434 media: ov6650: Fix stored frame format not in sync with hardware
In reply to Greg Kroah-HartmanFrom: Janusz Krzysztofik <[email protected]>
[ Upstream commit 3143b459de4cdcce67b36827476c966e93c1cf01 ]
The driver stores frame format settings supposed to be in line with hardware state in a device private structure. Since the driver initial submission, those settings are updated before they are actually applied on hardware. If an error occurs on device update, the stored settings my not reflect hardware state anymore and consecutive calls to .get_fmt() may return incorrect information. That in turn may affect ability of a bridge device to use correct DMA transfer settings if such incorrect informmation on active frame format returned by .get_fmt() is used.
Assuming a failed device update means its state hasn't changed, update frame format related settings stored in the device private structure only after they are successfully applied so the stored values always reflect hardware state as closely as possible.
--- drivers/media/i2c/ov6650.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/media/i2c/ov6650.c +6 -3
@@ -609,7 +609,6 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)dev_err (&client->dev,"Pixel format not handled: 0x%x\n" , code);return -EINVAL ; } - priv->code = code;if (code ==MEDIA_BUS_FMT_Y8_1X8 || code ==MEDIA_BUS_FMT_SBGGR8_1X8 ) {
@@ -635,7 +634,6 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)dev_dbg (&client->dev,"max resolution: CIF\n" ); coma_mask |=COMA_QCIF ; } - priv->half_scale = half_scale; clkrc = CLKRC_12MHz; mclk =12000000 ;
@@ -653,8 +651,13 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf) ret =ov6650_reg_rmw (client,REG_COMA , coma_set, coma_mask);if (!ret) ret =ov6650_reg_write (client,REG_CLKRC , clkrc); -if (!ret) +if (!ret) { + priv->half_scale = half_scale; + ret =ov6650_reg_rmw (client,REG_COML , coml_set, coml_mask); + } +if (!ret) + priv->code = code;if (!ret) { mf->colorspace = priv->colorspace;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 85/434 media: ov6650: Fix stored crop rectangle not in sync with hardware
In reply to Greg Kroah-HartmanFrom: Janusz Krzysztofik <[email protected]>
[ Upstream commit 1463b371aff0682c70141f7521db13cc4bbf3016 ]
The driver stores crop rectangle settings supposed to be in line with hardware state in a device private structure. Since the driver initial submission, crop rectangle width and height settings are not updated correctly when rectangle offset settings are applied on hardware. If an error occurs while the device is updated, the stored settings my no longer reflect hardware state and consecutive calls to .get_selection() as well as .get/set_fmt() may return incorrect information. That in turn may affect ability of a bridge device to use correct DMA transfer settings if such incorrect informamtion on active frame format returned by .get/set_fmt() is used.
Assuming a failed update of the device means its actual settings haven't changed, update crop rectangle width and height settings stored in the device private structure correctly while the rectangle offset is successfully applied on hardware so the stored values always reflect actual hardware state to the extent possible.
--- drivers/media/i2c/ov6650.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/i2c/ov6650.c +2 -0
@@ -481,6 +481,7 @@ static int ov6650_set_selection(struct v4l2_subdev *sd, ret =ov6650_reg_write (client,REG_HSTRT , sel->r.left >>1 );if (!ret) { + priv->rect.width += priv->rect.left - sel->r.left; priv->rect.left = sel->r.left; ret =ov6650_reg_write (client,REG_HSTOP , (sel->r.left + sel->r.width) >>1 );
@@ -490,6 +491,7 @@ static int ov6650_set_selection(struct v4l2_subdev *sd, ret =ov6650_reg_write (client,REG_VSTRT , sel->r.top >>1 ); }if (!ret) { + priv->rect.height += priv->rect.top - sel->r.top; priv->rect.top = sel->r.top; ret =ov6650_reg_write (client,REG_VSTOP , (sel->r.top + sel->r.height) >>1 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 87/434 media: venus: core: Fix msm8996 frequency table
In reply to Greg Kroah-HartmanFrom: Loic Poulain <[email protected]>
[ Upstream commit c690435ed07901737e5c007a65ec59f53b33eb71 ]
In downstream driver, there are two frequency tables defined, one for the encoder and one for the decoder:
/* Encoders /
<972000 490000000 0x55555555>, / 4k UHD @ 30 /
<489600 320000000 0x55555555>, / 1080p @ 60 /
<244800 150000000 0x55555555>, / 1080p @ 30 /
<108000 75000000 0x55555555>, / 720p @ 30 */
/* Decoders /
<1944000 490000000 0xffffffff>, / 4k UHD @ 60 /
< 972000 320000000 0xffffffff>, / 4k UHD @ 30 /
< 489600 150000000 0xffffffff>, / 1080p @ 60 /
< 244800 75000000 0xffffffff>; / 1080p @ 30 */
It shows that encoder always needs a higher clock than decoder.
In current venus driver, the unified frequency table is aligned with the downstream decoder table which causes performance issues in encoding scenarios. Fix that by aligning frequency table on worst case (encoding).
--- drivers/media/platform/qcom/venus/core.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/media/platform/qcom/venus/core.c +5 -4
@@ -427,10 +427,11 @@ static const struct venus_resources msm8916_res = { };static const struct freq_tbl msm8996_freq_table[] = { - {1944000 ,490000000 },/* 4k UHD @ 60 */ - {972000 ,320000000 },/* 4k UHD @ 30 */ - {489600 ,150000000 },/* 1080p @ 60 */ - {244800 ,75000000 },/* 1080p @ 30 */ + {1944000 ,520000000 },/* 4k UHD @ 60 (decode only) */ + {972000 ,520000000 },/* 4k UHD @ 30 */ + {489600 ,346666667 },/* 1080p @ 60 */ + {244800 ,150000000 },/* 1080p @ 30 */ + {108000 ,75000000 },/* 720p @ 30 */ };static const struct reg_val msm8996_reg_preset[] = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 88/434 ath10k: fix offchannel tx failure when no ath10k_mac_tx_frm_has_freq
In reply to Greg Kroah-HartmanFrom: Ben Greear <[email protected]>
[ Upstream commit cc6df017e55764ffef9819dd9554053182535ffd ]
Offchannel management frames were failing:
[18099.253732] ath10k_pci 0000:01:00.0: timed out waiting for offchannel skb cf0e3780 [18102.293686] ath10k_pci 0000:01:00.0: timed out waiting for offchannel skb cf0e3780 [18105.333653] ath10k_pci 0000:01:00.0: timed out waiting for offchannel skb cf0e3780 [18108.373712] ath10k_pci 0000:01:00.0: timed out waiting for offchannel skb cf0e3780 [18111.413687] ath10k_pci 0000:01:00.0: timed out waiting for offchannel skb cf0e36c0 [18114.453726] ath10k_pci 0000:01:00.0: timed out waiting for offchannel skb cf0e3f00 [18117.493773] ath10k_pci 0000:01:00.0: timed out waiting for offchannel skb cf0e36c0 [18120.533631] ath10k_pci 0000:01:00.0: timed out waiting for offchannel skb cf0e3f00
This bug appears to have been added between 4.0 (which works for us), and 4.4, which does not work.
I think this is because the tx-offchannel logic gets in a loop when ath10k_mac_tx_frm_has_freq(ar) is false, so pkt is never actually sent to the firmware for transmit.
This patch fixes the problem on 4.9 for me, and now HS20 clients can work again with my firmware.
Antonio: tested with 10.4-3.5.3-00057 on QCA4019 and QCA9888
--- drivers/net/wireless/ath/ath10k/mac.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/net/wireless/ath/ath10k/mac.c +11 -11
@@ -3708,7 +3708,7 @@ static int ath10k_mac_tx(struct ath10k *ar,struct ieee80211_vif *vif, enum ath10k_hw_txrx_mode txmode, enum ath10k_mac_tx_path txpath, - struct sk_buff *skb) + struct sk_buff *skb, bool noque_offchan) { struct ieee80211_hw *hw = ar->hw;struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb);
@@ -3738,10 +3738,10 @@ static int ath10k_mac_tx(struct ath10k *ar, } } -if (info->flags &IEEE80211_TX_CTL_TX_OFFCHAN ) { +if (!noque_offchan && info->flags &IEEE80211_TX_CTL_TX_OFFCHAN ) {if (!ath10k_mac_tx_frm_has_freq (ar)) { -ath10k_dbg (ar,ATH10K_DBG_MAC ,"queued offchannel skb %pK\n" , - skb); +ath10k_dbg (ar,ATH10K_DBG_MAC ,"mac queued offchannel skb %pK len %d\n" , + skb, skb->len);skb_queue_tail (&ar->offchan_tx_queue, skb);ieee80211_queue_work (hw, &ar->offchan_tx_work);
@@ -3803,8 +3803,8 @@ void ath10k_offchan_tx_work(struct work_struct *work)mutex_lock (&ar->conf_mutex); -ath10k_dbg (ar,ATH10K_DBG_MAC ,"mac offchannel skb %pK\n" , - skb); +ath10k_dbg (ar,ATH10K_DBG_MAC ,"mac offchannel skb %pK len %d\n" , + skb, skb->len); hdr = (struct ieee80211_hdr *)skb->data; peer_addr =ieee80211_get_DA (hdr);
@@ -3850,7 +3850,7 @@ void ath10k_offchan_tx_work(struct work_struct *work) txmode =ath10k_mac_tx_h_get_txmode (ar, vif, sta, skb); txpath =ath10k_mac_tx_h_get_txpath (ar, skb, txmode); - ret =ath10k_mac_tx (ar, vif, txmode, txpath, skb); + ret =ath10k_mac_tx (ar, vif, txmode, txpath, skb, true);if (ret) {ath10k_warn (ar,"failed to transmit offchannel frame: %d\n" , ret);
@@ -3860,8 +3860,8 @@ void ath10k_offchan_tx_work(struct work_struct *work) time_left =wait_for_completion_timeout (&ar->offchan_tx_completed,3 *HZ );if (time_left ==0 ) -ath10k_warn (ar,"timed out waiting for offchannel skb %pK\n" , - skb); +ath10k_warn (ar,"timed out waiting for offchannel skb %pK, len: %d\n" , + skb, skb->len);if (!peer && tmp_peer_created) { ret =ath10k_peer_delete (ar, vdev_id, peer_addr);
@@ -4097,7 +4097,7 @@ int ath10k_mac_tx_push_txq(struct ieee80211_hw *hw,spin_unlock_bh (&ar->htt.tx_lock); } - ret =ath10k_mac_tx (ar, vif, txmode, txpath, skb); + ret =ath10k_mac_tx (ar, vif, txmode, txpath, skb, false);if (unlikely (ret)) {ath10k_warn (ar,"failed to push frame: %d\n" , ret);
@@ -4378,7 +4378,7 @@ static void ath10k_mac_op_tx(struct ieee80211_hw *hw,spin_unlock_bh (&ar->htt.tx_lock); } - ret =ath10k_mac_tx (ar, vif, txmode, txpath, skb); + ret =ath10k_mac_tx (ar, vif, txmode, txpath, skb, false);if (ret) {ath10k_warn (ar,"failed to transmit frame: %d\n" , ret);if (is_htt) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 62/434 spi: Add call to spi_slave_abort() function when spidev driver is released
In reply to Greg Kroah-HartmanFrom: Lukasz Majewski <[email protected]>
[ Upstream commit 9f918a728cf86b2757b6a7025e1f46824bfe3155 ]
This change is necessary for spidev devices (e.g. /dev/spidev3.0) working in the slave mode (like NXP's dspi driver for Vybrid SoC).
When SPI HW works in this mode - the master is responsible for providing CS and CLK signals. However, when some fault happens - like for example distortion on SPI lines - the SPI Linux driver needs a chance to recover from this abnormal situation and prepare itself for next (correct) transmission.
This change doesn't pose any threat on drivers working in master mode as spi_slave_abort() function checks if SPI slave mode is supported.
--- drivers/spi/spidev.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/spi/spidev.c +3 -0
@@ -627,6 +627,9 @@ static int spidev_release(struct inode *inode, struct file *filp)if (dofree)kfree (spidev); } +#ifdef CONFIG_SPI_SLAVE +spi_slave_abort (spidev->spi); +#endif mutex_unlock (&device_list_lock);return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 89/434 media: vimc: Fix gpf in rmmod path when stream is active
In reply to Greg Kroah-HartmanFrom: Shuah Khan <[email protected]>
[ Upstream commit d7fb5c361c2a2666d20e044206e1756bc8e87df2 ]
If vimc module is removed while streaming is in progress, sensor subdev unregister runs into general protection fault when it tries to unregister media entities. This is a common subdev problem related to releasing pads from v4l2_device_unregister_subdev() before calling unregister. Unregister references pads during unregistering subdev.
The sd release handler is the right place for releasing all sd resources including pads. The release handlers currently release all resources except the pads.
Fix v4l2_device_unregister_subdev() not release pads and release pads from the sd_int_op release handlers.
kernel: [ 4136.715839] general protection fault: 0000 [#1] SMP PTI
kernel: [ 4136.715847] CPU: 2 PID: 1972 Comm: bash Not tainted 5.3.0-rc2+ #4
kernel: [ 4136.715850] Hardware name: Dell Inc. OptiPlex 790/0HY9JP, BIOS A18 09/24/2013
kernel: [ 4136.715858] RIP: 0010:media_gobj_destroy.part.16+0x1f/0x60
kernel: [ 4136.715863] Code: ff 66 2e 0f 1f 84 00 00 00 00 00 66 66 66 66 90 55 48 89 fe 48 89 e5 53 48 89 fb 48 c7 c7 00 7f cf b0 e8 24 fa ff ff 48 8b 03 <48> 83 80 a0 00 00 00 01 48 8b 43 18 48 8b 53 10 48 89 42 08 48 89
kernel: [ 4136.715866] RSP: 0018:ffff9b2248fe3cb0 EFLAGS: 00010246
kernel: [ 4136.715870] RAX: bcf2bfbfa0d63c2f RBX: ffff88c3eb37e9c0 RCX: 00000000802a0018
kernel: [ 4136.715873] RDX: ffff88c3e4f6a078 RSI: ffff88c3eb37e9c0 RDI: ffffffffb0cf7f00
kernel: [ 4136.715876] RBP: ffff9b2248fe3cb8 R08: 0000000001000002 R09: ffffffffb0492b00
kernel: [ 4136.715879] R10: ffff9b2248fe3c28 R11: 0000000000000001 R12: 0000000000000038
kernel: [ 4136.715881] R13: ffffffffc09a1628 R14: ffff88c3e4f6a028 R15: fffffffffffffff2
kernel: [ 4136.715885] FS: 00007f8389647740(0000) GS:ffff88c465500000(0000) knlGS:0000000000000000
kernel: [ 4136.715888] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
kernel: [ 4136.715891] CR2: 000055d008f80fd8 CR3: 00000001996ec005 CR4: 00000000000606e0
kernel: [ 4136.715894] Call Trace:
kernel: [ 4136.715903] media_gobj_destroy+0x14/0x20
kernel: [ 4136.715908] __media_device_unregister_entity+0xb3/0xe0
kernel: [ 4136.715915] media_device_unregister_entity+0x30/0x40
kernel: [ 4136.715920] v4l2_device_unregister_subdev+0xa8/0xe0
kernel: [ 4136.715928] vimc_ent_sd_unregister+0x1e/0x30 [vimc]
kernel: [ 4136.715933] vimc_sen_rm+0x16/0x20 [vimc]
kernel: [ 4136.715938] vimc_remove+0x3e/0xa0 [vimc]
kernel: [ 4136.715945] platform_drv_remove+0x25/0x50
kernel: [ 4136.715951] device_release_driver_internal+0xe0/0x1b0
kernel: [ 4136.715956] device_driver_detach+0x14/0x20
kernel: [ 4136.715960] unbind_store+0xd1/0x130
kernel: [ 4136.715965] drv_attr_store+0x27/0x40
kernel: [ 4136.715971] sysfs_kf_write+0x48/0x60
kernel: [ 4136.715976] kernfs_fop_write+0x128/0x1b0
kernel: [ 4136.715982] __vfs_write+0x1b/0x40
kernel: [ 4136.715987] vfs_write+0xc3/0x1d0
kernel: [ 4136.715993] ksys_write+0xaa/0xe0
kernel: [ 4136.715999] __x64_sys_write+0x1a/0x20
kernel: [ 4136.716005] do_syscall_64+0x5a/0x130
kernel: [ 4136.716010] entry_SYSCALL_64_after_hwframe+0x4
--- drivers/media/platform/vimc/vimc-common.c | 3 +-- drivers/media/platform/vimc/vimc-debayer.c | 1 + drivers/media/platform/vimc/vimc-scaler.c | 1 + drivers/media/platform/vimc/vimc-sensor.c | 1 + 4 files changed, 4 insertions(+), 2 deletions(-)
drivers/media/platform/vimc/vimc-common.c +1 -2
@@ -375,7 +375,7 @@ int vimc_ent_sd_register(struct vimc_ent_device *ved, {int ret; -/* Allocate the pads */ +/* Allocate the pads. Should be released from the sd_int_op release */ ved->pads =vimc_pads_init (num_pads, pads_flag);if (IS_ERR (ved->pads))return PTR_ERR (ved->pads);
@@ -424,7 +424,6 @@ EXPORT_SYMBOL_GPL(vimc_ent_sd_register);void vimc_ent_sd_unregister (struct vimc_ent_device *ved,struct v4l2_subdev *sd) {media_entity_cleanup (ved->ent); -vimc_pads_cleanup (ved->pads);v4l2_device_unregister_subdev (sd); }EXPORT_SYMBOL_GPL (vimc_ent_sd_unregister);
drivers/media/platform/vimc/vimc-debayer.c +1 -0
@@ -484,6 +484,7 @@ static void vimc_deb_release(struct v4l2_subdev *sd)struct vimc_deb_device *vdeb = container_of(sd, struct vimc_deb_device, sd); +vimc_pads_cleanup (vdeb->ved.pads);kfree (vdeb); }
drivers/media/platform/vimc/vimc-scaler.c +1 -0
@@ -343,6 +343,7 @@ static void vimc_sca_release(struct v4l2_subdev *sd)struct vimc_sca_device *vsca = container_of(sd, struct vimc_sca_device, sd); +vimc_pads_cleanup (vsca->ved.pads);kfree (vsca); }
drivers/media/platform/vimc/vimc-sensor.c +1 -0
@@ -292,6 +292,7 @@ static void vimc_sen_release(struct v4l2_subdev *sd)v4l2_ctrl_handler_free (&vsen->hdl);tpg_free (&vsen->tpg); +vimc_pads_cleanup (vsen->ved.pads);kfree (vsen); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 91/434 pinctrl: devicetree: Avoid taking direct reference to device name string
In reply to Greg Kroah-HartmanFrom: Will Deacon <[email protected]>
[ Upstream commit be4c60b563edee3712d392aaeb0943a768df7023 ]
When populating the pinctrl mapping table entries for a device, the 'dev_name' field for each entry is initialised to point directly at the string returned by 'dev_name()' for the device and subsequently used by 'create_pinctrl()' when looking up the mappings for the device being probed.
This is unreliable in the presence of calls to 'dev_set_name()', which may reallocate the device name string leaving the pinctrl mappings with a dangling reference. This then leads to a use-after-free every time the name is dereferenced by a device probe:
| BUG: KASAN: invalid-access in strcmp+0x20/0x64 | Read of size 1 at addr 13ffffc153494b00 by task modprobe/590 | Pointer tag: [13], memory tag: [fe] | | Call trace: | __kasan_report+0x16c/0x1dc | kasan_report+0x10/0x18 | check_memory_region | __hwasan_load1_noabort+0x4c/0x54 | strcmp+0x20/0x64 | create_pinctrl+0x18c/0x7f4 | pinctrl_get+0x90/0x114 | devm_pinctrl_get+0x44/0x98 | pinctrl_bind_pins+0x5c/0x450 | really_probe+0x1c8/0x9a4 | driver_probe_device+0x120/0x1d8
Follow the example of sysfs, and duplicate the device name string before stashing it away in the pinctrl mapping entries.
--- drivers/pinctrl/devicetree.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-)
drivers/pinctrl/devicetree.c +20 -5
@@ -29,6 +29,13 @@ struct pinctrl_dt_map {static void dt_free_map (struct pinctrl_dev *pctldev,struct pinctrl_map *map,unsigned num_maps) { +int i; + +for (i =0 ; i < num_maps; ++i) { +kfree_const (map[i].dev_name); + map[i].dev_name =NULL ; + } +if (pctldev) {const struct pinctrl_ops *ops = pctldev->desc->pctlops;if (ops->dt_free_map)
@@ -63,7 +70,13 @@ static int dt_remember_or_free_map(struct pinctrl *p, const char *statename,/* Initialize common mapping table entry fields */ for (i =0 ; i < num_maps; i++) { - map[i].dev_name =dev_name (p->dev); +const char *devname; + + devname =kstrdup_const (dev_name (p->dev),GFP_KERNEL ); +if (!devname) + goto err_free_map; + + map[i].dev_name = devname; map[i].name = statename;if (pctldev) map[i].ctrl_dev_name =dev_name (pctldev->dev);
@@ -71,10 +84,8 @@ static int dt_remember_or_free_map(struct pinctrl *p, const char *statename,/* Remember the converted mapping table entries */ dt_map =kzalloc (sizeof (*dt_map),GFP_KERNEL ); -if (!dt_map) { -dt_free_map (pctldev, map, num_maps); -return -ENOMEM ; - } +if (!dt_map) + goto err_free_map; dt_map->pctldev = pctldev; dt_map->map = map;
@@ -82,6 +93,10 @@ static int dt_remember_or_free_map(struct pinctrl *p, const char *statename,list_add_tail (&dt_map->node, &p->dt_maps);return pinctrl_register_map (map, num_maps, false); + +err_free_map: +dt_free_map (pctldev, map, num_maps); +return -ENOMEM ; }struct pinctrl_dev *of_pinctrl_get (struct device_node *np)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 92/434 drm/sun4i: dsi: Fix TCON DRQ set bits
In reply to Greg Kroah-HartmanFrom: Jagan Teki <[email protected]>
[ Upstream commit 7ac6269968826f9cad61b501bb613cc5cadb7229 ]
The LCD timing definitions between Linux DRM vs Allwinner are different, below diagram shows this clear differences.
Active Front Sync Back
Region Porch Porch
<-----------------------><----------------><--------------><-------------->
//////////////////////|
////////////////////// |
////////////////////// |.................. ................
________________<----- [hv]display ----->
<------------- [hv]sync_start ------------> <--------------------- [hv]sync_end ----------------------> <-------------------------------- [hv]total ------------------------------>
<----- lcd_[xy] --------> <- lcd_[hv]spw ->
<---------- lcd_[hv]bp --------->
<-------------------------------- lcd_[hv]t ------------------------------>
The DSI driver misinterpreted the hbp term from the BSP code to refer only to the backporch, when in fact it was backporch + sync. Thus the driver incorrectly used the horizontal front porch plus sync in its calculation of the DRQ set bit value, when it should not have included the sync timing.
Including additional sync timings leads to flip_done timed out as:
WARNING: CPU: 0 PID: 31 at drivers/gpu/drm/drm_atomic_helper.c:1429 drm_atomic_helper_wait_for_vblanks.part.1+0x298/0x2a0 [CRTC:46:crtc-0] vblank wait timed out Modules linked in: CPU: 0 PID: 31 Comm: kworker/0:1 Not tainted 5.1.0-next-20190514-00026-g01f0c75b902d-dirty #13 Hardware name: Allwinner sun8i Family Workqueue: events deferred_probe_work_func [<c010ed54>] (unwind_backtrace) from [<c010b76c>] (show_stack+0x10/0x14) [<c010b76c>] (show_stack) from [<c0688c70>] (dump_stack+0x84/0x98) [<c0688c70>] (dump_stack) from [<c011d9e4>] (__warn+0xfc/0x114) [<c011d9e4>] (__warn) from [<c011da40>] (warn_slowpath_fmt+0x44/0x68) [<c011da40>] (warn_slowpath_fmt) from [<c040cd50>] (drm_atomic_helper_wait_for_vblanks.part.1+0x298/0x2a0) [<c040cd50>] (drm_atomic_helper_wait_for_vblanks.part.1) from [<c040e694>] (drm_atomic_helper_commit_tail_rpm+0x5c/0x6c) [<c040e694>] (drm_atomic_helper_commit_tail_rpm) from [<c040e4dc>] (commit_tail+0x40/0x6c) [<c040e4dc>] (commit_tail) from [<c040e5cc>] (drm_atomic_helper_commit+0xbc/0x128) [<c040e5cc>] (drm_atomic_helper_commit) from [<c0411b64>] (restore_fbdev_mode_atomic+0x1cc/0x1dc) [<c0411b64>] (restore_fbdev_mode_atomic) from [<c04156f8>] (drm_fb_helper_restore_fbdev_mode_unlocked+0x54/0xa0) [<c04156f8>] (drm_fb_helper_restore_fbdev_mode_unlocked) from [<c0415774>] (drm_fb_helper_set_par+0x30/0x54) [<c0415774>] (drm_fb_helper_set_par) from [<c03ad450>] (fbcon_init+0x560/0x5ac) [<c03ad450>] (fbcon_init) from [<c03eb8a0>] (visual_init+0xbc/0x104) [<c03eb8a0>] (visual_init) from [<c03ed1b8>] (do_bind_con_driver+0x1b0/0x390) [<c03ed1b8>] (do_bind_con_driver) from [<c03ed780>] (do_take_over_console+0x13c/0x1c4) [<c03ed780>] (do_take_over_console) from [<c03ad800>] (do_fbcon_takeover+0x74/0xcc) [<c03ad800>] (do_fbcon_takeover) from [<c013c9c8>] (notifier_call_chain+0x44/0x84) [<c013c9c8>] (notifier_call_chain) from [<c013cd20>] (__blocking_notifier_call_chain+0x48/0x60) [<c013cd20>] (__blocking_notifier_call_chain) from [<c013cd50>] (blocking_notifier_call_chain+0x18/0x20) [<c013cd50>] (blocking_notifier_call_chain) from [<c03a6e44>] (register_framebuffer+0x1e0/0x2f8) [<c03a6e44>] (register_framebuffer) from [<c04153c0>] (__drm_fb_helper_initial_config_and_unlock+0x2fc/0x50c) [<c04153c0>] (__drm_fb_helper_initial_config_and_unlock) from [<c04158c8>] (drm_fbdev_client_hotplug+0xe8/0x1b8) [<c04158c8>] (drm_fbdev_client_hotplug) from [<c0415a20>] (drm_fbdev_generic_setup+0x88/0x118) [<c0415a20>] (drm_fbdev_generic_setup) from [<c043f060>] (sun4i_drv_bind+0x128/0x160) [<c043f060>] (sun4i_drv_bind) from [<c044b598>] (try_to_bring_up_master+0x164/0x1a0) [<c044b598>] (try_to_bring_up_master) from [<c044b668>] (__component_add+0x94/0x140) [<c044b668>] (__component_add) from [<c0445e1c>] (sun6i_dsi_probe+0x144/0x234) [<c0445e1c>] (sun6i_dsi_probe) from [<c0452ef4>] (platform_drv_probe+0x48/0x9c) [<c0452ef4>] (platform_drv_probe) from [<c04512cc>] (really_probe+0x1dc/0x2c8) [<c04512cc>] (really_probe) from [<c0451518>] (driver_probe_device+0x60/0x160) [<c0451518>] (driver_probe_device) from [<c044f7a4>] (bus_for_each_drv+0x74/0xb8) [<c044f7a4>] (bus_for_each_drv) from [<c045107c>] (__device_attach+0xd0/0x13c) [<c045107c>] (__device_attach) from [<c0450474>] (bus_probe_device+0x84/0x8c) [<c0450474>] (bus_probe_device) from [<c0450900>] (deferred_probe_work_func+0x64/0x90) [<c0450900>] (deferred_probe_work_func) from [<c0135970>] (process_one_work+0x204/0x420) [<c0135970>] (process_one_work) from [<c013690c>] (worker_thread+0x274/0x5a0) [<c013690c>] (worker_thread) from [<c013b3d8>] (kthread+0x11c/0x14c) [<c013b3d8>] (kthread) from [<c01010e8>] (ret_from_fork+0x14/0x2c) Exception stack(0xde539fb0 to 0xde539ff8) 9fa0: 00000000 00000000 00000000 00000000 9fc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 9fe0: 00000000 00000000 00000000 00000000 00000013 00000000 ---[ end trace b57eb1e5c64c6b8b ]---
random: fast init done
[drm:drm_atomic_helper_wait_for_dependencies] *ERROR* [CRTC:46:crtc-0] flip_done timed out [drm:drm_atomic_helper_wait_for_dependencies] *ERROR* [CONNECTOR:48:DSI-1] flip_done timed out [drm:drm_atomic_helper_wait_for_dependencies] *ERROR* [PLANE:30:plane-0] flip_done timed out
With the terms(as described in above diagram) fixed, the panel displays correctly without any timeouts.
--- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c +2 -2
@@ -437,9 +437,9 @@ static void sun6i_dsi_setup_burst(struct sun6i_dsi *dsi, SUN6I_DSI_BURST_LINE_SYNC_POINT(SUN6I_DSI_SYNC_POINT)); val =SUN6I_DSI_TCON_DRQ_ENABLE_MODE ; - }else if ((mode->hsync_end - mode->hdisplay) >20 ) { + }else if ((mode->hsync_start - mode->hdisplay) >20 ) {/* Maaaaaagic */ -u16 drq = (mode->hsync_end - mode->hdisplay) -20 ; +u16 drq = (mode->hsync_start - mode->hdisplay) -20 ; drq *=mipi_dsi_pixel_format_to_bpp (device->format); drq /=32 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 93/434 drm/amdkfd: fix a potential NULL pointer dereference (v2)
In reply to Greg Kroah-HartmanFrom: Allen Pais <[email protected]>
[ Upstream commit 81de29d842ccb776c0f77aa3e2b11b07fff0c0e2 ]
alloc_workqueue is not checked for errors and as a result, a potential NULL dereference could occur.
v2 (Felix Kuehling):
* Fix compile error (kfifo_free instead of fifo_free)
* Return proper error code
--- drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c +5 -0
@@ -62,6 +62,11 @@ int kfd_interrupt_init(struct kfd_dev *kfd) } kfd->ih_wq =alloc_workqueue ("KFD IH" ,WQ_HIGHPRI ,1 ); +if (unlikely (!kfd->ih_wq)) { +kfifo_free (&kfd->ih_fifo); +dev_err (kfd_chardev (),"Failed to allocate KFD IH workqueue\n" ); +return -ENOMEM ; + }spin_lock_init (&kfd->interrupt_lock);INIT_WORK (&kfd->interrupt_work, interrupt_wq);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 95/434 drm/amd/powerplay: A workaround to GPU RESET on APU
In reply to Greg Kroah-HartmanFrom: chen gong <[email protected]>
[ Upstream commit 068ad870bbd8f4f2c5b2fd4977a4f3330c9988f4 ]
Changes to function "smu_suspend" in amdgpu_smu.c is a workaround.
We should get real information about if baco is enabled or not, while we always consider APU SMU feature as enabled in current code.
I know APU do not support baco mode for GPU reset, so I use "adev->flags" to skip function "smu_feature_is_enabled".
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +4 -1
@@ -1344,7 +1344,10 @@ static int smu_suspend(void *handle)int ret;struct amdgpu_device *adev = (struct amdgpu_device *)handle;struct smu_context *smu = &adev->smu; -bool baco_feature_is_enabled =smu_feature_is_enabled (smu,SMU_FEATURE_BACO_BIT ); +bool baco_feature_is_enabled = false; + +if (!(adev->flags &AMD_IS_APU )) + baco_feature_is_enabled =smu_feature_is_enabled (smu,SMU_FEATURE_BACO_BIT ); ret =smu_system_features_control (smu, false);if (ret)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 94/434 x86/math-emu: Check __copy_from_user() result
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit e6b44ce1925a8329a937c57f0d60ba0d9bb5d226 ]
The new __must_check annotation on __copy_from_user() successfully identified some code that has lacked the check since at least linux-2.1.73:
arch/x86/math-emu/reg_ld_str.c:88:2: error: ignoring return value of \
function declared with 'warn_unused_result' attribute [-Werror,-Wunused-result] __copy_from_user(sti_ptr, s, 10);
^~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~ arch/x86/math-emu/reg_ld_str.c:1129:2: error: ignoring return value of \
function declared with 'warn_unused_result' attribute [-Werror,-Wunused-result] __copy_from_user(register_base + offset, s, other); ^~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ arch/x86/math-emu/reg_ld_str.c:1131:3: error: ignoring return value of \
function declared with 'warn_unused_result' attribute [-Werror,-Wunused-result] __copy_from_user(register_base, s + other, offset);
^~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In addition, the get_user()/put_user() helpers do not enforce a return value check, but actually still require one. These have been missing for even longer.
Change the internal wrappers around get_user()/put_user() to force a signal and add a corresponding wrapper around __copy_from_user() to check all such cases.
[ bp: Break long lines. ]
--- arch/x86/math-emu/fpu_system.h | 6 ++++-- arch/x86/math-emu/reg_ld_str.c | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-)
arch/x86/math-emu/fpu_system.h +4 -2
@@ -107,6 +107,8 @@ static inline bool seg_writable(struct desc_struct *d)#define FPU_access_ok (y,z) if ( !access_ok(y,z) ) \ math_abort(FPU_info,SIGSEGV)#define FPU_abort math_abort(FPU_info, SIGSEGV) +#define FPU_copy_from_user (to, from, n) \ + do { if (copy_from_user(to, from, n)) FPU_abort; } while (0)#undef FPU_IGNORE_CODE_SEGV#ifdef FPU_IGNORE_CODE_SEGV
@@ -122,7 +124,7 @@ static inline bool seg_writable(struct desc_struct *d)#define FPU_code_access_ok (z) FPU_access_ok((void __user *)FPU_EIP,z)#endif -#define FPU_get_user (x,y) get_user((x),(y)) -#define FPU_put_user (x,y) put_user((x),(y)) +#define FPU_get_user (x,y) do { if (get_user((x),(y))) FPU_abort; } while (0) +#define FPU_put_user (x,y) do { if (put_user((x),(y))) FPU_abort; } while (0)#endif
arch/x86/math-emu/reg_ld_str.c +3 -3
@@ -85,7 +85,7 @@ int FPU_load_extended(long double __user *s, int stnr)RE_ENTRANT_CHECK_OFF ;FPU_access_ok (s,10 ); -__copy_from_user (sti_ptr, s,10 ); +FPU_copy_from_user (sti_ptr, s,10 );RE_ENTRANT_CHECK_ON ;return FPU_tagof (sti_ptr);
@@ -1126,9 +1126,9 @@ void frstor(fpu_addr_modes addr_modes, u_char __user *data_address)/* Copy all registers in stack order. */ RE_ENTRANT_CHECK_OFF ;FPU_access_ok (s,80 ); -__copy_from_user (register_base + offset, s, other); +FPU_copy_from_user (register_base + offset, s, other);if (offset) -__copy_from_user (register_base, s + other, offset); +FPU_copy_from_user (register_base, s + other, offset);RE_ENTRANT_CHECK_ON ;for (i =0 ; i <8 ; i++) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 97/434 drm/amd/display: set minimum abm backlight level
In reply to Greg Kroah-HartmanFrom: Anthony Koo <[email protected]>
[ Upstream commit 2ad0cdf9e2e9e079af34af681863fa638f2ee212 ]
[Why]
A lot of the time, the backlight characteristic curve maps min backlight to a non-zero value.
But there are cases where we want the curve to intersect at 0. In this scenario even if OS never asks to set 0% backlight, the ABM reduction can result in backlight being lowered close to 0. This particularly can cause problems in some LED drivers, and in general just looks like backlight is completely off.
[How]
Add default cap to disallow backlight from dropping below 1% even after ABM reduction is applied.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 ++ .../amd/display/modules/power/power_helpers.c | 77 +++++++++++-------- .../amd/display/modules/power/power_helpers.h | 1 + 3 files changed, 49 insertions(+), 34 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +5 -0
@@ -940,6 +940,11 @@ static int dm_late_init(void *handle) params.backlight_lut_array_size =16 ; params.backlight_lut_array = linear_lut; +/* Min backlight level after ABM reduction, Don't allow below 1% +* 0xFFFF x 0.01 = 0x28F +*/ + params.min_abm_backlight =0x28F ; +/* todo will enable for navi10 */ if (adev->asic_type <=CHIP_RAVEN ) { ret =dmcu_load_iram (dmcu, params);
drivers/gpu/drm/amd/display/modules/power/power_helpers.c +43 -34
121 lines not on this page · raw message
drivers/gpu/drm/amd/display/modules/power/power_helpers.h +1 -0
@@ -38,6 +38,7 @@ struct dmcu_iram_parameters {unsigned int backlight_lut_array_size;unsigned int backlight_ramping_reduction;unsigned int backlight_ramping_start; +unsigned int min_abm_backlight;unsigned int set; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 98/434 media: venus: Fix occasionally failures to suspend
In reply to Greg Kroah-HartmanFrom: Stanimir Varbanov <[email protected]>
[ Upstream commit 8dbebb2bd01e6f36e9a215dcde99ace70408f2c8 ]
Failure to suspend (venus_suspend_3xx) happens when the system is fresh booted and loading venus driver. This happens once and after reload the venus driver modules the problem disrepair.
Fix the failure by skipping the check for WFI and IDLE bits if PC_READY is on in control status register.
--- drivers/media/platform/qcom/venus/hfi_venus.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/media/platform/qcom/venus/hfi_venus.c +6 -0
@@ -1472,6 +1472,7 @@ static int venus_suspend_3xx(struct venus_core *core) {struct venus_hfi_device *hdev =to_hfi_priv (core);struct device *dev = core->dev; +u32 ctrl_status;bool val;int ret;
@@ -1487,6 +1488,10 @@ static int venus_suspend_3xx(struct venus_core *core)return -EINVAL ; } + ctrl_status =venus_readl (hdev,CPU_CS_SCIACMDARG0 ); +if (ctrl_status &CPU_CS_SCIACMDARG0_PC_READY ) + goto power_off; +/* * Power collapse sequence for Venus 3xx and 4xx versions: * 1. Check for ARM9 and video core to be idle by checking WFI bit
@@ -1511,6 +1516,7 @@ static int venus_suspend_3xx(struct venus_core *core)if (ret)return ret; +power_off:mutex_lock (&hdev->lock); ret =venus_power_off (hdev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 63/434 drm/meson: vclk: use the correct G12A frac max value
In reply to Greg Kroah-HartmanFrom: Neil Armstrong <[email protected]>
[ Upstream commit d56276a13c2b9ea287b9fc7cc78bed4c43b286f9 ]
When calculating the HDMI PLL settings for a DMT mode PHY frequency, use the correct max fractional PLL value for G12A VPU.
With this fix, we can finally setup the 1024x768-60 mode.
--- drivers/gpu/drm/meson/meson_vclk.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/meson/meson_vclk.c +7 -2
@@ -638,13 +638,18 @@ static bool meson_hdmi_pll_validate_params(struct meson_drm *priv,if (frac >=HDMI_FRAC_MAX_GXBB )return false; }else if (meson_vpu_is_compatible (priv,VPU_COMPATIBLE_GXM ) || -meson_vpu_is_compatible (priv,VPU_COMPATIBLE_GXL ) || -meson_vpu_is_compatible (priv,VPU_COMPATIBLE_G12A )) { +meson_vpu_is_compatible (priv,VPU_COMPATIBLE_GXL )) {/* Empiric supported min/max dividers */ if (m <106 || m >247 )return false;if (frac >=HDMI_FRAC_MAX_GXL )return false; + }else if (meson_vpu_is_compatible (priv,VPU_COMPATIBLE_G12A )) { +/* Empiric supported min/max dividers */ +if (m <106 || m >247 ) +return false; +if (frac >=HDMI_FRAC_MAX_G12A ) +return false; }return true;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 99/434 rtw88: fix NSS of hw_cap
In reply to Greg Kroah-HartmanFrom: Ping-Ke Shih <[email protected]>
[ Upstream commit 4f5bb7ff8b8d4bafd91243fc969ed240e67aa1ca ]
8822C is a 2x2 11ac chip, and then NSS must be less or equal to 2. However, current nss of hw cap is 3, likes
hw cap: hci=0x0f, bw=0x07, ptcl=0x03, ant_num=7, nss=3
This commit adds constraint to make sure NSS <= rf_path_num, and result looks like
hw cap: hci=0x0f, bw=0x07, ptcl=0x03, ant_num=7, nss=2
--- drivers/net/wireless/realtek/rtw88/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw88/main.c +2 -1
@@ -1020,7 +1020,8 @@ static int rtw_dump_hw_feature(struct rtw_dev *rtwdev)rtw_hw_config_rf_ant_num (rtwdev, efuse->hw_cap.ant_num); -if (efuse->hw_cap.nss ==EFUSE_HW_CAP_IGNORE ) +if (efuse->hw_cap.nss ==EFUSE_HW_CAP_IGNORE || + efuse->hw_cap.nss > rtwdev->hal.rf_path_num) efuse->hw_cap.nss = rtwdev->hal.rf_path_num; rtw_dbg(rtwdev, RTW_DBG_EFUSE,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 100/434 drm/amd/display: fix struct init in update_bounding_box
In reply to Greg Kroah-HartmanFrom: Raul E Rangel <[email protected]>
[ Upstream commit 960b6f4f2d2e96d5f7ffe2854e0040b46cafbd36 ]
dcn20_resource.c:2636:9: error: missing braces around initializer [-Werror=missing-braces]
struct _vcs_dpi_voltage_scaling_st calculated_states[MAX_CLOCK_LIMIT_STATES] = {0};
^--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +3 -1
@@ -3041,7 +3041,7 @@ static void cap_soc_clocks(static void update_bounding_box (struct dc *dc,struct _vcs_dpi_soc_bounding_box_st *bb,struct pp_smu_nv_clock_table *max_clocks,unsigned int *uclk_states,unsigned int num_states) { -struct _vcs_dpi_voltage_scaling_st calculated_states[MAX_CLOCK_LIMIT_STATES ] = {0 }; +struct _vcs_dpi_voltage_scaling_st calculated_states[MAX_CLOCK_LIMIT_STATES ];int i;int num_calculated_states =0 ;int min_dcfclk =0 ;
@@ -3049,6 +3049,8 @@ static void update_bounding_box(struct dc *dc, struct _vcs_dpi_soc_bounding_box_if (num_states ==0 )return ; +memset (calculated_states,0 ,sizeof (calculated_states)); +if (dc->bb_overrides.min_dcfclk_mhz >0 ) min_dcfclk = dc->bb_overrides.min_dcfclk_mhz;else
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 64/434 staging: rtl8192u: fix multiple memory leaks on error path
In reply to Greg Kroah-HartmanFrom: Navid Emamdoost <[email protected]>
[ Upstream commit ca312438cf176a16d4b89350cade8789ba8d7133 ]
In rtl8192_tx on error handling path allocated urbs and also skb should be released.
--- drivers/staging/rtl8192u/r8192U_core.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +12 -5
@@ -1422,7 +1422,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb) (struct tx_fwinfo_819x_usb *)(skb->data +USB_HWDESC_HEADER_LEN );struct usb_device *udev = priv->udev;int pend; -int status; +int status, rt =-1 ;struct urb *tx_urb =NULL , *tx_urb_zero =NULL ;unsigned int idx_pipe;
@@ -1566,8 +1566,10 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb) }if (bSend0Byte) { tx_urb_zero =usb_alloc_urb (0 ,GFP_ATOMIC ); -if (!tx_urb_zero) -return -ENOMEM ; +if (!tx_urb_zero) { + rt = -ENOMEM ; + goto error; + }usb_fill_bulk_urb (tx_urb_zero, udev,usb_sndbulkpipe (udev, idx_pipe), &zero,0 , tx_zero_isr, dev);
@@ -1577,7 +1579,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)"Error TX URB for zero byte %d, error %d" ,atomic_read (&priv->tx_pending[tcb_desc->queue_index]), status); -return -1 ; + goto error; } }netif_trans_update (dev);
@@ -1588,7 +1590,12 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)RT_TRACE (COMP_ERR ,"Error TX URB %d, error %d" ,atomic_read (&priv->tx_pending[tcb_desc->queue_index]), status); -return -1 ; + +error: +dev_kfree_skb_any (skb); +usb_free_urb (tx_urb); +usb_free_urb (tx_urb_zero); +return rt; }static short rtl8192_usb_initendpoints (struct net_device *dev)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 66/434 rtlwifi: prevent memory leak in rtl_usb_probe
In reply to Greg Kroah-HartmanFrom: Navid Emamdoost <[email protected]>
[ Upstream commit 3f93616951138a598d930dcaec40f2bfd9ce43bb ]
In rtl_usb_probe if allocation for usb_data fails the allocated hw should be released. In addition the allocated rtlpriv->usb_data should be released on error handling path.
--- drivers/net/wireless/realtek/rtlwifi/usb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtlwifi/usb.c +4 -1
@@ -1021,8 +1021,10 @@ int rtl_usb_probe(struct usb_interface *intf, rtlpriv->hw = hw; rtlpriv->usb_data =kcalloc (RTL_USB_MAX_RX_COUNT ,sizeof (u32),GFP_KERNEL ); -if (!rtlpriv->usb_data) +if (!rtlpriv->usb_data) { +ieee80211_free_hw (hw);return -ENOMEM ; + }/* this spin lock must be initialized early */ spin_lock_init (&rtlpriv->locks.usb_lock);
@@ -1083,6 +1085,7 @@ error_out2:_rtl_usb_io_handler_release (hw);usb_put_dev (udev);complete (&rtlpriv->firmware_loading_complete); +kfree (rtlpriv->usb_data);return -ENODEV ; }EXPORT_SYMBOL (rtl_usb_probe);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 65/434 staging: rtl8188eu: fix possible null dereference
In reply to Greg Kroah-HartmanFrom: Connor Kuehl <[email protected]>
[ Upstream commit 228241944a48113470d3c3b46c88ba7fbe0a274b ]
Inside a nested 'else' block at the beginning of this function is a call that assigns 'psta' to the return value of 'rtw_get_stainfo()'. If 'rtw_get_stainfo()' returns NULL and the flow of control reaches the 'else if' where 'psta' is dereferenced, then we will dereference a NULL pointer.
Fix this by checking if 'psta' is not NULL before reading its 'psta->qos_option' data member.
Addresses-Coverity: ("Dereference null return value")
--- drivers/staging/rtl8188eu/core/rtw_xmit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8188eu/core/rtw_xmit.c +2 -2
@@ -776,7 +776,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattrmemcpy (pwlanhdr->addr2,get_bssid (pmlmepriv),ETH_ALEN );memcpy (pwlanhdr->addr3, pattrib->src,ETH_ALEN ); -if (psta->qos_option) +if (psta && psta->qos_option) qos_option = true; }else if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) ||check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) {
@@ -784,7 +784,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattrmemcpy (pwlanhdr->addr2, pattrib->src,ETH_ALEN );memcpy (pwlanhdr->addr3,get_bssid (pmlmepriv),ETH_ALEN ); -if (psta->qos_option) +if (psta && psta->qos_option) qos_option = true; }else {RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("fw_state:%x is not allowed to xmit frame\n" ,get_fwstate (pmlmepriv)));
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 67/434 libertas: fix a potential NULL pointer dereference
In reply to Greg Kroah-HartmanFrom: Allen Pais <[email protected]>
[ Upstream commit 7da413a18583baaf35dd4a8eb414fa410367d7f2 ]
alloc_workqueue is not checked for errors and as a result, a potential NULL dereference could occur.
--- drivers/net/wireless/marvell/libertas/if_sdio.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/marvell/libertas/if_sdio.c +5 -0
@@ -1179,6 +1179,10 @@ static int if_sdio_probe(struct sdio_func *func,spin_lock_init (&card->lock); card->workqueue =alloc_workqueue ("libertas_sdio" ,WQ_MEM_RECLAIM ,0 ); +if (unlikely (!card->workqueue)) { + ret = -ENOMEM ; + goto err_queue; + }INIT_WORK (&card->packet_worker, if_sdio_host_to_card_worker);init_waitqueue_head (&card->pwron_waitq);
@@ -1230,6 +1234,7 @@ err_activate_card:lbs_remove_card (priv); free:destroy_workqueue (card->workqueue); +err_queue:while (card->packets) { packet = card->packets; card->packets = card->packets->next;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 102/434 crypto: aegis128-neon - use Clang compatible cflags for ARM
In reply to Greg Kroah-HartmanFrom: Ard Biesheuvel <[email protected]>
[ Upstream commit 2eb2d198bd6cd0083a5363ce66272fb34a19928f ]
The next version of Clang will start policing compiler command line options, and will reject combinations of -march and -mfpu that it thinks are incompatible.
This results in errors like
clang-10: warning: ignoring extension 'crypto' because the 'armv7-a' architecture does not support it [-Winvalid-command-line-argument] /tmp/aegis128-neon-inner-5ee428.s: Assembler messages:
/tmp/aegis128-neon-inner-5ee428.s:73: Error: selected
processor does not support `aese.8 q2,q14' in ARM mode
when buiding the SIMD aegis128 code for 32-bit ARM, given that the 'armv7-a' -march argument is considered to be compatible with the ARM crypto extensions. Instead, we should use armv8-a, which does allow the crypto extensions to be enabled.
--- crypto/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
crypto/Makefile +1 -1
@@ -93,7 +93,7 @@ obj-$(CONFIG_CRYPTO_AEGIS128) += aegis128.o aegis128-y := aegis128-core.o ifeq ($(ARCH),arm) -CFLAGS_aegis128-neon-inner.o += -ffreestanding -march=armv7-a -mfloat-abi=softfp +CFLAGS_aegis128-neon-inner.o += -ffreestanding -march=armv8-a -mfloat-abi=softfp CFLAGS_aegis128-neon-inner.o += -mfpu=crypto-neon-fp-armv8 aegis128-$(CONFIG_CRYPTO_AEGIS128_SIMD) += aegis128-neon.o aegis128-neon-inner.o endif
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 111/434 block: Fix writeback throttling W=1 compiler warnings
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit 1d200e9d6f635ae894993a7d0f1b9e0b6e522e3b ]
Fix the following compiler warnings:
In file included from ./include/linux/bitmap.h:9,
from ./include/linux/cpumask.h:12,
from ./arch/x86/include/asm/cpumask.h:5,
from ./arch/x86/include/asm/msr.h:11,
from ./arch/x86/include/asm/processor.h:21,
from ./arch/x86/include/asm/cpufeature.h:5,
from ./arch/x86/include/asm/thread_info.h:53,
from ./include/linux/thread_info.h:38,
from ./arch/x86/include/asm/preempt.h:7,
from ./include/linux/preempt.h:78,
from ./include/linux/spinlock.h:51,
from ./include/linux/mmzone.h:8,
from ./include/linux/gfp.h:6,
from ./include/linux/mm.h:10,
from ./include/linux/bvec.h:13,
from ./include/linux/blk_types.h:10,
from block/blk-wbt.c:23:
In function 'strncpy',
inlined from 'perf_trace_wbt_stat' at ./include/trace/events/wbt.h:15:1:
./include/linux/string.h:260:9: warning: '__builtin_strncpy' specified bound 32 equals destination size [-Wstringop-truncation]
return __builtin_strncpy(p, q, size);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In function 'strncpy',
inlined from 'perf_trace_wbt_lat' at ./include/trace/events/wbt.h:58:1:
./include/linux/string.h:260:9: warning: '__builtin_strncpy' specified bound 32 equals destination size [-Wstringop-truncation]
return __builtin_strncpy(p, q, size);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In function 'strncpy',
inlined from 'perf_trace_wbt_step' at ./include/trace/events/wbt.h:87:1:
./include/linux/string.h:260:9: warning: '__builtin_strncpy' specified bound 32 equals destination size [-Wstringop-truncation]
return __builtin_strncpy(p, q, size);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In function 'strncpy',
inlined from 'perf_trace_wbt_timer' at ./include/trace/events/wbt.h:126:1:
./include/linux/string.h:260:9: warning: '__builtin_strncpy' specified bound 32 equals destination size [-Wstringop-truncation]
return __builtin_strncpy(p, q, size);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In function 'strncpy',
inlined from 'trace_event_raw_event_wbt_stat' at ./include/trace/events/wbt.h:15:1:
./include/linux/string.h:260:9: warning: '__builtin_strncpy' specified bound 32 equals destination size [-Wstringop-truncation]
return __builtin_strncpy(p, q, size);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In function 'strncpy',
inlined from 'trace_event_raw_event_wbt_lat' at ./include/trace/events/wbt.h:58:1:
./include/linux/string.h:260:9: warning: '__builtin_strncpy' specified bound 32 equals destination size [-Wstringop-truncation]
return __builtin_strncpy(p, q, size);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In function 'strncpy',
inlined from 'trace_event_raw_event_wbt_timer' at ./include/trace/events/wbt.h:126:1:
./include/linux/string.h:260:9: warning: '__builtin_strncpy' specified bound 32 equals destination size [-Wstringop-truncation]
return __builtin_strncpy(p, q, size);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In function 'strncpy',
inlined from 'trace_event_raw_event_wbt_step' at ./include/trace/events/wbt.h:87:1:
./include/linux/string.h:260:9: warning: '__builtin_strncpy' specified bound 32 equals destination size [-Wstringop-truncation]
return __builtin_strncpy(p, q, size);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~--- include/trace/events/wbt.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
include/trace/events/wbt.h +8 -4
@@ -33,7 +33,8 @@ TRACE_EVENT(wbt_stat, ),TP_fast_assign ( - strncpy(__entry->name, dev_name(bdi->dev), 32); +strlcpy (__entry->name,dev_name (bdi->dev), + ARRAY_SIZE(__entry->name)); __entry->rmean = stat[0 ].mean; __entry->rmin = stat[0 ].min; __entry->rmax = stat[0 ].max;
@@ -67,7 +68,8 @@ TRACE_EVENT(wbt_lat, ),TP_fast_assign ( - strncpy(__entry->name, dev_name(bdi->dev), 32); +strlcpy (__entry->name,dev_name (bdi->dev), + ARRAY_SIZE(__entry->name)); __entry->lat =div_u64 (lat,1000 ); ),
@@ -103,7 +105,8 @@ TRACE_EVENT(wbt_step, ),TP_fast_assign ( - strncpy(__entry->name, dev_name(bdi->dev), 32); +strlcpy (__entry->name,dev_name (bdi->dev), + ARRAY_SIZE(__entry->name)); __entry->msg = msg; __entry->step = step; __entry->window =div_u64 (window,1000 );
@@ -138,7 +141,8 @@ TRACE_EVENT(wbt_timer, ),TP_fast_assign ( - strncpy(__entry->name, dev_name(bdi->dev), 32); +strlcpy (__entry->name,dev_name (bdi->dev), + ARRAY_SIZE(__entry->name)); __entry->status = status; __entry->step = step; __entry->inflight = inflight;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 113/434 drm/amdkfd: Fix MQD size calculation
In reply to Greg Kroah-HartmanFrom: Oak Zeng <[email protected]>
[ Upstream commit 40a9592a26608e16f7545a068ea4165e1869f629 ]
On device initialization, a chunk of GTT memory is pre-allocated for HIQ and all SDMA queues mqd. The size of this allocation was wrong. The correct sdma engine number should be PCIe-optimized SDMA engine number plus xgmi SDMA engine number.
--- drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +2 -1
@@ -1676,7 +1676,8 @@ static int allocate_hiq_sdma_mqd(struct device_queue_manager *dqm)struct kfd_dev *dev = dqm->dev;struct kfd_mem_obj *mem_obj = &dqm->hiq_sdma_mqd;uint32_t size = dqm->mqd_mgrs[KFD_MQD_TYPE_SDMA ]->mqd_size * - dev->device_info->num_sdma_engines * + (dev->device_info->num_sdma_engines + + dev->device_info->num_xgmi_sdma_engines) * dev->device_info->num_sdma_queues_per_engine + dqm->mqd_mgrs[KFD_MQD_TYPE_HIQ ]->mqd_size;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 114/434 MIPS: futex: Emit Loongson3 sync workarounds within asm
In reply to Greg Kroah-HartmanFrom: Paul Burton <[email protected]>
[ Upstream commit 3c1d3f0979721a39dd2980c97466127ce65aa130 ]
Generate the sync instructions required to workaround Loongson3 LL/SC errata within inline asm blocks, which feels a little safer than doing it from C where strictly speaking the compiler would be well within its rights to insert a memory access between the separate asm statements we previously had, containing sync & ll instructions respectively.
--- arch/mips/include/asm/barrier.h | 13 +++++++------ arch/mips/include/asm/futex.h | 15 +++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-)
arch/mips/include/asm/barrier.h +7 -6
@@ -218,13 +218,14 @@* ordering will be done by smp_llsc_mb() and friends. */ #if defined(CONFIG_WEAK_REORDERING_BEYOND_LLSC ) && defined(CONFIG_SMP ) -#define __WEAK_LLSC_MB " sync \n" -#define smp_llsc_mb () __asm__ __volatile__(__WEAK_LLSC_MB : : :"memory") -#define __LLSC_CLOBBER +# define __WEAK_LLSC_MB sync +# define smp_llsc_mb () \ + __asm__ __volatile__(__stringify(__WEAK_LLSC_MB) : : :"memory") +# define __LLSC_CLOBBER#else -#define __WEAK_LLSC_MB " \n" -#define smp_llsc_mb () do { } while (0) -#define __LLSC_CLOBBER "memory" +# define __WEAK_LLSC_MB +# define smp_llsc_mb () do { } while (0) +# define __LLSC_CLOBBER "memory"#endif #ifdef CONFIG_CPU_CAVIUM_OCTEON
arch/mips/include/asm/futex.h +7 -8
@@ -16,6 +16,7 @@#include <asm/barrier.h> #include <asm/compiler.h> #include <asm/errno.h> +#include <asm/sync.h> #include <asm/war.h> #define __futex_atomic_op (insn, ret, oldval, uaddr, oparg) \
@@ -32,7 +33,7 @@" .set arch=r4000 \n" \"2: sc $1, %2 \n" \" beqzl $1, 1b \n" \ - __WEAK_LLSC_MB \ + __stringify(__WEAK_LLSC_MB) \"3: \n" \" .insn \n" \" .set pop \n" \
@@ -50,19 +51,19 @@ "i" (-EFAULT) \ : "memory"); \ } else if (cpu_has_llsc) { \ - loongson_llsc_mb(); \ __asm__ __volatile__( \ " .set push \n" \ " .set noat \n" \ " .set push \n" \ " .set "MIPS_ISA_ARCH_LEVEL" \n" \ + " " __SYNC(full, loongson3_war) " \n" \ "1: "user_ll("%1", "%4")" # __futex_atomic_op\n" \ " .set pop \n" \ " " insn " \n" \ " .set "MIPS_ISA_ARCH_LEVEL" \n" \ "2: "user_sc("$1", "%2")" \n" \ " beqz $1, 1b \n" \ - __WEAK_LLSC_MB \ + __stringify(__WEAK_LLSC_MB) \"3: \n" \" .insn \n" \" .set pop \n" \
@@ -147,7 +148,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr," .set arch=r4000 \n" "2: sc $1, %2 \n" " beqzl $1, 1b \n" - __WEAK_LLSC_MB + __stringify(__WEAK_LLSC_MB)"3: \n" " .insn \n" " .set pop \n"
@@ -164,13 +165,13 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, "i" (-EFAULT) : "memory"); }else if (cpu_has_llsc) { -loongson_llsc_mb (); __asm__ __volatile__("# futex_atomic_cmpxchg_inatomic \n" " .set push \n" " .set noat \n" " .set push \n" " .set " MIPS_ISA_ARCH_LEVEL " \n" + " " __SYNC(full, loongson3_war) " \n" "1: "user_ll("%1", "%3")" \n"" bne %1, %z4, 3f \n" " .set pop \n"
@@ -178,8 +179,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr," .set " MIPS_ISA_ARCH_LEVEL " \n" "2: "user_sc("$1", "%2")" \n"" beqz $1, 1b \n" - __WEAK_LLSC_MB -"3: \n" + "3: " __SYNC_ELSE(full, loongson3_war, __WEAK_LLSC_MB) "\n"" .insn \n" " .set pop \n" " .section .fixup,\"ax\" \n"
@@ -194,7 +194,6 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, : GCC_OFF_SMALL_ASM() (*uaddr), "Jr" (oldval), "Jr" (newval), "i" (-EFAULT) : "memory"); -loongson_llsc_mb (); }else return -ENOSYS ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 115/434 mwifiex: pcie: Fix memory leak in mwifiex_pcie_init_evt_ring
In reply to Greg Kroah-HartmanFrom: Navid Emamdoost <[email protected]>
[ Upstream commit d10dcb615c8e29d403a24d35f8310a7a53e3050c ]
In mwifiex_pcie_init_evt_ring, a new skb is allocated which should be released if mwifiex_map_pci_memory() fails. The release for skb and card->evtbd_ring_vbase is added.
--- drivers/net/wireless/marvell/mwifiex/pcie.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/marvell/mwifiex/pcie.c +4 -1
@@ -687,8 +687,11 @@ static int mwifiex_pcie_init_evt_ring(struct mwifiex_adapter *adapter)skb_put (skb,MAX_EVENT_SIZE );if (mwifiex_map_pci_memory (adapter, skb,MAX_EVENT_SIZE , -PCI_DMA_FROMDEVICE )) +PCI_DMA_FROMDEVICE )) { +kfree_skb (skb); +kfree (card->evtbd_ring_vbase);return -1 ; + } buf_pa =MWIFIEX_SKB_DMA_ADDR (skb);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 116/434 drm/drm_vblank: Change EINVAL by the correct errno
In reply to Greg Kroah-HartmanFrom: Rodrigo Siqueira <[email protected]>
[ Upstream commit aed6105b28b10613f16c0bfe97525fe5a23338df ]
For historical reasons, the function drm_wait_vblank_ioctl always return -EINVAL if something gets wrong. This scenario limits the flexibility for the userspace to make detailed verification of any problem and take some action. In particular, the validation of “if (!dev->irq_enabled)” in the drm_wait_vblank_ioctl is responsible for checking if the driver support vblank or not. If the driver does not support VBlank, the function drm_wait_vblank_ioctl returns EINVAL, which does not represent the real issue; this patch changes this behavior by return EOPNOTSUPP. Additionally, drm_crtc_get_sequence_ioctl and drm_crtc_queue_sequence_ioctl, also returns EINVAL if vblank is not supported; this patch also changes the return value to EOPNOTSUPP in these functions. Lastly, these functions are invoked by libdrm, which is used by many compositors; because of this, it is important to check if this change breaks any compositor. In this sense, the following projects were examined:
* Drm-hwcomposer
* Kwin
* Sway
* Wlroots
* Wayland
* Weston
* Mutter
* Xorg (67 different drivers)
For each repository the verification happened in three steps:
* Update the main branch
* Look for any occurrence of "drmCrtcQueueSequence", "drmCrtcGetSequence", and "drmWaitVBlank" with the command git grep -n "STRING".
* Look in the git history of the project with the command git log -S<STRING>
None of the above projects validate the use of EINVAL when using drmWaitVBlank(), which make safe, at least for these projects, to change the return values. On the other hand, mesa and xserver project uses drmCrtcQueueSequence() and drmCrtcGetSequence(); this change is harmless for both projects.
Change since V5 (Pekka Paalanen):
- Check if the change also affects Mutter
Change since V4 (Daniel):
- Also return EOPNOTSUPP in drm_crtc_[get|queue]_sequence_ioctl
Change since V3:
- Return EINVAL for _DRM_VBLANK_SIGNAL (Daniel)
Change since V2:
Daniel Vetter and Chris Wilson
- Replace ENOTTY by EOPNOTSUPP
- Return EINVAL if the parameters are wrong
--- drivers/gpu/drm/drm_vblank.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_vblank.c +3 -3
@@ -1581,7 +1581,7 @@ int drm_wait_vblank_ioctl(struct drm_device *dev, void *data,unsigned int flags, pipe, high_pipe;if (!dev->irq_enabled) -return -EINVAL ; +return -EOPNOTSUPP ;if (vblwait->request.type & _DRM_VBLANK_SIGNAL)return -EINVAL ;
@@ -1838,7 +1838,7 @@ int drm_crtc_get_sequence_ioctl(struct drm_device *dev, void *data,return -EOPNOTSUPP ;if (!dev->irq_enabled) -return -EINVAL ; +return -EOPNOTSUPP ; crtc =drm_crtc_find (dev, file_priv, get_seq->crtc_id);if (!crtc)
@@ -1896,7 +1896,7 @@ int drm_crtc_queue_sequence_ioctl(struct drm_device *dev, void *data,return -EOPNOTSUPP ;if (!dev->irq_enabled) -return -EINVAL ; +return -EOPNOTSUPP ; crtc =drm_crtc_find (dev, file_priv, queue_seq->crtc_id);if (!crtc)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 117/434 selftests/bpf: Fix btf_dump padding test case
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit 76790c7c66ccc8695afc75e73f54c0ca86267ed2 ]
Existing padding test case for btf_dump has a good test that was supposed to test padding generation at the end of a struct, but its expected output was specified incorrectly. Fix this.
--- .../testing/selftests/bpf/progs/btf_dump_test_case_padding.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/testing/selftests/bpf/progs/btf_dump_test_case_padding.c +4 -1
@@ -62,6 +62,10 @@ struct padded_a_lot {* long: 64; * long: 64; * int b; +* long: 32; +* long: 64; +* long: 64; +* long: 64; *}; * */
@@ -95,7 +99,6 @@ struct zone_padding {struct zone {int a;short b; - short: 16;struct zone_padding __pad__; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 118/434 libbpf: Fix struct end padding in btf_dump
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit b4099769f3321a8d258a47a8b4b9d278dad28a73 ]
Fix a case where explicit padding at the end of a struct is necessary due to non-standart alignment requirements of fields (which BTF doesn't capture explicitly).
--- tools/lib/bpf/btf_dump.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
tools/lib/bpf/btf_dump.c +7 -1
@@ -876,7 +876,6 @@ static void btf_dump_emit_struct_def(struct btf_dump *d,__u16 vlen =btf_vlen (t); packed = is_struct ?btf_is_struct_packed (d->btf, id, t) :0 ; - align = packed ?1 :btf_align_of (d->btf, id); btf_dump_printf(d, "%s%s%s {", is_struct ? "struct" : "union",
@@ -906,6 +905,13 @@ static void btf_dump_emit_struct_def(struct btf_dump *d,btf_dump_printf (d,";" ); } +/* pad at the end, if necessary */ +if (is_struct) { + align = packed ?1 :btf_align_of (d->btf, id); +btf_dump_emit_bit_padding (d, off, t->size *8 ,0 , align, + lvl +1 ); + } +if (vlen)btf_dump_printf (d,"\n" );btf_dump_printf (d,"%s}" ,pfx (lvl));
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 119/434 libbpf: Fix passing uninitialized bytes to setsockopt
In reply to Greg Kroah-HartmanFrom: Ilya Maximets <[email protected]>
[ Upstream commit 25bfef430e960e695403b5d9c8dcc11b9f5d62be ]
'struct xdp_umem_reg' has 4 bytes of padding at the end that makes valgrind complain about passing uninitialized stack memory to the syscall:
Syscall param socketcall.setsockopt() points to uninitialised byte(s)
at 0x4E7AB7E: setsockopt (in /usr/lib64/libc-2.29.so)
by 0x4BDE035: xsk_umem__create@@LIBBPF_0.0.4 (xsk.c:172)
Uninitialised value was created by a stack allocation
at 0x4BDDEBA: xsk_umem__create@@LIBBPF_0.0.4 (xsk.c:140)Padding bytes appeared after introducing of a new 'flags' field. memset() is required to clear them.
--- tools/lib/bpf/xsk.c | 1 + 1 file changed, 1 insertion(+)
tools/lib/bpf/xsk.c +1 -0
@@ -163,6 +163,7 @@ int xsk_umem__create_v0_0_4(struct xsk_umem **umem_ptr, void *umem_area, umem->umem_area = umem_area;xsk_set_umem_config (&umem->config, usr_config); +memset (&mr,0 ,sizeof (mr)); mr.addr = (uintptr_t )umem_area; mr.len = size; mr.chunk_size = umem->config.frame_size;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 103/434 hwrng: omap3-rom - Call clk_disable_unprepare() on exit only if not idled
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit eaecce12f5f0d2c35d278e41e1bc4522393861ab ]
When unloading omap3-rom-rng, we'll get the following:
WARNING: CPU: 0 PID: 100 at drivers/clk/clk.c:948 clk_core_disable
This is because the clock may be already disabled by omap3_rom_rng_idle(). Let's fix the issue by checking for rng_idle on exit.
--- drivers/char/hw_random/omap3-rom-rng.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/char/hw_random/omap3-rom-rng.c +2 -1
@@ -121,7 +121,8 @@ static int omap3_rom_rng_remove(struct platform_device *pdev) {cancel_delayed_work_sync (&idle_work);hwrng_unregister (&omap3_rom_rng_ops); -clk_disable_unprepare (rng_clk); +if (!rng_idle) +clk_disable_unprepare (rng_clk);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 120/434 net/smc: increase device refcount for added link group
In reply to Greg Kroah-HartmanFrom: Ursula Braun <[email protected]>
[ Upstream commit b3cb53c05f20c5b4026a36a7bbd3010d1f3e0a55 ]
SMCD link groups belong to certain ISM-devices and SMCR link group links belong to certain IB-devices. Increase the refcount for these devices, as long as corresponding link groups exist.
--- net/smc/smc_core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
net/smc/smc_core.c +7 -2
@@ -231,10 +231,12 @@ static int smc_lgr_create(struct smc_sock *smc, struct smc_init_info *ini) lgr->conns_all =RB_ROOT ;if (ini->is_smcd) {/* SMC-D specific settings */ +get_device (&ini->ism_dev->dev); lgr->peer_gid = ini->ism_gid; lgr->smcd = ini->ism_dev; }else {/* SMC-R specific settings */ +get_device (&ini->ib_dev->ibdev->dev); lgr->role = smc->listen_smc ?SMC_SERV :SMC_CLNT ;memcpy (lgr->peer_systemid, ini->ib_lcl->id_for_peer,SMC_SYSTEMID_LEN );
@@ -433,10 +435,13 @@ static void smc_lgr_free_bufs(struct smc_link_group *lgr)static void smc_lgr_free (struct smc_link_group *lgr) {smc_lgr_free_bufs (lgr); -if (lgr->is_smcd) +if (lgr->is_smcd) {smc_ism_put_vlan (lgr->smcd, lgr->vlan_id); -else +put_device (&lgr->smcd->dev); + }else {smc_link_clear (&lgr->lnk[SMC_SINGLE_LINK ]); +put_device (&lgr->lnk[SMC_SINGLE_LINK ].smcibdev->ibdev->dev); + }kfree (lgr); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 122/434 media: cx88: Fix some error handling path in cx8800_initdev()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit e1444e9b0424c70def6352580762d660af50e03f ]
A call to 'pci_disable_device()' is missing in the error handling path. In some cases, a call to 'free_irq()' may also be missing.
Reorder the error handling path, add some new labels and fix the 2 issues mentionned above.
This way, the error handling path in more in line with 'cx8800_finidev()' (i.e. the remove function)
--- drivers/media/pci/cx88/cx88-video.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/media/pci/cx88/cx88-video.c +7 -4
@@ -1277,7 +1277,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev, core =cx88_core_get (dev->pci);if (!core) { err = -EINVAL ; - goto fail_free; + goto fail_disable; } dev->core = core;
@@ -1323,7 +1323,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev, cc->step, cc->default_value);if (!vc) { err = core->audio_hdl.error; - goto fail_core; + goto fail_irq; } vc->priv = (void *)cc; }
@@ -1337,7 +1337,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev, cc->step, cc->default_value);if (!vc) { err = core->video_hdl.error; - goto fail_core; + goto fail_irq; } vc->priv = (void *)cc;if (vc->id ==V4L2_CID_CHROMA_AGC )
@@ -1509,11 +1509,14 @@ static int cx8800_initdev(struct pci_dev *pci_dev, fail_unreg:cx8800_unregister_video (dev); -free_irq (pci_dev->irq, dev);mutex_unlock (&core->lock); +fail_irq: +free_irq (pci_dev->irq, dev); fail_core: core->v4ldev =NULL ;cx88_core_put (core, dev->pci); +fail_disable: +pci_disable_device (pci_dev); fail_free:kfree (dev);return err;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 124/434 crypto: aegis128/simd - build 32-bit ARM for v8 architecture explicitly
In reply to Greg Kroah-HartmanFrom: Ard Biesheuvel <[email protected]>
[ Upstream commit 830536770f968ab33ece123b317e252c269098db ]
Now that the Clang compiler has taken it upon itself to police the compiler command line, and reject combinations for arguments it views as incompatible, the AEGIS128 no longer builds correctly, and errors out like this:
clang-10: warning: ignoring extension 'crypto' because the 'armv7-a' architecture does not support it [-Winvalid-command-line-argument]
So let's switch to armv8-a instead, which matches the crypto-neon-fp-armv8 FPU profile we specify. Since neither were actually supported by GCC versions before 4.8, let's tighten the Kconfig dependencies as well so we won't run into errors when building with an ancient compiler.
--- crypto/Kconfig | 1 + 1 file changed, 1 insertion(+)
crypto/Kconfig +1 -0
@@ -309,6 +309,7 @@ config CRYPTO_AEGIS128 config CRYPTO_AEGIS128_SIMD bool "Support SIMD acceleration for AEGIS-128" depends on CRYPTO_AEGIS128 && ((ARM || ARM64) && KERNEL_MODE_NEON) + depends on !ARM || CC_IS_CLANG || GCC_VERSION >= 40800 default y config CRYPTO_AEGIS128_AESNI_SSE2
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 123/434 crypto: inside-secure - Fix a maybe-uninitialized warning
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 74e6bd472b6d9e80ec9972989d8991736fe46c51 ]
A previous fixup avoided an unused variable warning but replaced it with a slightly scarier warning:
drivers/crypto/inside-secure/safexcel.c:1100:6: error: variable 'irq' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized]
This is harmless as it is impossible to get into this case, but the compiler has no way of knowing that. Add an explicit error handling case to make it obvious to both compilers and humans reading the source.
--- drivers/crypto/inside-secure/safexcel.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/crypto/inside-secure/safexcel.c +2 -0
@@ -1120,6 +1120,8 @@ static int safexcel_request_ring_irq(void *pdev, int irqid, irq_name, irq);return irq; } + }else { +return -ENXIO ; } ret = devm_request_threaded_irq(dev, irq, handler,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 129/434 media: ti-vpe: vpe: fix a v4l2-compliance failure about frame sequence number
In reply to Greg Kroah-HartmanFrom: Benoit Parrot <[email protected]>
[ Upstream commit 2444846c0dbfa4ead21b621e4300ec32c90fbf38 ]
v4l2-compliance fails with this message:
fail: v4l2-test-buffers.cpp(294): \ (int)g_sequence() < seq.last_seq + 1 fail: v4l2-test-buffers.cpp(740): \ buf.check(m2m_q, last_m2m_seq)
fail: v4l2-test-buffers.cpp(974): \
captureBufs(node, q, m2m_q, frame_count, true)
test MMAP: FAIL
The driver is failing to update the source frame sequence number in the vb2 buffer object. Only the destination frame sequence was being updated.
This is only a reporting issue if the user space app actually cares about the frame sequence number. But it is fixed nonetheless.
--- drivers/media/platform/ti-vpe/vpe.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/platform/ti-vpe/vpe.c +1 -0
@@ -1417,6 +1417,7 @@ static irqreturn_t vpe_irq(int irq_vpe, void *data) d_vb->timecode = s_vb->timecode; d_vb->sequence = ctx->sequence; + s_vb->sequence = ctx->sequence; d_q_data = &ctx->q_data[Q_DATA_DST ];if (d_q_data->flags &Q_IS_INTERLACED ) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 130/434 media: ti-vpe: vpe: Make sure YUYV is set as default format
In reply to Greg Kroah-HartmanFrom: Benoit Parrot <[email protected]>
[ Upstream commit e20b248051ca0f90d84b4d9378e4780bc31f16c6 ]
v4l2-compliance fails with this message:
fail: v4l2-test-formats.cpp(672): \ Video Capture Multiplanar: TRY_FMT(G_FMT) != G_FMT fail: v4l2-test-formats.cpp(672): \ Video Output Multiplanar: TRY_FMT(G_FMT) != G_FMT ...
test VIDIOC_TRY_FMT: FAIL
The default pixel format was setup as pointing to a specific offset in the vpe_formats table assuming it was pointing to the V4L2_PIX_FMT_YUYV entry. This became false after the addition on the NV21 format (see above commid-id)
So instead of hard-coding an offset which might change over time we need to use a lookup helper instead so we know the default will always be what we intended.
--- drivers/media/platform/ti-vpe/vpe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/ti-vpe/vpe.c +1 -1
@@ -2288,7 +2288,7 @@ static int vpe_open(struct file *file)v4l2_ctrl_handler_setup (hdl); s_q_data = &ctx->q_data[Q_DATA_SRC ]; - s_q_data->fmt = &vpe_formats[2 ]; + s_q_data->fmt =__find_format (V4L2_PIX_FMT_YUYV ); s_q_data->width =1920 ; s_q_data->height =1080 ; s_q_data->nplanes =1 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 104/434 regulator: max8907: Fix the usage of uninitialized variable in max8907_regulator_probe()
In reply to Greg Kroah-HartmanFrom: Yizhuo <[email protected]>
[ Upstream commit 472b39c3d1bba0616eb0e9a8fa3ad0f56927c7d7 ]
Inside function max8907_regulator_probe(), variable val could be uninitialized if regmap_read() fails. However, val is used later in the if statement to decide the content written to "pmic", which is potentially unsafe.
--- drivers/regulator/max8907-regulator.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/regulator/max8907-regulator.c +12 -3
@@ -296,7 +296,10 @@ static int max8907_regulator_probe(struct platform_device *pdev)memcpy (pmic->desc, max8907_regulators,sizeof (pmic->desc));/* Backwards compatibility with MAX8907B; SD1 uses different voltages */ -regmap_read (max8907->regmap_gen,MAX8907_REG_II2RR , &val); + ret =regmap_read (max8907->regmap_gen,MAX8907_REG_II2RR , &val); +if (ret) +return ret; +if ((val &MAX8907_II2RR_VERSION_MASK ) ==MAX8907_II2RR_VERSION_REV_B ) { pmic->desc[MAX8907_SD1 ].min_uV =637500 ;
@@ -333,14 +336,20 @@ static int max8907_regulator_probe(struct platform_device *pdev) }if (pmic->desc[i].ops == &max8907_ldo_ops) { -regmap_read (config.regmap, pmic->desc[i].enable_reg, + ret =regmap_read (config.regmap, pmic->desc[i].enable_reg, &val); +if (ret) +return ret; +if ((val &MAX8907_MASK_LDO_SEQ ) !=MAX8907_MASK_LDO_SEQ ) pmic->desc[i].ops = &max8907_ldo_hwctl_ops; }else if (pmic->desc[i].ops == &max8907_out5v_ops) { -regmap_read (config.regmap, pmic->desc[i].enable_reg, + ret =regmap_read (config.regmap, pmic->desc[i].enable_reg, &val); +if (ret) +return ret; +if ((val & (MAX8907_MASK_OUT5V_VINEN |MAX8907_MASK_OUT5V_ENSRC )) !=MAX8907_MASK_OUT5V_ENSRC )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 127/434 media: ti-vpe: vpe: Fix Motion Vector vpdma stride
In reply to Greg Kroah-HartmanFrom: Benoit Parrot <[email protected]>
[ Upstream commit 102af9b9922f658f705a4b0deaccabac409131bf ]
commit 3dc2046ca78b ("[media] media: ti-vpe: vpe: allow use of user specified stride") and commit da4414eaed15 ("[media] media: ti-vpe: vpdma:
add support for user specified stride") resulted in the Motion Vector stride to be the same as the image stride.
This caused memory corruption in the output image as mentioned in commit 00db969964c8 ("[media] media: ti-vpe: vpe: Fix line stride for output motion vector").
--- drivers/media/platform/ti-vpe/vpe.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/media/platform/ti-vpe/vpe.c +13 -5
@@ -1013,11 +1013,14 @@ static void add_out_dtd(struct vpe_ctx *ctx, int port)dma_addr_t dma_addr;u32 flags =0 ;u32 offset =0 ; +u32 stride;if (port ==VPE_PORT_MV_OUT ) { vpdma_fmt = &vpdma_misc_fmts[VPDMA_DATA_FMT_MV ]; dma_addr = ctx->mv_buf_dma[mv_buf_selector]; q_data = &ctx->q_data[Q_DATA_SRC ]; + stride =ALIGN ((q_data->width * vpdma_fmt->depth) >>3 , +VPDMA_STRIDE_ALIGN ); }else {/* to incorporate interleaved formats */ int plane = fmt->coplanar ? p_data->vb_part :0 ;
@@ -1044,6 +1047,7 @@ static void add_out_dtd(struct vpe_ctx *ctx, int port) }/* Apply the offset */ dma_addr += offset; + stride = q_data->bytesperline[VPE_LUMA ]; }if (q_data->flags &Q_DATA_FRAME_1D )
@@ -1055,7 +1059,7 @@ static void add_out_dtd(struct vpe_ctx *ctx, int port) MAX_W, MAX_H);vpdma_add_out_dtd (&ctx->desc_list, q_data->width, - q_data->bytesperline[VPE_LUMA ], &q_data->c_rect, + stride, &q_data->c_rect, vpdma_fmt, dma_addr,MAX_OUT_WIDTH_REG1 ,MAX_OUT_HEIGHT_REG1 , p_data->channel, flags); }
@@ -1074,10 +1078,13 @@ static void add_in_dtd(struct vpe_ctx *ctx, int port)dma_addr_t dma_addr;u32 flags =0 ;u32 offset =0 ; +u32 stride;if (port ==VPE_PORT_MV_IN ) { vpdma_fmt = &vpdma_misc_fmts[VPDMA_DATA_FMT_MV ]; dma_addr = ctx->mv_buf_dma[mv_buf_selector]; + stride =ALIGN ((q_data->width * vpdma_fmt->depth) >>3 , +VPDMA_STRIDE_ALIGN ); }else {/* to incorporate interleaved formats */ int plane = fmt->coplanar ? p_data->vb_part :0 ;
@@ -1104,6 +1111,7 @@ static void add_in_dtd(struct vpe_ctx *ctx, int port) }/* Apply the offset */ dma_addr += offset; + stride = q_data->bytesperline[VPE_LUMA ];if (q_data->flags &Q_DATA_INTERLACED_SEQ_TB ) {/*
@@ -1139,10 +1147,10 @@ static void add_in_dtd(struct vpe_ctx *ctx, int port)if (p_data->vb_part && fmt->fourcc ==V4L2_PIX_FMT_NV12 ) frame_height /=2 ; -vpdma_add_in_dtd (&ctx->desc_list, q_data->width, - q_data->bytesperline[VPE_LUMA ], &q_data->c_rect, - vpdma_fmt, dma_addr, p_data->channel, field, flags, frame_width, - frame_height,0 ,0 ); +vpdma_add_in_dtd (&ctx->desc_list, q_data->width, stride, + &q_data->c_rect, vpdma_fmt, dma_addr, + p_data->channel, field, flags, frame_width, + frame_height,0 ,0 ); }/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 131/434 media: ti-vpe: vpe: fix a v4l2-compliance failure causing a kernel panic
In reply to Greg Kroah-HartmanFrom: Benoit Parrot <[email protected]>
[ Upstream commit a37980ac5be29b83da67bf7d571c6bd9f90f8e45 ]
v4l2-compliance fails with this message:
warn: v4l2-test-formats.cpp(717): \
TRY_FMT cannot handle an invalid pixelformat.
test VIDIOC_TRY_FMT: FAIL
This causes the following kernel panic:
Unable to handle kernel paging request at virtual address 56595561 pgd = ecd80e00 *pgd=00000000 Internal error: Oops: 205 [#1] PREEMPT SMP ARM ... CPU: 0 PID: 930 Comm: v4l2-compliance Not tainted \ 4.14.62-01715-gc8cd67f49a19 #1 Hardware name: Generic DRA72X (Flattened Device Tree)
task: ece44d80 task.stack: ecc6e000
PC is at __vpe_try_fmt+0x18c/0x2a8 [ti_vpe]
LR is at 0x8
Because the driver fails to properly check the 'num_planes' values for proper ranges it ends up accessing out of bound data causing the kernel panic.
Since this driver only handle single or dual plane pixel format, make sure the provided value does not exceed 2 planes.
--- drivers/media/platform/ti-vpe/vpe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/ti-vpe/vpe.c +1 -1
@@ -1629,7 +1629,7 @@ static int __vpe_try_fmt(struct vpe_ctx *ctx, struct v4l2_format *f, &pix->height,MIN_H ,MAX_H ,H_ALIGN , S_ALIGN); -if (!pix->num_planes) +if (!pix->num_planes || pix->num_planes >2 ) pix->num_planes = fmt->coplanar ?2 :1 ;else if (pix->num_planes >1 && !fmt->coplanar) pix->num_planes =1 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 132/434 media: ti-vpe: vpe: ensure buffers are cleaned up properly in abort cases
In reply to Greg Kroah-HartmanFrom: Benoit Parrot <[email protected]>
[ Upstream commit cf6acb73b050e98b5cc435fae0e8ae0157520410 ]
v4l2-compliance fails with this message:
fail: v4l2-test-buffers.cpp(691): ret == 0
fail: v4l2-test-buffers.cpp(974): captureBufs(node, q, m2m_q,frame_count, true)
test MMAP: FAIL
This caused the following Kernel Warning:
WARNING: CPU: 0 PID: 961 at drivers/media/v4l2-core/videobuf2-core.c:1658 __vb2_queue_cancel+0x174/0x1d8 ... CPU: 0 PID: 961 Comm: v4l2-compliance Not tainted 4.14.62-01720-g20ecd717e87a #6 Hardware name: Generic DRA72X (Flattened Device Tree) Backtrace: [<c020b5bc>] (dump_backtrace) from [<c020b8a0>] (show_stack+0x18/0x1c) r7:00000009 r6:60070013 r5:00000000 r4:c1053824 [<c020b888>] (show_stack) from [<c09232e8>] (dump_stack+0x90/0xa4) [<c0923258>] (dump_stack) from [<c022b740>] (__warn+0xec/0x104) r7:00000009 r6:c0c0ad50 r5:00000000 r4:00000000 [<c022b654>] (__warn) from [<c022b810>] (warn_slowpath_null+0x28/0x30) r9:00000008 r8:00000000 r7:eced4808 r6:edbc9bac r5:eced4844
r4:eced4808
[<c022b7e8>] (warn_slowpath_null) from [<c0726f48>] (__vb2_queue_cancel+0x174/0x1d8)
[<c0726dd4>] (__vb2_queue_cancel) from [<c0727648>] (vb2_core_queue_release+0x20/0x40)
r10:ecc7bd70 r9:00000008 r8:00000000 r7:edb73010 r6:edbc9bac
r5:eced4844
r4:eced4808 r3:00000004
[<c0727628>] (vb2_core_queue_release) from [<c0729528>] (vb2_queue_release+0x10/0x14)
r5:edbc9810 r4:eced4800
[<c0729518>] (vb2_queue_release) from [<c0724d08>] (v4l2_m2m_ctx_release+0x1c/0x30)
[<c0724cec>] (v4l2_m2m_ctx_release) from [<bf0e8f28>] (vpe_release+0x74/0xb0 [ti_vpe])
r5:edbc9810 r4:ed67a400
[<bf0e8eb4>] (vpe_release [ti_vpe]) from [<c070fccc>] (v4l2_release+0x3c/0x80)
r7:edb73010 r6:ed176aa0 r5:edbc9868 r4:ed5119c0
[<c070fc90>] (v4l2_release) from [<c033cf1c>] (__fput+0x8c/0x1dc)
r5:ecc7bd70 r4:ed5119c0
[<c033ce90>] (__fput) from [<c033d0cc>] (____fput+0x10/0x14)
r10:00000000 r9:ed5119c0 r8:ece392d0 r7:c1059544 r6:ece38d80
r5:ece392b4
r4:00000000
[<c033d0bc>] (____fput) from [<c0246e00>] (task_work_run+0x98/0xb8) [<c0246d68>] (task_work_run) from [<c022f1d8>] (do_exit+0x170/0xa80)
r9:ece351fc r8:00000000 r7:ecde3f58 r6:ffffe000 r5:ece351c0
r4:ece38d80
[<c022f068>] (do_exit) from [<c022fb6c>] (do_group_exit+0x48/0xc4)
r7:000000f8
[<c022fb24>] (do_group_exit) from [<c022fc00>] (__wake_up_parent+0x0/0x28)
r7:000000f8 r6:b6c6a798 r5:00000001 r4:00000001
[<c022fbe8>] (SyS_exit_group) from [<c0207c80>] (ret_fast_syscall+0x0/0x4c)
These warnings are caused by buffers which not properly cleaned up/release during an abort use case.
In the abort cases the VPDMA desc buffers would still be mapped and the in-flight VB2 buffers would not be released properly causing a kernel warning from being generated by the videobuf2-core level.
--- drivers/media/platform/ti-vpe/vpe.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/media/platform/ti-vpe/vpe.c +9 -3
@@ -1404,9 +1404,6 @@ static irqreturn_t vpe_irq(int irq_vpe, void *data)/* the previous dst mv buffer becomes the next src mv buffer */ ctx->src_mv_buf_selector = !ctx->src_mv_buf_selector; -if (ctx->aborting) - goto finished; - s_vb = ctx->src_vbs[0 ]; d_vb = ctx->dst_vb;
@@ -1471,6 +1468,9 @@ static irqreturn_t vpe_irq(int irq_vpe, void *data) ctx->src_vbs[0 ] =NULL ; ctx->dst_vb =NULL ; +if (ctx->aborting) + goto finished; + ctx->bufs_completed++;if (ctx->bufs_completed < ctx->bufs_per_job &&job_ready (ctx)) {device_run (ctx);
@@ -2366,6 +2366,12 @@ static int vpe_release(struct file *file)mutex_lock (&dev->dev_mutex);free_mv_buffers (ctx); + +vpdma_unmap_desc_buf (dev->vpdma, &ctx->desc_list.buf); +vpdma_unmap_desc_buf (dev->vpdma, &ctx->mmr_adb); +vpdma_unmap_desc_buf (dev->vpdma, &ctx->sc_coeff_h); +vpdma_unmap_desc_buf (dev->vpdma, &ctx->sc_coeff_v); +vpdma_free_desc_list (&ctx->desc_list);vpdma_free_desc_buf (&ctx->mmr_adb);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 134/434 drm/amd/display: wait for set pipe mcp command completion
In reply to Greg Kroah-HartmanFrom: Josip Pavic <[email protected]>
[ Upstream commit 15caeabc5787c15babad7ee444afe9c26df1c8b3 ]
[Why]
When the driver sends a pipe set command to the DMCU FW, it does not wait for the command to complete. This can lead to unpredictable behavior if, for example, the driver were to request a pipe disable to the FW via MCP, then power down some hardware before the firmware has completed processing the command.
[How]
Wait for the DMCU FW to finish processing set pipe commands
--- drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/dc/dce/dce_abm.c +3 -0
@@ -77,6 +77,9 @@ static bool dce_abm_set_pipe(struct abm *abm, uint32_t controller_id)/* notifyDMCUMsg */ REG_UPDATE (MASTER_COMM_CNTL_REG ,MASTER_COMM_INTERRUPT ,1 ); +REG_WAIT (MASTER_COMM_CNTL_REG ,MASTER_COMM_INTERRUPT ,0 , +1 ,80000 ); +return true; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 136/434 drm/amd/display: add new active dongle to existent w/a
In reply to Greg Kroah-HartmanFrom: Vitaly Prosyak <[email protected]>
[ Upstream commit 566b4252fe9da9582dde008c5e9c3eb7c136e348 ]
[Why & How]
Dongle 0x00E04C power down all internal circuits including AUX communication preventing reading DPCD table. Encoder will skip DP RX power down on disable output to keep receiver powered all the time.
--- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 1 + drivers/gpu/drm/amd/display/include/ddc_service_types.h | 2 ++ 2 files changed, 3 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +1 -0
@@ -2691,6 +2691,7 @@ static void dp_wa_power_up_0010FA(struct dc_link *link, uint8_t *dpcd_data,* keep receiver powered all the time.*/ case DP_BRANCH_DEVICE_ID_0010FA :case DP_BRANCH_DEVICE_ID_0080E1 : +case DP_BRANCH_DEVICE_ID_00E04C : link->wa_flags.dp_keep_receiver_powered = true;break ;
drivers/gpu/drm/amd/display/include/ddc_service_types.h +2 -0
@@ -31,6 +31,8 @@#define DP_BRANCH_DEVICE_ID_0022B9 0x0022B9#define DP_BRANCH_DEVICE_ID_00001A 0x00001A#define DP_BRANCH_DEVICE_ID_0080E1 0x0080e1 +#define DP_BRANCH_DEVICE_ID_90CC24 0x90CC24 +#define DP_BRANCH_DEVICE_ID_00E04C 0x00E04Cenum ddc_result {DDC_RESULT_UNKNOWN =0 ,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 135/434 media: ti-vpe: vpe: fix a v4l2-compliance failure about invalid sizeimage
In reply to Greg Kroah-HartmanFrom: Benoit Parrot <[email protected]>
[ Upstream commit 0bac73adea4df8d34048b38f6ff24dc3e73e90b6 ]
v4l2-compliance fails with this message:
fail: v4l2-test-formats.cpp(463): !pfmt.sizeimage
fail: v4l2-test-formats.cpp(736): \ Video Capture Multiplanar is valid, \ but TRY_FMT failed to return a format
test VIDIOC_TRY_FMT: FAIL
This failure is causd by the driver failing to handle out range 'bytesperline' values from user space applications.
VPDMA hardware is limited to 64k line stride (16 bytes aligned, so 65520 bytes). So make sure the provided or calculated 'bytesperline' is smaller than the maximum value.
--- drivers/media/platform/ti-vpe/vpdma.h | 1 + drivers/media/platform/ti-vpe/vpe.c | 4 ++++ 2 files changed, 5 insertions(+)
drivers/media/platform/ti-vpe/vpdma.h +1 -0
@@ -57,6 +57,7 @@ struct vpdma_data_format {* line stride of source and dest * buffers should be 16 byte aligned */ +#define VPDMA_MAX_STRIDE 65520/* Max line stride 16 byte aligned */ #define VPDMA_DTD_DESC_SIZE 32/* 8 words */ #define VPDMA_CFD_CTD_DESC_SIZE 16/* 4 words */
drivers/media/platform/ti-vpe/vpe.c +4 -0
@@ -1668,6 +1668,10 @@ static int __vpe_try_fmt(struct vpe_ctx *ctx, struct v4l2_format *f,if (stride > plane_fmt->bytesperline) plane_fmt->bytesperline = stride; + plane_fmt->bytesperline =clamp_t (u32, plane_fmt->bytesperline, + stride, +VPDMA_MAX_STRIDE ); + plane_fmt->bytesperline =ALIGN (plane_fmt->bytesperline,VPDMA_STRIDE_ALIGN );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 141/434 x86/mm: Use the correct function type for native_set_fixmap()
In reply to Greg Kroah-HartmanFrom: Sami Tolvanen <[email protected]>
[ Upstream commit f53e2cd0b8ab7d9e390414470bdbd830f660133f ]
We call native_set_fixmap indirectly through the function pointer struct pv_mmu_ops::set_fixmap, which expects the first parameter to be 'unsigned' instead of 'enum fixed_addresses'. This patch changes the function type for native_set_fixmap to match the pointer, which fixes indirect call mismatches with Control-Flow Integrity (CFI) checking.
--- arch/x86/include/asm/fixmap.h | 2 +- arch/x86/mm/pgtable.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/include/asm/fixmap.h +1 -1
@@ -156,7 +156,7 @@ extern pte_t *kmap_pte;extern pte_t *pkmap_page_table;void __native_set_fixmap (enum fixed_addresses idx,pte_t pte); -void native_set_fixmap (enum fixed_addresses idx, +void native_set_fixmap (unsigned /* enum fixed_addresses */ idx,phys_addr_t phys,pgprot_t flags);#ifndef CONFIG_PARAVIRT_XXL
arch/x86/mm/pgtable.c +2 -2
@@ -643,8 +643,8 @@ void __native_set_fixmap(enum fixed_addresses idx, pte_t pte) fixmaps_set++; } -void native_set_fixmap (enum fixed_addresses idx,phys_addr_t phys, -pgprot_t flags) +void native_set_fixmap (unsigned /* enum fixed_addresses */ idx, +phys_addr_t phys,pgprot_t flags) {/* Sanitize 'prot' against any unsupported bits: */ pgprot_val (flags) &= __default_kernel_pte_mask;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 137/434 syscalls/x86: Use the correct function type in SYSCALL_DEFINE0
In reply to Greg Kroah-HartmanFrom: Sami Tolvanen <[email protected]>
[ Upstream commit 8661d769ab77c675b5eb6c3351a372b9fbc1bf40 ]
Although a syscall defined using SYSCALL_DEFINE0 doesn't accept parameters, use the correct function type to avoid type mismatches with Control-Flow Integrity (CFI) checking.
--- arch/x86/include/asm/syscall_wrapper.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
arch/x86/include/asm/syscall_wrapper.h +12 -11
@@ -48,12 +48,13 @@* To keep the naming coherent, re-define SYSCALL_DEFINE0 to create an alias * named __ia32_sys_*() */ -#define SYSCALL_DEFINE0 (sname) \ - SYSCALL_METADATA(_##sname, 0); \ - asmlinkage long __x64_sys_##sname(void); \ - ALLOW_ERROR_INJECTION(__x64_sys_##sname, ERRNO); \ - SYSCALL_ALIAS(__ia32_sys_##sname, __x64_sys_##sname); \ - asmlinkage long __x64_sys_##sname(void) + +#define SYSCALL_DEFINE0 (sname) \ + SYSCALL_METADATA(_##sname, 0); \ + asmlinkage long __x64_sys_##sname(const struct pt_regs *__unused);\ + ALLOW_ERROR_INJECTION(__x64_sys_##sname, ERRNO); \ + SYSCALL_ALIAS(__ia32_sys_##sname, __x64_sys_##sname); \ + asmlinkage long __x64_sys_##sname(const struct pt_regs *__unused)#define COND_SYSCALL (name) \ cond_syscall(__x64_sys_##name); \
@@ -181,11 +182,11 @@* macros to work correctly. */ #ifndef SYSCALL_DEFINE0 -#define SYSCALL_DEFINE0 (sname) \ - SYSCALL_METADATA(_##sname, 0); \ - asmlinkage long __x64_sys_##sname(void); \ - ALLOW_ERROR_INJECTION(__x64_sys_##sname, ERRNO); \ - asmlinkage long __x64_sys_##sname(void) +#define SYSCALL_DEFINE0 (sname) \ + SYSCALL_METADATA(_##sname, 0); \ + asmlinkage long __x64_sys_##sname(const struct pt_regs *__unused);\ + ALLOW_ERROR_INJECTION(__x64_sys_##sname, ERRNO); \ + asmlinkage long __x64_sys_##sname(const struct pt_regs *__unused)#endif #ifndef COND_SYSCALL
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 108/434 media: meson/ao-cec: move cec_notifier_cec_adap_register after hw setup
In reply to Greg Kroah-HartmanFrom: Neil Armstrong <[email protected]>
[ Upstream commit 3e84a18a259e1df35e5b549ab92ec3baf82ff010 ]
When probed after the HDMI notifier, calling cec_notifier_cec_adap_register() calls the enable() adapter callback, but the HW is not yet set up.
Moving cec_notifier_cec_adap_register() right before cec_register_adapter() fixes the following crash:
Ignoring spurious kernel translation fault at virtual address 0000000000000008 [...]
Hardware name: Khadas VIM (DT) [...] pc : __do_kernel_fault+0xdc/0x120 lr : __do_kernel_fault+0xdc/0x120 [...] Call trace: __do_kernel_fault+0xdc/0x120 do_page_fault+0x180/0x458 do_translation_fault+0x64/0x70 do_mem_abort+0x3c/0x98 el1_da+0x20/0x94 meson_ao_cec_adap_enable+0x30/0x218 [ao_cec] __cec_s_phys_addr+0x184/0x270 cec_s_phys_addr+0x44/0x60 cec_notifier_cec_adap_register+0x68/0x90 meson_ao_cec_probe+0xb0/0x288 [ao_cec]
[...]
el0_svc_compat+0x8/0x10
--- drivers/media/platform/meson/ao-cec-g12a.c | 36 +++++++++++----------- drivers/media/platform/meson/ao-cec.c | 30 +++++++++--------- 2 files changed, 33 insertions(+), 33 deletions(-)
drivers/media/platform/meson/ao-cec-g12a.c +18 -18
@@ -662,34 +662,27 @@ static int meson_ao_cec_g12a_probe(struct platform_device *pdev)if (IS_ERR (ao_cec->adap))return PTR_ERR (ao_cec->adap); - ao_cec->notify =cec_notifier_cec_adap_register (hdmi_dev,NULL , - ao_cec->adap); -if (!ao_cec->notify) { - ret = -ENOMEM ; - goto out_probe_adapter; - } - ao_cec->adap->owner =THIS_MODULE ; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); base =devm_ioremap_resource (&pdev->dev, res);if (IS_ERR (base)) { ret =PTR_ERR (base); - goto out_probe_notify; + goto out_probe_adapter; } ao_cec->regmap =devm_regmap_init_mmio (&pdev->dev, base, &meson_ao_cec_g12a_regmap_conf);if (IS_ERR (ao_cec->regmap)) { ret =PTR_ERR (ao_cec->regmap); - goto out_probe_notify; + goto out_probe_adapter; } ao_cec->regmap_cec =devm_regmap_init (&pdev->dev,NULL , ao_cec, &meson_ao_cec_g12a_cec_regmap_conf);if (IS_ERR (ao_cec->regmap_cec)) { ret =PTR_ERR (ao_cec->regmap_cec); - goto out_probe_notify; + goto out_probe_adapter; } irq =platform_get_irq (pdev,0 );
@@ -699,45 +692,52 @@ static int meson_ao_cec_g12a_probe(struct platform_device *pdev) 0, NULL, ao_cec);if (ret) {dev_err (&pdev->dev,"irq request failed\n" ); - goto out_probe_notify; + goto out_probe_adapter; } ao_cec->oscin =devm_clk_get (&pdev->dev,"oscin" );if (IS_ERR (ao_cec->oscin)) {dev_err (&pdev->dev,"oscin clock request failed\n" ); ret =PTR_ERR (ao_cec->oscin); - goto out_probe_notify; + goto out_probe_adapter; } ret =meson_ao_cec_g12a_setup_clk (ao_cec);if (ret) - goto out_probe_notify; + goto out_probe_adapter; ret =clk_prepare_enable (ao_cec->core);if (ret) {dev_err (&pdev->dev,"core clock enable failed\n" ); - goto out_probe_notify; + goto out_probe_adapter; }device_reset_optional (&pdev->dev);platform_set_drvdata (pdev, ao_cec); + ao_cec->notify =cec_notifier_cec_adap_register (hdmi_dev,NULL , + ao_cec->adap); +if (!ao_cec->notify) { + ret = -ENOMEM ; + goto out_probe_core_clk; + } + ret =cec_register_adapter (ao_cec->adap, &pdev->dev);if (ret <0 ) - goto out_probe_core_clk; + goto out_probe_notify;/* Setup Hardware */ regmap_write (ao_cec->regmap,CECB_GEN_CNTL_REG ,CECB_GEN_CNTL_RESET );return 0 ; -out_probe_core_clk: -clk_disable_unprepare (ao_cec->core); - out_probe_notify:cec_notifier_cec_adap_unregister (ao_cec->notify); +out_probe_core_clk: +clk_disable_unprepare (ao_cec->core); + out_probe_adapter:cec_delete_adapter (ao_cec->adap);
drivers/media/platform/meson/ao-cec.c +15 -15
@@ -624,20 +624,13 @@ static int meson_ao_cec_probe(struct platform_device *pdev)if (IS_ERR (ao_cec->adap))return PTR_ERR (ao_cec->adap); - ao_cec->notify =cec_notifier_cec_adap_register (hdmi_dev,NULL , - ao_cec->adap); -if (!ao_cec->notify) { - ret = -ENOMEM ; - goto out_probe_adapter; - } - ao_cec->adap->owner =THIS_MODULE ; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); ao_cec->base =devm_ioremap_resource (&pdev->dev, res);if (IS_ERR (ao_cec->base)) { ret =PTR_ERR (ao_cec->base); - goto out_probe_notify; + goto out_probe_adapter; } irq =platform_get_irq (pdev,0 );
@@ -647,20 +640,20 @@ static int meson_ao_cec_probe(struct platform_device *pdev) 0, NULL, ao_cec);if (ret) {dev_err (&pdev->dev,"irq request failed\n" ); - goto out_probe_notify; + goto out_probe_adapter; } ao_cec->core =devm_clk_get (&pdev->dev,"core" );if (IS_ERR (ao_cec->core)) {dev_err (&pdev->dev,"core clock request failed\n" ); ret =PTR_ERR (ao_cec->core); - goto out_probe_notify; + goto out_probe_adapter; } ret =clk_prepare_enable (ao_cec->core);if (ret) {dev_err (&pdev->dev,"core clock enable failed\n" ); - goto out_probe_notify; + goto out_probe_adapter; } ret =clk_set_rate (ao_cec->core,CEC_CLK_RATE );
@@ -674,9 +667,16 @@ static int meson_ao_cec_probe(struct platform_device *pdev) ao_cec->pdev = pdev;platform_set_drvdata (pdev, ao_cec); + ao_cec->notify =cec_notifier_cec_adap_register (hdmi_dev,NULL , + ao_cec->adap); +if (!ao_cec->notify) { + ret = -ENOMEM ; + goto out_probe_clk; + } + ret =cec_register_adapter (ao_cec->adap, &pdev->dev);if (ret <0 ) - goto out_probe_clk; + goto out_probe_notify;/* Setup Hardware */ writel_relaxed(CEC_GEN_CNTL_RESET,
@@ -684,12 +684,12 @@ static int meson_ao_cec_probe(struct platform_device *pdev)return 0 ; -out_probe_clk: -clk_disable_unprepare (ao_cec->core); - out_probe_notify:cec_notifier_cec_adap_unregister (ao_cec->notify); +out_probe_clk: +clk_disable_unprepare (ao_cec->core); + out_probe_adapter:cec_delete_adapter (ao_cec->adap);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 109/434 drm/bridge: dw-hdmi: Refuse DDC/CI transfers on the internal I2C controller
In reply to Greg Kroah-HartmanFrom: Matthias Kaehlcke <[email protected]>
[ Upstream commit bee447e224b2645911c5d06e35dc90d8433fcef6 ]
The DDC/CI protocol involves sending a multi-byte request to the display via I2C, which is typically followed by a multi-byte response. The internal I2C controller only allows single byte reads/writes or reads of 8 sequential bytes, hence DDC/CI is not supported when the internal I2C controller is used. The I2C transfers complete without errors, however the data in the response is garbage. Abort transfers to/from slave address 0x37 (DDC) with -EOPNOTSUPP, to make it evident that the communication is failing.
--- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +10 -0
@@ -36,6 +36,7 @@#include "dw-hdmi-cec.h" #include "dw-hdmi.h" +#define DDC_CI_ADDR 0x37#define DDC_SEGMENT_ADDR 0x30#define HDMI_EDID_LEN 512
@@ -398,6 +399,15 @@ static int dw_hdmi_i2c_xfer(struct i2c_adapter *adap,u8 addr = msgs[0 ].addr;int i, ret =0 ; +if (addr ==DDC_CI_ADDR ) +/* +* The internal I2C controller does not support the multi-byte +* read and write operations needed for DDC/CI. +* TOFIX: Blacklist the DDC/CI address until we filter out +* unsupported I2C operations. +*/ +return -EOPNOTSUPP ; +dev_dbg (hdmi->dev,"xfer: num: %d, addr: %#x\n" , num, addr);for (i =0 ; i < num; i++) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 107/434 media: cec-funcs.h: add status_req checks
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit 9b211f9c5a0b67afc435b86f75d78273b97db1c5 ]
The CEC_MSG_GIVE_DECK_STATUS and CEC_MSG_GIVE_TUNER_DEVICE_STATUS commands both have a status_req argument: ON, OFF, ONCE. If ON or ONCE, then the follower will reply with a STATUS message. Either once or whenever the status changes (status_req == ON).
If status_req == OFF, then it will stop sending continuous status updates, but the follower will *not* send a STATUS message in that case.
This means that if status_req == OFF, then msg->reply should be 0 as well since no reply is expected in that case.
--- include/uapi/linux/cec-funcs.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
include/uapi/linux/cec-funcs.h +4 -2
@@ -923,7 +923,8 @@ static inline void cec_msg_give_deck_status(struct cec_msg *msg, msg->len =3 ; msg->msg[1 ] =CEC_MSG_GIVE_DECK_STATUS ; msg->msg[2 ] = status_req; - msg->reply = reply ?CEC_MSG_DECK_STATUS :0 ; + msg->reply = (reply && status_req !=CEC_OP_STATUS_REQ_OFF ) ? +CEC_MSG_DECK_STATUS :0 ; } static inline void cec_ops_give_deck_status(const struct cec_msg *msg,
@@ -1027,7 +1028,8 @@ static inline void cec_msg_give_tuner_device_status(struct cec_msg *msg, msg->len =3 ; msg->msg[1 ] =CEC_MSG_GIVE_TUNER_DEVICE_STATUS ; msg->msg[2 ] = status_req; - msg->reply = reply ?CEC_MSG_TUNER_DEVICE_STATUS :0 ; + msg->reply = (reply && status_req !=CEC_OP_STATUS_REQ_OFF ) ? +CEC_MSG_TUNER_DEVICE_STATUS :0 ; } static inline void cec_ops_give_tuner_device_status(const struct cec_msg *msg,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 144/434 drm/bridge: dw-hdmi: Restore audio when setting a mode
In reply to Greg Kroah-HartmanFrom: Daniel Kurtz <[email protected]>
[ Upstream commit fadfee3f9d8f114435a8a3e9f83a227600d89de7 ]
When setting a new display mode, dw_hdmi_setup() calls dw_hdmi_enable_video_path(), which disables all hdmi clocks, including the audio clock.
We should only (re-)enable the audio clock if audio was already enabled when setting the new mode.
Without this patch, on RK3288, there will be HDMI audio on some monitors if i2s was played to headphone when the monitor was plugged. ACER H277HU and ASUS PB278 are two of the monitors showing this issue.
--- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +1 -1
@@ -2033,7 +2033,7 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode)/* HDMI Initialization Step E - Configure audio */ hdmi_clk_regenerator_update_pixel_clock (hdmi); -hdmi_enable_audio_clk (hdmi, true); +hdmi_enable_audio_clk (hdmi, hdmi->audio_enable); }/* not for DVI mode */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 153/434 Bluetooth: missed cpu_to_le16 conversion in hci_init4_req
In reply to Greg Kroah-HartmanFrom: Ben Dooks (Codethink) <[email protected]>
[ Upstream commit 727ea61a5028f8ac96f75ab34cb1b56e63fd9227 ]
It looks like in hci_init4_req() the request is being initialised from cpu-endian data but the packet is specified to be little-endian. This causes an warning from sparse due to __le16 to u16 conversion.
Fix this by using cpu_to_le16() on the two fields in the packet.
net/bluetooth/hci_core.c:845:27: warning: incorrect type in assignment (different base types)net/bluetooth/hci_core.c:845:27: expected restricted __le16 [usertype] tx_lennet/bluetooth/hci_core.c:845:27: got unsigned short [usertype] le_max_tx_lennet/bluetooth/hci_core.c:846:28: warning: incorrect type in assignment (different base types)net/bluetooth/hci_core.c:846:28: expected restricted __le16 [usertype] tx_timenet/bluetooth/hci_core.c:846:28: got unsigned short [usertype] le_max_tx_time
--- net/bluetooth/hci_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/bluetooth/hci_core.c +2 -2
@@ -842,8 +842,8 @@ static int hci_init4_req(struct hci_request *req, unsigned long opt)if (hdev->le_features[0 ] &HCI_LE_DATA_LEN_EXT ) {struct hci_cp_le_write_def_data_len cp; - cp.tx_len = hdev->le_max_tx_len; - cp.tx_time = hdev->le_max_tx_time; + cp.tx_len =cpu_to_le16 (hdev->le_max_tx_len); + cp.tx_time =cpu_to_le16 (hdev->le_max_tx_time);hci_req_add (req,HCI_OP_LE_WRITE_DEF_DATA_LEN ,sizeof (cp), &cp); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 154/434 Bluetooth: Workaround directed advertising bug in Broadcom controllers
In reply to Greg Kroah-HartmanFrom: Szymon Janc <[email protected]>
[ Upstream commit 4c371bb95cf06ded80df0e6139fdd77cee1d9a94 ]
It appears that some Broadcom controllers (eg BCM20702A0) reject LE Set Advertising Parameters command if advertising intervals provided are not within range for undirected and low duty directed advertising.
Workaround this bug by populating min and max intervals with 'valid' values.
< HCI Command: LE Set Advertising Parameters (0x08|0x0006) plen 15
Min advertising interval: 0.000 msec (0x0000)
Max advertising interval: 0.000 msec (0x0000)
Type: Connectable directed - ADV_DIRECT_IND (high duty cycle) (0x01)
Own address type: Public (0x00)
Direct address type: Random (0x01)
Direct address: E2:F0:7B:9F:DC:F4 (Static)
Channel map: 37, 38, 39 (0x07)
Filter policy: Allow Scan Request from Any, Allow Connect Request from Any (0x00)Quoted 1 line
HCI Event: Command Complete (
0x0e) plen 4
LE Set Advertising Parameters (0x08|0x0006) ncmd 1
Status: Invalid HCI Command Parameters (0x12)--- net/bluetooth/hci_conn.c | 8 ++++++++ 1 file changed, 8 insertions(+)
net/bluetooth/hci_conn.c +8 -0
@@ -934,6 +934,14 @@ static void hci_req_directed_advertising(struct hci_request *req,return ;memset (&cp,0 ,sizeof (cp)); + +/* Some controllers might reject command if intervals are not +* within range for undirected advertising. +* BCM20702A0 is known to be affected by this. +*/ + cp.min_interval =cpu_to_le16 (0x0020 ); + cp.max_interval =cpu_to_le16 (0x0020 ); + cp.type =LE_ADV_DIRECT_IND ; cp.own_address_type = own_addr_type; cp.direct_addr_type = conn->dst_type;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 155/434 Bluetooth: hci_core: fix init for HCI_USER_CHANNEL
In reply to Greg Kroah-HartmanFrom: Mattijs Korpershoek <[email protected]>
[ Upstream commit eb8c101e28496888a0dcfe16ab86a1bee369e820 ]
During the setup() stage, HCI device drivers expect the chip to acknowledge its setup() completion via vendor specific frames.
If userspace opens() such HCI device in HCI_USER_CHANNEL [1] mode, the vendor specific frames are never tranmitted to the driver, as they are filtered in hci_rx_work().
Allow HCI devices which operate in HCI_USER_CHANNEL mode to receive frames if the HCI device is is HCI_INIT state.
[1] https://www.spinics.net/lists/linux-bluetooth/msg37345.html
--- net/bluetooth/hci_core.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
net/bluetooth/hci_core.c +8 -1
@@ -4440,7 +4440,14 @@ static void hci_rx_work(struct work_struct *work)hci_send_to_sock (hdev, skb); } -if (hci_dev_test_flag (hdev,HCI_USER_CHANNEL )) { +/* If the device has been opened in HCI_USER_CHANNEL, +* the userspace has exclusive access to device. +* When device is HCI_INIT, we still need to process +* the data packets to the driver in order +* to complete its setup(). +*/ +if (hci_dev_test_flag (hdev,HCI_USER_CHANNEL ) && + !test_bit (HCI_INIT , &hdev->flags)) {kfree_skb (skb);continue ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 156/434 bpf/stackmap: Fix deadlock with rq_lock in bpf_get_stack()
In reply to Greg Kroah-HartmanFrom: Song Liu <[email protected]>
[ Upstream commit eac9153f2b584c702cea02c1f1a57d85aa9aea42 ]
bpf stackmap with build-id lookup (BPF_F_STACK_BUILD_ID) can trigger A-A deadlock on rq_lock():
rcu: INFO: rcu_sched detected stalls on CPUs/tasks: [...] Call Trace: try_to_wake_up+0x1ad/0x590 wake_up_q+0x54/0x80 rwsem_wake+0x8a/0xb0 bpf_get_stack+0x13c/0x150 bpf_prog_fbdaf42eded9fe46_on_event+0x5e3/0x1000 bpf_overflow_handler+0x60/0x100 __perf_event_overflow+0x4f/0xf0 perf_swevent_overflow+0x99/0xc0 ___perf_sw_event+0xe7/0x120 __schedule+0x47d/0x620 schedule+0x29/0x90 futex_wait_queue_me+0xb9/0x110 futex_wait+0x139/0x230 do_futex+0x2ac/0xa50 __x64_sys_futex+0x13c/0x180 do_syscall_64+0x42/0x100 entry_SYSCALL_64_after_hwframe+0x44/0xa9
This can be reproduced by:
1. Start a multi-thread program that does parallel mmap() and malloc();
2. taskset the program to 2 CPUs;
3. Attach bpf program to trace_sched_switch and gather stackmap with build-id, e.g. with trace.py from bcc tools:
trace.py -U -p <pid> -s <some-bin,some-lib> t:sched:sched_switch
A sample reproducer is attached at the end.
This could also trigger deadlock with other locks that are nested with rq_lock.
Fix this by checking whether irqs are disabled. Since rq_lock and all other nested locks are irq safe, it is safe to do up_read() when irqs are not disable. If the irqs are disabled, postpone up_read() in irq_work.
Reproducer:
============================ 8< ============================
char *filename;
void *worker(void *p)
{
void *ptr;
int fd;
char *pptr;
fd = open(filename, O_RDONLY);
if (fd < 0)
return NULL;
while (1) {
struct timespec ts = {0, 1000 + rand() % 2000};
ptr = mmap(NULL, 4096 * 64, PROT_READ, MAP_PRIVATE, fd, 0);
usleep(1);
if (ptr == MAP_FAILED) {
printf("failed to mmap\n");
break;
}
munmap(ptr, 4096 * 64);
usleep(1);
pptr = malloc(1);
usleep(1);
pptr[0] = 1;
usleep(1);
free(pptr);
usleep(1);
nanosleep(&ts, NULL);
}
close(fd);
return NULL;
}int main(int argc, char *argv[])
{
void *ptr;
int i;
pthread_t threads[THREAD_COUNT];
if (argc < 2)
return 0;
filename = argv[1];
for (i = 0; i < THREAD_COUNT; i++) {
if (pthread_create(threads + i, NULL, worker, NULL)) {
fprintf(stderr, "Error creating thread\n");
return 0;
}
}
for (i = 0; i < THREAD_COUNT; i++)
pthread_join(threads[i], NULL);
return 0;
}============================ 8< ============================
--- kernel/bpf/stackmap.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
kernel/bpf/stackmap.c +4 -3
@@ -287,7 +287,7 @@ static void stack_map_get_build_id_offset(struct bpf_stack_build_id *id_offs,bool irq_work_busy = false;struct stack_map_irq_work *work =NULL ; -if (in_nmi ()) { +if (irqs_disabled ()) { work =this_cpu_ptr (&up_read_work);if (work->irq_work.flags &IRQ_WORK_BUSY )/* cannot queue more up_read, fallback */
@@ -295,8 +295,9 @@ static void stack_map_get_build_id_offset(struct bpf_stack_build_id *id_offs, }/* -* We cannot do up_read() in nmi context. To do build_id lookup -* in nmi context, we need to run up_read() in irq_work. We use +* We cannot do up_read() when the irq is disabled, because of +* risk to deadlock with rq_lock. To do build_id lookup when the +* irqs are disabled, we need to run up_read() in irq_work. We use * a percpu variable to do the irq_work. If the irq_work is * already used by another lookup, we fall back to report ips. *
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 158/434 drm/amd/display: enable hostvm based on roimmu active for dcn2.1
In reply to Greg Kroah-HartmanFrom: Dmytro Laktyushkin <[email protected]>
[ Upstream commit 48d92e8eda3d9b61978377e7539bfc5958e850cf ]
Enabling hostvm when ROIMMU is not active seems to break GPUVM. This fixes the issue by not enabling hostvm if ROIMMU is not activated.
--- .../drm/amd/display/dc/dcn21/dcn21_hubbub.c | 40 ++++++++++++------- 1 file changed, 25 insertions(+), 15 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c +25 -15
@@ -22,6 +22,7 @@* Authors: AMD * */ +#include <linux/delay.h> #include "dm_services.h" #include "dcn20/dcn20_hubbub.h" #include "dcn21_hubbub.h"
@@ -71,30 +72,39 @@ static uint32_t convert_and_clamp(void dcn21_dchvm_init (struct hubbub *hubbub) {struct dcn20_hubbub *hubbub1 =TO_DCN20_HUBBUB (hubbub); +uint32_t riommu_active; +int i;//Init DCHVM block REG_UPDATE (DCHVM_CTRL0 ,HOSTVM_INIT_REQ ,1 );//Poll until RIOMMU_ACTIVE = 1 -//TODO: Figure out interval us and retry count -REG_WAIT (DCHVM_RIOMMU_STAT0 ,RIOMMU_ACTIVE ,1 ,5 ,100 ); +for (i =0 ; i <100 ; i++) { +REG_GET (DCHVM_RIOMMU_STAT0 ,RIOMMU_ACTIVE , &riommu_active); -//Reflect the power status of DCHUBBUB -REG_UPDATE (DCHVM_RIOMMU_CTRL0 ,HOSTVM_POWERSTATUS ,1 ); +if (riommu_active) +break ; +else +udelay (5 ); + } + +if (riommu_active) { +//Reflect the power status of DCHUBBUB +REG_UPDATE (DCHVM_RIOMMU_CTRL0 ,HOSTVM_POWERSTATUS ,1 ); -//Start rIOMMU prefetching -REG_UPDATE (DCHVM_RIOMMU_CTRL0 ,HOSTVM_PREFETCH_REQ ,1 ); +//Start rIOMMU prefetching +REG_UPDATE (DCHVM_RIOMMU_CTRL0 ,HOSTVM_PREFETCH_REQ ,1 ); -// Enable dynamic clock gating -REG_UPDATE_4 (DCHVM_CLK_CTRL , -HVM_DISPCLK_R_GATE_DIS ,0 , -HVM_DISPCLK_G_GATE_DIS ,0 , -HVM_DCFCLK_R_GATE_DIS ,0 , -HVM_DCFCLK_G_GATE_DIS ,0 ); +// Enable dynamic clock gating +REG_UPDATE_4 (DCHVM_CLK_CTRL , +HVM_DISPCLK_R_GATE_DIS ,0 , +HVM_DISPCLK_G_GATE_DIS ,0 , +HVM_DCFCLK_R_GATE_DIS ,0 , +HVM_DCFCLK_G_GATE_DIS ,0 ); -//Poll until HOSTVM_PREFETCH_DONE = 1 -//TODO: Figure out interval us and retry count -REG_WAIT (DCHVM_RIOMMU_STAT0 ,HOSTVM_PREFETCH_DONE ,1 ,5 ,100 ); +//Poll until HOSTVM_PREFETCH_DONE = 1 +REG_WAIT (DCHVM_RIOMMU_STAT0 ,HOSTVM_PREFETCH_DONE ,1 ,5 ,100 ); + } } static int hubbub21_init_dchub(struct hubbub *hubbub,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 161/434 staging: iio: ad9834: add a check for devm_clk_get
In reply to Greg Kroah-HartmanFrom: Chuhong Yuan <[email protected]>
[ Upstream commit a96de139301385e5992768c0f60240ddfbb33325 ]
ad9834_probe misses a check for devm_clk_get and may cause problems. Add a check like what ad9832 does to fix it.
--- drivers/staging/iio/frequency/ad9834.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/staging/iio/frequency/ad9834.c +4 -0
@@ -417,6 +417,10 @@ static int ad9834_probe(struct spi_device *spi) st =iio_priv (indio_dev);mutex_init (&st->lock); st->mclk =devm_clk_get (&spi->dev,NULL ); +if (IS_ERR (st->mclk)) { + ret =PTR_ERR (st->mclk); + goto error_disable_reg; + } ret =clk_prepare_enable (st->mclk);if (ret) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 162/434 power: supply: cpcap-battery: Check voltage before orderly_poweroff
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit 639c1524da3b273d20c42ff2387d08eb4b12e903 ]
We can get the low voltage interrupt trigger sometimes way too early, maybe because of CPU load spikes. This causes orderly_poweroff() be called too easily.
Let's check the voltage before orderly_poweroff in case it was not yet a permanent condition. We will be getting more interrupts anyways if the condition persists.
Let's also show the measured voltages for low battery and battery empty warnings since we have them.
--- drivers/power/supply/cpcap-battery.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/power/supply/cpcap-battery.c +5 -3
@@ -562,12 +562,14 @@ static irqreturn_t cpcap_battery_irq_thread(int irq, void *data)switch (d->action) {case CPCAP_BATTERY_IRQ_ACTION_BATTERY_LOW :if (latest->current_ua >=0 ) -dev_warn (ddata->dev,"Battery low at 3.3V!\n" ); +dev_warn (ddata->dev,"Battery low at %imV!\n" , + latest->voltage /1000 );break ;case CPCAP_BATTERY_IRQ_ACTION_POWEROFF : -if (latest->current_ua >=0 ) { +if (latest->current_ua >=0 && latest->voltage <=3200000 ) {dev_emerg (ddata->dev, -"Battery empty at 3.1V, powering off\n" ); +"Battery empty at %imV, powering off\n" , + latest->voltage /1000 );orderly_poweroff (true); }break ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 145/434 perf test: Report failure for mmap events
In reply to Greg Kroah-HartmanFrom: Leo Yan <[email protected]>
[ Upstream commit 6add129c5d9210ada25217abc130df0b7096ee02 ]
When fail to mmap events in task exit case, it misses to set 'err' to -1; thus the testing will not report failure for it.
This patch sets 'err' to -1 when fails to mmap events, thus Perf tool can report correct result.
--- tools/perf/tests/task-exit.c | 1 + 1 file changed, 1 insertion(+)
tools/perf/tests/task-exit.c +1 -0
@@ -110,6 +110,7 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unusedif (evlist__mmap (evlist,128 ) <0 ) {pr_debug ("failed to mmap events: %d (%s)\n" , errno,str_error_r (errno, sbuf,sizeof (sbuf))); + err =-1 ; goto out_delete_evlist; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 164/434 selftests/bpf: Make a copy of subtest name
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit f90415e9600c5227131531c0ed11514a2d3bbe62 ]
test_progs never created a copy of subtest name, rather just stored pointer to whatever string test provided. This is bad as that string might be freed or modified by the end of subtest. Fix this by creating a copy of given subtest name when subtest starts.
--- tools/testing/selftests/bpf/test_progs.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
tools/testing/selftests/bpf/test_progs.c +12 -5
@@ -20,7 +20,7 @@ struct prog_test_def {bool tested;bool need_cgroup_cleanup; -const char *subtest_name; +char *subtest_name;int subtest_num;/* store counts before subtest started */
@@ -81,16 +81,17 @@ void test__end_subtest()fprintf (env.stdout,"#%d/%d %s:%s\n" , test->test_num, test->subtest_num, test->subtest_name, sub_error_cnt ?"FAIL" :"OK" ); + +free (test->subtest_name); + test->subtest_name =NULL ; }bool test__start_subtest (const char *name) {struct prog_test_def *test = env.test; -if (test->subtest_name) { +if (test->subtest_name)test__end_subtest (); - test->subtest_name =NULL ; - } test->subtest_num++;
@@ -104,7 +105,13 @@ bool test__start_subtest(const char *name)if (!should_run (&env.subtest_selector, test->subtest_num, name))return false; - test->subtest_name = name; + test->subtest_name =strdup (name); +if (!test->subtest_name) { +fprintf (env.stderr, +"Subtest #%d: failed to copy subtest name!\n" , + test->subtest_num); +return false; + } env.test->old_error_cnt = env.test->error_cnt;return true;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 165/434 net: hns3: log and clear hardware error after reset complete
In reply to Greg Kroah-HartmanFrom: Jian Shen <[email protected]>
[ Upstream commit 4fdd0bca6152aa201898454e63cbb255a18ae6e9 ]
When device is resetting, the CMDQ service may be stopped until reset completed. If a new RAS error occurs at this moment, it will no be able to clear the RAS source. This patch fixes it by clear the RAS source after reset complete.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +3 -0
@@ -9443,6 +9443,9 @@ static int hclge_reset_ae_dev(struct hnae3_ae_dev *ae_dev)return ret; } +/* Log and clear the hw errors those already occurred */ +hclge_handle_all_hns_hw_errors (ae_dev); +/* Re-enable the hw error interrupts because * the interrupts get disabled on global reset. */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 166/434 RDMA/hns: Fix wrong parameters when initial mtt of srq->idx_que
In reply to Greg Kroah-HartmanFrom: Weihang Li <[email protected]>
[ Upstream commit e8a07de57ea4ca7c2d604871c52826e66899fc70 ]
The parameters npages used to initial mtt of srq->idx_que shouldn't be same with srq's. And page_shift should be calculated from idx_buf_pg_sz. This patch fixes above issues and use field named npage and page_shift in hns_roce_buf instead of two temporary variables to let us use them anywhere.
--- drivers/infiniband/hw/hns/hns_roce_srq.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)
drivers/infiniband/hw/hns/hns_roce_srq.c +14 -10
@@ -180,8 +180,7 @@ static int create_user_srq(struct hns_roce_srq *srq, struct ib_udata *udata, {struct hns_roce_dev *hr_dev =to_hr_dev (srq->ibsrq.device);struct hns_roce_ib_create_srq ucmd; -u32 page_shift; -u32 npages; +struct hns_roce_buf *buf;int ret;if (ib_copy_from_udata (&ucmd, udata,sizeof (ucmd)))
@@ -191,11 +190,13 @@ static int create_user_srq(struct hns_roce_srq *srq, struct ib_udata *udata,if (IS_ERR (srq->umem))return PTR_ERR (srq->umem); - npages = (ib_umem_page_count (srq->umem) + - (1 << hr_dev->caps.srqwqe_buf_pg_sz) -1 ) / - (1 << hr_dev->caps.srqwqe_buf_pg_sz); - page_shift =PAGE_SHIFT + hr_dev->caps.srqwqe_buf_pg_sz; - ret =hns_roce_mtt_init (hr_dev, npages, page_shift, &srq->mtt); + buf = &srq->buf; + buf->npages = (ib_umem_page_count (srq->umem) + + (1 << hr_dev->caps.srqwqe_buf_pg_sz) -1 ) / + (1 << hr_dev->caps.srqwqe_buf_pg_sz); + buf->page_shift =PAGE_SHIFT + hr_dev->caps.srqwqe_buf_pg_sz; + ret =hns_roce_mtt_init (hr_dev, buf->npages, buf->page_shift, + &srq->mtt);if (ret) goto err_user_buf;
@@ -212,9 +213,12 @@ static int create_user_srq(struct hns_roce_srq *srq, struct ib_udata *udata, goto err_user_srq_mtt; } - ret =hns_roce_mtt_init (hr_dev,ib_umem_page_count (srq->idx_que.umem), -PAGE_SHIFT , &srq->idx_que.mtt); - + buf = &srq->idx_que.idx_buf; + buf->npages =DIV_ROUND_UP (ib_umem_page_count (srq->idx_que.umem), +1 << hr_dev->caps.idx_buf_pg_sz); + buf->page_shift =PAGE_SHIFT + hr_dev->caps.idx_buf_pg_sz; + ret =hns_roce_mtt_init (hr_dev, buf->npages, buf->page_shift, + &srq->idx_que.mtt);if (ret) {dev_err (hr_dev->dev,"hns_roce_mtt_init error for idx que\n" ); goto err_user_idx_mtt;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 168/434 ASoC: soc-pcm: fixup dpcm_prune_paths() loop continue
In reply to Greg Kroah-HartmanFrom: Kuninori Morimoto <[email protected]>
[ Upstream commit bed646dc3f7bcec91178c278deaf969cce0700a8 ]
dpcm_prune_paths() is checking widget at 2 parts.
(A) is for CPU, (B) is for Codec.
If we focus to (A) part, continue at (a) is for (1) loop. But, if we focus to (B) part, continue at (b) is for (2) loop, not for (1). This is bug.
This patch fixup this issue.
static int dpcm_prune_paths(...)
{
...
(1) for_each_dpcm_be(fe, stream, dpcm) {
... ^ widget = dai_get_widget(...);
|
(A) if (widget && widget_in_list(...))
| (a) continue;
v
^ (2) for_each_rtd_codec_dai(...) {
| widget = dai_get_widget(...);
(B)
| if (widget && widget_in_list(...))
v (b) continue; } ...
--- sound/soc/soc-pcm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
sound/soc/soc-pcm.c +5 -1
@@ -1385,6 +1385,7 @@ static int dpcm_prune_paths(struct snd_soc_pcm_runtime *fe, int stream,struct snd_soc_dapm_widget *widget;struct snd_soc_dai *dai;int prune =0 ; +int do_prune;/* Destroy any old FE <--> BE connections */ for_each_dpcm_be (fe, stream, dpcm) {
@@ -1398,13 +1399,16 @@ static int dpcm_prune_paths(struct snd_soc_pcm_runtime *fe, int stream,continue ;/* is there a valid CODEC DAI widget for this BE */ + do_prune =1 ;for_each_rtd_codec_dai (dpcm->be, i, dai) { widget =dai_get_widget (dai, stream);/* prune the BE if it's no longer in our active list */ if (widget &&widget_in_list (list, widget)) -continue ; + do_prune =0 ; } +if (!do_prune) +continue ; dev_dbg(fe->dev, "ASoC: pruning %s BE %s for %s\n", stream ? "capture" : "playback",
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 169/434 rtl8xxxu: fix RTL8723BU connection failure issue after warm reboot
In reply to Greg Kroah-HartmanFrom: Chris Chiu <[email protected]>
[ Upstream commit 0eeb91ade90ce06d2fa1e2fcb55e3316b64c203c ]
The RTL8723BU has problems connecting to AP after each warm reboot. Sometimes it returns no scan result, and in most cases, it fails the authentication for unknown reason. However, it works totally fine after cold reboot.
Compare the value of register SYS_CR and SYS_CLK_MAC_CLK_ENABLE for cold reboot and warm reboot, the registers imply that the MAC is already powered and thus some procedures are skipped during driver initialization. Double checked the vendor driver, it reads the SYS_CR and SYS_CLK_MAC_CLK_ENABLE also but doesn't skip any during initialization based on them. This commit only tells the RTL8723BU to do full initialization without checking MAC status.
--- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 1 + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 1 + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 3 +++ 3 files changed, 5 insertions(+)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h +1 -0
@@ -1341,6 +1341,7 @@ struct rtl8xxxu_fileops { u8 has_s0s1:1; u8 has_tx_report:1; u8 gen2_thermal_meter:1; + u8 needs_full_init:1;u32 adda_1t_init;u32 adda_1t_path_on;u32 adda_2t_path_on_a;
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c +1 -0
@@ -1670,6 +1670,7 @@ struct rtl8xxxu_fileops rtl8723bu_fops = { .has_s0s1 = 1, .has_tx_report = 1, .gen2_thermal_meter = 1, + .needs_full_init = 1, .adda_1t_init = 0x01c00014, .adda_1t_path_on = 0x01c00014, .adda_2t_path_on_a = 0x01c00014,
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +3 -0
@@ -3902,6 +3902,9 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw)else macpower = true; +if (fops->needs_full_init) + macpower = false; + ret = fops->power_on (priv);if (ret <0 ) {dev_warn (dev,"%s: Failed power on\n" , __func__);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 171/434 ipmi: Dont allow device module unload when in use
In reply to Greg Kroah-HartmanFrom: Corey Minyard <[email protected]>
[ Upstream commit cbb79863fc3175ed5ac506465948b02a893a8235 ]
If something has the IPMI driver open, don't allow the device module to be unloaded. Before it would unload and the user would get errors on use.
This change is made on user request, and it makes it consistent with the I2C driver, which has the same behavior.
It does change things a little bit with respect to kernel users. If the ACPI or IPMI watchdog (or any other kernel user) has created a user, then the device module cannot be unloaded. Before it could be unloaded,
This does not affect hot-plug. If the device goes away (it's on something removable that is removed or is hot-removed via sysfs) then it still behaves as it did before.
--- drivers/char/ipmi/ipmi_msghandler.c | 23 ++++++++++++++++------- include/linux/ipmi_smi.h | 12 ++++++++---- 2 files changed, 24 insertions(+), 11 deletions(-)
drivers/char/ipmi/ipmi_msghandler.c +16 -7
@@ -448,6 +448,8 @@ enum ipmi_stat_indexes {#define IPMI_IPMB_NUM_SEQ 64struct ipmi_smi { +struct module *owner; +/* What interface number are we? */ int intf_num;
@@ -1220,6 +1222,11 @@ int ipmi_create_user(unsigned int if_num,if (rv) goto out_kfree; +if (!try_module_get (intf->owner)) { + rv = -ENODEV ; + goto out_kfree; + } +/* Note that each existing user holds a refcount to the interface. */ kref_get (&intf->refcount);
@@ -1349,6 +1356,7 @@ static void _ipmi_destroy_user(struct ipmi_user *user) }kref_put (&intf->refcount, intf_free); +module_put (intf->owner); }int ipmi_destroy_user (struct ipmi_user *user)
@@ -2459,7 +2467,7 @@ static int __get_device_id(struct ipmi_smi *intf, struct bmc_device *bmc)* been recently fetched, this will just use the cached data. Otherwise * it will run a new fetch. * -* Except for the first time this is called (in ipmi_register_smi()), +* Except for the first time this is called (in ipmi_add_smi()), * this will always return good data; */ static int __bmc_get_device_id(struct ipmi_smi *intf, struct bmc_device *bmc,
@@ -3377,10 +3385,11 @@ static void redo_bmc_reg(struct work_struct *work)kref_put (&intf->refcount, intf_free); } -int ipmi_register_smi (const struct ipmi_smi_handlers *handlers, -void *send_info, -struct device *si_dev, -unsigned char slave_addr) +int ipmi_add_smi (struct module *owner, +const struct ipmi_smi_handlers *handlers, +void *send_info, +struct device *si_dev, +unsigned char slave_addr) {int i, j;int rv;
@@ -3406,7 +3415,7 @@ int ipmi_register_smi(const struct ipmi_smi_handlers *handlers,return rv; } - + intf->owner = owner; intf->bmc = &intf->tmp_bmc;INIT_LIST_HEAD (&intf->bmc->intfs);mutex_init (&intf->bmc->dyn_mutex);
@@ -3514,7 +3523,7 @@ int ipmi_register_smi(const struct ipmi_smi_handlers *handlers,return rv; } -EXPORT_SYMBOL (ipmi_register_smi); +EXPORT_SYMBOL (ipmi_add_smi); static void deliver_smi_err_response(struct ipmi_smi *intf, struct ipmi_smi_msg *msg,
include/linux/ipmi_smi.h +8 -4
@@ -224,10 +224,14 @@ static inline int ipmi_demangle_device_id(uint8_t netfn, uint8_t cmd,* is called, and the lower layer must get the interface from that * call. */ -int ipmi_register_smi (const struct ipmi_smi_handlers *handlers, -void *send_info, -struct device *dev, -unsigned char slave_addr); +int ipmi_add_smi (struct module *owner, +const struct ipmi_smi_handlers *handlers, +void *send_info, +struct device *dev, +unsigned char slave_addr); + +#define ipmi_register_smi (handlers, send_info, dev, slave_addr) \ + ipmi_add_smi(THIS_MODULE, handlers, send_info, dev, slave_addr)/* * Remove a low-level interface from the IPMI driver. This will
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 146/434 perf report: Add warning when libunwind not compiled in
In reply to Greg Kroah-HartmanFrom: Jin Yao <[email protected]>
[ Upstream commit 800d3f561659b5436f8c57e7c26dd1f6928b5615 ]
We received a user report that call-graph DWARF mode was enabled in 'perf record' but 'perf report' didn't unwind the callstack correctly. The reason was, libunwind was not compiled in.
We can use 'perf -vv' to check the compiled libraries but it would be valuable to report a warning to user directly (especially valuable for a perf newbie).
The warning is:
Warning:
Please install libunwind development packages during the perf build.
Both TUI and stdio are supported.
--- tools/perf/builtin-report.c | 7 +++++++ 1 file changed, 7 insertions(+)
tools/perf/builtin-report.c +7 -0
@@ -399,6 +399,13 @@ static int report__setup_sample_type(struct report *rep) PERF_SAMPLE_BRANCH_ANY)) rep->nonany_branch_mode = true; +#ifndef HAVE_LIBUNWIND_SUPPORT +if (dwarf_callchain_users) { +ui__warning ("Please install libunwind development packages " +"during the perf build.\n" ); + } +#endif +return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 174/434 media: aspeed: set hsync and vsync polarities to normal before starting mode detection
In reply to Greg Kroah-HartmanFrom: Jae Hyun Yoo <[email protected]>
[ Upstream commit 5b3f3c41c5c791c1c22cd91655e7ef4b2a1dff7c ]
Sometimes it detects a weird resolution such as 1024x287 when the actual resolution is 1024x768. To resolve such an issue, this commit adds clearing for hsync and vsync polarity register bits at the beginning of the first mode detection. This is recommended in the datasheet.
--- drivers/media/platform/aspeed-video.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/platform/aspeed-video.c +2 -0
@@ -741,6 +741,8 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) }set_bit (VIDEO_RES_DETECT , &video->flags); +aspeed_video_update (video,VE_CTRL , +VE_CTRL_VSYNC_POL |VE_CTRL_HSYNC_POL ,0 );aspeed_video_enable_mode_detect (video); rc = wait_event_interruptible_timeout(video->wait,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 175/434 drm/nouveau: Dont grab runtime PM refs for HPD IRQs
In reply to Greg Kroah-HartmanFrom: Lyude Paul <[email protected]>
[ Upstream commit 09e530657e1c982d3dbc5e4302bf9207950c3d0a ]
In order for suspend/resume reprobing to work, we need to be able to perform sideband communications during suspend/resume, along with runtime PM suspend/resume. In order to do so, we also need to make sure that nouveau doesn't bother grabbing a runtime PM reference to do so, since otherwise we'll start deadlocking runtime PM again.
Note that we weren't able to do this before, because of the DP MST helpers processing UP requests from topologies in the same context as drm_dp_mst_hpd_irq() which would have caused us to open ourselves up to receiving hotplug events and deadlocking with runtime suspend/resume. Now that those requests are handled asynchronously, this change should be completely safe.
--- drivers/gpu/drm/nouveau/nouveau_connector.c | 33 +++++++++++---------- 1 file changed, 17 insertions(+), 16 deletions(-)
drivers/gpu/drm/nouveau/nouveau_connector.c +17 -16
@@ -1131,6 +1131,16 @@ nouveau_connector_hotplug(struct nvif_notify *notify)const char *name = connector->name;struct nouveau_encoder *nv_encoder;int ret; +bool plugged = (rep->mask !=NVIF_NOTIFY_CONN_V0_UNPLUG ); + +if (rep->mask &NVIF_NOTIFY_CONN_V0_IRQ ) { +NV_DEBUG (drm,"service %s\n" , name); +drm_dp_cec_irq (&nv_connector->aux); +if ((nv_encoder =find_encoder (connector,DCB_OUTPUT_DP ))) +nv50_mstm_service (nv_encoder->dp.mstm); + +return NVIF_NOTIFY_KEEP ; + } ret =pm_runtime_get (drm->dev->dev);if (ret ==0 ) {
@@ -1151,25 +1161,16 @@ nouveau_connector_hotplug(struct nvif_notify *notify)return NVIF_NOTIFY_DROP ; } -if (rep->mask &NVIF_NOTIFY_CONN_V0_IRQ ) { -NV_DEBUG (drm,"service %s\n" , name); -drm_dp_cec_irq (&nv_connector->aux); -if ((nv_encoder =find_encoder (connector,DCB_OUTPUT_DP ))) -nv50_mstm_service (nv_encoder->dp.mstm); - }else { -bool plugged = (rep->mask !=NVIF_NOTIFY_CONN_V0_UNPLUG ); - +if (!plugged) +drm_dp_cec_unset_edid (&nv_connector->aux); +NV_DEBUG (drm,"%splugged %s\n" , plugged ?"" :"un" , name); +if ((nv_encoder =find_encoder (connector,DCB_OUTPUT_DP ))) {if (!plugged) -drm_dp_cec_unset_edid (&nv_connector->aux); -NV_DEBUG (drm,"%splugged %s\n" , plugged ?"" :"un" , name); -if ((nv_encoder =find_encoder (connector,DCB_OUTPUT_DP ))) { -if (!plugged) -nv50_mstm_remove (nv_encoder->dp.mstm); - } - -drm_helper_hpd_irq_event (connector->dev); +nv50_mstm_remove (nv_encoder->dp.mstm); } +drm_helper_hpd_irq_event (connector->dev); +pm_runtime_mark_last_busy (drm->dev->dev);pm_runtime_put_autosuspend (drm->dev->dev);return NVIF_NOTIFY_KEEP ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 176/434 media: ov6650: Fix stored frame interval not in sync with hardware
In reply to Greg Kroah-HartmanFrom: Janusz Krzysztofik <[email protected]>
[ Upstream commit 57822068dd120386b98891cb151dc20107b63ba7 ]
The driver stores a frame interval value supposed to be in line with hardware state in a device private structure. Since the driver initial submission, the respective field of the structure has never been initialised on device probe. Moreover, if updated from .s_frame_interval(), a new value is stored before it is applied on hardware. If an error occurs during device update, the stored value may no longer reflect hardware state and consecutive calls to .g_frame_interval() may return incorrect information.
Assuming a failed update of the device means its actual state hasn't changed, update the frame interval field of the device private structure with a new value only after it is successfully applied on hardware so it always reflects actual hardware state to the extent possible. Also, initialise the field with hardware default frame interval on device probe.
--- drivers/media/i2c/ov6650.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
drivers/media/i2c/ov6650.c +12 -9
@@ -130,6 +130,7 @@#define CLKRC_24MHz 0xc0#define CLKRC_DIV_MASK 0x3f#define GET_CLKRC_DIV (x) (((x) & CLKRC_DIV_MASK) + 1) +#define DEF_CLKRC 0x00#define COMA_RESET BIT(7)#define COMA_QCIF BIT(5)
@@ -758,19 +759,17 @@ static int ov6650_s_frame_interval(struct v4l2_subdev *sd,else if (div >GET_CLKRC_DIV (CLKRC_DIV_MASK )) div =GET_CLKRC_DIV (CLKRC_DIV_MASK ); -/* -* Keep result to be used as tpf limit -* for subsequent clock divider calculations -*/ - priv->tpf.numerator = div; - priv->tpf.denominator =FRAME_RATE_MAX ; + tpf->numerator = div; + tpf->denominator =FRAME_RATE_MAX ; - clkrc =to_clkrc (&priv->tpf, priv->pclk_limit, priv->pclk_max); + clkrc =to_clkrc (tpf, priv->pclk_limit, priv->pclk_max); ret =ov6650_reg_rmw (client,REG_CLKRC , clkrc,CLKRC_DIV_MASK );if (!ret) { - tpf->numerator =GET_CLKRC_DIV (clkrc); - tpf->denominator =FRAME_RATE_MAX ; + priv->tpf.numerator =GET_CLKRC_DIV (clkrc); + priv->tpf.denominator =FRAME_RATE_MAX ; + + *tpf = priv->tpf; }return ret;
@@ -1011,6 +1010,10 @@ static int ov6650_probe(struct i2c_client *client, priv->code =MEDIA_BUS_FMT_YUYV8_2X8 ; priv->colorspace =V4L2_COLORSPACE_JPEG ; +/* Hardware default frame interval */ + priv->tpf.numerator =GET_CLKRC_DIV (DEF_CLKRC ); + priv->tpf.denominator =FRAME_RATE_MAX ; + priv->subdev.internal_ops = &ov6650_internal_ops; ret =v4l2_async_register_subdev (&priv->subdev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 177/434 media: ad5820: Define entity function
In reply to Greg Kroah-HartmanFrom: Ricardo Ribalda Delgado <[email protected]>
[ Upstream commit 801ef7c4919efba6b96b5aed1e72844ca69e26d3 ]
Without this patch, media_device_register_entity throws a warning:
dev_warn(mdev->dev,
"Entity type for entity %s was not initialized!\n", entity->name);
--- drivers/media/i2c/ad5820.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/i2c/ad5820.c +1 -0
@@ -309,6 +309,7 @@ static int ad5820_probe(struct i2c_client *client,v4l2_i2c_subdev_init (&coil->subdev, client, &ad5820_ops); coil->subdev.flags |=V4L2_SUBDEV_FL_HAS_DEVNODE ; coil->subdev.internal_ops = &ad5820_internal_ops; + coil->subdev.entity.function =MEDIA_ENT_F_LENS ;strscpy (coil->subdev.name,"ad5820 focus" ,sizeof (coil->subdev.name)); ret =media_entity_pads_init (&coil->subdev.entity,0 ,NULL );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 178/434 media: ov5640: Make 2592x1944 mode only available at 15 fps
In reply to Greg Kroah-HartmanFrom: Benoit Parrot <[email protected]>
[ Upstream commit 981e445454531c9d5ac5d3fa8c0f1bd55262d001 ]
The sensor data sheet clearly state that 2592x1944 only works at 15 fps make sure we don't try to miss configure the pll out of acceptable range.
--- drivers/media/i2c/ov5640.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/media/i2c/ov5640.c +5 -0
@@ -1611,6 +1611,11 @@ ov5640_find_mode(struct ov5640_dev *sensor, enum ov5640_frame_rate fr, !(mode->hact == 640 && mode->vact == 480))return NULL ; +/* 2592x1944 only works at 15fps max */ +if ((mode->hact ==2592 && mode->vact ==1944 ) && + fr >OV5640_15_FPS ) +return NULL ; +return mode; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 179/434 media: st-mipid02: add a check for devm_gpiod_get_optional
In reply to Greg Kroah-HartmanFrom: Chuhong Yuan <[email protected]>
[ Upstream commit 61c03b631b74a38ab53753f3ee971a55886d4843 ]
mipid02_probe misses a check for devm_gpiod_get_optional and may miss the failure.
Add a check to fix the problem.
--- drivers/media/i2c/st-mipid02.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/media/i2c/st-mipid02.c +5 -0
@@ -971,6 +971,11 @@ static int mipid02_probe(struct i2c_client *client) bridge->reset_gpio =devm_gpiod_get_optional (dev,"reset" ,GPIOD_OUT_HIGH ); +if (IS_ERR (bridge->reset_gpio)) { +dev_err (dev,"failed to get reset GPIO\n" ); +return PTR_ERR (bridge->reset_gpio); + } + ret =mipid02_get_regulators (bridge);if (ret) {dev_err (dev,"failed to get regulators %d" , ret);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 180/434 media: imx7-mipi-csis: Add a check for devm_regulator_get
In reply to Greg Kroah-HartmanFrom: Chuhong Yuan <[email protected]>
[ Upstream commit a0219deefe9ee5006a28d48522f76b217d198c51 ]
devm_regulator_get may return an error but mipi_csis_phy_init misses a check for it.
This may lead to problems when regulator_set_voltage uses the unchecked pointer.
This patch adds a check for devm_regulator_get to avoid potential risk.
--- drivers/staging/media/imx/imx7-mipi-csis.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/staging/media/imx/imx7-mipi-csis.c +6 -1
@@ -350,6 +350,8 @@ static void mipi_csis_sw_reset(struct csi_state *state)static int mipi_csis_phy_init (struct csi_state *state) { state->mipi_phy_regulator =devm_regulator_get (state->dev,"phy" ); +if (IS_ERR (state->mipi_phy_regulator)) +return PTR_ERR (state->mipi_phy_regulator);return regulator_set_voltage (state->mipi_phy_regulator,1000000 ,1000000 );
@@ -966,7 +968,10 @@ static int mipi_csis_probe(struct platform_device *pdev)return ret; } -mipi_csis_phy_init (state); + ret =mipi_csis_phy_init (state); +if (ret <0 ) +return ret; +mipi_csis_phy_reset (state); mem_res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 147/434 perf test: Avoid infinite loop for task exit case
In reply to Greg Kroah-HartmanFrom: Leo Yan <[email protected]>
[ Upstream commit 791ce9c48c79210d2ffcdbe69421e7783b32921f ]
When executing the task exit testing case, perf gets stuck in an endless loop this case and doesn't return back on Arm64 Juno board.
After digging into this issue, since Juno board has Arm's big.LITTLE CPUs, thus the PMUs are not compatible between the big CPUs and little CPUs. This leads to a PMU event that cannot be enabled properly when the traced task is migrated from one variant's CPU to another variant. Finally, the test case runs into infinite loop for cannot read out any event data after return from polling.
Eventually, we need to work out formal solution to allow PMU events can be freely migrated from one CPU variant to another, but this is a difficult task and a different topic. This patch tries to fix the Perf test case to avoid infinite loop, when the testing detects 1000 times retrying for reading empty events, it will directly bail out and return failure. This allows the Perf tool can continue its other test cases.
--- tools/perf/tests/task-exit.c | 8 ++++++++ 1 file changed, 8 insertions(+)
tools/perf/tests/task-exit.c +8 -0
@@ -53,6 +53,7 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unusedstruct perf_cpu_map *cpus;struct perf_thread_map *threads;struct mmap *md; +int retry_count =0 ;signal (SIGCHLD , sig_handler);
@@ -132,6 +133,13 @@ retry: out_init:if (!exited || !nr_exit) {evlist__poll (evlist,-1 ); + +if (retry_count++ >1000 ) { +pr_debug ("Failed after retrying 1000 times\n" ); + err =-1 ; + goto out_free_maps; + } + goto retry; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 182/434 media: smiapp: Register sensor after enabling runtime PM on the device
In reply to Greg Kroah-HartmanFrom: Sakari Ailus <[email protected]>
[ Upstream commit 90c9e4a4dba9f4de331372e745fb1991c1faa598 ]
Earlier it was possible that the parts of the driver that assumed runtime PM was enabled were being called before runtime PM was enabled in the driver's probe function. So enable runtime PM before registering the sub-device.
--- drivers/media/i2c/smiapp/smiapp-core.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/media/i2c/smiapp/smiapp-core.c +8 -4
@@ -3101,19 +3101,23 @@ static int smiapp_probe(struct i2c_client *client)if (rval <0 ) goto out_media_entity_cleanup; - rval =v4l2_async_register_subdev_sensor_common (&sensor->src->sd); -if (rval <0 ) - goto out_media_entity_cleanup; -pm_runtime_set_active (&client->dev);pm_runtime_get_noresume (&client->dev);pm_runtime_enable (&client->dev); + + rval =v4l2_async_register_subdev_sensor_common (&sensor->src->sd); +if (rval <0 ) + goto out_disable_runtime_pm; +pm_runtime_set_autosuspend_delay (&client->dev,1000 );pm_runtime_use_autosuspend (&client->dev);pm_runtime_put_autosuspend (&client->dev);return 0 ; +out_disable_runtime_pm: +pm_runtime_disable (&client->dev); + out_media_entity_cleanup:media_entity_cleanup (&sensor->src->sd.entity);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 184/434 staging: wilc1000: potential corruption in wilc_parse_join_bss_param()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit d59dc92f1bccd5acde793aebdbb4f7121cf3f9af ]
The "rates_len" value needs to be capped so that the memcpy() doesn't copy beyond the end of the array.
--- drivers/staging/wilc1000/wilc_hif.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/staging/wilc1000/wilc_hif.c +2 -0
@@ -473,6 +473,8 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss, rates_ie =cfg80211_find_ie (WLAN_EID_SUPP_RATES , ies->data, ies->len);if (rates_ie) { rates_len = rates_ie[1 ]; +if (rates_len >WILC_MAX_RATES_SUPPORTED ) + rates_len =WILC_MAX_RATES_SUPPORTED ; param->supp_rates[0 ] = rates_len;memcpy (¶m->supp_rates[1 ], rates_ie +2 , rates_len); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 183/434 md: no longer compare spare disk superblock events in super_load
In reply to Greg Kroah-HartmanFrom: Yufen Yu <[email protected]>
[ Upstream commit 6a5cb53aaa4ef515ddeffa04ce18b771121127b4 ]
We have a test case as follow:
mdadm -CR /dev/md1 -l 1 -n 4 /dev/sd[a-d] \ --assume-clean --bitmap=internal
mdadm -S /dev/md1
mdadm -A /dev/md1 /dev/sd[b-c] --run --force
mdadm --zero /dev/sda mdadm /dev/md1 -a /dev/sda
echo offline > /sys/block/sdc/device/state
echo offline > /sys/block/sdb/device/state
sleep 5
mdadm -S /dev/md1
echo running > /sys/block/sdb/device/state echo running > /sys/block/sdc/device/state mdadm -A /dev/md1 /dev/sd[a-c] --run --force
When we readd /dev/sda to the array, it started to do recovery. After offline the other two disks in md1, the recovery have been interrupted and superblock update info cannot be written to the offline disks. While the spare disk (/dev/sda) can continue to update superblock info.
After stopping the array and assemble it, we found the array run fail, with the follow kernel message:
[ 172.986064] md: kicking non-fresh sdb from array! [ 173.004210] md: kicking non-fresh sdc from array! [ 173.022383] md/raid1:md1: active with 0 out of 4 mirrors [ 173.022406] md1: failed to create bitmap (-5) [ 173.023466] md: md1 stopped.
Since both sdb and sdc have the value of 'sb->events' smaller than that in sda, they have been kicked from the array. However, the only remained disk sda is in 'spare' state before stop and it cannot be added to conf->mirrors[] array. In the end, raid array assemble and run fail.
In fact, we can use the older disk sdb or sdc to assemble the array. That means we should not choose the 'spare' disk as the fresh disk in analyze_sbs().
To fix the problem, we do not compare superblock events when it is a spare disk, as same as validate_super.
--- drivers/md/md.c | 57 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 6 deletions(-)
drivers/md/md.c +51 -6
@@ -1156,7 +1156,15 @@ static int super_90_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor rdev->desc_nr = sb->this_disk.number;if (!refdev) { - ret =1 ; +/* +* Insist on good event counter while assembling, except +* for spares (which don't need an event count) +*/ +if (sb->disks[rdev->desc_nr].state & ( + (1 <<MD_DISK_SYNC ) | (1 <<MD_DISK_ACTIVE ))) + ret =1 ; +else + ret =0 ; }else {__u64 ev1, ev2;mdp_super_t *refsb =page_address (refdev->sb_page);
@@ -1172,7 +1180,14 @@ static int super_90_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor } ev1 =md_event (sb); ev2 =md_event (refsb); -if (ev1 > ev2) + +/* +* Insist on good event counter while assembling, except +* for spares (which don't need an event count) +*/ +if (sb->disks[rdev->desc_nr].state & ( + (1 <<MD_DISK_SYNC ) | (1 <<MD_DISK_ACTIVE )) && + (ev1 > ev2)) ret =1 ;else ret =0 ;
@@ -1532,6 +1547,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_sector_t sectors;char b[BDEVNAME_SIZE ], b2[BDEVNAME_SIZE ];int bmask; +__u64 role;/* * Calculate the position of the superblock in 512byte sectors.
@@ -1665,8 +1681,20 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_ sb->level != 0)return -EINVAL ; + role =le16_to_cpu (sb->dev_roles[rdev->desc_nr]); +if (!refdev) { - ret =1 ; +/* +* Insist of good event counter while assembling, except for +* spares (which don't need an event count) +*/ +if (rdev->desc_nr >=0 && + rdev->desc_nr <le32_to_cpu (sb->max_dev) && + (role <MD_DISK_ROLE_MAX || + role ==MD_DISK_ROLE_JOURNAL )) + ret =1 ; +else + ret =0 ; }else {__u64 ev1, ev2;struct mdp_superblock_1 *refsb =page_address (refdev->sb_page);
@@ -1683,7 +1711,14 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_ ev1 =le64_to_cpu (sb->events); ev2 =le64_to_cpu (refsb->events); -if (ev1 > ev2) +/* +* Insist of good event counter while assembling, except for +* spares (which don't need an event count) +*/ +if (rdev->desc_nr >=0 && + rdev->desc_nr <le32_to_cpu (sb->max_dev) && + (role <MD_DISK_ROLE_MAX || + role ==MD_DISK_ROLE_JOURNAL ) && ev1 > ev2) ret =1 ;else ret =0 ;
@@ -3604,7 +3639,7 @@ abort_free:* Check a full RAID array for plausibility */ -static void analyze_sbs (struct mddev *mddev) +static int analyze_sbs (struct mddev *mddev) {int i;struct md_rdev *rdev, *freshest, *tmp;
@@ -3625,6 +3660,12 @@ static void analyze_sbs(struct mddev *mddev)md_kick_rdev_from_array (rdev); } +/* Cannot find a valid fresh disk */ +if (!freshest) { +pr_warn ("md: cannot find a valid disk\n" ); +return -EINVAL ; + } + super_types[mddev->major_version].validate_super (mddev, freshest);
@@ -3659,6 +3700,8 @@ static void analyze_sbs(struct mddev *mddev)clear_bit (In_sync, &rdev->flags); } } + +return 0 ; }/* Read a fixed-point number.
@@ -5577,7 +5620,9 @@ int md_run(struct mddev *mddev)if (!mddev->raid_disks) {if (!mddev->persistent)return -EINVAL ; -analyze_sbs (mddev); + err =analyze_sbs (mddev); +if (err) +return -EINVAL ; }if (mddev->level !=LEVEL_NONE )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 186/434 drm: Dont free jobs in wait_event_interruptible()
In reply to Greg Kroah-HartmanFrom: Steven Price <[email protected]>
[ Upstream commit 588b9828f0744ca13555c4a35cd0251ac8ad8ad2 ]
drm_sched_cleanup_jobs() attempts to free finished jobs, however because it is called as the condition of wait_event_interruptible() it must not sleep. Unfortunately some free callbacks (notably for Panfrost) do sleep.
Instead let's rename drm_sched_cleanup_jobs() to drm_sched_get_cleanup_job() and simply return a job for processing if there is one. The caller can then call the free_job() callback outside the wait_event_interruptible() where sleeping is possible before re-checking and returning to sleep if necessary.
--- drivers/gpu/drm/scheduler/sched_main.c | 43 ++++++++++++++------------ 1 file changed, 24 insertions(+), 19 deletions(-)
drivers/gpu/drm/scheduler/sched_main.c +24 -19
@@ -632,43 +632,41 @@ static void drm_sched_process_job(struct dma_fence *f, struct dma_fence_cb *cb) }/** -* drm_sched_cleanup_jobs - destroy finished jobs +* drm_sched_get_cleanup_job - fetch the next finished job to be destroyed * * @sched: scheduler instance * -* Remove all finished jobs from the mirror list and destroy them. +* Returns the next finished job from the mirror list (if there is one) +* ready for it to be destroyed. */ -static void drm_sched_cleanup_jobs (struct drm_gpu_scheduler *sched) +static struct drm_sched_job * +drm_sched_get_cleanup_job (struct drm_gpu_scheduler *sched) { +struct drm_sched_job *job;unsigned long flags;/* Don't destroy jobs while the timeout worker is running */ if (sched->timeout !=MAX_SCHEDULE_TIMEOUT && !cancel_delayed_work (&sched->work_tdr)) -return ; - +return NULL ; -while (!list_empty (&sched->ring_mirror_list)) { -struct drm_sched_job *job; +spin_lock_irqsave (&sched->job_list_lock, flags); - job =list_first_entry (&sched->ring_mirror_list, + job =list_first_entry_or_null (&sched->ring_mirror_list, struct drm_sched_job, node); -if (!dma_fence_is_signaled (&job->s_fence->finished)) -break ; -spin_lock_irqsave (&sched->job_list_lock, flags); +if (job &&dma_fence_is_signaled (&job->s_fence->finished)) {/* remove job from ring_mirror_list */ list_del_init (&job->node); -spin_unlock_irqrestore (&sched->job_list_lock, flags); - - sched->ops->free_job (job); + }else { + job =NULL ; +/* queue timeout for next job */ +drm_sched_start_timeout (sched); } -/* queue timeout for next job */ -spin_lock_irqsave (&sched->job_list_lock, flags); -drm_sched_start_timeout (sched);spin_unlock_irqrestore (&sched->job_list_lock, flags); +return job; }/**
@@ -708,12 +706,19 @@ static int drm_sched_main(void *param)struct drm_sched_fence *s_fence;struct drm_sched_job *sched_job;struct dma_fence *fence; +struct drm_sched_job *cleanup_job =NULL ;wait_event_interruptible (sched->wake_up_worker, - (drm_sched_cleanup_jobs (sched), + (cleanup_job =drm_sched_get_cleanup_job (sched)) || (!drm_sched_blocked (sched) && (entity =drm_sched_select_entity (sched))) || -kthread_should_stop ())); +kthread_should_stop ()); + +if (cleanup_job) { + sched->ops->free_job (cleanup_job); +/* queue timeout for next job */ +drm_sched_start_timeout (sched); + }if (!entity)continue ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 148/434 perf vendor events arm64: Fix Hisi hip08 DDRC PMU eventname
In reply to Greg Kroah-HartmanFrom: John Garry <[email protected]>
[ Upstream commit 84b0975f4853ba32d2d9b3c19ffa2b947f023fb3 ]
The "EventName" for the DDRC precharge command event is incorrect, so fix it.
--- .../perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-ddrc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-ddrc.json +1 -1
@@ -15,7 +15,7 @@ }, { "EventCode": "0x04", - "EventName": "uncore_hisi_ddrc.flux_wr", + "EventName": "uncore_hisi_ddrc.pre_cmd", "BriefDescription": "DDRC precharge commands", "PublicDescription": "DDRC precharge commands", "Unit": "hisi_sccl,ddrc",
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 152/434 Bluetooth: btusb: avoid unused function warning
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 42d22098127d6384f789107f59caae87d7520fc4 ]
The btusb_rtl_cmd_timeout() function is used inside of an ifdef, leading to a warning when this part is hidden from the compiler:
drivers/bluetooth/btusb.c:530:13: error: unused function 'btusb_rtl_cmd_timeout' [-Werror,-Wunused-function]
Use an IS_ENABLED() check instead so the compiler can see the code and then discard it silently.
--- drivers/bluetooth/btusb.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/bluetooth/btusb.c +2 -3
@@ -3807,8 +3807,8 @@ static int btusb_probe(struct usb_interface *intf,btusb_check_needs_reset_resume (intf); } -#ifdef CONFIG_BT_HCIBTUSB_RTL -if (id->driver_info &BTUSB_REALTEK ) { +if (IS_ENABLED (CONFIG_BT_HCIBTUSB_RTL ) && + (id->driver_info &BTUSB_REALTEK )) { hdev->setup = btrtl_setup_realtek; hdev->shutdown = btrtl_shutdown_realtek; hdev->cmd_timeout = btusb_rtl_cmd_timeout;
@@ -3819,7 +3819,6 @@ static int btusb_probe(struct usb_interface *intf,*/ set_bit (BTUSB_WAKEUP_DISABLE , &data->flags); } -#endif if (id->driver_info &BTUSB_AMP ) {/* AMP controllers do not support SCO packets */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 151/434 iio: adc: max1027: Reset the device at probe time
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
[ Upstream commit db033831b4f5589f9fcbadb837614a7c4eac0308 ]
All the registers are configured by the driver, let's reset the chip at probe time, avoiding any conflict with a possible earlier configuration.
--- drivers/iio/adc/max1027.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/iio/adc/max1027.c +8 -0
@@ -458,6 +458,14 @@ static int max1027_probe(struct spi_device *spi)return ret; } +/* Internal reset */ + st->reg =MAX1027_RST_REG ; + ret =spi_write (st->spi, &st->reg,1 ); +if (ret <0 ) { +dev_err (&indio_dev->dev,"Failed to reset the ADC\n" ); +return ret; + } +/* Disable averaging */ st->reg =MAX1027_AVG_REG ; ret =spi_write (st->spi, &st->reg,1 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 188/434 arm64: psci: Reduce the waiting time for cpu_psci_cpu_kill()
In reply to Greg Kroah-HartmanFrom: Yunfeng Ye <[email protected]>
[ Upstream commit bfcef4ab1d7ee8921bc322109b1692036cc6cbe0 ]
In cases like suspend-to-disk and suspend-to-ram, a large number of CPU cores need to be shut down. At present, the CPU hotplug operation is serialised, and the CPU cores can only be shut down one by one. In this process, if PSCI affinity_info() does not return LEVEL_OFF quickly, cpu_psci_cpu_kill() needs to wait for 10ms. If hundreds of CPU cores need to be shut down, it will take a long time.
Normally, there is no need to wait 10ms in cpu_psci_cpu_kill(). So change the wait interval from 10 ms to max 1 ms and use usleep_range() instead of msleep() for more accurate timer.
In addition, reducing the time interval will increase the messages output, so remove the "Retry ..." message, instead, track time and output to the the sucessful message.
--- arch/arm64/kernel/psci.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
arch/arm64/kernel/psci.c +9 -6
@@ -81,7 +81,8 @@ static void cpu_psci_cpu_die(unsigned int cpu)static int cpu_psci_cpu_kill (unsigned int cpu) { -int err, i; +int err; +unsigned long start, end;if (!psci_ops.affinity_info)return 0 ;
@@ -91,16 +92,18 @@ static int cpu_psci_cpu_kill(unsigned int cpu)* while it is dying. So, try again a few times. */ -for (i =0 ; i <10 ; i++) { + start = jiffies; + end = start +msecs_to_jiffies (100 ); +do { err = psci_ops.affinity_info (cpu_logical_map (cpu),0 );if (err ==PSCI_0_2_AFFINITY_LEVEL_OFF ) { -pr_info ("CPU%d killed.\n" , cpu); +pr_info ("CPU%d killed (polled %d ms)\n" , cpu, +jiffies_to_msecs (jiffies - start));return 0 ; } -msleep (10 ); -pr_info ("Retrying again to check for CPU kill\n" ); - } +usleep_range (100 ,1000 ); + }while (time_before (jiffies, end));pr_warn ("CPU%d may not have shut down cleanly (AFFINITY_INFO reports %d)\n" , cpu, err);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 197/434 spi: sprd: adi: Add missing lock protection when rebooting
In reply to Greg Kroah-HartmanFrom: Lingling Xu <[email protected]>
[ Upstream commit 91ea1d70607e374b014b4b9bea771ce661f9f64b ]
When rebooting the system, we should lock the watchdog after configuration to make sure the watchdog can reboot the system successfully.
--- drivers/spi/spi-sprd-adi.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/spi/spi-sprd-adi.c +3 -0
@@ -393,6 +393,9 @@ static int sprd_adi_restart_handler(struct notifier_block *this, val |=BIT_WDG_RUN |BIT_WDG_RST ;sprd_adi_write (sadi, sadi->slave_pbase +REG_WDG_CTRL , val); +/* Lock the watchdog */ +sprd_adi_write (sadi, sadi->slave_pbase +REG_WDG_LOCK , ~WDG_UNLOCK_KEY ); +mdelay (1000 );dev_emerg (sadi->dev,"Unable to restart system\n" );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 198/434 ACPI: button: Add DMI quirk for Medion Akoya E2215T
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 932e1ba486117de2fcea3df27ad8218ad6c11470 ]
The Medion Akoya E2215T's ACPI _LID implementation is quite broken:
1. For notifications it uses an ActiveLow Edge GpioInt, rather then an ActiveBoth one, meaning that the device is only notified when the lid is closed, not when it is opened.
2. Matching with this its _LID method simply always returns 0 (closed)
In order for the Linux LID code to work properly with this implementation, the lid_init_state selection needs to be set to ACPI_BUTTON_LID_INIT_OPEN.
This commit adds a DMI quirk for this.
--- drivers/acpi/button.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/acpi/button.c +11 -0
@@ -78,6 +78,17 @@ static const struct dmi_system_id lid_blacklst[] = { DMI_MATCH(DMI_BIOS_VERSION, "BYT70A.YNCHENG.WIN.007"), }, }, + { + /* + * Medion Akoya E2215T, notification of the LID device only + * happens on close, not on open and _LID always returns closed. + */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "MEDION"), + DMI_MATCH(DMI_PRODUCT_NAME, "E2215T MD60198"), + }, + .driver_data = (void *)(long)ACPI_BUTTON_LID_INIT_OPEN, + }, {} };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 199/434 RDMA/qedr: Fix memory leak in user qp and mr
In reply to Greg Kroah-HartmanFrom: Michal Kalderon <[email protected]>
[ Upstream commit 24e412c1e00ebfe73619e6b88cbc26c2c7d41b85 ]
User QPs pbl's weren't freed properly.
MR pbls weren't freed properly.
--- drivers/infiniband/hw/qedr/verbs.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/infiniband/hw/qedr/verbs.c +10 -2
@@ -1577,6 +1577,14 @@ static void qedr_cleanup_user(struct qedr_dev *dev, struct qedr_qp *qp)ib_umem_release (qp->urq.umem); qp->urq.umem =NULL ; + +if (rdma_protocol_roce (&dev->ibdev,1 )) { +qedr_free_pbl (dev, &qp->usq.pbl_info, qp->usq.pbl_tbl); +qedr_free_pbl (dev, &qp->urq.pbl_info, qp->urq.pbl_tbl); + }else { +kfree (qp->usq.pbl_tbl); +kfree (qp->urq.pbl_tbl); + } } static int qedr_create_user_qp(struct qedr_dev *dev,
@@ -2673,8 +2681,8 @@ int qedr_dereg_mr(struct ib_mr *ib_mr, struct ib_udata *udata) dev->ops->rdma_free_tid (dev->rdma_ctx, mr->hw_mr.itid); -if ((mr->type !=QEDR_MR_DMA ) && (mr->type !=QEDR_MR_FRMR )) -qedr_free_pbl (dev, &mr->info.pbl_info, mr->info.pbl_table); +if (mr->type !=QEDR_MR_DMA ) +free_mr_info (dev, &mr->info);/* it could be user registered memory. */ ib_umem_release (mr->umem);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 200/434 RDMA/hns: Fix memory leak on context on error return path
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 994195e1537074f56df216a9309f6e366cb35b67 ]
Currently, the error return path when the call to function dev->dfx->query_cqc_info fails will leak object 'context'. Fix this by making the error return path via 'err' return return codes rather than -EMSGSIZE, set ret appropriately for all error return paths and for the memory leak now return via 'err' rather than just returning without freeing context.
Addresses-Coverity: ("Resource leak")
--- drivers/infiniband/hw/hns/hns_roce_restrack.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/infiniband/hw/hns/hns_roce_restrack.c +7 -3
@@ -98,11 +98,15 @@ static int hns_roce_fill_res_cq_entry(struct sk_buff *msg, goto err; table_attr =nla_nest_start (msg,RDMA_NLDEV_ATTR_DRIVER ); -if (!table_attr) +if (!table_attr) { + ret = -EMSGSIZE ; goto err; + } -if (hns_roce_fill_cq (msg, context)) +if (hns_roce_fill_cq (msg, context)) { + ret = -EMSGSIZE ; goto err_cancel_table; + }nla_nest_end (msg, table_attr);kfree (context);
@@ -113,7 +117,7 @@ err_cancel_table:nla_nest_cancel (msg, table_attr); err:kfree (context); -return -EMSGSIZE ; +return ret; } int hns_roce_fill_res_entry(struct sk_buff *msg,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 201/434 RDMA/qedr: Fix srqs xarray initialization
In reply to Greg Kroah-HartmanFrom: Michal Kalderon <[email protected]>
[ Upstream commit 73ab512f720298aabe23b34110e3f6a8545b0ba5 ]
There was a missing initialization for the srqs xarray. SRQs xarray can also be called from irq context when searching for an element and uses the xa_XXX_irq apis, therefore should be initialized with IRQ flags.
--- drivers/infiniband/hw/qedr/main.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/hw/qedr/main.c +1 -0
@@ -357,6 +357,7 @@ static int qedr_alloc_resources(struct qedr_dev *dev)return -ENOMEM ;spin_lock_init (&dev->sgid_lock); +xa_init_flags (&dev->srqs,XA_FLAGS_LOCK_IRQ );if (IS_IWARP (dev)) {xa_init_flags (&dev->qps,XA_FLAGS_LOCK_IRQ );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 202/434 RDMA/core: Set DMA parameters correctly
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit c9121262d57b8a3be4f08073546436ba0128ca6a ]
The dma_set_max_seg_size() call in setup_dma_device() does not have any effect since device->dev.dma_parms is NULL. Fix this by initializing device->dev.dma_parms first.
--- drivers/infiniband/core/device.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/infiniband/core/device.c +14 -2
@@ -1199,9 +1199,21 @@ static void setup_dma_device(struct ib_device *device)WARN_ON_ONCE (!parent); device->dma_device = parent; } -/* Setup default max segment size for all IB devices */ -dma_set_max_seg_size (device->dma_device,SZ_2G ); +if (!device->dev.dma_parms) { +if (parent) { +/* +* The caller did not provide DMA parameters, so +* 'parent' probably represents a PCI device. The PCI +* core sets the maximum segment size to 64 +* KB. Increase this parameter to 2 GB. +*/ + device->dev.dma_parms = parent->dma_parms; +dma_set_max_seg_size (device->dma_device,SZ_2G ); + }else { +WARN_ON_ONCE (true); + } + } }/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 203/434 staging: wilc1000: check if device is initialzied before changing vif
In reply to Greg Kroah-HartmanFrom: Adham Abozaeid <[email protected]>
[ Upstream commit 6df6f3849bb8f317bf2d52711aacea4292237ede ]
When killing hostapd, the interface is closed which deinitializes the device, then change virtual interface is called.
This change checks if the device is initialized before sending the interface change command to the device
--- .../staging/wilc1000/wilc_wfi_cfgoperations.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +12 -6
@@ -1419,8 +1419,10 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,if (vif->iftype ==WILC_AP_MODE || vif->iftype ==WILC_GO_MODE )wilc_wfi_deinit_mon_interface (wl, true); vif->iftype =WILC_STATION_MODE ; -wilc_set_operation_mode (vif,wilc_get_vif_idx (vif), -WILC_STATION_MODE , vif->idx); + +if (wl->initialized) +wilc_set_operation_mode (vif,wilc_get_vif_idx (vif), +WILC_STATION_MODE , vif->idx);memset (priv->assoc_stainfo.sta_associated_bss,0 ,WILC_MAX_NUM_STA *ETH_ALEN );
@@ -1432,8 +1434,10 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, priv->wdev.iftype = type; vif->monitor_flag =0 ; vif->iftype =WILC_CLIENT_MODE ; -wilc_set_operation_mode (vif,wilc_get_vif_idx (vif), -WILC_STATION_MODE , vif->idx); + +if (wl->initialized) +wilc_set_operation_mode (vif,wilc_get_vif_idx (vif), +WILC_STATION_MODE , vif->idx);break ;case NL80211_IFTYPE_AP :
@@ -1450,8 +1454,10 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, dev->ieee80211_ptr->iftype = type; priv->wdev.iftype = type; vif->iftype =WILC_GO_MODE ; -wilc_set_operation_mode (vif,wilc_get_vif_idx (vif), -WILC_AP_MODE , vif->idx); + +if (wl->initialized) +wilc_set_operation_mode (vif,wilc_get_vif_idx (vif), +WILC_AP_MODE , vif->idx);break ;default :
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 204/434 gpu: host1x: Allocate gather copy for host1x
In reply to Greg Kroah-HartmanFrom: Thierry Reding <[email protected]>
[ Upstream commit b78e70c04c149299bd210759d7c7af7c86b89ca8 ]
Currently when the gather buffers are copied, they are copied to a buffer that is allocated for the host1x client that wants to execute the command streams in the buffers. However, the gather buffers will be read by the host1x device, which causes SMMU faults if the DMA API is backed by an IOMMU.
Fix this by allocating the gather buffer copy for the host1x device, which makes sure that it will be mapped into the host1x's IOVA space if the DMA API is backed by an IOMMU.
--- drivers/gpu/host1x/job.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/host1x/job.c +6 -5
@@ -436,7 +436,8 @@ out:return err; } -static inline int copy_gathers (struct host1x_job *job,struct device *dev) +static inline int copy_gathers (struct device *host,struct host1x_job *job, +struct device *dev) {struct host1x_firewall fw;size_t size =0 ;
@@ -459,12 +460,12 @@ static inline int copy_gathers(struct host1x_job *job, struct device *dev)* Try a non-blocking allocation from a higher priority pools first, * as awaiting for the allocation here is a major performance hit. */ - job->gather_copy_mapped =dma_alloc_wc (dev, size, &job->gather_copy, + job->gather_copy_mapped =dma_alloc_wc (host, size, &job->gather_copy,GFP_NOWAIT );/* the higher priority allocation failed, try the generic-blocking */ if (!job->gather_copy_mapped) - job->gather_copy_mapped =dma_alloc_wc (dev, size, + job->gather_copy_mapped =dma_alloc_wc (host, size, &job->gather_copy,GFP_KERNEL );if (!job->gather_copy_mapped)
@@ -512,7 +513,7 @@ int host1x_job_pin(struct host1x_job *job, struct device *dev) goto out;if (IS_ENABLED (CONFIG_TEGRA_HOST1X_FIREWALL )) { - err =copy_gathers (job, dev); + err =copy_gathers (host->dev, job, dev);if (err) goto out; }
@@ -573,7 +574,7 @@ void host1x_job_unpin(struct host1x_job *job) job->num_unpins =0 ;if (job->gather_copy_size) -dma_free_wc (job->channel->dev, job->gather_copy_size, +dma_free_wc (host->dev, job->gather_copy_size, job->gather_copy_mapped, job->gather_copy); }EXPORT_SYMBOL (host1x_job_unpin);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 206/434 ALSA: hda/hdmi - implement mst_no_extra_pcms flag
In reply to Greg Kroah-HartmanFrom: Kai Vehmanen <[email protected]>
[ Upstream commit 2a2edfbbfee47947dd05f5860c66c0e80ee5e09d ]
To support the DP-MST multiple streams via single connector feature, the HDMI driver was extended with the concept of backup PCMs. See commit 9152085defb6 ("ALSA: hda - add DP MST audio support").
This implementation works fine with snd_hda_intel.c as PCM topology is fully managed within the single driver.
When the HDA codec driver is used from ASoC components, the concept of backup PCMs no longer fits. For ASoC topologies, the physical HDMI converters are presented as backend DAIs and these should match with hardware capabilities. The ASoC topology may define arbitrary PCMs (i.e. frontend DAIs) and have processing elements before eventual routing to the HDMI BE DAIs. With backup PCMs, the link between FE and BE DAIs would become dynamic and change when monitors are (un)plugged. This would lead to modifying the topology every time hotplug events happen, which is not currently possible in ASoC and there does not seem to be any obvious benefits from this design.
To overcome above problems and enable the HDMI driver to be used from ASoC, this patch adds a new mode (mst_no_extra_pcms flags) to patch_hdmi.c. In this mode, the codec driver does not assume the backup PCMs to be created.
--- include/sound/hda_codec.h | 1 + sound/pci/hda/patch_hdmi.c | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-)
include/sound/hda_codec.h +1 -0
@@ -254,6 +254,7 @@ struct hda_codec { unsigned int force_pin_prefix:1; /* Add location prefix */ unsigned int link_down_at_suspend:1; /* link down at runtime suspend */ unsigned int relaxed_resume:1; /* don't resume forcibly for jack */ + unsigned int mst_no_extra_pcms:1; /* no backup PCMs for DP-MST */#ifdef CONFIG_PM unsigned long power_on_acct;
sound/pci/hda/patch_hdmi.c +14 -5
@@ -2082,15 +2082,24 @@ static bool is_hdmi_pcm_attached(struct hdac_device *hdac, int pcm_idx)static int generic_hdmi_build_pcms (struct hda_codec *codec) {struct hdmi_spec *spec = codec->spec; -int idx; +int idx, pcm_num;/* * for non-mst mode, pcm number is the same as before -* for DP MST mode, pcm number is (nid number + dev_num - 1) -* dev_num is the device entry number in a pin -* +* for DP MST mode without extra PCM, pcm number is same +* for DP MST mode with extra PCMs, pcm number is +* (nid number + dev_num - 1) +* dev_num is the device entry number in a pin */ -for (idx =0 ; idx < spec->num_nids + spec->dev_num -1 ; idx++) { + +if (codec->mst_no_extra_pcms) + pcm_num = spec->num_nids; +else + pcm_num = spec->num_nids + spec->dev_num -1 ; + +codec_dbg (codec,"hdmi: pcm_num set to %d\n" , pcm_num); + +for (idx =0 ; idx < pcm_num; idx++) {struct hda_pcm *info;struct hda_pcm_stream *pstr;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 189/434 drm/amd/display: setting the DIG_MODE to the correct value.
In reply to Greg Kroah-HartmanFrom: Zhan liu <[email protected]>
[ Upstream commit 967a3b85bac91c55eff740e61bf270c2732f48b2 ]
[Why]
This patch is for fixing Navi14 HDMI display pink screen issue.
[How]
Call stream->link->link_enc->funcs->setup twice. This is setting the DIG_MODE to the correct value after having been overridden by the call to transmitter control.
--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +9 -0
@@ -2769,6 +2769,15 @@ void core_link_enable_stream( CONTROLLER_DP_TEST_PATTERN_VIDEOMODE, COLOR_DEPTH_UNDEFINED); +/* This second call is needed to reconfigure the DIG +* as a workaround for the incorrect value being applied +* from transmitter control. +*/ +if (!dc_is_virtual_signal (pipe_ctx->stream->signal)) + stream->link->link_enc->funcs->setup ( + stream->link->link_enc, + pipe_ctx->stream->signal); +#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT if (pipe_ctx->stream->timing.flags.DSC) { if (dc_is_dp_signal(pipe_ctx->stream->signal) ||
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 209/434 s390/time: ensure get_clock_monotonic() returns monotonic values
In reply to Greg Kroah-HartmanFrom: Heiko Carstens <[email protected]>
[ Upstream commit 011620688a71f2f1fe9901dbc2479a7c01053196 ]
The current implementation of get_clock_monotonic() leaves it up to the caller to call the function with preemption disabled. The only core kernel caller (sched_clock) however does not disable preemption.
In order to make sure that all callers of this function see monotonic values handle disabling preemption within the function itself.
--- arch/s390/include/asm/timex.h | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
arch/s390/include/asm/timex.h +10 -6
@@ -10,8 +10,9 @@#ifndef _ASM_S390_TIMEX_H#define _ASM_S390_TIMEX_H -#include <asm/lowcore.h> +#include <linux/preempt.h> #include <linux/time64.h> +#include <asm/lowcore.h> /* The value of the TOD clock for 1.1.1970. */ #define TOD_UNIX_EPOCH 0x7d91048bca000000ULL
@@ -186,15 +187,18 @@ extern unsigned char tod_clock_base[16] __aligned(8);/** * get_clock_monotonic - returns current time in clock rate units * -* The caller must ensure that preemption is disabled. * The clock and tod_clock_base get changed via stop_machine. -* Therefore preemption must be disabled when calling this -* function, otherwise the returned value is not guaranteed to -* be monotonic. +* Therefore preemption must be disabled, otherwise the returned +* value is not guaranteed to be monotonic. */ static inline unsigned long long get_tod_clock_monotonic (void ) { -return get_tod_clock () - *(unsigned long long *) &tod_clock_base[1 ]; +unsigned long long tod; + +preempt_disable (); + tod =get_tod_clock () - *(unsigned long long *) &tod_clock_base[1 ]; +preempt_enable (); +return tod; }/**
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 210/434 s390: add error handling to perf_callchain_kernel
In reply to Greg Kroah-HartmanFrom: Ilya Leoshkevich <[email protected]>
[ Upstream commit effb83ccc83a97dbbe5214f4c443522719f05f3a ]
perf_callchain_kernel stops neither when it encounters a garbage address, nor when it runs out of space. Fix both issues using x86 version as an inspiration.
--- arch/s390/kernel/perf_event.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/s390/kernel/perf_event.c +6 -2
@@ -224,9 +224,13 @@ void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs) {struct unwind_state state; +unsigned long addr; -unwind_for_each_frame (&state, current, regs,0 ) -perf_callchain_store (entry, state.ip); +unwind_for_each_frame (&state, current, regs,0 ) { + addr =unwind_get_return_address (&state); +if (!addr ||perf_callchain_store (entry, addr)) +return ; + } }/* Perf definitions for PMU event attributes in sysfs */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 211/434 s390/mm: add mm_pxd_folded() checks to pxd_free()
In reply to Greg Kroah-HartmanFrom: Gerald Schaefer <[email protected]>
[ Upstream commit 2416cefc504ba8ae9b17e3e6b40afc72708f96be ]
Unlike pxd_free_tlb(), the pxd_free() functions do not check for folded page tables. This is not an issue so far, as those functions will actually never be called, since no code will reach them when page tables are folded.
In order to avoid future issues, and to make the s390 code more similar to other architectures, add mm_pxd_folded() checks, similar to how it is done in pxd_free_tlb().
This was found by testing a patch from from Anshuman Khandual, which is currently discussed on LKML ("mm/debug: Add tests validating architecture page table helpers").
--- arch/s390/include/asm/pgalloc.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
arch/s390/include/asm/pgalloc.h +14 -2
@@ -56,7 +56,12 @@ static inline p4d_t *p4d_alloc_one(struct mm_struct *mm, unsigned long address)crst_table_init (table, _REGION2_ENTRY_EMPTY);return (p4d_t *) table; } -#define p4d_free (mm, p4d) crst_table_free(mm, (unsigned long *) p4d) + +static inline void p4d_free (struct mm_struct *mm,p4d_t *p4d) +{ +if (!mm_p4d_folded (mm)) +crst_table_free (mm, (unsigned long *) p4d); +}static inline pud_t *pud_alloc_one (struct mm_struct *mm,unsigned long address) {
@@ -65,7 +70,12 @@ static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long address)crst_table_init (table, _REGION3_ENTRY_EMPTY);return (pud_t *) table; } -#define pud_free (mm, pud) crst_table_free(mm, (unsigned long *) pud) + +static inline void pud_free (struct mm_struct *mm,pud_t *pud) +{ +if (!mm_pud_folded (mm)) +crst_table_free (mm, (unsigned long *) pud); +}static inline pmd_t *pmd_alloc_one (struct mm_struct *mm,unsigned long vmaddr) {
@@ -83,6 +93,8 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long vmaddr)static inline void pmd_free (struct mm_struct *mm,pmd_t *pmd) { +if (mm_pmd_folded (mm)) +return ;pgtable_pmd_page_dtor (virt_to_page (pmd));crst_table_free (mm, (unsigned long *) pmd); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 213/434 libata: Ensure ata_port probe has completed before detach
In reply to Greg Kroah-HartmanFrom: John Garry <[email protected]>
[ Upstream commit 130f4caf145c3562108b245a576db30b916199d2 ]
With CONFIG_DEBUG_TEST_DRIVER_REMOVE set, we may find the following WARN:
[ 23.452574] ------------[ cut here ]------------ [ 23.457190] WARNING: CPU: 59 PID: 1 at drivers/ata/libata-core.c:6676 ata_host_detach+0x15c/0x168 [ 23.466047] Modules linked in: [ 23.469092] CPU: 59 PID: 1 Comm: swapper/0 Not tainted 5.4.0-rc1-00010-g5b83fd27752b-dirty #296 [ 23.477776] Hardware name: Huawei D06 /D06, BIOS Hisilicon D06 UEFI RC0 - V1.16.01 03/15/2019 [ 23.486286] pstate: a0c00009 (NzCv daif +PAN +UAO) [ 23.491065] pc : ata_host_detach+0x15c/0x168 [ 23.495322] lr : ata_host_detach+0x88/0x168 [ 23.499491] sp : ffff800011cabb50 [ 23.502792] x29: ffff800011cabb50 x28: 0000000000000007 [ 23.508091] x27: ffff80001137f068 x26: ffff8000112c0c28 [ 23.513390] x25: 0000000000003848 x24: ffff0023ea185300 [ 23.518689] x23: 0000000000000001 x22: 00000000000014c0 [ 23.523987] x21: 0000000000013740 x20: ffff0023bdc20000 [ 23.529286] x19: 0000000000000000 x18: 0000000000000004 [ 23.534584] x17: 0000000000000001 x16: 00000000000000f0 [ 23.539883] x15: ffff0023eac13790 x14: ffff0023eb76c408 [ 23.545181] x13: 0000000000000000 x12: ffff0023eac13790 [ 23.550480] x11: ffff0023eb76c228 x10: 0000000000000000 [ 23.555779] x9 : ffff0023eac13798 x8 : 0000000040000000 [ 23.561077] x7 : 0000000000000002 x6 : 0000000000000001 [ 23.566376] x5 : 0000000000000002 x4 : 0000000000000000 [ 23.571674] x3 : ffff0023bf08a0bc x2 : 0000000000000000 [ 23.576972] x1 : 3099674201f72700 x0 : 0000000000400284 [ 23.582272] Call trace: [ 23.584706] ata_host_detach+0x15c/0x168 [ 23.588616] ata_pci_remove_one+0x10/0x18 [ 23.592615] ahci_remove_one+0x20/0x40 [ 23.596356] pci_device_remove+0x3c/0xe0 [ 23.600267] really_probe+0xdc/0x3e0 [ 23.603830] driver_probe_device+0x58/0x100 [ 23.608000] device_driver_attach+0x6c/0x90 [ 23.612169] __driver_attach+0x84/0xc8 [ 23.615908] bus_for_each_dev+0x74/0xc8 [ 23.619730] driver_attach+0x20/0x28 [ 23.623292] bus_add_driver+0x148/0x1f0 [ 23.627115] driver_register+0x60/0x110 [ 23.630938] __pci_register_driver+0x40/0x48 [ 23.635199] ahci_pci_driver_init+0x20/0x28 [ 23.639372] do_one_initcall+0x5c/0x1b0 [ 23.643199] kernel_init_freeable+0x1a4/0x24c [ 23.647546] kernel_init+0x10/0x108 [ 23.651023] ret_from_fork+0x10/0x18 [ 23.654590] ---[ end trace 634a14b675b71c13 ]---
With KASAN also enabled, we may also get many use-after-free reports.
The issue is that when CONFIG_DEBUG_TEST_DRIVER_REMOVE is set, we may attempt to detach the ata_port before it has been probed.
This is because the ata_ports are async probed, meaning that there is no guarantee that the ata_port has probed prior to detach. When the ata_port does probe in this scenario, we get all sorts of issues as the detach may have already happened.
Fix by ensuring synchronisation with async_synchronize_full(). We could alternatively use the cookie returned from the ata_port probe async_schedule() call, but that means managing the cookie, so more complicated.
--- drivers/ata/libata-core.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/ata/libata-core.c +3 -0
@@ -6708,6 +6708,9 @@ void ata_host_detach(struct ata_host *host) {int i; +/* Ensure ata_port probe has completed */ +async_synchronize_full (); +for (i =0 ; i < host->n_ports; i++)ata_port_detach (host->ports[i]);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 214/434 loop: fix no-unmap write-zeroes request behavior
In reply to Greg Kroah-HartmanFrom: Darrick J. Wong <[email protected]>
[ Upstream commit efcfec579f6139528c9e6925eca2bc4a36da65c6 ]
Currently, if the loop device receives a WRITE_ZEROES request, it asks the underlying filesystem to punch out the range. This behavior is correct if unmapping is allowed. However, a NOUNMAP request means that the caller doesn't want us to free the storage backing the range, so punching out the range is incorrect behavior.
To satisfy a NOUNMAP | WRITE_ZEROES request, loop should ask the underlying filesystem to FALLOC_FL_ZERO_RANGE, which is (according to the fallocate documentation) required to ensure that the entire range is backed by real storage, which suffices for our purposes.
--- drivers/block/loop.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-)
drivers/block/loop.c +18 -8
@@ -417,18 +417,20 @@ out_free_page:return ret; } -static int lo_discard (struct loop_device *lo,struct request *rq,loff_t pos) +static int lo_fallocate (struct loop_device *lo,struct request *rq,loff_t pos, +int mode) {/* -* We use punch hole to reclaim the free space used by the -* image a.k.a. discard. However we do not support discard if -* encryption is enabled, because it may give an attacker -* useful information. +* We use fallocate to manipulate the space mappings used by the image +* a.k.a. discard/zerorange. However we do not support this if +* encryption is enabled, because it may give an attacker useful +* information. */ struct file *file = lo->lo_backing_file; -int mode =FALLOC_FL_PUNCH_HOLE |FALLOC_FL_KEEP_SIZE ;int ret; + mode |=FALLOC_FL_KEEP_SIZE ; +if ((!file->f_op->fallocate) || lo->lo_encrypt_key_size) { ret = -EOPNOTSUPP ; goto out;
@@ -596,9 +598,17 @@ static int do_req_filebacked(struct loop_device *lo, struct request *rq)switch (req_op (rq)) {case REQ_OP_FLUSH :return lo_req_flush (lo, rq); -case REQ_OP_DISCARD :case REQ_OP_WRITE_ZEROES : -return lo_discard (lo, rq, pos); +/* +* If the caller doesn't want deallocation, call zeroout to +* write zeroes the range. Otherwise, punch them out. +*/ +return lo_fallocate (lo, rq, pos, + (rq->cmd_flags &REQ_NOUNMAP ) ? +FALLOC_FL_ZERO_RANGE : +FALLOC_FL_PUNCH_HOLE ); +case REQ_OP_DISCARD : +return lo_fallocate (lo, rq, pos,FALLOC_FL_PUNCH_HOLE );case REQ_OP_WRITE :if (lo->transfer)return lo_write_transfer (lo, rq, pos);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 216/434 pinctrl: sh-pfc: sh7734: Fix duplicate TCLK1_B
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 884caadad128efad8e00c1cdc3177bc8912ee8ec ]
The definitions for bit field [19:18] of the Peripheral Function Select Register 3 were accidentally copied from bit field [20], leading to duplicates for the TCLK1_B function, and missing TCLK0, CAN_CLK_B, and ET0_ETXD4 functions.
Fix this by adding the missing GPIO_FN_CAN_CLK_B and GPIO_FN_ET0_ETXD4 enum values, and correcting the functions.
--- arch/sh/include/cpu-sh4/cpu/sh7734.h | 2 +- drivers/pinctrl/sh-pfc/pfc-sh7734.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/sh/include/cpu-sh4/cpu/sh7734.h +1 -1
@@ -134,7 +134,7 @@ enum {GPIO_FN_EX_WAIT1 ,GPIO_FN_SD1_DAT0_A ,GPIO_FN_DREQ2 ,GPIO_FN_CAN1_TX_C ,GPIO_FN_ET0_LINK_C ,GPIO_FN_ET0_ETXD5_A ,GPIO_FN_EX_WAIT0 ,GPIO_FN_TCLK1_B , -GPIO_FN_RD_WR ,GPIO_FN_TCLK0 , +GPIO_FN_RD_WR ,GPIO_FN_TCLK0 ,GPIO_FN_CAN_CLK_B ,GPIO_FN_ET0_ETXD4 ,GPIO_FN_EX_CS5 ,GPIO_FN_SD1_CMD_A ,GPIO_FN_ATADIR ,GPIO_FN_QSSL_B ,GPIO_FN_ET0_ETXD3_A , GPIO_FN_EX_CS4, GPIO_FN_SD1_WP_A, GPIO_FN_ATAWR, GPIO_FN_QMI_QIO1_B,
drivers/pinctrl/sh-pfc/pfc-sh7734.c +2 -2
@@ -1450,7 +1450,7 @@ static const struct pinmux_func pinmux_func_gpios[] = {GPIO_FN (ET0_ETXD2_A ),GPIO_FN (EX_CS5 ),GPIO_FN (SD1_CMD_A ),GPIO_FN (ATADIR ),GPIO_FN (QSSL_B ),GPIO_FN (ET0_ETXD3_A ), -GPIO_FN (RD_WR ),GPIO_FN (TCLK1_B ), +GPIO_FN (RD_WR ),GPIO_FN (TCLK0 ),GPIO_FN (CAN_CLK_B ),GPIO_FN (ET0_ETXD4 ),GPIO_FN (EX_WAIT0 ),GPIO_FN (TCLK1_B ),GPIO_FN (EX_WAIT1 ),GPIO_FN (SD1_DAT0_A ),GPIO_FN (DREQ2 ), GPIO_FN(CAN1_TX_C), GPIO_FN(ET0_LINK_C), GPIO_FN(ET0_ETXD5_A),
@@ -1949,7 +1949,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {/* IP3_20 [1] */ FN_EX_WAIT0 ,FN_TCLK1_B ,/* IP3_19_18 [2] */ -FN_RD_WR ,FN_TCLK1_B ,0 ,0 , +FN_RD_WR ,FN_TCLK0 ,FN_CAN_CLK_B ,FN_ET0_ETXD4 ,/* IP3_17_15 [3] */ FN_EX_CS5 ,FN_SD1_CMD_A ,FN_ATADIR ,FN_QSSL_B , FN_ET0_ETXD3_A, 0, 0, 0,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 217/434 ALSA: bebob: expand sleep just after breaking connections for protocol version 1
In reply to Greg Kroah-HartmanFrom: Takashi Sakamoto <[email protected]>
[ Upstream commit d3eabe939aee3ffd5b133766a932629a9746298c ]
As long as I investigated, some devices with BeBoB protocol version 1 can be freezed during several hundreds milliseconds after breaking connections. When accessing during the freezed time, any transaction is corrupted. In the worst case, the device is going to reboot.
I can see this issue in:
* Roland FA-66
* M-Audio FireWire Solo
This commit expands sleep just after breaking connections to avoid the freezed time as much as possible. I note that the freeze/reboot behaviour is similar to below models:
* Focusrite Saffire Pro 10 I/O
* Focusrite Saffire Pro 26 I/O
The above models certainly reboot after breaking connections.
--- sound/firewire/bebob/bebob_stream.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
sound/firewire/bebob/bebob_stream.c +6 -5
@@ -415,15 +415,16 @@ static int make_both_connections(struct snd_bebob *bebob)return 0 ; } -static void -break_both_connections (struct snd_bebob *bebob) +static void break_both_connections (struct snd_bebob *bebob) {cmp_connection_break (&bebob->in_conn);cmp_connection_break (&bebob->out_conn); -/* These models seems to be in transition state for a longer time. */ -if (bebob->maudio_special_quirk !=NULL ) -msleep (200 ); +// These models seem to be in transition state for a longer time. When +// accessing in the state, any transactions is corrupted. In the worst +// case, the device is going to reboot. +if (bebob->version <2 ) +msleep (600 ); } static int
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 190/434 i40e: initialize ITRN registers with correct values
In reply to Greg Kroah-HartmanFrom: Nicholas Nunley <[email protected]>
[ Upstream commit 998e5166e604fd37afe94352f7b8c2d816b11049 ]
Since commit 92418fb14750 ("i40e/i40evf: Use usec value instead of reg value for ITR defines") the driver tracks the interrupt throttling intervals in single usec units, although the actual ITRN/ITR0 registers are programmed in 2 usec units. Most register programming flows in the driver correctly handle the conversion, although it is currently not applied when the registers are initialized to their default values. Most of the time this doesn't present a problem since the default values are usually immediately overwritten through the standard adaptive throttling mechanism, or updated manually by the user, but if adaptive throttling is disabled and the interval values are left alone then the incorrect value will persist.
Since the intended default interval of 50 usecs (vs. 100 usecs as programmed) performs better for most traffic workloads, this can lead to performance regressions.
This patch adds the correct conversion when writing the initial values to the ITRN registers.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +5 -5
@@ -3534,14 +3534,14 @@ static void i40e_vsi_configure_msix(struct i40e_vsi *vsi) q_vector->rx.target_itr =ITR_TO_REG (vsi->rx_rings[i]->itr_setting);wr32 (hw,I40E_PFINT_ITRN (I40E_RX_ITR , vector -1 ), - q_vector->rx.target_itr); + q_vector->rx.target_itr >>1 ); q_vector->rx.current_itr = q_vector->rx.target_itr; q_vector->tx.next_update = jiffies +1 ; q_vector->tx.target_itr =ITR_TO_REG (vsi->tx_rings[i]->itr_setting);wr32 (hw,I40E_PFINT_ITRN (I40E_TX_ITR , vector -1 ), - q_vector->tx.target_itr); + q_vector->tx.target_itr >>1 ); q_vector->tx.current_itr = q_vector->tx.target_itr; wr32(hw, I40E_PFINT_RATEN(vector - 1),
@@ -3646,11 +3646,11 @@ static void i40e_configure_msi_and_legacy(struct i40e_vsi *vsi)/* set the ITR configuration */ q_vector->rx.next_update = jiffies +1 ; q_vector->rx.target_itr =ITR_TO_REG (vsi->rx_rings[0 ]->itr_setting); -wr32 (hw,I40E_PFINT_ITR0 (I40E_RX_ITR ), q_vector->rx.target_itr); +wr32 (hw,I40E_PFINT_ITR0 (I40E_RX_ITR ), q_vector->rx.target_itr >>1 ); q_vector->rx.current_itr = q_vector->rx.target_itr; q_vector->tx.next_update = jiffies +1 ; q_vector->tx.target_itr =ITR_TO_REG (vsi->tx_rings[0 ]->itr_setting); -wr32 (hw,I40E_PFINT_ITR0 (I40E_TX_ITR ), q_vector->tx.target_itr); +wr32 (hw,I40E_PFINT_ITR0 (I40E_TX_ITR ), q_vector->tx.target_itr >>1 ); q_vector->tx.current_itr = q_vector->tx.target_itr;i40e_enable_misc_int_causes (pf);
@@ -11396,7 +11396,7 @@ static int i40e_setup_misc_vector(struct i40e_pf *pf)/* associate no queues to the misc vector */ wr32 (hw,I40E_PFINT_LNKLST0 ,I40E_QUEUE_END_OF_LIST ); -wr32 (hw,I40E_PFINT_ITR0 (I40E_RX_ITR ),I40E_ITR_8K ); +wr32 (hw,I40E_PFINT_ITR0 (I40E_RX_ITR ),I40E_ITR_8K >>1 );i40e_flush (hw);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 219/434 libbpf: Fix error handling in bpf_map__reuse_fd()
In reply to Greg Kroah-HartmanFrom: Toke Høiland-Jørgensen <[email protected]>
[ Upstream commit d1b4574a4b86565325ef2e545eda8dfc9aa07c60 ]
bpf_map__reuse_fd() was calling close() in the error path before returning an error value based on errno. However, close can change errno, so that can lead to potentially misleading error messages. Instead, explicitly store errno in the err variable before each goto.
--- tools/lib/bpf/libbpf.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
tools/lib/bpf/libbpf.c +10 -4
@@ -1897,16 +1897,22 @@ int bpf_map__reuse_fd(struct bpf_map *map, int fd)return -errno; new_fd =open ("/" ,O_RDONLY |O_CLOEXEC ); -if (new_fd <0 ) +if (new_fd <0 ) { + err = -errno; goto err_free_new_name; + } new_fd =dup3 (fd, new_fd,O_CLOEXEC ); -if (new_fd <0 ) +if (new_fd <0 ) { + err = -errno; goto err_close_new_fd; + } err =zclose (map->fd); -if (err) +if (err) { + err = -errno; goto err_close_new_fd; + }free (map->name); map->fd = new_fd;
@@ -1925,7 +1931,7 @@ err_close_new_fd:close (new_fd); err_free_new_name:free (new_name); -return -errno; +return err; }int bpf_map__resize (struct bpf_map *map,__u32 max_entries)
Signature · 1 line
2.20.1