5.17.2-rc1 review
Subsystems (11)
Greg Kroah-Hartman
maintainerPATCH 678/1126 PCI: imx6: Invoke the PHY exit function after PHY power off
In reply to Greg Kroah-HartmanFrom: Richard Zhu <[email protected]>
[ Upstream commit deaf7a2c2e4b5072a743633bf37c45f34426a093 ]
To balance phy->init_count, invoke the phy_exit() after phy_power_off().
--- drivers/pci/controller/dwc/pci-imx6.c | 1 + 1 file changed, 1 insertion(+)
drivers/pci/controller/dwc/pci-imx6.c +1 -0
@@ -977,6 +977,7 @@ static int imx6_pcie_suspend_noirq(struccase IMX8MM :if (phy_power_off (imx6_pcie->phy))dev_err (dev,"unable to power off PHY\n" ); +phy_exit (imx6_pcie->phy);break ;default :break ;
Greg Kroah-Hartman
maintainerPATCH 679/1126 PCI: imx6: Assert i.MX8MM CLKREQ# even if no device present
In reply to Greg Kroah-HartmanFrom: Richard Zhu <[email protected]>
[ Upstream commit 45514f78c65cc9a09437f20e180625f94f769863 ]
The CLKREQ# signal is an open drain, active low signal that is driven low by the remote Endpoint device. But it might not be driven low if no Endpoint device is connected.
On i.MX8MM PCIe, phy_init() may fail and system boot may hang if no Endpoint is connected to assert CLKREQ#.
Handle this as on i.MX8MQ, where we explicitly assert CLKREQ# so the PHY can be initialized.
--- drivers/pci/controller/dwc/pci-imx6.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/pci/controller/dwc/pci-imx6.c +0 -4
@@ -453,10 +453,6 @@ static int imx6_pcie_enable_ref_clk(struct imx6_pcie *imx6_pcie)case IMX7D :break ;case IMX8MM : - ret =clk_prepare_enable (imx6_pcie->pcie_aux); -if (ret) -dev_err (dev,"unable to enable pcie_aux clock\n" ); -break ;case IMX8MQ : ret =clk_prepare_enable (imx6_pcie->pcie_aux);if (ret) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 680/1126 ibmvnic: fix race between xmit and reset
In reply to Greg Kroah-HartmanFrom: Sukadev Bhattiprolu <[email protected]>
[ Upstream commit 4219196d1f662cb10a462eb9e076633a3fc31a15 ]
There is a race between reset and the transmit paths that can lead to ibmvnic_xmit() accessing an scrq after it has been freed in the reset path. It can result in a crash like:
Kernel attempted to read user page (0) - exploit attempt? (uid: 0) BUG: Kernel NULL pointer dereference on read at 0x00000000 Faulting instruction address: 0xc0080000016189f8 Oops: Kernel access of bad area, sig: 11 [#1] ... NIP [c0080000016189f8] ibmvnic_xmit+0x60/0xb60 [ibmvnic] LR [c000000000c0046c] dev_hard_start_xmit+0x11c/0x280 Call Trace: [c008000001618f08] ibmvnic_xmit+0x570/0xb60 [ibmvnic] (unreliable) [c000000000c0046c] dev_hard_start_xmit+0x11c/0x280 [c000000000c9cfcc] sch_direct_xmit+0xec/0x330 [c000000000bfe640] __dev_xmit_skb+0x3a0/0x9d0 [c000000000c00ad4] __dev_queue_xmit+0x394/0x730 [c008000002db813c] __bond_start_xmit+0x254/0x450 [bonding] [c008000002db8378] bond_start_xmit+0x40/0xc0 [bonding] [c000000000c0046c] dev_hard_start_xmit+0x11c/0x280 [c000000000c00ca4] __dev_queue_xmit+0x564/0x730 [c000000000cf97e0] neigh_hh_output+0xd0/0x180 [c000000000cfa69c] ip_finish_output2+0x31c/0x5c0 [c000000000cfd244] __ip_queue_xmit+0x194/0x4f0 [c000000000d2a3c4] __tcp_transmit_skb+0x434/0x9b0 [c000000000d2d1e0] __tcp_retransmit_skb+0x1d0/0x6a0 [c000000000d2d984] tcp_retransmit_skb+0x34/0x130 [c000000000d310e8] tcp_retransmit_timer+0x388/0x6d0 [c000000000d315ec] tcp_write_timer_handler+0x1bc/0x330 [c000000000d317bc] tcp_write_timer+0x5c/0x200 [c000000000243270] call_timer_fn+0x50/0x1c0 [c000000000243704] __run_timers.part.0+0x324/0x460 [c000000000243894] run_timer_softirq+0x54/0xa0 [c000000000ea713c] __do_softirq+0x15c/0x3e0 [c000000000166258] __irq_exit_rcu+0x158/0x190 [c000000000166420] irq_exit+0x20/0x40 [c00000000002853c] timer_interrupt+0x14c/0x2b0 [c000000000009a00] decrementer_common_virt+0x210/0x220 --- interrupt: 900 at plpar_hcall_norets_notrace+0x18/0x2c
The immediate cause of the crash is the access of tx_scrq in the following snippet during a reset, where the tx_scrq can be either NULL or an address that will soon be invalid:
ibmvnic_xmit()
{
...
tx_scrq = adapter->tx_scrq[queue_num];
txq = netdev_get_tx_queue(netdev, queue_num);
ind_bufp = &tx_scrq->ind_buf;
if (test_bit(0, &adapter->resetting)) {
...
}But beyond that, the call to ibmvnic_xmit() itself is not safe during a reset and the reset path attempts to avoid this by stopping the queue in ibmvnic_cleanup(). However just after the queue was stopped, an in-flight ibmvnic_complete_tx() could have restarted the queue even as the reset is progressing.
Since the queue was restarted we could get a call to ibmvnic_xmit() which can then access the bad tx_scrq (or other fields).
We cannot however simply have ibmvnic_complete_tx() check the ->resetting bit and skip starting the queue. This can race at the "back-end" of a good reset which just restarted the queue but has not cleared the ->resetting bit yet. If we skip restarting the queue due to ->resetting being true, the queue would remain stopped indefinitely potentially leading to transmit timeouts.
IOW ->resetting is too broad for this purpose. Instead use a new flag that indicates whether or not the queues are active. Only the open/ reset paths control when the queues are active. ibmvnic_complete_tx() and others wake up the queue only if the queue is marked active.
So we will have:
A. reset/open thread in ibmvnic_cleanup() and __ibmvnic_open() ->resetting = true ->tx_queues_active = false disable tx queues ... ->tx_queues_active = true start tx queues B. Tx interrupt in ibmvnic_complete_tx(): if (->tx_queues_active) netif_wake_subqueue();
To ensure that ->tx_queues_active and state of the queues are consistent, we need a lock which:
- must also be taken in the interrupt path (ibmvnic_complete_tx())
- shared across the multiple queues in the adapter (so they don't become serialized)
Use rcu_read_lock() and have the reset thread synchronize_rcu() after updating the ->tx_queues_active state.
While here, consolidate a few boolean fields in ibmvnic_adapter for better alignment.
Based on discussions with Brian King and Dany Madden.
--- drivers/net/ethernet/ibm/ibmvnic.c | 63 ++++++++++++++++++++++++------ drivers/net/ethernet/ibm/ibmvnic.h | 7 +++- 2 files changed, 55 insertions(+), 15 deletions(-)
drivers/net/ethernet/ibm/ibmvnic.c +50 -13
@@ -1429,6 +1429,15 @@ static int __ibmvnic_open(struct net_device *netdev)return rc; } + adapter->tx_queues_active = true; + +/* Since queues were stopped until now, there shouldn't be any +* one in ibmvnic_complete_tx() or ibmvnic_xmit() so maybe we +* don't need the synchronize_rcu()? Leaving it for consistency +* with setting ->tx_queues_active = false. +*/ +synchronize_rcu (); +netif_tx_start_all_queues (netdev);if (prev_state ==VNIC_CLOSED ) {
@@ -1603,6 +1612,14 @@ static void ibmvnic_cleanup(struct net_device *netdev)struct ibmvnic_adapter *adapter =netdev_priv (netdev);/* ensure that transmissions are stopped if called by do_reset */ + + adapter->tx_queues_active = false; + +/* Ensure complete_tx() and ibmvnic_xmit() see ->tx_queues_active +* update so they don't restart a queue after we stop it below. +*/ +synchronize_rcu (); +if (test_bit (0 , &adapter->resetting))netif_tx_disable (netdev);else
@@ -1842,14 +1859,21 @@ static void ibmvnic_tx_scrq_clean_buffer(struct ibmvnic_adapter *adapter, tx_buff->skb =NULL ; adapter->netdev->stats.tx_dropped++; } + ind_bufp->index =0 ; +if (atomic_sub_return (entries, &tx_scrq->used) <= (adapter->req_tx_entries_per_subcrq /2 ) && -__netif_subqueue_stopped (adapter->netdev, queue_num) && - !test_bit (0 , &adapter->resetting)) { -netif_wake_subqueue (adapter->netdev, queue_num); -netdev_dbg (adapter->netdev,"Started queue %d\n" , - queue_num); +__netif_subqueue_stopped (adapter->netdev, queue_num)) { +rcu_read_lock (); + +if (adapter->tx_queues_active) { +netif_wake_subqueue (adapter->netdev, queue_num); +netdev_dbg (adapter->netdev,"Started queue %d\n" , + queue_num); + } + +rcu_read_unlock (); } }
@@ -1904,11 +1928,12 @@ static netdev_tx_t ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev)int index =0 ;u8 proto =0 ; - tx_scrq = adapter->tx_scrq[queue_num]; - txq =netdev_get_tx_queue (netdev, queue_num); - ind_bufp = &tx_scrq->ind_buf; - -if (test_bit (0 , &adapter->resetting)) { +/* If a reset is in progress, drop the packet since +* the scrqs may get torn down. Otherwise use the +* rcu to ensure reset waits for us to complete. +*/ +rcu_read_lock (); +if (!adapter->tx_queues_active) {dev_kfree_skb_any (skb); tx_send_failed++;
@@ -1917,6 +1942,10 @@ static netdev_tx_t ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) goto out; } + tx_scrq = adapter->tx_scrq[queue_num]; + txq =netdev_get_tx_queue (netdev, queue_num); + ind_bufp = &tx_scrq->ind_buf; +if (ibmvnic_xmit_workarounds (skb, netdev)) { tx_dropped++; tx_send_failed++;
@@ -1924,6 +1953,7 @@ static netdev_tx_t ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev)ibmvnic_tx_scrq_flush (adapter, tx_scrq); goto out; } +if (skb_is_gso (skb)) tx_pool = &adapter->tso_pool[queue_num];else
@@ -2078,6 +2108,7 @@ static netdev_tx_t ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev)netif_carrier_off (netdev); } out: +rcu_read_unlock (); netdev->stats.tx_dropped += tx_dropped; netdev->stats.tx_bytes += tx_bytes; netdev->stats.tx_packets += tx_packets;
@@ -3732,9 +3763,15 @@ static int ibmvnic_complete_tx(struct ibmvnic_adapter *adapter, (adapter->req_tx_entries_per_subcrq / 2) && __netif_subqueue_stopped(adapter->netdev, scrq->pool_index)) { -netif_wake_subqueue (adapter->netdev, scrq->pool_index); -netdev_dbg (adapter->netdev,"Started queue %d\n" , - scrq->pool_index); +rcu_read_lock (); +if (adapter->tx_queues_active) { +netif_wake_subqueue (adapter->netdev, + scrq->pool_index); +netdev_dbg (adapter->netdev, +"Started queue %d\n" , + scrq->pool_index); + } +rcu_read_unlock (); } }
drivers/net/ethernet/ibm/ibmvnic.h +5 -2
@@ -1006,11 +1006,14 @@ struct ibmvnic_adapter {struct work_struct ibmvnic_reset;struct delayed_work ibmvnic_delayed_reset;unsigned long resetting; -bool napi_enabled, from_passive_init; -bool login_pending;/* last device reset time */ unsigned long last_reset_time; +bool napi_enabled; +bool from_passive_init; +bool login_pending; +/* protected by rcu */ +bool tx_queues_active;bool failover_pending;bool force_reset_recovery;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 681/1126 af_unix: Fix some data-races around unix_sk(sk)->oob_skb.
In reply to Greg Kroah-HartmanFrom: Kuniyuki Iwashima <[email protected]>
[ Upstream commit e82025c623e2bf04d162bafceb66a59115814479 ]
Out-of-band data automatically places a "mark" showing wherein the sequence the out-of-band data would have been. If the out-of-band data implies cancelling everything sent so far, the "mark" is helpful to flush them. When the socket's read pointer reaches the "mark", the ioctl() below sets a non zero value to the arg atmark:
The out-of-band data is queued in sk->sk_receive_queue as well as ordinary data and also saved in unix_sk(sk)->oob_skb. It can be used to test if the head of the receive queue is the out-of-band data meaning the socket is at the "mark".
While testing that, unix_ioctl() reads unix_sk(sk)->oob_skb locklessly. Thus, all accesses to oob_skb need some basic protection to avoid load/store tearing which KCSAN detects when these are called concurrently:
- ioctl(fd_a, SIOCATMARK, &atmark, sizeof(atmark))
- send(fd_b_connected_to_a, buf, sizeof(buf), MSG_OOB)
BUG: KCSAN: data-race in unix_ioctl / unix_stream_sendmsg
write to 0xffff888003d9cff0 of 8 bytes by task 175 on cpu 1:
unix_stream_sendmsg (net/unix/af_unix.c:2087 net/unix/af_unix.c:2191) sock_sendmsg (net/socket.c:705 net/socket.c:725) __sys_sendto (net/socket.c:2040) __x64_sys_sendto (net/socket.c:2048) do_syscall_64 (arch/x86/entry/common.c:50 arch/x86/entry/common.c:80) entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:113)
read to 0xffff888003d9cff0 of 8 bytes by task 176 on cpu 0:
unix_ioctl (net/unix/af_unix.c:3101 (discriminator 1)) sock_do_ioctl (net/socket.c:1128) sock_ioctl (net/socket.c:1242) __x64_sys_ioctl (fs/ioctl.c:52 fs/ioctl.c:874 fs/ioctl.c:860 fs/ioctl.c:860) do_syscall_64 (arch/x86/entry/common.c:50 arch/x86/entry/common.c:80) entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:113)
value changed: 0xffff888003da0c00 -> 0xffff888003da0d00
Reported by Kernel Concurrency Sanitizer on:
CPU: 0 PID: 176 Comm: unix_race_oob_i Not tainted 5.17.0-rc5-59529-g83dc4c2af682 #12 Hardware name: Red Hat KVM, BIOS 1.11.0-2.amzn2 04/01/2014
--- net/unix/af_unix.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
net/unix/af_unix.c +5 -7
@@ -2084,7 +2084,7 @@ static int queue_oob(struct socket *sock, struct msghdr *msg, struct sock *otherif (ousk->oob_skb)consume_skb (ousk->oob_skb); - ousk->oob_skb = skb; +WRITE_ONCE (ousk->oob_skb, skb);scm_stat_add (other, skb);skb_queue_tail (&other->sk_receive_queue, skb);
@@ -2602,9 +2602,8 @@ static int unix_stream_recv_urg(struct unix_stream_read_state *state) oob_skb = u->oob_skb; -if (!(state->flags &MSG_PEEK )) { - u->oob_skb =NULL ; - } +if (!(state->flags &MSG_PEEK )) +WRITE_ONCE (u->oob_skb,NULL );unix_state_unlock (sk);
@@ -2639,7 +2638,7 @@ static struct sk_buff *manage_oob(struct sk_buff *skb, struct sock *sk, skb =NULL ; }else if (sock_flag (sk,SOCK_URGINLINE )) {if (!(flags &MSG_PEEK )) { - u->oob_skb =NULL ; +WRITE_ONCE (u->oob_skb,NULL );consume_skb (skb); } }else if (!(flags &MSG_PEEK )) {
@@ -3094,11 +3093,10 @@ static int unix_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)case SIOCATMARK : {struct sk_buff *skb; -struct unix_sock *u =unix_sk (sk);int answ =0 ; skb =skb_peek (&sk->sk_receive_queue); -if (skb && skb == u->oob_skb) +if (skb && skb ==READ_ONCE (unix_sk (sk)->oob_skb)) answ =1 ; err =put_user (answ, (int __user *)arg); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 682/1126 selftests/bpf: Fix error reporting from sock_fields programs
In reply to Greg Kroah-HartmanFrom: Jakub Sitnicki <[email protected]>
[ Upstream commit a4c9fe0ed4a13e25e43fcd44d9f89bc19ba8fbb7 ]
The helper macro that records an error in BPF programs that exercise sock fields access has been inadvertently broken by adaptation work that happened in commit b18c1f0aa477 ("bpf: selftest: Adapt sock_fields test to use skel and global variables").
BPF_NOEXIST flag cannot be used to update BPF_MAP_TYPE_ARRAY. The operation always fails with -EEXIST, which in turn means the error never gets recorded, and the checks for errors always pass.
Revert the change in update flags.
--- tools/testing/selftests/bpf/progs/test_sock_fields.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/progs/test_sock_fields.c +1 -1
@@ -113,7 +113,7 @@ static void tpcpy(struct bpf_tcp_sock *dst,#define RET_LOG () ({ \ linum = __LINE__; \ - bpf_map_update_elem(&linum_map, &linum_idx, &linum, BPF_NOEXIST); \ + bpf_map_update_elem(&linum_map, &linum_idx, &linum, BPF_ANY); \ return CG_OK; \ })
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 683/1126 Bluetooth: hci_uart: add missing NULL check in h5_enqueue
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
[ Upstream commit 32cb08e958696908a9aad5e49a78d74f7e32fffb ]
Syzbot hit general protection fault in __pm_runtime_resume(). The problem was in missing NULL check.
hu->serdev can be NULL and we should not blindly pass &serdev->dev somewhere, since it will cause GPF.
--- drivers/bluetooth/hci_h5.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/bluetooth/hci_h5.c +5 -3
@@ -629,9 +629,11 @@ static int h5_enqueue(struct hci_uart *hu, struct sk_buff *skb)break ; } -pm_runtime_get_sync (&hu->serdev->dev); -pm_runtime_mark_last_busy (&hu->serdev->dev); -pm_runtime_put_autosuspend (&hu->serdev->dev); +if (hu->serdev) { +pm_runtime_get_sync (&hu->serdev->dev); +pm_runtime_mark_last_busy (&hu->serdev->dev); +pm_runtime_put_autosuspend (&hu->serdev->dev); + }return 0 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 684/1126 Bluetooth: call hci_le_conn_failed with hdev lock in hci_le_conn_failed
In reply to Greg Kroah-HartmanFrom: Niels Dossche <[email protected]>
[ Upstream commit 9fa6b4cda3b414e990f008f45f9bcecbcb54d4d1 ]
hci_le_conn_failed function's documentation says that the caller must hold hdev->lock. The only callsite that does not hold that lock is hci_le_conn_failed. The other 3 callsites hold the hdev->lock very locally. The solution is to hold the lock during the call to hci_le_conn_failed.
--- net/bluetooth/hci_conn.c | 2 ++ 1 file changed, 2 insertions(+)
net/bluetooth/hci_conn.c +2 -0
@@ -669,7 +669,9 @@ static void le_conn_timeout(struct work_struct *work)if (conn->role ==HCI_ROLE_SLAVE ) {/* Disable LE Advertising */ le_disable_advertising (hdev); +hci_dev_lock (hdev);hci_le_conn_failed (conn,HCI_ERROR_ADVERTISING_TIMEOUT ); +hci_dev_unlock (hdev);return ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 685/1126 Bluetooth: btmtksdio: Fix kernel oops in btmtksdio_interrupt
In reply to Greg Kroah-HartmanFrom: Yake Yang <[email protected]>
[ Upstream commit b062a0b9c1dc1ff63094337dccfe1568d5b62023 ]
Fix the following kernel oops in btmtksdio_interrrupt
[ 14.339134] btmtksdio_interrupt+0x28/0x54 [ 14.339139] process_sdio_pending_irqs+0x68/0x1a0 [ 14.339144] sdio_irq_work+0x40/0x70 [ 14.339154] process_one_work+0x184/0x39c [ 14.339160] worker_thread+0x228/0x3e8 [ 14.339168] kthread+0x148/0x3ac [ 14.339176] ret_from_fork+0x10/0x30
That happened because hdev->power_on is already called before sdio_set_drvdata which btmtksdio_interrupt handler relies on is not properly set up.
The details are shown as the below: hci_register_dev would run queue_work(hdev->req_workqueue, &hdev->power_on) as WQ_HIGHPRI workqueue_struct to complete the power-on sequeunce and thus hci_power_on may run before sdio_set_drvdata is done in btmtksdio_probe.
The hci_dev_do_open in hci_power_on would initialize the device and enable the interrupt and thus it is possible that btmtksdio_interrupt is being called right before sdio_set_drvdata is filled out.
When btmtksdio_interrupt is being called and sdio_set_drvdata is not filled , the kernel oops is going to happen because btmtksdio_interrupt access an uninitialized pointer.
--- drivers/bluetooth/btmtksdio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/bluetooth/btmtksdio.c +2 -2
@@ -1095,6 +1095,8 @@ static int btmtksdio_probe(struct sdio_func *func, hdev->manufacturer =70 ;set_bit (HCI_QUIRK_NON_PERSISTENT_SETUP , &hdev->quirks); +sdio_set_drvdata (func, bdev); + err =hci_register_dev (hdev);if (err <0 ) {dev_err (&func->dev,"Can't register HCI device\n" );
@@ -1102,8 +1104,6 @@ static int btmtksdio_probe(struct sdio_func *func,return err; } -sdio_set_drvdata (func, bdev); -/* pm_runtime_enable would be done after the firmware is being * downloaded because the core layer probably already enables * runtime PM for this func such as the case host->caps &
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 686/1126 RDMA/nldev: Prevent underflow in nldev_stat_set_counter_dynamic_doit()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 87e0eacb176f9500c2063d140c0a1d7fa51ab8a5 ]
This code checks "index" for an upper bound but it does not check for negatives. Change the type to unsigned to prevent underflows.
--- drivers/infiniband/core/nldev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/infiniband/core/nldev.c +2 -1
@@ -1951,9 +1951,10 @@ static int nldev_stat_set_counter_dynamic_doit(struct nlattr *tb[], u32 port) {struct rdma_hw_stats *stats; -int rem, i, index, ret =0 ;struct nlattr *entry_attr;unsigned long *target; +int rem, i, ret =0 ; +u32 index; stats =ib_get_hw_stats_port (device, port);if (!stats)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 687/1126 ipv4: Fix route lookups when handling ICMP redirects and PMTU updates
In reply to Greg Kroah-HartmanFrom: Guillaume Nault <[email protected]>
[ Upstream commit 544b4dd568e3b09c1ab38a759d3187e7abda11a0 ]
The PMTU update and ICMP redirect helper functions initialise their fl4 variable with either __build_flow_key() or build_sk_flow_key(). These initialisation functions always set ->flowi4_scope with RT_SCOPE_UNIVERSE and might set the ECN bits of ->flowi4_tos. This is not a problem when the route lookup is later done via ip_route_output_key_hash(), which properly clears the ECN bits from ->flowi4_tos and initialises ->flowi4_scope based on the RTO_ONLINK flag. However, some helpers call fib_lookup() directly, without sanitising the tos and scope fields, so the route lookup can fail and, as a result, the ICMP redirect or PMTU update aren't taken into account.
Fix this by extracting the ->flowi4_tos and ->flowi4_scope sanitisation code into ip_rt_fix_tos(), then use this function in handlers that call fib_lookup() directly.
Note 1: We can't sanitise ->flowi4_tos and ->flowi4_scope in a central place (like __build_flow_key() or flowi4_init_output()), because ip_route_output_key_hash() expects non-sanitised values. When called with sanitised values, it can erroneously overwrite RT_SCOPE_LINK with RT_SCOPE_UNIVERSE in ->flowi4_scope. Therefore we have to be careful to sanitise the values only for those paths that don't call ip_route_output_key_hash().
Note 2: The problem is mostly about sanitising ->flowi4_tos. Having ->flowi4_scope initialised with RT_SCOPE_UNIVERSE instead of RT_SCOPE_LINK probably wasn't really a problem: sockets with the SOCK_LOCALROUTE flag set (those that'd result in RTO_ONLINK being set) normally shouldn't receive ICMP redirects or PMTU updates.
--- net/ipv4/route.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
net/ipv4/route.c +14 -4
@@ -499,6 +499,15 @@ void __ip_select_ident(struct net *net, struct iphdr *iph, int segs) }EXPORT_SYMBOL (__ip_select_ident); +static void ip_rt_fix_tos (struct flowi4 *fl4) +{ +__u8 tos =RT_FL_TOS (fl4); + + fl4->flowi4_tos = tos &IPTOS_RT_MASK ; + fl4->flowi4_scope = tos &RTO_ONLINK ? +RT_SCOPE_LINK :RT_SCOPE_UNIVERSE ; +} + static void __build_flow_key(const struct net *net, struct flowi4 *fl4, const struct sock *sk, const struct iphdr *iph,
@@ -824,6 +833,7 @@ static void ip_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_buf rt = (struct rtable *) dst;__build_flow_key (net, &fl4, sk, iph, oif, tos, prot, mark,0 ); +ip_rt_fix_tos (&fl4);__ip_do_redirect (rt, skb, &fl4, true); }
@@ -1048,6 +1058,7 @@ static void ip_rt_update_pmtu(struct dst_entry *dst, struct sock *sk,struct flowi4 fl4;ip_rt_build_flow_key (&fl4, sk, skb); +ip_rt_fix_tos (&fl4);/* Don't make lookup fail for bridged encapsulations */ if (skb &&netif_is_any_bridge_port (skb->dev))
@@ -1122,6 +1133,8 @@ void ipv4_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, u32 mtu) goto out; new = true; + }else { +ip_rt_fix_tos (&fl4); }__ip_rt_update_pmtu ((struct rtable *)xfrm_dst_path (&rt->dst), &fl4, mtu);
@@ -2603,7 +2616,6 @@ static struct rtable *__mkroute_output(const struct fib_result *res,struct rtable *ip_route_output_key_hash (struct net *net,struct flowi4 *fl4,const struct sk_buff *skb) { -__u8 tos =RT_FL_TOS (fl4);struct fib_result res = { .type =RTN_UNSPEC , .fi =NULL ,
@@ -2613,9 +2625,7 @@ struct rtable *ip_route_output_key_hash(struct net *net, struct flowi4 *fl4,struct rtable *rth; fl4->flowi4_iif =LOOPBACK_IFINDEX ; - fl4->flowi4_tos = tos &IPTOS_RT_MASK ; - fl4->flowi4_scope = ((tos &RTO_ONLINK ) ? -RT_SCOPE_LINK :RT_SCOPE_UNIVERSE ); +ip_rt_fix_tos (fl4);rcu_read_lock (); rth =ip_route_output_key_hash_rcu (net, fl4, &res, skb);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 688/1126 mptcp: Fix crash due to tcp_tsorted_anchor was initialized before release skb
In reply to Greg Kroah-HartmanFrom: Yonglong Li <[email protected]>
[ Upstream commit 3ef3905aa3b5b3e222ee6eb0210bfd999417a8cc ]
Got crash when doing pressure test of mptcp:
===========================================================================dst_release: dst:ffffa06ce6e5c058 refcnt:-1
kernel tried to execute NX-protected page - exploit attempt? (uid: 0)
BUG: unable to handle kernel paging request at ffffa06ce6e5c058 PGD 190a01067 P4D 190a01067 PUD 43fffb067 PMD 22e403063 PTE 8000000226e5c063 Oops: 0011 [#1] SMP PTI CPU: 7 PID: 7823 Comm: kworker/7:0 Kdump: loaded Tainted: G E Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.2.1 04/01/2014 Call Trace: ? skb_release_head_state+0x68/0x100 ? skb_release_all+0xe/0x30 ? kfree_skb+0x32/0xa0 ? mptcp_sendmsg_frag+0x57e/0x750 ? __mptcp_retrans+0x21b/0x3c0 ? __switch_to_asm+0x35/0x70 ? mptcp_worker+0x25e/0x320 ? process_one_work+0x1a7/0x360 ? worker_thread+0x30/0x390 ? create_worker+0x1a0/0x1a0 ? kthread+0x112/0x130 ? kthread_flush_work_fn+0x10/0x10 ? ret_from_fork+0x35/0x40 ===========================================================================
In __mptcp_alloc_tx_skb skb was allocated and skb->tcp_tsorted_anchor will be initialized, in under memory pressure situation sk_wmem_schedule will return false and then kfree_skb. In this case skb->_skb_refdst is not null because_skb_refdst and tcp_tsorted_anchor are stored in the same mem, and kfree_skb will try to release dst and cause crash.
--- net/mptcp/protocol.c | 1 + 1 file changed, 1 insertion(+)
net/mptcp/protocol.c +1 -0
@@ -1196,6 +1196,7 @@ static struct sk_buff *__mptcp_alloc_tx_skb(struct sock *sk, struct sock *ssk, gtcp_skb_entail (ssk, skb);return skb; } +tcp_skb_tsorted_anchor_cleanup (skb);kfree_skb (skb);return NULL ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 689/1126 af_netlink: Fix shift out of bounds in group mask calculation
In reply to Greg Kroah-HartmanFrom: Petr Machata <[email protected]>
[ Upstream commit 0caf6d9922192dd1afa8dc2131abfb4df1443b9f ]
When a netlink message is received, netlink_recvmsg() fills in the address of the sender. One of the fields is the 32-bit bitfield nl_groups, which carries the multicast group on which the message was received. The least significant bit corresponds to group 1, and therefore the highest group that the field can represent is 32. Above that, the UB sanitizer flags the out-of-bounds shift attempts.
Which bits end up being set in such case is implementation defined, but it's either going to be a wrong non-zero value, or zero, which is at least not misleading. Make the latter choice deterministic by always setting to 0 for higher-numbered multicast groups.
To get information about membership in groups >= 32, userspace is expected to use nl_pktinfo control messages[0], which are enabled by NETLINK_PKTINFO socket option.
[0] https://lwn.net/Articles/147608/
The way to trigger this issue is e.g. through monitoring the BRVLAN group:
# bridge monitor vlan & # ip link add name br type bridge
Which produces the following citation:
UBSAN: shift-out-of-bounds in net/netlink/af_netlink.c:162:19 shift exponent 32 is too large for 32-bit type 'int'
--- net/netlink/af_netlink.c | 2 ++ 1 file changed, 2 insertions(+)
net/netlink/af_netlink.c +2 -0
@@ -159,6 +159,8 @@ EXPORT_SYMBOL(do_trace_netlink_extack);static inline u32 netlink_group_mask (u32 group) { +if (group >32 ) +return 0 ;return group ?1 << (group -1 ) :0 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 690/1126 i2c: meson: Fix wrong speed use from probe
In reply to Greg Kroah-HartmanFrom: Lucas Tanure <[email protected]>
[ Upstream commit cb13aa16f34f794a9cee2626862af8a95f0f0ee9 ]
Having meson_i2c_set_clk_div after i2c_add_adapter causes issues for client drivers that try to use the bus before the requested speed is applied.
The bus can be used just after i2c_add_adapter, so move i2c_add_adapter to the final step as meson_i2c_set_clk_div needs to be called before the bus is used.
--- drivers/i2c/busses/i2c-meson.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/i2c/busses/i2c-meson.c +6 -6
@@ -465,18 +465,18 @@ static int meson_i2c_probe(struct platform_device *pdev)*/ meson_i2c_set_mask (i2c,REG_CTRL ,REG_CTRL_START ,0 ); - ret =i2c_add_adapter (&i2c->adap); -if (ret <0 ) { -clk_disable_unprepare (i2c->clk); -return ret; - } -/* Disable filtering */ meson_i2c_set_mask (i2c,REG_SLAVE_ADDR ,REG_SLV_SDA_FILTER |REG_SLV_SCL_FILTER ,0 );meson_i2c_set_clk_div (i2c, timings.bus_freq_hz); + ret =i2c_add_adapter (&i2c->adap); +if (ret <0 ) { +clk_disable_unprepare (i2c->clk); +return ret; + } +return 0 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 691/1126 netfilter: conntrack: Add and use nf_ct_set_auto_assign_helper_warned()
In reply to Greg Kroah-HartmanFrom: Phil Sutter <[email protected]>
[ Upstream commit 31d0bb9763efad30377505f3467f958d1ebe1e3d ]
The function sets the pernet boolean to avoid the spurious warning from nf_ct_lookup_helper() when assigning conntrack helpers via nftables.
--- include/net/netfilter/nf_conntrack_helper.h | 1 + net/netfilter/nf_conntrack_helper.c | 6 ++++++ net/netfilter/nft_ct.c | 3 +++ 3 files changed, 10 insertions(+)
include/net/netfilter/nf_conntrack_helper.h +1 -0
@@ -177,4 +177,5 @@ void nf_nat_helper_unregister(struct nf_conntrack_nat_helper *nat);int nf_nat_helper_try_module_get (const char *name,u16 l3num,u8 protonum);void nf_nat_helper_put (struct nf_conntrack_helper *helper); +void nf_ct_set_auto_assign_helper_warned (struct net *net);#endif /*_NF_CONNTRACK_HELPER_H*/
net/netfilter/nf_conntrack_helper.c +6 -0
@@ -556,6 +556,12 @@ static const struct nf_ct_ext_type helper_extend = { .id = NF_CT_EXT_HELPER, }; +void nf_ct_set_auto_assign_helper_warned (struct net *net) +{ +nf_ct_pernet (net)->auto_assign_helper_warned = true; +} +EXPORT_SYMBOL_GPL (nf_ct_set_auto_assign_helper_warned); +void nf_conntrack_helper_pernet_init (struct net *net) {struct nf_conntrack_net *cnet =nf_ct_pernet (net);
net/netfilter/nft_ct.c +3 -0
@@ -1041,6 +1041,9 @@ static int nft_ct_helper_obj_init(const struct nft_ctx *ctx,if (err <0 ) goto err_put_helper; +/* Avoid the bogus warning, helper will be assigned after CT init */ +nf_ct_set_auto_assign_helper_warned (ctx->net); +return 0 ; err_put_helper:
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 692/1126 i2c: mux: demux-pinctrl: do not deactivate a master that is not active
In reply to Greg Kroah-HartmanFrom: Peter Rosin <[email protected]>
[ Upstream commit 1a22aabf20adf89cb216f566913196128766f25b ]
Attempting to rollback the activation of the current master when the current master has not been activated is bad. priv->cur_chan and priv->cur_adap are both still zeroed out and the rollback may result in attempts to revert an of changeset that has not been applied and do result in calls to both del and put the zeroed out i2c_adapter. Maybe it crashes, or whatever, but it's bad in any case.
--- drivers/i2c/muxes/i2c-demux-pinctrl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/i2c/muxes/i2c-demux-pinctrl.c +3 -2
@@ -261,7 +261,7 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev) err =device_create_file (&pdev->dev, &dev_attr_available_masters);if (err) - goto err_rollback; + goto err_rollback_activation; err =device_create_file (&pdev->dev, &dev_attr_current_master);if (err)
@@ -271,8 +271,9 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev) err_rollback_available:device_remove_file (&pdev->dev, &dev_attr_available_masters); -err_rollback: +err_rollback_activation:i2c_demux_deactivate_master (priv); +err_rollback:for (j =0 ; j < i; j++) {of_node_put (priv->chan[j].parent_np);of_changeset_destroy (&priv->chan[j].chgset);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 693/1126 powerpc/pseries: Fix use after free in remove_phb_dynamic()
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
[ Upstream commit fe2640bd7a62f1f7c3f55fbda31084085075bc30 ]
In remove_phb_dynamic() we use &phb->io_resource, after we've called device_unregister(&host_bridge->dev). But the unregister may have freed phb, because pcibios_free_controller_deferred() is the release function for the host_bridge.
If there are no outstanding references when we call device_unregister() then phb will be freed out from under us.
This has gone mainly unnoticed, but with slub_debug and page_poison enabled it can lead to a crash:
PID: 7574 TASK: c0000000d492cb80 CPU: 13 COMMAND: "drmgr"
#0 [c0000000e4f075a0] crash_kexec at c00000000027d7dc
#1 [c0000000e4f075d0] oops_end at c000000000029608
#2 [c0000000e4f07650] __bad_page_fault at c0000000000904b4 #3 [c0000000e4f076c0] do_bad_slb_fault at c00000000009a5a8 #4 [c0000000e4f076f0] data_access_slb_common_virt at c000000000008b30 Data SLB Access [380] exception frame:
R0: c000000000167250 R1: c0000000e4f07a00 R2: c000000002a46100 R3: c000000002b39ce8 R4: 00000000000000c0 R5: 00000000000000a9 R6: 3894674d000000c0 R7: 0000000000000000 R8: 00000000000000ff R9: 0000000000000100 R10: 6b6b6b6b6b6b6b6b R11: 0000000000008000 R12: c00000000023da80 R13: c0000009ffd38b00 R14: 0000000000000000 R15: 000000011c87f0f0 R16: 0000000000000006 R17: 0000000000000003 R18: 0000000000000002 R19: 0000000000000004 R20: 0000000000000005 R21: 000000011c87ede8 R22: 000000011c87c5a8 R23: 000000011c87d3a0 R24: 0000000000000000 R25: 0000000000000001 R26: c0000000e4f07cc8 R27: c00000004d1cc400 R28: c0080000031d00e8 R29: c00000004d23d800 R30: c00000004d1d2400 R31: c00000004d1d2540 NIP: c000000000167258 MSR: 8000000000009033 OR3: c000000000e9f474 CTR: 0000000000000000 LR: c000000000167250 XER: 0000000020040003 CCR: 0000000024088420 MQ: 0000000000000000 DAR: 6b6b6b6b6b6b6ba3
DSISR: c0000000e4f07920 Syscall Result: fffffffffffffff2
[NIP : release_resource+56]
[LR : release_resource+48]
#5 [c0000000e4f07a00] release_resource at c000000000167258 (unreliable) #6 [c0000000e4f07a30] remove_phb_dynamic at c000000000105648 #7 [c0000000e4f07ab0] dlpar_remove_slot at c0080000031a09e8 [rpadlpar_io] #8 [c0000000e4f07b50] remove_slot_store at c0080000031a0b9c [rpadlpar_io] #9 [c0000000e4f07be0] kobj_attr_store at c000000000817d8c
#10 [c0000000e4f07c00] sysfs_kf_write at c00000000063e504
#11 [c0000000e4f07c20] kernfs_fop_write_iter at c00000000063d868 #12 [c0000000e4f07c70] new_sync_write at c00000000054339c
#13 [c0000000e4f07d10] vfs_write at c000000000546624
#14 [c0000000e4f07d60] ksys_write at c0000000005469f4
#15 [c0000000e4f07db0] system_call_exception at c000000000030840 #16 [c0000000e4f07e10] system_call_vectored_common at c00000000000c168
To avoid it, we can take a reference to the host_bridge->dev until we're done using phb. Then when we drop the reference the phb will be freed.
--- arch/powerpc/platforms/pseries/pci_dlpar.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/powerpc/platforms/pseries/pci_dlpar.c +4 -0
@@ -78,6 +78,9 @@ int remove_phb_dynamic(struct pci_controller *phb)pseries_msi_free_domains (phb); +/* Keep a reference so phb isn't freed yet */ +get_device (&host_bridge->dev); +/* Remove the PCI bus and unregister the bridge device from sysfs */ phb->bus =NULL ;pci_remove_bus (b);
@@ -101,6 +104,7 @@ int remove_phb_dynamic(struct pci_controller *phb)* the pcibios_free_controller_deferred() callback; * see pseries_root_bridge_prepare(). */ +put_device (&host_bridge->dev);return 0 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 694/1126 ax25: Fix refcount leaks caused by ax25_cb_del()
In reply to Greg Kroah-HartmanFrom: Duoming Zhou <[email protected]>
[ Upstream commit 9fd75b66b8f68498454d685dc4ba13192ae069b0 ]
The previous commit d01ffb9eee4a ("ax25: add refcount in ax25_dev to avoid UAF bugs") and commit feef318c855a ("ax25: fix UAF bugs of net_device caused by rebinding operation") increase the refcounts of ax25_dev and net_device in ax25_bind() and decrease the matching refcounts in ax25_kill_by_device() in order to prevent UAF bugs, but there are reference count leaks.
The root cause of refcount leaks is shown below:
(Thread 1) | (Thread 2)
ax25_bind() |
... |
ax25_addr_ax25dev() |
ax25_dev_hold() //(1) |
... |
dev_hold_track() //(2) |
... | ax25_destroy_socket()
| ax25_cb_del()
| ...
| hlist_del_init() //(3)
|
|
(Thread 3) |
ax25_kill_by_device() |
... |
ax25_for_each(s, &ax25_list) { |
if (s->ax25_dev == ax25_dev) //(4) |
... |Firstly, we use ax25_bind() to increase the refcount of ax25_dev in position (1) and increase the refcount of net_device in position (2). Then, we use ax25_cb_del() invoked by ax25_destroy_socket() to delete ax25_cb in hlist in position (3) before calling ax25_kill_by_device(). Finally, the decrements of refcounts in ax25_kill_by_device() will not be executed, because no s->ax25_dev equals to ax25_dev in position (4).
This patch adds decrements of refcounts in ax25_release() and use lock_sock() to do synchronization. If refcounts decrease in ax25_release(), the decrements of refcounts in ax25_kill_by_device() will not be executed and vice versa.
--- net/ax25/af_ax25.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
net/ax25/af_ax25.c +11 -3
@@ -98,8 +98,10 @@ static void ax25_kill_by_device(struct net_device *dev)spin_unlock_bh (&ax25_list_lock);lock_sock (sk); s->ax25_dev =NULL ; -dev_put_track (ax25_dev->dev, &ax25_dev->dev_tracker); -ax25_dev_put (ax25_dev); +if (sk->sk_socket) { +dev_put_track (ax25_dev->dev, &ax25_dev->dev_tracker); +ax25_dev_put (ax25_dev); + }ax25_disconnect (s,ENETUNREACH );release_sock (sk);spin_lock_bh (&ax25_list_lock);
@@ -979,14 +981,20 @@ static int ax25_release(struct socket *sock) {struct sock *sk = sock->sk;ax25_cb *ax25; +ax25_dev *ax25_dev;if (sk ==NULL )return 0 ;sock_hold (sk); -sock_orphan (sk);lock_sock (sk); +sock_orphan (sk); ax25 =sk_to_ax25 (sk); + ax25_dev = ax25->ax25_dev; +if (ax25_dev) { +dev_put_track (ax25_dev->dev, &ax25_dev->dev_tracker); +ax25_dev_put (ax25_dev); + }if (sk->sk_type ==SOCK_SEQPACKET ) {switch (ax25->state) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 695/1126 ax25: Fix NULL pointer dereferences in ax25 timers
In reply to Greg Kroah-HartmanFrom: Duoming Zhou <[email protected]>
[ Upstream commit fc6d01ff9ef03b66d4a3a23b46fc3c3d8cf92009 ]
The previous commit 7ec02f5ac8a5 ("ax25: fix NPD bug in ax25_disconnect") move ax25_disconnect into lock_sock() in order to prevent NPD bugs. But there are race conditions that may lead to null pointer dereferences in ax25_heartbeat_expiry(), ax25_t1timer_expiry(), ax25_t2timer_expiry(), ax25_t3timer_expiry() and ax25_idletimer_expiry(), when we use ax25_kill_by_device() to detach the ax25 device.
One of the race conditions that cause null pointer dereferences can be shown as below:
(Thread 1) | (Thread 2)
ax25_connect() |
ax25_std_establish_data_link() |
ax25_start_t1timer() |
mod_timer(&ax25->t1timer,..) |
| ax25_kill_by_device()
(wait a time) | ...
| s->ax25_dev = NULL; //(1)
ax25_t1timer_expiry() |
ax25->ax25_dev->values[..] //(2)| ...
... |We set null to ax25_cb->ax25_dev in position (1) and dereference the null pointer in position (2).
The corresponding fail log is shown below:
===============================================================
BUG: kernel NULL pointer dereference, address: 0000000000000050 CPU: 1 PID: 0 Comm: swapper/1 Not tainted 5.17.0-rc6-00794-g45690b7d0 RIP: 0010:ax25_t1timer_expiry+0x12/0x40 ... Call Trace: call_timer_fn+0x21/0x120 __run_timers.part.0+0x1ca/0x250 run_timer_softirq+0x2c/0x60 __do_softirq+0xef/0x2f3 irq_exit_rcu+0xb6/0x100 sysvec_apic_timer_interrupt+0xa2/0xd0
...
This patch moves ax25_disconnect() before s->ax25_dev = NULL and uses del_timer_sync() to delete timers in ax25_disconnect(). If ax25_disconnect() is called by ax25_kill_by_device() or ax25->ax25_dev is NULL, the reason in ax25_disconnect() will be equal to ENETUNREACH, it will wait all timers to stop before we set null to s->ax25_dev in ax25_kill_by_device().
--- net/ax25/af_ax25.c | 4 ++-- net/ax25/ax25_subr.c | 20 ++++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-)
net/ax25/af_ax25.c +2 -2
@@ -89,20 +89,20 @@ static void ax25_kill_by_device(struct net_device *dev) sk = s->sk;if (!sk) {spin_unlock_bh (&ax25_list_lock); - s->ax25_dev =NULL ;ax25_disconnect (s,ENETUNREACH ); + s->ax25_dev =NULL ;spin_lock_bh (&ax25_list_lock); goto again; }sock_hold (sk);spin_unlock_bh (&ax25_list_lock);lock_sock (sk); +ax25_disconnect (s,ENETUNREACH ); s->ax25_dev =NULL ;if (sk->sk_socket) {dev_put_track (ax25_dev->dev, &ax25_dev->dev_tracker);ax25_dev_put (ax25_dev); } -ax25_disconnect (s,ENETUNREACH );release_sock (sk);spin_lock_bh (&ax25_list_lock);sock_put (sk);
net/ax25/ax25_subr.c +14 -6
@@ -261,12 +261,20 @@ void ax25_disconnect(ax25_cb *ax25, int reason) {ax25_clear_queues (ax25); -if (!ax25->sk || !sock_flag (ax25->sk,SOCK_DESTROY )) -ax25_stop_heartbeat (ax25); -ax25_stop_t1timer (ax25); -ax25_stop_t2timer (ax25); -ax25_stop_t3timer (ax25); -ax25_stop_idletimer (ax25); +if (reason ==ENETUNREACH ) { +del_timer_sync (&ax25->timer); +del_timer_sync (&ax25->t1timer); +del_timer_sync (&ax25->t2timer); +del_timer_sync (&ax25->t3timer); +del_timer_sync (&ax25->idletimer); + }else { +if (!ax25->sk || !sock_flag (ax25->sk,SOCK_DESTROY )) +ax25_stop_heartbeat (ax25); +ax25_stop_t1timer (ax25); +ax25_stop_t2timer (ax25); +ax25_stop_t3timer (ax25); +ax25_stop_idletimer (ax25); + } ax25->state =AX25_STATE_0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 696/1126 drm/i915: Fix renamed struct field
In reply to Greg Kroah-HartmanFrom: Lucas De Marchi <[email protected]>
[ Upstream commit 00f4150d27d2c01eaeffe1091fc311a7c0872c69 ]
Earlier versions of commit a5b7ef27da60 ("drm/i915: Add struct to hold IP version") named "ver" as "arch" and then when it was renamed it missed the rename on MEDIA_VER_FULL() since it it's currently not used.
--- drivers/gpu/drm/i915/i915_drv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -1146,7 +1146,7 @@ static inline struct intel_gt *to_gt(struct drm_i915_private *i915) (GRAPHICS_VER(i915) >= (from) && GRAPHICS_VER(i915) <= (until))#define MEDIA_VER (i915) (INTEL_INFO(i915)->media.ver) -#define MEDIA_VER_FULL (i915) IP_VER(INTEL_INFO(i915)->media.arch, \ +#define MEDIA_VER_FULL (i915) IP_VER(INTEL_INFO(i915)->media.ver, \ INTEL_INFO(i915)->media.rel)#define IS_MEDIA_VER (i915, from, until) \ (MEDIA_VER(i915) >= (from) && MEDIA_VER(i915) <= (until))
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 697/1126 selftests/bpf/test_lirc_mode2.sh: Exit with proper code
In reply to Greg Kroah-HartmanFrom: Hangbin Liu <[email protected]>
[ Upstream commit ec80906b0fbd7be11e3e960813b977b1ffe5f8fe ]
When test_lirc_mode2_user exec failed, the test report failed but still exit with 0. Fix it by exiting with an error code.
Another issue is for the LIRCDEV checking. With bash -n, we need to quote the variable, or it will always be true. So if test_lirc_mode2_user was not run, just exit with skip code.
--- tools/testing/selftests/bpf/test_lirc_mode2.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/testing/selftests/bpf/test_lirc_mode2.sh +4 -1
@@ -3,6 +3,7 @@ # Kselftest framework requirement - SKIP code is 4. ksft_skip=4 +ret=$ksft_skip msg="skip all tests:" if [ $UID != 0 ]; then
@@ -25,7 +26,7 @@ do fi done -if [ -n $LIRCDEV ]; +if [ -n "$LIRCDEV" ]; then TYPE=lirc_mode2 ./test_lirc_mode2_user $LIRCDEV $INPUTDEV
@@ -36,3 +37,5 @@ then echo -e ${GREEN}"PASS: $TYPE"${NC} fi fi + +exit $ret
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 698/1126 bpftool: Fix print error when show bpf map
In reply to Greg Kroah-HartmanFrom: Yafang Shao <[email protected]>
[ Upstream commit 1824d8ea75f275a5e69e5f6bc0ffe122ea9b938c ]
If there is no btf_id or frozen, it will not show the pids, but the pids don't depend on any one of them.
Below is the result after this change:
$ ./bpftool map show 2: lpm_trie flags 0x1 key 8B value 8B max_entries 1 memlock 4096B pids systemd(1) 3: lpm_trie flags 0x1 key 20B value 8B max_entries 1 memlock 4096B pids systemd(1)
While before this change, the 'pids systemd(1)' can't be displayed.
--- tools/bpf/bpftool/map.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
tools/bpf/bpftool/map.c +2 -5
@@ -620,17 +620,14 @@ static int show_map_close_plain(int fd, struct bpf_map_info *info) u32_as_hash_field(info->id))printf ("\n\tpinned %s" , (char *)entry->value); } -printf ("\n" );if (frozen_str) { frozen =atoi (frozen_str);free (frozen_str); } -if (!info->btf_id && !frozen) -return 0 ; - -printf ("\t" ); +if (info->btf_id || frozen) +printf ("\n\t" );if (info->btf_id)printf ("btf_id %d" , info->btf_id);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 699/1126 PCI: Avoid broken MSI on SB600 USB devices
In reply to Greg Kroah-HartmanFrom: Bjorn Helgaas <[email protected]>
[ Upstream commit 63cd736f449445edcd7f0bcc7d84453e9beec0aa ]
Some ATI SB600 USB adapters advertise MSI, but if INTx is disabled by setting PCI_COMMAND_INTX_DISABLE, MSI doesn't work either. The PCI/PCIe specs do not require software to set PCI_COMMAND_INTX_DISABLE when enabling MSI, but Linux has done that for many years.
Mick reported that 306c54d0edb6 ("usb: hcd: Try MSI interrupts on PCI devices") broke these devices. Prior to 306c54d0edb6, they used INTx. Starting with 306c54d0edb6, they use MSI, and and the fact that Linux sets PCI_COMMAND_INTX_DISABLE means both INTx and MSI are disabled on these devices.
Avoid this SB600 defect by disabling MSI so we use INTx as before.
--- drivers/pci/quirks.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/pci/quirks.c +12 -0
@@ -1811,6 +1811,18 @@ static void quirk_alder_ioapic(struct pci_dev *pdev)DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_EESSC , quirk_alder_ioapic);#endif +static void quirk_no_msi (struct pci_dev *dev) +{ +pci_info (dev,"avoiding MSI to work around a hardware defect\n" ); + dev->no_msi =1 ; +} +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_ATI ,0x4386 , quirk_no_msi); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_ATI ,0x4387 , quirk_no_msi); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_ATI ,0x4388 , quirk_no_msi); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_ATI ,0x4389 , quirk_no_msi); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_ATI ,0x438a , quirk_no_msi); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_ATI ,0x438b , quirk_no_msi); +static void quirk_pcie_mch (struct pci_dev *pdev) { pdev->no_msi =1 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 700/1126 net: bcmgenet: Use stronger register read/writes to assure ordering
In reply to Greg Kroah-HartmanFrom: Jeremy Linton <[email protected]>
[ Upstream commit 8d3ea3d402db94b61075617e71b67459a714a502 ]
GCC12 appears to be much smarter about its dependency tracking and is aware that the relaxed variants are just normal loads and stores and this is causing problems like:
[ 210.074549] ------------[ cut here ]------------ [ 210.079223] NETDEV WATCHDOG: enabcm6e4ei0 (bcmgenet): transmit queue 1 timed out [ 210.086717] WARNING: CPU: 1 PID: 0 at net/sched/sch_generic.c:529 dev_watchdog+0x234/0x240 [ 210.095044] Modules linked in: genet(E) nft_fib_inet nft_fib_ipv4 nft_fib_ipv6 nft_fib nft_reject_inet nf_reject_ipv4 nf_reject_ipv6 nft_reject nft_ct nft_chain_nat] [ 210.146561] ACPI CPPC: PCC check channel failed for ss: 0. ret=-110 [ 210.146927] CPU: 1 PID: 0 Comm: swapper/1 Tainted: G E 5.17.0-rc7G12+ #58 [ 210.153226] CPPC Cpufreq:cppc_scale_freq_workfn: failed to read perf counters [ 210.161349] Hardware name: Raspberry Pi Foundation Raspberry Pi 4 Model B/Raspberry Pi 4 Model B, BIOS EDK2-DEV 02/08/2022 [ 210.161353] pstate: 80400005 (Nzcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 210.161358] pc : dev_watchdog+0x234/0x240 [ 210.161364] lr : dev_watchdog+0x234/0x240 [ 210.161368] sp : ffff8000080a3a40 [ 210.161370] x29: ffff8000080a3a40 x28: ffffcd425af87000 x27: ffff8000080a3b20 [ 210.205150] x26: ffffcd425aa00000 x25: 0000000000000001 x24: ffffcd425af8ec08 [ 210.212321] x23: 0000000000000100 x22: ffffcd425af87000 x21: ffff55b142688000 [ 210.219491] x20: 0000000000000001 x19: ffff55b1426884c8 x18: ffffffffffffffff [ 210.226661] x17: 64656d6974203120 x16: 0000000000000001 x15: 6d736e617274203a [ 210.233831] x14: 2974656e65676d63 x13: ffffcd4259c300d8 x12: ffffcd425b07d5f0 [ 210.241001] x11: 00000000ffffffff x10: ffffcd425b07d5f0 x9 : ffffcd4258bdad9c [ 210.248171] x8 : 00000000ffffdfff x7 : 000000000000003f x6 : 0000000000000000 [ 210.255341] x5 : 0000000000000000 x4 : 0000000000000000 x3 : 0000000000001000 [ 210.262511] x2 : 0000000000001000 x1 : 0000000000000005 x0 : 0000000000000044 [ 210.269682] Call trace: [ 210.272133] dev_watchdog+0x234/0x240 [ 210.275811] call_timer_fn+0x3c/0x15c [ 210.279489] __run_timers.part.0+0x288/0x310 [ 210.283777] run_timer_softirq+0x48/0x80 [ 210.287716] __do_softirq+0x128/0x360 [ 210.291392] __irq_exit_rcu+0x138/0x140 [ 210.295243] irq_exit_rcu+0x1c/0x30 [ 210.298745] el1_interrupt+0x38/0x54 [ 210.302334] el1h_64_irq_handler+0x18/0x24 [ 210.306445] el1h_64_irq+0x7c/0x80 [ 210.309857] arch_cpu_idle+0x18/0x2c [ 210.313445] default_idle_call+0x4c/0x140 [ 210.317470] cpuidle_idle_call+0x14c/0x1a0 [ 210.321584] do_idle+0xb0/0x100 [ 210.324737] cpu_startup_entry+0x30/0x8c [ 210.328675] secondary_start_kernel+0xe4/0x110 [ 210.333138] __secondary_switched+0x94/0x98
The assumption when these were relaxed seems to be that device memory would be mapped non reordering, and that other constructs (spinlocks/etc) would provide the barriers to assure that packet data and in memory rings/queues were ordered with respect to device register reads/writes. This itself seems a bit sketchy, but the real problem with GCC12 is that it is moving the actual reads/writes around at will as though they were independent operations when in truth they are not, but the compiler can't know that. When looking at the assembly dumps for many of these routines its possible to see very clean, but not strictly in program order operations occurring as the compiler would be free to do if these weren't actually register reads/write operations.
Its possible to suppress the timeout with a liberal bit of dma_mb()'s sprinkled around but the device still seems unable to reliably send/receive data. A better plan is to use the safer readl/writel everywhere.
Since this partially reverts an older commit, which notes the use of the relaxed variants for performance reasons. I would suggest that any performance problems with this commit are targeted at relaxing only the performance critical code paths after assuring proper barriers.
--- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/broadcom/genet/bcmgenet.c +2 -2
@@ -76,7 +76,7 @@ static inline void bcmgenet_writel(u32 value, void __iomem *offset)if (IS_ENABLED (CONFIG_MIPS ) &&IS_ENABLED (CONFIG_CPU_BIG_ENDIAN ))__raw_writel (value, offset);else -writel_relaxed (value, offset); +writel (value, offset); }static inline u32 bcmgenet_readl (void __iomem *offset)
@@ -84,7 +84,7 @@ static inline u32 bcmgenet_readl(void __iomem *offset)if (IS_ENABLED (CONFIG_MIPS ) &&IS_ENABLED (CONFIG_CPU_BIG_ENDIAN ))return __raw_readl (offset);else -return readl_relaxed (offset); +return readl (offset); } static inline void dmadesc_set_length_status(struct bcmgenet_priv *priv,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 701/1126 tcp: ensure PMTU updates are processed during fastopen
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit ed0c99dc0f499ff8b6e75b5ae6092ab42be1ad39 ]
tp->rx_opt.mss_clamp is not populated, yet, during TFO send so we rise it to the local MSS. tp->mss_cache is not updated, however:
tcp_v6_connect():
tp->rx_opt.mss_clamp = IPV6_MIN_MTU - headers;
tcp_connect():
tcp_connect_init():
tp->mss_cache = min(mtu, tp->rx_opt.mss_clamp)
tcp_send_syn_data():
tp->rx_opt.mss_clamp = tp->advmssAfter recent fixes to ICMPv6 PTB handling we started dropping PMTU updates higher than tp->mss_cache. Because of the stale tp->mss_cache value PMTU updates during TFO are always dropped.
Thanks to Wei for helping zero in on the problem and the fix!
--- net/ipv4/tcp_output.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
net/ipv4/tcp_output.c +4 -1
@@ -3719,6 +3719,7 @@ static void tcp_connect_queue_skb(struct sock *sk, struct sk_buff *skb)*/ static int tcp_send_syn_data (struct sock *sk,struct sk_buff *syn) { +struct inet_connection_sock *icsk =inet_csk (sk);struct tcp_sock *tp =tcp_sk (sk);struct tcp_fastopen_request *fo = tp->fastopen_req;int space, err =0 ;
@@ -3733,8 +3734,10 @@ static int tcp_send_syn_data(struct sock *sk, struct sk_buff *syn)* private TCP options. The cost is reduced data space in SYN :( */ tp->rx_opt.mss_clamp =tcp_mss_clamp (tp, tp->rx_opt.mss_clamp); +/* Sync mss_cache after updating the mss_clamp */ +tcp_sync_mss (sk, icsk->icsk_pmtu_cookie); - space =__tcp_mtu_to_mss (sk,inet_csk (sk)->icsk_pmtu_cookie) - + space =__tcp_mtu_to_mss (sk, icsk->icsk_pmtu_cookie) -MAX_TCP_OPTION_SPACE ; space =min_t (size_t, space, fo->size);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 702/1126 openvswitch: always update flow key after nat
In reply to Greg Kroah-HartmanFrom: Aaron Conole <[email protected]>
[ Upstream commit 60b44ca6bd7518dd38fa2719bc9240378b6172c3 ]
During NAT, a tuple collision may occur. When this happens, openvswitch will make a second pass through NAT which will perform additional packet modification. This will update the skb data, but not the flow key that OVS uses. This means that future flow lookups, and packet matches will have incorrect data. This has been supported since 5d50aa83e2c8 ("openvswitch: support asymmetric conntrack").
That commit failed to properly update the sw_flow_key attributes, since it only called the ovs_ct_nat_update_key once, rather than each time ovs_ct_nat_execute was called. As these two operations are linked, the ovs_ct_nat_execute() function should always make sure that the sw_flow_key is updated after a successful call through NAT infrastructure.
--- net/openvswitch/conntrack.c | 118 ++++++++++++++++++------------------ 1 file changed, 59 insertions(+), 59 deletions(-)
net/openvswitch/conntrack.c +59 -59
@@ -734,6 +734,57 @@ static bool skb_nfct_cached(struct net *net, }#if IS_ENABLED (CONFIG_NF_NAT ) +static void ovs_nat_update_key (struct sw_flow_key *key, +const struct sk_buff *skb, +enum nf_nat_manip_type maniptype) +{ +if (maniptype ==NF_NAT_MANIP_SRC ) { +__be16 src; + + key->ct_state |=OVS_CS_F_SRC_NAT ; +if (key->eth.type ==htons (ETH_P_IP )) + key->ipv4.addr.src =ip_hdr (skb)->saddr; +else if (key->eth.type ==htons (ETH_P_IPV6 )) +memcpy (&key->ipv6.addr.src, &ipv6_hdr (skb)->saddr, +sizeof (key->ipv6.addr.src)); +else +return ; + +if (key->ip.proto ==IPPROTO_UDP ) + src =udp_hdr (skb)->source; +else if (key->ip.proto ==IPPROTO_TCP ) + src =tcp_hdr (skb)->source; +else if (key->ip.proto ==IPPROTO_SCTP ) + src =sctp_hdr (skb)->source; +else +return ; + + key->tp.src = src; + }else { +__be16 dst; + + key->ct_state |=OVS_CS_F_DST_NAT ; +if (key->eth.type ==htons (ETH_P_IP )) + key->ipv4.addr.dst =ip_hdr (skb)->daddr; +else if (key->eth.type ==htons (ETH_P_IPV6 )) +memcpy (&key->ipv6.addr.dst, &ipv6_hdr (skb)->daddr, +sizeof (key->ipv6.addr.dst)); +else +return ; + +if (key->ip.proto ==IPPROTO_UDP ) + dst =udp_hdr (skb)->dest; +else if (key->ip.proto ==IPPROTO_TCP ) + dst =tcp_hdr (skb)->dest; +else if (key->ip.proto ==IPPROTO_SCTP ) + dst =sctp_hdr (skb)->dest; +else +return ; + + key->tp.dst = dst; + } +} +/* Modelled after nf_nat_ipv[46]_fn(). * range is only used for new, uninitialized NAT state. * Returns either NF_ACCEPT or NF_DROP.
@@ -741,7 +792,7 @@ static bool skb_nfct_cached(struct net *net,static int ovs_ct_nat_execute (struct sk_buff *skb,struct nf_conn *ct,enum ip_conntrack_info ctinfo,const struct nf_nat_range2 *range, -enum nf_nat_manip_type maniptype) +enum nf_nat_manip_type maniptype,struct sw_flow_key *key) {int hooknum, nh_off, err =NF_ACCEPT ;
@@ -813,58 +864,11 @@ static int ovs_ct_nat_execute(struct sk_buff *skb, struct nf_conn *ct, push:skb_push_rcsum (skb, nh_off); -return err; -} - -static void ovs_nat_update_key (struct sw_flow_key *key, -const struct sk_buff *skb, -enum nf_nat_manip_type maniptype) -{ -if (maniptype ==NF_NAT_MANIP_SRC ) { -__be16 src; - - key->ct_state |=OVS_CS_F_SRC_NAT ; -if (key->eth.type ==htons (ETH_P_IP )) - key->ipv4.addr.src =ip_hdr (skb)->saddr; -else if (key->eth.type ==htons (ETH_P_IPV6 )) -memcpy (&key->ipv6.addr.src, &ipv6_hdr (skb)->saddr, -sizeof (key->ipv6.addr.src)); -else -return ; - -if (key->ip.proto ==IPPROTO_UDP ) - src =udp_hdr (skb)->source; -else if (key->ip.proto ==IPPROTO_TCP ) - src =tcp_hdr (skb)->source; -else if (key->ip.proto ==IPPROTO_SCTP ) - src =sctp_hdr (skb)->source; -else -return ; - - key->tp.src = src; - }else { -__be16 dst; - - key->ct_state |=OVS_CS_F_DST_NAT ; -if (key->eth.type ==htons (ETH_P_IP )) - key->ipv4.addr.dst =ip_hdr (skb)->daddr; -else if (key->eth.type ==htons (ETH_P_IPV6 )) -memcpy (&key->ipv6.addr.dst, &ipv6_hdr (skb)->daddr, -sizeof (key->ipv6.addr.dst)); -else -return ; - -if (key->ip.proto ==IPPROTO_UDP ) - dst =udp_hdr (skb)->dest; -else if (key->ip.proto ==IPPROTO_TCP ) - dst =tcp_hdr (skb)->dest; -else if (key->ip.proto ==IPPROTO_SCTP ) - dst =sctp_hdr (skb)->dest; -else -return ; +/* Update the flow key if NAT successful. */ +if (err ==NF_ACCEPT ) +ovs_nat_update_key (key, skb, maniptype); - key->tp.dst = dst; - } +return err; }/* Returns NF_DROP if the packet should be dropped, NF_ACCEPT otherwise. */
@@ -906,7 +910,7 @@ static int ovs_ct_nat(struct net *net, struct sw_flow_key *key, }else {return NF_ACCEPT ;/* Connection is not NATed. */ } - err =ovs_ct_nat_execute (skb, ct, ctinfo, &info->range, maniptype); + err =ovs_ct_nat_execute (skb, ct, ctinfo, &info->range, maniptype, key);if (err ==NF_ACCEPT && ct->status &IPS_DST_NAT ) {if (ct->status &IPS_SRC_NAT ) {
@@ -916,17 +920,13 @@ static int ovs_ct_nat(struct net *net, struct sw_flow_key *key, maniptype =NF_NAT_MANIP_SRC ; err =ovs_ct_nat_execute (skb, ct, ctinfo, &info->range, - maniptype); + maniptype, key); }else if (CTINFO2DIR (ctinfo) ==IP_CT_DIR_ORIGINAL ) { err =ovs_ct_nat_execute (skb, ct, ctinfo,NULL , -NF_NAT_MANIP_SRC ); +NF_NAT_MANIP_SRC , key); } } -/* Mark NAT done if successful and update the flow key. */ -if (err ==NF_ACCEPT ) -ovs_nat_update_key (key, skb, maniptype); -return err; }#else /* !CONFIG_NF_NAT */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 703/1126 net: dsa: fix panic on shutdown if multi-chip tree failed to probe
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit 8fd36358ce82382519b50b05f437493e1e00c4a9 ]
DSA probing is atypical because a tree of devices must probe all at once, so out of N switches which call dsa_tree_setup_routing_table() during probe, for (N - 1) of them, "complete" will return false and they will exit probing early. The Nth switch will set up the whole tree on their behalf.
The implication is that for (N - 1) switches, the driver binds to the device successfully, without doing anything. When the driver is bound, the ->shutdown() method may run. But if the Nth switch has failed to initialize the tree, there is nothing to do for the (N - 1) driver instances, since the slave devices have not been created, etc. Moreover, dsa_switch_shutdown() expects that the calling @ds has been in fact initialized, so it jumps at dereferencing the various data structures, which is incorrect.
Avoid the ensuing NULL pointer dereferences by simply checking whether the Nth switch has previously set "ds->setup = true" for the switch which is currently shutting down. The entire setup is serialized under dsa2_mutex which we already hold.
--- net/dsa/dsa2.c | 5 +++++ 1 file changed, 5 insertions(+)
net/dsa/dsa2.c +5 -0
@@ -1722,6 +1722,10 @@ void dsa_switch_shutdown(struct dsa_switch *ds)struct dsa_port *dp;mutex_lock (&dsa2_mutex); + +if (!ds->setup) + goto out; +rtnl_lock ();dsa_switch_for_each_user_port (dp, ds) {
@@ -1738,6 +1742,7 @@ void dsa_switch_shutdown(struct dsa_switch *ds) dp->master->dsa_ptr =NULL ;rtnl_unlock (); +out:mutex_unlock (&dsa2_mutex); }EXPORT_SYMBOL_GPL (dsa_switch_shutdown);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 704/1126 net: wwan: qcom_bam_dmux: fix wrong pointer passed to IS_ERR()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 6b3c74550224c3be24c4cf6ab8c333602b458bff ]
It should check dmux->tx after calling dma_request_chan().
--- drivers/net/wwan/qcom_bam_dmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wwan/qcom_bam_dmux.c +1 -1
@@ -755,7 +755,7 @@ static int __maybe_unused bam_dmux_runtime_resume(struct device *dev)return 0 ; dmux->tx =dma_request_chan (dev,"tx" ); -if (IS_ERR (dmux->rx)) { +if (IS_ERR (dmux->tx)) {dev_err (dev,"Failed to request TX DMA channel: %pe\n" , dmux->tx); dmux->tx =NULL ;bam_dmux_runtime_suspend (dev);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 705/1126 tipc: fix the timer expires after interval 100ms
In reply to Greg Kroah-HartmanFrom: Hoang Le <[email protected]>
[ Upstream commit 6a7d8cff4a3301087dd139293e9bddcf63827282 ]
In the timer callback function tipc_sk_timeout(), we're trying to reschedule another timeout to retransmit a setup request if destination link is congested. But we use the incorrect timeout value (msecs_to_jiffies(100)) instead of (jiffies + msecs_to_jiffies(100)), so that the timer expires immediately, it's irrelevant for original description.
In this commit we correct the timeout value in sk_reset_timer()
--- net/tipc/socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/tipc/socket.c +2 -1
@@ -2852,7 +2852,8 @@ static void tipc_sk_retry_connect(struct sock *sk, struct sk_buff_head *list)/* Try again later if dest link is congested */ if (tsk->cong_link_cnt) { -sk_reset_timer (sk, &sk->sk_timer,msecs_to_jiffies (100 )); +sk_reset_timer (sk, &sk->sk_timer, + jiffies +msecs_to_jiffies (100 ));return ; }/* Prepare SYN for retransmit */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 706/1126 mfd: asic3: Add missing iounmap() on error asic3_mfd_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit e84ee1a75f944a0fe3c277aaa10c426603d2b0bc ]
Add the missing iounmap() before return from asic3_mfd_probe in the error handling case.
--- drivers/mfd/asic3.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/mfd/asic3.c +7 -3
@@ -906,14 +906,14 @@ static int __init asic3_mfd_probe(struct platform_device *pdev, ret =mfd_add_devices (&pdev->dev, pdev->id, &asic3_cell_ds1wm,1 , mem, asic->irq_base,NULL );if (ret <0 ) - goto out; + goto out_unmap; }if (mem_sdio && (irq >=0 )) { ret =mfd_add_devices (&pdev->dev, pdev->id, &asic3_cell_mmc,1 , mem_sdio, irq,NULL );if (ret <0 ) - goto out; + goto out_unmap; } ret =0 ;
@@ -927,8 +927,12 @@ static int __init asic3_mfd_probe(struct platform_device *pdev, ret =mfd_add_devices (&pdev->dev,0 , asic3_cell_leds,ASIC3_NUM_LEDS ,NULL ,0 ,NULL ); } +return ret; - out: +out_unmap: +if (asic->tmio_cnf) +iounmap (asic->tmio_cnf); +out:return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 707/1126 ice: fix scheduling while atomic on aux critical err interrupt
In reply to Greg Kroah-HartmanFrom: Alexander Lobakin <[email protected]>
[ Upstream commit 32d53c0aa3a7b727243473949bad2a830b908edc ]
There's a kernel BUG splat on processing aux critical error interrupts in ice_misc_intr():
[ 2100.917085] BUG: scheduling while atomic: swapper/15/0/0x00010000 ... [ 2101.060770] Call Trace: [ 2101.063229] <IRQ> [ 2101.065252] dump_stack+0x41/0x60 [ 2101.068587] __schedule_bug.cold.100+0x4c/0x58 [ 2101.073060] __schedule+0x6a4/0x830 [ 2101.076570] schedule+0x35/0xa0 [ 2101.079727] schedule_preempt_disabled+0xa/0x10 [ 2101.084284] __mutex_lock.isra.7+0x310/0x420 [ 2101.088580] ? ice_misc_intr+0x201/0x2e0 [ice] [ 2101.093078] ice_send_event_to_aux+0x25/0x70 [ice] [ 2101.097921] ice_misc_intr+0x220/0x2e0 [ice] [ 2101.102232] __handle_irq_event_percpu+0x40/0x180 [ 2101.106965] handle_irq_event_percpu+0x30/0x80 [ 2101.111434] handle_irq_event+0x36/0x53 [ 2101.115292] handle_edge_irq+0x82/0x190 [ 2101.119148] handle_irq+0x1c/0x30 [ 2101.122480] do_IRQ+0x49/0xd0 [ 2101.125465] common_interrupt+0xf/0xf [ 2101.129146] </IRQ>
...
As Andrew correctly mentioned previously[0], the following call ladder happens:
ice_misc_intr() <- hardirq
ice_send_event_to_aux()
device_lock()
mutex_lock()
might_sleep()
might_resched() <- oops
Add a new PF state bit which indicates that an aux critical error occurred and serve it in ice_service_task() in process context. The new ice_pf::oicr_err_reg is read-write in both hardirq and process contexts, but only 3 bits of non-critical data probably aren't worth explicit synchronizing (and they're even in the same byte [31:24]).
[0] https://lore.kernel.org/all/[email protected]
--- drivers/net/ethernet/intel/ice/ice.h | 2 ++ drivers/net/ethernet/intel/ice/ice_main.c | 25 ++++++++++++++--------- 2 files changed, 17 insertions(+), 10 deletions(-)
drivers/net/ethernet/intel/ice/ice.h +2 -0
@@ -290,6 +290,7 @@ enum ice_pf_state {ICE_LINK_DEFAULT_OVERRIDE_PENDING ,ICE_PHY_INIT_COMPLETE ,ICE_FD_VF_FLUSH_CTX ,/* set at FD Rx IRQ or timeout */ +ICE_AUX_ERR_PENDING , ICE_STATE_NBITS /* must be last */ };
@@ -559,6 +560,7 @@ struct ice_pf {wait_queue_head_t reset_wait_queue;u32 hw_csum_rx_error; +u32 oicr_err_reg;u16 oicr_idx;/* Other interrupt cause MSIX vector index */ u16 num_avail_sw_msix;/* remaining MSIX SW vectors left unclaimed */ u16 max_pf_txqs;/* Total Tx queues PF wide */
drivers/net/ethernet/intel/ice/ice_main.c +15 -10
@@ -2255,6 +2255,19 @@ static void ice_service_task(struct work_struct *work)return ; } +if (test_and_clear_bit (ICE_AUX_ERR_PENDING , pf->state)) { +struct iidc_event *event; + + event =kzalloc (sizeof (*event),GFP_KERNEL ); +if (event) { +set_bit (IIDC_EVENT_CRIT_ERR , event->type); +/* report the entire OICR value to AUX driver */ +swap (event->reg, pf->oicr_err_reg); +ice_send_event_to_aux (pf, event); +kfree (event); + } + } +if (test_bit (ICE_FLAG_PLUG_AUX_DEV , pf->flags)) {/* Plug aux device per request */ ice_plug_aux_dev (pf);
@@ -3041,17 +3054,9 @@ static irqreturn_t ice_misc_intr(int __always_unused irq, void *data)#define ICE_AUX_CRIT_ERR (PFINT_OICR_PE_CRITERR_M | PFINT_OICR_HMC_ERR_M | PFINT_OICR_PE_PUSH_M)if (oicr &ICE_AUX_CRIT_ERR ) { -struct iidc_event *event; - + pf->oicr_err_reg |= oicr; +set_bit (ICE_AUX_ERR_PENDING , pf->state); ena_mask &= ~ICE_AUX_CRIT_ERR ; - event =kzalloc (sizeof (*event),GFP_ATOMIC ); -if (event) { -set_bit (IIDC_EVENT_CRIT_ERR , event->type); -/* report the entire OICR value to AUX driver */ - event->reg = oicr; -ice_send_event_to_aux (pf, event); -kfree (event); - } }/* Report any remaining unexpected interrupts */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 708/1126 ice: dont allow to run ice_send_event_to_aux() in atomic ctx
In reply to Greg Kroah-HartmanFrom: Alexander Lobakin <[email protected]>
[ Upstream commit 5a3156932da06f09953764de113419f254086faf ]
ice_send_event_to_aux() eventually descends to mutex_lock() (-> might_sched()), so it must not be called under non-task context. However, at least two fixes have happened already for the bug splats occurred due to this function being called from atomic context.
To make the emergency landings softer, bail out early when executed in non-task context emitting a warn splat only once. This way we trade some events being potentially lost for system stability and avoid any related hangs and crashes.
--- drivers/net/ethernet/intel/ice/ice_idc.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/intel/ice/ice_idc.c +3 -0
@@ -34,6 +34,9 @@ void ice_send_event_to_aux(struct ice_pf *pf, struct iidc_event *event) {struct iidc_auxiliary_drv *iadrv; +if (WARN_ON_ONCE (!in_task ())) +return ; +if (!pf->adev)return ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 709/1126 drivers: ethernet: cpsw: fix panic when interrupt coaleceing is set via ethtool
In reply to Greg Kroah-HartmanFrom: Sondhauß, Jan <[email protected]>
[ Upstream commit 2844e2434385819f674d1fb4130c308c50ba681e ]
cpsw_ethtool_begin directly returns the result of pm_runtime_get_sync when successful.pm_runtime_get_sync returns -error code on failure and 0 on successful resume but also 1 when the device is already active. So the common case for cpsw_ethtool_begin is to return 1. That leads to inconsistent calls to pm_runtime_put in the call-chain so that pm_runtime_put is called one too many times and as result leaving the cpsw dev behind suspended.
The suspended cpsw dev leads to an access violation later on by different parts of the cpsw driver.
Fix this by calling the return-friendly pm_runtime_resume_and_get function.
--- drivers/net/ethernet/ti/cpsw_ethtool.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/net/ethernet/ti/cpsw_ethtool.c +2 -4
@@ -364,11 +364,9 @@ int cpsw_ethtool_op_begin(struct net_device *ndev)struct cpsw_common *cpsw = priv->cpsw;int ret; - ret =pm_runtime_get_sync (cpsw->dev); -if (ret <0 ) { + ret =pm_runtime_resume_and_get (cpsw->dev); +if (ret <0 )cpsw_err (priv, drv,"ethtool begin failed %d\n" , ret); -pm_runtime_put_noidle (cpsw->dev); - }return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 710/1126 kernel/resource: fix kfree() of bootmem memory again
In reply to Greg Kroah-HartmanFrom: Miaohe Lin <[email protected]>
[ Upstream commit 0cbcc92917c5de80f15c24d033566539ad696892 ]
Since commit ebff7d8f270d ("mem hotunplug: fix kfree() of bootmem memory"), we could get a resource allocated during boot via alloc_resource(). And it's required to release the resource using free_resource(). Howerver, many people use kfree directly which will result in kernel BUG. In order to fix this without fixing every call site, just leak a couple of bytes in such corner case.
--- kernel/resource.c | 41 ++++++++--------------------------------- 1 file changed, 8 insertions(+), 33 deletions(-)
kernel/resource.c +8 -33
@@ -56,14 +56,6 @@ struct resource_constraint {static DEFINE_RWLOCK (resource_lock); -/* -* For memory hotplug, there is no way to free resource entries allocated -* by boot mem after the system is up. So for reusing the resource entry -* we need to remember the resource. -*/ -static struct resource *bootmem_resource_free; -static DEFINE_SPINLOCK (bootmem_resource_lock); -static struct resource *next_resource (struct resource *p) {if (p->child)
@@ -160,36 +152,19 @@ __initcall(ioresources_init);static void free_resource (struct resource *res) { -if (!res) -return ; - -if (!PageSlab (virt_to_head_page (res))) { -spin_lock (&bootmem_resource_lock); - res->sibling = bootmem_resource_free; - bootmem_resource_free = res; -spin_unlock (&bootmem_resource_lock); - }else { +/** +* If the resource was allocated using memblock early during boot +* we'll leak it here: we can only return full pages back to the +* buddy and trying to be smart and reusing them eventually in +* alloc_resource() overcomplicates resource handling. +*/ +if (res &&PageSlab (virt_to_head_page (res)))kfree (res); - } }static struct resource *alloc_resource (gfp_t flags) { -struct resource *res =NULL ; - -spin_lock (&bootmem_resource_lock); -if (bootmem_resource_free) { - res = bootmem_resource_free; - bootmem_resource_free = res->sibling; - } -spin_unlock (&bootmem_resource_lock); - -if (res) -memset (res,0 ,sizeof (struct resource )); -else - res =kzalloc (sizeof (struct resource ), flags); - -return res; +return kzalloc (sizeof (struct resource ), flags); }/* Return the conflict entry if you can't request it */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 711/1126 clk: renesas: r9a07g044: Update multiplier and divider values for PLL2/3
In reply to Greg Kroah-HartmanFrom: Lad Prabhakar <[email protected]>
[ Upstream commit b289cdecc7c3e25e001cde260c882e4d9a8b0772 ]
As per the HW manual (Rev.1.00 Sep, 2021) PLL2 and PLL3 should be 1600 MHz, but with current multiplier and divider values this resulted to 1596 MHz.
This patch updates the multiplier and divider values for PLL2 and PLL3 so that we get the exact (1600 MHz) values.
--- drivers/clk/renesas/r9a07g044-cpg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/renesas/r9a07g044-cpg.c +2 -2
@@ -88,8 +88,8 @@ static const struct cpg_core_clk r9a07g044_core_clks[] __initconst = {DEF_FIXED (".osc" ,R9A07G044_OSCCLK ,CLK_EXTAL ,1 ,1 ),DEF_FIXED (".osc_div1000" ,CLK_OSC_DIV1000 ,CLK_EXTAL ,1 ,1000 ),DEF_SAMPLL (".pll1" ,CLK_PLL1 ,CLK_EXTAL ,PLL146_CONF (0 )), -DEF_FIXED (".pll2" ,CLK_PLL2 ,CLK_EXTAL ,133 ,2 ), -DEF_FIXED (".pll3" ,CLK_PLL3 ,CLK_EXTAL ,133 ,2 ), +DEF_FIXED (".pll2" ,CLK_PLL2 ,CLK_EXTAL ,200 ,3 ), +DEF_FIXED (".pll3" ,CLK_PLL3 ,CLK_EXTAL ,200 ,3 ),DEF_FIXED (".pll3_400" ,CLK_PLL3_400 ,CLK_PLL3 ,1 ,4 ), DEF_FIXED(".pll3_533", CLK_PLL3_533, CLK_PLL3, 1, 3),
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 712/1126 staging: r8188eu: release_firmware is not called if allocation fails
In reply to Greg Kroah-HartmanFrom: Michael Straube <[email protected]>
[ Upstream commit 39850edf2befe27bcb3d6c37b6ee76d2ee4df903 ]
In function load_firmware() release_firmware() is not called if the allocation of pFirmware->szFwBuffer fails or if fw->size is greater than FW_8188E_SIZE.
Move the call to release_firmware() to the exit label at the end of the function to fix this.
--- drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +1 -1
@@ -538,10 +538,10 @@ static int load_firmware(struct rt_firmware *pFirmware, struct device *device) }memcpy (pFirmware->szFwBuffer, fw->data, fw->size); pFirmware->ulFwLength = fw->size; -release_firmware (fw);dev_dbg (device,"!bUsedWoWLANFw, FmrmwareLen:%d+\n" , pFirmware->ulFwLength); Exit: +release_firmware (fw);return rtStatus; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 713/1126 mxser: fix xmit_buf leak in activate when LSR == 0xff
In reply to Greg Kroah-HartmanFrom: Jiri Slaby <[email protected]>
[ Upstream commit cd3a4907ee334b40d7aa880c7ab310b154fd5cd4 ]
When LSR is 0xff in ->activate() (rather unlike), we return an error. Provided ->shutdown() is not called when ->activate() fails, nothing actually frees the buffer in this case.
Fix this by properly freeing the buffer in a designated label. We jump there also from the "!info->type" if now too.
--- drivers/tty/mxser.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/tty/mxser.c +11 -4
@@ -744,6 +744,7 @@ static int mxser_activate(struct tty_port *port, struct tty_struct *tty) struct mxser_port *info = container_of(port, struct mxser_port, port);unsigned long page;unsigned long flags; +int ret; page =__get_free_page (GFP_KERNEL );if (!page)
@@ -753,9 +754,9 @@ static int mxser_activate(struct tty_port *port, struct tty_struct *tty)if (!info->type) {set_bit (TTY_IO_ERROR , &tty->flags); -free_page (page);spin_unlock_irqrestore (&info->slock, flags); -return 0 ; + ret =0 ; + goto err_free_xmit; } info->port.xmit_buf = (unsigned char *) page;
@@ -775,8 +776,10 @@ static int mxser_activate(struct tty_port *port, struct tty_struct *tty)if (capable (CAP_SYS_ADMIN )) {set_bit (TTY_IO_ERROR , &tty->flags);return 0 ; - }else -return -ENODEV ; + } + + ret = -ENODEV ; + goto err_free_xmit; }/*
@@ -821,6 +824,10 @@ static int mxser_activate(struct tty_port *port, struct tty_struct *tty)spin_unlock_irqrestore (&info->slock, flags);return 0 ; +err_free_xmit: +free_page (page); + info->port.xmit_buf =NULL ; +return ret; }/*
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 714/1126 fsi: scom: Fix error handling
In reply to Greg Kroah-HartmanFrom: Joel Stanley <[email protected]>
[ Upstream commit d46fddd52d11eb6a3a7ed836f9f273e9cf8cd01c ]
SCOM error handling is made complex by trying to pass around two bits of
information: the function return code, and a status parameter that represents the CFAM error status register.
The commit f72ddbe1d7b7 ("fsi: scom: Remove retries") removed the "hidden" retries in the SCOM driver, in preference of allowing the calling code (userspace or driver) to decide how to handle a failed SCOM. However it introduced a bug by attempting to be smart about the return codes that were "errors" and which were ok to fall through to the status register parsing.
We get the following errors:
- EINVAL or ENXIO, for indirect scoms where the value is invalid
- EINVAL, where the size or address is incorrect
- EIO or ETIMEOUT, where FSI write failed (aspeed master)
- EAGAIN, where the master detected a crc error (GPIO master only)
- EBUSY, where the bus is disabled (GPIO master in external mode)
In all of these cases we should fail the SCOM read/write and return the error.
Thanks to Dan Carpenter for the detailed bug report.
--- drivers/fsi/fsi-scom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/fsi/fsi-scom.c +2 -2
@@ -289,7 +289,7 @@ static int put_scom(struct scom_device *scom, uint64_t value,int rc; rc =raw_put_scom (scom, value, addr, &status); -if (rc == -ENODEV ) +if (rc)return rc; rc =handle_fsi2pib_status (scom, status);
@@ -308,7 +308,7 @@ static int get_scom(struct scom_device *scom, uint64_t *value,int rc; rc =raw_get_scom (scom, value, addr, &status); -if (rc == -ENODEV ) +if (rc)return rc; rc =handle_fsi2pib_status (scom, status);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 715/1126 fsi: scom: Remove retries in indirect scoms
In reply to Greg Kroah-HartmanFrom: Joel Stanley <[email protected]>
[ Upstream commit ab1b79159ad5a6dc4e4994b49737f7feb13b7155 ]
In commit f72ddbe1d7b7 ("fsi: scom: Remove retries") the retries were removed from get and put scoms. That patch missed the retires in get and put indirect scom.
For the same reason, remove them from the scom driver to allow the caller to decide to retry.
This removes the following special case which would have caused the retry code to return early:
- if ((ind_data & XSCOM_DATA_IND_COMPLETE) || (err != SCOM_PIB_BLOCKED))
- return 0;
I believe this case is handled.
--- drivers/fsi/fsi-scom.c | 41 +++++++++++++++-------------------------- 1 file changed, 15 insertions(+), 26 deletions(-)
drivers/fsi/fsi-scom.c +15 -26
@@ -145,7 +145,7 @@ static int put_indirect_scom_form0(struct scom_device *scom, uint64_t value, uint64_t addr, uint32_t *status) { uint64_t ind_data, ind_addr; -int rc, retries, err =0 ; +int rc, err;if (value & ~XSCOM_DATA_IND_DATA )return -EINVAL ;
@@ -156,19 +156,14 @@ static int put_indirect_scom_form0(struct scom_device *scom, uint64_t value,if (rc || (*status &SCOM_STATUS_ANY_ERR ))return rc; -for (retries =0 ; retries <SCOM_MAX_IND_RETRIES ; retries++) { - rc =__get_scom (scom, &ind_data, addr, status); -if (rc || (*status &SCOM_STATUS_ANY_ERR )) -return rc; + rc =__get_scom (scom, &ind_data, addr, status); +if (rc || (*status &SCOM_STATUS_ANY_ERR )) +return rc; - err = (ind_data &XSCOM_DATA_IND_ERR_MASK ) >>XSCOM_DATA_IND_ERR_SHIFT ; - *status = err <<SCOM_STATUS_PIB_RESP_SHIFT ; -if ((ind_data &XSCOM_DATA_IND_COMPLETE ) || (err !=SCOM_PIB_BLOCKED )) -return 0 ; + err = (ind_data &XSCOM_DATA_IND_ERR_MASK ) >>XSCOM_DATA_IND_ERR_SHIFT ; + *status = err <<SCOM_STATUS_PIB_RESP_SHIFT ; -msleep (1 ); - } -return rc; +return 0 ; } static int put_indirect_scom_form1(struct scom_device *scom, uint64_t value,
@@ -188,7 +183,7 @@ static int get_indirect_scom_form0(struct scom_device *scom, uint64_t *value, uint64_t addr, uint32_t *status) { uint64_t ind_data, ind_addr; -int rc, retries, err =0 ; +int rc, err; ind_addr = addr &XSCOM_ADDR_DIRECT_PART ; ind_data = (addr &XSCOM_ADDR_INDIRECT_PART ) |XSCOM_DATA_IND_READ ;
@@ -196,21 +191,15 @@ static int get_indirect_scom_form0(struct scom_device *scom, uint64_t *value,if (rc || (*status &SCOM_STATUS_ANY_ERR ))return rc; -for (retries =0 ; retries <SCOM_MAX_IND_RETRIES ; retries++) { - rc =__get_scom (scom, &ind_data, addr, status); -if (rc || (*status &SCOM_STATUS_ANY_ERR )) -return rc; - - err = (ind_data &XSCOM_DATA_IND_ERR_MASK ) >>XSCOM_DATA_IND_ERR_SHIFT ; - *status = err <<SCOM_STATUS_PIB_RESP_SHIFT ; - *value = ind_data &XSCOM_DATA_IND_DATA ; + rc =__get_scom (scom, &ind_data, addr, status); +if (rc || (*status &SCOM_STATUS_ANY_ERR )) +return rc; -if ((ind_data &XSCOM_DATA_IND_COMPLETE ) || (err !=SCOM_PIB_BLOCKED )) -return 0 ; + err = (ind_data &XSCOM_DATA_IND_ERR_MASK ) >>XSCOM_DATA_IND_ERR_SHIFT ; + *status = err <<SCOM_STATUS_PIB_RESP_SHIFT ; + *value = ind_data &XSCOM_DATA_IND_DATA ; -msleep (1 ); - } -return rc; +return 0 ; } static int raw_put_scom(struct scom_device *scom, uint64_t value,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 716/1126 pwm: lpc18xx-sct: Initialize driver data and hardware before pwmchip_add()
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 0401f24cd238ae200a23a13925f98de3d2c883b8 ]
When a driver calls pwmchip_add() it has to be prepared to immediately get its callbacks called. So move allocation of driver data and hardware initialization before the call to pwmchip_add().
This fixes a potential NULL pointer exception and a race condition on register writes.
--- drivers/pwm/pwm-lpc18xx-sct.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)
drivers/pwm/pwm-lpc18xx-sct.c +9 -11
@@ -395,12 +395,6 @@ static int lpc18xx_pwm_probe(struct platform_device *pdev)lpc18xx_pwm_writel (lpc18xx_pwm,LPC18XX_PWM_LIMIT ,BIT (lpc18xx_pwm->period_event)); - ret =pwmchip_add (&lpc18xx_pwm->chip); -if (ret <0 ) { -dev_err (&pdev->dev,"pwmchip_add failed: %d\n" , ret); - goto disable_pwmclk; - } -for (i =0 ; i < lpc18xx_pwm->chip.npwm; i++) {struct lpc18xx_pwm_data *data;
@@ -410,14 +404,12 @@ static int lpc18xx_pwm_probe(struct platform_device *pdev) GFP_KERNEL);if (!data) { ret = -ENOMEM ; - goto remove_pwmchip; + goto disable_pwmclk; }pwm_set_chip_data (pwm, data); } -platform_set_drvdata (pdev, lpc18xx_pwm); - val =lpc18xx_pwm_readl (lpc18xx_pwm,LPC18XX_PWM_CTRL ); val &= ~LPC18XX_PWM_BIDIR ; val &= ~LPC18XX_PWM_CTRL_HALT ;
@@ -425,10 +417,16 @@ static int lpc18xx_pwm_probe(struct platform_device *pdev) val |=LPC18XX_PWM_PRE (0 );lpc18xx_pwm_writel (lpc18xx_pwm,LPC18XX_PWM_CTRL , val); + ret =pwmchip_add (&lpc18xx_pwm->chip); +if (ret <0 ) { +dev_err (&pdev->dev,"pwmchip_add failed: %d\n" , ret); + goto disable_pwmclk; + } + +platform_set_drvdata (pdev, lpc18xx_pwm); +return 0 ; -remove_pwmchip: -pwmchip_remove (&lpc18xx_pwm->chip); disable_pwmclk:clk_disable_unprepare (lpc18xx_pwm->pwm_clk);return ret;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 717/1126 pps: clients: gpio: Propagate return value from pps_gpio_probe
In reply to Greg Kroah-HartmanFrom: Robert Hancock <[email protected]>
[ Upstream commit abaca3179b41d4b3b115f27814ee36f6fb45e897 ]
If the pps-gpio driver was probed prior to the GPIO device it uses, the devm_gpiod_get call returned an -EPROBE_DEFER error, but pps_gpio_probe replaced that error code with -EINVAL, causing the pps-gpio probe to fail and not be retried later. Propagate the error return value so that deferred probe works properly.
--- drivers/pps/clients/pps-gpio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pps/clients/pps-gpio.c +1 -1
@@ -169,7 +169,7 @@ static int pps_gpio_probe(struct platform_device *pdev)/* GPIO setup */ ret =pps_gpio_setup (dev);if (ret) -return -EINVAL ; +return ret;/* IRQ setup */ ret =gpiod_to_irq (data->gpio_pin);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 718/1126 fsi: Aspeed: Fix a potential double free
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 83ba7e895debc529803a7a258653f2fe9bf3bf40 ]
A struct device can never be devm_alloc()'ed.
Here, it is embedded in "struct fsi_master", and "struct fsi_master" is embedded in "struct fsi_master_aspeed".
Since "struct device" is embedded, the data structure embedding it must be released with the release function, as is already done here.
So use kzalloc() instead of devm_kzalloc() when allocating "aspeed" and update all error handling branches accordingly.
This prevent a potential double free().
This also fix another issue if opb_readl() fails. Instead of a direct return, it now jumps in the error handling path.
--- drivers/fsi/fsi-master-aspeed.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/fsi/fsi-master-aspeed.c +11 -6
@@ -542,25 +542,28 @@ static int fsi_master_aspeed_probe(struct platform_device *pdev)return rc; } - aspeed =devm_kzalloc (&pdev->dev,sizeof (*aspeed),GFP_KERNEL ); + aspeed =kzalloc (sizeof (*aspeed),GFP_KERNEL );if (!aspeed)return -ENOMEM ; aspeed->dev = &pdev->dev; aspeed->base =devm_platform_ioremap_resource (pdev,0 ); -if (IS_ERR (aspeed->base)) -return PTR_ERR (aspeed->base); +if (IS_ERR (aspeed->base)) { + rc =PTR_ERR (aspeed->base); + goto err_free_aspeed; + } aspeed->clk =devm_clk_get (aspeed->dev,NULL );if (IS_ERR (aspeed->clk)) {dev_err (aspeed->dev,"couldn't get clock\n" ); -return PTR_ERR (aspeed->clk); + rc =PTR_ERR (aspeed->clk); + goto err_free_aspeed; } rc =clk_prepare_enable (aspeed->clk);if (rc) {dev_err (aspeed->dev,"couldn't enable clock\n" ); -return rc; + goto err_free_aspeed; } rc =setup_cfam_reset (aspeed);
@@ -595,7 +598,7 @@ static int fsi_master_aspeed_probe(struct platform_device *pdev) rc =opb_readl (aspeed, ctrl_base +FSI_MVER , &raw);if (rc) {dev_err (&pdev->dev,"failed to read hub version\n" ); -return rc; + goto err_release; } reg =be32_to_cpu (raw);
@@ -634,6 +637,8 @@ static int fsi_master_aspeed_probe(struct platform_device *pdev) err_release:clk_disable_unprepare (aspeed->clk); +err_free_aspeed: +kfree (aspeed);return rc; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 719/1126 misc: alcor_pci: Fix an error handling path
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 5b3dc949f554379edcb8ef6111aa5ecb78feb798 ]
A successful ida_simple_get() should be balanced by a corresponding ida_simple_remove().
Add the missing call in the error handling path of the probe.
While at it, switch to ida_alloc()/ida_free() instead to ida_simple_get()/ida_simple_remove().
The latter is deprecated and more verbose.
--- drivers/misc/cardreader/alcor_pci.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/misc/cardreader/alcor_pci.c +6 -3
@@ -266,7 +266,7 @@ static int alcor_pci_probe(struct pci_dev *pdev,if (!priv)return -ENOMEM ; - ret =ida_simple_get (&alcor_pci_idr,0 ,0 ,GFP_KERNEL ); + ret =ida_alloc (&alcor_pci_idr,GFP_KERNEL );if (ret <0 )return ret; priv->id = ret;
@@ -280,7 +280,8 @@ static int alcor_pci_probe(struct pci_dev *pdev, ret =pci_request_regions (pdev,DRV_NAME_ALCOR_PCI );if (ret) {dev_err (&pdev->dev,"Cannot request region\n" ); -return -ENOMEM ; + ret = -ENOMEM ; + goto error_free_ida; }if (!(pci_resource_flags (pdev, bar) &IORESOURCE_MEM )) {
@@ -324,6 +325,8 @@ static int alcor_pci_probe(struct pci_dev *pdev, error_release_regions:pci_release_regions (pdev); +error_free_ida: +ida_free (&alcor_pci_idr, priv->id);return ret; }
@@ -337,7 +340,7 @@ static void alcor_pci_remove(struct pci_dev *pdev)mfd_remove_devices (&pdev->dev); -ida_simple_remove (&alcor_pci_idr, priv->id); +ida_free (&alcor_pci_idr, priv->id);pci_release_regions (pdev);pci_set_drvdata (pdev,NULL );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 720/1126 cpufreq: qcom-cpufreq-nvmem: fix reading of PVS Valid fuse
In reply to Greg Kroah-HartmanFrom: Luca Weiss <[email protected]>
[ Upstream commit 4a8a77abf0e2b6468ba0281e33384cbec5fb476a ]
The fuse consists of 64 bits, with this statement we're supposed to get the upper 32 bits but it actually read out of bounds and got 0 instead of the desired value which lead to the "PVS bin not set." codepath being run resetting our pvs value.
--- drivers/cpufreq/qcom-cpufreq-nvmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpufreq/qcom-cpufreq-nvmem.c +1 -1
@@ -130,7 +130,7 @@ static void get_krait_bin_format_b(struct device *cpu_dev, }/* Check PVS_BLOW_STATUS */ - pte_efuse = *(((u32 *)buf) +4 ); + pte_efuse = *(((u32 *)buf) +1 ); pte_efuse &=BIT (21 );if (pte_efuse) {dev_dbg (cpu_dev,"PVS bin: %d\n" , *pvs);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 721/1126 soundwire: intel: fix wrong register name in intel_shim_wake
In reply to Greg Kroah-HartmanFrom: Libin Yang <[email protected]>
[ Upstream commit 3957db3ae3dae6f8b8168791f154567fe49e1fd7 ]
When clearing the sdw wakests status, we should use SDW_SHIM_WAKESTS.
--- drivers/soundwire/intel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/soundwire/intel.c +2 -2
@@ -448,8 +448,8 @@ static void intel_shim_wake(struct sdw_intel *sdw, bool wake_enable)/* Clear wake status */ wake_sts =intel_readw (shim,SDW_SHIM_WAKESTS ); - wake_sts |= (SDW_SHIM_WAKEEN_ENABLE << link_id); -intel_writew (shim,SDW_SHIM_WAKESTS_STATUS , wake_sts); + wake_sts |= (SDW_SHIM_WAKESTS_STATUS << link_id); +intel_writew (shim,SDW_SHIM_WAKESTS , wake_sts); }mutex_unlock (sdw->link_res->shim_lock); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 722/1126 clk: qcom: ipq8074: fix PCI-E clock oops
In reply to Greg Kroah-HartmanFrom: Robert Marko <[email protected]>
[ Upstream commit bf8f5182b8f59309809b41c1d1730ed9ca6134b1 ]
Fix PCI-E clock related kernel oops that are caused by a missing clock parent.
pcie0_rchng_clk_src has num_parents set to 2 but only one parent is actually set via parent_hws, it should also have "XO" defined. This will cause the kernel to panic on a NULL pointer in clk_core_get_parent_by_index().
So, to fix this utilize clk_parent_data to provide gcc_xo_gpll0 parent data.
Since there is already an existing static const char * const gcc_xo_gpll0[] used to provide the same parents via parent_names convert those users to clk_parent_data as well.
Without this earlycon is needed to even catch the OOPS as it will reset the board before serial is initialized with the following:
[ 0.232279] Unable to handle kernel paging request at virtual address 0000a00000000000 [ 0.232322] Mem abort info: [ 0.239094] ESR = 0x96000004 [ 0.241778] EC = 0x25: DABT (current EL), IL = 32 bits [ 0.244908] SET = 0, FnV = 0 [ 0.250377] EA = 0, S1PTW = 0 [ 0.253236] FSC = 0x04: level 0 translation fault [ 0.256277] Data abort info: [ 0.261141] ISV = 0, ISS = 0x00000004 [ 0.264262] CM = 0, WnR = 0 [ 0.267820] [0000a00000000000] address between user and kernel address ranges [ 0.270954] Internal error: Oops: 96000004 [#1] SMP [ 0.278067] Modules linked in: [ 0.282751] CPU: 1 PID: 1 Comm: swapper/0 Not tainted 5.15.10 #0 [ 0.285882] Hardware name: Xiaomi AX3600 (DT) [ 0.292043] pstate: 20400005 (nzCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 0.296299] pc : clk_core_get_parent_by_index+0x68/0xec [ 0.303067] lr : __clk_register+0x1d8/0x820 [ 0.308273] sp : ffffffc01111b7d0 [ 0.312438] x29: ffffffc01111b7d0 x28: 0000000000000000 x27: 0000000000000040 [ 0.315919] x26: 0000000000000002 x25: 0000000000000000 x24: ffffff8000308800 [ 0.323037] x23: ffffff8000308850 x22: ffffff8000308880 x21: ffffff8000308828 [ 0.330155] x20: 0000000000000028 x19: ffffff8000309700 x18: 0000000000000020 [ 0.337272] x17: 000000005cc86990 x16: 0000000000000004 x15: ffffff80001d9d0a [ 0.344391] x14: 0000000000000000 x13: 0000000000000000 x12: 0000000000000006 [ 0.351508] x11: 0000000000000003 x10: 0101010101010101 x9 : 0000000000000000 [ 0.358626] x8 : 7f7f7f7f7f7f7f7f x7 : 6468626f5e626266 x6 : 17000a3a403c1b06 [ 0.365744] x5 : 061b3c403a0a0017 x4 : 0000000000000000 x3 : 0000000000000001 [ 0.372863] x2 : 0000a00000000000 x1 : 0000000000000001 x0 : ffffff8000309700 [ 0.379982] Call trace: [ 0.387091] clk_core_get_parent_by_index+0x68/0xec [ 0.389351] __clk_register+0x1d8/0x820 [ 0.394210] devm_clk_hw_register+0x5c/0xe0 [ 0.398030] devm_clk_register_regmap+0x44/0x8c [ 0.402198] qcom_cc_really_probe+0x17c/0x1d0 [ 0.406711] qcom_cc_probe+0x34/0x44 [ 0.411224] gcc_ipq8074_probe+0x18/0x30 [ 0.414869] platform_probe+0x68/0xe0 [ 0.418776] really_probe.part.0+0x9c/0x30c [ 0.422336] __driver_probe_device+0x98/0x144 [ 0.426329] driver_probe_device+0x44/0x11c [ 0.430842] __device_attach_driver+0xb4/0x120 [ 0.434836] bus_for_each_drv+0x68/0xb0 [ 0.439349] __device_attach+0xb0/0x170 [ 0.443081] device_initial_probe+0x14/0x20 [ 0.446901] bus_probe_device+0x9c/0xa4 [ 0.451067] device_add+0x35c/0x834 [ 0.454886] of_device_add+0x54/0x64 [ 0.458360] of_platform_device_create_pdata+0xc0/0x100 [ 0.462181] of_platform_bus_create+0x114/0x370 [ 0.467128] of_platform_bus_create+0x15c/0x370 [ 0.471641] of_platform_populate+0x50/0xcc [ 0.476155] of_platform_default_populate_init+0xa8/0xc8 [ 0.480324] do_one_initcall+0x50/0x1b0 [ 0.485877] kernel_init_freeable+0x234/0x29c [ 0.489436] kernel_init+0x24/0x120 [ 0.493948] ret_from_fork+0x10/0x20 [ 0.497253] Code: d50323bf d65f03c0 f94002a2 b4000302 (f9400042) [ 0.501079] ---[ end trace 4ca7e1129da2abce ]---
--- drivers/clk/qcom/gcc-ipq8074.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
drivers/clk/qcom/gcc-ipq8074.c +9 -10
@@ -60,11 +60,6 @@ static const struct parent_map gcc_xo_gpll0_gpll0_out_main_div2_map[] = { { P_GPLL0_DIV2, 4 }, }; -static const char *const gcc_xo_gpll0[] = { -"xo" , -"gpll0" , -}; -static const struct parent_map gcc_xo_gpll0_map[] = { {P_XO ,0 }, { P_GPLL0, 1 },
@@ -956,6 +951,11 @@ static struct clk_rcg2 blsp1_uart6_apps_clk_src = { }, }; +static const struct clk_parent_data gcc_xo_gpll0[] = { + { .fw_name ="xo" }, + { .hw = &gpll0.clkr.hw }, +}; +static const struct freq_tbl ftbl_pcie_axi_clk_src[] = {F (19200000 ,P_XO ,1 ,0 ,0 ),F (200000000 ,P_GPLL0 ,4 ,0 ,0 ),
@@ -969,7 +969,7 @@ static struct clk_rcg2 pcie0_axi_clk_src = { .parent_map = gcc_xo_gpll0_map, .clkr.hw.init = &(struct clk_init_data ){ .name ="pcie0_axi_clk_src" , - .parent_names = gcc_xo_gpll0, + .parent_data = gcc_xo_gpll0, .num_parents =2 , .ops = &clk_rcg2_ops, },
@@ -1016,7 +1016,7 @@ static struct clk_rcg2 pcie1_axi_clk_src = { .parent_map = gcc_xo_gpll0_map, .clkr.hw.init = &(struct clk_init_data ){ .name ="pcie1_axi_clk_src" , - .parent_names = gcc_xo_gpll0, + .parent_data = gcc_xo_gpll0, .num_parents =2 , .ops = &clk_rcg2_ops, },
@@ -1330,7 +1330,7 @@ static struct clk_rcg2 nss_ce_clk_src = { .parent_map = gcc_xo_gpll0_map, .clkr.hw.init = &(struct clk_init_data ){ .name ="nss_ce_clk_src" , - .parent_names = gcc_xo_gpll0, + .parent_data = gcc_xo_gpll0, .num_parents =2 , .ops = &clk_rcg2_ops, },
@@ -4329,8 +4329,7 @@ static struct clk_rcg2 pcie0_rchng_clk_src = { .parent_map = gcc_xo_gpll0_map, .clkr.hw.init = &(struct clk_init_data ){ .name ="pcie0_rchng_clk_src" , - .parent_hws = (const struct clk_hw *[]) { - &gpll0.clkr.hw }, + .parent_data = gcc_xo_gpll0, .num_parents =2 , .ops = &clk_rcg2_ops, },
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 723/1126 dmaengine: idxd: restore traffic class defaults after wq reset
In reply to Greg Kroah-HartmanFrom: Dave Jiang <[email protected]>
[ Upstream commit ea7c8f598c323f6ebaf9ddae01fb2a981fe8c56a ]
When clearing the group configurations, the driver fails to restore the default setting for DSA 1.x based devices. Add defaults in idxd_groups_clear_state() for traffic class configuration.
--- drivers/dma/idxd/device.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/dma/idxd/device.c +7 -2
@@ -681,8 +681,13 @@ static void idxd_groups_clear_state(struct idxd_device *idxd) group->use_rdbuf_limit = false; group->rdbufs_allowed =0 ; group->rdbufs_reserved =0 ; - group->tc_a =-1 ; - group->tc_b =-1 ; +if (idxd->hw.version <DEVICE_VERSION_2 && !tc_override) { + group->tc_a =1 ; + group->tc_b =1 ; + }else { + group->tc_a =-1 ; + group->tc_b =-1 ; + } } }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 724/1126 iio: mma8452: Fix probe failing when an i2c_device_id is used
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit a47ac019e7e8129b93a0b991e04b2a59872e053d ]
The mma8452_driver declares both of_match_table and i2c_driver.id_table match-tables, but its probe() function only checked for of matches.
Add support for i2c_device_id matches. This fixes the driver not loading on some x86 tablets (e.g. the Nextbook Ares 8) where the i2c_client is instantiated by platform code using an i2c_device_id.
Drop of_match_ptr() protection to avoid unused warning.
--- drivers/iio/accel/mma8452.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-)
drivers/iio/accel/mma8452.c +18 -11
@@ -176,6 +176,7 @@ static const struct mma8452_event_regs trans_ev_regs = {* @enabled_events: event flags enabled and handled by this driver */ struct mma_chip_info { +const char *name;u8 chip_id;const struct iio_chan_spec *channels;int num_channels;
@@ -1301,6 +1302,7 @@ enum {static const struct mma_chip_info mma_chip_info_table[] = { [mma8451] = { + .name ="mma8451" , .chip_id =MMA8451_DEVICE_ID , .channels = mma8451_channels, .num_channels =ARRAY_SIZE (mma8451_channels),
@@ -1325,6 +1327,7 @@ static const struct mma_chip_info mma_chip_info_table[] = { MMA8452_INT_FF_MT, }, [mma8452] = { + .name = "mma8452", .chip_id = MMA8452_DEVICE_ID, .channels = mma8452_channels, .num_channels = ARRAY_SIZE(mma8452_channels),
@@ -1341,6 +1344,7 @@ static const struct mma_chip_info mma_chip_info_table[] = { MMA8452_INT_FF_MT, }, [mma8453] = { + .name = "mma8453", .chip_id = MMA8453_DEVICE_ID, .channels = mma8453_channels, .num_channels = ARRAY_SIZE(mma8453_channels),
@@ -1357,6 +1361,7 @@ static const struct mma_chip_info mma_chip_info_table[] = { MMA8452_INT_FF_MT, }, [mma8652] = { + .name = "mma8652", .chip_id = MMA8652_DEVICE_ID, .channels = mma8652_channels, .num_channels = ARRAY_SIZE(mma8652_channels),
@@ -1366,6 +1371,7 @@ static const struct mma_chip_info mma_chip_info_table[] = { .enabled_events = MMA8452_INT_FF_MT, }, [mma8653] = { + .name = "mma8653", .chip_id = MMA8653_DEVICE_ID, .channels = mma8653_channels, .num_channels = ARRAY_SIZE(mma8653_channels),
@@ -1380,6 +1386,7 @@ static const struct mma_chip_info mma_chip_info_table[] = { .enabled_events = MMA8452_INT_FF_MT, }, [fxls8471] = { + .name = "fxls8471", .chip_id = FXLS8471_DEVICE_ID, .channels = mma8451_channels, .num_channels = ARRAY_SIZE(mma8451_channels),
@@ -1522,13 +1529,6 @@ static int mma8452_probe(struct i2c_client *client,struct mma8452_data *data;struct iio_dev *indio_dev;int ret; -const struct of_device_id *match; - - match =of_match_device (mma8452_dt_ids, &client->dev); -if (!match) { -dev_err (&client->dev,"unknown device model\n" ); -return -ENODEV ; - } indio_dev =devm_iio_device_alloc (&client->dev,sizeof (*data));if (!indio_dev)
@@ -1537,7 +1537,14 @@ static int mma8452_probe(struct i2c_client *client, data =iio_priv (indio_dev); data->client = client;mutex_init (&data->lock); - data->chip_info = match->data; + + data->chip_info =device_get_match_data (&client->dev); +if (!data->chip_info && id) { + data->chip_info = &mma_chip_info_table[id->driver_data]; + }else { +dev_err (&client->dev,"unknown device model\n" ); +return -ENODEV ; + } data->vdd_reg =devm_regulator_get (&client->dev,"vdd" );if (IS_ERR (data->vdd_reg))
@@ -1581,11 +1588,11 @@ static int mma8452_probe(struct i2c_client *client, }dev_info (&client->dev,"registering %s accelerometer; ID 0x%x\n" , - match->compatible, data->chip_info->chip_id); + data->chip_info->name, data->chip_info->chip_id);i2c_set_clientdata (client, indio_dev); indio_dev->info = &mma8452_info; - indio_dev->name = id->name; + indio_dev->name = data->chip_info->name; indio_dev->modes =INDIO_DIRECT_MODE ; indio_dev->channels = data->chip_info->channels; indio_dev->num_channels = data->chip_info->num_channels;
@@ -1810,7 +1817,7 @@ MODULE_DEVICE_TABLE(i2c, mma8452_id);static struct i2c_driver mma8452_driver = { .driver = { .name ="mma8452" , - .of_match_table =of_match_ptr (mma8452_dt_ids), + .of_match_table = mma8452_dt_ids, .pm = &mma8452_pm_ops, }, .probe = mma8452_probe,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 725/1126 staging: qlge: add unregister_netdev in qlge_probe
In reply to Greg Kroah-HartmanFrom: Hangyu Hua <[email protected]>
[ Upstream commit 4fcc0c275e3f59cd68f977c57953783f8014ed15 ]
unregister_netdev need to be called when register_netdev succeeds qlge_health_create_reporters fails.
--- drivers/staging/qlge/qlge_main.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/staging/qlge/qlge_main.c +7 -4
@@ -4605,14 +4605,12 @@ static int qlge_probe(struct pci_dev *pdev, err =register_netdev (ndev);if (err) {dev_err (&pdev->dev,"net device registration failed.\n" ); -qlge_release_all (pdev); -pci_disable_device (pdev); - goto netdev_free; + goto cleanup_pdev; } err =qlge_health_create_reporters (qdev);if (err) - goto netdev_free; + goto unregister_netdev;/* Start up the timer to trigger EEH if * the bus goes dead
@@ -4626,6 +4624,11 @@ static int qlge_probe(struct pci_dev *pdev,devlink_register (devlink);return 0 ; +unregister_netdev: +unregister_netdev (ndev); +cleanup_pdev: +qlge_release_all (pdev); +pci_disable_device (pdev); netdev_free:free_netdev (ndev); devlink_free:
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 726/1126 serial: 8250_aspeed_vuart: add PORT_ASPEED_VUART port type
In reply to Greg Kroah-HartmanFrom: Zev Weiss <[email protected]>
[ Upstream commit a603ca60cebff8589882427a67f870ed946b3fc8 ]
Commit 54da3e381c2b ("serial: 8250_aspeed_vuart: use UPF_IOREMAP to set up register mapping") fixed a bug that had, as a side-effect, prevented the 8250_aspeed_vuart driver from enabling the VUART's FIFOs. However, fixing that (and hence enabling the FIFOs) has in turn revealed what appears to be a hardware bug in the ASPEED VUART in which the host-side THRE bit doesn't get if the BMC-side receive FIFO trigger level is set to anything but one byte. This causes problems for polled-mode writes from the host -- for example, Linux kernel console writes proceed at a glacial pace (less than 100 bytes per second) because the write path waits for a 10ms timeout to expire after every character instead of being able to continue on to the next character upon seeing THRE asserted. (GRUB behaves similarly.)
As a workaround, introduce a new port type for the ASPEED VUART that's identical to PORT_16550A as it had previously been using, but with UART_FCR_R_TRIG_00 instead to set the receive FIFO trigger level to one byte, which (experimentally) seems to avoid the problematic THRE behavior.
--- drivers/tty/serial/8250/8250_aspeed_vuart.c | 2 +- drivers/tty/serial/8250/8250_port.c | 8 ++++++++ include/uapi/linux/serial_core.h | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-)
drivers/tty/serial/8250/8250_aspeed_vuart.c +1 -1
@@ -487,7 +487,7 @@ static int aspeed_vuart_probe(struct platform_device *pdev) port.port.irq =irq_of_parse_and_map (np,0 ); port.port.handle_irq = aspeed_vuart_handle_irq; port.port.iotype =UPIO_MEM ; - port.port.type =PORT_16550A ; + port.port.type =PORT_ASPEED_VUART ; port.port.uartclk = clk; port.port.flags =UPF_SHARE_IRQ |UPF_BOOT_AUTOCONF |UPF_IOREMAP |UPF_FIXED_PORT |UPF_FIXED_TYPE |UPF_NO_THRE_TEST ;
drivers/tty/serial/8250/8250_port.c +8 -0
@@ -307,6 +307,14 @@ static const struct serial8250_config uart_config[] = { .rxtrig_bytes = {1, 32, 64, 112}, .flags = UART_CAP_FIFO | UART_CAP_SLEEP, }, + [PORT_ASPEED_VUART] = { + .name ="ASPEED VUART" , + .fifo_size = 16, + .tx_loadsz = 16, + .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_00, + .rxtrig_bytes = {1, 4, 8, 14}, + .flags = UART_CAP_FIFO, + }, };/* Uart divisor latch read */
include/uapi/linux/serial_core.h +3 -0
@@ -68,6 +68,9 @@/* NVIDIA Tegra Combined UART */ #define PORT_TEGRA_TCU 41 +/* ASPEED AST2x00 virtual UART */ +#define PORT_ASPEED_VUART 42 +/* Intel EG20 */ #define PORT_PCH_8LINE 44#define PORT_PCH_2LINE 45
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 727/1126 staging:iio:adc:ad7280a: Fix handing of device address bit reversing.
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit f281e4ddbbc0b60f061bc18a2834e9363ba85f9f ]
The bit reversal was wrong for bits 1 and 3 of the 5 bits. Result is driver failure to probe if you have more than 2 daisy-chained devices. Discovered via QEMU based device emulation.
Fixes tag is for when this moved from a macro to a function, but it was broken before that.
--- drivers/staging/iio/adc/ad7280a.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/iio/adc/ad7280a.c +2 -2
@@ -107,9 +107,9 @@static unsigned int ad7280a_devaddr (unsigned int addr) {return ((addr &0x1 ) <<4 ) | - ((addr &0x2 ) <<3 ) | + ((addr &0x2 ) <<2 ) | (addr &0x4 ) | - ((addr &0x8 ) >>3 ) | + ((addr &0x8 ) >>2 ) | ((addr &0x10 ) >>4 ); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 728/1126 clk: renesas: r8a779f0: Fix RSW2 clock divider
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 691419f90f7fb8a6f247b477cb539644e11431da ]
According to Section 8.1.2 Figure 8.1.1 ("Block Diagram of CPG"), Note 22 ("RSW2 divider"), and Table 8.1.4d ("Lists of CPG clocks generated from CPGMA1"), the RSwitch2 and PCI Express clock is generated from PLL5 by dividing by two, followed by the RSW2 divider. As PLL5 runs at 3200 MHz, and RSW2 is fixed to 320 MHz, the RSW2 divider must be 5.
Correct the parent and the fixed divider.
--- drivers/clk/renesas/r8a779f0-cpg-mssr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/renesas/r8a779f0-cpg-mssr.c +1 -1
@@ -103,7 +103,7 @@ static const struct cpg_core_clk r8a779f0_core_clks[] __initconst = {DEF_FIXED ("s0d12_hsc" ,R8A779F0_CLK_S0D12_HSC ,CLK_S0 ,12 ,1 ),DEF_FIXED ("cl16m_hsc" ,R8A779F0_CLK_CL16M_HSC ,CLK_S0 ,48 ,1 ),DEF_FIXED ("s0d2_cc" ,R8A779F0_CLK_S0D2_CC ,CLK_S0 ,2 ,1 ), -DEF_FIXED ("rsw2" ,R8A779F0_CLK_RSW2 ,CLK_PLL5 ,2 ,1 ), +DEF_FIXED ("rsw2" ,R8A779F0_CLK_RSW2 ,CLK_PLL5_DIV2 ,5 ,1 ),DEF_FIXED ("cbfusa" ,R8A779F0_CLK_CBFUSA ,CLK_EXTAL ,2 ,1 ), DEF_FIXED("cpex", R8A779F0_CLK_CPEX, CLK_EXTAL, 2, 1),
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 729/1126 pinctrl: renesas: r8a77470: Reduce size for narrow VIN1 channel
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 9e04a0eda84fccab0ac22a33825ad53f47c968c7 ]
The second video-in channel on RZ/G1C has only 12 data lanes, but the pin control driver uses the vin_data union, which is meant for 24 data lanes, thus wasting space.
Fix this by using the vin_data12 union instead.
This reduces kernel size by 96 bytes.
--- drivers/pinctrl/renesas/pfc-r8a77470.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pinctrl/renesas/pfc-r8a77470.c +2 -2
@@ -2140,7 +2140,7 @@ static const unsigned int vin0_clk_mux[] = { VI0_CLK_MARK, };/* - VIN1 ------------------------------------------------------------------- */ -static const union vin_data vin1_data_pins = { +static const union vin_data12 vin1_data_pins = { .data12 = {RCAR_GP_PIN (3 ,1 ),RCAR_GP_PIN (3 ,2 ),RCAR_GP_PIN (3 ,3 ),RCAR_GP_PIN (3 ,4 ),
@@ -2150,7 +2150,7 @@ static const union vin_data vin1_data_pins = { RCAR_GP_PIN(3, 15), RCAR_GP_PIN(3, 16), }, }; -static const union vin_data vin1_data_mux = { +static const union vin_data12 vin1_data_mux = { .data12 = {VI1_DATA0_MARK ,VI1_DATA1_MARK ,VI1_DATA2_MARK ,VI1_DATA3_MARK ,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 730/1126 pinctrl: renesas: checker: Fix miscalculation of number of states
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit de9b861018d46af27a5edff8b6baef35c0c0ad4f ]
The checker failed to validate all enum IDs in the description of a register with fixed-width register fields, due to a miscalculation of the number of described states: each register field of n bits can have "1 << n" possible states, not "1".
Increase SH_PFC_MAX_ENUMS accordingly, now more enum IDs are checked (SH-Mobile AG5 has more than 4000 enum IDs defined).
--- drivers/pinctrl/renesas/core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/pinctrl/renesas/core.c +3 -2
@@ -741,7 +741,7 @@ static int sh_pfc_suspend_init(struct sh_pfc *pfc) { return 0; }#ifdef DEBUG #define SH_PFC_MAX_REGS 300 -#define SH_PFC_MAX_ENUMS 3000 +#define SH_PFC_MAX_ENUMS 5000static unsigned int sh_pfc_errors__initdata ;static unsigned int sh_pfc_warnings__initdata ;
@@ -865,7 +865,8 @@ static void __init sh_pfc_check_cfg_reg(const char *drvname, GENMASK(cfg_reg->reg_width - 1, 0));if (cfg_reg->field_width) { - n = cfg_reg->reg_width / cfg_reg->field_width; + fw = cfg_reg->field_width; + n = (cfg_reg->reg_width / fw) << fw;/* Skip field checks (done at build time) */ goto check_enum_ids; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 731/1126 clk: qcom: ipq8074: Use floor ops for SDCC1 clock
In reply to Greg Kroah-HartmanFrom: Dirk Buchwalder <[email protected]>
[ Upstream commit b77d8306d84f83d1da68028a68c91da9c867b6f6 ]
Use floor ops on SDCC1 APPS clock in order to round down selected clock frequency and avoid overclocking SD/eMMC cards.
For example, currently HS200 cards were failling tuning as they were actually being clocked at 384MHz instead of 192MHz.
This caused some boards to disable 1.8V I/O and force the eMMC into the standard HS mode (50MHz) and that appeared to work despite the eMMC being overclocked to 96Mhz in that case.
There was a previous commit to use floor ops on SDCC clocks, but it looks to have only covered SDCC2 clock.
--- drivers/clk/qcom/gcc-ipq8074.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/qcom/gcc-ipq8074.c +1 -1
@@ -1074,7 +1074,7 @@ static struct clk_rcg2 sdcc1_apps_clk_src = { .name = "sdcc1_apps_clk_src", .parent_names = gcc_xo_gpll0_gpll2_gpll0_out_main_div2, .num_parents = 4, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_floor_ops, }, };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 732/1126 phy: dphy: Correct lpx parameter and its derivatives(ta_{get,go,sure})
In reply to Greg Kroah-HartmanFrom: Liu Ying <[email protected]>
[ Upstream commit 3153fa38e38af566cf6454a03b1dbadaf6f323c0 ]
According to the comment of the function phy_mipi_dphy_get_default_config(), it uses minimum D-PHY timings based on MIPI D-PHY specification. They are derived from the valid ranges specified in Section 6.9, Table 14, Page 41 of the D-PHY specification (v1.2). The table 14 explicitly mentions that the minimum T-LPX parameter is 50 nanoseconds and the minimum TA-SURE parameter is T-LPX nanoseconds. Likewise, the kernel doc of the 'lpx' and 'ta_sure' members of struct phy_configure_opts_mipi_dphy mentions that the minimum values are 50000 picoseconds and @lpx picoseconds respectively. Also, the function phy_mipi_dphy_config_validate() checks if cfg->lpx is less than 50000 picoseconds and if cfg->ta_sure is less than cfg->lpx, which hints the same minimum values.
Without this patch, the function phy_mipi_dphy_get_default_config() wrongly sets cfg->lpx to 60000 picoseconds and cfg->ta_sure to 2 * cfg->lpx. So, let's correct them to 50000 picoseconds and cfg->lpx respectively.
Note that I've only tested the patch with RM67191 DSI panel on i.MX8mq EVK. Help is needed to test with other i.MX8mq, Meson and Rockchip platforms, as I don't have the hardwares.
--- drivers/phy/phy-core-mipi-dphy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/phy/phy-core-mipi-dphy.c +2 -2
@@ -64,10 +64,10 @@ int phy_mipi_dphy_get_default_config(unsigned long pixel_clock, cfg->hs_trail =max (4 *8 * ui,60000 +4 *4 * ui); cfg->init =100 ; - cfg->lpx =60000 ; + cfg->lpx =50000 ; cfg->ta_get =5 * cfg->lpx; cfg->ta_go =4 * cfg->lpx; - cfg->ta_sure =2 * cfg->lpx; + cfg->ta_sure = cfg->lpx; cfg->wakeup =1000 ; cfg->hs_clk_rate = hs_clk_rate;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 733/1126 phy: phy-brcm-usb: fixup BCM4908 support
In reply to Greg Kroah-HartmanFrom: Rafał Miłecki <[email protected]>
[ Upstream commit 32942d33d63d27714ed16a4176e5a99547adb6e0 ]
Just like every other family BCM4908 should get its own enum value. That is required to properly handle it in chipset conditional code.
The real change is excluding BCM4908 from the PLL reprogramming code (see brcmusb_usb3_pll_54mhz()). I'm not sure what's the BCM4908 reference clock frequency but:
1. BCM4908 custom driver from Broadcom's SDK doesn't reprogram PLL
2. Doing that in Linux driver stopped PHY handling some USB 3.0 devices
This change makes USB 3.0 PHY recognize e.g.:
1. 04e8:6860 - Samsung Electronics Co., Ltd Galaxy series, misc. (MTP mode)
2. 1058:259f - Western Digital My Passport 259F
Broadcom's STB SoCs come with a set of SUN_TOP_CTRL_* registers that allow reading chip family and product ids. Such a block & register is missing on BCM4908 so this commit introduces "compatible" string specific binding.
--- drivers/phy/broadcom/phy-brcm-usb-init.c | 36 ++++++++++++++++++++++++ drivers/phy/broadcom/phy-brcm-usb-init.h | 1 + drivers/phy/broadcom/phy-brcm-usb.c | 11 +++++++- 3 files changed, 47 insertions(+), 1 deletion(-)
drivers/phy/broadcom/phy-brcm-usb-init.c +36 -0
@@ -79,6 +79,7 @@enum brcm_family_type {BRCM_FAMILY_3390A0 , +BRCM_FAMILY_4908 ,BRCM_FAMILY_7250B0 ,BRCM_FAMILY_7271A0 ,BRCM_FAMILY_7364A0 ,
@@ -96,6 +97,7 @@ enum brcm_family_type {static const char *family_names[BRCM_FAMILY_COUNT ] = { USB_BRCM_FAMILY(3390A0), +USB_BRCM_FAMILY (4908 ), USB_BRCM_FAMILY(7250B0), USB_BRCM_FAMILY(7271A0), USB_BRCM_FAMILY(7364A0),
@@ -203,6 +205,27 @@ usb_reg_bits_map_table[BRCM_FAMILY_COUNT][USB_CTRL_SELECTOR_COUNT] = { USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK,ENDIAN_SETTINGS ,/* USB_CTRL_SETUP ENDIAN bits */ }, + /* 4908 */ + [BRCM_FAMILY_4908] = { +0 ,/* USB_CTRL_SETUP_SCB1_EN_MASK */ +0 ,/* USB_CTRL_SETUP_SCB2_EN_MASK */ +0 ,/* USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK */ +0 ,/* USB_CTRL_SETUP_STRAP_IPP_SEL_MASK */ +0 ,/* USB_CTRL_SETUP_OC3_DISABLE_MASK */ +0 ,/* USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK */ +0 ,/* USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK */ +USB_CTRL_USB_PM_XHC_SOFT_RESETB_MASK , +USB_CTRL_USB_PM_USB_PWRDN_MASK , +0 ,/* USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK */ +0 ,/* USB_CTRL_USB30_CTL1_USB3_IOC_MASK */ +0 ,/* USB_CTRL_USB30_CTL1_USB3_IPP_MASK */ +0 ,/* USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK */ +0 ,/* USB_CTRL_USB_PM_SOFT_RESET_MASK */ +0 ,/* USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK */ +0 ,/* USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK */ +0 ,/* USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK */ +0 ,/* USB_CTRL_SETUP ENDIAN bits */ + }, /* 7250b0 */ [BRCM_FAMILY_7250B0 ] = {USB_CTRL_SETUP_SCB1_EN_MASK ,
@@ -559,6 +582,7 @@ static void brcmusb_usb3_pll_54mhz(struct brcm_usb_init_params *params)*/ switch (params->selected_family) {case BRCM_FAMILY_3390A0 : +case BRCM_FAMILY_4908 :case BRCM_FAMILY_7250B0 :case BRCM_FAMILY_7366C0 :case BRCM_FAMILY_74371A0 :
@@ -1004,6 +1028,18 @@ static const struct brcm_usb_init_ops bcm7445_ops = { .set_dual_select = usb_set_dual_select, }; +void brcm_usb_dvr_init_4908 (struct brcm_usb_init_params *params) +{ +int fam; + + fam =BRCM_FAMILY_4908 ; + params->selected_family = fam; + params->usb_reg_bits_map = + &usb_reg_bits_map_table[fam][0 ]; + params->family_name = family_names[fam]; + params->ops = &bcm7445_ops; +} +void brcm_usb_dvr_init_7445 (struct brcm_usb_init_params *params) {int fam;
drivers/phy/broadcom/phy-brcm-usb-init.h +1 -0
@@ -64,6 +64,7 @@ struct brcm_usb_init_params {bool suspend_with_clocks; }; +void brcm_usb_dvr_init_4908 (struct brcm_usb_init_params *params);void brcm_usb_dvr_init_7445 (struct brcm_usb_init_params *params);void brcm_usb_dvr_init_7216 (struct brcm_usb_init_params *params);void brcm_usb_dvr_init_7211b0 (struct brcm_usb_init_params *params);
drivers/phy/broadcom/phy-brcm-usb.c +10 -1
@@ -283,6 +283,15 @@ static const struct attribute_group brcm_usb_phy_group = { .attrs = brcm_usb_phy_attrs, }; +static const struct match_chip_info chip_info_4908 = { + .init_func = &brcm_usb_dvr_init_4908, + .required_regs = { +BRCM_REGS_CTRL , +BRCM_REGS_XHCI_EC , +-1 , + }, +}; +static const struct match_chip_info chip_info_7216 = { .init_func = &brcm_usb_dvr_init_7216, .required_regs = {
@@ -318,7 +327,7 @@ static const struct match_chip_info chip_info_7445 = {static const struct of_device_id brcm_usb_dt_ids[] = { { .compatible ="brcm,bcm4908-usb-phy" , - .data = &chip_info_7445, + .data = &chip_info_4908, }, { .compatible ="brcm,bcm7216-usb-phy" ,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 734/1126 serial: 8250_mid: Balance reference count for PCI DMA device
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 67ec6dd0b257bd81b4e9fcac89b29da72f6265e5 ]
The pci_get_slot() increases its reference count, the caller must decrement the reference count by calling pci_dev_put().
Depends-on: d9eda9bab237 ("serial: 8250_pci: Intel MID UART support to its own driver")
--- drivers/tty/serial/8250/8250_mid.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/tty/serial/8250/8250_mid.c +15 -4
@@ -73,6 +73,11 @@ static int pnw_setup(struct mid8250 *mid, struct uart_port *p)return 0 ; } +static void pnw_exit (struct mid8250 *mid) +{ +pci_dev_put (mid->dma_dev); +} +static int tng_handle_irq (struct uart_port *p) {struct mid8250 *mid = p->private_data;
@@ -124,6 +129,11 @@ static int tng_setup(struct mid8250 *mid, struct uart_port *p)return 0 ; } +static void tng_exit (struct mid8250 *mid) +{ +pci_dev_put (mid->dma_dev); +} +static int dnv_handle_irq (struct uart_port *p) {struct mid8250 *mid = p->private_data;
@@ -330,9 +340,9 @@ static int mid8250_probe(struct pci_dev *pdev, const struct pci_device_id *id)pci_set_drvdata (pdev, mid);return 0 ; + err: -if (mid->board->exit) - mid->board->exit (mid); + mid->board->exit (mid);return ret; }
@@ -342,8 +352,7 @@ static void mid8250_remove(struct pci_dev *pdev)serial8250_unregister_port (mid->line); -if (mid->board->exit) - mid->board->exit (mid); + mid->board->exit (mid); }static const struct mid8250_board pnw_board = {
@@ -351,6 +360,7 @@ static const struct mid8250_board pnw_board = { .freq = 50000000, .base_baud = 115200, .setup = pnw_setup, + .exit = pnw_exit, };static const struct mid8250_board tng_board = {
@@ -358,6 +368,7 @@ static const struct mid8250_board tng_board = { .freq = 38400000, .base_baud = 1843200, .setup = tng_setup, + .exit = tng_exit, };static const struct mid8250_board dnv_board = {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 735/1126 serial: 8250_lpss: Balance reference count for PCI DMA device
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 5318f70da7e82649d794fc27d8a127c22aa3566e ]
The pci_get_slot() increases its reference count, the caller must decrement the reference count by calling pci_dev_put().
Depends-on: a13e19cf3dc1 ("serial: 8250_lpss: split LPSS driver to separate module")
--- drivers/tty/serial/8250/8250_lpss.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-)
drivers/tty/serial/8250/8250_lpss.c +22 -6
@@ -117,8 +117,7 @@ static int byt_serial_setup(struct lpss8250 *lpss, struct uart_port *port) {struct dw_dma_slave *param = &lpss->dma_param;struct pci_dev *pdev =to_pci_dev (port->dev); -unsigned int dma_devfn =PCI_DEVFN (PCI_SLOT (pdev->devfn),0 ); -struct pci_dev *dma_dev =pci_get_slot (pdev->bus, dma_devfn); +struct pci_dev *dma_dev;switch (pdev->device) {case PCI_DEVICE_ID_INTEL_BYT_UART1 :
@@ -137,6 +136,8 @@ static int byt_serial_setup(struct lpss8250 *lpss, struct uart_port *port)return -EINVAL ; } + dma_dev =pci_get_slot (pdev->bus,PCI_DEVFN (PCI_SLOT (pdev->devfn),0 )); + param->dma_dev = &dma_dev->dev; param->m_master =0 ; param->p_master =1 ;
@@ -152,6 +153,14 @@ static int byt_serial_setup(struct lpss8250 *lpss, struct uart_port *port)return 0 ; } +static void byt_serial_exit (struct lpss8250 *lpss) +{ +struct dw_dma_slave *param = &lpss->dma_param; + +/* Paired with pci_get_slot() in the byt_serial_setup() above */ +put_device (param->dma_dev); +} +static int ehl_serial_setup (struct lpss8250 *lpss,struct uart_port *port) {struct uart_8250_dma *dma = &lpss->data.dma;
@@ -170,6 +179,13 @@ static int ehl_serial_setup(struct lpss8250 *lpss, struct uart_port *port)return 0 ; } +static void ehl_serial_exit (struct lpss8250 *lpss) +{ +struct uart_8250_port *up =serial8250_get_port (lpss->data.line); + + up->dma =NULL ; +} +#ifdef CONFIG_SERIAL_8250_DMA static const struct dw_dma_platform_data qrk_serial_dma_pdata = { .nr_channels = 2,
@@ -344,8 +360,7 @@ static int lpss8250_probe(struct pci_dev *pdev, const struct pci_device_id *id)return 0 ; err_exit: -if (lpss->board->exit) - lpss->board->exit (lpss); + lpss->board->exit (lpss);pci_free_irq_vectors (pdev);return ret; }
@@ -356,8 +371,7 @@ static void lpss8250_remove(struct pci_dev *pdev)serial8250_unregister_port (lpss->data.line); -if (lpss->board->exit) - lpss->board->exit (lpss); + lpss->board->exit (lpss);pci_free_irq_vectors (pdev); }
@@ -365,12 +379,14 @@ static const struct lpss8250_board byt_board = { .freq = 100000000, .base_baud = 2764800, .setup = byt_serial_setup, + .exit = byt_serial_exit, };static const struct lpss8250_board ehl_board = { .freq =200000000 , .base_baud =12500000 , .setup = ehl_serial_setup, + .exit = ehl_serial_exit, };static const struct lpss8250_board qrk_board = {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 736/1126 NFS: Use of mapping_set_error() results in spurious errors
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit 6c984083ec2453dfd3fcf98f392f34500c73e3f2 ]
The use of mapping_set_error() in conjunction with calls to filemap_check_errors() is problematic because every error gets reported as either an EIO or an ENOSPC by filemap_check_errors() in functions such as filemap_write_and_wait() or filemap_write_and_wait_range(). In almost all cases, we prefer to use the more nuanced wb errors.
--- fs/nfs/write.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/nfs/write.c +4 -1
@@ -316,7 +316,10 @@ static void nfs_mapping_set_error(struct page *page, int error)struct address_space *mapping =page_file_mapping (page);SetPageError (page); -mapping_set_error (mapping, error); +filemap_set_wb_err (mapping, error); +if (mapping->host) +errseq_set (&mapping->host->i_sb->s_wb_err, + error == -ENOSPC ? -ENOSPC : -EIO );nfs_set_pageerror (mapping); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 737/1126 serial: 8250: Fix race condition in RTS-after-send handling
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit dedab69fd650ea74710b2e626e63fd35584ef773 ]
Set em485->active_timer = NULL isn't always enough to take out the stop timer. While there is a check that it acts in the right state (i.e. waiting for RTS-after-send to pass after sending some chars) but the following might happen:
- CPU1: some chars send, shifter becomes empty, stop tx timer armed
- CPU0: more chars send before RTS-after-send expired
- CPU0: shifter empty irq, port lock taken
- CPU1: tx timer triggers, waits for port lock
- CPU0: em485->active_timer = &em485->stop_tx_timer, hrtimer_start(), releases lock()
- CPU1: get lock, see em485->active_timer == &em485->stop_tx_timer, tear down RTS too early
This fix bases on research done by Steffen Trumtrar.
--- drivers/tty/serial/8250/8250_port.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/tty/serial/8250/8250_port.c +12 -0
@@ -1623,6 +1623,18 @@ static inline void start_tx_rs485(struct uart_port *port)struct uart_8250_port *up =up_to_u8250p (port);struct uart_8250_em485 *em485 = up->em485; +/* +* While serial8250_em485_handle_stop_tx() is a noop if +* em485->active_timer != &em485->stop_tx_timer, it might happen that +* the timer is still armed and triggers only after the current bunch of +* chars is send and em485->active_timer == &em485->stop_tx_timer again. +* So cancel the timer. There is still a theoretical race condition if +* the timer is already running and only comes around to check for +* em485->active_timer when &em485->stop_tx_timer is armed again. +*/ +if (em485->active_timer == &em485->stop_tx_timer) +hrtimer_try_to_cancel (&em485->stop_tx_timer); + em485->active_timer =NULL ;if (em485->tx_stopped) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 738/1126 iio: adc: Add check for devm_request_threaded_irq
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit b30537a4cedcacf0ade2f33ebb7610178ed1e7d7 ]
As the potential failure of the devm_request_threaded_irq(), it should be better to check the return value and return error if fails.
--- drivers/iio/adc/twl6030-gpadc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/iio/adc/twl6030-gpadc.c +2 -0
@@ -911,6 +911,8 @@ static int twl6030_gpadc_probe(struct platform_device *pdev) ret =devm_request_threaded_irq (dev, irq,NULL , twl6030_gpadc_irq_handler,IRQF_ONESHOT ,"twl6030_gpadc" , indio_dev); +if (ret) +return ret; ret =twl6030_gpadc_enable_irq (TWL6030_GPADC_RT_SW1_EOC_MASK );if (ret <0 ) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 739/1126 habanalabs: Add check for pci_enable_device
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 9c27896ac1bb83ea5c461ce6f7089d02102a2b21 ]
As the potential failure of the pci_enable_device(), it should be better to check the return value and return error if fails.
--- drivers/misc/habanalabs/common/debugfs.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/misc/habanalabs/common/debugfs.c +2 -0
@@ -890,6 +890,8 @@ static ssize_t hl_set_power_state(struct file *f, const char __user *buf,pci_set_power_state (hdev->pdev,PCI_D0 );pci_restore_state (hdev->pdev); rc =pci_enable_device (hdev->pdev); +if (rc <0 ) +return rc; }else if (value ==2 ) {pci_save_state (hdev->pdev);pci_disable_device (hdev->pdev);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 740/1126 NFS: Return valid errors from nfs2/3_decode_dirent()
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit 64cfca85bacde54caa64e0ab855c48734894fa37 ]
Valid return values for decode_dirent() callback functions are:
0: Success
-EBADCOOKIE: End of directory
-EAGAIN: End of xdr_stream
All errors need to map into one of those three values.
--- fs/nfs/nfs2xdr.c | 2 +- fs/nfs/nfs3xdr.c | 21 ++++++--------------- 2 files changed, 7 insertions(+), 16 deletions(-)
fs/nfs/nfs2xdr.c +1 -1
@@ -949,7 +949,7 @@ int nfs2_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry, error =decode_filename_inline (xdr, &entry->name, &entry->len);if (unlikely (error)) -return error; +return -EAGAIN ;/* * The type (size and byte order) of nfscookie isn't defined in
fs/nfs/nfs3xdr.c +6 -15
@@ -1967,7 +1967,6 @@ int nfs3_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry, bool plus) {struct user_namespace *userns =rpc_userns (entry->server->client); -struct nfs_entry old = *entry;__be32 *p;int error;u64 new_cookie;
@@ -1987,15 +1986,15 @@ int nfs3_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry, error =decode_fileid3 (xdr, &entry->ino);if (unlikely (error)) -return error; +return -EAGAIN ; error =decode_inline_filename3 (xdr, &entry->name, &entry->len);if (unlikely (error)) -return error; +return -EAGAIN ; error =decode_cookie3 (xdr, &new_cookie);if (unlikely (error)) -return error; +return -EAGAIN ; entry->d_type =DT_UNKNOWN ;
@@ -2003,7 +2002,7 @@ int nfs3_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry, entry->fattr->valid =0 ; error =decode_post_op_attr (xdr, entry->fattr, userns);if (unlikely (error)) -return error; +return -EAGAIN ;if (entry->fattr->valid &NFS_ATTR_FATTR_V3 ) entry->d_type =nfs_umode_to_dtype (entry->fattr->mode);
@@ -2018,11 +2017,8 @@ int nfs3_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry,return -EAGAIN ;if (*p != xdr_zero) { error =decode_nfs_fh3 (xdr, entry->fh); -if (unlikely (error)) { -if (error == -E2BIG ) - goto out_truncated; -return error; - } +if (unlikely (error)) +return -EAGAIN ; }else zero_nfs_fh3 (entry->fh); }
@@ -2031,11 +2027,6 @@ int nfs3_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry, entry->cookie = new_cookie;return 0 ; - -out_truncated: -dprintk ("NFS: directory entry contains invalid file handle\n" ); - *entry = old; -return -EAGAIN ; }/*
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 741/1126 staging: r8188eu: fix endless loop in recv_func
In reply to Greg Kroah-HartmanFrom: Martin Kaiser <[email protected]>
[ Upstream commit 1327fcf175fa63d3b7a058b8148ed7714acdc035 ]
Fix an endless loop in recv_func. If pending_frame is not NULL, we're stuck in the while loop forever. We have to call rtw_alloc_recvframe each time we loop.
--- drivers/staging/r8188eu/core/rtw_recv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/r8188eu/core/rtw_recv.c +1 -2
@@ -1853,8 +1853,7 @@ static int recv_func(struct adapter *padapter, struct recv_frame *rframe)struct recv_frame *pending_frame;int cnt =0 ; - pending_frame =rtw_alloc_recvframe (&padapter->recvpriv.uc_swdec_pending_queue); -while (pending_frame) { +while ((pending_frame =rtw_alloc_recvframe (&padapter->recvpriv.uc_swdec_pending_queue))) { cnt++;recv_func_posthandle (padapter, pending_frame); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 742/1126 dma-debug: fix return value of __setup handlers
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 80e4390981618e290616dbd06ea190d4576f219d ]
When valid kernel command line parameters
dma_debug=off dma_debug_entries=100
are used, they are reported as Unknown parameters and added to init's environment strings, polluting it.
Unknown kernel command line parameters "BOOT_IMAGE=/boot/bzImage-517rc5
dma_debug=off dma_debug_entries=100", will be passed to user space.
and
Run /sbin/init as init process
with arguments:
/sbin/init
with environment:
HOME=/
TERM=linux
BOOT_IMAGE=/boot/bzImage-517rc5
dma_debug=off
dma_debug_entries=100Return 1 from these __setup handlers to indicate that the command line option has been handled.
--- kernel/dma/debug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/dma/debug.c +2 -2
@@ -927,7 +927,7 @@ static __init int dma_debug_cmdline(char *str) global_disable = true; } -return 0 ; +return 1 ; }static __init int dma_debug_entries_cmdline (char *str)
@@ -936,7 +936,7 @@ static __init int dma_debug_entries_cmdline(char *str)return -EINVAL ;if (!get_option (&str, &nr_prealloc_entries)) nr_prealloc_entries =PREALLOC_DMA_DEBUG_ENTRIES ; -return 0 ; +return 1 ; }__setup ("dma_debug=" , dma_debug_cmdline);
Signature · 8 lines
2.34.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Greg Kroah-Hartman
maintainerPATCH 743/1126 clk: imx7d: Remove audio_mclk_root_clk
In reply to Greg Kroah-HartmanFrom: Abel Vesa <[email protected]>
[ Upstream commit eccac77ede3946c90143447cdc785dc16aec4b24 ]
The audio_mclk_root_clk was added as a gate with the CCGR121 (0x4790), but according to the reference manual, there is no such gate. The CCGR121 belongs to ECSPI2 and it is not shared.
--- drivers/clk/imx/clk-imx7d.c | 1 - 1 file changed, 1 deletion(-)
drivers/clk/imx/clk-imx7d.c +0 -1
@@ -849,7 +849,6 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node) hws[IMX7D_WDOG4_ROOT_CLK ] =imx_clk_hw_gate4 ("wdog4_root_clk" ,"wdog_post_div" , base +0x49f0 ,0 ); hws[IMX7D_KPP_ROOT_CLK ] =imx_clk_hw_gate4 ("kpp_root_clk" ,"ipg_root_clk" , base +0x4aa0 ,0 ); hws[IMX7D_CSI_MCLK_ROOT_CLK ] =imx_clk_hw_gate4 ("csi_mclk_root_clk" ,"csi_mclk_post_div" , base +0x4490 ,0 ); - hws[IMX7D_AUDIO_MCLK_ROOT_CLK ] =imx_clk_hw_gate4 ("audio_mclk_root_clk" ,"audio_mclk_post_div" , base +0x4790 ,0 ); hws[IMX7D_WRCLK_ROOT_CLK ] =imx_clk_hw_gate4 ("wrclk_root_clk" ,"wrclk_post_div" , base +0x47a0 ,0 ); hws[IMX7D_USB_CTRL_CLK ] =imx_clk_hw_gate4 ("usb_ctrl_clk" ,"ahb_root_clk" , base +0x4680 ,0 ); hws[IMX7D_USB_PHY1_CLK ] =imx_clk_hw_gate4 ("usb_phy1_clk" ,"pll_usb1_main_clk" , base +0x46a0 ,0 );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 744/1126 clk: imx: off by one in imx_lpcg_parse_clks_from_dt()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 135efc3a76d127691afaf1864e4ab627bf09d53d ]
The > needs to be >= to prevent an off by one access.
--- drivers/clk/imx/clk-imx8qxp-lpcg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/imx/clk-imx8qxp-lpcg.c +1 -1
@@ -248,7 +248,7 @@ static int imx_lpcg_parse_clks_from_dt(struct platform_device *pdev,for (i =0 ; i < count; i++) { idx = bit_offset[i] /4 ; -if (idx >IMX_LPCG_MAX_CLKS ) { +if (idx >=IMX_LPCG_MAX_CLKS ) {dev_warn (&pdev->dev,"invalid bit offset of clock %d\n" , i); ret = -EINVAL ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 745/1126 clk: at91: sama7g5: fix parents of PDMCs GCLK
In reply to Greg Kroah-HartmanFrom: Codrin Ciubotariu <[email protected]>
[ Upstream commit 1a944729d8635fa59638f24e8727d5ccaa0c8c19 ]
Audio PLL can be used as parent by the GCLKs of PDMCs.
--- drivers/clk/at91/sama7g5.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/clk/at91/sama7g5.c +4 -4
@@ -696,16 +696,16 @@ static const struct { { .n = "pdmc0_gclk", .id = 68, .r = { .max = 50000000 }, - .pp = { "syspll_divpmcck", "baudpll_divpmcck", }, - .pp_mux_table = { 5, 8, }, + .pp = { "syspll_divpmcck", "audiopll_divpmcck", }, + .pp_mux_table = { 5, 9, }, .pp_count = 2, .pp_chg_id = INT_MIN, }, { .n = "pdmc1_gclk", .id = 69, .r = { .max = 50000000, }, - .pp = { "syspll_divpmcck", "baudpll_divpmcck", }, - .pp_mux_table = { 5, 8, }, + .pp = { "syspll_divpmcck", "audiopll_divpmcck", }, + .pp_mux_table = { 5, 9, }, .pp_count = 2, .pp_chg_id = INT_MIN, },
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 746/1126 clk: qcom: clk-rcg2: Update logic to calculate D value for RCG
In reply to Greg Kroah-HartmanFrom: Taniya Das <[email protected]>
[ Upstream commit 58922910add18583d5273c2edcdb9fd7bf4eca02 ]
The display pixel clock has a requirement on certain newer platforms to support M/N as (2/3) and the final D value calculated results in underflow errors.
As the current implementation does not check for D value is within the accepted range for a given M & N value. Update the logic to calculate the final D value based on the range.
--- drivers/clk/qcom/clk-rcg2.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/clk/qcom/clk-rcg2.c +11 -2
@@ -264,7 +264,7 @@ static int clk_rcg2_determine_floor_rate(struct clk_hw *hw,static int __clk_rcg2_configure (struct clk_rcg2 *rcg,const struct freq_tbl *f) { -u32 cfg, mask; +u32 cfg, mask, d_val, not2d_val, n_minus_m;struct clk_hw *hw = &rcg->clkr.hw;int ret, index =qcom_find_src_index (hw, rcg->parent_map, f->src);
@@ -283,8 +283,17 @@ static int __clk_rcg2_configure(struct clk_rcg2 *rcg, const struct freq_tbl *f)if (ret)return ret; +/* Calculate 2d value */ + d_val = f->n; + + n_minus_m = f->n - f->m; + n_minus_m *=2 ; + + d_val =clamp_t (u32, d_val, f->m, n_minus_m); + not2d_val = ~d_val & mask; + ret =regmap_update_bits (rcg->clkr.regmap, -RCG_D_OFFSET (rcg), mask, ~f->n); +RCG_D_OFFSET (rcg), mask, not2d_val);if (ret)return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 747/1126 clk: qcom: clk-rcg2: Update the frac table for pixel clock
In reply to Greg Kroah-HartmanFrom: Taniya Das <[email protected]>
[ Upstream commit b527358cb4cd58a8279c9062b0786f1fab628fdc ]
Support the new numerator and denominator for pixel clock on SM8350 and support rgb101010, RGB888 use cases on SM8450.
--- drivers/clk/qcom/clk-rcg2.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/qcom/clk-rcg2.c +1 -0
@@ -729,6 +729,7 @@ static const struct frac_entry frac_table_pixel[] = { { 2, 9 }, { 4, 9 }, { 1, 1 }, + { 2, 3 }, { } };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 748/1126 clk: starfive: jh7100: Dont round divisor up twice
In reply to Greg Kroah-HartmanFrom: Emil Renner Berthing <[email protected]>
[ Upstream commit 40dda3532f903107a063cd6ec1f15e10dd0eccc5 ]
The problem is best illustrated by an example. Suppose a consumer wants a 4MHz clock rate from a divider with a 10MHz parent. It would then call
clk_round_rate(clk, 4000000)
which would call into our determine_rate() callback that correctly rounds up and finds that a divisor of 3 gives the highest possible frequency below the requested 4MHz and returns 10000000 / 3 = 3333333Hz.
However the consumer would then call
clk_set_rate(clk, 3333333)
but since 3333333 doesn't divide 10000000 evenly our set_rate() callback would again round the divisor up and set it to 4 which results in an unnecessarily low rate of 2.5MHz.
Fix it by using DIV_ROUND_CLOSEST in the set_rate() callback.
--- drivers/clk/starfive/clk-starfive-jh7100.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)
drivers/clk/starfive/clk-starfive-jh7100.c +3 -11
@@ -399,22 +399,13 @@ static unsigned long jh7100_clk_recalc_rate(struct clk_hw *hw,return div ? parent_rate / div :0 ; } -static unsigned long jh7100_clk_bestdiv (struct jh7100_clk *clk, -unsigned long rate,unsigned long parent) -{ -unsigned long max = clk->max_div; -unsigned long div =DIV_ROUND_UP (parent, rate); - -return min (div, max); -} -static int jh7100_clk_determine_rate (struct clk_hw *hw,struct clk_rate_request *req) {struct jh7100_clk *clk =jh7100_clk_from (hw);unsigned long parent = req->best_parent_rate;unsigned long rate =clamp (req->rate, req->min_rate, req->max_rate); -unsigned long div =jh7100_clk_bestdiv (clk, rate, parent); + unsigned long div = min_t(unsigned long, DIV_ROUND_UP(parent, rate), clk->max_div);unsigned long result = parent / div;/*
@@ -442,7 +433,8 @@ static int jh7100_clk_set_rate(struct clk_hw *hw, unsigned long parent_rate) {struct jh7100_clk *clk =jh7100_clk_from (hw); -unsigned long div =jh7100_clk_bestdiv (clk, rate, parent_rate); +unsigned long div =clamp (DIV_ROUND_CLOSEST (parent_rate, rate), +1UL , (unsigned long )clk->max_div);jh7100_clk_reg_rmw (clk,JH7100_CLK_DIV_MASK , div);return 0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 749/1126 clk: starfive: jh7100: Handle audio_div clock properly
In reply to Greg Kroah-HartmanFrom: Emil Renner Berthing <[email protected]>
[ Upstream commit 73bfc8d745a98744088cb30517399222674455b1 ]
It turns out the audio_div clock is a fractional divider where the lowest byte of the ctrl register is the integer part of the divider and the 2nd byte is the number of 100th added to the divider.
The children of this clock is used by the audio peripherals for their sample rate clock, so round to the closest possible rate rather than always rounding down like regular dividers.
--- drivers/clk/starfive/clk-starfive-jh7100.c | 68 +++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-)
drivers/clk/starfive/clk-starfive-jh7100.c +67 -1
@@ -32,6 +32,13 @@#define JH7100_CLK_MUX_MASK GENMASK(27, 24)#define JH7100_CLK_MUX_SHIFT 24#define JH7100_CLK_DIV_MASK GENMASK(23, 0) +#define JH7100_CLK_FRAC_MASK GENMASK(15, 8) +#define JH7100_CLK_FRAC_SHIFT 8 +#define JH7100_CLK_INT_MASK GENMASK(7, 0) + +/* fractional divider min/max */ +#define JH7100_CLK_FRAC_MIN 100UL +#define JH7100_CLK_FRAC_MAX 25599UL/* clock data */ #define JH7100_GATE (_idx, _name, _flags, _parent) [_idx] = { \
@@ -55,6 +62,13 @@ .parents = { [0] = _parent }, \ } +#define JH7100_FDIV (_idx, _name, _parent) [_idx] = { \ + .name = _name, \ + .flags = 0, \ + .max = JH7100_CLK_FRAC_MAX, \ + .parents = { [0] = _parent }, \ +} +#define JH7100__MUX (_idx, _name, _nparents, ...) [_idx] = { \ .name = _name, \ .flags = 0, \
@@ -225,7 +239,7 @@ static const struct {JH7100__MUX (JH7100_CLK_USBPHY_25M ,"usbphy_25m" ,2 ,JH7100_CLK_OSC_SYS ,JH7100_CLK_USBPHY_PLLDIV25M ), -JH7100__DIV (JH7100_CLK_AUDIO_DIV ,"audio_div" ,131072 ,JH7100_CLK_AUDIO_ROOT ), +JH7100_FDIV (JH7100_CLK_AUDIO_DIV ,"audio_div" ,JH7100_CLK_AUDIO_ROOT ),JH7100_GATE (JH7100_CLK_AUDIO_SRC ,"audio_src" ,0 ,JH7100_CLK_AUDIO_DIV ),JH7100_GATE (JH7100_CLK_AUDIO_12288 ,"audio_12288" ,0 ,JH7100_CLK_OSC_AUD ), JH7100_GDIV(JH7100_CLK_VIN_SRC, "vin_src", 0, 4, JH7100_CLK_VIN_ROOT),
@@ -440,6 +454,49 @@ static int jh7100_clk_set_rate(struct clk_hw *hw,return 0 ; } +static unsigned long jh7100_clk_frac_recalc_rate (struct clk_hw *hw, +unsigned long parent_rate) +{ +struct jh7100_clk *clk =jh7100_clk_from (hw); +u32 reg =jh7100_clk_reg_get (clk); +unsigned long div100 =100 * (reg &JH7100_CLK_INT_MASK ) + + ((reg &JH7100_CLK_FRAC_MASK ) >>JH7100_CLK_FRAC_SHIFT ); + +return (div100 >=JH7100_CLK_FRAC_MIN ) ?100 * parent_rate / div100 :0 ; +} + +static int jh7100_clk_frac_determine_rate (struct clk_hw *hw, +struct clk_rate_request *req) +{ +unsigned long parent100 =100 * req->best_parent_rate; +unsigned long rate =clamp (req->rate, req->min_rate, req->max_rate); +unsigned long div100 =clamp (DIV_ROUND_CLOSEST (parent100, rate), +JH7100_CLK_FRAC_MIN ,JH7100_CLK_FRAC_MAX ); +unsigned long result = parent100 / div100; + +/* clamp the result as in jh7100_clk_determine_rate() above */ +if (result > req->max_rate && div100 <JH7100_CLK_FRAC_MAX ) + result = parent100 / (div100 +1 ); +if (result < req->min_rate && div100 >JH7100_CLK_FRAC_MIN ) + result = parent100 / (div100 -1 ); + + req->rate = result; +return 0 ; +} + +static int jh7100_clk_frac_set_rate (struct clk_hw *hw, +unsigned long rate, +unsigned long parent_rate) +{ +struct jh7100_clk *clk =jh7100_clk_from (hw); +unsigned long div100 =clamp (DIV_ROUND_CLOSEST (100 * parent_rate, rate), +JH7100_CLK_FRAC_MIN ,JH7100_CLK_FRAC_MAX ); +u32 value = ((div100 %100 ) <<JH7100_CLK_FRAC_SHIFT ) | (div100 /100 ); + +jh7100_clk_reg_rmw (clk,JH7100_CLK_DIV_MASK , value); +return 0 ; +} +static u8 jh7100_clk_get_parent (struct clk_hw *hw) {struct jh7100_clk *clk =jh7100_clk_from (hw);
@@ -526,6 +583,13 @@ static const struct clk_ops jh7100_clk_div_ops = { .debug_init = jh7100_clk_debug_init, }; +static const struct clk_ops jh7100_clk_fdiv_ops = { + .recalc_rate = jh7100_clk_frac_recalc_rate, + .determine_rate = jh7100_clk_frac_determine_rate, + .set_rate = jh7100_clk_frac_set_rate, + .debug_init = jh7100_clk_debug_init, +}; +static const struct clk_ops jh7100_clk_gdiv_ops = { .enable = jh7100_clk_enable, .disable = jh7100_clk_disable,
@@ -564,6 +628,8 @@ static const struct clk_ops *__init jh7100_clk_ops(u32 max)if (max &JH7100_CLK_DIV_MASK ) {if (max &JH7100_CLK_ENABLE )return &jh7100_clk_gdiv_ops; +if (max ==JH7100_CLK_FRAC_MAX ) +return &jh7100_clk_fdiv_ops;return &jh7100_clk_div_ops; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 750/1126 dmaengine: hisi_dma: fix MSI allocate fail when reload hisi_dma
In reply to Greg Kroah-HartmanFrom: Jie Hai <[email protected]>
[ Upstream commit b95044b38425f563404234d96bbb20cc6360c7e1 ]
Remove the loaded hisi_dma driver and reload it, the driver fails to work properly. The following error is reported in the kernel log:
[ 1475.597609] hisi_dma 0000:7b:00.0: Failed to allocate MSI vectors! [ 1475.604915] hisi_dma: probe of 0000:7b:00.0 failed with error -28
As noted in "The MSI Driver Guide HOWTO"[1], the number of MSI interrupt must be a power of two. The Kunpeng DMA driver allocates 30 MSI interrupts. As a result, no space left on device is reported when the driver is reloaded and allocates interrupt vectors from the interrupt domain.
This patch changes the number of interrupt vectors allocated by hisi_dma driver to 32 to avoid this problem.
[1] https://www.kernel.org/doc/html/latest/PCI/msi-howto.html
--- drivers/dma/hisi_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/hisi_dma.c +1 -1
@@ -30,7 +30,7 @@#define HISI_DMA_MODE 0x217c#define HISI_DMA_OFFSET 0x100 -#define HISI_DMA_MSI_NUM 30 +#define HISI_DMA_MSI_NUM 32#define HISI_DMA_CHAN_NUM 30#define HISI_DMA_Q_DEPTH_VAL 1024
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 751/1126 remoteproc: qcom: Fix missing of_node_put in adsp_alloc_memory_region
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 505b5b1616e200042999de715dbe7c1e2735cd65 ]
The device_node pointer is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done.
--- drivers/remoteproc/qcom_q6v5_adsp.c | 1 + 1 file changed, 1 insertion(+)
drivers/remoteproc/qcom_q6v5_adsp.c +1 -0
@@ -408,6 +408,7 @@ static int adsp_alloc_memory_region(struct qcom_adsp *adsp) } ret =of_address_to_resource (node,0 , &r); +of_node_put (node);if (ret)return ret;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 752/1126 remoteproc: qcom_wcnss: Add missing of_node_put() in wcnss_alloc_memory_region
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 8f90161a66bc3d6b9fe8dde4d9028d20eae1b62a ]
The device_node pointer is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done.
--- drivers/remoteproc/qcom_wcnss.c | 1 + 1 file changed, 1 insertion(+)
drivers/remoteproc/qcom_wcnss.c +1 -0
@@ -500,6 +500,7 @@ static int wcnss_alloc_memory_region(struct qcom_wcnss *wcnss) } ret =of_address_to_resource (node,0 , &r); +of_node_put (node);if (ret)return ret;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 753/1126 remoteproc: qcom_q6v5_mss: Fix some leaks in q6v5_alloc_memory_region
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 07a5dcc4bed9d7cae54adf5aa10ff9f037a3204b ]
The device_node pointer is returned by of_parse_phandle() or of_get_child_by_name() with refcount incremented. We should use of_node_put() on it when done.
This function only call of_node_put(node) when of_address_to_resource succeeds, missing error cases.
--- drivers/remoteproc/qcom_q6v5_mss.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/remoteproc/qcom_q6v5_mss.c +7 -4
@@ -1806,18 +1806,20 @@ static int q6v5_alloc_memory_region(struct q6v5 *qproc)* reserved memory regions from device's memory-region property. */ child =of_get_child_by_name (qproc->dev->of_node,"mba" ); -if (!child) +if (!child) { node =of_parse_phandle (qproc->dev->of_node,"memory-region" ,0 ); -else + }else { node =of_parse_phandle (child,"memory-region" ,0 ); +of_node_put (child); + } ret =of_address_to_resource (node,0 , &r); +of_node_put (node);if (ret) {dev_err (qproc->dev,"unable to resolve mba region\n" );return ret; } -of_node_put (node); qproc->mba_phys = r.start; qproc->mba_size =resource_size (&r);
@@ -1828,14 +1830,15 @@ static int q6v5_alloc_memory_region(struct q6v5 *qproc) }else { child =of_get_child_by_name (qproc->dev->of_node,"mpss" ); node =of_parse_phandle (child,"memory-region" ,0 ); +of_node_put (child); } ret =of_address_to_resource (node,0 , &r); +of_node_put (node);if (ret) {dev_err (qproc->dev,"unable to resolve mpss region\n" );return ret; } -of_node_put (node); qproc->mpss_phys = qproc->mpss_reloc = r.start; qproc->mpss_size =resource_size (&r);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 754/1126 nvdimm/region: Fix default alignment for small regions
In reply to Greg Kroah-HartmanFrom: Dan Williams <[email protected]>
[ Upstream commit d9d290d7e659e9db3e4518040cc18b97f5535f4a ]
In preparation for removing BLK aperture support the NVDIMM unit tests discovered that the default alignment can be set higher than the capacity of the region. Fall back to PAGE_SIZE in that case.
Given this has not been seen in the wild, elide notifying -stable.
--- drivers/nvdimm/region_devs.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/nvdimm/region_devs.c +3 -0
@@ -1025,6 +1025,9 @@ static unsigned long default_align(struct nd_region *nd_region) } } +if (nd_region->ndr_size <MEMREMAP_COMPAT_ALIGN_MAX ) + align =PAGE_SIZE ; + mappings =max_t (u16,1 , nd_region->ndr_mappings);div_u64_rem (align, mappings, &remainder);if (remainder)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 755/1126 clk: actions: Terminate clk_div_table with sentinel element
In reply to Greg Kroah-HartmanFrom: Jonathan Neuschäfer <[email protected]>
[ Upstream commit d8a441e53e2434b1401e52dfd66b05263e442edc ]
In order that the end of a clk_div_table can be detected, it must be terminated with a sentinel element (.div = 0).
In owl-s900.s, the { 0, 8 } element was probably meant to be just that, so this patch changes { 0, 8 } to { 0, 0 }.
--- drivers/clk/actions/owl-s700.c | 1 + drivers/clk/actions/owl-s900.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/clk/actions/owl-s700.c +1 -0
@@ -162,6 +162,7 @@ static struct clk_div_table hdmia_div_table[] = {static struct clk_div_table rmii_div_table[] = { {0 ,4 }, {1 ,10 }, + {0 ,0 } };/* divider clocks */
drivers/clk/actions/owl-s900.c +1 -1
@@ -140,7 +140,7 @@ static struct clk_div_table rmii_ref_div_table[] = {static struct clk_div_table usb3_mac_div_table[] = { {1 ,2 }, {2 ,3 }, {3 ,4 }, - {0 ,8 }, + {0 ,0 } };static struct clk_div_table i2s_div_table[] = {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 756/1126 clk: loongson1: Terminate clk_div_table with sentinel element
In reply to Greg Kroah-HartmanFrom: Jonathan Neuschäfer <[email protected]>
[ Upstream commit 3eb00f89162e80083dfcaa842468b510462cfeaa ]
In order that the end of a clk_div_table can be detected, it must be terminated with a sentinel element (.div = 0).
--- drivers/clk/loongson1/clk-loongson1c.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/loongson1/clk-loongson1c.c +1 -0
@@ -37,6 +37,7 @@ static const struct clk_div_table ahb_div_table[] = { [1] = { .val = 1, .div = 4 }, [2] = { .val = 2, .div = 3 }, [3] = { .val = 3, .div = 3 }, + [4] = { /* sentinel */ } };void __init ls1x_clk_init (void )
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 757/1126 clk: hisilicon: Terminate clk_div_table with sentinel element
In reply to Greg Kroah-HartmanFrom: Jonathan Neuschäfer <[email protected]>
[ Upstream commit 113b261bdf2b4fd34e7769a147a7acd0a4d9137f ]
In order that the end of a clk_div_table can be detected, it must be terminated with a sentinel element (.div = 0).
--- drivers/clk/hisilicon/clk-hi3559a.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/hisilicon/clk-hi3559a.c +2 -2
@@ -611,8 +611,8 @@ static struct hisi_mux_clock hi3559av100_shub_mux_clks[] = {/* shub div clk */ -static struct clk_div_table shub_spi_clk_table[] = {{0 ,8 }, {1 ,4 }, {2 ,2 }}; -static struct clk_div_table shub_uart_div_clk_table[] = {{1 ,8 }, {2 ,4 }}; +static struct clk_div_table shub_spi_clk_table[] = {{0 ,8 }, {1 ,4 }, {2 ,2 }, {/*sentinel*/ }}; +static struct clk_div_table shub_uart_div_clk_table[] = {{1 ,8 }, {2 ,4 }, {/*sentinel*/ }};static struct hisi_divider_clock hi3559av100_shub_div_clks[] = { {HI3559AV100_SHUB_SPI_SOURCE_CLK ,"clk_spi_clk" ,"shub_clk" ,0 ,0x20 ,24 ,2 ,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 758/1126 clk: clps711x: Terminate clk_div_table with sentinel element
In reply to Greg Kroah-HartmanFrom: Jonathan Neuschäfer <[email protected]>
[ Upstream commit 8bed4ed5aa3431085d9d27afc35d684856460eda ]
In order that the end of a clk_div_table can be detected, it must be terminated with a sentinel element (.div = 0).
--- drivers/clk/clk-clps711x.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clk/clk-clps711x.c +2 -0
@@ -28,11 +28,13 @@ static const struct clk_div_table spi_div_table[] = { { .val = 1, .div = 8, }, { .val = 2, .div = 2, }, { .val = 3, .div = 1, }, + {/* sentinel */ } };static const struct clk_div_table timer_div_table[] = { { .val =0 , .div =256 , }, { .val =1 , .div =1 , }, + {/* sentinel */ } }; struct clps711x_clk {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 759/1126 clk: Fix clk_hw_get_clk() when dev is NULL
In reply to Greg Kroah-HartmanFrom: Maxime Ripard <[email protected]>
[ Upstream commit 0c1b56df451716ba207bbf59f303473643eee4fd ]
Any registered clk_core structure can have a NULL pointer in its dev field. While never actually documented, this is evidenced by the wide usage of clk_register and clk_hw_register with a NULL device pointer, and the fact that the core of_clk_hw_register() function also passes a NULL device pointer.
A call to clk_hw_get_clk() on a clk_hw struct whose clk_core is in that case will result in a NULL pointer derefence when it calls dev_name() on that NULL device pointer.
Add a test for this case and use NULL as the dev_id if the device pointer is NULL.
--- drivers/clk/clk.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/clk/clk.c +2 -1
@@ -3773,8 +3773,9 @@ struct clk *clk_hw_create_clk(struct device *dev, struct clk_hw *hw,struct clk *clk_hw_get_clk (struct clk_hw *hw,const char *con_id) {struct device *dev = hw->core->dev; +const char *name = dev ?dev_name (dev) :NULL ; -return clk_hw_create_clk (dev, hw,dev_name (dev), con_id); +return clk_hw_create_clk (dev, hw, name, con_id); }EXPORT_SYMBOL (clk_hw_get_clk);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 760/1126 clk: tegra: tegra124-emc: Fix missing put_device() call in emc_ensure_emc_driver
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 6d6ef58c2470da85a99119f74d34216c8074b9f0 ]
The reference taken by 'of_find_device_by_node()' must be released when not needed anymore.
Add the corresponding 'put_device()' in the error handling path.
--- drivers/clk/tegra/clk-tegra124-emc.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/tegra/clk-tegra124-emc.c +1 -0
@@ -198,6 +198,7 @@ static struct tegra_emc *emc_ensure_emc_driver(struct tegra_clk_emc *tegra) tegra->emc =platform_get_drvdata (pdev);if (!tegra->emc) { +put_device (&pdev->dev);pr_err ("%s: cannot find EMC driver\n" , __func__);return NULL ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 761/1126 mailbox: imx: fix crash in resume on i.mx8ulp
In reply to Greg Kroah-HartmanFrom: Robin Gong <[email protected]>
[ Upstream commit 8219efd08a0aa1d7944bdb66d84ba57549258968 ]
check 'priv->clk' before 'imx_mu_read()' otherwise crash happens on i.mx8ulp, since clock not enabled.
--- drivers/mailbox/imx-mailbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mailbox/imx-mailbox.c +1 -1
@@ -718,7 +718,7 @@ static int __maybe_unused imx_mu_resume_noirq(struct device *dev)* send failed, may lead to system freeze. This issue * is observed by testing freeze mode suspend. */ -if (!imx_mu_read (priv, priv->dcfg->xCR[0 ]) && !priv->clk) { +if (!priv->clk && !imx_mu_read (priv, priv->dcfg->xCR[0 ])) {for (i =0 ; i < IMX_MU_xCR_MAX; i++)imx_mu_write (priv, priv->xcr[i], priv->dcfg->xCR[i]); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 762/1126 NFS: remove unneeded check in decode_devicenotify_args()
In reply to Greg Kroah-HartmanFrom: Alexey Khoroshilov <[email protected]>
[ Upstream commit cb8fac6d2727f79f211e745b16c9abbf4d8be652 ]
[You don't often get email from [email protected]. Learn why this is important at http://aka.ms/LearnAboutSenderIdentification.]
Overflow check in not needed anymore after we switch to kmalloc_array().
--- fs/nfs/callback_xdr.c | 4 ---- 1 file changed, 4 deletions(-)
fs/nfs/callback_xdr.c +0 -4
@@ -271,10 +271,6 @@ __be32 decode_devicenotify_args(struct svc_rqst *rqstp, n =ntohl (*p++);if (n ==0 ) goto out; -if (n >ULONG_MAX /sizeof (*args->devs)) { - status =htonl (NFS4ERR_BADXDR ); - goto out; - } args->devs =kmalloc_array (n,sizeof (*args->devs),GFP_KERNEL );if (!args->devs) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 763/1126 staging: mt7621-dts: fix LEDs and pinctrl on GB-PC1 devicetree
In reply to Greg Kroah-HartmanFrom: Arınç ÜNAL <[email protected]>
[ Upstream commit 6256e18686158fa49e019297f990f1c1817aabf1 ]
Fix LED and pinctrl definitions on the GB-PC1 devicetree. Refer to the schematics of the device for more information.
LED fixes:
- Change GPIO6 LED label from system to power as GPIO6 is connected to PLED.
- Add default-on default-trigger to power LED.
- Change GPIO8 LED label from status to system as GPIO8 is connected to SYS_LED.
- Add disk-activity default-trigger to system LED.
- Switch to the color:function naming scheme.
- Remove lan1 and lan2 LEDs as they don't exist.
Pinctrl fixes:
- Claim state_default node under pinctrl node.
- Change pinctrl0 node name to state-default.
- Change gpio node name to gpio-pinmux to respect Documentation/devicetree/bindings/pinctrl/ralink,rt2880-pinmux.yaml.
- Sort pin groups alphabetically.
Misc fixes:
- Fix formatting.
- Use the status value "okay".
- Define hexadecimal addresses in lower case.
- Make hexadecimal addresses for memory easier to read.
--- drivers/staging/mt7621-dts/gbpc1.dts | 40 +++++++++++++--------------- 1 file changed, 18 insertions(+), 22 deletions(-)
drivers/staging/mt7621-dts/gbpc1.dts +18 -22
@@ -12,7 +12,8 @@ memory@0 { device_type = "memory"; - reg = <0x0 0x1c000000>, <0x20000000 0x4000000>; + reg = <0x00000000 0x1c000000>, + <0x20000000 0x04000000>; }; chosen {
@@ -38,24 +39,16 @@ gpio-leds { compatible = "gpio-leds"; - system { - label = "gb-pc1:green:system"; + power { + label = "green:power"; gpios = <&gpio 6 GPIO_ACTIVE_LOW>; + linux,default-trigger = "default-on"; }; - status { - label = "gb-pc1:green:status"; + system { + label = "green:system"; gpios = <&gpio 8 GPIO_ACTIVE_LOW>; - }; - - lan1 { - label = "gb-pc1:green:lan1"; - gpios = <&gpio 24 GPIO_ACTIVE_LOW>; - }; - - lan2 { - label = "gb-pc1:green:lan2"; - gpios = <&gpio 25 GPIO_ACTIVE_LOW>; + linux,default-trigger = "disk-activity"; }; }; };
@@ -95,9 +88,8 @@ partition@50000 { label = "firmware"; - reg = <0x50000 0x1FB0000>; + reg = <0x50000 0x1fb0000>; }; - }; };
@@ -106,9 +98,12 @@ }; &pinctrl { - state_default: pinctrl0 { - default_gpio: gpio { - groups = "wdt", "rgmii2", "uart3"; + pinctrl-names = "default"; + pinctrl-0 = <&state_default>; + + state_default: state-default { + gpio-pinmux { + groups = "rgmii2", "uart3", "wdt"; function = "gpio"; }; };
@@ -117,12 +112,13 @@ &switch0 { ports { port@0 { + status = "okay"; label = "ethblack"; - status = "ok"; }; + port@4 { + status = "okay"; label = "ethblue"; - status = "ok"; }; }; };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 764/1126 staging: mt7621-dts: fix formatting
In reply to Greg Kroah-HartmanFrom: Arınç ÜNAL <[email protected]>
[ Upstream commit 7eeec44d33f6be7caca4fe9ca4e653cf315a36c1 ]
Fix formatting on mt7621.dtsi.
--- drivers/staging/mt7621-dts/mt7621.dtsi | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/staging/mt7621-dts/mt7621.dtsi +12 -3
@@ -44,9 +44,9 @@ regulator-max-microvolt = <3300000>; enable-active-high; regulator-always-on; - }; + }; - mmc_fixed_1v8_io: fixedregulator@1 { + mmc_fixed_1v8_io: fixedregulator@1 { compatible = "regulator-fixed"; regulator-name = "mmc_io"; regulator-min-microvolt = <1800000>;
@@ -325,17 +325,18 @@ mediatek,ethsys = <&sysc>; - gmac0: mac@0 { compatible = "mediatek,eth-mac"; reg = <0>; phy-mode = "rgmii"; + fixed-link { speed = <1000>; full-duplex; pause; }; }; + gmac1: mac@1 { compatible = "mediatek,eth-mac"; reg = <1>;
@@ -343,6 +344,7 @@ phy-mode = "rgmii-rxid"; phy-handle = <&phy_external>; }; + mdio-bus { #address-cells = <1>; #size-cells = <0>;
@@ -373,36 +375,43 @@ #address-cells = <1>; #size-cells = <0>; reg = <0>; + port@0 { status = "off"; reg = <0>; label = "lan0"; }; + port@1 { status = "off"; reg = <1>; label = "lan1"; }; + port@2 { status = "off"; reg = <2>; label = "lan2"; }; + port@3 { status = "off"; reg = <3>; label = "lan3"; }; + port@4 { status = "off"; reg = <4>; label = "lan4"; }; + port@6 { reg = <6>; label = "cpu"; ethernet = <&gmac0>; phy-mode = "trgmii"; + fixed-link { speed = <1000>; full-duplex;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 765/1126 staging: mt7621-dts: fix pinctrl properties for ethernet
In reply to Greg Kroah-HartmanFrom: Arınç ÜNAL <[email protected]>
[ Upstream commit 0a93c0d75809582893e82039143591b9265b520e ]
Add pinctrl properties with rgmii1 & mdio pins under ethernet node which was wrongfully put under an external phy node.
GMAC1 will start working with this fix.
Move GB-PC2 specific phy_external node to its own device tree.
--- drivers/staging/mt7621-dts/gbpc2.dts | 16 +++++++++++----- drivers/staging/mt7621-dts/mt7621.dtsi | 13 +++---------- 2 files changed, 14 insertions(+), 15 deletions(-)
drivers/staging/mt7621-dts/gbpc2.dts +11 -5
@@ -13,10 +13,16 @@ function = "gpio"; }; -&gmac1 { - status = "ok"; -}; +ðernet { + gmac1: mac@1 { + status = "ok"; + phy-handle = <&phy_external>; + }; -&phy_external { - status = "ok"; + mdio-bus { + phy_external: ethernet-phy@5 { + reg = <5>; + phy-mode = "rgmii-rxid"; + }; + }; };
drivers/staging/mt7621-dts/mt7621.dtsi +3 -10
@@ -325,6 +325,9 @@ mediatek,ethsys = <&sysc>; + pinctrl-names = "default"; + pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>; + gmac0: mac@0 { compatible = "mediatek,eth-mac"; reg = <0>;
@@ -342,22 +345,12 @@ reg = <1>; status = "off"; phy-mode = "rgmii-rxid"; - phy-handle = <&phy_external>; }; mdio-bus { #address-cells = <1>; #size-cells = <0>; - phy_external: ethernet-phy@5 { - status = "off"; - reg = <5>; - phy-mode = "rgmii-rxid"; - - pinctrl-names = "default"; - pinctrl-0 = <&rgmii2_pins>; - }; - switch0: switch0@0 { compatible = "mediatek,mt7621"; #address-cells = <1>;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 766/1126 staging: mt7621-dts: fix GB-PC2 devicetree
In reply to Greg Kroah-HartmanFrom: Arınç ÜNAL <[email protected]>
[ Upstream commit 5bc148649cf358d0cccf525452a4efbd4bc89a0f ]
Fix the GB-PC2 devicetree. Refer to the schematics of the device for more information.
GB-PC2 devicetree fixes:
- Include mt7621.dtsi instead of gbpc1.dts. Add the missing definitions.
- Remove gpio-leds node as the system LED is not wired to anywhere on the board and the power LED is directly wired to GND.
- Remove uart3 pin group from gpio-pinmux node as it's not used as GPIO.
- Use reg 7 for the external phy to be on par with Documentation/devicetree/bindings/net/dsa/mt7530.txt.
- Use the status value "okay".
--- drivers/staging/mt7621-dts/gbpc2.dts | 110 +++++++++++++++++++++++++-- 1 file changed, 102 insertions(+), 8 deletions(-)
drivers/staging/mt7621-dts/gbpc2.dts +102 -8
@@ -1,28 +1,122 @@ // SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) /dts-v1/; -#include "gbpc1.dts" +#include "mt7621.dtsi" + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> / { compatible = "gnubee,gb-pc2", "mediatek,mt7621-soc"; model = "GB-PC2"; + + memory@0 { + device_type = "memory"; + reg = <0x00000000 0x1c000000>, + <0x20000000 0x04000000>; + }; + + chosen { + bootargs = "console=ttyS0,57600"; + }; + + palmbus: palmbus@1e000000 { + i2c@900 { + status = "okay"; + }; + }; + + gpio-keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&gpio 18 GPIO_ACTIVE_HIGH>; + linux,code = <KEY_RESTART>; + }; + }; }; -&default_gpio { - groups = "wdt", "uart3"; - function = "gpio"; +&sdhci { + status = "okay"; +}; + +&spi0 { + status = "okay"; + + m25p80@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <50000000>; + broken-flash-reset; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x30000>; + read-only; + }; + + partition@30000 { + label = "u-boot-env"; + reg = <0x30000 0x10000>; + read-only; + }; + + factory: partition@40000 { + label = "factory"; + reg = <0x40000 0x10000>; + read-only; + }; + + partition@50000 { + label = "firmware"; + reg = <0x50000 0x1fb0000>; + }; + }; +}; + +&pcie { + status = "okay"; +}; + +&pinctrl { + pinctrl-names = "default"; + pinctrl-0 = <&state_default>; + + state_default: state-default { + gpio-pinmux { + groups = "wdt"; + function = "gpio"; + }; + }; }; ðernet { gmac1: mac@1 { - status = "ok"; - phy-handle = <&phy_external>; + status = "okay"; + phy-handle = <ðphy7>; }; mdio-bus { - phy_external: ethernet-phy@5 { - reg = <5>; + ethphy7: ethernet-phy@7 { + reg = <7>; phy-mode = "rgmii-rxid"; }; }; }; + +&switch0 { + ports { + port@0 { + status = "okay"; + label = "ethblack"; + }; + + port@4 { + status = "okay"; + label = "ethblue"; + }; + }; +};
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 767/1126 pinctrl: ocelot: fix confops resource index
In reply to Greg Kroah-HartmanFrom: Michael Walle <[email protected]>
[ Upstream commit 94ef32970d4076b3179b801c251bf99446b62da5 ]
Prior to commit ad96111e658a ("pinctrl: ocelot: combine get resource and ioremap into single call") the resource index was 1, now it is 0. But 0 is the base region for the pinctrl block. Fix it.
I noticed this because there was an error that the memory region was ioremapped twice.
--- drivers/pinctrl/pinctrl-ocelot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/pinctrl-ocelot.c +1 -1
@@ -1790,7 +1790,7 @@ static struct regmap *ocelot_pinctrl_create_pincfg(struct platform_device *pdev) .max_register = 32, }; - base =devm_platform_ioremap_resource (pdev,0 ); + base =devm_platform_ioremap_resource (pdev,1 );if (IS_ERR (base)) {dev_dbg (&pdev->dev,"Failed to ioremap config registers (no extended pinconf)\n" );return NULL ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 768/1126 pinctrl: ocelot: fix duplicate debugfs entry
In reply to Greg Kroah-HartmanFrom: Michael Walle <[email protected]>
[ Upstream commit 359afd90fef3ec9285432f50720c813987df4a89 ]
This driver can have up to two regmaps. If the second one is registered its debugfs entry will have the same name as the first one and the following error will be printed:
[ 2.242568] debugfs: Directory 'e2004064.pinctrl' with parent 'regmap' already present!
Give the second regmap a name to avoid this.
--- drivers/pinctrl/pinctrl-ocelot.c | 1 + 1 file changed, 1 insertion(+)
drivers/pinctrl/pinctrl-ocelot.c +1 -0
@@ -1788,6 +1788,7 @@ static struct regmap *ocelot_pinctrl_create_pincfg(struct platform_device *pdev) .val_bits = 32, .reg_stride = 4, .max_register = 32, + .name = "pincfg", }; base =devm_platform_ioremap_resource (pdev,1 );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 769/1126 pinctrl: mediatek: Fix missing of_node_put() in mtk_pctrl_init
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit dab4df9ca919f59e5b9dd84385eaf34d4f20dbb0 ]
The device_node pointer is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done.
--- drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pinctrl/mediatek/pinctrl-mtk-common.c +2 -0
@@ -1038,6 +1038,7 @@ int mtk_pctrl_init(struct platform_device *pdev, node =of_parse_phandle (np,"mediatek,pctl-regmap" ,0 );if (node) { pctl->regmap1 =syscon_node_to_regmap (node); +of_node_put (node);if (IS_ERR (pctl->regmap1))return PTR_ERR (pctl->regmap1); }else if (regmap) {
@@ -1051,6 +1052,7 @@ int mtk_pctrl_init(struct platform_device *pdev, node =of_parse_phandle (np,"mediatek,pctl-regmap" ,1 );if (node) { pctl->regmap2 =syscon_node_to_regmap (node); +of_node_put (node);if (IS_ERR (pctl->regmap2))return PTR_ERR (pctl->regmap2); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 770/1126 pinctrl: mediatek: paris: Fix PIN_CONFIG_BIAS_* readback
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit 3e8c6bc608480010f360c4a59578d7841726137d ]
When reading back pin bias settings, if the pin is not in the corresponding bias state, the function should return -EINVAL.
Fix this in the mediatek-paris pinctrl library so that the read back state is not littered with bogus a "input bias disabled" combined with "pull up" or "pull down" states.
--- drivers/pinctrl/mediatek/pinctrl-paris.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
drivers/pinctrl/mediatek/pinctrl-paris.c +6 -10
@@ -96,20 +96,16 @@ static int mtk_pinconf_get(struct pinctrl_dev *pctldev, err = hw->soc->bias_get_combo (hw, desc, &pullup, &ret);if (err) goto out; +if (ret ==MTK_PUPD_SET_R1R0_00 ) + ret =MTK_DISABLE ;if (param ==PIN_CONFIG_BIAS_DISABLE ) { -if (ret ==MTK_PUPD_SET_R1R0_00 ) - ret =MTK_DISABLE ; +if (ret !=MTK_DISABLE ) + err = -EINVAL ; }else if (param ==PIN_CONFIG_BIAS_PULL_UP ) { -/* When desire to get pull-up value, return -* error if current setting is pull-down -*/ -if (!pullup) +if (!pullup || ret ==MTK_DISABLE ) err = -EINVAL ; }else if (param ==PIN_CONFIG_BIAS_PULL_DOWN ) { -/* When desire to get pull-down value, return -* error if current setting is pull-up -*/ -if (pullup) +if (pullup || ret ==MTK_DISABLE ) err = -EINVAL ; } }else {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 771/1126 pinctrl: mediatek: paris: Fix "argument" argument type for mtk_pinconf_get()
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit 19bce7ce0a593c7024030a0cda9e23facea3c93d ]
For mtk_pinconf_get(), the "argument" argument is typically returned by pinconf_to_config_argument(), which holds the value for a given pinconf parameter. It certainly should not have the type of "enum pin_config_param", which describes the type of the pinconf parameter itself.
Change the type to u32, which matches the return type of pinconf_to_config_argument().
--- drivers/pinctrl/mediatek/pinctrl-paris.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/pinctrl/mediatek/pinctrl-paris.c +1 -2
@@ -184,8 +184,7 @@ static int mtk_pinconf_get(struct pinctrl_dev *pctldev, }static int mtk_pinconf_set (struct pinctrl_dev *pctldev,unsigned int pin, -enum pin_config_param param, -enum pin_config_param arg) +enum pin_config_param param,u32 arg) {struct mtk_pinctrl *hw =pinctrl_dev_get_drvdata (pctldev);const struct mtk_pin_desc *desc;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 772/1126 pinctrl: mediatek: paris: Fix pingroup pin config state readback
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit 54fe55fb384ade630ef20b9a8b8f3b2a89ad97f2 ]
mtk_pconf_group_get(), used to read back pingroup pin config state, simply returns a set of configs saved from a previous invocation of mtk_pconf_group_set(). This is an unfiltered, unvalidated set passed in from the pinconf core, which does not match the current hardware state.
Since the driver library is designed to have one pin per group, pass through mtk_pconf_group_get() to mtk_pinconf_get(), to read back the current pin config state of the only pin in the group.
Also drop the assignment of pin config state to the group.
--- drivers/pinctrl/mediatek/pinctrl-paris.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/pinctrl/mediatek/pinctrl-paris.c +3 -5
@@ -732,10 +732,10 @@ static int mtk_pconf_group_get(struct pinctrl_dev *pctldev, unsigned group, unsigned long *config) {struct mtk_pinctrl *hw =pinctrl_dev_get_drvdata (pctldev); +struct mtk_pinctrl_group *grp = &hw->groups[group]; - *config = hw->groups[group].config; - -return 0 ; +/* One pin per group only */ +return mtk_pinconf_get (pctldev, grp->pin, config); } static int mtk_pconf_group_set(struct pinctrl_dev *pctldev, unsigned group,
@@ -751,8 +751,6 @@ static int mtk_pconf_group_set(struct pinctrl_dev *pctldev, unsigned group, pinconf_to_config_argument(configs[i]));if (ret <0 )return ret; - - grp->config = configs[i]; }return 0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 773/1126 pinctrl: mediatek: paris: Skip custom extra pin config dump for virtual GPIOs
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit 1763933d377ecb05454f8d20e3c8922480db2ac0 ]
Virtual GPIOs do not have any hardware state associated with them. Any attempt to read back hardware state for these pins result in error codes.
Skip dumping extra pin config information for these virtual GPIOs.
--- drivers/pinctrl/mediatek/pinctrl-paris.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/pinctrl/mediatek/pinctrl-paris.c +3 -0
@@ -581,6 +581,9 @@ ssize_t mtk_pctrl_show_one_pin(struct mtk_pinctrl *hw,if (gpio >= hw->soc->npins)return -EINVAL ; +if (mtk_is_virt_gpio (hw, gpio)) +return -EINVAL ; + desc = (const struct mtk_pin_desc *)&hw->soc->pins[gpio]; pinmux =mtk_pctrl_get_pinmux (hw, gpio);if (pinmux >= hw->soc->nfuncs)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 774/1126 pinctrl: ocelot: Fix interrupt parsing
In reply to Greg Kroah-HartmanFrom: Horatiu Vultur <[email protected]>
[ Upstream commit d1f2c82f3b1f428bdc0933dde52fb93ae796d4ee ]
In the blamed commit, it removes the duplicate of_node assignment in the driver. But the driver uses this before calling into of_gpio_dev_init to determine if it needs to assign an IRQ chip to the GPIO. The fixes consists in using the platform_get_irq_optional
--- drivers/pinctrl/pinctrl-ocelot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pinctrl/pinctrl-ocelot.c +2 -2
@@ -1750,8 +1750,8 @@ static int ocelot_gpiochip_register(struct platform_device *pdev, gc->base =-1 ; gc->label ="ocelot-gpio" ; - irq =irq_of_parse_and_map (gc->of_node,0 ); -if (irq) { + irq =platform_get_irq_optional (pdev,0 ); +if (irq >0 ) { girq = &gc->irq; girq->chip = &ocelot_irqchip; girq->parent_handler = ocelot_irq_handler;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 775/1126 pinctrl: microchip-sgpio: lock RMW access
In reply to Greg Kroah-HartmanFrom: Michael Walle <[email protected]>
[ Upstream commit 7996c5f5ec7a20b3f6b8fae93fcf3cb8f1c01743 ]
Protect any RMW access to the registers by a spinlock.
--- drivers/pinctrl/pinctrl-microchip-sgpio.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/pinctrl/pinctrl-microchip-sgpio.c +15 -0
@@ -19,6 +19,7 @@#include <linux/property.h> #include <linux/regmap.h> #include <linux/reset.h> +#include <linux/spinlock.h> #include "core.h" #include "pinconf.h"
@@ -116,6 +117,7 @@ struct sgpio_priv {u32 clock;struct regmap *regs;const struct sgpio_properties *properties; +spinlock_t lock; };struct sgpio_port_addr {
@@ -229,6 +231,7 @@ static void sgpio_output_set(struct sgpio_priv *priv, int value) {unsigned int bit =SGPIO_SRC_BITS * addr->bit; +unsigned long flags;u32 clr, set;switch (priv->properties->arch) {
@@ -247,7 +250,10 @@ static void sgpio_output_set(struct sgpio_priv *priv,default :return ; } + +spin_lock_irqsave (&priv->lock, flags);sgpio_clrsetbits (priv,REG_PORT_CONFIG , addr->port, clr, set); +spin_unlock_irqrestore (&priv->lock, flags); } static int sgpio_output_get(struct sgpio_priv *priv,
@@ -575,10 +581,13 @@ static void microchip_sgpio_irq_settype(struct irq_data *data,struct sgpio_bank *bank =gpiochip_get_data (chip);unsigned int gpio =irqd_to_hwirq (data);struct sgpio_port_addr addr; +unsigned long flags;u32 ena;sgpio_pin_to_addr (bank->priv, gpio, &addr); +spin_lock_irqsave (&bank->priv->lock, flags); +/* Disable interrupt while changing type */ ena =sgpio_readl (bank->priv,REG_INT_ENABLE , addr.bit);sgpio_writel (bank->priv, ena & ~BIT (addr.port),REG_INT_ENABLE , addr.bit);
@@ -595,6 +604,8 @@ static void microchip_sgpio_irq_settype(struct irq_data *data,/* Possibly re-enable interrupts */ sgpio_writel (bank->priv, ena,REG_INT_ENABLE , addr.bit); + +spin_unlock_irqrestore (&bank->priv->lock, flags); } static void microchip_sgpio_irq_setreg(struct irq_data *data,
@@ -605,13 +616,16 @@ static void microchip_sgpio_irq_setreg(struct irq_data *data,struct sgpio_bank *bank =gpiochip_get_data (chip);unsigned int gpio =irqd_to_hwirq (data);struct sgpio_port_addr addr; +unsigned long flags;sgpio_pin_to_addr (bank->priv, gpio, &addr); +spin_lock_irqsave (&bank->priv->lock, flags);if (clear)sgpio_clrsetbits (bank->priv, reg, addr.bit,BIT (addr.port),0 );else sgpio_clrsetbits (bank->priv, reg, addr.bit,0 ,BIT (addr.port)); +spin_unlock_irqrestore (&bank->priv->lock, flags); }static void microchip_sgpio_irq_mask (struct irq_data *data)
@@ -833,6 +847,7 @@ static int microchip_sgpio_probe(struct platform_device *pdev)return -ENOMEM ; priv->dev = dev; +spin_lock_init (&priv->lock); reset =devm_reset_control_get_optional_shared (&pdev->dev,"switch" );if (IS_ERR (reset))
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 776/1126 pinctrl: nomadik: Add missing of_node_put() in nmk_pinctrl_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit c09ac191b1f97cfa06f394dbfd7a5db07986cefc ]
This node pointer is returned by of_parse_phandle() with refcount incremented in this function. Calling of_node_put() to avoid the refcount leak.
--- drivers/pinctrl/nomadik/pinctrl-nomadik.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/pinctrl/nomadik/pinctrl-nomadik.c +3 -1
@@ -1883,8 +1883,10 @@ static int nmk_pinctrl_probe(struct platform_device *pdev) } prcm_np =of_parse_phandle (np,"prcm" ,0 ); -if (prcm_np) +if (prcm_np) { npct->prcm_base =of_iomap (prcm_np,0 ); +of_node_put (prcm_np); + }if (!npct->prcm_base) {if (version ==PINCTRL_NMK_STN8815 ) { dev_info(&pdev->dev,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 777/1126 pinctrl/rockchip: Add missing of_node_put() in rockchip_pinctrl_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 89388f8730699c259f8090ec435fb43569efe4ac ]
The device_node pointer is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done.
--- drivers/pinctrl/pinctrl-rockchip.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pinctrl/pinctrl-rockchip.c +2 -0
@@ -2693,6 +2693,7 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev) node =of_parse_phandle (np,"rockchip,grf" ,0 );if (node) { info->regmap_base =syscon_node_to_regmap (node); +of_node_put (node);if (IS_ERR (info->regmap_base))return PTR_ERR (info->regmap_base); }else {
@@ -2725,6 +2726,7 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev) node =of_parse_phandle (np,"rockchip,pmu" ,0 );if (node) { info->regmap_pmu =syscon_node_to_regmap (node); +of_node_put (node);if (IS_ERR (info->regmap_pmu))return PTR_ERR (info->regmap_pmu); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 778/1126 clk: visconti: prevent array overflow in visconti_clk_register_gates()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit c5601e0720ce1a3ad895f94a5838530edde01ed3 ]
This code was using -1 to represent that there was no reset function. Unfortunately, the -1 was stored in u8 so the if (clks[i].rs_id >= 0) condition was always true. This lead to an out of bounds access in visconti_clk_register_gates().
--- drivers/clk/visconti/clkc-tmpv770x.c | 2 +- drivers/clk/visconti/clkc.c | 2 +- drivers/clk/visconti/clkc.h | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-)
drivers/clk/visconti/clkc-tmpv770x.c +1 -1
@@ -176,7 +176,7 @@ static const struct visconti_clk_gate_table clk_gate_tables[] = { {TMPV770X_CLK_WRCK ,"wrck" , clks_parent_data,ARRAY_SIZE (clks_parent_data),0 ,0x68 ,0x168 ,9 ,32 , - -1, }, /* No reset */ + NO_RESET, }, { TMPV770X_CLK_PICKMON, "pickmon", clks_parent_data,ARRAY_SIZE (clks_parent_data), 0, 0x10, 0x110, 8, 4,
drivers/clk/visconti/clkc.c +1 -1
@@ -147,7 +147,7 @@ int visconti_clk_register_gates(struct visconti_clk_provider *ctx,if (!dev_name)return -ENOMEM ; -if (clks[i].rs_id >=0 ) { +if (clks[i].rs_id !=NO_RESET ) { rson_offset = reset[clks[i].rs_id].rson_offset; rsoff_offset = reset[clks[i].rs_id].rsoff_offset; rs_idx = reset[clks[i].rs_id].rs_idx;
drivers/clk/visconti/clkc.h +3 -0
@@ -73,4 +73,7 @@ int visconti_clk_register_gates(struct visconti_clk_provider *data,int num_gate, const struct visconti_reset_data *reset, spinlock_t *lock); + +#define NO_RESET 0xFF +#endif /* _VISCONTI_CLKC_H_ */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 779/1126 tty: hvc: fix return value of __setup handler
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 53819a0d97aace1425bb042829e3446952a9e8a9 ]
__setup() handlers should return 1 to indicate that the boot option has been handled or 0 to indicate that it was not handled. Add a pr_warn() message if the option value is invalid and then always return 1.
--- drivers/tty/hvc/hvc_iucv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/tty/hvc/hvc_iucv.c +3 -1
@@ -1417,7 +1417,9 @@ static int __init hvc_iucv_init(void)*/ static int __init hvc_iucv_config (char *val) { -return kstrtoul (val,10 , &hvc_iucv_devices); +if (kstrtoul (val,10 , &hvc_iucv_devices)) +pr_warn ("hvc_iucv= invalid parameter value '%s'\n" , val); +return 1 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 780/1126 kgdboc: fix return value of __setup handler
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit ab818c7aa7544bf8d2dd4bdf68878b17a02eb332 ]
__setup() handlers should return 1 to obsolete_checksetup() in init/main.c to indicate that the boot option has been handled. A return of 0 causes the boot option/value to be listed as an Unknown kernel parameter and added to init's (limited) environment strings. So return 1 from kgdboc_option_setup().
Unknown kernel command line parameters "BOOT_IMAGE=/boot/bzImage-517rc7
kgdboc=kbd kgdbts=", will be passed to user space.
Run /sbin/init as init process
with arguments:
/sbin/init
with environment:
HOME=/
TERM=linux
BOOT_IMAGE=/boot/bzImage-517rc7
kgdboc=kbd
kgdbts=--- drivers/tty/serial/kgdboc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/tty/serial/kgdboc.c +3 -3
@@ -403,16 +403,16 @@ static int kgdboc_option_setup(char *opt) {if (!opt) {pr_err ("config string not provided\n" ); -return -EINVAL ; +return 1 ; }if (strlen (opt) >=MAX_CONFIG_LEN ) {pr_err ("config string too long\n" ); -return -ENOSPC ; +return 1 ; }strcpy (config, opt); -return 0 ; +return 1 ; }__setup ("kgdboc=" , kgdboc_option_setup);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 781/1126 serial: 8250: fix XOFF/XON sending when DMA is used
In reply to Greg Kroah-HartmanFrom: Ilpo Järvinen <[email protected]>
[ Upstream commit f58c252e30cf74f68b0054293adc03b5923b9f0e ]
When 8250 UART is using DMA, x_char (XON/XOFF) is never sent to the wire. After this change, x_char is injected correctly.
Create uart_xchar_out() helper for sending the x_char out and accounting related to it. It seems that almost every driver does these same steps with x_char. Except for 8250, however, almost all currently lack .serial_out so they cannot immediately take advantage of this new helper.
The downside of this patch is that it might reintroduce the problems some devices faced with mixed DMA/non-DMA transfer which caused revert f967fc8f165f (Revert "serial: 8250_dma:
don't bother DMA with small transfers"). However, the impact should be limited to cases with XON/XOFF (that didn't work with DMA capable devices to begin with so this problem is not very likely to cause a major issue, if any at all).
--- drivers/tty/serial/8250/8250_dma.c | 11 ++++++++++- drivers/tty/serial/8250/8250_port.c | 4 +--- drivers/tty/serial/serial_core.c | 14 ++++++++++++++ include/linux/serial_core.h | 2 ++ 4 files changed, 27 insertions(+), 4 deletions(-)
drivers/tty/serial/8250/8250_dma.c +10 -1
@@ -64,10 +64,19 @@ int serial8250_tx_dma(struct uart_8250_port *p)struct uart_8250_dma *dma = p->dma;struct circ_buf *xmit = &p->port.state->xmit;struct dma_async_tx_descriptor *desc; +struct uart_port *up = &p->port;int ret; -if (dma->tx_running) +if (dma->tx_running) { +if (up->x_char) { +dmaengine_pause (dma->txchan); +uart_xchar_out (up,UART_TX ); +dmaengine_resume (dma->txchan); + }return 0 ; + }else if (up->x_char) { +uart_xchar_out (up,UART_TX ); + }if (uart_tx_stopped (&p->port) ||uart_circ_empty (xmit)) {/* We have been called from __dma_tx_complete() */
drivers/tty/serial/8250/8250_port.c +1 -3
@@ -1819,9 +1819,7 @@ void serial8250_tx_chars(struct uart_8250_port *up)int count;if (port->x_char) { -serial_out (up,UART_TX , port->x_char); - port->icount.tx++; - port->x_char =0 ; +uart_xchar_out (port,UART_TX );return ; }if (uart_tx_stopped (port)) {
drivers/tty/serial/serial_core.c +14 -0
@@ -644,6 +644,20 @@ static void uart_flush_buffer(struct tty_struct *tty)tty_port_tty_wakeup (&state->port); } +/* +* This function performs low-level write of high-priority XON/XOFF +* character and accounting for it. +* +* Requires uart_port to implement .serial_out(). +*/ +void uart_xchar_out (struct uart_port *uport,int offset) +{ +serial_port_out (uport, offset, uport->x_char); + uport->icount.tx++; + uport->x_char =0 ; +} +EXPORT_SYMBOL_GPL (uart_xchar_out); +/* * This function is used to send a high-priority XON/XOFF character to * the device
include/linux/serial_core.h +2 -0
@@ -458,6 +458,8 @@ extern void uart_handle_cts_change(struct uart_port *uport,extern void uart_insert_char (struct uart_port *port,unsigned int status,unsigned int overrun,unsigned int ch,unsigned int flag); +void uart_xchar_out (struct uart_port *uport,int offset); +#ifdef CONFIG_MAGIC_SYSRQ_SERIAL #define SYSRQ_TIMEOUT (HZ * 5)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 782/1126 virt: acrn: obtain pa from VMA with PFNMAP flag
In reply to Greg Kroah-HartmanFrom: Yonghua Huang <[email protected]>
[ Upstream commit 8a6e85f75a83d16a71077e41f2720c691f432002 ]
acrn_vm_ram_map can't pin the user pages with VM_PFNMAP flag by calling get_user_pages_fast(), the PA(physical pages) may be mapped by kernel driver and set PFNMAP flag.
This patch fixes logic to setup EPT mapping for PFN mapped RAM region by checking the memory attribute before adding EPT mapping for them.
--- drivers/virt/acrn/mm.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/virt/acrn/mm.c +24 -0
@@ -162,10 +162,34 @@ int acrn_vm_ram_map(struct acrn_vm *vm, struct acrn_vm_memmap *memmap)void *remap_vaddr;int ret, pinned;u64 user_vm_pa; +unsigned long pfn; +struct vm_area_struct *vma;if (!vm || !memmap)return -EINVAL ; +mmap_read_lock (current->mm); + vma =vma_lookup (current->mm, memmap->vma_base); +if (vma && ((vma->vm_flags &VM_PFNMAP ) !=0 )) { +if ((memmap->vma_base + memmap->len) > vma->vm_end) { +mmap_read_unlock (current->mm); +return -EINVAL ; + } + + ret =follow_pfn (vma, memmap->vma_base, &pfn); +mmap_read_unlock (current->mm); +if (ret <0 ) { +dev_dbg (acrn_dev.this_device, +"Failed to lookup PFN at VMA:%pK.\n" , (void *)memmap->vma_base); +return ret; + } + +return acrn_mm_region_add (vm, memmap->user_vm_pa, +PFN_PHYS (pfn), memmap->len, +ACRN_MEM_TYPE_WB , memmap->attr); + } +mmap_read_unlock (current->mm); +/* Get the page number of the map region */ nr_pages = memmap->len >>PAGE_SHIFT ; pages =vzalloc (nr_pages *sizeof (struct page *));
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 783/1126 virt: acrn: fix a memory leak in acrn_dev_ioctl()
In reply to Greg Kroah-HartmanFrom: Xiaolong Huang <[email protected]>
[ Upstream commit ecd1735f14d6ac868ae5d8b7a2bf193fa11f388b ]
The vm_param and cpu_regs need to be freed via kfree() before return -EINVAL error.
--- drivers/virt/acrn/hsm.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
drivers/virt/acrn/hsm.c +15 -5
@@ -136,8 +136,10 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,if (IS_ERR (vm_param))return PTR_ERR (vm_param); -if ((vm_param->reserved0 | vm_param->reserved1) !=0 ) +if ((vm_param->reserved0 | vm_param->reserved1) !=0 ) { +kfree (vm_param);return -EINVAL ; + } vm =acrn_vm_create (vm, vm_param);if (!vm) {
@@ -182,21 +184,29 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,return PTR_ERR (cpu_regs);for (i =0 ; i <ARRAY_SIZE (cpu_regs->reserved); i++) -if (cpu_regs->reserved[i]) +if (cpu_regs->reserved[i]) { +kfree (cpu_regs);return -EINVAL ; + }for (i =0 ; i <ARRAY_SIZE (cpu_regs->vcpu_regs.reserved_32); i++) -if (cpu_regs->vcpu_regs.reserved_32[i]) +if (cpu_regs->vcpu_regs.reserved_32[i]) { +kfree (cpu_regs);return -EINVAL ; + }for (i =0 ; i <ARRAY_SIZE (cpu_regs->vcpu_regs.reserved_64); i++) -if (cpu_regs->vcpu_regs.reserved_64[i]) +if (cpu_regs->vcpu_regs.reserved_64[i]) { +kfree (cpu_regs);return -EINVAL ; + }for (i =0 ; i <ARRAY_SIZE (cpu_regs->vcpu_regs.gdt.reserved); i++)if (cpu_regs->vcpu_regs.gdt.reserved[i] | - cpu_regs->vcpu_regs.idt.reserved[i]) + cpu_regs->vcpu_regs.idt.reserved[i]) { +kfree (cpu_regs);return -EINVAL ; + } ret =hcall_set_vcpu_regs (vm->vmid,virt_to_phys (cpu_regs));if (ret <0 )
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 784/1126 kgdbts: fix return value of __setup handler
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 96c9e802c64014a7716865332d732cc9c7f24593 ]
__setup() handlers should return 1 to indicate that the boot option has been handled. A return of 0 causes the boot option/value to be listed as an Unknown kernel parameter and added to init's (limited) environment strings. So return 1 from kgdbts_option_setup().
Unknown kernel command line parameters "BOOT_IMAGE=/boot/bzImage-517rc7
kgdboc=kbd kgdbts=", will be passed to user space.
Run /sbin/init as init process
with arguments:
/sbin/init
with environment:
HOME=/
TERM=linux
BOOT_IMAGE=/boot/bzImage-517rc7
kgdboc=kbd
kgdbts=--- drivers/misc/kgdbts.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/misc/kgdbts.c +2 -2
@@ -1070,10 +1070,10 @@ static int kgdbts_option_setup(char *opt) {if (strlen (opt) >=MAX_CONFIG_LEN ) {printk (KERN_ERR "kgdbts: config string too long\n" ); -return -ENOSPC ; +return 1 ; }strcpy (config, opt); -return 0 ; +return 1 ; }__setup ("kgdbts=" , kgdbts_option_setup);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 785/1126 firmware: google: Properly state IOMEM dependency
In reply to Greg Kroah-HartmanFrom: David Gow <[email protected]>
[ Upstream commit 37fd83916da2e4cae03d350015c82a67b1b334c4 ]
The Google Coreboot implementation requires IOMEM functions (memmremap, memunmap, devm_memremap), but does not specify this is its Kconfig. This results in build errors when HAS_IOMEM is not set, such as on some UML configurations:
/usr/bin/ld: drivers/firmware/google/coreboot_table.o: in function `coreboot_table_probe':
coreboot_table.c:(.text+0x311): undefined reference to memremap' /usr/bin/ld: coreboot_table.c:(.text+0x34e): undefined reference to memunmap' /usr/bin/ld: drivers/firmware/google/memconsole-coreboot.o: in function `memconsole_probe':
memconsole-coreboot.c:(.text+0x12d): undefined reference to memremap' /usr/bin/ld: memconsole-coreboot.c:(.text+0x17e): undefined reference to devm_memremap' /usr/bin/ld: memconsole-coreboot.c:(.text+0x191): undefined reference to memunmap' /usr/bin/ld: drivers/firmware/google/vpd.o: in function vpd_section_destroy.isra.0':
vpd.c:(.text+0x300): undefined reference to `memunmap'/usr/bin/ld: drivers/firmware/google/vpd.o: in function `vpd_section_init':
vpd.c:(.text+0x382): undefined reference to `memremap'/usr/bin/ld: vpd.c:(.text+0x459): undefined reference to memunmap' /usr/bin/ld: drivers/firmware/google/vpd.o: in function vpd_probe':
vpd.c:(.text+0x59d): undefined reference to `memremap'/usr/bin/ld: vpd.c:(.text+0x5d3): undefined reference to `memunmap'
collect2: error: ld returned 1 exit status
--- drivers/firmware/google/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/google/Kconfig +1 -1
@@ -21,7 +21,7 @@ config GOOGLE_SMI config GOOGLE_COREBOOT_TABLE tristate "Coreboot Table Access" - depends on ACPI || OF + depends on HAS_IOMEM && (ACPI || OF) help This option enables the coreboot_table module, which provides other firmware modules access to the coreboot table. The coreboot table
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 786/1126 driver core: dd: fix return value of __setup handler
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit f2aad54703dbe630f9d8b235eb58e8c8cc78f37d ]
When "driver_async_probe=nulltty" is used on the kernel boot command line, it causes an Unknown parameter message and the string is added to init's environment strings, polluting them.
Unknown kernel command line parameters "BOOT_IMAGE=/boot/bzImage-517rc6 driver_async_probe=nulltty", will be passed to user space.
Run /sbin/init as init process
with arguments:
/sbin/init
with environment:
HOME=/
TERM=linux
BOOT_IMAGE=/boot/bzImage-517rc6
driver_async_probe=nullttyChange the return value of the __setup function to 1 to indicate that the __setup option has been handled.
--- drivers/base/dd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/dd.c +1 -1
@@ -810,7 +810,7 @@ static int __init save_async_options(char *buf)pr_warn ("Too long list of driver names for 'driver_async_probe'!\n" );strlcpy (async_probe_drv_names, buf,ASYNC_DRV_NAMES_MAX_LEN ); -return 0 ; +return 1 ; }__setup ("driver_async_probe=" , save_async_options);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 787/1126 perf test arm64: Test unwinding using fame-pointer (fp) mode
In reply to Greg Kroah-HartmanFrom: German Gomez <[email protected]>
[ Upstream commit cd6382d82752737e43ef3617bb9e72913d2b1d47 ]
Add a shell script to check that the call-graphs generated using frame pointers (--call-graph fp) are complete and not missing leaf functions:
| $ perf test 88 -v | 88: Check Arm64 callgraphs are complete in fp mode : | --- start --- | test child forked, pid 8734 | + Compiling test program (/tmp/test_program.Cz3yL)... | + Recording (PID=8749)... | + Stopping perf-record... | test_program.Cz | 728 leaf | 753 parent | 76c main | test child finished with 0 | ---- end ---- | Check Arm SPE callgraphs are complete in fp mode: Ok
It's supposed to work with both unwinders:
| $ make # for libunwind (default) | $ make NO_LIBUNWIND=1 # for libdw
Tester notes:
Ran it on N1SDP and it passes, and it fails if b9f6fbb3b2c29736 ("perf
arm64: Inject missing frames when using 'perf record --call-graph=fp'") isn't applied.
--- .../perf/tests/shell/test_arm_callgraph_fp.sh | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100755 tools/perf/tests/shell/test_arm_callgraph_fp.sh
tools/perf/tests/shell/test_arm_callgraph_fp.sh new file +68 -0
@@ -0,0 +1,68 @@ +#!/bin/sh +# Check Arm64 callgraphs are complete in fp mode +# SPDX-License-Identifier: GPL-2.0 + +lscpu | grep -q "aarch64" || exit 2 + +if ! [ -x "$(command -v cc)" ]; then + echo "failed: no compiler, install gcc" + exit 2 +fi + +PERF_DATA=$(mktemp /tmp/__perf_test.perf.data.XXXXX) +TEST_PROGRAM_SOURCE=$(mktemp /tmp/test_program.XXXXX.c) +TEST_PROGRAM=$(mktemp /tmp/test_program.XXXXX) + +cleanup_files() +{ + rm -f $PERF_DATA + rm -f $TEST_PROGRAM_SOURCE + rm -f $TEST_PROGRAM +} + +trap cleanup_files exit term int + +cat << EOF > $TEST_PROGRAM_SOURCE +int a = 0; +void leaf(void) { + for (;;) + a += a; +} +void parent(void) { + leaf(); +} +int main(void) { + parent(); + return 0; +} +EOF + +echo " + Compiling test program ($TEST_PROGRAM)..." + +CFLAGS="-g -O0 -fno-inline -fno-omit-frame-pointer" +cc $CFLAGS $TEST_PROGRAM_SOURCE -o $TEST_PROGRAM || exit 1 + +# Add a 1 second delay to skip samples that are not in the leaf() function +perf record -o $PERF_DATA --call-graph fp -e cycles//u -D 1000 -- $TEST_PROGRAM 2> /dev/null & +PID=$! + +echo " + Recording (PID=$PID)..." +sleep 2 +echo " + Stopping perf-record..." + +kill $PID +wait $PID + +# expected perf-script output: +# +# program +# 728 leaf +# 753 parent +# 76c main +# ... + +perf script -i $PERF_DATA -F comm,ip,sym | head -n4 +perf script -i $PERF_DATA -F comm,ip,sym | head -n4 | \ + awk '{ if ($2 != "") sym[i++] = $2 } END { if (sym[0] != "leaf" || + sym[1] != "parent" || + sym[2] != "main") exit 1 }'
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 788/1126 jfs: fix divide error in dbNextAG
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
[ Upstream commit 2cc7cc01c15f57d056318c33705647f87dcd4aab ]
Syzbot reported divide error in dbNextAG(). The problem was in missing validation check for malicious image.
Syzbot crafted an image with bmp->db_numag equal to 0. There wasn't any validation checks, but dbNextAG() blindly use bmp->db_numag in divide expression
Fix it by validating bmp->db_numag in dbMount() and return an error if image is malicious
--- fs/jfs/jfs_dmap.c | 7 +++++++ 1 file changed, 7 insertions(+)
fs/jfs/jfs_dmap.c +7 -0
@@ -148,6 +148,7 @@ static const s8 budtab[256] = {* 0 - success * -ENOMEM - insufficient memory * -EIO - i/o error +* -EINVAL - wrong bmap data */ int dbMount (struct inode *ipbmap) {
@@ -179,6 +180,12 @@ int dbMount(struct inode *ipbmap) bmp->db_nfree =le64_to_cpu (dbmp_le->dn_nfree); bmp->db_l2nbperpage =le32_to_cpu (dbmp_le->dn_l2nbperpage); bmp->db_numag =le32_to_cpu (dbmp_le->dn_numag); +if (!bmp->db_numag) { +release_metapage (mp); +kfree (bmp); +return -EINVAL ; + } + bmp->db_maxlevel =le32_to_cpu (dbmp_le->dn_maxlevel); bmp->db_maxag =le32_to_cpu (dbmp_le->dn_maxag); bmp->db_agpref =le32_to_cpu (dbmp_le->dn_agpref);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 789/1126 SUNRPC/call_alloc: async tasks mustnt block waiting for memory
In reply to Greg Kroah-HartmanFrom: NeilBrown <[email protected]>
[ Upstream commit c487216bec83b0c5a8803e5c61433d33ad7b104d ]
When memory is short, new worker threads cannot be created and we depend on the minimum one rpciod thread to be able to handle everything. So it must not block waiting for memory.
mempools are particularly a problem as memory can only be released back to the mempool by an async rpc task running. If all available workqueue threads are waiting on the mempool, no thread is available to return anything.
rpc_malloc() can block, and this might cause deadlocks.
So check RPC_IS_ASYNC(), rather than RPC_IS_SWAPPER() to determine if blocking is acceptable.
--- net/sunrpc/sched.c | 4 +++- net/sunrpc/xprtrdma/transport.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)
net/sunrpc/sched.c +3 -1
@@ -1023,8 +1023,10 @@ int rpc_malloc(struct rpc_task *task)struct rpc_buffer *buf;gfp_t gfp =GFP_NOFS ; +if (RPC_IS_ASYNC (task)) + gfp =GFP_NOWAIT | __GFP_NOWARN;if (RPC_IS_SWAPPER (task)) - gfp = __GFP_MEMALLOC |GFP_NOWAIT | __GFP_NOWARN; + gfp |= __GFP_MEMALLOC; size +=sizeof (struct rpc_buffer );if (size <=RPC_BUFFER_MAXSIZE )
net/sunrpc/xprtrdma/transport.c +3 -1
@@ -570,8 +570,10 @@ xprt_rdma_allocate(struct rpc_task *task)gfp_t flags; flags =RPCRDMA_DEF_GFP ; +if (RPC_IS_ASYNC (task)) + flags =GFP_NOWAIT | __GFP_NOWARN;if (RPC_IS_SWAPPER (task)) - flags = __GFP_MEMALLOC |GFP_NOWAIT | __GFP_NOWARN; + flags |= __GFP_MEMALLOC;if (!rpcrdma_check_regbuf (r_xprt, req->rl_sendbuf, rqst->rq_callsize, flags))
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 790/1126 SUNRPC: improve swap handling: scheduling and PF_MEMALLOC
In reply to Greg Kroah-HartmanFrom: NeilBrown <[email protected]>
[ Upstream commit 8db55a032ac7ac1ed7b98d6b1dc980e6378c652f ]
rpc tasks can be marked as RPC_TASK_SWAPPER. This causes GFP_MEMALLOC to be used for some allocations. This is needed in some cases, but not in all where it is currently provided, and in some where it isn't provided.
Currently *all* tasks associated with a rpc_client on which swap is enabled get the flag and hence some GFP_MEMALLOC support.
GFP_MEMALLOC is provided for ->buf_alloc() but only swap-writes need it. However xdr_alloc_bvec does not get GFP_MEMALLOC - though it often does need it.
xdr_alloc_bvec is called while the XPRT_LOCK is held. If this blocks, then it blocks all other queued tasks. So this allocation needs GFP_MEMALLOC for *all* requests, not just writes, when the xprt is used for any swap writes.
Similarly, if the transport is not connected, that will block all requests including swap writes, so memory allocations should get GFP_MEMALLOC if swap writes are possible.
So with this patch:
1/ we ONLY set RPC_TASK_SWAPPER for swap writes.
2/ __rpc_execute() sets PF_MEMALLOC while handling any task
with RPC_TASK_SWAPPER set, or when handling any task that holds the XPRT_LOCKED lock on an xprt used for swap. This removes the need for the RPC_IS_SWAPPER() test in ->buf_alloc handlers.
3/ xprt_prepare_transmit() sets PF_MEMALLOC after locking
any task to a swapper xprt. __rpc_execute() will clear it.
3/ PF_MEMALLOC is set for all the connect workers.
--- fs/nfs/write.c | 2 ++ net/sunrpc/clnt.c | 2 -- net/sunrpc/sched.c | 20 +++++++++++++++++--- net/sunrpc/xprt.c | 3 +++ net/sunrpc/xprtrdma/transport.c | 6 ++++-- net/sunrpc/xprtsock.c | 8 ++++++++ 6 files changed, 34 insertions(+), 7 deletions(-)
fs/nfs/write.c +2 -0
@@ -1412,6 +1412,8 @@ static void nfs_initiate_write(struct nfs_pgio_header *hdr, {int priority =flush_task_priority (how); +if (IS_SWAPFILE (hdr->inode)) + task_setup_data->flags |=RPC_TASK_SWAPPER ; task_setup_data->priority = priority; rpc_ops->write_setup (hdr, msg, &task_setup_data->rpc_client);trace_nfs_initiate_write (hdr);
net/sunrpc/clnt.c +0 -2
@@ -1085,8 +1085,6 @@ void rpc_task_set_client(struct rpc_task *task, struct rpc_clnt *clnt) task->tk_flags |=RPC_TASK_TIMEOUT ;if (clnt->cl_noretranstimeo) task->tk_flags |=RPC_TASK_NO_RETRANS_TIMEOUT ; -if (atomic_read (&clnt->cl_swapper)) - task->tk_flags |=RPC_TASK_SWAPPER ;/* Add to the client's list of all tasks */ spin_lock (&clnt->cl_lock);list_add_tail (&task->tk_task, &clnt->cl_tasks);
net/sunrpc/sched.c +17 -3
@@ -876,6 +876,15 @@ void rpc_release_calldata(const struct rpc_call_ops *ops, void *calldata) ops->rpc_release (calldata); } +static bool xprt_needs_memalloc (struct rpc_xprt *xprt,struct rpc_task *tk) +{ +if (!xprt) +return false; +if (!atomic_read (&xprt->swapper)) +return false; +return test_bit (XPRT_LOCKED , &xprt->state) && xprt->snd_task == tk; +} +/* * This is the RPC `scheduler' (or rather, the finite state machine). */
@@ -884,6 +893,7 @@ static void __rpc_execute(struct rpc_task *task)struct rpc_wait_queue *queue;int task_is_async =RPC_IS_ASYNC (task);int status =0 ; +unsigned long pflags = current->flags;WARN_ON_ONCE (RPC_IS_QUEUED (task));if (RPC_IS_QUEUED (task))
@@ -906,6 +916,10 @@ static void __rpc_execute(struct rpc_task *task) }if (!do_action)break ; +if (RPC_IS_SWAPPER (task) || +xprt_needs_memalloc (task->tk_xprt, task)) + current->flags |=PF_MEMALLOC ; +trace_rpc_task_run_action (task, do_action);do_action (task);
@@ -943,7 +957,7 @@ static void __rpc_execute(struct rpc_task *task)rpc_clear_running (task);spin_unlock (&queue->lock);if (task_is_async) -return ; + goto out;/* sync task: sleep here */ trace_rpc_task_sync_sleep (task, task->tk_action);
@@ -967,6 +981,8 @@ static void __rpc_execute(struct rpc_task *task)/* Release all resources associated with the task */ rpc_release_task (task); +out: +current_restore_flags (pflags,PF_MEMALLOC ); }/*
@@ -1025,8 +1041,6 @@ int rpc_malloc(struct rpc_task *task)if (RPC_IS_ASYNC (task)) gfp =GFP_NOWAIT | __GFP_NOWARN; -if (RPC_IS_SWAPPER (task)) - gfp |= __GFP_MEMALLOC; size +=sizeof (struct rpc_buffer );if (size <=RPC_BUFFER_MAXSIZE )
net/sunrpc/xprt.c +3 -0
@@ -1503,6 +1503,9 @@ bool xprt_prepare_transmit(struct rpc_task *task)return false; } +if (atomic_read (&xprt->swapper)) +/* This will be clear in __rpc_execute */ + current->flags |=PF_MEMALLOC ;return true; }
net/sunrpc/xprtrdma/transport.c +4 -2
@@ -235,8 +235,11 @@ xprt_rdma_connect_worker(struct work_struct *work) struct rpcrdma_xprt *r_xprt = container_of(work, struct rpcrdma_xprt, rx_connect_worker.work);struct rpc_xprt *xprt = &r_xprt->rx_xprt; +unsigned int pflags = current->flags;int rc; +if (atomic_read (&xprt->swapper)) + current->flags |=PF_MEMALLOC ; rc =rpcrdma_xprt_connect (r_xprt);xprt_clear_connecting (xprt);if (!rc) {
@@ -250,6 +253,7 @@ xprt_rdma_connect_worker(struct work_struct *work)rpcrdma_xprt_disconnect (r_xprt);xprt_unlock_connect (xprt, r_xprt);xprt_wake_pending_tasks (xprt, rc); +current_restore_flags (pflags,PF_MEMALLOC ); }/**
@@ -572,8 +576,6 @@ xprt_rdma_allocate(struct rpc_task *task) flags =RPCRDMA_DEF_GFP ;if (RPC_IS_ASYNC (task)) flags =GFP_NOWAIT | __GFP_NOWARN; -if (RPC_IS_SWAPPER (task)) - flags |= __GFP_MEMALLOC;if (!rpcrdma_check_regbuf (r_xprt, req->rl_sendbuf, rqst->rq_callsize, flags))
net/sunrpc/xprtsock.c +8 -0
@@ -2070,7 +2070,10 @@ static void xs_udp_setup_socket(struct work_struct *work)struct rpc_xprt *xprt = &transport->xprt;struct socket *sock;int status = -EIO ; +unsigned int pflags = current->flags; +if (atomic_read (&xprt->swapper)) + current->flags |=PF_MEMALLOC ; sock =xs_create_sock (xprt, transport,xs_addr (xprt)->sa_family,SOCK_DGRAM ,IPPROTO_UDP , false);
@@ -2090,6 +2093,7 @@ static void xs_udp_setup_socket(struct work_struct *work)xprt_clear_connecting (xprt);xprt_unlock_connect (xprt, transport);xprt_wake_pending_tasks (xprt, status); +current_restore_flags (pflags,PF_MEMALLOC ); }/**
@@ -2249,7 +2253,10 @@ static void xs_tcp_setup_socket(struct work_struct *work)struct socket *sock = transport->sock;struct rpc_xprt *xprt = &transport->xprt;int status; +unsigned int pflags = current->flags; +if (atomic_read (&xprt->swapper)) + current->flags |=PF_MEMALLOC ;if (!sock) { sock = xs_create_sock(xprt, transport, xs_addr(xprt)->sa_family, SOCK_STREAM,
@@ -2314,6 +2321,7 @@ static void xs_tcp_setup_socket(struct work_struct *work)xprt_clear_connecting (xprt); out_unlock:xprt_unlock_connect (xprt, transport); +current_restore_flags (pflags,PF_MEMALLOC ); }/**
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 791/1126 SUNRPC: Dont call connect() more than once on a TCP socket
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit 89f42494f92f448747bd8a7ab1ae8b5d5520577d ]
Avoid socket state races due to repeated calls to ->connect() using the same socket. If connect() returns 0 due to the connection having completed, but we are in fact in a closing state, then we may leave the XPRT_CONNECTING flag set on the transport.
--- include/linux/sunrpc/xprtsock.h | 1 + net/sunrpc/xprtsock.c | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-)
include/linux/sunrpc/xprtsock.h +1 -0
@@ -88,5 +88,6 @@ struct sock_xprt {#define XPRT_SOCK_WAKE_WRITE (5)#define XPRT_SOCK_WAKE_PENDING (6)#define XPRT_SOCK_WAKE_DISCONNECT (7) +#define XPRT_SOCK_CONNECT_SENT (8)#endif /* _LINUX_SUNRPC_XPRTSOCK_H */
net/sunrpc/xprtsock.c +12 -10
@@ -2257,10 +2257,15 @@ static void xs_tcp_setup_socket(struct work_struct *work)if (atomic_read (&xprt->swapper)) current->flags |=PF_MEMALLOC ; -if (!sock) { - sock =xs_create_sock (xprt, transport, -xs_addr (xprt)->sa_family,SOCK_STREAM , -IPPROTO_TCP , true); + +if (xprt_connected (xprt)) + goto out; +if (test_and_clear_bit (XPRT_SOCK_CONNECT_SENT , + &transport->sock_state) || + !sock) { +xs_reset_transport (transport); + sock =xs_create_sock (xprt, transport,xs_addr (xprt)->sa_family, +SOCK_STREAM ,IPPROTO_TCP , true);if (IS_ERR (sock)) {xprt_wake_pending_tasks (xprt,PTR_ERR (sock)); goto out;
@@ -2284,6 +2289,7 @@ static void xs_tcp_setup_socket(struct work_struct *work) fallthrough;case -EINPROGRESS :/* SYN_SENT! */ +set_bit (XPRT_SOCK_CONNECT_SENT , &transport->sock_state);if (xprt->reestablish_timeout <XS_TCP_INIT_REEST_TO ) xprt->reestablish_timeout =XS_TCP_INIT_REEST_TO ; fallthrough;
@@ -2345,13 +2351,9 @@ static void xs_connect(struct rpc_xprt *xprt, struct rpc_task *task)WARN_ON_ONCE (!xprt_lock_connect (xprt, task, transport)); -if (transport->sock !=NULL && !xprt_connecting (xprt)) { +if (transport->sock !=NULL ) {dprintk ("RPC: xs_connect delayed xprt %p for %lu " -"seconds\n" , - xprt, xprt->reestablish_timeout /HZ ); - -/* Start by resetting any existing state */ -xs_reset_transport (transport); +"seconds\n" , xprt, xprt->reestablish_timeout /HZ ); delay =xprt_reconnect_delay (xprt);xprt_reconnect_backoff (xprt,XS_TCP_INIT_REEST_TO );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 792/1126 perf parse-events: Move slots only with topdown
In reply to Greg Kroah-HartmanFrom: Ian Rogers <[email protected]>
[ Upstream commit bc355822f0d9623b632069105d425c822d124cc8 ]
If slots isn't with a topdown event then moving it is unnecessary. For example {instructions, slots} is re-ordered:
$ perf stat -e '{instructions,slots}' -a sleep 1Performance counter stats for 'system wide':
936,600,825 slots
144,440,968 instructions
1.006061423 seconds time elapsedWhich can break tools expecting the command line order to match the printed order. It is necessary to move the slots event first when it appears with topdown events. Add extra checking so that the slots event is only moved in the case of there being a topdown event like:
$ perf stat -e '{instructions,slots,topdown-fe-bound}' -a sleep 1Performance counter stats for 'system wide':
2427568570 slots
300927614 instructions
551021649 topdown-fe-bound1.001771803 seconds time elapsed
--- tools/perf/arch/x86/util/evlist.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
tools/perf/arch/x86/util/evlist.c +14 -4
@@ -20,17 +20,27 @@ int arch_evlist__add_default_attrs(struct evlist *evlist)struct evsel *arch_evlist__leader (struct list_head *list) { -struct evsel *evsel, *first; +struct evsel *evsel, *first, *slots =NULL ; +bool has_topdown = false; first = list_first_entry(list, struct evsel, core.node);if (!pmu_have_event ("cpu" ,"slots" ))return first; +/* If there is a slots event and a topdown event then the slots event comes first. */ __evlist__for_each_entry (list, evsel) { -if (evsel->pmu_name && !strcmp (evsel->pmu_name,"cpu" ) && - evsel->name &&strcasestr (evsel->name,"slots" )) -return evsel; +if (evsel->pmu_name && !strcmp (evsel->pmu_name,"cpu" ) && evsel->name) { +if (strcasestr (evsel->name,"slots" )) { + slots = evsel; +if (slots == first) +return first; + } +if (!strncasecmp (evsel->name,"topdown" ,7 )) + has_topdown = true; +if (slots && has_topdown) +return slots; + } }return first; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 793/1126 netfilter: egress: Report interface as outgoing
In reply to Greg Kroah-HartmanFrom: Phil Sutter <[email protected]>
[ Upstream commit d645552e9bd96671079b27015294ec7f9748fa2b ]
Otherwise packets in egress chains seem like they are being received by the interface, not sent out via it.
--- include/linux/netfilter_netdev.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/netfilter_netdev.h +1 -1
@@ -99,7 +99,7 @@ static inline struct sk_buff *nf_hook_egress(struct sk_buff *skb, int *rc,return skb;nf_hook_state_init (&state,NF_NETDEV_EGRESS , -NFPROTO_NETDEV , dev,NULL ,NULL , +NFPROTO_NETDEV ,NULL , dev,NULL ,dev_net (dev),NULL );/* nf assumes rcu_read_lock, not just read_lock_bh */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 794/1126 netfilter: nf_conntrack_tcp: preserve liberal flag in tcp options
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit f2dd495a8d589371289981d5ed33e6873df94ecc ]
Do not reset IP_CT_TCP_FLAG_BE_LIBERAL flag in out-of-sync scenarios coming before the TCP window tracking, otherwise such connections will fail in the window check.
Update tcp_options() to leave this flag in place and add a new helper function to reset the tcp window state.
Based on patch from Sven Auhagen.
--- net/netfilter/nf_conntrack_proto_tcp.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
net/netfilter/nf_conntrack_proto_tcp.c +13 -4
@@ -341,8 +341,8 @@ static void tcp_options(const struct sk_buff *skb,if (!ptr)return ; - state->td_scale = - state->flags =0 ; + state->td_scale =0 ; + state->flags &=IP_CT_TCP_FLAG_BE_LIBERAL ;while (length >0 ) {int opcode=*ptr++;
@@ -862,6 +862,16 @@ static bool tcp_can_early_drop(const struct nf_conn *ct)return false; } +static void nf_ct_tcp_state_reset (struct ip_ct_tcp_state *state) +{ + state->td_end =0 ; + state->td_maxend =0 ; + state->td_maxwin =0 ; + state->td_maxack =0 ; + state->td_scale =0 ; + state->flags &=IP_CT_TCP_FLAG_BE_LIBERAL ; +} +/* Returns verdict for packet, or -1 for invalid. */ int nf_conntrack_tcp_packet(struct nf_conn *ct, struct sk_buff *skb,
@@ -968,8 +978,7 @@ int nf_conntrack_tcp_packet(struct nf_conn *ct, ct->proto.tcp.last_flags &= ~IP_CT_EXP_CHALLENGE_ACK ; ct->proto.tcp.seen[ct->proto.tcp.last_dir].flags = ct->proto.tcp.last_flags; -memset (&ct->proto.tcp.seen[dir],0 , -sizeof (struct ip_ct_tcp_state )); +nf_ct_tcp_state_reset (&ct->proto.tcp.seen[dir]);break ; } ct->proto.tcp.last_index = index;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 795/1126 SUNRPC dont resend a task on an offlined transport
In reply to Greg Kroah-HartmanFrom: Olga Kornievskaia <[email protected]>
[ Upstream commit 82ee41b85cef16b4be1f4732650012d9baaedddd ]
When a task is being retried, due to an NFS error, if the assigned transport has been put offline and the task is relocatable pick a new transport.
--- net/sunrpc/clnt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/sunrpc/clnt.c +3 -1
@@ -1065,7 +1065,9 @@ rpc_task_get_next_xprt(struct rpc_clnt *clnt)static void rpc_task_set_transport (struct rpc_task *task,struct rpc_clnt *clnt) { -if (task->tk_xprt) +if (task->tk_xprt && + !(test_bit (XPRT_OFFLINE , &task->tk_xprt->state) && + (task->tk_flags &RPC_TASK_MOVEABLE )))return ;if (task->tk_flags &RPC_TASK_NO_ROUND_ROBIN ) task->tk_xprt =rpc_task_get_first_xprt (clnt);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 796/1126 NFSv4.1: dont retry BIND_CONN_TO_SESSION on session error
In reply to Greg Kroah-HartmanFrom: Olga Kornievskaia <[email protected]>
[ Upstream commit 1d15d121cc2ad4d016a7dc1493132a9696f91fc5 ]
There is no reason to retry the operation if a session error had occurred in such case result structure isn't filled out.
--- fs/nfs/nfs4proc.c | 1 + 1 file changed, 1 insertion(+)
fs/nfs/nfs4proc.c +1 -0
@@ -8333,6 +8333,7 @@ nfs4_bind_one_conn_to_session_done(struct rpc_task *task, void *calldata)case -NFS4ERR_DEADSESSION :nfs4_schedule_session_recovery (clp->cl_session, task->tk_status); +return ; }if (args->dir ==NFS4_CDFC4_FORE_OR_BOTH && res->dir !=NFS4_CDFS4_BOTH ) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 797/1126 kdb: Fix the putarea helper function
In reply to Greg Kroah-HartmanFrom: Daniel Thompson <[email protected]>
[ Upstream commit c1cb81429df462eca1b6ba615cddd21dd3103c46 ]
Currently kdb_putarea_size() uses copy_from_kernel_nofault() to write *to* arbitrary kernel memory. This is obviously wrong and means the memory modify ('mm') command is a serious risk to debugger stability: if we poke to a bad address we'll double-fault and lose our debug session.
Fix this the (very) obvious way.
Note that there are two Fixes: tags because the API was renamed and this patch will only trivially backport as far as the rename (and this is probably enough). Nevertheless Christoph's rename did not introduce this problem so I wanted to record that!
--- kernel/debug/kdb/kdb_support.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/debug/kdb/kdb_support.c +1 -1
@@ -291,7 +291,7 @@ int kdb_getarea_size(void *res, unsigned long addr, size_t size)*/ int kdb_putarea_size (unsigned long addr,void *res,size_t size) { -int ret =copy_from_kernel_nofault ((char *)addr, (char *)res, size); +int ret =copy_to_kernel_nofault ((char *)addr, (char *)res, size);if (ret) {if (!KDB_STATE (SUPPRESS )) {kdb_func_printf ("Bad address 0x%lx\n" , addr);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 798/1126 perf stat: Fix forked applications enablement of counters
In reply to Greg Kroah-HartmanFrom: Thomas Richter <[email protected]>
[ Upstream commit d0a0a511493d269514fcbd852481cdca32c95350 ]
I have run into the following issue:
# perf stat -a -e new_pmu/INSTRUCTION_7/ -- mytest -c1 7
Performance counter stats for 'system wide':
0 new_pmu/INSTRUCTION_7/
0.000366428 seconds time elapsed#
The new PMU for s390 counts the execution of certain CPU instructions. The root cause is the extremely small run time of the mytest program. It just executes some assembly instructions and then exits.
In above invocation the instruction is executed exactly one time (-c1 option). The PMU is expected to report this one time execution by a counter value of one, but fails to do so in some cases, not all.
Debugging reveals the invocation of the child process is done *before* the counter events are installed and enabled.
Tracing reveals that sometimes the child process starts and exits before the event is installed on all CPUs. The more CPUs the machine has, the more often this miscount happens.
Fix this by reversing the start of the work load after the events have been installed on the specified CPUs. Now the comment also matches the code.
Output after:
# perf stat -a -e new_pmu/INSTRUCTION_7/ -- mytest -c1 7
Performance counter stats for 'system wide':
1 new_pmu/INSTRUCTION_7/
0.000366428 seconds time elapsed#
Now the correct result is reported rock solid all the time regardless how many CPUs are online.
Reviewers notes:
Jiri:
Right, without -a the event has enable_on_exec so the race does not matter, but it's a problem for system wide with fork.
Namhyung:
Agreed. Also we may move the enable_counters() and the clock code out of the if block to be shared with the else block.
--- tools/perf/builtin-stat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-stat.c +1 -1
@@ -955,10 +955,10 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)* Enable counters and exec the command: */ if (forks) { -evlist__start_workload (evsel_list); err =enable_counters ();if (err)return -1 ; +evlist__start_workload (evsel_list); t0 =rdclock ();clock_gettime (CLOCK_MONOTONIC , &ref_time);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 799/1126 net: stmmac: dwmac-qcom-ethqos: Enable RGMII functional clock on resume
In reply to Greg Kroah-HartmanFrom: Bjorn Andersson <[email protected]>
[ Upstream commit ffba2123e1714a27e9362fda57c42155dda37efc ]
When the Qualcomm ethqos driver is properly described in its associated GDSC power-domain, the hardware will be powered down and loose its state between qcom_ethqos_probe() and stmmac_init_dma_engine().
The result of this is that the functional clock from the RGMII IO macro is no longer provides and the DMA software reset in dwmac4_dma_reset() will time out, due to lacking clock signal.
Re-enable the functional clock, as part of the Qualcomm specific clock enablement sequence to avoid this problem.
The final clock configuration will be adjusted by ethqos_fix_mac_speed() once the link is being brought up.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +7 -0
@@ -460,6 +460,13 @@ static int ethqos_clks_config(void *priv, bool enabled)dev_err (ðqos->pdev->dev,"rgmii_clk enable failed\n" );return ret; } + +/* Enable functional clock to prevent DMA reset to timeout due +* to lacking PHY clock after the hardware block has been power +* cycled. The actual configuration will be adjusted once +* ethqos_fix_mac_speed() is invoked. +*/ +ethqos_set_func_clk_en (ethqos); }else {clk_disable_unprepare (ethqos->rgmii_clk); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 800/1126 clk: qcom: gcc-msm8994: Fix gpll4 width
In reply to Greg Kroah-HartmanFrom: Konrad Dybcio <[email protected]>
[ Upstream commit 71021db1c532c2545ae53b9ee85b37b7154f51d4 ]
The gpll4 postdiv is actually a div4, so make sure that Linux is aware of this.
This fixes the following error messages:
mmc1: Card appears overclocked; req 200000000 Hz, actual 343999999 Hz
mmc1: Card appears overclocked; req 400000000 Hz, actual 687999999 Hz
--- drivers/clk/qcom/gcc-msm8994.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/qcom/gcc-msm8994.c +1 -0
@@ -77,6 +77,7 @@ static struct clk_alpha_pll gpll4_early = {static struct clk_alpha_pll_postdiv gpll4 = { .offset =0x1dc0 , + .width =4 , .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT ], .clkr.hw.init = &(struct clk_init_data ){ .name ="gpll4" ,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 801/1126 vsock/virtio: initialize vdev->priv before using VQs
In reply to Greg Kroah-HartmanFrom: Stefano Garzarella <[email protected]>
[ Upstream commit 4b5f1ad5566ada230aaa2ce861b28d1895f1ea68 ]
When we fill VQs with empty buffers and kick the host, it may send an interrupt. vdev->priv must be initialized before this since it is used in the virtqueue callbacks.
--- net/vmw_vsock/virtio_transport.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/vmw_vsock/virtio_transport.c +2 -1
@@ -622,6 +622,8 @@ static int virtio_vsock_probe(struct virtio_device *vdev)INIT_WORK (&vsock->event_work, virtio_transport_event_work);INIT_WORK (&vsock->send_pkt_work, virtio_transport_send_pkt_work); + vdev->priv = vsock; +mutex_lock (&vsock->tx_lock); vsock->tx_run = true;mutex_unlock (&vsock->tx_lock);
@@ -639,7 +641,6 @@ static int virtio_vsock_probe(struct virtio_device *vdev)if (virtio_has_feature (vdev,VIRTIO_VSOCK_F_SEQPACKET )) vsock->seqpacket_allow = true; - vdev->priv = vsock;rcu_assign_pointer (the_virtio_vsock, vsock);mutex_unlock (&the_virtio_vsock_mutex);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 802/1126 vsock/virtio: read the negotiated features before using VQs
In reply to Greg Kroah-HartmanFrom: Stefano Garzarella <[email protected]>
[ Upstream commit c1011c0b3a9c8d2065f425407475cbcc812540b7 ]
Complete the driver configuration, reading the negotiated features, before using the VQs in the virtio_vsock_probe().
--- net/vmw_vsock/virtio_transport.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/vmw_vsock/virtio_transport.c +3 -3
@@ -622,6 +622,9 @@ static int virtio_vsock_probe(struct virtio_device *vdev)INIT_WORK (&vsock->event_work, virtio_transport_event_work);INIT_WORK (&vsock->send_pkt_work, virtio_transport_send_pkt_work); +if (virtio_has_feature (vdev,VIRTIO_VSOCK_F_SEQPACKET )) + vsock->seqpacket_allow = true; + vdev->priv = vsock;mutex_lock (&vsock->tx_lock);
@@ -638,9 +641,6 @@ static int virtio_vsock_probe(struct virtio_device *vdev) vsock->event_run = true;mutex_unlock (&vsock->event_lock); -if (virtio_has_feature (vdev,VIRTIO_VSOCK_F_SEQPACKET )) - vsock->seqpacket_allow = true; -rcu_assign_pointer (the_virtio_vsock, vsock);mutex_unlock (&the_virtio_vsock_mutex);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 803/1126 vsock/virtio: enable VQs early on probe
In reply to Greg Kroah-HartmanFrom: Stefano Garzarella <[email protected]>
[ Upstream commit 88704454ef8b00ea91537ae0d47d9348077e0e72 ]
virtio spec requires drivers to set DRIVER_OK before using VQs. This is set automatically after probe returns, but virtio-vsock driver uses VQs in the probe function to fill rx and event VQs with new buffers.
Let's fix this, calling virtio_device_ready() before using VQs in the probe function.
--- net/vmw_vsock/virtio_transport.c | 2 ++ 1 file changed, 2 insertions(+)
net/vmw_vsock/virtio_transport.c +2 -0
@@ -627,6 +627,8 @@ static int virtio_vsock_probe(struct virtio_device *vdev) vdev->priv = vsock; +virtio_device_ready (vdev); +mutex_lock (&vsock->tx_lock); vsock->tx_run = true;mutex_unlock (&vsock->tx_lock);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 804/1126 clk: Initialize orphan req_rate
In reply to Greg Kroah-HartmanFrom: Maxime Ripard <[email protected]>
[ Upstream commit 5f7e2af00807f2117650e711a58b7f0e986ce1df ]
When registering a clock that doesn't have a recalc_rate implementation, and doesn't have its parent registered yet, we initialize the clk_core rate and 'req_rate' fields to 0.
The rate field is later updated when the parent is registered in clk_core_reparent_orphans_nolock() using __clk_recalc_rates(), but the 'req_rate' field is never updated.
This leads to an issue in clk_set_rate_range() and clk_put(), since those functions will call clk_set_rate() with the content of 'req_rate' to provide drivers with the opportunity to change the rate based on the new boundaries. In this case, we would call clk_set_rate() with a rate of 0, effectively enforcing the minimum allowed for this clock whenever we would call one of those two functions, even though the actual rate might be within range.
Let's fix this by setting 'req_rate' in clk_core_reparent_orphans_nolock() with the rate field content just updated by the call to __clk_recalc_rates().
--- drivers/clk/clk.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/clk/clk.c +13 -0
@@ -3456,6 +3456,19 @@ static void clk_core_reparent_orphans_nolock(void)__clk_set_parent_after (orphan, parent,NULL );__clk_recalc_accuracies (orphan);__clk_recalc_rates (orphan,0 ); + +/* +* __clk_init_parent() will set the initial req_rate to +* 0 if the clock doesn't have clk_ops::recalc_rate and +* is an orphan when it's registered. +* +* 'req_rate' is used by clk_set_rate_range() and +* clk_put() to trigger a clk_set_rate() call whenever +* the boundaries are modified. Let's make sure +* 'req_rate' is set to something non-zero so that +* clk_set_rate_range() doesn't drop the frequency. +*/ + orphan->req_rate = orphan->rate; } } }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 805/1126 xen: fix is_xen_pmu()
In reply to Greg Kroah-HartmanFrom: Juergen Gross <[email protected]>
[ Upstream commit de2ae403b4c0e79a3410e63bc448542fbb9f9bfc ]
is_xen_pmu() is taking the cpu number as parameter, but it is not using it. Instead it just tests whether the Xen PMU initialization on the current cpu did succeed. As this test is done by checking a percpu pointer, preemption needs to be disabled in order to avoid switching the cpu while doing the test. While resuming from suspend() this seems not to be the case:
[ 88.082751] ACPI: PM: Low-level resume complete [ 88.087933] ACPI: EC: EC started [ 88.091464] ACPI: PM: Restoring platform NVS memory [ 88.097166] xen_acpi_processor: Uploading Xen processor PM info [ 88.103850] Enabling non-boot CPUs ... [ 88.108128] installing Xen timer for CPU 1 [ 88.112763] BUG: using smp_processor_id() in preemptible [00000000] code: systemd-sleep/7138 [ 88.122256] caller is is_xen_pmu+0x12/0x30 [ 88.126937] CPU: 0 PID: 7138 Comm: systemd-sleep Tainted: G W 5.16.13-2.fc32.qubes.x86_64 #1 [ 88.137939] Hardware name: Star Labs StarBook/StarBook, BIOS 7.97 03/21/2022 [ 88.145930] Call Trace: [ 88.148757] <TASK> [ 88.151193] dump_stack_lvl+0x48/0x5e [ 88.155381] check_preemption_disabled+0xde/0xe0 [ 88.160641] is_xen_pmu+0x12/0x30 [ 88.164441] xen_smp_intr_init_pv+0x75/0x100
Fix that by replacing is_xen_pmu() by a simple boolean variable which reflects the Xen PMU initialization state on cpu 0.
Modify xen_pmu_init() to return early in case it is being called for a cpu other than cpu 0 and the boolean variable not being set.
--- arch/x86/xen/pmu.c | 10 ++++------ arch/x86/xen/pmu.h | 3 ++- arch/x86/xen/smp_pv.c | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-)
arch/x86/xen/pmu.c +4 -6
@@ -506,10 +506,7 @@ irqreturn_t xen_pmu_irq_handler(int irq, void *dev_id)return ret; } -bool is_xen_pmu (int cpu) -{ -return (get_xenpmu_data () !=NULL ); -} +bool is_xen_pmu;void xen_pmu_init (int cpu) {
@@ -520,7 +517,7 @@ void xen_pmu_init(int cpu)BUILD_BUG_ON (sizeof (struct xen_pmu_data ) >PAGE_SIZE ); -if (xen_hvm_domain ()) +if (xen_hvm_domain () || (cpu !=0 && !is_xen_pmu))return ; xenpmu_data = (struct xen_pmu_data *)get_zeroed_page (GFP_KERNEL );
@@ -541,7 +538,8 @@ void xen_pmu_init(int cpu)per_cpu (xenpmu_shared, cpu).xenpmu_data = xenpmu_data;per_cpu (xenpmu_shared, cpu).flags =0 ; -if (cpu ==0 ) { +if (!is_xen_pmu) { + is_xen_pmu = true;perf_register_guest_info_callbacks (&xen_guest_cbs);xen_pmu_arch_init (); }
arch/x86/xen/pmu.h +2 -1
@@ -4,6 +4,8 @@#include <xen/interface/xenpmu.h> +extern bool is_xen_pmu; +irqreturn_t xen_pmu_irq_handler (int irq,void *dev_id);#ifdef CONFIG_XEN_HAVE_VPMU void xen_pmu_init (int cpu);
@@ -12,7 +14,6 @@ void xen_pmu_finish(int cpu);static inline void xen_pmu_init (int cpu) {}static inline void xen_pmu_finish (int cpu) {}#endif -bool is_xen_pmu (int cpu);bool pmu_msr_read (unsigned int msr,uint64_t *val,int *err);bool pmu_msr_write (unsigned int msr,uint32_t low,uint32_t high,int *err);int pmu_apic_update (uint32_t reg);
arch/x86/xen/smp_pv.c +1 -1
@@ -129,7 +129,7 @@ int xen_smp_intr_init_pv(unsigned int cpu)per_cpu (xen_irq_work, cpu).irq = rc;per_cpu (xen_irq_work, cpu).name = callfunc_name; -if (is_xen_pmu (cpu)) { +if (is_xen_pmu) { pmu_name =kasprintf (GFP_KERNEL ,"pmu%d" , cpu); rc = bind_virq_to_irqhandler(VIRQ_XENPMU, cpu, xen_pmu_irq_handler,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 806/1126 net: enetc: report software timestamping via SO_TIMESTAMPING
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit feb13dcb1818b775fbd9191f797be67cd605f03e ]
Let user space properly determine that the enetc driver provides software timestamps.
--- drivers/net/ethernet/freescale/enetc/enetc_ethtool.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/freescale/enetc/enetc_ethtool.c +4 -1
@@ -674,7 +674,10 @@ static int enetc_get_ts_info(struct net_device *ndev,#ifdef CONFIG_FSL_ENETC_PTP_CLOCK info->so_timestamping =SOF_TIMESTAMPING_TX_HARDWARE |SOF_TIMESTAMPING_RX_HARDWARE | -SOF_TIMESTAMPING_RAW_HARDWARE ; +SOF_TIMESTAMPING_RAW_HARDWARE | +SOF_TIMESTAMPING_TX_SOFTWARE | +SOF_TIMESTAMPING_RX_SOFTWARE | +SOF_TIMESTAMPING_SOFTWARE ; info->tx_types = (1 <<HWTSTAMP_TX_OFF ) | (1 << HWTSTAMP_TX_ON) |
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 807/1126 net: hns3: fix bug when PF set the duplicate MAC address for VFs
In reply to Greg Kroah-HartmanFrom: Jian Shen <[email protected]>
[ Upstream commit ccb18f05535c96d26e2d559d402acb87700fc5a7 ]
If the MAC address A is configured to vport A and then vport B. The MAC address of vport A in the hardware becomes invalid. If the address of vport A is changed to MAC address B, the driver needs to delete the MAC address A of vport A. Due to the MAC address A of vport A has become invalid in the hardware entry, so "-ENOENT" is returned. In this case, the "used_umv_size" value recorded in driver is not updated. As a result, the MAC entry status of the software is inconsistent with that of the hardware.
Therefore, the driver updates the umv size even if the MAC entry cannot be found. Ensure that the software and hardware status is consistent.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +2 -3
@@ -8429,12 +8429,11 @@ int hclge_rm_uc_addr_common(struct hclge_vport *vport,hnae3_set_bit (req.entry_type,HCLGE_MAC_VLAN_BIT0_EN_B ,0 );hclge_prepare_mac_addr (&req, addr, false); ret =hclge_remove_mac_vlan_tbl (vport, &req); -if (!ret) { +if (!ret || ret == -ENOENT ) {mutex_lock (&hdev->vport_lock);hclge_update_umv_space (vport, true);mutex_unlock (&hdev->vport_lock); - }else if (ret == -ENOENT ) { - ret =0 ; +return 0 ; }return ret;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 808/1126 net: hns3: fix port base vlan add fail when concurrent with reset
In reply to Greg Kroah-HartmanFrom: Jian Shen <[email protected]>
[ Upstream commit c0f46de30c965d4ba208b5bf1a6d3437a7556ee2 ]
Currently, Port base vlan is initiated by PF and configured to its VFs, by using command "ip link set <pf name> vf <vf id> vlan <vlan id>". When a global reset was triggered, the hardware vlan table and the soft recorded vlan information will be cleared by PF, and restored them until VFs were ready. There is a short time window between the table had been cleared and before table restored. If configured a new port base vlan tag at this moment, driver will check the soft recorded vlan information, and find there hasn't the old tag in it, which causing a warning print.
Due to the port base vlan is managed by PF, so the VFs's port base vlan restoring should be handled by PF when PF was ready.
This patch fixes it.
--- .../hisilicon/hns3/hns3pf/hclge_main.c | 62 +++++++++++++------ .../hisilicon/hns3/hns3pf/hclge_main.h | 3 + 2 files changed, 46 insertions(+), 19 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +43 -19
@@ -1863,6 +1863,7 @@ static int hclge_alloc_vport(struct hclge_dev *hdev) vport->vf_info.link_state =IFLA_VF_LINK_STATE_AUTO ; vport->mps =HCLGE_MAC_DEFAULT_FRAME ; vport->port_base_vlan_cfg.state =HNAE3_PORT_BASE_VLAN_DISABLE ; + vport->port_base_vlan_cfg.tbl_sta = true; vport->rxvlan_cfg.rx_vlan_offload_en = true; vport->req_vlan_fltr_en = true;INIT_LIST_HEAD (&vport->vlan_list);
@@ -9906,34 +9907,52 @@ void hclge_uninit_vport_vlan_table(struct hclge_dev *hdev) } } -void hclge_restore_vport_vlan_table (struct hclge_vport *vport) +void hclge_restore_vport_port_base_vlan_config (struct hclge_dev *hdev) { -struct hclge_vport_vlan_cfg *vlan, *tmp; -struct hclge_dev *hdev = vport->back; +struct hclge_vlan_info *vlan_info; +struct hclge_vport *vport;u16 vlan_proto;u16 vlan_id;u16 state; +int vf_id;int ret; - vlan_proto = vport->port_base_vlan_cfg.vlan_info.vlan_proto; - vlan_id = vport->port_base_vlan_cfg.vlan_info.vlan_tag; - state = vport->port_base_vlan_cfg.state; +/* PF should restore all vfs port base vlan */ +for (vf_id =0 ; vf_id < hdev->num_alloc_vfs; vf_id++) { + vport = &hdev->vport[vf_id +HCLGE_VF_VPORT_START_NUM ]; + vlan_info = vport->port_base_vlan_cfg.tbl_sta ? + &vport->port_base_vlan_cfg.vlan_info : + &vport->port_base_vlan_cfg.old_vlan_info; -if (state !=HNAE3_PORT_BASE_VLAN_DISABLE ) { -clear_bit (vport->vport_id, hdev->vlan_table[vlan_id]); -hclge_set_vlan_filter_hw (hdev,htons (vlan_proto), - vport->vport_id, vlan_id, - false); -return ; + vlan_id = vlan_info->vlan_tag; + vlan_proto = vlan_info->vlan_proto; + state = vport->port_base_vlan_cfg.state; + +if (state !=HNAE3_PORT_BASE_VLAN_DISABLE ) { +clear_bit (vport->vport_id, hdev->vlan_table[vlan_id]); + ret =hclge_set_vlan_filter_hw (hdev,htons (vlan_proto), + vport->vport_id, + vlan_id, false); + vport->port_base_vlan_cfg.tbl_sta = ret ==0 ; + } } +} -list_for_each_entry_safe (vlan, tmp, &vport->vlan_list, node) { - ret =hclge_set_vlan_filter_hw (hdev,htons (ETH_P_8021Q ), - vport->vport_id, - vlan->vlan_id, false); -if (ret) -break ; - vlan->hd_tbl_status = true; +void hclge_restore_vport_vlan_table (struct hclge_vport *vport) +{ +struct hclge_vport_vlan_cfg *vlan, *tmp; +struct hclge_dev *hdev = vport->back; +int ret; + +if (vport->port_base_vlan_cfg.state ==HNAE3_PORT_BASE_VLAN_DISABLE ) { +list_for_each_entry_safe (vlan, tmp, &vport->vlan_list, node) { + ret =hclge_set_vlan_filter_hw (hdev,htons (ETH_P_8021Q ), + vport->vport_id, + vlan->vlan_id, false); +if (ret) +break ; + vlan->hd_tbl_status = true; + } } }
@@ -9974,6 +9993,7 @@ static void hclge_restore_hw_table(struct hclge_dev *hdev)struct hnae3_handle *handle = &vport->nic;hclge_restore_mac_table_common (vport); +hclge_restore_vport_port_base_vlan_config (hdev);hclge_restore_vport_vlan_table (vport);set_bit (HCLGE_STATE_FD_USER_DEF_CHANGED , &hdev->state);hclge_restore_fd_entries (handle);
@@ -10030,6 +10050,8 @@ static int hclge_update_vlan_filter_entries(struct hclge_vport *vport, false); } + vport->port_base_vlan_cfg.tbl_sta = false; +/* force add VLAN 0 */ ret =hclge_set_vf_vlan_common (hdev, vport->vport_id, false,0 );if (ret)
@@ -10119,7 +10141,9 @@ int hclge_update_port_base_vlan_cfg(struct hclge_vport *vport, u16 state,else nic->port_base_vlan_state =HNAE3_PORT_BASE_VLAN_ENABLE ; + vport->port_base_vlan_cfg.old_vlan_info = *old_vlan_info; vport->port_base_vlan_cfg.vlan_info = *vlan_info; + vport->port_base_vlan_cfg.tbl_sta = true;hclge_set_vport_vlan_fltr_change (vport);return 0 ;
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h +3 -0
@@ -977,7 +977,9 @@ struct hclge_vlan_info {struct hclge_port_base_vlan_config {u16 state; +bool tbl_sta;struct hclge_vlan_info vlan_info; +struct hclge_vlan_info old_vlan_info; };struct hclge_vf_info {
@@ -1097,6 +1099,7 @@ void hclge_rm_vport_all_mac_table(struct hclge_vport *vport, bool is_del_list,void hclge_rm_vport_all_vlan_table (struct hclge_vport *vport,bool is_del_list);void hclge_uninit_vport_vlan_table (struct hclge_dev *hdev);void hclge_restore_mac_table_common (struct hclge_vport *vport); +void hclge_restore_vport_port_base_vlan_config (struct hclge_dev *hdev);void hclge_restore_vport_vlan_table (struct hclge_vport *vport);int hclge_update_port_base_vlan_cfg (struct hclge_vport *vport,u16 state,struct hclge_vlan_info *vlan_info);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 809/1126 net: hns3: add vlan list lock to protect vlan list
In reply to Greg Kroah-HartmanFrom: Jian Shen <[email protected]>
[ Upstream commit 1932a624ab88ff407d1a1d567fe581faa15dc725 ]
When adding port base VLAN, vf VLAN need to remove from HW and modify the vlan state in vf VLAN list as false. If the periodicity task is freeing the same node, it may cause "use after free" error. This patch adds a vlan list lock to protect the vlan list.
--- .../hisilicon/hns3/hns3pf/hclge_main.c | 38 +++++++++++++++++-- .../hisilicon/hns3/hns3pf/hclge_main.h | 1 + 2 files changed, 35 insertions(+), 4 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +34 -4
@@ -9809,19 +9809,28 @@ static void hclge_add_vport_vlan_table(struct hclge_vport *vport, u16 vlan_id, bool writen_to_tbl) {struct hclge_vport_vlan_cfg *vlan, *tmp; +struct hclge_dev *hdev = vport->back; -list_for_each_entry_safe (vlan, tmp, &vport->vlan_list, node) -if (vlan->vlan_id == vlan_id) +mutex_lock (&hdev->vport_lock); + +list_for_each_entry_safe (vlan, tmp, &vport->vlan_list, node) { +if (vlan->vlan_id == vlan_id) { +mutex_unlock (&hdev->vport_lock);return ; + } + } vlan =kzalloc (sizeof (*vlan),GFP_KERNEL ); -if (!vlan) +if (!vlan) { +mutex_unlock (&hdev->vport_lock);return ; + } vlan->hd_tbl_status = writen_to_tbl; vlan->vlan_id = vlan_id;list_add_tail (&vlan->node, &vport->vlan_list); +mutex_unlock (&hdev->vport_lock); }static int hclge_add_vport_all_vlan_table (struct hclge_vport *vport)
@@ -9830,6 +9839,8 @@ static int hclge_add_vport_all_vlan_table(struct hclge_vport *vport)struct hclge_dev *hdev = vport->back;int ret; +mutex_lock (&hdev->vport_lock); +list_for_each_entry_safe (vlan, tmp, &vport->vlan_list, node) {if (!vlan->hd_tbl_status) { ret = hclge_set_vlan_filter_hw(hdev, htons(ETH_P_8021Q),
@@ -9839,12 +9850,16 @@ static int hclge_add_vport_all_vlan_table(struct hclge_vport *vport)dev_err (&hdev->pdev->dev,"restore vport vlan list failed, ret=%d\n" , ret); + +mutex_unlock (&hdev->vport_lock);return ret; } } vlan->hd_tbl_status = true; } +mutex_unlock (&hdev->vport_lock); +return 0 ; }
@@ -9854,6 +9869,8 @@ static void hclge_rm_vport_vlan_table(struct hclge_vport *vport, u16 vlan_id,struct hclge_vport_vlan_cfg *vlan, *tmp;struct hclge_dev *hdev = vport->back; +mutex_lock (&hdev->vport_lock); +list_for_each_entry_safe (vlan, tmp, &vport->vlan_list, node) {if (vlan->vlan_id == vlan_id) {if (is_write_tbl && vlan->hd_tbl_status)
@@ -9868,6 +9885,8 @@ static void hclge_rm_vport_vlan_table(struct hclge_vport *vport, u16 vlan_id,break ; } } + +mutex_unlock (&hdev->vport_lock); }void hclge_rm_vport_all_vlan_table (struct hclge_vport *vport,bool is_del_list)
@@ -9875,6 +9894,8 @@ void hclge_rm_vport_all_vlan_table(struct hclge_vport *vport, bool is_del_list)struct hclge_vport_vlan_cfg *vlan, *tmp;struct hclge_dev *hdev = vport->back; +mutex_lock (&hdev->vport_lock); +list_for_each_entry_safe (vlan, tmp, &vport->vlan_list, node) {if (vlan->hd_tbl_status) hclge_set_vlan_filter_hw(hdev,
@@ -9890,6 +9911,7 @@ void hclge_rm_vport_all_vlan_table(struct hclge_vport *vport, bool is_del_list) } }clear_bit (vport->vport_id, hdev->vf_vlan_full); +mutex_unlock (&hdev->vport_lock); }void hclge_uninit_vport_vlan_table (struct hclge_dev *hdev)
@@ -9898,6 +9920,8 @@ void hclge_uninit_vport_vlan_table(struct hclge_dev *hdev)struct hclge_vport *vport;int i; +mutex_lock (&hdev->vport_lock); +for (i =0 ; i < hdev->num_alloc_vport; i++) { vport = &hdev->vport[i];list_for_each_entry_safe (vlan, tmp, &vport->vlan_list, node) {
@@ -9905,6 +9929,8 @@ void hclge_uninit_vport_vlan_table(struct hclge_dev *hdev)kfree (vlan); } } + +mutex_unlock (&hdev->vport_lock); }void hclge_restore_vport_port_base_vlan_config (struct hclge_dev *hdev)
@@ -9944,6 +9970,8 @@ void hclge_restore_vport_vlan_table(struct hclge_vport *vport)struct hclge_dev *hdev = vport->back;int ret; +mutex_lock (&hdev->vport_lock); +if (vport->port_base_vlan_cfg.state ==HNAE3_PORT_BASE_VLAN_DISABLE ) {list_for_each_entry_safe (vlan, tmp, &vport->vlan_list, node) { ret = hclge_set_vlan_filter_hw(hdev, htons(ETH_P_8021Q),
@@ -9954,6 +9982,8 @@ void hclge_restore_vport_vlan_table(struct hclge_vport *vport) vlan->hd_tbl_status = true; } } + +mutex_unlock (&hdev->vport_lock); }/* For global reset and imp reset, hardware will clear the mac table,
@@ -11854,8 +11884,8 @@ static void hclge_uninit_ae_dev(struct hnae3_ae_dev *ae_dev)hclge_misc_irq_uninit (hdev);hclge_devlink_uninit (hdev);hclge_pci_uninit (hdev); -mutex_destroy (&hdev->vport_lock);hclge_uninit_vport_vlan_table (hdev); +mutex_destroy (&hdev->vport_lock); ae_dev->priv =NULL ; }
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h +1 -0
@@ -1025,6 +1025,7 @@ struct hclge_vport {spinlock_t mac_list_lock;/* protect mac address need to add/detele */ struct list_head uc_mac_list;/* Store VF unicast table */ struct list_head mc_mac_list;/* Store VF multicast table */ +struct list_head vlan_list;/* Store VF vlan table */ };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 810/1126 net: hns3: refine the process when PF set VF VLAN
In reply to Greg Kroah-HartmanFrom: Jian Shen <[email protected]>
[ Upstream commit 190cd8a72b0181c543ecada6243be3a50636941b ]
Currently, when PF set VF VLAN, it sends notify mailbox to VF if VF alive. VF stop its traffic, and send request mailbox to PF, then PF updates VF VLAN. It's a bit complex. If VF is killed before sending request, PF will not set VF VLAN without any log.
This patch refines the process, PF can set VF VLAN direclty, and then notify the VF. If VF is resetting at that time, the notify may be dropped, so VF should query it after reset finished.
--- .../hisilicon/hns3/hns3pf/hclge_main.c | 18 +++++++++++++----- .../hisilicon/hns3/hns3vf/hclgevf_main.c | 5 +++++ 2 files changed, 18 insertions(+), 5 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +13 -5
@@ -8984,11 +8984,16 @@ static int hclge_set_vf_mac(struct hnae3_handle *handle, int vf,ether_addr_copy (vport->vf_info.mac, mac_addr); +/* there is a timewindow for PF to know VF unalive, it may +* cause send mailbox fail, but it doesn't matter, VF will +* query it when reinit. +*/ if (test_bit (HCLGE_VPORT_STATE_ALIVE , &vport->state)) {dev_info (&hdev->pdev->dev,"MAC of VF %d has been set to %s, and it will be reinitialized!\n" , vf, format_mac_addr); -return hclge_inform_reset_assert_to_vf (vport); + (void )hclge_inform_reset_assert_to_vf (vport); +return 0 ; } dev_info(&hdev->pdev->dev, "MAC of VF %d has been set to %s\n",
@@ -10241,14 +10246,17 @@ static int hclge_set_vf_vlan_filter(struct hnae3_handle *handle, int vfid,return ret; } -/* for DEVICE_VERSION_V3, vf doesn't need to know about the port based +/* there is a timewindow for PF to know VF unalive, it may +* cause send mailbox fail, but it doesn't matter, VF will +* query it when reinit. +* for DEVICE_VERSION_V3, vf doesn't need to know about the port based * VLAN state. */ if (ae_dev->dev_version <HNAE3_DEVICE_VERSION_V3 &&test_bit (HCLGE_VPORT_STATE_ALIVE , &vport->state)) -hclge_push_vf_port_base_vlan_info (&hdev->vport[0 ], - vport->vport_id, state, - &vlan_info); + (void )hclge_push_vf_port_base_vlan_info (&hdev->vport[0 ], + vport->vport_id, + state, &vlan_info);return 0 ; }
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +5 -0
@@ -2855,6 +2855,11 @@ static int hclgevf_reset_hdev(struct hclgevf_dev *hdev)return ret; } +/* get current port based vlan state from PF */ + ret =hclgevf_get_port_base_vlan_filter_state (hdev); +if (ret) +return ret; +set_bit (HCLGEVF_STATE_PROMISC_CHANGED , &hdev->state);hclgevf_init_rxd_adv_layout (hdev);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 811/1126 net: phy: broadcom: Fix brcm_fet_config_init()
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
[ Upstream commit bf8bfc4336f7a34e48b3bbd19b1542bf085bdc3d ]
A Broadcom AC201 PHY (same entry as 5241) would be flagged by the Broadcom UniMAC MDIO controller as not completing the turn around properly since the PHY expects 65 MDC clock cycles to complete a write cycle, and the MDIO controller was only sending 64 MDC clock cycles as determined by looking at a scope shot.
This would make the subsequent read fail with the UniMAC MDIO controller command field having MDIO_READ_FAIL set and we would abort the brcm_fet_config_init() function and thus not probe the PHY at all.
After issuing a software reset, wait for at least 1ms which is well above the 1us reset delay advertised by the datasheet and issue a dummy read to let the PHY turn around the line properly. This read specifically ignores -EIO which would be returned by MDIO controllers checking for the line being turned around.
If we have a genuine reaad failure, the next read of the interrupt status register would pick it up anyway.
--- drivers/net/phy/broadcom.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/net/phy/broadcom.c +21 -0
@@ -11,6 +11,7 @@*/ #include "bcm-phy-lib.h" +#include <linux/delay.h> #include <linux/module.h> #include <linux/phy.h> #include <linux/brcmphy.h>
@@ -602,6 +603,26 @@ static int brcm_fet_config_init(struct phy_device *phydev)if (err <0 )return err; +/* The datasheet indicates the PHY needs up to 1us to complete a reset, +* build some slack here. +*/ +usleep_range (1000 ,2000 ); + +/* The PHY requires 65 MDC clock cycles to complete a write operation +* and turnaround the line properly. +* +* We ignore -EIO here as the MDIO controller (e.g.: mdio-bcm-unimac) +* may flag the lack of turn-around as a read failure. This is +* particularly true with this combination since the MDIO controller +* only used 64 MDC cycles. This is not a critical failure in this +* specific case and it has no functional impact otherwise, so we let +* that one go through. If there is a genuine bus error, the next read +* of MII_BRCM_FET_INTREG will error out. +*/ + err =phy_read (phydev,MII_BMCR ); +if (err <0 && err != -EIO ) +return err; + reg =phy_read (phydev,MII_BRCM_FET_INTREG );if (reg <0 )return reg;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 812/1126 selftests: test_vxlan_under_vrf: Fix broken test case
In reply to Greg Kroah-HartmanFrom: Ido Schimmel <[email protected]>
[ Upstream commit b50d3b46f84282d795ae3076111acb75ae1031f3 ]
The purpose of the last test case is to test VXLAN encapsulation and decapsulation when the underlay lookup takes place in a non-default VRF. This is achieved by enslaving the physical device of the tunnel to a VRF.
The binding of the VXLAN UDP socket to the VRF happens when the VXLAN device itself is opened, not when its physical device is opened. This was also mentioned in the cited commit ("tests that moving the underlay from a VRF to another works when down/up the VXLAN interface"), but the test did something else.
Fix it by reopening the VXLAN device instead of its physical device.
Before:
# ./test_vxlan_under_vrf.sh Checking HV connectivity [ OK ] Check VM connectivity through VXLAN (underlay in the default VRF) [ OK ] Check VM connectivity through VXLAN (underlay in a VRF) [FAIL]
After:
# ./test_vxlan_under_vrf.sh Checking HV connectivity [ OK ] Check VM connectivity through VXLAN (underlay in the default VRF) [ OK ] Check VM connectivity through VXLAN (underlay in a VRF) [ OK ]
--- tools/testing/selftests/net/test_vxlan_under_vrf.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/testing/selftests/net/test_vxlan_under_vrf.sh +4 -4
@@ -120,11 +120,11 @@ echo "[ OK ]" # Move the underlay to a non-default VRF ip -netns hv-1 link set veth0 vrf vrf-underlay -ip -netns hv-1 link set veth0 down -ip -netns hv-1 link set veth0 up +ip -netns hv-1 link set vxlan0 down +ip -netns hv-1 link set vxlan0 up ip -netns hv-2 link set veth0 vrf vrf-underlay -ip -netns hv-2 link set veth0 down -ip -netns hv-2 link set veth0 up +ip -netns hv-2 link set vxlan0 down +ip -netns hv-2 link set vxlan0 up echo -n "Check VM connectivity through VXLAN (underlay in a VRF) " ip netns exec vm-1 ping -c 1 -W 1 10.0.0.2 &> /dev/null || (echo "[FAIL]"; false)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 813/1126 NFS: Dont loop forever in nfs_do_recoalesce()
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit d02d81efc7564b4d5446a02e0214a164cf00b1f3 ]
If __nfs_pageio_add_request() fails to add the request, it will return with either desc->pg_error < 0, or mirror->pg_recoalesce will be set, so we are guaranteed either to exit the function altogether, or to loop.
However if there is nothing left in mirror->pg_list to coalesce, we must exit, so make sure that we clear mirror->pg_recoalesce every time we loop.
--- fs/nfs/pagelist.c | 1 + 1 file changed, 1 insertion(+)
fs/nfs/pagelist.c +1 -0
@@ -1218,6 +1218,7 @@ static int nfs_do_recoalesce(struct nfs_pageio_descriptor *desc) do { list_splice_init(&mirror->pg_list, &head); + mirror->pg_recoalesce = 0; while (!list_empty(&head)) { struct nfs_page *req;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 814/1126 libperf tests: Fix typo in perf_evlist__open() failure error messages
In reply to Greg Kroah-HartmanFrom: Shunsuke Nakamura <[email protected]>
[ Upstream commit c2eeac985657f61543e6c5a333b94f3bd18e6b9d ]
This patch corrects typos in error messages. I should be "evlist", not "evsel" as the function that fails is perf_evlist__open().
--- tools/lib/perf/tests/test-evlist.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/lib/perf/tests/test-evlist.c +4 -4
@@ -69,7 +69,7 @@ static int test_stat_cpu(void)perf_evlist__set_maps (evlist, cpus,NULL ); err =perf_evlist__open (evlist); -__T ("failed to open evsel" , err ==0 ); +__T ("failed to open evlist" , err ==0 );perf_evlist__for_each_evsel (evlist, evsel) { cpus =perf_evsel__cpus (evsel);
@@ -130,7 +130,7 @@ static int test_stat_thread(void)perf_evlist__set_maps (evlist,NULL , threads); err =perf_evlist__open (evlist); -__T ("failed to open evsel" , err ==0 ); +__T ("failed to open evlist" , err ==0 );perf_evlist__for_each_evsel (evlist, evsel) {perf_evsel__read (evsel,0 ,0 , &counts);
@@ -187,7 +187,7 @@ static int test_stat_thread_enable(void)perf_evlist__set_maps (evlist,NULL , threads); err =perf_evlist__open (evlist); -__T ("failed to open evsel" , err ==0 ); +__T ("failed to open evlist" , err ==0 );perf_evlist__for_each_evsel (evlist, evsel) {perf_evsel__read (evsel,0 ,0 , &counts);
@@ -507,7 +507,7 @@ static int test_stat_multiplexing(void)perf_evlist__set_maps (evlist,NULL , threads); err =perf_evlist__open (evlist); -__T ("failed to open evsel" , err ==0 ); +__T ("failed to open evlist" , err ==0 );perf_evlist__enable (evlist);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 815/1126 net: hns3: fix ethtool tx copybreak buf size indicating not aligned issue
In reply to Greg Kroah-HartmanFrom: Hao Chen <[email protected]>
[ Upstream commit 8778372118023e2258612c03573c47efef41d755 ]
When use ethtoool set tx copybreak buf size to a large value which causes order exceeding 10 or memory is not enough, it causes allocating tx copybreak buffer failed and print "the active tx spare buf is 0, not enabled tx spare buffer", however, use --get-tunable parameter query tx copybreak buf size and it indicates setting value not 0.
So, it's necessary to change the print value from setting value to 0.
Set kinfo.tx_spare_buf_size to 0 when set tx copybreak buf size failed.
--- .../net/ethernet/hisilicon/hns3/hns3_enet.c | 20 +++++++++++-------- .../ethernet/hisilicon/hns3/hns3_ethtool.c | 3 ++- 2 files changed, 14 insertions(+), 9 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +12 -8
@@ -1028,13 +1028,12 @@ static bool hns3_can_use_tx_sgl(struct hns3_enet_ring *ring,static void hns3_init_tx_spare_buffer (struct hns3_enet_ring *ring) { +u32 alloc_size = ring->tqp->handle->kinfo.tx_spare_buf_size;struct hns3_tx_spare *tx_spare;struct page *page; -u32 alloc_size;dma_addr_t dma;int order; - alloc_size = ring->tqp->handle->kinfo.tx_spare_buf_size;if (!alloc_size)return ;
@@ -1044,30 +1043,35 @@ static void hns3_init_tx_spare_buffer(struct hns3_enet_ring *ring)if (!tx_spare) {/* The driver still work without the tx spare buffer */ dev_warn (ring_to_dev (ring),"failed to allocate hns3_tx_spare\n" ); -return ; + goto devm_kzalloc_error; } page =alloc_pages_node (dev_to_node (ring_to_dev (ring)),GFP_KERNEL , order);if (!page) {dev_warn (ring_to_dev (ring),"failed to allocate tx spare pages\n" ); -devm_kfree (ring_to_dev (ring), tx_spare); -return ; + goto alloc_pages_error; } dma =dma_map_page (ring_to_dev (ring), page,0 ,PAGE_SIZE << order,DMA_TO_DEVICE );if (dma_mapping_error (ring_to_dev (ring), dma)) {dev_warn (ring_to_dev (ring),"failed to map pages for tx spare\n" ); -put_page (page); -devm_kfree (ring_to_dev (ring), tx_spare); -return ; + goto dma_mapping_error; } tx_spare->dma = dma; tx_spare->buf =page_address (page); tx_spare->len =PAGE_SIZE << order; ring->tx_spare = tx_spare; +return ; + +dma_mapping_error: +put_page (page); +alloc_pages_error: +devm_kfree (ring_to_dev (ring), tx_spare); +devm_kzalloc_error: + ring->tqp->handle->kinfo.tx_spare_buf_size =0 ; }/* Use hns3_tx_spare_space() to make sure there is enough buffer
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +2 -1
@@ -1816,7 +1816,8 @@ static int hns3_set_tunable(struct net_device *netdev, old_tx_spare_buf_size = h->kinfo.tx_spare_buf_size; new_tx_spare_buf_size = *(u32 *)data; ret =hns3_set_tx_spare_buf_size (netdev, new_tx_spare_buf_size); -if (ret) { +if (ret || + (!priv->ring->tx_spare && new_tx_spare_buf_size !=0 )) {int ret1; netdev_warn(netdev,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 816/1126 net: hns3: add max order judgement for tx spare buffer
In reply to Greg Kroah-HartmanFrom: Hao Chen <[email protected]>
[ Upstream commit a89cbb16995bf15582e0d1bdb922ad1a54a2fa8c ]
Add max order judgement for tx spare buffer to avoid triggering call trace, print related fail information instead, when user set tx spare buf size to a large value which causes order exceeding 10.
--- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +6 -0
@@ -1038,6 +1038,12 @@ static void hns3_init_tx_spare_buffer(struct hns3_enet_ring *ring)return ; order =get_order (alloc_size); +if (order >=MAX_ORDER ) { +if (net_ratelimit ()) +dev_warn (ring_to_dev (ring),"failed to allocate tx spare buffer, exceed to max order\n" ); +return ; + } + tx_spare =devm_kzalloc (ring_to_dev (ring),sizeof (*tx_spare),GFP_KERNEL );if (!tx_spare) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 817/1126 net: hns3: clean residual vf config after disable sriov
In reply to Greg Kroah-HartmanFrom: Peng Li <[email protected]>
[ Upstream commit 671cb8cbb9c9e24b681d21b1bfae991e2386ac73 ]
After disable sriov, VF still has some config and info need to be cleaned, which configured by PF. This patch clean the HW config and SW struct vport->vf_info.
--- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 3 ++ .../net/ethernet/hisilicon/hns3/hns3_enet.c | 18 +++++++ .../hisilicon/hns3/hns3pf/hclge_main.c | 50 +++++++++++++++++++ 3 files changed, 71 insertions(+)
drivers/net/ethernet/hisilicon/hns3/hnae3.h +3 -0
@@ -536,6 +536,8 @@ struct hnae3_ae_dev {* Get 1588 rx hwstamp * get_ts_info * Get phc info +* clean_vf_config +* Clean residual vf info after disable sriov */ struct hnae3_ae_ops {int (*init_ae_dev)(struct hnae3_ae_dev *ae_dev);
@@ -729,6 +731,7 @@ struct hnae3_ae_ops { struct ethtool_ts_info *info);int (*get_link_diagnosis_info)(struct hnae3_handle *handle,u32 *status_code); +void (*clean_vf_config)(struct hnae3_ae_dev *ae_dev,int num_vfs); };struct hnae3_dcb_ops {
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +18 -0
@@ -2992,6 +2992,21 @@ static int hns3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)return ret; } +/** +* hns3_clean_vf_config +* @pdev: pointer to a pci_dev structure +* @num_vfs: number of VFs allocated +* +* Clean residual vf config after disable sriov +**/ +static void hns3_clean_vf_config (struct pci_dev *pdev,int num_vfs) +{ +struct hnae3_ae_dev *ae_dev =pci_get_drvdata (pdev); + +if (ae_dev->ops->clean_vf_config) + ae_dev->ops->clean_vf_config (ae_dev, num_vfs); +} +/* hns3_remove - Device removal routine * @pdev: PCI device information struct */
@@ -3030,7 +3045,10 @@ static int hns3_pci_sriov_configure(struct pci_dev *pdev, int num_vfs)else return num_vfs; }else if (!pci_vfs_assigned (pdev)) { +int num_vfs_pre =pci_num_vf (pdev); +pci_disable_sriov (pdev); +hns3_clean_vf_config (pdev, num_vfs_pre); }else {dev_warn (&pdev->dev,"Unable to free VFs because some are assigned to VMs.\n" );
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +50 -0
62 lines not on this page · raw message
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 818/1126 net: hns3: add netdev reset check for hns3_set_tunable()
In reply to Greg Kroah-HartmanFrom: Hao Chen <[email protected]>
[ Upstream commit f5cd60169f981ca737c9e49c446506dfafc90a35 ]
When pci device reset failed, it does uninit operation and priv->ring is NULL, it causes accessing NULL pointer error.
Add netdev reset check for hns3_set_tunable() to fix it.
--- drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +5 -3
@@ -1764,9 +1764,6 @@ static int hns3_set_tx_spare_buf_size(struct net_device *netdev,struct hnae3_handle *h = priv->ae_handle;int ret; -if (hns3_nic_resetting (netdev)) -return -EBUSY ; - h->kinfo.tx_spare_buf_size = data; ret =hns3_reset_notify (h,HNAE3_DOWN_CLIENT );
@@ -1797,6 +1794,11 @@ static int hns3_set_tunable(struct net_device *netdev,struct hnae3_handle *h = priv->ae_handle;int i, ret =0 ; +if (hns3_nic_resetting (netdev) || !priv->ring) { +netdev_err (netdev,"failed to set tunable value, dev resetting!" ); +return -EBUSY ; + } +switch (tuna->id) {case ETHTOOL_TX_COPYBREAK : priv->tx_copybreak = *(u32 *)data;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 819/1126 net: hns3: add NULL pointer check for hns3_set/get_ringparam()
In reply to Greg Kroah-HartmanFrom: Hao Chen <[email protected]>
[ Upstream commit 4d07c5936c2508ddd1cfd49b0a91d94cb4d1f0e8 ]
When pci devices init failed and haven't reinit, priv->ring is NULL and hns3_set/get_ringparam() will access priv->ring. it causes call trace.
So, add NULL pointer check for hns3_set/get_ringparam() to avoid this situation.
--- drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +9 -3
@@ -651,8 +651,8 @@ static void hns3_get_ringparam(struct net_device *netdev,struct hnae3_handle *h = priv->ae_handle;int rx_queue_index = h->kinfo.num_tqps; -if (hns3_nic_resetting (netdev)) { -netdev_err (netdev,"dev resetting!" ); +if (hns3_nic_resetting (netdev) || !priv->ring) { +netdev_err (netdev,"failed to get ringparam value, due to dev resetting or uninited\n" );return ; }
@@ -1072,8 +1072,14 @@ static int hns3_check_ringparam(struct net_device *ndev, {#define RX_BUF_LEN_2K 2048#define RX_BUF_LEN_4K 4096 -if (hns3_nic_resetting (ndev)) + +struct hns3_nic_priv *priv =netdev_priv (ndev); + +if (hns3_nic_resetting (ndev) || !priv->ring) { +netdev_err (ndev,"failed to set ringparam value, due to dev resetting or uninited\n" );return -EBUSY ; + } +if (param->rx_mini_pending || param->rx_jumbo_pending)return -EINVAL ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 820/1126 net: hns3: fix phy can not link up when autoneg off and reset
In reply to Greg Kroah-HartmanFrom: Guangbin Huang <[email protected]>
[ Upstream commit ad0ecaef6a2c07e67ef9fe163c007f7b3dad8643 ]
Currently, function hclge_mdio_read() will return 0 if during reset(the cmd state will be set to disable).
If use general phy driver, the phy_state_machine() will update phy speed every second in function genphy_read_status_fixed() when PHY is set to autoneg off, no matter of link down or link up.
If phy driver happens to read BMCR register during reset, phy speed will be updated to 10Mpbs as BMCR register value is 0. So it may call phy can not link up if previous speed is not 10Mpbs.
To fix this problem, function hclge_mdio_read() should return -EBUSY if the cmd state is disable. So does function hclge_mdio_write().
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c +2 -2
@@ -48,7 +48,7 @@ static int hclge_mdio_write(struct mii_bus *bus, int phyid, int regnum,int ret;if (test_bit (HCLGE_COMM_STATE_CMD_DISABLE , &hdev->hw.hw.comm_state)) -return 0 ; +return -EBUSY ;hclge_cmd_setup_basic_desc (&desc,HCLGE_OPC_MDIO_CONFIG , false);
@@ -86,7 +86,7 @@ static int hclge_mdio_read(struct mii_bus *bus, int phyid, int regnum)int ret;if (test_bit (HCLGE_COMM_STATE_CMD_DISABLE , &hdev->hw.hw.comm_state)) -return 0 ; +return -EBUSY ;hclge_cmd_setup_basic_desc (&desc,HCLGE_OPC_MDIO_CONFIG , true);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 821/1126 net: sparx5: depends on PTP_1588_CLOCK_OPTIONAL
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 08be6b13db23f68146c600dd5adfd92e99d9ec6e ]
Fix build errors when PTP_1588_CLOCK=m and SPARX5_SWTICH=y.
arc-linux-ld: drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.o: in function `sparx5_get_ts_info':
sparx5_ethtool.c:(.text+0x146): undefined reference to `ptp_clock_index'
arc-linux-ld: sparx5_ethtool.c:(.text+0x146): undefined reference to `ptp_clock_index'
arc-linux-ld: drivers/net/ethernet/microchip/sparx5/sparx5_ptp.o: in function `sparx5_ptp_init':
sparx5_ptp.c:(.text+0xd56): undefined reference to `ptp_clock_register'
arc-linux-ld: sparx5_ptp.c:(.text+0xd56): undefined reference to `ptp_clock_register'
arc-linux-ld: drivers/net/ethernet/microchip/sparx5/sparx5_ptp.o: in function `sparx5_ptp_deinit':
sparx5_ptp.c:(.text+0xf30): undefined reference to `ptp_clock_unregister'
arc-linux-ld: sparx5_ptp.c:(.text+0xf30): undefined reference to `ptp_clock_unregister'
arc-linux-ld: sparx5_ptp.c:(.text+0xf38): undefined reference to `ptp_clock_unregister'
arc-linux-ld: sparx5_ptp.c:(.text+0xf46): undefined reference to `ptp_clock_unregister'
arc-linux-ld: drivers/net/ethernet/microchip/sparx5/sparx5_ptp.o:sparx5_ptp.c:(.text+0xf46): more undefined references to `ptp_clock_unregister' follow
--- drivers/net/ethernet/microchip/sparx5/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/microchip/sparx5/Kconfig +1 -0
@@ -4,6 +4,7 @@ config SPARX5_SWITCH depends on HAS_IOMEM depends on OF depends on ARCH_SPARX5 || COMPILE_TEST + depends on PTP_1588_CLOCK_OPTIONAL select PHYLINK select PHY_SPARX5_SERDES select RESET_CONTROLLER
Signature · 1 line
2.34.1