Commit c7081ec6 authored by Danilo Krummrich's avatar Danilo Krummrich
Browse files

rust: dma: add type alias for bindings::dma_addr_t 



Add a type alias for bindings::dma_addr_t (DmaAddress), such that we do
not have to access bindings directly.

Reviewed-by: default avatarAlice Ryhl <aliceryhl@google.com>
Reviewed-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Reviewed-by: default avatarDaniel Almeida <daniel.almeida@collabora.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Suggested-by: default avatarAlice Ryhl <aliceryhl@google.com>
Link: https://lore.kernel.org/r/20250828133323.53311-3-dakr@kernel.org


Signed-off-by: default avatarDanilo Krummrich <dakr@kernel.org>
parent c2437c43

drivers/gpu/nova-core/falcon.rs

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 


use core::ops::Deref;

use hal::FalconHal;

use kernel::bindings;

use kernel::device;

use kernel::dma::DmaAddress;

use kernel::prelude::*;

use kernel::sync::aref::ARef;

use kernel::time::Delta;
@@ -455,7 +455,7 @@ fn dma_wr<F: FalconFirmware<Target = E>>( 
                fw.dma_handle_with_offset(load_offsets.src_start as usize)?,

            ),

        };

        if dma_start % bindings::dma_addr_t::from(DMA_LEN) > 0 {

        if dma_start % DmaAddress::from(DMA_LEN) > 0 {

            dev_err!(

                self.dev,

                "DMA transfer start addresses must be a multiple of {}",

rust/kernel/dma.rs

+14 −4
Original line number Diff line number Diff line
@@ -13,6 +13,16 @@ 
    types::ARef,

};



/// DMA address type.

///

/// Represents a bus address used for Direct Memory Access (DMA) operations.

///

/// This is an alias of the kernel's `dma_addr_t`, which may be `u32` or `u64` depending on

/// `CONFIG_ARCH_DMA_ADDR_T_64BIT`.

///

/// Note that this may be `u64` even on 32-bit architectures.

pub type DmaAddress = bindings::dma_addr_t;



/// Trait to be implemented by DMA capable bus devices.

///

/// The [`dma::Device`](Device) trait should be implemented by bus specific device representations,
@@ -343,7 +353,7 @@ fn from(direction: DataDirection) -> Self { 
// entire `CoherentAllocation` including the allocated memory itself.

pub struct CoherentAllocation<T: AsBytes + FromBytes> {

    dev: ARef<device::Device>,

    dma_handle: bindings::dma_addr_t,

    dma_handle: DmaAddress,

    count: usize,

    cpu_addr: *mut T,

    dma_attrs: Attrs,
@@ -444,7 +454,7 @@ pub fn start_ptr_mut(&mut self) -> *mut T { 


    /// Returns a DMA handle which may be given to the device as the DMA address base of

    /// the region.

    pub fn dma_handle(&self) -> bindings::dma_addr_t {

    pub fn dma_handle(&self) -> DmaAddress {

        self.dma_handle

    }
@@ -452,13 +462,13 @@ pub fn dma_handle(&self) -> bindings::dma_addr_t { 
    /// device as the DMA address base of the region.

    ///

    /// Returns `EINVAL` if `offset` is not within the bounds of the allocation.

    pub fn dma_handle_with_offset(&self, offset: usize) -> Result<bindings::dma_addr_t> {

    pub fn dma_handle_with_offset(&self, offset: usize) -> Result<DmaAddress> {

        if offset >= self.count {

            Err(EINVAL)

        } else {

            // INVARIANT: The type invariant of `Self` guarantees that `size_of::<T> * count` fits

            // into a `usize`, and `offset` is inferior to `count`.

            Ok(self.dma_handle + (offset * core::mem::size_of::<T>()) as bindings::dma_addr_t)

            Ok(self.dma_handle + (offset * core::mem::size_of::<T>()) as DmaAddress)

        }

    }