From: Igor Korotin <igor.korotin.linux@gmail.com>
To: ojeda@kernel.org, alex.gaynor@gmail.com, rafael@kernel.org,
gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org,
rust-for-linux@vger.kernel.org, linux-acpi@vger.kernel.org
Cc: boqun.feng@gmail.com, gary@garyguo.net, bjorn3_gh@protonmail.com,
benno.lossin@proton.me, a.hindborg@kernel.org,
aliceryhl@google.com, tmgross@umich.edu, dakr@kernel.org,
lenb@kernel.org, wedsonaf@gmail.com, viresh.kumar@linaro.org,
alex.hung@amd.com, dingxiangfei2009@gmail.com
Subject: [PATCH v3 2/4] rust: driver: Add ACPI id table support to Adapter trait
Date: Fri, 6 Jun 2025 18:08:17 +0100 [thread overview]
Message-ID: <20250606170817.3881748-1-igor.korotin.linux@gmail.com> (raw)
In-Reply-To: <20250606170341.3880941-1-igor.korotin.linux@gmail.com>
Extend the `Adapter` trait to support ACPI device identification.
This mirrors the existing Open Firmware (OF) support (`of_id_table`) and
enables Rust drivers to match and retrieve ACPI-specific device data
when `CONFIG_ACPI` is enabled.
To avoid breaking compilation, a stub implementation of `acpi_id_table()`
is added to the Platform adapter; the full implementation will be provided
in a subsequent patch.
Signed-off-by: Igor Korotin <igor.korotin.linux@gmail.com>
---
rust/bindings/bindings_helper.h | 1 +
rust/kernel/driver.rs | 39 ++++++++++++++++++++++++++++++++-
rust/kernel/platform.rs | 6 ++++-
3 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h
index ab37e1d35c70..002d84f06b42 100644
--- a/rust/bindings/bindings_helper.h
+++ b/rust/bindings/bindings_helper.h
@@ -6,6 +6,7 @@
* Sorted alphabetically.
*/
+#include <linux/acpi.h>
#include <kunit/test.h>
#include <linux/blk-mq.h>
#include <linux/blk_types.h>
diff --git a/rust/kernel/driver.rs b/rust/kernel/driver.rs
index ec9166cedfa7..638f1d270af8 100644
--- a/rust/kernel/driver.rs
+++ b/rust/kernel/driver.rs
@@ -6,7 +6,7 @@
//! register using the [`Registration`] class.
use crate::error::{Error, Result};
-use crate::{device, of, str::CStr, try_pin_init, types::Opaque, ThisModule};
+use crate::{acpi, device, of, str::CStr, try_pin_init, types::Opaque, ThisModule};
use core::pin::Pin;
use pin_init::{pin_data, pinned_drop, PinInit};
@@ -141,6 +141,38 @@ pub trait Adapter {
/// The type holding driver private data about each device id supported by the driver.
type IdInfo: 'static;
+ /// The [`acpi::IdTable`] of the corresponding driver
+ fn acpi_id_table() -> Option<acpi::IdTable<Self::IdInfo>>;
+
+ /// Returns the driver's private data from the matching entry in the [`acpi::IdTable`], if any.
+ ///
+ /// If this returns `None`, it means there is no match with an entry in the [`acpi::IdTable`].
+ #[cfg(CONFIG_ACPI)]
+ fn acpi_id_info(dev: &device::Device) -> Option<&'static Self::IdInfo> {
+ let table = Self::acpi_id_table()?;
+
+ // SAFETY:
+ // - `table` has static lifetime, hence it's valid for read,
+ // - `dev` is guaranteed to be valid while it's alive, and so is `pdev.as_ref().as_raw()`.
+ let raw_id = unsafe { bindings::acpi_match_device(table.as_ptr(), dev.as_raw()) };
+
+ if raw_id.is_null() {
+ None
+ } else {
+ // SAFETY: `DeviceId` is a `#[repr(transparent)` wrapper of `struct of_device_id` 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)))
+ }
+ }
+
+ #[cfg(not(CONFIG_ACPI))]
+ #[allow(missing_docs)]
+ fn acpi_id_info(_dev: &device::Device) -> Option<&'static Self::IdInfo> {
+ None
+ }
+
/// The [`of::IdTable`] of the corresponding driver.
fn of_id_table() -> Option<of::IdTable<Self::IdInfo>>;
@@ -178,6 +210,11 @@ fn of_id_info(_dev: &device::Device) -> Option<&'static Self::IdInfo> {
/// If this returns `None`, it means that there is no match in any of the ID tables directly
/// associated with a [`device::Device`].
fn id_info(dev: &device::Device) -> Option<&'static Self::IdInfo> {
+ let id = Self::acpi_id_info(dev);
+ if id.is_some() {
+ return id;
+ }
+
let id = Self::of_id_info(dev);
if id.is_some() {
return id;
diff --git a/rust/kernel/platform.rs b/rust/kernel/platform.rs
index 4917cb34e2fe..dd77934937d3 100644
--- a/rust/kernel/platform.rs
+++ b/rust/kernel/platform.rs
@@ -5,7 +5,7 @@
//! C header: [`include/linux/platform_device.h`](srctree/include/linux/platform_device.h)
use crate::{
- bindings, device, driver,
+ acpi, bindings, device, driver,
error::{to_result, Result},
of,
prelude::*,
@@ -95,6 +95,10 @@ impl<T: Driver + 'static> driver::Adapter for Adapter<T> {
fn of_id_table() -> Option<of::IdTable<Self::IdInfo>> {
T::OF_ID_TABLE
}
+
+ fn acpi_id_table() -> Option<acpi::IdTable<Self::IdInfo>> {
+ None
+ }
}
/// Declares a kernel module that exposes a single platform driver.
--
2.43.0
next prev parent reply other threads:[~2025-06-06 17:08 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-06 17:03 [PATCH v3 0/4] rust: Add ACPI match table support for Rust drivers Igor Korotin
2025-06-06 17:06 ` [PATCH v3 1/4] rust: acpi: add `acpi::DeviceId` abstraction Igor Korotin
2025-06-08 7:48 ` Benno Lossin
2025-06-08 10:42 ` Danilo Krummrich
2025-06-06 17:08 ` Igor Korotin [this message]
2025-06-08 7:54 ` [PATCH v3 2/4] rust: driver: Add ACPI id table support to Adapter trait Benno Lossin
2025-06-08 10:48 ` Danilo Krummrich
2025-06-08 11:46 ` Benno Lossin
2025-06-08 11:49 ` Danilo Krummrich
2025-06-09 13:09 ` Igor Korotin
2025-06-09 13:42 ` Miguel Ojeda
[not found] ` <CAG7QV91u4rVgAqDjKAofupASSk9q0uRKNtsrHg7Q6KExRMkFog@mail.gmail.com>
2025-06-09 14:06 ` Igor Korotin
2025-06-09 14:50 ` Miguel Ojeda
2025-06-09 14:44 ` Benno Lossin
2025-06-06 17:09 ` [PATCH v3 3/4] rust: platform: Add ACPI match table support to `Driver` trait Igor Korotin
2025-06-07 6:28 ` kernel test robot
2025-06-08 10:58 ` Danilo Krummrich
2025-06-06 17:10 ` [PATCH v3 4/4] samples: rust: add ACPI match table example to platform driver Igor Korotin
2025-06-08 7:58 ` Benno Lossin
2025-06-08 10:50 ` Danilo Krummrich
2025-06-08 11:08 ` Danilo Krummrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250606170817.3881748-1-igor.korotin.linux@gmail.com \
--to=igor.korotin.linux@gmail.com \
--cc=a.hindborg@kernel.org \
--cc=alex.gaynor@gmail.com \
--cc=alex.hung@amd.com \
--cc=aliceryhl@google.com \
--cc=benno.lossin@proton.me \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun.feng@gmail.com \
--cc=dakr@kernel.org \
--cc=dingxiangfei2009@gmail.com \
--cc=gary@garyguo.net \
--cc=gregkh@linuxfoundation.org \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ojeda@kernel.org \
--cc=rafael@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=tmgross@umich.edu \
--cc=viresh.kumar@linaro.org \
--cc=wedsonaf@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).