6.2.15-rc1 review
Subsystems (6)
Greg Kroah-Hartman
maintainerPATCH 398/663 wifi: mt76: mt7921e: fix probe timeout after reboot
In reply to Greg Kroah-HartmanFrom: Quan Zhou <[email protected]>
[ Upstream commit c397fc1e6365a2a9e5540a85b2c1d4ea412aa0e2 ]
In system warm reboot scene, due to the polling timeout(now 1000us) is too short to wait dma idle in time, it may make driver probe fail with error code -ETIMEDOUT. Meanwhile, we also found the dma may take around 70ms to enter idle state. Change the polling idle timeout to 100ms to avoid the probabilistic probe fail.
Tested pass with 5000 times warm reboot on x86 platform.
[4.477496] pci 0000:01:00.0: attach allowed to drvr mt7921e [internal device] [4.478306] mt7921e 0000:01:00.0: ASIC revision: 79610010 [4.480063] mt7921e: probe of 0000:01:00.0 failed with error -110
--- drivers/net/wireless/mediatek/mt76/mt7921/dma.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7921/dma.c +3 -3
@@ -90,9 +90,9 @@ static int mt7921_dma_disable(struct mt7921_dev *dev, bool force)MT_WFDMA0_GLO_CFG_OMIT_RX_INFO | MT_WFDMA0_GLO_CFG_OMIT_RX_INFO_PFET2); -if (!mt76_poll (dev,MT_WFDMA0_GLO_CFG , -MT_WFDMA0_GLO_CFG_TX_DMA_BUSY | -MT_WFDMA0_GLO_CFG_RX_DMA_BUSY ,0 ,1000 )) +if (!mt76_poll_msec_tick (dev,MT_WFDMA0_GLO_CFG , +MT_WFDMA0_GLO_CFG_TX_DMA_BUSY | +MT_WFDMA0_GLO_CFG_RX_DMA_BUSY ,0 ,100 ,1 ))return -ETIMEDOUT ;return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 399/663 wifi: mt76: fix 6GHz high channel not be scanned
In reply to Greg Kroah-HartmanFrom: Ming Yen Hsieh <[email protected]>
[ Upstream commit 23792cedaff02351b57bddd8957fc917fa88f2e0 ]
mt76 scan command only support 64 channels currently. If the channel count is larger than 64(for 2+5+6GHz), some channels will not be scanned. Hence change the scan type to full channel scan in case of the command cannot include proper list for chip.
--- .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +10 -3
@@ -1632,8 +1632,16 @@ int mt76_connac_mcu_hw_scan(struct mt76_phy *phy, struct ieee80211_vif *vif, req->channel_min_dwell_time =cpu_to_le16 (duration); req->channel_dwell_time =cpu_to_le16 (duration); - req->channels_num =min_t (u8, sreq->n_channels,32 ); - req->ext_channels_num =min_t (u8, ext_channels_num,32 ); +if (sreq->n_channels ==0 || sreq->n_channels >64 ) { + req->channel_type =0 ; + req->channels_num =0 ; + req->ext_channels_num =0 ; + }else { + req->channel_type =4 ; + req->channels_num =min_t (u8, sreq->n_channels,32 ); + req->ext_channels_num =min_t (u8, ext_channels_num,32 ); + } +for (i =0 ; i < req->channels_num + req->ext_channels_num; i++) {if (i >=32 ) chan = &req->ext_channels[i -32 ];
@@ -1653,7 +1661,6 @@ int mt76_connac_mcu_hw_scan(struct mt76_phy *phy, struct ieee80211_vif *vif, } chan->channel_num = scan_list[i]->hw_value; } - req->channel_type = sreq->n_channels ?4 :0 ;if (sreq->ie_len >0 ) {memcpy (req->ies, sreq->ie, sreq->ie_len);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 400/663 mt76: mt7921: fix kernel panic by accessing unallocated eeprom.data
In reply to Greg Kroah-HartmanFrom: Sean Wang <[email protected]>
[ Upstream commit 12db28c3ef31f719bd18fa186a40bb152e6a527c ]
The MT7921 driver no longer uses eeprom.data, but the relevant code has not been removed completely since
commit 16d98b548365 ("mt76: mt7921: rely on mcu_get_nic_capability"). This could result in potential invalid memory access.
To fix the kernel panic issue in mt7921, it is necessary to avoid accessing unallocated eeprom.data which can lead to invalid memory access.
Furthermore, it is possible to entirely eliminate the mt7921_mcu_parse_eeprom function and solely depend on mt7921_mcu_parse_response to divide the RxD header.
[2.702735] BUG: kernel NULL pointer dereference, address: 0000000000000550 [2.702740] #PF: supervisor write access in kernel mode [2.702741] #PF: error_code(0x0002) - not-present page [2.702743] PGD 0 P4D 0 [2.702747] Oops: 0002 [#1] PREEMPT SMP NOPTI [2.702755] RIP: 0010:mt7921_mcu_parse_response+0x147/0x170 [mt7921_common] [2.702758] RSP: 0018:ffffae7c00fef828 EFLAGS: 00010286 [2.702760] RAX: ffffa367f57be024 RBX: ffffa367cc7bf500 RCX: 0000000000000000 [2.702762] RDX: 0000000000000550 RSI: 0000000000000000 RDI: ffffa367cc7bf500 [2.702763] RBP: ffffae7c00fef840 R08: ffffa367cb167000 R09: 0000000000000005 [2.702764] R10: 0000000000000000 R11: ffffffffc04702e4 R12: ffffa367e8329f40 [2.702766] R13: 0000000000000000 R14: 0000000000000001 R15: ffffa367e8329f40 [2.702768] FS: 000079ee6cf20c40(0000) GS:ffffa36b2f940000(0000) knlGS:0000000000000000 [2.702769] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [2.702775] CR2: 0000000000000550 CR3: 00000001233c6004 CR4: 0000000000770ee0 [2.702776] PKRU: 55555554 [2.702777] Call Trace: [2.702782] mt76_mcu_skb_send_and_get_msg+0xc3/0x11e [mt76 <HASH:1bc4 5>] [2.702785] mt7921_run_firmware+0x241/0x853 [mt7921_common <HASH:6a2f 6>] [2.702789] mt7921e_mcu_init+0x2b/0x56 [mt7921e <HASH:d290 7>] [2.702792] mt7921_register_device+0x2eb/0x5a5 [mt7921_common <HASH:6a2f 6>] [2.702795] ? mt7921_irq_tasklet+0x1d4/0x1d4 [mt7921e <HASH:d290 7>] [2.702797] mt7921_pci_probe+0x2d6/0x319 [mt7921e <HASH:d290 7>] [2.702799] pci_device_probe+0x9f/0x12a
--- .../net/wireless/mediatek/mt76/mt7921/mcu.c | 20 ------------------- 1 file changed, 20 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7921/mcu.c +0 -20
@@ -16,24 +16,6 @@ static bool mt7921_disable_clc;module_param_named (disable_clc, mt7921_disable_clc, bool,0644 );MODULE_PARM_DESC (disable_clc,"disable CLC support" ); -static int -mt7921_mcu_parse_eeprom (struct mt76_dev *dev,struct sk_buff *skb) -{ -struct mt7921_mcu_eeprom_info *res; -u8 *buf; - -if (!skb) -return -EINVAL ; - -skb_pull (skb,sizeof (struct mt76_connac2_mcu_rxd )); - - res = (struct mt7921_mcu_eeprom_info *)skb->data; - buf = dev->eeprom.data +le32_to_cpu (res->addr); -memcpy (buf, res->data,16 ); - -return 0 ; -} -int mt7921_mcu_parse_response (struct mt76_dev *mdev,int cmd,struct sk_buff *skb,int seq) {
@@ -60,8 +42,6 @@ int mt7921_mcu_parse_response(struct mt76_dev *mdev, int cmd, }else if (cmd ==MCU_EXT_CMD (THERMAL_CTRL )) {skb_pull (skb,sizeof (*rxd) +4 ); ret =le32_to_cpu (*(__le32 *)skb->data); - }else if (cmd ==MCU_EXT_CMD (EFUSE_ACCESS )) { - ret =mt7921_mcu_parse_eeprom (mdev, skb); } else if (cmd == MCU_UNI_CMD(DEV_INFO_UPDATE) || cmd == MCU_UNI_CMD(BSS_INFO_UPDATE) || cmd == MCU_UNI_CMD(STA_REC_UPDATE) ||
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 401/663 wifi: mt76: mt7921: fix missing unwind goto in `mt7921u_probe`
In reply to Greg Kroah-HartmanFrom: Jiefeng Li <[email protected]>
[ Upstream commit 5c47cdebbaeb7724df6f9f46917c93e53f791547 ]
mt7921u_dma_init can only return zero or negative number according to its definition. When it returns non-zero number, there exists an error and this function should handle this error rather than return directly.
--- drivers/net/wireless/mediatek/mt76/mt7921/usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7921/usb.c +1 -1
@@ -270,7 +270,7 @@ static int mt7921u_probe(struct usb_interface *usb_intf, ret =mt7921u_dma_init (dev, false);if (ret) -return ret; + goto error; hw =mt76_hw (dev);/* check hw sg support in order to enable AMSDU */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 402/663 wifi: mt76: mt7921e: improve reliability of dma reset
In reply to Greg Kroah-HartmanFrom: Quan Zhou <[email protected]>
[ Upstream commit 87714bf6ed1589813e473db5471e6e9857755764 ]
The hardware team has advised the driver that it is necessary to first put WFDMA into an idle state before resetting the WFDMA. Otherwise, the WFDMA may enter an unknown state where it cannot be polled with the right state successfully. To ensure that the DMA can work properly while a stressful cold reboot test was being made, we have reordered the programming sequence in the driver based on the hardware team's guidance.
The patch would modify the WFDMA disabling flow from
"DMA reset -> disabling DMASHDL -> disabling WFDMA -> polling and waiting until DMA idle" to "disabling WFDMA -> polling and waiting for DMA idle -> disabling DMASHDL -> DMA reset.
Where he polling and waiting until WFDMA is idle is coordinated with the operation of disabling WFDMA. Even while WFDMA is being disabled, it can still handle Tx/Rx requests. The additional polling allows sufficient time for WFDMA to process the last T/Rx request. When the idle state of WFDMA is reached, it is a reliable indication that DMASHDL is also idle to ensure it is safe to disable it and perform the DMA reset.
--- .../net/wireless/mediatek/mt76/mt7921/dma.c | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7921/dma.c +20 -16
@@ -66,22 +66,6 @@ static void mt7921_dma_prefetch(struct mt7921_dev *dev)static int mt7921_dma_disable (struct mt7921_dev *dev,bool force) { -if (force) { -/* reset */ -mt76_clear (dev,MT_WFDMA0_RST , -MT_WFDMA0_RST_DMASHDL_ALL_RST | -MT_WFDMA0_RST_LOGIC_RST ); - -mt76_set (dev,MT_WFDMA0_RST , -MT_WFDMA0_RST_DMASHDL_ALL_RST | -MT_WFDMA0_RST_LOGIC_RST ); - } - -/* disable dmashdl */ -mt76_clear (dev,MT_WFDMA0_GLO_CFG_EXT0 , -MT_WFDMA0_CSR_TX_DMASHDL_ENABLE ); -mt76_set (dev,MT_DMASHDL_SW_CONTROL ,MT_DMASHDL_DMASHDL_BYPASS ); -/* disable WFDMA0 */ mt76_clear(dev, MT_WFDMA0_GLO_CFG, MT_WFDMA0_GLO_CFG_TX_DMA_EN | MT_WFDMA0_GLO_CFG_RX_DMA_EN |
@@ -95,6 +79,22 @@ static int mt7921_dma_disable(struct mt7921_dev *dev, bool force) MT_WFDMA0_GLO_CFG_RX_DMA_BUSY, 0, 100, 1))return -ETIMEDOUT ; +/* disable dmashdl */ +mt76_clear (dev,MT_WFDMA0_GLO_CFG_EXT0 , +MT_WFDMA0_CSR_TX_DMASHDL_ENABLE ); +mt76_set (dev,MT_DMASHDL_SW_CONTROL ,MT_DMASHDL_DMASHDL_BYPASS ); + +if (force) { +/* reset */ +mt76_clear (dev,MT_WFDMA0_RST , +MT_WFDMA0_RST_DMASHDL_ALL_RST | +MT_WFDMA0_RST_LOGIC_RST ); + +mt76_set (dev,MT_WFDMA0_RST , +MT_WFDMA0_RST_DMASHDL_ALL_RST | +MT_WFDMA0_RST_LOGIC_RST ); + } +return 0 ; }
@@ -301,6 +301,10 @@ void mt7921_dma_cleanup(struct mt7921_dev *dev)MT_WFDMA0_GLO_CFG_OMIT_RX_INFO | MT_WFDMA0_GLO_CFG_OMIT_RX_INFO_PFET2); +mt76_poll_msec_tick (dev,MT_WFDMA0_GLO_CFG , +MT_WFDMA0_GLO_CFG_TX_DMA_BUSY | +MT_WFDMA0_GLO_CFG_RX_DMA_BUSY ,0 ,100 ,1 ); +/* reset */ mt76_clear(dev, MT_WFDMA0_RST, MT_WFDMA0_RST_DMASHDL_ALL_RST |
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 403/663 wifi: mt76: mt7921e: stop chip reset worker in unregister hook
In reply to Greg Kroah-HartmanFrom: Quan Zhou <[email protected]>
[ Upstream commit 3d78c46423c6567ed25ca033e086865b1b4d5ae1 ]
If the chip reset worker is triggered during the remove process, the chip DMA may not be properly pushed back to the idle state. This can lead to corruption of the DMA flow due to the chip reset. Therefore, it is necessary to stop the chip reset before the DMA is finalized.
To avoid resetting the chip after the reset worker is cancelled, use __mt7921_mcu_drv_pmctrl() instead of mt7921_mcu_drv_pmctrl(). It is safe to ignore the pm mutex because the pm worker and wake worker have already been cancelled.
--- drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7921/pci.c +2 -1
@@ -115,9 +115,10 @@ static void mt7921e_unregister_device(struct mt7921_dev *dev)napi_disable (&dev->mt76.napi[i]);cancel_delayed_work_sync (&pm->ps_work);cancel_work_sync (&pm->wake_work); +cancel_work_sync (&dev->reset_work);mt7921_tx_token_put (dev); -mt7921_mcu_drv_pmctrl (dev); +__mt7921_mcu_drv_pmctrl (dev);mt7921_dma_cleanup (dev);mt7921_wfsys_reset (dev);skb_queue_purge (&dev->mt76.mcu.res_q);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 404/663 wifi: mt76: connac: fix txd multicast rate setting
In reply to Greg Kroah-HartmanFrom: Ryder Lee <[email protected]>
[ Upstream commit 3d2892e05086d09aecf14ea64b2debbf495e313c ]
The vif->bss_conf.mcast_rate should be applied to multicast data frame only.
--- drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c +2 -1
@@ -537,7 +537,8 @@ void mt76_connac2_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi,if (txwi[2 ] &cpu_to_le32 (MT_TXD2_FIX_RATE )) {/* Fixed rata is available just for 802.11 txd */ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; -bool multicast =is_multicast_ether_addr (hdr->addr1); +bool multicast =ieee80211_is_data (hdr->frame_control) && +is_multicast_ether_addr (hdr->addr1);u16 rate =mt76_connac2_mac_tx_rate_val (mphy, vif, beacon, multicast);u32 val =MT_TXD6_FIXED_BW ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 405/663 wifi: iwlwifi: mvm: check firmware response size
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
[ Upstream commit 13513cec93ac9902d0b896976d8bab3758a9881c ]
Check the firmware response size for responses to the memory read/write command in debugfs before using it.
--- drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c +10 -0
@@ -1745,6 +1745,11 @@ static ssize_t iwl_dbgfs_mem_read(struct file *file, char __user *user_buf,if (ret <0 )return ret; +if (iwl_rx_packet_payload_len (hcmd.resp_pkt) <sizeof (*rsp)) { + ret = -EIO ; + goto out; + } + rsp = (void *)hcmd.resp_pkt->data;if (le32_to_cpu (rsp->status) !=DEBUG_MEM_STATUS_SUCCESS ) { ret = -ENXIO ;
@@ -1821,6 +1826,11 @@ static ssize_t iwl_dbgfs_mem_write(struct file *file,if (ret <0 )return ret; +if (iwl_rx_packet_payload_len (hcmd.resp_pkt) <sizeof (*rsp)) { + ret = -EIO ; + goto out; + } + rsp = (void *)hcmd.resp_pkt->data;if (rsp->status !=DEBUG_MEM_STATUS_SUCCESS ) { ret = -ENXIO ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 406/663 netfilter: conntrack: restore IPS_CONFIRMED out of nf_conntrack_hash_check_insert()
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 2cdaa3eefed83082923cf219c8b6a314e622da74 ]
e6d57e9ff0ae ("netfilter: conntrack: fix rmmod double-free race") consolidates IPS_CONFIRMED bit set in nf_conntrack_hash_check_insert(). However, this breaks ctnetlink:
# conntrack -I -p tcp --timeout 123 --src 1.2.3.4 --dst 5.6.7.8 --state ESTABLISHED --sport 1 --dport 4 -u SEEN_REPLY conntrack v1.4.6 (conntrack-tools): Operation failed: Device or resource busy
This is a partial revert of the aforementioned commit to restore IPS_CONFIRMED.
--- net/netfilter/nf_conntrack_bpf.c | 1 + net/netfilter/nf_conntrack_core.c | 1 - net/netfilter/nf_conntrack_netlink.c | 3 +++ 3 files changed, 4 insertions(+), 1 deletion(-)
net/netfilter/nf_conntrack_bpf.c +1 -0
@@ -381,6 +381,7 @@ struct nf_conn *bpf_ct_insert_entry(struct nf_conn___init *nfct_i)struct nf_conn *nfct = (struct nf_conn *)nfct_i;int err; + nfct->status |=IPS_CONFIRMED ; err =nf_conntrack_hash_check_insert (nfct);if (err <0 ) {nf_conntrack_free (nfct);
net/netfilter/nf_conntrack_core.c +0 -1
@@ -934,7 +934,6 @@ nf_conntrack_hash_check_insert(struct nf_conn *ct) goto out; } - ct->status |=IPS_CONFIRMED ;smp_wmb ();/* The caller holds a reference to this object */ refcount_set (&ct->ct_general.use,2 );
net/netfilter/nf_conntrack_netlink.c +3 -0
@@ -2316,6 +2316,9 @@ ctnetlink_create_conntrack(struct net *net,nfct_seqadj_ext_add (ct);nfct_synproxy_ext_add (ct); +/* we must add conntrack extensions before confirmation. */ + ct->status |=IPS_CONFIRMED ; +if (cda[CTA_STATUS ]) { err =ctnetlink_change_status (ct, cda);if (err <0 )
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 407/663 wifi: mt76: mt7996: rely on mt76_connac_txp_common structure
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit 3c38dfc1702d812f7c4a89ed5b0521e2ad8381d6 ]
mt7996_txp structure is equal to mt76_connac_fw_txp one. Drop mt7996_txp and rely on mt76_connac_txp_common.
Stable-dep-of: 3b522cadedfe ("wifi: mt76: mt7996: fill txd by host driver")
--- .../net/wireless/mediatek/mt76/mt7996/mac.c | 38 +++++++++---------- .../net/wireless/mediatek/mt76/mt7996/mac.h | 15 +------- .../net/wireless/mediatek/mt76/mt7996/mmio.c | 2 +- 3 files changed, 22 insertions(+), 33 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/mac.c +19 -19
@@ -1072,8 +1072,8 @@ int mt7996_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,struct ieee80211_tx_info *info =IEEE80211_SKB_CB (tx_info->skb);struct ieee80211_key_conf *key = info->control.hw_key;struct ieee80211_vif *vif = info->control.vif; +struct mt76_connac_txp_common *txp;struct mt76_txwi_cache *t; -struct mt7996_txp *txp;int id, i, pid, nbuf = tx_info->nbuf -1 ;bool is_8023 = info->flags &IEEE80211_TX_CTL_HW_80211_ENCAP ;u8 *txwi = (u8 *)txwi_ptr;
@@ -1107,35 +1107,35 @@ int mt7996_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,mt7996_mac_write_txwi (dev, txwi_ptr, tx_info->skb, wcid, key, pid, qid,0 ); - txp = (struct mt7996_txp *)(txwi +MT_TXD_SIZE ); + txp = (struct mt76_connac_txp_common *)(txwi +MT_TXD_SIZE );for (i =0 ; i < nbuf; i++) { - txp->buf[i] =cpu_to_le32 (tx_info->buf[i +1 ].addr); - txp->len[i] =cpu_to_le16 (tx_info->buf[i +1 ].len); + txp->fw.buf[i] =cpu_to_le32 (tx_info->buf[i +1 ].addr); + txp->fw.len[i] =cpu_to_le16 (tx_info->buf[i +1 ].len); } - txp->nbuf = nbuf; + txp->fw.nbuf = nbuf; - txp->flags =cpu_to_le16 (MT_CT_INFO_FROM_HOST ); + txp->fw.flags =cpu_to_le16 (MT_CT_INFO_FROM_HOST );if (!is_8023 || pid >=MT_PACKET_ID_FIRST ) - txp->flags |=cpu_to_le16 (MT_CT_INFO_APPLY_TXD ); + txp->fw.flags |=cpu_to_le16 (MT_CT_INFO_APPLY_TXD );if (!key) - txp->flags |=cpu_to_le16 (MT_CT_INFO_NONE_CIPHER_FRAME ); + txp->fw.flags |=cpu_to_le16 (MT_CT_INFO_NONE_CIPHER_FRAME );if (!is_8023 &&ieee80211_is_mgmt (hdr->frame_control)) - txp->flags |=cpu_to_le16 (MT_CT_INFO_MGMT_FRAME ); + txp->fw.flags |=cpu_to_le16 (MT_CT_INFO_MGMT_FRAME );if (vif) {struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv; - txp->bss_idx = mvif->mt76.idx; + txp->fw.bss_idx = mvif->mt76.idx; } - txp->token =cpu_to_le16 (id); + txp->fw.token =cpu_to_le16 (id);if (test_bit (MT_WCID_FLAG_4ADDR , &wcid->flags)) - txp->rept_wds_wcid =cpu_to_le16 (wcid->idx); + txp->fw.rept_wds_wcid =cpu_to_le16 (wcid->idx);else - txp->rept_wds_wcid =cpu_to_le16 (0xfff ); + txp->fw.rept_wds_wcid =cpu_to_le16 (0xfff ); tx_info->skb =DMA_DUMMY_DATA ;/* pass partial skb header to fw */
@@ -1174,13 +1174,13 @@ mt7996_tx_check_aggr(struct ieee80211_sta *sta, __le32 *txwi)static void mt7996_txp_skb_unmap (struct mt76_dev *dev,struct mt76_txwi_cache *t) { -struct mt7996_txp *txp; +struct mt76_connac_txp_common *txp;int i; txp =mt7996_txwi_to_txp (dev, t); -for (i =0 ; i < txp->nbuf; i++) -dma_unmap_single (dev->dev,le32_to_cpu (txp->buf[i]), -le16_to_cpu (txp->len[i]),DMA_TO_DEVICE ); +for (i =0 ; i < txp->fw.nbuf; i++) +dma_unmap_single (dev->dev,le32_to_cpu (txp->fw.buf[i]), +le16_to_cpu (txp->fw.len[i]),DMA_TO_DEVICE ); } static void
@@ -1557,11 +1557,11 @@ void mt7996_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e)/* error path */ if (e->skb ==DMA_DUMMY_DATA ) { +struct mt76_connac_txp_common *txp;struct mt76_txwi_cache *t; -struct mt7996_txp *txp; txp =mt7996_txwi_to_txp (mdev, e->txwi); - t =mt76_token_put (mdev,le16_to_cpu (txp->token)); + t =mt76_token_put (mdev,le16_to_cpu (txp->fw.token)); e->skb = t ? t->skb :NULL ; }
drivers/net/wireless/mediatek/mt76/mt7996/mac.h +2 -13
@@ -265,17 +265,6 @@ enum tx_mgnt_type {/* VHT/HE only use bits 0-3 */ #define MT_TX_RATE_IDX GENMASK(5, 0) -struct mt7996_txp { -__le16 flags; -__le16 token; -u8 bss_idx; -__le16 rept_wds_wcid; -u8 nbuf; -#define MT_TXP_MAX_BUF_NUM 6 -__le32 buf[MT_TXP_MAX_BUF_NUM ]; -__le16 len[MT_TXP_MAX_BUF_NUM ]; -} __packed__aligned(4) ; -#define MT_TXFREE0_PKT_TYPE GENMASK(31, 27)#define MT_TXFREE0_MSDU_CNT GENMASK(25, 16)#define MT_TXFREE0_RX_BYTE GENMASK(15, 0)
@@ -379,7 +368,7 @@ struct mt7996_dfs_radar_spec {struct mt7996_dfs_pattern radar_pattern[16 ]; }; -static inline struct mt7996_txp * +static inline struct mt76_connac_txp_common *mt7996_txwi_to_txp (struct mt76_dev *dev,struct mt76_txwi_cache *t) {u8 *txwi;
@@ -389,7 +378,7 @@ mt7996_txwi_to_txp(struct mt76_dev *dev, struct mt76_txwi_cache *t) txwi =mt76_get_txwi_ptr (dev, t); - return (struct mt7996_txp *)(txwi + MT_TXD_SIZE); + return (struct mt76_connac_txp_common *)(txwi + MT_TXD_SIZE); }#endif
drivers/net/wireless/mediatek/mt76/mt7996/mmio.c +1 -1
@@ -318,7 +318,7 @@ struct mt7996_dev *mt7996_mmio_probe(struct device *pdev, { static const struct mt76_driver_ops drv_ops = { /* txwi_size = txd size + txp size */ - .txwi_size = MT_TXD_SIZE + sizeof(struct mt7996_txp), + .txwi_size = MT_TXD_SIZE + sizeof(struct mt76_connac_fw_txp), .drv_flags = MT_DRV_TXWI_NO_FREE | MT_DRV_HW_MGMT_TXQ, .survey_flags = SURVEY_INFO_TIME_TX |
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 408/663 wifi: mt76: mt7996: fill txd by host driver
In reply to Greg Kroah-HartmanFrom: Ryder Lee <[email protected]>
[ Upstream commit 3b522cadedfe6e9e0e8193d7d4ab5aa8d0c73209 ]
The hardware SDO has issue to fill txd for the moment, so fallback to driver filling method.
--- drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/mac.c +4 -9
@@ -1101,11 +1101,8 @@ int mt7996_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,return id; pid =mt76_tx_status_skb_add (mdev, wcid, tx_info->skb); -memset (txwi_ptr,0 ,MT_TXD_SIZE ); -/* Transmit non qos data by 802.11 header and need to fill txd by host*/ -if (!is_8023 || pid >=MT_PACKET_ID_FIRST ) -mt7996_mac_write_txwi (dev, txwi_ptr, tx_info->skb, wcid, key, - pid, qid,0 ); +mt7996_mac_write_txwi (dev, txwi_ptr, tx_info->skb, wcid, key, + pid, qid,0 ); txp = (struct mt76_connac_txp_common *)(txwi +MT_TXD_SIZE );for (i =0 ; i < nbuf; i++) {
@@ -1114,10 +1111,8 @@ int mt7996_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, } txp->fw.nbuf = nbuf; - txp->fw.flags =cpu_to_le16 (MT_CT_INFO_FROM_HOST ); - -if (!is_8023 || pid >=MT_PACKET_ID_FIRST ) - txp->fw.flags |=cpu_to_le16 (MT_CT_INFO_APPLY_TXD ); + txp->fw.flags = +cpu_to_le16 (MT_CT_INFO_FROM_HOST |MT_CT_INFO_APPLY_TXD );if (!key) txp->fw.flags |=cpu_to_le16 (MT_CT_INFO_NONE_CIPHER_FRAME );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 409/663 netfilter: conntrack: fix wrong ct->timeout value
In reply to Greg Kroah-HartmanFrom: Tzung-Bi Shih <[email protected]>
[ Upstream commit 73db1b8f2bb6725b7391e85aab41fdf592b3c0c1 ]
(struct nf_conn)->timeout is an interval before the conntrack confirmed. After confirmed, it becomes a timestamp.
It is observed that timeout of an unconfirmed conntrack:
- Set by calling ctnetlink_change_timeout(). As a result, nfct_time_stamp was wrongly added to ct->timeout twice.
- Get by calling ctnetlink_dump_timeout(). As a result, nfct_time_stamp was wrongly subtracted.
Call Trace: <TASK> dump_stack_lvl ctnetlink_dump_timeout __ctnetlink_glue_build ctnetlink_glue_build __nfqnl_enqueue_packet nf_queue nf_hook_slow ip_mc_output ? __pfx_ip_finish_output ip_send_skb ? __pfx_dst_output udp_send_skb udp_sendmsg ? __pfx_ip_generic_getfrag sock_sendmsg
Separate the 2 cases in:
- Setting ct->timeout in __nf_ct_set_timeout().
- Getting ct->timeout in ctnetlink_dump_timeout().
Pablo appends:
Update ctnetlink to set up the timeout _after_ the IPS_CONFIRMED flag is set on, otherwise conntrack creation via ctnetlink breaks.
Note that the problem described in this patch occurs since the introduction of the nfnetlink_queue conntrack support, select a sufficiently old Fixes: tag for -stable kernel to pick up this fix.
--- include/net/netfilter/nf_conntrack_core.h | 6 +++++- net/netfilter/nf_conntrack_netlink.c | 13 +++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-)
include/net/netfilter/nf_conntrack_core.h +5 -1
@@ -89,7 +89,11 @@ static inline void __nf_ct_set_timeout(struct nf_conn *ct, u64 timeout) {if (timeout >INT_MAX ) timeout =INT_MAX ; -WRITE_ONCE (ct->timeout, nfct_time_stamp + (u32 )timeout); + +if (nf_ct_is_confirmed (ct)) +WRITE_ONCE (ct->timeout, nfct_time_stamp + (u32 )timeout); +else + ct->timeout = (u32 )timeout; }int __nf_ct_change_timeout (struct nf_conn *ct,u64 cta_timeout);
net/netfilter/nf_conntrack_netlink.c +9 -4
@@ -176,7 +176,12 @@ static int ctnetlink_dump_status(struct sk_buff *skb, const struct nf_conn *ct)static int ctnetlink_dump_timeout (struct sk_buff *skb,const struct nf_conn *ct,bool skip_zero) { -long timeout =nf_ct_expires (ct) /HZ ; +long timeout; + +if (nf_ct_is_confirmed (ct)) + timeout =nf_ct_expires (ct) /HZ ; +else + timeout = ct->timeout /HZ ;if (skip_zero && timeout ==0 )return 0 ;
@@ -2253,9 +2258,6 @@ ctnetlink_create_conntrack(struct net *net,if (!cda[CTA_TIMEOUT ]) goto err1; - timeout = (u64 )ntohl (nla_get_be32 (cda[CTA_TIMEOUT ])) *HZ ; -__nf_ct_set_timeout (ct, timeout); -rcu_read_lock ();if (cda[CTA_HELP ]) {char *helpname =NULL ;
@@ -2319,6 +2321,9 @@ ctnetlink_create_conntrack(struct net *net,/* we must add conntrack extensions before confirmation. */ ct->status |=IPS_CONFIRMED ; + timeout = (u64 )ntohl (nla_get_be32 (cda[CTA_TIMEOUT ])) *HZ ; +__nf_ct_set_timeout (ct, timeout); +if (cda[CTA_STATUS ]) { err =ctnetlink_change_status (ct, cda);if (err <0 )
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 410/663 wifi: iwlwifi: fw: fix memory leak in debugfs
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
[ Upstream commit 3d90d2f4a018fe8cfd65068bc6350b6222be4852 ]
Fix a memory leak that occurs when reading the fw_info file all the way, since we return NULL indicating no more data, but don't free the status tracking object.
--- drivers/net/wireless/intel/iwlwifi/fw/debugfs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/fw/debugfs.c +3 -1
@@ -317,8 +317,10 @@ static void *iwl_dbgfs_fw_info_seq_next(struct seq_file *seq,const struct iwl_fw *fw = priv->fwrt->fw; *pos = ++state->pos; -if (*pos >= fw->ucode_capa.n_cmd_versions) +if (*pos >= fw->ucode_capa.n_cmd_versions) { +kfree (state);return NULL ; + }return state; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 411/663 ixgbe: Allow flow hash to be set via ethtool
In reply to Greg Kroah-HartmanFrom: Joe Damato <[email protected]>
[ Upstream commit 4f3ed1293feb9502dc254b05802faf1ad3317ac6 ]
ixgbe currently returns EINVAL whenever the flowhash it set by ethtool because the ethtool code in the kernel passes a non-zero value for hfunc that ixgbe should allow.
When ethtool is called with ETHTOOL_SRXFHINDIR, ethtool_set_rxfh_indir will call ixgbe's set_rxfh function with ETH_RSS_HASH_NO_CHANGE. This value should be accepted.
When ethtool is called with ETHTOOL_SRSSH, ethtool_set_rxfh will call ixgbe's set_rxfh function with rxfh.hfunc, which appears to be hardcoded in ixgbe to always be ETH_RSS_HASH_TOP. This value should also be accepted.
Before this patch:
$ sudo ethtool -L eth1 combined 10 $ sudo ethtool -X eth1 default Cannot set RX flow hash configuration: Invalid argument
After this patch:
$ sudo ethtool -L eth1 combined 10
$ sudo ethtool -X eth1 default
$ sudo ethtool -x eth1
RX flow hash indirection table for eth1 with 10 RX ring(s):
0: 0 1 2 3 4 5 6 7
8: 8 9 0 1 2 3 4 5
16: 6 7 8 9 0 1 2 3
24: 4 5 6 7 8 9 0 1
...--- drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c +2 -2
@@ -3131,8 +3131,8 @@ static int ixgbe_set_rxfh(struct net_device *netdev, const u32 *indir,int i;u32 reta_entries =ixgbe_rss_indir_tbl_entries (adapter); -if (hfunc) -return -EINVAL ; +if (hfunc !=ETH_RSS_HASH_NO_CHANGE && hfunc !=ETH_RSS_HASH_TOP ) +return -EOPNOTSUPP ;/* Fill out the redirection table */ if (indir) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 412/663 ixgbe: Enable setting RSS table to default values
In reply to Greg Kroah-HartmanFrom: Joe Damato <[email protected]>
[ Upstream commit e85d3d55875f7a1079edfbc4e4e98d6f8aea9ac7 ]
ethtool uses ETHTOOL_GRXRINGS to compute how many queues are supported by RSS. The driver should return the smaller of either:
- The maximum number of RSS queues the device supports, OR
- The number of RX queues configured
Prior to this change, running ethtool -X $iface default fails if the number of queues configured is larger than the number supported by RSS, even though changing the queue count correctly resets the flowhash to use all supported queues.
Other drivers (for example, i40e) will succeed but the flow hash will reset to support the maximum number of queues supported by RSS, even if that amount is smaller than the configured amount.
Prior to this change:
$ sudo ethtool -L eth1 combined 20
$ sudo ethtool -x eth1
RX flow hash indirection table for eth1 with 20 RX ring(s):
0: 0 1 2 3 4 5 6 7
8: 8 9 10 11 12 13 14 15
16: 0 1 2 3 4 5 6 7
24: 8 9 10 11 12 13 14 15
32: 0 1 2 3 4 5 6 7
...You can see that the flowhash was correctly set to use the maximum number of queues supported by the driver (16).
However, asking the NIC to reset to "default" fails:
$ sudo ethtool -X eth1 default Cannot set RX flow hash configuration: Invalid argument
After this change, the flowhash can be reset to default which will use all of the available RSS queues (16) or the configured queue count, whichever is smaller.
Starting with eth1 which has 10 queues and a flowhash distributing to all 10 queues:
$ sudo ethtool -x eth1
RX flow hash indirection table for eth1 with 10 RX ring(s):
0: 0 1 2 3 4 5 6 7
8: 8 9 0 1 2 3 4 5
16: 6 7 8 9 0 1 2 3
...Increasing the queue count to 48 resets the flowhash to distribute to 16 queues, as it did before this patch:
$ sudo ethtool -L eth1 combined 48
$ sudo ethtool -x eth1
RX flow hash indirection table for eth1 with 16 RX ring(s):
0: 0 1 2 3 4 5 6 7
8: 8 9 10 11 12 13 14 15
16: 0 1 2 3 4 5 6 7
...Due to the other bugfix in this series, the flowhash can be set to use queues 0-5:
$ sudo ethtool -X eth1 equal 5
$ sudo ethtool -x eth1
RX flow hash indirection table for eth1 with 16 RX ring(s):
0: 0 1 2 3 4 0 1 2
8: 3 4 0 1 2 3 4 0
16: 1 2 3 4 0 1 2 3
...Due to this bugfix, the flowhash can be reset to default and use 16 queues:
$ sudo ethtool -X eth1 default
$ sudo ethtool -x eth1
RX flow hash indirection table for eth1 with 16 RX ring(s):
0: 0 1 2 3 4 5 6 7
8: 8 9 10 11 12 13 14 15
16: 0 1 2 3 4 5 6 7
...--- .../net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c +10 -9
@@ -2665,6 +2665,14 @@ static int ixgbe_get_rss_hash_opts(struct ixgbe_adapter *adapter,return 0 ; } +static int ixgbe_rss_indir_tbl_max (struct ixgbe_adapter *adapter) +{ +if (adapter->hw.mac.type < ixgbe_mac_X550) +return 16 ; +else +return 64 ; +} +static int ixgbe_get_rxnfc (struct net_device *dev,struct ethtool_rxnfc *cmd,u32 *rule_locs) {
@@ -2673,7 +2681,8 @@ static int ixgbe_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,switch (cmd->cmd) {case ETHTOOL_GRXRINGS : - cmd->data = adapter->num_rx_queues; + cmd->data =min_t (int, adapter->num_rx_queues, +ixgbe_rss_indir_tbl_max (adapter)); ret =0 ;break ;case ETHTOOL_GRXCLSRLCNT :
@@ -3075,14 +3084,6 @@ static int ixgbe_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)return ret; } -static int ixgbe_rss_indir_tbl_max (struct ixgbe_adapter *adapter) -{ -if (adapter->hw.mac.type < ixgbe_mac_X550) -return 16 ; -else -return 64 ; -} -static u32 ixgbe_get_rxfh_key_size (struct net_device *netdev) {return IXGBE_RSS_KEY_SIZE ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 413/663 net/mlx5e: Dont clone flow post action attributes second time
In reply to Greg Kroah-HartmanFrom: Vlad Buslov <[email protected]>
[ Upstream commit e9fce818fe003b6c527f25517b9ac08eb4661b5d ]
The code already clones post action attributes in mlx5e_clone_flow_attr_for_post_act(). Creating another copy in mlx5e_tc_post_act_add() is a erroneous leftover from original implementation. Instead, assign handle->attribute to post_attr provided by the caller. Note that cloning the attribute second time is not just wasteful but also causes issues like second copy not being properly updated in neigh update code which leads to following use-after-free:
Feb 21 09:02:00 c-237-177-40-045 kernel: BUG: KASAN: use-after-free in mlx5_cmd_set_fte+0x200d/0x24c0 [mlx5_core] Feb 21 09:02:00 c-237-177-40-045 kernel: kasan_report+0xbb/0x1a0 Feb 21 09:02:00 c-237-177-40-045 kernel: kasan_save_stack+0x1e/0x40 Feb 21 09:02:00 c-237-177-40-045 kernel: kasan_set_track+0x21/0x30 Feb 21 09:02:00 c-237-177-40-045 kernel: __kasan_kmalloc+0x7a/0x90 Feb 21 09:02:00 c-237-177-40-045 kernel: kasan_save_stack+0x1e/0x40 Feb 21 09:02:00 c-237-177-40-045 kernel: kasan_set_track+0x21/0x30 Feb 21 09:02:00 c-237-177-40-045 kernel: kasan_save_free_info+0x2a/0x40 Feb 21 09:02:00 c-237-177-40-045 kernel: ____kasan_slab_free+0x11a/0x1b0 Feb 21 09:02:00 c-237-177-40-045 kernel: page dumped because: kasan: bad access detected Feb 21 09:02:00 c-237-177-40-045 kernel: mlx5_core 0000:08:00.0: mlx5_cmd_out_err:803:(pid 8833): SET_FLOW_TABLE_ENTRY(0x936) op_mod(0x0) failed, status bad resource state(0x9), syndrome (0xf2ff71), err(-22) Feb 21 09:02:00 c-237-177-40-045 kernel: mlx5_core 0000:08:00.0 enp8s0f0: Failed to add post action rule Feb 21 09:02:00 c-237-177-40-045 kernel: mlx5_core 0000:08:00.0: mlx5e_tc_encap_flows_add:190:(pid 8833): Failed to update flow post acts, -22 Feb 21 09:02:00 c-237-177-40-045 kernel: Call Trace: Feb 21 09:02:00 c-237-177-40-045 kernel: <TASK> Feb 21 09:02:00 c-237-177-40-045 kernel: dump_stack_lvl+0x57/0x7d Feb 21 09:02:00 c-237-177-40-045 kernel: print_report+0x170/0x471 Feb 21 09:02:00 c-237-177-40-045 kernel: ? mlx5_cmd_set_fte+0x200d/0x24c0 [mlx5_core] Feb 21 09:02:00 c-237-177-40-045 kernel: kasan_report+0xbb/0x1a0 Feb 21 09:02:00 c-237-177-40-045 kernel: ? mlx5_cmd_set_fte+0x200d/0x24c0 [mlx5_core] Feb 21 09:02:00 c-237-177-40-045 kernel: mlx5_cmd_set_fte+0x200d/0x24c0 [mlx5_core] Feb 21 09:02:00 c-237-177-40-045 kernel: ? __module_address.part.0+0x62/0x200 Feb 21 09:02:00 c-237-177-40-045 kernel: ? mlx5_cmd_stub_create_flow_table+0xd0/0xd0 [mlx5_core] Feb 21 09:02:00 c-237-177-40-045 kernel: ? __raw_spin_lock_init+0x3b/0x110 Feb 21 09:02:00 c-237-177-40-045 kernel: mlx5_cmd_create_fte+0x80/0xb0 [mlx5_core] Feb 21 09:02:00 c-237-177-40-045 kernel: add_rule_fg+0xe80/0x19c0 [mlx5_core] -- Feb 21 09:02:00 c-237-177-40-045 kernel: Allocated by task 13476: Feb 21 09:02:00 c-237-177-40-045 kernel: kasan_save_stack+0x1e/0x40 Feb 21 09:02:00 c-237-177-40-045 kernel: kasan_set_track+0x21/0x30 Feb 21 09:02:00 c-237-177-40-045 kernel: __kasan_kmalloc+0x7a/0x90 Feb 21 09:02:00 c-237-177-40-045 kernel: mlx5_packet_reformat_alloc+0x7b/0x230 [mlx5_core] Feb 21 09:02:00 c-237-177-40-045 kernel: mlx5e_tc_tun_create_header_ipv4+0x977/0xf10 [mlx5_core] Feb 21 09:02:00 c-237-177-40-045 kernel: mlx5e_attach_encap+0x15b4/0x1e10 [mlx5_core] Feb 21 09:02:00 c-237-177-40-045 kernel: post_process_attr+0x305/0xa30 [mlx5_core] Feb 21 09:02:00 c-237-177-40-045 kernel: mlx5e_tc_add_fdb_flow+0x4c0/0xcf0 [mlx5_core] Feb 21 09:02:00 c-237-177-40-045 kernel: __mlx5e_add_fdb_flow+0x7cf/0xe90 [mlx5_core] Feb 21 09:02:00 c-237-177-40-045 kernel: mlx5e_configure_flower+0xcaa/0x4b90 [mlx5_core] Feb 21 09:02:00 c-237-177-40-045 kernel: mlx5e_rep_setup_tc_cls_flower+0x99/0x1b0 [mlx5_core] Feb 21 09:02:00 c-237-177-40-045 kernel: mlx5e_rep_setup_tc_cb+0x133/0x1e0 [mlx5_core] -- Feb 21 09:02:00 c-237-177-40-045 kernel: Freed by task 8833: Feb 21 09:02:00 c-237-177-40-045 kernel: kasan_save_stack+0x1e/0x40 Feb 21 09:02:00 c-237-177-40-045 kernel: kasan_set_track+0x21/0x30 Feb 21 09:02:00 c-237-177-40-045 kernel: kasan_save_free_info+0x2a/0x40 Feb 21 09:02:00 c-237-177-40-045 kernel: ____kasan_slab_free+0x11a/0x1b0 Feb 21 09:02:00 c-237-177-40-045 kernel: __kmem_cache_free+0x1de/0x400 Feb 21 09:02:00 c-237-177-40-045 kernel: mlx5_packet_reformat_dealloc+0xad/0x100 [mlx5_core] Feb 21 09:02:00 c-237-177-40-045 kernel: mlx5e_tc_encap_flows_del+0x3c0/0x500 [mlx5_core] Feb 21 09:02:00 c-237-177-40-045 kernel: mlx5e_rep_update_flows+0x40c/0xa80 [mlx5_core] Feb 21 09:02:00 c-237-177-40-045 kernel: mlx5e_rep_neigh_update+0x473/0x7a0 [mlx5_core] Feb 21 09:02:00 c-237-177-40-045 kernel: process_one_work+0x7c2/0x1310 Feb 21 09:02:00 c-237-177-40-045 kernel: worker_thread+0x59d/0xec0 Feb 21 09:02:00 c-237-177-40-045 kernel: kthread+0x28f/0x330
--- .../net/ethernet/mellanox/mlx5/core/en/tc/post_act.c | 11 ++--------- .../net/ethernet/mellanox/mlx5/core/en/tc/post_act.h | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_act.c +2 -9
@@ -106,22 +106,17 @@ mlx5e_tc_post_act_offload(struct mlx5e_post_act *post_act, }struct mlx5e_post_act_handle * -mlx5e_tc_post_act_add (struct mlx5e_post_act *post_act,struct mlx5_flow_attr *attr) +mlx5e_tc_post_act_add (struct mlx5e_post_act *post_act,struct mlx5_flow_attr *post_attr) { -u32 attr_sz =ns_to_attr_sz (post_act->ns_type);struct mlx5e_post_act_handle *handle; -struct mlx5_flow_attr *post_attr;int err; handle =kzalloc (sizeof (*handle),GFP_KERNEL ); - post_attr =mlx5_alloc_flow_attr (post_act->ns_type); -if (!handle || !post_attr) { -kfree (post_attr); +if (!handle) {kfree (handle);return ERR_PTR (-ENOMEM ); } -memcpy (post_attr, attr, attr_sz); post_attr->chain =0 ; post_attr->prio =0 ; post_attr->ft = post_act->ft;
@@ -145,7 +140,6 @@ mlx5e_tc_post_act_add(struct mlx5e_post_act *post_act, struct mlx5_flow_attr *atreturn handle; err_xarray: -kfree (post_attr);kfree (handle);return ERR_PTR (err); }
@@ -164,7 +158,6 @@ mlx5e_tc_post_act_del(struct mlx5e_post_act *post_act, struct mlx5e_post_act_hanif (!IS_ERR_OR_NULL (handle->rule))mlx5e_tc_post_act_unoffload (post_act, handle);xa_erase (&post_act->ids, handle->id); -kfree (handle->attr);kfree (handle); }
drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_act.h +1 -1
@@ -19,7 +19,7 @@ void mlx5e_tc_post_act_destroy(struct mlx5e_post_act *post_act);struct mlx5e_post_act_handle * -mlx5e_tc_post_act_add (struct mlx5e_post_act *post_act,struct mlx5_flow_attr *attr); +mlx5e_tc_post_act_add (struct mlx5e_post_act *post_act,struct mlx5_flow_attr *post_attr);void mlx5e_tc_post_act_del (struct mlx5e_post_act *post_act,struct mlx5e_post_act_handle *handle);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 414/663 net/mlx5: E-switch, Create per vport table based on devlink encap mode
In reply to Greg Kroah-HartmanFrom: Chris Mi <[email protected]>
[ Upstream commit fd745f4c0abe41ebb09d11bf622b054a0f3e7b49 ]
Currently when creating per vport table, create flags are hardcoded. Devlink encap mode is set based on user input and HW capability. Create per vport table based on devlink encap mode.
--- .../net/ethernet/mellanox/mlx5/core/en/tc/sample.c | 4 ++-- .../net/ethernet/mellanox/mlx5/core/esw/vporttbl.c | 12 +++++++++++- drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 2 +- .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 2 +- 4 files changed, 15 insertions(+), 5 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en/tc/sample.c +2 -2
@@ -14,10 +14,10 @@#define MLX5_ESW_VPORT_TBL_SIZE_SAMPLE (64 * 1024) -static const struct esw_vport_tbl_namespace mlx5_esw_vport_tbl_sample_ns = { +static struct esw_vport_tbl_namespace mlx5_esw_vport_tbl_sample_ns = { .max_fte =MLX5_ESW_VPORT_TBL_SIZE_SAMPLE , .max_num_groups =0 ,/* default num of groups */ - .flags =MLX5_FLOW_TABLE_TUNNEL_EN_REFORMAT |MLX5_FLOW_TABLE_TUNNEL_EN_DECAP , + .flags =0 , };struct mlx5e_tc_psample {
drivers/net/ethernet/mellanox/mlx5/core/esw/vporttbl.c +11 -1
@@ -11,7 +11,7 @@ struct mlx5_vport_key {u16 prio;u16 vport;u16 vhca_id; -const struct esw_vport_tbl_namespace *vport_ns; +struct esw_vport_tbl_namespace *vport_ns; } __packed;struct mlx5_vport_table {
@@ -21,6 +21,14 @@ struct mlx5_vport_table {struct mlx5_vport_key key; }; +static void +esw_vport_tbl_init (struct mlx5_eswitch *esw,struct esw_vport_tbl_namespace *ns) +{ +if (esw->offloads.encap !=DEVLINK_ESWITCH_ENCAP_MODE_NONE ) + ns->flags |= (MLX5_FLOW_TABLE_TUNNEL_EN_REFORMAT | +MLX5_FLOW_TABLE_TUNNEL_EN_DECAP ); +} +static struct mlx5_flow_table *esw_vport_tbl_create (struct mlx5_eswitch *esw,struct mlx5_flow_namespace *ns,const struct esw_vport_tbl_namespace *vport_ns)
@@ -80,6 +88,7 @@ mlx5_esw_vporttbl_get(struct mlx5_eswitch *esw, struct mlx5_vport_tbl_attr *attru32 hkey;mutex_lock (&esw->fdb_table.offloads.vports.lock); +esw_vport_tbl_init (esw, attr->vport_ns); hkey =flow_attr_to_vport_key (esw, attr, &skey); e =esw_vport_tbl_lookup (esw, &skey, hkey);if (e) {
@@ -127,6 +136,7 @@ mlx5_esw_vporttbl_put(struct mlx5_eswitch *esw, struct mlx5_vport_tbl_attr *attru32 hkey;mutex_lock (&esw->fdb_table.offloads.vports.lock); +esw_vport_tbl_init (esw, attr->vport_ns); hkey =flow_attr_to_vport_key (esw, attr, &key); e =esw_vport_tbl_lookup (esw, &key, hkey);if (!e || --e->num_rules)
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +1 -1
@@ -677,7 +677,7 @@ struct mlx5_vport_tbl_attr {u32 chain;u16 prio;u16 vport; -const struct esw_vport_tbl_namespace *vport_ns; +struct esw_vport_tbl_namespace *vport_ns; }; struct mlx5_flow_table *
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +1 -1
@@ -73,7 +73,7 @@#define MLX5_ESW_FT_OFFLOADS_DROP_RULE (1) -static const struct esw_vport_tbl_namespace mlx5_esw_vport_tbl_mirror_ns = { +static struct esw_vport_tbl_namespace mlx5_esw_vport_tbl_mirror_ns = { .max_fte =MLX5_ESW_VPORT_TBL_SIZE , .max_num_groups =MLX5_ESW_VPORT_TBL_NUM_GROUPS , .flags =0 ,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 415/663 net/mlx5: E-switch, Dont destroy indirect table in split rule
In reply to Greg Kroah-HartmanFrom: Chris Mi <[email protected]>
[ Upstream commit 4c8189302567f75099a336b0efcff8291ec86ff4 ]
Source port rewrite (forward to ovs internal port or statck device) isn't supported in the rule of split action. So there is no indirect table in split rule. The cited commit destroyes indirect table in split rule. The indirect table for other rules will be destroyed wrongly. It will cause traffic loss.
Fix it by removing the destroy function in split rule. And also remove the destroy function in error flow.
--- drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +0 -2
@@ -763,7 +763,6 @@ mlx5_eswitch_add_fwd_rule(struct mlx5_eswitch *esw,kfree (dest);return rule; err_chain_src_rewrite: -esw_put_dest_tables_loop (esw, attr,0 , i);mlx5_esw_vporttbl_put (esw, &fwd_attr); err_get_fwd:mlx5_chains_put_table (chains, attr->chain, attr->prio,0 );
@@ -806,7 +805,6 @@ __mlx5_eswitch_del_rule(struct mlx5_eswitch *esw,if (fwd_rule) {mlx5_esw_vporttbl_put (esw, &fwd_attr);mlx5_chains_put_table (chains, attr->chain, attr->prio,0 ); -esw_put_dest_tables_loop (esw, attr,0 , esw_attr->split_count); }else {if (split)mlx5_esw_vporttbl_put (esw, &fwd_attr);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 416/663 net/mlx5e: Fix error flow in representor failing to add vport rx rule
In reply to Greg Kroah-HartmanFrom: Roi Dayan <[email protected]>
[ Upstream commit 0a6b069cc60d68d33b4f6e7dd7f1adc3ec749766 ]
On representor init rx error flow the flow steering pointer is being released so mlx5e_attach_netdev() doesn't have a valid fs pointer in its error flow. Make sure the pointer is nullified when released and add a check in mlx5e_fs_cleanup() to verify fs is not null as representor cleanup callback would be called anyway.
--- drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 2 ++ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 ++ 3 files changed, 5 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/en_fs.c +2 -0
@@ -1471,6 +1471,8 @@ struct mlx5e_flow_steering *mlx5e_fs_init(const struct mlx5e_profile *profile,void mlx5e_fs_cleanup (struct mlx5e_flow_steering *fs) { +if (!fs) +return ;mlx5e_fs_ethtool_free (fs);mlx5e_fs_tc_free (fs);mlx5e_fs_vlan_free (fs);
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +1 -0
@@ -5208,6 +5208,7 @@ static void mlx5e_nic_cleanup(struct mlx5e_priv *priv)mlx5e_health_destroy_reporters (priv);mlx5e_ktls_cleanup (priv);mlx5e_fs_cleanup (priv->fs); + priv->fs =NULL ; }static int mlx5e_init_nic_rx (struct mlx5e_priv *priv)
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +2 -0
@@ -822,6 +822,7 @@ static int mlx5e_init_ul_rep(struct mlx5_core_dev *mdev,static void mlx5e_cleanup_rep (struct mlx5e_priv *priv) {mlx5e_fs_cleanup (priv->fs); + priv->fs =NULL ; }static int mlx5e_create_rep_ttc_table (struct mlx5e_priv *priv)
@@ -988,6 +989,7 @@ static int mlx5e_init_rep_rx(struct mlx5e_priv *priv) priv->rx_res =NULL ; err_free_fs:mlx5e_fs_cleanup (priv->fs); + priv->fs =NULL ;return err; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 417/663 net/mlx5: Remove "recovery" arg from mlx5_load_one() function
In reply to Greg Kroah-HartmanFrom: Jiri Pirko <[email protected]>
[ Upstream commit 5977ac3910f1cbaf44dca48179118b25c206ac29 ]
mlx5_load_one() is always called with recovery==false, so remove the unneeded function arg.
Stable-dep-of: dfad99750c0f ("net/mlx5: Use recovery timeout on sync reset flow")
--- drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 9 ++++----- drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c +1 -1
@@ -154,7 +154,7 @@ static void mlx5_fw_reset_complete_reload(struct mlx5_core_dev *dev)if (mlx5_health_wait_pci_up (dev))mlx5_core_err (dev,"reset reload flow aborted, PCI reads still not working\n" );else -mlx5_load_one (dev, false); +mlx5_load_one (dev);devlink_remote_reload_actions_performed (priv_to_devlink (dev),0 ,BIT (DEVLINK_RELOAD_ACTION_DRIVER_REINIT ) |BIT (DEVLINK_RELOAD_ACTION_FW_ACTIVATE ));
drivers/net/ethernet/mellanox/mlx5/core/main.c +4 -5
@@ -1491,13 +1491,13 @@ int mlx5_load_one_devl_locked(struct mlx5_core_dev *dev, bool recovery)return err; } -int mlx5_load_one (struct mlx5_core_dev *dev,bool recovery) +int mlx5_load_one (struct mlx5_core_dev *dev) {struct devlink *devlink =priv_to_devlink (dev);int ret;devl_lock (devlink); - ret =mlx5_load_one_devl_locked (dev, recovery); + ret =mlx5_load_one_devl_locked (dev, false);devl_unlock (devlink);return ret; }
@@ -1891,8 +1891,7 @@ static void mlx5_pci_resume(struct pci_dev *pdev)mlx5_pci_trace (dev,"Enter, loading driver..\n" ); - err =mlx5_load_one (dev, false); - + err =mlx5_load_one (dev);if (!err)devlink_health_reporter_state_update (dev->priv.health.fw_fatal_reporter,DEVLINK_HEALTH_REPORTER_STATE_HEALTHY );
@@ -1983,7 +1982,7 @@ static int mlx5_resume(struct pci_dev *pdev) {struct mlx5_core_dev *dev =pci_get_drvdata (pdev); -return mlx5_load_one (dev, false); +return mlx5_load_one (dev); }static const struct pci_device_id mlx5_core_pci_table[] = {
drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h +1 -1
@@ -321,7 +321,7 @@ int mlx5_init_one(struct mlx5_core_dev *dev);void mlx5_uninit_one (struct mlx5_core_dev *dev);void mlx5_unload_one (struct mlx5_core_dev *dev);void mlx5_unload_one_devl_locked (struct mlx5_core_dev *dev); -int mlx5_load_one (struct mlx5_core_dev *dev,bool recovery); +int mlx5_load_one (struct mlx5_core_dev *dev);int mlx5_load_one_devl_locked (struct mlx5_core_dev *dev,bool recovery); int mlx5_vport_set_other_func_cap(struct mlx5_core_dev *dev, const void *hca_cap, u16 function_id,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 418/663 net/mlx5: Suspend auxiliary devices only in case of PCI device suspend
In reply to Greg Kroah-HartmanFrom: Jiri Pirko <[email protected]>
[ Upstream commit 72ed5d5624af384eaf74d84915810d54486a75e2 ]
The original behavior introduced by commit c6acd629eec7 ("net/mlx5e: Add support for devlink-port in non-representors mode") correctly re-instantiated uplink devlink port and related netdevice during devlink reload. However with migration to auxiliary devices, this behaviour changed.
Restore the original behaviour and tear down auxiliary devices completely during devlink reload.
Stable-dep-of: dfad99750c0f ("net/mlx5: Use recovery timeout on sync reset flow")
--- drivers/net/ethernet/mellanox/mlx5/core/dev.c | 4 ++-- .../net/ethernet/mellanox/mlx5/core/devlink.c | 4 ++-- .../net/ethernet/mellanox/mlx5/core/fw_reset.c | 4 ++-- drivers/net/ethernet/mellanox/mlx5/core/health.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 16 ++++++++-------- .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 6 +++--- .../ethernet/mellanox/mlx5/core/sf/dev/driver.c | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/dev.c +2 -2
@@ -396,7 +396,7 @@ int mlx5_attach_device(struct mlx5_core_dev *dev)return ret; } -void mlx5_detach_device (struct mlx5_core_dev *dev) +void mlx5_detach_device (struct mlx5_core_dev *dev,bool suspend) {struct mlx5_priv *priv = &dev->priv;struct auxiliary_device *adev;
@@ -426,7 +426,7 @@ void mlx5_detach_device(struct mlx5_core_dev *dev) adrv =to_auxiliary_drv (adev->dev.driver); -if (adrv->suspend) { +if (adrv->suspend && suspend) { adrv->suspend (adev, pm);continue ; }
drivers/net/ethernet/mellanox/mlx5/core/devlink.c +2 -2
@@ -104,7 +104,7 @@ static int mlx5_devlink_reload_fw_activate(struct devlink *devlink, struct netliif (err)return err; -mlx5_unload_one_devl_locked (dev); +mlx5_unload_one_devl_locked (dev, true); err =mlx5_health_wait_pci_up (dev);if (err)NL_SET_ERR_MSG_MOD (extack,"FW activate aborted, PCI reads fail after reset" );
@@ -162,7 +162,7 @@ static int mlx5_devlink_reload_down(struct devlink *devlink, bool netns_change,switch (action) {case DEVLINK_RELOAD_ACTION_DRIVER_REINIT : -mlx5_unload_one_devl_locked (dev); +mlx5_unload_one_devl_locked (dev, false);break ;case DEVLINK_RELOAD_ACTION_FW_ACTIVATE :if (limit ==DEVLINK_RELOAD_LIMIT_NO_RESET )
drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c +2 -2
@@ -150,7 +150,7 @@ static void mlx5_fw_reset_complete_reload(struct mlx5_core_dev *dev)if (test_bit (MLX5_FW_RESET_FLAGS_PENDING_COMP , &fw_reset->reset_flags)) {complete (&fw_reset->done); }else { -mlx5_unload_one (dev); +mlx5_unload_one (dev, false);if (mlx5_health_wait_pci_up (dev))mlx5_core_err (dev,"reset reload flow aborted, PCI reads still not working\n" );else
@@ -484,7 +484,7 @@ int mlx5_fw_reset_wait_reset_done(struct mlx5_core_dev *dev) } err = fw_reset->ret;if (test_and_clear_bit (MLX5_FW_RESET_FLAGS_RELOAD_REQUIRED , &fw_reset->reset_flags)) { -mlx5_unload_one_devl_locked (dev); +mlx5_unload_one_devl_locked (dev, false);mlx5_load_one_devl_locked (dev, false); } out:
drivers/net/ethernet/mellanox/mlx5/core/health.c +1 -1
@@ -699,7 +699,7 @@ static void mlx5_fw_fatal_reporter_err_work(struct work_struct *work)* requests from the kernel. */ mlx5_core_err (dev,"Driver is in error state. Unloading\n" ); -mlx5_unload_one (dev); +mlx5_unload_one (dev, false); } }
drivers/net/ethernet/mellanox/mlx5/core/main.c +8 -8
@@ -1502,12 +1502,12 @@ int mlx5_load_one(struct mlx5_core_dev *dev)return ret; } -void mlx5_unload_one_devl_locked (struct mlx5_core_dev *dev) +void mlx5_unload_one_devl_locked (struct mlx5_core_dev *dev,bool suspend) {devl_assert_locked (priv_to_devlink (dev));mutex_lock (&dev->intf_state_mutex); -mlx5_detach_device (dev); +mlx5_detach_device (dev, suspend);if (!test_bit (MLX5_INTERFACE_STATE_UP , &dev->intf_state)) { mlx5_core_warn(dev, "%s: interface is down, NOP\n",
@@ -1522,12 +1522,12 @@ void mlx5_unload_one_devl_locked(struct mlx5_core_dev *dev)mutex_unlock (&dev->intf_state_mutex); } -void mlx5_unload_one (struct mlx5_core_dev *dev) +void mlx5_unload_one (struct mlx5_core_dev *dev,bool suspend) {struct devlink *devlink =priv_to_devlink (dev);devl_lock (devlink); -mlx5_unload_one_devl_locked (dev); +mlx5_unload_one_devl_locked (dev, suspend);devl_unlock (devlink); }
@@ -1809,7 +1809,7 @@ static pci_ers_result_t mlx5_pci_err_detected(struct pci_dev *pdev,mlx5_enter_error_state (dev, false);mlx5_error_sw_reset (dev); -mlx5_unload_one (dev); +mlx5_unload_one (dev, true);mlx5_drain_health_wq (dev);mlx5_pci_disable_device (dev);
@@ -1965,7 +1965,7 @@ static void shutdown(struct pci_dev *pdev)set_bit (MLX5_BREAK_FW_WAIT , &dev->intf_state); err =mlx5_try_fast_unload (dev);if (err) -mlx5_unload_one (dev); +mlx5_unload_one (dev, false);mlx5_pci_disable_device (dev); }
@@ -1973,7 +1973,7 @@ static int mlx5_suspend(struct pci_dev *pdev, pm_message_t state) {struct mlx5_core_dev *dev =pci_get_drvdata (pdev); -mlx5_unload_one (dev); +mlx5_unload_one (dev, true);return 0 ; }
@@ -2016,7 +2016,7 @@ MODULE_DEVICE_TABLE(pci, mlx5_core_pci_table);void mlx5_disable_device (struct mlx5_core_dev *dev) {mlx5_error_sw_reset (dev); -mlx5_unload_one_devl_locked (dev); +mlx5_unload_one_devl_locked (dev, false); }int mlx5_recover_device (struct mlx5_core_dev *dev)
drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h +3 -3
@@ -236,7 +236,7 @@ void mlx5_adev_cleanup(struct mlx5_core_dev *dev);int mlx5_adev_init (struct mlx5_core_dev *dev);int mlx5_attach_device (struct mlx5_core_dev *dev); -void mlx5_detach_device (struct mlx5_core_dev *dev); +void mlx5_detach_device (struct mlx5_core_dev *dev,bool suspend);int mlx5_register_device (struct mlx5_core_dev *dev);void mlx5_unregister_device (struct mlx5_core_dev *dev);struct mlx5_core_dev *mlx5_get_next_phys_dev_lag (struct mlx5_core_dev *dev);
@@ -319,8 +319,8 @@ int mlx5_mdev_init(struct mlx5_core_dev *dev, int profile_idx);void mlx5_mdev_uninit (struct mlx5_core_dev *dev);int mlx5_init_one (struct mlx5_core_dev *dev);void mlx5_uninit_one (struct mlx5_core_dev *dev); -void mlx5_unload_one (struct mlx5_core_dev *dev); -void mlx5_unload_one_devl_locked (struct mlx5_core_dev *dev); +void mlx5_unload_one (struct mlx5_core_dev *dev,bool suspend); +void mlx5_unload_one_devl_locked (struct mlx5_core_dev *dev,bool suspend);int mlx5_load_one (struct mlx5_core_dev *dev);int mlx5_load_one_devl_locked (struct mlx5_core_dev *dev,bool recovery);
drivers/net/ethernet/mellanox/mlx5/core/sf/dev/driver.c +1 -1
@@ -74,7 +74,7 @@ static void mlx5_sf_dev_shutdown(struct auxiliary_device *adev) { struct mlx5_sf_dev *sf_dev = container_of(adev, struct mlx5_sf_dev, adev); -mlx5_unload_one (sf_dev->mdev); +mlx5_unload_one (sf_dev->mdev, false); }static const struct auxiliary_device_id mlx5_sf_dev_id_table[] = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 419/663 Revert "net/mlx5: Remove "recovery" arg from mlx5_load_one() function"
In reply to Greg Kroah-HartmanFrom: Moshe Shemesh <[email protected]>
[ Upstream commit 21608a2cf38e9f743636b5f86507ffbca18ecee7 ]
This reverts commit 5977ac3910f1cbaf44dca48179118b25c206ac29.
Revert this patch as we need the "recovery" arg back in mlx5_load_one() function. This arg will be used in the next patch for using recovery timeout during sync reset flow.
Stable-dep-of: dfad99750c0f ("net/mlx5: Use recovery timeout on sync reset flow")
--- drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 9 +++++---- drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c +1 -1
@@ -154,7 +154,7 @@ static void mlx5_fw_reset_complete_reload(struct mlx5_core_dev *dev)if (mlx5_health_wait_pci_up (dev))mlx5_core_err (dev,"reset reload flow aborted, PCI reads still not working\n" );else -mlx5_load_one (dev); +mlx5_load_one (dev, false);devlink_remote_reload_actions_performed (priv_to_devlink (dev),0 ,BIT (DEVLINK_RELOAD_ACTION_DRIVER_REINIT ) |BIT (DEVLINK_RELOAD_ACTION_FW_ACTIVATE ));
drivers/net/ethernet/mellanox/mlx5/core/main.c +5 -4
@@ -1491,13 +1491,13 @@ int mlx5_load_one_devl_locked(struct mlx5_core_dev *dev, bool recovery)return err; } -int mlx5_load_one (struct mlx5_core_dev *dev) +int mlx5_load_one (struct mlx5_core_dev *dev,bool recovery) {struct devlink *devlink =priv_to_devlink (dev);int ret;devl_lock (devlink); - ret =mlx5_load_one_devl_locked (dev, false); + ret =mlx5_load_one_devl_locked (dev, recovery);devl_unlock (devlink);return ret; }
@@ -1891,7 +1891,8 @@ static void mlx5_pci_resume(struct pci_dev *pdev)mlx5_pci_trace (dev,"Enter, loading driver..\n" ); - err =mlx5_load_one (dev); + err =mlx5_load_one (dev, false); +if (!err)devlink_health_reporter_state_update (dev->priv.health.fw_fatal_reporter,DEVLINK_HEALTH_REPORTER_STATE_HEALTHY );
@@ -1982,7 +1983,7 @@ static int mlx5_resume(struct pci_dev *pdev) {struct mlx5_core_dev *dev =pci_get_drvdata (pdev); -return mlx5_load_one (dev); +return mlx5_load_one (dev, false); }static const struct pci_device_id mlx5_core_pci_table[] = {
drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h +1 -1
@@ -321,7 +321,7 @@ int mlx5_init_one(struct mlx5_core_dev *dev);void mlx5_uninit_one (struct mlx5_core_dev *dev);void mlx5_unload_one (struct mlx5_core_dev *dev,bool suspend);void mlx5_unload_one_devl_locked (struct mlx5_core_dev *dev,bool suspend); -int mlx5_load_one (struct mlx5_core_dev *dev); +int mlx5_load_one (struct mlx5_core_dev *dev,bool recovery);int mlx5_load_one_devl_locked (struct mlx5_core_dev *dev,bool recovery); int mlx5_vport_set_other_func_cap(struct mlx5_core_dev *dev, const void *hca_cap, u16 function_id,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 420/663 net/mlx5: Use recovery timeout on sync reset flow
In reply to Greg Kroah-HartmanFrom: Moshe Shemesh <[email protected]>
[ Upstream commit dfad99750c0f83b0242572a573afa2c055f85b36 ]
Use the same timeout for sync reset flow and health recovery flow, since the former involves driver's recovery from firmware reset, which is similar to health recovery. Otherwise, in some cases, such as a firmware upgrade on the DPU, the firmware pre-init bit may not be ready within current timeout and the driver will abort loading back after reset.
--- drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/devlink.c +1 -1
@@ -196,7 +196,7 @@ static int mlx5_devlink_reload_up(struct devlink *devlink, enum devlink_reload_abreak ;/* On fw_activate action, also driver is reloaded and reinit performed */ *actions_performed |=BIT (DEVLINK_RELOAD_ACTION_DRIVER_REINIT ); - ret =mlx5_load_one_devl_locked (dev, false); + ret =mlx5_load_one_devl_locked (dev, true);break ;default :/* Unsupported action should not get to this function */
drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c +2 -2
@@ -154,7 +154,7 @@ static void mlx5_fw_reset_complete_reload(struct mlx5_core_dev *dev)if (mlx5_health_wait_pci_up (dev))mlx5_core_err (dev,"reset reload flow aborted, PCI reads still not working\n" );else -mlx5_load_one (dev, false); +mlx5_load_one (dev, true);devlink_remote_reload_actions_performed (priv_to_devlink (dev),0 ,BIT (DEVLINK_RELOAD_ACTION_DRIVER_REINIT ) |BIT (DEVLINK_RELOAD_ACTION_FW_ACTIVATE ));
@@ -485,7 +485,7 @@ int mlx5_fw_reset_wait_reset_done(struct mlx5_core_dev *dev) err = fw_reset->ret;if (test_and_clear_bit (MLX5_FW_RESET_FLAGS_RELOAD_REQUIRED , &fw_reset->reset_flags)) {mlx5_unload_one_devl_locked (dev, false); -mlx5_load_one_devl_locked (dev, false); +mlx5_load_one_devl_locked (dev, true); } out:clear_bit (MLX5_FW_RESET_FLAGS_PENDING_COMP , &fw_reset->reset_flags);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 421/663 net/mlx5e: Nullify table pointer when failing to create
In reply to Greg Kroah-HartmanFrom: Aya Levin <[email protected]>
[ Upstream commit 1b540decd03acd736693aabb6cb46c71fca38ae6 ]
On failing to create promisc flow steering table, the pointer is returned with an error. Nullify it so unloading the driver won't try to destroy a non existing table.
Failing to create promisc table may happen over BF devices when the ARM side is going through a firmware tear down. The host side start a reload flow. While the driver unloads, it tries to remove the promisc table. Remove WARN in this state as it is a valid error flow.
--- drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/en_fs.c +2 -1
@@ -776,6 +776,7 @@ static int mlx5e_create_promisc_table(struct mlx5e_flow_steering *fs) ft->t =mlx5_create_auto_grouped_flow_table (fs->ns, &ft_attr);if (IS_ERR (ft->t)) { err =PTR_ERR (ft->t); + ft->t =NULL ;fs_err (fs,"fail to create promisc table err=%d\n" , err);return err; }
@@ -803,7 +804,7 @@ static void mlx5e_del_promisc_rule(struct mlx5e_flow_steering *fs)static void mlx5e_destroy_promisc_table (struct mlx5e_flow_steering *fs) { -if (WARN (!fs->promisc.ft.t,"Trying to remove non-existing promiscuous table" )) +if (!fs->promisc.ft.t)return ;mlx5e_del_promisc_rule (fs);mlx5_destroy_flow_table (fs->promisc.ft.t);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 422/663 Revert "net/mlx5e: Dont use termination table when redundant"
In reply to Greg Kroah-HartmanFrom: Vlad Buslov <[email protected]>
[ Upstream commit 081abcacaf0a9505c0d4cc9780b12e6ce5d33630 ]
This reverts commit 14624d7247fcd0f3114a6f5f17b3c8d1020fbbb7.
The termination table usage is requires for DMFS steering mode as firmware doesn't support mixed table destinations list which causes following syndrome with hairpin rules:
[81922.283225] mlx5_core 0000:08:00.0: mlx5_cmd_out_err:803:(pid 25977): SET_FLOW_TABLE_ENTRY(0x936) op_mod(0x0) failed, status bad parameter(0x3), syndrome (0xaca205), err(-22)
--- .../mlx5/core/eswitch_offloads_termtbl.c | 32 +++---------------- 1 file changed, 4 insertions(+), 28 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c +4 -28
@@ -210,18 +210,6 @@ static bool mlx5_eswitch_offload_is_uplink_port(const struct mlx5_eswitch *esw,return (port_mask & port_value) ==MLX5_VPORT_UPLINK ; } -static bool -mlx5_eswitch_is_push_vlan_no_cap (struct mlx5_eswitch *esw, -struct mlx5_flow_act *flow_act) -{ -if (flow_act->action &MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH && - !(mlx5_fs_get_capabilities (esw->dev,MLX5_FLOW_NAMESPACE_FDB ) & -MLX5_FLOW_STEERING_CAP_VLAN_PUSH_ON_RX )) -return true; - -return false; -} - bool mlx5_eswitch_termtbl_required(struct mlx5_eswitch *esw, struct mlx5_flow_attr *attr,
@@ -237,7 +225,10 @@ mlx5_eswitch_termtbl_required(struct mlx5_eswitch *esw, (!mlx5_eswitch_offload_is_uplink_port(esw, spec) && !esw_attr->int_port))return false; -if (mlx5_eswitch_is_push_vlan_no_cap (esw, flow_act)) +/* push vlan on RX */ +if (flow_act->action &MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH && + !(mlx5_fs_get_capabilities (esw->dev,MLX5_FLOW_NAMESPACE_FDB ) & +MLX5_FLOW_STEERING_CAP_VLAN_PUSH_ON_RX ))return true;/* hairpin */
@@ -261,31 +252,19 @@ mlx5_eswitch_add_termtbl_rule(struct mlx5_eswitch *esw,struct mlx5_flow_act term_tbl_act = {};struct mlx5_flow_handle *rule =NULL ;bool term_table_created = false; -bool is_push_vlan_on_rx;int num_vport_dests =0 ;int i, curr_dest; - is_push_vlan_on_rx =mlx5_eswitch_is_push_vlan_no_cap (esw, flow_act);mlx5_eswitch_termtbl_actions_move (flow_act, &term_tbl_act); term_tbl_act.action |=MLX5_FLOW_CONTEXT_ACTION_FWD_DEST ;for (i =0 ; i < num_dest; i++) {struct mlx5_termtbl_handle *tt; -bool hairpin = false;/* only vport destinations can be terminated */ if (dest[i].type !=MLX5_FLOW_DESTINATION_TYPE_VPORT )continue ; -if (attr->dests[num_vport_dests].rep && - attr->dests[num_vport_dests].rep->vport ==MLX5_VPORT_UPLINK ) - hairpin = true; - -if (!is_push_vlan_on_rx && !hairpin) { - num_vport_dests++; -continue ; - } -if (attr->dests[num_vport_dests].flags &MLX5_ESW_DEST_ENCAP ) { term_tbl_act.action |=MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT ; term_tbl_act.pkt_reformat = attr->dests[num_vport_dests].pkt_reformat;
@@ -333,9 +312,6 @@ mlx5_eswitch_add_termtbl_rule(struct mlx5_eswitch *esw,for (curr_dest =0 ; curr_dest < num_vport_dests; curr_dest++) {struct mlx5_termtbl_handle *tt = attr->dests[curr_dest].termtbl; -if (!tt) -continue ; - attr->dests[curr_dest].termtbl =NULL ;/* search for the destination associated with the
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 423/663 net: stmmac:fix system hang when setting up tag_8021q VLAN for DSA ports
In reply to Greg Kroah-HartmanFrom: Yan Wang <[email protected]>
[ Upstream commit 35226750f7ab9d49140d95bc7d38a2a9b0f4fdfc ]
The system hang because of dsa_tag_8021q_port_setup()->
stmmac_vlan_rx_add_vid().
I found in stmmac_drv_probe() that cailing pm_runtime_put() disabled the clock.
First, when the kernel is compiled with CONFIG_PM=y,The stmmac's resume/suspend is active.
Secondly,stmmac as DSA master,the dsa_tag_8021q_port_setup() function will callback stmmac_vlan_rx_add_vid when DSA dirver starts. However, The system is hanged for the stmmac_vlan_rx_add_vid() accesses its registers after stmmac's clock is closed.
I would suggest adding the pm_runtime_resume_and_get() to the stmmac_vlan_rx_add_vid().This guarantees that resuming clock output while in use.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +9 -3
@@ -6348,6 +6348,10 @@ static int stmmac_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vidbool is_double = false;int ret; + ret =pm_runtime_resume_and_get (priv->device); +if (ret <0 ) +return ret; +if (be16_to_cpu (proto) ==ETH_P_8021AD ) is_double = true;
@@ -6355,16 +6359,18 @@ static int stmmac_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vid ret =stmmac_vlan_update (priv, is_double);if (ret) {clear_bit (vid, priv->active_vlans); -return ret; + goto err_pm_put; }if (priv->hw->num_vlan) { ret =stmmac_add_hw_vlan_rx_fltr (priv, ndev, priv->hw, proto, vid);if (ret) -return ret; + goto err_pm_put; } +err_pm_put: +pm_runtime_put (priv->device); -return 0 ; +return ret; }static int stmmac_vlan_rx_kill_vid (struct net_device *ndev,__be16 proto,u16 vid)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 424/663 bpf: Fix race between btf_put and btf_idr walk.
In reply to Greg Kroah-HartmanFrom: Alexei Starovoitov <[email protected]>
[ Upstream commit acf1c3d68e9a31f10d92bc67ad4673cdae5e8d92 ]
Florian and Eduard reported hard dead lock:
[ 58.433327] _raw_spin_lock_irqsave+0x40/0x50 [ 58.433334] btf_put+0x43/0x90 [ 58.433338] bpf_find_btf_id+0x157/0x240 [ 58.433353] btf_parse_fields+0x921/0x11c0
This happens since btf->refcount can be 1 at the time of btf_put() and btf_put() will call btf_free_id() which will try to grab btf_idr_lock and will dead lock.
Avoid the issue by doing btf_put() without locking.
--- kernel/bpf/btf.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
kernel/bpf/btf.c +3 -5
@@ -566,8 +566,8 @@ static s32 bpf_find_btf_id(const char *name, u32 kind, struct btf **btf_p) *btf_p = btf;return ret; } -spin_lock_bh (&btf_idr_lock);btf_put (btf); +spin_lock_bh (&btf_idr_lock); }spin_unlock_bh (&btf_idr_lock);return ret;
@@ -8185,12 +8185,10 @@ bpf_core_find_cands(struct bpf_core_ctx *ctx, u32 local_type_id)btf_get (mod_btf);spin_unlock_bh (&btf_idr_lock); cands =bpf_core_add_cands (cands, mod_btf,btf_nr_types (main_btf)); -if (IS_ERR (cands)) { -btf_put (mod_btf); +btf_put (mod_btf); +if (IS_ERR (cands))return ERR_CAST (cands); - }spin_lock_bh (&btf_idr_lock); -btf_put (mod_btf); }spin_unlock_bh (&btf_idr_lock);/* cands is a pointer to kmalloced memory here if cands->cnt > 0
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 425/663 bpf: Dont EFAULT for getsockopt with optval=NULL
In reply to Greg Kroah-HartmanFrom: Stanislav Fomichev <[email protected]>
[ Upstream commit 00e74ae0863827d944e36e56a4ce1e77e50edb91 ]
Some socket options do getsockopt with optval=NULL to estimate the size of the final buffer (which is returned via optlen). This breaks BPF getsockopt assumptions about permitted optval buffer size. Let's enforce these assumptions only when non-NULL optval is provided.
--- kernel/bpf/cgroup.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
kernel/bpf/cgroup.c +6 -3
@@ -1921,14 +1921,17 @@ int __cgroup_bpf_run_filter_getsockopt(struct sock *sk, int level,if (ret <0 ) goto out; -if (ctx.optlen > max_optlen || ctx.optlen <0 ) { +if (optval && (ctx.optlen > max_optlen || ctx.optlen <0 )) { ret = -EFAULT ; goto out; }if (ctx.optlen !=0 ) { -if (copy_to_user (optval, ctx.optval, ctx.optlen) || -put_user (ctx.optlen, optlen)) { +if (optval &©_to_user (optval, ctx.optval, ctx.optlen)) { + ret = -EFAULT ; + goto out; + } +if (put_user (ctx.optlen, optlen)) { ret = -EFAULT ; goto out; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 426/663 netfilter: nf_tables: dont write table validation state without mutex
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
[ Upstream commit 9a32e9850686599ed194ccdceb6cd3dd56b2d9b9 ]
The ->cleanup callback needs to be removed, this doesn't work anymore as the transaction mutex is already released in the ->abort function.
Just do it after a successful validation pass, this either happens from commit or abort phases where transaction mutex is held.
--- include/linux/netfilter/nfnetlink.h | 1 - net/netfilter/nf_tables_api.c | 8 ++------ net/netfilter/nfnetlink.c | 2 -- 3 files changed, 2 insertions(+), 9 deletions(-)
include/linux/netfilter/nfnetlink.h +0 -1
@@ -45,7 +45,6 @@ struct nfnetlink_subsystem {int (*commit)(struct net *net,struct sk_buff *skb);int (*abort)(struct net *net,struct sk_buff *skb,enum nfnl_abort_action action); -void (*cleanup)(struct net *net);bool (*valid_genid)(struct net *net,u32 genid); };
net/netfilter/nf_tables_api.c +2 -6
@@ -8571,6 +8571,8 @@ static int nf_tables_validate(struct net *net)if (nft_table_validate (net, table) <0 )return -EAGAIN ; } + +nft_validate_state_update (net,NFT_VALIDATE_SKIP );break ; }
@@ -9491,11 +9493,6 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)return 0 ; } -static void nf_tables_cleanup (struct net *net) -{ -nft_validate_state_update (net,NFT_VALIDATE_SKIP ); -} -static int nf_tables_abort (struct net *net,struct sk_buff *skb,enum nfnl_abort_action action) {
@@ -9529,7 +9526,6 @@ static const struct nfnetlink_subsystem nf_tables_subsys = { .cb = nf_tables_cb, .commit = nf_tables_commit, .abort = nf_tables_abort, - .cleanup = nf_tables_cleanup, .valid_genid = nf_tables_valid_genid, .owner = THIS_MODULE, };
net/netfilter/nfnetlink.c +0 -2
@@ -590,8 +590,6 @@ static void nfnetlink_rcv_batch(struct sk_buff *skb, struct nlmsghdr *nlh, goto replay_abort; } } -if (ss->cleanup) - ss->cleanup (net);nfnl_err_deliver (&err_list, oskb);kfree_skb (skb);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 427/663 net: dpaa: Fix uninitialized variable in dpaa_stop()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 461bb5b97049a149278f2c27a3aa12af16da6a2e ]
The return value is not initialized on the success path.
--- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +2 -1
@@ -295,7 +295,8 @@ static int dpaa_stop(struct net_device *net_dev) {struct mac_device *mac_dev;struct dpaa_priv *priv; -int i, err, error; +int i, error; +int err =0 ; priv =netdev_priv (net_dev); mac_dev = priv->mac_dev;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 428/663 net/sched: sch_fq: fix integer overflow of "credit"
In reply to Greg Kroah-HartmanFrom: Davide Caratti <[email protected]>
[ Upstream commit 7041101ff6c3073fd8f2e99920f535b111c929cb ]
if sch_fq is configured with "initial quantum" having values greater than INT_MAX, the first assignment of "credit" does signed integer overflow to a very negative value.
In this situation, the syzkaller script provided by Cristoph triggers the CPU soft-lockup warning even with few sockets. It's not an infinite loop, but "credit" wasn't probably meant to be minus 2Gb for each new flow. Capping "initial quantum" to INT_MAX proved to fix the issue.
v2: validation of "initial quantum" is done in fq_policy, instead of open
coding in fq_change() _ suggested by Jakub Kicinski
--- net/sched/sch_fq.c | 6 ++++- .../tc-testing/tc-tests/qdiscs/fq.json | 22 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-)
net/sched/sch_fq.c +5 -1
@@ -779,13 +779,17 @@ static int fq_resize(struct Qdisc *sch, u32 log)return 0 ; } +static struct netlink_range_validation iq_range = { + .max =INT_MAX , +}; +static const struct nla_policy fq_policy[TCA_FQ_MAX +1 ] = { [TCA_FQ_UNSPEC ] = { .strict_start_type =TCA_FQ_TIMER_SLACK }, [TCA_FQ_PLIMIT ] = { .type =NLA_U32 }, [TCA_FQ_FLOW_PLIMIT ] = { .type =NLA_U32 }, [TCA_FQ_QUANTUM ] = { .type =NLA_U32 }, - [TCA_FQ_INITIAL_QUANTUM ] = { .type =NLA_U32 }, + [TCA_FQ_INITIAL_QUANTUM ] =NLA_POLICY_FULL_RANGE (NLA_U32 , &iq_range), [TCA_FQ_RATE_ENABLE ] = { .type =NLA_U32 }, [TCA_FQ_FLOW_DEFAULT_RATE ] = { .type =NLA_U32 }, [TCA_FQ_FLOW_MAX_RATE ] = { .type =NLA_U32 },
tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq.json +22 -0
@@ -114,6 +114,28 @@ "$IP link del dev $DUMMY type dummy" ] }, + { + "id": "10f7", + "name": "Create FQ with invalid initial_quantum setting", + "category": [ + "qdisc", + "fq" + ], + "plugins": { + "requires": "nsPlugin" + }, + "setup": [ + "$IP link add dev $DUMMY type dummy || /bin/true" + ], + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root fq initial_quantum 0x80000000", + "expExitCode": "2", + "verifyCmd": "$TC qdisc show dev $DUMMY", + "matchPattern": "qdisc fq 1: root.*initial_quantum 2048Mb", + "matchCount": "0", + "teardown": [ + "$IP link del dev $DUMMY type dummy" + ] + }, { "id": "9398", "name": "Create FQ with maxrate setting",
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 429/663 ipv4: Fix potential uninit variable access bug in __ip_make_skb()
In reply to Greg Kroah-HartmanFrom: Ziyang Xuan <[email protected]>
[ Upstream commit 99e5acae193e369b71217efe6f1dad42f3f18815 ]
Like commit ea30388baebc ("ipv6: Fix an uninit variable access bug in __ip6_make_skb()"). icmphdr does not in skb linear region under the scenario of SOCK_RAW socket. Access icmp_hdr(skb)->type directly will trigger the uninit variable access bug.
Use a local variable icmp_type to carry the correct value in different scenarios.
--- net/ipv4/ip_output.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
net/ipv4/ip_output.c +13 -3
@@ -1570,9 +1570,19 @@ struct sk_buff *__ip_make_skb(struct sock *sk, cork->dst =NULL ;skb_dst_set (skb, &rt->dst); -if (iph->protocol ==IPPROTO_ICMP ) -icmp_out_count (net, ((struct icmphdr *) -skb_transport_header (skb))->type); +if (iph->protocol ==IPPROTO_ICMP ) { +u8 icmp_type; + +/* For such sockets, transhdrlen is zero when do ip_append_data(), +* so icmphdr does not in skb linear region and can not get icmp_type +* by icmp_hdr(skb)->type. +*/ +if (sk->sk_type ==SOCK_RAW && !inet_sk (sk)->hdrincl) + icmp_type = fl4->fl4_icmp_type; +else + icmp_type =icmp_hdr (skb)->type; +icmp_out_count (net, icmp_type); + }ip_cork_release (cork); out:
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 430/663 rxrpc: Fix error when reading rxrpc tokens
In reply to Greg Kroah-HartmanFrom: Marc Dionne <[email protected]>
[ Upstream commit fadfc57cc8047080a123b16f288b7138524fb1e2 ]
When converting from ASSERTCMP to WARN_ON, the tested condition must be inverted, which was missed for this case.
This would cause an EIO error when trying to read an rxrpc token, for instance when trying to display tokens with AuriStor's "tokens" command.
--- net/rxrpc/key.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/rxrpc/key.c +1 -1
@@ -680,7 +680,7 @@ static long rxrpc_read(const struct key *key,return -ENOPKG ; } -if (WARN_ON ((unsigned long )xdr - (unsigned long )oldxdr == +if (WARN_ON ((unsigned long )xdr - (unsigned long )oldxdr != toksize))return -EIO ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 431/663 Revert "Bluetooth: btsdio: fix use after free bug in btsdio_remove due to unfinished work"
In reply to Greg Kroah-HartmanFrom: Liu Jian <[email protected]>
[ Upstream commit db2bf510bd5d57f064d9e1db395ed86a08320c54 ]
This reverts commit 1e9ac114c4428fdb7ff4635b45d4f46017e8916f.
This patch introduces a possible null-ptr-def problem. Revert it. And the fixed bug by this patch have resolved by commit 73f7b171b7c0 ("Bluetooth:
btsdio: fix use after free bug in btsdio_remove due to race condition").
--- drivers/bluetooth/btsdio.c | 1 - 1 file changed, 1 deletion(-)
drivers/bluetooth/btsdio.c +0 -1
@@ -354,7 +354,6 @@ static void btsdio_remove(struct sdio_func *func)BT_DBG ("func %p" , func); -cancel_work_sync (&data->work);if (!data)return ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 432/663 netlink: Use copy_to_user() for optval in netlink_getsockopt().
In reply to Greg Kroah-HartmanFrom: Kuniyuki Iwashima <[email protected]>
[ Upstream commit d913d32cc2707e9cd24fe6fa6d7d470e9c728980 ]
Brad Spencer provided a detailed report [0] that when calling getsockopt() for AF_NETLINK, some SOL_NETLINK options set only 1 byte even though such options require at least sizeof(int) as length.
The options return a flag value that fits into 1 byte, but such behaviour confuses users who do not initialise the variable before calling getsockopt() and do not strictly check the returned value as char.
Currently, netlink_getsockopt() uses put_user() to copy data to optlen and optval, but put_user() casts the data based on the pointer, char *optval. As a result, only 1 byte is set to optval.
To avoid this behaviour, we need to use copy_to_user() or cast optval for put_user().
Note that this changes the behaviour on big-endian systems, but we document that the size of optval is int in the man page.
$ man 7 netlink
...
Socket options
To set or get a netlink socket option, call getsockopt(2) to read
or setsockopt(2) to write the option with the option level argument
set to SOL_NETLINK. Unless otherwise noted, optval is a pointer to
an int.--- net/netlink/af_netlink.c | 75 ++++++++++++---------------------------- 1 file changed, 23 insertions(+), 52 deletions(-)
net/netlink/af_netlink.c +23 -52
@@ -1742,7 +1742,8 @@ static int netlink_getsockopt(struct socket *sock, int level, int optname, {struct sock *sk = sock->sk;struct netlink_sock *nlk =nlk_sk (sk); -int len, val, err; +unsigned int flag; +int len, val;if (level !=SOL_NETLINK )return -ENOPROTOOPT ;
@@ -1754,39 +1755,17 @@ static int netlink_getsockopt(struct socket *sock, int level, int optname,switch (optname) {case NETLINK_PKTINFO : -if (len <sizeof (int )) -return -EINVAL ; - len =sizeof (int ); - val = nlk->flags &NETLINK_F_RECV_PKTINFO ?1 :0 ; -if (put_user (len, optlen) || -put_user (val, optval)) -return -EFAULT ; - err =0 ; + flag =NETLINK_F_RECV_PKTINFO ;break ;case NETLINK_BROADCAST_ERROR : -if (len <sizeof (int )) -return -EINVAL ; - len =sizeof (int ); - val = nlk->flags &NETLINK_F_BROADCAST_SEND_ERROR ?1 :0 ; -if (put_user (len, optlen) || -put_user (val, optval)) -return -EFAULT ; - err =0 ; + flag =NETLINK_F_BROADCAST_SEND_ERROR ;break ;case NETLINK_NO_ENOBUFS : -if (len <sizeof (int )) -return -EINVAL ; - len =sizeof (int ); - val = nlk->flags &NETLINK_F_RECV_NO_ENOBUFS ?1 :0 ; -if (put_user (len, optlen) || -put_user (val, optval)) -return -EFAULT ; - err =0 ; + flag =NETLINK_F_RECV_NO_ENOBUFS ;break ;case NETLINK_LIST_MEMBERSHIPS : { -int pos, idx, shift; +int pos, idx, shift, err =0 ; - err =0 ;netlink_lock_table ();for (pos =0 ; pos *8 < nlk->ngroups; pos +=sizeof (u32)) {if (len - pos <sizeof (u32))
@@ -1803,40 +1782,32 @@ static int netlink_getsockopt(struct socket *sock, int level, int optname,if (put_user (ALIGN (nlk->ngroups /8 ,sizeof (u32)), optlen)) err = -EFAULT ;netlink_unlock_table (); -break ; +return err; }case NETLINK_CAP_ACK : -if (len <sizeof (int )) -return -EINVAL ; - len =sizeof (int ); - val = nlk->flags &NETLINK_F_CAP_ACK ?1 :0 ; -if (put_user (len, optlen) || -put_user (val, optval)) -return -EFAULT ; - err =0 ; + flag =NETLINK_F_CAP_ACK ;break ;case NETLINK_EXT_ACK : -if (len <sizeof (int )) -return -EINVAL ; - len =sizeof (int ); - val = nlk->flags &NETLINK_F_EXT_ACK ?1 :0 ; -if (put_user (len, optlen) ||put_user (val, optval)) -return -EFAULT ; - err =0 ; + flag =NETLINK_F_EXT_ACK ;break ;case NETLINK_GET_STRICT_CHK : -if (len <sizeof (int )) -return -EINVAL ; - len =sizeof (int ); - val = nlk->flags &NETLINK_F_STRICT_CHK ?1 :0 ; -if (put_user (len, optlen) ||put_user (val, optval)) -return -EFAULT ; - err =0 ; + flag =NETLINK_F_STRICT_CHK ;break ;default : - err = -ENOPROTOOPT ; +return -ENOPROTOOPT ; } -return err; + +if (len <sizeof (int )) +return -EINVAL ; + + len =sizeof (int ); + val = nlk->flags & flag ?1 :0 ; + +if (put_user (len, optlen) || +copy_to_user (optval, &val, len)) +return -EFAULT ; + +return 0 ; }static void netlink_cmsg_recv_pktinfo (struct msghdr *msg,struct sk_buff *skb)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 433/663 net: amd: Fix link leak when verifying config failed
In reply to Greg Kroah-HartmanFrom: Gencen Gan <[email protected]>
[ Upstream commit d325c34d9e7e38d371c0a299d415e9b07f66a1fb ]
After failing to verify configuration, it returns directly without releasing link, which may cause memory leak.
Paolo Abeni thinks that the whole code of this driver is quite "suboptimal" and looks unmainatained since at least ~15y, so he suggests that we could simply remove the whole driver, please take it into consideration.
Simon Horman suggests that the fix label should be set to "Linux-2.6.12-rc2" considering that the problem has existed since the driver was introduced and the commit above doesn't seem to exist in net/net-next.
--- drivers/net/ethernet/amd/nmclan_cs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/amd/nmclan_cs.c +1 -1
@@ -651,7 +651,7 @@ static int nmclan_config(struct pcmcia_device *link) }else {pr_notice ("mace id not found: %x %x should be 0x40 0x?9\n" , sig[0 ], sig[1 ]); -return -ENODEV ; + goto failed; } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 434/663 tcp/udp: Fix memleaks of sk and zerocopy skbs with TX timestamp.
In reply to Greg Kroah-HartmanFrom: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 50749f2dd6854a41830996ad302aef2ffaf011d8 ]
syzkaller reported [0] memory leaks of an UDP socket and ZEROCOPY skbs. We can reproduce the problem with these sequences:
sk = socket(AF_INET, SOCK_DGRAM, 0) sk.setsockopt(SOL_SOCKET, SO_TIMESTAMPING, SOF_TIMESTAMPING_TX_SOFTWARE) sk.setsockopt(SOL_SOCKET, SO_ZEROCOPY, 1)
sk.sendto(b'', MSG_ZEROCOPY, ('127.0.0.1', 53))
sk.close()
sendmsg() calls msg_zerocopy_alloc(), which allocates a skb, sets skb->cb->ubuf.refcnt to 1, and calls sock_hold(). Here, struct ubuf_info_msgzc indirectly holds a refcnt of the socket. When the skb is sent, __skb_tstamp_tx() clones it and puts the clone into the socket's error queue with the TX timestamp.
When the original skb is received locally, skb_copy_ubufs() calls skb_unclone(), and pskb_expand_head() increments skb->cb->ubuf.refcnt. This additional count is decremented while freeing the skb, but struct ubuf_info_msgzc still has a refcnt, so __msg_zerocopy_callback() is not called.
The last refcnt is not released unless we retrieve the TX timestamped skb by recvmsg(). Since we clear the error queue in inet_sock_destruct() after the socket's refcnt reaches 0, there is a circular dependency. If we close() the socket holding such skbs, we never call sock_put() and leak the count, sk, and skb.
TCP has the same problem, and commit e0c8bccd40fc ("net: stream:
purge sk_error_queue in sk_stream_kill_queues()") tried to fix it by calling skb_queue_purge() during close(). However, there is a small chance that skb queued in a qdisc or device could be put into the error queue after the skb_queue_purge() call.
In __skb_tstamp_tx(), the cloned skb should not have a reference to the ubuf to remove the circular dependency, but skb_clone() does not call skb_copy_ubufs() for zerocopy skb. So, we need to call skb_orphan_frags_rx() for the cloned skb to call skb_copy_ubufs().
[0]:
BUG: memory leak
unreferenced object 0xffff88800c6d2d00 (size 1152):
comm "syz-executor392", pid 264, jiffies 4294785440 (age 13.044s)
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 cd af e8 81 00 00 00 00 ................
02 00 07 40 00 00 00 00 00 00 00 00 00 00 00 00 ...@............
backtrace:
[<0000000055636812>] sk_prot_alloc+0x64/0x2a0 net/core/sock.c:2024
[<0000000054d77b7a>] sk_alloc+0x3b/0x800 net/core/sock.c:2083
[<0000000066f3c7e0>] inet_create net/ipv4/af_inet.c:319 [inline]
[<0000000066f3c7e0>] inet_create+0x31e/0xe40 net/ipv4/af_inet.c:245
[<000000009b83af97>] __sock_create+0x2ab/0x550 net/socket.c:1515
[<00000000b9b11231>] sock_create net/socket.c:1566 [inline]
[<00000000b9b11231>] __sys_socket_create net/socket.c:1603 [inline]
[<00000000b9b11231>] __sys_socket_create net/socket.c:1588 [inline]
[<00000000b9b11231>] __sys_socket+0x138/0x250 net/socket.c:1636
[<000000004fb45142>] __do_sys_socket net/socket.c:1649 [inline]
[<000000004fb45142>] __se_sys_socket net/socket.c:1647 [inline]
[<000000004fb45142>] __x64_sys_socket+0x73/0xb0 net/socket.c:1647
[<0000000066999e0e>] do_syscall_x64 arch/x86/entry/common.c:50 [inline]
[<0000000066999e0e>] do_syscall_64+0x38/0x90 arch/x86/entry/common.c:80
[<0000000017f238c1>] entry_SYSCALL_64_after_hwframe+0x63/0xcd
BUG: memory leak
unreferenced object 0xffff888017633a00 (size 240):
comm "syz-executor392", pid 264, jiffies 4294785440 (age 13.044s)
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 2d 6d 0c 80 88 ff ff .........-m.....
backtrace:
[<000000002b1c4368>] __alloc_skb+0x229/0x320 net/core/skbuff.c:497
[<00000000143579a6>] alloc_skb include/linux/skbuff.h:1265 [inline]
[<00000000143579a6>] sock_omalloc+0xaa/0x190 net/core/sock.c:2596
[<00000000be626478>] msg_zerocopy_alloc net/core/skbuff.c:1294 [inline]
[<00000000be626478>] msg_zerocopy_realloc+0x1ce/0x7f0 net/core/skbuff.c:1370
[<00000000cbfc9870>] __ip_append_data+0x2adf/0x3b30 net/ipv4/ip_output.c:1037
[<0000000089869146>] ip_make_skb+0x26c/0x2e0 net/ipv4/ip_output.c:1652
[<00000000098015c2>] udp_sendmsg+0x1bac/0x2390 net/ipv4/udp.c:1253
[<0000000045e0e95e>] inet_sendmsg+0x10a/0x150 net/ipv4/af_inet.c:819
[<000000008d31bfde>] sock_sendmsg_nosec net/socket.c:714 [inline]
[<000000008d31bfde>] sock_sendmsg+0x141/0x190 net/socket.c:734
[<0000000021e21aa4>] __sys_sendto+0x243/0x360 net/socket.c:2117
[<00000000ac0af00c>] __do_sys_sendto net/socket.c:2129 [inline]
[<00000000ac0af00c>] __se_sys_sendto net/socket.c:2125 [inline]
[<00000000ac0af00c>] __x64_sys_sendto+0xe1/0x1c0 net/socket.c:2125
[<0000000066999e0e>] do_syscall_x64 arch/x86/entry/common.c:50 [inline]
[<0000000066999e0e>] do_syscall_64+0x38/0x90 arch/x86/entry/common.c:80
[<0000000017f238c1>] entry_SYSCALL_64_after_hwframe+0x63/0xcd--- net/core/skbuff.c | 3 +++ 1 file changed, 3 insertions(+)
net/core/skbuff.c +3 -0
@@ -5038,6 +5038,9 @@ void __skb_tstamp_tx(struct sk_buff *orig_skb, skb =alloc_skb (0 ,GFP_ATOMIC ); }else { skb =skb_clone (orig_skb,GFP_ATOMIC ); + +if (skb_orphan_frags_rx (skb,GFP_ATOMIC )) +return ; }if (!skb)return ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 435/663 ipmi: ASPEED_BT_IPMI_BMC: select REGMAP_MMIO instead of depending on it
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 2a587b9ad052e7e92e508aea90c1e2ae433c1908 ]
REGMAP is a hidden (not user visible) symbol. Users cannot set it directly thru "make *config", so drivers should select it instead of depending on it if they need it.
Consistently using "select" or "depends on" can also help reduce Kconfig circular dependency issues.
Therefore, change the use of "depends on REGMAP_MMIO" to "select REGMAP_MMIO", which will also set REGMAP.
Message-Id: <[email protected]>
--- drivers/char/ipmi/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/char/ipmi/Kconfig +2 -1
@@ -162,7 +162,8 @@ config IPMI_KCS_BMC_SERIO config ASPEED_BT_IPMI_BMC depends on ARCH_ASPEED || COMPILE_TEST - depends on REGMAP && REGMAP_MMIO && MFD_SYSCON + depends on MFD_SYSCON + select REGMAP_MMIO tristate "BT IPMI bmc driver" help Provides a driver for the BT (Block Transfer) IPMI interface
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 436/663 ASoC: cs35l41: Only disable internal boost
In reply to Greg Kroah-HartmanFrom: Lucas Tanure <[email protected]>
[ Upstream commit 4658de99d43cd740e019e7fd124b4128f8f4027f ]
In error situations, only the internal boost case should be disabled and re-enabled.
Also, for other boost cases re-enabling the boost to the default internal boost config is incorrect.
--- sound/soc/codecs/cs35l41.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-)
sound/soc/codecs/cs35l41.c +19 -15
@@ -356,6 +356,19 @@ static const struct snd_kcontrol_new cs35l41_aud_controls[] = { WM_ADSP_FW_CONTROL("DSP1", 0), }; +static void cs35l41_boost_enable (struct cs35l41_private *cs35l41,unsigned int enable) +{ +switch (cs35l41->hw_cfg.bst_type) { +case CS35L41_INT_BOOST : + enable = enable ?CS35L41_BST_EN_DEFAULT :CS35L41_BST_DIS_FET_OFF ; +regmap_update_bits (cs35l41->regmap,CS35L41_PWR_CTRL2 ,CS35L41_BST_EN_MASK , + enable <<CS35L41_BST_EN_SHIFT ); +break ; +default : +break ; + } +} +static irqreturn_t cs35l41_irq (int irq,void *data) {struct cs35l41_private *cs35l41 = data;
@@ -431,8 +444,7 @@ static irqreturn_t cs35l41_irq(int irq, void *data)if (status[0 ] &CS35L41_BST_OVP_ERR ) {dev_crit_ratelimited (cs35l41->dev,"VBST Over Voltage error\n" ); -regmap_update_bits (cs35l41->regmap,CS35L41_PWR_CTRL2 , -CS35L41_BST_EN_MASK ,0 ); +cs35l41_boost_enable (cs35l41,0 );regmap_write (cs35l41->regmap,CS35L41_IRQ1_STATUS1 ,CS35L41_BST_OVP_ERR );regmap_write (cs35l41->regmap,CS35L41_PROTECT_REL_ERR_IGN ,0 );
@@ -441,16 +453,13 @@ static irqreturn_t cs35l41_irq(int irq, void *data) CS35L41_BST_OVP_ERR_RLS);regmap_update_bits (cs35l41->regmap,CS35L41_PROTECT_REL_ERR_IGN ,CS35L41_BST_OVP_ERR_RLS ,0 ); -regmap_update_bits (cs35l41->regmap,CS35L41_PWR_CTRL2 , -CS35L41_BST_EN_MASK , -CS35L41_BST_EN_DEFAULT <<CS35L41_BST_EN_SHIFT ); +cs35l41_boost_enable (cs35l41,1 ); ret =IRQ_HANDLED ; }if (status[0 ] &CS35L41_BST_DCM_UVP_ERR ) {dev_crit_ratelimited (cs35l41->dev,"DCM VBST Under Voltage Error\n" ); -regmap_update_bits (cs35l41->regmap,CS35L41_PWR_CTRL2 , -CS35L41_BST_EN_MASK ,0 ); +cs35l41_boost_enable (cs35l41,0 );regmap_write (cs35l41->regmap,CS35L41_IRQ1_STATUS1 ,CS35L41_BST_DCM_UVP_ERR );regmap_write (cs35l41->regmap,CS35L41_PROTECT_REL_ERR_IGN ,0 );
@@ -459,16 +468,13 @@ static irqreturn_t cs35l41_irq(int irq, void *data) CS35L41_BST_UVP_ERR_RLS);regmap_update_bits (cs35l41->regmap,CS35L41_PROTECT_REL_ERR_IGN ,CS35L41_BST_UVP_ERR_RLS ,0 ); -regmap_update_bits (cs35l41->regmap,CS35L41_PWR_CTRL2 , -CS35L41_BST_EN_MASK , -CS35L41_BST_EN_DEFAULT <<CS35L41_BST_EN_SHIFT ); +cs35l41_boost_enable (cs35l41,1 ); ret =IRQ_HANDLED ; }if (status[0 ] &CS35L41_BST_SHORT_ERR ) {dev_crit_ratelimited (cs35l41->dev,"LBST error: powering off!\n" ); -regmap_update_bits (cs35l41->regmap,CS35L41_PWR_CTRL2 , -CS35L41_BST_EN_MASK ,0 ); +cs35l41_boost_enable (cs35l41,0 );regmap_write (cs35l41->regmap,CS35L41_IRQ1_STATUS1 ,CS35L41_BST_SHORT_ERR );regmap_write (cs35l41->regmap,CS35L41_PROTECT_REL_ERR_IGN ,0 );
@@ -477,9 +483,7 @@ static irqreturn_t cs35l41_irq(int irq, void *data) CS35L41_BST_SHORT_ERR_RLS);regmap_update_bits (cs35l41->regmap,CS35L41_PROTECT_REL_ERR_IGN ,CS35L41_BST_SHORT_ERR_RLS ,0 ); -regmap_update_bits (cs35l41->regmap,CS35L41_PWR_CTRL2 , -CS35L41_BST_EN_MASK , -CS35L41_BST_EN_DEFAULT <<CS35L41_BST_EN_SHIFT ); +cs35l41_boost_enable (cs35l41,1 ); ret =IRQ_HANDLED ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 437/663 drivers: staging: rtl8723bs: Fix locking in _rtw_join_timeout_handler()
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 215792eda008f6a1e7ed9d77fa20d582d22bb114 ]
Commit 041879b12ddb ("drivers: staging: rtl8192bs: Fix deadlock in rtw_joinbss_event_prehandle()") besides fixing the deadlock also modified _rtw_join_timeout_handler() to use spin_[un]lock_irq() instead of spin_[un]lock_bh().
_rtw_join_timeout_handler() calls rtw_do_join() which takes pmlmepriv->scanned_queue.lock using spin_[un]lock_bh(). This spin_unlock_bh() call re-enables softirqs which triggers an oops in kernel/softirq.c: __local_bh_enable_ip() when it calls lockdep_assert_irqs_enabled():
[ 244.506087] WARNING: CPU: 2 PID: 0 at kernel/softirq.c:376 __local_bh_enable_ip+0xa6/0x100 ... [ 244.509022] Call Trace: [ 244.509048] <IRQ> [ 244.509100] _rtw_join_timeout_handler+0x134/0x170 [r8723bs] [ 244.509468] ? __pfx__rtw_join_timeout_handler+0x10/0x10 [r8723bs] [ 244.509772] ? __pfx__rtw_join_timeout_handler+0x10/0x10 [r8723bs] [ 244.510076] call_timer_fn+0x95/0x2a0 [ 244.510200] __run_timers.part.0+0x1da/0x2d0
This oops is causd by the switch to spin_[un]lock_irq() which disables the IRQs for the entire duration of _rtw_join_timeout_handler().
Disabling the IRQs is not necessary since all code taking this lock runs from either user contexts or from softirqs, switch back to spin_[un]lock_bh() to fix this.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +2 -2
@@ -1549,7 +1549,7 @@ void _rtw_join_timeout_handler(struct timer_list *t)if (adapter->bDriverStopped || adapter->bSurpriseRemoved)return ; -spin_lock_irq (&pmlmepriv->lock); +spin_lock_bh (&pmlmepriv->lock);if (rtw_to_roam (adapter) >0 ) {/* join timeout caused by roaming */ while (1 ) {
@@ -1577,7 +1577,7 @@ void _rtw_join_timeout_handler(struct timer_list *t) } -spin_unlock_irq (&pmlmepriv->lock); +spin_unlock_bh (&pmlmepriv->lock); }/*
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 438/663 drivers: staging: rtl8723bs: Fix locking in rtw_scan_timeout_handler()
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 3f467036093fedd7e231924327455fc609b5ef02 ]
Commit cc7ad0d77b51 ("drivers: staging: rtl8723bs: Fix deadlock in rtw_surveydone_event_callback()") besides fixing the deadlock also modified rtw_scan_timeout_handler() to use spin_[un]lock_irq() instead of spin_[un]lock_bh().
Disabling the IRQs is not necessary since all code taking this lock runs from either user contexts or from softirqs
rtw_scan_timeout_handler() is the only function taking pmlmepriv->lock which uses spin_[un]lock_irq() for this. Switch back to spin_[un]lock_bh() to make it consistent with the rest of the code.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +2 -2
@@ -1590,11 +1590,11 @@ void rtw_scan_timeout_handler(struct timer_list *t) mlmepriv.scan_to_timer);struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -spin_lock_irq (&pmlmepriv->lock); +spin_lock_bh (&pmlmepriv->lock);_clr_fwstate_ (pmlmepriv, _FW_UNDER_SURVEY); -spin_unlock_irq (&pmlmepriv->lock); +spin_unlock_bh (&pmlmepriv->lock);rtw_indicate_scan_done (adapter, true); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 439/663 pstore: Revert pmsg_lock back to a normal mutex
In reply to Greg Kroah-HartmanFrom: John Stultz <[email protected]>
[ Upstream commit 5239a89b06d6b199f133bf0ffea421683187f257 ]
This reverts commit 76d62f24db07f22ccf9bc18ca793c27d4ebef721.
So while priority inversion on the pmsg_lock is an occasional problem that an rt_mutex would help with, in uses where logging is writing to pmsg heavily from multiple threads, the pmsg_lock can be heavily contended.
After this change landed, it was reported that cases where the mutex locking overhead was commonly adding on the order of 10s of usecs delay had suddenly jumped to ~msec delay with rtmutex.
It seems the slight differences in the locks under this level of contention causes the normal mutexes to utilize the spinning optimizations, while the rtmutexes end up in the sleeping slowpath (which allows additional threads to pile on trying to take the lock).
In this case, it devolves to a worse case senerio where the lock acquisition and scheduling overhead dominates, and each thread is waiting on the order of ~ms to do ~us of work.
Obviously, having tons of threads all contending on a single lock for logging is non-optimal, so the proper fix is probably reworking pstore pmsg to have per-cpu buffers so we don't have contention.
Additionally, Steven Rostedt has provided some furhter optimizations for rtmutexes that improves the rtmutex spinning path, but at least in my testing, I still see the test tripping into the sleeping path on rtmutexes while utilizing the spinning path with mutexes.
But in the short term, lets revert the change to the rt_mutex and go back to normal mutexes to avoid a potentially major performance regression. And we can work on optimizations to both rtmutexes and finer-grained locking for pstore pmsg in the future.
--- fs/pstore/pmsg.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
fs/pstore/pmsg.c +3 -4
@@ -7,10 +7,9 @@#include <linux/device.h> #include <linux/fs.h> #include <linux/uaccess.h> -#include <linux/rtmutex.h> #include "internal.h" -static DEFINE_RT_MUTEX (pmsg_lock); +static DEFINE_MUTEX (pmsg_lock);static ssize_t write_pmsg (struct file *file,const char __user *buf,size_t count,loff_t *ppos)
@@ -29,9 +28,9 @@ static ssize_t write_pmsg(struct file *file, const char __user *buf,if (!access_ok (buf, count))return -EFAULT ; -rt_mutex_lock (&pmsg_lock); +mutex_lock (&pmsg_lock); ret = psinfo->write_user (&record, buf); -rt_mutex_unlock (&pmsg_lock); +mutex_unlock (&pmsg_lock);return ret ? ret : count; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 440/663 usb: host: xhci-rcar: remove leftover quirk handling
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
[ Upstream commit 5d67f4861884762ebc2bddb5d667444e45f25782 ]
Loading V3 firmware does not need a quirk anymore, remove the leftover code.
--- drivers/usb/host/xhci-rcar.c | 3 --- 1 file changed, 3 deletions(-)
drivers/usb/host/xhci-rcar.c +0 -3
@@ -75,7 +75,6 @@ MODULE_FIRMWARE(XHCI_RCAR_FIRMWARE_NAME_V3);/* For soc_device_attribute */ #define RCAR_XHCI_FIRMWARE_V2 BIT(0)/* FIRMWARE V2 */ -#define RCAR_XHCI_FIRMWARE_V3 BIT(1)/* FIRMWARE V3 */ static const struct soc_device_attribute rcar_quirks_match[] = { {
@@ -147,8 +146,6 @@ static int xhci_rcar_download_firmware(struct usb_hcd *hcd)if (quirks &RCAR_XHCI_FIRMWARE_V2 ) firmware_name =XHCI_RCAR_FIRMWARE_NAME_V2 ; -else if (quirks &RCAR_XHCI_FIRMWARE_V3 ) - firmware_name =XHCI_RCAR_FIRMWARE_NAME_V3 ;else firmware_name = priv->firmware_name;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 441/663 usb: dwc3: gadget: Change condition for processing suspend event
In reply to Greg Kroah-HartmanFrom: Prashanth K <[email protected]>
[ Upstream commit 4decf4060ecfee1f7a710999fcd421645ac0c419 ]
Currently we process the suspend interrupt event only if the device is in configured state. Consider a case where device is not configured and got suspend interrupt, in that case our gadget will still use 100mA as composite_suspend didn't happen. But battery charging specification (BC1.2) expects a downstream device to draw less than 2.5mA when unconnected OR suspended.
Fix this by removing the condition for processing suspend event, and thus composite_resume would set vbus draw to 2.
--- drivers/usb/dwc3/gadget.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
drivers/usb/dwc3/gadget.c +2 -9
@@ -4262,15 +4262,8 @@ static void dwc3_gadget_interrupt(struct dwc3 *dwc,break ;case DWC3_DEVICE_EVENT_SUSPEND :/* It changed to be suspend event for version 2.30a and above */ - if (!DWC3_VER_IS_PRIOR(DWC3, 230A)) { -/* -* Ignore suspend event until the gadget enters into -* USB_STATE_CONFIGURED state. -*/ -if (dwc->gadget->state >=USB_STATE_CONFIGURED ) -dwc3_gadget_suspend_interrupt (dwc, - event->event_info); - } + if (!DWC3_VER_IS_PRIOR(DWC3, 230A)) +dwc3_gadget_suspend_interrupt (dwc, event->event_info);break ;case DWC3_DEVICE_EVENT_SOF :case DWC3_DEVICE_EVENT_ERRATIC_ERROR :
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 442/663 serial: stm32: Re-assert RTS/DE GPIO in RS485 mode only if more data are transmitted
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit c47527cbcc3c50800f34b8c684f29721f75de246 ]
The stm32_usart_transmit_chars() may be called with empty or stopped transmit queue, and no XON/OFF character pending. This can happen at the end of transmission, where this last call is used to either handle the XON/XOFF x_char, or disable TX interrupt if queue is empty or stopped.
If that occurs, do not assert the RS485 RTS/DE GPIO anymore, as the GPIO would remain asserted past the end of transmission and that would block the RS485 bus after the transmission.
Only assert the RS485 RTS/DE GPIO if there is either pending XON/XOFF x_char, or at least one character in running transmit queue.
--- drivers/tty/serial/stm32-usart.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/tty/serial/stm32-usart.c +3 -2
@@ -689,8 +689,9 @@ static void stm32_usart_transmit_chars(struct uart_port *port)int ret;if (!stm32_port->hw_flow_control && - port->rs485.flags &SER_RS485_ENABLED ) { - stm32_port->txdone = false; + port->rs485.flags &SER_RS485_ENABLED && + (port->x_char || + !(uart_circ_empty (xmit) ||uart_tx_stopped (port)))) {stm32_usart_tc_interrupt_disable (port);stm32_usart_rs485_rts_enable (port); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 443/663 fpga: bridge: fix kernel-doc parameter description
In reply to Greg Kroah-HartmanFrom: Marco Pagani <[email protected]>
[ Upstream commit 7ef1a2c1c9dffa177ecc3ea50b7f5ee63a621137 ]
Fix the kernel-doc description for the "struct fpga_image_info *info" parameter of the fpga_bridge_get() function.
--- drivers/fpga/fpga-bridge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/fpga/fpga-bridge.c +1 -1
@@ -115,7 +115,7 @@ static int fpga_bridge_dev_match(struct device *dev, const void *data)/** * fpga_bridge_get - get an exclusive reference to an fpga bridge * @dev: parent device that fpga bridge was registered with -* @info: fpga manager info +* @info: fpga image specific information * * Given a device, get an exclusive reference to an fpga bridge. *
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 444/663 iommufd/selftest: Catch overflow of uptr and length
In reply to Greg Kroah-HartmanFrom: Jason Gunthorpe <[email protected]>
[ Upstream commit fd8c1a4aee973e87d890a5861e106625a33b2c4e ]
syzkaller hits a WARN_ON when trying to have a uptr close to UINTPTR_MAX:
WARNING: CPU: 1 PID: 393 at drivers/iommu/iommufd/selftest.c:403 iommufd_test+0xb19/0x16f0 Modules linked in: CPU: 1 PID: 393 Comm: repro Not tainted 6.2.0-c9c3395d5e3d #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.0-0-gd239552ce722-prebuilt.qemu.org 04/01/2014 RIP: 0010:iommufd_test+0xb19/0x16f0 Code: 94 c4 31 ff 44 89 e6 e8 a5 54 17 ff 45 84 e4 0f 85 bb 0b 00 00 41 be fb ff ff ff e8 31 53 17 ff e9 a0 f7 ff ff e8 27 53 17 ff <0f> 0b 41 be 8 RSP: 0018:ffffc90000eabdc0 EFLAGS: 00010246 RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffffffff8214c487 RDX: 0000000000000000 RSI: ffff88800f5c8000 RDI: 0000000000000002 RBP: ffffc90000eabe48 R08: 0000000000000000 R09: 0000000000000001 R10: 0000000000000001 R11: 0000000000000000 R12: 00000000cd2b0000 R13: 00000000cd2af000 R14: 0000000000000000 R15: ffffc90000eabe68 FS: 00007f94d76d5740(0000) GS:ffff88807dd00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000020000043 CR3: 0000000006880006 CR4: 0000000000770ee0 PKRU: 55555554 Call Trace: <TASK> ? write_comp_data+0x2f/0x90 iommufd_fops_ioctl+0x1ef/0x310 __x64_sys_ioctl+0x10e/0x160 ? __pfx_iommufd_fops_ioctl+0x10/0x10 do_syscall_64+0x3b/0x90 entry_SYSCALL_64_after_hwframe+0x72/0xdc
Check that the user memory range doesn't overflow.
--- drivers/iommu/iommufd/selftest.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/iommu/iommufd/selftest.c +7 -2
@@ -339,10 +339,12 @@ static int iommufd_test_md_check_pa(struct iommufd_ucmd *ucmd, {struct iommufd_hw_pagetable *hwpt;struct mock_iommu_domain *mock; +uintptr_t end;int rc;if (iova %MOCK_IO_PAGE_SIZE || length %MOCK_IO_PAGE_SIZE || - (uintptr_t )uptr %MOCK_IO_PAGE_SIZE ) + (uintptr_t )uptr %MOCK_IO_PAGE_SIZE || +check_add_overflow ((uintptr_t )uptr, (uintptr_t )length, &end))return -EINVAL ; hwpt =get_md_pagetable (ucmd, mockpt_id, &mock);
@@ -390,7 +392,10 @@ static int iommufd_test_md_check_refs(struct iommufd_ucmd *ucmd, void __user *uptr, size_t length, unsigned int refs) { - if (length % PAGE_SIZE || (uintptr_t)uptr % PAGE_SIZE) + uintptr_t end; + +if (length %PAGE_SIZE || (uintptr_t )uptr %PAGE_SIZE || +check_add_overflow ((uintptr_t )uptr, (uintptr_t )length, &end))return -EINVAL ;for (; length; length -=PAGE_SIZE ) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 445/663 iio: light: max44009: add missing OF device matching
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit b29c49026c3c05a11f845dba17cad0b3ba06836d ]
The driver currently matches only via i2c_device_id, but also has of_device_id table:
drivers/iio/light/max44009.c:545:34: error: ‘max44009_of_match’ defined but not used [-Werror=unused-const-variable=]
--- drivers/iio/light/max44009.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/iio/light/max44009.c +7 -6
@@ -528,6 +528,12 @@ static int max44009_probe(struct i2c_client *client,return devm_iio_device_register (&client->dev, indio_dev); } +static const struct of_device_id max44009_of_match[] = { + { .compatible ="maxim,max44009" }, + { } +}; +MODULE_DEVICE_TABLE (of, max44009_of_match); +static const struct i2c_device_id max44009_id[] = { {"max44009" ,0 }, { }
@@ -537,18 +543,13 @@ MODULE_DEVICE_TABLE(i2c, max44009_id);static struct i2c_driver max44009_driver = { .driver = { .name =MAX44009_DRV_NAME , + .of_match_table = max44009_of_match, }, .probe = max44009_probe, .id_table = max44009_id, };module_i2c_driver (max44009_driver); -static const struct of_device_id max44009_of_match[] = { - { .compatible ="maxim,max44009" }, - { } -}; -MODULE_DEVICE_TABLE (of, max44009_of_match); -MODULE_AUTHOR ("Robert Eshleman <[email protected]>" );MODULE_LICENSE ("GPL v2" );MODULE_DESCRIPTION ("MAX44009 ambient light sensor driver" );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 446/663 serial: 8250_bcm7271: Fix arbitration handling
In reply to Greg Kroah-HartmanFrom: Doug Berger <[email protected]>
[ Upstream commit 15ac1122fd6d4bf408a03e6f23c7ad4f60b22f9e ]
The arbitration of the UART DMA is mishandled for a few exceptional cases when probing and releasing the driver.
It is possible that the DMA register spaces are not defined in device tree for an instance of the driver, so attempts to access the registers in brcmuart_arbitration() would use NULL pointers.
It is also possible for the probe function to return an error while still holding the UART DMA. This would prevent the UART DMA from being claimed by an instance that could use it.
These errors are addressed by only releasing the UART DMA if it is held by this instance (i.e. priv->dma_enabled == 1) and directing early error paths in probe to this common release_dma handling.
--- drivers/tty/serial/8250/8250_bcm7271.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/tty/serial/8250/8250_bcm7271.c +12 -6
@@ -1014,14 +1014,16 @@ static int brcmuart_probe(struct platform_device *pdev)/* See if a Baud clock has been specified */ baud_mux_clk =of_clk_get_by_name (np,"sw_baud" );if (IS_ERR (baud_mux_clk)) { -if (PTR_ERR (baud_mux_clk) == -EPROBE_DEFER ) -return -EPROBE_DEFER ; +if (PTR_ERR (baud_mux_clk) == -EPROBE_DEFER ) { + ret = -EPROBE_DEFER ; + goto release_dma; + }dev_dbg (dev,"BAUD MUX clock not specified\n" ); }else {dev_dbg (dev,"BAUD MUX clock found\n" ); ret =clk_prepare_enable (baud_mux_clk);if (ret) -return ret; + goto release_dma; priv->baud_mux_clk = baud_mux_clk;init_real_clk_rates (dev, priv); clk_rate = priv->default_mux_rate;
@@ -1029,7 +1031,8 @@ static int brcmuart_probe(struct platform_device *pdev)if (clk_rate ==0 ) {dev_err (dev,"clock-frequency or clk not defined\n" ); -return -EINVAL ; + ret = -EINVAL ; + goto release_dma; }dev_dbg (dev,"DMA is %senabled\n" , priv->dma_enabled ?"" :"not " );
@@ -1116,7 +1119,9 @@ static int brcmuart_probe(struct platform_device *pdev)serial8250_unregister_port (priv->line); err:brcmuart_free_bufs (dev, priv); -brcmuart_arbitration (priv,0 ); +release_dma: +if (priv->dma_enabled) +brcmuart_arbitration (priv,0 );return ret; }
@@ -1128,7 +1133,8 @@ static int brcmuart_remove(struct platform_device *pdev)hrtimer_cancel (&priv->hrt);serial8250_unregister_port (priv->line);brcmuart_free_bufs (&pdev->dev, priv); -brcmuart_arbitration (priv,0 ); +if (priv->dma_enabled) +brcmuart_arbitration (priv,0 );return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 447/663 spi: atmel-quadspi: Dont leak clk enable count in pm resume
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit c18bbac353ffed50be134b0a2a059a2bd540c503 ]
The pm resume call is supposed to enable two clocks. If the second enable fails the callback reports failure but doesn't undo the first enable.
So call clk_disable() for the first clock when clk_enable() for the second one fails.
--- drivers/spi/atmel-quadspi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/spi/atmel-quadspi.c +5 -1
@@ -786,7 +786,11 @@ static int __maybe_unused atmel_qspi_runtime_resume(struct device *dev)if (ret)return ret; -return clk_enable (aq->qspick); + ret =clk_enable (aq->qspick); +if (ret) +clk_disable (aq->pclk); + +return ret; }static const struct dev_pm_ops __maybe_unused atmel_qspi_pm_ops = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 448/663 spi: atmel-quadspi: Free resources even if runtime resume failed in .remove()
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 9448bc1dee65f86c0fe64d9dea8b410af0586886 ]
An early error exit in atmel_qspi_remove() doesn't prevent the device unbind. So this results in an spi controller with an unbound parent and unmapped register space (because devm_ioremap_resource() is undone). So using the remaining spi controller probably results in an oops.
Instead unregister the controller unconditionally and only skip hardware access and clk disable.
Also add a warning about resume failing and return zero unconditionally. The latter has the only effect to suppress a less helpful error message by the spi core.
--- drivers/spi/atmel-quadspi.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-)
drivers/spi/atmel-quadspi.c +17 -7
@@ -706,18 +706,28 @@ static int atmel_qspi_remove(struct platform_device *pdev)struct atmel_qspi *aq =spi_controller_get_devdata (ctrl);int ret; - ret =pm_runtime_resume_and_get (&pdev->dev); -if (ret <0 ) -return ret; -spi_unregister_controller (ctrl); -atmel_qspi_write (QSPI_CR_QSPIDIS , aq,QSPI_CR ); + + ret =pm_runtime_get_sync (&pdev->dev); +if (ret >=0 ) { +atmel_qspi_write (QSPI_CR_QSPIDIS , aq,QSPI_CR ); +clk_disable (aq->qspick); +clk_disable (aq->pclk); + }else { +/* +* atmel_qspi_runtime_{suspend,resume} just disable and enable +* the two clks respectively. So after resume failed these are +* off, and we skip hardware access and disabling these clks again. +*/ +dev_warn (&pdev->dev,"Failed to resume device on remove\n" ); + } + +clk_unprepare (aq->qspick); +clk_unprepare (aq->pclk);pm_runtime_disable (&pdev->dev);pm_runtime_put_noidle (&pdev->dev); -clk_disable_unprepare (aq->qspick); -clk_disable_unprepare (aq->pclk);return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 449/663 spi: imx: Dont skip cleanup in removes error path
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 11951c9e3f364d7ae3b568a0e52c8335d43066b5 ]
Returning early in a platform driver's remove callback is wrong. In this case the dma resources are not released in the error path. this is never retried later and so this is a permanent leak. To fix this, only skip hardware disabling if waking the device fails.
--- drivers/spi/spi-imx.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/spi/spi-imx.c +5 -7
@@ -1856,13 +1856,11 @@ static int spi_imx_remove(struct platform_device *pdev)spi_unregister_controller (controller); - ret =pm_runtime_resume_and_get (spi_imx->dev); -if (ret <0 ) { -dev_err (spi_imx->dev,"failed to enable clock\n" ); -return ret; - } - -writel (0 , spi_imx->base +MXC_CSPICTRL ); + ret =pm_runtime_get_sync (spi_imx->dev); +if (ret >=0 ) +writel (0 , spi_imx->base +MXC_CSPICTRL ); +else +dev_warn (spi_imx->dev,"failed to enable clock, skip hw disable\n" );pm_runtime_dont_use_autosuspend (spi_imx->dev);pm_runtime_put_sync (spi_imx->dev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 450/663 interconnect: qcom: drop obsolete OSM_L3/EPSS defines
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit 4c4161b4c81b632fc29002c324e996cbb79894e7 ]
Since Qualcomm platforms have switched to the separate OSM_L3/EPSS driver, old related defines became unused. Drop them now.
--- drivers/interconnect/qcom/sc7180.h | 2 -- drivers/interconnect/qcom/sc7280.h | 2 -- drivers/interconnect/qcom/sc8180x.h | 2 -- drivers/interconnect/qcom/sdm845.h | 2 -- drivers/interconnect/qcom/sm8150.h | 2 -- drivers/interconnect/qcom/sm8250.h | 2 -- 6 files changed, 12 deletions(-)
drivers/interconnect/qcom/sc7180.h +0 -2
@@ -145,7 +145,5 @@#define SC7180_SLAVE_SERVICE_SNOC 134#define SC7180_SLAVE_QDSS_STM 135#define SC7180_SLAVE_TCU 136 -#define SC7180_MASTER_OSM_L3_APPS 137 -#define SC7180_SLAVE_OSM_L3 138#endif
drivers/interconnect/qcom/sc7280.h +0 -2
@@ -150,7 +150,5 @@#define SC7280_SLAVE_PCIE_1 139#define SC7280_SLAVE_QDSS_STM 140#define SC7280_SLAVE_TCU 141 -#define SC7280_MASTER_EPSS_L3_APPS 142 -#define SC7280_SLAVE_EPSS_L3 143#endif
drivers/interconnect/qcom/sc8180x.h +0 -2
@@ -168,8 +168,6 @@#define SC8180X_SLAVE_EBI_CH0_DISPLAY 158#define SC8180X_SLAVE_MNOC_SF_MEM_NOC_DISPLAY 159#define SC8180X_SLAVE_MNOC_HF_MEM_NOC_DISPLAY 160 -#define SC8180X_MASTER_OSM_L3_APPS 161 -#define SC8180X_SLAVE_OSM_L3 162#define SC8180X_MASTER_QUP_CORE_0 163#define SC8180X_MASTER_QUP_CORE_1 164
drivers/interconnect/qcom/sdm845.h +0 -2
@@ -136,7 +136,5 @@#define SDM845_SLAVE_SERVICE_SNOC 128#define SDM845_SLAVE_QDSS_STM 129#define SDM845_SLAVE_TCU 130 -#define SDM845_MASTER_OSM_L3_APPS 131 -#define SDM845_SLAVE_OSM_L3 132#endif /* __DRIVERS_INTERCONNECT_QCOM_SDM845_H__ */
drivers/interconnect/qcom/sm8150.h +0 -2
@@ -148,7 +148,5 @@#define SM8150_SLAVE_VSENSE_CTRL_CFG 137#define SM8150_SNOC_CNOC_MAS 138#define SM8150_SNOC_CNOC_SLV 139 -#define SM8150_MASTER_OSM_L3_APPS 140 -#define SM8150_SLAVE_OSM_L3 141#endif
drivers/interconnect/qcom/sm8250.h +0 -2
@@ -158,7 +158,5 @@#define SM8250_SLAVE_VSENSE_CTRL_CFG 147#define SM8250_SNOC_CNOC_MAS 148#define SM8250_SNOC_CNOC_SLV 149 -#define SM8250_MASTER_EPSS_L3_APPS 150 -#define SM8250_SLAVE_EPSS_L3 151#endif
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 451/663 interconnect: qcom: osm-l3: drop unuserd header inclusion
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit f730038fe6a6de170268fd779b2c029aa70a928b ]
The commit 4529992c9474 ("interconnect: qcom: osm-l3: Use platform-independent node ids") made osm-l3 driver use platform-independent IDs, removing the need to include platform headers.
--- drivers/interconnect/qcom/osm-l3.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/interconnect/qcom/osm-l3.c +0 -7
@@ -14,13 +14,6 @@#include <dt-bindings/interconnect/qcom,osm-l3.h> -#include "sc7180.h" -#include "sc7280.h" -#include "sc8180x.h" -#include "sdm845.h" -#include "sm8150.h" -#include "sm8250.h" -#define LUT_MAX_ENTRIES 40U#define LUT_SRC GENMASK(31, 30)#define LUT_L_VAL GENMASK(7, 0)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 452/663 spi: f_ospi: Add missing spi_mem_default_supports_op() helper
In reply to Greg Kroah-HartmanFrom: Kunihiko Hayashi <[email protected]>
[ Upstream commit bc43c5ec1a97772269785d19f62d32c91ac5fc36 ]
The .supports_op() callback function returns true by default after performing driver-specific checks. Therefore the driver cannot apply the buswidth in devicetree.
Call spi_mem_default_supports_op() helper to handle the buswidth in devicetree.
--- drivers/spi/spi-sn-f-ospi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-sn-f-ospi.c +1 -1
@@ -561,7 +561,7 @@ static bool f_ospi_supports_op(struct spi_mem *mem,if (!f_ospi_supports_op_width (mem, op))return false; -return true; +return spi_mem_default_supports_op (mem, op); }static int f_ospi_adjust_op_size (struct spi_mem *mem,struct spi_mem_op *op)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 453/663 module/decompress: Never use kunmap() for local un-mappings
In reply to Greg Kroah-HartmanFrom: Fabio M. De Francesco <[email protected]>
[ Upstream commit 3c17655ab13704582fe25e8ea3200a9b2f8bf20a ]
Use kunmap_local() to unmap pages locally mapped with kmap_local_page().
kunmap_local() must be called on the kernel virtual address returned by kmap_local_page(), differently from how we use kunmap() which instead expects the mapped page as its argument.
In module_zstd_decompress() we currently map with kmap_local_page() and unmap with kunmap(). This breaks the code and so it should be fixed.
--- kernel/module/decompress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/module/decompress.c +1 -1
@@ -267,7 +267,7 @@ static ssize_t module_zstd_decompress(struct load_info *info, zstd_dec.size =PAGE_SIZE ; ret =zstd_decompress_stream (dstream, &zstd_dec, &zstd_buf); -kunmap (page); +kunmap_local (zstd_dec.dst); retval =zstd_get_error_code (ret);if (retval)break ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 454/663 usb: gadget: udc: renesas_usb3: Fix use after free bug in renesas_usb3_remove due to race condition
In reply to Greg Kroah-HartmanFrom: Zheng Wang <[email protected]>
[ Upstream commit 2b947f8769be8b8181dc795fd292d3e7120f5204 ]
In renesas_usb3_probe, role_work is bound with renesas_usb3_role_work. renesas_usb3_start will be called to start the work.
If we remove the driver which will call usbhs_remove, there may be an unfinished work. The possible sequence is as follows:
CPU0 CPU1
renesas_usb3_role_workrenesas_usb3_removeusb_role_switch_unregisterdevice_unregister
kfree(sw)
//free usb3->role_sw
usb_role_switch_set_role
//use usb3->role_swThe usb3->role_sw could be freed under such circumstance and then used in usb_role_switch_set_role.
This bug was found by static analysis. And note that removing a driver is a root-only operation, and should never happen in normal case. But the root user may directly remove the device which will also trigger the remove function.
Fix it by canceling the work before cleanup in the renesas_usb3_remove.
--- drivers/usb/gadget/udc/renesas_usb3.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/gadget/udc/renesas_usb3.c +1 -0
@@ -2596,6 +2596,7 @@ static int renesas_usb3_remove(struct platform_device *pdev)debugfs_remove_recursive (usb3->dentry);device_remove_file (&pdev->dev, &dev_attr_role); +cancel_work_sync (&usb3->role_work);usb_role_switch_unregister (usb3->role_sw);usb_del_gadget_udc (&usb3->gadget);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 455/663 ASoC: soc-compress: Inherit atomicity from DAI link for Compress FE
In reply to Greg Kroah-HartmanFrom: Daniel Baluta <[email protected]>
[ Upstream commit 37b58becc1cee4d591024f2056d7ffa99c6089e0 ]
After commit bbf7d3b1c4f40 ("ASoC: soc-pcm: align BE 'atomicity' with that of the FE") BE and FE atomicity must match.
In the case of Compress PCM there is a mismatch in atomicity between FE and BE and we get errors like this:
[ 36.434566] sai1-wm8960-hifi: dpcm_be_connect: FE is atomic but BE is nonatomic, invalid configuration [ 36.444278] PCM Deep Buffer: ASoC: can't connect SAI1.OUT
In order to fix this we must inherit the atomicity from DAI link associated with current PCM Compress FE.
--- sound/soc/soc-compress.c | 3 +++ 1 file changed, 3 insertions(+)
sound/soc/soc-compress.c +3 -0
@@ -622,6 +622,9 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)return ret; } +/* inherit atomicity from DAI link */ + be_pcm->nonatomic = rtd->dai_link->nonatomic; + rtd->pcm = be_pcm; rtd->fe_compr =1 ;if (rtd->dai_link->dpcm_playback)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 456/663 PCI: imx6: Install the fault handler only on compatible match
In reply to Greg Kroah-HartmanFrom: H. Nikolaus Schaller <[email protected]>
[ Upstream commit 5f5ac460dfe7f4e11f99de9870f240e39189cf72 ]
commit bb38919ec56e ("PCI: imx6: Add support for i.MX6 PCIe controller") added a fault hook to this driver in the probe function. So it was only installed if needed.
commit bde4a5a00e76 ("PCI: imx6: Allow probe deferral by reset GPIO") moved it from probe to driver init which installs the hook unconditionally as soon as the driver is compiled into a kernel.
When this driver is compiled as a module, the hook is not registered until after the driver has been matched with a .compatible and loaded.
commit 415b6185c541 ("PCI: imx6: Fix config read timeout handling") extended the fault handling code.
commit 2d8ed461dbc9 ("PCI: imx6: Add support for i.MX8MQ") added some protection for non-ARM architectures, but this does not protect non-i.MX ARM architectures.
Since fault handlers can be triggered on any architecture for different reasons, there is no guarantee that they will be triggered only for the assumed situation, leading to improper error handling (i.MX6-specific imx6q_pcie_abort_handler) on foreign systems.
I had seen strange L3 imprecise external abort messages several times on OMAP4 and OMAP5 devices and couldn't make sense of them until I realized they were related to this unused imx6q driver because I had CONFIG_PCI_IMX6=y.
Note that CONFIG_PCI_IMX6=y is useful for kernel binaries that are designed to run on different ARM SoC and be differentiated only by device tree binaries. So turning off CONFIG_PCI_IMX6 is not a solution.
Therefore we check the compatible in the init function before registering the fault handler.
--- drivers/pci/controller/dwc/pci-imx6.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/pci/controller/dwc/pci-imx6.c +7 -0
@@ -1402,6 +1402,13 @@ DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_SYNOPSYS, 0xabcd,static int __init imx6_pcie_init (void ) {#ifdef CONFIG_ARM +struct device_node *np; + + np =of_find_matching_node (NULL , imx6_pcie_of_match); +if (!np) +return -ENODEV ; +of_node_put (np); +/* * Since probe() can be deferred we need to make sure that * hook_fault_code is not called after __init memory is freed
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 457/663 ASoC: es8316: Handle optional IRQ assignment
In reply to Greg Kroah-HartmanFrom: Cristian Ciocaltea <[email protected]>
[ Upstream commit 39db65a0a17b54915b269d3685f253a4731f344c ]
The driver is able to work fine without relying on a mandatory interrupt being assigned to the I2C device. This is only needed when making use of the jack-detect support.
However, the following warning message is always emitted when there is no such interrupt available:
es8316 0-0011: Failed to get IRQ 0: -22
Do not attempt to request an IRQ if it is not available/valid. This also ensures the rather misleading message is not displayed anymore.
Also note the IRQ validation relies on commit dab472eb931bc291 ("i2c /
ACPI: Use 0 to indicate that device does not have interrupt assigned").
--- sound/soc/codecs/es8316.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
sound/soc/codecs/es8316.c +8 -6
@@ -842,12 +842,14 @@ static int es8316_i2c_probe(struct i2c_client *i2c_client) es8316->irq = i2c_client->irq;mutex_init (&es8316->lock); - ret =devm_request_threaded_irq (dev, es8316->irq,NULL , es8316_irq, -IRQF_TRIGGER_HIGH |IRQF_ONESHOT |IRQF_NO_AUTOEN , -"es8316" , es8316); -if (ret) { -dev_warn (dev,"Failed to get IRQ %d: %d\n" , es8316->irq, ret); - es8316->irq = -ENXIO ; +if (es8316->irq >0 ) { + ret =devm_request_threaded_irq (dev, es8316->irq,NULL , es8316_irq, +IRQF_TRIGGER_HIGH |IRQF_ONESHOT |IRQF_NO_AUTOEN , +"es8316" , es8316); +if (ret) { +dev_warn (dev,"Failed to get IRQ %d: %d\n" , es8316->irq, ret); + es8316->irq = -ENXIO ; + } } return devm_snd_soc_register_component(&i2c_client->dev,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 458/663 linux/vt_buffer.h: allow either builtin or modular for macros
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 2b76ffe81e32afd6d318dc4547e2ba8c46207b77 ]
Fix build errors on ARCH=alpha when CONFIG_MDA_CONSOLE=m. This allows the ARCH macros to be the only ones defined.
In file included from ../drivers/video/console/mdacon.c:37:../arch/alpha/include/asm/vga.h:17:40: error: expected identifier or '(' before 'volatile'
17 | static inline void scr_writew(u16 val, volatile u16 *addr)
| ^~~~~~~~../include/linux/vt_buffer.h:24:34: note: in definition of macro 'scr_writew'
24 | #define scr_writew(val, addr) (*(addr) = (val))
| ^~~~../include/linux/vt_buffer.h:24:40: error: expected ')' before '=' token
24 | #define scr_writew(val, addr) (*(addr) = (val))
| ^../arch/alpha/include/asm/vga.h:17:20: note: in expansion of macro 'scr_writew'
17 | static inline void scr_writew(u16 val, volatile u16 *addr)
| ^~~~~~~~~~
../arch/alpha/include/asm/vga.h:25:29: error: expected identifier or '(' before 'volatile'
25 | static inline u16 scr_readw(volatile const u16 *addr)
| ^~~~~~~~
--- include/linux/vt_buffer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/vt_buffer.h +1 -1
@@ -16,7 +16,7 @@#include <linux/string.h> -#if defined(CONFIG_VGA_CONSOLE ) || defined(CONFIG_MDA_CONSOLE ) +#if IS_ENABLED (CONFIG_VGA_CONSOLE ) ||IS_ENABLED (CONFIG_MDA_CONSOLE )#include <asm/vga.h> #endif
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 459/663 spi: qup: Dont skip cleanup in removes error path
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 61f49171a43ab1f80c73c5c88c508770c461e0f2 ]
Returning early in a platform driver's remove callback is wrong. In this case the dma resources are not released in the error path. this is never retried later and so this is a permanent leak. To fix this, only skip hardware disabling if waking the device fails.
--- drivers/spi/spi-qup.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
drivers/spi/spi-qup.c +13 -9
@@ -1277,18 +1277,22 @@ static int spi_qup_remove(struct platform_device *pdev)struct spi_qup *controller =spi_master_get_devdata (master);int ret; - ret =pm_runtime_resume_and_get (&pdev->dev); -if (ret <0 ) -return ret; + ret =pm_runtime_get_sync (&pdev->dev); - ret =spi_qup_set_state (controller,QUP_STATE_RESET ); -if (ret) -return ret; +if (ret >=0 ) { + ret =spi_qup_set_state (controller,QUP_STATE_RESET ); +if (ret) +dev_warn (&pdev->dev,"failed to reset controller (%pe)\n" , +ERR_PTR (ret)); -spi_qup_release_dma (master); +clk_disable_unprepare (controller->cclk); +clk_disable_unprepare (controller->iclk); + }else { +dev_warn (&pdev->dev,"failed to resume, skip hw disable (%pe)\n" , +ERR_PTR (ret)); + } -clk_disable_unprepare (controller->cclk); -clk_disable_unprepare (controller->iclk); +spi_qup_release_dma (master);pm_runtime_put_noidle (&pdev->dev);pm_runtime_disable (&pdev->dev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 460/663 interconnect: qcom: rpm: drop bogus pm domain attach
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
[ Upstream commit 72b2720c18ecde92e6a36c4ac897dd5848e3f379 ]
Any power domain would already have been attached by the platform bus code so drop the bogus power domain attach which always succeeds from probe.
This effectively reverts commit 7de109c0abe9 ("interconnect: icc-rpm:
Add support for bus power domain").
--- drivers/interconnect/qcom/icc-rpm.c | 7 ------- drivers/interconnect/qcom/icc-rpm.h | 1 - drivers/interconnect/qcom/msm8996.c | 1 - 3 files changed, 9 deletions(-)
drivers/interconnect/qcom/icc-rpm.c +0 -7
@@ -11,7 +11,6 @@#include <linux/of_device.h> #include <linux/of_platform.h> #include <linux/platform_device.h> -#include <linux/pm_domain.h> #include <linux/regmap.h> #include <linux/slab.h>
@@ -496,12 +495,6 @@ int qnoc_probe(struct platform_device *pdev)if (ret)return ret; -if (desc->has_bus_pd) { - ret =dev_pm_domain_attach (dev, true); -if (ret) -return ret; - } - provider = &qp->provider; provider->dev = dev; provider->set = qcom_icc_set;
drivers/interconnect/qcom/icc-rpm.h +0 -1
@@ -91,7 +91,6 @@ struct qcom_icc_desc {size_t num_nodes;const char *const *clocks;size_t num_clocks; -bool has_bus_pd;enum qcom_icc_type type;const struct regmap_config *regmap_cfg;unsigned int qos_offset;
drivers/interconnect/qcom/msm8996.c +0 -1
@@ -1823,7 +1823,6 @@ static const struct qcom_icc_desc msm8996_a0noc = { .num_nodes = ARRAY_SIZE(a0noc_nodes), .clocks = bus_a0noc_clocks, .num_clocks = ARRAY_SIZE(bus_a0noc_clocks), - .has_bus_pd = true, .regmap_cfg = &msm8996_a0noc_regmap_config };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 461/663 spi: mchp-pci1xxxx: Fix length of SPI transactions not set properly in driver
In reply to Greg Kroah-HartmanFrom: Tharun Kumar P <[email protected]>
[ Upstream commit 35c8c5e503a82e0a4bf251d32096211eba8c2be6 ]
In pci1xxxx_spi_transfer_one API, length of SPI transaction gets cleared by setting of length mask. Set length of transaction only after masking length field.
--- drivers/spi/spi-pci1xxxx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/spi/spi-pci1xxxx.c +2 -1
@@ -199,8 +199,9 @@ static int pci1xxxx_spi_transfer_one(struct spi_controller *spi_ctlr,else regval &= ~SPI_MST_CTL_MODE_SEL ; - regval |= ((clkdiv <<5 ) |SPI_FORCE_CE | (len <<8 )); + regval |= ((clkdiv <<5 ) |SPI_FORCE_CE ); regval &= ~SPI_MST_CTL_CMD_LEN_MASK ; + regval |= (len <<8 );writel (regval, par->reg_base +SPI_MST_CTL_REG_OFFSET (p->hw_inst)); regval = readl(par->reg_base +
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 462/663 spi: mchp-pci1xxxx: Fix SPI transactions not working after suspend and resume
In reply to Greg Kroah-HartmanFrom: Tharun Kumar P <[email protected]>
[ Upstream commit 4266d21669de62cf3fb6774f7d404c1eb95a5ab3 ]
pci1xxxx_spi_resume API masks SPI interrupt bit which prohibits interrupt from coming to the host at the end of the transaction after suspend-resume. This patch unmasks this bit at resume.
--- drivers/spi/spi-pci1xxxx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-pci1xxxx.c +1 -1
@@ -58,7 +58,7 @@#define VENDOR_ID_MCHP 0x1055#define SPI_SUSPEND_CONFIG 0x101 -#define SPI_RESUME_CONFIG 0x303 +#define SPI_RESUME_CONFIG 0x203struct pci1xxxx_spi_internal {u8 hw_inst;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 463/663 spi: fsl-spi: Fix CPM/QE mode Litte Endian
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
[ Upstream commit c20c57d9868d7f9fd1b2904c7801b07e128f6322 ]
CPM has the same problem as QE so for CPM also use the fix added by commit 0398fb70940e ("spi/spi_mpc8xxx: Fix QE mode Litte Endian"):
CPM mode uses Little Endian so words > 8 bits are byte swapped. Workaround this by always enforcing wordsize 8 for 16 and 32 bits words. Unfortunately this will not work for LSB transfers where wordsize is > 8 bits so disable these for now.
Also limit the workaround to 16 and 32 bits words because it can only work for multiples of 8-bits.
--- drivers/spi/spi-fsl-spi.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/spi/spi-fsl-spi.c +7 -5
@@ -181,8 +181,8 @@ static int mspi_apply_qe_mode_quirks(struct spi_mpc8xxx_cs *cs,struct spi_device *spi, int bits_per_word) { -/* QE uses Little Endian for words > 8 -* so transform all words > 8 into 8 bits +/* CPM/QE uses Little Endian for words > 8 +* so transform 16 and 32 bits words into 8 bits * Unfortnatly that doesn't work for LSB so * reject these for now */ /* Note: 32 bits word, LSB works iff
@@ -190,9 +190,11 @@ static int mspi_apply_qe_mode_quirks(struct spi_mpc8xxx_cs *cs,if (spi->mode &SPI_LSB_FIRST && bits_per_word >8 )return -EINVAL ; -if (bits_per_word >8 ) +if (bits_per_word <=8 ) +return bits_per_word; +if (bits_per_word ==16 || bits_per_word ==32 )return 8 ;/* pretend its 8 bits */ -return bits_per_word; +return -EINVAL ; } static int fsl_spi_setup_transfer(struct spi_device *spi,
@@ -222,7 +224,7 @@ static int fsl_spi_setup_transfer(struct spi_device *spi, bits_per_word =mspi_apply_cpu_mode_quirks (cs, spi, mpc8xxx_spi, bits_per_word); - else if (mpc8xxx_spi->flags & SPI_QE) + else bits_per_word =mspi_apply_qe_mode_quirks (cs, spi, bits_per_word);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 464/663 vmci_host: fix a race condition in vmci_host_poll() causing GPF
In reply to Greg Kroah-HartmanFrom: Dae R. Jeong <[email protected]>
[ Upstream commit ae13381da5ff0e8e084c0323c3cc0a945e43e9c7 ]
During fuzzing, a general protection fault is observed in vmci_host_poll().
general protection fault, probably for non-canonical address 0xdffffc0000000019: 0000 [#1] PREEMPT SMP KASAN KASAN: null-ptr-deref in range [0x00000000000000c8-0x00000000000000cf] RIP: 0010:__lock_acquire+0xf3/0x5e00 kernel/locking/lockdep.c:4926 <- omitting registers -> Call Trace: <TASK> lock_acquire+0x1a4/0x4a0 kernel/locking/lockdep.c:5672 __raw_spin_lock_irqsave include/linux/spinlock_api_smp.h:110 [inline] _raw_spin_lock_irqsave+0xb3/0x100 kernel/locking/spinlock.c:162 add_wait_queue+0x3d/0x260 kernel/sched/wait.c:22 poll_wait include/linux/poll.h:49 [inline] vmci_host_poll+0xf8/0x2b0 drivers/misc/vmw_vmci/vmci_host.c:174 vfs_poll include/linux/poll.h:88 [inline] do_pollfd fs/select.c:873 [inline] do_poll fs/select.c:921 [inline] do_sys_poll+0xc7c/0x1aa0 fs/select.c:1015 __do_sys_ppoll fs/select.c:1121 [inline] __se_sys_ppoll+0x2cc/0x330 fs/select.c:1101 do_syscall_x64 arch/x86/entry/common.c:51 [inline] do_syscall_64+0x4e/0xa0 arch/x86/entry/common.c:82 entry_SYSCALL_64_after_hwframe+0x46/0xb0
Example thread interleaving that causes the general protection fault is as follows:
CPU1 (vmci_host_poll) CPU2 (vmci_host_do_init_context)
----- -----
// Read uninitialized context
context = vmci_host_dev->context;
// Initialize context
vmci_host_dev->context = vmci_ctx_create();
vmci_host_dev->ct_type = VMCIOBJ_CONTEXT;if (vmci_host_dev->ct_type == VMCIOBJ_CONTEXT) {
// Dereferencing the wrong pointer
poll_wait(..., &context->host_context);
}In this scenario, vmci_host_poll() reads vmci_host_dev->context first, and then reads vmci_host_dev->ct_type to check that vmci_host_dev->context is initialized. However, since these two reads are not atomically executed, there is a chance of a race condition as described above.
To fix this race condition, read vmci_host_dev->context after checking the value of vmci_host_dev->ct_type so that vmci_host_poll() always reads an initialized context.
--- drivers/misc/vmw_vmci/vmci_host.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/misc/vmw_vmci/vmci_host.c +7 -1
@@ -165,10 +165,16 @@ static int vmci_host_close(struct inode *inode, struct file *filp)static __poll_t vmci_host_poll (struct file *filp,poll_table *wait) {struct vmci_host_dev *vmci_host_dev = filp->private_data; -struct vmci_ctx *context = vmci_host_dev->context; +struct vmci_ctx *context;__poll_t mask =0 ;if (vmci_host_dev->ct_type ==VMCIOBJ_CONTEXT ) { +/* +* Read context only if ct_type == VMCIOBJ_CONTEXT to make +* sure that context is initialized +*/ + context = vmci_host_dev->context; +/* Check for VMCI calls to this VM context. */ if (wait) poll_wait(filp, &context->host_context.wait_queue,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 465/663 of: Fix modalias string generation
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
[ Upstream commit b19a4266c52de78496fe40f0b37580a3b762e67d ]
The helper generating an OF based modalias (of_device_get_modalias()) works fine, but due to the use of snprintf() internally it needs a buffer one byte longer than what should be needed just for the entire string (excluding the '\0'). Most users of this helper are sysfs hooks providing the modalias string to users. They all provide a PAGE_SIZE buffer which is way above the number of bytes required to fit the modalias string and hence do not suffer from this issue.
There is another user though, of_device_request_module(), which is only called by drivers/usb/common/ulpi.c. This request module function is faulty, but maybe because in most cases there is an alternative, ULPI driver users have not noticed it.
In this function, of_device_get_modalias() is called twice. The first time without buffer just to get the number of bytes required by the modalias string (excluding the null byte), and a second time, after buffer allocation, to fill the buffer. The allocation asks for an additional byte, in order to store the trailing '\0'. However, the buffer *length* provided to of_device_get_modalias() excludes this extra byte. The internal use of snprintf() with a length that is exactly the number of bytes to be written has the effect of using the last available byte to store a '\0', which then smashes the last character of the modalias string.
Provide the actual size of the buffer to of_device_get_modalias() to fix this issue.
Note: the "str[size - 1] = '\0';" line is not really needed as snprintf will anyway end the string with a null byte, but there is a possibility that this function might be called on a struct device_node without compatible, in this case snprintf() would not be executed. So we keep it just to avoid possible unbounded strings.
--- drivers/of/device.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/of/device.c +5 -2
@@ -297,12 +297,15 @@ int of_device_request_module(struct device *dev)if (size <0 )return size; - str =kmalloc (size +1 ,GFP_KERNEL ); +/* Reserve an additional byte for the trailing '\0' */ + size++; + + str =kmalloc (size,GFP_KERNEL );if (!str)return -ENOMEM ;of_device_get_modalias (dev, str, size); - str[size] ='\0' ; + str[size -1 ] ='\0' ; ret =request_module (str);kfree (str);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 466/663 PCI/EDR: Clear Device Status after EDR error recovery
In reply to Greg Kroah-HartmanFrom: Kuppuswamy Sathyanarayanan <[email protected]>
[ Upstream commit c441b1e03da6c680a3e12da59c554f454f2ccf5e ]
During EDR recovery, the OS must clear error status of the port that triggered DPC even if firmware retains control of DPC and AER (see the implementation note in the PCI Firmware spec r3.3, sec 4.6.12).
Prior to 068c29a248b6 ("PCI/ERR: Clear PCIe Device Status errors only if OS owns AER"), the port Device Status was cleared in this path:
edr_handle_event
dpc_process_error(dev) # "dev" triggered DPC
pcie_do_recovery(dev, dpc_reset_link)
dpc_reset_link # exit DPC
pcie_clear_device_status(dev) # clear Device Status
After 068c29a248b6, pcie_do_recovery() no longer clears Device Status when firmware controls AER, so the error bit remains set even after recovery.
Per the "Downstream Port Containment configuration control" bit in the returned _OSC Control Field (sec 4.5.1), the OS is allowed to clear error status until it evaluates _OST, so clear Device Status in edr_handle_event() if the error recovery was successful.
--- drivers/pci/pcie/edr.c | 1 + 1 file changed, 1 insertion(+)
drivers/pci/pcie/edr.c +1 -0
@@ -193,6 +193,7 @@ static void edr_handle_event(acpi_handle handle, u32 event, void *data)*/ if (estate ==PCI_ERS_RESULT_RECOVERED ) {pci_dbg (edev,"DPC port successfully recovered\n" ); +pcie_clear_device_status (edev);acpi_send_edr_status (pdev, edev,EDR_OST_SUCCESS ); }else {pci_dbg (edev,"DPC port recovery failed\n" );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 467/663 ia64: mm/contig: fix section mismatch warning/error
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 58deeb4ef3b054498747d0929d94ac53ab90981f ]
alloc_per_cpu_data() is called by find_memory(), which is marked as __init. Therefore alloc_per_cpu_data() can also be marked as __init to remedy this modpost problem.
WARNING: modpost: vmlinux.o: section mismatch in reference: alloc_per_cpu_data (section: .text) -> memblock_alloc_try_nid (section: .init.text)
--- arch/ia64/mm/contig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/ia64/mm/contig.c +1 -1
@@ -77,7 +77,7 @@ void *per_cpu_init(void)return __per_cpu_start + __per_cpu_offset[smp_processor_id ()]; } -static inline void +static inline __init void alloc_per_cpu_data (void ) {size_t size =PERCPU_PAGE_SIZE *num_possible_cpus ();
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 468/663 ia64: salinfo: placate defined-but-not-used warning
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 0de155752b152d6bcd96b5b5bf20af336abd183a ]
When CONFIG_PROC_FS is not set, proc_salinfo_show() is not used. Mark the function as __maybe_unused to quieten the warning message.
../arch/ia64/kernel/salinfo.c:584:12: warning: 'proc_salinfo_show' defined but not used [-Wunused-function]
584 | static int proc_salinfo_show(struct seq_file *m, void *v)
| ^~~~~~~~~~~~~~~~~
--- arch/ia64/kernel/salinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/ia64/kernel/salinfo.c +1 -1
@@ -581,7 +581,7 @@ static int salinfo_cpu_pre_down(unsigned int cpu)* 'data' contains an integer that corresponds to the feature we're * testing */ -static int proc_salinfo_show (struct seq_file *m,void *v) +static int __maybe_unused proc_salinfo_show (struct seq_file *m,void *v) {unsigned long data = (unsigned long )v;seq_puts (m, (sal_platform_features & data) ?"1\n" :"0\n" );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 469/663 scripts/gdb: bail early if there are no clocks
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
[ Upstream commit 1d7adbc74c009057ed9dc3112f388e91a9c79acc ]
Avoid generating an exception if there are no clocks registered:
(gdb) lx-clk-summary
enable prepare protect
clock count count count rate
------------------------------------------------------------------------
Python Exception <class 'gdb.error'>: No symbol "clk_root_list" in current context.
Error occurred in Python: No symbol "clk_root_list" in current context.
--- scripts/gdb/linux/clk.py | 2 ++ 1 file changed, 2 insertions(+)
scripts/gdb/linux/clk.py +2 -0
@@ -41,6 +41,8 @@ are cached and potentially out of date""" self.show_subtree(child, level + 1) def invoke(self, arg, from_tty): + if utils.gdb_eval_or_none("clk_root_list") is None: + raise gdb.GdbError("No clocks registered") gdb.write(" enable prepare protect \n") gdb.write(" clock count count count rate \n") gdb.write("------------------------------------------------------------------------\n")
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 470/663 scripts/gdb: bail early if there are no generic PD
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
[ Upstream commit f19c3c2959e465209ade1a7a699e6cbf4359ce78 ]
Avoid generating an exception if there are no generic power domain(s) registered:
(gdb) lx-genpd-summary
domain status children
/device runtime status
----------------------------------------------------------------------
Python Exception <class 'gdb.error'>: No symbol "gpd_list" in current context. Error occurred in Python: No symbol "gpd_list" in current context. (gdb) quit
--- scripts/gdb/linux/genpd.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
scripts/gdb/linux/genpd.py +3 -1
@@ -5,7 +5,7 @@ import gdb import sys -from linux.utils import CachedType +from linux.utils import CachedType, gdb_eval_or_none from linux.lists import list_for_each_entry generic_pm_domain_type = CachedType('struct generic_pm_domain')
@@ -70,6 +70,8 @@ Output is similar to /sys/kernel/debug/pm_genpd/pm_genpd_summary''' gdb.write(' %-50s %s\n' % (kobj_path, rtpm_status_str(dev))) def invoke(self, arg, from_tty): + if gdb_eval_or_none("&gpd_list") is None: + raise gdb.GdbError("No power domain(s) registered") gdb.write('domain status children\n'); gdb.write(' /device runtime status\n'); gdb.write('----------------------------------------------------------------------\n');
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 471/663 HID: amd_sfh: Correct the structure fields
In reply to Greg Kroah-HartmanFrom: Basavaraj Natikar <[email protected]>
[ Upstream commit 7e7fdab79899f62de39c9280fb78f3d3b02ac207 ]
Misinterpreted sfh_cmd_base structure member fields. Therefore, adjust the structure member fields accordingly to reflect functionality.
--- drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_interface.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_interface.h +3 -3
@@ -33,9 +33,9 @@ struct sfh_cmd_base {struct {u32 sensor_id :4 ;u32 cmd_id :4 ; -u32 sub_cmd_id :6 ; -u32 length :12 ; -u32 rsvd :5 ; +u32 sub_cmd_id :8 ; +u32 sub_cmd_value :12 ; +u32 rsvd :3 ;u32 intr_disable :1 ; } cmd; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 472/663 HID: amd_sfh: Correct the sensor enable and disable command
In reply to Greg Kroah-HartmanFrom: Basavaraj Natikar <[email protected]>
[ Upstream commit 0b9255bf11baa61cd526e6bd24d6c8e6d1eabf8d ]
In order to start or stop sensors, the firmware command needs to be changed to add an additional default subcommand value. For this reason, add a subcommand value to enable or disable sensors accordingly.
--- drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_interface.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_interface.c +2 -0
@@ -33,6 +33,7 @@ static void amd_start_sensor(struct amd_mp2_dev *privdata, struct amd_mp2_sensor cmd_base.ul =0 ; cmd_base.cmd.cmd_id =ENABLE_SENSOR ; cmd_base.cmd.intr_disable =0 ; + cmd_base.cmd.sub_cmd_value =1 ; cmd_base.cmd.sensor_id = info.sensor_idx;writel (cmd_base.ul, privdata->mmio +AMD_C2P_MSG (0 ));
@@ -45,6 +46,7 @@ static void amd_stop_sensor(struct amd_mp2_dev *privdata, u16 sensor_idx) cmd_base.ul =0 ; cmd_base.cmd.cmd_id =DISABLE_SENSOR ; cmd_base.cmd.intr_disable =0 ; + cmd_base.cmd.sub_cmd_value =1 ; cmd_base.cmd.sensor_id = sensor_idx;writeq (0x0 , privdata->mmio +AMD_C2P_MSG (1 ));
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 473/663 HID: amd_sfh: Fix illuminance value
In reply to Greg Kroah-HartmanFrom: Basavaraj Natikar <[email protected]>
[ Upstream commit a33e5e393171ae8384d3381db5cd159ba877cfcb ]
Illuminance value is actually 32 bits, but is incorrectly trancated to 16 bits. Hence convert to integer illuminace accordingly to reflect correct values.
--- drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_desc.c | 2 +- drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_interface.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_desc.c +1 -1
@@ -218,7 +218,7 @@ static u8 get_input_rep(u8 current_index, int sensor_idx, int report_id,OFFSET_SENSOR_DATA_DEFAULT ;memcpy_fromio (&als_data, sensoraddr,sizeof (struct sfh_als_data ));get_common_inputs (&als_input.common_property, report_id); - als_input.illuminance_value = als_data.lux; + als_input.illuminance_value =float_to_int (als_data.lux); report_size =sizeof (als_input);memcpy (input_report, &als_input,sizeof (als_input));break ;
drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_interface.h +1 -1
@@ -133,7 +133,7 @@ struct sfh_mag_data {struct sfh_als_data {struct sfh_common_data commondata; -u16 lux; +u32 lux; };struct hpd_status {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 474/663 HID: amd_sfh: Add support for shutdown operation
In reply to Greg Kroah-HartmanFrom: Basavaraj Natikar <[email protected]>
[ Upstream commit 1353ecaf1830d6d1b74f3225378a9498b4e14fdd ]
As soon as the system is booted after shutdown, the sensors may remain in a weird state and fail to initialize. Therefore, all sensors should be turned off during shutdown.
--- drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/hid/amd-sfh-hid/amd_sfh_pcie.c +9 -0
@@ -367,6 +367,14 @@ static int amd_mp2_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ireturn devm_add_action_or_reset (&pdev->dev, privdata->mp2_ops->remove, privdata); } +static void amd_sfh_shutdown (struct pci_dev *pdev) +{ +struct amd_mp2_dev *mp2 =pci_get_drvdata (pdev); + +if (mp2 && mp2->mp2_ops) + mp2->mp2_ops->stop_all (mp2); +} +static int __maybe_unused amd_mp2_pci_resume (struct device *dev) {struct amd_mp2_dev *mp2 =dev_get_drvdata (dev);
@@ -401,6 +409,7 @@ static struct pci_driver amd_mp2_pci_driver = { .id_table = amd_mp2_pci_tbl, .probe = amd_mp2_pci_probe, .driver.pm = &amd_mp2_pm_ops, + .shutdown = amd_sfh_shutdown, };module_pci_driver (amd_mp2_pci_driver);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 475/663 HID: amd_sfh: Correct the stop all command
In reply to Greg Kroah-HartmanFrom: Basavaraj Natikar <[email protected]>
[ Upstream commit 82c2a0d137794f5ef47982231593a00aee26ce3b ]
Misinterpreted the stop all command in SHF1.1 firmware. Therefore, it is necessary to update the stop all command accordingly to disable all sensors.
--- drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_interface.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_interface.c +3 -1
@@ -58,8 +58,10 @@ static void amd_stop_all_sensor(struct amd_mp2_dev *privdata)struct sfh_cmd_base cmd_base; cmd_base.ul =0 ; - cmd_base.cmd.cmd_id =STOP_ALL_SENSORS ; + cmd_base.cmd.cmd_id =DISABLE_SENSOR ; cmd_base.cmd.intr_disable =0 ; +/* 0xf indicates all sensors */ + cmd_base.cmd.sensor_id =0xf ;writel (cmd_base.ul, privdata->mmio +AMD_C2P_MSG (0 )); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 476/663 HID: amd_sfh: Increase sensor command timeout for SFH1.1
In reply to Greg Kroah-HartmanFrom: Basavaraj Natikar <[email protected]>
[ Upstream commit 571dc8f59dd477037bb5a029e8d1b5a4a4d9dd63 ]
The initialization of SFH1.1 sensors may take some time. Hence, increase sensor command timeouts in order to obtain status responses within a maximum timeout.
--- drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_interface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_interface.c +2 -2
@@ -16,11 +16,11 @@ static int amd_sfh_wait_response(struct amd_mp2_dev *mp2, u8 sid, u32 cmd_id) {struct sfh_cmd_response cmd_resp; -/* Get response with status within a max of 1600 ms timeout */ +/* Get response with status within a max of 10000 ms timeout */ if (!readl_poll_timeout (mp2->mmio +AMD_P2C_MSG (0 ), cmd_resp.resp, (cmd_resp.response.response ==0 && cmd_resp.response.cmd_id == cmd_id && (sid ==0xff || - cmd_resp.response.sensor_id == sid)),500 ,1600000 )) + cmd_resp.response.sensor_id == sid)),500 ,10000000 ))return cmd_resp.response.response;return -1 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 477/663 HID: amd_sfh: Handle "no sensors" enabled for SFH1.1
In reply to Greg Kroah-HartmanFrom: Basavaraj Natikar <[email protected]>
[ Upstream commit 8455cbb25927013b3417ab619dced1c0e87708af ]
Based on num_hid_devices, each sensor device is initialized. If "no sensors" is initialized, amd_sfh work initialization and scheduling doesn’t make sense and returns EOPNOTSUPP to stop driver probe. Hence, add a check for "no sensors" enabled to handle the special case.
--- drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c +11 -0
@@ -112,6 +112,7 @@ static int amd_sfh1_1_hid_client_init(struct amd_mp2_dev *privdata) cl_data->num_hid_devices =amd_sfh_get_sensor_num (privdata, &cl_data->sensor_idx[0 ]);if (cl_data->num_hid_devices ==0 )return -ENODEV ; + cl_data->is_any_sensor_enabled = false;INIT_DELAYED_WORK (&cl_data->work, amd_sfh_work);INIT_DELAYED_WORK (&cl_data->work_buffer, amd_sfh_work_buffer);
@@ -170,6 +171,7 @@ static int amd_sfh1_1_hid_client_init(struct amd_mp2_dev *privdata) status = (status ==0 ) ?SENSOR_ENABLED :SENSOR_DISABLED ;if (status ==SENSOR_ENABLED ) { + cl_data->is_any_sensor_enabled = true; cl_data->sensor_sts[i] =SENSOR_ENABLED ; rc =amdtp_hid_probe (i, cl_data);if (rc) {
@@ -186,12 +188,21 @@ static int amd_sfh1_1_hid_client_init(struct amd_mp2_dev *privdata) cl_data->sensor_sts[i]); goto cleanup; } + }else { + cl_data->sensor_sts[i] =SENSOR_DISABLED ; }dev_dbg (dev,"sid 0x%x (%s) status 0x%x\n" , cl_data->sensor_idx[i],get_sensor_name (cl_data->sensor_idx[i]), cl_data->sensor_sts[i]); } +if (!cl_data->is_any_sensor_enabled) { +dev_warn (dev,"Failed to discover, sensors not enabled is %d\n" , + cl_data->is_any_sensor_enabled); + rc = -EOPNOTSUPP ; + goto cleanup; + } +schedule_delayed_work (&cl_data->work_buffer,msecs_to_jiffies (AMD_SFH_IDLE_LOOP ));return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 478/663 cacheinfo: Check sib_leaf in cache_leaves_are_shared()
In reply to Greg Kroah-HartmanFrom: Pierre Gondois <[email protected]>
[ Upstream commit 7a306e3eabf2b2fd8cffa69b87b32dbf814d79ce ]
If there is no ACPI/DT information, it is assumed that L1 caches are private and L2 (and higher) caches are shared. A cache is 'shared' between two CPUs if it is accessible from these two CPUs.
Each CPU owns a representation (i.e. has a dedicated cacheinfo struct) of the caches it has access to. cache_leaves_are_shared() tries to identify whether two representations are designating the same actual cache.
In cache_leaves_are_shared(), if 'this_leaf' is a L2 cache (or higher) and 'sib_leaf' is a L1 cache, the caches are detected as shared as only this_leaf's cache level is checked.
This is leads to setting sib_leaf as being shared with another CPU, which is incorrect as this is a L1 cache.
Check 'sib_leaf->level'. Also update the comment as the function is called when populating 'shared_cpu_map'.
--- drivers/base/cacheinfo.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/base/cacheinfo.c +2 -3
@@ -38,11 +38,10 @@ static inline bool cache_leaves_are_shared(struct cacheinfo *this_leaf, {/* * For non DT/ACPI systems, assume unique level 1 caches, -* system-wide shared caches for all other levels. This will be used -* only if arch specific code has not populated shared_cpu_map +* system-wide shared caches for all other levels. */ if (!(IS_ENABLED (CONFIG_OF ) ||IS_ENABLED (CONFIG_ACPI ))) -return !(this_leaf->level ==1 ); +return (this_leaf->level !=1 ) && (sib_leaf->level !=1 );if ((sib_leaf->attributes &CACHE_ID ) && (this_leaf->attributes &CACHE_ID ))
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 479/663 coresight: etm_pmu: Set the module field
In reply to Greg Kroah-HartmanFrom: Suzuki K Poulose <[email protected]>
[ Upstream commit 18996a113f2567aef3057e300e3193ce2df1684c ]
struct pmu::module must be set to the module owning the PMU driver. Set this for the coresight etm_pmu.
--- drivers/hwtracing/coresight/coresight-etm-perf.c | 1 + 1 file changed, 1 insertion(+)
drivers/hwtracing/coresight/coresight-etm-perf.c +1 -0
@@ -870,6 +870,7 @@ int __init etm_perf_init(void) etm_pmu.addr_filters_sync = etm_addr_filters_sync; etm_pmu.addr_filters_validate = etm_addr_filters_validate; etm_pmu.nr_addr_filters =ETM_ADDR_CMP_MAX ; + etm_pmu.module =THIS_MODULE ; ret =perf_pmu_register (&etm_pmu,CORESIGHT_ETM_PMU_NAME ,-1 );if (ret ==0 )
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 480/663 drm/panel: novatek-nt35950: Improve error handling
In reply to Greg Kroah-HartmanFrom: Konrad Dybcio <[email protected]>
[ Upstream commit 5dd45b66742a1f3cfa9a92dc0ac8714c7708ee6c ]
In a very peculiar case when probing and registering with the secondary DSI host succeeds, but the OF backlight or DSI attachment fails, the primary DSI device is automatically cleaned up, but the secondary one is not, leading to -EEXIST when the driver core tries to handle -EPROBE_DEFER.
Unregister the DSI1 device manually on failure to prevent that.
--- drivers/gpu/drm/panel/panel-novatek-nt35950.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/panel/panel-novatek-nt35950.c +7 -1
@@ -593,8 +593,11 @@ static int nt35950_probe(struct mipi_dsi_device *dsi) DRM_MODE_CONNECTOR_DSI); ret =drm_panel_of_backlight (&nt->panel); -if (ret) +if (ret) { +mipi_dsi_device_unregister (nt->dsi[1 ]); +return dev_err_probe (dev, ret,"Failed to get backlight\n" ); + }drm_panel_add (&nt->panel);
@@ -610,6 +613,9 @@ static int nt35950_probe(struct mipi_dsi_device *dsi) ret =mipi_dsi_attach (nt->dsi[i]);if (ret <0 ) { +/* If we fail to attach to either host, we're done */ +mipi_dsi_device_unregister (nt->dsi[1 ]); +return dev_err_probe (dev, ret,"Cannot attach to DSI%d host.\n" , i); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 481/663 ASoC: fsl_mqs: move of_node_put() to the correct location
In reply to Greg Kroah-HartmanFrom: Liliang Ye <[email protected]>
[ Upstream commit 1c34890273a020d61d6127ade3f68ed1cb21c16a ]
of_node_put() should have been done directly after mqs_priv->regmap = syscon_node_to_regmap(gpr_np); otherwise it creates a reference leak on the success path.
To fix this, of_node_put() is moved to the correct location, and change all the gotos to direct returns.
--- sound/soc/fsl/fsl_mqs.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
sound/soc/fsl/fsl_mqs.c +5 -10
@@ -210,10 +210,10 @@ static int fsl_mqs_probe(struct platform_device *pdev) } mqs_priv->regmap =syscon_node_to_regmap (gpr_np); +of_node_put (gpr_np);if (IS_ERR (mqs_priv->regmap)) {dev_err (&pdev->dev,"failed to get gpr regmap\n" ); - ret =PTR_ERR (mqs_priv->regmap); - goto err_free_gpr_np; +return PTR_ERR (mqs_priv->regmap); } }else { regs =devm_platform_ioremap_resource (pdev,0 );
@@ -242,8 +242,7 @@ static int fsl_mqs_probe(struct platform_device *pdev)if (IS_ERR (mqs_priv->mclk)) {dev_err (&pdev->dev,"failed to get the clock: %ld\n" ,PTR_ERR (mqs_priv->mclk)); - ret =PTR_ERR (mqs_priv->mclk); - goto err_free_gpr_np; +return PTR_ERR (mqs_priv->mclk); }dev_set_drvdata (&pdev->dev, mqs_priv);
@@ -252,13 +251,9 @@ static int fsl_mqs_probe(struct platform_device *pdev) ret =devm_snd_soc_register_component (&pdev->dev, &soc_codec_fsl_mqs, &fsl_mqs_dai,1 );if (ret) - goto err_free_gpr_np; -return 0 ; - -err_free_gpr_np: -of_node_put (gpr_np); +return ret; -return ret; +return 0 ; }static int fsl_mqs_remove (struct platform_device *pdev)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 482/663 PCI/PM: Extend D3hot delay for NVIDIA HDA controllers
In reply to Greg Kroah-HartmanFrom: Alex Williamson <[email protected]>
[ Upstream commit a5a6dd2624698b6e3045c3a1450874d8c790d5d9 ]
Assignment of NVIDIA Ampere-based GPUs have seen a regression since the below referenced commit, where the reduced D3hot transition delay appears to introduce a small window where a D3hot->D0 transition followed by a bus reset can wedge the device. The entire device is subsequently unavailable, returning -1 on config space read and is unrecoverable without a host reset.
This has been observed with RTX A2000 and A5000 GPU and audio functions assigned to a Windows VM, where shutdown of the VM places the devices in D3hot prior to vfio-pci performing a bus reset when userspace releases the devices. The issue has roughly a 2-3% chance of occurring per shutdown.
Restoring the HDA controller d3hot_delay to the effective value before the below commit has been shown to resolve the issue. NVIDIA confirms this change should be safe for all of their HDA controllers.
--- drivers/pci/quirks.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/pci/quirks.c +13 -0
@@ -1939,6 +1939,19 @@ static void quirk_radeon_pm(struct pci_dev *dev) }DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_ATI ,0x6741 , quirk_radeon_pm); +/* +* NVIDIA Ampere-based HDA controllers can wedge the whole device if a bus +* reset is performed too soon after transition to D0, extend d3hot_delay +* to previous effective default for all NVIDIA HDA controllers. +*/ +static void quirk_nvidia_hda_pm (struct pci_dev *dev) +{ +quirk_d3hot_delay (dev,20 ); +} +DECLARE_PCI_FIXUP_CLASS_FINAL (PCI_VENDOR_ID_NVIDIA ,PCI_ANY_ID , +PCI_CLASS_MULTIMEDIA_HD_AUDIO ,8 , + quirk_nvidia_hda_pm); +/* * Ryzen5/7 XHCI controllers fail upon resume from runtime suspend or s2idle. * https://bugzilla.kernel.org/show_bug.cgi?id=205587
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 483/663 drm/panel: novatek-nt35950: Only unregister DSI1 if it exists
In reply to Greg Kroah-HartmanFrom: Konrad Dybcio <[email protected]>
[ Upstream commit a50be876f4fe2349dc8b056a49d87f69c944570f ]
Commit 5dd45b66742a ("drm/panel: novatek-nt35950: Improve error handling") introduced logic to unregister DSI1 on any sort of probe failure, as that's not done automatically by kernel APIs.
It did not however account for cases where only one DSI host is used. Fix that.
--- drivers/gpu/drm/panel/panel-novatek-nt35950.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/panel/panel-novatek-nt35950.c +4 -2
@@ -594,7 +594,8 @@ static int nt35950_probe(struct mipi_dsi_device *dsi) ret =drm_panel_of_backlight (&nt->panel);if (ret) { -mipi_dsi_device_unregister (nt->dsi[1 ]); +if (num_dsis ==2 ) +mipi_dsi_device_unregister (nt->dsi[1 ]);return dev_err_probe (dev, ret,"Failed to get backlight\n" ); }
@@ -614,7 +615,8 @@ static int nt35950_probe(struct mipi_dsi_device *dsi) ret =mipi_dsi_attach (nt->dsi[i]);if (ret <0 ) {/* If we fail to attach to either host, we're done */ -mipi_dsi_device_unregister (nt->dsi[1 ]); +if (num_dsis ==2 ) +mipi_dsi_device_unregister (nt->dsi[1 ]);return dev_err_probe (dev, ret,"Cannot attach to DSI%d host.\n" , i);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 484/663 spi: cadence-quadspi: fix suspend-resume implementations
In reply to Greg Kroah-HartmanFrom: Dhruva Gole <[email protected]>
[ Upstream commit 2087e85bb66ee3652dafe732bb9b9b896229eafc ]
The cadence QSPI driver misbehaves after performing a full system suspend resume:
...
spi-nor spi0.0: resume() failed
...
This results in a flash connected via OSPI interface after system suspend- resume to be unusable.
fix these suspend and resume functions.
--- drivers/spi/spi-cadence-quadspi.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
drivers/spi/spi-cadence-quadspi.c +16 -3
@@ -1772,17 +1772,30 @@ static int cqspi_remove(struct platform_device *pdev)static int cqspi_suspend (struct device *dev) {struct cqspi_st *cqspi =dev_get_drvdata (dev); +struct spi_master *master =dev_get_drvdata (dev); +int ret; + ret =spi_master_suspend (master);cqspi_controller_enable (cqspi,0 ); -return 0 ; + +clk_disable_unprepare (cqspi->clk); + +return ret; }static int cqspi_resume (struct device *dev) {struct cqspi_st *cqspi =dev_get_drvdata (dev); +struct spi_master *master =dev_get_drvdata (dev); -cqspi_controller_enable (cqspi,1 ); -return 0 ; +clk_prepare_enable (cqspi->clk); +cqspi_wait_idle (cqspi); +cqspi_controller_init (cqspi); + + cqspi->current_cs =-1 ; + cqspi->sclk =0 ; + +return spi_master_resume (master); }static const struct dev_pm_ops cqspi__dev_pm_ops = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 485/663 i2c: cadence: cdns_i2c_master_xfer(): Fix runtime PM leak on error path
In reply to Greg Kroah-HartmanFrom: Lars-Peter Clausen <[email protected]>
[ Upstream commit ae1664f04f504a998737f5bb563f16b44357bcca ]
The cdns_i2c_master_xfer() function gets a runtime PM reference when the function is entered. This reference is released when the function is exited. There is currently one error path where the function exits directly, which leads to a leak of the runtime PM reference.
Make sure that this error path also releases the runtime PM reference.
--- drivers/i2c/busses/i2c-cadence.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/i2c/busses/i2c-cadence.c +4 -2
@@ -833,8 +833,10 @@ static int cdns_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,#if IS_ENABLED (CONFIG_I2C_SLAVE )/* Check i2c operating mode and switch if possible */ if (id->dev_mode ==CDNS_I2C_MODE_SLAVE ) { -if (id->slave_state !=CDNS_I2C_SLAVE_STATE_IDLE ) -return -EAGAIN ; +if (id->slave_state !=CDNS_I2C_SLAVE_STATE_IDLE ) { + ret = -EAGAIN ; + goto out; + }/* Set mode to master */ cdns_i2c_set_mode (CDNS_I2C_MODE_MASTER , id);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 486/663 i2c: xiic: xiic_xfer(): Fix runtime PM leak on error path
In reply to Greg Kroah-HartmanFrom: Lars-Peter Clausen <[email protected]>
[ Upstream commit d663d93bb47e7ab45602b227701022d8aa16040a ]
The xiic_xfer() function gets a runtime PM reference when the function is entered. This reference is released when the function is exited. There is currently one error path where the function exits directly, which leads to a leak of the runtime PM reference.
Make sure that this error path also releases the runtime PM reference.
--- drivers/i2c/busses/i2c-xiic.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/i2c/busses/i2c-xiic.c +3 -1
@@ -704,7 +704,7 @@ static int xiic_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) err =xiic_start_xfer (i2c, msgs, num);if (err <0 ) {dev_err (adap->dev.parent,"Error xiic_start_xfer\n" ); -return err; + goto out; } err =wait_for_completion_timeout (&i2c->completion,XIIC_XFER_TIMEOUT );
@@ -722,6 +722,8 @@ static int xiic_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) err = (i2c->state ==STATE_DONE ) ? num : -EIO ; }mutex_unlock (&i2c->lock); + +out:pm_runtime_mark_last_busy (i2c->dev);pm_runtime_put_autosuspend (i2c->dev);return err;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 487/663 scripts/gdb: raise error with reduced debugging information
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
[ Upstream commit 8af055ae25bff48f57227f5e3d48a4306f3dd1c4 ]
If CONFIG_DEBUG_INFO_REDUCED is enabled in the kernel configuration, we will typically not be able to load vmlinux-gdb.py and will fail with:
Traceback (most recent call last):
File "/home/fainelli/work/buildroot/output/arm64/build/linux-custom/vmlinux-gdb.py", line 25, in <module>
import linux.utils
File "/home/fainelli/work/buildroot/output/arm64/build/linux-custom/scripts/gdb/linux/utils.py", line 131, in <module>
atomic_long_counter_offset = atomic_long_type.get_type()['counter'].bitpos
KeyError: 'counter'
Rather be left wondering what is happening only to find out that reduced debug information is the cause, raise an eror. This was not typically a problem until e3c8d33e0d62 ("scripts/gdb: fix 'lx-dmesg' on 32 bits arch") but it has since then.
--- scripts/gdb/linux/constants.py.in | 2 ++ scripts/gdb/vmlinux-gdb.py | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-)
scripts/gdb/linux/constants.py.in +2 -0
@@ -39,6 +39,8 @@ import gdb +LX_CONFIG(CONFIG_DEBUG_INFO_REDUCED) + /* linux/clk-provider.h */ if IS_BUILTIN(CONFIG_COMMON_CLK): LX_GDBPARSED(CLK_GET_RATE_NOCACHE)
scripts/gdb/vmlinux-gdb.py +4 -1
@@ -22,6 +22,10 @@ except: gdb.write("NOTE: gdb 7.2 or later required for Linux helper scripts to " "work.\n") else: + import linux.constants + if linux.constants.LX_CONFIG_DEBUG_INFO_REDUCED: + raise gdb.GdbError("Reduced debug information will prevent GDB " + "from having complete types.\n") import linux.utils import linux.symbols import linux.modules
@@ -32,7 +36,6 @@ else: import linux.lists import linux.rbtree import linux.proc - import linux.constants import linux.timerlist import linux.clk import linux.genpd
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 488/663 uapi/linux/const.h: prefer ISO-friendly __typeof__
In reply to Greg Kroah-HartmanFrom: Kevin Brodsky <[email protected]>
[ Upstream commit 31088f6f7906253ef4577f6a9b84e2d42447dba0 ]
typeof is (still) a GNU extension, which means that it cannot be used when building ISO C (e.g. -std=c99). It should therefore be avoided in uapi headers in favour of the ISO-friendly __typeof__.
Unfortunately this issue could not be detected by CONFIG_UAPI_HEADER_TEST=y as the __ALIGN_KERNEL() macro is not expanded in any uapi header.
This matters from a userspace perspective, not a kernel one. uapi headers and their contents are expected to be usable in a variety of situations, and in particular when building ISO C applications (with -std=c99 or similar).
This particular problem can be reproduced by trying to use the __ALIGN_KERNEL macro directly in application code, say:
#include <linux/const.h>
int align(int x, int a)
{
return __KERNEL_ALIGN(x, a);
}and trying to build that with -std=c99.
--- include/uapi/linux/const.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/const.h +1 -1
@@ -28,7 +28,7 @@#define _BITUL (x) (_UL(1) << (x))#define _BITULL (x) (_ULL(1) << (x)) -#define __ALIGN_KERNEL (x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1) +#define __ALIGN_KERNEL (x, a) __ALIGN_KERNEL_MASK(x, (__typeof__(x))(a) - 1)#define __ALIGN_KERNEL_MASK (x, mask) (((x) + (mask)) & ~(mask))#define __KERNEL_DIV_ROUND_UP (n, d) (((n) + (d) - 1) / (d))
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 489/663 sh: sq: Fix incorrect element size for allocating bitmap buffer
In reply to Greg Kroah-HartmanFrom: John Paul Adrian Glaubitz <[email protected]>
[ Upstream commit 80f746e2bd0e1da3fdb49a53570e54a1a225faac ]
The Store Queue code allocates a bitmap buffer with the size of multiple of sizeof(long) in sq_api_init(). While the buffer size is calculated correctly, the code uses the wrong element size to allocate the buffer which results in the allocated bitmap buffer being too small.
Fix this by allocating the buffer with kcalloc() with element size sizeof(long) instead of kzalloc() whose elements size defaults to sizeof(char).
--- arch/sh/kernel/cpu/sh4/sq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/sh/kernel/cpu/sh4/sq.c +1 -1
@@ -382,7 +382,7 @@ static int __init sq_api_init(void)if (unlikely (!sq_cache))return ret; - sq_bitmap =kzalloc (size,GFP_KERNEL ); + sq_bitmap =kcalloc (size,sizeof (long ),GFP_KERNEL );if (unlikely (!sq_bitmap)) goto out;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 490/663 usb: gadget: tegra-xudc: Fix crash in vbus_draw
In reply to Greg Kroah-HartmanFrom: Jon Hunter <[email protected]>
[ Upstream commit 5629d31955297ca47b9283c64fff70f2f34aa528 ]
Commit ac82b56bda5f ("usb: gadget: tegra-xudc: Add vbus_draw support") populated the vbus_draw callback for the Tegra XUDC driver. The function tegra_xudc_gadget_vbus_draw(), that was added by this commit, assumes that the pointer 'curr_usbphy' has been initialised, which is not always the case because this is only initialised when the USB role is updated. Fix this crash, by checking that the 'curr_usbphy' is valid before dereferencing.
--- drivers/usb/gadget/udc/tegra-xudc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/gadget/udc/tegra-xudc.c +1 -1
@@ -2160,7 +2160,7 @@ static int tegra_xudc_gadget_vbus_draw(struct usb_gadget *gadget,dev_dbg (xudc->dev,"%s: %u mA\n" , __func__, m_a); -if (xudc->curr_usbphy->chg_type ==SDP_TYPE ) +if (xudc->curr_usbphy && xudc->curr_usbphy->chg_type ==SDP_TYPE ) ret =usb_phy_set_power (xudc->curr_usbphy, m_a);return ret;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 491/663 usb: chipidea: fix missing goto in `ci_hdrc_probe`
In reply to Greg Kroah-HartmanFrom: Yinhao Hu <[email protected]>
[ Upstream commit d6f712f53b79f5017cdcefafb7a5aea9ec52da5d ]
Quoted 1 line
From the comment of
ci_usb_phy_init, it returns an error code if
usb_phy_init has failed, and it should do some clean up, not just return directly.
Fix this by goto the error handling.
--- drivers/usb/chipidea/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/chipidea/core.c +1 -1
@@ -1108,7 +1108,7 @@ static int ci_hdrc_probe(struct platform_device *pdev) ret =ci_usb_phy_init (ci);if (ret) {dev_err (dev,"unable to init phy: %d\n" , ret); -return ret; + goto ulpi_exit; } ci->hw_bank.phys = res->start;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 492/663 usb: mtu3: fix kernel panic at qmu transfer done irq handler
In reply to Greg Kroah-HartmanFrom: Chunfeng Yun <[email protected]>
[ Upstream commit d28f4091ea7ec3510fd6a3c6d433234e7a2bef14 ]
When handle qmu transfer irq, it will unlock @mtu->lock before give back request, if another thread handle disconnect event at the same time, and try to disable ep, it may lock @mtu->lock and free qmu ring, then qmu irq hanlder may get a NULL gpd, avoid the KE by checking gpd's value before handling it.
e.g.
qmu done irq on cpu0 thread running on cpu1
qmu_done_tx()
handle gpd [0]
mtu3_requ_complete() mtu3_gadget_ep_disable()
unlock @mtu->lock
give back request lock @mtu->lock
mtu3_ep_disable()
mtu3_gpd_ring_free()
unlock @mtu->lock
lock @mtu->lock
get next gpd [1][1]: goto [0] to handle next gpd, and next gpd may be NULL.
--- drivers/usb/mtu3/mtu3_qmu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/usb/mtu3/mtu3_qmu.c +3 -2
@@ -210,6 +210,7 @@ static struct qmu_gpd *advance_enq_gpd(struct mtu3_gpd_ring *ring)return ring->enqueue; } +/* @dequeue may be NULL if ring is unallocated or freed */ static struct qmu_gpd *advance_deq_gpd (struct mtu3_gpd_ring *ring) {if (ring->dequeue < ring->end)
@@ -484,7 +485,7 @@ static void qmu_done_tx(struct mtu3 *mtu, u8 epnum)dev_dbg (mtu->dev,"%s EP%d, last=%p, current=%p, enq=%p\n" , __func__, epnum, gpd, gpd_current, ring->enqueue); -while (gpd != gpd_current && !GET_GPD_HWO (gpd)) { +while (gpd && gpd != gpd_current && !GET_GPD_HWO (gpd)) { mreq =next_request (mep);
@@ -523,7 +524,7 @@ static void qmu_done_rx(struct mtu3 *mtu, u8 epnum)dev_dbg (mtu->dev,"%s EP%d, last=%p, current=%p, enq=%p\n" , __func__, epnum, gpd, gpd_current, ring->enqueue); -while (gpd != gpd_current && !GET_GPD_HWO (gpd)) { +while (gpd && gpd != gpd_current && !GET_GPD_HWO (gpd)) { mreq =next_request (mep);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 493/663 firmware: stratix10-svc: Fix an NULL vs IS_ERR() bug in probe
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit e1d6ca042e62c2a69513235f8629eb6e62ca79c5 ]
The svc_create_memory_pool() function returns error pointers. It never returns NULL. Fix the check.
--- drivers/firmware/stratix10-svc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/firmware/stratix10-svc.c +2 -2
@@ -1133,8 +1133,8 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev)return ret; genpool =svc_create_memory_pool (pdev, sh_memory); -if (!genpool) -return -ENOMEM ; +if (IS_ERR (genpool)) +return PTR_ERR (genpool);/* allocate service controller and supporting channel */ controller =devm_kzalloc (dev,sizeof (*controller),GFP_KERNEL );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 494/663 tty: serial: fsl_lpuart: adjust buffer length to the intended size
In reply to Greg Kroah-HartmanFrom: Shenwei Wang <[email protected]>
[ Upstream commit f73fd750552524b06b5d77ebfdd106ccc8fcac61 ]
Based on the fls function definition provided below, we should not subtract 1 to obtain the correct buffer length:
fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
--- drivers/tty/serial/fsl_lpuart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/fsl_lpuart.c +1 -1
@@ -1270,7 +1270,7 @@ static inline int lpuart_start_rx_dma(struct lpuart_port *sport)* 10ms at any baud rate. */ sport->rx_dma_rng_buf_len = (DMA_RX_TIMEOUT * baud / bits /1000 ) *2 ; - sport->rx_dma_rng_buf_len = (1 << (fls (sport->rx_dma_rng_buf_len) -1 )); + sport->rx_dma_rng_buf_len = (1 <<fls (sport->rx_dma_rng_buf_len));if (sport->rx_dma_rng_buf_len <16 ) sport->rx_dma_rng_buf_len =16 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 495/663 serial: 8250: Add missing wakeup event reporting
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
[ Upstream commit 0ba9e3a13c6adfa99e32b2576d20820ab10ad48a ]
An 8250 UART configured as a wake-up source would not have reported itself through sysfs as being the source of wake-up, correct that.
--- drivers/tty/serial/8250/8250_port.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/tty/serial/8250/8250_port.c +4 -0
@@ -15,6 +15,7 @@#include <linux/moduleparam.h> #include <linux/ioport.h> #include <linux/init.h> +#include <linux/irq.h> #include <linux/console.h> #include <linux/gpio/consumer.h> #include <linux/sysrq.h>
@@ -1925,6 +1926,7 @@ static bool handle_rx_dma(struct uart_8250_port *up, unsigned int iir)int serial8250_handle_irq (struct uart_port *port,unsigned int iir) {struct uart_8250_port *up =up_to_u8250p (port); +struct tty_port *tport = &port->state->port;bool skip_rx = false;unsigned long flags;u16 status;
@@ -1950,6 +1952,8 @@ int serial8250_handle_irq(struct uart_port *port, unsigned int iir) skip_rx = true;if (status & (UART_LSR_DR |UART_LSR_BI ) && !skip_rx) { +if (irqd_is_wakeup_set (irq_get_irq_data (port->irq))) +pm_wakeup_event (tport->tty->dev,0 );if (!up->dma ||handle_rx_dma (up, iir)) status =serial8250_rx_chars (up, status); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 496/663 spi: cadence-quadspi: use macro DEFINE_SIMPLE_DEV_PM_OPS
In reply to Greg Kroah-HartmanFrom: Dhruva Gole <[email protected]>
[ Upstream commit be3206e8906e7a93df673ab2e96d69304a008edc ]
Using this macro makes the code more readable.
It also inits the members of dev_pm_ops in the following manner without us explicitly needing to:
.suspend = cqspi_suspend, \
.resume = cqspi_resume, \
.freeze = cqspi_suspend, \
.thaw = cqspi_resume, \
.poweroff = cqspi_suspend, \
.restore = cqspi_resume
Also get rid of conditional compilation based on CONFIG_PM_SLEEP because it introduces build issues with certain configs when CQSPI_DEV_PM_OPS is just NULL.
--- drivers/spi/spi-cadence-quadspi.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
drivers/spi/spi-cadence-quadspi.c +2 -11
@@ -1768,7 +1768,6 @@ static int cqspi_remove(struct platform_device *pdev)return 0 ; } -#ifdef CONFIG_PM_SLEEP static int cqspi_suspend (struct device *dev) {struct cqspi_st *cqspi =dev_get_drvdata (dev);
@@ -1798,15 +1797,7 @@ static int cqspi_resume(struct device *dev)return spi_master_resume (master); } -static const struct dev_pm_ops cqspi__dev_pm_ops = { - .suspend = cqspi_suspend, - .resume = cqspi_resume, -}; - -#define CQSPI_DEV_PM_OPS (&cqspi__dev_pm_ops) -#else -#define CQSPI_DEV_PM_OPS NULL -#endif +static DEFINE_SIMPLE_DEV_PM_OPS(cqspi_dev_pm_ops, cqspi_suspend, cqspi_resume);static const struct cqspi_driver_platdata cdns_qspi = { .quirks =CQSPI_DISABLE_DAC_MODE ,
@@ -1873,7 +1864,7 @@ static struct platform_driver cqspi_platform_driver = { .remove = cqspi_remove, .driver = { .name = CQSPI_NAME, - .pm = CQSPI_DEV_PM_OPS, + .pm = &cqspi_dev_pm_ops, .of_match_table = cqspi_dt_ids, }, };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 497/663 staging: rtl8192e: Fix W_DISABLE# does not work after stop/start
In reply to Greg Kroah-HartmanFrom: Philipp Hortmann <[email protected]>
[ Upstream commit 3fac2397f562eb669ddc2f45867a253f3fc26184 ]
When loading the driver for rtl8192e, the W_DISABLE# switch is working as intended. But when the WLAN is turned off in software and then turned on again the W_DISABLE# does not work anymore. Reason for this is that in the function _rtl92e_dm_check_rf_ctrl_gpio() the bfirst_after_down is checked and returned when true. bfirst_after_down is set true when switching the WLAN off in software. But it is not set to false again when WLAN is turned on again.
Add bfirst_after_down = false in _rtl92e_sta_up to reset bit and fix above described bug.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 + 1 file changed, 1 insertion(+)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +1 -0
@@ -716,6 +716,7 @@ static int _rtl92e_sta_up(struct net_device *dev, bool is_silent_reset)else netif_wake_queue (dev); + priv->bfirst_after_down = false;return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 498/663 spmi: Add a check for remove callback when removing a SPMI driver
In reply to Greg Kroah-HartmanFrom: Jishnu Prakash <[email protected]>
[ Upstream commit b56eef3e16d888883fefab47425036de80dd38fc ]
When removing a SPMI driver, there can be a crash due to NULL pointer dereference if it does not have a remove callback defined. This is one such call trace observed when removing the QCOM SPMI PMIC driver:
dump_backtrace.cfi_jt+0x0/0x8 dump_stack_lvl+0xd8/0x16c panic+0x188/0x498 __cfi_slowpath+0x0/0x214 __cfi_slowpath+0x1dc/0x214 spmi_drv_remove+0x16c/0x1e0 device_release_driver_internal+0x468/0x79c driver_detach+0x11c/0x1a0 bus_remove_driver+0xc4/0x124 driver_unregister+0x58/0x84 cleanup_module+0x1c/0xc24 [qcom_spmi_pmic] __do_sys_delete_module+0x3ec/0x53c __arm64_sys_delete_module+0x18/0x28 el0_svc_common+0xdc/0x294 el0_svc+0x38/0x9c el0_sync_handler+0x8c/0xf0 el0_sync+0x1b4/0x1c0
If a driver has all its resources allocated through devm_() APIs and does not need any other explicit cleanup, it would not require a remove callback to be defined. Hence, add a check for remove callback presence before calling it when removing a SPMI driver.
--- drivers/spmi/spmi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/spmi/spmi.c +2 -1
@@ -350,7 +350,8 @@ static void spmi_drv_remove(struct device *dev)const struct spmi_driver *sdrv =to_spmi_driver (dev->driver);pm_runtime_get_sync (dev); - sdrv->remove (to_spmi_device (dev)); +if (sdrv->remove) + sdrv->remove (to_spmi_device (dev));pm_runtime_put_noidle (dev);pm_runtime_disable (dev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 499/663 virtio_ring: dont update event idx on get_buf
In reply to Greg Kroah-HartmanFrom: Albert Huang <[email protected]>
[ Upstream commit 6c0b057cec5eade4c3afec3908821176931a9997 ]
In virtio_net, if we disable napi_tx, when we trigger a tx interrupt, the vq->event_triggered will be set to true. It is then never reset until we explicitly call virtqueue_enable_cb_delayed or virtqueue_enable_cb_prepare.
If we disable the napi_tx, virtqueue_enable_cb* will only be called when the tx ring is getting relatively empty.
Since event_triggered is true, VRING_AVAIL_F_NO_INTERRUPT or VRING_PACKED_EVENT_FLAG_DISABLE will not be set. As a result we update vring_used_event(&vq->split.vring) or vq->packed.vring.driver->off_wrap every time we call virtqueue_get_buf_ctx. This causes more interrupts.
To summarize:
1) event_triggered was set to true in vring_interrupt()
2) after this nothing will happen in virtqueue_disable_cb() so VRING_AVAIL_F_NO_INTERRUPT is not set in avail_flags_shadow
3) virtqueue_get_buf_ctx_split() will still think the cb is enabled and then it will publish a new event index
To fix:
update VRING_AVAIL_F_NO_INTERRUPT or VRING_PACKED_EVENT_FLAG_DISABLE in the vq when we call virtqueue_disable_cb even when event_triggered is true.
Tested with iperf:
iperf3 tcp stream:
vm1 -----------------> vm2
vm2 just receives tcp data stream from vm1, and sends acks to vm1, there are many tx interrupts in vm2.
with the patch applied there are just a few tx interrupts.
v2->v3:
-update the interrupt disable flag even with the event_triggered is set, -instead of checking whether event_triggered is set in -virtqueue_get_buf_ctx_{packed/split}, will cause the drivers which have -not called virtqueue_{enable/disable}_cb to miss notifications.
v3->v4:
-remove change for
-"if (vq->packed.event_flags_shadow != VRING_PACKED_EVENT_FLAG_DISABLE)" -in virtqueue_disable_cb_packed
Message-Id: <[email protected]>
--- drivers/virtio/virtio_ring.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
drivers/virtio/virtio_ring.c +16 -6
@@ -848,6 +848,14 @@ static void virtqueue_disable_cb_split(struct virtqueue *_vq)if (!(vq->split.avail_flags_shadow &VRING_AVAIL_F_NO_INTERRUPT )) { vq->split.avail_flags_shadow |=VRING_AVAIL_F_NO_INTERRUPT ; + +/* +* If device triggered an event already it won't trigger one again: +* no need to disable. +*/ +if (vq->event_triggered) +return ; +if (vq->event)/* TODO: this is a hack. Figure out a cleaner value to write. */ vring_used_event (&vq->split.vring) =0x0 ;
@@ -1687,6 +1695,14 @@ static void virtqueue_disable_cb_packed(struct virtqueue *_vq)if (vq->packed.event_flags_shadow !=VRING_PACKED_EVENT_FLAG_DISABLE ) { vq->packed.event_flags_shadow =VRING_PACKED_EVENT_FLAG_DISABLE ; + +/* +* If device triggered an event already it won't trigger one again: +* no need to disable. +*/ +if (vq->event_triggered) +return ; + vq->packed.vring.driver->flags =cpu_to_le16 (vq->packed.event_flags_shadow); }
@@ -2309,12 +2325,6 @@ void virtqueue_disable_cb(struct virtqueue *_vq) {struct vring_virtqueue *vq =to_vvq (_vq); -/* If device triggered an event already it won't trigger one again: -* no need to disable. -*/ -if (vq->event_triggered) -return ; -if (vq->packed_ring)virtqueue_disable_cb_packed (_vq);else
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 500/663 spi: bcm63xx: remove PM_SLEEP based conditional compilation
In reply to Greg Kroah-HartmanFrom: Dhruva Gole <[email protected]>
[ Upstream commit 25f0617109496e1aff49594fbae5644286447a0f ]
Get rid of conditional compilation based on CONFIG_PM_SLEEP because it may introduce build issues with certain configs where it maybe disabled This is because if above config is not enabled the suspend-resume functions are never part of the code but the bcm63xx_spi_pm_ops struct still inits them to non-existent suspend-resume functions.
--- drivers/spi/spi-bcm63xx.c | 2 -- 1 file changed, 2 deletions(-)
drivers/spi/spi-bcm63xx.c +0 -2
@@ -629,7 +629,6 @@ static int bcm63xx_spi_remove(struct platform_device *pdev)return 0 ; } -#ifdef CONFIG_PM_SLEEP static int bcm63xx_spi_suspend (struct device *dev) {struct spi_master *master =dev_get_drvdata (dev);
@@ -656,7 +655,6 @@ static int bcm63xx_spi_resume(struct device *dev)return 0 ; } -#endif static const struct dev_pm_ops bcm63xx_spi_pm_ops = {SET_SYSTEM_SLEEP_PM_OPS (bcm63xx_spi_suspend, bcm63xx_spi_resume)
Signature · 1 line
2.39.2
Re: [PATCH 6.2 500/663] spi: bcm63xx: remove PM_SLEEP based conditional compilation
Quoted 10 lines · Greg Kroah-Hartman
From: Dhruva Gole <[email protected]>
[ Upstream commit
25f0617109496e1aff49594fbae5644286447a0f]Get rid of conditional compilation based on
CONFIG_PM_SLEEPbecause it may introduce build issues with certain configs where it maybe disabled This is because if above config is not enabled the suspend-resume functions are never part of the code but thebcm63xx_spi_pm_opsstruct still inits them to non-existent suspend-resume functions.
Quoted 6 lines
Fixes b42dfed83d95 ("spi: add Broadcom BCM63xx SPI controller driver")Signed-off-by Dhruva Gole <[email protected]>Signed-off-by Mark Brown <[email protected]>Signed-off-by Sasha Levin <[email protected]>
This breaks the build on RISC-V.
Seems to be messing around happening on the same patch in 6.1 w/ a fixup patch, but sounds like the fixup didn't apply properly either:
https://lore.kernel.org/stable/2023050845-pancreas-postage-5769@gregkh/
The fixup would be needed here too, provided it (:
Cheers,
Conor.
Greg Kroah-Hartman
maintainerRe: [PATCH 6.2 500/663] spi: bcm63xx: remove PM_SLEEP based conditional compilation
Quoted 18 lines · Conor Dooley
Quoted 10 lines · Greg Kroah-Hartman
From: Dhruva Gole <[email protected]>
[ Upstream commit
25f0617109496e1aff49594fbae5644286447a0f]Get rid of conditional compilation based on
CONFIG_PM_SLEEPbecause it may introduce build issues with certain configs where it maybe disabled This is because if above config is not enabled the suspend-resume functions are never part of the code but thebcm63xx_spi_pm_opsstruct still inits them to non-existent suspend-resume functions.Quoted 6 lines
Fixes b42dfed83d95 ("spi: add Broadcom BCM63xx SPI controller driver")Signed-off-by Dhruva Gole <[email protected]>Signed-off-by Mark Brown <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Quoted 5 lines
This breaks the build on RISC-V.
Seems to be messing around happening on the same patch in 6.1 w/ a fixup patch, but sounds like the fixup didn't apply properly either:
https://lore.kernel.org/stable/2023050845-pancreas-postage-5769@gregkh/
Ok, let me drop this patch, and the add-on one, from all branches now and push out a -rc2.
thanks,
greg k-h
Greg Kroah-Hartman
maintainerPATCH 501/663 fbdev: mmp: Fix deferred clk handling in mmphw_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit b3a7a9ab65ae2f2626c7222fb79cdd433f8c5252 ]
When dev_err_probe() is called, 'ret' holds the value of the previous successful devm_request_irq() call.
'ret' should be assigned with a meaningful value before being used in dev_err_probe().
While at it, use and return "PTR_ERR(ctrl->clk)" instead of a hard-coded "-ENOENT" so that -EPROBE_DEFER is handled and propagated correctly.
--- drivers/video/fbdev/mmp/hw/mmp_ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/mmp/hw/mmp_ctrl.c +1 -1
@@ -514,9 +514,9 @@ static int mmphw_probe(struct platform_device *pdev)/* get clock */ ctrl->clk =devm_clk_get (ctrl->dev, mi->clk_name);if (IS_ERR (ctrl->clk)) { + ret =PTR_ERR (ctrl->clk);dev_err_probe (ctrl->dev, ret,"unable to get clk %s\n" , mi->clk_name); - ret = -ENOENT ; goto failed; }clk_prepare_enable (ctrl->clk);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 502/663 selftests/powerpc/pmu: Fix sample field check in the mmcra_thresh_marked_sample_test
In reply to Greg Kroah-HartmanFrom: Kajol Jain <[email protected]>
[ Upstream commit 8a32341cf04ba05974931b4664683c2c9fb84e56 ]
The testcase verifies the setting of different fields in Monitor Mode Control Register A (MMCRA). In the current code, EV_CODE_EXTRACT macro is used to extract the "sample" field, which then needs to be further processed to fetch rand_samp_elig and rand_samp_mode bits. But the current code is not passing valid sample field to EV_CODE_EXTRACT macro. Patch addresses this by fixing the input for EV_CODE_EXTRACT.
--- .../pmu/sampling_tests/mmcra_thresh_marked_sample_test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_thresh_marked_sample_test.c +2 -2
@@ -63,9 +63,9 @@ static int mmcra_thresh_marked_sample(void) get_mmcra_thd_stop(get_reg_value(intr_regs, "MMCRA"), 4));FAIL_IF (EV_CODE_EXTRACT (event.attr.config, marked) !=get_mmcra_marked (get_reg_value (intr_regs,"MMCRA" ),4 )); -FAIL_IF (EV_CODE_EXTRACT (event.attr.config, sample >>2 ) != +FAIL_IF ((EV_CODE_EXTRACT (event.attr.config, sample) >>2 ) !=get_mmcra_rand_samp_elig (get_reg_value (intr_regs,"MMCRA" ),4 )); -FAIL_IF (EV_CODE_EXTRACT (event.attr.config, sample &0x3 ) != +FAIL_IF ((EV_CODE_EXTRACT (event.attr.config, sample) &0x3 ) !=get_mmcra_sample_mode (get_reg_value (intr_regs,"MMCRA" ),4 ));FAIL_IF (EV_CODE_EXTRACT (event.attr.config, sm) !=get_mmcra_sm (get_reg_value (intr_regs,"MMCRA" ),4 ));
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 503/663 macintosh/windfarm_smu_sat: Add missing of_node_put()
In reply to Greg Kroah-HartmanFrom: Liang He <[email protected]>
[ Upstream commit 631cf002826007ab7415258ee647dcaf8845ad5a ]
We call of_node_get() in wf_sat_probe() after sat is created, so we need the of_node_put() before *kfree(sat)*.
--- drivers/macintosh/windfarm_smu_sat.c | 1 + 1 file changed, 1 insertion(+)
drivers/macintosh/windfarm_smu_sat.c +1 -0
@@ -171,6 +171,7 @@ static void wf_sat_release(struct kref *ref)if (sat->nr >=0 ) sats[sat->nr] =NULL ; +of_node_put (sat->node);kfree (sat); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 504/663 powerpc/perf: Properly detect mpc7450 family
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
[ Upstream commit e7299f961fe5e4496db0bfaa9e819f5e97f3846b ]
Unlike PVR_POWER8, etc ...., PVR_7450 represents a full PVR value and not a family value.
To avoid confusion, do like E500 family and define the relevant PVR_VER_xxxx values for the 7450 family:
0x8000 ==> 7450
0x8001 ==> 7455
0x8002 ==> 7447
0x8003 ==> 7447A
0x8004 ==> 7448
And use them to detect 7450 family for perf events.
--- arch/powerpc/include/asm/reg.h | 5 +++++ arch/powerpc/perf/mpc7450-pmu.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-)
arch/powerpc/include/asm/reg.h +5 -0
@@ -1310,6 +1310,11 @@#define PVR_VER_E500MC 0x8023#define PVR_VER_E5500 0x8024#define PVR_VER_E6500 0x8040 +#define PVR_VER_7450 0x8000 +#define PVR_VER_7455 0x8001 +#define PVR_VER_7447 0x8002 +#define PVR_VER_7447A 0x8003 +#define PVR_VER_7448 0x8004/* * For the 8xx processors, all of them report the same PVR family for
arch/powerpc/perf/mpc7450-pmu.c +3 -3
@@ -417,9 +417,9 @@ struct power_pmu mpc7450_pmu = {static int __init init_mpc7450_pmu (void ) { -unsigned int pvr =mfspr (SPRN_PVR ); - -if (PVR_VER (pvr) !=PVR_7450 ) +if (!pvr_version_is (PVR_VER_7450 ) && !pvr_version_is (PVR_VER_7455 ) && + !pvr_version_is (PVR_VER_7447 ) && !pvr_version_is (PVR_VER_7447A ) && + !pvr_version_is (PVR_VER_7448 ))return -ENODEV ;return register_power_pmu (&mpc7450_pmu);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 505/663 powerpc/mpc512x: fix resource printk format warning
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 7538c97e2b80ff6b7a8ea2ecf16a04355461b439 ]
Use "%pa" format specifier for resource_size_t to avoid a compiler printk format warning.
../arch/powerpc/platforms/512x/clock-commonclk.c: In function 'mpc5121_clk_provide_backwards_compat':../arch/powerpc/platforms/512x/clock-commonclk.c:989:44: error: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'resource_size_t' {aka 'long long unsigned int'} [-Werror=format=]
989 | snprintf(devname, sizeof(devname), "%08x.%s", res.start, np->name); \
| ^~~~~~~~~ ~~~~~~~~~
| |
| resource_size_t {aka long long unsigned int}Prevents 24 such warnings.
--- arch/powerpc/platforms/512x/clock-commonclk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/platforms/512x/clock-commonclk.c +1 -1
@@ -986,7 +986,7 @@ static void __init mpc5121_clk_provide_migration_support(void)#define NODE_PREP do { \ of_address_to_resource(np, 0, &res); \ - snprintf(devname, sizeof(devname), "%08x.%s", res.start, np->name); \ + snprintf(devname, sizeof(devname), "%pa.%s", &res.start, np->name); \ } while (0)#define NODE_CHK (clkname, clkitem, regnode, regflag) do { \
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 506/663 powerpc/wii: fix resource printk format warnings
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 7b69600d4da0049244e9be2f5ef5a2f8e04fcd9a ]
Use "%pa" format specifier for resource_size_t to avoid compiler printk format warnings.
../arch/powerpc/platforms/embedded6xx/flipper-pic.c: In function 'flipper_pic_init':../include/linux/kern_levels.h:5:25: error: format '%x' expects argument of type 'unsigned int', but argument 2 has type 'resource_size_t' {aka 'long long unsigned int'} [-Werror=format=] ../arch/powerpc/platforms/embedded6xx/flipper-pic.c:148:9: note: in expansion of macro 'pr_info'
148 | pr_info("controller at 0x%08x mapped to 0x%p\n", res.start, io_base);
| ^~~~~~~../arch/powerpc/platforms/embedded6xx/hlwd-pic.c: In function 'hlwd_pic_init':../include/linux/kern_levels.h:5:25: error: format '%x' expects argument of type 'unsigned int', but argument 2 has type 'resource_size_t' {aka 'long long unsigned int'} [-Werror=format=] ../arch/powerpc/platforms/embedded6xx/hlwd-pic.c:174:9: note: in expansion of macro 'pr_info'
174 | pr_info("controller at 0x%08x mapped to 0x%p\n", res.start, io_base);
| ^~~~~~~../arch/powerpc/platforms/embedded6xx/wii.c: In function 'wii_ioremap_hw_regs':../include/linux/kern_levels.h:5:25: error: format '%x' expects argument of type 'unsigned int', but argument 3 has type 'resource_size_t' {aka 'long long unsigned int'} [-Werror=format=] ../arch/powerpc/platforms/embedded6xx/wii.c:77:17: note: in expansion of macro 'pr_info'
77 | pr_info("%s at 0x%08x mapped to 0x%p\n", name,
| ^~~~~~~--- arch/powerpc/platforms/embedded6xx/flipper-pic.c | 2 +- arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 2 +- arch/powerpc/platforms/embedded6xx/wii.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
arch/powerpc/platforms/embedded6xx/flipper-pic.c +1 -1
@@ -145,7 +145,7 @@ static struct irq_domain * __init flipper_pic_init(struct device_node *np) } io_base =ioremap (res.start,resource_size (&res)); -pr_info ("controller at 0x%08x mapped to 0x%p\n" , res.start, io_base); +pr_info ("controller at 0x%pa mapped to 0x%p\n" , &res.start, io_base);__flipper_quiesce (io_base);
arch/powerpc/platforms/embedded6xx/hlwd-pic.c +1 -1
@@ -171,7 +171,7 @@ static struct irq_domain *__init hlwd_pic_init(struct device_node *np)return NULL ; } -pr_info ("controller at 0x%08x mapped to 0x%p\n" , res.start, io_base); +pr_info ("controller at 0x%pa mapped to 0x%p\n" , &res.start, io_base);__hlwd_quiesce (io_base);
arch/powerpc/platforms/embedded6xx/wii.c +2 -2
@@ -74,8 +74,8 @@ static void __iomem *__init wii_ioremap_hw_regs(char *name, char *compatible) hw_regs =ioremap (res.start,resource_size (&res));if (hw_regs) { -pr_info ("%s at 0x%08x mapped to 0x%p\n" , name, - res.start, hw_regs); +pr_info ("%s at 0x%pa mapped to 0x%p\n" , name, + &res.start, hw_regs); } out_put:
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 507/663 powerpc/sysdev/tsi108: fix resource printk format warnings
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 55d8bd02cc1b9f1063993b5c42c9cabf4af67dea ]
Use "%pa" format specifier for resource_size_t to avoid a compiler printk format warning.
arch/powerpc/sysdev/tsi108_pci.c: In function 'tsi108_setup_pci':
include/linux/kern_levels.h:5:25: error: format '%x' expects argument of type 'unsigned int', but argument 2 has type 'resource_size_t'
--- arch/powerpc/sysdev/tsi108_pci.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/powerpc/sysdev/tsi108_pci.c +2 -3
@@ -217,9 +217,8 @@ int __init tsi108_setup_pci(struct device_node *dev, u32 cfg_phys, int primary) (hose)->ops = &tsi108_direct_pci_ops; -printk (KERN_INFO "Found tsi108 PCI host bridge at 0x%08x. " -"Firmware bus number: %d->%d\n" , - rsrc.start, hose->first_busno, hose->last_busno); +pr_info ("Found tsi108 PCI host bridge at 0x%pa. Firmware bus number: %d->%d\n" , + &rsrc.start, hose->first_busno, hose->last_busno);/* Interpret the "ranges" property */ /* This also maps the I/O region and sets isa_io/mem_base */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 508/663 macintosh: via-pmu-led: requires ATA to be set
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 05dce4ba125336875cd3eed3c1503fa81cd2f691 ]
LEDS_TRIGGER_DISK depends on ATA, so selecting LEDS_TRIGGER_DISK when ATA is not set/enabled causes a Kconfig warning:
WARNING: unmet direct dependencies detected for LEDS_TRIGGER_DISK
Depends on [n]: NEW_LEDS [=y] && LEDS_TRIGGERS [=y] && ATA [=n]
Selected by [y]:
- ADB_PMU_LED_DISK [=y] && MACINTOSH_DRIVERS [=y] && ADB_PMU_LED [=y] && LEDS_CLASS [=y]
Fix this by making ADB_PMU_LED_DISK depend on ATA.
Seen on both PPC32 and PPC64.
--- drivers/macintosh/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/macintosh/Kconfig +1 -0
@@ -86,6 +86,7 @@ config ADB_PMU_LED config ADB_PMU_LED_DISK bool "Use front LED as DISK LED by default" + depends on ATA depends on ADB_PMU_LED depends on LEDS_CLASS select LEDS_TRIGGERS
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 509/663 powerpc/rtas: use memmove for potentially overlapping buffer copy
In reply to Greg Kroah-HartmanFrom: Nathan Lynch <[email protected]>
[ Upstream commit 271208ee5e335cb1ad280d22784940daf7ddf820 ]
Using memcpy() isn't safe when buf is identical to rtas_err_buf, which can happen during boot before slab is up. Full context which may not be obvious from the diff:
if (altbuf) {
buf = altbuf;
} else {
buf = rtas_err_buf;
if (slab_is_available())
buf = kmalloc(RTAS_ERROR_LOG_MAX, GFP_ATOMIC);
}
if (buf)
memcpy(buf, rtas_err_buf, RTAS_ERROR_LOG_MAX);This was found by inspection and I'm not aware of it causing problems in practice. It appears to have been introduced by commit 033ef338b6e0 ("powerpc: Merge rtas.c into arch/powerpc/kernel"); the old ppc64 version of this code did not have this problem.
Use memmove() instead.
--- arch/powerpc/kernel/rtas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/rtas.c +1 -1
@@ -425,7 +425,7 @@ static char *__fetch_rtas_last_error(char *altbuf) buf =kmalloc (RTAS_ERROR_LOG_MAX ,GFP_ATOMIC ); }if (buf) -memcpy (buf, rtas_err_buf,RTAS_ERROR_LOG_MAX ); +memmove (buf, rtas_err_buf,RTAS_ERROR_LOG_MAX ); }return buf;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 510/663 sched/fair: Fix inaccurate tally of ttwu_move_affine
In reply to Greg Kroah-HartmanFrom: Libo Chen <[email protected]>
[ Upstream commit 39afe5d6fc59237ff7738bf3ede5a8856822d59d ]
There are scenarios where non-affine wakeups are incorrectly counted as affine wakeups by schedstats.
When wake_affine_idle() returns prev_cpu which doesn't equal to nr_cpumask_bits, it will slip through the check: target == nr_cpumask_bits in wake_affine() and be counted as if target == this_cpu in schedstats.
Replace target == nr_cpumask_bits with target != this_cpu to make sure affine wakeups are accurately tallied.
--- kernel/sched/fair.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/fair.c +1 -1
@@ -6487,7 +6487,7 @@ static int wake_affine(struct sched_domain *sd, struct task_struct *p, target =wake_affine_weight (sd, p, this_cpu, prev_cpu, sync);schedstat_inc (p->stats.nr_wakeups_affine_attempts); -if (target == nr_cpumask_bits) +if (target != this_cpu)return prev_cpu;schedstat_inc (sd->ttwu_move_affine);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 511/663 perf/core: Fix hardlockup failure caused by perf throttle
In reply to Greg Kroah-HartmanFrom: Yang Jihong <[email protected]>
[ Upstream commit 15def34e2635ab7e0e96f1bc32e1b69609f14942 ]
commit e050e3f0a71bf ("perf: Fix broken interrupt rate throttling") introduces a change in throttling threshold judgment. Before this, compare hwc->interrupts and max_samples_per_tick, then increase hwc->interrupts by 1, but this commit reverses order of these two behaviors, causing the semantics of max_samples_per_tick to change. In literal sense of "max_samples_per_tick", if hwc->interrupts == max_samples_per_tick, it should not be throttled, therefore, the judgment condition should be changed to "hwc->interrupts > max_samples_per_tick".
In fact, this may cause the hardlockup to fail, The minimum value of max_samples_per_tick may be 1, in this case, the return value of __perf_event_account_interrupt function is 1.
As a result, nmi_watchdog gets throttled, which would stop PMU (Use x86 architecture as an example, see x86_pmu_handle_irq).
--- kernel/events/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/events/core.c +2 -2
@@ -9408,8 +9408,8 @@ __perf_event_account_interrupt(struct perf_event *event, int throttle) hwc->interrupts =1 ; }else { hwc->interrupts++; -if (unlikely (throttle - && hwc->interrupts >= max_samples_per_tick)) { +if (unlikely (throttle && + hwc->interrupts > max_samples_per_tick)) {__this_cpu_inc (perf_throttled_count);tick_dep_set_cpu (smp_processor_id (),TICK_DEP_BIT_PERF_EVENTS ); hwc->interrupts =MAX_INTERRUPTS ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 512/663 Revert "objtool: Support addition to set CFA base"
In reply to Greg Kroah-HartmanFrom: Josh Poimboeuf <[email protected]>
[ Upstream commit e18398e80c73e3cc7d9c3d2e0bc06a4af8f4f1cb ]
Commit 468af56a7bba ("objtool: Support addition to set CFA base") was added as a preparatory patch for arm64 support, but that support never came. It triggers a false positive warning on x86, so just revert it for now.
Fixes the following warning:
vmlinux.o: warning: objtool: cdce925_regmap_i2c_write+0xdb: stack state mismatch: cfa1=4+120 cfa2=5+40
--- tools/objtool/check.c | 11 ----------- 1 file changed, 11 deletions(-)
tools/objtool/check.c +0 -11
@@ -2913,17 +2913,6 @@ static int update_cfi_state(struct instruction *insn,break ; } -if (!cfi->drap && op->src.reg ==CFI_SP && - op->dest.reg ==CFI_BP && cfa->base ==CFI_SP && -check_reg_frame_pos (®s[CFI_BP ], -cfa->offset + op->src.offset)) { - -/* lea disp(%rsp), %rbp */ - cfa->base =CFI_BP ; - cfa->offset -= op->src.offset; - cfi->bp_scratch = false; -break ; - } -if (op->src.reg ==CFI_SP && cfa->base ==CFI_SP ) {/* drap: lea disp(%rsp), %drap */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 513/663 riscv: Fix ptdump when KASAN is enabled
In reply to Greg Kroah-HartmanFrom: Alexandre Ghiti <[email protected]>
[ Upstream commit ecd7ebaf0b5a094a6180b299a5635c0eea42be4b ]
The KASAN shadow region was moved next to the kernel mapping but the ptdump code was not updated and it appears to break the dump of the kernel page table, so fix this by moving the KASAN shadow region in ptdump.
--- arch/riscv/mm/ptdump.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
arch/riscv/mm/ptdump.c +12 -12
@@ -59,10 +59,6 @@ struct ptd_mm_info { };enum address_markers_idx { -#ifdef CONFIG_KASAN -KASAN_SHADOW_START_NR , -KASAN_SHADOW_END_NR , -#endif FIXMAP_START_NR ,FIXMAP_END_NR ,PCI_IO_START_NR ,
@@ -74,6 +70,10 @@ enum address_markers_idx {VMALLOC_START_NR ,VMALLOC_END_NR ,PAGE_OFFSET_NR , +#ifdef CONFIG_KASAN +KASAN_SHADOW_START_NR , +KASAN_SHADOW_END_NR , +#endif #ifdef CONFIG_64BITMODULES_MAPPING_NR , KERNEL_MAPPING_NR,
@@ -82,10 +82,6 @@ enum address_markers_idx { };static struct addr_marker address_markers[] = { -#ifdef CONFIG_KASAN - {0, "Kasan shadow start"}, - {0, "Kasan shadow end"}, -#endif {0 ,"Fixmap start" }, {0 ,"Fixmap end" }, {0 ,"PCI I/O start" },
@@ -97,6 +93,10 @@ static struct addr_marker address_markers[] = { {0, "vmalloc() area"}, {0, "vmalloc() end"}, {0, "Linear mapping"}, +#ifdef CONFIG_KASAN + {0, "Kasan shadow start"}, + {0, "Kasan shadow end"}, +#endif #ifdef CONFIG_64BIT {0, "Modules/BPF mapping"}, {0, "Kernel mapping"},
@@ -362,10 +362,6 @@ static int __init ptdump_init(void) {unsigned int i, j; -#ifdef CONFIG_KASAN - address_markers[KASAN_SHADOW_START_NR ].start_address =KASAN_SHADOW_START ; - address_markers[KASAN_SHADOW_END_NR ].start_address =KASAN_SHADOW_END ; -#endif address_markers[FIXMAP_START_NR ].start_address =FIXADDR_START ; address_markers[FIXMAP_END_NR ].start_address =FIXADDR_TOP ; address_markers[PCI_IO_START_NR ].start_address =PCI_IO_START ;
@@ -377,6 +373,10 @@ static int __init ptdump_init(void) address_markers[VMALLOC_START_NR ].start_address =VMALLOC_START ; address_markers[VMALLOC_END_NR ].start_address =VMALLOC_END ; address_markers[PAGE_OFFSET_NR ].start_address =PAGE_OFFSET ; +#ifdef CONFIG_KASAN + address_markers[KASAN_SHADOW_START_NR ].start_address =KASAN_SHADOW_START ; + address_markers[KASAN_SHADOW_END_NR ].start_address =KASAN_SHADOW_END ; +#endif #ifdef CONFIG_64BIT address_markers[MODULES_MAPPING_NR ].start_address =MODULES_VADDR ; address_markers[KERNEL_MAPPING_NR ].start_address = kernel_map.virt_addr;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 514/663 sched/rt: Fix bad task migration for rt tasks
In reply to Greg Kroah-HartmanFrom: Schspa Shi <[email protected]>
[ Upstream commit feffe5bb274dd3442080ef0e4053746091878799 ]
Commit 95158a89dd50 ("sched,rt: Use the full cpumask for balancing") allows find_lock_lowest_rq() to pick a task with migration disabled. The purpose of the commit is to push the current running task on the CPU that has the migrate_disable() task away.
However, there is a race which allows a migrate_disable() task to be migrated. Consider:
CPU0 CPU1
push_rt_task
check is_migration_disabled(next_task)
task not running and
migration_disabled == 0
find_lock_lowest_rq(next_task, rq);
_double_lock_balance(this_rq, busiest);
raw_spin_rq_unlock(this_rq);
double_rq_lock(this_rq, busiest);
<<wait for busiest rq>>
<wakeup>
task become running
migrate_disable();
<context out>
deactivate_task(rq, next_task, 0);
set_task_cpu(next_task, lowest_rq->cpu);
WARN_ON_ONCE(is_migration_disabled(p));--- kernel/sched/deadline.c | 1 + kernel/sched/rt.c | 4 ++++ 2 files changed, 5 insertions(+)
kernel/sched/deadline.c +1 -0
@@ -2246,6 +2246,7 @@ static struct rq *find_lock_later_rq(struct task_struct *task, struct rq *rq) !cpumask_test_cpu(later_rq->cpu, &task->cpus_mask) || task_on_cpu(rq, task) || !dl_task(task) || + is_migration_disabled(task) || !task_on_rq_queued(task))) {double_unlock_balance (rq, later_rq); later_rq =NULL ;
kernel/sched/rt.c +4 -0
@@ -2000,11 +2000,15 @@ static struct rq *find_lock_lowest_rq(struct task_struct *task, struct rq *rq)* the mean time, task could have * migrated already or had its affinity changed. * Also make sure that it wasn't scheduled on its rq. +* It is possible the task was scheduled, set +* "migrate_disabled" and then got preempted, so we must +* check the task migration disable flag here too. */ if (unlikely (task_rq (task) != rq || !cpumask_test_cpu (lowest_rq->cpu, &task->cpus_mask) ||task_on_cpu (rq, task) || !rt_task (task) || +is_migration_disabled (task) || !task_on_rq_queued (task))) {double_unlock_balance (rq, lowest_rq);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 515/663 Fix addition on an uninitialized variable run
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 54a0dffa62de0c91b406ff32082a121ccfa0d7f1 ]
The variable run is not initialized however it is being accumulated by the return value from the call to ikm_run_monitor. Fix this by initializing run to zero at the start of the function.
--- tools/verification/rv/src/rv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/verification/rv/src/rv.c +1 -1
@@ -74,7 +74,7 @@ static void rv_list(int argc, char **argv)static void rv_mon (int argc,char **argv) {char *monitor_name; -int i, run; +int i, run =0 ;static const char *const usage[] = {"" ,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 516/663 tracing/user_events: Ensure write index cannot be negative
In reply to Greg Kroah-HartmanFrom: Beau Belgrave <[email protected]>
[ Upstream commit cd98c93286a30cc4588dfd02453bec63c2f4acf4 ]
The write index indicates which event the data is for and accesses a per-file array. The index is passed by user processes during write() calls as the first 4 bytes. Ensure that it cannot be negative by returning -EINVAL to prevent out of bounds accesses.
Update ftrace self-test to ensure this occurs properly.
--- kernel/trace/trace_events_user.c | 3 +++ tools/testing/selftests/user_events/ftrace_test.c | 5 +++++ 2 files changed, 8 insertions(+)
kernel/trace/trace_events_user.c +3 -0
@@ -1398,6 +1398,9 @@ static ssize_t user_events_write_core(struct file *file, struct iov_iter *i)if (unlikely (copy_from_iter (&idx,sizeof (idx), i) !=sizeof (idx)))return -EFAULT ; +if (idx <0 ) +return -EINVAL ; +rcu_read_lock_sched (); refs =rcu_dereference_sched (info->refs);
tools/testing/selftests/user_events/ftrace_test.c +5 -0
@@ -294,6 +294,11 @@ TEST_F(user, write_events) {ASSERT_NE (-1 ,writev (self->data_fd, (const struct iovec *)io,3 )); after =trace_bytes ();ASSERT_GT (after, before); + +/* Negative index should fail with EINVAL */ + reg.write_index =-1 ; +ASSERT_EQ (-1 ,writev (self->data_fd, (const struct iovec *)io,3 )); +ASSERT_EQ (EINVAL , errno); } TEST_F(user, write_fault) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 517/663 clk: at91: clk-sam9x60-pll: fix return value check
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit 1bd8e27fd0db0fe7f489213836dcbab92934f8fa ]
sam9x60_frac_pll_compute_mul_frac() can't return zero. Remove the check against zero to reflect this.
--- drivers/clk/at91/clk-sam9x60-pll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/at91/clk-sam9x60-pll.c +1 -1
@@ -668,7 +668,7 @@ sam9x60_clk_register_frac_pll(struct regmap *regmap, spinlock_t *lock, ret =sam9x60_frac_pll_compute_mul_frac (&frac->core,FCORE_MIN , parent_rate, true); -if (ret <=0 ) { +if (ret <0 ) { hw =ERR_PTR (ret); goto free; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 518/663 IB/hifi1: add a null check of kzalloc_node in hfi1_ipoib_txreq_init
In reply to Greg Kroah-HartmanFrom: Kang Chen <[email protected]>
[ Upstream commit c874ad879c2f29ebe040a34b974389875c0d81eb ]
kzalloc_node may fails, check it and do the cleanup.
--- drivers/infiniband/hw/hfi1/ipoib_tx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/infiniband/hw/hfi1/ipoib_tx.c +4 -1
@@ -737,10 +737,13 @@ int hfi1_ipoib_txreq_init(struct hfi1_ipoib_dev_priv *priv) txq->tx_ring.shift =ilog2 (tx_item_size); txq->tx_ring.avail =hfi1_ipoib_ring_hwat (txq); tx_ring = &txq->tx_ring; -for (j =0 ; j < tx_ring_size; j++) +for (j =0 ; j < tx_ring_size; j++) {hfi1_txreq_from_idx (tx_ring, j)->sdma_hdr =kzalloc_node (sizeof (*tx->sdma_hdr),GFP_KERNEL , priv->dd->node); +if (!hfi1_txreq_from_idx (tx_ring, j)->sdma_hdr) + goto free_txqs; + }netif_napi_add_tx (dev, &txq->napi, hfi1_ipoib_poll_tx_ring); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 519/663 RDMA/siw: Fix potential page_array out of range access
In reply to Greg Kroah-HartmanFrom: Daniil Dulov <[email protected]>
[ Upstream commit 271bfcfb83a9f77cbae3d6e1a16e3c14132922f0 ]
When seg is equal to MAX_ARRAY, the loop should break, otherwise it will result in out of range access.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/infiniband/sw/siw/siw_qp_tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/sw/siw/siw_qp_tx.c +1 -1
@@ -558,7 +558,7 @@ static int siw_tx_hdt(struct siw_iwarp_tx *c_tx, struct socket *s) data_len -= plen; fp_off =0 ; -if (++seg > (int )MAX_ARRAY ) { +if (++seg >= (int )MAX_ARRAY ) {siw_dbg_qp (tx_qp (c_tx),"to many fragments\n" );siw_unmap_pages (iov, kmap_mask, seg-1 ); wqe->processed -= c_tx->bytes_unsent;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 520/663 clk: mediatek: mt2712: Add error handling to clk_mt2712_apmixed_probe()
In reply to Greg Kroah-HartmanFrom: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit 20cace1b9d7e33f68f0ee17196bf0df618dbacbe ]
This function was completely missing error handling: add it.
--- drivers/clk/mediatek/clk-mt2712.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/clk/mediatek/clk-mt2712.c +14 -4
@@ -1283,15 +1283,25 @@ static int clk_mt2712_apmixed_probe(struct platform_device *pdev)struct device_node *node = pdev->dev.of_node; clk_data =mtk_alloc_clk_data (CLK_APMIXED_NR_CLK ); +if (!clk_data) +return -ENOMEM ; -mtk_clk_register_plls (node, plls,ARRAY_SIZE (plls), clk_data); + r =mtk_clk_register_plls (node, plls,ARRAY_SIZE (plls), clk_data); +if (r) + goto free_clk_data; r =of_clk_add_hw_provider (node, of_clk_hw_onecell_get, clk_data); +if (r) { +dev_err (&pdev->dev,"Cannot register clock provider: %d\n" , r); + goto unregister_plls; + } -if (r !=0 ) -pr_err ("%s(): could not register clock provider: %d\n" , - __func__, r); +return 0 ; +unregister_plls: +mtk_clk_unregister_plls (plls,ARRAY_SIZE (plls), clk_data); +free_clk_data: +mtk_free_clk_data (clk_data);return r; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 521/663 clk: mediatek: Consistently use GATE_MTK() macro
In reply to Greg Kroah-HartmanFrom: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit 4c85e20b656607897e3bb06ff565822fa4b4de95 ]
All the various MediaTek clock drivers are, in a way or another, redefining the GATE_MTK() macro with different names: while some are doing that by actually using GATE_MTK(), others are copying it entirely (hence, entirely redefining it).
Change all clock drivers to always and consistently use this macro.
Stable-dep-of: fa8c0d01df62 ("clk: mediatek: mt7622: Properly use CLK_IS_CRITICAL flag")
--- drivers/clk/mediatek/clk-mt2701-aud.c | 40 +++-------- drivers/clk/mediatek/clk-mt2701-bdp.c | 20 ++---- drivers/clk/mediatek/clk-mt2701-eth.c | 10 +-- drivers/clk/mediatek/clk-mt2701-g3d.c | 10 +-- drivers/clk/mediatek/clk-mt2701-hif.c | 10 +-- drivers/clk/mediatek/clk-mt2701-img.c | 10 +-- drivers/clk/mediatek/clk-mt2701-mm.c | 20 ++---- drivers/clk/mediatek/clk-mt2701-vdec.c | 20 ++---- drivers/clk/mediatek/clk-mt2701.c | 40 +++-------- drivers/clk/mediatek/clk-mt2712-bdp.c | 10 +-- drivers/clk/mediatek/clk-mt2712-img.c | 10 +-- drivers/clk/mediatek/clk-mt2712-jpgdec.c | 10 +-- drivers/clk/mediatek/clk-mt2712-mfg.c | 10 +-- drivers/clk/mediatek/clk-mt2712-mm.c | 34 +++------ drivers/clk/mediatek/clk-mt2712-vdec.c | 20 ++---- drivers/clk/mediatek/clk-mt2712-venc.c | 10 +-- drivers/clk/mediatek/clk-mt2712.c | 60 ++++------------ drivers/clk/mediatek/clk-mt6765-audio.c | 20 ++---- drivers/clk/mediatek/clk-mt6765-cam.c | 10 +-- drivers/clk/mediatek/clk-mt6765-img.c | 10 +-- drivers/clk/mediatek/clk-mt6765-mipi0a.c | 10 +-- drivers/clk/mediatek/clk-mt6765-mm.c | 10 +-- drivers/clk/mediatek/clk-mt6765-vcodec.c | 10 +-- drivers/clk/mediatek/clk-mt6765.c | 80 +++++----------------- drivers/clk/mediatek/clk-mt6797-img.c | 10 +-- drivers/clk/mediatek/clk-mt6797-mm.c | 20 ++---- drivers/clk/mediatek/clk-mt6797-vdec.c | 20 ++---- drivers/clk/mediatek/clk-mt6797-venc.c | 10 +-- drivers/clk/mediatek/clk-mt6797.c | 42 ++++-------- drivers/clk/mediatek/clk-mt7622-aud.c | 40 +++-------- drivers/clk/mediatek/clk-mt7622-eth.c | 20 ++---- drivers/clk/mediatek/clk-mt7622-hif.c | 20 ++---- drivers/clk/mediatek/clk-mt7622.c | 61 ++++------------- drivers/clk/mediatek/clk-mt7629-eth.c | 20 ++---- drivers/clk/mediatek/clk-mt7629-hif.c | 20 ++---- drivers/clk/mediatek/clk-mt7629.c | 40 +++-------- drivers/clk/mediatek/clk-mt7986-eth.c | 24 ++----- drivers/clk/mediatek/clk-mt7986-infracfg.c | 24 ++----- drivers/clk/mediatek/clk-mt8135.c | 30 ++------ drivers/clk/mediatek/clk-mt8167-aud.c | 11 +-- drivers/clk/mediatek/clk-mt8167-img.c | 10 +-- drivers/clk/mediatek/clk-mt8167-mfgcfg.c | 10 +-- drivers/clk/mediatek/clk-mt8167-mm.c | 22 ++---- drivers/clk/mediatek/clk-mt8167-vdec.c | 20 ++---- drivers/clk/mediatek/clk-mt8173-mm.c | 22 ++---- drivers/clk/mediatek/clk-mt8516-aud.c | 10 +-- drivers/clk/mediatek/clk-mt8516.c | 60 ++++------------ 47 files changed, 222 insertions(+), 838 deletions(-)
drivers/clk/mediatek/clk-mt2701-aud.c +8 -32
@@ -15,41 +15,17 @@#include <dt-bindings/clock/mt2701-clk.h> -#define GATE_AUDIO0 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &audio0_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr, \ - } +#define GATE_AUDIO0 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &audio0_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr) -#define GATE_AUDIO1 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &audio1_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr, \ - } +#define GATE_AUDIO1 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &audio1_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr) -#define GATE_AUDIO2 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &audio2_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr, \ - } +#define GATE_AUDIO2 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &audio2_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr) -#define GATE_AUDIO3 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &audio3_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr, \ - } +#define GATE_AUDIO3 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &audio3_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr)static const struct mtk_gate_regs audio0_cg_regs = { .set_ofs =0x0 ,
drivers/clk/mediatek/clk-mt2701-bdp.c +4 -16
@@ -24,23 +24,11 @@ static const struct mtk_gate_regs bdp1_cg_regs = { .sta_ofs = 0x0110, }; -#define GATE_BDP0 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &bdp0_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr_inv, \ - } +#define GATE_BDP0 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &bdp0_cg_regs, _shift, &mtk_clk_gate_ops_setclr_inv) -#define GATE_BDP1 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &bdp1_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr_inv, \ - } +#define GATE_BDP1 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &bdp1_cg_regs, _shift, &mtk_clk_gate_ops_setclr_inv)static const struct mtk_gate bdp_clks[] = {GATE_BDP0 (CLK_BDP_BRG_BA ,"brg_baclk" ,"mm_sel" ,0 ),
drivers/clk/mediatek/clk-mt2701-eth.c +2 -8
@@ -16,14 +16,8 @@ static const struct mtk_gate_regs eth_cg_regs = { .sta_ofs = 0x0030, }; -#define GATE_ETH (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = ð_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr_inv, \ - } +#define GATE_ETH (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, ð_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr_inv)static const struct mtk_gate eth_clks[] = {GATE_ETH (CLK_ETHSYS_HSDMA ,"hsdma_clk" ,"ethif_sel" ,5 ),
drivers/clk/mediatek/clk-mt2701-g3d.c +2 -8
@@ -16,14 +16,8 @@#include <dt-bindings/clock/mt2701-clk.h> -#define GATE_G3D (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &g3d_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } +#define GATE_G3D (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &g3d_cg_regs, _shift, &mtk_clk_gate_ops_setclr)static const struct mtk_gate_regs g3d_cg_regs = { .sta_ofs =0x0 ,
drivers/clk/mediatek/clk-mt2701-hif.c +2 -8
@@ -16,14 +16,8 @@ static const struct mtk_gate_regs hif_cg_regs = { .sta_ofs = 0x0030, }; -#define GATE_HIF (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &hif_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr_inv, \ - } +#define GATE_HIF (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &hif_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr_inv)static const struct mtk_gate hif_clks[] = {GATE_HIF (CLK_HIFSYS_USB0PHY ,"usb0_phy_clk" ,"ethpll_500m_ck" ,21 ),
drivers/clk/mediatek/clk-mt2701-img.c +2 -8
@@ -18,14 +18,8 @@ static const struct mtk_gate_regs img_cg_regs = { .sta_ofs = 0x0000, }; -#define GATE_IMG (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &img_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } +#define GATE_IMG (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &img_cg_regs, _shift, &mtk_clk_gate_ops_setclr)static const struct mtk_gate img_clks[] = {GATE_IMG (CLK_IMG_SMI_COMM ,"img_smi_comm" ,"mm_sel" ,0 ),
drivers/clk/mediatek/clk-mt2701-mm.c +4 -16
@@ -24,23 +24,11 @@ static const struct mtk_gate_regs disp1_cg_regs = { .sta_ofs = 0x0110, }; -#define GATE_DISP0 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &disp0_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } +#define GATE_DISP0 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &disp0_cg_regs, _shift, &mtk_clk_gate_ops_setclr) -#define GATE_DISP1 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &disp1_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } +#define GATE_DISP1 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &disp1_cg_regs, _shift, &mtk_clk_gate_ops_setclr)static const struct mtk_gate mm_clks[] = {GATE_DISP0 (CLK_MM_SMI_COMMON ,"mm_smi_comm" ,"mm_sel" ,0 ),
drivers/clk/mediatek/clk-mt2701-vdec.c +4 -16
@@ -24,23 +24,11 @@ static const struct mtk_gate_regs vdec1_cg_regs = { .sta_ofs = 0x0008, }; -#define GATE_VDEC0 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &vdec0_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr_inv, \ - } +#define GATE_VDEC0 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &vdec0_cg_regs, _shift, &mtk_clk_gate_ops_setclr_inv) -#define GATE_VDEC1 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &vdec1_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr_inv, \ - } +#define GATE_VDEC1 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &vdec1_cg_regs, _shift, &mtk_clk_gate_ops_setclr_inv)static const struct mtk_gate vdec_clks[] = {GATE_VDEC0 (CLK_VDEC_CKGEN ,"vdec_cken" ,"vdec_sel" ,0 ),
drivers/clk/mediatek/clk-mt2701.c +8 -32
@@ -636,14 +636,8 @@ static const struct mtk_gate_regs top_aud_cg_regs = { .sta_ofs = 0x012C, }; -#define GATE_TOP_AUD (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &top_aud_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr, \ - } +#define GATE_TOP_AUD (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &top_aud_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr)static const struct mtk_gate top_clks[] = { GATE_TOP_AUD(CLK_TOP_AUD_48K_TIMING, "a1sys_hp_ck", "aud_mux1_div",
@@ -701,14 +695,8 @@ static const struct mtk_gate_regs infra_cg_regs = { .sta_ofs = 0x0048, }; -#define GATE_ICG (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &infra_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } +#define GATE_ICG (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &infra_cg_regs, _shift, &mtk_clk_gate_ops_setclr)static const struct mtk_gate infra_clks[] = {GATE_ICG (CLK_INFRA_DBG ,"dbgclk" ,"axi_sel" ,0 ),
@@ -822,23 +810,11 @@ static const struct mtk_gate_regs peri1_cg_regs = { .sta_ofs = 0x001c, }; -#define GATE_PERI0 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &peri0_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } +#define GATE_PERI0 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &peri0_cg_regs, _shift, &mtk_clk_gate_ops_setclr) -#define GATE_PERI1 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &peri1_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } +#define GATE_PERI1 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &peri1_cg_regs, _shift, &mtk_clk_gate_ops_setclr)static const struct mtk_gate peri_clks[] = {GATE_PERI0 (CLK_PERI_USB0_MCU ,"usb0_mcu_ck" ,"axi_sel" ,31 ),
drivers/clk/mediatek/clk-mt2712-bdp.c +2 -8
@@ -18,14 +18,8 @@ static const struct mtk_gate_regs bdp_cg_regs = { .sta_ofs = 0x100, }; -#define GATE_BDP (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &bdp_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr, \ - } +#define GATE_BDP (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &bdp_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr)static const struct mtk_gate bdp_clks[] = {GATE_BDP (CLK_BDP_BRIDGE_B ,"bdp_bridge_b" ,"mm_sel" ,0 ),
drivers/clk/mediatek/clk-mt2712-img.c +2 -8
@@ -18,14 +18,8 @@ static const struct mtk_gate_regs img_cg_regs = { .sta_ofs = 0x0, }; -#define GATE_IMG (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &img_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr, \ - } +#define GATE_IMG (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &img_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr)static const struct mtk_gate img_clks[] = {GATE_IMG (CLK_IMG_SMI_LARB2 ,"img_smi_larb2" ,"mm_sel" ,0 ),
drivers/clk/mediatek/clk-mt2712-jpgdec.c +2 -8
@@ -18,14 +18,8 @@ static const struct mtk_gate_regs jpgdec_cg_regs = { .sta_ofs = 0x0, }; -#define GATE_JPGDEC (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &jpgdec_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr_inv, \ - } +#define GATE_JPGDEC (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &jpgdec_cg_regs, _shift, &mtk_clk_gate_ops_setclr_inv)static const struct mtk_gate jpgdec_clks[] = {GATE_JPGDEC (CLK_JPGDEC_JPGDEC1 ,"jpgdec_jpgdec1" ,"jpgdec_sel" ,0 ),
drivers/clk/mediatek/clk-mt2712-mfg.c +2 -8
@@ -18,14 +18,8 @@ static const struct mtk_gate_regs mfg_cg_regs = { .sta_ofs = 0x0, }; -#define GATE_MFG (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &mfg_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } +#define GATE_MFG (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &mfg_cg_regs, _shift, &mtk_clk_gate_ops_setclr)static const struct mtk_gate mfg_clks[] = {GATE_MFG (CLK_MFG_BG3D ,"mfg_bg3d" ,"mfg_sel" ,0 ),
drivers/clk/mediatek/clk-mt2712-mm.c +8 -26
@@ -30,32 +30,14 @@ static const struct mtk_gate_regs mm2_cg_regs = { .sta_ofs = 0x220, }; -#define GATE_MM0 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &mm0_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } - -#define GATE_MM1 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &mm1_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } - -#define GATE_MM2 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &mm2_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } +#define GATE_MM0 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &mm0_cg_regs, _shift, &mtk_clk_gate_ops_setclr) + +#define GATE_MM1 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &mm1_cg_regs, _shift, &mtk_clk_gate_ops_setclr) + +#define GATE_MM2 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &mm2_cg_regs, _shift, &mtk_clk_gate_ops_setclr)static const struct mtk_gate mm_clks[] = {/* MM0 */
drivers/clk/mediatek/clk-mt2712-vdec.c +4 -16
@@ -24,23 +24,11 @@ static const struct mtk_gate_regs vdec1_cg_regs = { .sta_ofs = 0x8, }; -#define GATE_VDEC0 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &vdec0_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr_inv, \ - } +#define GATE_VDEC0 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &vdec0_cg_regs, _shift, &mtk_clk_gate_ops_setclr_inv) -#define GATE_VDEC1 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &vdec1_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr_inv, \ - } +#define GATE_VDEC1 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &vdec1_cg_regs, _shift, &mtk_clk_gate_ops_setclr_inv)static const struct mtk_gate vdec_clks[] = {/* VDEC0 */
drivers/clk/mediatek/clk-mt2712-venc.c +2 -8
@@ -18,14 +18,8 @@ static const struct mtk_gate_regs venc_cg_regs = { .sta_ofs = 0x0, }; -#define GATE_VENC (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &venc_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr_inv, \ - } +#define GATE_VENC (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &venc_cg_regs, _shift, &mtk_clk_gate_ops_setclr_inv)static const struct mtk_gate venc_clks[] = {GATE_VENC (CLK_VENC_SMI_COMMON_CON ,"venc_smi" ,"mm_sel" ,0 ),
drivers/clk/mediatek/clk-mt2712.c +12 -48
81 lines not on this page · raw message
drivers/clk/mediatek/clk-mt6765-audio.c +4 -16
@@ -24,23 +24,11 @@ static const struct mtk_gate_regs audio1_cg_regs = { .sta_ofs = 0x4, }; -#define GATE_AUDIO0 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &audio0_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr, \ - } +#define GATE_AUDIO0 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &audio0_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr) -#define GATE_AUDIO1 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &audio1_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr, \ - } +#define GATE_AUDIO1 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &audio1_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr)static const struct mtk_gate audio_clks[] = {/* AUDIO0 */
drivers/clk/mediatek/clk-mt6765-cam.c +2 -8
@@ -18,14 +18,8 @@ static const struct mtk_gate_regs cam_cg_regs = { .sta_ofs = 0x0, }; -#define GATE_CAM (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &cam_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } +#define GATE_CAM (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &cam_cg_regs, _shift, &mtk_clk_gate_ops_setclr)static const struct mtk_gate cam_clks[] = {GATE_CAM (CLK_CAM_LARB3 ,"cam_larb3" ,"mm_ck" ,0 ),
drivers/clk/mediatek/clk-mt6765-img.c +2 -8
@@ -18,14 +18,8 @@ static const struct mtk_gate_regs img_cg_regs = { .sta_ofs = 0x0, }; -#define GATE_IMG (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &img_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } +#define GATE_IMG (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &img_cg_regs, _shift, &mtk_clk_gate_ops_setclr)static const struct mtk_gate img_clks[] = {GATE_IMG (CLK_IMG_LARB2 ,"img_larb2" ,"mm_ck" ,0 ),
drivers/clk/mediatek/clk-mt6765-mipi0a.c +2 -8
@@ -18,14 +18,8 @@ static const struct mtk_gate_regs mipi0a_cg_regs = { .sta_ofs = 0x80, }; -#define GATE_MIPI0A (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &mipi0a_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr_inv, \ - } +#define GATE_MIPI0A (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &mipi0a_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr_inv)static const struct mtk_gate mipi0a_clks[] = { GATE_MIPI0A(CLK_MIPI0A_CSR_CSI_EN_0A,
drivers/clk/mediatek/clk-mt6765-mm.c +2 -8
@@ -18,14 +18,8 @@ static const struct mtk_gate_regs mm_cg_regs = { .sta_ofs = 0x100, }; -#define GATE_MM (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &mm_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } +#define GATE_MM (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &mm_cg_regs, _shift, &mtk_clk_gate_ops_setclr)static const struct mtk_gate mm_clks[] = {/* MM */
drivers/clk/mediatek/clk-mt6765-vcodec.c +2 -8
@@ -18,14 +18,8 @@ static const struct mtk_gate_regs venc_cg_regs = { .sta_ofs = 0x0, }; -#define GATE_VENC (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &venc_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr_inv, \ - } +#define GATE_VENC (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &venc_cg_regs, _shift, &mtk_clk_gate_ops_setclr_inv)static const struct mtk_gate venc_clks[] = {GATE_VENC (CLK_VENC_SET0_LARB ,"venc_set0_larb" ,"mm_ck" ,0 ),
drivers/clk/mediatek/clk-mt6765.c +16 -64
103 lines not on this page · raw message
drivers/clk/mediatek/clk-mt6797-img.c +2 -8
@@ -16,14 +16,8 @@ static const struct mtk_gate_regs img_cg_regs = { .sta_ofs = 0x0000, }; -#define GATE_IMG (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &img_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } +#define GATE_IMG (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &img_cg_regs, _shift, &mtk_clk_gate_ops_setclr)static const struct mtk_gate img_clks[] = {GATE_IMG (CLK_IMG_FDVT ,"img_fdvt" ,"mm_sel" ,11 ),
drivers/clk/mediatek/clk-mt6797-mm.c +4 -16
@@ -23,23 +23,11 @@ static const struct mtk_gate_regs mm1_cg_regs = { .sta_ofs = 0x0110, }; -#define GATE_MM0 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &mm0_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ -} +#define GATE_MM0 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &mm0_cg_regs, _shift, &mtk_clk_gate_ops_setclr) -#define GATE_MM1 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &mm1_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ -} +#define GATE_MM1 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &mm1_cg_regs, _shift, &mtk_clk_gate_ops_setclr)static const struct mtk_gate mm_clks[] = {GATE_MM0 (CLK_MM_SMI_COMMON ,"mm_smi_common" ,"mm_sel" ,0 ),
drivers/clk/mediatek/clk-mt6797-vdec.c +4 -16
@@ -24,23 +24,11 @@ static const struct mtk_gate_regs vdec1_cg_regs = { .sta_ofs = 0x0008, }; -#define GATE_VDEC0 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &vdec0_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr_inv, \ -} +#define GATE_VDEC0 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &vdec0_cg_regs, _shift, &mtk_clk_gate_ops_setclr_inv) -#define GATE_VDEC1 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &vdec1_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr_inv, \ -} +#define GATE_VDEC1 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &vdec1_cg_regs, _shift, &mtk_clk_gate_ops_setclr_inv)static const struct mtk_gate vdec_clks[] = {GATE_VDEC0 (CLK_VDEC_CKEN_ENG ,"vdec_cken_eng" ,"vdec_sel" ,8 ),
drivers/clk/mediatek/clk-mt6797-venc.c +2 -8
@@ -18,14 +18,8 @@ static const struct mtk_gate_regs venc_cg_regs = { .sta_ofs = 0x0000, }; -#define GATE_VENC (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &venc_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr_inv, \ - } +#define GATE_VENC (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &venc_cg_regs, _shift, &mtk_clk_gate_ops_setclr_inv)static const struct mtk_gate venc_clks[] = {GATE_VENC (CLK_VENC_0 ,"venc_0" ,"mm_sel" ,0 ),
drivers/clk/mediatek/clk-mt6797.c +12 -30
52 lines not on this page · raw message
drivers/clk/mediatek/clk-mt7622-aud.c +8 -32
@@ -16,41 +16,17 @@#include <dt-bindings/clock/mt7622-clk.h> -#define GATE_AUDIO0 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &audio0_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr, \ - } +#define GATE_AUDIO0 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &audio0_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr) -#define GATE_AUDIO1 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &audio1_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr, \ - } +#define GATE_AUDIO1 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &audio1_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr) -#define GATE_AUDIO2 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &audio2_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr, \ - } +#define GATE_AUDIO2 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &audio2_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr) -#define GATE_AUDIO3 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &audio3_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr, \ - } +#define GATE_AUDIO3 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &audio3_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr)static const struct mtk_gate_regs audio0_cg_regs = { .set_ofs =0x0 ,
drivers/clk/mediatek/clk-mt7622-eth.c +4 -16
@@ -16,14 +16,8 @@#include <dt-bindings/clock/mt7622-clk.h> -#define GATE_ETH (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = ð_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr_inv, \ - } +#define GATE_ETH (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, ð_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr_inv)static const struct mtk_gate_regs eth_cg_regs = { .set_ofs =0x30 ,
@@ -45,14 +39,8 @@ static const struct mtk_gate_regs sgmii_cg_regs = { .sta_ofs = 0xE4, }; -#define GATE_SGMII (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &sgmii_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr_inv, \ - } +#define GATE_SGMII (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &sgmii_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr_inv)static const struct mtk_gate sgmii_clks[] = { GATE_SGMII(CLK_SGMII_TX250M_EN, "sgmii_tx250m_en",
drivers/clk/mediatek/clk-mt7622-hif.c +4 -16
@@ -16,23 +16,11 @@#include <dt-bindings/clock/mt7622-clk.h> -#define GATE_PCIE (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &pcie_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr_inv, \ - } +#define GATE_PCIE (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &pcie_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr_inv) -#define GATE_SSUSB (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &ssusb_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr_inv, \ - } +#define GATE_SSUSB (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &ssusb_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr_inv)static const struct mtk_gate_regs pcie_cg_regs = { .set_ofs =0x30 ,
drivers/clk/mediatek/clk-mt7622.c +13 -48
72 lines not on this page · raw message
drivers/clk/mediatek/clk-mt7629-eth.c +4 -16
@@ -16,14 +16,8 @@#include <dt-bindings/clock/mt7629-clk.h> -#define GATE_ETH (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = ð_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr_inv, \ - } +#define GATE_ETH (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, ð_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr_inv)static const struct mtk_gate_regs eth_cg_regs = { .set_ofs =0x30 ,
@@ -45,14 +39,8 @@ static const struct mtk_gate_regs sgmii_cg_regs = { .sta_ofs = 0xE4, }; -#define GATE_SGMII (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &sgmii_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr_inv, \ - } +#define GATE_SGMII (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &sgmii_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr_inv)static const struct mtk_gate sgmii_clks[2 ][4 ] = { {
drivers/clk/mediatek/clk-mt7629-hif.c +4 -16
@@ -16,23 +16,11 @@#include <dt-bindings/clock/mt7629-clk.h> -#define GATE_PCIE (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &pcie_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr_inv, \ - } +#define GATE_PCIE (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &pcie_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr_inv) -#define GATE_SSUSB (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &ssusb_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr_inv, \ - } +#define GATE_SSUSB (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &ssusb_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr_inv)static const struct mtk_gate_regs pcie_cg_regs = { .set_ofs =0x30 ,
drivers/clk/mediatek/clk-mt7629.c +8 -32
@@ -50,41 +50,17 @@ _pd_reg, _pd_shift, _tuner_reg, _pcw_reg, _pcw_shift, \ NULL, "clk20m") -#define GATE_APMIXED (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &apmixed_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr_inv, \ - } +#define GATE_APMIXED (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &apmixed_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr_inv) -#define GATE_INFRA (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &infra_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } +#define GATE_INFRA (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &infra_cg_regs, _shift, &mtk_clk_gate_ops_setclr) -#define GATE_PERI0 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &peri0_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } +#define GATE_PERI0 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &peri0_cg_regs, _shift, &mtk_clk_gate_ops_setclr) -#define GATE_PERI1 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &peri1_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } +#define GATE_PERI1 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &peri1_cg_regs, _shift, &mtk_clk_gate_ops_setclr)static DEFINE_SPINLOCK (mt7629_clk_lock);
drivers/clk/mediatek/clk-mt7986-eth.c +6 -18
@@ -22,12 +22,8 @@ static const struct mtk_gate_regs sgmii0_cg_regs = { .sta_ofs = 0xe4, }; -#define GATE_SGMII0 (_id, _name, _parent, _shift) \ - { \ - .id = _id, .name = _name, .parent_name = _parent, \ - .regs = &sgmii0_cg_regs, .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr_inv, \ - } +#define GATE_SGMII0 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &sgmii0_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr_inv)static const struct mtk_gate sgmii0_clks[]__initconst = {GATE_SGMII0 (CLK_SGMII0_TX250M_EN ,"sgmii0_tx250m_en" ,"top_xtal" ,2 ),
@@ -42,12 +38,8 @@ static const struct mtk_gate_regs sgmii1_cg_regs = { .sta_ofs = 0xe4, }; -#define GATE_SGMII1 (_id, _name, _parent, _shift) \ - { \ - .id = _id, .name = _name, .parent_name = _parent, \ - .regs = &sgmii1_cg_regs, .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr_inv, \ - } +#define GATE_SGMII1 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &sgmii1_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr_inv)static const struct mtk_gate sgmii1_clks[]__initconst = {GATE_SGMII1 (CLK_SGMII1_TX250M_EN ,"sgmii1_tx250m_en" ,"top_xtal" ,2 ),
@@ -62,12 +54,8 @@ static const struct mtk_gate_regs eth_cg_regs = { .sta_ofs = 0x30, }; -#define GATE_ETH (_id, _name, _parent, _shift) \ - { \ - .id = _id, .name = _name, .parent_name = _parent, \ - .regs = ð_cg_regs, .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr_inv, \ - } +#define GATE_ETH (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, ð_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr_inv)static const struct mtk_gate eth_clks[]__initconst = {GATE_ETH (CLK_ETH_FE_EN ,"eth_fe_en" ,"netsys_2x_sel" ,6 ),
drivers/clk/mediatek/clk-mt7986-infracfg.c +6 -18
@@ -87,26 +87,14 @@ static const struct mtk_gate_regs infra2_cg_regs = { .sta_ofs = 0x68, }; -#define GATE_INFRA0 (_id, _name, _parent, _shift) \ - { \ - .id = _id, .name = _name, .parent_name = _parent, \ - .regs = &infra0_cg_regs, .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } +#define GATE_INFRA0 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &infra0_cg_regs, _shift, &mtk_clk_gate_ops_setclr) -#define GATE_INFRA1 (_id, _name, _parent, _shift) \ - { \ - .id = _id, .name = _name, .parent_name = _parent, \ - .regs = &infra1_cg_regs, .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } +#define GATE_INFRA1 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &infra1_cg_regs, _shift, &mtk_clk_gate_ops_setclr) -#define GATE_INFRA2 (_id, _name, _parent, _shift) \ - { \ - .id = _id, .name = _name, .parent_name = _parent, \ - .regs = &infra2_cg_regs, .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } +#define GATE_INFRA2 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &infra2_cg_regs, _shift, &mtk_clk_gate_ops_setclr)static const struct mtk_gate infra_clks[] = {/* INFRA0 */
drivers/clk/mediatek/clk-mt8135.c +6 -24
@@ -401,14 +401,8 @@ static const struct mtk_gate_regs infra_cg_regs = { .sta_ofs = 0x0048, }; -#define GATE_ICG (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &infra_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } +#define GATE_ICG (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &infra_cg_regs, _shift, &mtk_clk_gate_ops_setclr)static const struct mtk_gate infra_clks[]__initconst = {GATE_ICG (CLK_INFRA_PMIC_WRAP ,"pmic_wrap_ck" ,"axi_sel" ,23 ),
@@ -438,23 +432,11 @@ static const struct mtk_gate_regs peri1_cg_regs = { .sta_ofs = 0x001c, }; -#define GATE_PERI0 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &peri0_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } +#define GATE_PERI0 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &peri0_cg_regs, _shift, &mtk_clk_gate_ops_setclr) -#define GATE_PERI1 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &peri1_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } +#define GATE_PERI1 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &peri1_cg_regs, _shift, &mtk_clk_gate_ops_setclr)static const struct mtk_gate peri_gates[]__initconst = {/* PERI0 */
drivers/clk/mediatek/clk-mt8167-aud.c +3 -8
@@ -23,14 +23,9 @@ static const struct mtk_gate_regs aud_cg_regs = { .sta_ofs = 0x0, }; -#define GATE_AUD (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &aud_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr, \ - } +#define GATE_AUD (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &aud_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr) +static const struct mtk_gate aud_clks[]__initconst = {GATE_AUD (CLK_AUD_AFE ,"aud_afe" ,"clk26m_ck" ,2 ),
drivers/clk/mediatek/clk-mt8167-img.c +2 -8
@@ -23,14 +23,8 @@ static const struct mtk_gate_regs img_cg_regs = { .sta_ofs = 0x0, }; -#define GATE_IMG (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &img_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } +#define GATE_IMG (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &img_cg_regs, _shift, &mtk_clk_gate_ops_setclr)static const struct mtk_gate img_clks[]__initconst = {GATE_IMG (CLK_IMG_LARB1_SMI ,"img_larb1_smi" ,"smi_mm" ,0 ),
drivers/clk/mediatek/clk-mt8167-mfgcfg.c +2 -8
@@ -23,14 +23,8 @@ static const struct mtk_gate_regs mfg_cg_regs = { .sta_ofs = 0x0, }; -#define GATE_MFG (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &mfg_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } +#define GATE_MFG (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &mfg_cg_regs, _shift, &mtk_clk_gate_ops_setclr)static const struct mtk_gate mfg_clks[]__initconst = {GATE_MFG (CLK_MFG_BAXI ,"mfg_baxi" ,"ahb_infra_sel" ,0 ),
drivers/clk/mediatek/clk-mt8167-mm.c +5 -17
@@ -29,23 +29,11 @@ static const struct mtk_gate_regs mm1_cg_regs = { .sta_ofs = 0x110, }; -#define GATE_MM0 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &mm0_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } - -#define GATE_MM1 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &mm1_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } +#define GATE_MM0 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &mm0_cg_regs, _shift, &mtk_clk_gate_ops_setclr) + +#define GATE_MM1 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &mm1_cg_regs, _shift, &mtk_clk_gate_ops_setclr)static const struct mtk_gate mm_clks[] = {/* MM0 */
drivers/clk/mediatek/clk-mt8167-vdec.c +4 -16
@@ -29,23 +29,11 @@ static const struct mtk_gate_regs vdec1_cg_regs = { .sta_ofs = 0x8, }; -#define GATE_VDEC0_I (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &vdec0_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr_inv, \ - } +#define GATE_VDEC0_I (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &vdec0_cg_regs, _shift, &mtk_clk_gate_ops_setclr_inv) -#define GATE_VDEC1_I (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &vdec1_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr_inv, \ - } +#define GATE_VDEC1_I (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &vdec1_cg_regs, _shift, &mtk_clk_gate_ops_setclr_inv)static const struct mtk_gate vdec_clks[]__initconst = {/* VDEC0 */
drivers/clk/mediatek/clk-mt8173-mm.c +5 -17
@@ -25,23 +25,11 @@ static const struct mtk_gate_regs mm1_cg_regs = { .sta_ofs = 0x0110, }; -#define GATE_MM0 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &mm0_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } - -#define GATE_MM1 (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &mm1_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_setclr, \ - } +#define GATE_MM0 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &mm0_cg_regs, _shift, &mtk_clk_gate_ops_setclr) + +#define GATE_MM1 (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &mm1_cg_regs, _shift, &mtk_clk_gate_ops_setclr)static const struct mtk_gate mt8173_mm_clks[] = {/* MM0 */
drivers/clk/mediatek/clk-mt8516-aud.c +2 -8
@@ -22,14 +22,8 @@ static const struct mtk_gate_regs aud_cg_regs = { .sta_ofs = 0x0, }; -#define GATE_AUD (_id, _name, _parent, _shift) { \ - .id = _id, \ - .name = _name, \ - .parent_name = _parent, \ - .regs = &aud_cg_regs, \ - .shift = _shift, \ - .ops = &mtk_clk_gate_ops_no_setclr, \ - } +#define GATE_AUD (_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &aud_cg_regs, _shift, &mtk_clk_gate_ops_no_setclr)static const struct mtk_gate aud_clks[]__initconst = {GATE_AUD (CLK_AUD_AFE ,"aud_afe" ,"clk26m_ck" ,2 ),
drivers/clk/mediatek/clk-mt8516.c +12 -48
71 lines not on this page · raw message
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 522/663 clk: mediatek: mt7622: Properly use CLK_IS_CRITICAL flag
In reply to Greg Kroah-HartmanFrom: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit fa8c0d01df62130ff596d560380a6f844f62639e ]
Instead of calling clk_prepare_enable() for clocks that shall stay enabled, use the CLK_IS_CRITICAL flag, which purpose is exactly that.
--- drivers/clk/mediatek/clk-mt7622.c | 35 +++++++++++++------------------ 1 file changed, 15 insertions(+), 20 deletions(-)
drivers/clk/mediatek/clk-mt7622.c +15 -20
@@ -50,9 +50,9 @@ _pd_reg, _pd_shift, _tuner_reg, _pcw_reg, _pcw_shift, \ NULL, "clkxtal") -#define GATE_APMIXED (_id, _name, _parent, _shift) \ - GATE_MTK(_id, _name, _parent, &apmixed_cg_regs, _shift, \ - &mtk_clk_gate_ops_no_setclr_inv) +#define GATE_APMIXED_AO (_id, _name, _parent, _shift) \ + GATE_MTK_FLAGS(_id, _name, _parent, &apmixed_cg_regs, _shift, \ + &mtk_clk_gate_ops_no_setclr_inv, CLK_IS_CRITICAL)#define GATE_INFRA (_id, _name, _parent, _shift) \ GATE_MTK(_id, _name, _parent, &infra_cg_regs, _shift, &mtk_clk_gate_ops_setclr)
@@ -66,6 +66,10 @@#define GATE_PERI0 (_id, _name, _parent, _shift) \ GATE_MTK(_id, _name, _parent, &peri0_cg_regs, _shift, &mtk_clk_gate_ops_setclr) +#define GATE_PERI0_AO (_id, _name, _parent, _shift) \ + GATE_MTK_FLAGS(_id, _name, _parent, &peri0_cg_regs, _shift, \ + &mtk_clk_gate_ops_setclr, CLK_IS_CRITICAL) +#define GATE_PERI1 (_id, _name, _parent, _shift) \ GATE_MTK(_id, _name, _parent, &peri1_cg_regs, _shift, &mtk_clk_gate_ops_setclr)
@@ -315,7 +319,7 @@ static const struct mtk_pll_data plls[] = { };static const struct mtk_gate apmixed_clks[] = { -GATE_APMIXED (CLK_APMIXED_MAIN_CORE_EN ,"main_core_en" ,"mainpll" ,5 ), +GATE_APMIXED_AO (CLK_APMIXED_MAIN_CORE_EN ,"main_core_en" ,"mainpll" ,5 ), };static const struct mtk_gate infra_clks[] = {
@@ -450,7 +454,7 @@ static const struct mtk_gate peri_clks[] = {GATE_PERI0 (CLK_PERI_AP_DMA_PD ,"peri_ap_dma_pd" ,"axi_sel" ,12 ),GATE_PERI0 (CLK_PERI_MSDC30_0_PD ,"peri_msdc30_0" ,"msdc30_0_sel" ,13 ),GATE_PERI0 (CLK_PERI_MSDC30_1_PD ,"peri_msdc30_1" ,"msdc30_1_sel" ,14 ), -GATE_PERI0 (CLK_PERI_UART0_PD ,"peri_uart0_pd" ,"axi_sel" ,17 ), +GATE_PERI0_AO (CLK_PERI_UART0_PD ,"peri_uart0_pd" ,"axi_sel" ,17 ),GATE_PERI0 (CLK_PERI_UART1_PD ,"peri_uart1_pd" ,"axi_sel" ,18 ),GATE_PERI0 (CLK_PERI_UART2_PD ,"peri_uart2_pd" ,"axi_sel" ,19 ), GATE_PERI0(CLK_PERI_UART3_PD, "peri_uart3_pd", "axi_sel", 20),
@@ -478,12 +482,12 @@ static struct mtk_composite infra_muxes[] = {static struct mtk_composite top_muxes[] = {/* CLK_CFG_0 */ -MUX_GATE (CLK_TOP_AXI_SEL ,"axi_sel" , axi_parents, -0x040 ,0 ,3 ,7 ), -MUX_GATE (CLK_TOP_MEM_SEL ,"mem_sel" , mem_parents, -0x040 ,8 ,1 ,15 ), -MUX_GATE (CLK_TOP_DDRPHYCFG_SEL ,"ddrphycfg_sel" , ddrphycfg_parents, -0x040 ,16 ,1 ,23 ), +MUX_GATE_FLAGS (CLK_TOP_AXI_SEL ,"axi_sel" , axi_parents, +0x040 ,0 ,3 ,7 ,CLK_IS_CRITICAL ), +MUX_GATE_FLAGS (CLK_TOP_MEM_SEL ,"mem_sel" , mem_parents, +0x040 ,8 ,1 ,15 ,CLK_IS_CRITICAL ), +MUX_GATE_FLAGS (CLK_TOP_DDRPHYCFG_SEL ,"ddrphycfg_sel" , ddrphycfg_parents, +0x040 ,16 ,1 ,23 ,CLK_IS_CRITICAL ),MUX_GATE (CLK_TOP_ETH_SEL ,"eth_sel" , eth_parents,0x040 ,24 ,3 ,31 ),
@@ -620,10 +624,6 @@ static int mtk_topckgen_init(struct platform_device *pdev)mtk_clk_register_gates (node, top_clks,ARRAY_SIZE (top_clks), clk_data); -clk_prepare_enable (clk_data->hws[CLK_TOP_AXI_SEL ]->clk); -clk_prepare_enable (clk_data->hws[CLK_TOP_MEM_SEL ]->clk); -clk_prepare_enable (clk_data->hws[CLK_TOP_DDRPHYCFG_SEL ]->clk); -return of_clk_add_hw_provider (node, of_clk_hw_onecell_get, clk_data); }
@@ -666,9 +666,6 @@ static int mtk_apmixedsys_init(struct platform_device *pdev)mtk_clk_register_gates (node, apmixed_clks,ARRAY_SIZE (apmixed_clks), clk_data); -clk_prepare_enable (clk_data->hws[CLK_APMIXED_ARMPLL ]->clk); -clk_prepare_enable (clk_data->hws[CLK_APMIXED_MAIN_CORE_EN ]->clk); -return of_clk_add_hw_provider (node, of_clk_hw_onecell_get, clk_data); }
@@ -695,8 +692,6 @@ static int mtk_pericfg_init(struct platform_device *pdev)if (r)return r; -clk_prepare_enable (clk_data->hws[CLK_PERI_UART0_PD ]->clk); -mtk_register_reset_controller_with_dev (&pdev->dev, &clk_rst_desc[1 ]);return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 523/663 clk: mediatek: mt8135: Properly use CLK_IS_CRITICAL flag
In reply to Greg Kroah-HartmanFrom: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit f4f9a9c003b52ea3cffda186753bfb3e37b970f8 ]
Instead of calling clk_prepare_enable() for clocks that shall stay enabled, use the CLK_IS_CRITICAL flag, which purpose is exactly that.
--- drivers/clk/mediatek/clk-mt8135.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/clk/mediatek/clk-mt8135.c +8 -6
@@ -2,6 +2,8 @@/* * Copyright (c) 2014 MediaTek Inc. * Author: James Liao <[email protected]> +* Copyright (c) 2023 Collabora, Ltd. +* AngeloGioacchino Del Regno <[email protected]> */ #include <linux/clk.h>
@@ -390,7 +392,7 @@ static const struct mtk_composite top_muxes[] __initconst = {MUX_GATE (CLK_TOP_GCPU_SEL ,"gcpu_sel" , gcpu_parents,0x0164 ,24 ,3 ,31 ),/* CLK_CFG_9 */ MUX_GATE (CLK_TOP_DPI1_SEL ,"dpi1_sel" , dpi1_parents,0x0168 ,0 ,2 ,7 ), -MUX_GATE (CLK_TOP_CCI_SEL ,"cci_sel" , cci_parents,0x0168 ,8 ,3 ,15 ), +MUX_GATE_FLAGS (CLK_TOP_CCI_SEL ,"cci_sel" , cci_parents,0x0168 ,8 ,3 ,15 ,CLK_IS_CRITICAL ),MUX_GATE (CLK_TOP_APLL_SEL ,"apll_sel" , apll_parents,0x0168 ,16 ,3 ,23 ), MUX_GATE(CLK_TOP_HDMIPLL_SEL, "hdmipll_sel", hdmipll_parents, 0x0168, 24, 2, 31), };
@@ -404,6 +406,10 @@ static const struct mtk_gate_regs infra_cg_regs = {#define GATE_ICG (_id, _name, _parent, _shift) \ GATE_MTK(_id, _name, _parent, &infra_cg_regs, _shift, &mtk_clk_gate_ops_setclr) +#define GATE_ICG_AO (_id, _name, _parent, _shift) \ + GATE_MTK_FLAGS(_id, _name, _parent, &infra_cg_regs, _shift, \ + &mtk_clk_gate_ops_setclr, CLK_IS_CRITICAL) +static const struct mtk_gate infra_clks[]__initconst = {GATE_ICG (CLK_INFRA_PMIC_WRAP ,"pmic_wrap_ck" ,"axi_sel" ,23 ),GATE_ICG (CLK_INFRA_PMICSPI ,"pmicspi_ck" ,"pmicspi_sel" ,22 ),
@@ -411,7 +417,7 @@ static const struct mtk_gate infra_clks[] __initconst = {GATE_ICG (CLK_INFRA_CCIF0_AP_CTRL ,"ccif0_ap_ctrl" ,"axi_sel" ,20 ),GATE_ICG (CLK_INFRA_KP ,"kp_ck" ,"axi_sel" ,16 ),GATE_ICG (CLK_INFRA_CPUM ,"cpum_ck" ,"cpum_tck_in" ,15 ), -GATE_ICG (CLK_INFRA_M4U ,"m4u_ck" ,"mem_sel" ,8 ), +GATE_ICG_AO (CLK_INFRA_M4U ,"m4u_ck" ,"mem_sel" ,8 ),GATE_ICG (CLK_INFRA_MFGAXI ,"mfgaxi_ck" ,"axi_sel" ,7 ),GATE_ICG (CLK_INFRA_DEVAPC ,"devapc_ck" ,"axi_sel" ,6 ), GATE_ICG(CLK_INFRA_AUDIO, "audio_ck", "aud_intbus_sel", 5),
@@ -533,8 +539,6 @@ static void __init mtk_topckgen_init(struct device_node *node)mtk_clk_register_composites (top_muxes,ARRAY_SIZE (top_muxes), base, &mt8135_clk_lock, clk_data); -clk_prepare_enable (clk_data->hws[CLK_TOP_CCI_SEL ]->clk); - r =of_clk_add_hw_provider (node, of_clk_hw_onecell_get, clk_data);if (r) pr_err("%s(): could not register clock provider: %d\n",
@@ -552,8 +556,6 @@ static void __init mtk_infrasys_init(struct device_node *node)mtk_clk_register_gates (node, infra_clks,ARRAY_SIZE (infra_clks), clk_data); -clk_prepare_enable (clk_data->hws[CLK_INFRA_M4U ]->clk); - r =of_clk_add_hw_provider (node, of_clk_hw_onecell_get, clk_data);if (r) pr_err("%s(): could not register clock provider: %d\n",
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 524/663 RDMA/rdmavt: Delete unnecessary NULL check
In reply to Greg Kroah-HartmanFrom: Natalia Petrova <[email protected]>
[ Upstream commit b73a0b80c69de77d8d4942abb37066531c0169b2 ]
There is no need to check 'rdi->qp_dev' for NULL. The field 'qp_dev' is created in rvt_register_device() which will fail if the 'qp_dev' allocation fails in rvt_driver_qp_init(). Overwise this pointer doesn't changed and passed to rvt_qp_exit() by the next step.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/infiniband/sw/rdmavt/qp.c | 2 -- 1 file changed, 2 deletions(-)
drivers/infiniband/sw/rdmavt/qp.c +0 -2
@@ -464,8 +464,6 @@ void rvt_qp_exit(struct rvt_dev_info *rdi)if (qps_inuse)rvt_pr_err (rdi,"QP memory leak! %u still in use\n" , qps_inuse); -if (!rdi->qp_dev) -return ;kfree (rdi->qp_dev->qp_table);free_qpn_table (&rdi->qp_dev->qpn_table);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 525/663 clk: mediatek: clk-pllfh: fix missing of_node_put() in fhctl_parse_dt()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit f1d97a37f975ac615e4d6875c27516150642d499 ]
The device_node pointer returned by of_find_compatible_node() with refcount incremented, when finish using it, the refcount need be decreased.
--- drivers/clk/mediatek/clk-pllfh.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/clk/mediatek/clk-pllfh.c +9 -2
@@ -75,13 +75,13 @@ void fhctl_parse_dt(const u8 *compatible_node, struct mtk_pllfh_data *pllfhs, base =of_iomap (node,0 );if (!base) {pr_err ("%s(): ioremap failed\n" , __func__); -return ; + goto out_node_put; } num_clocks =of_clk_get_parent_count (node);if (!num_clocks) {pr_err ("%s(): failed to get clocks property\n" , __func__); -return ; + goto err; }for (i =0 ; i < num_clocks; i++) {
@@ -102,6 +102,13 @@ void fhctl_parse_dt(const u8 *compatible_node, struct mtk_pllfh_data *pllfhs, pllfh->state.ssc_rate = ssc_rate; pllfh->state.base = base; } + +out_node_put: +of_node_put (node); +return ; +err: +iounmap (base); + goto out_node_put; }static void pllfh_init (struct mtk_fh *fh,struct mtk_pllfh_data *pllfh_data)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 526/663 clk: qcom: gcc-qcm2290: Fix up gcc_sdcc2_apps_clk_src
In reply to Greg Kroah-HartmanFrom: Konrad Dybcio <[email protected]>
[ Upstream commit 1bf088a9f0e50acd175ba8deef0db11c099fa26e ]
Add the PARENT_ENABLE flag to prevent the clock from getting stuck at boot and use floor_ops to avoid SDHCI overclocking.
--- drivers/clk/qcom/gcc-qcm2290.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/clk/qcom/gcc-qcm2290.c +2 -1
@@ -1243,7 +1243,8 @@ static struct clk_rcg2 gcc_sdcc2_apps_clk_src = { .name = "gcc_sdcc2_apps_clk_src", .parent_data = gcc_parents_12, .num_parents = ARRAY_SIZE(gcc_parents_12), - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_floor_ops, + .flags = CLK_OPS_PARENT_ENABLE, }, };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 527/663 workqueue: Fix hung time report of worker pools
In reply to Greg Kroah-HartmanFrom: Petr Mladek <[email protected]>
[ Upstream commit 335a42ebb0ca8ee9997a1731aaaae6dcd704c113 ]
The workqueue watchdog prints a warning when there is no progress in a worker pool. Where the progress means that the pool started processing a pending work item.
Note that it is perfectly fine to process work items much longer. The progress should be guaranteed by waking up or creating idle workers.
show_one_worker_pool() prints state of non-idle worker pool. It shows a delay since the last pool->watchdog_ts.
The timestamp is updated when a first pending work is queued in __queue_work(). Also it is updated when a work is dequeued for processing in worker_thread() and rescuer_thread().
The delay is misleading when there is no pending work item. In this case it shows how long the last work item is being proceed. Show zero instead. There is no stall if there is no pending work.
--- kernel/workqueue.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
kernel/workqueue.c +7 -3
@@ -4850,10 +4850,16 @@ static void show_one_worker_pool(struct worker_pool *pool)struct worker *worker;bool first = true;unsigned long flags; +unsigned long hung =0 ;raw_spin_lock_irqsave (&pool->lock, flags);if (pool->nr_workers == pool->nr_idle) goto next_pool; + +/* How long the first pending work is waiting for a worker. */ +if (!list_empty (&pool->worklist)) + hung =jiffies_to_msecs (jiffies - pool->watchdog_ts) /1000 ; +/* * Defer printing to avoid deadlocks in console drivers that * queue work while holding locks also taken in their write
@@ -4862,9 +4868,7 @@ static void show_one_worker_pool(struct worker_pool *pool)printk_deferred_enter ();pr_info ("pool %d:" , pool->id);pr_cont_pool_info (pool); -pr_cont (" hung=%us workers=%d" , -jiffies_to_msecs (jiffies - pool->watchdog_ts) /1000 , - pool->nr_workers); +pr_cont (" hung=%lus workers=%d" , hung, pool->nr_workers);if (pool->manager)pr_cont (" manager: %d" ,task_pid_nr (pool->manager->task));
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 528/663 rtc: omap: include header for omap_rtc_power_off_program prototype
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit f69c2b5420497b7a54181ce170d682cbeb1f119f ]
Non-static functions should have a prototype:
drivers/rtc/rtc-omap.c:410:5: error: no previous prototype for ‘omap_rtc_power_off_program’ [-Werror=missing-prototypes]
--- drivers/rtc/rtc-omap.c | 1 + 1 file changed, 1 insertion(+)
drivers/rtc/rtc-omap.c +1 -0
@@ -25,6 +25,7 @@#include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/rtc.h> +#include <linux/rtc/rtc-omap.h> /* * The OMAP RTC is a year/month/day/hours/minutes/seconds BCD clock
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 529/663 RDMA/mlx4: Prevent shift wrapping in set_user_sq_size()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit d50b3c73f1ac20dabc53dc6e9d64ce9c79a331eb ]
The ucmd->log_sq_bb_count variable is controlled by the user so this shift can wrap. Fix it by using check_shl_overflow() in the same way that it was done in commit 515f60004ed9 ("RDMA/hns: Prevent undefined behavior in hns_roce_set_user_sq_size()").
--- drivers/infiniband/hw/mlx4/qp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/infiniband/hw/mlx4/qp.c +6 -2
@@ -412,9 +412,13 @@ static int set_user_sq_size(struct mlx4_ib_dev *dev,struct mlx4_ib_qp *qp, struct mlx4_ib_create_qp *ucmd) { + u32 cnt; +/* Sanity check SQ size before proceeding */ -if ((1 << ucmd->log_sq_bb_count) > dev->dev->caps.max_wqes || - ucmd->log_sq_stride > +if (check_shl_overflow (1 , ucmd->log_sq_bb_count, &cnt) || + cnt > dev->dev->caps.max_wqes) +return -EINVAL ; +if (ucmd->log_sq_stride >ilog2 (roundup_pow_of_two (dev->dev->caps.max_sq_desc_sz)) || ucmd->log_sq_stride <MLX4_IB_MIN_SQ_STRIDE )return -EINVAL ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 530/663 rtc: meson-vrtc: Use ktime_get_real_ts64() to get the current time
In reply to Greg Kroah-HartmanFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit 0e6255fa3f649170da6bd1a544680589cfae1131 ]
The VRTC alarm register can be programmed with an amount of seconds after which the SoC will be woken up by the VRTC timer again. We are already converting the alarm time from meson_vrtc_set_alarm() to "seconds since 1970". This means we also need to use "seconds since 1970" for the current time.
This fixes a problem where setting the alarm to one minute in the future results in the firmware (which handles wakeup) to output (on the serial console) that the system will be woken up in billions of seconds. ktime_get_raw_ts64() returns the time since boot, not since 1970. Switch to ktime_get_real_ts64() to fix the calculation of the alarm time and to make the SoC wake up at the specified date/time. Also the firmware (which manages suspend) now prints either 59 or 60 seconds until wakeup (depending on how long it takes for the system to enter suspend).
--- drivers/rtc/rtc-meson-vrtc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/rtc/rtc-meson-vrtc.c +2 -2
@@ -23,7 +23,7 @@ static int meson_vrtc_read_time(struct device *dev, struct rtc_time *tm)struct timespec64 time;dev_dbg (dev,"%s\n" , __func__); -ktime_get_raw_ts64 (&time); +ktime_get_real_ts64 (&time);rtc_time64_to_tm (time.tv_sec, tm);return 0 ;
@@ -96,7 +96,7 @@ static int __maybe_unused meson_vrtc_suspend(struct device *dev)long alarm_secs;struct timespec64 time; -ktime_get_raw_ts64 (&time); +ktime_get_real_ts64 (&time); local_time = time.tv_sec; dev_dbg(dev, "alarm_time = %lus, local_time=%lus\n",
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 531/663 rtc: k3: handle errors while enabling wake irq
In reply to Greg Kroah-HartmanFrom: Dhruva Gole <[email protected]>
[ Upstream commit d31d7300ebc0c43021ec48c0e6a3a427386f4617 ]
Due to the potential failure of enable_irq_wake(), it would be better to return error if it fails.
--- drivers/rtc/rtc-ti-k3.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/rtc/rtc-ti-k3.c +2 -1
@@ -632,7 +632,8 @@ static int __maybe_unused ti_k3_rtc_suspend(struct device *dev)struct ti_k3_rtc *priv =dev_get_drvdata (dev);if (device_may_wakeup (dev)) -enable_irq_wake (priv->irq); +return enable_irq_wake (priv->irq); +return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 532/663 RDMA/rxe: Replace exists by rxe in rxe.c
In reply to Greg Kroah-HartmanFrom: Bob Pearson <[email protected]>
[ Upstream commit 9168d125ea032ad199275193493c13cb077da5cc ]
'exists' looks like a boolean. This patch replaces it by the normal name used for the rxe device, 'rxe', which should be a little less confusing. The second rxe_dbg() message is incorrect since rxe is known to be NULL and this will cause a seg fault if this message were ever sent. Replace it by pr_debug for the moment.
--- drivers/infiniband/sw/rxe/rxe.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/infiniband/sw/rxe/rxe.c +6 -6
@@ -175,7 +175,7 @@ int rxe_add(struct rxe_dev *rxe, unsigned int mtu, const char *ibdev_name)static int rxe_newlink (const char *ibdev_name,struct net_device *ndev) { -struct rxe_dev *exists; +struct rxe_dev *rxe;int err =0 ;if (is_vlan_dev (ndev)) {
@@ -184,17 +184,17 @@ static int rxe_newlink(const char *ibdev_name, struct net_device *ndev) goto err; } - exists =rxe_get_dev_from_net (ndev); -if (exists) { -ib_device_put (&exists->ib_dev); -rxe_dbg (exists,"already configured on %s\n" , ndev->name); + rxe =rxe_get_dev_from_net (ndev); +if (rxe) { +ib_device_put (&rxe->ib_dev); +rxe_dbg (rxe,"already configured on %s\n" , ndev->name); err = -EEXIST ; goto err; } err =rxe_net_add (ibdev_name, ndev);if (err) { -rxe_dbg (exists,"failed to add %s\n" , ndev->name); +pr_debug ("failed to add %s\n" , ndev->name); goto err; } err:
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 533/663 RDMA/erdma: Use fixed hardware page size
In reply to Greg Kroah-HartmanFrom: Cheng Xu <[email protected]>
[ Upstream commit d649c638dc26f3501da510cf7fceb5c15ca54258 ]
Hardware's page size is 4096, but the kernel's page size may vary. Driver should use hardware's page size when communicating with hardware.
--- drivers/infiniband/hw/erdma/erdma_hw.h | 4 ++++ drivers/infiniband/hw/erdma/erdma_verbs.c | 17 +++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-)
drivers/infiniband/hw/erdma/erdma_hw.h +4 -0
@@ -112,6 +112,10 @@#define ERDMA_PAGE_SIZE_SUPPORT 0x7FFFF000 +/* Hardware page size definition */ +#define ERDMA_HW_PAGE_SHIFT 12 +#define ERDMA_HW_PAGE_SIZE 4096 +/* WQE related. */ #define EQE_SIZE 16#define EQE_SHIFT 4
drivers/infiniband/hw/erdma/erdma_verbs.c +9 -8
@@ -38,7 +38,7 @@ static int create_qp_cmd(struct erdma_dev *dev, struct erdma_qp *qp)FIELD_PREP (ERDMA_CMD_CREATE_QP_PD_MASK , pd->pdn);if (rdma_is_kernel_res (&qp->ibqp.res)) { -u32 pgsz_range =ilog2 (SZ_1M ) -PAGE_SHIFT ; +u32 pgsz_range =ilog2 (SZ_1M ) -ERDMA_HW_PAGE_SHIFT ; req.sq_cqn_mtt_cfg = FIELD_PREP(ERDMA_CMD_CREATE_QP_PAGE_SIZE_MASK,
@@ -66,13 +66,13 @@ static int create_qp_cmd(struct erdma_dev *dev, struct erdma_qp *qp) user_qp = &qp->user_qp; req.sq_cqn_mtt_cfg =FIELD_PREP (ERDMA_CMD_CREATE_QP_PAGE_SIZE_MASK , -ilog2 (user_qp->sq_mtt.page_size) -PAGE_SHIFT ); +ilog2 (user_qp->sq_mtt.page_size) -ERDMA_HW_PAGE_SHIFT ); req.sq_cqn_mtt_cfg |=FIELD_PREP (ERDMA_CMD_CREATE_QP_CQN_MASK , qp->scq->cqn); req.rq_cqn_mtt_cfg =FIELD_PREP (ERDMA_CMD_CREATE_QP_PAGE_SIZE_MASK , -ilog2 (user_qp->rq_mtt.page_size) -PAGE_SHIFT ); +ilog2 (user_qp->rq_mtt.page_size) -ERDMA_HW_PAGE_SHIFT ); req.rq_cqn_mtt_cfg |=FIELD_PREP (ERDMA_CMD_CREATE_QP_CQN_MASK , qp->rcq->cqn);
@@ -162,7 +162,7 @@ static int create_cq_cmd(struct erdma_dev *dev, struct erdma_cq *cq)if (rdma_is_kernel_res (&cq->ibcq.res)) { page_size =SZ_32M ; req.cfg0 |=FIELD_PREP (ERDMA_CMD_CREATE_CQ_PAGESIZE_MASK , -ilog2 (page_size) -PAGE_SHIFT ); +ilog2 (page_size) -ERDMA_HW_PAGE_SHIFT ); req.qbuf_addr_l =lower_32_bits (cq->kern_cq.qbuf_dma_addr); req.qbuf_addr_h =upper_32_bits (cq->kern_cq.qbuf_dma_addr);
@@ -175,8 +175,9 @@ static int create_cq_cmd(struct erdma_dev *dev, struct erdma_cq *cq) cq->kern_cq.qbuf_dma_addr + (cq->depth <<CQE_SHIFT ); }else { mtt = &cq->user_cq.qbuf_mtt; - req.cfg0 |=FIELD_PREP (ERDMA_CMD_CREATE_CQ_PAGESIZE_MASK , -ilog2 (mtt->page_size) -PAGE_SHIFT ); + req.cfg0 |= +FIELD_PREP (ERDMA_CMD_CREATE_CQ_PAGESIZE_MASK , +ilog2 (mtt->page_size) -ERDMA_HW_PAGE_SHIFT );if (mtt->mtt_nents ==1 ) { req.qbuf_addr_l =lower_32_bits (*(u64 *)mtt->mtt_buf); req.qbuf_addr_h =upper_32_bits (*(u64 *)mtt->mtt_buf);
@@ -636,7 +637,7 @@ static int init_user_qp(struct erdma_qp *qp, struct erdma_ucontext *uctx,u32 rq_offset;int ret; -if (len < (PAGE_ALIGN (qp->attrs.sq_size *SQEBB_SIZE ) + +if (len < (ALIGN (qp->attrs.sq_size *SQEBB_SIZE ,ERDMA_HW_PAGE_SIZE ) + qp->attrs.rq_size *RQE_SIZE ))return -EINVAL ;
@@ -646,7 +647,7 @@ static int init_user_qp(struct erdma_qp *qp, struct erdma_ucontext *uctx,if (ret)return ret; - rq_offset =PAGE_ALIGN (qp->attrs.sq_size <<SQEBB_SHIFT ); + rq_offset =ALIGN (qp->attrs.sq_size <<SQEBB_SHIFT ,ERDMA_HW_PAGE_SIZE ); qp->user_qp.rq_offset = rq_offset; ret = get_mtt_entries(qp->dev, &qp->user_qp.rq_mtt, va + rq_offset,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 534/663 fs/ntfs3: Fix memory leak if ntfs_read_mft failed
In reply to Greg Kroah-HartmanFrom: Chen Zhongjin <[email protected]>
[ Upstream commit bfa434c60157c9793e9b12c9b68ade02aff9f803 ]
Label ATTR_ROOT in ntfs_read_mft() sets is_root = true and ni->ni_flags |= NI_FLAG_DIR, then next attr will goto label ATTR_ALLOC and alloc ni->dir.alloc_run. However two states are not always consistent and can make memory leak.
1) attr_name in ATTR_ROOT does not fit the condition it will set is_root = true but NI_FLAG_DIR is not set.
2) next attr_name in ATTR_ALLOC fits the condition and alloc ni->dir.alloc_run
3) in cleanup function ni_clear(), when NI_FLAG_DIR is set, it frees ni->dir.alloc_run, otherwise it frees ni->file.run
4) because NI_FLAG_DIR is not set in this case, ni->dir.alloc_run is leaked as kmemleak reported:
unreferenced object 0xffff888003bc5480 (size 64):
backtrace:
[<000000003d42e6b0>] __kmalloc_node+0x4e/0x1c0
[<00000000d8e19b8a>] kvmalloc_node+0x39/0x1f0
[<00000000fc3eb5b8>] run_add_entry+0x18a/0xa40 [ntfs3]
[<0000000011c9f978>] run_unpack+0x75d/0x8e0 [ntfs3]
[<00000000e7cf1819>] run_unpack_ex+0xbc/0x500 [ntfs3]
[<00000000bbf0a43d>] ntfs_iget5+0xb25/0x2dd0 [ntfs3]
[<00000000a6e50693>] ntfs_fill_super+0x218d/0x3580 [ntfs3]
[<00000000b9170608>] get_tree_bdev+0x3fb/0x710
[<000000004833798a>] vfs_get_tree+0x8e/0x280
[<000000006e20b8e6>] path_mount+0xf3c/0x1930
[<000000007bf15a5f>] do_mount+0xf3/0x110
...Fix this by always setting is_root and NI_FLAG_DIR together.
--- fs/ntfs3/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ntfs3/inode.c +1 -1
@@ -259,7 +259,6 @@ static struct inode *ntfs_read_mft(struct inode *inode, goto out; root =Add2Ptr (attr, roff); - is_root = true;if (attr->name_len !=ARRAY_SIZE (I30_NAME ) ||memcmp (attr_name (attr),I30_NAME ,sizeof (I30_NAME )))
@@ -272,6 +271,7 @@ static struct inode *ntfs_read_mft(struct inode *inode,if (!is_dir) goto next_attr; + is_root = true; ni->ni_flags |=NI_FLAG_DIR ; err =indx_init (&ni->dir, sbi, attr,INDEX_MUTEX_I30 );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 535/663 fs/ntfs3: Add check for kmemdup
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit e6c3cef24cb0d045f99d5cb039b344874e3cfd74 ]
Since the kmemdup may return NULL pointer,
it should be better to add check for the return value in order to avoid NULL pointer dereference.
--- fs/ntfs3/fslog.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/ntfs3/fslog.c +4 -0
@@ -4256,6 +4256,10 @@ int log_replay(struct ntfs_inode *ni, bool *initialized) rec_len -= t32; attr_names =kmemdup (Add2Ptr (lrh, t32), rec_len,GFP_NOFS ); +if (!attr_names) { + err = -ENOMEM ; + goto out; + }lcb_put (lcb); lcb =NULL ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 536/663 fs/ntfs3: Fix null-ptr-deref on inode->i_op in ntfs_lookup()
In reply to Greg Kroah-HartmanFrom: ZhangPeng <[email protected]>
[ Upstream commit 254e69f284d7270e0abdc023ee53b71401c3ba0c ]
Syzbot reported a null-ptr-deref bug:
ntfs3: loop0: Different NTFS' sector size (1024) and media sector size
(512)
ntfs3: loop0: Mark volume as dirty due to NTFS errors
general protection fault, probably for non-canonical address 0xdffffc0000000001: 0000 [#1] PREEMPT SMP KASAN KASAN: null-ptr-deref in range [0x0000000000000008-0x000000000000000f] RIP: 0010:d_flags_for_inode fs/dcache.c:1980 [inline] RIP: 0010:__d_add+0x5ce/0x800 fs/dcache.c:2796 Call Trace: <TASK> d_splice_alias+0x122/0x3b0 fs/dcache.c:3191 lookup_open fs/namei.c:3391 [inline] open_last_lookups fs/namei.c:3481 [inline] path_openat+0x10e6/0x2df0 fs/namei.c:3688 do_filp_open+0x264/0x4f0 fs/namei.c:3718 do_sys_openat2+0x124/0x4e0 fs/open.c:1310 do_sys_open fs/open.c:1326 [inline] __do_sys_open fs/open.c:1334 [inline] __se_sys_open fs/open.c:1330 [inline] __x64_sys_open+0x221/0x270 fs/open.c:1330 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
If the MFT record of ntfs inode is not a base record, inode->i_op can be NULL. And a null-ptr-deref may happen:
ntfs_lookup()
dir_search_u() # inode->i_op is set to NULL
d_splice_alias()
__d_add()
d_flags_for_inode() # inode->i_op->get_link null-ptr-derefFix this by adding a Check on inode->i_op before calling the d_splice_alias() function.
--- fs/ntfs3/namei.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
fs/ntfs3/namei.c +10 -0
@@ -88,6 +88,16 @@ static struct dentry *ntfs_lookup(struct inode *dir, struct dentry *dentry,__putname (uni); } +/* +* Check for a null pointer +* If the MFT record of ntfs inode is not a base record, inode->i_op can be NULL. +* This causes null pointer dereference in d_splice_alias(). +*/ +if (!IS_ERR (inode) && inode->i_op ==NULL ) { +iput (inode); + inode =ERR_PTR (-EINVAL ); + } +return d_splice_alias (inode, dentry); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 537/663 fs/ntfs3: Fix OOB read in indx_insert_into_buffer
In reply to Greg Kroah-HartmanFrom: ZhangPeng <[email protected]>
[ Upstream commit b8c44949044e5f7f864525fdffe8e95135ce9ce5 ]
Syzbot reported a OOB read bug:
BUG: KASAN: slab-out-of-bounds in indx_insert_into_buffer+0xaa3/0x13b0 fs/ntfs3/index.c:1755 Read of size 17168 at addr ffff8880255e06c0 by task syz-executor308/3630 Call Trace: <TASK> memmove+0x25/0x60 mm/kasan/shadow.c:54 indx_insert_into_buffer+0xaa3/0x13b0 fs/ntfs3/index.c:1755 indx_insert_entry+0x446/0x6b0 fs/ntfs3/index.c:1863 ntfs_create_inode+0x1d3f/0x35c0 fs/ntfs3/inode.c:1548 ntfs_create+0x3e/0x60 fs/ntfs3/namei.c:100 lookup_open fs/namei.c:3413 [inline]
If the member struct INDEX_BUFFER *index of struct indx_node is incorrect, that is, the value of __le32 used is greater than the value of __le32 total in struct INDEX_HDR. Therefore, OOB read occurs when memmove is called in indx_insert_into_buffer().
Fix this by adding a check in hdr_find_e().
--- fs/ntfs3/index.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/ntfs3/index.c +4 -0
@@ -725,9 +725,13 @@ static struct NTFS_DE *hdr_find_e(const struct ntfs_index *indx,u32 e_size, e_key_len;u32 end =le32_to_cpu (hdr->used);u32 off =le32_to_cpu (hdr->de_off); +u32 total =le32_to_cpu (hdr->total);u16 offs[128 ]; fill_table: +if (end > total) +return NULL ; +if (off +sizeof (struct NTFS_DE ) > end)return NULL ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 538/663 fs/ntfs3: Fix slab-out-of-bounds read in hdr_delete_de()
In reply to Greg Kroah-HartmanFrom: Zeng Heng <[email protected]>
[ Upstream commit ab84eee4c7ab929996602eda7832854c35a6dda2 ]
Here is a BUG report from syzbot:
BUG: KASAN: slab-out-of-bounds in hdr_delete_de+0xe0/0x150 fs/ntfs3/index.c:806 Read of size 16842960 at addr ffff888079cc0600 by task syz-executor934/3631 Call Trace: memmove+0x25/0x60 mm/kasan/shadow.c:54 hdr_delete_de+0xe0/0x150 fs/ntfs3/index.c:806 indx_delete_entry+0x74f/0x3670 fs/ntfs3/index.c:2193 ni_remove_name+0x27a/0x980 fs/ntfs3/frecord.c:2910 ntfs_unlink_inode+0x3d4/0x720 fs/ntfs3/inode.c:1712 ntfs_rename+0x41a/0xcb0 fs/ntfs3/namei.c:276
Before using the meta-data in struct INDEX_HDR, we need to check index header valid or not. Otherwise, the corruptedi (or malicious) fs image can cause out-of-bounds access which could make kernel panic.
--- fs/ntfs3/fslog.c | 2 +- fs/ntfs3/index.c | 4 ++++ fs/ntfs3/ntfs_fs.h | 1 + 3 files changed, 6 insertions(+), 1 deletion(-)
fs/ntfs3/fslog.c +1 -1
@@ -2575,7 +2575,7 @@ static int read_next_log_rec(struct ntfs_log *log, struct lcb *lcb, u64 *lsn)return find_log_rec (log, *lsn, lcb); } -static inline bool check_index_header (const struct INDEX_HDR *hdr,size_t bytes) +bool check_index_header (const struct INDEX_HDR *hdr,size_t bytes) {__le16 mask;u32 min_de, de_off, used, total;
fs/ntfs3/index.c +4 -0
@@ -848,6 +848,10 @@ static inline struct NTFS_DE *hdr_delete_de(struct INDEX_HDR *hdr,u32 off =PtrOffset (hdr, re);int bytes = used - (off + esize); +/* check INDEX_HDR valid before using INDEX_HDR */ +if (!check_index_header (hdr,le32_to_cpu (hdr->total))) +return NULL ; +if (off >= used || esize <sizeof (struct NTFS_DE ) || bytes <sizeof (struct NTFS_DE ))return NULL ;
fs/ntfs3/ntfs_fs.h +1 -0
@@ -579,6 +579,7 @@ int ni_rename(struct ntfs_inode *dir_ni, struct ntfs_inode *new_dir_ni,bool ni_is_dirty (struct inode *inode);/* Globals from fslog.c */ +bool check_index_header (const struct INDEX_HDR *hdr,size_t bytes);int log_replay (struct ntfs_inode *ni,bool *initialized);/* Globals from fsntfs.c */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 539/663 iommu/mediatek: Set dma_mask for PGTABLE_PA_35_EN
In reply to Greg Kroah-HartmanFrom: Yong Wu <[email protected]>
[ Upstream commit f045e9df6537175d02565f21616ac1a9dd59b61c ]
When we enable PGTABLE_PA_35_EN, the PA for pgtable may be 35bits. Thus add dma_mask for it.
--- drivers/iommu/mtk_iommu.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/iommu/mtk_iommu.c +8 -0
@@ -1267,6 +1267,14 @@ static int mtk_iommu_probe(struct platform_device *pdev)return PTR_ERR (data->bclk); } +if (MTK_IOMMU_HAS_FLAG (data->plat_data,PGTABLE_PA_35_EN )) { + ret =dma_set_mask (dev,DMA_BIT_MASK (35 )); +if (ret) { +dev_err (dev,"Failed to set dma_mask 35.\n" ); +return ret; + } + } +pm_runtime_enable (dev);if (MTK_IOMMU_IS_TYPE (data->plat_data,MTK_IOMMU_TYPE_MM )) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 540/663 RDMA/rxe: Remove tasklet call from rxe_cq.c
In reply to Greg Kroah-HartmanFrom: Bob Pearson <[email protected]>
[ Upstream commit 78b26a335310a097d6b22581b706050db42f196c ]
Remove the tasklet call in rxe_cq.c and also the is_dying in the cq struct. There is no reason for the rxe driver to defer the call to the cq completion handler by scheduling a tasklet. rxe_cq_post() is not called in a hard irq context.
The rxe driver currently is incorrect because the tasklet call is made without protecting the cq pointer with a reference from having the underlying memory freed before the deferred routine is called. Executing the comp_handler inline fixes this problem.
--- drivers/infiniband/sw/rxe/rxe_cq.c | 32 +++----------------------------- drivers/infiniband/sw/rxe/rxe_verbs.c | 2 -- drivers/infiniband/sw/rxe/rxe_verbs.h | 2 -- 3 files changed, 3 insertions(+), 33 deletions(-)
drivers/infiniband/sw/rxe/rxe_cq.c +3 -29
@@ -39,21 +39,6 @@ err1:return -EINVAL ; } -static void rxe_send_complete (struct tasklet_struct *t) -{ -struct rxe_cq *cq =from_tasklet (cq, t, comp_task); -unsigned long flags; - -spin_lock_irqsave (&cq->cq_lock, flags); -if (cq->is_dying) { -spin_unlock_irqrestore (&cq->cq_lock, flags); -return ; - } -spin_unlock_irqrestore (&cq->cq_lock, flags); - - cq->ibcq.comp_handler (&cq->ibcq, cq->ibcq.cq_context); -} -int rxe_cq_from_init (struct rxe_dev *rxe,struct rxe_cq *cq,int cqe,int comp_vector,struct ib_udata *udata,struct rxe_create_cq_resp __user *uresp)
@@ -79,10 +64,6 @@ int rxe_cq_from_init(struct rxe_dev *rxe cq->is_user = uresp; - cq->is_dying = false; - -tasklet_setup (&cq->comp_task, rxe_send_complete); -spin_lock_init (&cq->cq_lock); cq->ibcq.cqe = cqe;return 0 ;
@@ -103,6 +84,7 @@ int rxe_cq_resize_queue(struct rxe_cq *creturn err; } +/* caller holds reference to cq */ int rxe_cq_post (struct rxe_cq *cq,struct rxe_cqe *cqe,int solicited) {struct ib_event ev;
@@ -135,21 +117,13 @@ int rxe_cq_post(struct rxe_cq *cq, strucif ((cq->notify ==IB_CQ_NEXT_COMP ) || (cq->notify ==IB_CQ_SOLICITED && solicited)) { cq->notify =0 ; -tasklet_schedule (&cq->comp_task); + + cq->ibcq.comp_handler (&cq->ibcq, cq->ibcq.cq_context); }return 0 ; } -void rxe_cq_disable (struct rxe_cq *cq) -{ -unsigned long flags; - -spin_lock_irqsave (&cq->cq_lock, flags); - cq->is_dying = true; -spin_unlock_irqrestore (&cq->cq_lock, flags); -} -void rxe_cq_cleanup (struct rxe_pool_elem *elem) {struct rxe_cq *cq =container_of (elem,typeof (*cq), elem);
drivers/infiniband/sw/rxe/rxe_verbs.c +0 -2
@@ -786,8 +786,6 @@ static int rxe_destroy_cq(struct ib_cq *if (atomic_read (&cq->num_wq))return -EINVAL ; -rxe_cq_disable (cq); -rxe_cleanup (cq);return 0 ; }
drivers/infiniband/sw/rxe/rxe_verbs.h +0 -2
@@ -63,9 +63,7 @@ struct rxe_cq {struct rxe_queue *queue;spinlock_t cq_lock;u8 notify; -bool is_dying;bool is_user; -struct tasklet_struct comp_task;atomic_t num_wq; };
Greg Kroah-Hartman
maintainerPATCH 541/663 power: supply: generic-adc-battery: fix unit scaling
In reply to Greg Kroah-HartmanFrom: Sebastian Reichel <[email protected]>
[ Upstream commit 44263f50065969f2344808388bd589740f026167 ]
power-supply properties are reported in µV, µA and µW. The IIO API provides mV, mA, mW, so the values need to be multiplied by 1000.
--- drivers/power/supply/generic-adc-battery.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/power/supply/generic-adc-battery.c +3 -0
@@ -135,6 +135,9 @@ static int read_channel(struct gab *adc_bat, enum power_supply_property psp, result);if (ret <0 )pr_err ("read channel error\n" ); +else + *result *=1000 ; +return ret; }
Signature · 1 line
2.39.2