6.6.44-rc1 review
Subsystems (4)
Greg Kroah-Hartman
maintainerPATCH 133/568 wifi: ath11k: fix wrong handling of CCMP256 and GCMP ciphers
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baochen Qiang <[email protected]>
[ Upstream commit d2b0ca38d362ebf16ca79cd7f309d5bb8b581deb ]
Currently for CCMP256, GCMP128 and GCMP256 ciphers, in ath11k_install_key() IEEE80211_KEY_FLAG_GENERATE_IV_MGMT is not set. And in ath11k_mac_mgmt_tx_wmi() a length of IEEE80211_CCMP_MIC_LEN is reserved for all ciphers.
This results in unexpected management frame drop in case either of above 3 ciphers is used. The reason is, without IEEE80211_KEY_FLAG_GENERATE_IV_MGMT set, mac80211 will not generate CCMP/GCMP headers in frame for ath11k. Also MIC length reserved is wrong. Such frame is dropped later by hardware:
ath11k_pci 0000:5a:00.0: mac tx mgmt frame, buf id 0 ath11k_pci 0000:5a:00.0: mgmt tx compl ev pdev_id 1, desc_id 0, status 1
Quoted 1 line
From user point of view, we have observed very low throughput due to this issue:
action frames are all dropped so ADDBA response from DUT never reaches AP. AP can not use aggregation thus throughput is low.
Fix this by setting IEEE80211_KEY_FLAG_GENERATE_IV_MGMT flag and by reserving proper MIC length for those ciphers.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.30
Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath11k/dp_rx.c | 3 +-- drivers/net/wireless/ath/ath11k/dp_rx.h | 3 +++ drivers/net/wireless/ath/ath11k/mac.c | 15 +++++++++++---- 3 files changed, 15 insertions(+), 6 deletions(-)
drivers/net/wireless/ath/ath11k/dp_rx.c +1 -2
@@ -1880,8 +1880,7 @@ static void ath11k_dp_rx_h_csum_offload(struct ath11k *ar, struct sk_buff *msdu) CHECKSUM_NONE :CHECKSUM_UNNECESSARY ; } -static int ath11k_dp_rx_crypto_mic_len (struct ath11k *ar, -enum hal_encrypt_type enctype) +int ath11k_dp_rx_crypto_mic_len (struct ath11k *ar,enum hal_encrypt_type enctype) {switch (enctype) {case HAL_ENCRYPT_TYPE_OPEN :
drivers/net/wireless/ath/ath11k/dp_rx.h +3 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. +* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_DP_RX_H #define ATH11K_DP_RX_H
@@ -95,4 +96,6 @@ int ath11k_peer_rx_frag_setup(struct ath11k *ar, const u8 *peer_mac, int vdev_idint ath11k_dp_rx_pktlog_start (struct ath11k_base *ab);int ath11k_dp_rx_pktlog_stop (struct ath11k_base *ab,bool stop_timer); +int ath11k_dp_rx_crypto_mic_len (struct ath11k *ar,enum hal_encrypt_type enctype); +#endif /* ATH11K_DP_RX_H */
drivers/net/wireless/ath/ath11k/mac.c +11 -4
@@ -4130,6 +4130,7 @@ static int ath11k_install_key(struct ath11k_vif *arvif,switch (key->cipher) {case WLAN_CIPHER_SUITE_CCMP : +case WLAN_CIPHER_SUITE_CCMP_256 : arg.key_cipher =WMI_CIPHER_AES_CCM ;/* TODO: Re-check if flag is valid */ key->flags |=IEEE80211_KEY_FLAG_GENERATE_IV_MGMT ;
@@ -4139,12 +4140,10 @@ static int ath11k_install_key(struct ath11k_vif *arvif, arg.key_txmic_len =8 ; arg.key_rxmic_len =8 ;break ; -case WLAN_CIPHER_SUITE_CCMP_256 : - arg.key_cipher =WMI_CIPHER_AES_CCM ; -break ;case WLAN_CIPHER_SUITE_GCMP :case WLAN_CIPHER_SUITE_GCMP_256 : arg.key_cipher =WMI_CIPHER_AES_GCM ; + key->flags |=IEEE80211_KEY_FLAG_GENERATE_IV_MGMT ;break ;default :ath11k_warn (ar->ab,"cipher %d is not supported\n" , key->cipher);
@@ -6023,7 +6022,10 @@ static int ath11k_mac_mgmt_tx_wmi(struct ath11k *ar, struct ath11k_vif *arvif, {struct ath11k_base *ab = ar->ab;struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; +struct ath11k_skb_cb *skb_cb =ATH11K_SKB_CB (skb);struct ieee80211_tx_info *info; +enum hal_encrypt_type enctype; +unsigned int mic_len;dma_addr_t paddr;int buf_id;int ret;
@@ -6047,7 +6049,12 @@ static int ath11k_mac_mgmt_tx_wmi(struct ath11k *ar, struct ath11k_vif *arvif, ieee80211_is_deauth(hdr->frame_control) || ieee80211_is_disassoc(hdr->frame_control)) && ieee80211_has_protected(hdr->frame_control)) { -skb_put (skb,IEEE80211_CCMP_MIC_LEN ); +if (!(skb_cb->flags &ATH11K_SKB_CIPHER_SET )) +ath11k_warn (ab,"WMI management tx frame without ATH11K_SKB_CIPHER_SET" ); + + enctype =ath11k_dp_tx_get_encrypt_type (skb_cb->cipher); + mic_len =ath11k_dp_rx_crypto_mic_len (ar, enctype); +skb_put (skb, mic_len); } }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 134/568 wifi: cfg80211: fix typo in cfg80211_calculate_bitrate_he()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baochen Qiang <[email protected]>
[ Upstream commit 9ee0d44f055276fe2802b2f65058e920853f4f99 ]
rates_996 is mistakenly written as rates_969, fix it.
--- net/wireless/util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/wireless/util.c +2 -2
@@ -1460,7 +1460,7 @@ static u32 cfg80211_calculate_bitrate_he(struct rate_info *rate) 5120, /* 0.833333... */ };u32 rates_160M[3 ] = {960777777 ,907400000 ,816666666 }; -u32 rates_969[3 ] = {480388888 ,453700000 ,408333333 }; +u32 rates_996[3 ] = {480388888 ,453700000 ,408333333 };u32 rates_484[3 ] = {229411111 ,216666666 ,195000000 };u32 rates_242[3 ] = {114711111 ,108333333 ,97500000 };u32 rates_106[3 ] = {40000000 ,37777777 ,34000000 };
@@ -1485,7 +1485,7 @@ static u32 cfg80211_calculate_bitrate_he(struct rate_info *rate)else if (rate->bw ==RATE_INFO_BW_80 || (rate->bw ==RATE_INFO_BW_HE_RU && rate->he_ru_alloc ==NL80211_RATE_INFO_HE_RU_ALLOC_996 )) - result = rates_969[rate->he_gi]; + result = rates_996[rate->he_gi];else if (rate->bw ==RATE_INFO_BW_40 || (rate->bw ==RATE_INFO_BW_HE_RU && rate->he_ru_alloc ==NL80211_RATE_INFO_HE_RU_ALLOC_484 ))
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 135/568 wifi: cfg80211: handle 2x996 RU allocation in cfg80211_calculate_bitrate_he()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baochen Qiang <[email protected]>
[ Upstream commit bcbd771cd5d68c0c52567556097d75f9fc4e7cd6 ]
Currently NL80211_RATE_INFO_HE_RU_ALLOC_2x996 is not handled in cfg80211_calculate_bitrate_he(), leading to below warning:
kernel: invalid HE MCS: bw:6, ru:6
kernel: WARNING: CPU: 0 PID: 2312 at net/wireless/util.c:1501 cfg80211_calculate_bitrate_he+0x22b/0x270 [cfg80211]
Fix it by handling 2x996 RU allocation in the same way as 160 MHz bandwidth.
--- net/wireless/util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/wireless/util.c +3 -1
@@ -1480,7 +1480,9 @@ static u32 cfg80211_calculate_bitrate_he(struct rate_info *rate)if (WARN_ON_ONCE (rate->nss <1 || rate->nss >8 ))return 0 ; -if (rate->bw ==RATE_INFO_BW_160 ) +if (rate->bw ==RATE_INFO_BW_160 || + (rate->bw ==RATE_INFO_BW_HE_RU && + rate->he_ru_alloc == NL80211_RATE_INFO_HE_RU_ALLOC_2x996)) result = rates_160M[rate->he_gi]; else if (rate->bw == RATE_INFO_BW_80 || (rate->bw == RATE_INFO_BW_HE_RU &&
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 136/568 udf: Fix bogus checksum computation in udf_rename()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
[ Upstream commit 27ab33854873e6fb958cb074681a0107cc2ecc4c ]
Syzbot reports uninitialized memory access in udf_rename() when updating checksum of '..' directory entry of a moved directory. This is indeed true as we pass on-stack diriter.fi to the udf_update_tag() and because that has only struct fileIdentDesc included in it and not the impUse or name fields, the checksumming function is going to checksum random stack contents beyond the end of the structure. This is actually harmless because the following udf_fiiter_write_fi() will recompute the checksum from on-disk buffers where everything is properly included. So all that is needed is just removing the bogus calculation.
--- fs/udf/namei.c | 2 -- 1 file changed, 2 deletions(-)
fs/udf/namei.c +0 -2
@@ -874,8 +874,6 @@ static int udf_rename(struct mnt_idmap *idmap, struct inode *old_dir,if (has_diriter) { diriter.fi.icb.extLocation =cpu_to_lelb (UDF_I (new_dir)->i_location); -udf_update_tag ((char *)&diriter.fi, -udf_dir_entry_len (&diriter.fi));udf_fiiter_write_fi (&diriter,NULL );udf_fiiter_release (&diriter);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 137/568 net: fec: Refactor: #define magic constants
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Csókás Bence <[email protected]>
[ Upstream commit ff049886671ccd4e624a30ec464cb20e4c39a313 ]
Add defines for bits of ECR, RCR control registers, TX watermark etc.
Stable-dep-of: c32fe1986f27 ("net: fec: Fix FEC_ECR_EN1588 being cleared on link-down")
--- drivers/net/ethernet/freescale/fec_main.c | 46 +++++++++++++++-------- 1 file changed, 30 insertions(+), 16 deletions(-)
drivers/net/ethernet/freescale/fec_main.c +30 -16
@@ -283,8 +283,8 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address");#define PKT_MINBUF_SIZE 64/* FEC receive acceleration */ -#define FEC_RACC_IPDIS (1 << 1) -#define FEC_RACC_PRODIS (1 << 2) +#define FEC_RACC_IPDIS BIT(1) +#define FEC_RACC_PRODIS BIT(2)#define FEC_RACC_SHIFT16 BIT(7)#define FEC_RACC_OPTIONS (FEC_RACC_IPDIS | FEC_RACC_PRODIS)
@@ -316,8 +316,23 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address");#define FEC_MMFR_TA (2 << 16)#define FEC_MMFR_DATA (v) (v & 0xffff)/* FEC ECR bits definition */ -#define FEC_ECR_MAGICEN (1 << 2) -#define FEC_ECR_SLEEP (1 << 3) +#define FEC_ECR_RESET BIT(0) +#define FEC_ECR_ETHEREN BIT(1) +#define FEC_ECR_MAGICEN BIT(2) +#define FEC_ECR_SLEEP BIT(3) +#define FEC_ECR_EN1588 BIT(4) +#define FEC_ECR_BYTESWP BIT(8) +/* FEC RCR bits definition */ +#define FEC_RCR_LOOP BIT(0) +#define FEC_RCR_HALFDPX BIT(1) +#define FEC_RCR_MII BIT(2) +#define FEC_RCR_PROMISC BIT(3) +#define FEC_RCR_BC_REJ BIT(4) +#define FEC_RCR_FLOWCTL BIT(5) +#define FEC_RCR_RMII BIT(8) +#define FEC_RCR_10BASET BIT(9) +/* TX WMARK bits */ +#define FEC_TXWMRK_STRFWD BIT(8)#define FEC_MII_TIMEOUT 30000/* us */
@@ -1041,7 +1056,7 @@ fec_restart(struct net_device *ndev)struct fec_enet_private *fep =netdev_priv (ndev);u32 temp_mac[2 ];u32 rcntl =OPT_FRAME_SIZE |0x04 ; -u32 ecntl =0x2 ;/* ETHEREN */ +u32 ecntl =FEC_ECR_ETHEREN ;/* Whack a reset. We should wait for this. * For i.MX6SX SOC, enet use AXI bus, we use disable MAC
@@ -1116,18 +1131,18 @@ fec_restart(struct net_device *ndev) fep->phy_interface == PHY_INTERFACE_MODE_RGMII_TXID) rcntl |= (1 <<6 ); else if (fep->phy_interface == PHY_INTERFACE_MODE_RMII) - rcntl |= (1 << 8); + rcntl |= FEC_RCR_RMII; else - rcntl &= ~(1 << 8); + rcntl &= ~FEC_RCR_RMII;/* 1G, 100M or 10M */ if (ndev->phydev) {if (ndev->phydev->speed ==SPEED_1000 ) ecntl |= (1 <<5 );else if (ndev->phydev->speed ==SPEED_100 ) - rcntl &= ~(1 <<9 ); + rcntl &= ~FEC_RCR_10BASET ;else - rcntl |= (1 <<9 ); + rcntl |=FEC_RCR_10BASET ; } }else {#ifdef FEC_MIIGSK_ENR
@@ -1186,13 +1201,13 @@ fec_restart(struct net_device *ndev)if (fep->quirks &FEC_QUIRK_ENET_MAC ) {/* enable ENET endian swap */ - ecntl |= (1 <<8 ); + ecntl |=FEC_ECR_BYTESWP ;/* enable ENET store and forward mode */ -writel (1 <<8 , fep->hwp +FEC_X_WMRK ); +writel (FEC_TXWMRK_STRFWD , fep->hwp +FEC_X_WMRK ); }if (fep->bufdesc_ex) - ecntl |= (1 <<4 ); + ecntl |=FEC_ECR_EN1588 ;if (fep->quirks &FEC_QUIRK_DELAYED_CLKS_SUPPORT && fep->rgmii_txc_dly)
@@ -1291,7 +1306,7 @@ static void fec_stop(struct net_device *ndev) {struct fec_enet_private *fep =netdev_priv (ndev); -u32 rmii_mode =readl (fep->hwp +FEC_R_CNTRL ) & (1 <<8 ); +u32 rmii_mode =readl (fep->hwp +FEC_R_CNTRL ) &FEC_RCR_RMII ;u32 val;/* We cannot expect a graceful transmit stop without link !!! */
@@ -1310,7 +1325,7 @@ fec_stop(struct net_device *ndev)if (fep->quirks &FEC_QUIRK_HAS_MULTI_QUEUES ) {writel (0 , fep->hwp +FEC_ECNTRL ); }else { -writel (1 , fep->hwp +FEC_ECNTRL ); +writel (FEC_ECR_RESET , fep->hwp +FEC_ECNTRL );udelay (10 ); } }else {
@@ -1324,12 +1339,11 @@ fec_stop(struct net_device *ndev)/* We have to keep ENET enabled to have MII interrupt stay working */ if (fep->quirks &FEC_QUIRK_ENET_MAC && !(fep->wol_flag &FEC_WOL_FLAG_SLEEP_ON )) { -writel (2 , fep->hwp +FEC_ECNTRL ); +writel (FEC_ECR_ETHEREN , fep->hwp +FEC_ECNTRL );writel (rmii_mode, fep->hwp +FEC_R_CNTRL ); } } -static void fec_timeout (struct net_device *ndev,unsigned int txqueue) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 138/568 net: fec: Fix FEC_ECR_EN1588 being cleared on link-down
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Csókás, Bence <[email protected]>
[ Upstream commit c32fe1986f27cac329767d3497986e306cad1d5e ]
FEC_ECR_EN1588 bit gets cleared after MAC reset in fec_stop(), which makes all 1588 functionality shut down, and all the extended registers disappear, on link-down, making the adapter fall back to compatibility "dumb mode". However, some functionality needs to be retained (e.g. PPS) even without link.
--- drivers/net/ethernet/freescale/fec_main.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/ethernet/freescale/fec_main.c +6 -0
@@ -1342,6 +1342,12 @@ fec_stop(struct net_device *ndev)writel (FEC_ECR_ETHEREN , fep->hwp +FEC_ECNTRL );writel (rmii_mode, fep->hwp +FEC_R_CNTRL ); } + +if (fep->bufdesc_ex) { + val =readl (fep->hwp +FEC_ECNTRL ); + val |=FEC_ECR_EN1588 ; +writel (val, fep->hwp +FEC_ECNTRL ); + } } static void
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 139/568 libbpf: Checking the btf_type kind when fixing variable offsets
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Donglin Peng <[email protected]>
[ Upstream commit cc5083d1f3881624ad2de1f3cbb3a07e152cb254 ]
I encountered an issue when building the test_progs from the repository [1]:
$ pwd /work/Qemu/x86_64/linux-6.10-rc2/tools/testing/selftests/bpf/
$ make test_progs V=1 [...] ./tools/sbin/bpftool gen object ./ip_check_defrag.bpf.linked2.o ./ip_check_defrag.bpf.linked1.o libbpf: failed to find symbol for variable 'bpf_dynptr_slice' in section '.ksyms' Error: failed to link './ip_check_defrag.bpf.linked1.o': No such file or directory (2) [...]
Upon investigation, I discovered that the btf_types referenced in the '.ksyms' section had a kind of BTF_KIND_FUNC instead of BTF_KIND_VAR:
$ bpftool btf dump file ./ip_check_defrag.bpf.linked1.o
[...]
[2] DATASEC '.ksyms' size=0 vlen=2
type_id=16 offset=0 size=0 (FUNC 'bpf_dynptr_from_skb')
type_id=17 offset=0 size=0 (FUNC 'bpf_dynptr_slice')
[...]
[16] FUNC 'bpf_dynptr_from_skb' type_id=82 linkage=extern
[17] FUNC 'bpf_dynptr_slice' type_id=85 linkage=extern
[...]For a detailed analysis, please refer to [2]. We can add a kind checking to fix the issue.
[1] https://github.com/eddyz87/bpf/tree/binsort-btf-dedup
[2] https://lore.kernel.org/all/[email protected]/
--- tools/lib/bpf/linker.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
tools/lib/bpf/linker.c +9 -2
@@ -2194,10 +2194,17 @@ static int linker_fixup_btf(struct src_obj *obj) vi =btf_var_secinfos (t);for (j =0 , m =btf_vlen (t); j < m; j++, vi++) {const struct btf_type *vt =btf__type_by_id (obj->btf, vi->type); -const char *var_name =btf__str_by_offset (obj->btf, vt->name_off); -int var_linkage =btf_var (vt)->linkage; +const char *var_name; +int var_linkage;Elf64_Sym *sym; +/* could be a variable or function */ +if (!btf_is_var (vt)) +continue ; + + var_name =btf__str_by_offset (obj->btf, vt->name_off); + var_linkage =btf_var (vt)->linkage; +/* no need to patch up static or extern vars */ if (var_linkage !=BTF_VAR_GLOBAL_ALLOCATED )continue ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 140/568 xfrm: Fix unregister netdevice hang on hardware offload.
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steffen Klassert <[email protected]>
[ Upstream commit 07b87f9eea0c30675084d50c82532d20168da009 ]
When offloading xfrm states to hardware, the offloading device is attached to the skbs secpath. If a skb is free is deferred, an unregister netdevice hangs because the netdevice is still refcounted.
Fix this by removing the netdevice from the xfrm states when the netdevice is unregistered. To find all xfrm states that need to be cleared we add another list where skbs linked to that are unlinked from the lists (deleted) but not yet freed.
--- include/net/xfrm.h | 36 +++++++------------------ net/xfrm/xfrm_state.c | 61 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 69 insertions(+), 28 deletions(-)
include/net/xfrm.h +10 -26
@@ -176,7 +176,10 @@ struct xfrm_state {struct hlist_node gclist;struct hlist_node bydst; }; -struct hlist_node bysrc; +union { +struct hlist_node dev_gclist; +struct hlist_node bysrc; + };struct hlist_node byspi;struct hlist_node byseq;
@@ -1584,7 +1587,7 @@ int xfrm_state_check_expire(struct xfrm_state *x);static inline void xfrm_dev_state_update_curlft (struct xfrm_state *x) {struct xfrm_dev_offload *xdo = &x->xso; -struct net_device *dev = xdo->dev; +struct net_device *dev =READ_ONCE (xdo->dev);if (x->xso.type !=XFRM_DEV_OFFLOAD_PACKET )return ;
@@ -1943,13 +1946,16 @@ int xfrm_dev_policy_add(struct net *net, struct xfrm_policy *xp, struct xfrm_user_offload *xuo, u8 dir, struct netlink_ext_ack *extack);bool xfrm_dev_offload_ok (struct sk_buff *skb,struct xfrm_state *x); +void xfrm_dev_state_delete (struct xfrm_state *x); +void xfrm_dev_state_free (struct xfrm_state *x);static inline void xfrm_dev_state_advance_esn (struct xfrm_state *x) {struct xfrm_dev_offload *xso = &x->xso; +struct net_device *dev =READ_ONCE (xso->dev); -if (xso->dev && xso->dev->xfrmdev_ops->xdo_dev_state_advance_esn) - xso->dev->xfrmdev_ops->xdo_dev_state_advance_esn (x); +if (dev && dev->xfrmdev_ops->xdo_dev_state_advance_esn) + dev->xfrmdev_ops->xdo_dev_state_advance_esn (x); }static inline bool xfrm_dst_offload_ok (struct dst_entry *dst)
@@ -1970,28 +1976,6 @@ static inline bool xfrm_dst_offload_ok(struct dst_entry *dst)return false; } -static inline void xfrm_dev_state_delete (struct xfrm_state *x) -{ -struct xfrm_dev_offload *xso = &x->xso; - -if (xso->dev) - xso->dev->xfrmdev_ops->xdo_dev_state_delete (x); -} - -static inline void xfrm_dev_state_free (struct xfrm_state *x) -{ -struct xfrm_dev_offload *xso = &x->xso; -struct net_device *dev = xso->dev; - -if (dev && dev->xfrmdev_ops) { -if (dev->xfrmdev_ops->xdo_dev_state_free) - dev->xfrmdev_ops->xdo_dev_state_free (x); - xso->dev =NULL ; - xso->type =XFRM_DEV_OFFLOAD_UNSPECIFIED ; -netdev_put (dev, &xso->dev_tracker); - } -} -static inline void xfrm_dev_policy_delete (struct xfrm_policy *x) {struct xfrm_dev_offload *xdo = &x->xdo;
net/xfrm/xfrm_state.c +59 -2
103 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 141/568 ipvs: Avoid unnecessary calls to skb_is_gso_sctp
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ismael Luceno <[email protected]>
[ Upstream commit 53796b03295cf7ab1fc8600016fa6dfbf4a494a0 ]
In the context of the SCTP SNAT/DNAT handler, these calls can only return true.
--- net/netfilter/ipvs/ip_vs_proto_sctp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/netfilter/ipvs/ip_vs_proto_sctp.c +2 -2
@@ -126,7 +126,7 @@ sctp_snat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp,if (sctph->source != cp->vport || payload_csum || skb->ip_summed ==CHECKSUM_PARTIAL ) { sctph->source = cp->vport; -if (!skb_is_gso (skb) || !skb_is_gso_sctp (skb)) +if (!skb_is_gso (skb))sctp_nat_csum (skb, sctph, sctphoff); }else { skb->ip_summed =CHECKSUM_UNNECESSARY ;
@@ -175,7 +175,7 @@ sctp_dnat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp, (skb->ip_summed == CHECKSUM_PARTIAL && !(skb_dst(skb)->dev->features & NETIF_F_SCTP_CRC))) { sctph->dest = cp->dport; -if (!skb_is_gso (skb) || !skb_is_gso_sctp (skb)) +if (!skb_is_gso (skb))sctp_nat_csum (skb, sctph, sctphoff); } else if (skb->ip_summed != CHECKSUM_PARTIAL) { skb->ip_summed =CHECKSUM_UNNECESSARY ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 142/568 netfilter: nf_tables: rise cap on SELinux secmark context
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
[ Upstream commit e29630247be24c3987e2b048f8e152771b32d38b ]
secmark context is artificially limited 256 bytes, rise it to 4Kbytes.
--- include/uapi/linux/netfilter/nf_tables.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/netfilter/nf_tables.h +1 -1
@@ -1372,7 +1372,7 @@ enum nft_secmark_attributes {#define NFTA_SECMARK_MAX (__NFTA_SECMARK_MAX - 1)/* Max security context length */ -#define NFT_SECMARK_CTX_MAXLEN 256 +#define NFT_SECMARK_CTX_MAXLEN 4096/** * enum nft_reject_types - nf_tables reject expression reject types
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 143/568 wifi: rtw89: 8852b: fix definition of KIP register number
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuan-Chung Chen <[email protected]>
[ Upstream commit 2f35712ab82683554c660bc2456f05785835efbe ]
An incorrect definition caused DPK to fail to backup and restore a set of KIP registers. Fixing this will improve RX throughput from 902 to 997 Mbps.
--- drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c +1 -1
@@ -20,7 +20,7 @@#define RTW8852B_RF_REL_VERSION 34#define RTW8852B_DPK_VER 0x0d#define RTW8852B_DPK_RF_PATH 2 -#define RTW8852B_DPK_KIP_REG_NUM 2 +#define RTW8852B_DPK_KIP_REG_NUM 3#define _TSSI_DE_MASK GENMASK(21, 12)#define ADDC_T_AVG 100
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 144/568 wifi: rtl8xxxu: 8188f: Limit TX power index
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin Kaistra <[email protected]>
[ Upstream commit d0b4b8ef083ca46d5d318e66a30fb80e0abbb90d ]
TX power index is read from the efuse on init, the values get written to the TX power registers when the channel gets switched.
When the chip has not yet been calibrated, the efuse values are 0xFF, which on some boards leads to USB timeouts for reading/writing registers after the first frames have been sent.
The vendor driver (v5.11.5-1) checks for these invalid values and sets default values instead. Implement something similar in rtl8188fu_parse_efuse().
--- .../wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c +15 -0
@@ -713,9 +713,14 @@ static void rtl8188fu_init_statistics(struct rtl8xxxu_priv *priv)rtl8xxxu_write32 (priv,REG_OFDM0_FA_RSTC , val32); } +#define TX_POWER_INDEX_MAX 0x3F +#define TX_POWER_INDEX_DEFAULT_CCK 0x22 +#define TX_POWER_INDEX_DEFAULT_HT40 0x27 +static int rtl8188fu_parse_efuse (struct rtl8xxxu_priv *priv) {struct rtl8188fu_efuse *efuse = &priv->efuse_wifi.efuse8188fu; +int i;if (efuse->rtl_id !=cpu_to_le16 (0x8129 ))return -EINVAL ;
@@ -729,6 +734,16 @@ static int rtl8188fu_parse_efuse(struct rtl8xxxu_priv *priv) efuse->tx_power_index_A.ht40_base, sizeof(efuse->tx_power_index_A.ht40_base)); +for (i =0 ; i <ARRAY_SIZE (priv->cck_tx_power_index_A); i++) { +if (priv->cck_tx_power_index_A[i] >TX_POWER_INDEX_MAX ) + priv->cck_tx_power_index_A[i] =TX_POWER_INDEX_DEFAULT_CCK ; + } + +for (i =0 ; i <ARRAY_SIZE (priv->ht40_1s_tx_power_index_A); i++) { +if (priv->ht40_1s_tx_power_index_A[i] >TX_POWER_INDEX_MAX ) + priv->ht40_1s_tx_power_index_A[i] =TX_POWER_INDEX_DEFAULT_HT40 ; + } + priv->ofdm_tx_power_diff[0 ].a = efuse->tx_power_index_A.ht20_ofdm_1s_diff.a; priv->ht20_tx_power_diff[0 ].a = efuse->tx_power_index_A.ht20_ofdm_1s_diff.b;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 145/568 xfrm: Export symbol xfrm_dev_state_delete.
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steffen Klassert <[email protected]>
[ Upstream commit 2d5317753e5f02a66e6d0afb9b25105d0beab1be ]
This fixes a build failure if xfrm_user is build as a module.
--- net/xfrm/xfrm_state.c | 1 + 1 file changed, 1 insertion(+)
net/xfrm/xfrm_state.c +1 -0
@@ -698,6 +698,7 @@ void xfrm_dev_state_delete(struct xfrm_state *x)spin_unlock_bh (&xfrm_state_dev_gc_lock); } } +EXPORT_SYMBOL_GPL (xfrm_dev_state_delete);void xfrm_dev_state_free (struct xfrm_state *x) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 146/568 bpftool: Mount bpffs when pinmaps path not under the bpffs
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tao Chen <[email protected]>
[ Upstream commit da5f8fd1f0d393d5eaaba9ad8c22d1c26bb2bf9b ]
As Quentin said [0], BPF map pinning will fail if the pinmaps path is not under the bpffs, like:
libbpf: specified path /home/ubuntu/test/sock_ops_map is not on BPF FS
Error: failed to pin all maps
[0] https://github.com/libbpf/bpftool/issues/146
--- tools/bpf/bpftool/prog.c | 4 ++++ 1 file changed, 4 insertions(+)
tools/bpf/bpftool/prog.c +4 -0
@@ -1809,6 +1809,10 @@ static int load_with_options(int argc, char **argv, bool first_prog_only) }if (pinmaps) { + err =create_and_mount_bpffs_dir (pinmaps); +if (err) + goto err_unpin; + err =bpf_object__pin_maps (obj, pinmaps);if (err) {p_err ("failed to pin all maps" );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 147/568 perf/x86/intel/pt: Fix pt_topa_entry_for_page() address calculation
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
[ Upstream commit 3520b251dcae2b4a27b95cd6f745c54fd658bda5 ]
Currently, perf allocates an array of page pointers which is limited in size by MAX_PAGE_ORDER. That in turn limits the maximum Intel PT buffer size to 2GiB. Should that limitation be lifted, the Intel PT driver can support larger sizes, except for one calculation in pt_topa_entry_for_page(), which is limited to 32-bits.
Fix pt_topa_entry_for_page() address calculation by adding a cast.
--- arch/x86/events/intel/pt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/pt.c +1 -1
@@ -989,7 +989,7 @@ pt_topa_entry_for_page(struct pt_buffer *buf, unsigned int pg)* order allocations, there shouldn't be many of these. */ list_for_each_entry (topa, &buf->tables, list) { -if (topa->offset + topa->size > pg <<PAGE_SHIFT ) +if (topa->offset + topa->size > (unsigned long )pg <<PAGE_SHIFT ) goto found; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 148/568 perf: Fix perf_aux_size() for greater-than 32-bit size
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
[ Upstream commit 3df94a5b1078dfe2b0c03f027d018800faf44c82 ]
perf_buffer->aux_nr_pages uses a 32-bit type, so a cast is needed to calculate a 64-bit size.
--- kernel/events/internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/events/internal.h +1 -1
@@ -128,7 +128,7 @@ static inline unsigned long perf_data_size(struct perf_buffer *rb)static inline unsigned long perf_aux_size (struct perf_buffer *rb) { -return rb->aux_nr_pages <<PAGE_SHIFT ; +return (unsigned long )rb->aux_nr_pages <<PAGE_SHIFT ; }#define __DEFINE_OUTPUT_COPY_BODY (advance_buf, memcpy_func, ...) \
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 149/568 perf: Prevent passing zero nr_pages to rb_alloc_aux()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
[ Upstream commit dbc48c8f41c208082cfa95e973560134489e3309 ]
nr_pages is unsigned long but gets passed to rb_alloc_aux() as an int, and is stored as an int.
Only power-of-2 values are accepted, so if nr_pages is a 64_bit value, it will be passed to rb_alloc_aux() as zero.
That is not ideal because:
1. the value is incorrect
2. rb_alloc_aux() is at risk of misbehaving, although it manages to return -ENOMEM in that case, it is a result of passing zero to get_order() even though the get_order() result is documented to be undefined in that case.
Fix by simply validating the maximum supported value in the first place. Use -ENOMEM error code for consistency with the current error code that is returned in that case.
--- kernel/events/core.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/events/core.c +2 -0
@@ -6478,6 +6478,8 @@ static int perf_mmap(struct file *file, struct vm_area_struct *vma)return -EINVAL ; nr_pages = vma_size /PAGE_SIZE ; +if (nr_pages >INT_MAX ) +return -ENOMEM ;mutex_lock (&event->mmap_mutex); ret = -EINVAL ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 150/568 perf: Fix default aux_watermark calculation
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
[ Upstream commit 43deb76b19663a96ec2189d8f4eb9a9dc2d7623f ]
The default aux_watermark is half the AUX area buffer size. In general, on a 64-bit architecture, the AUX area buffer size could be a bigger than fits in a 32-bit type, but the calculation does not allow for that possibility.
However the aux_watermark value is recorded in a u32, so should not be more than U32_MAX either.
Fix by doing the calculation in a correctly sized type, and limiting the result to U32_MAX.
--- kernel/events/ring_buffer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/events/ring_buffer.c +3 -1
@@ -684,7 +684,9 @@ int rb_alloc_aux(struct perf_buffer *rb, struct perf_event *event,* max_order, to aid PMU drivers in double buffering. */ if (!watermark) - watermark = nr_pages << (PAGE_SHIFT -1 ); + watermark = min_t(unsigned long, +U32_MAX , + (unsigned long )nr_pages << (PAGE_SHIFT -1 ));/* * Use aux_watermark as the basis for chunking to
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 151/568 perf/x86/intel/cstate: Fix Alderlake/Raptorlake/Meteorlake
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Rui <[email protected]>
[ Upstream commit 2c3aedd9db6295619d21e50ad29efda614023bf1 ]
For Alderlake, the spec changes after the patch submitted and PC7/PC9 are removed.
Raptorlake and Meteorlake, which copy the Alderlake cstate PMU, also don't have PC7/PC9.
Remove PC7/PC9 support for Alderlake/Raptorlake/Meteorlake.
--- arch/x86/events/intel/cstate.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
arch/x86/events/intel/cstate.c +2 -5
@@ -80,7 +80,7 @@* MSR_PKG_C7_RESIDENCY: Package C7 Residency Counter. * perf code: 0x03 * Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,CNL, -* KBL,CML,ICL,TGL,RKL,ADL,RPL,MTL +* KBL,CML,ICL,TGL,RKL * Scope: Package (physical package) * MSR_PKG_C8_RESIDENCY: Package C8 Residency Counter. * perf code: 0x04
@@ -89,8 +89,7 @@* Scope: Package (physical package) * MSR_PKG_C9_RESIDENCY: Package C9 Residency Counter. * perf code: 0x05 -* Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL, -* ADL,RPL,MTL +* Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL * Scope: Package (physical package) * MSR_PKG_C10_RESIDENCY: Package C10 Residency Counter. * perf code: 0x06
@@ -582,9 +581,7 @@ static const struct cstate_model adl_cstates __initconst = { .pkg_events = BIT(PERF_CSTATE_PKG_C2_RES) |BIT (PERF_CSTATE_PKG_C3_RES ) |BIT (PERF_CSTATE_PKG_C6_RES ) | -BIT (PERF_CSTATE_PKG_C7_RES ) |BIT (PERF_CSTATE_PKG_C8_RES ) | -BIT (PERF_CSTATE_PKG_C9_RES ) | BIT(PERF_CSTATE_PKG_C10_RES), };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 152/568 wifi: rtw89: Fix array index mistake in rtw89_sta_info_get_iter()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aleksandr Mishin <[email protected]>
[ Upstream commit 85099c7ce4f9e64c66aa397cd9a37473637ab891 ]
In rtw89_sta_info_get_iter() 'status->he_gi' is compared to array size. But then 'rate->he_gi' is used as array index instead of 'status->he_gi'. This can lead to go beyond array boundaries in case of 'rate->he_gi' is not equal to 'status->he_gi' and is bigger than array size. Looks like "copy-paste" mistake.
Fix this mistake by replacing 'rate->he_gi' with 'status->he_gi'.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/net/wireless/realtek/rtw89/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/debug.c +1 -1
@@ -3292,7 +3292,7 @@ static void rtw89_sta_info_get_iter(void *data, struct ieee80211_sta *sta)case RX_ENC_HE :seq_printf (m,"HE %dSS MCS-%d GI:%s" , status->nss, status->rate_idx, status->he_gi <=NL80211_RATE_INFO_HE_GI_3_2 ? - he_gi_str[rate->he_gi] :"N/A" ); + he_gi_str[status->he_gi] :"N/A" );break ; }seq_printf (m," BW:%u" ,rtw89_rate_info_bw_to_mhz (status->bw));
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 153/568 xfrm: fix netdev reference count imbalance
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jianbo Liu <[email protected]>
[ Upstream commit 9199b915e9fad7f5eff6160d24ff6b38e970107d ]
In cited commit, netdev_tracker_alloc() is called for the newly allocated xfrm state, but dev_hold() is missed, which causes netdev reference count imbalance, because netdev_put() is called when the state is freed in xfrm_dev_state_free(). Fix the issue by replacing netdev_tracker_alloc() with netdev_hold().
--- net/xfrm/xfrm_state.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/xfrm/xfrm_state.c +1 -2
@@ -1331,8 +1331,7 @@ xfrm_state_find(const xfrm_address_t *daddr, const xfrm_address_t *saddr, xso->dev = xdo->dev; xso->real_dev = xdo->real_dev; xso->flags =XFRM_DEV_OFFLOAD_FLAG_ACQ ; -netdev_tracker_alloc (xso->dev, &xso->dev_tracker, -GFP_ATOMIC ); +netdev_hold (xso->dev, &xso->dev_tracker,GFP_ATOMIC ); error = xso->dev->xfrmdev_ops->xdo_dev_state_add (x,NULL );if (error) { xso->dir =0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 154/568 xfrm: call xfrm_dev_policy_delete when kill policy
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jianbo Liu <[email protected]>
[ Upstream commit 89a2aefe4b084686c2ffc1ee939585111ea4fc0f ]
xfrm_policy_kill() is called at different places to delete xfrm policy. It will call xfrm_pol_put(). But xfrm_dev_policy_delete() is not called to free the policy offloaded to hardware.
The three commits cited here are to handle this issue by calling xfrm_dev_policy_delete() outside xfrm_get_policy(). But they didn't cover all the cases. An example, which is not handled for now, is xfrm_policy_insert(). It is called when XFRM_MSG_UPDPOLICY request is received. Old policy is replaced by new one, but the offloaded policy is not deleted, so driver doesn't have the chance to release hardware resources.
To resolve this issue for all cases, move xfrm_dev_policy_delete() into xfrm_policy_kill(), so the offloaded policy can be deleted from hardware when it is called, which avoids hardware resources leakage.
--- net/xfrm/xfrm_policy.c | 5 ++--- net/xfrm/xfrm_user.c | 1 - 2 files changed, 2 insertions(+), 4 deletions(-)
net/xfrm/xfrm_policy.c +2 -3
@@ -436,6 +436,8 @@ EXPORT_SYMBOL(xfrm_policy_destroy);static void xfrm_policy_kill (struct xfrm_policy *policy) { +xfrm_dev_policy_delete (policy); +write_lock_bh (&policy->lock); policy->walk.dead =1 ;write_unlock_bh (&policy->lock);
@@ -1834,7 +1836,6 @@ int xfrm_policy_flush(struct net *net, u8 type, bool task_valid)__xfrm_policy_unlink (pol, dir);spin_unlock_bh (&net->xfrm.xfrm_policy_lock); -xfrm_dev_policy_delete (pol); cnt++;xfrm_audit_policy_delete (pol,1 , task_valid);xfrm_policy_kill (pol);
@@ -1875,7 +1876,6 @@ int xfrm_dev_policy_flush(struct net *net, struct net_device *dev,__xfrm_policy_unlink (pol, dir);spin_unlock_bh (&net->xfrm.xfrm_policy_lock); -xfrm_dev_policy_delete (pol); cnt++;xfrm_audit_policy_delete (pol,1 , task_valid);xfrm_policy_kill (pol);
@@ -2326,7 +2326,6 @@ int xfrm_policy_delete(struct xfrm_policy *pol, int dir) pol =__xfrm_policy_unlink (pol, dir);spin_unlock_bh (&net->xfrm.xfrm_policy_lock);if (pol) { -xfrm_dev_policy_delete (pol);xfrm_policy_kill (pol);return 0 ; }
net/xfrm/xfrm_user.c +0 -1
@@ -2348,7 +2348,6 @@ static int xfrm_get_policy(struct sk_buff *skb, struct nlmsghdr *nlh, NETLINK_CB(skb).portid); } }else { -xfrm_dev_policy_delete (xp);xfrm_audit_policy_delete (xp, err ?0 :1 , true);if (err !=0 )
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 155/568 wifi: virt_wifi: avoid reporting connection success with wrong SSID
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: En-Wei Wu <[email protected]>
[ Upstream commit b5d14b0c6716fad7f0c94ac6e1d6f60a49f985c7 ]
When user issues a connection with a different SSID than the one virt_wifi has advertised, the __cfg80211_connect_result() will trigger the warning: WARN_ON(bss_not_found).
The issue is because the connection code in virt_wifi does not check the SSID from user space (it only checks the BSSID), and virt_wifi will call cfg80211_connect_result() with WLAN_STATUS_SUCCESS even if the SSID is different from the one virt_wifi has advertised. Eventually cfg80211 won't be able to find the cfg80211_bss and generate the warning.
Fixed it by checking the SSID (from user space) in the connection code.
--- drivers/net/wireless/virtual/virt_wifi.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
drivers/net/wireless/virtual/virt_wifi.c +16 -3
@@ -136,6 +136,8 @@ static struct ieee80211_supported_band band_5ghz = {/* Assigned at module init. Guaranteed locally-administered and unicast. */ static u8 fake_router_bssid[ETH_ALEN ]__ro_after_init = {}; +#define VIRT_WIFI_SSID "VirtWifi" +static void virt_wifi_inform_bss (struct wiphy *wiphy) {u64 tsf =div_u64 (ktime_get_boottime_ns (),1000 );
@@ -146,8 +148,8 @@ static void virt_wifi_inform_bss(struct wiphy *wiphy)u8 ssid[8 ]; }__packed ssid = { .tag =WLAN_EID_SSID , - .len =8 , - .ssid ="VirtWifi" , + .len =strlen (VIRT_WIFI_SSID ), + .ssid =VIRT_WIFI_SSID , }; informed_bss = cfg80211_inform_bss(wiphy, &channel_5ghz,
@@ -213,6 +215,8 @@ struct virt_wifi_netdev_priv {struct net_device *upperdev;u32 tx_packets;u32 tx_failed; +u32 connect_requested_ssid_len; +u8 connect_requested_ssid[IEEE80211_MAX_SSID_LEN ];u8 connect_requested_bss[ETH_ALEN ];bool is_up;bool is_connected;
@@ -229,6 +233,12 @@ static int virt_wifi_connect(struct wiphy *wiphy, struct net_device *netdev,if (priv->being_deleted || !priv->is_up)return -EBUSY ; +if (!sme->ssid) +return -EINVAL ; + + priv->connect_requested_ssid_len = sme->ssid_len; +memcpy (priv->connect_requested_ssid, sme->ssid, sme->ssid_len); + could_schedule =schedule_delayed_work (&priv->connect,HZ *2 );if (!could_schedule)return -EBUSY ;
@@ -252,12 +262,15 @@ static void virt_wifi_connect_complete(struct work_struct *work) container_of(work, struct virt_wifi_netdev_priv, connect.work);u8 *requested_bss = priv->connect_requested_bss;bool right_addr =ether_addr_equal (requested_bss, fake_router_bssid); +bool right_ssid = priv->connect_requested_ssid_len ==strlen (VIRT_WIFI_SSID ) && + !memcmp (priv->connect_requested_ssid,VIRT_WIFI_SSID , + priv->connect_requested_ssid_len);u16 status =WLAN_STATUS_SUCCESS ;if (is_zero_ether_addr (requested_bss)) requested_bss =NULL ; -if (!priv->is_up || (requested_bss && !right_addr)) +if (!priv->is_up || (requested_bss && !right_addr) || !right_ssid) status =WLAN_STATUS_UNSPECIFIED_FAILURE ;else priv->is_connected = true;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 156/568 gss_krb5: Fix the error handling path for crypto_sync_skcipher_setkey
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gaosheng Cui <[email protected]>
[ Upstream commit a3123341dc358952ce2bf8067fbdfb7eaadf71bb ]
If we fail to call crypto_sync_skcipher_setkey, we should free the memory allocation for cipher, replace err_return with err_free_cipher to free the memory of cipher.
--- net/sunrpc/auth_gss/gss_krb5_keys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sunrpc/auth_gss/gss_krb5_keys.c +1 -1
@@ -168,7 +168,7 @@ static int krb5_DK(const struct gss_krb5_enctype *gk5e, goto err_return; blocksize =crypto_sync_skcipher_blocksize (cipher);if (crypto_sync_skcipher_setkey (cipher, inkey->data, inkey->len)) - goto err_return; + goto err_free_cipher; ret = -ENOMEM ; inblockdata =kmalloc (blocksize, gfp_mask);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 157/568 wifi: virt_wifi: dont use strlen() in const context
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 6e909f489191b365364e9d636dec33b5dfd4e5eb ]
Looks like not all compilers allow strlen(constant) as a constant, so don't do that. Instead, revert back to defining the length as the first submission had it.
--- drivers/net/wireless/virtual/virt_wifi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/virtual/virt_wifi.c +3 -2
@@ -137,6 +137,7 @@ static struct ieee80211_supported_band band_5ghz = {static u8 fake_router_bssid[ETH_ALEN ]__ro_after_init = {};#define VIRT_WIFI_SSID "VirtWifi" +#define VIRT_WIFI_SSID_LEN 8static void virt_wifi_inform_bss (struct wiphy *wiphy) {
@@ -148,7 +149,7 @@ static void virt_wifi_inform_bss(struct wiphy *wiphy)u8 ssid[8 ]; }__packed ssid = { .tag =WLAN_EID_SSID , - .len =strlen (VIRT_WIFI_SSID ), + .len =VIRT_WIFI_SSID_LEN , .ssid =VIRT_WIFI_SSID , };
@@ -262,7 +263,7 @@ static void virt_wifi_connect_complete(struct work_struct *work) container_of(work, struct virt_wifi_netdev_priv, connect.work);u8 *requested_bss = priv->connect_requested_bss;bool right_addr =ether_addr_equal (requested_bss, fake_router_bssid); -bool right_ssid = priv->connect_requested_ssid_len ==strlen (VIRT_WIFI_SSID ) && +bool right_ssid = priv->connect_requested_ssid_len ==VIRT_WIFI_SSID_LEN && !memcmp (priv->connect_requested_ssid,VIRT_WIFI_SSID , priv->connect_requested_ssid_len);u16 status =WLAN_STATUS_SUCCESS ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 160/568 selftests/bpf: Null checks for links in bpf_tcp_ca
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geliang Tang <[email protected]>
[ Upstream commit eef0532e900c20a6760da829e82dac3ee18688c5 ]
Run bpf_tcp_ca selftests (./test_progs -t bpf_tcp_ca) on a Loongarch platform, some "Segmentation fault" errors occur:
'''
test_dctcp:PASS:bpf_dctcp__open_and_load 0 nsec test_dctcp:FAIL:bpf_map__attach_struct_ops unexpected error: -524
#29/1 bpf_tcp_ca/dctcp:FAIL
test_cubic:PASS:bpf_cubic__open_and_load 0 nsec test_cubic:FAIL:bpf_map__attach_struct_ops unexpected error: -524
#29/2 bpf_tcp_ca/cubic:FAIL
test_dctcp_fallback:PASS:dctcp_skel 0 nsec test_dctcp_fallback:PASS:bpf_dctcp__load 0 nsec test_dctcp_fallback:FAIL:dctcp link unexpected error: -524
#29/4 bpf_tcp_ca/dctcp_fallback:FAIL
test_write_sk_pacing:PASS:open_and_load 0 nsec test_write_sk_pacing:FAIL:attach_struct_ops unexpected error: -524
#29/6 bpf_tcp_ca/write_sk_pacing:FAIL
test_update_ca:PASS:open 0 nsec test_update_ca:FAIL:attach_struct_ops unexpected error: -524
settcpca:FAIL:setsockopt unexpected setsockopt: \ actual -1 == expected -1 (network_helpers.c:99: errno: No such file or directory) \ Failed to call post_socket_cb start_test:FAIL:start_server_str unexpected start_server_str: \ actual -1 == expected -1
test_update_ca:FAIL:ca1_ca1_cnt unexpected ca1_ca1_cnt: \
actual 0 <= expected 0
#29/9 bpf_tcp_ca/update_ca:FAIL
#29 bpf_tcp_ca:FAIL
Caught signal #11!
Stack trace:
./test_progs(crash_handler+0x28)[0x5555567ed91c] linux-vdso.so.1(__vdso_rt_sigreturn+0x0)[0x7ffffee408b0] ./test_progs(bpf_link__update_map+0x80)[0x555556824a78] ./test_progs(+0x94d68)[0x5555564c4d68] ./test_progs(test_bpf_tcp_ca+0xe8)[0x5555564c6a88] ./test_progs(+0x3bde54)[0x5555567ede54] ./test_progs(main+0x61c)[0x5555567efd54] /usr/lib64/libc.so.6(+0x22208)[0x7ffff2aaa208] /usr/lib64/libc.so.6(__libc_start_main+0xac)[0x7ffff2aaa30c] ./test_progs(_start+0x48)[0x55555646bca8] Segmentation fault
'''
This is because BPF trampoline is not implemented on Loongarch yet, "link" returned by bpf_map__attach_struct_ops() is NULL. test_progs crashs when this NULL link passes to bpf_link__update_map(). This patch adds NULL checks for all links in bpf_tcp_ca to fix these errors. If "link" is NULL, goto the newly added label "out" to destroy the skel.
v2:
- use "goto out" instead of "return" as Eduard suggested.
--- .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +12 -4
@@ -396,7 +396,8 @@ static void test_update_ca(void)return ; link =bpf_map__attach_struct_ops (skel->maps.ca_update_1); -ASSERT_OK_PTR (link,"attach_struct_ops" ); +if (!ASSERT_OK_PTR (link,"attach_struct_ops" )) + goto out;do_test ("tcp_ca_update" ,NULL ); saved_ca1_cnt = skel->bss->ca1_cnt;
@@ -410,6 +411,7 @@ static void test_update_ca(void)ASSERT_GT (skel->bss->ca2_cnt,0 ,"ca2_ca2_cnt" );bpf_link__destroy (link); +out:tcp_ca_update__destroy (skel); }
@@ -425,7 +427,8 @@ static void test_update_wrong(void)return ; link =bpf_map__attach_struct_ops (skel->maps.ca_update_1); -ASSERT_OK_PTR (link,"attach_struct_ops" ); +if (!ASSERT_OK_PTR (link,"attach_struct_ops" )) + goto out;do_test ("tcp_ca_update" ,NULL ); saved_ca1_cnt = skel->bss->ca1_cnt;
@@ -438,6 +441,7 @@ static void test_update_wrong(void)ASSERT_GT (skel->bss->ca1_cnt, saved_ca1_cnt,"ca2_ca1_cnt" );bpf_link__destroy (link); +out:tcp_ca_update__destroy (skel); }
@@ -452,7 +456,8 @@ static void test_mixed_links(void)return ; link_nl =bpf_map__attach_struct_ops (skel->maps.ca_no_link); -ASSERT_OK_PTR (link_nl,"attach_struct_ops_nl" ); +if (!ASSERT_OK_PTR (link_nl,"attach_struct_ops_nl" )) + goto out; link =bpf_map__attach_struct_ops (skel->maps.ca_update_1);ASSERT_OK_PTR (link,"attach_struct_ops" );
@@ -465,6 +470,7 @@ static void test_mixed_links(void)bpf_link__destroy (link);bpf_link__destroy (link_nl); +out:tcp_ca_update__destroy (skel); }
@@ -507,7 +513,8 @@ static void test_link_replace(void)bpf_link__destroy (link); link =bpf_map__attach_struct_ops (skel->maps.ca_update_2); -ASSERT_OK_PTR (link,"attach_struct_ops_2nd" ); +if (!ASSERT_OK_PTR (link,"attach_struct_ops_2nd" )) + goto out;/* BPF_F_REPLACE with a wrong old map Fd. It should fail! *
@@ -530,6 +537,7 @@ static void test_link_replace(void)bpf_link__destroy (link); +out:tcp_ca_update__destroy (skel); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 161/568 selftests/bpf: Close obj in error path in xdp_adjust_tail
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geliang Tang <[email protected]>
[ Upstream commit 52b49ec1b2c78deb258596c3b231201445ef5380 ]
If bpf_object__load() fails in test_xdp_adjust_frags_tail_grow(), "obj" opened before this should be closed. So use "goto out" to close it instead of using "return" here.
--- tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c +1 -1
@@ -222,7 +222,7 @@ static void test_xdp_adjust_frags_tail_grow(void) prog =bpf_object__next_program (obj,NULL );if (bpf_object__load (obj)) -return ; + goto out; prog_fd =bpf_program__fd (prog);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 162/568 selftests/resctrl: Move run_benchmark() to a more fitting file
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maciej Wieczor-Retman <[email protected]>
[ Upstream commit 508934b5d15ab79fd5895cc2a6063bc9d95f6a55 ]
resctrlfs.c contains mostly functions that interact in some way with resctrl FS entries while functions inside resctrl_val.c deal with measurements and benchmarking.
run_benchmark() is located in resctrlfs.c even though it's purpose is not interacting with the resctrl FS but to execute cache checking logic.
Move run_benchmark() to resctrl_val.c just before resctrl_val() that makes use of run_benchmark(). Make run_benchmark() static since it's not used between multiple files anymore.
Remove return comment from kernel-doc since the function is type void.
Stable-dep-of: c44000b6535d ("selftests/resctrl: Fix closing IMC fds on error and open-code R+W instead of loops")
--- tools/testing/selftests/resctrl/resctrl.h | 1 - tools/testing/selftests/resctrl/resctrl_val.c | 50 ++++++++++++++++++ tools/testing/selftests/resctrl/resctrlfs.c | 52 ------------------- 3 files changed, 50 insertions(+), 53 deletions(-)
tools/testing/selftests/resctrl/resctrl.h +0 -1
@@ -86,7 +86,6 @@ int validate_bw_report_request(char *bw_report);bool validate_resctrl_feature_request (const char *resource,const char *feature);char *fgrep (FILE *inf,const char *str);int taskset_benchmark (pid_t bm_pid,int cpu_no); -void run_benchmark (int signum,siginfo_t *info,void *ucontext);int write_schemata (char *ctrlgrp,char *schemata,int cpu_no,char *resctrl_val); int write_bm_pid_to_resctrl(pid_t bm_pid, char *ctrlgrp, char *mongrp,
tools/testing/selftests/resctrl/resctrl_val.c +50 -0
56 lines not on this page · raw message
tools/testing/selftests/resctrl/resctrlfs.c +0 -52
58 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 163/568 selftests/resctrl: Convert perror() to ksft_perror() or ksft_print_msg()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit cc8ff7f5c85c076297b18fb9f6d45ec5569d3d44 ]
The resctrl selftest code contains a number of perror() calls. Some of them come with hash character and some don't. The kselftest framework provides ksft_perror() that is compatible with test output formatting so it should be used instead of adding custom hash signs.
Some perror() calls are too far away from anything that sets error. For those call sites, ksft_print_msg() must be used instead.
Convert perror() to ksft_perror() or ksft_print_msg().
Other related changes:
- Remove hash signs
- Remove trailing stops & newlines from ksft_perror()
- Add terminating newlines for converted ksft_print_msg()
- Use consistent capitalization
- Small fixes/tweaks to typos & grammar of the messages
- Extract error printing out of PARENT_EXIT() to be able to differentiate
Stable-dep-of: c44000b6535d ("selftests/resctrl: Fix closing IMC fds on error and open-code R+W instead of loops")
--- tools/testing/selftests/resctrl/cache.c | 10 +-- tools/testing/selftests/resctrl/cat_test.c | 8 +- tools/testing/selftests/resctrl/cmt_test.c | 2 +- tools/testing/selftests/resctrl/fill_buf.c | 2 +- tools/testing/selftests/resctrl/mba_test.c | 2 +- tools/testing/selftests/resctrl/mbm_test.c | 2 +- tools/testing/selftests/resctrl/resctrl.h | 3 +- tools/testing/selftests/resctrl/resctrl_val.c | 76 ++++++++++--------- tools/testing/selftests/resctrl/resctrlfs.c | 42 +++++----- 9 files changed, 77 insertions(+), 70 deletions(-)
tools/testing/selftests/resctrl/cache.c +5 -5
@@ -40,7 +40,7 @@ static int perf_event_open_llc_miss(pid_t pid, int cpu_no) fd_lm =perf_event_open (&pea_llc_miss, pid, cpu_no,-1 ,PERF_FLAG_FD_CLOEXEC );if (fd_lm ==-1 ) { -perror ("Error opening leader" ); +ksft_perror ("Error opening leader" );ctrlc_handler (0 ,NULL ,NULL );return -1 ; }
@@ -95,7 +95,7 @@ static int get_llc_perf(unsigned long *llc_perf_miss) ret =read (fd_lm, &rf_cqm,sizeof (struct read_format ));if (ret ==-1 ) { -perror ("Could not get llc misses through perf" ); +ksft_perror ("Could not get llc misses through perf" );return -1 ; }
@@ -124,12 +124,12 @@ static int get_llc_occu_resctrl(unsigned long *llc_occupancy) fp =fopen (llc_occup_path,"r" );if (!fp) { -perror ("Failed to open results file" ); +ksft_perror ("Failed to open results file" );return errno; }if (fscanf (fp,"%lu" , llc_occupancy) <=0 ) { -perror ("Could not get llc occupancy" ); +ksft_perror ("Could not get llc occupancy" );fclose (fp);return -1 ;
@@ -159,7 +159,7 @@ static int print_results_cache(char *filename, int bm_pid, }else { fp =fopen (filename,"a" );if (!fp) { -perror ("Cannot open results file" ); +ksft_perror ("Cannot open results file" );return errno; }
tools/testing/selftests/resctrl/cat_test.c +4 -4
@@ -51,7 +51,7 @@ static int check_results(struct resctrl_val_param *param, size_t span)ksft_print_msg ("Checking for pass/fail\n" ); fp =fopen (param->filename,"r" );if (!fp) { -perror ("# Cannot open file" ); +ksft_perror ("Cannot open file" );return errno; }
@@ -149,7 +149,7 @@ int cat_perf_miss_val(int cpu_no, int n, char *cache_type) param.num_of_runs =0 ;if (pipe (pipefd)) { -perror ("# Unable to create pipe" ); +ksft_perror ("Unable to create pipe" );return errno; }
@@ -185,7 +185,7 @@ int cat_perf_miss_val(int cpu_no, int n, char *cache_type)* Just print the error message. * Let while(1) run and wait for itself to be killed. */ -perror ("# failed signaling parent process" ); +ksft_perror ("Failed signaling parent process" );close (pipefd[1 ]);while (1 )
@@ -197,7 +197,7 @@ int cat_perf_miss_val(int cpu_no, int n, char *cache_type)while (pipe_message !=1 ) {if (read (pipefd[0 ], &pipe_message,sizeof (pipe_message)) <sizeof (pipe_message)) { -perror ("# failed reading from child process" ); +ksft_perror ("Failed reading from child process" );break ; } }
tools/testing/selftests/resctrl/cmt_test.c +1 -1
@@ -37,7 +37,7 @@ static int check_results(struct resctrl_val_param *param, size_t span, int no_ofksft_print_msg ("Checking for pass/fail\n" ); fp =fopen (param->filename,"r" );if (!fp) { -perror ("# Error in opening file\n" ); +ksft_perror ("Error in opening file" );return errno; }
tools/testing/selftests/resctrl/fill_buf.c +1 -1
@@ -115,7 +115,7 @@ static int fill_cache_read(unsigned char *buf, size_t buf_size, bool once)/* Consume read result so that reading memory is not optimized out. */ fp =fopen ("/dev/null" ,"w" );if (!fp) { -perror ("Unable to write to /dev/null" ); +ksft_perror ("Unable to write to /dev/null" );return -1 ; }fprintf (fp,"Sum: %d " , ret);
tools/testing/selftests/resctrl/mba_test.c +1 -1
@@ -109,7 +109,7 @@ static int check_results(void) fp =fopen (output,"r" );if (!fp) { -perror (output); +ksft_perror (output);return errno; }
tools/testing/selftests/resctrl/mbm_test.c +1 -1
@@ -59,7 +59,7 @@ static int check_results(size_t span) fp =fopen (output,"r" );if (!fp) { -perror (output); +ksft_perror (output);return errno; }
tools/testing/selftests/resctrl/resctrl.h +1 -2
@@ -37,9 +37,8 @@#define DEFAULT_SPAN (250 * MB) -#define PARENT_EXIT (err_msg) \ +#define PARENT_EXIT () \ do { \ - perror(err_msg); \ kill(ppid, SIGKILL); \ umount_resctrlfs(); \ exit(EXIT_FAILURE); \
tools/testing/selftests/resctrl/resctrl_val.c +42 -34
239 lines not on this page · raw message
tools/testing/selftests/resctrl/resctrlfs.c +21 -21
157 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 164/568 selftests/resctrl: Fix closing IMC fds on error and open-code R+W instead of loops
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit c44000b6535dc9806b9128d1aed403862b2adab9 ]
The imc perf fd close() calls are missing from all error paths. In addition, get_mem_bw_imc() handles fds in a for loop but close() is based on two fixed indexes READ and WRITE.
Open code inner for loops to READ+WRITE entries for clarity and add a function to close() IMC fds properly in all cases.
--- tools/testing/selftests/resctrl/resctrl_val.c | 54 ++++++++++++------- 1 file changed, 36 insertions(+), 18 deletions(-)
tools/testing/selftests/resctrl/resctrl_val.c +36 -18
@@ -292,6 +292,18 @@ static int initialize_mem_bw_imc(void)return 0 ; } +static void perf_close_imc_mem_bw (void ) +{ +int mc; + +for (mc =0 ; mc < imcs; mc++) { +if (imc_counters_config[mc][READ ].fd !=-1 ) +close (imc_counters_config[mc][READ ].fd); +if (imc_counters_config[mc][WRITE ].fd !=-1 ) +close (imc_counters_config[mc][WRITE ].fd); + } +} +/* * get_mem_bw_imc: Memory band width as reported by iMC counters * @cpu_no: CPU number that the benchmark PID is binded to
@@ -305,26 +317,33 @@ static int initialize_mem_bw_imc(void)static int get_mem_bw_imc (int cpu_no,char *bw_report,float *bw_imc) {float reads, writes, of_mul_read, of_mul_write; -int imc, j, ret; +int imc, ret; + +for (imc =0 ; imc < imcs; imc++) { + imc_counters_config[imc][READ ].fd =-1 ; + imc_counters_config[imc][WRITE ].fd =-1 ; + }/* Start all iMC counters to log values (both read and write) */ reads =0 , writes =0 , of_mul_read =1 , of_mul_write =1 ;for (imc =0 ; imc < imcs; imc++) { -for (j =0 ; j <2 ; j++) { - ret =open_perf_event (imc, cpu_no, j); -if (ret) -return -1 ; - } -for (j =0 ; j <2 ; j++) -membw_ioctl_perf_event_ioc_reset_enable (imc, j); + ret =open_perf_event (imc, cpu_no,READ ); +if (ret) + goto close_fds; + ret =open_perf_event (imc, cpu_no,WRITE ); +if (ret) + goto close_fds; + +membw_ioctl_perf_event_ioc_reset_enable (imc,READ ); +membw_ioctl_perf_event_ioc_reset_enable (imc,WRITE ); }sleep (1 );/* Stop counters after a second to get results (both read and write) */ for (imc =0 ; imc < imcs; imc++) { -for (j =0 ; j <2 ; j++) -membw_ioctl_perf_event_ioc_disable (imc, j); +membw_ioctl_perf_event_ioc_disable (imc,READ ); +membw_ioctl_perf_event_ioc_disable (imc,WRITE ); }/*
@@ -340,15 +359,13 @@ static int get_mem_bw_imc(int cpu_no, char *bw_report, float *bw_imc)if (read (r->fd, &r->return_value,sizeof (struct membw_read_format )) ==-1 ) {ksft_perror ("Couldn't get read b/w through iMC" ); - -return -1 ; + goto close_fds; }if (read (w->fd, &w->return_value,sizeof (struct membw_read_format )) ==-1 ) {ksft_perror ("Couldn't get write bw through iMC" ); - -return -1 ; + goto close_fds; }__u64 r_time_enabled = r->return_value.time_enabled;
@@ -368,10 +385,7 @@ static int get_mem_bw_imc(int cpu_no, char *bw_report, float *bw_imc) writes += w->return_value.value * of_mul_write *SCALE ; } -for (imc =0 ; imc < imcs; imc++) { -close (imc_counters_config[imc][READ ].fd); -close (imc_counters_config[imc][WRITE ].fd); - } +perf_close_imc_mem_bw ();if (strcmp (bw_report,"reads" ) ==0 ) { *bw_imc = reads;
@@ -385,6 +399,10 @@ static int get_mem_bw_imc(int cpu_no, char *bw_report, float *bw_imc) *bw_imc = reads + writes;return 0 ; + +close_fds: +perf_close_imc_mem_bw (); +return -1 ; }void set_mbm_path (const char *ctrlgrp,const char *mongrp,int resource_id)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 165/568 bpf: annotate BTF show functions with __printf
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Maguire <[email protected]>
[ Upstream commit b3470da314fd8018ee237e382000c4154a942420 ]
-Werror=suggest-attribute=format warns about two functions in kernel/bpf/btf.c [1]; add __printf() annotations to silence these warnings since for CONFIG_WERROR=y they will trigger build failures.
[1] https://lore.kernel.org/bpf/[email protected]/
--- kernel/bpf/btf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/bpf/btf.c +4 -4
@@ -7070,8 +7070,8 @@ static void btf_type_show(const struct btf *btf, u32 type_id, void *obj,btf_type_ops (t)->show (btf, t, type_id, obj,0 , show); } -static void btf_seq_show (struct btf_show *show,const char *fmt, -va_list args) +__printf(2, 0) static void btf_seq_show(struct btf_show *show, const char *fmt, +va_list args) {seq_vprintf ((struct seq_file *)show->target, fmt, args); }
@@ -7104,8 +7104,8 @@ struct btf_show_snprintf {int len;/* length we would have written */ }; -static void btf_snprintf_show (struct btf_show *show,const char *fmt, -va_list args) +__printf(2, 0) static void btf_snprintf_show(struct btf_show *show, const char *fmt, +va_list args) {struct btf_show_snprintf *ssnprintf = (struct btf_show_snprintf *)show;int len;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 166/568 bna: adjust name buf size of bna_tcb and bna_ccb structures
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexey Kodanev <[email protected]>
[ Upstream commit c9741a03dc8e491e57b95fba0058ab46b7e506da ]
To have enough space to write all possible sprintf() args. Currently 'name' size is 16, but the first '%s' specifier may already need at least 16 characters, since 'bnad->netdev->name' is used there.
For '%d' specifiers, assume that they require:
* 1 char for 'tx_id + tx_info->tcb[i]->id' sum, BNAD_MAX_TXQ_PER_TX is 8
* 2 chars for 'rx_id + rx_info->rx_ctrl[i].ccb->id', BNAD_MAX_RXP_PER_RX is 16
And replace sprintf with snprintf.
Detected using the static analysis tool - Svace.
--- drivers/net/ethernet/brocade/bna/bna_types.h | 2 +- drivers/net/ethernet/brocade/bna/bnad.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-)
drivers/net/ethernet/brocade/bna/bna_types.h +1 -1
@@ -416,7 +416,7 @@ struct bna_ib {/* Tx object */ /* Tx datapath control structure */ -#define BNA_Q_NAME_SIZE 16 +#define BNA_Q_NAME_SIZE (IFNAMSIZ + 6)struct bna_tcb {/* Fast path */ void **sw_qpt;
drivers/net/ethernet/brocade/bna/bnad.c +6 -5
@@ -1534,8 +1534,9 @@ bnad_tx_msix_register(struct bnad *bnad, struct bnad_tx_info *tx_info,for (i =0 ; i < num_txqs; i++) { vector_num = tx_info->tcb[i]->intr_vector; -sprintf (tx_info->tcb[i]->name,"%s TXQ %d" , bnad->netdev->name, - tx_id + tx_info->tcb[i]->id); +snprintf (tx_info->tcb[i]->name,BNA_Q_NAME_SIZE ,"%s TXQ %d" , + bnad->netdev->name, + tx_id + tx_info->tcb[i]->id); err = request_irq(bnad->msix_table[vector_num].vector, (irq_handler_t)bnad_msix_tx, 0, tx_info->tcb[i]->name,
@@ -1585,9 +1586,9 @@ bnad_rx_msix_register(struct bnad *bnad, struct bnad_rx_info *rx_info,for (i =0 ; i < num_rxps; i++) { vector_num = rx_info->rx_ctrl[i].ccb->intr_vector; -sprintf (rx_info->rx_ctrl[i].ccb->name,"%s CQ %d" , - bnad->netdev->name, - rx_id + rx_info->rx_ctrl[i].ccb->id); +snprintf (rx_info->rx_ctrl[i].ccb->name,BNA_Q_NAME_SIZE , +"%s CQ %d" , bnad->netdev->name, + rx_id + rx_info->rx_ctrl[i].ccb->id); err = request_irq(bnad->msix_table[vector_num].vector, (irq_handler_t)bnad_msix_rx, 0, rx_info->rx_ctrl[i].ccb->name,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 167/568 bpf: Eliminate remaining "make W=1" warnings in kernel/bpf/btf.o
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Maguire <[email protected]>
[ Upstream commit 2454075f8e2915cebbe52a1195631bc7efe2b7e1 ]
As reported by Mirsad [1] we still see format warnings in kernel/bpf/btf.o at W=1 warning level:
CC kernel/bpf/btf.o./kernel/bpf/btf.c: In function ‘btf_type_seq_show_flags’:./kernel/bpf/btf.c:7553:21: warning: assignment left-hand side might be a candidate for a format attribute [-Wsuggest-attribute=format]
7553 | sseq.showfn = btf_seq_show;
| ^./kernel/bpf/btf.c: In function ‘btf_type_snprintf_show’:./kernel/bpf/btf.c:7604:31: warning: assignment left-hand side might be a candidate for a format attribute [-Wsuggest-attribute=format]
7604 | ssnprintf.show.showfn = btf_snprintf_show;
| ^
Combined with CONFIG_WERROR=y these can halt the build.
The fix (annotating the structure field with __printf()) suggested by Mirsad resolves these. Apologies I missed this last time. No other W=1 warnings were observed in kernel/bpf after this fix.
[1] https://lore.kernel.org/bpf/[email protected]/
--- kernel/bpf/btf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/btf.c +1 -1
@@ -405,7 +405,7 @@ const char *btf_type_str(const struct btf_type *t)struct btf_show {u64 flags;void *target;/* target of show operation (seq file, buffer) */ -void (*showfn)(struct btf_show *show,const char *fmt,va_list args); + __printf(2, 0) void (*showfn)(struct btf_show *show, const char *fmt, va_list args);const struct btf *btf;/* below are used during iteration */ struct {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 168/568 bpf: Fix null pointer dereference in resolve_prog_type() for BPF_PROG_TYPE_EXT
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tengda Wu <[email protected]>
[ Upstream commit f7866c35873377313ff94398f17d425b28b71de1 ]
When loading a EXT program without specifying attr->attach_prog_fd, the prog->aux->dst_prog will be null. At this time, calling resolve_prog_type() anywhere will result in a null pointer dereference.
Example stack trace:
[ 8.107863] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000004 [ 8.108262] Mem abort info: [ 8.108384] ESR = 0x0000000096000004 [ 8.108547] EC = 0x25: DABT (current EL), IL = 32 bits [ 8.108722] SET = 0, FnV = 0 [ 8.108827] EA = 0, S1PTW = 0 [ 8.108939] FSC = 0x04: level 0 translation fault [ 8.109102] Data abort info: [ 8.109203] ISV = 0, ISS = 0x00000004, ISS2 = 0x00000000 [ 8.109399] CM = 0, WnR = 0, TnD = 0, TagAccess = 0 [ 8.109614] GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0 [ 8.109836] user pgtable: 4k pages, 48-bit VAs, pgdp=0000000101354000 [ 8.110011] [0000000000000004] pgd=0000000000000000, p4d=0000000000000000 [ 8.112624] Internal error: Oops: 0000000096000004 [#1] PREEMPT SMP [ 8.112783] Modules linked in: [ 8.113120] CPU: 0 PID: 99 Comm: may_access_dire Not tainted 6.10.0-rc3-next-20240613-dirty #1 [ 8.113230] Hardware name: linux,dummy-virt (DT) [ 8.113390] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 8.113429] pc : may_access_direct_pkt_data+0x24/0xa0 [ 8.113746] lr : add_subprog_and_kfunc+0x634/0x8e8 [ 8.113798] sp : ffff80008283b9f0 [ 8.113813] x29: ffff80008283b9f0 x28: ffff800082795048 x27: 0000000000000001 [ 8.113881] x26: ffff0000c0bb2600 x25: 0000000000000000 x24: 0000000000000000 [ 8.113897] x23: ffff0000c1134000 x22: 000000000001864f x21: ffff0000c1138000 [ 8.113912] x20: 0000000000000001 x19: ffff0000c12b8000 x18: ffffffffffffffff [ 8.113929] x17: 0000000000000000 x16: 0000000000000000 x15: 0720072007200720 [ 8.113944] x14: 0720072007200720 x13: 0720072007200720 x12: 0720072007200720 [ 8.113958] x11: 0720072007200720 x10: 0000000000f9fca4 x9 : ffff80008021f4e4 [ 8.113991] x8 : 0101010101010101 x7 : 746f72705f6d656d x6 : 000000001e0e0f5f [ 8.114006] x5 : 000000000001864f x4 : ffff0000c12b8000 x3 : 000000000000001c [ 8.114020] x2 : 0000000000000002 x1 : 0000000000000000 x0 : 0000000000000000 [ 8.114126] Call trace: [ 8.114159] may_access_direct_pkt_data+0x24/0xa0 [ 8.114202] bpf_check+0x3bc/0x28c0 [ 8.114214] bpf_prog_load+0x658/0xa58 [ 8.114227] __sys_bpf+0xc50/0x2250 [ 8.114240] __arm64_sys_bpf+0x28/0x40 [ 8.114254] invoke_syscall.constprop.0+0x54/0xf0 [ 8.114273] do_el0_svc+0x4c/0xd8 [ 8.114289] el0_svc+0x3c/0x140 [ 8.114305] el0t_64_sync_handler+0x134/0x150 [ 8.114331] el0t_64_sync+0x168/0x170 [ 8.114477] Code: 7100707f 54000081 f9401c00 f9403800 (b9400403) [ 8.118672] ---[ end trace 0000000000000000 ]---
One way to fix it is by forcing attach_prog_fd non-empty when bpf_prog_load(). But this will lead to libbpf_probe_bpf_prog_type API broken which use verifier log to probe prog type and will log nothing if we reject invalid EXT prog before bpf_check().
Another way is by adding null check in resolve_prog_type().
The issue was introduced by commit 4a9c7bbe2ed4 ("bpf: Resolve to prog->aux->dst_prog->type only for BPF_PROG_TYPE_EXT") which wanted to correct type resolution for BPF_PROG_TYPE_TRACING programs. Before that, the type resolution of BPF_PROG_TYPE_EXT prog actually follows the logic below:
prog->aux->dst_prog ? prog->aux->dst_prog->type : prog->type;
It implies that when EXT program is not yet attached to dst_prog, the prog type should be EXT itself. This code worked fine in the past. So just keep using it.
Fix this by returning prog->type for BPF_PROG_TYPE_EXT if dst_prog is not present in resolve_prog_type().
--- include/linux/bpf_verifier.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/bpf_verifier.h +1 -1
@@ -760,7 +760,7 @@ static inline u32 type_flag(u32 type)/* only use after check_attach_btf_id() */ static inline enum bpf_prog_type resolve_prog_type (const struct bpf_prog *prog) { -return prog->type ==BPF_PROG_TYPE_EXT ? +return (prog->type ==BPF_PROG_TYPE_EXT && prog->aux->dst_prog) ? prog->aux->dst_prog->type : prog->type; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 169/568 selftests: forwarding: devlink_lib: Wait for udev events after reloading
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amit Cohen <[email protected]>
[ Upstream commit f67a90a0c8f5b3d0acc18f10650d90fec44775f9 ]
Lately, an additional locking was added by commit c0a40097f0bc ("drivers: core: synchronize really_probe() and dev_uevent()"). The locking protects dev_uevent() calling. This function is used to send messages from the kernel to user space. Uevent messages notify user space about changes in device states, such as when a device is added, removed, or changed. These messages are used by udev (or other similar user-space tools) to apply device-specific rules.
After reloading devlink instance, udev events should be processed. This locking causes a short delay of udev events handling.
One example for useful udev rule is renaming ports. 'forwading.config' can be configured to use names after udev rules are applied. Some tests run devlink_reload() and immediately use the updated names. This worked before the above mentioned commit was pushed, but now the delay of uevent messages causes that devlink_reload() returns before udev events are handled and tests fail.
Adjust devlink_reload() to not assume that udev events are already processed when devlink reload is done, instead, wait for udev events to ensure they are processed before returning from the function.
Without this patch:
TESTS='rif_mac_profile' ./resource_scale.sh
TEST: 'rif_mac_profile' 4 [ OK ]
sysctl: cannot stat /proc/sys/net/ipv6/conf/swp1/disable_ipv6: No such file or directory
sysctl: cannot stat /proc/sys/net/ipv6/conf/swp1/disable_ipv6: No such file or directory
sysctl: cannot stat /proc/sys/net/ipv6/conf/swp2/disable_ipv6: No such file or directory
sysctl: cannot stat /proc/sys/net/ipv6/conf/swp2/disable_ipv6: No such file or directory Cannot find device "swp1"
Cannot find device "swp2"
TEST: setup_wait_dev (: Interface swp1 does not come up.) [FAIL]
With this patch:
$ TESTS='rif_mac_profile' ./resource_scale.sh TEST: 'rif_mac_profile' 4 [ OK ] TEST: 'rif_mac_profile' overflow 5 [ OK ]
This is relevant not only for this test.
--- tools/testing/selftests/net/forwarding/devlink_lib.sh | 2 ++ 1 file changed, 2 insertions(+)
tools/testing/selftests/net/forwarding/devlink_lib.sh +2 -0
@@ -122,6 +122,8 @@ devlink_reload() still_pending=$(devlink resource show "$DEVLINK_DEV" | \ grep -c "size_new") check_err $still_pending "Failed reload - There are still unset sizes" + + udevadm settle } declare -A DEVLINK_ORIG
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 170/568 Bluetooth: hci_bcm4377: Use correct unit for timeouts
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sven Peter <[email protected]>
[ Upstream commit 56c695a823e4ee1e5294a8340d5afe5de73828ec ]
BCM4377_TIMEOUT is always used to wait for completitions and their API expects a timeout in jiffies instead of msecs.
--- drivers/bluetooth/hci_bcm4377.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bluetooth/hci_bcm4377.c +1 -1
@@ -32,7 +32,7 @@ enum bcm4377_chip {#define BCM4378_DEVICE_ID 0x5f69#define BCM4387_DEVICE_ID 0x5f71 -#define BCM4377_TIMEOUT 1000 +#define BCM4377_TIMEOUT msecs_to_jiffies(1000)/* * These devices only support DMA transactions inside a 32bit window
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 171/568 Bluetooth: btintel: Refactor btintel_set_ppag()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kiran K <[email protected]>
[ Upstream commit 0a3e2eca1daa5627c8ecd1554e3146de82d61dd2 ]
Current flow iterates the ACPI table associated with Bluetooth controller looking for PPAG method. Method name can be directly passed to acpi_evaluate_object function instead of iterating the table.
--- drivers/bluetooth/btintel.c | 119 +++++++++++------------------------- 1 file changed, 34 insertions(+), 85 deletions(-)
drivers/bluetooth/btintel.c +34 -85
@@ -26,21 +26,11 @@#define ECDSA_OFFSET 644#define ECDSA_HEADER_LEN 320 -#define BTINTEL_PPAG_NAME "PPAG" -enum {DSM_SET_WDISABLE2_DELAY =1 ,DSM_SET_RESET_METHOD =3 , }; -/* structure to store the PPAG data read from ACPI table */ -struct btintel_ppag { -u32 domain; -u32 mode; -acpi_status status; -struct hci_dev *hdev; -}; -#define CMD_WRITE_BOOT_PARAMS 0xfc0estruct cmd_write_boot_params {__le32 boot_addr;
@@ -1312,65 +1302,6 @@ static int btintel_read_debug_features(struct hci_dev *hdev,return 0 ; } -static acpi_status btintel_ppag_callback (acpi_handle handle,u32 lvl,void *data, -void **ret) -{ -acpi_status status; -size_t len; -struct btintel_ppag *ppag = data; -union acpi_object *p, *elements; -struct acpi_buffer string = {ACPI_ALLOCATE_BUFFER ,NULL }; -struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER ,NULL }; -struct hci_dev *hdev = ppag->hdev; - - status =acpi_get_name (handle,ACPI_FULL_PATHNAME , &string); -if (ACPI_FAILURE (status)) { -bt_dev_warn (hdev,"PPAG-BT: ACPI Failure: %s" ,acpi_format_exception (status)); -return status; - } - - len =strlen (string.pointer); -if (len <strlen (BTINTEL_PPAG_NAME )) { -kfree (string.pointer); -return AE_OK ; - } - -if (strncmp ((char *)string.pointer + len -4 ,BTINTEL_PPAG_NAME ,4 )) { -kfree (string.pointer); -return AE_OK ; - } -kfree (string.pointer); - - status =acpi_evaluate_object (handle,NULL ,NULL , &buffer); -if (ACPI_FAILURE (status)) { - ppag->status = status; -bt_dev_warn (hdev,"PPAG-BT: ACPI Failure: %s" ,acpi_format_exception (status)); -return status; - } - - p = buffer.pointer; - ppag = (struct btintel_ppag *)data; - -if (p->type !=ACPI_TYPE_PACKAGE || p->package.count !=2 ) { -kfree (buffer.pointer); -bt_dev_warn (hdev,"PPAG-BT: Invalid object type: %d or package count: %d" , - p->type, p->package.count); - ppag->status =AE_ERROR ; -return AE_ERROR ; - } - - elements = p->package.elements; - -/* PPAG table is located at element[1] */ - p = &elements[1 ]; - - ppag->domain = (u32 )p->package.elements[0 ].integer.value; - ppag->mode = (u32 )p->package.elements[1 ].integer.value; - ppag->status =AE_OK ; -kfree (buffer.pointer); -return AE_CTRL_TERMINATE ; -} -static int btintel_set_debug_features (struct hci_dev *hdev,const struct intel_debug_features *features) {
@@ -2399,10 +2330,13 @@ static int btintel_configure_offload(struct hci_dev *hdev)static void btintel_set_ppag (struct hci_dev *hdev,struct intel_version_tlv *ver) { -struct btintel_ppag ppag;struct sk_buff *skb;struct hci_ppag_enable_cmd ppag_cmd;acpi_handle handle; +struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER ,NULL }; +union acpi_object *p, *elements; +u32 domain, mode; +acpi_status status;/* PPAG is not supported if CRF is HrP2, Jfp2, JfP1 */ switch (ver->cnvr_top &0xFFF ) {
@@ -2420,22 +2354,34 @@ static void btintel_set_ppag(struct hci_dev *hdev, struct intel_version_tlv *verreturn ; } -memset (&ppag,0 ,sizeof (ppag)); - - ppag.hdev = hdev; - ppag.status =AE_NOT_FOUND ; -acpi_walk_namespace (ACPI_TYPE_PACKAGE , handle,1 ,NULL , - btintel_ppag_callback, &ppag,NULL ); - -if (ACPI_FAILURE (ppag.status)) { -if (ppag.status ==AE_NOT_FOUND ) { + status =acpi_evaluate_object (handle,"PPAG" ,NULL , &buffer); +if (ACPI_FAILURE (status)) { +if (status ==AE_NOT_FOUND ) {bt_dev_dbg (hdev,"PPAG-BT: ACPI entry not found" );return ; } +bt_dev_warn (hdev,"PPAG-BT: ACPI Failure: %s" ,acpi_format_exception (status)); +return ; + } + + p = buffer.pointer; +if (p->type !=ACPI_TYPE_PACKAGE || p->package.count !=2 ) { +bt_dev_warn (hdev,"PPAG-BT: Invalid object type: %d or package count: %d" , + p->type, p->package.count); +kfree (buffer.pointer);return ; } -if (ppag.domain !=0x12 ) { + elements = p->package.elements; + +/* PPAG table is located at element[1] */ + p = &elements[1 ]; + + domain = (u32 )p->package.elements[0 ].integer.value; + mode = (u32 )p->package.elements[1 ].integer.value; +kfree (buffer.pointer); + +if (domain !=0x12 ) {bt_dev_dbg (hdev,"PPAG-BT: Bluetooth domain is disabled in ACPI firmware" );return ; }
@@ -2446,19 +2392,22 @@ static void btintel_set_ppag(struct hci_dev *hdev, struct intel_version_tlv *ver* BIT 1 : 0 Disabled in China * 1 Enabled in China */ -if ((ppag.mode &0x01 ) !=BIT (0 ) && (ppag.mode &0x02 ) !=BIT (1 )) { -bt_dev_dbg (hdev,"PPAG-BT: EU, China mode are disabled in CB/BIOS" ); + mode &=0x03 ; + +if (!mode) { +bt_dev_dbg (hdev,"PPAG-BT: EU, China mode are disabled in BIOS" );return ; } - ppag_cmd.ppag_enable_flags =cpu_to_le32 (ppag.mode); + ppag_cmd.ppag_enable_flags =cpu_to_le32 (mode); - skb =__hci_cmd_sync (hdev,INTEL_OP_PPAG_CMD ,sizeof (ppag_cmd), &ppag_cmd,HCI_CMD_TIMEOUT ); + skb =__hci_cmd_sync (hdev,INTEL_OP_PPAG_CMD ,sizeof (ppag_cmd), + &ppag_cmd,HCI_CMD_TIMEOUT );if (IS_ERR (skb)) {bt_dev_warn (hdev,"Failed to send PPAG Enable (%ld)" ,PTR_ERR (skb));return ; } -bt_dev_info (hdev,"PPAG-BT: Enabled (Mode %d)" , ppag.mode); +bt_dev_info (hdev,"PPAG-BT: Enabled (Mode %d)" , mode);kfree_skb (skb); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 172/568 Bluetooth: btnxpuart: Add handling for boot-signature timeout errors
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Neeraj Sanjay Kale <[email protected]>
[ Upstream commit 27489364299a2ddb5c54cd9f29a3f41bd8d151ab ]
This handles the timeout error codes sent by the chip as part of the bootloader signatures during firmware download process.
When the bootloader does not receive a response packet from the host within a specific time, it adds an error code to the bootloader signature while requesting for the FW chunk from the same offset.
The host is expected to clear this error code with a NAK, and reply to only those bootloader signatures which have error code 0.
However, the driver was ignoring this error code and replying with the firmware chunks instead, which is apparently ignored by the chip and the chip resends the same bootloader signature with the error code again. This happens in a loop until the error code self clears and firmware download proceeds ahead, adding a couple of milliseconds to the total firmware download time.
Commit 689ca16e5232 was an initial implementation which simply printed the following line during driver debug:
- FW Download received err 0x04 from chip
This commit adds the expected handling to the error codes.
This error handling is valid for data_req bootloader signatures for V3 and future bootloader versions.
--- drivers/bluetooth/btnxpuart.c | 52 ++++++++++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 4 deletions(-)
drivers/bluetooth/btnxpuart.c +48 -4
@@ -186,6 +186,11 @@ struct btnxpuart_dev {#define NXP_NAK_V3 0x7b#define NXP_CRC_ERROR_V3 0x7c +/* Bootloader signature error codes */ +#define NXP_ACK_RX_TIMEOUT 0x0002/* ACK not received from host */ +#define NXP_HDR_RX_TIMEOUT 0x0003/* FW Header chunk not received */ +#define NXP_DATA_RX_TIMEOUT 0x0004/* FW Data chunk not received */ +#define HDR_LEN 16#define NXP_RECV_CHIP_VER_V1 \
@@ -276,6 +281,17 @@ struct nxp_bootloader_cmd {__be32 crc; } __packed; +struct nxp_v3_rx_timeout_nak { +u8 nak; +__le32 offset; +u8 crc; +} __packed; + +union nxp_v3_rx_timeout_nak_u { +struct nxp_v3_rx_timeout_nak pkt; +u8 buf[6 ]; +}; +static u8 crc8_table[CRC8_TABLE_SIZE ];/* Default configurations */
@@ -883,6 +899,32 @@ static int nxp_recv_chip_ver_v3(struct hci_dev *hdev, struct sk_buff *skb)return 0 ; } +static void nxp_handle_fw_download_error (struct hci_dev *hdev,struct v3_data_req *req) +{ +struct btnxpuart_dev *nxpdev =hci_get_drvdata (hdev); +__u32 offset =__le32_to_cpu (req->offset); +__u16 err =__le16_to_cpu (req->error); +union nxp_v3_rx_timeout_nak_u nak_tx_buf; + +switch (err) { +case NXP_ACK_RX_TIMEOUT : +case NXP_HDR_RX_TIMEOUT : +case NXP_DATA_RX_TIMEOUT : + nak_tx_buf.pkt.nak =NXP_NAK_V3 ; + nak_tx_buf.pkt.offset =__cpu_to_le32 (offset); + nak_tx_buf.pkt.crc =crc8 (crc8_table, nak_tx_buf.buf, +sizeof (nak_tx_buf) -1 ,0xff ); +serdev_device_write_buf (nxpdev->serdev, nak_tx_buf.buf, +sizeof (nak_tx_buf)); +break ; +default : +bt_dev_dbg (hdev,"Unknown bootloader error code: %d" , err); +break ; + + } + +} +static int nxp_recv_fw_req_v3 (struct hci_dev *hdev,struct sk_buff *skb) {struct btnxpuart_dev *nxpdev =hci_get_drvdata (hdev);
@@ -897,7 +939,12 @@ static int nxp_recv_fw_req_v3(struct hci_dev *hdev, struct sk_buff *skb)if (!req || !nxpdev->fw) goto free_skb; -nxp_send_ack (NXP_ACK_V3 , hdev); +if (!req->error) { +nxp_send_ack (NXP_ACK_V3 , hdev); + }else { +nxp_handle_fw_download_error (hdev, req); + goto free_skb; + } len =__le16_to_cpu (req->len);
@@ -924,9 +971,6 @@ static int nxp_recv_fw_req_v3(struct hci_dev *hdev, struct sk_buff *skb)wake_up_interruptible (&nxpdev->fw_dnld_done_wait_q); goto free_skb; } -if (req->error) -bt_dev_dbg (hdev,"FW Download received err 0x%02x from chip" , - req->error); offset =__le32_to_cpu (req->offset);if (offset < nxpdev->fw_v3_offset_correction) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 173/568 xdp: fix invalid wait context of page_pool_destroy()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Taehee Yoo <[email protected]>
[ Upstream commit 59a931c5b732ca5fc2ca727f5a72aeabaafa85ec ]
If the driver uses a page pool, it creates a page pool with page_pool_create().
The reference count of page pool is 1 as default.
A page pool will be destroyed only when a reference count reaches 0. page_pool_destroy() is used to destroy page pool, it decreases a reference count.
When a page pool is destroyed, ->disconnect() is called, which is mem_allocator_disconnect().
This function internally acquires mutex_lock().
If the driver uses XDP, it registers a memory model with xdp_rxq_info_reg_mem_model().
The xdp_rxq_info_reg_mem_model() internally increases a page pool reference count if a memory model is a page pool.
Now the reference count is 2.
To destroy a page pool, the driver should call both page_pool_destroy() and xdp_unreg_mem_model().
The xdp_unreg_mem_model() internally calls page_pool_destroy(). Only page_pool_destroy() decreases a reference count.
If a driver calls page_pool_destroy() then xdp_unreg_mem_model(), we will face an invalid wait context warning.
Because xdp_unreg_mem_model() calls page_pool_destroy() with rcu_read_lock().
The page_pool_destroy() internally acquires mutex_lock().
Splat looks like:
=============================
[ BUG: Invalid wait context ]
6.10.0-rc6+ #4 Tainted: G W
-----------------------------
ethtool/1806 is trying to lock:ffffffff90387b90 (mem_id_lock){+.+.}-{4:4}, at: mem_allocator_disconnect+0x73/0x150 other info that might help us debug this:
context-{5:5}
3 locks held by ethtool/1806:
stack backtrace: CPU: 0 PID: 1806 Comm: ethtool Tainted: G W 6.10.0-rc6+ #4 f916f41f172891c800f2fed Hardware name: ASUS System Product Name/PRIME Z690-P D4, BIOS 0603 11/01/2021 Call Trace: <TASK> dump_stack_lvl+0x7e/0xc0 __lock_acquire+0x1681/0x4de0 ? _printk+0x64/0xe0 ? __pfx_mark_lock.part.0+0x10/0x10 ? __pfx___lock_acquire+0x10/0x10 lock_acquire+0x1b3/0x580 ? mem_allocator_disconnect+0x73/0x150 ? __wake_up_klogd.part.0+0x16/0xc0 ? __pfx_lock_acquire+0x10/0x10 ? dump_stack_lvl+0x91/0xc0 __mutex_lock+0x15c/0x1690 ? mem_allocator_disconnect+0x73/0x150 ? __pfx_prb_read_valid+0x10/0x10 ? mem_allocator_disconnect+0x73/0x150 ? __pfx_llist_add_batch+0x10/0x10 ? console_unlock+0x193/0x1b0 ? lockdep_hardirqs_on+0xbe/0x140 ? __pfx___mutex_lock+0x10/0x10 ? tick_nohz_tick_stopped+0x16/0x90 ? __irq_work_queue_local+0x1e5/0x330 ? irq_work_queue+0x39/0x50 ? __wake_up_klogd.part.0+0x79/0xc0 ? mem_allocator_disconnect+0x73/0x150 mem_allocator_disconnect+0x73/0x150 ? __pfx_mem_allocator_disconnect+0x10/0x10 ? mark_held_locks+0xa5/0xf0 ? rcu_is_watching+0x11/0xb0 page_pool_release+0x36e/0x6d0 page_pool_destroy+0xd7/0x440 xdp_unreg_mem_model+0x1a7/0x2a0 ? __pfx_xdp_unreg_mem_model+0x10/0x10 ? kfree+0x125/0x370 ? bnxt_free_ring.isra.0+0x2eb/0x500 ? bnxt_free_mem+0x5ac/0x2500 xdp_rxq_info_unreg+0x4a/0xd0 bnxt_free_mem+0x1356/0x2500 bnxt_close_nic+0xf0/0x3b0 ? __pfx_bnxt_close_nic+0x10/0x10 ? ethnl_parse_bit+0x2c6/0x6d0 ? __pfx___nla_validate_parse+0x10/0x10 ? __pfx_ethnl_parse_bit+0x10/0x10 bnxt_set_features+0x2a8/0x3e0 __netdev_update_features+0x4dc/0x1370 ? ethnl_parse_bitset+0x4ff/0x750 ? __pfx_ethnl_parse_bitset+0x10/0x10 ? __pfx___netdev_update_features+0x10/0x10 ? mark_held_locks+0xa5/0xf0 ? _raw_spin_unlock_irqrestore+0x42/0x70 ? __pm_runtime_resume+0x7d/0x110 ethnl_set_features+0x32d/0xa20
To fix this problem, it uses rhashtable_lookup_fast() instead of rhashtable_lookup() with rcu_read_lock().
Using xa without rcu_read_lock() here is safe.
xa is freed by __xdp_mem_allocator_rcu_free() and this is called by call_rcu() of mem_xa_remove().
The mem_xa_remove() is called by page_pool_destroy() if a reference count reaches 0.
The xa is already protected by the reference count mechanism well in the control plane.
So removing rcu_read_lock() for page_pool_destroy() is safe.
--- net/core/xdp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
net/core/xdp.c +1 -3
@@ -126,10 +126,8 @@ void xdp_unreg_mem_model(struct xdp_mem_info *mem)return ;if (type ==MEM_TYPE_PAGE_POOL ) { -rcu_read_lock (); - xa =rhashtable_lookup (mem_id_ht, &id, mem_id_rht_params); + xa =rhashtable_lookup_fast (mem_id_ht, &id, mem_id_rht_params);page_pool_destroy (xa->page_pool); -rcu_read_unlock (); } }EXPORT_SYMBOL_GPL (xdp_unreg_mem_model);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 174/568 net: bridge: mst: Check vlan state for egress decision
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Elliot Ayrey <[email protected]>
[ Upstream commit 0a1868b93fad5938dbcca77286b25bf211c49f7a ]
If a port is blocking in the common instance but forwarding in an MST instance, traffic egressing the bridge will be dropped because the state of the common instance is overriding that of the MST instance.
Fix this by skipping the port state check in MST mode to allow checking the vlan state via br_allowed_egress(). This is similar to what happens in br_handle_frame_finish() when checking ingress traffic, which was introduced in the change below.
--- net/bridge/br_forward.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/bridge/br_forward.c +2 -2
@@ -25,8 +25,8 @@ static inline int should_deliver(const struct net_bridge_port *p, vg =nbp_vlan_group_rcu (p);return ((p->flags &BR_HAIRPIN_MODE ) || skb->dev != p->dev) && - p->state ==BR_STATE_FORWARDING &&br_allowed_egress (vg, skb) && -nbp_switchdev_allowed_egress (p, skb) && + (br_mst_is_enabled (p->br) || p->state ==BR_STATE_FORWARDING ) && +br_allowed_egress (vg, skb) &&nbp_switchdev_allowed_egress (p, skb) && !br_skb_isolated (p, skb); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 175/568 drm/rockchip: vop2: Fix the port mux of VP2
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Yan <[email protected]>
[ Upstream commit 2bdb481bf7a93c22b9fea8daefa2834aab23a70f ]
The port mux of VP2 should be RK3568_OVL_PORT_SET__PORT2_MUX.
--- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +1 -1
@@ -1927,7 +1927,7 @@ static void vop2_setup_layer_mixer(struct vop2_video_port *vp) port_sel |=FIELD_PREP (RK3568_OVL_PORT_SET__PORT2_MUX , (vp2->nlayers + vp1->nlayers + vp0->nlayers -1 )); else - port_sel |= FIELD_PREP(RK3568_OVL_PORT_SET__PORT1_MUX, 8); + port_sel |= FIELD_PREP(RK3568_OVL_PORT_SET__PORT2_MUX, 8); layer_sel =vop2_readl (vop2,RK3568_OVL_LAYER_SEL );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 176/568 drm/arm/komeda: Fix komeda probe failing if there are no links in the secondary pipeline
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Faiz Abbas <[email protected]>
[ Upstream commit 9054c46d479b55768adae31031a1afa1b7d62228 ]
Since commit 4cfe5cc02e3f ("drm/arm/komeda: Remove component framework and add a simple encoder"), the devm_drm_of_get_bridge() call happens regardless of whether any remote nodes are available on the pipeline. Fix this by moving the bridge attach to its own function and calling it conditional on there being an output link.
--- .../gpu/drm/arm/display/komeda/komeda_crtc.c | 43 ++++++++++++++----- 1 file changed, 32 insertions(+), 11 deletions(-)
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +32 -11
@@ -5,6 +5,7 @@* */ #include <linux/clk.h> +#include <linux/of.h> #include <linux/pm_runtime.h> #include <linux/spinlock.h>
@@ -610,12 +611,34 @@ get_crtc_primary(struct komeda_kms_dev *kms, struct komeda_crtc *crtc)return NULL ; } +static int komeda_attach_bridge (struct device *dev, +struct komeda_pipeline *pipe, +struct drm_encoder *encoder) +{ +struct drm_bridge *bridge; +int err; + + bridge =devm_drm_of_get_bridge (dev, pipe->of_node, +KOMEDA_OF_PORT_OUTPUT ,0 ); +if (IS_ERR (bridge)) +return dev_err_probe (dev,PTR_ERR (bridge),"remote bridge not found for pipe: %s\n" , +of_node_full_name (pipe->of_node)); + + err =drm_bridge_attach (encoder, bridge,NULL ,0 ); +if (err) +dev_err (dev,"bridge_attach() failed for pipe: %s\n" , +of_node_full_name (pipe->of_node)); + +return err; +} +static int komeda_crtc_add (struct komeda_kms_dev *kms,struct komeda_crtc *kcrtc) {struct drm_crtc *crtc = &kcrtc->base;struct drm_device *base = &kms->base; -struct drm_bridge *bridge; +struct komeda_pipeline *pipe = kcrtc->master; +struct drm_encoder *encoder = &kcrtc->encoder;int err; err = drm_crtc_init_with_planes(base, crtc,
@@ -626,27 +649,25 @@ static int komeda_crtc_add(struct komeda_kms_dev *kms,drm_crtc_helper_add (crtc, &komeda_crtc_helper_funcs); - crtc->port = kcrtc->master->of_output_port; + crtc->port = pipe->of_output_port;/* Construct an encoder for each pipeline and attach it to the remote * bridge */ kcrtc->encoder.possible_crtcs =drm_crtc_mask (crtc); - err =drm_simple_encoder_init (base, &kcrtc->encoder, -DRM_MODE_ENCODER_TMDS ); + err =drm_simple_encoder_init (base, encoder,DRM_MODE_ENCODER_TMDS );if (err)return err; - bridge =devm_drm_of_get_bridge (base->dev, kcrtc->master->of_node, -KOMEDA_OF_PORT_OUTPUT ,0 ); -if (IS_ERR (bridge)) -return PTR_ERR (bridge); - - err =drm_bridge_attach (&kcrtc->encoder, bridge,NULL ,0 ); +if (pipe->of_output_links[0 ]) { + err =komeda_attach_bridge (base->dev, pipe, encoder); +if (err) +return err; + }drm_crtc_enable_color_mgmt (crtc,0 , true,KOMEDA_COLOR_LUT_SIZE ); -return err; +return 0 ; }int komeda_kms_add_crtcs (struct komeda_kms_dev *kms,struct komeda_dev *mdev)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 177/568 drm/amdkfd: Fix CU Masking for GFX 9.4.3
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mukul Joshi <[email protected]>
[ Upstream commit 85cf43c554e438e2e12b0fe109688c9533e4d93f ]
We are incorrectly passing the first XCC's MQD when updating CU masks for other XCCs in the partition. Fix this by passing the MQD for the XCC currently being updated with CU mask to update_cu_mask function.
--- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c +1 -1
@@ -686,7 +686,7 @@ static void update_mqd_v9_4_3(struct mqd_manager *mm, void *mqd, m =get_mqd (mqd + size * xcc);update_mqd (mm, m, q, minfo); -update_cu_mask (mm, mqd, minfo, xcc); +update_cu_mask (mm, m, minfo, xcc);if (q->format ==KFD_QUEUE_FORMAT_AQL ) {switch (xcc) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 178/568 drm/mipi-dsi: Fix theoretical int overflow in mipi_dsi_dcs_write_seq()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
[ Upstream commit 0b03829fdece47beba9ecb7dbcbde4585ee3663e ]
The mipi_dsi_dcs_write_seq() macro makes a call to mipi_dsi_dcs_write_buffer() which returns a type ssize_t. The macro then stores it in an int and checks to see if it's negative. This could theoretically be a problem if "ssize_t" is larger than "int".
To see the issue, imagine that "ssize_t" is 32-bits and "int" is 16-bits, you could see a problem if there was some code out there that looked like:
mipi_dsi_dcs_write_seq(dsi, cmd, <32767 bytes as arguments>);
...since we'd get back that 32768 bytes were transferred and 32768 stored in a 16-bit int would look negative.
Though there are no callsites where we'd actually hit this (even if "int" was only 16-bit), it's cleaner to make the types match so let's fix it.
--- include/drm/drm_mipi_dsi.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
include/drm/drm_mipi_dsi.h +12 -12
@@ -324,18 +324,18 @@ int mipi_dsi_dcs_get_display_brightness_large(struct mipi_dsi_device *dsi,* @cmd: Command * @seq: buffer containing data to be transmitted */ -#define mipi_dsi_dcs_write_seq(dsi, cmd, seq...) \ - do { \ - static const u8 d[] = { cmd, seq }; \ - struct device *dev = &dsi->dev; \ - int ret; \ - ret = mipi_dsi_dcs_write_buffer(dsi, d, ARRAY_SIZE(d)); \ - if (ret < 0) { \ - dev_err_ratelimited( \ - dev, "sending command %#02x failed: %d\n", \ - cmd, ret); \ - return ret; \ - } \ +#define mipi_dsi_dcs_write_seq(dsi, cmd, seq...) \ + do { \ + static const u8 d[] = { cmd, seq }; \ + struct device *dev = &dsi->dev; \ + ssize_t ret; \ + ret = mipi_dsi_dcs_write_buffer(dsi, d, ARRAY_SIZE(d)); \ + if (ret < 0) { \ + dev_err_ratelimited( \ + dev, "sending command %#02x failed: %zd\n", \ + cmd, ret); \ + return ret; \ + } \ } while (0)/**
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 179/568 drm/mipi-dsi: Fix theoretical int overflow in mipi_dsi_generic_write_seq()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
[ Upstream commit 24acbcce5cc673886c2f4f9b3f6f89a9c6a53b7e ]
The mipi_dsi_generic_write_seq() macro makes a call to mipi_dsi_generic_write() which returns a type ssize_t. The macro then stores it in an int and checks to see if it's negative. This could theoretically be a problem if "ssize_t" is larger than "int".
To see the issue, imagine that "ssize_t" is 32-bits and "int" is 16-bits, you could see a problem if there was some code out there that looked like:
mipi_dsi_generic_write_seq(dsi, <32768 bytes as arguments>);
...since we'd get back that 32768 bytes were transferred and 32768 stored in a 16-bit int would look negative.
Though there are no callsites where we'd actually hit this (even if "int" was only 16-bit), it's cleaner to make the types match so let's fix it.
--- include/drm/drm_mipi_dsi.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
include/drm/drm_mipi_dsi.h +11 -11
@@ -305,17 +305,17 @@ int mipi_dsi_dcs_get_display_brightness_large(struct mipi_dsi_device *dsi,* @dsi: DSI peripheral device * @seq: buffer containing the payload */ -#define mipi_dsi_generic_write_seq(dsi, seq...) \ - do { \ - static const u8 d[] = { seq }; \ - struct device *dev = &dsi->dev; \ - int ret; \ - ret = mipi_dsi_generic_write(dsi, d, ARRAY_SIZE(d)); \ - if (ret < 0) { \ - dev_err_ratelimited(dev, "transmit data failed: %d\n", \ - ret); \ - return ret; \ - } \ +#define mipi_dsi_generic_write_seq(dsi, seq...) \ + do { \ + static const u8 d[] = { seq }; \ + struct device *dev = &dsi->dev; \ + ssize_t ret; \ + ret = mipi_dsi_generic_write(dsi, d, ARRAY_SIZE(d)); \ + if (ret < 0) { \ + dev_err_ratelimited(dev, "transmit data failed: %zd\n", \ + ret); \ + return ret; \ + } \ } while (0)/**
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 180/568 drm/amd/pm: Fix aldebaran pcie speed reporting
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lijo Lazar <[email protected]>
[ Upstream commit b6420021e17e262c57bb289d0556ee181b014f9c ]
Fix the field definitions for LC_CURRENT_DATA_RATE.
--- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +2 -2
@@ -79,8 +79,8 @@ MODULE_FIRMWARE("amdgpu/smu_13_0_10.bin");#define PCIE_LC_LINK_WIDTH_CNTL__LC_LINK_WIDTH_RD_MASK 0x00000070L#define PCIE_LC_LINK_WIDTH_CNTL__LC_LINK_WIDTH_RD__SHIFT 0x4#define smnPCIE_LC_SPEED_CNTL 0x11140290 -#define PCIE_LC_SPEED_CNTL__LC_CURRENT_DATA_RATE_MASK 0xC000 -#define PCIE_LC_SPEED_CNTL__LC_CURRENT_DATA_RATE__SHIFT 0xE +#define PCIE_LC_SPEED_CNTL__LC_CURRENT_DATA_RATE_MASK 0xE0 +#define PCIE_LC_SPEED_CNTL__LC_CURRENT_DATA_RATE__SHIFT 0x5static const int link_width[] = {0 ,1 ,2 ,4 ,8 ,12 ,16 };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 181/568 drm/amdgpu: Fix memory range calculation
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lijo Lazar <[email protected]>
[ Upstream commit ce798376ef6764de51d8f4684ae525b55df295fa ]
Consider the 16M reserved region also before range calculation for GMC 9.4.3 SOCs.
--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +1 -1
@@ -1949,7 +1949,7 @@ gmc_v9_0_init_sw_mem_ranges(struct amdgpu_device *adev,break ; } - size = adev->gmc.real_vram_size >>AMDGPU_GPU_PAGE_SHIFT ; + size = (adev->gmc.real_vram_size +SZ_16M ) >>AMDGPU_GPU_PAGE_SHIFT ; size /= adev->gmc.num_mem_partitions;for (i =0 ; i < adev->gmc.num_mem_partitions; ++i) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 182/568 drm/amdgpu: Check if NBIO funcs are NULL in amdgpu_device_baco_exit
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Friedrich Vock <[email protected]>
[ Upstream commit 0cdb3f9740844b9d95ca413e3fcff11f81223ecf ]
The special case for VM passthrough doesn't check adev->nbio.funcs before dereferencing it. If GPUs that don't have an NBIO block are passed through, this leads to a NULL pointer dereference on startup.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -1
@@ -5645,7 +5645,7 @@ int amdgpu_device_baco_exit(struct drm_device *dev) adev->nbio.funcs->enable_doorbell_interrupt) adev->nbio.funcs->enable_doorbell_interrupt(adev, true); -if (amdgpu_passthrough (adev) && +if (amdgpu_passthrough (adev) && adev->nbio.funcs && adev->nbio.funcs->clear_doorbell_interrupt) adev->nbio.funcs->clear_doorbell_interrupt (adev);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 183/568 drm/amdgpu: Remove GC HW IP 9.3.0 from noretry=1
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tim Van Patten <[email protected]>
[ Upstream commit 1446226d32a45bb7c4f63195a59be8c08defe658 ]
The following commit updated gmc->noretry from 0 to 1 for GC HW IP 9.3.0:
commit 5f3854f1f4e2 ("drm/amdgpu: add more cases to noretry=1")This causes the device to hang when a page fault occurs, until the device is rebooted. Instead, revert back to gmc->noretry=0 so the device is still responsive.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +0 -1
@@ -650,7 +650,6 @@ void amdgpu_gmc_noretry_set(struct amdgpu_device *adev)struct amdgpu_gmc *gmc = &adev->gmc;uint32_t gc_ver = adev->ip_versions[GC_HWIP ][0 ]; bool noretry_default = (gc_ver == IP_VERSION(9, 0, 1) || - gc_ver == IP_VERSION(9, 3, 0) || gc_ver == IP_VERSION(9, 4, 0) || gc_ver == IP_VERSION(9, 4, 1) || gc_ver == IP_VERSION(9, 4, 2) ||
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 184/568 drm/panel: himax-hx8394: Handle errors from mipi_dsi_dcs_set_display_on() better
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
[ Upstream commit cc2db2ef8d9eebc0df03808ac0dadbdb96733499 ]
If mipi_dsi_dcs_set_display_on() returned an error then we'd store that in the "ret" variable and jump to error handling. We'd then attempt an orderly poweroff. Unfortunately we then blew away the value stored in "ret". That means that if the orderly poweroff actually worked then we're return 0 (no error) from hx8394_enable() even though the panel wasn't enabled.
Fix this by not blowing away "ret".
Found by code inspection.
--- drivers/gpu/drm/panel/panel-himax-hx8394.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/panel/panel-himax-hx8394.c +1 -2
@@ -234,8 +234,7 @@ static int hx8394_enable(struct drm_panel *panel) sleep_in:/* This will probably fail, but let's try orderly power off anyway. */ - ret =mipi_dsi_dcs_enter_sleep_mode (dsi); -if (!ret) +if (!mipi_dsi_dcs_enter_sleep_mode (dsi))msleep (50 );return ret;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 185/568 drm/panel: boe-tv101wum-nl6: If prepare fails, disable GPIO before regulators
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
[ Upstream commit 587c48f622374e5d47b1d515c6006a4df4dee882 ]
The enable GPIO should clearly be set low before turning off regulators. That matches both the inverse order that things were enabled and also the order in unprepare().
--- drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c +1 -1
@@ -1868,13 +1868,13 @@ static int boe_panel_prepare(struct drm_panel *panel)return 0 ; poweroff: +gpiod_set_value (boe->enable_gpio,0 );regulator_disable (boe->avee); poweroffavdd:regulator_disable (boe->avdd); poweroff1v8:usleep_range (5000 ,7000 );regulator_disable (boe->pp1800); -gpiod_set_value (boe->enable_gpio,0 );return ret; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 186/568 drm/panel: boe-tv101wum-nl6: Check for errors on the NOP in prepare()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
[ Upstream commit 6320b9199dd99622668649c234d4e8a99e44a9c8 ]
The mipi_dsi_dcs_nop() function returns an error but we weren't checking it in boe_panel_prepare(). Add a check. This is highly unlikely to matter in practice. If the NOP failed then likely later MIPI commands would fail too.
Found by code inspection.
--- drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c +5 -1
@@ -1847,7 +1847,11 @@ static int boe_panel_prepare(struct drm_panel *panel)usleep_range (10000 ,11000 );if (boe->desc->lp11_before_reset) { -mipi_dsi_dcs_nop (boe->dsi); + ret =mipi_dsi_dcs_nop (boe->dsi); +if (ret <0 ) { +dev_err (&boe->dsi->dev,"Failed to send NOP: %d\n" , ret); + goto poweroff; + }usleep_range (1000 ,2000 ); }gpiod_set_value (boe->enable_gpio,1 );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 187/568 drm/bridge: Fixed a DP link training bug
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: xiazhengqiao <[email protected]>
[ Upstream commit ca077ff8cac5af8a5a3c476983a6dd54aa3511b7 ]
To have better compatibility for DP sink, there is a retry mechanism for the link training process to switch between different training process. The original driver code doesn't reset the retry counter when training state is pass. If the system triggers link training over 3 times, there will be a chance to causes the driver to use the wrong training method and return a training fail result.
To Fix this, we reset the retry counter when training state is pass each time.
Stable-dep-of: 484436ec5c2b ("drm/bridge: it6505: fix hibernate to resume no display issue")
--- drivers/gpu/drm/bridge/ite-it6505.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/bridge/ite-it6505.c +3 -1
@@ -2240,11 +2240,13 @@ static void it6505_link_training_work(struct work_struct *work) ret =it6505_link_start_auto_train (it6505);DRM_DEV_DEBUG_DRIVER (dev,"auto train %s, auto_train_retry: %d" , ret ?"pass" :"failed" , it6505->auto_train_retry); - it6505->auto_train_retry--;if (ret) { + it6505->auto_train_retry =AUTO_TRAIN_RETRY ;it6505_link_train_ok (it6505);return ; + }else { + it6505->auto_train_retry--; }it6505_dump (it6505);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 188/568 drm/bridge: it6505: fix hibernate to resume no display issue
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuro Chung <[email protected]>
[ Upstream commit 484436ec5c2bffe8f346a09ae1cbc4cbf5e50005 ]
When the system power resumes, the TTL input of IT6505 may experience some noise before the video signal stabilizes, necessitating a video reset. This patch is implemented to prevent a loop of video error interrupts, which can occur when a video reset in the video FIFO error interrupt triggers another such interrupt. The patch processes the SCDT and FIFO error interrupts simultaneously and ignores any video FIFO error interrupts caused by a video reset.
--- drivers/gpu/drm/bridge/ite-it6505.c | 73 +++++++++++++++++++---------- 1 file changed, 49 insertions(+), 24 deletions(-)
drivers/gpu/drm/bridge/ite-it6505.c +49 -24
@@ -1306,9 +1306,15 @@ static void it6505_video_reset(struct it6505 *it6505)it6505_link_reset_step_train (it6505);it6505_set_bits (it6505,REG_DATA_MUTE_CTRL ,EN_VID_MUTE ,EN_VID_MUTE );it6505_set_bits (it6505,REG_INFOFRAME_CTRL ,EN_VID_CTRL_PKT ,0x00 ); -it6505_set_bits (it6505,REG_RESET_CTRL ,VIDEO_RESET ,VIDEO_RESET ); + +it6505_set_bits (it6505,REG_VID_BUS_CTRL1 ,TX_FIFO_RESET ,TX_FIFO_RESET ); +it6505_set_bits (it6505,REG_VID_BUS_CTRL1 ,TX_FIFO_RESET ,0x00 ); +it6505_set_bits (it6505,REG_501_FIFO_CTRL ,RST_501_FIFO ,RST_501_FIFO );it6505_set_bits (it6505,REG_501_FIFO_CTRL ,RST_501_FIFO ,0x00 ); + +it6505_set_bits (it6505,REG_RESET_CTRL ,VIDEO_RESET ,VIDEO_RESET ); +usleep_range (1000 ,2000 );it6505_set_bits (it6505,REG_RESET_CTRL ,VIDEO_RESET ,0x00 ); }
@@ -2244,12 +2250,11 @@ static void it6505_link_training_work(struct work_struct *work)if (ret) { it6505->auto_train_retry =AUTO_TRAIN_RETRY ;it6505_link_train_ok (it6505); -return ; }else { it6505->auto_train_retry--; +it6505_dump (it6505); } -it6505_dump (it6505); }static void it6505_plugged_status_to_codec (struct it6505 *it6505)
@@ -2470,31 +2475,53 @@ static void it6505_irq_link_train_fail(struct it6505 *it6505)schedule_work (&it6505->link_works); } -static void it6505_irq_video_fifo_error (struct it6505 *it6505) +static bool it6505_test_bit (unsigned int bit,const unsigned int *addr) { -struct device *dev = it6505->dev; - -DRM_DEV_DEBUG_DRIVER (dev,"video fifo overflow interrupt" ); - it6505->auto_train_retry =AUTO_TRAIN_RETRY ; -flush_work (&it6505->link_works); -it6505_stop_hdcp (it6505); -it6505_video_reset (it6505); +return 1 & (addr[bit /BITS_PER_BYTE ] >> (bit %BITS_PER_BYTE )); } -static void it6505_irq_io_latch_fifo_overflow (struct it6505 *it6505) +static void it6505_irq_video_handler (struct it6505 *it6505,const int *int_status) {struct device *dev = it6505->dev; +int reg_0d, reg_int03; -DRM_DEV_DEBUG_DRIVER (dev,"IO latch fifo overflow interrupt" ); - it6505->auto_train_retry =AUTO_TRAIN_RETRY ; -flush_work (&it6505->link_works); -it6505_stop_hdcp (it6505); -it6505_video_reset (it6505); -} +/* +* When video SCDT change with video not stable, +* Or video FIFO error, need video reset +*/ -static bool it6505_test_bit (unsigned int bit,const unsigned int *addr) -{ -return 1 & (addr[bit /BITS_PER_BYTE ] >> (bit %BITS_PER_BYTE )); +if ((!it6505_get_video_status (it6505) && + (it6505_test_bit (INT_SCDT_CHANGE , (unsigned int *)int_status))) || + (it6505_test_bit (BIT_INT_IO_FIFO_OVERFLOW , + (unsigned int *)int_status)) || + (it6505_test_bit (BIT_INT_VID_FIFO_ERROR , + (unsigned int *)int_status))) { + it6505->auto_train_retry =AUTO_TRAIN_RETRY ; +flush_work (&it6505->link_works); +it6505_stop_hdcp (it6505); +it6505_video_reset (it6505); + +usleep_range (10000 ,11000 ); + +/* +* Clear FIFO error IRQ to prevent fifo error -> reset loop +* HW will trigger SCDT change IRQ again when video stable +*/ + + reg_int03 =it6505_read (it6505,INT_STATUS_03 ); + reg_0d =it6505_read (it6505,REG_SYSTEM_STS ); + + reg_int03 &= (BIT (INT_VID_FIFO_ERROR ) |BIT (INT_IO_LATCH_FIFO_OVERFLOW )); +it6505_write (it6505,INT_STATUS_03 , reg_int03); + +DRM_DEV_DEBUG_DRIVER (dev,"reg08 = 0x%02x" , reg_int03); +DRM_DEV_DEBUG_DRIVER (dev,"reg0D = 0x%02x" , reg_0d); + +return ; + } + +if (it6505_test_bit (INT_SCDT_CHANGE , (unsigned int *)int_status)) +it6505_irq_scdt (it6505); }static irqreturn_t it6505_int_threaded_handler (int unused,void *data)
@@ -2507,15 +2534,12 @@ static irqreturn_t it6505_int_threaded_handler(int unused, void *data) } irq_vec[] = { { BIT_INT_HPD, it6505_irq_hpd }, { BIT_INT_HPD_IRQ, it6505_irq_hpd_irq }, - { BIT_INT_SCDT, it6505_irq_scdt }, { BIT_INT_HDCP_FAIL, it6505_irq_hdcp_fail }, { BIT_INT_HDCP_DONE, it6505_irq_hdcp_done }, { BIT_INT_AUX_CMD_FAIL, it6505_irq_aux_cmd_fail }, { BIT_INT_HDCP_KSV_CHECK, it6505_irq_hdcp_ksv_check }, { BIT_INT_AUDIO_FIFO_ERROR, it6505_irq_audio_fifo_error }, { BIT_INT_LINK_TRAIN_FAIL, it6505_irq_link_train_fail }, - { BIT_INT_VID_FIFO_ERROR, it6505_irq_video_fifo_error }, - { BIT_INT_IO_FIFO_OVERFLOW, it6505_irq_io_latch_fifo_overflow }, }; int int_status[3], i;
@@ -2545,6 +2569,7 @@ static irqreturn_t it6505_int_threaded_handler(int unused, void *data)if (it6505_test_bit (irq_vec[i].bit, (unsigned int *)int_status)) irq_vec[i].handler (it6505); } +it6505_irq_video_handler (it6505, (unsigned int *)int_status); }pm_runtime_put_sync (dev);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 189/568 media: pci: ivtv: Add check for DMA map result
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikhail Kobuk <[email protected]>
[ Upstream commit 629913d6d79508b166c66e07e4857e20233d85a9 ]
In case DMA fails, 'dma->SG_length' is 0. This value is later used to access 'dma->SGarray[dma->SG_length - 1]', which will cause out of bounds access.
Add check to return early on invalid value. Adjust warnings accordingly.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/media/pci/ivtv/ivtv-udma.c | 8 ++++++++ drivers/media/pci/ivtv/ivtv-yuv.c | 6 ++++++ drivers/media/pci/ivtv/ivtvfb.c | 6 +++--- 3 files changed, 17 insertions(+), 3 deletions(-)
drivers/media/pci/ivtv/ivtv-udma.c +8 -0
@@ -131,6 +131,8 @@ int ivtv_udma_setup(struct ivtv *itv, unsigned long ivtv_dest_addr,/* Fill SG List with new values */ if (ivtv_udma_fill_sg_list (dma, &user_dma,0 ) <0 ) { +IVTV_DEBUG_WARN ("%s: could not allocate bounce buffers for highmem userspace buffers\n" , + __func__);unpin_user_pages (dma->map, dma->page_count); dma->page_count =0 ;return -ENOMEM ;
@@ -139,6 +141,12 @@ int ivtv_udma_setup(struct ivtv *itv, unsigned long ivtv_dest_addr,/* Map SG List */ dma->SG_length =dma_map_sg (&itv->pdev->dev, dma->SGlist, dma->page_count,DMA_TO_DEVICE ); +if (!dma->SG_length) { +IVTV_DEBUG_WARN ("%s: DMA map error, SG_length is 0\n" , __func__); +unpin_user_pages (dma->map, dma->page_count); + dma->page_count =0 ; +return -EINVAL ; + }/* Fill SG Array with new values */ ivtv_udma_fill_sg_array (dma, ivtv_dest_addr,0 ,-1 );
drivers/media/pci/ivtv/ivtv-yuv.c +6 -0
@@ -114,6 +114,12 @@ static int ivtv_yuv_prep_user_dma(struct ivtv *itv, struct ivtv_user_dma *dma, } dma->SG_length =dma_map_sg (&itv->pdev->dev, dma->SGlist, dma->page_count,DMA_TO_DEVICE ); +if (!dma->SG_length) { +IVTV_DEBUG_WARN ("%s: DMA map error, SG_length is 0\n" , __func__); +unpin_user_pages (dma->map, dma->page_count); + dma->page_count =0 ; +return -EINVAL ; + }/* Fill SG Array with new values */ ivtv_udma_fill_sg_array (dma, y_buffer_offset, uv_buffer_offset, y_size);
drivers/media/pci/ivtv/ivtvfb.c +3 -3
@@ -281,10 +281,10 @@ static int ivtvfb_prep_dec_dma_to_device(struct ivtv *itv,/* Map User DMA */ if (ivtv_udma_setup (itv, ivtv_dest_addr, userbuf, size_in_bytes) <=0 ) {mutex_unlock (&itv->udma.lock); -IVTVFB_WARN ("ivtvfb_prep_dec_dma_to_device, Error with pin_user_pages: %d bytes, %d pages returned\n" , - size_in_bytes, itv->udma.page_count); +IVTVFB_WARN ("%s, Error in ivtv_udma_setup: %d bytes, %d pages returned\n" , + __func__, size_in_bytes, itv->udma.page_count); -/* pin_user_pages must have failed completely */ +/* pin_user_pages or DMA must have failed completely */ return -EIO ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 190/568 media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zheng Yejian <[email protected]>
[ Upstream commit 2052138b7da52ad5ccaf74f736d00f39a1c9198c ]
Infinite log printing occurs during fuzz test:
rc rc1: DViCO FusionHDTV DVB-T USB (LGZ201) as ...
...
dvb-usb: schedule remote query interval to 100 msecs.
dvb-usb: DViCO FusionHDTV DVB-T USB (LGZ201) successfully initialized ...
dvb-usb: bulk message failed: -22 (1/0)
dvb-usb: bulk message failed: -22 (1/0)
dvb-usb: bulk message failed: -22 (1/0)
...
dvb-usb: bulk message failed: -22 (1/0)
Looking into the codes, there is a loop in dvb_usb_read_remote_control(), that is in rc_core_dvb_usb_remote_init() create a work that will call dvb_usb_read_remote_control(), and this work will reschedule itself at 'rc_interval' intervals to recursively call dvb_usb_read_remote_control(), see following code snippet:
rc_core_dvb_usb_remote_init() {
...
INIT_DELAYED_WORK(&d->rc_query_work, dvb_usb_read_remote_control);
schedule_delayed_work(&d->rc_query_work,
msecs_to_jiffies(rc_interval));
...
}
dvb_usb_read_remote_control() {
...
err = d->props.rc.core.rc_query(d);
if (err)
err(...) // Did not return even if query failed
schedule_delayed_work(&d->rc_query_work,
msecs_to_jiffies(rc_interval));
}When the infinite log printing occurs, the query callback 'd->props.rc.core.rc_query' is cxusb_rc_query(). And the log is due to the failure of finding a valid 'generic_bulk_ctrl_endpoint' in usb_bulk_msg(), see following code snippet:
cxusb_rc_query() {
cxusb_ctrl_msg() {
dvb_usb_generic_rw() {
ret = usb_bulk_msg(d->udev, usb_sndbulkpipe(d->udev,
d->props.generic_bulk_ctrl_endpoint),...);
if (ret)
err("bulk message failed: %d (%d/%d)",ret,wlen,actlen);
...
}
...
}By analyzing the corresponding USB descriptor, it shows that the bNumEndpoints is 0 in its interface descriptor, but
the 'generic_bulk_ctrl_endpoint' is 1, that means user don't configure a valid endpoint for 'generic_bulk_ctrl_endpoint', therefore this 'invalid' USB device should be rejected before it calls into dvb_usb_read_remote_control().
To fix it, we need to add endpoint check for 'generic_bulk_ctrl_endpoint'. And as Sean suggested, the same check and clear halts should be done for 'generic_bulk_ctrl_endpoint_response'. So introduce dvb_usb_check_bulk_endpoint() to do it for both of them.
--- drivers/media/usb/dvb-usb/dvb-usb-init.c | 35 +++++++++++++++++++++--- 1 file changed, 31 insertions(+), 4 deletions(-)
drivers/media/usb/dvb-usb/dvb-usb-init.c +31 -4
@@ -23,11 +23,40 @@ static int dvb_usb_force_pid_filter_usage;module_param_named (force_pid_filter_usage, dvb_usb_force_pid_filter_usage, int,0444 );MODULE_PARM_DESC (force_pid_filter_usage,"force all dvb-usb-devices to use a PID filter, if any (default: 0)." ); +static int dvb_usb_check_bulk_endpoint (struct dvb_usb_device *d,u8 endpoint) +{ +if (endpoint) { +int ret; + + ret =usb_pipe_type_check (d->udev,usb_sndbulkpipe (d->udev, endpoint)); +if (ret) +return ret; + ret =usb_pipe_type_check (d->udev,usb_rcvbulkpipe (d->udev, endpoint)); +if (ret) +return ret; + } +return 0 ; +} + +static void dvb_usb_clear_halt (struct dvb_usb_device *d,u8 endpoint) +{ +if (endpoint) { +usb_clear_halt (d->udev,usb_sndbulkpipe (d->udev, endpoint)); +usb_clear_halt (d->udev,usb_rcvbulkpipe (d->udev, endpoint)); + } +} +static int dvb_usb_adapter_init (struct dvb_usb_device *d,short *adapter_nrs) {struct dvb_usb_adapter *adap;int ret, n, o; + ret =dvb_usb_check_bulk_endpoint (d, d->props.generic_bulk_ctrl_endpoint); +if (ret) +return ret; + ret =dvb_usb_check_bulk_endpoint (d, d->props.generic_bulk_ctrl_endpoint_response); +if (ret) +return ret;for (n =0 ; n < d->props.num_adapters; n++) { adap = &d->adapter[n]; adap->dev = d;
@@ -103,10 +132,8 @@ static int dvb_usb_adapter_init(struct dvb_usb_device *d, short *adapter_nrs)* when reloading the driver w/o replugging the device * sometimes a timeout occurs, this helps */ -if (d->props.generic_bulk_ctrl_endpoint !=0 ) { -usb_clear_halt (d->udev,usb_sndbulkpipe (d->udev, d->props.generic_bulk_ctrl_endpoint)); -usb_clear_halt (d->udev,usb_rcvbulkpipe (d->udev, d->props.generic_bulk_ctrl_endpoint)); - } +dvb_usb_clear_halt (d, d->props.generic_bulk_ctrl_endpoint); +dvb_usb_clear_halt (d, d->props.generic_bulk_ctrl_endpoint_response);return 0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 191/568 media: imon: Fix race getting ictx->lock
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo Ribalda <[email protected]>
[ Upstream commit 24147897507cd3a7d63745d1518a638bf4132238 ]
Lets fix a race between mutex_is_lock() and mutex_lock().
<-mutex is not locked
if (!mutex_is_locked(&ictx->lock)) {
unlock = true; <- mutex is locked externaly
mutex_lock(&ictx->lock);
}Let's use mutex_trylock() that does mutex_is_lock() and mutex_lock() atomically.
Fix the following cocci warning:
drivers/media/rc/imon.c:1167:1-7: preceding lock on line 1153
--- drivers/media/rc/imon.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/media/rc/imon.c +1 -4
@@ -1148,10 +1148,7 @@ static int imon_ir_change_protocol(struct rc_dev *rc, u64 *rc_proto)memcpy (ictx->usb_tx_buf, &ir_proto_packet,sizeof (ir_proto_packet)); -if (!mutex_is_locked (&ictx->lock)) { - unlock = true; -mutex_lock (&ictx->lock); - } + unlock =mutex_trylock (&ictx->lock); retval =send_packet (ictx);if (retval)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 192/568 media: i2c: Fix imx412 exposure control
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bryan O'Donoghue <[email protected]>
[ Upstream commit a1956bf53a2774014ee1768b484af2c38c633a25 ]
Currently we have the following algorithm to calculate what value should be written to the exposure control of imx412.
lpfr = imx412->vblank + imx412->cur_mode->height;
shutter = lpfr - exposure;
The 'shutter' value is given to IMX412_REG_EXPOSURE_CIT however, the above algorithm will result in the value given to IMX412_REG_EXPOSURE_CIT decreasing as the requested exposure value from user-space goes up.
e.g.
[ 2255.713989] imx412 20-001a: Received exp 1608, analog gain 0 [ 2255.714002] imx412 20-001a: Set exp 1608, analog gain 0, shutter 1938, lpfr 3546 [ 2256.302770] imx412 20-001a: Received exp 2586, analog gain 100 [ 2256.302800] imx412 20-001a: Set exp 2586, analog gain 100, shutter 960, lpfr 3546 [ 2256.753755] imx412 20-001a: Received exp 3524, analog gain 110 [ 2256.753772] imx412 20-001a: Set exp 3524, analog gain 110, shutter 22, lpfr 3546
This behaviour results in the image having less exposure as the requested exposure value from user-space increases.
Other sensor drivers such as ov5675, imx218, hid556 and others take the requested exposure value and use the value directly.
Take the example of the above cited sensor drivers and directly apply the requested exposure value from user-space. The 'lpfr' variable still functions as before but the 'shutter' variable can be dispensed with as a result.
Once done a similar run of the test application requesting higher exposure looks like this, with 'exp' written directly to the sensor.
[ 133.207884] imx412 20-001a: Received exp 1608, analog gain 0 [ 133.207899] imx412 20-001a: Set exp 1608, analog gain 0, lpfr 3546 [ 133.905309] imx412 20-001a: Received exp 2844, analog gain 100 [ 133.905344] imx412 20-001a: Set exp 2844, analog gain 100, lpfr 3546 [ 134.241705] imx412 20-001a: Received exp 3524, analog gain 110 [ 134.241775] imx412 20-001a: Set exp 3524, analog gain 110, lpfr 3546
The result is then setting the sensor exposure to lower values results in darker, less exposure images and vice versa with higher exposure values.
--- drivers/media/i2c/imx412.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/media/i2c/imx412.c +4 -5
@@ -544,14 +544,13 @@ static int imx412_update_controls(struct imx412 *imx412,*/ static int imx412_update_exp_gain (struct imx412 *imx412,u32 exposure,u32 gain) { -u32 lpfr, shutter; +u32 lpfr;int ret; lpfr = imx412->vblank + imx412->cur_mode->height; - shutter = lpfr - exposure; -dev_dbg (imx412->dev,"Set exp %u, analog gain %u, shutter %u, lpfr %u" , - exposure, gain, shutter, lpfr); +dev_dbg (imx412->dev,"Set exp %u, analog gain %u, lpfr %u" , + exposure, gain, lpfr); ret =imx412_write_reg (imx412,IMX412_REG_HOLD ,1 ,1 );if (ret)
@@ -561,7 +560,7 @@ static int imx412_update_exp_gain(struct imx412 *imx412, u32 exposure, u32 gain)if (ret) goto error_release_group_hold; - ret =imx412_write_reg (imx412,IMX412_REG_EXPOSURE_CIT ,2 , shutter); + ret =imx412_write_reg (imx412,IMX412_REG_EXPOSURE_CIT ,2 , exposure);if (ret) goto error_release_group_hold;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 193/568 media: v4l: async: Fix NULL pointer dereference in adding ancillary links
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: ChiYuan Huang <[email protected]>
[ Upstream commit 9b4667ea67854f0b116fe22ad11ef5628c5b5b5f ]
In v4l2_async_create_ancillary_links(), ancillary links are created for lens and flash sub-devices. These are sub-device to sub-device links and if the async notifier is related to a V4L2 device, the source sub-device of the ancillary link is NULL, leading to a NULL pointer dereference. Check the notifier's sd field is non-NULL in v4l2_async_create_ancillary_links().
--- drivers/media/v4l2-core/v4l2-async.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/v4l2-core/v4l2-async.c +3 -0
@@ -324,6 +324,9 @@ static int v4l2_async_create_ancillary_links(struct v4l2_async_notifier *n, sd->entity.function != MEDIA_ENT_F_FLASH)return 0 ; +if (!n->sd) +return 0 ; + link =media_create_ancillary_link (&n->sd->entity, &sd->entity);#endif
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 194/568 s390/mm: Convert make_page_secure to use a folio
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Wilcox (Oracle) <[email protected]>
[ Upstream commit 259e660d91d0e7261ae0ee37bb37266d6006a546 ]
These page APIs are deprecated, so convert the incoming page to a folio and use the folio APIs instead. The ultravisor API cannot handle large folios, so return -EINVAL if one has slipped through.
Stable-dep-of: 3f29f6537f54 ("s390/uv: Don't call folio_wait_writeback() without a folio reference")
--- arch/s390/kernel/uv.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-)
arch/s390/kernel/uv.c +16 -13
@@ -181,21 +181,21 @@ int uv_convert_owned_from_secure(unsigned long paddr) }/* -* Calculate the expected ref_count for a page that would otherwise have no +* Calculate the expected ref_count for a folio that would otherwise have no * further pins. This was cribbed from similar functions in other places in * the kernel, but with some slight modifications. We know that a secure -* page can not be a huge page for example. +* folio can not be a large folio, for example. */ -static int expected_page_refs (struct page *page) +static int expected_folio_refs (struct folio *folio) {int res; - res =page_mapcount (page); -if (PageSwapCache (page)) { + res =folio_mapcount (folio); +if (folio_test_swapcache (folio)) { res++; - }else if (page_mapping (page)) { + }else if (folio_mapping (folio)) { res++; -if (page_has_private (page)) +if (folio->private) res++; }return res;
@@ -203,14 +203,17 @@ static int expected_page_refs(struct page *page)static int make_page_secure (struct page *page,struct uv_cb_header *uvcb) { +struct folio *folio =page_folio (page);int expected, cc =0 ; -if (PageWriteback (page)) +if (folio_test_large (folio)) +return -EINVAL ; +if (folio_test_writeback (folio))return -EAGAIN ; - expected =expected_page_refs (page); -if (!page_ref_freeze (page, expected)) + expected =expected_folio_refs (folio); +if (!folio_ref_freeze (folio, expected))return -EBUSY ; -set_bit (PG_arch_1, &page->flags); +set_bit (PG_arch_1, &folio->flags);/* * If the UVC does not succeed or fail immediately, we don't want to * loop for long, or we might get stall notifications.
@@ -220,9 +223,9 @@ static int make_page_secure(struct page *page, struct uv_cb_header *uvcb)* -EAGAIN and we let the callers deal with it. */ cc =__uv_call (0 , (u64 )uvcb); -page_ref_unfreeze (page, expected); +folio_ref_unfreeze (folio, expected);/* -* Return -ENXIO if the page was not mapped, -EINVAL for other errors. +* Return -ENXIO if the folio was not mapped, -EINVAL for other errors. * If busy or partially completed, return -EAGAIN. */ if (cc ==UVC_CC_OK )
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 195/568 s390/mm: Convert gmap_make_secure to use a folio
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Wilcox (Oracle) <[email protected]>
[ Upstream commit d35c34bb32f2cc4ec0b52e91ad7a8fcab55d7856 ]
Remove uses of deprecated page APIs, and move the check for large folios to here to avoid taking the folio lock if the folio is too large. We could do better here by attempting to split the large folio, but I'll leave that improvement for someone who can test it.
Stable-dep-of: 3f29f6537f54 ("s390/uv: Don't call folio_wait_writeback() without a folio reference")
--- arch/s390/kernel/uv.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-)
arch/s390/kernel/uv.c +14 -13
@@ -201,13 +201,10 @@ static int expected_folio_refs(struct folio *folio)return res; } -static int make_page_secure (struct page *page,struct uv_cb_header *uvcb) +static int make_folio_secure (struct folio *folio,struct uv_cb_header *uvcb) { -struct folio *folio =page_folio (page);int expected, cc =0 ; -if (folio_test_large (folio)) -return -EINVAL ;if (folio_test_writeback (folio))return -EAGAIN ; expected =expected_folio_refs (folio);
@@ -280,7 +277,7 @@ int gmap_make_secure(struct gmap *gmap, unsigned long gaddr, void *uvcb)bool local_drain = false;spinlock_t *ptelock;unsigned long uaddr; -struct page *page; +struct folio *folio;pte_t *ptep;int rc;
@@ -309,15 +306,19 @@ int gmap_make_secure(struct gmap *gmap, unsigned long gaddr, void *uvcb)if (!ptep) goto out;if (pte_present (*ptep) && !(pte_val (*ptep) & _PAGE_INVALID) &&pte_write (*ptep)) { - page =pte_page (*ptep); + folio =page_folio (pte_page (*ptep)); + rc = -EINVAL ; +if (folio_test_large (folio)) + goto unlock; rc = -EAGAIN ; -if (trylock_page (page)) { +if (folio_trylock (folio)) {if (should_export_before_import (uvcb, gmap->mm)) -uv_convert_from_secure (page_to_phys (page)); - rc =make_page_secure (page, uvcb); -unlock_page (page); +uv_convert_from_secure (PFN_PHYS (folio_pfn (folio))); + rc =make_folio_secure (folio, uvcb); +folio_unlock (folio); } } +unlock:pte_unmap_unlock (ptep, ptelock); out:mmap_read_unlock (gmap->mm);
@@ -327,10 +328,10 @@ int gmap_make_secure(struct gmap *gmap, unsigned long gaddr, void *uvcb)* If we are here because the UVC returned busy or partial * completion, this is just a useless check, but it is safe. */ -wait_on_page_writeback (page); +folio_wait_writeback (folio); }else if (rc == -EBUSY ) {/* -* If we have tried a local drain and the page refcount +* If we have tried a local drain and the folio refcount * still does not match our expected safe value, try with a * system wide drain. This is needed if the pagevecs holding * the page are on a different CPU.
@@ -341,7 +342,7 @@ int gmap_make_secure(struct gmap *gmap, unsigned long gaddr, void *uvcb)return -EAGAIN ; }/* -* We are here if the page refcount does not match the +* We are here if the folio refcount does not match the * expected safe value. The main culprits are usually * pagevecs. With lru_add_drain() we drain the pagevecs * on the local CPU so that hopefully the refcount will
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 196/568 s390/uv: Dont call folio_wait_writeback() without a folio reference
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Hildenbrand <[email protected]>
[ Upstream commit 3f29f6537f54d74e64bac0a390fb2e26da25800d ]
folio_wait_writeback() requires that no spinlocks are held and that a folio reference is held, as documented. After we dropped the PTL, the folio could get freed concurrently. So grab a temporary reference.
--- arch/s390/kernel/uv.c | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/s390/kernel/uv.c +8 -0
@@ -317,6 +317,13 @@ int gmap_make_secure(struct gmap *gmap, unsigned long gaddr, void *uvcb) rc =make_folio_secure (folio, uvcb);folio_unlock (folio); } + +/* +* Once we drop the PTL, the folio may get unmapped and +* freed immediately. We need a temporary reference. +*/ +if (rc == -EAGAIN ) +folio_get (folio); } unlock:pte_unmap_unlock (ptep, ptelock);
@@ -329,6 +336,7 @@ int gmap_make_secure(struct gmap *gmap, unsigned long gaddr, void *uvcb)* completion, this is just a useless check, but it is safe. */ folio_wait_writeback (folio); +folio_put (folio); }else if (rc == -EBUSY ) {/* * If we have tried a local drain and the folio refcount
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 197/568 media: mediatek: vcodec: Handle invalid decoder vsi
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Irui Wang <[email protected]>
[ Upstream commit 59d438f8e02ca641c58d77e1feffa000ff809e9f ]
Handle an invalid decoder vsi in vpu_dec_init to ensure the decoder vsi is valid for future use.
--- .../media/platform/mediatek/vcodec/decoder/vdec_vpu_if.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.c +6 -0
@@ -233,6 +233,12 @@ int vpu_dec_init(struct vdec_vpu_inst *vpu)mtk_vdec_debug (vpu->ctx,"vdec_inst=%p" , vpu); err =vcodec_vpu_send_msg (vpu, (void *)&msg,sizeof (msg)); + +if (IS_ERR_OR_NULL (vpu->vsi)) { +mtk_vdec_err (vpu->ctx,"invalid vdec vsi, status=%d" , err); +return -EINVAL ; + } +mtk_vdec_debug (vpu->ctx,"- ret=%d" , err);return err; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 198/568 x86/shstk: Make return uprobe work with shadow stack
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Olsa <[email protected]>
[ Upstream commit 1713b63a07a28a475de94664f783b4cfd2e4fa90 ]
Currently the application with enabled shadow stack will crash if it sets up return uprobe. The reason is the uretprobe kernel code changes the user space task's stack, but does not update shadow stack accordingly.
Adding new functions to update values on shadow stack and using them in uprobe code to keep shadow stack in sync with uretprobe changes to user stack.
--- arch/x86/include/asm/shstk.h | 2 ++ arch/x86/kernel/shstk.c | 11 +++++++++++ arch/x86/kernel/uprobes.c | 7 ++++++- 3 files changed, 19 insertions(+), 1 deletion(-)
arch/x86/include/asm/shstk.h +2 -0
@@ -21,6 +21,7 @@ unsigned long shstk_alloc_thread_stack(struct task_struct *p, unsigned long clonvoid shstk_free (struct task_struct *p);int setup_signal_shadow_stack (struct ksignal *ksig);int restore_signal_shadow_stack (void ); +int shstk_update_last_frame (unsigned long val);#else static inline long shstk_prctl (struct task_struct *task,int option,unsigned long arg2) {return -EINVAL ; }
@@ -31,6 +32,7 @@ static inline unsigned long shstk_alloc_thread_stack(struct task_struct *p,static inline void shstk_free (struct task_struct *p) {}static inline int setup_signal_shadow_stack (struct ksignal *ksig) {return 0 ; }static inline int restore_signal_shadow_stack (void ) {return 0 ; } +static inline int shstk_update_last_frame (unsigned long val) {return 0 ; }#endif /* CONFIG_X86_USER_SHADOW_STACK */ #endif /* __ASSEMBLY__ */
arch/x86/kernel/shstk.c +11 -0
@@ -577,3 +577,14 @@ long shstk_prctl(struct task_struct *task, int option, unsigned long arg2)return wrss_control (true);return -EINVAL ; } + +int shstk_update_last_frame (unsigned long val) +{ +unsigned long ssp; + +if (!features_enabled (ARCH_SHSTK_SHSTK )) +return 0 ; + + ssp =get_user_shstk_addr (); +return write_user_shstk_64 ((u64 __user *)ssp, (u64 )val); +}
arch/x86/kernel/uprobes.c +6 -1
@@ -1076,8 +1076,13 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regsreturn orig_ret_vaddr; nleft =copy_to_user ((void __user *)regs->sp, &trampoline_vaddr, rasize); -if (likely (!nleft)) +if (likely (!nleft)) { +if (shstk_update_last_frame (trampoline_vaddr)) { +force_sig (SIGSEGV ); +return -1 ; + }return orig_ret_vaddr; + }if (nleft != rasize) { pr_err("return address clobbered: pid=%d, %%sp=%#lx, %%ip=%#lx\n",
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 199/568 ipmi: ssif_bmc: prevent integer overflow on 32bit systems
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 0627cef36145c9ff9845bdfd7ddf485bbac1f981 ]
There are actually two bugs here. First, we need to ensure that count is at least sizeof(u32) or msg.len will be uninitialized data.
The "msg.len" variable is a u32 that comes from the user. On 32bit systems the "sizeof_field(struct ipmi_ssif_msg, len) + msg.len" addition can overflow if "msg.len" is greater than U32_MAX - 4.
Valid lengths for "msg.len" are 1-254. Add a check for that to prevent the integer overflow.
Message-Id: <[email protected]>
--- drivers/char/ipmi/ssif_bmc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/char/ipmi/ssif_bmc.c +4 -2
@@ -177,13 +177,15 @@ static ssize_t ssif_bmc_write(struct file *file, const char __user *buf, size_tunsigned long flags;ssize_t ret; -if (count >sizeof (struct ipmi_ssif_msg )) +if (count <sizeof (msg.len) || + count >sizeof (struct ipmi_ssif_msg ))return -EINVAL ;if (copy_from_user (&msg, buf, count))return -EFAULT ; - if (!msg.len || count < sizeof_field(struct ipmi_ssif_msg, len) + msg.len) +if (!msg.len || msg.len >IPMI_SSIF_PAYLOAD_MAX || + count < sizeof_field(struct ipmi_ssif_msg, len) + msg.len)return -EINVAL ;spin_lock_irqsave (&ssif_bmc->lock, flags);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 200/568 saa7134: Unchecked i2c_transfer function result fixed
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aleksandr Burakov <[email protected]>
[ Upstream commit 9d8683b3fd93f0e378f24dc3d9604e5d7d3e0a17 ]
Return value of function 'i2c_transfer' is not checked that may cause undefined behaviour.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/media/pci/saa7134/saa7134-dvb.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/media/pci/saa7134/saa7134-dvb.c +6 -2
@@ -466,7 +466,9 @@ static int philips_europa_tuner_sleep(struct dvb_frontend *fe)/* switch the board to analog mode */ if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl (fe,1 ); -i2c_transfer (&dev->i2c_adap, &analog_msg,1 ); +if (i2c_transfer (&dev->i2c_adap, &analog_msg,1 ) !=1 ) +return -EIO ; +return 0 ; }
@@ -1018,7 +1020,9 @@ static int md8800_set_voltage2(struct dvb_frontend *fe,else wbuf[1 ] = rbuf &0xef ; msg[0 ].len =2 ; -i2c_transfer (&dev->i2c_adap, msg,1 ); +if (i2c_transfer (&dev->i2c_adap, msg,1 ) !=1 ) +return -EIO ; +return 0 ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 201/568 media: i2c: imx219: fix msr access command sequence
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Conor Dooley <[email protected]>
[ Upstream commit 3cdc776e0a5f1784c3ae5d3371b64215c228bf1f ]
It was reported to me that the imx219 didn't work on one of our development kits partly because the access sequence is incorrect. The datasheet I could find [1] for this camera has the access sequence:
Seq. No. Address (Hex) data
1 30EB 05 2 30EB 0C 3 300A FF 4 300B FF 5 30EB 05 6 30EB 09
but the driver swaps the first two elements. Laurent pointed out on IRC that the original code used the correct sequence for 1920x1080 but the current sequence for 3280x2464 and 1640x1232. During refactoring of the init sequence the current order was used for all formats.
Switch to using the documented sequence.
--- drivers/media/i2c/imx219.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/imx219.c +1 -1
@@ -188,8 +188,8 @@ static const struct cci_reg_sequence imx219_common_regs[] = { { IMX219_REG_MODE_SELECT, 0x00 }, /* Mode Select *//* To Access Addresses 3000-5fff, send the following commands */ - { CCI_REG8(0x30eb), 0x0c }, { CCI_REG8(0x30eb), 0x05 }, + { CCI_REG8(0x30eb), 0x0c }, { CCI_REG8(0x300a), 0xff }, { CCI_REG8(0x300b), 0xff }, { CCI_REG8(0x30eb), 0x05 },
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 202/568 media: uvcvideo: Disable autosuspend for Insta360 Link
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo Ribalda <[email protected]>
[ Upstream commit 3de6df64f92d8633eb51a5e957ffc43ebdb2156e ]
When the device suspends, it keeps power-cycling.
The user notices it because the LED constanct oscillate between blue (ready) and no LED (off).
<6>[95202.128542] usb 3-3-port4: attempt power cycle <6>[95206.070120] usb 3-3.4: new high-speed USB device number 49 using xhci_hcd <6>[95206.212027] usb 3-3.4: New USB device found, idVendor=2e1a, idProduct=4c01, bcdDevice= 2.00 <6>[95206.212044] usb 3-3.4: New USB device strings: Mfr=1, Product=2, SerialNumber=<Serial: 1> <6>[95206.212050] usb 3-3.4: Product: Insta360 Link <6>[95206.212075] usb 3-3.4: Manufacturer: Amba <7>[95206.214862] usb 3-3.4: GPIO lookup for consumer privacy <7>[95206.214866] usb 3-3.4: using lookup tables for GPIO lookup <7>[95206.214869] usb 3-3.4: No GPIO consumer privacy found <6>[95206.214871] usb 3-3.4: Found UVC 1.10 device Insta360 Link (2e1a:4c01) <3>[95206.217113] usb 3-3.4: Failed to query (GET_INFO) UVC control 14 on unit 1: -32 (exp. 1). <3>[95206.217733] usb 3-3.4: Failed to query (GET_INFO) UVC control 16 on unit 1: -32 (exp. 1). <4>[95206.223544] usb 3-3.4: Warning! Unlikely big volume range (=32767), cval->res is probably wrong. <4>[95206.223554] usb 3-3.4: [9] FU [Mic Capture Volume] ch = 1, val = -32768/-1/1 <6>[95210.698990] usb 3-3.4: USB disconnect, device number 49 <6>[95211.963090] usb 3-3.4: new high-speed USB device number 50 using xhci_hcd <6>[95212.657061] usb 3-3.4: new full-speed USB device number 51 using xhci_hcd <3>[95212.783119] usb 3-3.4: device descriptor read/64, error -32 <3>[95213.015076] usb 3-3.4: device descriptor read/64, error -32 <6>[95213.120358] usb 3-3-port4: attempt power cycle
Bus 001 Device 009: ID 2e1a:4c01 Amba Insta360 Link Device Descriptor:
bLength 18
bDescriptorType 1
bcdUSB 2.00
bDeviceClass 239 Miscellaneous Device
bDeviceSubClass 2
bDeviceProtocol 1 Interface Association
bMaxPacketSize0 64
idVendor 0x2e1a
idProduct 0x4c01
bcdDevice 2.00
iManufacturer 1 Amba iProduct 2 Insta360 Link iSerial 0 bNumConfigurations 1
Stable-dep-of: 85fbe91a7c92 ("media: uvcvideo: Add quirk for invalid dev_sof in Logitech C920")
--- drivers/media/usb/uvc/uvc_driver.c | 14 +++++++++++++- drivers/media/usb/uvc/uvcvideo.h | 1 + 2 files changed, 14 insertions(+), 1 deletion(-)
drivers/media/usb/uvc/uvc_driver.c +13 -1
@@ -2236,8 +2236,11 @@ static int uvc_probe(struct usb_interface *intf,if (dev->quirks &UVC_QUIRK_NO_RESET_RESUME ) udev->quirks &= ~USB_QUIRK_RESET_RESUME ; +if (!(dev->quirks &UVC_QUIRK_DISABLE_AUTOSUSPEND )) +usb_enable_autosuspend (udev); +uvc_dbg (dev,PROBE ,"UVC device initialized\n" ); -usb_enable_autosuspend (udev); +return 0 ; error:
@@ -3043,6 +3046,15 @@ static const struct usb_device_id uvc_ids[] = { .bInterfaceSubClass = 1, .bInterfaceProtocol = UVC_PC_PROTOCOL_15, .driver_info = (kernel_ulong_t)&uvc_ctrl_power_line_uvc11 }, +/* Insta360 Link */ + { .match_flags = USB_DEVICE_ID_MATCH_DEVICE + | USB_DEVICE_ID_MATCH_INT_INFO, + .idVendor = 0x2e1a, + .idProduct = 0x4c01, + .bInterfaceClass = USB_CLASS_VIDEO, + .bInterfaceSubClass = 1, + .bInterfaceProtocol = 0, + .driver_info = UVC_INFO_QUIRK(UVC_QUIRK_DISABLE_AUTOSUSPEND) }, /* Lenovo Integrated Camera */ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO,
drivers/media/usb/uvc/uvcvideo.h +1 -0
@@ -74,6 +74,7 @@#define UVC_QUIRK_FORCE_BPP 0x00001000#define UVC_QUIRK_WAKE_AUTOSUSPEND 0x00002000#define UVC_QUIRK_NO_RESET_RESUME 0x00004000 +#define UVC_QUIRK_DISABLE_AUTOSUSPEND 0x00008000/* Format flags */ #define UVC_FMT_FLAG_COMPRESSED 0x00000001
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 203/568 media: uvcvideo: Quirk for invalid dev_sof in Logitech C922
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo Ribalda <[email protected]>
[ Upstream commit 9183c6f1a21e0da4415762c504e2d7f784304d12 ]
Logitech C922 internal SOF does not increases at a stable rate of 1kHz. This causes that the device_sof and the host_sof run at different rates, breaking the clock domain conversion algorithm. Eg:
30 (6) [-] none 30 614400 B 21.245557 21.395214 34.133 fps ts mono/SoE 31 (7) [-] none 31 614400 B 21.275327 21.427246 33.591 fps ts mono/SoE 32 (0) [-] none 32 614400 B 21.304739 21.459256 34.000 fps ts mono/SoE 33 (1) [-] none 33 614400 B 21.334324 21.495274 33.801 fps ts mono/SoE
* 34 (2) [-] none 34 614400 B 21.529237 21.527297 5.130 fps ts mono/SoE
* 35 (3) [-] none 35 614400 B 21.649416 21.559306 8.321 fps ts mono/SoE 36 (4) [-] none 36 614400 B 21.678789 21.595320 34.045 fps ts mono/SoE
...
99 (3) [-] none 99 614400 B 23.542226 23.696352 33.541 fps ts mono/SoE 100 (4) [-] none 100 614400 B 23.571578 23.728404 34.069 fps ts mono/SoE 101 (5) [-] none 101 614400 B 23.601425 23.760420 33.504 fps ts mono/SoE
* 102 (6) [-] none 102 614400 B 23.798324 23.796428 5.079 fps ts mono/SoE
* 103 (7) [-] none 103 614400 B 23.916271 23.828450 8.478 fps ts mono/SoE 104 (0) [-] none 104 614400 B 23.945720 23.860479 33.957 fps ts mono/SoE
Instead of disabling completely the hardware timestamping for such hardware we take the assumption that the packet handling jitter is under 2ms and use the host_sof as dev_sof.
We can think of the UVC hardware clock as a system with a coarse clock (the SOF) and a fine clock (the PTS). The coarse clock can be replaced with a clock on the same frequency, if the jitter of such clock is smaller than its sampling rate. That way we can save some of the precision of the fine clock.
To probe this point we have run three experiments on the Logitech C922. On that experiment we run the camera at 33fps and we analyse the difference in msec between a frame and its predecessor. If we display the histogram of that value, a thinner histogram will mean a better meassurement. The results for:
- original hw timestamp: https://ibb.co/D1HJJ4x
- pure software timestamp: https://ibb.co/QC9MgVK
- modified hw timestamp: https://ibb.co/8s9dBdk
This bug in the camera firmware has been confirmed by the vendor.
lsusb -v
Bus 001 Device 044: ID 046d:085c Logitech, Inc. C922 Pro Stream Webcam Device Descriptor:
bLength 18
bDescriptorType 1
bcdUSB 2.00
bDeviceClass 239 Miscellaneous Device
bDeviceSubClass 2
bDeviceProtocol 1 Interface Association
bMaxPacketSize0 64
idVendor 0x046d Logitech, Inc.
idProduct 0x085c C922 Pro Stream Webcam
bcdDevice 0.16
iManufacturer 0 iProduct 2 C922 Pro Stream Webcam iSerial 1 80B912DF bNumConfigurations 1
Stable-dep-of: 85fbe91a7c92 ("media: uvcvideo: Add quirk for invalid dev_sof in Logitech C920")
--- drivers/media/usb/uvc/uvc_driver.c | 9 +++++++++ drivers/media/usb/uvc/uvc_video.c | 11 +++++++++++ drivers/media/usb/uvc/uvcvideo.h | 1 + 3 files changed, 21 insertions(+)
drivers/media/usb/uvc/uvc_driver.c +9 -0
@@ -2581,6 +2581,15 @@ static const struct usb_device_id uvc_ids[] = { .bInterfaceSubClass = 1, .bInterfaceProtocol = 0, .driver_info = UVC_INFO_QUIRK(UVC_QUIRK_RESTORE_CTRLS_ON_INIT) }, +/* Logitech HD Pro Webcam C922 */ + { .match_flags = USB_DEVICE_ID_MATCH_DEVICE + | USB_DEVICE_ID_MATCH_INT_INFO, + .idVendor = 0x046d, + .idProduct = 0x085c, + .bInterfaceClass = USB_CLASS_VIDEO, + .bInterfaceSubClass = 1, + .bInterfaceProtocol = 0, + .driver_info = UVC_INFO_QUIRK(UVC_QUIRK_INVALID_DEVICE_SOF) }, /* Logitech Rally Bar Huddle */ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO,
drivers/media/usb/uvc/uvc_video.c +11 -0
@@ -529,6 +529,17 @@ uvc_video_clock_decode(struct uvc_streaming *stream, struct uvc_buffer *buf, stream->clock.last_sof = dev_sof; host_sof =usb_get_current_frame_number (stream->dev->udev); + +/* +* On some devices, like the Logitech C922, the device SOF does not run +* at a stable rate of 1kHz. For those devices use the host SOF instead. +* In the tests performed so far, this improves the timestamp precision. +* This is probably explained by a small packet handling jitter from the +* host, but the exact reason hasn't been fully determined. +*/ +if (stream->dev->quirks &UVC_QUIRK_INVALID_DEVICE_SOF ) + dev_sof = host_sof; + time =uvc_video_get_time ();/*
drivers/media/usb/uvc/uvcvideo.h +1 -0
@@ -75,6 +75,7 @@#define UVC_QUIRK_WAKE_AUTOSUSPEND 0x00002000#define UVC_QUIRK_NO_RESET_RESUME 0x00004000#define UVC_QUIRK_DISABLE_AUTOSUSPEND 0x00008000 +#define UVC_QUIRK_INVALID_DEVICE_SOF 0x00010000/* Format flags */ #define UVC_FMT_FLAG_COMPRESSED 0x00000001
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 204/568 media: uvcvideo: Add quirk for invalid dev_sof in Logitech C920
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleksandr Natalenko <[email protected]>
[ Upstream commit 85fbe91a7c9210bb30638846b551fa5d3cb7bc4c ]
Similarly to Logitech C922, C920 seems to also suffer from a firmware bug that breaks hardware timestamping.
Add a quirk for this camera model too.
Before applying the quirk:
``` 100 (4) [-] none 100 200717 B 212.919114 213.079004 33.727 fps ts mono/SoE 101 (5) [-] none 101 200889 B 213.003703 213.114996 11.822 fps ts mono/SoE 102 (6) [-] none 102 200926 B 213.035571 213.146999 31.379 fps ts mono/SoE 103 (7) [-] none 103 200839 B 213.067424 213.179003 31.394 fps ts mono/SoE 104 (0) [-] none 104 200692 B 213.293180 213.214991 4.430 fps ts mono/SoE 105 (1) [-] none 105 200937 B 213.322374 213.247001 34.254 fps ts mono/SoE 106 (2) [-] none 106 201013 B 213.352228 213.279005 33.496 fps ts mono/SoE … ```
After applying the quirk:
``` 154 (2) [-] none 154 192417 B 42.199823 42.207788 27.779 fps ts mono/SoE 155 (3) [-] none 155 192040 B 42.231834 42.239791 31.239 fps ts mono/SoE 156 (4) [-] none 156 192213 B 42.263823 42.271822 31.261 fps ts mono/SoE 157 (5) [-] none 157 191981 B 42.299824 42.303827 27.777 fps ts mono/SoE 158 (6) [-] none 158 191953 B 42.331835 42.339811 31.239 fps ts mono/SoE 159 (7) [-] none 159 191904 B 42.363824 42.371813 31.261 fps ts mono/SoE 160 (0) [-] none 160 192210 B 42.399834 42.407801 27.770 fps ts mono/SoE ```
--- drivers/media/usb/uvc/uvc_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/usb/uvc/uvc_driver.c +2 -1
@@ -2580,7 +2580,8 @@ static const struct usb_device_id uvc_ids[] = { .bInterfaceClass = USB_CLASS_VIDEO, .bInterfaceSubClass = 1, .bInterfaceProtocol = 0, - .driver_info = UVC_INFO_QUIRK(UVC_QUIRK_RESTORE_CTRLS_ON_INIT) }, + .driver_info =UVC_INFO_QUIRK (UVC_QUIRK_RESTORE_CTRLS_ON_INIT + | UVC_QUIRK_INVALID_DEVICE_SOF) }, /* Logitech HD Pro Webcam C922 */ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 205/568 media: uvcvideo: Override default flags
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Schaefer <[email protected]>
[ Upstream commit 86419686e66da5b90a07fb8a40ab138fe97189b5 ]
When the UVC device has a control that is readonly it doesn't set the SET_CUR flag. For example the privacy control has SET_CUR flag set in the defaults in the uvc_ctrls variable. Even if the device does not have it set, it's not cleared by uvc_ctrl_get_flags().
Originally written with assignment in commit 859086ae3636 ("media:
uvcvideo: Apply flags from device to actual properties"). But changed to |= in commit 0dc68cabdb62 ("media: uvcvideo: Prevent setting unavailable flags"). It would not clear the default flags.
With this patch applied the correct flags are reported to user space. Tested with:
``` > v4l2-ctl --list-ctrls | grep privacy privacy 0x009a0910 (bool) : default=0 value=0 flags=read-only ```
--- drivers/media/usb/uvc/uvc_ctrl.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/media/usb/uvc/uvc_ctrl.c +8 -1
@@ -2029,7 +2029,13 @@ static int uvc_ctrl_get_flags(struct uvc_device *dev,else ret =uvc_query_ctrl (dev,UVC_GET_INFO , ctrl->entity->id, dev->intfnum, info->selector, data,1 ); -if (!ret) + +if (!ret) { + info->flags &= ~(UVC_CTRL_FLAG_GET_CUR | +UVC_CTRL_FLAG_SET_CUR | +UVC_CTRL_FLAG_AUTO_UPDATE | +UVC_CTRL_FLAG_ASYNCHRONOUS ); + info->flags |= (data[0 ] &UVC_CONTROL_CAP_GET ?UVC_CTRL_FLAG_GET_CUR :0 ) | (data[0] & UVC_CONTROL_CAP_SET ?
@@ -2038,6 +2044,7 @@ static int uvc_ctrl_get_flags(struct uvc_device *dev, UVC_CTRL_FLAG_AUTO_UPDATE : 0) | (data[0 ] &UVC_CONTROL_CAP_ASYNCHRONOUS ?UVC_CTRL_FLAG_ASYNCHRONOUS :0 ); + }kfree (data);return ret;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 206/568 drm: zynqmp_dpsub: Fix an error handling path in zynqmp_dpsub_probe()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit 4ea3deda1341fef7b923ad9cfe5dd46b1b51bfa8 ]
If zynqmp_dpsub_drm_init() fails, we must undo the previous drm_bridge_add() call.
--- drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/xlnx/zynqmp_dpsub.c +1 -0
@@ -269,6 +269,7 @@ static int zynqmp_dpsub_probe(struct platform_device *pdev)return 0 ; err_disp: +drm_bridge_remove (dpsub->bridge);zynqmp_disp_remove (dpsub); err_dp:zynqmp_dp_remove (dpsub);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 207/568 drm: zynqmp_kms: Fix AUX bus not getting unregistered
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Anderson <[email protected]>
[ Upstream commit 0743dafefd3f2b92116213f2225ea355001b7948 ]
drm_encoder_cleanup is responsible for calling drm_bridge_detach for each bridge attached to the encoder. zynqmp_dp_bridge_detach is in turn responsible for unregistering the AUX bus. However, we never ended up calling drm_encoder_cleanup in the remove or error paths, so the AUX bus would stick around after the rest of the driver had been removed.
I don't really understand why drm_mode_config_cleanup doesn't call drm_encoder_cleanup for us. It will call destroy (which for simple_encoder is drm_encoder_cleanup) on encoders in the mode_config's encoder_list.
Should drm_encoder_cleanup get called before or after drm_atomic_helper_shutdown?
--- drivers/gpu/drm/xlnx/zynqmp_kms.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/gpu/drm/xlnx/zynqmp_kms.c +9 -3
@@ -434,23 +434,28 @@ static int zynqmp_dpsub_kms_init(struct zynqmp_dpsub *dpsub) DRM_BRIDGE_ATTACH_NO_CONNECTOR);if (ret) {dev_err (dpsub->dev,"failed to attach bridge to encoder\n" ); -return ret; + goto err_encoder; }/* Create the connector for the chain of bridges. */ connector =drm_bridge_connector_init (&dpsub->drm->dev, encoder);if (IS_ERR (connector)) {dev_err (dpsub->dev,"failed to created connector\n" ); -return PTR_ERR (connector); + ret =PTR_ERR (connector); + goto err_encoder; } ret =drm_connector_attach_encoder (connector, encoder);if (ret <0 ) {dev_err (dpsub->dev,"failed to attach connector to encoder\n" ); -return ret; + goto err_encoder; }return 0 ; + +err_encoder: +drm_encoder_cleanup (encoder); +return ret; }static void zynqmp_dpsub_drm_release (struct drm_device *drm,void *res)
@@ -530,5 +535,6 @@ void zynqmp_dpsub_drm_cleanup(struct zynqmp_dpsub *dpsub)drm_dev_unregister (drm);drm_atomic_helper_shutdown (drm); +drm_encoder_cleanup (&dpsub->drm->encoder);drm_kms_helper_poll_fini (drm); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 208/568 media: rcar-vin: Fix YUYV8_1X16 handling for CSI-2
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jacopo Mondi <[email protected]>
[ Upstream commit 9caf253e8ad6f4c66f5591bac900f9f68b6b6620 ]
The YUYV8_1X16 and UYVY8_1X16 formats are treated as 'ITU-R BT.601/BT.1358 16-bit YCbCr-422 input' (YUV16 - 0x5) in the R-Car VIN driver and are thus disallowed when capturing frames from the R-Car CSI-2 interface according to the hardware manual.
As the 1X16 format variants are meant to be used with serial busses they have to be treated as 'YCbCr-422 8-bit data input' (0x1) when capturing from CSI-2, which is a valid setting for CSI-2.
Commit 78b3f9d75a62 ("media: rcar-vin: Add check that input interface and format are valid") disallowed capturing YUV16 when using the CSI-2 interface. Fix this by using YUV8_BT601 for YCbCr422 when CSI-2 is in use.
--- .../media/platform/renesas/rcar-vin/rcar-dma.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
drivers/media/platform/renesas/rcar-vin/rcar-dma.c +13 -3
@@ -742,12 +742,22 @@ static int rvin_setup(struct rvin_dev *vin)*/ switch (vin->mbus_code) {case MEDIA_BUS_FMT_YUYV8_1X16 : -/* BT.601/BT.1358 16bit YCbCr422 */ - vnmc |=VNMC_INF_YUV16 ; +if (vin->is_csi) +/* YCbCr422 8-bit */ + vnmc |=VNMC_INF_YUV8_BT601 ; +else +/* BT.601/BT.1358 16bit YCbCr422 */ + vnmc |=VNMC_INF_YUV16 ; input_is_yuv = true;break ;case MEDIA_BUS_FMT_UYVY8_1X16 : - vnmc |=VNMC_INF_YUV16 |VNMC_YCAL ; +if (vin->is_csi) +/* YCbCr422 8-bit */ + vnmc |=VNMC_INF_YUV8_BT601 ; +else +/* BT.601/BT.1358 16bit YCbCr422 */ + vnmc |=VNMC_INF_YUV16 ; + vnmc |=VNMC_YCAL ; input_is_yuv = true;break ;case MEDIA_BUS_FMT_UYVY8_2X8 :
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 209/568 media: rcar-csi2: Disable runtime_pm in probe error
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jacopo Mondi <[email protected]>
[ Upstream commit e306183628f7c2e95f9bf853d8fcb86288f606de ]
Disable pm_runtime in the probe() function error path.
--- drivers/media/platform/renesas/rcar-vin/rcar-csi2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/platform/renesas/rcar-vin/rcar-csi2.c +3 -1
@@ -1914,12 +1914,14 @@ static int rcsi2_probe(struct platform_device *pdev) ret =v4l2_async_register_subdev (&priv->subdev);if (ret <0 ) - goto error_async; + goto error_pm_runtime;dev_info (priv->dev,"%d lanes found\n" , priv->lanes);return 0 ; +error_pm_runtime: +pm_runtime_disable (&pdev->dev); error_async:v4l2_async_nf_unregister (&priv->notifier);v4l2_async_nf_cleanup (&priv->notifier);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 210/568 media: rcar-csi2: Cleanup subdevice in remove()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jacopo Mondi <[email protected]>
[ Upstream commit f6d64d0d2897ed4e85ac00afe43e45c8b8fc0c44 ]
Cleanup the V4L2 subdevice in the driver's remove function to ensure its async connection are freed, and guarantee in future that the subdev active state is cleaned up.
--- drivers/media/platform/renesas/rcar-vin/rcar-csi2.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/platform/renesas/rcar-vin/rcar-csi2.c +1 -0
@@ -1938,6 +1938,7 @@ static void rcsi2_remove(struct platform_device *pdev)v4l2_async_nf_unregister (&priv->notifier);v4l2_async_nf_cleanup (&priv->notifier);v4l2_async_unregister_subdev (&priv->subdev); +v4l2_subdev_cleanup (&priv->subdev);pm_runtime_disable (&pdev->dev);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 211/568 media: renesas: vsp1: Fix _irqsave and _irq mix
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Laurent Pinchart <[email protected]>
[ Upstream commit 57edbbcf5258c378a9b9d0c80d33b03a010b22c8 ]
The histogram support mixes _irqsave and _irq, causing the following smatch warning:
drivers/media/platform/renesas/vsp1/vsp1_histo.c:153 histo_stop_streaming()
warn: mixing irqsave and irq
The histo_stop_streaming() calls spin_lock_irqsave() followed by wait_event_lock_irq(). The former hints that interrupts may be disabled by the caller, while the latter reenables interrupts unconditionally. This doesn't cause any real bug, as the function is always called with interrupts enabled, but the pattern is still incorrect.
Fix the problem by using spin_lock_irq() instead of spin_lock_irqsave() in histo_stop_streaming(). While at it, switch to spin_lock_irq() and spin_lock() as appropriate elsewhere.
--- .../media/platform/renesas/vsp1/vsp1_histo.c | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-)
drivers/media/platform/renesas/vsp1/vsp1_histo.c +8 -12
@@ -36,9 +36,8 @@ struct vsp1_histogram_buffer * vsp1_histogram_buffer_get(struct vsp1_histogram *histo) {struct vsp1_histogram_buffer *buf =NULL ; -unsigned long flags; -spin_lock_irqsave (&histo->irqlock, flags); +spin_lock (&histo->irqlock);if (list_empty (&histo->irqqueue)) goto done;
@@ -49,7 +48,7 @@ vsp1_histogram_buffer_get(struct vsp1_histogram *histo) histo->readout = true; done: -spin_unlock_irqrestore (&histo->irqlock, flags); +spin_unlock (&histo->irqlock);return buf; }
@@ -58,7 +57,6 @@ void vsp1_histogram_buffer_complete(struct vsp1_histogram *histo, size_t size) {struct vsp1_pipeline *pipe = histo->entity.pipe; -unsigned long flags;/* * The pipeline pointer is guaranteed to be valid as this function is
@@ -70,10 +68,10 @@ void vsp1_histogram_buffer_complete(struct vsp1_histogram *histo,vb2_set_plane_payload (&buf->buf.vb2_buf,0 , size);vb2_buffer_done (&buf->buf.vb2_buf,VB2_BUF_STATE_DONE ); -spin_lock_irqsave (&histo->irqlock, flags); +spin_lock (&histo->irqlock); histo->readout = false;wake_up (&histo->wait_queue); -spin_unlock_irqrestore (&histo->irqlock, flags); +spin_unlock (&histo->irqlock); }/* -----------------------------------------------------------------------------
@@ -124,11 +122,10 @@ static void histo_buffer_queue(struct vb2_buffer *vb)struct vb2_v4l2_buffer *vbuf =to_vb2_v4l2_buffer (vb);struct vsp1_histogram *histo =vb2_get_drv_priv (vb->vb2_queue);struct vsp1_histogram_buffer *buf =to_vsp1_histogram_buffer (vbuf); -unsigned long flags; -spin_lock_irqsave (&histo->irqlock, flags); +spin_lock_irq (&histo->irqlock);list_add_tail (&buf->queue, &histo->irqqueue); -spin_unlock_irqrestore (&histo->irqlock, flags); +spin_unlock_irq (&histo->irqlock); }static int histo_start_streaming (struct vb2_queue *vq,unsigned int count)
@@ -140,9 +137,8 @@ static void histo_stop_streaming(struct vb2_queue *vq) {struct vsp1_histogram *histo =vb2_get_drv_priv (vq);struct vsp1_histogram_buffer *buffer; -unsigned long flags; -spin_lock_irqsave (&histo->irqlock, flags); +spin_lock_irq (&histo->irqlock);/* Remove all buffers from the IRQ queue. */ list_for_each_entry (buffer, &histo->irqqueue, queue)
@@ -152,7 +148,7 @@ static void histo_stop_streaming(struct vb2_queue *vq)/* Wait for the buffer being read out (if any) to complete. */ wait_event_lock_irq (histo->wait_queue, !histo->readout, histo->irqlock); -spin_unlock_irqrestore (&histo->irqlock, flags); +spin_unlock_irq (&histo->irqlock); }static const struct vb2_ops histo_video_queue_qops = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 212/568 media: renesas: vsp1: Store RPF partition configuration per RPF instance
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Laurent Pinchart <[email protected]>
[ Upstream commit a213bc09b1025c771ee722ee341af1d84375db8a ]
The vsp1_partition structure stores the RPF partition configuration in a single field for all RPF instances, while each RPF can have its own configuration. Fix it by storing the configuration separately for each RPF instance.
--- drivers/media/platform/renesas/vsp1/vsp1_pipe.h | 2 +- drivers/media/platform/renesas/vsp1/vsp1_rpf.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-)
drivers/media/platform/renesas/vsp1/vsp1_pipe.h +1 -1
@@ -73,7 +73,7 @@ struct vsp1_partition_window {* @wpf: The WPF partition window configuration */ struct vsp1_partition { -struct vsp1_partition_window rpf; +struct vsp1_partition_window rpf[VSP1_MAX_RPF ];struct vsp1_partition_window uds_sink;struct vsp1_partition_window uds_source;struct vsp1_partition_window sru;
drivers/media/platform/renesas/vsp1/vsp1_rpf.c +5 -3
@@ -315,8 +315,8 @@ static void rpf_configure_partition(struct vsp1_entity *entity,* 'width' need to be adjusted. */ if (pipe->partitions >1 ) { - crop.width = pipe->partition->rpf.width; - crop.left += pipe->partition->rpf.left; + crop.width = pipe->partition->rpf[rpf->entity.index].width; + crop.left += pipe->partition->rpf[rpf->entity.index].left; }if (pipe->interlaced) {
@@ -371,7 +371,9 @@ static void rpf_partition(struct vsp1_entity *entity,unsigned int partition_idx, struct vsp1_partition_window *window) { - partition->rpf = *window; + struct vsp1_rwpf *rpf = to_rwpf(&entity->subdev); + + partition->rpf[rpf->entity.index] = *window; } static const struct vsp1_entity_operations rpf_entity_ops = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 213/568 drm/mediatek: Add missing plane settings when async update
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hsiao Chien Sung <[email protected]>
[ Upstream commit 86b89dc669c400576dc23aa923bcf302f99e8e3a ]
Fix an issue that plane coordinate was not saved when calling async update.
--- drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/mediatek/mtk_drm_plane.c +2 -0
@@ -227,6 +227,8 @@ static void mtk_plane_atomic_async_update(struct drm_plane *plane, plane->state->src_y = new_state->src_y; plane->state->src_h = new_state->src_h; plane->state->src_w = new_state->src_w; + plane->state->dst.x1 = new_state->dst.x1; + plane->state->dst.y1 = new_state->dst.y1;mtk_plane_update_new_state (new_state, new_plane_state);swap (plane->state->fb, new_state->fb);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 214/568 drm/mediatek: Use 8-bit alpha in ETHDR
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hsiao Chien Sung <[email protected]>
[ Upstream commit 231c020141cb150a59f5b28379cad82ff7bad899 ]
9-bit alpha (max=0x100) is designed for special HDR related calculation, which should be disabled by default. Change the alpha value from 0x100 to 0xff in 8-bit form.
--- drivers/gpu/drm/mediatek/mtk_ethdr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/mediatek/mtk_ethdr.c +1 -2
@@ -50,7 +50,6 @@#define MIXER_INX_MODE_BYPASS 0#define MIXER_INX_MODE_EVEN_EXTEND 1 -#define DEFAULT_9BIT_ALPHA 0x100#define MIXER_ALPHA_AEN BIT(8)#define MIXER_ALPHA 0xff#define ETHDR_CLK_NUM 13
@@ -169,7 +168,7 @@ void mtk_ethdr_layer_config(struct device *dev, unsigned int idx, alpha_con =MIXER_ALPHA_AEN |MIXER_ALPHA ;mtk_mmsys_mixer_in_config (priv->mmsys_dev, idx +1 , alpha_con ? false : true, -DEFAULT_9BIT_ALPHA , +MIXER_ALPHA , pending->x &1 ?MIXER_INX_MODE_EVEN_EXTEND :MIXER_INX_MODE_BYPASS , align_width /2 -1 , cmdq_pkt);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 215/568 drm/mediatek: Fix XRGB setting error in OVL
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hsiao Chien Sung <[email protected]>
[ Upstream commit 765f284f1fe172573021056f7e337ee53f252969 ]
CONST_BLD must be enabled for XRGB formats although the alpha channel can be ignored, or OVL will still read the value from memory. This error only affects CRC generation.
--- drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/gpu/drm/mediatek/mtk_disp_ovl.c +12 -2
@@ -38,6 +38,7 @@#define DISP_REG_OVL_PITCH_MSB (n) (0x0040 + 0x20 * (n))#define OVL_PITCH_MSB_2ND_SUBBUF BIT(16)#define DISP_REG_OVL_PITCH (n) (0x0044 + 0x20 * (n)) +#define OVL_CONST_BLEND BIT(28)#define DISP_REG_OVL_RDMA_CTRL (n) (0x00c0 + 0x20 * (n))#define DISP_REG_OVL_RDMA_GMC (n) (0x00c8 + 0x20 * (n))#define DISP_REG_OVL_ADDR_MT2701 0x0040
@@ -407,6 +408,7 @@ void mtk_ovl_layer_config(struct device *dev, unsigned int idx,unsigned int fmt = pending->format;unsigned int offset = (pending->y <<16 ) | pending->x;unsigned int src_size = (pending->height <<16 ) | pending->width; +unsigned int ignore_pixel_alpha =0 ;unsigned int con;bool is_afbc = pending->modifier !=DRM_FORMAT_MOD_LINEAR ;union overlay_pitch {
@@ -428,6 +430,14 @@ void mtk_ovl_layer_config(struct device *dev, unsigned int idx,if (state->base.fb && state->base.fb->format->has_alpha) con |=OVL_CON_AEN |OVL_CON_ALPHA ; +/* CONST_BLD must be enabled for XRGB formats although the alpha channel +* can be ignored, or OVL will still read the value from memory. +* For RGB888 related formats, whether CONST_BLD is enabled or not won't +* affect the result. Therefore we use !has_alpha as the condition. +*/ +if (state->base.fb && !state->base.fb->format->has_alpha) + ignore_pixel_alpha =OVL_CONST_BLEND ; +if (pending->rotation &DRM_MODE_REFLECT_Y ) { con |=OVL_CON_VIRT_FLIP ; addr += (pending->height -1 ) * pending->pitch;
@@ -443,8 +453,8 @@ void mtk_ovl_layer_config(struct device *dev, unsigned int idx,mtk_ddp_write_relaxed (cmdq_pkt, con, &ovl->cmdq_reg, ovl->regs,DISP_REG_OVL_CON (idx)); -mtk_ddp_write_relaxed (cmdq_pkt, overlay_pitch.split_pitch.lsb, &ovl->cmdq_reg, ovl->regs, -DISP_REG_OVL_PITCH (idx)); +mtk_ddp_write_relaxed (cmdq_pkt, overlay_pitch.split_pitch.lsb | ignore_pixel_alpha, + &ovl->cmdq_reg, ovl->regs,DISP_REG_OVL_PITCH (idx));mtk_ddp_write_relaxed (cmdq_pkt, src_size, &ovl->cmdq_reg, ovl->regs,DISP_REG_OVL_SRC_SIZE (idx)); mtk_ddp_write_relaxed(cmdq_pkt, offset, &ovl->cmdq_reg, ovl->regs,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 216/568 drm/mediatek: Fix XRGB setting error in Mixer
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hsiao Chien Sung <[email protected]>
[ Upstream commit 8e418bee401b7cfd0bc40d187afea2c6b08b44ec ]
Although the alpha channel in XRGB formats can be ignored, ALPHA_CON must be configured accordingly when using XRGB formats or it will still affects CRC generation.
--- drivers/gpu/drm/mediatek/mtk_ethdr.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/gpu/drm/mediatek/mtk_ethdr.c +10 -1
@@ -153,6 +153,7 @@ void mtk_ethdr_layer_config(struct device *dev, unsigned int idx,unsigned int offset = (pending->x &1 ) <<31 | pending->y <<16 | pending->x;unsigned int align_width =ALIGN_DOWN (pending->width,2 );unsigned int alpha_con =0 ; +bool replace_src_a = false;dev_dbg (dev,"%s+ idx:%d" , __func__, idx);
@@ -167,7 +168,15 @@ void mtk_ethdr_layer_config(struct device *dev, unsigned int idx,if (state->base.fb && state->base.fb->format->has_alpha) alpha_con =MIXER_ALPHA_AEN |MIXER_ALPHA ; -mtk_mmsys_mixer_in_config (priv->mmsys_dev, idx +1 , alpha_con ? false : true, +if (state->base.fb && !state->base.fb->format->has_alpha) { +/* +* Mixer doesn't support CONST_BLD mode, +* use a trick to make the output equivalent +*/ + replace_src_a = true; + } + +mtk_mmsys_mixer_in_config (priv->mmsys_dev, idx +1 , replace_src_a,MIXER_ALPHA , pending->x &1 ?MIXER_INX_MODE_EVEN_EXTEND :MIXER_INX_MODE_BYPASS , align_width /2 -1 , cmdq_pkt);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 217/568 drm/mediatek: Fix destination alpha error in OVL
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hsiao Chien Sung <[email protected]>
[ Upstream commit 31c0fbf67c8c0bb38d7fb21d404ea3dbd619d99e ]
The formula of Coverage alpha blending is:
dst.a = dst.a * (0xff - src.a * SCA / 0xff) / 0xff
+ src.a * SCA / 0xff
dst.a: destination alpha
src.a: pixel alpha
SCA : plane alpha
When SCA = 0xff, the formula becomes:
dst.a = dst.a * (0xff - src.a) + src.a
This patch is to set the destination alpha (background) to 0xff:
- When dst.a = 0 (before), dst.a = src.a
- When dst.a = 0xff (after) , dst.a = 0xff * (0xff - src.a) + src.a
According to the fomula above:
- When src.a = 0 , dst.a = 0
- When src.a = 0xff, dst.a = 0xff
This two cases are just still correct. But when src.a is between 0 and 0xff, the difference starts to appear
--- drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/gpu/drm/mediatek/mtk_disp_ovl.c +9 -1
@@ -72,6 +72,8 @@#define OVL_CON_VIRT_FLIP BIT(9)#define OVL_CON_HORZ_FLIP BIT(10) +#define OVL_COLOR_ALPHA GENMASK(31, 24) +static const u32 mt8173_formats[] = {DRM_FORMAT_XRGB8888 ,DRM_FORMAT_ARGB8888 ,
@@ -274,7 +276,13 @@ void mtk_ovl_config(struct device *dev, unsigned int w,if (w !=0 && h !=0 )mtk_ddp_write_relaxed (cmdq_pkt, h <<16 | w, &ovl->cmdq_reg, ovl->regs,DISP_REG_OVL_ROI_SIZE ); -mtk_ddp_write_relaxed (cmdq_pkt,0x0 , &ovl->cmdq_reg, ovl->regs,DISP_REG_OVL_ROI_BGCLR ); + +/* +* The background color must be opaque black (ARGB), +* otherwise the alpha blending will have no effect +*/ +mtk_ddp_write_relaxed (cmdq_pkt,OVL_COLOR_ALPHA , &ovl->cmdq_reg, + ovl->regs,DISP_REG_OVL_ROI_BGCLR );mtk_ddp_write (cmdq_pkt,0x1 , &ovl->cmdq_reg, ovl->regs,DISP_REG_OVL_RST );mtk_ddp_write (cmdq_pkt,0x0 , &ovl->cmdq_reg, ovl->regs,DISP_REG_OVL_RST );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 218/568 drm/mediatek: Turn off the layers with zero width or height
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hsiao Chien Sung <[email protected]>
[ Upstream commit 6b9946f4550d8dad8bc1af2db97286ca449af786 ]
We found that IGT (Intel GPU Tool) will try to commit layers with zero width or height and lead to undefined behaviors in hardware. Disable the layers in such a situation.
--- drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 2 +- drivers/gpu/drm/mediatek/mtk_ethdr.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c +1 -1
@@ -111,7 +111,7 @@ void mtk_ovl_adaptor_layer_config(struct device *dev, unsigned int idx, merge = ovl_adaptor->ovl_adaptor_comp[OVL_ADAPTOR_MERGE0 + idx]; ethdr = ovl_adaptor->ovl_adaptor_comp[OVL_ADAPTOR_ETHDR0 ]; -if (!pending->enable) { +if (!pending->enable || !pending->width || !pending->height) {mtk_merge_stop_cmdq (merge, cmdq_pkt);mtk_mdp_rdma_stop (rdma_l, cmdq_pkt);mtk_mdp_rdma_stop (rdma_r, cmdq_pkt);
drivers/gpu/drm/mediatek/mtk_ethdr.c +6 -1
@@ -160,7 +160,12 @@ void mtk_ethdr_layer_config(struct device *dev, unsigned int idx,if (idx >=4 )return ; -if (!pending->enable) { +if (!pending->enable || !pending->width || !pending->height) { +/* +* instead of disabling layer with MIX_SRC_CON directly +* set the size to 0 to avoid screen shift due to mixer +* mode switch (hardware behavior) +*/ mtk_ddp_write (cmdq_pkt,0 , &mixer->cmdq_base, mixer->regs,MIX_L_SRC_SIZE (idx));return ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 219/568 drm/mediatek: Add OVL compatible name for MT8195
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hsiao Chien Sung <[email protected]>
[ Upstream commit 6fb7a0985fd16868b5d72eb3e3de7524a6000e6e ]
Add OVL compatible name for MT8195.
Without this commit, DRM won't work after modifying the device tree.
--- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/mediatek/mtk_drm_drv.c +2 -0
@@ -719,6 +719,8 @@ static const struct of_device_id mtk_ddp_comp_dt_ids[] = { .data = (void *)MTK_DISP_OVL }, { .compatible = "mediatek,mt8192-disp-ovl", .data = (void *)MTK_DISP_OVL }, + { .compatible = "mediatek,mt8195-disp-ovl", + .data = (void *)MTK_DISP_OVL }, { .compatible = "mediatek,mt8183-disp-ovl-2l", .data = (void *)MTK_DISP_OVL_2L }, { .compatible = "mediatek,mt8192-disp-ovl-2l",
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 221/568 leds: trigger: Unregister sysfs attributes before calling deactivate()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit c0dc9adf9474ecb7106e60e5472577375aedaed3 ]
Triggers which have trigger specific sysfs attributes typically store related data in trigger-data allocated by the activate() callback and freed by the deactivate() callback.
Calling device_remove_groups() after calling deactivate() leaves a window where the sysfs attributes show/store functions could be called after deactivation and then operate on the just freed trigger-data.
Move the device_remove_groups() call to before deactivate() to close this race window.
This also makes the deactivation path properly do things in reverse order of the activation path which calls the activate() callback before calling device_add_groups().
--- drivers/leds/led-triggers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/leds/led-triggers.c +1 -1
@@ -179,9 +179,9 @@ int led_trigger_set(struct led_classdev *led_cdev, struct led_trigger *trig)cancel_work_sync (&led_cdev->set_brightness_work);led_stop_software_blink (led_cdev); +device_remove_groups (led_cdev->dev, led_cdev->trigger->groups);if (led_cdev->trigger->deactivate) led_cdev->trigger->deactivate (led_cdev); -device_remove_groups (led_cdev->dev, led_cdev->trigger->groups); led_cdev->trigger =NULL ; led_cdev->trigger_data =NULL ; led_cdev->activated = false;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 222/568 drm/msm/dsi: set VIDEO_COMPRESSION_MODE_CTRL_WC
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonathan Marek <[email protected]>
[ Upstream commit 9ecd0ddd223b68b4603e4766a1d51f6c6cda346e ]
Video mode DSC won't work if this field is not set correctly. Set it to fix video mode DSC (for slice_per_pkt==1 cases at least).
Patchwork: https://patchwork.freedesktop.org/patch/596234/
--- drivers/gpu/drm/msm/dsi/dsi_host.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/msm/dsi/dsi_host.c +3 -0
@@ -832,6 +832,7 @@ static void dsi_update_dsc_timing(struct msm_dsi_host *msm_host, bool is_cmd_modu32 slice_per_intf, total_bytes_per_intf;u32 pkt_per_line;u32 eol_byte_num; +u32 bytes_per_pkt;/* first calculate dsc parameters and then program * compress mode registers
@@ -839,6 +840,7 @@ static void dsi_update_dsc_timing(struct msm_dsi_host *msm_host, bool is_cmd_mod slice_per_intf =msm_dsc_get_slices_per_intf (dsc, hdisplay); total_bytes_per_intf = dsc->slice_chunk_size * slice_per_intf; + bytes_per_pkt = dsc->slice_chunk_size;/* * slice_per_pkt; */ eol_byte_num = total_bytes_per_intf %3 ;
@@ -876,6 +878,7 @@ static void dsi_update_dsc_timing(struct msm_dsi_host *msm_host, bool is_cmd_moddsi_write (msm_host,REG_DSI_COMMAND_COMPRESSION_MODE_CTRL , reg_ctrl);dsi_write (msm_host,REG_DSI_COMMAND_COMPRESSION_MODE_CTRL2 , reg_ctrl2); }else { + reg |=DSI_VIDEO_COMPRESSION_MODE_CTRL_WC (bytes_per_pkt);dsi_write (msm_host,REG_DSI_VIDEO_COMPRESSION_MODE_CTRL , reg); } }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 223/568 drm/msm/dpu: drop validity checks for clear_pending_flush() ctl op
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Abhinav Kumar <[email protected]>
[ Upstream commit 3d68e3dedd4b48f0358bdc187277e3315d8aa559 ]
clear_pending_flush() ctl op is always assigned irrespective of the DPU hardware revision. Hence there is no needed to check whether the op has been assigned before calling it.
Drop the checks across the driver for clear_pending_flush() and also update its documentation that it is always expected to be assigned.
changes in v2:
- instead of adding more validity checks just drop the one for clear_pending_flush
- update the documentation for clear_pending_flush() ctl op
- update the commit text reflecting these changes
changes in v3:
- simplify the documentation of clear_pending_flush
Patchwork: https://patchwork.freedesktop.org/patch/600241/
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 3 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 3 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 3 ++- 3 files changed, 4 insertions(+), 5 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +1 -2
@@ -1672,8 +1672,7 @@ void dpu_encoder_trigger_kickoff_pending(struct drm_encoder *drm_enc) phys = dpu_enc->phys_encs[i]; ctl = phys->hw_ctl; -if (ctl->ops.clear_pending_flush) - ctl->ops.clear_pending_flush (ctl); + ctl->ops.clear_pending_flush (ctl);/* update only for command mode primary ctl */ if ((phys == dpu_enc->cur_master) &&
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c +1 -2
@@ -528,8 +528,7 @@ static void dpu_encoder_phys_wb_disable(struct dpu_encoder_phys *phys_enc) }/* reset h/w before final flush */ -if (phys_enc->hw_ctl->ops.clear_pending_flush) - phys_enc->hw_ctl->ops.clear_pending_flush (phys_enc->hw_ctl); + phys_enc->hw_ctl->ops.clear_pending_flush (phys_enc->hw_ctl);/* * New CTL reset sequence from 5.0 MDP onwards.
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h +2 -1
@@ -81,7 +81,8 @@ struct dpu_hw_ctl_ops {/** * Clear the value of the cached pending_flush_mask -* No effect on hardware +* No effect on hardware. +* Required to be implemented. * @ctx : ctl path ctx pointer */ void (*clear_pending_flush)(struct dpu_hw_ctl *ctx);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 224/568 perf test: Make test_arm_callgraph_fp.sh more robust
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Clark <[email protected]>
[ Upstream commit ff16aeb9b83441b8458d4235496cf320189a0c60 ]
The 2 second sleep can cause the test to fail on very slow network file systems because Perf ends up being killed before it finishes starting up.
Fix it by making the leafloop workload end after a fixed time like the other workloads so there is no need to kill it after 2 seconds.
Also remove the 1 second start sampling delay because it is similarly fragile. Instead, search through all samples for a matching one, rather than just checking the first sample and hoping it's in the right place.
--- .../perf/tests/shell/test_arm_callgraph_fp.sh | 27 +++++++------------ tools/perf/tests/workloads/leafloop.c | 20 +++++++++++--- 2 files changed, 26 insertions(+), 21 deletions(-)
tools/perf/tests/shell/test_arm_callgraph_fp.sh +10 -17
@@ -14,28 +14,21 @@ cleanup_files() trap cleanup_files EXIT TERM INT -# Add a 1 second delay to skip samples that are not in the leaf() function # shellcheck disable=SC2086 -perf record -o "$PERF_DATA" --call-graph fp -e cycles//u -D 1000 --user-callchains -- $TEST_PROGRAM 2> /dev/null & -PID=$! +perf record -o "$PERF_DATA" --call-graph fp -e cycles//u --user-callchains -- $TEST_PROGRAM -echo " + Recording (PID=$PID)..." -sleep 2 -echo " + Stopping perf-record..." - -kill $PID -wait $PID +# Try opening the file so any immediate errors are visible in the log +perf script -i "$PERF_DATA" -F comm,ip,sym | head -n4 -# expected perf-script output: +# expected perf-script output if 'leaf' has been inserted correctly: # -# program +# perf # 728 leaf # 753 parent # 76c leafloop -# ... +# ... remaining stack to main() ... -perf script -i "$PERF_DATA" -F comm,ip,sym | head -n4 -perf script -i "$PERF_DATA" -F comm,ip,sym | head -n4 | \ - awk '{ if ($2 != "") sym[i++] = $2 } END { if (sym[0] != "leaf" || - sym[1] != "parent" || - sym[2] != "leafloop") exit 1 }' +# Each frame is separated by a tab, some spaces and an address +SEP="[[:space:]]+ [[:xdigit:]]+" +perf script -i "$PERF_DATA" -F comm,ip,sym | tr '\n' ' ' | \ + grep -E -q "perf $SEP leaf $SEP parent $SEP leafloop"
tools/perf/tests/workloads/leafloop.c +16 -4
@@ -1,6 +1,8 @@/* SPDX-License-Identifier: GPL-2.0 */ +#include <signal.h> #include <stdlib.h> #include <linux/compiler.h> +#include <unistd.h> #include "../tests.h" /* We want to check these symbols in perf script */
@@ -8,10 +10,16 @@ noinline void leaf(volatile int b); noinline void parent(volatile int b);static volatile int a; +static volatile sig_atomic_t done; + +static void sighandler (int sig__maybe_unused ) +{ + done =1 ; +} noinline void leaf(volatile int b) { -for (;;) +while (!done) a += b; }
@@ -22,12 +30,16 @@ noinline void parent(volatile int b)static int leafloop (int argc,const char **argv) { -int c =1 ; +int sec =1 ;if (argc >0 ) - c =atoi (argv[0 ]); + sec =atoi (argv[0 ]); + +signal (SIGINT , sighandler); +signal (SIGALRM , sighandler); +alarm (sec); -parent (c); +parent (sec);return 0 ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 225/568 perf pmus: Fixes always false when compare duplicates aliases
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Junhao He <[email protected]>
[ Upstream commit dd9a426eade634bf794c7e0f1b0c6659f556942f ]
In the previous loop, all the members in the aliases[j-1] have been freed and set to NULL. But in this loop, the function pmu_alias_is_duplicate() compares the aliases[j] with the aliases[j-1] that has already been disposed, so the function will always return false and duplicate aliases will never be discarded.
If we find duplicate aliases, it skips the zfree aliases[j], which is accompanied by a memory leak.
We can use the next aliases[j+1] to theck for duplicate aliases to fixes the aliases NULL pointer dereference, then goto zfree code snippet to release it.
After patch testing:
$ perf list --unit=hisi_sicl,cpa pmu
uncore cpa:
cpa_p0_rd_dat_32b
[Number of read ops transmitted by the P0 port which size is 32 bytes.
Unit: hisi_sicl,cpa]
cpa_p0_rd_dat_64b
[Number of read ops transmitted by the P0 port which size is 64 bytes.
Unit: hisi_sicl,cpa]
--- tools/perf/util/pmus.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tools/perf/util/pmus.c +3 -2
@@ -470,8 +470,8 @@ void perf_pmus__print_pmu_events(const struct print_callbacks *print_cb, void *pqsort (aliases, len,sizeof (struct sevent ), cmp_sevent);for (int j =0 ; j < len; j++) {/* Skip duplicates */ -if (j >0 &&pmu_alias_is_duplicate (&aliases[j], &aliases[j -1 ])) -continue ; +if (j < len -1 &&pmu_alias_is_duplicate (&aliases[j], &aliases[j +1 ])) + goto free; print_cb->print_event(print_state, aliases[j].pmu_name,
@@ -484,6 +484,7 @@ void perf_pmus__print_pmu_events(const struct print_callbacks *print_cb, void *p aliases[j].desc, aliases[j].long_desc, aliases[j].encoding_desc); +free:zfree (&aliases[j].name);zfree (&aliases[j].alias);zfree (&aliases[j].scale_unit);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 226/568 perf report: Fix condition in sort__sym_cmp()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namhyung Kim <[email protected]>
[ Upstream commit cb39d05e67dc24985ff9f5150e71040fa4d60ab8 ]
It's expected that both hist entries are in the same hists when comparing two. But the current code in the function checks one without dso sort key and other with the key. This would make the condition true in any case.
I guess the intention of the original commit was to add '!' for the right side too. But as it should be the same, let's just remove it.
--- tools/perf/util/sort.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/sort.c +1 -1
@@ -332,7 +332,7 @@ sort__sym_cmp(struct hist_entry *left, struct hist_entry *right)* comparing symbol address alone is not enough since it's a * relative address within a dso. */ -if (!hists__has (left->hists, dso) ||hists__has (right->hists, dso)) { +if (!hists__has (left->hists, dso)) { ret =sort__dso_cmp (left, right);if (ret !=0 )return ret;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 227/568 drm/etnaviv: fix DMA direction handling for cached RW buffers
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lucas Stach <[email protected]>
[ Upstream commit 58979ad6330a70450ed78837be3095107d022ea9 ]
The dma sync operation needs to be done with DMA_BIDIRECTIONAL when the BO is prepared for both read and write operations.
--- drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/etnaviv/etnaviv_gem.c +4 -2
@@ -356,9 +356,11 @@ static void *etnaviv_gem_vmap_impl(struct etnaviv_gem_object *obj)static inline enum dma_data_direction etnaviv_op_to_dma_dir (u32 op) { -if (op &ETNA_PREP_READ ) + op &=ETNA_PREP_READ |ETNA_PREP_WRITE ; + +if (op ==ETNA_PREP_READ )return DMA_FROM_DEVICE ; -else if (op &ETNA_PREP_WRITE ) +else if (op ==ETNA_PREP_WRITE )return DMA_TO_DEVICE ;else return DMA_BIDIRECTIONAL ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 228/568 drm/qxl: Add check for drm_cvt_mode
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen Ni <[email protected]>
[ Upstream commit 7bd09a2db0f617377027a2bb0b9179e6959edff3 ]
Add check for the return value of drm_cvt_mode() and return the error if it fails in order to avoid NULL pointer dereference.
--- drivers/gpu/drm/qxl/qxl_display.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/qxl/qxl_display.c +3 -0
@@ -236,6 +236,9 @@ static int qxl_add_mode(struct drm_connector *connector,return 0 ; mode =drm_cvt_mode (dev, width, height,60 , false, false, false); +if (!mode) +return 0 ; +if (preferred) mode->type |=DRM_MODE_TYPE_PREFERRED ; mode->hdisplay = width;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 229/568 Revert "leds: led-core: Fix refcount leak in of_led_get()"
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luca Ceresoli <[email protected]>
[ Upstream commit 940b27161afc6ec53fc66245a4fb3518394cdc92 ]
This reverts commit da1afe8e6099980fe1e2fd7436dca284af9d3f29.
Commit 699a8c7c4bd3 ("leds: Add of_led_get() and led_put()"), introduced in 5.5, added of_led_get() and led_put() but missed a put_device() in led_put(), thus creating a leak in case the consumer device is removed.
Arguably device removal was not very popular, so this went apparently unnoticed until 2022. In January 2023 two different patches got merged to fix the same bug:
- commit da1afe8e6099 ("leds: led-core: Fix refcount leak in of_led_get()")
- commit 445110941eb9 ("leds: led-class: Add missing put_device() to led_put()")
They fix the bug in two different ways, which creates no patch conflicts, and both were merged in v6.2. The result is that now there is one more put_device() than get_device()s, instead of one less.
Arguably device removal is not very popular yet, so this apparently hasn't been noticed as well up to now. But it blew up here while I'm working with device tree overlay insertion and removal. The symptom is an apparently unrelated list of oopses on device removal, with reasons:
kernfs: can not remove 'uevent', no directory
kernfs: can not remove 'brightness', no directory
kernfs: can not remove 'max_brightness', no directory
...
Here sysfs fails removing attribute files, which is because the device name changed and so the sysfs path. This is because the device name string got corrupted, which is because it got freed too early and its memory reused.
Different symptoms could appear in different use cases.
Fix by removing one of the two fixes.
The choice was to remove commit da1afe8e6099 because:
* it is calling put_device() inside of_led_get() just after getting the device, thus it is basically not refcounting the LED device at all during its entire lifetime
* it does not add a corresponding put_device() in led_get(), so it fixes only the OF case
The other fix (445110941eb9) is adding the put_device() in led_put() so it covers the entire lifetime, and it works even in the non-DT case.
--- drivers/leds/led-class.c | 1 - 1 file changed, 1 deletion(-)
drivers/leds/led-class.c +0 -1
@@ -258,7 +258,6 @@ struct led_classdev *of_led_get(struct device_node *np, int index) led_dev =class_find_device_by_of_node (&leds_class, led_node);of_node_put (led_node); -put_device (led_dev);return led_module_get (led_dev); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 230/568 drm/mediatek: Remove less-than-zero comparison of an unsigned value
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hsiao Chien Sung <[email protected]>
[ Upstream commit 4ed9dd7fde22ed614384c03f8049723cbe7e6a58 ]
Fix a Coverity error that less-than-zero comparison of an unsigned value is never true.
--- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +1 -1
@@ -553,7 +553,7 @@ int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp *comp,int ret;#endif -if (comp_id <0 || comp_id >=DDP_COMPONENT_DRM_ID_MAX ) +if (comp_id >=DDP_COMPONENT_DRM_ID_MAX )return -EINVAL ; type = mtk_ddp_matches[comp_id].type;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 231/568 ext4: fix infinite loop when replaying fast_commit
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luis Henriques (SUSE) <[email protected]>
[ Upstream commit 907c3fe532253a6ef4eb9c4d67efb71fab58c706 ]
When doing fast_commit replay an infinite loop may occur due to an uninitialized extent_status struct. ext4_ext_determine_insert_hole() does not detect the replay and calls ext4_es_find_extent_range(), which will return immediately without initializing the 'es' variable.
Because 'es' contains garbage, an integer overflow may happen causing an infinite loop in this function, easily reproducible using fstest generic/039.
This commit fixes this issue by unconditionally initializing the structure in function ext4_es_find_extent_range().
Thanks to Zhang Yi, for figuring out the real problem!
--- fs/ext4/extents_status.c | 2 ++ 1 file changed, 2 insertions(+)
fs/ext4/extents_status.c +2 -0
@@ -310,6 +310,8 @@ void ext4_es_find_extent_range(struct inode *inode, ext4_lblk_t lblk, ext4_lblk_t end, struct extent_status *es) { + es->es_lblk = es->es_len = es->es_pblk = 0; +if (EXT4_SB (inode->i_sb)->s_mount_state &EXT4_FC_REPLAY )return ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 232/568 drm/mediatek/dp: switch to ->edid_read callback
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jani Nikula <[email protected]>
[ Upstream commit 0c13bd9bf444b0dfb2e9ea0d26915f310cc8ad6a ]
Prefer using the struct drm_edid based callback and functions.
Stable-dep-of: 8ad49a92cff4 ("drm/mediatek/dp: Fix spurious kfree()")
--- drivers/gpu/drm/mediatek/mtk_dp.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-)
drivers/gpu/drm/mediatek/mtk_dp.c +20 -11
@@ -2027,12 +2027,12 @@ static enum drm_connector_status mtk_dp_bdg_detect(struct drm_bridge *bridge)return ret; } -static struct edid *mtk_dp_get_edid (struct drm_bridge *bridge, -struct drm_connector *connector) +static const struct drm_edid *mtk_dp_edid_read (struct drm_bridge *bridge, +struct drm_connector *connector) {struct mtk_dp *mtk_dp =mtk_dp_from_bridge (bridge);bool enabled = mtk_dp->enabled; -struct edid *new_edid =NULL ; +const struct drm_edid *drm_edid;struct mtk_dp_audio_cfg *audio_caps = &mtk_dp->info.audio_cur_cfg;if (!enabled) {
@@ -2040,7 +2040,7 @@ static struct edid *mtk_dp_get_edid(struct drm_bridge *bridge,mtk_dp_aux_panel_poweron (mtk_dp, true); } - new_edid =drm_get_edid (connector, &mtk_dp->aux.ddc); + drm_edid =drm_edid_read_ddc (connector, &mtk_dp->aux.ddc);/* * Parse capability here to let atomic_get_input_bus_fmts and
@@ -2048,17 +2048,26 @@ static struct edid *mtk_dp_get_edid(struct drm_bridge *bridge,*/ if (mtk_dp_parse_capabilities (mtk_dp)) {drm_err (mtk_dp->drm_dev,"Can't parse capabilities\n" ); -kfree (new_edid); - new_edid =NULL ; +drm_edid_free (drm_edid); + drm_edid =NULL ; } -if (new_edid) { +if (drm_edid) { +/* +* FIXME: get rid of drm_edid_raw() +*/ +const struct edid *edid =drm_edid_raw (drm_edid);struct cea_sad *sads; - audio_caps->sad_count =drm_edid_to_sad (new_edid, &sads); + audio_caps->sad_count =drm_edid_to_sad (edid, &sads);kfree (sads); - audio_caps->detect_monitor =drm_detect_monitor_audio (new_edid); +/* +* FIXME: This should use connector->display_info.has_audio from +* a path that has read the EDID and called +* drm_edid_connector_update(). +*/ + audio_caps->detect_monitor =drm_detect_monitor_audio (edid); }if (!enabled) {
@@ -2066,7 +2075,7 @@ static struct edid *mtk_dp_get_edid(struct drm_bridge *bridge,drm_atomic_bridge_chain_post_disable (bridge, connector->state->state); } -return new_edid; +return drm_edid; } static ssize_t mtk_dp_aux_transfer(struct drm_dp_aux *mtk_aux,
@@ -2418,7 +2427,7 @@ static const struct drm_bridge_funcs mtk_dp_bridge_funcs = { .atomic_enable = mtk_dp_bridge_atomic_enable, .atomic_disable = mtk_dp_bridge_atomic_disable, .mode_valid = mtk_dp_bridge_mode_valid, - .get_edid = mtk_dp_get_edid, + .edid_read = mtk_dp_edid_read, .detect = mtk_dp_bdg_detect, };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 233/568 drm/mediatek/dp: Fix spurious kfree()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Walle <[email protected]>
[ Upstream commit 8ad49a92cff4bab13eb2f2725243f5f31eff3f3b ]
drm_edid_to_sad() might return an error or just zero. If that is the case, we must not free the SADs because there was no allocation in the first place.
--- drivers/gpu/drm/mediatek/mtk_dp.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/mediatek/mtk_dp.c +8 -2
@@ -2058,9 +2058,15 @@ static const struct drm_edid *mtk_dp_edid_read(struct drm_bridge *bridge,*/ const struct edid *edid =drm_edid_raw (drm_edid);struct cea_sad *sads; +int ret; - audio_caps->sad_count =drm_edid_to_sad (edid, &sads); -kfree (sads); + ret =drm_edid_to_sad (edid, &sads); +/* Ignore any errors */ +if (ret <0 ) + ret =0 ; +if (ret) +kfree (sads); + audio_caps->sad_count = ret;/* * FIXME: This should use connector->display_info.has_audio from
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 234/568 media: venus: flush all buffers in output plane streamoff
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dikshita Agarwal <[email protected]>
[ Upstream commit e750a4b1224142bd8dd057b0d5adf8a5608b7e77 ]
For scenarios, when source change is followed by VIDIOC_STREAMOFF on output plane, driver should discard any queued OUTPUT buffers, which are not decoded or dequeued.
Flush with HFI_FLUSH_INPUT does not have any actual impact. So, fix it, by invoking HFI_FLUSH_ALL, which will flush all queued buffers.
--- drivers/media/platform/qcom/venus/vdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/qcom/venus/vdec.c +1 -1
@@ -1255,7 +1255,7 @@ static int vdec_stop_output(struct venus_inst *inst)break ;case VENUS_DEC_STATE_INIT :case VENUS_DEC_STATE_CAPTURE_SETUP : - ret =hfi_session_flush (inst,HFI_FLUSH_INPUT , true); + ret =hfi_session_flush (inst,HFI_FLUSH_ALL , true);break ;default :break ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 235/568 perf intel-pt: Fix aux_watermark calculation for 64-bit size
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
[ Upstream commit 36b4cd990a8fd3f5b748883050e9d8c69fe6398d ]
aux_watermark is a u32. For a 64-bit size, cap the aux_watermark calculation at UINT_MAX instead of truncating it to 32-bits.
--- tools/perf/arch/x86/util/intel-pt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/perf/arch/x86/util/intel-pt.c +2 -1
@@ -766,7 +766,8 @@ static int intel_pt_recording_options(struct auxtrace_record *itr, }if (!opts->auxtrace_snapshot_mode && !opts->auxtrace_sample_mode) { -u32 aux_watermark = opts->auxtrace_mmap_pages * page_size /4 ; +size_t aw = opts->auxtrace_mmap_pages * (size_t )page_size /4 ; +u32 aux_watermark = aw >UINT_MAX ?UINT_MAX : aw; intel_pt_evsel->core.attr.aux_watermark = aux_watermark; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 236/568 perf intel-pt: Fix exclude_guest setting
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
[ Upstream commit b40934ae32232140e85dc7dc1c3ea0e296986723 ]
In the past, the exclude_guest setting has had no effect on Intel PT tracing, but that may not be the case in the future.
Set the flag correctly based upon whether KVM is using Intel PT "Host/Guest" mode, which is determined by the kvm_intel module parameter pt_mode:
pt_mode=0 System-wide mode : host and guest output to host buffer
pt_mode=1 Host/Guest mode : host/guest output to host/guest
buffers respectively
--- tools/perf/arch/x86/util/intel-pt.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
tools/perf/arch/x86/util/intel-pt.c +12 -0
@@ -32,6 +32,7 @@#include "../../../util/tsc.h" #include <internal/lib.h> // page_size #include "../../../util/intel-pt.h" +#include <api/fs/fs.h> #define KiB (x) ((x) * 1024)#define MiB (x) ((x) * 1024 * 1024)
@@ -436,6 +437,16 @@ static int intel_pt_track_switches(struct evlist *evlist) }#endif +static bool intel_pt_exclude_guest (void ) +{ +int pt_mode; + +if (sysfs__read_int ("module/kvm_intel/parameters/pt_mode" , &pt_mode)) + pt_mode =0 ; + +return pt_mode ==1 ; +} +static void intel_pt_valid_str (char *str,size_t len,u64 valid) {unsigned int val, last =0 , state =1 ;
@@ -628,6 +639,7 @@ static int intel_pt_recording_options(struct auxtrace_record *itr, } evsel->core.attr.freq =0 ; evsel->core.attr.sample_period =1 ; + evsel->core.attr.exclude_guest =intel_pt_exclude_guest (); evsel->no_aux_samples = true; evsel->needs_auxtrace_mmap = true; intel_pt_evsel = evsel;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 237/568 mfd: rsmu: Split core code into separate module
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit c879a8c39dd55e7fabdd8d13341f7bc5200db377 ]
Linking a file into two modules can have unintended side-effects and produces a W=1 warning:
scripts/Makefile.build:236: drivers/mfd/Makefile: rsmu_core.o is added to multiple modules: rsmu-i2c rsmu-spi
Make this one a separate module instead.
--- drivers/mfd/Makefile | 6 ++---- drivers/mfd/rsmu_core.c | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/mfd/Makefile +2 -4
@@ -280,7 +280,5 @@ obj-$(CONFIG_MFD_INTEL_M10_BMC_PMCI) += intel-m10-bmc-pmci.o obj-$(CONFIG_MFD_ATC260X) += atc260x-core.o obj-$(CONFIG_MFD_ATC260X_I2C) += atc260x-i2c.o -rsmu-i2c-objs := rsmu_core.o rsmu_i2c.o -rsmu-spi-objs := rsmu_core.o rsmu_spi.o -obj-$(CONFIG_MFD_RSMU_I2C) += rsmu-i2c.o -obj-$(CONFIG_MFD_RSMU_SPI) += rsmu-spi.o +obj-$(CONFIG_MFD_RSMU_I2C) += rsmu_i2c.o rsmu_core.o +obj-$(CONFIG_MFD_RSMU_SPI) += rsmu_spi.o rsmu_core.o
drivers/mfd/rsmu_core.c +2 -0
@@ -78,11 +78,13 @@ int rsmu_core_init(struct rsmu_ddata *rsmu)return ret; } +EXPORT_SYMBOL_GPL (rsmu_core_init);void rsmu_core_exit (struct rsmu_ddata *rsmu) {mutex_destroy (&rsmu->lock); } +EXPORT_SYMBOL_GPL (rsmu_core_exit);MODULE_DESCRIPTION ("Renesas SMU core driver" );MODULE_LICENSE ("GPL" );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 238/568 mfd: omap-usb-tll: Use struct_size to allocate tll
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Javier Carrasco <[email protected]>
[ Upstream commit 40176714c818b0b6a2ca8213cdb7654fbd49b742 ]
Commit 16c2004d9e4d ("mfd: omap-usb-tll: Allocate driver data at once") changed the memory allocation of 'tll' to consolidate it into a single allocation, introducing an incorrect size calculation.
In particular, the allocation for the array of pointers was converted into a single-pointer allocation.
The memory allocation used to occur in two steps:
tll = devm_kzalloc(dev, sizeof(struct usbtll_omap), GFP_KERNEL); tll->ch_clk = devm_kzalloc(dev, sizeof(struct clk *) * tll->nch,
GFP_KERNEL);
And it turned that into the following allocation:
tll = devm_kzalloc(dev, sizeof(*tll) + sizeof(tll->ch_clk[nch]),
GFP_KERNEL);
sizeof(tll->ch_clk[nch]) returns the size of a single pointer instead of the expected nch pointers.
This bug went unnoticed because the allocation size was small enough to fit within the minimum size of a memory allocation for this particular case [1].
The complete allocation can still be done at once with the struct_size macro, which comes in handy for structures with a trailing flexible array.
Fix the memory allocation to obtain the original size again.
--- drivers/mfd/omap-usb-tll.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/mfd/omap-usb-tll.c +1 -2
@@ -230,8 +230,7 @@ static int usbtll_omap_probe(struct platform_device *pdev)break ; } - tll =devm_kzalloc (dev,sizeof (*tll) +sizeof (tll->ch_clk[nch]), -GFP_KERNEL ); + tll =devm_kzalloc (dev,struct_size (tll, ch_clk, nch),GFP_KERNEL );if (!tll) {pm_runtime_put_sync (dev);pm_runtime_disable (dev);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 239/568 xprtrdma: Fix rpcrdma_reqs_reset()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chuck Lever <[email protected]>
[ Upstream commit acd9f2dd23c632568156217aac7a05f5a0313152 ]
Avoid FastReg operations getting MW_BIND_ERR after a reconnect.
rpcrdma_reqs_reset() is called on transport tear-down to get each rpcrdma_req back into a clean state.
MRs on req->rl_registered are waiting for a FastReg, are already registered, or are waiting for invalidation. If the transport is being torn down when reqs_reset() is called, the matching LocalInv might never be posted. That leaves these MR registered /and/ on req->rl_free_mrs, where they can be re-used for the next connection.
Since xprtrdma does not keep specific track of the MR state, it's not possible to know what state these MRs are in, so the only safe thing to do is release them immediately.
--- net/sunrpc/xprtrdma/frwr_ops.c | 3 ++- net/sunrpc/xprtrdma/verbs.c | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-)
net/sunrpc/xprtrdma/frwr_ops.c +2 -1
@@ -92,7 +92,8 @@ static void frwr_mr_put(struct rpcrdma_mr *mr)rpcrdma_mr_push (mr, &mr->mr_req->rl_free_mrs); } -/* frwr_reset - Place MRs back on the free list +/** +* frwr_reset - Place MRs back on @req's free list * @req: request to reset * * Used after a failed marshal. For FRWR, this means the MRs
net/sunrpc/xprtrdma/verbs.c +15 -1
@@ -897,6 +897,8 @@ static int rpcrdma_reqs_setup(struct rpcrdma_xprt *r_xprt)static void rpcrdma_req_reset (struct rpcrdma_req *req) { +struct rpcrdma_mr *mr; +/* Credits are valid for only one connection */ req->rl_slot.rq_cong =0 ;
@@ -906,7 +908,19 @@ static void rpcrdma_req_reset(struct rpcrdma_req *req)rpcrdma_regbuf_dma_unmap (req->rl_sendbuf);rpcrdma_regbuf_dma_unmap (req->rl_recvbuf); -frwr_reset (req); +/* The verbs consumer can't know the state of an MR on the +* req->rl_registered list unless a successful completion +* has occurred, so they cannot be re-used. +*/ +while ((mr =rpcrdma_mr_pop (&req->rl_registered))) { +struct rpcrdma_buffer *buf = &mr->mr_xprt->rx_buf; + +spin_lock (&buf->rb_lock); +list_del (&mr->mr_all); +spin_unlock (&buf->rb_lock); + +frwr_mr_release (mr); + } }/* ASSUMPTION: the rb_allreqs list is stable for the duration,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 240/568 SUNRPC: avoid soft lockup when transmitting UDP to reachable server.
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: NeilBrown <[email protected]>
[ Upstream commit 6258cf25d5e3155c3219ab5a79b970eef7996356 ]
Prior to the commit identified below, call_transmit_status() would handle -EPERM and other errors related to an unreachable server by falling through to call_status() which added a 3-second delay and handled the failure as a timeout.
Since that commit, call_transmit_status() falls through to handle_bind(). For UDP this moves straight on to handle_connect() and handle_transmit() so we immediately retransmit - and likely get the same error.
This results in an indefinite loop in __rpc_execute() which triggers a soft-lockup warning.
For the errors that indicate an unreachable server, call_transmit_status() should fall back to call_status() as it did before. This cannot cause the thundering herd that the previous patch was avoiding, as the call_status() will insert a delay.
--- net/sunrpc/clnt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/sunrpc/clnt.c +2 -1
@@ -2310,12 +2310,13 @@ call_transmit_status(struct rpc_task *task) task->tk_action = call_transmit; task->tk_status =0 ;break ; -case -ECONNREFUSED :case -EHOSTDOWN :case -ENETDOWN :case -EHOSTUNREACH :case -ENETUNREACH :case -EPERM : +break ; +case -ECONNREFUSED :if (RPC_IS_SOFTCONN (task)) {if (!task->tk_msg.rpc_proc->p_proc) trace_xprt_ping(task->tk_xprt,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 241/568 NFSv4.1 another fix for EXCHGID4_FLAG_USE_PNFS_DS for DS server
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Olga Kornievskaia <[email protected]>
[ Upstream commit 4840c00003a2275668a13b82c9f5b1aed80183aa ]
Previously in order to mark the communication with the DS server, we tried to use NFS_CS_DS in cl_flags. However, this flag would only be saved for the DS server and in case where DS equals MDS, the client would not find a matching nfs_client in nfs_match_client that represents the MDS (but is also a DS).
Instead, don't rely on the NFS_CS_DS but instead use NFS_CS_PNFS.
--- fs/nfs/nfs4client.c | 6 ++---- fs/nfs/nfs4proc.c | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-)
fs/nfs/nfs4client.c +2 -4
@@ -231,9 +231,8 @@ struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init)__set_bit (NFS_CS_INFINITE_SLOTS , &clp->cl_flags);__set_bit (NFS_CS_DISCRTRY , &clp->cl_flags);__set_bit (NFS_CS_NO_RETRANS_TIMEOUT , &clp->cl_flags); - -if (test_bit (NFS_CS_DS , &cl_init->init_flags)) -__set_bit (NFS_CS_DS , &clp->cl_flags); +if (test_bit (NFS_CS_PNFS , &cl_init->init_flags)) +__set_bit (NFS_CS_PNFS , &clp->cl_flags);/* * Set up the connection to the server before we add add to the * global list.
@@ -1011,7 +1010,6 @@ struct nfs_client *nfs4_set_ds_client(struct nfs_server *mds_srv,if (mds_srv->flags &NFS_MOUNT_NORESVPORT )__set_bit (NFS_CS_NORESVPORT , &cl_init.init_flags); -__set_bit (NFS_CS_DS , &cl_init.init_flags);__set_bit (NFS_CS_PNFS , &cl_init.init_flags); cl_init.max_connect =NFS_MAX_TRANSPORTS ;/*
fs/nfs/nfs4proc.c +1 -1
@@ -8816,7 +8816,7 @@ nfs4_run_exchange_id(struct nfs_client *clp, const struct cred *cred,#ifdef CONFIG_NFS_V4_1_MIGRATION calldata->args.flags |=EXCHGID4_FLAG_SUPP_MOVED_MIGR ;#endif -if (test_bit (NFS_CS_DS , &clp->cl_flags)) +if (test_bit (NFS_CS_PNFS , &clp->cl_flags)) calldata->args.flags |=EXCHGID4_FLAG_USE_PNFS_DS ; msg.rpc_argp = &calldata->args; msg.rpc_resp = &calldata->res;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 242/568 ext4: dont track ranges in fast_commit if inode has inlined data
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luis Henriques (SUSE) <[email protected]>
[ Upstream commit 7882b0187bbeb647967a7b5998ce4ad26ef68a9a ]
When fast-commit needs to track ranges, it has to handle inodes that have inlined data in a different way because ext4_fc_write_inode_data(), in the actual commit path, will attempt to map the required blocks for the range. However, inodes that have inlined data will have it's data stored in inode->i_block and, eventually, in the extended attribute space.
Unfortunately, because fast commit doesn't currently support extended attributes, the solution is to mark this commit as ineligible.
--- fs/ext4/fast_commit.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/ext4/fast_commit.c +6 -0
@@ -649,6 +649,12 @@ void ext4_fc_track_range(handle_t *handle, struct inode *inode, ext4_lblk_t starif (ext4_test_mount_flag (inode->i_sb,EXT4_MF_FC_INELIGIBLE ))return ; +if (ext4_has_inline_data (inode)) { +ext4_fc_mark_ineligible (inode->i_sb,EXT4_FC_REASON_XATTR , + handle); +return ; + } + args.start = start; args.end = end;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 243/568 ext4: avoid writing unitialized memory to disk in EA inodes
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
[ Upstream commit 65121eff3e4c8c90f8126debf3c369228691c591 ]
If the extended attribute size is not a multiple of block size, the last block in the EA inode will have uninitialized tail which will get written to disk. We will never expose the data to userspace but still this is not a good practice so just zero out the tail of the block as it isn't going to cause a noticeable performance overhead.
--- fs/ext4/xattr.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/ext4/xattr.c +6 -0
@@ -1433,6 +1433,12 @@ static int ext4_xattr_inode_write(handle_t *handle, struct inode *ea_inode, goto out;memcpy (bh->b_data, buf, csize); +/* +* Zero out block tail to avoid writing uninitialized memory +* to disk. +*/ +if (csize < blocksize) +memset (bh->b_data + csize,0 , blocksize - csize);set_buffer_uptodate (bh);ext4_handle_dirty_metadata (handle, ea_inode, bh);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 244/568 leds: flash: leds-qcom-flash: Test the correct variable in init
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 87e552ad654554be73e62dd43c923bcee215287d ]
This code was passing the incorrect pointer to PTR_ERR_OR_ZERO() so it always returned success. It should have been checking the array element instead of the array itself.
--- drivers/leds/flash/leds-qcom-flash.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/leds/flash/leds-qcom-flash.c +7 -3
@@ -505,6 +505,7 @@ qcom_flash_v4l2_init(struct device *dev, struct qcom_flash_led *led, struct fwnostruct qcom_flash_data *flash_data = led->flash_data;struct v4l2_flash_config v4l2_cfg = {0 };struct led_flash_setting *intensity = &v4l2_cfg.intensity; +struct v4l2_flash *v4l2_flash;if (!(led->flash.led_cdev.flags &LED_DEV_CAP_FLASH ))return 0 ;
@@ -523,9 +524,12 @@ qcom_flash_v4l2_init(struct device *dev, struct qcom_flash_led *led, struct fwnoLED_FAULT_OVER_TEMPERATURE |LED_FAULT_TIMEOUT ; - flash_data->v4l2_flash[flash_data->leds_count] = -v4l2_flash_init (dev, fwnode, &led->flash, &qcom_v4l2_flash_ops, &v4l2_cfg); -return PTR_ERR_OR_ZERO (flash_data->v4l2_flash); + v4l2_flash =v4l2_flash_init (dev, fwnode, &led->flash, &qcom_v4l2_flash_ops, &v4l2_cfg); +if (IS_ERR (v4l2_flash)) +return PTR_ERR (v4l2_flash); + + flash_data->v4l2_flash[flash_data->leds_count] = v4l2_flash; +return 0 ; }# else static int
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 245/568 sparc64: Fix incorrect function signature and add prototype for prom_cif_init
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andreas Larsson <[email protected]>
[ Upstream commit a6c3ea1ec96307dbfbb2f16d96c674c5cc80f445 ]
Remove the unused cif_stack argument and add a protype in oplib_64.h Commit ef3e035c3a9b ("sparc64: Fix register corruption in top-most kernel stack frame during boot.") removed the cif_stack argument to prom_cif init in the declaration at the caller site and the usage of it within prom_cif_init, but not in the function signature of the function itself.
This also fixes the following warning:arch/sparc/prom/p1275.c:52:6: warning: no previous prototype for ‘prom_cif_init’
--- arch/sparc/include/asm/oplib_64.h | 1 + arch/sparc/prom/init_64.c | 3 --- arch/sparc/prom/p1275.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-)
arch/sparc/include/asm/oplib_64.h +1 -0
@@ -247,6 +247,7 @@ void prom_sun4v_guest_soft_state(void);int prom_ihandle2path (int handle,char *buffer,int bufsize);/* Client interface level routines. */ +void prom_cif_init (void *cif_handler);void p1275_cmd_direct (unsigned long *);#endif /* !(__SPARC64_OPLIB_H) */
arch/sparc/prom/init_64.c +0 -3
@@ -26,9 +26,6 @@ phandle prom_chosen_node;* routines in the prom library. * It gets passed the pointer to the PROM vector. */ - -extern void prom_cif_init (void *); -void __init prom_init (void *cif_handler) {phandle node;
arch/sparc/prom/p1275.c +1 -1
@@ -49,7 +49,7 @@ void p1275_cmd_direct(unsigned long *args)local_irq_restore (flags); } -void prom_cif_init (void *cif_handler,void *cif_stack) +void prom_cif_init (void *cif_handler) { p1275buf.prom_cif_handler = (void (*)(long *))cif_handler; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 246/568 SUNRPC: Fixup gss_status tracepoint error output
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Coddington <[email protected]>
[ Upstream commit b9fae9f06d84ffab0f3f9118f3a96bbcdc528bf6 ]
The GSS routine errors are values, not flags.
--- include/trace/events/rpcgss.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/trace/events/rpcgss.h +1 -1
@@ -54,7 +54,7 @@ TRACE_DEFINE_ENUM(GSS_S_UNSEQ_TOKEN);TRACE_DEFINE_ENUM (GSS_S_GAP_TOKEN );#define show_gss_status (x) \ - __print_flags(x, "|", \ + __print_symbolic(x, \ { GSS_S_BAD_MECH, "GSS_S_BAD_MECH" }, \ { GSS_S_BAD_NAME, "GSS_S_BAD_NAME" }, \ { GSS_S_BAD_NAMETYPE, "GSS_S_BAD_NAMETYPE" }, \
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 247/568 iio: Fix the sorting functionality in iio_gts_build_avail_time_table
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chenyuan Yang <[email protected]>
[ Upstream commit 5acc3f971a01be48d5ff4252d8f9cdb87998cdfb ]
The sorting in iio_gts_build_avail_time_table is not working as intended. It could result in an out-of-bounds access when the time is zero.
Here are more details:
1. When the gts->itime_table[i].time_us is zero, e.g., the time sequence is 3, 0, 1, the inner for-loop will not terminate and do out-of-bound writes. This is because once times[j] > new, the value new will be added in the current position and the times[j] will be moved to j+1 position, which makes the if-condition always hold. Meanwhile, idx will be added one, making the loop keep running without termination and out-of-bound write.
2. If none of the gts->itime_table[i].time_us is zero, the elements will just be copied without being sorted as described in the comment "Sort times from all tables to one and remove duplicates".
For more details, please refer to
https://lore.kernel.org/all/[email protected].
--- drivers/iio/industrialio-gts-helper.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/iio/industrialio-gts-helper.c +5 -2
@@ -362,17 +362,20 @@ static int iio_gts_build_avail_time_table(struct iio_gts *gts)for (i = gts->num_itime -1 ; i >=0 ; i--) {int new = gts->itime_table[i].time_us; -if (times[idx] < new) { +if (idx ==0 || times[idx -1 ] < new) { times[idx++] = new;continue ; } -for (j =0 ; j <= idx; j++) { +for (j =0 ; j < idx; j++) { +if (times[j] == new) +break ;if (times[j] > new) {memmove (×[j +1 ], ×[j], (idx - j) *sizeof (int )); times[j] = new; idx++; +break ; } } }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 248/568 PCI: Fix resource double counting on remove & rescan
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit 903534fa7d30214d8ba840ab1cd9e917e0c88e41 ]
pbus_size_mem() keeps the size of the optional resources in children_add_size. When calculating the PCI bridge window size, calculate_memsize() lower bounds size by old_size before adding children_add_size and performing the window size alignment. This results in double counting for the resources in children_add_size because old_size may be based on the previous size of the bridge window after it has already included children_add_size (that is, size1 in pbus_size_mem() from an earlier invocation of that function).
As a result, on repeated remove of the bus & rescan cycles the resource size keeps increasing when children_add_size is non-zero as can be seen from this extract:
iomem0: 23fffd00000-23fffdfffff : PCI Bus 0000:03 # 1MiB iomem1: 20000000000-200001fffff : PCI Bus 0000:03 # 2MiB iomem2: 20000000000-200002fffff : PCI Bus 0000:03 # 3MiB iomem3: 20000000000-200003fffff : PCI Bus 0000:03 # 4MiB iomem4: 20000000000-200004fffff : PCI Bus 0000:03 # 5MiB
Solve the double counting by moving old_size check later in calculate_memsize() so that children_add_size is already accounted for.
After the patch, the bridge window retains its size as expected:
iomem0: 23fffd00000-23fffdfffff : PCI Bus 0000:03 # 1MiB iomem1: 20000000000-200000fffff : PCI Bus 0000:03 # 1MiB iomem2: 20000000000-200000fffff : PCI Bus 0000:03 # 1MiB
--- drivers/pci/setup-bus.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/pci/setup-bus.c +2 -4
@@ -820,11 +820,9 @@ static resource_size_t calculate_memsize(resource_size_t size, size = min_size;if (old_size ==1 ) old_size =0 ; -if (size < old_size) - size = old_size; - size =ALIGN (max (size, add_size) + children_add_size, align); -return size; + size =max (size, add_size) + children_add_size; +return ALIGN (max (size, old_size), align); } resource_size_t __weak pcibios_window_alignment(struct pci_bus *bus,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 249/568 PCI: keystone: Relocate ks_pcie_set/clear_dbi_mode()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Siddharth Vadapalli <[email protected]>
[ Upstream commit 5125fdc3292eea20870d4e6cefa62dc1245ce7ec ]
Relocate ks_pcie_set_dbi_mode() and ks_pcie_clear_dbi_mode() to avoid forward declaration in a subsequent patch. No functional change intended.
Stable-dep-of: 9ffa0e70b2da ("PCI: keystone: Don't enable BAR 0 for AM654x")
--- drivers/pci/controller/dwc/pci-keystone.c | 84 +++++++++++------------ 1 file changed, 42 insertions(+), 42 deletions(-)
drivers/pci/controller/dwc/pci-keystone.c +42 -42
@@ -246,6 +246,48 @@ static struct irq_chip ks_pcie_msi_irq_chip = { .irq_unmask = ks_pcie_msi_unmask, }; +/** +* ks_pcie_set_dbi_mode() - Set DBI mode to access overlaid BAR mask registers +* @ks_pcie: A pointer to the keystone_pcie structure which holds the KeyStone +* PCIe host controller driver information. +* +* Since modification of dbi_cs2 involves different clock domain, read the +* status back to ensure the transition is complete. +*/ +static void ks_pcie_set_dbi_mode (struct keystone_pcie *ks_pcie) +{ +u32 val; + + val =ks_pcie_app_readl (ks_pcie,CMD_STATUS ); + val |=DBI_CS2 ; +ks_pcie_app_writel (ks_pcie,CMD_STATUS , val); + +do { + val =ks_pcie_app_readl (ks_pcie,CMD_STATUS ); + }while (!(val &DBI_CS2 )); +} + +/** +* ks_pcie_clear_dbi_mode() - Disable DBI mode +* @ks_pcie: A pointer to the keystone_pcie structure which holds the KeyStone +* PCIe host controller driver information. +* +* Since modification of dbi_cs2 involves different clock domain, read the +* status back to ensure the transition is complete. +*/ +static void ks_pcie_clear_dbi_mode (struct keystone_pcie *ks_pcie) +{ +u32 val; + + val =ks_pcie_app_readl (ks_pcie,CMD_STATUS ); + val &= ~DBI_CS2 ; +ks_pcie_app_writel (ks_pcie,CMD_STATUS , val); + +do { + val =ks_pcie_app_readl (ks_pcie,CMD_STATUS ); + }while (val &DBI_CS2 ); +} +static int ks_pcie_msi_host_init (struct dw_pcie_rp *pp) { pp->msi_irq_chip = &ks_pcie_msi_irq_chip;
@@ -342,48 +384,6 @@ static const struct irq_domain_ops ks_pcie_legacy_irq_domain_ops = { .xlate = irq_domain_xlate_onetwocell, }; -/** -* ks_pcie_set_dbi_mode() - Set DBI mode to access overlaid BAR mask registers -* @ks_pcie: A pointer to the keystone_pcie structure which holds the KeyStone -* PCIe host controller driver information. -* -* Since modification of dbi_cs2 involves different clock domain, read the -* status back to ensure the transition is complete. -*/ -static void ks_pcie_set_dbi_mode (struct keystone_pcie *ks_pcie) -{ -u32 val; - - val =ks_pcie_app_readl (ks_pcie,CMD_STATUS ); - val |=DBI_CS2 ; -ks_pcie_app_writel (ks_pcie,CMD_STATUS , val); - -do { - val =ks_pcie_app_readl (ks_pcie,CMD_STATUS ); - }while (!(val &DBI_CS2 )); -} - -/** -* ks_pcie_clear_dbi_mode() - Disable DBI mode -* @ks_pcie: A pointer to the keystone_pcie structure which holds the KeyStone -* PCIe host controller driver information. -* -* Since modification of dbi_cs2 involves different clock domain, read the -* status back to ensure the transition is complete. -*/ -static void ks_pcie_clear_dbi_mode (struct keystone_pcie *ks_pcie) -{ -u32 val; - - val =ks_pcie_app_readl (ks_pcie,CMD_STATUS ); - val &= ~DBI_CS2 ; -ks_pcie_app_writel (ks_pcie,CMD_STATUS , val); - -do { - val =ks_pcie_app_readl (ks_pcie,CMD_STATUS ); - }while (val &DBI_CS2 ); -} -static void ks_pcie_setup_rc_app_regs (struct keystone_pcie *ks_pcie) {u32 val;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 250/568 PCI: keystone: Dont enable BAR 0 for AM654x
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Siddharth Vadapalli <[email protected]>
[ Upstream commit 9ffa0e70b2daf9b0271e4960b7c8a2350e2cda08 ]
After 6ab15b5e7057 ("PCI: dwc: keystone: Convert .scan_bus() callback to use add_bus"), ks_pcie_v3_65_add_bus() enabled BAR 0 for both v3.65a and v4.90a devices. On the AM654x SoC, which uses v4.90a, enabling BAR 0 causes Completion Timeouts when setting up MSI-X. These timeouts delay boot of the AM654x by about 45 seconds.
Move the BAR 0 initialization to ks_pcie_msi_host_init(), which is only used for v3.65a devices, and remove ks_pcie_v3_65_add_bus().
--- drivers/pci/controller/dwc/pci-keystone.c | 52 ++++++++--------------- 1 file changed, 18 insertions(+), 34 deletions(-)
drivers/pci/controller/dwc/pci-keystone.c +18 -34
@@ -290,6 +290,24 @@ static void ks_pcie_clear_dbi_mode(struct keystone_pcie *ks_pcie)static int ks_pcie_msi_host_init (struct dw_pcie_rp *pp) { +struct dw_pcie *pci =to_dw_pcie_from_pp (pp); +struct keystone_pcie *ks_pcie =to_keystone_pcie (pci); + +/* Configure and set up BAR0 */ +ks_pcie_set_dbi_mode (ks_pcie); + +/* Enable BAR0 */ +dw_pcie_writel_dbi (pci,PCI_BASE_ADDRESS_0 ,1 ); +dw_pcie_writel_dbi (pci,PCI_BASE_ADDRESS_0 ,SZ_4K -1 ); + +ks_pcie_clear_dbi_mode (ks_pcie); + +/* +* For BAR0, just setting bus address for inbound writes (MSI) should +* be sufficient. Use physical address to avoid any conflicts. +*/ +dw_pcie_writel_dbi (pci,PCI_BASE_ADDRESS_0 , ks_pcie->app.start); + pp->msi_irq_chip = &ks_pcie_msi_irq_chip;return dw_pcie_allocate_domains (pp); }
@@ -447,44 +465,10 @@ static struct pci_ops ks_child_pcie_ops = { .write = pci_generic_config_write, }; -/** -* ks_pcie_v3_65_add_bus() - keystone add_bus post initialization -* @bus: A pointer to the PCI bus structure. -* -* This sets BAR0 to enable inbound access for MSI_IRQ register -*/ -static int ks_pcie_v3_65_add_bus (struct pci_bus *bus) -{ -struct dw_pcie_rp *pp = bus->sysdata; -struct dw_pcie *pci =to_dw_pcie_from_pp (pp); -struct keystone_pcie *ks_pcie =to_keystone_pcie (pci); - -if (!pci_is_root_bus (bus)) -return 0 ; - -/* Configure and set up BAR0 */ -ks_pcie_set_dbi_mode (ks_pcie); - -/* Enable BAR0 */ -dw_pcie_writel_dbi (pci,PCI_BASE_ADDRESS_0 ,1 ); -dw_pcie_writel_dbi (pci,PCI_BASE_ADDRESS_0 ,SZ_4K -1 ); - -ks_pcie_clear_dbi_mode (ks_pcie); - -/* -* For BAR0, just setting bus address for inbound writes (MSI) should -* be sufficient. Use physical address to avoid any conflicts. -*/ -dw_pcie_writel_dbi (pci,PCI_BASE_ADDRESS_0 , ks_pcie->app.start); - -return 0 ; -} -static struct pci_ops ks_pcie_ops = { .map_bus = dw_pcie_own_conf_map_bus, .read = pci_generic_config_read, .write = pci_generic_config_write, - .add_bus = ks_pcie_v3_65_add_bus, };/**
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 251/568 PCI: keystone: Fix NULL pointer dereference in case of DT error in ks_pcie_setup_rc_app_regs()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aleksandr Mishin <[email protected]>
[ Upstream commit a231707a91f323af1e5d9f1722055ec2fc1c7775 ]
If IORESOURCE_MEM is not provided in Device Tree due to any error, resource_list_first_type() will return NULL and pci_parse_request_of_pci_ranges() will just emit a warning.
This will cause a NULL pointer dereference. Fix this bug by adding NULL return check.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/pci/controller/dwc/pci-keystone.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
drivers/pci/controller/dwc/pci-keystone.c +15 -5
@@ -402,17 +402,22 @@ static const struct irq_domain_ops ks_pcie_legacy_irq_domain_ops = { .xlate = irq_domain_xlate_onetwocell, }; -static void ks_pcie_setup_rc_app_regs (struct keystone_pcie *ks_pcie) +static int ks_pcie_setup_rc_app_regs (struct keystone_pcie *ks_pcie) {u32 val;u32 num_viewport = ks_pcie->num_viewport;struct dw_pcie *pci = ks_pcie->pci;struct dw_pcie_rp *pp = &pci->pp; -u64 start, end; +struct resource_entry *entry;struct resource *mem; +u64 start, end;int i; - mem =resource_list_first_type (&pp->bridge->windows,IORESOURCE_MEM )->res; + entry =resource_list_first_type (&pp->bridge->windows,IORESOURCE_MEM ); +if (!entry) +return -ENODEV ; + + mem = entry->res; start = mem->start; end = mem->end;
@@ -423,7 +428,7 @@ static void ks_pcie_setup_rc_app_regs(struct keystone_pcie *ks_pcie)ks_pcie_clear_dbi_mode (ks_pcie);if (ks_pcie->is_am6) -return ; +return 0 ; val =ilog2 (OB_WIN_SIZE );ks_pcie_app_writel (ks_pcie,OB_SIZE , val);
@@ -440,6 +445,8 @@ static void ks_pcie_setup_rc_app_regs(struct keystone_pcie *ks_pcie) val =ks_pcie_app_readl (ks_pcie,CMD_STATUS ); val |=OB_XLAT_EN_VAL ;ks_pcie_app_writel (ks_pcie,CMD_STATUS , val); + +return 0 ; } static void __iomem *ks_pcie_other_map_bus(struct pci_bus *bus,
@@ -801,7 +808,10 @@ static int __init ks_pcie_host_init(struct dw_pcie_rp *pp)return ret;ks_pcie_stop_link (pci); -ks_pcie_setup_rc_app_regs (ks_pcie); + ret =ks_pcie_setup_rc_app_regs (ks_pcie); +if (ret) +return ret; +writew (PCI_IO_RANGE_TYPE_32 | (PCI_IO_RANGE_TYPE_32 <<8 ), pci->dbi_base +PCI_IO_BASE );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 252/568 PCI: rcar: Demote WARN() to dev_warn_ratelimited() in rcar_pcie_wakeup()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Vasut <[email protected]>
[ Upstream commit c93637e6a4c4e1d0e85ef7efac78d066bbb24d96 ]
Avoid large backtrace, it is sufficient to warn the user that there has been a link problem. Either the link has failed and the system is in need of maintenance, or the link continues to work and user has been informed. The message from the warning can be looked up in the sources.
This makes an actual link issue less verbose.
First of all, this controller has a limitation in that the controller driver has to assist the hardware with transition to L1 link state by writing L1IATN to PMCTRL register, the L1 and L0 link state switching is not fully automatic on this controller.
In case of an ASMedia ASM1062 PCIe SATA controller which does not support ASPM, on entry to suspend or during platform pm_test, the SATA controller enters D3hot state and the link enters L1 state. If the SATA controller wakes up before rcar_pcie_wakeup() was called and returns to D0, the link returns to L0 before the controller driver even started its transition to L1 link state. At this point, the SATA controller did send an PM_ENTER_L1 DLLP to the PCIe controller and the PCIe controller received it, and the PCIe controller did set PMSR PMEL1RX bit.
Once rcar_pcie_wakeup() is called, if the link is already back in L0 state and PMEL1RX bit is set, the controller driver has no way to determine if it should perform the link transition to L1 state, or treat the link as if it is in L0 state. Currently the driver attempts to perform the transition to L1 link state unconditionally, which in this specific case fails with a PMSR L1FAEG poll timeout, however the link still works as it is already back in L0 state.
Reduce this warning verbosity. In case the link is really broken, the rcar_pcie_config_access() would fail, otherwise it will succeed and any system with this controller and ASM1062 can suspend without generating a backtrace.
--- drivers/pci/controller/pcie-rcar-host.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/pci/controller/pcie-rcar-host.c +5 -1
@@ -77,7 +77,11 @@ static int rcar_pcie_wakeup(struct device *pcie_dev, void __iomem *pcie_base)writel (L1IATN , pcie_base +PMCTLR ); ret =readl_poll_timeout_atomic (pcie_base +PMSR , val, val &L1FAEG ,10 ,1000 ); -WARN (ret,"Timeout waiting for L1 link state, ret=%d\n" , ret); +if (ret) { +dev_warn_ratelimited (pcie_dev, +"Timeout waiting for L1 link state, ret=%d\n" , + ret); + }writel (L1FAEG |PMEL1RX , pcie_base +PMSR ); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 253/568 scsi: ufs: mcq: Fix missing argument hba in MCQ_OPR_OFFSET_n
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Minwoo Im <[email protected]>
[ Upstream commit 2fc39848952dfb91a9233563cc1444669b8e79c3 ]
The MCQ_OPR_OFFSET_n macro takes 'hba' in the caller context without receiving 'hba' instance as an argument. To prevent potential bugs in future use cases, add an argument 'hba'.
--- drivers/ufs/core/ufs-mcq.c | 10 ++++------ include/ufs/ufshcd.h | 6 ++++++ 2 files changed, 10 insertions(+), 6 deletions(-)
drivers/ufs/core/ufs-mcq.c +4 -6
@@ -230,8 +230,6 @@ int ufshcd_mcq_memory_alloc(struct ufs_hba *hba)/* Operation and runtime registers configuration */ #define MCQ_CFG_n (r, i) ((r) + MCQ_QCFG_SIZE * (i)) -#define MCQ_OPR_OFFSET_n (p, i) \ - (hba->mcq_opr[(p)].offset + hba->mcq_opr[(p)].stride * (i))static void __iomem *mcq_opr_base (struct ufs_hba *hba,enum ufshcd_mcq_opr n,int i)
@@ -344,10 +342,10 @@ void ufshcd_mcq_make_queues_operational(struct ufs_hba *hba)ufsmcq_writelx (hba,upper_32_bits (hwq->sqe_dma_addr),MCQ_CFG_n (REG_SQUBA , i));/* Submission Queue Doorbell Address Offset */ -ufsmcq_writelx (hba,MCQ_OPR_OFFSET_n (OPR_SQD , i), +ufsmcq_writelx (hba,ufshcd_mcq_opr_offset (hba,OPR_SQD , i),MCQ_CFG_n (REG_SQDAO , i));/* Submission Queue Interrupt Status Address Offset */ -ufsmcq_writelx (hba,MCQ_OPR_OFFSET_n (OPR_SQIS , i), +ufsmcq_writelx (hba,ufshcd_mcq_opr_offset (hba,OPR_SQIS , i),MCQ_CFG_n (REG_SQISAO , i));/* Completion Queue Lower Base Address */
@@ -357,10 +355,10 @@ void ufshcd_mcq_make_queues_operational(struct ufs_hba *hba)ufsmcq_writelx (hba,upper_32_bits (hwq->cqe_dma_addr),MCQ_CFG_n (REG_CQUBA , i));/* Completion Queue Doorbell Address Offset */ -ufsmcq_writelx (hba,MCQ_OPR_OFFSET_n (OPR_CQD , i), +ufsmcq_writelx (hba,ufshcd_mcq_opr_offset (hba,OPR_CQD , i),MCQ_CFG_n (REG_CQDAO , i));/* Completion Queue Interrupt Status Address Offset */ -ufsmcq_writelx (hba,MCQ_OPR_OFFSET_n (OPR_CQIS , i), +ufsmcq_writelx (hba,ufshcd_mcq_opr_offset (hba,OPR_CQIS , i),MCQ_CFG_n (REG_CQISAO , i));/* Save the base addresses for quicker access */
include/ufs/ufshcd.h +6 -0
@@ -1117,6 +1117,12 @@ static inline bool is_mcq_enabled(struct ufs_hba *hba)return hba->mcq_enabled; } +static inline unsigned int ufshcd_mcq_opr_offset (struct ufs_hba *hba, +enum ufshcd_mcq_opr opr,int idx) +{ +return hba->mcq_opr[opr].offset + hba->mcq_opr[opr].stride * idx; +} +#ifdef CONFIG_SCSI_UFS_VARIABLE_SG_ENTRY_SIZE static inline size_t ufshcd_sg_entry_size (const struct ufs_hba *hba) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 254/568 clk: qcom: gcc-sc7280: Update force mem core bit for UFS ICE clock
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Taniya Das <[email protected]>
[ Upstream commit f38467b5a920be1473710428a93c4e54b6f8a0c1 ]
Update the force mem core bit for UFS ICE clock to force the core on signal to remain active during halt state of the clk. When retention bit of the clock is set the memories of the subsystem will retain the logic across power states.
--- drivers/clk/qcom/gcc-sc7280.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/clk/qcom/gcc-sc7280.c +3 -0
@@ -3467,6 +3467,9 @@ static int gcc_sc7280_probe(struct platform_device *pdev)regmap_update_bits (regmap,0x71004 ,BIT (0 ),BIT (0 ));regmap_update_bits (regmap,0x7100C ,BIT (13 ),BIT (13 )); +/* FORCE_MEM_CORE_ON for ufs phy ice core clocks */ +qcom_branch_set_force_mem_core (regmap, gcc_ufs_phy_ice_core_clk, true); + ret =qcom_cc_register_rcg_dfs (regmap, gcc_dfs_clocks,ARRAY_SIZE (gcc_dfs_clocks));if (ret)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 255/568 clk: qcom: camcc-sc7280: Add parent dependency to all camera GDSCs
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Taniya Das <[email protected]>
[ Upstream commit 63aec3e4d987fd43237f557460345bca3b51e530 ]
Camera titan top GDSC is a parent supply to all other camera GDSCs. Titan top GDSC is required to be enabled before enabling any other camera GDSCs and it should be disabled only after all other camera GDSCs are disabled. Ensure this behavior by marking titan top GDSC as parent of all other camera GDSCs.
--- drivers/clk/qcom/camcc-sc7280.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/clk/qcom/camcc-sc7280.c +5 -0
@@ -2260,6 +2260,7 @@ static struct gdsc cam_cc_bps_gdsc = { .name = "cam_cc_bps_gdsc", }, .pwrsts = PWRSTS_OFF_ON, + .parent = &cam_cc_titan_top_gdsc.pd, .flags = HW_CTRL | RETAIN_FF_ENABLE, };
@@ -2269,6 +2270,7 @@ static struct gdsc cam_cc_ife_0_gdsc = { .name = "cam_cc_ife_0_gdsc", }, .pwrsts = PWRSTS_OFF_ON, + .parent = &cam_cc_titan_top_gdsc.pd, .flags = RETAIN_FF_ENABLE, };
@@ -2278,6 +2280,7 @@ static struct gdsc cam_cc_ife_1_gdsc = { .name = "cam_cc_ife_1_gdsc", }, .pwrsts = PWRSTS_OFF_ON, + .parent = &cam_cc_titan_top_gdsc.pd, .flags = RETAIN_FF_ENABLE, };
@@ -2287,6 +2290,7 @@ static struct gdsc cam_cc_ife_2_gdsc = { .name = "cam_cc_ife_2_gdsc", }, .pwrsts = PWRSTS_OFF_ON, + .parent = &cam_cc_titan_top_gdsc.pd, .flags = RETAIN_FF_ENABLE, };
@@ -2296,6 +2300,7 @@ static struct gdsc cam_cc_ipe_0_gdsc = { .name = "cam_cc_ipe_0_gdsc", }, .pwrsts = PWRSTS_OFF_ON, + .parent = &cam_cc_titan_top_gdsc.pd, .flags = HW_CTRL | RETAIN_FF_ENABLE, };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 256/568 iio: frequency: adrf6780: rm clk provider include
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Antoniu Miclaus <[email protected]>
[ Upstream commit e2261b4a4de2804698935eb44f98dc897e1c44c3 ]
The driver has no clock provider implementation, therefore remove the include.
--- drivers/iio/frequency/adrf6780.c | 1 - 1 file changed, 1 deletion(-)
drivers/iio/frequency/adrf6780.c +0 -1
@@ -9,7 +9,6 @@#include <linux/bits.h> #include <linux/clk.h> #include <linux/clkdev.h> -#include <linux/clk-provider.h> #include <linux/delay.h> #include <linux/device.h> #include <linux/iio/iio.h>
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 257/568 KVM: PPC: Book3S HV: Fix the set_one_reg for MMCR3
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shivaprasad G Bhat <[email protected]>
[ Upstream commit f9ca6a10be20479d526f27316cc32cfd1785ed39 ]
The kvmppc_set_one_reg_hv() wrongly get() the value instead of set() for MMCR3. Fix the same.
--- arch/powerpc/kvm/book3s_hv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kvm/book3s_hv.c +1 -1
@@ -2484,7 +2484,7 @@ static int kvmppc_set_one_reg_hv(struct kvm_vcpu *vcpu, u64 id, vcpu->arch.mmcrs =set_reg_val (id, *val);break ;case KVM_REG_PPC_MMCR3 : - *val =get_reg_val (id, vcpu->arch.mmcr[3 ]); +kvmppc_set_mmcr_hv (vcpu,3 ,set_reg_val (id, *val));break ; case KVM_REG_PPC_PMC1 ... KVM_REG_PPC_PMC8: i = id -KVM_REG_PPC_PMC1 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 258/568 KVM: PPC: Book3S HV: Fix the get_one_reg of SDAR
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shivaprasad G Bhat <[email protected]>
[ Upstream commit 009f6f42c67e9de737d6d3d199f92b21a8cb9622 ]
The kvmppc_get_one_reg_hv() for SDAR is wrongly getting the SIAR instead of SDAR, possibly a paste error emanating from the previous refactoring.
Patch fixes the wrong get_one_reg() for the same.
--- arch/powerpc/kvm/book3s_hv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kvm/book3s_hv.c +1 -1
@@ -2249,7 +2249,7 @@ static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id, *val =get_reg_val (id,kvmppc_get_siar_hv (vcpu));break ;case KVM_REG_PPC_SDAR : - *val =get_reg_val (id,kvmppc_get_siar_hv (vcpu)); + *val =get_reg_val (id,kvmppc_get_sdar_hv (vcpu));break ;case KVM_REG_PPC_SIER : *val =get_reg_val (id,kvmppc_get_sier_hv (vcpu,0 ));
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 259/568 coresight: Fix ref leak when of_coresight_parse_endpoint() fails
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Clark <[email protected]>
[ Upstream commit 7fcb9cb2fe47294e16067c3cfd25332c8662a115 ]
of_graph_get_next_endpoint() releases the reference to the previous endpoint on each iteration, but when parsing fails the loop exits early meaning the last reference is never dropped.
Fix it by dropping the refcount in the exit condition.
--- drivers/hwtracing/coresight/coresight-platform.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/hwtracing/coresight/coresight-platform.c +3 -1
@@ -297,8 +297,10 @@ static int of_get_coresight_platform_data(struct device *dev,continue ; ret =of_coresight_parse_endpoint (dev, ep, pdata); -if (ret) +if (ret) { +of_node_put (ep);return ret; + } }return 0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 260/568 RDMA/mlx5: Set mkeys for dmabuf at PAGE_SIZE
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chiara Meiohas <[email protected]>
[ Upstream commit a4e540119be565f47c305f295ed43f8e0bc3f5c3 ]
Set the mkey for dmabuf at PAGE_SIZE to support any SGL after a move operation.
ib_umem_find_best_pgsz returns 0 on error, so it is incorrect to check the returned page_size against PAGE_SIZE
--- drivers/infiniband/hw/mlx5/mlx5_ib.h | 13 +++++++++++++ drivers/infiniband/hw/mlx5/odp.c | 6 ++---- 2 files changed, 15 insertions(+), 4 deletions(-)
drivers/infiniband/hw/mlx5/mlx5_ib.h +13 -0
@@ -115,6 +115,19 @@ unsigned long __mlx5_umem_find_best_quantized_pgoff( __mlx5_bit_sz(typ, page_offset_fld), 0, scale, \ page_offset_quantized) +static inline unsigned long +mlx5_umem_dmabuf_find_best_pgsz (struct ib_umem_dmabuf *umem_dmabuf) +{ +/* +* mkeys used for dmabuf are fixed at PAGE_SIZE because we must be able +* to hold any sgl after a move operation. Ideally the mkc page size +* could be changed at runtime to be optimal, but right now the driver +* cannot do that. +*/ +return ib_umem_find_best_pgsz (&umem_dmabuf->umem,PAGE_SIZE , + umem_dmabuf->umem.iova); +} +enum {MLX5_IB_MMAP_OFFSET_START =9 ,MLX5_IB_MMAP_OFFSET_END =255 ,
drivers/infiniband/hw/mlx5/odp.c +2 -4
@@ -705,10 +705,8 @@ static int pagefault_dmabuf_mr(struct mlx5_ib_mr *mr, size_t bcnt,return err; } - page_size =mlx5_umem_find_best_pgsz (&umem_dmabuf->umem, mkc, - log_page_size,0 , - umem_dmabuf->umem.iova); -if (unlikely (page_size <PAGE_SIZE )) { + page_size =mlx5_umem_dmabuf_find_best_pgsz (umem_dmabuf); +if (!page_size) {ib_umem_dmabuf_unmap_pages (umem_dmabuf); err = -EINVAL ; }else {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 261/568 ASoc: tas2781: Enable RCA-based playback without DSP firmware download
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shenghao Ding <[email protected]>
[ Upstream commit 9f774c757e3fb2ac32dc4377e8f21f3364a8df81 ]
In only loading RCA (Reconfigurable Architecture) binary case, no DSP program will be working inside tas2563/tas2781, that is dsp-bypass mode, do not support speaker protection, or audio acoustic algorithms in this mode.
--- include/sound/tas2781-dsp.h | 11 +++++++-- sound/soc/codecs/tas2781-fmwlib.c | 18 ++++++++++---- sound/soc/codecs/tas2781-i2c.c | 39 ++++++++++++++++++++----------- 3 files changed, 48 insertions(+), 20 deletions(-)
include/sound/tas2781-dsp.h +9 -2
@@ -112,10 +112,17 @@ struct tasdevice_fw {struct device *dev; }; -enum tasdevice_dsp_fw_state { -TASDEVICE_DSP_FW_NONE =0 , +enum tasdevice_fw_state { +/* Driver in startup mode, not load any firmware. */ TASDEVICE_DSP_FW_PENDING , +/* DSP firmware in the system, but parsing error. */ TASDEVICE_DSP_FW_FAIL , +/* +* Only RCA (Reconfigurable Architecture) firmware load +* successfully. +*/ +TASDEVICE_RCA_FW_OK , +/* Both RCA and DSP firmware load successfully. */ TASDEVICE_DSP_FW_ALL_OK , };
sound/soc/codecs/tas2781-fmwlib.c +13 -5
@@ -2354,14 +2354,21 @@ void tasdevice_tuning_switch(void *context, int state)struct tasdevice_fw *tas_fmw = tas_priv->fmw;int profile_cfg_id = tas_priv->rcabin.profile_cfg_id; -if (tas_priv->fw_state ==TASDEVICE_DSP_FW_FAIL ) { -dev_err (tas_priv->dev,"DSP bin file not loaded\n" ); +/* +* Only RCA-based Playback can still work with no dsp program running +* inside the chip. +*/ +switch (tas_priv->fw_state) { +case TASDEVICE_RCA_FW_OK : +case TASDEVICE_DSP_FW_ALL_OK : +break ; +default :return ; }if (state ==0 ) { -if (tas_priv->cur_prog < tas_fmw->nr_programs) { -/*dsp mode or tuning mode*/ +if (tas_fmw && tas_priv->cur_prog < tas_fmw->nr_programs) { +/* dsp mode or tuning mode */ profile_cfg_id = tas_priv->rcabin.profile_cfg_id; tasdevice_select_tuningprm_cfg(tas_priv, tas_priv->cur_prog, tas_priv->cur_conf,
@@ -2370,9 +2377,10 @@ void tasdevice_tuning_switch(void *context, int state)tasdevice_select_cfg_blk (tas_priv, profile_cfg_id,TASDEVICE_BIN_BLK_PRE_POWER_UP ); - }else + }else {tasdevice_select_cfg_blk (tas_priv, profile_cfg_id,TASDEVICE_BIN_BLK_PRE_SHUTDOWN ); + } }EXPORT_SYMBOL_NS_GPL (tasdevice_tuning_switch,SND_SOC_TAS2781_FMWLIB );
sound/soc/codecs/tas2781-i2c.c +26 -13
@@ -378,23 +378,37 @@ static void tasdevice_fw_ready(const struct firmware *fmw,mutex_lock (&tas_priv->codec_lock); ret =tasdevice_rca_parser (tas_priv, fmw); -if (ret) +if (ret) { +tasdevice_config_info_remove (tas_priv); goto out; + }tasdevice_create_control (tas_priv);tasdevice_dsp_remove (tas_priv);tasdevice_calbin_remove (tas_priv); - tas_priv->fw_state =TASDEVICE_DSP_FW_PENDING ; +/* +* The baseline is the RCA-only case, and then the code attempts to +* load DSP firmware but in case of failures just keep going, i.e. +* failing to load DSP firmware is NOT an error. +*/ + tas_priv->fw_state =TASDEVICE_RCA_FW_OK ;scnprintf (tas_priv->coef_binaryname,64 ,"%s_coef.bin" , tas_priv->dev_name); ret =tasdevice_dsp_parser (tas_priv);if (ret) {dev_err (tas_priv->dev,"dspfw load %s error\n" , tas_priv->coef_binaryname); - tas_priv->fw_state =TASDEVICE_DSP_FW_FAIL ; goto out; } -tasdevice_dsp_create_ctrls (tas_priv); + +/* +* If no dsp-related kcontrol created, the dsp resource will be freed. +*/ + ret =tasdevice_dsp_create_ctrls (tas_priv); +if (ret) { +dev_err (tas_priv->dev,"dsp controls error\n" ); + goto out; + } tas_priv->fw_state =TASDEVICE_DSP_FW_ALL_OK ;
@@ -415,9 +429,8 @@ static void tasdevice_fw_ready(const struct firmware *fmw,tasdevice_prmg_load (tas_priv,0 ); tas_priv->cur_prog =0 ; out: -if (tas_priv->fw_state ==TASDEVICE_DSP_FW_FAIL ) { -/*If DSP FW fail, kcontrol won't be created */ -tasdevice_config_info_remove (tas_priv); +if (tas_priv->fw_state ==TASDEVICE_RCA_FW_OK ) { +/* If DSP FW fail, DSP kcontrol won't be created. */ tasdevice_dsp_remove (tas_priv); }mutex_unlock (&tas_priv->codec_lock);
@@ -464,14 +477,14 @@ static int tasdevice_startup(struct snd_pcm_substream *substream, {struct snd_soc_component *codec = dai->component;struct tasdevice_priv *tas_priv =snd_soc_component_get_drvdata (codec); -int ret =0 ; -if (tas_priv->fw_state !=TASDEVICE_DSP_FW_ALL_OK ) { -dev_err (tas_priv->dev,"DSP bin file not loaded\n" ); - ret = -EINVAL ; +switch (tas_priv->fw_state) { +case TASDEVICE_RCA_FW_OK : +case TASDEVICE_DSP_FW_ALL_OK : +return 0 ; +default : +return -EINVAL ; } - -return ret; } static int tasdevice_hw_params(struct snd_pcm_substream *substream,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 262/568 ASoC: cs35l56: Accept values greater than 0 as IRQ numbers
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Simon Trimmer <[email protected]>
[ Upstream commit 3ec1428d7b7c519d757a013cef908d7e33dee882 ]
IRQ lookup functions such as those in ACPI can return error values when an IRQ is not defined. The i2c core driver converts the error codes to a value of 0 and the SPI bus driver passes them unaltered to client device drivers.
The cs35l56 driver should only accept positive non-zero values as IRQ numbers.
--- sound/soc/codecs/cs35l56-shared.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/cs35l56-shared.c +1 -1
@@ -354,7 +354,7 @@ int cs35l56_irq_request(struct cs35l56_base *cs35l56_base, int irq) {int ret; -if (!irq) +if (irq <1 )return 0 ; ret = devm_request_threaded_irq(cs35l56_base->dev, irq, NULL, cs35l56_irq,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 263/568 usb: typec-mux: nb7vpq904m: unregister typec switch on probe error and remove
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Neil Armstrong <[email protected]>
[ Upstream commit 74b64e760ee3433c0f8d95715038c869bcddacf7 ]
Add the missing call to typec_switch_put() when probe fails and the nb7vpq904m_remove() call is called.
--- drivers/usb/typec/mux/nb7vpq904m.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/usb/typec/mux/nb7vpq904m.c +6 -1
@@ -453,7 +453,7 @@ static int nb7vpq904m_probe(struct i2c_client *client) ret =nb7vpq904m_parse_data_lanes_mapping (nb7);if (ret) -return ret; + goto err_switch_put; ret =regulator_enable (nb7->vcc_supply);if (ret)
@@ -496,6 +496,9 @@ static int nb7vpq904m_probe(struct i2c_client *client)gpiod_set_value (nb7->enable_gpio,0 );regulator_disable (nb7->vcc_supply); +err_switch_put: +typec_switch_put (nb7->typec_switch); +return ret; }
@@ -509,6 +512,8 @@ static void nb7vpq904m_remove(struct i2c_client *client)gpiod_set_value (nb7->enable_gpio,0 );regulator_disable (nb7->vcc_supply); + +typec_switch_put (nb7->typec_switch); }static const struct i2c_device_id nb7vpq904m_table[] = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 264/568 RDMA/cache: Release GID table even if leak is detected
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leon Romanovsky <[email protected]>
[ Upstream commit a92fbeac7e94a420b55570c10fe1b90e64da4025 ]
When the table is released, we nullify pointer to GID table, it means that in case GID entry leak is detected, we will leak table too.
Delete code that prevents table destruction.
--- drivers/infiniband/core/cache.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
drivers/infiniband/core/cache.c +5 -9
@@ -794,7 +794,6 @@ static struct ib_gid_table *alloc_gid_table(int sz)static void release_gid_table (struct ib_device *device,struct ib_gid_table *table) { -bool leak = false;int i;if (!table)
@@ -803,15 +802,12 @@ static void release_gid_table(struct ib_device *device,for (i =0 ; i < table->sz; i++) {if (is_gid_entry_free (table->data_vec[i]))continue ; -if (kref_read (&table->data_vec[i]->kref) >1 ) { -dev_err (&device->dev, -"GID entry ref leak for index %d ref=%u\n" , i, -kref_read (&table->data_vec[i]->kref)); - leak = true; - } + +WARN_ONCE (true, +"GID entry ref leak for dev %s index %d ref=%u\n" , +dev_name (&device->dev), i, +kref_read (&table->data_vec[i]->kref)); } -if (leak) -return ;mutex_destroy (&table->lock);kfree (table->data_vec);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 265/568 clk: qcom: gpucc-sm8350: Park RCGs clk source at XO during disable
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Taniya Das <[email protected]>
[ Upstream commit 313e2909023bef36ef7b6d1d9ff2d98febcaa28d ]
The RCG's clk src has to be parked at XO while disabling as per the HW recommendation, hence use clk_rcg2_shared_ops to achieve the same.
--- drivers/clk/qcom/gpucc-sm8350.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/clk/qcom/gpucc-sm8350.c +3 -2
@@ -2,6 +2,7 @@/* * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved. * Copyright (c) 2022, Linaro Limited +* Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved. */ #include <linux/clk.h>
@@ -147,7 +148,7 @@ static struct clk_rcg2 gpu_cc_gmu_clk_src = { .parent_data = gpu_cc_parent_data_0, .num_parents = ARRAY_SIZE(gpu_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -169,7 +170,7 @@ static struct clk_rcg2 gpu_cc_hub_clk_src = { .parent_data = gpu_cc_parent_data_1, .num_parents = ARRAY_SIZE(gpu_cc_parent_data_1), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 266/568 clk: qcom: gcc-sa8775p: Update the GDSC wait_val fields and flags
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Taniya Das <[email protected]>
[ Upstream commit be208c0ccf7d861fc6109ca06c1a773512739af9 ]
Update the GDSC wait_val fields as per the default hardware values as otherwise they would lead to GDSC FSM state to be stuck and causing failures to power on/off. Also add the GDSC flags as applicable and add support to control PCIE GDSC's using collapse vote registers.
--- drivers/clk/qcom/gcc-sa8775p.c | 40 ++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)
drivers/clk/qcom/gcc-sa8775p.c +40 -0
@@ -4305,74 +4305,114 @@ static struct clk_branch gcc_video_axi1_clk = {static struct gdsc pcie_0_gdsc = { .gdscr =0xa9004 , + .collapse_ctrl =0x4b104 , + .collapse_mask =BIT (0 ), + .en_rest_wait_val =0x2 , + .en_few_wait_val =0x2 , + .clk_dis_wait_val =0xf , .pd = { .name ="pcie_0_gdsc" , }, .pwrsts =PWRSTS_OFF_ON , + .flags =VOTABLE |RETAIN_FF_ENABLE |POLL_CFG_GDSCR , };static struct gdsc pcie_1_gdsc = { .gdscr =0x77004 , + .collapse_ctrl =0x4b104 , + .collapse_mask =BIT (1 ), + .en_rest_wait_val =0x2 , + .en_few_wait_val =0x2 , + .clk_dis_wait_val =0xf , .pd = { .name ="pcie_1_gdsc" , }, .pwrsts =PWRSTS_OFF_ON , + .flags =VOTABLE |RETAIN_FF_ENABLE |POLL_CFG_GDSCR , };static struct gdsc ufs_card_gdsc = { .gdscr =0x81004 , + .en_rest_wait_val =0x2 , + .en_few_wait_val =0x2 , + .clk_dis_wait_val =0xf , .pd = { .name ="ufs_card_gdsc" , }, .pwrsts =PWRSTS_OFF_ON , + .flags =RETAIN_FF_ENABLE |POLL_CFG_GDSCR , };static struct gdsc ufs_phy_gdsc = { .gdscr =0x83004 , + .en_rest_wait_val =0x2 , + .en_few_wait_val =0x2 , + .clk_dis_wait_val =0xf , .pd = { .name ="ufs_phy_gdsc" , }, .pwrsts =PWRSTS_OFF_ON , + .flags =RETAIN_FF_ENABLE |POLL_CFG_GDSCR , };static struct gdsc usb20_prim_gdsc = { .gdscr =0x1c004 , + .en_rest_wait_val =0x2 , + .en_few_wait_val =0x2 , + .clk_dis_wait_val =0xf , .pd = { .name ="usb20_prim_gdsc" , }, .pwrsts =PWRSTS_OFF_ON , + .flags =RETAIN_FF_ENABLE |POLL_CFG_GDSCR , };static struct gdsc usb30_prim_gdsc = { .gdscr =0x1b004 , + .en_rest_wait_val =0x2 , + .en_few_wait_val =0x2 , + .clk_dis_wait_val =0xf , .pd = { .name ="usb30_prim_gdsc" , }, .pwrsts =PWRSTS_OFF_ON , + .flags =RETAIN_FF_ENABLE |POLL_CFG_GDSCR , };static struct gdsc usb30_sec_gdsc = { .gdscr =0x2f004 , + .en_rest_wait_val =0x2 , + .en_few_wait_val =0x2 , + .clk_dis_wait_val =0xf , .pd = { .name ="usb30_sec_gdsc" , }, .pwrsts =PWRSTS_OFF_ON , + .flags =RETAIN_FF_ENABLE |POLL_CFG_GDSCR , };static struct gdsc emac0_gdsc = { .gdscr =0xb6004 , + .en_rest_wait_val =0x2 , + .en_few_wait_val =0x2 , + .clk_dis_wait_val =0xf , .pd = { .name ="emac0_gdsc" , }, .pwrsts =PWRSTS_OFF_ON , + .flags =RETAIN_FF_ENABLE |POLL_CFG_GDSCR , };static struct gdsc emac1_gdsc = { .gdscr =0xb4004 , + .en_rest_wait_val =0x2 , + .en_few_wait_val =0x2 , + .clk_dis_wait_val =0xf , .pd = { .name ="emac1_gdsc" , }, .pwrsts =PWRSTS_OFF_ON , + .flags =RETAIN_FF_ENABLE |POLL_CFG_GDSCR , };static struct clk_regmap *gcc_sa8775p_clocks[] = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 267/568 clk: qcom: gpucc-sa8775p: Remove the CLK_IS_CRITICAL and ALWAYS_ON flags
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Taniya Das <[email protected]>
[ Upstream commit e69386d4a42afa5da6bfdcd4ac5ec61e1db04c61 ]
The GPU clocks/GDSCs have been marked critical from the clock driver but the GPU driver votes on these resources as per the HW requirement. In the case where these clocks & GDSCs are left enabled, would have power impact and also cause GPU stability/corruptions.
Fix the same by removing the CLK_IS_CRITICAL for clocks and ALWAYS_ON flags for the GPU GDSCs.
--- drivers/clk/qcom/gpucc-sa8775p.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-)
drivers/clk/qcom/gpucc-sa8775p.c +11 -16
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (c) 2021-2022, Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2022, 2024, Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2023, Linaro Limited */
@@ -280,7 +280,7 @@ static struct clk_branch gpu_cc_ahb_clk = { &gpu_cc_hub_ahb_div_clk_src.clkr.hw, }, .num_parents = 1, - .flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, + .flags = CLK_SET_RATE_PARENT, .ops = &clk_branch2_ops, }, },
@@ -294,7 +294,6 @@ static struct clk_branch gpu_cc_cb_clk = { .enable_mask = BIT(0), .hw.init = &(const struct clk_init_data ){ .name ="gpu_cc_cb_clk" , - .flags =CLK_IS_CRITICAL , .ops = &clk_branch2_ops, }, },
@@ -312,7 +311,7 @@ static struct clk_branch gpu_cc_crc_ahb_clk = { &gpu_cc_hub_ahb_div_clk_src.clkr.hw, }, .num_parents = 1, - .flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, + .flags = CLK_SET_RATE_PARENT, .ops = &clk_branch2_ops, }, },
@@ -330,7 +329,7 @@ static struct clk_branch gpu_cc_cx_ff_clk = { &gpu_cc_ff_clk_src.clkr.hw, }, .num_parents = 1, - .flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, + .flags = CLK_SET_RATE_PARENT, .ops = &clk_branch2_ops, }, },
@@ -348,7 +347,7 @@ static struct clk_branch gpu_cc_cx_gmu_clk = { &gpu_cc_gmu_clk_src.clkr.hw, }, .num_parents = 1, - .flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, + .flags = CLK_SET_RATE_PARENT, .ops = &clk_branch2_aon_ops, }, },
@@ -362,7 +361,6 @@ static struct clk_branch gpu_cc_cx_snoc_dvm_clk = { .enable_mask = BIT(0), .hw.init = &(const struct clk_init_data ){ .name ="gpu_cc_cx_snoc_dvm_clk" , - .flags =CLK_IS_CRITICAL , .ops = &clk_branch2_ops, }, },
@@ -380,7 +378,7 @@ static struct clk_branch gpu_cc_cxo_aon_clk = { &gpu_cc_xo_clk_src.clkr.hw, }, .num_parents = 1, - .flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, + .flags = CLK_SET_RATE_PARENT, .ops = &clk_branch2_ops, }, },
@@ -398,7 +396,7 @@ static struct clk_branch gpu_cc_cxo_clk = { &gpu_cc_xo_clk_src.clkr.hw, }, .num_parents = 1, - .flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, + .flags = CLK_SET_RATE_PARENT, .ops = &clk_branch2_ops, }, },
@@ -416,7 +414,7 @@ static struct clk_branch gpu_cc_demet_clk = { &gpu_cc_demet_div_clk_src.clkr.hw, }, .num_parents = 1, - .flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, + .flags = CLK_SET_RATE_PARENT, .ops = &clk_branch2_aon_ops, }, },
@@ -430,7 +428,6 @@ static struct clk_branch gpu_cc_hlos1_vote_gpu_smmu_clk = { .enable_mask = BIT(0), .hw.init = &(const struct clk_init_data ){ .name ="gpu_cc_hlos1_vote_gpu_smmu_clk" , - .flags =CLK_IS_CRITICAL , .ops = &clk_branch2_ops, }, },
@@ -448,7 +445,7 @@ static struct clk_branch gpu_cc_hub_aon_clk = { &gpu_cc_hub_clk_src.clkr.hw, }, .num_parents = 1, - .flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, + .flags = CLK_SET_RATE_PARENT, .ops = &clk_branch2_aon_ops, }, },
@@ -466,7 +463,7 @@ static struct clk_branch gpu_cc_hub_cx_int_clk = { &gpu_cc_hub_cx_int_div_clk_src.clkr.hw, }, .num_parents = 1, - .flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, + .flags = CLK_SET_RATE_PARENT, .ops = &clk_branch2_aon_ops, }, },
@@ -480,7 +477,6 @@ static struct clk_branch gpu_cc_memnoc_gfx_clk = { .enable_mask = BIT(0), .hw.init = &(const struct clk_init_data ){ .name ="gpu_cc_memnoc_gfx_clk" , - .flags =CLK_IS_CRITICAL , .ops = &clk_branch2_ops, }, },
@@ -494,7 +490,6 @@ static struct clk_branch gpu_cc_sleep_clk = { .enable_mask = BIT(0), .hw.init = &(const struct clk_init_data ){ .name ="gpu_cc_sleep_clk" , - .flags =CLK_IS_CRITICAL , .ops = &clk_branch2_ops, }, },
@@ -533,7 +528,7 @@ static struct gdsc cx_gdsc = { .name = "cx_gdsc", }, .pwrsts = PWRSTS_OFF_ON, - .flags = VOTABLE | RETAIN_FF_ENABLE | ALWAYS_ON, + .flags = VOTABLE | RETAIN_FF_ENABLE, }; static struct gdsc gx_gdsc = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 268/568 clk: qcom: gpucc-sa8775p: Park RCGs clk source at XO during disable
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Taniya Das <[email protected]>
[ Upstream commit dff68b2f74547617dbb75d0d12f404877ec8f8ce ]
The RCG's clk src has to be parked at XO while disabling as per the HW recommendation, hence use clk_rcg2_shared_ops to achieve the same. Also gpu_cc_cb_clk is recommended to be kept always ON, hence use clk_branch2_aon_ops to keep the clock always ON.
--- drivers/clk/qcom/gpucc-sa8775p.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/clk/qcom/gpucc-sa8775p.c +4 -4
@@ -161,7 +161,7 @@ static struct clk_rcg2 gpu_cc_ff_clk_src = { .name = "gpu_cc_ff_clk_src", .parent_data = gpu_cc_parent_data_0, .num_parents = ARRAY_SIZE(gpu_cc_parent_data_0), - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -181,7 +181,7 @@ static struct clk_rcg2 gpu_cc_gmu_clk_src = { .parent_data = gpu_cc_parent_data_1, .num_parents = ARRAY_SIZE(gpu_cc_parent_data_1), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -200,7 +200,7 @@ static struct clk_rcg2 gpu_cc_hub_clk_src = { .name = "gpu_cc_hub_clk_src", .parent_data = gpu_cc_parent_data_2, .num_parents = ARRAY_SIZE(gpu_cc_parent_data_2), - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -294,7 +294,7 @@ static struct clk_branch gpu_cc_cb_clk = { .enable_mask = BIT(0), .hw.init = &(const struct clk_init_data ){ .name ="gpu_cc_cb_clk" , - .ops = &clk_branch2_ops, + .ops = &clk_branch2_aon_ops, }, }, };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 269/568 clk: qcom: gpucc-sa8775p: Update wait_val fields for GPU GDSCs
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Taniya Das <[email protected]>
[ Upstream commit 211681998d706d1e0fff6b62f89efcdf29c24978 ]
Update wait_val fields as per the default hardware values of the GDSC as otherwise it would lead to GDSC FSM state stuck causing power on/off failures of the GSDC.
--- drivers/clk/qcom/gpucc-sa8775p.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/clk/qcom/gpucc-sa8775p.c +6 -0
@@ -523,6 +523,9 @@ static struct clk_regmap *gpu_cc_sa8775p_clocks[] = {static struct gdsc cx_gdsc = { .gdscr =0x9108 , + .en_rest_wait_val =0x2 , + .en_few_wait_val =0x2 , + .clk_dis_wait_val =0xf , .gds_hw_ctrl =0x953c , .pd = { .name ="cx_gdsc" ,
@@ -533,6 +536,9 @@ static struct gdsc cx_gdsc = {static struct gdsc gx_gdsc = { .gdscr =0x905c , + .en_rest_wait_val =0x2 , + .en_few_wait_val =0x2 , + .clk_dis_wait_val =0xf , .pd = { .name ="gx_gdsc" , .power_on = gdsc_gx_do_nothing_enable,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 270/568 interconnect: qcom: qcm2290: Fix mas_snoc_bimc RPM master ID
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit cd5ce4589081190281cc2537301edd4275fe55eb ]
The value was wrong, resulting in misprogramming of the hardware. Fix it.
--- drivers/interconnect/qcom/qcm2290.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/interconnect/qcom/qcm2290.c +1 -1
@@ -163,7 +163,7 @@ static struct qcom_icc_node mas_snoc_bimc = { .qos.ap_owned = true, .qos.qos_port = 6, .qos.qos_mode = NOC_QOS_MODE_BYPASS, - .mas_rpm_id = 164, + .mas_rpm_id = 3, .slv_rpm_id = -1, .num_links = ARRAY_SIZE(mas_snoc_bimc_links), .links = mas_snoc_bimc_links,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 271/568 Input: qt1050 - handle CHIP_ID reading error
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrei Lalaev <[email protected]>
[ Upstream commit 866a5c7e2781cf1b019072288f1f5c64186dcb63 ]
If the device is missing, we get the following error:
qt1050 3-0041: ID -1340767592 not supported
Let's handle this situation and print more informative error when reading of CHIP_ID fails:
qt1050 3-0041: Failed to read chip ID: -6
--- drivers/input/keyboard/qt1050.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/input/keyboard/qt1050.c +6 -1
@@ -226,7 +226,12 @@ static bool qt1050_identify(struct qt1050_priv *ts)int err;/* Read Chip ID */ -regmap_read (ts->regmap,QT1050_CHIP_ID , &val); + err =regmap_read (ts->regmap,QT1050_CHIP_ID , &val); +if (err) { +dev_err (&ts->client->dev,"Failed to read chip ID: %d\n" , err); +return false; + } +if (val !=QT1050_CHIP_ID_VER ) {dev_err (&ts->client->dev,"ID %d not supported\n" , val);return false;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 272/568 RDMA/mlx4: Fix truncated output warning in mad.c
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leon Romanovsky <[email protected]>
[ Upstream commit 0d2e6992fc956e3308cd5376c18567def4cb3967 ]
Increase size of the name array to avoid truncated output warning.
drivers/infiniband/hw/mlx4/mad.c: In function ‘mlx4_ib_alloc_demux_ctx’:drivers/infiniband/hw/mlx4/mad.c:2197:47: error: ‘%d’ directive output may be truncated writing between 1 and 11 bytes into a region of size 4 [-Werror=format-truncation=]
2197 | snprintf(name, sizeof(name), "mlx4_ibt%d", port);
| ^~drivers/infiniband/hw/mlx4/mad.c:2197:38: note: directive argument in the range [-2147483645, 2147483647]
2197 | snprintf(name, sizeof(name), "mlx4_ibt%d", port);
| ^~~~~~~~~~~~
drivers/infiniband/hw/mlx4/mad.c:2197:9: note: ‘snprintf’ output between
10 and 20 bytes into a destination of size 12
2197 | snprintf(name, sizeof(name), "mlx4_ibt%d", port);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~drivers/infiniband/hw/mlx4/mad.c:2205:48: error: ‘%d’ directive output may be truncated writing between 1 and 11 bytes into a region of size 3 [-Werror=format-truncation=]
2205 | snprintf(name, sizeof(name), "mlx4_ibwi%d", port);
| ^~drivers/infiniband/hw/mlx4/mad.c:2205:38: note: directive argument in the range [-2147483645, 2147483647]
2205 | snprintf(name, sizeof(name), "mlx4_ibwi%d", port);
| ^~~~~~~~~~~~~
drivers/infiniband/hw/mlx4/mad.c:2205:9: note: ‘snprintf’ output between
11 and 21 bytes into a destination of size 12
2205 | snprintf(name, sizeof(name), "mlx4_ibwi%d", port);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~drivers/infiniband/hw/mlx4/mad.c:2213:48: error: ‘%d’ directive output may be truncated writing between 1 and 11 bytes into a region of size 3 [-Werror=format-truncation=]
2213 | snprintf(name, sizeof(name), "mlx4_ibud%d", port);
| ^~drivers/infiniband/hw/mlx4/mad.c:2213:38: note: directive argument in the range [-2147483645, 2147483647]
2213 | snprintf(name, sizeof(name), "mlx4_ibud%d", port);
| ^~~~~~~~~~~~~
drivers/infiniband/hw/mlx4/mad.c:2213:9: note: ‘snprintf’ output between
11 and 21 bytes into a destination of size 12
2213 | snprintf(name, sizeof(name), "mlx4_ibud%d", port);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~cc1: all warnings being treated as errors
make[6]: *** [scripts/Makefile.build:244: drivers/infiniband/hw/mlx4/mad.o] Error 1
--- drivers/infiniband/hw/mlx4/mad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/mlx4/mad.c +1 -1
@@ -2158,7 +2158,7 @@ static int mlx4_ib_alloc_demux_ctx(struct mlx4_ib_dev *dev,struct mlx4_ib_demux_ctx *ctx, int port) { - char name[12]; + char name[21];int ret =0 ;int i;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 273/568 RDMA/mlx4: Fix truncated output warning in alias_GUID.c
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leon Romanovsky <[email protected]>
[ Upstream commit 5953e0647cec703ef436ead37fed48943507b433 ]
drivers/infiniband/hw/mlx4/alias_GUID.c: In function ‘mlx4_ib_init_alias_guid_service’:drivers/infiniband/hw/mlx4/alias_GUID.c:878:74: error: ‘%d’ directive
output may be truncated writing between 1 and 11 bytes into a region of
size 5 [-Werror=format-truncation=]
878 | snprintf(alias_wq_name, sizeof alias_wq_name, "alias_guid%d", i);
| ^~drivers/infiniband/hw/mlx4/alias_GUID.c:878:63: note: directive argument in the range [-2147483641, 2147483646]
878 | snprintf(alias_wq_name, sizeof alias_wq_name, "alias_guid%d", i);
| ^~~~~~~~~~~~~~drivers/infiniband/hw/mlx4/alias_GUID.c:878:17: note: ‘snprintf’ output
between 12 and 22 bytes into a destination of size 15
878 | snprintf(alias_wq_name, sizeof alias_wq_name, "alias_guid%d", i);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~cc1: all warnings being treated as errors
--- drivers/infiniband/hw/mlx4/alias_GUID.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/mlx4/alias_GUID.c +1 -1
@@ -829,7 +829,7 @@ void mlx4_ib_destroy_alias_guid_service(struct mlx4_ib_dev *dev)int mlx4_ib_init_alias_guid_service (struct mlx4_ib_dev *dev) { -char alias_wq_name[15 ]; +char alias_wq_name[22 ];int ret =0 ;int i, j;union ib_gid gid;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 274/568 RDMA/mlx5: Use sq timestamp as QP timestamp when RoCE is disabled
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Or Har-Toov <[email protected]>
[ Upstream commit 0c5275bf75ec3708d95654195ae4ed80d946d088 ]
When creating a QP, one of the attributes is TS format (timestamp). In some devices, we have a limitation that all QPs should have the same ts_format. The ts_format is chosen based on the device's capability. The qp_ts_format cap resides under the RoCE caps table, and the cap will be 0 when RoCE is disabled. So when RoCE is disabled, the value that should be queried is sq_ts_format under HCA caps.
Consider the case when the system supports REAL_TIME_TS format (0x2), some QPs are created with REAL_TIME_TS as ts_format, and afterwards RoCE gets disabled. When trying to construct a new QP, we can't use the qp_ts_format, that is queried from the RoCE caps table, Since it leads to passing 0x0 (FREE_RUNNING_TS) as the value of the qp_ts_format, which is different than the ts_format of the previously allocated QPs REAL_TIME_TS format (0x2).
Thus, to resolve this, read the sq_ts_format, which also reflect the supported ts format for the QP when RoCE is disabled.
--- include/linux/mlx5/qp.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
include/linux/mlx5/qp.h +6 -3
@@ -576,9 +576,12 @@ static inline const char *mlx5_qp_state_str(int state)static inline int mlx5_get_qp_default_ts (struct mlx5_core_dev *dev) { -return !MLX5_CAP_ROCE (dev, qp_ts_format) ? -MLX5_TIMESTAMP_FORMAT_FREE_RUNNING : -MLX5_TIMESTAMP_FORMAT_DEFAULT ; +u8 supported_ts_cap =mlx5_get_roce_state (dev) ? +MLX5_CAP_ROCE (dev, qp_ts_format) : +MLX5_CAP_GEN (dev, sq_ts_format); + +return supported_ts_cap ?MLX5_TIMESTAMP_FORMAT_DEFAULT : +MLX5_TIMESTAMP_FORMAT_FREE_RUNNING ; }#endif /* MLX5_QP_H */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 275/568 RDMA/rxe: Dont set BTH_ACK_MASK for UC or UD QPs
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Honggang LI <[email protected]>
[ Upstream commit 4adcaf969d77d3d3aa3871bbadc196258a38aec6 ]
BTH_ACK_MASK bit is used to indicate that an acknowledge (for this packet) should be scheduled by the responder. Both UC and UD QPs are unacknowledged, so don't set BTH_ACK_MASK for UC or UD QPs.
--- drivers/infiniband/sw/rxe/rxe_req.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/infiniband/sw/rxe/rxe_req.c +4 -3
@@ -424,7 +424,7 @@ static struct sk_buff *init_req_packet(struct rxe_qp *qp,int paylen;int solicited;u32 qp_num; -int ack_req; +int ack_req =0 ;/* length from start of bth to end of icrc */ paylen = rxe_opcode[opcode].length + payload + pad +RXE_ICRC_SIZE ;
@@ -445,8 +445,9 @@ static struct sk_buff *init_req_packet(struct rxe_qp *qp, qp_num = (pkt->mask &RXE_DETH_MASK ) ? ibwr->wr.ud.remote_qpn : qp->attr.dest_qp_num; - ack_req = ((pkt->mask &RXE_END_MASK ) || - (qp->req.noack_pkts++ >RXE_MAX_PKT_PER_ACK )); +if (qp_type (qp) !=IB_QPT_UD &&qp_type (qp) !=IB_QPT_UC ) + ack_req = ((pkt->mask &RXE_END_MASK ) || + (qp->req.noack_pkts++ >RXE_MAX_PKT_PER_ACK ));if (ack_req) qp->req.noack_pkts =0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 276/568 ASoC: qcom: Adjust issues in case of DT error in asoc_qcom_lpass_cpu_platform_probe()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aleksandr Mishin <[email protected]>
[ Upstream commit f9f7f29f64454bb20896c7d918c3abc3a1aa487b ]
If IORESOURCE_MEM "lpass-rxtx-cdc-dma-lpm" or "lpass-va-cdc-dma-lpm" resources is not provided in Device Tree due to any error, platform_get_resource_byname() will return NULL which is later dereferenced. According to sound/qcom,lpass-cpu.yaml, these resources are provided, but DT can be broken due to any error. In such cases driver must be able to protect itself, since the DT is external data for the driver.
Adjust this issues by adding NULL return check.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- sound/soc/qcom/lpass-cpu.c | 4 ++++ 1 file changed, 4 insertions(+)
sound/soc/qcom/lpass-cpu.c +4 -0
@@ -1170,9 +1170,13 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) } res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"lpass-rxtx-cdc-dma-lpm" ); +if (!res) +return -EINVAL ; drvdata->rxtx_cdc_dma_lpm_buf = res->start; res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"lpass-va-cdc-dma-lpm" ); +if (!res) +return -EINVAL ; drvdata->va_cdc_dma_lpm_buf = res->start; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 277/568 scsi: lpfc: Fix a possible null pointer dereference
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Huai-Yuan Liu <[email protected]>
[ Upstream commit 5e0bf3e8aec2cbc51123f84b29aaacbd91fc56fa ]
In function lpfc_xcvr_data_show, the memory allocation with kmalloc might fail, thereby making rdp_context a null pointer. In the following context and functions that use this pointer, there are dereferencing operations, leading to null pointer dereference.
To fix this issue, a null pointer check should be added. If it is null, use scnprintf to notify the user and return len.
--- drivers/scsi/lpfc/lpfc_attr.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/scsi/lpfc/lpfc_attr.c +5 -0
@@ -1904,6 +1904,11 @@ lpfc_xcvr_data_show(struct device *dev, struct device_attribute *attr,/* Get transceiver information */ rdp_context =kmalloc (sizeof (*rdp_context),GFP_KERNEL ); +if (!rdp_context) { + len =scnprintf (buf,PAGE_SIZE - len, +"SPF info NA: alloc failure\n" ); +return len; + } rc =lpfc_get_sfp_info_wait (phba, rdp_context);if (rc) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 278/568 hwrng: core - Fix wrong quality calculation at hw rng registration
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Harald Freudenberger <[email protected]>
[ Upstream commit 95c0f5c3b8bb7acdc5c4f04bc6a7d3f40d319e9e ]
When there are rng sources registering at the hwrng core via hwrng_register() a struct hwrng is delivered. There is a quality field in there which is used to decide which of the registered hw rng sources will be used by the hwrng core.
With commit 16bdbae39428 ("hwrng: core - treat default_quality as a maximum and default to 1024") there came in a new default of 1024 in case this field is empty and all the known hw rng sources at that time had been reworked to not fill this field and thus use the default of 1024.
The code choosing the 'better' hw rng source during registration of a new hw rng source has never been adapted to this and thus used 0 if the hw rng implementation does not fill the quality field. So when two rng sources register, one with 0 (meaning 1024) and the other one with 999, the 999 hw rng will be chosen.
As the later invoked function hwrng_init() anyway adjusts the quality field of the hw rng source, this adjustment is now done during registration of this new hw rng source.
Tested on s390 with two hardware rng sources: crypto cards and trng true random generator device driver.
--- drivers/char/hw_random/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/char/hw_random/core.c +3 -1
@@ -174,7 +174,6 @@ static int hwrng_init(struct hwrng *rng)reinit_completion (&rng->cleanup_done); skip_init: - rng->quality =min_t (u16,min_t (u16, default_quality,1024 ), rng->quality ?:1024 ); current_quality = rng->quality;/* obsolete */ return 0 ;
@@ -563,6 +562,9 @@ int hwrng_register(struct hwrng *rng)complete (&rng->cleanup_done);init_completion (&rng->dying); +/* Adjust quality field to always have a proper value */ + rng->quality =min_t (u16,min_t (u16, default_quality,1024 ), rng->quality ?:1024 ); +if (!current_rng || (!cur_rng_set_by_user && rng->quality > current_rng->quality)) {/*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 279/568 powerpc/prom: Add CPU info to hardware description string later
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Lynch <[email protected]>
[ Upstream commit 7bdd1c6c87de758750d419eedab7285b95b66417 ]
cur_cpu_spec->cpu_name is appended to ppc_hw_desc before cur_cpu_spec has taken on its final value. This is illustrated on pseries by comparing the CPU name as reported at boot ("POWER8E (raw)") to the contents of /proc/cpuinfo ("POWER8 (architected)"):
$ dmesg | grep Hardware
Hardware name: IBM,8408-E8E POWER8E (raw) 0x4b0201 0xf000004 \
of:IBM,FW860.50 (SV860_146) hv:phyp pSeries$ grep -m 1 ^cpu /proc/cpuinfo cpu : POWER8 (architected), altivec supported
Some 44x models would appear to be affected as well; see identical_pvr_fixup().
This results in incorrect CPU information in stack dumps -- ppc_hw_desc is an input to dump_stack_set_arch_desc().
Delay gathering the CPU name until after all potential calls to identify_cpu().
--- arch/powerpc/kernel/prom.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
arch/powerpc/kernel/prom.c +8 -4
@@ -327,6 +327,7 @@ static int __init early_init_dt_scan_cpus(unsigned long node, void *data) {const char *type =of_get_flat_dt_prop (node,"device_type" ,NULL ); +const __be32 *cpu_version =NULL ;const __be32 *prop;const __be32 *intserv;int i, nthreads;
@@ -410,7 +411,7 @@ static int __init early_init_dt_scan_cpus(unsigned long node, prop =of_get_flat_dt_prop (node,"cpu-version" ,NULL );if (prop && (be32_to_cpup (prop) &0xff000000 ) ==0x0f000000 ) {identify_cpu (0 ,be32_to_cpup (prop)); -seq_buf_printf (&ppc_hw_desc,"0x%04x " ,be32_to_cpup (prop)); + cpu_version = prop; }check_cpu_feature_properties (node);
@@ -421,6 +422,12 @@ static int __init early_init_dt_scan_cpus(unsigned long node, }identical_pvr_fixup (node); + +// We can now add the CPU name & PVR to the hardware description +seq_buf_printf (&ppc_hw_desc,"%s 0x%04lx " , cur_cpu_spec->cpu_name,mfspr (SPRN_PVR )); +if (cpu_version) +seq_buf_printf (&ppc_hw_desc,"0x%04x " ,be32_to_cpup (cpu_version)); +init_mmu_slb_size (node);#ifdef CONFIG_PPC64
@@ -858,9 +865,6 @@ void __init early_init_devtree(void *params)dt_cpu_ftrs_scan (); -// We can now add the CPU name & PVR to the hardware description -seq_buf_printf (&ppc_hw_desc,"%s 0x%04lx " , cur_cpu_spec->cpu_name,mfspr (SPRN_PVR )); -/* Retrieve CPU related informations from the flat tree * (altivec support, boot CPU ID, ...) */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 280/568 ASoC: max98088: Check for clk_prepare_enable() error
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen Ni <[email protected]>
[ Upstream commit 1a70579723fde3624a72dfea6e79e55be6e36659 ]
clk_prepare_enable() may fail, so we should better check its return value and propagate it in the case of error.
--- sound/soc/codecs/max98088.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
sound/soc/codecs/max98088.c +7 -3
@@ -1318,6 +1318,7 @@ static int max98088_set_bias_level(struct snd_soc_component *component, enum snd_soc_bias_level level) {struct max98088_priv *max98088 =snd_soc_component_get_drvdata (component); +int ret;switch (level) {case SND_SOC_BIAS_ON :
@@ -1333,10 +1334,13 @@ static int max98088_set_bias_level(struct snd_soc_component *component,*/ if (!IS_ERR (max98088->mclk)) {if (snd_soc_component_get_bias_level (component) == -SND_SOC_BIAS_ON ) +SND_SOC_BIAS_ON ) {clk_disable_unprepare (max98088->mclk); -else -clk_prepare_enable (max98088->mclk); + }else { + ret =clk_prepare_enable (max98088->mclk); +if (ret) +return ret; + } }break ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 281/568 mtd: make mtd_test.c a separate module
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit a5cf054d325e6f362e82fe6d124a1871a4af8174 ]
This file gets linked into nine different modules, which causes a warning:
scripts/Makefile.build:236: drivers/mtd/tests/Makefile: mtd_test.o is added to multiple modules: mtd_nandbiterrs mtd_oobtest mtd_pagetest mtd_readtest mtd_speedtest mtd_stresstest mtd_subpagetest mtd_torturetest
Make it a separate module instead.
--- drivers/mtd/tests/Makefile | 34 +++++++++++++++++----------------- drivers/mtd/tests/mtd_test.c | 9 +++++++++ 2 files changed, 26 insertions(+), 17 deletions(-)
drivers/mtd/tests/Makefile +17 -17
@@ -1,19 +1,19 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_MTD_TESTS) += mtd_oobtest.o -obj-$(CONFIG_MTD_TESTS) += mtd_pagetest.o -obj-$(CONFIG_MTD_TESTS) += mtd_readtest.o -obj-$(CONFIG_MTD_TESTS) += mtd_speedtest.o -obj-$(CONFIG_MTD_TESTS) += mtd_stresstest.o -obj-$(CONFIG_MTD_TESTS) += mtd_subpagetest.o -obj-$(CONFIG_MTD_TESTS) += mtd_torturetest.o -obj-$(CONFIG_MTD_TESTS) += mtd_nandecctest.o -obj-$(CONFIG_MTD_TESTS) += mtd_nandbiterrs.o +obj-$(CONFIG_MTD_TESTS) += mtd_oobtest.o mtd_test.o +obj-$(CONFIG_MTD_TESTS) += mtd_pagetest.o mtd_test.o +obj-$(CONFIG_MTD_TESTS) += mtd_readtest.o mtd_test.o +obj-$(CONFIG_MTD_TESTS) += mtd_speedtest.o mtd_test.o +obj-$(CONFIG_MTD_TESTS) += mtd_stresstest.o mtd_test.o +obj-$(CONFIG_MTD_TESTS) += mtd_subpagetest.o mtd_test.o +obj-$(CONFIG_MTD_TESTS) += mtd_torturetest.o mtd_test.o +obj-$(CONFIG_MTD_TESTS) += mtd_nandecctest.o mtd_test.o +obj-$(CONFIG_MTD_TESTS) += mtd_nandbiterrs.o mtd_test.o -mtd_oobtest-objs := oobtest.o mtd_test.o -mtd_pagetest-objs := pagetest.o mtd_test.o -mtd_readtest-objs := readtest.o mtd_test.o -mtd_speedtest-objs := speedtest.o mtd_test.o -mtd_stresstest-objs := stresstest.o mtd_test.o -mtd_subpagetest-objs := subpagetest.o mtd_test.o -mtd_torturetest-objs := torturetest.o mtd_test.o -mtd_nandbiterrs-objs := nandbiterrs.o mtd_test.o +mtd_oobtest-objs := oobtest.o +mtd_pagetest-objs := pagetest.o +mtd_readtest-objs := readtest.o +mtd_speedtest-objs := speedtest.o +mtd_stresstest-objs := stresstest.o +mtd_subpagetest-objs := subpagetest.o +mtd_torturetest-objs := torturetest.o +mtd_nandbiterrs-objs := nandbiterrs.o
drivers/mtd/tests/mtd_test.c +9 -0
@@ -25,6 +25,7 @@ int mtdtest_erase_eraseblock(struct mtd_info *mtd, unsigned int ebnum)return 0 ; } +EXPORT_SYMBOL_GPL (mtdtest_erase_eraseblock);static int is_block_bad (struct mtd_info *mtd,unsigned int ebnum) {
@@ -57,6 +58,7 @@ int mtdtest_scan_for_bad_eraseblocks(struct mtd_info *mtd, unsigned char *bbt,return 0 ; } +EXPORT_SYMBOL_GPL (mtdtest_scan_for_bad_eraseblocks);int mtdtest_erase_good_eraseblocks (struct mtd_info *mtd,unsigned char *bbt,unsigned int eb,int ebcnt)
@@ -75,6 +77,7 @@ int mtdtest_erase_good_eraseblocks(struct mtd_info *mtd, unsigned char *bbt,return 0 ; } +EXPORT_SYMBOL_GPL (mtdtest_erase_good_eraseblocks);int mtdtest_read (struct mtd_info *mtd,loff_t addr,size_t size,void *buf) {
@@ -92,6 +95,7 @@ int mtdtest_read(struct mtd_info *mtd, loff_t addr, size_t size, void *buf)return err; } +EXPORT_SYMBOL_GPL (mtdtest_read);int mtdtest_write (struct mtd_info *mtd,loff_t addr,size_t size,const void *buf)
@@ -107,3 +111,8 @@ int mtdtest_write(struct mtd_info *mtd, loff_t addr, size_t size,return err; } +EXPORT_SYMBOL_GPL (mtdtest_write); + +MODULE_LICENSE ("GPL" ); +MODULE_DESCRIPTION ("MTD function test helpers" ); +MODULE_AUTHOR ("Akinobu Mita" );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 282/568 RDMA/device: Return error earlier if port in not valid
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leon Romanovsky <[email protected]>
[ Upstream commit 917918f57a7b139c043e78c502876f2c286f4f0a ]
There is no need to allocate port data if port provided is not valid.
--- drivers/infiniband/core/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/infiniband/core/device.c +3 -3
@@ -2146,6 +2146,9 @@ int ib_device_set_netdev(struct ib_device *ib_dev, struct net_device *ndev,unsigned long flags;int ret; +if (!rdma_is_port_valid (ib_dev, port)) +return -EINVAL ; +/* * Drivers wish to call this before ib_register_driver, so we have to * setup the port data early.
@@ -2154,9 +2157,6 @@ int ib_device_set_netdev(struct ib_device *ib_dev, struct net_device *ndev,if (ret)return ret; -if (!rdma_is_port_valid (ib_dev, port)) -return -EINVAL ; - pdata = &ib_dev->port_data[port];spin_lock_irqsave (&pdata->netdev_lock, flags); old_ndev = rcu_dereference_protected(
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 283/568 Input: elan_i2c - do not leave interrupt disabled on suspend failure
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Torokhov <[email protected]>
[ Upstream commit 5f82c1e04721e7cd98e604eb4e58f0724d8e5a65 ]
Make sure interrupts are not left disabled when we fail to suspend the touch controller.
--- drivers/input/mouse/elan_i2c_core.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/input/mouse/elan_i2c_core.c +2 -0
@@ -1356,6 +1356,8 @@ static int elan_suspend(struct device *dev) } err: +if (ret) +enable_irq (client->irq);mutex_unlock (&data->sysfs_mutex);return ret; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 284/568 ASoC: amd: Adjust error handling in case of absent codec device
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aleksandr Mishin <[email protected]>
[ Upstream commit 5080808c3339de2220c602ab7c7fa23dc6c1a5a3 ]
acpi_get_first_physical_node() can return NULL in several cases (no such device, ACPI table error, reference count drop to 0, etc). Existing check just emit error message, but doesn't perform return. Then this NULL pointer is passed to devm_acpi_dev_add_driver_gpios() where it is dereferenced.
Adjust this error handling by adding error code return.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- sound/soc/amd/acp-es8336.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/amd/acp-es8336.c +3 -1
@@ -203,8 +203,10 @@ static int st_es8336_late_probe(struct snd_soc_card *card) codec_dev =acpi_get_first_physical_node (adev);acpi_dev_put (adev); -if (!codec_dev) +if (!codec_dev) {dev_err (card->dev,"can not find codec dev\n" ); +return -ENODEV ; + } ret =devm_acpi_dev_add_driver_gpios (codec_dev, acpi_es8336_gpios);if (ret)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 285/568 PCI: endpoint: Clean up error handling in vpci_scan_bus()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 8e0f5a96c534f781e8c57ca30459448b3bfe5429 ]
Smatch complains about inconsistent NULL checking in vpci_scan_bus():
drivers/pci/endpoint/functions/pci-epf-vntb.c:1024 vpci_scan_bus() error: we previously assumed 'vpci_bus' could be null (see line 1021)
Instead of printing an error message and then crashing we should return an error code and clean up.
Also the NULL check is reversed so it prints an error for success instead of failure.
--- drivers/pci/endpoint/functions/pci-epf-vntb.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/pci/endpoint/functions/pci-epf-vntb.c +9 -3
@@ -1029,8 +1029,10 @@ static int vpci_scan_bus(void *sysdata)struct epf_ntb *ndev = sysdata; vpci_bus =pci_scan_bus (ndev->vbus_number, &vpci_ops, sysdata); -if (vpci_bus) -pr_err ("create pci bus\n" ); +if (!vpci_bus) { +pr_err ("create pci bus failed\n" ); +return -EINVAL ; + }pci_bus_add_devices (vpci_bus);
@@ -1352,10 +1354,14 @@ static int epf_ntb_bind(struct pci_epf *epf) goto err_bar_alloc; } -vpci_scan_bus (ntb); + ret =vpci_scan_bus (ntb); +if (ret) + goto err_unregister;return 0 ; +err_unregister: +pci_unregister_driver (&vntb_pci_driver); err_bar_alloc:epf_ntb_config_spad_bar_free (ntb);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 286/568 PCI: endpoint: Fix error handling in epf_ntb_epc_cleanup()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 6bba3c0ac5dc54737998a0982b2e272242c87e0f ]
There are two issues related to epf_ntb_epc_cleanup():
1) It should call epf_ntb_config_sspad_bar_clear()
2) The epf_ntb_bind() function should call epf_ntb_epc_cleanup() to cleanup.
I also changed the ordering a bit. Unwinding should be done in the mirror order from how they are allocated.
--- drivers/pci/endpoint/functions/pci-epf-vntb.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/pci/endpoint/functions/pci-epf-vntb.c +5 -2
@@ -810,8 +810,9 @@ static int epf_ntb_epc_init(struct epf_ntb *ntb)*/ static void epf_ntb_epc_cleanup (struct epf_ntb *ntb) { -epf_ntb_db_bar_clear (ntb);epf_ntb_mw_bar_clear (ntb, ntb->num_mws); +epf_ntb_db_bar_clear (ntb); +epf_ntb_config_sspad_bar_clear (ntb); }#define EPF_NTB_R (_name) \
@@ -1351,7 +1352,7 @@ static int epf_ntb_bind(struct pci_epf *epf) ret =pci_register_driver (&vntb_pci_driver);if (ret) {dev_err (dev,"failure register vntb pci driver\n" ); - goto err_bar_alloc; + goto err_epc_cleanup; } ret =vpci_scan_bus (ntb);
@@ -1362,6 +1363,8 @@ static int epf_ntb_bind(struct pci_epf *epf) err_unregister:pci_unregister_driver (&vntb_pci_driver); +err_epc_cleanup: +epf_ntb_epc_cleanup (ntb); err_bar_alloc:epf_ntb_config_spad_bar_free (ntb);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 287/568 vhost/vsock: always initialize seqpacket_allow
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael S. Tsirkin <[email protected]>
[ Upstream commit 1e1fdcbdde3b7663e5d8faeb2245b9b151417d22 ]
There are two issues around seqpacket_allow:
1. seqpacket_allow is not initialized when socket is created. Thus if features are never set, it will be read uninitialized.
2. if VIRTIO_VSOCK_F_SEQPACKET is set and then cleared, then seqpacket_allow will not be cleared appropriately (existing apps I know about don't usually do this but it's legal and there's no way to be sure no one relies on this).
To fix:
- initialize seqpacket_allow after allocation
- set it unconditionally in set_features
Message-ID: <[email protected]>
--- drivers/vhost/vsock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/vhost/vsock.c +2 -2
@@ -656,6 +656,7 @@ static int vhost_vsock_dev_open(struct inode *inode, struct file *file) } vsock->guest_cid =0 ;/* no CID assigned yet */ + vsock->seqpacket_allow = false;atomic_set (&vsock->queued_replies,0 );
@@ -799,8 +800,7 @@ static int vhost_vsock_set_features(struct vhost_vsock *vsock, u64 features) goto err; } -if (features & (1ULL <<VIRTIO_VSOCK_F_SEQPACKET )) - vsock->seqpacket_allow = true; + vsock->seqpacket_allow = features & (1ULL <<VIRTIO_VSOCK_F_SEQPACKET );for (i =0 ; i <ARRAY_SIZE (vsock->vqs); i++) { vq = &vsock->vqs[i];
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 288/568 net: missing check virtio
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Denis Arefev <[email protected]>
[ Upstream commit e269d79c7d35aa3808b1f3c1737d63dab504ddc8 ]
Two missing check in virtio_net_hdr_to_skb() allowed syzbot to crash kernels again
1. After the skb_segment function the buffer may become non-linear (nr_frags != 0), but since the SKBTX_SHARED_FRAG flag is not set anywhere the __skb_linearize function will not be executed, then the buffer will remain non-linear. Then the condition (offset >= skb_headlen(skb)) becomes true, which causes WARN_ON_ONCE in skb_checksum_help.
2. The struct sk_buff and struct virtio_net_hdr members must be mathematically related.
(gso_size) must be greater than (needed) otherwise WARN_ON_ONCE. (remainder) must be greater than (needed) otherwise WARN_ON_ONCE. (remainder) may be 0 if division is without remainder.
offset+2 (4191) > skb_headlen() (1116)
WARNING: CPU: 1 PID: 5084 at net/core/dev.c:3303 skb_checksum_help+0x5e2/0x740 net/core/dev.c:3303 Modules linked in: CPU: 1 PID: 5084 Comm: syz-executor336 Not tainted 6.7.0-rc3-syzkaller-00014-gdf60cee26a2e #0 Hardware name: Google Compute Engine/Google Compute Engine, BIOS Google 11/10/2023 RIP: 0010:skb_checksum_help+0x5e2/0x740 net/core/dev.c:3303 Code: 89 e8 83 e0 07 83 c0 03 38 d0 7c 08 84 d2 0f 85 52 01 00 00 44 89 e2 2b 53 74 4c 89 ee 48 c7 c7 40 57 e9 8b e8 af 8f dd f8 90 <0f> 0b 90 90 e9 87 fe ff ff e8 40 0f 6e f9 e9 4b fa ff ff 48 89 ef RSP: 0018:ffffc90003a9f338 EFLAGS: 00010286 RAX: 0000000000000000 RBX: ffff888025125780 RCX: ffffffff814db209 RDX: ffff888015393b80 RSI: ffffffff814db216 RDI: 0000000000000001 RBP: ffff8880251257f4 R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000001 R12: 000000000000045c R13: 000000000000105f R14: ffff8880251257f0 R15: 000000000000105d FS: 0000555555c24380(0000) GS:ffff8880b9900000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000000002000f000 CR3: 0000000023151000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> ip_do_fragment+0xa1b/0x18b0 net/ipv4/ip_output.c:777 ip_fragment.constprop.0+0x161/0x230 net/ipv4/ip_output.c:584 ip_finish_output_gso net/ipv4/ip_output.c:286 [inline] __ip_finish_output net/ipv4/ip_output.c:308 [inline] __ip_finish_output+0x49c/0x650 net/ipv4/ip_output.c:295 ip_finish_output+0x31/0x310 net/ipv4/ip_output.c:323 NF_HOOK_COND include/linux/netfilter.h:303 [inline] ip_output+0x13b/0x2a0 net/ipv4/ip_output.c:433 dst_output include/net/dst.h:451 [inline] ip_local_out+0xaf/0x1a0 net/ipv4/ip_output.c:129 iptunnel_xmit+0x5b4/0x9b0 net/ipv4/ip_tunnel_core.c:82 ipip6_tunnel_xmit net/ipv6/sit.c:1034 [inline] sit_tunnel_xmit+0xed2/0x28f0 net/ipv6/sit.c:1076 __netdev_start_xmit include/linux/netdevice.h:4940 [inline] netdev_start_xmit include/linux/netdevice.h:4954 [inline] xmit_one net/core/dev.c:3545 [inline] dev_hard_start_xmit+0x13d/0x6d0 net/core/dev.c:3561 __dev_queue_xmit+0x7c1/0x3d60 net/core/dev.c:4346 dev_queue_xmit include/linux/netdevice.h:3134 [inline] packet_xmit+0x257/0x380 net/packet/af_packet.c:276 packet_snd net/packet/af_packet.c:3087 [inline] packet_sendmsg+0x24ca/0x5240 net/packet/af_packet.c:3119 sock_sendmsg_nosec net/socket.c:730 [inline] __sock_sendmsg+0xd5/0x180 net/socket.c:745 __sys_sendto+0x255/0x340 net/socket.c:2190 __do_sys_sendto net/socket.c:2202 [inline] __se_sys_sendto net/socket.c:2198 [inline] __x64_sys_sendto+0xe0/0x1b0 net/socket.c:2198 do_syscall_x64 arch/x86/entry/common.c:51 [inline] do_syscall_64+0x40/0x110 arch/x86/entry/common.c:82 entry_SYSCALL_64_after_hwframe+0x63/0x6b
Found by Linux Verification Center (linuxtesting.org) with Syzkaller
Message-Id: <[email protected]>
--- include/linux/virtio_net.h | 11 +++++++++++ 1 file changed, 11 insertions(+)
include/linux/virtio_net.h +11 -0
@@ -56,6 +56,7 @@ static inline int virtio_net_hdr_to_skb(struct sk_buff *skb,unsigned int thlen =0 ;unsigned int p_off =0 ;unsigned int ip_proto; +u64 ret, remainder, gso_size;if (hdr->gso_type !=VIRTIO_NET_HDR_GSO_NONE ) {switch (hdr->gso_type & ~VIRTIO_NET_HDR_GSO_ECN ) {
@@ -98,6 +99,16 @@ static inline int virtio_net_hdr_to_skb(struct sk_buff *skb,u32 off =__virtio16_to_cpu (little_endian, hdr->csum_offset);u32 needed = start +max_t (u32, thlen, off +sizeof (__sum16)); +if (hdr->gso_size) { + gso_size =__virtio16_to_cpu (little_endian, hdr->gso_size); + ret =div64_u64_rem (skb->len, gso_size, &remainder); +if (!(ret && (hdr->gso_size > needed) && + ((remainder > needed) || (remainder ==0 )))) { +return -EINVAL ; + } +skb_shinfo (skb)->tx_flags |=SKBFL_SHARED_FRAG ; + } +if (!pskb_may_pull (skb, needed))return -EINVAL ;
Signature · 1 line
2.43.0