July 2024 - Linux-stable-mirror

[PATCH net v2] gve: Fix an edge case for TSO skb validity check

by Praveen Kaligineedi

From: Bailey Forrest <bcf(a)google.com> The NIC requires each TSO segment to not span more than 10 descriptors. NIC further requires each descriptor to not exceed 16KB - 1 (GVE_TX_MAX_BUF_SIZE_DQO). The descriptors for an skb are generated by gve_tx_add_skb_no_copy_dqo() for DQO RDA queue format. gve_tx_add_skb_no_copy_dqo() loops through each skb frag and generates a descriptor for the entire frag if the frag size is not greater than GVE_TX_MAX_BUF_SIZE_DQO. If the frag size is greater than GVE_TX_MAX_BUF_SIZE_DQO, it is split into descriptor(s) of size GVE_TX_MAX_BUF_SIZE_DQO and a descriptor is generated for the remainder (frag size % GVE_TX_MAX_BUF_SIZE_DQO). gve_can_send_tso() checks if the descriptors thus generated for an skb would meet the requirement that each TSO-segment not span more than 10 descriptors. However, the current code misses an edge case when a TSO segment spans multiple descriptors within a large frag. This change fixes the edge case. gve_can_send_tso() relies on the assumption that max gso size (9728) is less than GVE_TX_MAX_BUF_SIZE_DQO and therefore within an skb fragment a TSO segment can never span more than 2 descriptors. Fixes: a57e5de476be ("gve: DQO: Add TX path") Signed-off-by: Praveen Kaligineedi <pkaligineedi(a)google.com> Signed-off-by: Bailey Forrest <bcf(a)google.com> Reviewed-by: Jeroen de Borst <jeroendb(a)google.com> Cc: stable(a)vger.kernel.org --- Changes from v1: - Added 'stable tag' - Added more explanation in the commit message - Modified comments to clarify the changes made - Changed variable names 'last_frag_size' to 'prev_frag_size' and 'last_frag_remain' to 'prev_frag_remain' - Removed parentheses around single line statement drivers/net/ethernet/google/gve/gve_tx_dqo.c | 22 +++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/google/gve/gve_tx_dqo.c b/drivers/net/ethernet/google/gve/gve_tx_dqo.c index 0b3cca3fc792..f879426cb552 100644 --- a/drivers/net/ethernet/google/gve/gve_tx_dqo.c +++ b/drivers/net/ethernet/google/gve/gve_tx_dqo.c @@ -866,22 +866,42 @@ static bool gve_can_send_tso(const struct sk_buff *skb) const int header_len = skb_tcp_all_headers(skb); const int gso_size = shinfo->gso_size; int cur_seg_num_bufs; + int prev_frag_size; int cur_seg_size; int i; cur_seg_size = skb_headlen(skb) - header_len; + prev_frag_size = skb_headlen(skb); cur_seg_num_bufs = cur_seg_size > 0; for (i = 0; i < shinfo->nr_frags; i++) { if (cur_seg_size >= gso_size) { cur_seg_size %= gso_size; cur_seg_num_bufs = cur_seg_size > 0; + + if (prev_frag_size > GVE_TX_MAX_BUF_SIZE_DQO) { + int prev_frag_remain = prev_frag_size % + GVE_TX_MAX_BUF_SIZE_DQO; + + /* If the last descriptor of the previous frag + * is less than cur_seg_size, the segment will + * span two descriptors in the previous frag. + * Since max gso size (9728) is less than + * GVE_TX_MAX_BUF_SIZE_DQO, it is impossible + * for the segment to span more than two + * descriptors. + */ + if (prev_frag_remain && + cur_seg_size > prev_frag_remain) + cur_seg_num_bufs++; + } } if (unlikely(++cur_seg_num_bufs > max_bufs_per_seg)) return false; - cur_seg_size += skb_frag_size(&shinfo->frags[i]); + prev_frag_size = skb_frag_size(&shinfo->frags[i]); + cur_seg_size += prev_frag_size; } return true; -- 2.45.2.1089.g2a221341d9-goog

1 year, 3 months

3
2
0 0

[PATCH 6.1.y] bpf: Synchronize dispatcher update with bpf_dispatcher_xdp_func

by Sergio González Collado

