memory: tegra: Tegra234 and error logging support
Subsystems (2)
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
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
@@ -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
@@ -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
@@ -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
@@ -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
PATCH 2/4 memory: tegra: Add APE memory clients for Tegra234
In reply to Thierry RedingFrom: Sameer Pujar <[email protected]>
Add the memory clients on Tegra234 which are needed for APE DMA to properly use the SMMU.
--- drivers/memory/tegra/tegra234.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)
drivers/memory/tegra/tegra234.c +21 -1
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (C) 2021 NVIDIA CORPORATION. All rights reserved. +* Copyright (C) 2021-2022, NVIDIA CORPORATION. All rights reserved. */ #include <soc/tegra/mc.h>
@@ -70,6 +70,26 @@ static const struct tegra_mc_client tegra234_mc_clients[] = { .security = 0x4b4, }, }, + }, { + .id = TEGRA234_MEMORY_CLIENT_APEDMAR, + .name = "apedmar", + .sid = TEGRA234_SID_APE, + .regs = { + .sid = { + .override = 0x4f8, + .security = 0x4fc, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_APEDMAW, + .name = "apedmaw", + .sid = TEGRA234_SID_APE, + .regs = { + .sid = { + .override = 0x500, + .security = 0x504, + }, + }, }, };
Signature · 1 line
2.35.1
PATCH 3/4 memory: tegra: Add memory controller channels support
In reply to Thierry RedingFrom: Ashish Mhetre <[email protected]>
From Tegra186 onwards, the memory controller supports multiple channels. Add support for mapping the address spaces of these channels and specify the number of channels supported by Tegra186, Tegra194 and Tegra234.
In case of old bindings, channels won't be present. If channels are not present then print a warning and continue so that backward compatibility will be preserved in driver.
During error interrupts from memory controller, appropriate registers from these channels need to be accessed for logging error info.
--- drivers/memory/tegra/tegra186.c | 30 ++++++++++++++++++++++++++++++ drivers/memory/tegra/tegra194.c | 1 + drivers/memory/tegra/tegra234.c | 1 + include/soc/tegra/mc.h | 3 +++ 4 files changed, 35 insertions(+)
drivers/memory/tegra/tegra186.c +30 -0
@@ -48,8 +48,37 @@ static void tegra186_mc_program_sid(struct tegra_mc *mc)static int tegra186_mc_probe (struct tegra_mc *mc) { +struct platform_device *pdev =to_platform_device (mc->dev); +unsigned int i; +char name[8 ];int err; + mc->bcast_ch_regs =devm_platform_ioremap_resource_byname (pdev,"broadcast" ); +if (IS_ERR (mc->bcast_ch_regs)) { +if (PTR_ERR (mc->bcast_ch_regs) == -EINVAL ) { +dev_warn (&pdev->dev, +"Broadcast channel is missing, please update your device-tree\n" ); + mc->bcast_ch_regs =NULL ; + goto populate; + } + +return PTR_ERR (mc->bcast_ch_regs); + } + + mc->ch_regs =devm_kcalloc (mc->dev, mc->soc->num_channels,sizeof (*mc->ch_regs), +GFP_KERNEL ); +if (!mc->ch_regs) +return -ENOMEM ; + +for (i =0 ; i < mc->soc->num_channels; i++) { +snprintf (name,sizeof (name),"ch%u" , i); + + mc->ch_regs[i] =devm_platform_ioremap_resource_byname (pdev, name); +if (IS_ERR (mc->ch_regs[i])) +return PTR_ERR (mc->ch_regs[i]); + } + +populate: err =of_platform_populate (mc->dev->of_node,NULL ,NULL , mc->dev);if (err <0 )return err;
@@ -875,6 +904,7 @@ const struct tegra_mc_soc tegra186_mc_soc = { .num_clients = ARRAY_SIZE(tegra186_mc_clients), .clients = tegra186_mc_clients, .num_address_bits = 40, + .num_channels = 4, .ops = &tegra186_mc_ops, };#endif
drivers/memory/tegra/tegra194.c +1 -0
@@ -1347,5 +1347,6 @@ const struct tegra_mc_soc tegra194_mc_soc = { .num_clients = ARRAY_SIZE(tegra194_mc_clients), .clients = tegra194_mc_clients, .num_address_bits = 40, + .num_channels = 16, .ops = &tegra186_mc_ops, };
drivers/memory/tegra/tegra234.c +1 -0
@@ -97,5 +97,6 @@ const struct tegra_mc_soc tegra234_mc_soc = { .num_clients = ARRAY_SIZE(tegra234_mc_clients), .clients = tegra234_mc_clients, .num_address_bits = 40, + .num_channels = 16, .ops = &tegra186_mc_ops, };
include/soc/tegra/mc.h +3 -0
@@ -194,6 +194,7 @@ struct tegra_mc_soc {unsigned int atom_size;u8 client_id_mask; +u8 num_channels;const struct tegra_smmu_soc *smmu;
@@ -212,6 +213,8 @@ struct tegra_mc {struct tegra_smmu *smmu;struct gart_device *gart;void __iomem *regs; +void __iomem *bcast_ch_regs; +void __iomem **ch_regs;struct clk *clk;int irq;
Signature · 1 line
2.35.1
PATCH 4/4 memory: tegra: Add MC error logging on Tegra186 onward
In reply to Thierry RedingFrom: Ashish Mhetre <[email protected]>
Add support for logging memory controller errors on Tegra186, Tegra194 and Tegra234. On these SoCs, interrupts can occur on multiple channels. Add support required to read the status of interrupts across multiple channels, log and clear them.
Also add new interrupts supported on these SoCs.
--- drivers/memory/tegra/mc.c | 134 ++++++++++++++++++++++++++++---- drivers/memory/tegra/mc.h | 43 +++++++++- drivers/memory/tegra/tegra186.c | 9 +++ drivers/memory/tegra/tegra194.c | 8 ++ drivers/memory/tegra/tegra234.c | 8 ++ include/soc/tegra/mc.h | 5 +- 6 files changed, 189 insertions(+), 18 deletions(-)
drivers/memory/tegra/mc.c +118 -16
@@ -508,14 +508,54 @@ int tegra30_mc_probe(struct tegra_mc *mc)return 0 ; } -static irqreturn_t tegra30_mc_handle_irq (int irq,void *data) +const struct tegra_mc_ops tegra30_mc_ops = { + .probe = tegra30_mc_probe, + .handle_irq = tegra30_mc_handle_irq, +}; +#endif + +static int mc_global_intstatus_to_channel (const struct tegra_mc *mc,u32 status, +unsigned int *mc_channel) +{ +if ((status & mc->soc->ch_intmask) ==0 ) +return -EINVAL ; + + *mc_channel =__ffs ((status & mc->soc->ch_intmask) >> + mc->soc->global_intstatus_channel_shift); + +return 0 ; +} + +static u32 mc_channel_to_global_intstatus (const struct tegra_mc *mc, +unsigned int channel) +{ +return BIT (channel) << mc->soc->global_intstatus_channel_shift; +} + +irqreturn_t tegra30_mc_handle_irq (int irq,void *data) {struct tegra_mc *mc = data; +unsigned int bit, channel;unsigned long status; -unsigned int bit; -/* mask all interrupts to avoid flooding */ - status =mc_readl (mc,MC_INTSTATUS ) & mc->soc->intmask; +if (mc->soc->num_channels) { +u32 global_status; +int err; + + global_status =mc_ch_readl (mc,MC_BROADCAST_CHANNEL ,MC_GLOBAL_INTSTATUS ); + err =mc_global_intstatus_to_channel (mc, global_status, &channel); +if (err <0 ) { +dev_err_ratelimited (mc->dev,"unknown interrupt channel 0x%08x\n" , + global_status); +return IRQ_NONE ; + } + +/* mask all interrupts to avoid flooding */ + status =mc_ch_readl (mc, channel,MC_INTSTATUS ) & mc->soc->intmask; + }else { + status =mc_readl (mc,MC_INTSTATUS ) & mc->soc->intmask; + } +if (!status)return IRQ_NONE ;
@@ -523,18 +563,70 @@ static irqreturn_t tegra30_mc_handle_irq(int irq, void *data)const char *error = tegra_mc_status_names[bit] ?:"unknown" ;const char *client ="unknown" , *desc;const char *direction, *secure; +u32 status_reg, addr_reg; +u32 intmask =BIT (bit);phys_addr_t addr =0 ; +#ifdef CONFIG_PHYS_ADDR_T_64BIT +u32 addr_hi_reg =0 ; +#endif unsigned int i;char perm[7 ];u8 id, type;u32 value; - value =mc_readl (mc,MC_ERR_STATUS ); +switch (intmask) { +case MC_INT_DECERR_VPR : + status_reg =MC_ERR_VPR_STATUS ; + addr_reg =MC_ERR_VPR_ADR ; +break ; + +case MC_INT_SECERR_SEC : + status_reg =MC_ERR_SEC_STATUS ; + addr_reg =MC_ERR_SEC_ADR ; +break ; + +case MC_INT_DECERR_MTS : + status_reg =MC_ERR_MTS_STATUS ; + addr_reg =MC_ERR_MTS_ADR ; +break ; + +case MC_INT_DECERR_GENERALIZED_CARVEOUT : + status_reg =MC_ERR_GENERALIZED_CARVEOUT_STATUS ; + addr_reg =MC_ERR_GENERALIZED_CARVEOUT_ADR ; +break ; + +case MC_INT_DECERR_ROUTE_SANITY : + status_reg =MC_ERR_ROUTE_SANITY_STATUS ; + addr_reg =MC_ERR_ROUTE_SANITY_ADR ; +break ; + +default : + status_reg =MC_ERR_STATUS ; + addr_reg =MC_ERR_ADR ; + +#ifdef CONFIG_PHYS_ADDR_T_64BIT +if (mc->soc->has_addr_hi_reg) + addr_hi_reg =MC_ERR_ADR_HI ; +#endif +break ; + } + +if (mc->soc->num_channels) + value =mc_ch_readl (mc, channel, status_reg); +else + value =mc_readl (mc, status_reg);#ifdef CONFIG_PHYS_ADDR_T_64BIT if (mc->soc->num_address_bits >32 ) { - addr = ((value >>MC_ERR_STATUS_ADR_HI_SHIFT ) & -MC_ERR_STATUS_ADR_HI_MASK ); +if (addr_hi_reg) { +if (mc->soc->num_channels) + addr =mc_ch_readl (mc, channel, addr_hi_reg); +else + addr =mc_readl (mc, addr_hi_reg); + }else { + addr = ((value >>MC_ERR_STATUS_ADR_HI_SHIFT ) & +MC_ERR_STATUS_ADR_HI_MASK ); + } addr <<=32 ; }#endif
@@ -591,7 +683,10 @@ static irqreturn_t tegra30_mc_handle_irq(int irq, void *data)break ; } - value =mc_readl (mc,MC_ERR_ADR ); +if (mc->soc->num_channels) + value =mc_ch_readl (mc, channel, addr_reg); +else + value =mc_readl (mc, addr_reg); addr |= value; dev_err_ratelimited(mc->dev, "%s: %s%s @%pa: %s (%s%s)\n",
@@ -600,17 +695,18 @@ static irqreturn_t tegra30_mc_handle_irq(int irq, void *data) }/* clear interrupts */ -mc_writel (mc, status,MC_INTSTATUS ); +if (mc->soc->num_channels) { +mc_ch_writel (mc, channel, status,MC_INTSTATUS ); +mc_ch_writel (mc,MC_BROADCAST_CHANNEL , +mc_channel_to_global_intstatus (mc, channel), +MC_GLOBAL_INTSTATUS ); + }else { +mc_writel (mc, status,MC_INTSTATUS ); + }return IRQ_HANDLED ; } -const struct tegra_mc_ops tegra30_mc_ops = { - .probe = tegra30_mc_probe, - .handle_irq = tegra30_mc_handle_irq, -}; -#endif -const char *const tegra_mc_status_names[32 ] = { [1 ] ="External interrupt" , [6 ] ="EMEM address decode error" ,
@@ -622,6 +718,8 @@ const char *const tegra_mc_status_names[32] = { [12] = "VPR violation", [13] = "Secure carveout violation", [16] = "MTS carveout violation", + [17] = "Generalized carveout violation", + [20] = "Route Sanity error", };const char *const tegra_mc_error_names[8 ] = {
@@ -764,7 +862,11 @@ static int tegra_mc_probe(struct platform_device *pdev)WARN (!mc->soc->client_id_mask,"missing client ID mask for this SoC\n" ); -mc_writel (mc, mc->soc->intmask,MC_INTMASK ); +if (mc->soc->num_channels) +mc_ch_writel (mc,MC_BROADCAST_CHANNEL , mc->soc->intmask, +MC_INTMASK ); +else +mc_writel (mc, mc->soc->intmask,MC_INTMASK ); err =devm_request_irq (&pdev->dev, mc->irq, mc->soc->ops->handle_irq,0 ,dev_name (&pdev->dev), mc);
drivers/memory/tegra/mc.h +42 -1
67 lines not on this page · raw message
drivers/memory/tegra/tegra186.c +9 -0
@@ -16,6 +16,8 @@#include <dt-bindings/memory/tegra186-mc.h> #endif +#include "mc.h" +#define MC_SID_STREAMID_OVERRIDE_MASK GENMASK(7, 0)#define MC_SID_STREAMID_SECURITY_WRITE_ACCESS_DISABLED BIT(16)#define MC_SID_STREAMID_SECURITY_OVERRIDE BIT(8)
@@ -173,6 +175,7 @@ const struct tegra_mc_ops tegra186_mc_ops = { .remove = tegra186_mc_remove, .resume = tegra186_mc_resume, .probe_device = tegra186_mc_probe_device, + .handle_irq = tegra30_mc_handle_irq, };#if defined(CONFIG_ARCH_TEGRA_186_SOC )
@@ -905,6 +908,12 @@ const struct tegra_mc_soc tegra186_mc_soc = { .clients = tegra186_mc_clients, .num_address_bits = 40, .num_channels = 4, + .client_id_mask = 0xff, + .intmask =MC_INT_DECERR_GENERALIZED_CARVEOUT |MC_INT_DECERR_MTS | +MC_INT_SECERR_SEC |MC_INT_DECERR_VPR | + MC_INT_SECURITY_VIOLATION | MC_INT_DECERR_EMEM, .ops = &tegra186_mc_ops, + .ch_intmask = 0x0000000f, + .global_intstatus_channel_shift = 0, };#endif
drivers/memory/tegra/tegra194.c +8 -0
@@ -1348,5 +1348,13 @@ const struct tegra_mc_soc tegra194_mc_soc = { .clients = tegra194_mc_clients, .num_address_bits = 40, .num_channels = 16, + .client_id_mask = 0xff, + .intmask =MC_INT_DECERR_ROUTE_SANITY | +MC_INT_DECERR_GENERALIZED_CARVEOUT |MC_INT_DECERR_MTS | +MC_INT_SECERR_SEC |MC_INT_DECERR_VPR | + MC_INT_SECURITY_VIOLATION | MC_INT_DECERR_EMEM, + .has_addr_hi_reg = true, .ops = &tegra186_mc_ops, + .ch_intmask = 0x00000f00, + .global_intstatus_channel_shift = 8, };
drivers/memory/tegra/tegra234.c +8 -0
@@ -98,5 +98,13 @@ const struct tegra_mc_soc tegra234_mc_soc = { .clients = tegra234_mc_clients, .num_address_bits = 40, .num_channels = 16, + .client_id_mask = 0x1ff, + .intmask =MC_INT_DECERR_ROUTE_SANITY | +MC_INT_DECERR_GENERALIZED_CARVEOUT |MC_INT_DECERR_MTS | +MC_INT_SECERR_SEC |MC_INT_DECERR_VPR | + MC_INT_SECURITY_VIOLATION | MC_INT_DECERR_EMEM, + .has_addr_hi_reg = true, .ops = &tegra186_mc_ops, + .ch_intmask = 0x0000ff00, + .global_intstatus_channel_shift = 8, };
include/soc/tegra/mc.h +4 -1
@@ -193,12 +193,15 @@ struct tegra_mc_soc {unsigned int num_address_bits;unsigned int atom_size; -u8 client_id_mask; +u16 client_id_mask;u8 num_channels;const struct tegra_smmu_soc *smmu;u32 intmask; +u32 ch_intmask; +u32 global_intstatus_channel_shift; +bool has_addr_hi_reg;const struct tegra_mc_reset_ops *reset_ops;const struct tegra_mc_reset *resets;
Signature · 1 line
2.35.1