Commit 2d981773 authored by Joel Fernandes's avatar Joel Fernandes Committed by Alexandre Courbot
Browse files

gpu: nova-core: falcon: Move waiting until halted to a helper 



Move the "waiting until halted" functionality into a helper so that we
can use it in the sequencer, which is a separate sequencer operation.

Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Signed-off-by: default avatarJoel Fernandes <joelagnelf@nvidia.com>
Signed-off-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Message-ID: <20251114195552.739371-2-joelagnelf@nvidia.com>
parent 38b7cc44

drivers/gpu/nova-core/falcon.rs

+14 −7
Original line number Diff line number Diff line
@@ -551,6 +551,19 @@ pub(crate) fn dma_load<F: FalconFirmware<Target = E>>(&self, bar: &Bar0, fw: &F) 
        Ok(())

    }



    /// Wait until the falcon CPU is halted.

    pub(crate) fn wait_till_halted(&self, bar: &Bar0) -> Result<()> {

        // TIMEOUT: arbitrarily large value, firmwares should complete in less than 2 seconds.

        read_poll_timeout(

            || Ok(regs::NV_PFALCON_FALCON_CPUCTL::read(bar, &E::ID)),

            |r| r.halted(),

            Delta::ZERO,

            Delta::from_secs(2),

        )?;



        Ok(())

    }



    /// Runs the loaded firmware and waits for its completion.

    ///

    /// `mbox0` and `mbox1` are optional parameters to write into the `MBOX0` and `MBOX1` registers
@@ -585,13 +598,7 @@ pub(crate) fn boot( 
                .write(bar, &E::ID),

        }



        // TIMEOUT: arbitrarily large value, firmwares should complete in less than 2 seconds.

        read_poll_timeout(

            || Ok(regs::NV_PFALCON_FALCON_CPUCTL::read(bar, &E::ID)),

            |r| r.halted(),

            Delta::ZERO,

            Delta::from_secs(2),

        )?;

        self.wait_till_halted(bar)?;



        let (mbox0, mbox1) = (

            regs::NV_PFALCON_FALCON_MAILBOX0::read(bar, &E::ID).value(),