From: Jiri Olsa <jolsa(a)kernel.org> [ Upstream commit 4121d4481b72501aa4d22680be4ea1096d69d133 ] Hao Sun reported crash in dispatcher image [1]. Currently we don't have any sync between bpf_dispatcher_update and bpf_dispatcher_xdp_func, so following race is possible: cpu 0: cpu 1: bpf_prog_run_xdp ... bpf_dispatcher_xdp_func in image at offset 0x0 bpf_dispatcher_update update image at offset 0x800 bpf_dispatcher_update update image at offset 0x0 in image at offset 0x0 -> crash Fixing this by synchronizing dispatcher image update (which is done in bpf_dispatcher_update function) with bpf_dispatcher_xdp_func that reads and execute the dispatcher image. Calling synchronize_rcu after updating and installing new image ensures that readers leave old image before it's changed in the next dispatcher update. The update itself is locked with dispatcher's mutex. The bpf_prog_run_xdp is called under local_bh_disable and synchronize_rcu will wait for it to leave [2]. [1] https://lore.kernel.org/bpf/Y5SFho7ZYXr9ifRn@krava/T/#m00c29ece654bc9f332a1… [2] https://lore.kernel.org/bpf/0B62D35A-E695-4B7A-A0D4-774767544C1A@gmail.com/… Reported-by: Hao Sun <sunhao.th(a)gmail.com> Signed-off-by: Jiri Olsa <jolsa(a)kernel.org> Acked-by: Yonghong Song <yhs(a)fb.com> Acked-by: Paul E. McKenney <paulmck(a)kernel.org> Link: https://lore.kernel.org/r/20221214123542.1389719-1-jolsa@kernel.org Signed-off-by: Martin KaFai Lau <martin.lau(a)kernel.org> (cherry picked from commit 4121d4481b72501aa4d22680be4ea1096d69d133) Signed-off-by: Sergio González Collado <sergio.collado(a)gmail.com> Reported-by: syzbot+08ba1e474d350b613604(a)syzkaller.appspotmail.com --- kernel/bpf/dispatcher.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kernel/bpf/dispatcher.c b/kernel/bpf/dispatcher.c index c19719f48ce0..fa3e9225aedc 100644 --- a/kernel/bpf/dispatcher.c +++ b/kernel/bpf/dispatcher.c @@ -125,6 +125,11 @@ static void bpf_dispatcher_update(struct bpf_dispatcher *d, int prev_num_progs) __BPF_DISPATCHER_UPDATE(d, new ?: (void *)&bpf_dispatcher_nop_func); + /* Make sure all the callers executing the previous/old half of the + * image leave it, so following update call can modify it safely. + */ + synchronize_rcu(); + if (new) d->image_off = noff; } -- 2.39.2

1 year, 3 months

1
0
0 0

[PATCH 6.1.y] btrfs: do not BUG_ON on failure to get dir index for new snapshot

by Sergio González Collado

From: Filipe Manana <fdmanana(a)suse.com> [ Upstream commit df9f278239046719c91aeb59ec0afb1a99ee8b2b ] During the transaction commit path, at create_pending_snapshot(), there is no need to BUG_ON() in case we fail to get a dir index for the snapshot in the parent directory. This should fail very rarely because the parent inode should be loaded in memory already, with the respective delayed inode created and the parent inode's index_cnt field already initialized. However if it fails, it may be -ENOMEM like the comment at create_pending_snapshot() says or any error returned by btrfs_search_slot() through btrfs_set_inode_index_count(), which can be pretty much anything such as -EIO or -EUCLEAN for example. So the comment is not correct when it says it can only be -ENOMEM. However doing a BUG_ON() here is overkill, since we can instead abort the transaction and return the error. Note that any error returned by create_pending_snapshot() will eventually result in a transaction abort at cleanup_transaction(), called from btrfs_commit_transaction(), but we can explicitly abort the transaction at this point instead so that we get a stack trace to tell us that the call to btrfs_set_inode_index() failed. So just abort the transaction and return in case btrfs_set_inode_index() returned an error at create_pending_snapshot(). Reviewed-by: Johannes Thumshirn <johannes.thumshirn(a)wdc.com> Signed-off-by: Filipe Manana <fdmanana(a)suse.com> Reviewed-by: David Sterba <dsterba(a)suse.com> Signed-off-by: David Sterba <dsterba(a)suse.com> (cherry picked from commit df9f278239046719c91aeb59ec0afb1a99ee8b2b) Signed-off-by: Sergio González Collado <sergio.collado(a)gmail.com> Reported-by: syzbot+c56033c8c15c08286062(a)syzkaller.appspotmail.com --- fs/btrfs/transaction.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index a7853a3a5719..604241e6e2c1 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -1701,7 +1701,10 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, * insert the directory item */ ret = btrfs_set_inode_index(BTRFS_I(parent_inode), &index); - BUG_ON(ret); /* -ENOMEM */ + if (ret) { + btrfs_abort_transaction(trans, ret); + goto fail; + } /* check if there is a file/dir which has the same name. */ dir_item = btrfs_lookup_dir_item(NULL, parent_root, path, -- 2.39.2

1 year, 3 months

1
0
0 0

