Re: [PATCH v3 0/3] rust: Build PHY device tables by using module_device_table macro
From: Danilo Krummrich <dakr@kernel.org>
Date: 2025-07-08 22:51:32
Also in:
linux-devicetree, linux-pci, lkml, rust-for-linux
Subsystem:
acpi, driver core, kobjects, debugfs and sysfs, rust, the rest · Maintainers:
"Rafael J. Wysocki", Greg Kroah-Hartman, Danilo Krummrich, Miguel Ojeda, Linus Torvalds
On Tue, Jul 08, 2025 at 08:47:13PM +0200, Miguel Ojeda wrote:
Thanks Danilo -- ditto. Even netdev could make sense as you said. Since it touched several subsystems and it is based on rust-next, I am happy to do so, but driver-core makes sense given that is the main change after all. So if I don't see you picking it, I will eventually do it.
Checked again and the driver-core tree makes most sense, since we also need to fix up the ACPI device ID code, which is queued up in driver-core-next. I also caught a missing change in rust/kernel/driver.rs, which most likely slipped through by not building with CONFIG_OF. :) Here's the diff to fix up both, I already fixed it up on my end -- no need to send a new version. --
diff --git a/rust/kernel/acpi.rs b/rust/kernel/acpi.rs
index 2af4d4f92924..7ae317368b00 100644
--- a/rust/kernel/acpi.rs
+++ b/rust/kernel/acpi.rs@@ -2,7 +2,11 @@ //! Advanced Configuration and Power Interface abstractions. -use crate::{bindings, device_id::RawDeviceId, prelude::*}; +use crate::{ + bindings, + device_id::{RawDeviceId, RawDeviceIdIndex}, + prelude::*, +}; /// IdTable type for ACPI drivers. pub type IdTable<T> = &'static dyn kernel::device_id::IdTable<DeviceId, T>;
@@ -12,13 +16,14 @@ #[derive(Clone, Copy)] pub struct DeviceId(bindings::acpi_device_id); -// SAFETY: -// * `DeviceId` is a `#[repr(transparent)` wrapper of `struct acpi_device_id` and does not add -// additional invariants, so it's safe to transmute to `RawType`. -// * `DRIVER_DATA_OFFSET` is the offset to the `data` field. +// SAFETY: `DeviceId` is a `#[repr(transparent)]` wrapper of `acpi_device_id` and does not add +// additional invariants, so it's safe to transmute to `RawType`. unsafe impl RawDeviceId for DeviceId { type RawType = bindings::acpi_device_id; +} +// SAFETY: `DRIVER_DATA_OFFSET` is the offset to the `driver_data` field. +unsafe impl RawDeviceIdIndex for DeviceId { const DRIVER_DATA_OFFSET: usize = core::mem::offset_of!(bindings::acpi_device_id, driver_data); fn index(&self) -> usize {
diff --git a/rust/kernel/driver.rs b/rust/kernel/driver.rs
index f8dd7593e8dc..573d516b2f06 100644
--- a/rust/kernel/driver.rs
+++ b/rust/kernel/driver.rs@@ -170,7 +170,7 @@ fn acpi_id_info(dev: &device::Device) -> Option<&'static Self::IdInfo> { // and does not add additional invariants, so it's safe to transmute. let id = unsafe { &*raw_id.cast::<acpi::DeviceId>() }; - Some(table.info(<acpi::DeviceId as crate::device_id::RawDeviceId>::index(id))) + Some(table.info(<acpi::DeviceId as crate::device_id::RawDeviceIdIndex>::index(id))) } } }
@@ -204,7 +204,7 @@ fn of_id_info(dev: &device::Device) -> Option<&'static Self::IdInfo> { // and does not add additional invariants, so it's safe to transmute. let id = unsafe { &*raw_id.cast::<of::DeviceId>() }; - Some(table.info(<of::DeviceId as crate::device_id::RawDeviceId>::index(id))) + Some(table.info(<of::DeviceId as crate::device_id::RawDeviceIdIndex>::index(id))) } } }