This is a note to let you know that I've just added the patch titled interconnect: Restore sync state by ignoring ipa-virt in provider count to the 5.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: interconnect-restore-sync-state-by-ignoring-ipa-virt-in-provider-count.patch and it can be found in the queue-5.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From foo@baz Mon Jun 13 10:02:03 AM CEST 2022 From: Alex Elder <elder@xxxxxxxxxx> Date: Wed, 8 Jun 2022 15:54:15 -0500 Subject: interconnect: Restore sync state by ignoring ipa-virt in provider count To: stable@xxxxxxxxxxxxxxx Cc: Stephen Boyd <swboyd@xxxxxxxxxxxx>, elder@xxxxxxxxxx, dianders@xxxxxxxxxxxx, bjorn.andersson@xxxxxxxxxx, djakov@xxxxxxxxxx, quic_mdtipton@xxxxxxxxxxx, quic_tdas@xxxxxxxxxxx Message-ID: <20220608205415.185248-3-elder@xxxxxxxxxx> From: Stephen Boyd <swboyd@xxxxxxxxxxxx> commit 20ce30fb4750f2ffc130cdcb26232b1dd87cd0a5 upstream. Ignore compatible strings for the IPA virt drivers that were removed in commits 2fb251c26560 ("interconnect: qcom: sdx55: Drop IP0 interconnects") and 2f3724930eb4 ("interconnect: qcom: sc7180: Drop IP0 interconnects") so that the sync state logic can kick in again. Otherwise all the interconnects in the system will stay pegged at max speeds because 'providers_count' is always going to be one larger than the number of drivers that will ever probe on sc7180 or sdx55. This fixes suspend on sc7180 and sdx55 devices when you don't have a devicetree patch to remove the ipa-virt compatible node. Cc: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx> Cc: Doug Anderson <dianders@xxxxxxxxxxxx> Cc: Alex Elder <elder@xxxxxxxxxx> Cc: Taniya Das <quic_tdas@xxxxxxxxxxx> Cc: Mike Tipton <quic_mdtipton@xxxxxxxxxxx> Cc: <stable@xxxxxxxxxxxxxxx> # 5.10.x Fixes: 2fb251c26560 ("interconnect: qcom: sdx55: Drop IP0 interconnects") Fixes: 2f3724930eb4 ("interconnect: qcom: sc7180: Drop IP0 interconnects") Signed-off-by: Stephen Boyd <swboyd@xxxxxxxxxxxx> Reviewed-by: Alex Elder <elder@xxxxxxxxxx> Reviewed-by: Douglas Anderson <dianders@xxxxxxxxxxxx> Link: https://lore.kernel.org/r/20220427013226.341209-1-swboyd@xxxxxxxxxxxx Signed-off-by: Georgi Djakov <djakov@xxxxxxxxxx> Signed-off-by: Alex Elder <elder@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/interconnect/core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) --- a/drivers/interconnect/core.c +++ b/drivers/interconnect/core.c @@ -1084,9 +1084,14 @@ static int of_count_icc_providers(struct { struct device_node *child; int count = 0; + const struct of_device_id __maybe_unused ignore_list[] = { + { .compatible = "qcom,sc7180-ipa-virt" }, + {} + }; for_each_available_child_of_node(np, child) { - if (of_property_read_bool(child, "#interconnect-cells")) + if (of_property_read_bool(child, "#interconnect-cells") && + likely(!of_match_node(ignore_list, child))) count++; count += of_count_icc_providers(child); } Patches currently in stable-queue which might be from elder@xxxxxxxxxx are queue-5.10/interconnect-restore-sync-state-by-ignoring-ipa-virt-in-provider-count.patch queue-5.10/interconnect-qcom-sc7180-drop-ip0-interconnects.patch