FAILED: patch "[PATCH] arm64: dts: qcom: sm6115: Disable SS instance in Parkmode for" failed to apply to 6.6-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y git checkout FETCH_HEAD git cherry-pick -x 074992a1163295d717faa21d1818c4c19ef6e676 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024072522-properly-jackpot-9fed@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: 074992a11632 ("arm64: dts: qcom: sm6115: Disable SS instance in Parkmode for USB") a06a2f12f9e2 ("arm64: dts: qcom: qrb4210-rb2: enable USB-C port handling") 7e3a1f6470f7 ("arm64: dts: qcom: sm6115: drop pipe clock selection") b3eaa47395b9 ("arm64: dts: qcom: sm6115: Hook up interconnects") f6874706e311 ("arm64: dts: qcom: sm6115: switch UFS QMP PHY to new style of bindings") ff753723bf39 ("arm64: dts: qcom: qrb4210-rb2: Enable MPSS and Wi-Fi") cab60b166575 ("arm64: dts: qcom: qrb4210-rb2: Enable bluetooth") ba5f5610841f ("arm64: dts: qcom: sm6115: Add UART3") 27c2ca90e2f3 ("arm64: dts: qcom: qrb4210-rb2: don't force usb peripheral mode") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 074992a1163295d717faa21d1818c4c19ef6e676 Mon Sep 17 00:00:00 2001 From: Krishna Kurapati <quic_kriskura(a)quicinc.com> Date: Thu, 4 Jul 2024 20:58:45 +0530 Subject: [PATCH] arm64: dts: qcom: sm6115: Disable SS instance in Parkmode for USB For Gen-1 targets like SM6115, it is seen that stressing out the controller in host mode results in HC died error: xhci-hcd.12.auto: xHCI host not responding to stop endpoint command xhci-hcd.12.auto: xHCI host controller not responding, assume dead xhci-hcd.12.auto: HC died; cleaning up And at this instant only restarting the host mode fixes it. Disable SuperSpeed instance in park mode for SM6115 to mitigate this issue. Cc: stable(a)vger.kernel.org Fixes: 97e563bf5ba1 ("arm64: dts: qcom: sm6115: Add basic soc dtsi") Signed-off-by: Krishna Kurapati <quic_kriskura(a)quicinc.com> Reviewed-by: Konrad Dybcio <konrad.dybcio(a)linaro.org> Link: https://lore.kernel.org/r/20240704152848.3380602-6-quic_kriskura@quicinc.com Signed-off-by: Bjorn Andersson <andersson(a)kernel.org> diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qcom/sm6115.dtsi index ac5f071a8db3..aec6ca5941c2 100644 --- a/arch/arm64/boot/dts/qcom/sm6115.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi @@ -1659,6 +1659,7 @@ usb_dwc3: usb@4e00000 { snps,has-lpm-erratum; snps,hird-threshold = /bits/ 8 <0x10>; snps,usb3_lpm_capable; + snps,parkmode-disable-ss-quirk; usb-role-switch;

1 year, 3 months

1
0
0 0

