memory: tegra: Extract memory client SID programming
authorThierry Reding <treding@nvidia.com>
Sun, 22 Dec 2019 14:10:28 +0000 (15:10 +0100)
committerThierry Reding <treding@nvidia.com>
Thu, 9 Jan 2020 18:12:40 +0000 (19:12 +0100)
Move programming of the memory client to SID mapping into a separate
function so that it can be reused from multiple call sites.

Signed-off-by: Thierry Reding <treding@nvidia.com>
drivers/memory/tegra/tegra186.c

index ad5c353..5789511 100644 (file)
@@ -32,6 +32,32 @@ struct tegra186_mc {
        const struct tegra186_mc_soc *soc;
 };
 
+static void tegra186_mc_program_sid(struct tegra186_mc *mc)
+{
+       unsigned int i;
+
+       for (i = 0; i < mc->soc->num_clients; i++) {
+               const struct tegra186_mc_client *client = &mc->soc->clients[i];
+               u32 override, security;
+
+               override = readl(mc->regs + client->regs.override);
+               security = readl(mc->regs + client->regs.security);
+
+               dev_dbg(mc->dev, "client %s: override: %x security: %x\n",
+                       client->name, override, security);
+
+               dev_dbg(mc->dev, "setting SID %u for %s\n", client->sid,
+                       client->name);
+               writel(client->sid, mc->regs + client->regs.override);
+
+               override = readl(mc->regs + client->regs.override);
+               security = readl(mc->regs + client->regs.security);
+
+               dev_dbg(mc->dev, "client %s: override: %x security: %x\n",
+                       client->name, override, security);
+       }
+}
+
 static const struct tegra186_mc_client tegra186_mc_clients[] = {
        {
                .name = "ptcr",
@@ -549,7 +575,6 @@ static int tegra186_mc_probe(struct platform_device *pdev)
 {
        struct tegra186_mc *mc;
        struct resource *res;
-       unsigned int i;
        int err;
 
        mc = devm_kzalloc(&pdev->dev, sizeof(*mc), GFP_KERNEL);
@@ -565,28 +590,8 @@ static int tegra186_mc_probe(struct platform_device *pdev)
 
        mc->dev = &pdev->dev;
 
-       for (i = 0; i < mc->soc->num_clients; i++) {
-               const struct tegra186_mc_client *client = &mc->soc->clients[i];
-               u32 override, security;
-
-               override = readl(mc->regs + client->regs.override);
-               security = readl(mc->regs + client->regs.security);
-
-               dev_dbg(&pdev->dev, "client %s: override: %x security: %x\n",
-                       client->name, override, security);
-
-               dev_dbg(&pdev->dev, "setting SID %u for %s\n", client->sid,
-                       client->name);
-               writel(client->sid, mc->regs + client->regs.override);
-
-               override = readl(mc->regs + client->regs.override);
-               security = readl(mc->regs + client->regs.security);
-
-               dev_dbg(&pdev->dev, "client %s: override: %x security: %x\n",
-                       client->name, override, security);
-       }
-
        platform_set_drvdata(pdev, mc);
+       tegra186_mc_program_sid(mc);
 
        return err;
 }