| Message ID | 20220413094012.13589-2-amhetre@nvidia.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | memory: tegra: Add MC channels and error logging | expand |
On 4/13/22 12:40, Ashish Mhetre wrote: > +static int tegra186_mc_map_regs(struct tegra_mc *mc) > +{ > + struct platform_device *pdev = to_platform_device(mc->dev); > + int i; > + > + 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"); Set mc->bcast_ch_regs=NULL on error.
On 4/14/2022 2:47 AM, Dmitry Osipenko wrote: > External email: Use caution opening links or attachments > > > On 4/13/22 12:40, Ashish Mhetre wrote: >> +static int tegra186_mc_map_regs(struct tegra_mc *mc) >> +{ >> + struct platform_device *pdev = to_platform_device(mc->dev); >> + int i; >> + >> + 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"); > > Set mc->bcast_ch_regs=NULL on error. It's not really necessary. If mc->bcast_ch_regs == -EINVAL, then interrupts won't occur at all. I have added explanation in patch 2.
On 4/13/22 12:40, Ashish Mhetre wrote: > > +static int tegra186_mc_map_regs(struct tegra_mc *mc) > +{ > + struct platform_device *pdev = to_platform_device(mc->dev); > + int i; > + > + 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"); > + return 0; > + } > + return PTR_ERR(mc->bcast_ch_regs); > + } > + > + mc->ch_regs = devm_kcalloc(mc->dev, mc->soc->num_channels, > + sizeof(void __iomem *), GFP_KERNEL); > + if (!mc->ch_regs) > + return -ENOMEM; > + > + for (i = 0; i < mc->soc->num_channels; i++) { > + char name[4]; > + > + sprintf(name, "ch%u", i); name[5], otherwise you corrupting stack. Use snprintf(name, sizeof(name)).
diff --git a/drivers/memory/tegra/mc.c b/drivers/memory/tegra/mc.c index bf3abb6d8354..c1dd24542093 100644 --- a/drivers/memory/tegra/mc.c +++ b/drivers/memory/tegra/mc.c @@ -749,6 +749,12 @@ static int tegra_mc_probe(struct platform_device *pdev) if (IS_ERR(mc->regs)) return PTR_ERR(mc->regs); + if (mc->soc->ops && mc->soc->ops->map_regs) { + err = mc->soc->ops->map_regs(mc); + if (err < 0) + return err; + } + mc->debugfs.root = debugfs_create_dir("mc", NULL); if (mc->soc->ops && mc->soc->ops->probe) { diff --git a/drivers/memory/tegra/tegra186.c b/drivers/memory/tegra/tegra186.c index 3d153881abc1..9b151b98362b 100644 --- a/drivers/memory/tegra/tegra186.c +++ b/drivers/memory/tegra/tegra186.c @@ -139,11 +139,43 @@ static int tegra186_mc_probe_device(struct tegra_mc *mc, struct device *dev) return 0; } +static int tegra186_mc_map_regs(struct tegra_mc *mc) +{ + struct platform_device *pdev = to_platform_device(mc->dev); + int i; + + 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"); + return 0; + } + return PTR_ERR(mc->bcast_ch_regs); + } + + mc->ch_regs = devm_kcalloc(mc->dev, mc->soc->num_channels, + sizeof(void __iomem *), GFP_KERNEL); + if (!mc->ch_regs) + return -ENOMEM; + + for (i = 0; i < mc->soc->num_channels; i++) { + char name[4]; + + sprintf(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]); + } + + return 0; +} + const struct tegra_mc_ops tegra186_mc_ops = { .probe = tegra186_mc_probe, .remove = tegra186_mc_remove, .resume = tegra186_mc_resume, .probe_device = tegra186_mc_probe_device, + .map_regs = tegra186_mc_map_regs, }; #if defined(CONFIG_ARCH_TEGRA_186_SOC) @@ -875,6 +907,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 diff --git a/drivers/memory/tegra/tegra194.c b/drivers/memory/tegra/tegra194.c index cab998b8bd5c..94001174deaf 100644 --- a/drivers/memory/tegra/tegra194.c +++ b/drivers/memory/tegra/tegra194.c @@ -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, }; diff --git a/drivers/memory/tegra/tegra234.c b/drivers/memory/tegra/tegra234.c index e22824a79f45..6335a132be2d 100644 --- a/drivers/memory/tegra/tegra234.c +++ b/drivers/memory/tegra/tegra234.c @@ -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, }; diff --git a/include/soc/tegra/mc.h b/include/soc/tegra/mc.h index 1066b1194a5a..42b9c509773e 100644 --- a/include/soc/tegra/mc.h +++ b/include/soc/tegra/mc.h @@ -181,6 +181,7 @@ struct tegra_mc_ops { int (*resume)(struct tegra_mc *mc); irqreturn_t (*handle_irq)(int irq, void *data); int (*probe_device)(struct tegra_mc *mc, struct device *dev); + int (*map_regs)(struct tegra_mc *mc); }; struct tegra_mc_soc { @@ -194,6 +195,7 @@ struct tegra_mc_soc { unsigned int atom_size; u8 client_id_mask; + u8 num_channels; const struct tegra_smmu_soc *smmu; @@ -212,6 +214,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;
From tegra186 onwards, memory controller support multiple channels. Add support for mapping address spaces of these channels. Make sure that number of channels are as expected on each SOC. During error interrupts from memory controller, appropriate registers from these channels need to be accessed for logging error info. Signed-off-by: Ashish Mhetre <amhetre@nvidia.com> --- drivers/memory/tegra/mc.c | 6 ++++++ drivers/memory/tegra/tegra186.c | 33 +++++++++++++++++++++++++++++++++ drivers/memory/tegra/tegra194.c | 1 + drivers/memory/tegra/tegra234.c | 1 + include/soc/tegra/mc.h | 4 ++++ 5 files changed, 45 insertions(+)