FAILED: patch "[PATCH] arm64: dts: qcom: sdm845: Disable SS instance in Parkmode for" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.19.y git checkout FETCH_HEAD git cherry-pick -x cf4d6d54eadb60d2ee4d31c9d92299f5e8dcb55c # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024072513-cardinal-snowcap-d711@gregkh' --subject-prefix 'PATCH 4.19.y' HEAD^.. Possible dependencies: cf4d6d54eadb ("arm64: dts: qcom: sdm845: Disable SS instance in Parkmode for USB") ca5ca568d738 ("arm64: dts: qcom: sdm845: switch USB QMP PHY to new style of bindings") a9ecdec45a3a ("arm64: dts: qcom: sdm845: switch USB+DP QMP PHY to new style of bindings") 8fe25ba3ffec ("arm64: dts: qcom: sdm845: rename labels for DSI nodes") 8721e18ca696 ("arm64: dts: qcom: enable dual ("bonded") DSI mode for DB845c") 39e0f8076f6f ("arm64: dts: qcom: sdm845-tama: Enable remoteprocs") 5dcc6587fde2 ("arm64: dts: qcom: sdm845-tama: Add display nodes") e12482e68830 ("arm64: dts: qcom: sdm845-xiaomi-beryllium: drop invalid panel properties") 9f3c858ecde0 ("arm64: dts: qcom: sdm845-oneplus: drop invalid panel properties") 4ce03bb80fae ("arm64: dts: qcom: sdm845-tama: Add volume up and camera GPIO keys") a1a685c312f5 ("arm64: dts: qcom: sdm845: Add compat qcom,sdm845-dsi-ctrl") ea25d61b448a ("arm64: dts: qcom: Use plural _gpios node label for PMIC gpios") 67e75cfea375 ("arm64: dts: qcom: Add Lenovo Tab P11 (J606F/XiaoXin Pad) dts") cb3920b50b4d ("arm64: dts: qcom: align LED node names with dtschema") f86ae6f23a9e ("arm64: dts: qcom: sagit: add initial device tree for sagit") 0d97fdf380b4 ("arm64: dts: qcom: Add configuration for PMI8950 peripheral") e07f41b0e1db ("arm64: dts: qcom: Add configuration for PM8950 peripheral") 108162894a5d ("arm64: dts: qcom: sdm845-*: Fix up comments") 4ba146dd8897 ("arm64: dts: qcom: sm6125-seine: Configure additional trinket thermistors") 7401035f2ef8 ("arm64: dts: qcom: sm6125-seine: Include PM6125 and configure PON") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From cf4d6d54eadb60d2ee4d31c9d92299f5e8dcb55c Mon Sep 17 00:00:00 2001 From: Krishna Kurapati <quic_kriskura(a)quicinc.com> Date: Thu, 4 Jul 2024 20:58:48 +0530 Subject: [PATCH] arm64: dts: qcom: sdm845: Disable SS instance in Parkmode for USB For Gen-1 targets like SDM845, it is seen that stressing out the controller in host mode results in HC died error: xhci-hcd.12.auto: xHCI host not responding to stop endpoint command xhci-hcd.12.auto: xHCI host controller not responding, assume dead xhci-hcd.12.auto: HC died; cleaning up And at this instant only restarting the host mode fixes it. Disable SuperSpeed instance in park mode for SDM845 to mitigate this issue. Cc: stable(a)vger.kernel.org Fixes: ca4db2b538a1 ("arm64: dts: qcom: sdm845: Add USB-related nodes") Signed-off-by: Krishna Kurapati <quic_kriskura(a)quicinc.com> Reviewed-by: Konrad Dybcio <konrad.dybcio(a)linaro.org> Link: https://lore.kernel.org/r/20240704152848.3380602-9-quic_kriskura@quicinc.com Signed-off-by: Bjorn Andersson <andersson(a)kernel.org> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index 23b101bb3842..54077549b9da 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -4138,6 +4138,7 @@ usb_1_dwc3: usb@a600000 { iommus = <&apps_smmu 0x740 0>; snps,dis_u2_susphy_quirk; snps,dis_enblslpm_quirk; + snps,parkmode-disable-ss-quirk; phys = <&usb_1_hsphy>, <&usb_1_qmpphy QMP_USB43DP_USB3_PHY>; phy-names = "usb2-phy", "usb3-phy"; @@ -4213,6 +4214,7 @@ usb_2_dwc3: usb@a800000 { iommus = <&apps_smmu 0x760 0>; snps,dis_u2_susphy_quirk; snps,dis_enblslpm_quirk; + snps,parkmode-disable-ss-quirk; phys = <&usb_2_hsphy>, <&usb_2_qmpphy>; phy-names = "usb2-phy", "usb3-phy"; };

1 year, 3 months

1
0
0 0

