memory: tegra: Add MC error logging support for Tegra264 SoC
Subsystems (2)
v7 cover memory: tegra: Add MC error logging support for Tegra264 SoC
In Tegra264, different components from memory subsystems like Memory Controller Fabric (MCF), HUB, HUB Common (HUBC), Side Band Shim (SBS) and MC Channels have different interrupt lines for receiving memory controller error interrupts. This patch set includes changes to add support and enable Memory Controller error logging for Tegra264.
Ketan Patil (6):
memory: tegra: Group error handling related registers
memory: tegra: Group register and fields
memory: tegra: Add support for multiple IRQs
memory: tegra: Group SoC specific fields
memory: tegra: Prepare for supporting multiple intmask registers
memory: tegra: Add MC error logging support for Tegra264
---
Changes in v7:
- Removed WARN_ON from tegra30_mc_handle_irq function and handled error path by returning error value.
- Moved IRQ handler from tegra_mc_ops struct to tegra_mc_soc as it is a SoC specific entity.
- Splitted the 4th patch from v6 into 3 patches for easier review, improved commit message.
Changes in v6:
- Updated copyright year and commit message.
- Removed redundant mc_ prefix from few structs.
- Grouped the masks and bits next to the associated registers which were missed in previous revision.
- Separated out Tegra264 specific registers from previous SoC registers.
- Reduced variables in mcf_log_fault, hub_log_fault functions.
Changes in v5:
- Updated commit message to clarify the need of grouping of mc-err registers and support for multiple interrupts, so that it can support Tegra264.
Changes in v4:
- Fixed typo in variable name
- Added MC instance aperture mapping for hubc registers and corrected irq handler function to read from respective mc aperture.
Changes in v3:
- Fixed compilation error with W=1 build
Changes in v2:
- Fixed warning due to use of uninitialized variable by returning back from the function
- Removed unnecessary extern declaration of tegra264_mc_ops
- Updated tegra20_mc_irq_handlers, tegra264_mc_irq_handlers and tegra264_mc_ops to static
drivers/memory/tegra/mc.c | 110 ++++++--- drivers/memory/tegra/mc.h | 153 ++++++++---- drivers/memory/tegra/tegra114.c | 18 +- drivers/memory/tegra/tegra124.c | 40 ++- drivers/memory/tegra/tegra186.c | 22 +- drivers/memory/tegra/tegra194.c | 22 +- drivers/memory/tegra/tegra20.c | 31 ++- drivers/memory/tegra/tegra210.c | 21 +- drivers/memory/tegra/tegra234.c | 22 +- drivers/memory/tegra/tegra264.c | 420 +++++++++++++++++++++++++++++++- drivers/memory/tegra/tegra30.c | 18 +- include/soc/tegra/mc.h | 40 ++- 12 files changed, 781 insertions(+), 136 deletions(-)
Signature · 1 line
2.17.1
PATCH v7 1/6 memory: tegra: Group error handling related registers
Group MC error related registers into a struct as they could have SoC specific values. Tegra264 has different register offsets than the existing devices and so in order to add support for Tegra264 we need to first make this change.
--- drivers/memory/tegra/mc.c | 47 ++++++++++++++++++++++----------- drivers/memory/tegra/mc.h | 16 +---------- drivers/memory/tegra/tegra114.c | 3 ++- drivers/memory/tegra/tegra124.c | 4 ++- drivers/memory/tegra/tegra186.c | 3 ++- drivers/memory/tegra/tegra194.c | 3 ++- drivers/memory/tegra/tegra20.c | 3 ++- drivers/memory/tegra/tegra210.c | 3 ++- drivers/memory/tegra/tegra234.c | 3 ++- drivers/memory/tegra/tegra30.c | 3 ++- include/soc/tegra/mc.h | 22 ++++++++++++++- 11 files changed, 71 insertions(+), 39 deletions(-)
drivers/memory/tegra/mc.c +32 -15
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (C) 2014-2025 NVIDIA CORPORATION. All rights reserved. +* Copyright (C) 2014-2026 NVIDIA CORPORATION. All rights reserved. */ #include <linux/clk.h>
@@ -56,6 +56,23 @@ static const struct of_device_id tegra_mc_of_match[] = { };MODULE_DEVICE_TABLE (of, tegra_mc_of_match); +const struct tegra_mc_regs tegra20_mc_regs = { + .cfg_channel_enable =0xdf8 , + .err_status =0x08 , + .err_add =0x0c , + .err_add_hi =0x11fc , + .err_vpr_status =0x654 , + .err_vpr_add =0x658 , + .err_sec_status =0x67c , + .err_sec_add =0x680 , + .err_mts_status =0x9b0 , + .err_mts_add =0x9b4 , + .err_gen_co_status =0xc00 , + .err_gen_co_add =0xc04 , + .err_route_status =0x9c0 , + .err_route_add =0x9c4 , +}; +static void tegra_mc_devm_action_put_device (void *data) {struct tegra_mc *mc = data;
@@ -600,37 +617,37 @@ irqreturn_t tegra30_mc_handle_irq(int irq, void *data)switch (intmask) {case MC_INT_DECERR_VPR : - status_reg =MC_ERR_VPR_STATUS ; - addr_reg =MC_ERR_VPR_ADR ; + status_reg = mc->soc->regs->err_vpr_status; + addr_reg = mc->soc->regs->err_vpr_add;break ;case MC_INT_SECERR_SEC : - status_reg =MC_ERR_SEC_STATUS ; - addr_reg =MC_ERR_SEC_ADR ; + status_reg = mc->soc->regs->err_sec_status; + addr_reg = mc->soc->regs->err_sec_add;break ;case MC_INT_DECERR_MTS : - status_reg =MC_ERR_MTS_STATUS ; - addr_reg =MC_ERR_MTS_ADR ; + status_reg = mc->soc->regs->err_mts_status; + addr_reg = mc->soc->regs->err_mts_add;break ;case MC_INT_DECERR_GENERALIZED_CARVEOUT : - status_reg =MC_ERR_GENERALIZED_CARVEOUT_STATUS ; - addr_reg =MC_ERR_GENERALIZED_CARVEOUT_ADR ; + status_reg = mc->soc->regs->err_gen_co_status; + addr_reg = mc->soc->regs->err_gen_co_add;break ;case MC_INT_DECERR_ROUTE_SANITY : - status_reg =MC_ERR_ROUTE_SANITY_STATUS ; - addr_reg =MC_ERR_ROUTE_SANITY_ADR ; + status_reg = mc->soc->regs->err_route_status; + addr_reg = mc->soc->regs->err_route_add;break ;default : - status_reg =MC_ERR_STATUS ; - addr_reg =MC_ERR_ADR ; + status_reg = mc->soc->regs->err_status; + addr_reg = mc->soc->regs->err_add;#ifdef CONFIG_PHYS_ADDR_T_64BIT if (mc->soc->has_addr_hi_reg) - addr_hi_reg =MC_ERR_ADR_HI ; + addr_hi_reg = mc->soc->regs->err_add_hi;#endif break ; }
@@ -883,7 +900,7 @@ static void tegra_mc_num_channel_enabled(struct tegra_mc *mc)unsigned int i;u32 value; - value =mc_ch_readl (mc,0 ,MC_EMEM_ADR_CFG_CHANNEL_ENABLE ); + value =mc_ch_readl (mc,0 , mc->soc->regs->cfg_channel_enable);if (value <=0 ) { mc->num_channels = mc->soc->num_channels;return ;
drivers/memory/tegra/mc.h +1 -15
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ /* -* Copyright (C) 2014-2025 NVIDIA CORPORATION. All rights reserved. +* Copyright (C) 2014-2026 NVIDIA CORPORATION. All rights reserved. */ #ifndef MEMORY_TEGRA_MC_H
@@ -14,8 +14,6 @@#define MC_INTSTATUS 0x00#define MC_INTMASK 0x04 -#define MC_ERR_STATUS 0x08 -#define MC_ERR_ADR 0x0c#define MC_GART_ERROR_REQ 0x30#define MC_EMEM_ADR_CFG 0x54#define MC_DECERR_EMEM_OTHERS_STATUS 0x58
@@ -43,19 +41,7 @@#define MC_EMEM_ARB_OVERRIDE 0xe8#define MC_TIMING_CONTROL_DBG 0xf8#define MC_TIMING_CONTROL 0xfc -#define MC_ERR_VPR_STATUS 0x654 -#define MC_ERR_VPR_ADR 0x658 -#define MC_ERR_SEC_STATUS 0x67c -#define MC_ERR_SEC_ADR 0x680 -#define MC_ERR_MTS_STATUS 0x9b0 -#define MC_ERR_MTS_ADR 0x9b4 -#define MC_ERR_ROUTE_SANITY_STATUS 0x9c0 -#define MC_ERR_ROUTE_SANITY_ADR 0x9c4 -#define MC_ERR_GENERALIZED_CARVEOUT_STATUS 0xc00 -#define MC_ERR_GENERALIZED_CARVEOUT_ADR 0xc04 -#define MC_EMEM_ADR_CFG_CHANNEL_ENABLE 0xdf8#define MC_GLOBAL_INTSTATUS 0xf24 -#define MC_ERR_ADR_HI 0x11fc#define MC_INT_DECERR_ROUTE_SANITY BIT(20)#define MC_INT_DECERR_GENERALIZED_CARVEOUT BIT(17)
drivers/memory/tegra/tegra114.c +2 -1
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (C) 2014 NVIDIA CORPORATION. All rights reserved. +* Copyright (C) 2014-2026 NVIDIA CORPORATION. All rights reserved. */ #include <linux/of.h>
@@ -1114,4 +1114,5 @@ const struct tegra_mc_soc tegra114_mc_soc = { .resets = tegra114_mc_resets, .num_resets = ARRAY_SIZE(tegra114_mc_resets), .ops = &tegra30_mc_ops, + .regs = &tegra20_mc_regs, };
drivers/memory/tegra/tegra124.c +3 -1
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (C) 2014 NVIDIA CORPORATION. All rights reserved. +* Copyright (C) 2014-2026 NVIDIA CORPORATION. All rights reserved. */ #include <linux/of.h>
@@ -1275,6 +1275,7 @@ const struct tegra_mc_soc tegra124_mc_soc = { .num_resets = ARRAY_SIZE(tegra124_mc_resets), .icc_ops = &tegra124_mc_icc_ops, .ops = &tegra30_mc_ops, + .regs = &tegra20_mc_regs, };#endif /* CONFIG_ARCH_TEGRA_124_SOC */
@@ -1307,5 +1308,6 @@ const struct tegra_mc_soc tegra132_mc_soc = { .num_resets = ARRAY_SIZE(tegra124_mc_resets), .icc_ops = &tegra124_mc_icc_ops, .ops = &tegra30_mc_ops, + .regs = &tegra20_mc_regs, };#endif /* CONFIG_ARCH_TEGRA_132_SOC */
drivers/memory/tegra/tegra186.c +2 -1
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (C) 2017-2025 NVIDIA CORPORATION. All rights reserved. +* Copyright (C) 2017-2026 NVIDIA CORPORATION. All rights reserved. */ #include <linux/io.h>
@@ -914,5 +914,6 @@ const struct tegra_mc_soc tegra186_mc_soc = { .ops = &tegra186_mc_ops, .ch_intmask = 0x0000000f, .global_intstatus_channel_shift = 0, + .regs = &tegra20_mc_regs, };#endif
drivers/memory/tegra/tegra194.c +2 -1
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (C) 2017-2021 NVIDIA CORPORATION. All rights reserved. +* Copyright (C) 2017-2026 NVIDIA CORPORATION. All rights reserved. */ #include <soc/tegra/mc.h>
@@ -1358,4 +1358,5 @@ const struct tegra_mc_soc tegra194_mc_soc = { .icc_ops = &tegra_mc_icc_ops, .ch_intmask = 0x00000f00, .global_intstatus_channel_shift = 8, + .regs = &tegra20_mc_regs, };
drivers/memory/tegra/tegra20.c +2 -1
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (C) 2012 NVIDIA CORPORATION. All rights reserved. +* Copyright (C) 2012-2026 NVIDIA CORPORATION. All rights reserved. */ #include <linux/bitfield.h>
@@ -778,4 +778,5 @@ const struct tegra_mc_soc tegra20_mc_soc = { .num_resets = ARRAY_SIZE(tegra20_mc_resets), .icc_ops = &tegra20_mc_icc_ops, .ops = &tegra20_mc_ops, + .regs = &tegra20_mc_regs, };
drivers/memory/tegra/tegra210.c +2 -1
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (C) 2015 NVIDIA CORPORATION. All rights reserved. +* Copyright (C) 2015-2026 NVIDIA CORPORATION. All rights reserved. */ #include <dt-bindings/memory/tegra210-mc.h>
@@ -1287,4 +1287,5 @@ const struct tegra_mc_soc tegra210_mc_soc = { .resets = tegra210_mc_resets, .num_resets = ARRAY_SIZE(tegra210_mc_resets), .ops = &tegra30_mc_ops, + .regs = &tegra20_mc_regs, };
drivers/memory/tegra/tegra234.c +2 -1
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (C) 2022-2023, NVIDIA CORPORATION. All rights reserved. +* Copyright (C) 2022-2026, NVIDIA CORPORATION. All rights reserved. */ #include <soc/tegra/mc.h>
@@ -1152,4 +1152,5 @@ const struct tegra_mc_soc tegra234_mc_soc = {* supported. */ .num_carveouts = 32, + .regs = &tegra20_mc_regs, };
drivers/memory/tegra/tegra30.c +2 -1
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (C) 2014 NVIDIA CORPORATION. All rights reserved. +* Copyright (C) 2014-2026 NVIDIA CORPORATION. All rights reserved. */ #include <linux/device.h>
@@ -1400,4 +1400,5 @@ const struct tegra_mc_soc tegra30_mc_soc = { .num_resets = ARRAY_SIZE(tegra30_mc_resets), .icc_ops = &tegra30_mc_icc_ops, .ops = &tegra30_mc_ops, + .regs = &tegra20_mc_regs, };
include/soc/tegra/mc.h +21 -1
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ /* -* Copyright (C) 2014 NVIDIA Corporation +* Copyright (C) 2014-2026 NVIDIA Corporation */ #ifndef __SOC_TEGRA_MC_H__
@@ -168,6 +168,23 @@ struct tegra_mc_ops {int (*probe_device)(struct tegra_mc *mc,struct device *dev); }; +struct tegra_mc_regs { +unsigned int cfg_channel_enable; +unsigned int err_status; +unsigned int err_add; +unsigned int err_add_hi; +unsigned int err_vpr_status; +unsigned int err_vpr_add; +unsigned int err_sec_status; +unsigned int err_sec_add; +unsigned int err_mts_status; +unsigned int err_mts_add; +unsigned int err_gen_co_status; +unsigned int err_gen_co_add; +unsigned int err_route_status; +unsigned int err_route_add; +}; +struct tegra_mc_soc {const struct tegra_mc_client *clients;unsigned int num_clients;
@@ -196,6 +213,7 @@ struct tegra_mc_soc {const struct tegra_mc_icc_ops *icc_ops;const struct tegra_mc_ops *ops; +const struct tegra_mc_regs *regs; };struct tegra_mc {
@@ -256,4 +274,6 @@ tegra_mc_get_carveout_info(struct tegra_mc *mc, unsigned int id, }#endif +extern const struct tegra_mc_regs tegra20_mc_regs; +#endif /* __SOC_TEGRA_MC_H__ */
Signature · 1 line
2.17.1
PATCH v7 2/6 memory: tegra: Group register and fields
In reply to Ketan PatilThe current register definitions are not in sorted order. Sort these registers according to their address. Put bit fields and masks of the corresponding registers below the register definitions to clearly identify which fields belongs to which registers.
--- drivers/memory/tegra/mc.h | 62 +++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 29 deletions(-)
drivers/memory/tegra/mc.h +33 -29
@@ -13,13 +13,35 @@#include <soc/tegra/mc.h> #define MC_INTSTATUS 0x00 +/* Bit field of MC_INTSTATUS register */ +#define MC_INT_DECERR_EMEM BIT(6) +#define MC_INT_INVALID_GART_PAGE BIT(7) +#define MC_INT_SECURITY_VIOLATION BIT(8) +#define MC_INT_ARBITRATION_EMEM BIT(9) +#define MC_INT_INVALID_SMMU_PAGE BIT(10) +#define MC_INT_INVALID_APB_ASID_UPDATE BIT(11) +#define MC_INT_DECERR_VPR BIT(12) +#define MC_INT_SECERR_SEC BIT(13) +#define MC_INT_DECERR_MTS BIT(16) +#define MC_INT_DECERR_GENERALIZED_CARVEOUT BIT(17) +#define MC_INT_DECERR_ROUTE_SANITY BIT(20) +#define MC_INTMASK 0x04#define MC_GART_ERROR_REQ 0x30#define MC_EMEM_ADR_CFG 0x54 +#define MC_EMEM_ADR_CFG_EMEM_NUMDEV BIT(0) +#define MC_DECERR_EMEM_OTHERS_STATUS 0x58#define MC_SECURITY_VIOLATION_STATUS 0x74#define MC_EMEM_ARB_CFG 0x90 +#define MC_EMEM_ARB_CFG_CYCLES_PER_UPDATE (x) ((x) & 0x1ff) +#define MC_EMEM_ARB_CFG_CYCLES_PER_UPDATE_MASK 0x1ff +#define MC_EMEM_ARB_OUTSTANDING_REQ 0x94 +#define MC_EMEM_ARB_OUTSTANDING_REQ_HOLDOFF_OVERRIDE BIT(30) +#define MC_EMEM_ARB_OUTSTANDING_REQ_LIMIT_ENABLE BIT(31) +#define MC_EMEM_ARB_OUTSTANDING_REQ_MAX_MASK 0x1ff +#define MC_EMEM_ARB_TIMING_RCD 0x98#define MC_EMEM_ARB_TIMING_RP 0x9c#define MC_EMEM_ARB_TIMING_RC 0xa0
@@ -39,45 +61,27 @@#define MC_EMEM_ARB_MISC1 0xdc#define MC_EMEM_ARB_RING1_THROTTLE 0xe0#define MC_EMEM_ARB_OVERRIDE 0xe8 +#define MC_EMEM_ARB_OVERRIDE_EACK_MASK 0x3 +#define MC_TIMING_CONTROL_DBG 0xf8#define MC_TIMING_CONTROL 0xfc +#define MC_TIMING_UPDATE BIT(0) +#define MC_GLOBAL_INTSTATUS 0xf24 -#define MC_INT_DECERR_ROUTE_SANITY BIT(20) -#define MC_INT_DECERR_GENERALIZED_CARVEOUT BIT(17) -#define MC_INT_DECERR_MTS BIT(16) -#define MC_INT_SECERR_SEC BIT(13) -#define MC_INT_DECERR_VPR BIT(12) -#define MC_INT_INVALID_APB_ASID_UPDATE BIT(11) -#define MC_INT_INVALID_SMMU_PAGE BIT(10) -#define MC_INT_ARBITRATION_EMEM BIT(9) -#define MC_INT_SECURITY_VIOLATION BIT(8) -#define MC_INT_INVALID_GART_PAGE BIT(7) -#define MC_INT_DECERR_EMEM BIT(6) +/* Bit field of MC_ERR_STATUS_0 register */ +#define MC_ERR_STATUS_RW BIT(16) +#define MC_ERR_STATUS_SECURITY BIT(17) +#define MC_ERR_STATUS_NONSECURE BIT(25) +#define MC_ERR_STATUS_WRITABLE BIT(26) +#define MC_ERR_STATUS_READABLE BIT(27)#define MC_ERR_STATUS_TYPE_SHIFT 28#define MC_ERR_STATUS_TYPE_INVALID_SMMU_PAGE (0x6 << 28)#define MC_ERR_STATUS_TYPE_MASK (0x7 << 28) -#define MC_ERR_STATUS_READABLE BIT(27) -#define MC_ERR_STATUS_WRITABLE BIT(26) -#define MC_ERR_STATUS_NONSECURE BIT(25) +#define MC_ERR_STATUS_ADR_HI_SHIFT 20#define MC_ERR_STATUS_ADR_HI_MASK 0x3 -#define MC_ERR_STATUS_SECURITY BIT(17) -#define MC_ERR_STATUS_RW BIT(16) - -#define MC_EMEM_ADR_CFG_EMEM_NUMDEV BIT(0) - -#define MC_EMEM_ARB_CFG_CYCLES_PER_UPDATE (x) ((x) & 0x1ff) -#define MC_EMEM_ARB_CFG_CYCLES_PER_UPDATE_MASK 0x1ff - -#define MC_EMEM_ARB_OUTSTANDING_REQ_MAX_MASK 0x1ff -#define MC_EMEM_ARB_OUTSTANDING_REQ_HOLDOFF_OVERRIDE BIT(30) -#define MC_EMEM_ARB_OUTSTANDING_REQ_LIMIT_ENABLE BIT(31) - -#define MC_EMEM_ARB_OVERRIDE_EACK_MASK 0x3 - -#define MC_TIMING_UPDATE BIT(0)#define MC_BROADCAST_CHANNEL ~0
Signature · 1 line
2.17.1
PATCH v7 3/6 memory: tegra: Add support for multiple IRQs
In reply to Ketan PatilAdd support to handle multiple MC interrupts lines, as supported by Tegra264. Turn the single IRQ handler callback into a counted array to allow specifying a separate handler for each interrupt. Move IRQ handlers into tegra_mc_soc struct, so as to specify SoC specific values.
--- drivers/memory/tegra/mc.c | 34 ++++++++++++++++++++------------- drivers/memory/tegra/mc.h | 1 + drivers/memory/tegra/tegra114.c | 2 ++ drivers/memory/tegra/tegra124.c | 4 ++++ drivers/memory/tegra/tegra186.c | 3 ++- drivers/memory/tegra/tegra194.c | 2 ++ drivers/memory/tegra/tegra20.c | 7 ++++++- drivers/memory/tegra/tegra210.c | 2 ++ drivers/memory/tegra/tegra234.c | 2 ++ drivers/memory/tegra/tegra30.c | 2 ++ include/soc/tegra/mc.h | 8 +++++--- 11 files changed, 49 insertions(+), 18 deletions(-)
drivers/memory/tegra/mc.c +21 -13
@@ -398,6 +398,10 @@ unsigned int tegra_mc_get_emem_device_count(struct tegra_mc *mc) }EXPORT_SYMBOL_GPL (tegra_mc_get_emem_device_count); +const irq_handler_t tegra30_mc_irq_handlers[] = { + tegra30_mc_handle_irq +}; + #if defined(CONFIG_ARCH_TEGRA_3x_SOC) || \ defined(CONFIG_ARCH_TEGRA_114_SOC) || \ defined(CONFIG_ARCH_TEGRA_124_SOC) || \
@@ -551,7 +555,6 @@ int tegra30_mc_probe(struct tegra_mc *mc)const struct tegra_mc_ops tegra30_mc_ops = { .probe = tegra30_mc_probe, - .handle_irq = tegra30_mc_handle_irq, };#endif
@@ -952,26 +955,31 @@ static int tegra_mc_probe(struct platform_device *pdev)tegra_mc_num_channel_enabled (mc); -if (mc->soc->ops && mc->soc->ops->handle_irq) { - mc->irq =platform_get_irq (pdev,0 ); -if (mc->irq <0 ) -return mc->irq; +if (mc->soc->handle_irq) { +unsigned int i;WARN (!mc->soc->client_id_mask,"missing client ID mask for this SoC\n" ); +for (i =0 ; i < mc->soc->num_interrupts; i++) { +int irq; + + irq =platform_get_irq (pdev, i); +if (irq <0 ) +return irq; + + err =devm_request_irq (&pdev->dev, irq, mc->soc->handle_irq[i],0 , +dev_name (&pdev->dev), mc); +if (err <0 ) { +dev_err (&pdev->dev,"failed to request IRQ#%u: %d\n" , irq, err); +return err; + } + } +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); -if (err <0 ) { -dev_err (&pdev->dev,"failed to request IRQ#%u: %d\n" , mc->irq, - err); -return err; - } }if (mc->soc->reset_ops) {
drivers/memory/tegra/mc.h +1 -0
@@ -193,6 +193,7 @@ extern const struct tegra_mc_ops tegra186_mc_ops;#endif irqreturn_t tegra30_mc_handle_irq (int irq,void *data); +extern const irq_handler_t tegra30_mc_irq_handlers[1 ];extern const char *const tegra_mc_status_names[32 ];extern const char *const tegra_mc_error_names[8 ];
drivers/memory/tegra/tegra114.c +2 -0
@@ -1115,4 +1115,6 @@ const struct tegra_mc_soc tegra114_mc_soc = { .num_resets = ARRAY_SIZE(tegra114_mc_resets), .ops = &tegra30_mc_ops, .regs = &tegra20_mc_regs, + .handle_irq = tegra30_mc_irq_handlers, + .num_interrupts = ARRAY_SIZE(tegra30_mc_irq_handlers), };
drivers/memory/tegra/tegra124.c +4 -0
@@ -1276,6 +1276,8 @@ const struct tegra_mc_soc tegra124_mc_soc = { .icc_ops = &tegra124_mc_icc_ops, .ops = &tegra30_mc_ops, .regs = &tegra20_mc_regs, + .handle_irq = tegra30_mc_irq_handlers, + .num_interrupts = ARRAY_SIZE(tegra30_mc_irq_handlers), };#endif /* CONFIG_ARCH_TEGRA_124_SOC */
@@ -1309,5 +1311,7 @@ const struct tegra_mc_soc tegra132_mc_soc = { .icc_ops = &tegra124_mc_icc_ops, .ops = &tegra30_mc_ops, .regs = &tegra20_mc_regs, + .handle_irq = tegra30_mc_irq_handlers, + .num_interrupts = ARRAY_SIZE(tegra30_mc_irq_handlers), };#endif /* CONFIG_ARCH_TEGRA_132_SOC */
drivers/memory/tegra/tegra186.c +2 -1
@@ -174,7 +174,6 @@ 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 )
@@ -915,5 +914,7 @@ const struct tegra_mc_soc tegra186_mc_soc = { .ch_intmask = 0x0000000f, .global_intstatus_channel_shift = 0, .regs = &tegra20_mc_regs, + .handle_irq = tegra30_mc_irq_handlers, + .num_interrupts = ARRAY_SIZE(tegra30_mc_irq_handlers), };#endif
drivers/memory/tegra/tegra194.c +2 -0
@@ -1359,4 +1359,6 @@ const struct tegra_mc_soc tegra194_mc_soc = { .ch_intmask = 0x00000f00, .global_intstatus_channel_shift = 8, .regs = &tegra20_mc_regs, + .handle_irq = tegra30_mc_irq_handlers, + .num_interrupts = ARRAY_SIZE(tegra30_mc_irq_handlers), };
drivers/memory/tegra/tegra20.c +6 -1
@@ -761,9 +761,12 @@ static irqreturn_t tegra20_mc_handle_irq(int irq, void *data)return IRQ_HANDLED ; } +static const irq_handler_t tegra20_mc_irq_handlers[] = { + tegra20_mc_handle_irq +}; +static const struct tegra_mc_ops tegra20_mc_ops = { .probe = tegra20_mc_probe, - .handle_irq = tegra20_mc_handle_irq, };const struct tegra_mc_soc tegra20_mc_soc = {
@@ -779,4 +782,6 @@ const struct tegra_mc_soc tegra20_mc_soc = { .icc_ops = &tegra20_mc_icc_ops, .ops = &tegra20_mc_ops, .regs = &tegra20_mc_regs, + .handle_irq = tegra20_mc_irq_handlers, + .num_interrupts = ARRAY_SIZE(tegra20_mc_irq_handlers), };
drivers/memory/tegra/tegra210.c +2 -0
@@ -1288,4 +1288,6 @@ const struct tegra_mc_soc tegra210_mc_soc = { .num_resets = ARRAY_SIZE(tegra210_mc_resets), .ops = &tegra30_mc_ops, .regs = &tegra20_mc_regs, + .handle_irq = tegra30_mc_irq_handlers, + .num_interrupts = ARRAY_SIZE(tegra30_mc_irq_handlers), };
drivers/memory/tegra/tegra234.c +2 -0
@@ -1153,4 +1153,6 @@ const struct tegra_mc_soc tegra234_mc_soc = {*/ .num_carveouts = 32, .regs = &tegra20_mc_regs, + .handle_irq = tegra30_mc_irq_handlers, + .num_interrupts = ARRAY_SIZE(tegra30_mc_irq_handlers), };
drivers/memory/tegra/tegra30.c +2 -0
@@ -1401,4 +1401,6 @@ const struct tegra_mc_soc tegra30_mc_soc = { .icc_ops = &tegra30_mc_icc_ops, .ops = &tegra30_mc_ops, .regs = &tegra20_mc_regs, + .handle_irq = tegra30_mc_irq_handlers, + .num_interrupts = ARRAY_SIZE(tegra30_mc_irq_handlers), };
include/soc/tegra/mc.h +5 -3
@@ -10,10 +10,11 @@#include <linux/debugfs.h> #include <linux/err.h> #include <linux/interconnect-provider.h> +#include <linux/interrupt.h> #include <linux/irq.h> #include <linux/reset-controller.h> -#include <linux/types.h> #include <linux/tegra-icc.h> +#include <linux/types.h> struct clk ;struct device ;
@@ -164,7 +165,6 @@ struct tegra_mc_ops {int (*probe)(struct tegra_mc *mc);void (*remove)(struct tegra_mc *mc);int (*resume)(struct tegra_mc *mc); -irqreturn_t (*handle_irq)(int irq,void *data);int (*probe_device)(struct tegra_mc *mc,struct device *dev); };
@@ -214,6 +214,9 @@ struct tegra_mc_soc {const struct tegra_mc_icc_ops *icc_ops;const struct tegra_mc_ops *ops;const struct tegra_mc_regs *regs; + +const irq_handler_t *handle_irq; +unsigned int num_interrupts; };struct tegra_mc {
@@ -224,7 +227,6 @@ struct tegra_mc {void __iomem *bcast_ch_regs;void __iomem **ch_regs;struct clk *clk; -int irq;const struct tegra_mc_soc *soc;unsigned long tick;
Signature · 1 line
2.17.1
PATCH v7 4/6 memory: tegra: Group SoC specific fields
In reply to Ketan PatilIntroduce new SoC specific fields in tegra_mc_soc struct for high address mask and error status type mask because Tegra264 has different values for these than the existing devices. Error status registers e.g. MC_ERR_STATUS_0 has few bits which indicate the type of the error. In order to obtain such type of error from error status register, we use error status type mask. Similarly, these error status registers have bits which indicate the higher address bits of the address responsible for mc error. In order to obtain such higher address, we use high address mask. Make this change to prepare for adding MC interrupt support for Tegra264.
--- drivers/memory/tegra/mc.c | 12 ++++++++---- drivers/memory/tegra/mc.h | 2 -- drivers/memory/tegra/tegra114.c | 1 + drivers/memory/tegra/tegra124.c | 4 ++++ drivers/memory/tegra/tegra186.c | 2 ++ drivers/memory/tegra/tegra194.c | 2 ++ drivers/memory/tegra/tegra20.c | 1 + drivers/memory/tegra/tegra210.c | 2 ++ drivers/memory/tegra/tegra234.c | 2 ++ drivers/memory/tegra/tegra30.c | 1 + include/soc/tegra/mc.h | 2 ++ 11 files changed, 25 insertions(+), 6 deletions(-)
drivers/memory/tegra/mc.c +8 -4
@@ -667,9 +667,12 @@ irqreturn_t tegra30_mc_handle_irq(int irq, void *data) addr =mc_ch_readl (mc, channel, addr_hi_reg); else addr =mc_readl (mc, addr_hi_reg); - }else { + }else if (mc->soc->mc_addr_hi_mask) { addr = ((value >>MC_ERR_STATUS_ADR_HI_SHIFT ) & -MC_ERR_STATUS_ADR_HI_MASK ); + mc->soc->mc_addr_hi_mask); + }else { +dev_err_ratelimited (mc->dev,"Unable to determine high address!" ); +return IRQ_NONE ; } addr <<=32 ; }
@@ -694,11 +697,12 @@ irqreturn_t tegra30_mc_handle_irq(int irq, void *data) } } - type = (value &MC_ERR_STATUS_TYPE_MASK ) >> + + type = (value & mc->soc->mc_err_status_type_mask) >>MC_ERR_STATUS_TYPE_SHIFT ; desc = tegra_mc_error_names[type]; -switch (value &MC_ERR_STATUS_TYPE_MASK ) { +switch (value & mc->soc->mc_err_status_type_mask) {case MC_ERR_STATUS_TYPE_INVALID_SMMU_PAGE : perm[0 ] =' ' ; perm[1 ] ='[' ;
drivers/memory/tegra/mc.h +0 -2
@@ -78,10 +78,8 @@#define MC_ERR_STATUS_TYPE_SHIFT 28#define MC_ERR_STATUS_TYPE_INVALID_SMMU_PAGE (0x6 << 28) -#define MC_ERR_STATUS_TYPE_MASK (0x7 << 28)#define MC_ERR_STATUS_ADR_HI_SHIFT 20 -#define MC_ERR_STATUS_ADR_HI_MASK 0x3#define MC_BROADCAST_CHANNEL ~0
drivers/memory/tegra/tegra114.c +1 -0
@@ -1117,4 +1117,5 @@ const struct tegra_mc_soc tegra114_mc_soc = { .regs = &tegra20_mc_regs, .handle_irq = tegra30_mc_irq_handlers, .num_interrupts = ARRAY_SIZE(tegra30_mc_irq_handlers), + .mc_err_status_type_mask = (0x7 << 28), };
drivers/memory/tegra/tegra124.c +4 -0
@@ -1278,6 +1278,8 @@ const struct tegra_mc_soc tegra124_mc_soc = { .regs = &tegra20_mc_regs, .handle_irq = tegra30_mc_irq_handlers, .num_interrupts = ARRAY_SIZE(tegra30_mc_irq_handlers), + .mc_addr_hi_mask = 0x3, + .mc_err_status_type_mask = (0x7 << 28), };#endif /* CONFIG_ARCH_TEGRA_124_SOC */
@@ -1313,5 +1315,7 @@ const struct tegra_mc_soc tegra132_mc_soc = { .regs = &tegra20_mc_regs, .handle_irq = tegra30_mc_irq_handlers, .num_interrupts = ARRAY_SIZE(tegra30_mc_irq_handlers), + .mc_addr_hi_mask = 0x3, + .mc_err_status_type_mask = (0x7 << 28), };#endif /* CONFIG_ARCH_TEGRA_132_SOC */
drivers/memory/tegra/tegra186.c +2 -0
@@ -916,5 +916,7 @@ const struct tegra_mc_soc tegra186_mc_soc = { .regs = &tegra20_mc_regs, .handle_irq = tegra30_mc_irq_handlers, .num_interrupts = ARRAY_SIZE(tegra30_mc_irq_handlers), + .mc_addr_hi_mask = 0x3, + .mc_err_status_type_mask = (0x7 << 28), };#endif
drivers/memory/tegra/tegra194.c +2 -0
@@ -1361,4 +1361,6 @@ const struct tegra_mc_soc tegra194_mc_soc = { .regs = &tegra20_mc_regs, .handle_irq = tegra30_mc_irq_handlers, .num_interrupts = ARRAY_SIZE(tegra30_mc_irq_handlers), + .mc_addr_hi_mask = 0x3, + .mc_err_status_type_mask = (0x7 << 28), };
drivers/memory/tegra/tegra20.c +1 -0
@@ -784,4 +784,5 @@ const struct tegra_mc_soc tegra20_mc_soc = { .regs = &tegra20_mc_regs, .handle_irq = tegra20_mc_irq_handlers, .num_interrupts = ARRAY_SIZE(tegra20_mc_irq_handlers), + .mc_err_status_type_mask = (0x7 << 28), };
drivers/memory/tegra/tegra210.c +2 -0
@@ -1290,4 +1290,6 @@ const struct tegra_mc_soc tegra210_mc_soc = { .regs = &tegra20_mc_regs, .handle_irq = tegra30_mc_irq_handlers, .num_interrupts = ARRAY_SIZE(tegra30_mc_irq_handlers), + .mc_addr_hi_mask = 0x3, + .mc_err_status_type_mask = (0x7 << 28), };
drivers/memory/tegra/tegra234.c +2 -0
@@ -1155,4 +1155,6 @@ const struct tegra_mc_soc tegra234_mc_soc = { .regs = &tegra20_mc_regs, .handle_irq = tegra30_mc_irq_handlers, .num_interrupts = ARRAY_SIZE(tegra30_mc_irq_handlers), + .mc_addr_hi_mask = 0x3, + .mc_err_status_type_mask = (0x7 << 28), };
drivers/memory/tegra/tegra30.c +1 -0
@@ -1403,4 +1403,5 @@ const struct tegra_mc_soc tegra30_mc_soc = { .regs = &tegra20_mc_regs, .handle_irq = tegra30_mc_irq_handlers, .num_interrupts = ARRAY_SIZE(tegra30_mc_irq_handlers), + .mc_err_status_type_mask = (0x7 << 28), };
include/soc/tegra/mc.h +2 -0
@@ -217,6 +217,8 @@ struct tegra_mc_soc {const irq_handler_t *handle_irq;unsigned int num_interrupts; +unsigned int mc_addr_hi_mask; +unsigned int mc_err_status_type_mask; };struct tegra_mc {
Signature · 1 line
2.17.1
PATCH v7 5/6 memory: tegra: Prepare for supporting multiple intmask registers
In reply to Ketan PatilAdd a new structure for the intmask register e.g. MC_INTMASK_0 and it's mask value. Add an array of these new structures to prepare for supporting multiple intmask registers. This is done in preparation for adding support for Tegra264 which supports multiple intmask registers.
--- drivers/memory/tegra/mc.c | 16 +++++++++------- drivers/memory/tegra/tegra114.c | 12 ++++++++++-- drivers/memory/tegra/tegra124.c | 28 ++++++++++++++++++++++------ drivers/memory/tegra/tegra186.c | 14 +++++++++++--- drivers/memory/tegra/tegra194.c | 15 +++++++++++---- drivers/memory/tegra/tegra20.c | 14 +++++++++++--- drivers/memory/tegra/tegra210.c | 14 +++++++++++--- drivers/memory/tegra/tegra234.c | 15 +++++++++++---- drivers/memory/tegra/tegra264.c | 17 ++++++++++++----- drivers/memory/tegra/tegra30.c | 12 ++++++++++-- include/soc/tegra/mc.h | 8 +++++++- 11 files changed, 125 insertions(+), 40 deletions(-)
drivers/memory/tegra/mc.c +9 -7
@@ -595,9 +595,9 @@ irqreturn_t tegra30_mc_handle_irq(int irq, void *data) }/* mask all interrupts to avoid flooding */ - status =mc_ch_readl (mc, channel,MC_INTSTATUS ) & mc->soc->intmask; + status =mc_ch_readl (mc, channel,MC_INTSTATUS ) & mc->soc->intmasks[0 ].mask; }else { - status =mc_readl (mc,MC_INTSTATUS ) & mc->soc->intmask; + status =mc_readl (mc,MC_INTSTATUS ) & mc->soc->intmasks[0 ].mask; }if (!status)
@@ -979,11 +979,13 @@ static int tegra_mc_probe(struct platform_device *pdev) } } -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 ); +for (i =0 ; i < mc->soc->num_intmasks; i++) { +if (mc->soc->num_channels) +mc_ch_writel (mc,MC_BROADCAST_CHANNEL , mc->soc->intmasks[i].mask, + mc->soc->intmasks[i].reg); +else +mc_writel (mc, mc->soc->intmasks[i].mask, mc->soc->intmasks[i].reg); + } }if (mc->soc->reset_ops) {
drivers/memory/tegra/tegra114.c +10 -2
@@ -1101,6 +1101,14 @@ static const struct tegra_mc_reset tegra114_mc_resets[] = { TEGRA114_MC_RESET(VI, 0x200, 0x204, 17), }; +static const struct tegra_mc_intmask tegra114_mc_intmasks[] = { + { + .reg =MC_INTMASK , + .mask =MC_INT_INVALID_SMMU_PAGE |MC_INT_SECURITY_VIOLATION | +MC_INT_DECERR_EMEM , + }, +}; +const struct tegra_mc_soc tegra114_mc_soc = { .clients = tegra114_mc_clients, .num_clients =ARRAY_SIZE (tegra114_mc_clients),
@@ -1108,8 +1116,8 @@ const struct tegra_mc_soc tegra114_mc_soc = { .atom_size = 32, .client_id_mask = 0x7f, .smmu = &tegra114_smmu_soc, - .intmask =MC_INT_INVALID_SMMU_PAGE |MC_INT_SECURITY_VIOLATION | - MC_INT_DECERR_EMEM, + .intmasks = tegra114_mc_intmasks, + .num_intmasks = ARRAY_SIZE(tegra114_mc_intmasks), .reset_ops = &tegra_mc_reset_ops_common, .resets = tegra114_mc_resets, .num_resets = ARRAY_SIZE(tegra114_mc_resets),
drivers/memory/tegra/tegra124.c +22 -6
@@ -1258,6 +1258,15 @@ static const struct tegra_smmu_soc tegra124_smmu_soc = { .num_asids = 128, }; +static const struct tegra_mc_intmask tegra124_mc_intmasks[] = { + { + .reg =MC_INTMASK , + .mask =MC_INT_DECERR_MTS |MC_INT_SECERR_SEC |MC_INT_DECERR_VPR | +MC_INT_INVALID_APB_ASID_UPDATE |MC_INT_INVALID_SMMU_PAGE | +MC_INT_SECURITY_VIOLATION |MC_INT_DECERR_EMEM , + }, +}; +const struct tegra_mc_soc tegra124_mc_soc = { .clients = tegra124_mc_clients, .num_clients =ARRAY_SIZE (tegra124_mc_clients),
@@ -1267,9 +1276,8 @@ const struct tegra_mc_soc tegra124_mc_soc = { .smmu = &tegra124_smmu_soc, .emem_regs = tegra124_mc_emem_regs, .num_emem_regs = ARRAY_SIZE(tegra124_mc_emem_regs), - .intmask =MC_INT_DECERR_MTS |MC_INT_SECERR_SEC |MC_INT_DECERR_VPR | -MC_INT_INVALID_APB_ASID_UPDATE |MC_INT_INVALID_SMMU_PAGE | - MC_INT_SECURITY_VIOLATION | MC_INT_DECERR_EMEM, + .intmasks = tegra124_mc_intmasks, + .num_intmasks = ARRAY_SIZE(tegra124_mc_intmasks), .reset_ops = &tegra_mc_reset_ops_common, .resets = tegra124_mc_resets, .num_resets = ARRAY_SIZE(tegra124_mc_resets),
@@ -1297,6 +1305,15 @@ static const struct tegra_smmu_soc tegra132_smmu_soc = { .num_asids = 128, }; +static const struct tegra_mc_intmask tegra132_mc_intmasks[] = { + { + .reg =MC_INTMASK , + .mask =MC_INT_DECERR_MTS |MC_INT_SECERR_SEC |MC_INT_DECERR_VPR | +MC_INT_INVALID_APB_ASID_UPDATE |MC_INT_INVALID_SMMU_PAGE | +MC_INT_SECURITY_VIOLATION |MC_INT_DECERR_EMEM , + }, +}; +const struct tegra_mc_soc tegra132_mc_soc = { .clients = tegra124_mc_clients, .num_clients =ARRAY_SIZE (tegra124_mc_clients),
@@ -1304,9 +1321,8 @@ const struct tegra_mc_soc tegra132_mc_soc = { .atom_size = 32, .client_id_mask = 0x7f, .smmu = &tegra132_smmu_soc, - .intmask =MC_INT_DECERR_MTS |MC_INT_SECERR_SEC |MC_INT_DECERR_VPR | -MC_INT_INVALID_APB_ASID_UPDATE |MC_INT_INVALID_SMMU_PAGE | - MC_INT_SECURITY_VIOLATION | MC_INT_DECERR_EMEM, + .intmasks = tegra132_mc_intmasks, + .num_intmasks = ARRAY_SIZE(tegra132_mc_intmasks), .reset_ops = &tegra_mc_reset_ops_common, .resets = tegra124_mc_resets, .num_resets = ARRAY_SIZE(tegra124_mc_resets),
drivers/memory/tegra/tegra186.c +11 -3
@@ -901,15 +901,23 @@ static const struct tegra_mc_client tegra186_mc_clients[] = { }, }; +static const struct tegra_mc_intmask tegra186_mc_intmasks[] = { + { + .reg =MC_INTMASK , + .mask =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 , + }, +}; +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 , .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 , + .intmasks = tegra186_mc_intmasks, + .num_intmasks =ARRAY_SIZE (tegra186_mc_intmasks), .ops = &tegra186_mc_ops, .ch_intmask =0x0000000f , .global_intstatus_channel_shift =0 ,
drivers/memory/tegra/tegra194.c +11 -4
@@ -1343,16 +1343,23 @@ static const struct tegra_mc_client tegra194_mc_clients[] = { }, }; +static const struct tegra_mc_intmask tegra194_mc_intmasks[] = { + { + .reg =MC_INTMASK , + .mask =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 , + }, +}; +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 , .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 , + .intmasks = tegra194_mc_intmasks, + .num_intmasks =ARRAY_SIZE (tegra194_mc_intmasks), .has_addr_hi_reg = true, .ops = &tegra186_mc_ops, .icc_ops = &tegra_mc_icc_ops,
drivers/memory/tegra/tegra20.c +11 -3
@@ -695,7 +695,7 @@ static irqreturn_t tegra20_mc_handle_irq(int irq, void *data)unsigned int bit;/* mask all interrupts to avoid flooding */ - status =mc_readl (mc,MC_INTSTATUS ) & mc->soc->intmask; + status =mc_readl (mc,MC_INTSTATUS ) & mc->soc->intmasks[0 ].mask;if (!status)return IRQ_NONE ;
@@ -769,13 +769,21 @@ static const struct tegra_mc_ops tegra20_mc_ops = { .probe = tegra20_mc_probe, }; +static const struct tegra_mc_intmask tegra20_mc_intmasks[] = { + { + .reg =MC_INTMASK , + .mask =MC_INT_SECURITY_VIOLATION |MC_INT_INVALID_GART_PAGE | +MC_INT_DECERR_EMEM , + }, +}; +const struct tegra_mc_soc tegra20_mc_soc = { .clients = tegra20_mc_clients, .num_clients =ARRAY_SIZE (tegra20_mc_clients), .num_address_bits =32 , .client_id_mask =0x3f , - .intmask =MC_INT_SECURITY_VIOLATION |MC_INT_INVALID_GART_PAGE | -MC_INT_DECERR_EMEM , + .intmasks = tegra20_mc_intmasks, + .num_intmasks =ARRAY_SIZE (tegra20_mc_intmasks), .reset_ops = &tegra20_mc_reset_ops, .resets = tegra20_mc_resets, .num_resets =ARRAY_SIZE (tegra20_mc_resets),
drivers/memory/tegra/tegra210.c +11 -3
@@ -1273,6 +1273,15 @@ static const struct tegra_mc_reset tegra210_mc_resets[] = { TEGRA210_MC_RESET(TSECB, 0x970, 0x974, 13), }; +static const struct tegra_mc_intmask tegra210_mc_intmasks[] = { + { + .reg =MC_INTMASK , + .mask =MC_INT_DECERR_MTS |MC_INT_SECERR_SEC |MC_INT_DECERR_VPR | +MC_INT_INVALID_APB_ASID_UPDATE |MC_INT_INVALID_SMMU_PAGE | +MC_INT_SECURITY_VIOLATION |MC_INT_DECERR_EMEM , + }, +}; +const struct tegra_mc_soc tegra210_mc_soc = { .clients = tegra210_mc_clients, .num_clients =ARRAY_SIZE (tegra210_mc_clients),
@@ -1280,9 +1289,8 @@ const struct tegra_mc_soc tegra210_mc_soc = { .atom_size = 64, .client_id_mask = 0xff, .smmu = &tegra210_smmu_soc, - .intmask =MC_INT_DECERR_MTS |MC_INT_SECERR_SEC |MC_INT_DECERR_VPR | -MC_INT_INVALID_APB_ASID_UPDATE |MC_INT_INVALID_SMMU_PAGE | - MC_INT_SECURITY_VIOLATION | MC_INT_DECERR_EMEM, + .intmasks = tegra210_mc_intmasks, + .num_intmasks = ARRAY_SIZE(tegra210_mc_intmasks), .reset_ops = &tegra_mc_reset_ops_common, .resets = tegra210_mc_resets, .num_resets = ARRAY_SIZE(tegra210_mc_resets),
drivers/memory/tegra/tegra234.c +11 -4
@@ -1132,16 +1132,23 @@ static const struct tegra_mc_icc_ops tegra234_mc_icc_ops = { .set = tegra234_mc_icc_set, }; +static const struct tegra_mc_intmask tegra234_mc_intmasks[] = { + { + .reg =MC_INTMASK , + .mask =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 , + }, +}; +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 , .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 , + .intmasks = tegra234_mc_intmasks, + .num_intmasks =ARRAY_SIZE (tegra234_mc_intmasks), .has_addr_hi_reg = true, .ops = &tegra186_mc_ops, .icc_ops = &tegra234_mc_icc_ops,
drivers/memory/tegra/tegra264.c +12 -5
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (C) 2025, NVIDIA CORPORATION. All rights reserved. +* Copyright (C) 2025-2026, NVIDIA CORPORATION. All rights reserved. */ #include <dt-bindings/memory/nvidia,tegra264.h>
@@ -290,16 +290,23 @@ static const struct tegra_mc_icc_ops tegra264_mc_icc_ops = { .set = tegra264_mc_icc_set, }; +static const struct tegra_mc_intmask tegra264_mc_intmasks[] = { + { + .reg =MC_INTMASK , + .mask =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 , + }, +}; +const struct tegra_mc_soc tegra264_mc_soc = { .num_clients =ARRAY_SIZE (tegra264_mc_clients), .clients = tegra264_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 , + .intmasks = tegra264_mc_intmasks, + .num_intmasks =ARRAY_SIZE (tegra264_mc_intmasks), .has_addr_hi_reg = true, .ops = &tegra186_mc_ops, .icc_ops = &tegra264_mc_icc_ops,
drivers/memory/tegra/tegra30.c +10 -2
@@ -1384,6 +1384,14 @@ static const struct tegra_mc_icc_ops tegra30_mc_icc_ops = { .set = tegra30_mc_icc_set, }; +static const struct tegra_mc_intmask tegra30_mc_intmasks[] = { + { + .reg =MC_INTMASK , + .mask =MC_INT_INVALID_SMMU_PAGE |MC_INT_SECURITY_VIOLATION | +MC_INT_DECERR_EMEM , + }, +}; +const struct tegra_mc_soc tegra30_mc_soc = { .clients = tegra30_mc_clients, .num_clients =ARRAY_SIZE (tegra30_mc_clients),
@@ -1393,8 +1401,8 @@ const struct tegra_mc_soc tegra30_mc_soc = { .smmu = &tegra30_smmu_soc, .emem_regs = tegra30_mc_emem_regs, .num_emem_regs = ARRAY_SIZE(tegra30_mc_emem_regs), - .intmask =MC_INT_INVALID_SMMU_PAGE |MC_INT_SECURITY_VIOLATION | - MC_INT_DECERR_EMEM, + .intmasks = tegra30_mc_intmasks, + .num_intmasks = ARRAY_SIZE(tegra30_mc_intmasks), .reset_ops = &tegra_mc_reset_ops_common, .resets = tegra30_mc_resets, .num_resets = ARRAY_SIZE(tegra30_mc_resets),
include/soc/tegra/mc.h +7 -1
@@ -185,6 +185,11 @@ struct tegra_mc_regs {unsigned int err_route_add; }; +struct tegra_mc_intmask { +u32 reg; +u32 mask; +}; +struct tegra_mc_soc {const struct tegra_mc_client *clients;unsigned int num_clients;
@@ -202,7 +207,6 @@ struct tegra_mc_soc {const struct tegra_smmu_soc *smmu; -u32 intmask;u32 ch_intmask;u32 global_intstatus_channel_shift;bool has_addr_hi_reg;
@@ -219,6 +223,8 @@ struct tegra_mc_soc {unsigned int num_interrupts;unsigned int mc_addr_hi_mask;unsigned int mc_err_status_type_mask; +const struct tegra_mc_intmask *intmasks; +unsigned int num_intmasks; };struct tegra_mc {
Signature · 1 line
2.17.1
PATCH v7 6/6 memory: tegra: Add MC error logging support for Tegra264
In reply to Ketan PatilIn Tegra264, different components from memory subsystems like Memory Controller Fabric (MCF), HUB, HUB Common (HUBC), Side Band Shim (SBS) and channels have different interrupt lines for receiving memory controller error interrupts.
Add support for logging memory controller errors reported by these memory subsystems on Tegra264 by:
- Renaming tegra_mc_error_names array to tegra20_mc_error_names because it has a different bit index for error names compared to Tegra264.
- Defining the intmask registers and mask values supported for Tegra264.
- Registering interrupt handlers for interrupts associated with these different MC components which read the interrupt status registers to determine the type of violation that occurred.
--- drivers/memory/tegra/mc.c | 5 +- drivers/memory/tegra/mc.h | 72 +++++- drivers/memory/tegra/tegra20.c | 6 +- drivers/memory/tegra/tegra264.c | 411 +++++++++++++++++++++++++++++++- 4 files changed, 484 insertions(+), 10 deletions(-)
drivers/memory/tegra/mc.c +3 -2
@@ -700,7 +700,7 @@ irqreturn_t tegra30_mc_handle_irq(int irq, void *data) type = (value & mc->soc->mc_err_status_type_mask) >>MC_ERR_STATUS_TYPE_SHIFT ; - desc = tegra_mc_error_names[type]; + desc = tegra20_mc_error_names[type];switch (value & mc->soc->mc_err_status_type_mask) {case MC_ERR_STATUS_TYPE_INVALID_SMMU_PAGE :
@@ -768,9 +768,10 @@ const char *const tegra_mc_status_names[32] = { [16] = "MTS carveout violation", [17] = "Generalized carveout violation", [20] = "Route Sanity error", + [21] = "GIC_MSI error", }; -const char *const tegra_mc_error_names[8 ] = { +const char *const tegra20_mc_error_names[8 ] = { [2 ] ="EMEM decode error" , [3 ] ="TrustZone violation" , [4 ] ="Carveout violation" ,
drivers/memory/tegra/mc.h +71 -1
97 lines not on this page · raw message
drivers/memory/tegra/tegra20.c +3 -3
@@ -713,7 +713,7 @@ static irqreturn_t tegra20_mc_handle_irq(int irq, void *data) value =mc_readl (mc, reg); id = value & mc->soc->client_id_mask; - desc = tegra_mc_error_names[2 ]; + desc = tegra20_mc_error_names[2 ];if (value &BIT (31 )) direction ="write" ;
@@ -724,7 +724,7 @@ static irqreturn_t tegra20_mc_handle_irq(int irq, void *data) value =mc_readl (mc, reg); id = (value >>1 ) & mc->soc->client_id_mask; - desc = tegra_mc_error_names[2 ]; + desc = tegra20_mc_error_names[2 ];if (value &BIT (0 )) direction ="write" ;
@@ -736,7 +736,7 @@ static irqreturn_t tegra20_mc_handle_irq(int irq, void *data) id = value & mc->soc->client_id_mask; type = (value &BIT (30 )) ?4 :3 ; - desc = tegra_mc_error_names[type]; + desc = tegra20_mc_error_names[type]; secure ="secure " ;if (value &BIT (31 ))
drivers/memory/tegra/tegra264.c +407 -4
436 lines not on this page · raw message
Signature · 1 line
2.17.1
Quoted 6 lines · Ketan Patil
In Tegra264, different components from memory subsystems like Memory Controller Fabric (MCF), HUB, HUB Common (HUBC), Side Band Shim (SBS) and MC Channels have different interrupt lines for receiving memory controller error interrupts. This patch set includes changes to add support and enable Memory Controller error logging for Tegra264.
Quoted 8 lines
Ketan Patil (6):
memory: tegra: Group error handling related registers
memory: tegra: Group register and fields
memory: tegra: Add support for multiple IRQs
memory: tegra: Group SoC specific fields
memory: tegra: Prepare for supporting multiple intmask registers
memory: tegra: Add MC error logging support for Tegra264
Krzysztof, let us know if you are OK with this version? If so, would be great to get this into -next.
Thanks!
Jon
Signature · 1 line
nvpublic
Krzysztof Kozlowski
maintainerQuoted 6 lines · Ketan Patil
In Tegra264, different components from memory subsystems like Memory Controller Fabric (MCF), HUB, HUB Common (HUBC), Side Band Shim (SBS) and MC Channels have different interrupt lines for receiving memory controller error interrupts. This patch set includes changes to add support and enable Memory Controller error logging for Tegra264.
Quoted 8 lines
Ketan Patil (6):
memory: tegra: Group error handling related registers
memory: tegra: Group register and fields
memory: tegra: Add support for multiple IRQs
memory: tegra: Group SoC specific fields
memory: tegra: Prepare for supporting multiple intmask registers
memory: tegra: Add MC error logging support for Tegra264
Please use checkpatch. You should run it, not the maintainer.
CHECK: Alignment should match open parenthesis
CHECK: Please don't use multiple blank lines
Best regards,
Krzysztof
Quoted 18 lines · Krzysztof Kozlowski
External email: Use caution opening links or attachments
Quoted 6 lines · Ketan Patil
In Tegra264, different components from memory subsystems like Memory Controller Fabric (MCF), HUB, HUB Common (HUBC), Side Band Shim (SBS) and MC Channels have different interrupt lines for receiving memory controller error interrupts. This patch set includes changes to add support and enable Memory Controller error logging for Tegra264.
Quoted 8 lines
Ketan Patil (6):
memory: tegra: Group error handling related registers
memory: tegra: Group register and fields
memory: tegra: Add support for multiple IRQs
memory: tegra: Group SoC specific fields
memory: tegra: Prepare for supporting multiple intmask registers
memory: tegra: Add MC error logging support for Tegra264
Quoted 4 lines
Please use checkpatch. You should run it, not the maintainer.
CHECK: Alignment should match open parenthesis
CHECK: Please don't use multiple blank lines
Thanks Krzysztof for applying the patches.
Actually, I ran the checkpatch before sending the patches but did not see any issues. But, I did not run it with --strict option.
These errors are seen only with --strict option. I will make sure to use this option for any future patches.
Quoted 3 lines
Best regards,
Krzysztof
Quoted 9 lines · Ketan Patil
In Tegra264, different components from memory subsystems like Memory Controller Fabric (MCF), HUB, HUB Common (HUBC), Side Band Shim (SBS) and MC Channels have different interrupt lines for receiving memory controller error interrupts. This patch set includes changes to add support and enable Memory Controller error logging for Tegra264.
Ketan Patil (6):
[...]
Applied, thanks!
[1/6] memory: tegra: Group error handling related registers
https://git.kernel.org/krzk/linux-mem-ctrl/c/b8a177f18df1b439aac708da2d8bd9fcd68bb1eb [2/6] memory: tegra: Group register and fields https://git.kernel.org/krzk/linux-mem-ctrl/c/95b714bd8c39d65b241aa1c346625b9c942af403 [3/6] memory: tegra: Add support for multiple IRQs https://git.kernel.org/krzk/linux-mem-ctrl/c/4d865a2374037d2d0842f88822fd753f0918b370 [4/6] memory: tegra: Group SoC specific fields https://git.kernel.org/krzk/linux-mem-ctrl/c/2e4cfaa78eb98d2623367818c859225c6b6bf701 [5/6] memory: tegra: Prepare for supporting multiple intmask registers https://git.kernel.org/krzk/linux-mem-ctrl/c/9f2614510960f0761144d14e1b4c4d82e0c098e9 [6/6] memory: tegra: Add MC error logging support for Tegra264 https://git.kernel.org/krzk/linux-mem-ctrl/c/82169065ffb07577075a5088b313d78673ded331
Best regards,
Signature · 1 line
Krzysztof Kozlowski <[email protected]>