On Sat Nov 15, 2025 at 8:30 AM JST, Timur Tabi wrote:
> The GSP booter firmware in Turing and GA100 includes a third memory
> section called ImemNs, which is non-secure IMEM.  This section must
> be loaded separately from DMEM and secure IMEM, but only if it
> actually exists.
>
> Signed-off-by: Timur Tabi <[email protected]>
> ---
>  drivers/gpu/nova-core/falcon.rs          | 18 ++++++++++++++++--
>  drivers/gpu/nova-core/firmware/booter.rs |  9 +++++++++
>  drivers/gpu/nova-core/firmware/fwsec.rs  |  5 +++++
>  3 files changed, 30 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/nova-core/falcon.rs b/drivers/gpu/nova-core/falcon.rs
> index 0e0935dbb927..ece8b92a627e 100644
> --- a/drivers/gpu/nova-core/falcon.rs
> +++ b/drivers/gpu/nova-core/falcon.rs
> @@ -239,6 +239,8 @@ fn from(value: PeregrineCoreSelect) -> Self {
>  pub(crate) enum FalconMem {
>      /// Secure Instruction Memory.
>      ImemSec,
> +    /// Non-Secure Instruction Memory.
> +    ImemNs,

So, seeing how this is taking shape I now think we should just have one
Imem variant:

    Imem { secure: bool },

This makes matching easier for the common case of "we want to do
something in case of Imem, regardless of the secure flag". Something
like

    FalconMem::ImemSec | FalconMem::ImemNs => {

becomes:

    FalconMem::Imem { .. } => {

And if you need to use the flag, you can change e.g.:

    FalconMem::ImemSec | FalconMem::ImemNs => {
        regs::NV_PFALCON_FALCON_IMEMC::default()
            .set_secure(target_mem == FalconMem::ImemSec)

into

    FalconMem::Imem { secure } => {
        regs::NV_PFALCON_FALCON_IMEMC::default()
            .set_secure(secure)

Which is simpler and easier to read.

This also removes the need to rename `Imem` into `ImemSec`, so the first
two patches can be merged into one.

Reply via email to