This is a note to let you know that I've just added the patch titled memory: tegra: fix interconnect registration race 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: memory-tegra-fix-interconnect-registration-race.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. >From 5553055c62683ce339f9ef5fb2a26c8331485d68 Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan+linaro@xxxxxxxxxx> Date: Mon, 6 Mar 2023 08:56:45 +0100 Subject: memory: tegra: fix interconnect registration race From: Johan Hovold <johan+linaro@xxxxxxxxxx> commit 5553055c62683ce339f9ef5fb2a26c8331485d68 upstream. The current interconnect provider registration interface is inherently racy as nodes are not added until the after adding the provider. This can specifically cause racing DT lookups to fail. Switch to using the new API where the provider is not registered until after it has been fully initialised. Fixes: 06f079816d4c ("memory: tegra-mc: Add interconnect framework") Cc: stable@xxxxxxxxxxxxxxx # 5.11 Cc: Dmitry Osipenko <digetx@xxxxxxxxx> Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx> Signed-off-by: Johan Hovold <johan+linaro@xxxxxxxxxx> Link: https://lore.kernel.org/r/20230306075651.2449-18-johan+linaro@xxxxxxxxxx Signed-off-by: Georgi Djakov <djakov@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/memory/tegra/mc.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) --- a/drivers/memory/tegra/mc.c +++ b/drivers/memory/tegra/mc.c @@ -769,16 +769,12 @@ static int tegra_mc_interconnect_setup(s mc->provider.aggregate = mc->soc->icc_ops->aggregate; mc->provider.xlate_extended = mc->soc->icc_ops->xlate_extended; - err = icc_provider_add(&mc->provider); - if (err) - return err; + icc_provider_init(&mc->provider); /* create Memory Controller node */ node = icc_node_create(TEGRA_ICC_MC); - if (IS_ERR(node)) { - err = PTR_ERR(node); - goto del_provider; - } + if (IS_ERR(node)) + return PTR_ERR(node); node->name = "Memory Controller"; icc_node_add(node, &mc->provider); @@ -805,12 +801,14 @@ static int tegra_mc_interconnect_setup(s goto remove_nodes; } + err = icc_provider_register(&mc->provider); + if (err) + goto remove_nodes; + return 0; remove_nodes: icc_nodes_remove(&mc->provider); -del_provider: - icc_provider_del(&mc->provider); return err; } Patches currently in stable-queue which might be from johan+linaro@xxxxxxxxxx are queue-6.1/memory-tegra20-emc-fix-interconnect-registration-race.patch queue-6.1/memory-tegra124-emc-fix-interconnect-registration-race.patch queue-6.1/serial-qcom-geni-fix-console-shutdown-hang.patch queue-6.1/interconnect-exynos-fix-registration-race.patch queue-6.1/interconnect-imx-fix-registration-race.patch queue-6.1/memory-tegra30-emc-fix-interconnect-registration-race.patch queue-6.1/interconnect-qcom-msm8974-fix-registration-race.patch queue-6.1/memory-tegra-fix-interconnect-registration-race.patch queue-6.1/interconnect-qcom-rpm-fix-probe-child-node-error-handling.patch queue-6.1/interconnect-qcom-rpm-fix-registration-race.patch queue-6.1/interconnect-fix-provider-registration-api.patch queue-6.1/interconnect-fix-icc_provider_del-error-handling.patch queue-6.1/interconnect-qcom-rpmh-fix-registration-race.patch queue-6.1/interconnect-fix-mem-leak-when-freeing-nodes.patch queue-6.1/interconnect-qcom-rpmh-fix-probe-child-node-error-handling.patch queue-6.1/interconnect-exynos-fix-node-leak-in-probe-pm-qos-error-path.patch queue-6.1/interconnect-qcom-osm-l3-fix-registration-race.patch