Commit 2ad0f490 authored by Danilo Krummrich's avatar Danilo Krummrich
Browse files

rust: driver: add DriverData type to the DriverLayout trait 



Add an associated type DriverData to the DriverLayout trait indicating
the type of the driver's device private data.

Acked-by: default avatarAlice Ryhl <aliceryhl@google.com>
Acked-by: default avatarIgor Korotin <igor.korotin.linux@gmail.com>
Link: https://patch.msgid.link/20260107103511.570525-6-dakr@kernel.org


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

rust/kernel/auxiliary.rs

+2 −0
Original line number Diff line number Diff line
@@ -25,10 +25,12 @@ 


// SAFETY:

// - `bindings::auxiliary_driver` is a C type declared as `repr(C)`.

// - `T` is the type of the driver's device private data.

// - `struct auxiliary_driver` embeds a `struct device_driver`.

// - `DEVICE_DRIVER_OFFSET` is the correct byte offset to the embedded `struct device_driver`.

unsafe impl<T: Driver + 'static> driver::DriverLayout for Adapter<T> {

    type DriverType = bindings::auxiliary_driver;

    type DriverData = T;

    const DEVICE_DRIVER_OFFSET: usize = core::mem::offset_of!(Self::DriverType, driver);

}

rust/kernel/driver.rs

+4 −0
Original line number Diff line number Diff line
@@ -108,11 +108,15 @@ 
///

/// Implementors must guarantee that:

/// - `DriverType` is `repr(C)`,

/// - `DriverData` is the type of the driver's device private data.

/// - `DriverType` embeds a valid `struct device_driver` at byte offset `DEVICE_DRIVER_OFFSET`.

pub unsafe trait DriverLayout {

    /// The specific driver type embedding a `struct device_driver`.

    type DriverType: Default;



    /// The type of the driver's device private data.

    type DriverData;



    /// Byte offset of the embedded `struct device_driver` within `DriverType`.

    ///

    /// This must correspond exactly to the location of the embedded `struct device_driver` field.

rust/kernel/i2c.rs

+2 −0
Original line number Diff line number Diff line
@@ -94,10 +94,12 @@ macro_rules! i2c_device_table { 


// SAFETY:

// - `bindings::i2c_driver` is a C type declared as `repr(C)`.

// - `T` is the type of the driver's device private data.

// - `struct i2c_driver` embeds a `struct device_driver`.

// - `DEVICE_DRIVER_OFFSET` is the correct byte offset to the embedded `struct device_driver`.

unsafe impl<T: Driver + 'static> driver::DriverLayout for Adapter<T> {

    type DriverType = bindings::i2c_driver;

    type DriverData = T;

    const DEVICE_DRIVER_OFFSET: usize = core::mem::offset_of!(Self::DriverType, driver);

}

rust/kernel/pci.rs

+2 −0
Original line number Diff line number Diff line
@@ -52,10 +52,12 @@ 


// SAFETY:

// - `bindings::pci_driver` is a C type declared as `repr(C)`.

// - `T` is the type of the driver's device private data.

// - `struct pci_driver` embeds a `struct device_driver`.

// - `DEVICE_DRIVER_OFFSET` is the correct byte offset to the embedded `struct device_driver`.

unsafe impl<T: Driver + 'static> driver::DriverLayout for Adapter<T> {

    type DriverType = bindings::pci_driver;

    type DriverData = T;

    const DEVICE_DRIVER_OFFSET: usize = core::mem::offset_of!(Self::DriverType, driver);

}

rust/kernel/platform.rs

+2 −0
Original line number Diff line number Diff line
@@ -28,10 +28,12 @@ 


// SAFETY:

// - `bindings::platform_driver` is a C type declared as `repr(C)`.

// - `T` is the type of the driver's device private data.

// - `struct platform_driver` embeds a `struct device_driver`.

// - `DEVICE_DRIVER_OFFSET` is the correct byte offset to the embedded `struct device_driver`.

unsafe impl<T: Driver + 'static> driver::DriverLayout for Adapter<T> {

    type DriverType = bindings::platform_driver;

    type DriverData = T;

    const DEVICE_DRIVER_OFFSET: usize = core::mem::offset_of!(Self::DriverType, driver);

}