uefi: protocols: cleanup [re_,un_]install_protocol_interface()

Author: phip1611

uefi-test-runner/src/boot/misc.rs

@@ -164,7 +164,7 @@ fn test_install_protocol_interface() {
     unsafe { alloc.write(TestProtocol { data: 123 }) };
 
     let _ = unsafe {
-        boot::install_protocol_interface(None, &TestProtocol::GUID, alloc.cast())
+        boot::install_protocol_interface::<TestProtocol>(None, alloc.cast())
             .expect("Failed to install protocol interface")
     };
 
@@ -178,9 +178,8 @@ fn test_reinstall_protocol_interface() {
         .expect("Failed to find protocol to uninstall")[0];
 
     unsafe {
-        let _ = boot::reinstall_protocol_interface(
+        let _ = boot::reinstall_protocol_interface::<TestProtocol>(
             handle,
-            &TestProtocol::GUID,
             ptr::null_mut(),
             ptr::null_mut(),
         );

uefi-test-runner/src/proto/load.rs

@@ -61,13 +61,15 @@ impl CustomLoadFile2Protocol {
 
 unsafe fn install_protocol(handle: Handle, guid: Guid, protocol: &mut CustomLoadFile2Protocol) {
     unsafe {
-        boot::install_protocol_interface(Some(handle), &guid, addr_of!(*protocol).cast()).unwrap();
+        boot::install_protocol_interface_by_guid(Some(handle), &guid, addr_of!(*protocol).cast())
+            .unwrap();
     }
 }
 
 unsafe fn uninstall_protocol(handle: Handle, guid: Guid, protocol: &mut CustomLoadFile2Protocol) {
     unsafe {
-        boot::uninstall_protocol_interface(handle, &guid, addr_of!(*protocol).cast()).unwrap();
+        boot::uninstall_protocol_interface_by_guid(handle, &guid, addr_of!(*protocol).cast())
+            .unwrap();
     }
 }
 

uefi/CHANGELOG.md

@@ -9,6 +9,7 @@
 - Added `proto::media::block::BlockIO2`.
 - Added `boot::test_protocol_by_guid()`
 - Added `boot::register_protocol_notify_by_guid()`
+- Added `boot::[re_,un_]install_protocol_interface_by_guid()` functions.
 
 ## Changed
 - Changed ordering of `proto::pci::PciIoAddress` to (bus -> dev -> fun -> reg -> ext_reg).
@@ -19,6 +20,9 @@
   an owned value of type `HttpConfigData`
 - **Breaking**: `boot::register_protocol_notify()` now follows our generic-based
   API and now longer consumes a `&Guid` parameter.
+- **Breaking:**`boot::[re_,un_]install_protocol_interface()` no longer consume a
+  `&Guid` parameter but instead follow our generic type-based API. For example:
+  `install_protocol_interface<DevicePath>(handle, interface)`.
 
 # uefi - v0.36.1 (2025-11-05)
 

uefi/src/boot.rs

@@ -718,7 +718,12 @@ pub fn disconnect_controller(
 /// When a protocol interface is installed, firmware will call all functions
 /// that have registered to wait for that interface to be installed.
 ///
-/// If `handle` is `None`, a new handle will be created and returned.
+/// # Arguments
+///
+/// - `handle`: Either `None` to allocate a new handle or an existing handle.
+/// - `interface`: The protocol implementation. The memory backing the
+///   implementation **must live as long as the handle!**. Callers need to
+///   ensure a matching lifetime!
 ///
 /// # Safety
 ///
@@ -728,7 +733,20 @@ pub fn disconnect_controller(
 ///
 /// * [`Status::OUT_OF_RESOURCES`]: failed to allocate a new handle.
 /// * [`Status::INVALID_PARAMETER`]: this protocol is already installed on the handle.
-pub unsafe fn install_protocol_interface(
+pub unsafe fn install_protocol_interface<P: ProtocolPointer + ?Sized>(
+    handle: Option<Handle>,
+    interface: *const c_void,
+) -> Result<Handle> {
+    unsafe { install_protocol_interface_by_guid(handle, &P::GUID, interface) }
+}
+
+/// Variant of [`install_protocol_interface`] that consumes the [`Guid`] as
+/// parameter.
+///
+/// # Safety
+///
+/// See safety section in [`install_protocol_interface`].
+pub unsafe fn install_protocol_interface_by_guid(
     handle: Option<Handle>,
     protocol: &Guid,
     interface: *const c_void,
@@ -766,7 +784,21 @@ pub unsafe fn install_protocol_interface(
 ///
 /// * [`Status::NOT_FOUND`]: the old interface was not found on the handle.
 /// * [`Status::ACCESS_DENIED`]: the old interface is still in use and cannot be uninstalled.
-pub unsafe fn reinstall_protocol_interface(
+pub unsafe fn reinstall_protocol_interface<P: ProtocolPointer + ?Sized>(
+    handle: Handle,
+    old_interface: *const c_void,
+    new_interface: *const c_void,
+) -> Result<()> {
+    unsafe { reinstall_protocol_interface_by_guid(handle, &P::GUID, old_interface, new_interface) }
+}
+
+/// Variant of [`reinstall_protocol_interface`] that consumes the [`Guid`] as
+/// parameter.
+///
+/// # Safety
+///
+/// See safety section in [`reinstall_protocol_interface`].
+pub unsafe fn reinstall_protocol_interface_by_guid(
     handle: Handle,
     protocol: &Guid,
     old_interface: *const c_void,
@@ -796,7 +828,20 @@ pub unsafe fn reinstall_protocol_interface(
 ///
 /// * [`Status::NOT_FOUND`]: the interface was not found on the handle.
 /// * [`Status::ACCESS_DENIED`]: the interface is still in use and cannot be uninstalled.
-pub unsafe fn uninstall_protocol_interface(
+pub unsafe fn uninstall_protocol_interface<P: ProtocolPointer + ?Sized>(
+    handle: Handle,
+    interface: *const c_void,
+) -> Result<()> {
+    unsafe { uninstall_protocol_interface_by_guid(handle, &P::GUID, interface) }
+}
+
+/// Variant of [`uninstall_protocol_interface`] that consumes the [`Guid`] as
+/// parameter.
+///
+/// # Safety
+///
+/// See safety section in [`uninstall_protocol_interface`].
+pub unsafe fn uninstall_protocol_interface_by_guid(
     handle: Handle,
     protocol: &Guid,
     interface: *const c_void,