memory: tegra: Add MC error logging support for Tegra264 SoC
Subsystems (2)
v3 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 (4):
memory: tegra: Group mc-err related registers
memory: tegra: Group register and fields
memory: tegra: Add support for multiple irqs
memory: tegra: Add MC error logging support for Tegra264
---
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 | 125 +++++++--- drivers/memory/tegra/mc.h | 140 +++++++---- drivers/memory/tegra/tegra114.c | 3 +- drivers/memory/tegra/tegra124.c | 4 +- drivers/memory/tegra/tegra186.c | 14 +- drivers/memory/tegra/tegra194.c | 5 +- drivers/memory/tegra/tegra20.c | 20 +- drivers/memory/tegra/tegra210.c | 3 +- drivers/memory/tegra/tegra234.c | 5 +- drivers/memory/tegra/tegra264.c | 407 +++++++++++++++++++++++++++++++- drivers/memory/tegra/tegra30.c | 5 +- include/soc/tegra/mc.h | 32 ++- 12 files changed, 662 insertions(+), 101 deletions(-)
Signature · 1 line
2.17.1
PATCH v3 1/4 memory: tegra: Group mc-err related registers
Group MC error related registers into a struct as they could have soc specific values.
--- drivers/memory/tegra/mc.c | 45 +++++++++++++++++++++++---------- drivers/memory/tegra/mc.h | 14 ---------- drivers/memory/tegra/tegra114.c | 3 ++- drivers/memory/tegra/tegra124.c | 4 ++- drivers/memory/tegra/tegra186.c | 1 + 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 | 21 ++++++++++++++- 11 files changed, 67 insertions(+), 36 deletions(-)
drivers/memory/tegra/mc.c +31 -14
@@ -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 = { + .mc_cfg_channel_enable =0xdf8 , + .mc_err_status =0x08 , + .mc_err_add =0x0c , + .mc_err_add_hi =0x11fc , + .mc_err_vpr_status =0x654 , + .mc_err_vpr_add =0x658 , + .mc_err_sec_status =0x67c , + .mc_err_sec_add =0x680 , + .mc_err_mts_status =0x9b0 , + .mc_err_mts_add =0x9b4 , + .mc_err_gen_co_status =0xc00 , + .mc_err_gen_co_add =0xc04 , + .mc_err_route_status =0x9c0 , + .mc_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->mc_regs->mc_err_vpr_status; + addr_reg = mc->soc->mc_regs->mc_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->mc_regs->mc_err_sec_status; + addr_reg = mc->soc->mc_regs->mc_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->mc_regs->mc_err_mts_status; + addr_reg = mc->soc->mc_regs->mc_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->mc_regs->mc_err_gen_co_status; + addr_reg = mc->soc->mc_regs->mc_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->mc_regs->mc_err_route_status; + addr_reg = mc->soc->mc_regs->mc_err_route_add;break ;default : - status_reg =MC_ERR_STATUS ; - addr_reg =MC_ERR_ADR ; + status_reg = mc->soc->mc_regs->mc_err_status; + addr_reg = mc->soc->mc_regs->mc_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->mc_regs->mc_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->mc_regs->mc_cfg_channel_enable);if (value <=0 ) { mc->num_channels = mc->soc->num_channels;return ;
drivers/memory/tegra/mc.h +0 -14
@@ -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-2025 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, + .mc_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-2025 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, + .mc_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, + .mc_regs = &tegra20_mc_regs, };#endif /* CONFIG_ARCH_TEGRA_132_SOC */
drivers/memory/tegra/tegra186.c +1 -0
@@ -914,5 +914,6 @@ const struct tegra_mc_soc tegra186_mc_soc = { .ops = &tegra186_mc_ops, .ch_intmask = 0x0000000f, .global_intstatus_channel_shift = 0, + .mc_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-2025 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, + .mc_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-2025 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, + .mc_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-2025 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, + .mc_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-2025, 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, + .mc_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-2025 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, + .mc_regs = &tegra20_mc_regs, };
include/soc/tegra/mc.h +20 -1
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ /* -* Copyright (C) 2014 NVIDIA Corporation +* Copyright (C) 2014-2025 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 mc_cfg_channel_enable; +unsigned int mc_err_status; +unsigned int mc_err_add; +unsigned int mc_err_add_hi; +unsigned int mc_err_vpr_status; +unsigned int mc_err_vpr_add; +unsigned int mc_err_sec_status; +unsigned int mc_err_sec_add; +unsigned int mc_err_mts_status; +unsigned int mc_err_mts_add; +unsigned int mc_err_gen_co_status; +unsigned int mc_err_gen_co_add; +unsigned int mc_err_route_status; +unsigned int mc_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 *mc_regs; };struct tegra_mc {
@@ -256,4 +274,5 @@ 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 v3 2/4 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 of the corresponding registers below the register definitions to clearly identify which fields belongs to which registers.
--- drivers/memory/tegra/mc.h | 49 +++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 22 deletions(-)
drivers/memory/tegra/mc.h +27 -22
@@ -13,13 +13,31 @@#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_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_TIMING_RCD 0x98#define MC_EMEM_ARB_TIMING_RP 0x9c#define MC_EMEM_ARB_TIMING_RC 0xa0
@@ -41,44 +59,31 @@#define MC_EMEM_ARB_OVERRIDE 0xe8#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 ~0static inline u32 tegra_mc_scale_percents (u64 val,unsigned int percents)
Signature · 1 line
2.17.1
PATCH v3 3/4 memory: tegra: Add support for multiple irqs
In reply to Ketan PatilAdd support to handle multiple MC interrupts lines as the number of interrupt lines could vary based upon SoC. Add field to specify the number of interrupts and iterate over the number of interrupts to register handler for each interrupt. SoC with multiple interrupts will be added in subsequent patches.
--- drivers/memory/tegra/mc.c | 35 +++++++++++++++++++++------------ drivers/memory/tegra/mc.h | 1 + drivers/memory/tegra/tegra186.c | 3 ++- drivers/memory/tegra/tegra20.c | 7 ++++++- include/soc/tegra/mc.h | 4 +++- 5 files changed, 34 insertions(+), 16 deletions(-)
drivers/memory/tegra/mc.c +22 -13
@@ -551,10 +551,15 @@ 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, + .handle_irq = tegra30_mc_irq_handlers, + .num_interrupts =1 , };#endif +const irq_handler_t tegra30_mc_irq_handlers[] = { + tegra30_mc_handle_irq +}; +static int mc_global_intstatus_to_channel (const struct tegra_mc *mc,u32 status,unsigned int *mc_channel) {
@@ -953,25 +958,29 @@ 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; -WARN (!mc->soc->client_id_mask,"missing client ID mask for this SoC\n" ); +for (int i =0 ; i < mc->soc->ops->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->ops->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
@@ -194,6 +194,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[];extern const char *const tegra_mc_status_names[32 ];extern const char *const tegra_mc_error_names[8 ];
drivers/memory/tegra/tegra186.c +2 -1
@@ -174,7 +174,8 @@ 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, + .handle_irq = tegra30_mc_irq_handlers, + .num_interrupts = 1, };#if defined(CONFIG_ARCH_TEGRA_186_SOC )
drivers/memory/tegra/tegra20.c +6 -1
@@ -761,9 +761,14 @@ 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, + .handle_irq = tegra20_mc_irq_handlers, + .num_interrupts =1 , };const struct tegra_mc_soc tegra20_mc_soc = {
include/soc/tegra/mc.h +3 -1
@@ -14,6 +14,7 @@#include <linux/reset-controller.h> #include <linux/types.h> #include <linux/tegra-icc.h> +#include <linux/interrupt.h> struct clk ;struct device ;
@@ -164,8 +165,9 @@ 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); +const irq_handler_t *handle_irq;int (*probe_device)(struct tegra_mc *mc,struct device *dev); +unsigned int num_interrupts; };struct tegra_mc_regs {
Signature · 1 line
2.17.1
PATCH v3 4/4 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 MC Channels have different interrupt lines for receiving memory controller error interrupts.
Add support for logging memory controller errors on Tegra264.
- Add MC error handling flow for MCF, HUB, HUBC, SBS and MC Channel.
- Each of these components have different interrupt lines for MC error.
- Register interrupt handlers for interrupts from these different MC components.
- There is no global interrupt status register in Tegra264 unlike older Tegra chips.
- There are common interrupt status registers in case of MCF, HUB, HUBC from which figure out the slice number or hub number responsible for generating interrupt and then read interrupt status register to find out type of violation.
- Introduce new SoC specific fields in tegra_mc_soc like interrupt mask values for MCF, HUB, HUBC etc., which are SOC specific.
--- drivers/memory/tegra/mc.c | 49 +++- drivers/memory/tegra/mc.h | 78 +++++- drivers/memory/tegra/tegra186.c | 10 +- drivers/memory/tegra/tegra194.c | 2 + drivers/memory/tegra/tegra20.c | 10 +- drivers/memory/tegra/tegra234.c | 2 + drivers/memory/tegra/tegra264.c | 407 +++++++++++++++++++++++++++++++- drivers/memory/tegra/tegra30.c | 2 + include/soc/tegra/mc.h | 7 + 9 files changed, 537 insertions(+), 30 deletions(-)
drivers/memory/tegra/mc.c +37 -12
@@ -606,7 +606,7 @@ irqreturn_t tegra30_mc_handle_irq(int irq, void *data)return IRQ_NONE ;for_each_set_bit (bit, &status,32 ) { -const char *error = tegra_mc_status_names[bit] ?:"unknown" ; +const char *error = tegra20_mc_status_names[bit] ?:"unknown" ;const char *client ="unknown" , *desc;const char *direction, *secure;u32 status_reg, addr_reg;
@@ -671,7 +671,7 @@ irqreturn_t tegra30_mc_handle_irq(int irq, void *data) addr =mc_readl (mc, addr_hi_reg); }else { addr = ((value >>MC_ERR_STATUS_ADR_HI_SHIFT ) & -MC_ERR_STATUS_ADR_HI_MASK ); + mc->soc->mc_addr_hi_mask); } addr <<=32 ; }
@@ -696,11 +696,11 @@ 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]; + desc = tegra20_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 ] ='[' ;
@@ -753,7 +753,7 @@ irqreturn_t tegra30_mc_handle_irq(int irq, void *data)return IRQ_HANDLED ; } -const char *const tegra_mc_status_names[32 ] = { +const char *const tegra20_mc_status_names[32 ] = { [1 ] ="External interrupt" , [6 ] ="EMEM address decode error" , [7 ] ="GART page fault" ,
@@ -768,7 +768,7 @@ const char *const tegra_mc_status_names[32] = { [20] = "Route Sanity 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" ,
@@ -976,11 +976,36 @@ 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 ); +if (mc->soc->ops->num_interrupts >1 ) { +/* Unmask MCF interrupts */ +mc_ch_writel (mc,MC_BROADCAST_CHANNEL , mc->soc->mcf_intmask,MCF_INTMASK_0 ); +mc_ch_writel (mc,MC_BROADCAST_CHANNEL , mc->soc->mcf_intmask, +MCF_INTPRIORITY_0 ); + +/* Unmask HUB and HUBC interrupts */ +mc_ch_writel (mc,MC_BROADCAST_CHANNEL , mc->soc->hub_intmask, +MSS_HUB_INTRMASK_0 ); +mc_ch_writel (mc,MC_BROADCAST_CHANNEL , mc->soc->hub_intmask, +MSS_HUB_INTRPRIORITY_0 ); +mc_ch_writel (mc,MC_BROADCAST_CHANNEL , mc->soc->hubc_intmask, +MSS_HUB_HUBC_INTMASK_0 ); +mc_ch_writel (mc,MC_BROADCAST_CHANNEL , mc->soc->hubc_intmask, +MSS_HUB_HUBC_INTPRIORITY_0 ); + +/* Unmask SBS interrupts */ +mc_ch_writel (mc,MC_BROADCAST_CHANNEL , mc->soc->sbs_intmask, +MSS_SBS_INTMASK_0 ); + +/* Unmask MC channel interrupt */ +mc_ch_writel (mc,MC_BROADCAST_CHANNEL , mc->soc->mc_ch_intmask, +MC_CH_INTMASK_0 ); + }else { +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 ); + } }if (mc->soc->reset_ops) {
drivers/memory/tegra/mc.h +73 -5
112 lines not on this page · raw message
drivers/memory/tegra/tegra186.c +6 -4
@@ -23,7 +23,7 @@#define MC_SID_STREAMID_SECURITY_WRITE_ACCESS_DISABLED BIT(16)#define MC_SID_STREAMID_SECURITY_OVERRIDE BIT(8) -static int tegra186_mc_probe (struct tegra_mc *mc) +int tegra186_mc_probe (struct tegra_mc *mc) {struct platform_device *pdev =to_platform_device (mc->dev);struct resource *res;
@@ -76,7 +76,7 @@ static int tegra186_mc_probe(struct tegra_mc *mc)return 0 ; } -static void tegra186_mc_remove (struct tegra_mc *mc) +void tegra186_mc_remove (struct tegra_mc *mc) {of_platform_depopulate (mc->dev); }
@@ -124,7 +124,7 @@ static void tegra186_mc_client_sid_override(struct tegra_mc *mc, }#endif -static int tegra186_mc_probe_device (struct tegra_mc *mc,struct device *dev) +int tegra186_mc_probe_device (struct tegra_mc *mc,struct device *dev) {#if IS_ENABLED (CONFIG_IOMMU_API )struct of_phandle_args args;
@@ -154,7 +154,7 @@ static int tegra186_mc_probe_device(struct tegra_mc *mc, struct device *dev)return 0 ; } -static int tegra186_mc_resume (struct tegra_mc *mc) +int tegra186_mc_resume (struct tegra_mc *mc) {#if IS_ENABLED (CONFIG_IOMMU_API )unsigned int i;
@@ -916,5 +916,7 @@ const struct tegra_mc_soc tegra186_mc_soc = { .ch_intmask = 0x0000000f, .global_intstatus_channel_shift = 0, .mc_regs = &tegra20_mc_regs, + .mc_addr_hi_mask = 0x3, + .mc_err_status_type_mask = (0x7 << 28), };#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, .mc_regs = &tegra20_mc_regs, + .mc_addr_hi_mask = 0x3, + .mc_err_status_type_mask = (0x7 << 28), };
drivers/memory/tegra/tegra20.c +6 -4
@@ -700,7 +700,7 @@ static irqreturn_t tegra20_mc_handle_irq(int irq, void *data)return IRQ_NONE ;for_each_set_bit (bit, &status,32 ) { -const char *error = tegra_mc_status_names[bit]; +const char *error = tegra20_mc_status_names[bit];const char *direction ="read" , *secure ="" ;const char *client, *desc;phys_addr_t addr;
@@ -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 ))
@@ -784,4 +784,6 @@ const struct tegra_mc_soc tegra20_mc_soc = { .icc_ops = &tegra20_mc_icc_ops, .ops = &tegra20_mc_ops, .mc_regs = &tegra20_mc_regs, + .mc_addr_hi_mask = 0x3, + .mc_err_status_type_mask = (0x7 << 28), };
drivers/memory/tegra/tegra234.c +2 -0
@@ -1153,4 +1153,6 @@ const struct tegra_mc_soc tegra234_mc_soc = {*/ .num_carveouts = 32, .mc_regs = &tegra20_mc_regs, + .mc_addr_hi_mask = 0x3, + .mc_err_status_type_mask = (0x7 << 28), };
drivers/memory/tegra/tegra264.c +402 -5
436 lines not on this page · raw message
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, .mc_regs = &tegra20_mc_regs, + .mc_addr_hi_mask = 0x3, + .mc_err_status_type_mask = (0x7 << 28), };
include/soc/tegra/mc.h +7 -0
@@ -216,6 +216,13 @@ struct tegra_mc_soc {const struct tegra_mc_icc_ops *icc_ops;const struct tegra_mc_ops *ops;const struct tegra_mc_regs *mc_regs; +unsigned int mc_addr_hi_mask; +unsigned int mc_err_status_type_mask; +u32 mcf_intmask; +u32 hub_intmask; +u32 hubc_intmask; +u32 sbs_intmask; +u32 mc_ch_intmask; };struct tegra_mc {
Signature · 1 line
2.17.1
Jon Hunter
maintainerRe: [PATCH v3 4/4] memory: tegra: Add MC error logging support for Tegra264
Hi Ketan,
Quoted 20 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.
Add support for logging memory controller errors on Tegra264.
- Add MC error handling flow for MCF, HUB, HUBC, SBS and MC Channel.
- Each of these components have different interrupt lines for MC error.
- Register interrupt handlers for interrupts from these different MC components.
- There is no global interrupt status register in Tegra264 unlike older Tegra chips.
- There are common interrupt status registers in case of MCF, HUB, HUBC from which figure out the slice number or hub number responsible for generating interrupt and then read interrupt status register to find out type of violation.
- Introduce new SoC specific fields integra_mc_soclike interrupt mask values for MCF, HUB, HUBC etc., which are SOC specific.Signed-off-by Ketan Patil <[email protected]>
...
drivers/memory/tegra/tegra264.c static int tegra264_mc_icc_get_init_bw(struct icc_node *node, u32 *avg, u32 *pea · line 574
Quoted 5 lines
drivers/memory/tegra/tegra264.c +5
-0+static irqreturn_t handle_hub_irq (int irq,void *data) +{ +struct tegra_mc *mc = data; +unsigned long hub_global_intstat, hub_intstat, hub_interrupted =0 ; +unsigned int hub_gobal_mask =0x7F00 , hub_gobal_shift =8 , hub;
I assume the above are typos and these should be 'hub_global_mask' and 'hub_global_shift'?
drivers/memory/tegra/tegra264.c static int tegra264_mc_icc_get_init_bw(struct icc_node *node, u32 *avg, u32 *pea · line 579
Quoted 5 lines
drivers/memory/tegra/tegra264.c +5
-0+ +/* Read MSS_HUB_GLOBAL_INTSTATUS_0 from MCB block */ + hub_global_intstat =mc_ch_readl (mc,MC_BROADCAST_CHANNEL ,MSS_HUB_GLOBAL_INTSTATUS_0 ); +if (hub_global_intstat ==0 ) { +dev_err (mc->dev,"No interrupt in HUB/HUBC\n" );
It appears that this handle_hub_irq() is used for multiple interrupts, should the error messages in this function print the IRQ number that triggered this?
BTW, it appears that all interrupts that use this handle_hub_irq() function pass the same tegra_mc structure and so from what I can tell they are all reading and accessing the same registers. Is that intentional?
Jon
Signature · 1 line
nvpublic