FAILED: patch "[PATCH] arm64: dts: qcom: sdm845: Disable SS instance in Parkmode for" failed to apply to 5.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x cf4d6d54eadb60d2ee4d31c9d92299f5e8dcb55c # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024072512-saline-founder-7ebe@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: cf4d6d54eadb ("arm64: dts: qcom: sdm845: Disable SS instance in Parkmode for USB") ca5ca568d738 ("arm64: dts: qcom: sdm845: switch USB QMP PHY to new style of bindings") a9ecdec45a3a ("arm64: dts: qcom: sdm845: switch USB+DP QMP PHY to new style of bindings") 8fe25ba3ffec ("arm64: dts: qcom: sdm845: rename labels for DSI nodes") 8721e18ca696 ("arm64: dts: qcom: enable dual ("bonded") DSI mode for DB845c") 39e0f8076f6f ("arm64: dts: qcom: sdm845-tama: Enable remoteprocs") 5dcc6587fde2 ("arm64: dts: qcom: sdm845-tama: Add display nodes") e12482e68830 ("arm64: dts: qcom: sdm845-xiaomi-beryllium: drop invalid panel properties") 9f3c858ecde0 ("arm64: dts: qcom: sdm845-oneplus: drop invalid panel properties") 4ce03bb80fae ("arm64: dts: qcom: sdm845-tama: Add volume up and camera GPIO keys") a1a685c312f5 ("arm64: dts: qcom: sdm845: Add compat qcom,sdm845-dsi-ctrl") ea25d61b448a ("arm64: dts: qcom: Use plural _gpios node label for PMIC gpios") 67e75cfea375 ("arm64: dts: qcom: Add Lenovo Tab P11 (J606F/XiaoXin Pad) dts") cb3920b50b4d ("arm64: dts: qcom: align LED node names with dtschema") f86ae6f23a9e ("arm64: dts: qcom: sagit: add initial device tree for sagit") 0d97fdf380b4 ("arm64: dts: qcom: Add configuration for PMI8950 peripheral") e07f41b0e1db ("arm64: dts: qcom: Add configuration for PM8950 peripheral") 108162894a5d ("arm64: dts: qcom: sdm845-*: Fix up comments") 4ba146dd8897 ("arm64: dts: qcom: sm6125-seine: Configure additional trinket thermistors") 7401035f2ef8 ("arm64: dts: qcom: sm6125-seine: Include PM6125 and configure PON") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From cf4d6d54eadb60d2ee4d31c9d92299f5e8dcb55c Mon Sep 17 00:00:00 2001 From: Krishna Kurapati <quic_kriskura(a)quicinc.com> Date: Thu, 4 Jul 2024 20:58:48 +0530 Subject: [PATCH] arm64: dts: qcom: sdm845: Disable SS instance in Parkmode for USB For Gen-1 targets like SDM845, it is seen that stressing out the controller in host mode results in HC died error: xhci-hcd.12.auto: xHCI host not responding to stop endpoint command xhci-hcd.12.auto: xHCI host controller not responding, assume dead xhci-hcd.12.auto: HC died; cleaning up And at this instant only restarting the host mode fixes it. Disable SuperSpeed instance in park mode for SDM845 to mitigate this issue. Cc: stable(a)vger.kernel.org Fixes: ca4db2b538a1 ("arm64: dts: qcom: sdm845: Add USB-related nodes") Signed-off-by: Krishna Kurapati <quic_kriskura(a)quicinc.com> Reviewed-by: Konrad Dybcio <konrad.dybcio(a)linaro.org> Link: https://lore.kernel.org/r/20240704152848.3380602-9-quic_kriskura@quicinc.com Signed-off-by: Bjorn Andersson <andersson(a)kernel.org> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index 23b101bb3842..54077549b9da 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -4138,6 +4138,7 @@ usb_1_dwc3: usb@a600000 { iommus = <&apps_smmu 0x740 0>; snps,dis_u2_susphy_quirk; snps,dis_enblslpm_quirk; + snps,parkmode-disable-ss-quirk; phys = <&usb_1_hsphy>, <&usb_1_qmpphy QMP_USB43DP_USB3_PHY>; phy-names = "usb2-phy", "usb3-phy"; @@ -4213,6 +4214,7 @@ usb_2_dwc3: usb@a800000 { iommus = <&apps_smmu 0x760 0>; snps,dis_u2_susphy_quirk; snps,dis_enblslpm_quirk; + snps,parkmode-disable-ss-quirk; phys = <&usb_2_hsphy>, <&usb_2_qmpphy>; phy-names = "usb2-phy", "usb3-phy"; };

1 year, 3 months

1
0
0 0

FAILED: patch "[PATCH] arm64: dts: qcom: sdm845: Disable SS instance in Parkmode for" failed to apply to 5.10-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x cf4d6d54eadb60d2ee4d31c9d92299f5e8dcb55c # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024072511-taco-reveler-c562@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: cf4d6d54eadb ("arm64: dts: qcom: sdm845: Disable SS instance in Parkmode for USB") ca5ca568d738 ("arm64: dts: qcom: sdm845: switch USB QMP PHY to new style of bindings") a9ecdec45a3a ("arm64: dts: qcom: sdm845: switch USB+DP QMP PHY to new style of bindings") 8fe25ba3ffec ("arm64: dts: qcom: sdm845: rename labels for DSI nodes") 8721e18ca696 ("arm64: dts: qcom: enable dual ("bonded") DSI mode for DB845c") 39e0f8076f6f ("arm64: dts: qcom: sdm845-tama: Enable remoteprocs") 5dcc6587fde2 ("arm64: dts: qcom: sdm845-tama: Add display nodes") e12482e68830 ("arm64: dts: qcom: sdm845-xiaomi-beryllium: drop invalid panel properties") 9f3c858ecde0 ("arm64: dts: qcom: sdm845-oneplus: drop invalid panel properties") 4ce03bb80fae ("arm64: dts: qcom: sdm845-tama: Add volume up and camera GPIO keys") a1a685c312f5 ("arm64: dts: qcom: sdm845: Add compat qcom,sdm845-dsi-ctrl") ea25d61b448a ("arm64: dts: qcom: Use plural _gpios node label for PMIC gpios") 67e75cfea375 ("arm64: dts: qcom: Add Lenovo Tab P11 (J606F/XiaoXin Pad) dts") cb3920b50b4d ("arm64: dts: qcom: align LED node names with dtschema") f86ae6f23a9e ("arm64: dts: qcom: sagit: add initial device tree for sagit") 0d97fdf380b4 ("arm64: dts: qcom: Add configuration for PMI8950 peripheral") e07f41b0e1db ("arm64: dts: qcom: Add configuration for PM8950 peripheral") 108162894a5d ("arm64: dts: qcom: sdm845-*: Fix up comments") 4ba146dd8897 ("arm64: dts: qcom: sm6125-seine: Configure additional trinket thermistors") 7401035f2ef8 ("arm64: dts: qcom: sm6125-seine: Include PM6125 and configure PON") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From cf4d6d54eadb60d2ee4d31c9d92299f5e8dcb55c Mon Sep 17 00:00:00 2001 From: Krishna Kurapati <quic_kriskura(a)quicinc.com> Date: Thu, 4 Jul 2024 20:58:48 +0530 Subject: [PATCH] arm64: dts: qcom: sdm845: Disable SS instance in Parkmode for USB For Gen-1 targets like SDM845, it is seen that stressing out the controller in host mode results in HC died error: xhci-hcd.12.auto: xHCI host not responding to stop endpoint command xhci-hcd.12.auto: xHCI host controller not responding, assume dead xhci-hcd.12.auto: HC died; cleaning up And at this instant only restarting the host mode fixes it. Disable SuperSpeed instance in park mode for SDM845 to mitigate this issue. Cc: stable(a)vger.kernel.org Fixes: ca4db2b538a1 ("arm64: dts: qcom: sdm845: Add USB-related nodes") Signed-off-by: Krishna Kurapati <quic_kriskura(a)quicinc.com> Reviewed-by: Konrad Dybcio <konrad.dybcio(a)linaro.org> Link: https://lore.kernel.org/r/20240704152848.3380602-9-quic_kriskura@quicinc.com Signed-off-by: Bjorn Andersson <andersson(a)kernel.org> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index 23b101bb3842..54077549b9da 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -4138,6 +4138,7 @@ usb_1_dwc3: usb@a600000 { iommus = <&apps_smmu 0x740 0>; snps,dis_u2_susphy_quirk; snps,dis_enblslpm_quirk; + snps,parkmode-disable-ss-quirk; phys = <&usb_1_hsphy>, <&usb_1_qmpphy QMP_USB43DP_USB3_PHY>; phy-names = "usb2-phy", "usb3-phy"; @@ -4213,6 +4214,7 @@ usb_2_dwc3: usb@a800000 { iommus = <&apps_smmu 0x760 0>; snps,dis_u2_susphy_quirk; snps,dis_enblslpm_quirk; + snps,parkmode-disable-ss-quirk; phys = <&usb_2_hsphy>, <&usb_2_qmpphy>; phy-names = "usb2-phy", "usb3-phy"; };

