| Message ID | Z8SVslyQKIe41xET@vaman (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b91872c56940950a6a0852e499d249c3091d4284 |
| Headers | show |
| Series | [GIT,PULL] : Dmaengine subsystem fixes for v6.14 | expand |
The pull request you sent on Sun, 2 Mar 2025 23:00:26 +0530:
> git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git tags/dmaengine-fix-6.14
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/b91872c56940950a6a0852e499d249c3091d4284
Thank you!
On Sun, Mar 02, 2025 at 11:00:26PM +0530, Vinod Koul wrote: > Hello Linus, > > Please pull to receive two fixes for tegra adma driver and revert of > one qcom patch causing regressions. > > The following changes since commit 2014c95afecee3e76ca4a56956a936e23283f05b: > > Linux 6.14-rc1 (2025-02-02 15:39:26 -0800) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git tags/dmaengine-fix-6.14 > > for you to fetch changes up to e521f516716de7895acd1b5b7fac788214a390b9: > > dmaengine: Revert "dmaengine: qcom: bam_dma: Avoid writing unavailable register" (2025-02-27 13:29:15 +0530) > > ---------------------------------------------------------------- > dmaengine fixes for v6.14 > > Driver fixes for: > - tegra210 adma div_u64 divison and max page fixes > - Qualcomm Revert of unavailable register workaround which is causing > regression, fixes have been proposed but still gaps are present so revert > this for now > > ---------------------------------------------------------------- > Caleb Connolly (1): > dmaengine: Revert "dmaengine: qcom: bam_dma: Avoid writing unavailable register" > > Mohan Kumar D (2): > dmaengine: tegra210-adma: Use div_u64 for 64 bit division > dmaengine: tegra210-adma: check for adma max page > > drivers/dma/qcom/bam_dma.c | 24 ++++++++---------------- > drivers/dma/tegra210-adma.c | 20 ++++++++++++++++---- > 2 files changed, 24 insertions(+), 20 deletions(-) > > -- > ~Vinod Hi Vinod and Linus, Did the merge conflict resolve correctly between d440148418f4 ("tegra210-adma: fix 32-bit x86 build") and 76ed9b7d177e ("dmaengine: tegra210-adma: check for adma max page") 17987453a9d9 ("dmaengine: tegra210-adma: Use div_u64 for 64 bit division") Looking at the end result it added the bits below from 76ed9b7d177e on top of d440148418f4, but the code where it makes use of max_page was dropped. Regards, Jerry diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c index 5c6a5b358987..ce80ac4b1a1b 100644 --- a/drivers/dma/tegra210-adma.c +++ b/drivers/dma/tegra210-adma.c @@ -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, };
Hello Linus, Please pull to receive two fixes for tegra adma driver and revert of one qcom patch causing regressions. The following changes since commit 2014c95afecee3e76ca4a56956a936e23283f05b: Linux 6.14-rc1 (2025-02-02 15:39:26 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git tags/dmaengine-fix-6.14 for you to fetch changes up to e521f516716de7895acd1b5b7fac788214a390b9: dmaengine: Revert "dmaengine: qcom: bam_dma: Avoid writing unavailable register" (2025-02-27 13:29:15 +0530) ---------------------------------------------------------------- dmaengine fixes for v6.14 Driver fixes for: - tegra210 adma div_u64 divison and max page fixes - Qualcomm Revert of unavailable register workaround which is causing regression, fixes have been proposed but still gaps are present so revert this for now ---------------------------------------------------------------- Caleb Connolly (1): dmaengine: Revert "dmaengine: qcom: bam_dma: Avoid writing unavailable register" Mohan Kumar D (2): dmaengine: tegra210-adma: Use div_u64 for 64 bit division dmaengine: tegra210-adma: check for adma max page drivers/dma/qcom/bam_dma.c | 24 ++++++++---------------- drivers/dma/tegra210-adma.c | 20 ++++++++++++++++---- 2 files changed, 24 insertions(+), 20 deletions(-)