rust-for-linux.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Timur Tabi <ttabi@nvidia.com>
To: Alexandre Courbot <acourbot@nvidia.com>,
	Joel Fernandes <joelagnelf@nvidia.com>,
	John Hubbard <jhubbard@nvidia.com>,
	Danilo Krummrich <dakr@kernel.org>, Lyude Paul <lyude@redhat.com>,
	<nouveau@lists.freedesktop.org>, <rust-for-linux@vger.kernel.org>
Subject: [PATCH v3 03/12] gpu: nova-core: support header parsing on Turing/GA100
Date: Mon, 8 Dec 2025 17:17:52 -0600	[thread overview]
Message-ID: <20251208231801.1786803-4-ttabi@nvidia.com> (raw)
In-Reply-To: <20251208231801.1786803-1-ttabi@nvidia.com>

The Turing/GA100 version of Booter is slightly different from the
GA102+ version.  The headers are the same, but different fields of
the headers are used to identify the IMEM section.  In addition,
there is an NMEM section on Turing/GA100.

Signed-off-by: Timur Tabi <ttabi@nvidia.com>
---
 drivers/gpu/nova-core/firmware/booter.rs | 33 +++++++++++++++++++-----
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/nova-core/firmware/booter.rs b/drivers/gpu/nova-core/firmware/booter.rs
index 1b98bb47424c..7ceea7cc9a87 100644
--- a/drivers/gpu/nova-core/firmware/booter.rs
+++ b/drivers/gpu/nova-core/firmware/booter.rs
@@ -356,14 +356,27 @@ pub(crate) fn new(
             }
         };
 
+        // There are two versions of Booter, one for Turing/GA100, and another for
+        // GA102+.  The extraction of the IMEM sections differs between the two
+        // versions.  Unfortunately, the file names are the same, and the headers
+        // don't indicate the versions.  The only way to differentiate is by the Chipset.
+
         Ok(Self {
-            imem_sec_load_target: FalconLoadTarget {
-                src_start: app0.offset,
-                dst_start: 0,
-                len: app0.len,
+            imem_sec_load_target:
+                FalconLoadTarget {
+                    src_start: app0.offset,
+                    dst_start: if chipset > Chipset::GA100 { 0 } else { app0.offset },
+                    len: app0.len,
+                },
+            imem_ns_load_target: if chipset > Chipset::GA100 {
+                None
+            } else {
+                Some(FalconLoadTarget {
+                    src_start: 0,
+                    dst_start: load_hdr.os_code_offset,
+                    len: load_hdr.os_code_size,
+                })
             },
-            // Exists only in the booter image for Turing and GA100
-            imem_ns_load_target: None,
             dmem_load_target: FalconLoadTarget {
                 src_start: load_hdr.os_data_offset,
                 dst_start: 0,
@@ -393,7 +406,13 @@ fn brom_params(&self) -> FalconBromParams {
     }
 
     fn boot_addr(&self) -> u32 {
-        self.imem_sec_load_target.src_start
+        if let Some(ns_target) = &self.imem_ns_load_target {
+            // Turing and GA100 - use non-secure load target
+            ns_target.dst_start
+        } else {
+            // GA102 and later - use secure load target
+            self.imem_sec_load_target.src_start
+        }
     }
 }
 
-- 
2.52.0


  parent reply	other threads:[~2025-12-08 23:18 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-12-08 23:17 [PATCH v3 00/12] gpu: nova-core: add Turing support Timur Tabi
2025-12-08 23:17 ` [PATCH v3 01/12] gpu: nova-core: rename Imem to ImemSecure Timur Tabi
2025-12-08 23:17 ` [PATCH v3 02/12] gpu: nova-core: add ImemNonSecure section infrastructure Timur Tabi
2025-12-08 23:17 ` Timur Tabi [this message]
2025-12-17  6:23   ` [PATCH v3 03/12] gpu: nova-core: support header parsing on Turing/GA100 Alexandre Courbot
2025-12-08 23:17 ` [PATCH v3 04/12] gpu: nova-core: add support for Turing/GA100 fwsignature Timur Tabi
2025-12-17  6:27   ` Alexandre Courbot
2025-12-08 23:17 ` [PATCH v3 05/12] gpu: nova-core: add NV_PFALCON_FALCON_DMATRFCMD::with_falcon_mem() Timur Tabi
2025-12-08 23:17 ` [PATCH v3 06/12] gpu: nova-core: add Turing boot registers Timur Tabi
2025-12-17  6:36   ` Alexandre Courbot
2025-12-08 23:17 ` [PATCH v3 07/12] gpu: nova-core: move some functions into the HAL Timur Tabi
2025-12-08 23:17 ` [PATCH v3 08/12] gpu: nova-core: Add basic Turing HAL Timur Tabi
2025-12-17  6:40   ` Alexandre Courbot
2025-12-08 23:17 ` [PATCH v3 09/12] gpu: nova-core: add Falcon HAL method supports_dma() Timur Tabi
2025-12-08 23:17 ` [PATCH v3 10/12] gpu: nova-core: add FalconUCodeDescV2 support Timur Tabi
2025-12-08 23:18 ` [PATCH v3 11/12] gpu: nova-core: align LibosMemoryRegionInitArgument size to page size Timur Tabi
2025-12-17  7:17   ` Alexandre Courbot
2025-12-08 23:18 ` [PATCH v3 12/12] gpu: nova-core: add PIO support for loading firmware images Timur Tabi
2025-12-17  6:37 ` [PATCH v3 00/12] gpu: nova-core: add Turing support Alexandre Courbot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20251208231801.1786803-4-ttabi@nvidia.com \
    --to=ttabi@nvidia.com \
    --cc=acourbot@nvidia.com \
    --cc=dakr@kernel.org \
    --cc=jhubbard@nvidia.com \
    --cc=joelagnelf@nvidia.com \
    --cc=lyude@redhat.com \
    --cc=nouveau@lists.freedesktop.org \
    --cc=rust-for-linux@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).