| Message ID | 20220429113438.13988-2-amhetre@nvidia.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | memory: tegra: Add MC channels and error logging | expand |
On 4/29/22 14:34, Ashish Mhetre wrote: > static int tegra186_mc_probe(struct tegra_mc *mc) > { > + struct platform_device *pdev = to_platform_device(mc->dev); > + unsigned int i; > 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 skip_map_regs; > + } > + 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++) { > + char name[5]; > + > + 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]); > + } > + > +skip_map_regs: > err = of_platform_populate(mc->dev->of_node, NULL, NULL, mc->dev); More common to name labels by the action pointed by label, like "populate:" in this case. No need to make v11 because of that. Reviewed-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
diff --git a/drivers/memory/tegra/tegra186.c b/drivers/memory/tegra/tegra186.c index 3d153881abc1..cd7f9079312f 100644 --- a/drivers/memory/tegra/tegra186.c +++ b/drivers/memory/tegra/tegra186.c @@ -48,8 +48,35 @@ 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; 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 skip_map_regs; + } + 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++) { + char name[5]; + + 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]); + } + +skip_map_regs: err = of_platform_populate(mc->dev->of_node, NULL, NULL, mc->dev); if (err < 0) return err; @@ -875,6 +902,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..40f1d02a1358 100644 --- a/include/soc/tegra/mc.h +++ b/include/soc/tegra/mc.h @@ -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;
From tegra186 onwards, memory controller support multiple channels. Add support for mapping address spaces of these channels. Add 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 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. Signed-off-by: Ashish Mhetre <amhetre@nvidia.com> --- drivers/memory/tegra/tegra186.c | 28 ++++++++++++++++++++++++++++ drivers/memory/tegra/tegra194.c | 1 + drivers/memory/tegra/tegra234.c | 1 + include/soc/tegra/mc.h | 3 +++ 4 files changed, 33 insertions(+)