1 year, 3 months

1
0
0 0

FAILED: patch "[PATCH] arm64: dts: qcom: sdm845: Disable SS instance in Parkmode for" failed to apply to 5.15-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x cf4d6d54eadb60d2ee4d31c9d92299f5e8dcb55c # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024072511-kinetic-stumbling-e918@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: cf4d6d54eadb ("arm64: dts: qcom: sdm845: Disable SS instance in Parkmode for USB") ca5ca568d738 ("arm64: dts: qcom: sdm845: switch USB QMP PHY to new style of bindings") a9ecdec45a3a ("arm64: dts: qcom: sdm845: switch USB+DP QMP PHY to new style of bindings") 8fe25ba3ffec ("arm64: dts: qcom: sdm845: rename labels for DSI nodes") 8721e18ca696 ("arm64: dts: qcom: enable dual ("bonded") DSI mode for DB845c") 39e0f8076f6f ("arm64: dts: qcom: sdm845-tama: Enable remoteprocs") 5dcc6587fde2 ("arm64: dts: qcom: sdm845-tama: Add display nodes") e12482e68830 ("arm64: dts: qcom: sdm845-xiaomi-beryllium: drop invalid panel properties") 9f3c858ecde0 ("arm64: dts: qcom: sdm845-oneplus: drop invalid panel properties") 4ce03bb80fae ("arm64: dts: qcom: sdm845-tama: Add volume up and camera GPIO keys") a1a685c312f5 ("arm64: dts: qcom: sdm845: Add compat qcom,sdm845-dsi-ctrl") ea25d61b448a ("arm64: dts: qcom: Use plural _gpios node label for PMIC gpios") 67e75cfea375 ("arm64: dts: qcom: Add Lenovo Tab P11 (J606F/XiaoXin Pad) dts") cb3920b50b4d ("arm64: dts: qcom: align LED node names with dtschema") f86ae6f23a9e ("arm64: dts: qcom: sagit: add initial device tree for sagit") 0d97fdf380b4 ("arm64: dts: qcom: Add configuration for PMI8950 peripheral") e07f41b0e1db ("arm64: dts: qcom: Add configuration for PM8950 peripheral") 108162894a5d ("arm64: dts: qcom: sdm845-*: Fix up comments") 4ba146dd8897 ("arm64: dts: qcom: sm6125-seine: Configure additional trinket thermistors") 7401035f2ef8 ("arm64: dts: qcom: sm6125-seine: Include PM6125 and configure PON") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From cf4d6d54eadb60d2ee4d31c9d92299f5e8dcb55c Mon Sep 17 00:00:00 2001 From: Krishna Kurapati <quic_kriskura(a)quicinc.com> Date: Thu, 4 Jul 2024 20:58:48 +0530 Subject: [PATCH] arm64: dts: qcom: sdm845: Disable SS instance in Parkmode for USB For Gen-1 targets like SDM845, it is seen that stressing out the controller in host mode results in HC died error: xhci-hcd.12.auto: xHCI host not responding to stop endpoint command xhci-hcd.12.auto: xHCI host controller not responding, assume dead xhci-hcd.12.auto: HC died; cleaning up And at this instant only restarting the host mode fixes it. Disable SuperSpeed instance in park mode for SDM845 to mitigate this issue. Cc: stable(a)vger.kernel.org Fixes: ca4db2b538a1 ("arm64: dts: qcom: sdm845: Add USB-related nodes") Signed-off-by: Krishna Kurapati <quic_kriskura(a)quicinc.com> Reviewed-by: Konrad Dybcio <konrad.dybcio(a)linaro.org> Link: https://lore.kernel.org/r/20240704152848.3380602-9-quic_kriskura@quicinc.com Signed-off-by: Bjorn Andersson <andersson(a)kernel.org> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index 23b101bb3842..54077549b9da 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -4138,6 +4138,7 @@ usb_1_dwc3: usb@a600000 { iommus = <&apps_smmu 0x740 0>; snps,dis_u2_susphy_quirk; snps,dis_enblslpm_quirk; + snps,parkmode-disable-ss-quirk; phys = <&usb_1_hsphy>, <&usb_1_qmpphy QMP_USB43DP_USB3_PHY>; phy-names = "usb2-phy", "usb3-phy"; @@ -4213,6 +4214,7 @@ usb_2_dwc3: usb@a800000 { iommus = <&apps_smmu 0x760 0>; snps,dis_u2_susphy_quirk; snps,dis_enblslpm_quirk; + snps,parkmode-disable-ss-quirk; phys = <&usb_2_hsphy>, <&usb_2_qmpphy>; phy-names = "usb2-phy", "usb3-phy"; };

