The recently introduced `GspBootContext` is useful in at least two other places:
- As a replacement for the sequencer's `GspSequencerParams`, - As the main parameter of `Gsp::unload`, for symmetry with `Gsp::boot`. This symmetry can be further exploited to make `Gsp::boot` and `Gsp::unload` generic over the exact boot context required for the current chip. Doing so requires some more preliminary work that goes beyond this series, but this groundwork is needed regardless. Another cleanup that can be performed as a consequence is the removal of the `BootUnloadGuard`. This type is cumbersome as it holds extra references to the boot context, making it difficult to make some of these references mutable (as we want to do with the `Falcon`s that should require exclusive access to load and run firmware). Furthermore, it is only needed a single time in `Gsp::boot`, and inadequate to handle errors occurring in HALs. Building on this, the series also introduces a proper type for identifying the GSP boot method, and moves the `Fsp` instance to `Gpu` to make it available outside of the GSP boot process. This will be notably useful for vGPU support [1]. This series applies on the latest `drm-rust-next`. Since v3, `drm-rust-next` gained a change that makes `Falcon` retain references tied to the lifetime of the bound GPU [2]. `GspBootContext` thus needs separate lifetimes: one for these references valid as long as the GPU is bound, and another for its own shorter borrows of the GPU's subdevices. The distinction becomes necessary because the final patch adds a mutable reference to `Fsp`. Mutable references are invariant over their pointee type, and so the compiler raises an error unless the two lifetimes are separated. A new patch is introduced to take care of this. [1] https://lore.kernel.org/all/[email protected]/ [2] https://lore.kernel.org/all/[email protected]/ Signed-off-by: Alexandre Courbot <[email protected]> --- Changes in v4: - Rebase on top of latest `drm-rust-next`. - Add preparatory patch to separate the different lifetimes at play in `GspBootContext`. - Link to v3: https://patch.msgid.link/[email protected] Changes in v3: - Drop the preparatory closure-only patch. - Use ScopeGuard for GSP boot-error cleanup. - Keep TU102 boot-error cleanup local to the HAL. - Avoid spurious unload-bundle warnings on early failures. - Keep GH100 FMC boot arguments alive through lockdown release. - Link to v2: https://patch.msgid.link/[email protected] Changes in v2: - Replace nonexistent `ENODATA` with the more appropriate `EAGAIN`. - Add patches introducing `GspBootMethod`. - Add patches moving `Fsp` to `Gpu`. - Link to v1: https://patch.msgid.link/[email protected] --- Alexandre Courbot (13): gpu: nova-core: gsp: sequencer: use GspBootContext gpu: nova-core: gsp: sequencer: do not store sequence into GspSequencer gpu: nova-core: gsp: replace BootUnloadGuard with local handlers gpu: nova-core: gsp: pass GspBootContext to unload methods gpu: nova-core: gsp: centralize missing unload bundle warnings gpu: nova-core: gsp: fold TU102 unload bundle construction into HAL method gpu: nova-core: gsp: turn FWSEC execution into HAL method gpu: nova-core: gsp: make use of FWSEC bootloader a property of the TU102 HAL gpu: nova-core: introduce GspBootMethod gpu: nova-core: avoid repeated calls to pci::Device::as_ref gpu: nova-core: gsp: pass GspBootContext mutably gpu: nova-core: gsp: separate context and GPU lifetimes in GspBootContext gpu: nova-core: store Fsp instance in Gpu drivers/gpu/nova-core/firmware.rs | 25 ++- drivers/gpu/nova-core/firmware/fwsec.rs | 5 +- drivers/gpu/nova-core/gpu.rs | 68 ++++--- drivers/gpu/nova-core/gsp.rs | 63 +++++- drivers/gpu/nova-core/gsp/boot.rs | 99 +++------- drivers/gpu/nova-core/gsp/hal.rs | 56 +++--- drivers/gpu/nova-core/gsp/hal/ga102.rs | 14 ++ drivers/gpu/nova-core/gsp/hal/gh100.rs | 42 ++-- drivers/gpu/nova-core/gsp/hal/tu102.rs | 332 ++++++++++++++++---------------- drivers/gpu/nova-core/gsp/sequencer.rs | 71 +++---- 10 files changed, 383 insertions(+), 392 deletions(-) --- base-commit: 23d66dbab84e8518943563df2ced14aaab28b77a change-id: 20260619-nova-bootcontext-401d6107e8fb Best regards, -- Alexandre Courbot <[email protected]>
