Skip to contentSkip to conversation

memory: tegra: Tegra234 and error logging support

PATCH New Thierry Reding 1 participant 2 messages May 6, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover memory: tegra: Tegra234 and error logging support

From: Thierry Reding <[email protected]>

Hi Krzysztof,

here's the set of patches that add the initial Tegra234 support with Ashish's error logging support applied on top. This should all apply cleanly onto v5.18-rc1 (and consequently to your tree).

Thierry

Ashish Mhetre (2):
memory: tegra: Add memory controller channels support
memory: tegra: Add MC error logging on Tegra186 onward

Sameer Pujar (1):
memory: tegra: Add APE memory clients for Tegra234

Thierry Reding (1):
memory: tegra: Add Tegra234 support

 drivers/memory/tegra/Makefile       |   2 +
 drivers/memory/tegra/mc.c           | 137 ++++++++++++++++++++++++----
 drivers/memory/tegra/mc.h           |  50 +++++++++-
 drivers/memory/tegra/tegra186-emc.c |   3 +
 drivers/memory/tegra/tegra186.c     |  39 ++++++++
 drivers/memory/tegra/tegra194.c     |   9 ++
 drivers/memory/tegra/tegra234.c     | 110 ++++++++++++++++++++++
 include/soc/tegra/mc.h              |   8 +-
 8 files changed, 339 insertions(+), 19 deletions(-)
 create mode 100644 drivers/memory/tegra/tegra234.c
Signature · 1 line
2.35.1
#1 lore raw

PATCH 1/4 memory: tegra: Add Tegra234 support

From: Thierry Reding <[email protected]>

The memory controller and external memory controller found on Tegra234 is similar to the version found on earlier SoCs but supports a number of new memory clients.

Add initial memory client definitions for the Tegra234 so that the SMMU stream ID override registers can be properly programmed at boot time.

---
 drivers/memory/tegra/Makefile       |  2 +
 drivers/memory/tegra/mc.c           |  3 ++
 drivers/memory/tegra/mc.h           |  7 ++-
 drivers/memory/tegra/tegra186-emc.c |  3 ++
 drivers/memory/tegra/tegra234.c     | 81 +++++++++++++++++++++++++++++
 5 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 drivers/memory/tegra/tegra234.c
drivers/memory/tegra/Makefile +2 -0
index c992e87782d2..0750847dac3c 100644
@@ -9,6 +9,7 @@ tegra-mc-$(CONFIG_ARCH_TEGRA_132_SOC) += tegra124.o
 tegra-mc-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210.o
 tegra-mc-$(CONFIG_ARCH_TEGRA_186_SOC) += tegra186.o
 tegra-mc-$(CONFIG_ARCH_TEGRA_194_SOC) += tegra186.o tegra194.o
+tegra-mc-$(CONFIG_ARCH_TEGRA_234_SOC) += tegra186.o tegra234.o
 
 obj-$(CONFIG_TEGRA_MC) += tegra-mc.o
 
@@ -19,5 +20,6 @@ obj-$(CONFIG_TEGRA210_EMC_TABLE) += tegra210-emc-table.o
 obj-$(CONFIG_TEGRA210_EMC) += tegra210-emc.o
 obj-$(CONFIG_ARCH_TEGRA_186_SOC) += tegra186-emc.o
 obj-$(CONFIG_ARCH_TEGRA_194_SOC) += tegra186-emc.o
+obj-$(CONFIG_ARCH_TEGRA_234_SOC) += tegra186-emc.o
 
 tegra210-emc-y := tegra210-emc-core.o tegra210-emc-cc-r21021.o
drivers/memory/tegra/mc.c +3 -0
index 44b4a4080920..bf3abb6d8354 100644
@@ -44,6 +44,9 @@ static const struct of_device_id tegra_mc_of_match[] = {
 #endif
 #ifdef CONFIG_ARCH_TEGRA_194_SOC
 	{ .compatible = "nvidia,tegra194-mc", .data = &tegra194_mc_soc },
+#endif
+#ifdef CONFIG_ARCH_TEGRA_234_SOC
+	{ .compatible = "nvidia,tegra234-mc", .data = &tegra234_mc_soc },
 #endif
 	{ /* sentinel */ }
 };
drivers/memory/tegra/mc.h +6 -1
index 1e492989c363..062886e94c04 100644
@@ -137,6 +137,10 @@ extern const struct tegra_mc_soc tegra186_mc_soc;
 extern const struct tegra_mc_soc tegra194_mc_soc;
 #endif
 
+#ifdef CONFIG_ARCH_TEGRA_234_SOC
+extern const struct tegra_mc_soc tegra234_mc_soc;
+#endif
+
 #if defined(CONFIG_ARCH_TEGRA_3x_SOC) || \
     defined(CONFIG_ARCH_TEGRA_114_SOC) || \
     defined(CONFIG_ARCH_TEGRA_124_SOC) || \
@@ -147,7 +151,8 @@ extern const struct tegra_mc_ops tegra30_mc_ops;
 #endif
 
 #if defined(CONFIG_ARCH_TEGRA_186_SOC) || \
-    defined(CONFIG_ARCH_TEGRA_194_SOC)
+    defined(CONFIG_ARCH_TEGRA_194_SOC) || \
+    defined(CONFIG_ARCH_TEGRA_234_SOC)
 extern const struct tegra_mc_ops tegra186_mc_ops;
 #endif
 
drivers/memory/tegra/tegra186-emc.c +3 -0
index 746c4ef2c0af..54b47ca33483 100644
@@ -272,6 +272,9 @@ static const struct of_device_id tegra186_emc_of_match[] = {
 #endif
 #if defined(CONFIG_ARCH_TEGRA_194_SOC)
 	{ .compatible = "nvidia,tegra194-emc" },
+#endif
+#if defined(CONFIG_ARCH_TEGRA_234_SOC)
+	{ .compatible = "nvidia,tegra234-emc" },
 #endif
 	{ /* sentinel */ }
 };
drivers/memory/tegra/tegra234.c new file +81 -0

81 lines not on this page · raw message

Signature · 1 line
2.35.1