]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
memory: tegra: Protect SID override call under CONFIG_IOMMU_API
authorAshish Mhetre <amhetre@nvidia.com>
Tue, 5 Dec 2023 06:00:45 +0000 (11:30 +0530)
committerKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Wed, 6 Dec 2023 10:22:24 +0000 (11:22 +0100)
tegra186_mc_client_sid_override() is protected under CONFIG_IOMMU_API.
Call to this function is being made from tegra186_mc_resume() without
any protection which is leading to build failure when CONFIG_IOMMU_API
is not set. Fix this by protecting SID override function call from
tegra186_mc_resume() under CONFIG_IOMMU_API.

Fixes: fe3b082a6eb8 ("memory: tegra: Add SID override programming for MC clients")
Signed-off-by: Ashish Mhetre <amhetre@nvidia.com>
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
Link: https://lore.kernel.org/r/20231205060045.7985-1-amhetre@nvidia.com
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
drivers/memory/tegra/tegra186.c

index d1f1dfb427161ec265791e79feb7cb2a205651c5..0ff014a9d3cd420081fb16b27c870d505a583146 100644 (file)
@@ -141,6 +141,7 @@ static int tegra186_mc_probe_device(struct tegra_mc *mc, struct device *dev)
 
 static int tegra186_mc_resume(struct tegra_mc *mc)
 {
+#if IS_ENABLED(CONFIG_IOMMU_API)
        unsigned int i;
 
        for (i = 0; i < mc->soc->num_clients; i++) {
@@ -148,6 +149,7 @@ static int tegra186_mc_resume(struct tegra_mc *mc)
 
                tegra186_mc_client_sid_override(mc, client, client->sid);
        }
+#endif
 
        return 0;
 }