]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
dmaengine: tegra210-adma: check for adma max page
authorMohan Kumar D <mkumard@nvidia.com>
Mon, 10 Feb 2025 13:54:13 +0000 (19:24 +0530)
committerVinod Koul <vkoul@kernel.org>
Mon, 10 Feb 2025 14:19:17 +0000 (19:49 +0530)
Have additional check for max channel page during the probe
to cover if any offset overshoot happens due to wrong DT
configuration.

Fixes: 68811c928f88 ("dmaengine: tegra210-adma: Support channel page")
Cc: stable@vger.kernel.org
Signed-off-by: Mohan Kumar D <mkumard@nvidia.com>
Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Link: https://lore.kernel.org/r/20250210135413.2504272-3-mkumard@nvidia.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/tegra210-adma.c

index a0bd4822ed8086c1d92c4633afca454b4faaa962..801740ad8e0d973e6ff3e1b737728c615b9969ba 100644 (file)
@@ -83,7 +83,9 @@ struct tegra_adma;
  * @nr_channels: Number of DMA channels available.
  * @ch_fifo_size_mask: Mask for FIFO size field.
  * @sreq_index_offset: Slave channel index offset.
+ * @max_page: Maximum ADMA Channel Page.
  * @has_outstanding_reqs: If DMA channel can have outstanding requests.
+ * @set_global_pg_config: Global page programming.
  */
 struct tegra_adma_chip_data {
        unsigned int (*adma_get_burst_config)(unsigned int burst_size);
@@ -99,6 +101,7 @@ struct tegra_adma_chip_data {
        unsigned int nr_channels;
        unsigned int ch_fifo_size_mask;
        unsigned int sreq_index_offset;
+       unsigned int max_page;
        bool has_outstanding_reqs;
        void (*set_global_pg_config)(struct tegra_adma *tdma);
 };
@@ -854,6 +857,7 @@ static const struct tegra_adma_chip_data tegra210_chip_data = {
        .nr_channels            = 22,
        .ch_fifo_size_mask      = 0xf,
        .sreq_index_offset      = 2,
+       .max_page               = 0,
        .has_outstanding_reqs   = false,
        .set_global_pg_config   = NULL,
 };
@@ -871,6 +875,7 @@ static const struct tegra_adma_chip_data tegra186_chip_data = {
        .nr_channels            = 32,
        .ch_fifo_size_mask      = 0x1f,
        .sreq_index_offset      = 4,
+       .max_page               = 4,
        .has_outstanding_reqs   = true,
        .set_global_pg_config   = tegra186_adma_global_page_config,
 };
@@ -921,7 +926,7 @@ static int tegra_adma_probe(struct platform_device *pdev)
                        page_offset = res_page->start - res_base->start;
                        page_no = div_u64(page_offset, cdata->ch_base_offset);
 
-                       if (WARN_ON(page_no == 0))
+                       if (WARN_ON(page_no == 0 || page_no > cdata->max_page))
                                return -EINVAL;
 
                        tdma->ch_page_no = lower_32_bits(page_no) - 1;