summaryrefslogtreecommitdiff
path: root/drivers/gpu
diff options
context:
space:
mode:
authorAlexandre Courbot <acourbot@nvidia.com>2026-04-05 11:22:54 +0900
committerDanilo Krummrich <dakr@kernel.org>2026-04-05 16:10:49 +0200
commit0e0ffbcd0e8ef7a6919be5ff240b170f596815ca (patch)
tree63e60b3e7c6d4b474bb1be9f71124d6a9d3f1911 /drivers/gpu
parent8e6c34785a30012a53417b6d92e0ced71b9115a7 (diff)
downloadlwn-0e0ffbcd0e8ef7a6919be5ff240b170f596815ca.tar.gz
lwn-0e0ffbcd0e8ef7a6919be5ff240b170f596815ca.zip
gpu: nova-core: falcon: pad firmware DMA object size to required block alignment
Commit a88831502c8f ("gpu: nova-core: falcon: use dma::Coherent") dropped the nova-local `DmaObject` device memory type for the kernel-global `Coherent` one. This switch had a side-effect: `DmaObject` always aligned the requested size to `PAGE_SIZE`, and also reported that adjusted size when queried. `Coherent`, on the other hand, does page-align allocation sizes but only allows CPU access on the exact size provided by the caller. This change runs into a limitation of falcon DMA copies, namely that DMA accesses are done on blocks of exactly 256 bytes. If the provided data does not have a length that is a multiple of 256, `dma_wr` returns an error. It was expected that all firmwares would present the proper adjusted size, but this is not the case at least on my GA107: NovaCore 0000:08:00.0: DMA transfer goes beyond range of DMA object NovaCore 0000:08:00.0: Failed to load FWSEC firmware: EINVAL NovaCore 0000:08:00.0: probe with driver NovaCore failed with error -22 Fix this by padding the `Coherent`'s size to `MEM_BLOCK_ALIGNMENT` (i.e. 256) when allocating it and filling it with zeroes, before copying the firmware on top of it. Fixes: a88831502c8f ("gpu: nova-core: falcon: use dma::Coherent") Reviewed-by: John Hubbard <jhubbard@nvidia.com> Reviewed-by: Gary Guo <gary@garyguo.net> Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> Link: https://patch.msgid.link/20260405-falcon-dma-roundup-v2-1-4af5b2ff9c16@nvidia.com Signed-off-by: Danilo Krummrich <dakr@kernel.org>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/nova-core/falcon.rs21
1 files changed, 19 insertions, 2 deletions
diff --git a/drivers/gpu/nova-core/falcon.rs b/drivers/gpu/nova-core/falcon.rs
index e0315fda576b..33927af4134c 100644
--- a/drivers/gpu/nova-core/falcon.rs
+++ b/drivers/gpu/nova-core/falcon.rs
@@ -11,6 +11,7 @@ use kernel::{
},
dma::{
Coherent,
+ CoherentBox,
DmaAddress,
DmaMask, //
},
@@ -613,8 +614,24 @@ impl<E: FalconEngine + 'static> Falcon<E> {
bar: &Bar0,
fw: &F,
) -> Result {
- // Create DMA object with firmware content as the source of the DMA engine.
- let dma_obj = Coherent::from_slice(dev, fw.as_slice(), GFP_KERNEL)?;
+ // DMA object with firmware content as the source of the DMA engine.
+ let dma_obj = {
+ let fw_slice = fw.as_slice();
+
+ // DMA copies are done in chunks of `MEM_BLOCK_ALIGNMENT`, so pad the length
+ // accordingly and fill with `0`.
+ let mut dma_obj = CoherentBox::zeroed_slice(
+ dev,
+ fw_slice.len().next_multiple_of(MEM_BLOCK_ALIGNMENT),
+ GFP_KERNEL,
+ )?;
+
+ // PANIC: `dma_obj` has been created with a length equal to or larger than
+ // `fw_slice.len()`, so the range `..fw_slice.len()` is valid.
+ dma_obj[..fw_slice.len()].copy_from_slice(fw_slice);
+
+ dma_obj.into()
+ };
self.dma_reset(bar);
bar.update(regs::NV_PFALCON_FBIF_TRANSCFG::of::<E>().at(0), |v| {