The r000 boot protocol requires the driver to wait for the GSP suspend bit after each load-and-execute event. The shutdown path already does this.
The boot sequence will soon need this same functionality, so factor it out into a method, and put it in it's logical location as well, as a new method of Falcon<Gsp>. Also, use register!() for this, instead of manually masking off bit 31. As usual, that results in much more readable code. No functional changes. Co-developed-by: Alexandre Courbot <[email protected]> Signed-off-by: Alexandre Courbot <[email protected]> Signed-off-by: John Hubbard <[email protected]> --- drivers/gpu/nova-core/falcon/gsp.rs | 7 +++++++ drivers/gpu/nova-core/gsp/boot.rs | 6 ++---- drivers/gpu/nova-core/regs.rs | 5 +++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/nova-core/falcon/gsp.rs b/drivers/gpu/nova-core/falcon/gsp.rs index 1faefaede9fe..54247691b53c 100644 --- a/drivers/gpu/nova-core/falcon/gsp.rs +++ b/drivers/gpu/nova-core/falcon/gsp.rs @@ -47,6 +47,13 @@ fn pfalcon2(io: Bar0<'_>) -> Mmio<'_, super::PFalcon2Registers> { } impl<'a> Falcon<'a, Gsp> { + /// Returns `true` if GSP-RM has suspended the RISC-V core. + pub(crate) fn is_processor_suspended(&self) -> bool { + self.pfalcon + .read(regs::NV_PFALCON_FALCON_MAILBOX0_LIBOS) + .processor_suspended() + } + /// Clears the SWGEN0 latch in the GSP falcon. /// /// While the latch is set, no later message signals the tree, so a caller that consumed a diff --git a/drivers/gpu/nova-core/gsp/boot.rs b/drivers/gpu/nova-core/gsp/boot.rs index 1887806dc330..9d5da5b165ac 100644 --- a/drivers/gpu/nova-core/gsp/boot.rs +++ b/drivers/gpu/nova-core/gsp/boot.rs @@ -2,7 +2,6 @@ // SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. use kernel::{ - bits, io::poll::read_poll_timeout, prelude::*, time::Delta, @@ -98,10 +97,9 @@ fn shutdown_gsp( cmdq.send_rpc_command(commands::rpc::UnloadingGuestDriver::new(mode))?; // Wait until GSP signals it is suspended. - const LIBOS_INTERRUPT_PROCESSOR_SUSPENDED: u32 = bits::bit_u32(31); read_poll_timeout( - || Ok(gsp_falcon.read_mailbox0()), - |&mb0| mb0 & LIBOS_INTERRUPT_PROCESSOR_SUSPENDED != 0, + || Ok(gsp_falcon.is_processor_suspended()), + |suspended| *suspended, Delta::from_millis(10), Delta::from_secs(5), ) diff --git a/drivers/gpu/nova-core/regs.rs b/drivers/gpu/nova-core/regs.rs index df2eddc58efb..3a0c7159fa7e 100644 --- a/drivers/gpu/nova-core/regs.rs +++ b/drivers/gpu/nova-core/regs.rs @@ -147,6 +147,11 @@ pub(crate) fn usable_fb_size(self) -> u64 { 31:0 value => u32; } + /// `MAILBOX0` as LibOS, the kernel that GSP-RM runs on, writes it. + pub(crate) NV_PFALCON_FALCON_MAILBOX0_LIBOS(u32) => NV_PFALCON_FALCON_MAILBOX0 { + 31:31 processor_suspended => bool; + } + pub(crate) NV_PFALCON_FALCON_MAILBOX1(u32) @ 0x00000044 { 31:0 value => u32; } -- 2.56.0
