From: Thierry Reding <treding@xxxxxxxxxx>
>From Tegra20 through Tegra210, either the GART or SMMU drivers need
access to the internals of the memory controller driver because they are
tightly coupled (in fact, the GART and SMMU are part of the memory
controller). On later chips, a separate hardware block implements the
SMMU functionality, so this is no longer needed. However, we still want
to reuse some of the existing infrastructure on later chips, so split
the memory controller internals into a separate header file to avoid
conflicts with the implementation on newer chips.
Signed-off-by: Thierry Reding <treding@xxxxxxxxxx>
---
drivers/iommu/tegra-gart.c | 2 +-
drivers/iommu/tegra-smmu.c | 2 +-
drivers/memory/tegra/mc.h | 2 +-
drivers/memory/tegra/tegra186.c | 12 ++++---
include/soc/tegra/mc-internal.h | 62 +++++++++++++++++++++++++++++++++
include/soc/tegra/mc.h | 50 --------------------------
6 files changed, 72 insertions(+), 58 deletions(-)
create mode 100644 include/soc/tegra/mc-internal.h
diff --git a/drivers/iommu/tegra-gart.c b/drivers/iommu/tegra-gart.c
index 6f130e51f072..716185234b2a 100644
--- a/drivers/iommu/tegra-gart.c
+++ b/drivers/iommu/tegra-gart.c
@@ -17,7 +17,7 @@
#include <linux/spinlock.h>
#include <linux/vmalloc.h>
-#include <soc/tegra/mc.h>
+#include <soc/tegra/mc-internal.h>
#define GART_REG_BASE 0x24
#define GART_CONFIG (0x24 - GART_REG_BASE)
diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c
index 602aab98c079..fdb798c62596 100644
--- a/drivers/iommu/tegra-smmu.c
+++ b/drivers/iommu/tegra-smmu.c
@@ -17,7 +17,7 @@
#include <linux/dma-mapping.h>
#include <soc/tegra/ahb.h>
-#include <soc/tegra/mc.h>
+#include <soc/tegra/mc-internal.h>
struct tegra_smmu_group {
struct list_head list;
diff --git a/drivers/memory/tegra/mc.h b/drivers/memory/tegra/mc.h
index 1ee34f0da4f7..116bf68325b7 100644
--- a/drivers/memory/tegra/mc.h
+++ b/drivers/memory/tegra/mc.h
@@ -10,7 +10,7 @@
#include <linux/io.h>
#include <linux/types.h>
-#include <soc/tegra/mc.h>
+#include <soc/tegra/mc-internal.h>
#define MC_INTSTATUS 0x00
#define MC_INTMASK 0x04
diff --git a/drivers/memory/tegra/tegra186.c b/drivers/memory/tegra/tegra186.c
index e25c954dde2e..aa676c45650b 100644
--- a/drivers/memory/tegra/tegra186.c
+++ b/drivers/memory/tegra/tegra186.c
@@ -9,6 +9,8 @@
#include <linux/of_device.h>
#include <linux/platform_device.h>
+#include <soc/tegra/mc.h>
+
#if defined(CONFIG_ARCH_TEGRA_186_SOC)
#include <dt-bindings/memory/tegra186-mc.h>
#endif
@@ -31,14 +33,14 @@ struct tegra186_mc_soc {
unsigned int num_clients;
};
-struct tegra186_mc {
+struct tegra_mc {
struct device *dev;
void __iomem *regs;
const struct tegra186_mc_soc *soc;
};
-static void tegra186_mc_program_sid(struct tegra186_mc *mc)
+static void tegra186_mc_program_sid(struct tegra_mc *mc)
{
unsigned int i;
@@ -1523,8 +1525,8 @@ static const struct tegra186_mc_soc tegra194_mc_soc = {
static int tegra186_mc_probe(struct platform_device *pdev)
{
- struct tegra186_mc *mc;
struct resource *res;
+ struct tegra_mc *mc;
int err;
mc = devm_kzalloc(&pdev->dev, sizeof(*mc), GFP_KERNEL);
@@ -1552,7 +1554,7 @@ static int tegra186_mc_probe(struct platform_device *pdev)
static int tegra186_mc_remove(struct platform_device *pdev)
{
- struct tegra186_mc *mc = platform_get_drvdata(pdev);
+ struct tegra_mc *mc = platform_get_drvdata(pdev);
of_platform_depopulate(mc->dev);
@@ -1577,7 +1579,7 @@ static int __maybe_unused tegra186_mc_suspend(struct device *dev)
static int __maybe_unused tegra186_mc_resume(struct device *dev)
{
- struct tegra186_mc *mc = dev_get_drvdata(dev);
+ struct tegra_mc *mc = dev_get_drvdata(dev);
tegra186_mc_program_sid(mc);
diff --git a/include/soc/tegra/mc-internal.h b/include/soc/tegra/mc-internal.h
new file mode 100644
index 000000000000..4f327695d58c
--- /dev/null
+++ b/include/soc/tegra/mc-internal.h
@@ -0,0 +1,62 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (C) 2014 NVIDIA Corporation
+ * Copyright (C) 2021 NVIDIA Corporation
+ */
+
+#ifndef __SOC_TEGRA_MC_INTERNAL_H__
+#define __SOC_TEGRA_MC_INTERNAL_H__
+
+#include <soc/tegra/mc.h>
+
+struct tegra_mc_soc {
+ const struct tegra_mc_client *clients;
+ unsigned int num_clients;
+
+ const unsigned long *emem_regs;
+ unsigned int num_emem_regs;
+
+ unsigned int num_address_bits;
+ unsigned int atom_size;
+
+ u8 client_id_mask;
+
+ const struct tegra_smmu_soc *smmu;
+
+ u32 intmask;
+
+ const struct tegra_mc_reset_ops *reset_ops;
+ const struct tegra_mc_reset *resets;
+ unsigned int num_resets;
+
+ const struct tegra_mc_icc_ops *icc_ops;
+
+ int (*init)(struct tegra_mc *mc);
+};
+
+struct tegra_mc {
+ struct device *dev;
+ struct tegra_smmu *smmu;
+ struct gart_device *gart;
+ void __iomem *regs;
+ struct clk *clk;
+ int irq;
+
+ const struct tegra_mc_soc *soc;
+ unsigned long tick;
+
+ struct tegra_mc_timing *timings;
+ unsigned int num_timings;
+
+ struct reset_controller_dev reset;
+
+ struct icc_provider provider;
+
+ spinlock_t lock;
+
+ struct {
+ struct dentry *root;
+ } debugfs;
+};
+
+#endif /* __SOC_TEGRA_MC_INTERNAL_H__ */
diff --git a/include/soc/tegra/mc.h b/include/soc/tegra/mc.h
index d2fbe6a8b25b..7be8441c6e9e 100644
--- a/include/soc/tegra/mc.h
+++ b/include/soc/tegra/mc.h
@@ -155,56 +155,6 @@ struct tegra_mc_icc_ops {
void *data);
};
-struct tegra_mc_soc {
- const struct tegra_mc_client *clients;
- unsigned int num_clients;
-
- const unsigned long *emem_regs;
- unsigned int num_emem_regs;
-
- unsigned int num_address_bits;
- unsigned int atom_size;
-
- u8 client_id_mask;
-
- const struct tegra_smmu_soc *smmu;
-
- u32 intmask;
-
- const struct tegra_mc_reset_ops *reset_ops;
- const struct tegra_mc_reset *resets;
- unsigned int num_resets;
-
- const struct tegra_mc_icc_ops *icc_ops;
-
- int (*init)(struct tegra_mc *mc);
-};
-
-struct tegra_mc {
- struct device *dev;
- struct tegra_smmu *smmu;
- struct gart_device *gart;
- void __iomem *regs;
- struct clk *clk;
- int irq;
-
- const struct tegra_mc_soc *soc;
- unsigned long tick;
-
- struct tegra_mc_timing *timings;
- unsigned int num_timings;
-
- struct reset_controller_dev reset;
-
- struct icc_provider provider;
-
- spinlock_t lock;
-
- struct {
- struct dentry *root;
- } debugfs;
-};
-
int tegra_mc_write_emem_configuration(struct tegra_mc *mc, unsigned long rate);
unsigned int tegra_mc_get_emem_device_count(struct tegra_mc *mc);
--
2.30.2
