memory: tegra: Add Tegra264 support
v2 cover memory: tegra: Add Tegra264 support
From: Thierry Reding <[email protected]>
This set of patches extends the DT bindings for the memory controller and external memory controller for Tegra264 and add the necessary DT headers with memory client and stream ID definitions.
The driver changes in patch 4 are mostly an extension of existing code and the bulk consists of the memory client table for the new chip as well as the bandwidth manager calculations.
Changes in v2:
- squash DT bindings patches into a single patch
- address review comments for bindings
- add Acked-by on patch 2
Thierry
Sumit Gupta (2):
dt-bindings: memory: tegra: Add Tegra264 support
memory: tegra: Add Tegra264 MC and EMC support
.../nvidia,tegra186-mc.yaml | 84 ++++- drivers/memory/tegra/Makefile | 2 + drivers/memory/tegra/mc.c | 5 +- drivers/memory/tegra/mc.h | 9 +- drivers/memory/tegra/tegra186-emc.c | 5 +- drivers/memory/tegra/tegra186.c | 17 +- drivers/memory/tegra/tegra264-bwmgr.h | 50 +++ drivers/memory/tegra/tegra264.c | 313 ++++++++++++++++++ include/dt-bindings/memory/nvidia,tegra264.h | 136 ++++++++ 9 files changed, 613 insertions(+), 8 deletions(-) create mode 100644 drivers/memory/tegra/tegra264-bwmgr.h create mode 100644 drivers/memory/tegra/tegra264.c create mode 100644 include/dt-bindings/memory/nvidia,tegra264.h
Signature · 1 line
2.50.0
PATCH v2 1/2 dt-bindings: memory: tegra: Add Tegra264 support
From: Sumit Gupta <[email protected]>
Add bindings for the Memory Controller (MC) and External Memory Controller (EMC) found on the Tegra264 SoC. Tegra264 SoC has a different number of interrupt lines for MC sub-units: UCF_SOC, hub, hub common, syncpoint and MC channel. The total number of interrupt lines is eight. Update maxItems for MC interrupts accordingly.
This also adds a header containing the memory client ID definitions that are used by the interconnects property in DT and the tegra_mc_client table in the MC driver. These IDs are defined by the hardware, so the numbering doesn't start at 0 and contains holes. Also added are the stream IDs for various hardware blocks found on Tegra264. These are allocated as blocks of 256 IDs and each block can be subdivided for additional fine-grained isolation if needed.
---
Changes in v2:
- add interrupts and interrupt-names constraints for previous chips
- add missing maxItems for reg property on Tegra264
- squash memory client IDs and stream IDs patches
.../nvidia,tegra186-mc.yaml | 84 ++++++++++- include/dt-bindings/memory/nvidia,tegra264.h | 136 ++++++++++++++++++ 2 files changed, 218 insertions(+), 2 deletions(-) create mode 100644 include/dt-bindings/memory/nvidia,tegra264.h
Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-mc.yaml +82 -2
@@ -32,6 +32,7 @@ properties: - nvidia,tegra186-mc - nvidia,tegra194-mc - nvidia,tegra234-mc + - nvidia,tegra264-mc reg: minItems: 6
@@ -42,8 +43,12 @@ properties: maxItems: 18 interrupts: - items: - - description: MC general interrupt + minItems: 1 + maxItems: 8 + + interrupt-names: + minItems: 1 + maxItems: 8 "#address-cells": const: 2
@@ -74,6 +79,7 @@ patternProperties: - nvidia,tegra186-emc - nvidia,tegra194-emc - nvidia,tegra234-emc + - nvidia,tegra264-emc reg: minItems: 1
@@ -127,6 +133,15 @@ patternProperties: reg: minItems: 2 + - if: + properties: + compatible: + const: nvidia,tegra264-emc + then: + properties: + reg: + minItems: 2 + additionalProperties: false required:
@@ -158,6 +173,12 @@ allOf: - const: ch2 - const: ch3 + interrupts: + items: + - description: MC general interrupt + + interrupt-names: false + - if: properties: compatible:
@@ -189,6 +210,12 @@ allOf: - const: ch14 - const: ch15 + interrupts: + items: + - description: MC general interrupt + + interrupt-names: false + - if: properties: compatible:
@@ -220,6 +247,59 @@ allOf: - const: ch14 - const: ch15 + interrupts: + items: + - description: MC general interrupt + + interrupt-names: false + + - if: + properties: + compatible: + const: nvidia,tegra264-mc + then: + properties: + reg: + minItems: 17 + maxItems: 17 + description: 17 memory controller channels + + reg-names: + items: + - const: broadcast + - const: ch0 + - const: ch1 + - const: ch2 + - const: ch3 + - const: ch4 + - const: ch5 + - const: ch6 + - const: ch7 + - const: ch8 + - const: ch9 + - const: ch10 + - const: ch11 + - const: ch12 + - const: ch13 + - const: ch14 + - const: ch15 + + interrupts: + minItems: 8 + maxItems: 8 + description: One interrupt line for each MC component + + interrupt-names: + items: + - const: mcf + - const: hub1 + - const: hub2 + - const: hub3 + - const: hub4 + - const: hub5 + - const: sbs + - const: channel + additionalProperties: false required:
include/dt-bindings/memory/nvidia,tegra264.h new file +136 -0
136 lines not on this page · raw message
Signature · 1 line
2.50.0
Re: [PATCH v2 1/2] dt-bindings: memory: tegra: Add Tegra264 support
Quoted 16 lines · Thierry Reding
From: Sumit Gupta <[email protected]>
Add bindings for the Memory Controller (MC) and External Memory Controller (EMC) found on the Tegra264 SoC. Tegra264 SoC has a different number of interrupt lines for MC sub-units:
UCF_SOC, hub, hub common, syncpoint and MC channel. The total number of interrupt lines is eight. Update maxItems for MC interrupts accordingly.This also adds a header containing the memory client ID definitions that are used by the interconnects property in DT and the
tegra_mc_clienttable in the MC driver. These IDs are defined by the hardware, so the numbering doesn't start at 0 and contains holes. Also added are the stream IDs for various hardware blocks found on Tegra264. These are allocated as blocks of 256 IDs and each block can be subdivided for additional fine-grained isolation if needed.
Quoted 8 lines
Signed-off-by Sumit Gupta <[email protected]>[[email protected]: add SMMU stream IDs, squash patches]Signed-off-by Thierry Reding <[email protected]>---
Changes in v2:
- add interrupts and interrupt-names constraints for previous chips
- add missing maxItems for reg property on Tegra264
- squash memory client IDs and stream IDs patches
(also as an Ack)
Best regards,
Krzysztof
PATCH v2 2/2 memory: tegra: Add Tegra264 MC and EMC support
In reply to Thierry RedingFrom: Sumit Gupta <[email protected]>
Add support to enable Memory Controller (MC) and External Memory Controller (EMC) drivers for Tegra264. The nodes for MC and EMC are mostly the same as Tegra234 but differ in number of channels and interrupt numbers.
The patch also adds the bandwidth manager definitions required for Tegra264 and uses them to populate the memory client table. All of these are needed to properly enable memory interconnect (ICC) support.
--- drivers/memory/tegra/Makefile | 2 + drivers/memory/tegra/mc.c | 5 +- drivers/memory/tegra/mc.h | 9 +- drivers/memory/tegra/tegra186-emc.c | 5 +- drivers/memory/tegra/tegra186.c | 17 +- drivers/memory/tegra/tegra264-bwmgr.h | 50 ++++ drivers/memory/tegra/tegra264.c | 313 ++++++++++++++++++++++++++ 7 files changed, 395 insertions(+), 6 deletions(-) create mode 100644 drivers/memory/tegra/tegra264-bwmgr.h create mode 100644 drivers/memory/tegra/tegra264.c
drivers/memory/tegra/Makefile +2 -0
@@ -10,6 +10,7 @@ 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 +tegra-mc-$(CONFIG_ARCH_TEGRA_264_SOC) += tegra186.o tegra264.o obj-$(CONFIG_TEGRA_MC) += tegra-mc.o
@@ -21,5 +22,6 @@ 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 +obj-$(CONFIG_ARCH_TEGRA_264_SOC) += tegra186-emc.o tegra210-emc-y := tegra210-emc-core.o tegra210-emc-cc-r21021.o
drivers/memory/tegra/mc.c +4 -1
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (C) 2014 NVIDIA CORPORATION. All rights reserved. +* Copyright (C) 2014-2025 NVIDIA CORPORATION. All rights reserved. */ #include <linux/clk.h>
@@ -48,6 +48,9 @@ static const struct of_device_id tegra_mc_of_match[] = {#endif #ifdef CONFIG_ARCH_TEGRA_234_SOC { .compatible = "nvidia,tegra234-mc", .data = &tegra234_mc_soc }, +#endif +#ifdef CONFIG_ARCH_TEGRA_264_SOC + { .compatible = "nvidia,tegra264-mc", .data = &tegra264_mc_soc }, #endif { /* sentinel */ } };
drivers/memory/tegra/mc.h +7 -2
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ /* -* Copyright (C) 2014 NVIDIA CORPORATION. All rights reserved. +* Copyright (C) 2014-2025 NVIDIA CORPORATION. All rights reserved. */ #ifndef MEMORY_TEGRA_MC_H
@@ -182,6 +182,10 @@ extern const struct tegra_mc_soc tegra194_mc_soc;extern const struct tegra_mc_soc tegra234_mc_soc;#endif +#ifdef CONFIG_ARCH_TEGRA_264_SOC +extern const struct tegra_mc_soc tegra264_mc_soc; +#endif + #if defined(CONFIG_ARCH_TEGRA_3x_SOC) || \ defined(CONFIG_ARCH_TEGRA_114_SOC) || \ defined(CONFIG_ARCH_TEGRA_124_SOC) || \
@@ -193,7 +197,8 @@ extern const struct tegra_mc_ops tegra30_mc_ops;#if defined(CONFIG_ARCH_TEGRA_186_SOC ) || \ defined(CONFIG_ARCH_TEGRA_194_SOC ) || \ - defined(CONFIG_ARCH_TEGRA_234_SOC ) + defined(CONFIG_ARCH_TEGRA_234_SOC ) || \ + defined(CONFIG_ARCH_TEGRA_264_SOC )extern const struct tegra_mc_ops tegra186_mc_ops;#endif
drivers/memory/tegra/tegra186-emc.c +4 -1
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (C) 2019 NVIDIA CORPORATION. All rights reserved. +* Copyright (C) 2019-2025 NVIDIA CORPORATION. All rights reserved. */ #include <linux/clk.h>
@@ -393,6 +393,9 @@ static const struct of_device_id tegra186_emc_of_match[] = {#endif #if defined(CONFIG_ARCH_TEGRA_234_SOC) { .compatible = "nvidia,tegra234-emc" }, +#endif +#if defined(CONFIG_ARCH_TEGRA_264_SOC) + { .compatible = "nvidia,tegra264-emc" }, #endif { /* sentinel */ } };
drivers/memory/tegra/tegra186.c +15 -2
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (C) 2017-2021 NVIDIA CORPORATION. All rights reserved. +* Copyright (C) 2017-2025 NVIDIA CORPORATION. All rights reserved. */ #include <linux/io.h>
@@ -26,11 +26,24 @@static int tegra186_mc_probe (struct tegra_mc *mc) {struct platform_device *pdev =to_platform_device (mc->dev); +struct resource *res;unsigned int i;char name[8 ];int err; - mc->bcast_ch_regs =devm_platform_ioremap_resource_byname (pdev,"broadcast" ); +/* +* From Tegra264, the SID region is not present in MC node and BROADCAST is first. +* The common function 'tegra_mc_probe()' already maps first region entry from DT. +* Check if the SID region is present in DT then map BROADCAST. Otherwise, consider +* the first entry mapped in mc probe as the BROADCAST region. This is done to avoid +* mapping the region twice when SID is not present and keep backward compatibility. +*/ + res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"sid" ); +if (res) + mc->bcast_ch_regs =devm_platform_ioremap_resource_byname (pdev,"broadcast" ); +else + mc->bcast_ch_regs = mc->regs; +if (IS_ERR (mc->bcast_ch_regs)) {if (PTR_ERR (mc->bcast_ch_regs) == -EINVAL ) { dev_warn(&pdev->dev,
drivers/memory/tegra/tegra264-bwmgr.h new file +50 -0
50 lines not on this page · raw message
drivers/memory/tegra/tegra264.c new file +313 -0
313 lines not on this page · raw message
Signature · 1 line
2.50.0