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 is inadequate for handling errors occurring in HALs. Based on Eliot's feedback on v4, the series then removes the last remnants of the boot procedure leaking outside of the HALs, and consolidates everything within the GSP and FSP HALs. This series applies on the latest `drm-rust-next`. Signed-off-by: Alexandre Courbot <[email protected]> --- Changes in v6: - Use `ScopeGuard` in GH100 HAL and do not wait for lockdown release on the error path. (thanks Eliot!) - Link to v5: https://patch.msgid.link/[email protected] Changes in v5: - Make GH100's HAL wait on both GSP lockdown release and GSP RISC-V halt in case of error. - Drop `GspBootMethod` and use HAL abstractions to cover differences in boot procedures. (thanks Eliot!) - Stylistic improvement in TU102 HAL. - Convert more pdev -> dev in `gpu.rs`. - Link to v4: https://patch.msgid.link/[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 (12): 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: 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 Eliot Courtney (1): gpu: nova-core: move GSP firmware files decision to GSP HAL drivers/gpu/nova-core/firmware.rs | 25 ++- drivers/gpu/nova-core/firmware/fwsec.rs | 5 +- drivers/gpu/nova-core/fsp.rs | 21 +- drivers/gpu/nova-core/gpu.rs | 68 ++++--- drivers/gpu/nova-core/gsp.rs | 22 ++- drivers/gpu/nova-core/gsp/boot.rs | 99 +++------- drivers/gpu/nova-core/gsp/hal.rs | 59 +++--- drivers/gpu/nova-core/gsp/hal/ga102.rs | 14 ++ drivers/gpu/nova-core/gsp/hal/gh100.rs | 53 +++-- drivers/gpu/nova-core/gsp/hal/tu102.rs | 330 ++++++++++++++++---------------- drivers/gpu/nova-core/gsp/sequencer.rs | 71 +++---- 11 files changed, 374 insertions(+), 393 deletions(-) --- base-commit: d85845b64c0020b2812243a22fa79d57cc1c1e38 change-id: 20260619-nova-bootcontext-401d6107e8fb Best regards, -- Alexandre Courbot <[email protected]>
