Patch "interconnect: qcom: sdm845: Enable keepalive for the MM1 BCM" has been added to the 5.9-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    interconnect: qcom: sdm845: Enable keepalive for the MM1 BCM

to the 5.9-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-qcom-sdm845-enable-keepalive-for-the-mm.patch
and it can be found in the queue-5.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 7c9934fdf2d67fbdab74c73235753376fdffd9da
Author: Georgi Djakov <georgi.djakov@xxxxxxxxxx>
Date:   Mon Oct 12 22:40:34 2020 +0300

    interconnect: qcom: sdm845: Enable keepalive for the MM1 BCM
    
    [ Upstream commit 5be1805dc3961ce0465bcb0beab85fe8580af08d ]
    
    After enabling interconnect scaling for display on the db845c board,
    in certain configurations the board hangs, while the following errors
    are observed on the console:
    
      Error sending AMC RPMH requests (-110)
      qcom_rpmh TCS Busy, retrying RPMH message send: addr=0x50000
      qcom_rpmh TCS Busy, retrying RPMH message send: addr=0x50000
      qcom_rpmh TCS Busy, retrying RPMH message send: addr=0x50000
      ...
    
    In this specific case, the above is related to one of the sequencers
    being stuck, while client drivers are returning from probe and trying
    to disable the currently unused clock and interconnect resources.
    Generally we want to keep the multimedia NoC enabled like the rest of
    the NoCs, so let's set the keepalive flag on it too.
    
    Fixes: aae57773fbe0 ("interconnect: qcom: sdm845: Split qnodes into their respective NoCs")
    Reported-by: Amit Pundir <amit.pundir@xxxxxxxxxx>
    Reviewed-by: Mike Tipton <mdtipton@xxxxxxxxxxxxxx>
    Tested-by: John Stultz <john.stultz@xxxxxxxxxx>
    Link: https://lore.kernel.org/r/20201012194034.26944-1-georgi.djakov@xxxxxxxxxx
    Signed-off-by: Georgi Djakov <georgi.djakov@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/interconnect/qcom/sdm845.c b/drivers/interconnect/qcom/sdm845.c
index f6c7b969520d0..86f08c0f4c41b 100644
--- a/drivers/interconnect/qcom/sdm845.c
+++ b/drivers/interconnect/qcom/sdm845.c
@@ -151,7 +151,7 @@ DEFINE_QBCM(bcm_mc0, "MC0", true, &ebi);
 DEFINE_QBCM(bcm_sh0, "SH0", true, &qns_llcc);
 DEFINE_QBCM(bcm_mm0, "MM0", false, &qns_mem_noc_hf);
 DEFINE_QBCM(bcm_sh1, "SH1", false, &qns_apps_io);
-DEFINE_QBCM(bcm_mm1, "MM1", false, &qxm_camnoc_hf0_uncomp, &qxm_camnoc_hf1_uncomp, &qxm_camnoc_sf_uncomp, &qxm_camnoc_hf0, &qxm_camnoc_hf1, &qxm_mdp0, &qxm_mdp1);
+DEFINE_QBCM(bcm_mm1, "MM1", true, &qxm_camnoc_hf0_uncomp, &qxm_camnoc_hf1_uncomp, &qxm_camnoc_sf_uncomp, &qxm_camnoc_hf0, &qxm_camnoc_hf1, &qxm_mdp0, &qxm_mdp1);
 DEFINE_QBCM(bcm_sh2, "SH2", false, &qns_memnoc_snoc);
 DEFINE_QBCM(bcm_mm2, "MM2", false, &qns2_mem_noc);
 DEFINE_QBCM(bcm_sh3, "SH3", false, &acm_tcu);