1 year, 3 months

1
0
0 0

FAILED: patch "[PATCH] arm64: dts: qcom: sdm845: Disable SS instance in Parkmode for" failed to apply to 6.1-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x cf4d6d54eadb60d2ee4d31c9d92299f5e8dcb55c # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024072510-await-likely-827c@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: cf4d6d54eadb ("arm64: dts: qcom: sdm845: Disable SS instance in Parkmode for USB") ca5ca568d738 ("arm64: dts: qcom: sdm845: switch USB QMP PHY to new style of bindings") a9ecdec45a3a ("arm64: dts: qcom: sdm845: switch USB+DP QMP PHY to new style of bindings") 8fe25ba3ffec ("arm64: dts: qcom: sdm845: rename labels for DSI nodes") 8721e18ca696 ("arm64: dts: qcom: enable dual ("bonded") DSI mode for DB845c") 39e0f8076f6f ("arm64: dts: qcom: sdm845-tama: Enable remoteprocs") 5dcc6587fde2 ("arm64: dts: qcom: sdm845-tama: Add display nodes") e12482e68830 ("arm64: dts: qcom: sdm845-xiaomi-beryllium: drop invalid panel properties") 9f3c858ecde0 ("arm64: dts: qcom: sdm845-oneplus: drop invalid panel properties") 4ce03bb80fae ("arm64: dts: qcom: sdm845-tama: Add volume up and camera GPIO keys") a1a685c312f5 ("arm64: dts: qcom: sdm845: Add compat qcom,sdm845-dsi-ctrl") ea25d61b448a ("arm64: dts: qcom: Use plural _gpios node label for PMIC gpios") 67e75cfea375 ("arm64: dts: qcom: Add Lenovo Tab P11 (J606F/XiaoXin Pad) dts") cb3920b50b4d ("arm64: dts: qcom: align LED node names with dtschema") f86ae6f23a9e ("arm64: dts: qcom: sagit: add initial device tree for sagit") 0d97fdf380b4 ("arm64: dts: qcom: Add configuration for PMI8950 peripheral") e07f41b0e1db ("arm64: dts: qcom: Add configuration for PM8950 peripheral") 108162894a5d ("arm64: dts: qcom: sdm845-*: Fix up comments") 4ba146dd8897 ("arm64: dts: qcom: sm6125-seine: Configure additional trinket thermistors") 7401035f2ef8 ("arm64: dts: qcom: sm6125-seine: Include PM6125 and configure PON") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From cf4d6d54eadb60d2ee4d31c9d92299f5e8dcb55c Mon Sep 17 00:00:00 2001 From: Krishna Kurapati <quic_kriskura(a)quicinc.com> Date: Thu, 4 Jul 2024 20:58:48 +0530 Subject: [PATCH] arm64: dts: qcom: sdm845: Disable SS instance in Parkmode for USB For Gen-1 targets like SDM845, it is seen that stressing out the controller in host mode results in HC died error: xhci-hcd.12.auto: xHCI host not responding to stop endpoint command xhci-hcd.12.auto: xHCI host controller not responding, assume dead xhci-hcd.12.auto: HC died; cleaning up And at this instant only restarting the host mode fixes it. Disable SuperSpeed instance in park mode for SDM845 to mitigate this issue. Cc: stable(a)vger.kernel.org Fixes: ca4db2b538a1 ("arm64: dts: qcom: sdm845: Add USB-related nodes") Signed-off-by: Krishna Kurapati <quic_kriskura(a)quicinc.com> Reviewed-by: Konrad Dybcio <konrad.dybcio(a)linaro.org> Link: https://lore.kernel.org/r/20240704152848.3380602-9-quic_kriskura@quicinc.com Signed-off-by: Bjorn Andersson <andersson(a)kernel.org> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index 23b101bb3842..54077549b9da 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -4138,6 +4138,7 @@ usb_1_dwc3: usb@a600000 { iommus = <&apps_smmu 0x740 0>; snps,dis_u2_susphy_quirk; snps,dis_enblslpm_quirk; + snps,parkmode-disable-ss-quirk; phys = <&usb_1_hsphy>, <&usb_1_qmpphy QMP_USB43DP_USB3_PHY>; phy-names = "usb2-phy", "usb3-phy"; @@ -4213,6 +4214,7 @@ usb_2_dwc3: usb@a800000 { iommus = <&apps_smmu 0x760 0>; snps,dis_u2_susphy_quirk; snps,dis_enblslpm_quirk; + snps,parkmode-disable-ss-quirk; phys = <&usb_2_hsphy>, <&usb_2_qmpphy>; phy-names = "usb2-phy", "usb3-phy"; };

