Patch "interconnect: qcom: msm8996: Provide UFS clocks to A2NoC" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

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

    interconnect: qcom: msm8996: Provide UFS clocks to A2NoC

to the 6.1-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-msm8996-provide-ufs-clocks-to-a2no.patch
and it can be found in the queue-6.1 subdirectory.

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



commit e9a1181a51b33d9cc64cbbe3737a4ebe6a112db5
Author: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
Date:   Sat Dec 10 21:03:50 2022 +0100

    interconnect: qcom: msm8996: Provide UFS clocks to A2NoC
    
    [ Upstream commit 60426ff08af6a21275d9c879c0dfb09406469868 ]
    
    On eMMC devices the bootloader has no business enabling UFS clocks.
    That results in a platform hang and hard reboot when trying to vote
    on paths including MASTER_UFS and since sync_state guarantees that
    it's done at boot time, this effectively prevents such devices from
    booting. Fix that.
    
    Fixes: 7add937f5222 ("interconnect: qcom: Add MSM8996 interconnect provider driver")
    Signed-off-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
    Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
    Tested-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx> #db820c
    Link: https://lore.kernel.org/r/20221210200353.418391-3-konrad.dybcio@xxxxxxxxxx
    Signed-off-by: Georgi Djakov <djakov@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/interconnect/qcom/msm8996.c b/drivers/interconnect/qcom/msm8996.c
index c2903ae3b3bc..7ddb1f23fb2a 100644
--- a/drivers/interconnect/qcom/msm8996.c
+++ b/drivers/interconnect/qcom/msm8996.c
@@ -33,6 +33,13 @@ static const char * const bus_a0noc_clocks[] = {
 	"aggre0_noc_mpu_cfg"
 };
 
+static const char * const bus_a2noc_clocks[] = {
+	"bus",
+	"bus_a",
+	"aggre2_ufs_axi",
+	"ufs_axi"
+};
+
 static const u16 mas_a0noc_common_links[] = {
 	MSM8996_SLAVE_A0NOC_SNOC
 };
@@ -1859,6 +1866,8 @@ static const struct qcom_icc_desc msm8996_a2noc = {
 	.type = QCOM_ICC_NOC,
 	.nodes = a2noc_nodes,
 	.num_nodes = ARRAY_SIZE(a2noc_nodes),
+	.clocks = bus_a2noc_clocks,
+	.num_clocks = ARRAY_SIZE(bus_a2noc_clocks),
 	.regmap_cfg = &msm8996_a2noc_regmap_config
 };