[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20240415104701.4772-4-fujita.tomonori@gmail.com>
Date: Mon, 15 Apr 2024 19:47:00 +0900
From: FUJITA Tomonori <fujita.tomonori@...il.com>
To: netdev@...r.kernel.org
Cc: andrew@...n.ch,
rust-for-linux@...r.kernel.org,
tmgross@...ch.edu,
Luis Chamberlain <mcgrof@...nel.org>,
Russ Weight <russ.weight@...ux.dev>
Subject: [PATCH net-next v1 3/4] rust: net::phy support Firmware API
This patch adds support to the following basic Firmware API:
- request_firmware
- release_firmware
Signed-off-by: FUJITA Tomonori <fujita.tomonori@...il.com>
CC: Luis Chamberlain <mcgrof@...nel.org>
CC: Russ Weight <russ.weight@...ux.dev>
---
drivers/net/phy/Kconfig | 1 +
rust/bindings/bindings_helper.h | 1 +
rust/kernel/net/phy.rs | 45 +++++++++++++++++++++++++++++++++
3 files changed, 47 insertions(+)
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 7fddc8306d82..3ad04170aa4e 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -64,6 +64,7 @@ config RUST_PHYLIB_ABSTRACTIONS
bool "Rust PHYLIB abstractions support"
depends on RUST
depends on PHYLIB=y
+ depends on FW_LOADER=y
help
Adds support needed for PHY drivers written in Rust. It provides
a wrapper around the C phylib core.
diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h
index 65b98831b975..556f95c55b7b 100644
--- a/rust/bindings/bindings_helper.h
+++ b/rust/bindings/bindings_helper.h
@@ -9,6 +9,7 @@
#include <kunit/test.h>
#include <linux/errname.h>
#include <linux/ethtool.h>
+#include <linux/firmware.h>
#include <linux/jiffies.h>
#include <linux/mdio.h>
#include <linux/phy.h>
diff --git a/rust/kernel/net/phy.rs b/rust/kernel/net/phy.rs
index 421a231421f5..095dc3ccc553 100644
--- a/rust/kernel/net/phy.rs
+++ b/rust/kernel/net/phy.rs
@@ -9,6 +9,51 @@
use crate::{bindings, error::*, prelude::*, str::CStr, types::Opaque};
use core::marker::PhantomData;
+use core::ptr::{self, NonNull};
+
+/// A pointer to the kernel's `struct firmware`.
+///
+/// # Invariants
+///
+/// The pointer points at a `struct firmware`, and has ownership over the object.
+pub struct Firmware(NonNull<bindings::firmware>);
+
+impl Firmware {
+ /// Loads a firmware.
+ pub fn new(name: &CStr, dev: &Device) -> Result<Firmware> {
+ let phydev = dev.0.get();
+ let mut ptr: *mut bindings::firmware = ptr::null_mut();
+ let p_ptr: *mut *mut bindings::firmware = &mut ptr;
+ // SAFETY: `phydev` is pointing to a valid object by the type invariant of `Device`.
+ // So it's just an FFI call.
+ let ret = unsafe {
+ bindings::request_firmware(
+ p_ptr as *mut *const bindings::firmware,
+ name.as_char_ptr().cast(),
+ &mut (*phydev).mdio.dev,
+ )
+ };
+ let fw = NonNull::new(ptr).ok_or_else(|| Error::from_errno(ret))?;
+ // INVARIANT: We checked that the firmware was successfully loaded.
+ Ok(Firmware(fw))
+ }
+
+ /// Accesses the firmware contents.
+ pub fn data(&self) -> &[u8] {
+ // SAFETY: The type invariants guarantee that `self.0.as_ptr()` is valid.
+ // They also guarantee that `self.0.as_ptr().data` pointers to
+ // a valid memory region of size `self.0.as_ptr().size`.
+ unsafe { core::slice::from_raw_parts((*self.0.as_ptr()).data, (*self.0.as_ptr()).size) }
+ }
+}
+
+impl Drop for Firmware {
+ fn drop(&mut self) {
+ // SAFETY: By the type invariants, `self.0.as_ptr()` is valid and
+ // we have ownership of the object so can free it.
+ unsafe { bindings::release_firmware(self.0.as_ptr()) }
+ }
+}
/// PHY state machine states.
///
--
2.34.1
Powered by blists - more mailing lists