1 year, 3 months

1
0
0 0

FAILED: patch "[PATCH] arm64: dts: qcom: sdm845: Disable SS instance in Parkmode for" failed to apply to 6.6-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y git checkout FETCH_HEAD git cherry-pick -x cf4d6d54eadb60d2ee4d31c9d92299f5e8dcb55c # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024072509-chive-tabby-a6f1@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: cf4d6d54eadb ("arm64: dts: qcom: sdm845: Disable SS instance in Parkmode for USB") ca5ca568d738 ("arm64: dts: qcom: sdm845: switch USB QMP PHY to new style of bindings") a9ecdec45a3a ("arm64: dts: qcom: sdm845: switch USB+DP QMP PHY to new style of bindings") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From cf4d6d54eadb60d2ee4d31c9d92299f5e8dcb55c Mon Sep 17 00:00:00 2001 From: Krishna Kurapati <quic_kriskura(a)quicinc.com> Date: Thu, 4 Jul 2024 20:58:48 +0530 Subject: [PATCH] arm64: dts: qcom: sdm845: Disable SS instance in Parkmode for USB For Gen-1 targets like SDM845, it is seen that stressing out the controller in host mode results in HC died error: xhci-hcd.12.auto: xHCI host not responding to stop endpoint command xhci-hcd.12.auto: xHCI host controller not responding, assume dead xhci-hcd.12.auto: HC died; cleaning up And at this instant only restarting the host mode fixes it. Disable SuperSpeed instance in park mode for SDM845 to mitigate this issue. Cc: stable(a)vger.kernel.org Fixes: ca4db2b538a1 ("arm64: dts: qcom: sdm845: Add USB-related nodes") Signed-off-by: Krishna Kurapati <quic_kriskura(a)quicinc.com> Reviewed-by: Konrad Dybcio <konrad.dybcio(a)linaro.org> Link: https://lore.kernel.org/r/20240704152848.3380602-9-quic_kriskura@quicinc.com Signed-off-by: Bjorn Andersson <andersson(a)kernel.org> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index 23b101bb3842..54077549b9da 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -4138,6 +4138,7 @@ usb_1_dwc3: usb@a600000 { iommus = <&apps_smmu 0x740 0>; snps,dis_u2_susphy_quirk; snps,dis_enblslpm_quirk; + snps,parkmode-disable-ss-quirk; phys = <&usb_1_hsphy>, <&usb_1_qmpphy QMP_USB43DP_USB3_PHY>; phy-names = "usb2-phy", "usb3-phy"; @@ -4213,6 +4214,7 @@ usb_2_dwc3: usb@a800000 { iommus = <&apps_smmu 0x760 0>; snps,dis_u2_susphy_quirk; snps,dis_enblslpm_quirk; + snps,parkmode-disable-ss-quirk; phys = <&usb_2_hsphy>, <&usb_2_qmpphy>; phy-names = "usb2-phy", "usb3-phy"; };

1 year, 3 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror July 2024