Commit a75718af authored by Timur Tabi's avatar Timur Tabi Committed by Alexandre Courbot
Browse files

gpu: nova-core: add NV_PFALCON_FALCON_ENGINE::reset_engine() 



Add a method for the NV_PFALCON_FALCON_ENGINE register that reset the
Falcon, and update the reset_eng() HAL functions to use it.

Signed-off-by: default avatarTimur Tabi <ttabi@nvidia.com>
Reviewed-by: default avatarGary Guo <gary@garyguo.net>
Acked-by: default avatarDanilo Krummrich <dakr@kernel.org>
Link: https://patch.msgid.link/20260122222848.2555890-9-ttabi@nvidia.com


Signed-off-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
parent 954b38fd

drivers/gpu/nova-core/falcon/hal/ga102.rs

+1 −8
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
    device,

    io::poll::read_poll_timeout,

    prelude::*,

    time::delay::fsleep,

    time::Delta, //

};
@@ -147,13 +146,7 @@ fn reset_eng(&self, bar: &Bar0) -> Result { 
            Delta::from_micros(150),

        );



        regs::NV_PFALCON_FALCON_ENGINE::update(bar, &E::ID, |v| v.set_reset(true));



        // TIMEOUT: falcon engine should not take more than 10us to reset.

        fsleep(Delta::from_micros(10));



        regs::NV_PFALCON_FALCON_ENGINE::update(bar, &E::ID, |v| v.set_reset(false));



        regs::NV_PFALCON_FALCON_ENGINE::reset_engine::<E>(bar);

        self.reset_wait_mem_scrubbing(bar)?;



        Ok(())

drivers/gpu/nova-core/falcon/hal/tu102.rs

+1 −8
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
use kernel::{

    io::poll::read_poll_timeout,

    prelude::*,

    time::delay::fsleep,

    time::Delta, //

};
@@ -65,13 +64,7 @@ fn reset_wait_mem_scrubbing(&self, bar: &Bar0) -> Result { 
    }



    fn reset_eng(&self, bar: &Bar0) -> Result {

        regs::NV_PFALCON_FALCON_ENGINE::update(bar, &E::ID, |v| v.set_reset(true));



        // TIMEOUT: falcon engine should not take more than 10us to reset.

        fsleep(Delta::from_micros(10));



        regs::NV_PFALCON_FALCON_ENGINE::update(bar, &E::ID, |v| v.set_reset(false));



        regs::NV_PFALCON_FALCON_ENGINE::reset_engine::<E>(bar);

        self.reset_wait_mem_scrubbing(bar)?;



        Ok(())

drivers/gpu/nova-core/regs.rs

+18 −1
Original line number Diff line number Diff line
@@ -7,13 +7,18 @@ 
#[macro_use]

pub(crate) mod macros;



use kernel::prelude::*;

use kernel::{

    prelude::*,

    time, //

};



use crate::{

    driver::Bar0,

    falcon::{

        DmaTrfCmdSize,

        FalconCoreRev,

        FalconCoreRevSubversion,

        FalconEngine,

        FalconFbifMemType,

        FalconFbifTarget,

        FalconMem,
@@ -365,6 +370,18 @@ pub(crate) fn with_falcon_mem(self, mem: FalconMem) -> Self { 
    0:0     reset as bool;

});



impl NV_PFALCON_FALCON_ENGINE {

    /// Resets the falcon

    pub(crate) fn reset_engine<E: FalconEngine>(bar: &Bar0) {

        Self::read(bar, &E::ID).set_reset(true).write(bar, &E::ID);



        // TIMEOUT: falcon engine should not take more than 10us to reset.

        time::delay::fsleep(time::Delta::from_micros(10));



        Self::read(bar, &E::ID).set_reset(false).write(bar, &E::ID);

    }

}



register!(NV_PFALCON_FBIF_TRANSCFG @ PFalconBase[0x00000600[8]] {

    1:0     target as u8 ?=> FalconFbifTarget;

    2:2     mem_type as bool => FalconFbifMemType;