mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Joel Fernandes <joelagnelf@nvidia.com>
To: linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org,
	dri-devel@lists.freedesktop.org, dakr@kernel.org,
	acourbot@nvidia.com
Cc: Alistair Popple <apopple@nvidia.com>,
	Miguel Ojeda <ojeda@kernel.org>,
	Alex Gaynor <alex.gaynor@gmail.com>,
	Boqun Feng <boqun.feng@gmail.com>, Gary Guo <gary@garyguo.net>,
	bjorn3_gh@protonmail.com, Benno Lossin <lossin@kernel.org>,
	Andreas Hindborg <a.hindborg@kernel.org>,
	Alice Ryhl <aliceryhl@google.com>,
	Trevor Gross <tmgross@umich.edu>,
	David Airlie <airlied@gmail.com>, Simona Vetter <simona@ffwll.ch>,
	Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
	Maxime Ripard <mripard@kernel.org>,
	Thomas Zimmermann <tzimmermann@suse.de>,
	John Hubbard <jhubbard@nvidia.com>,
	Joel Fernandes <joelagnelf@nvidia.com>,
	Timur Tabi <ttabi@nvidia.com>,
	joel@joelfernandes.org, nouveau@lists.freedesktop.org
Subject: [PATCH v2 11/12] nova-core: sequencer: Implement core resume operation
Date: Sun,  2 Nov 2025 18:59:19 -0500	[thread overview]
Message-ID: <20251102235920.3784592-12-joelagnelf@nvidia.com> (raw)
In-Reply-To: <20251102235920.3784592-1-joelagnelf@nvidia.com>

Implement core resume operation. This is the last step of the sequencer
resulting in resume of the GSP and proceeding to INIT_DONE stage of GSP
boot.

Signed-off-by: Joel Fernandes <joelagnelf@nvidia.com>
---
 drivers/gpu/nova-core/falcon/gsp.rs    |  1 -
 drivers/gpu/nova-core/gsp/fw.rs        |  1 -
 drivers/gpu/nova-core/gsp/sequencer.rs | 49 ++++++++++++++++++++++++--
 3 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/nova-core/falcon/gsp.rs b/drivers/gpu/nova-core/falcon/gsp.rs
index e0c0b18ec5bf..391699dc3a8c 100644
--- a/drivers/gpu/nova-core/falcon/gsp.rs
+++ b/drivers/gpu/nova-core/falcon/gsp.rs
@@ -37,7 +37,6 @@ pub(crate) fn clear_swgen0_intr(&self, bar: &Bar0) {
     }
 
     /// Checks if GSP reload/resume has completed during the boot process.
-    #[expect(dead_code)]
     pub(crate) fn check_reload_completed(&self, bar: &Bar0, timeout: Delta) -> Result<bool> {
         read_poll_timeout(
             || Ok(regs::NV_PGC6_BSI_SECURE_SCRATCH_14::read(bar)),
diff --git a/drivers/gpu/nova-core/gsp/fw.rs b/drivers/gpu/nova-core/gsp/fw.rs
index 53e28458cd7d..bb79f92432aa 100644
--- a/drivers/gpu/nova-core/gsp/fw.rs
+++ b/drivers/gpu/nova-core/gsp/fw.rs
@@ -543,7 +543,6 @@ pub(crate) fn element_count(&self) -> u32 {
     }
 }
 
-#[expect(unused)]
 pub(crate) use r570_144::{
     // GSP sequencer run structure with information on how to run the sequencer.
     rpc_run_cpu_sequencer_v17_00,
diff --git a/drivers/gpu/nova-core/gsp/sequencer.rs b/drivers/gpu/nova-core/gsp/sequencer.rs
index 127b293a161c..ecc80f668dc8 100644
--- a/drivers/gpu/nova-core/gsp/sequencer.rs
+++ b/drivers/gpu/nova-core/gsp/sequencer.rs
@@ -52,6 +52,7 @@ pub(crate) enum GspSeqCmd {
     CoreReset,
     CoreStart,
     CoreWaitForHalt,
+    CoreResume,
 }
 
 impl GspSeqCmd {
@@ -83,6 +84,7 @@ pub(crate) fn from_fw_cmd(cmd: &fw::GSP_SEQUENCER_BUFFER_CMD) -> Result<Self> {
             fw::GSP_SEQ_BUF_OPCODE_GSP_SEQ_BUF_OPCODE_CORE_WAIT_FOR_HALT => {
                 Ok(GspSeqCmd::CoreWaitForHalt)
             }
+            fw::GSP_SEQ_BUF_OPCODE_GSP_SEQ_BUF_OPCODE_CORE_RESUME => Ok(GspSeqCmd::CoreResume),
             _ => Err(EINVAL),
         }
     }
@@ -105,7 +107,10 @@ pub(crate) fn size_bytes(&self) -> usize {
         let opcode_size = size_of::<fw::GSP_SEQ_BUF_OPCODE>();
         match self {
             // Each simple command type just adds 4 bytes (opcode_size) for the header.
-            GspSeqCmd::CoreReset | GspSeqCmd::CoreStart | GspSeqCmd::CoreWaitForHalt => opcode_size,
+            GspSeqCmd::CoreReset
+            | GspSeqCmd::CoreStart
+            | GspSeqCmd::CoreWaitForHalt
+            | GspSeqCmd::CoreResume => opcode_size,
 
             // For commands with payloads, add the payload size in bytes.
             GspSeqCmd::RegWrite(_) => opcode_size + size_of::<fw::GSP_SEQ_BUF_PAYLOAD_REG_WRITE>(),
@@ -119,7 +124,6 @@ pub(crate) fn size_bytes(&self) -> usize {
     }
 }
 
-#[expect(dead_code)]
 pub(crate) struct GspSequencer<'a> {
     seq_info: GspSequencerInfo<'a>,
     bar: &'a Bar0,
@@ -259,6 +263,47 @@ fn run(&self, seq: &GspSequencer<'_>) -> Result {
                 seq.gsp_falcon.wait_till_halted(seq.bar)?;
                 Ok(())
             }
+            GspSeqCmd::CoreResume => {
+                dev_dbg!(seq.dev, "CoreResume\n");
+                // At this point, 'SEC2-RTOS' has been loaded into SEC2 by the sequencer
+                // but neither SEC2-RTOS nor GSP-RM is running yet. This part of the
+                // sequencer will start both.
+
+                // Reset the GSP to prepare it for resuming.
+                seq.gsp_falcon.reset(seq.bar)?;
+
+                // Write the libOS DMA handle to GSP mailboxes.
+                seq.gsp_falcon.write_mailboxes(
+                    seq.bar,
+                    Some(seq.libos_dma_handle as u32),
+                    Some((seq.libos_dma_handle >> 32) as u32),
+                )?;
+
+                // Start the SEC2 falcon which will trigger GSP-RM to resume on the GSP.
+                seq.sec2_falcon.start(seq.bar)?;
+
+                // Poll until GSP-RM reload/resume has completed (up to 2 seconds).
+                seq.gsp_falcon
+                    .check_reload_completed(seq.bar, Delta::from_secs(2))?;
+
+                // Verify SEC2 completed successfully by checking its mailbox for errors.
+                let mbox0 = seq.sec2_falcon.read_mailbox0(seq.bar)?;
+                if mbox0 != 0 {
+                    dev_err!(seq.dev, "Sequencer: sec2 errors: {:?}\n", mbox0);
+                    return Err(EIO);
+                }
+
+                // Configure GSP with the bootloader version.
+                seq.gsp_falcon
+                    .write_os_version(seq.bar, seq.gsp_fw.bootloader.app_version);
+
+                // Verify the GSP's RISC-V core is active indicating successful GSP boot.
+                if !seq.gsp_falcon.is_riscv_active(seq.bar) {
+                    dev_err!(seq.dev, "Sequencer: RISC-V core is not active\n");
+                    return Err(EIO);
+                }
+                Ok(())
+            }
         }
     }
 }
-- 
2.34.1


  parent reply	other threads:[~2025-11-02 23:59 UTC|newest]

Thread overview: 83+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-11-02 23:59 [PATCH v2 00/12] nova-core: Complete GSP boot and begin RPC communication Joel Fernandes
2025-11-02 23:59 ` [PATCH v2 01/12] nova-core: falcon: Move waiting until halted to a helper Joel Fernandes
2025-11-05 23:12   ` Lyude Paul
2025-11-02 23:59 ` [PATCH v2 02/12] nova-core: falcon: Move start functionality into separate helper Joel Fernandes
2025-11-05 23:13   ` Lyude Paul
2025-11-02 23:59 ` [PATCH v2 03/12] nova-core: falcon: Move mbox functionalities into helper Joel Fernandes
2025-11-05 23:16   ` Lyude Paul
2025-11-02 23:59 ` [PATCH v2 04/12] nova-core: falcon: Move dma_reset functionality " Joel Fernandes
2025-11-05 23:16   ` Lyude Paul
2025-11-02 23:59 ` [PATCH v2 05/12] nova-core: gsp: Add support for checking if GSP reloaded Joel Fernandes
2025-11-05 23:18   ` Lyude Paul
2025-11-05 23:29     ` John Hubbard
2025-11-06  0:26     ` Alexandre Courbot
2025-11-02 23:59 ` [PATCH v2 06/12] nova-core: Add bindings required by GSP sequencer Joel Fernandes
2025-11-05 23:23   ` Lyude Paul
2025-11-10 13:39   ` Alexandre Courbot
2025-11-11 22:06     ` Joel Fernandes
2025-11-12  1:12       ` Alexandre Courbot
2025-11-12  2:53         ` Joel Fernandes
2025-11-02 23:59 ` [PATCH v2 07/12] nova-core: Implement the " Joel Fernandes
2025-11-10 13:43   ` Alexandre Courbot
2025-11-11 22:51     ` Joel Fernandes
2025-11-11 23:02     ` Joel Fernandes
2025-11-12  0:42       ` Alexandre Courbot
2025-11-12  2:57         ` Joel Fernandes
2025-11-02 23:59 ` [PATCH v2 08/12] nova-core: sequencer: Add register opcodes Joel Fernandes
2025-11-05  2:50   ` John Hubbard
2025-11-05  3:45     ` Joel Fernandes
2025-11-05 16:30       ` Timur Tabi
2025-11-05 21:55         ` John Hubbard
2025-11-05 23:19           ` Timur Tabi
2025-11-05 23:27             ` John Hubbard
2025-11-10 15:16             ` Joel Fernandes
2025-11-10 15:16               ` Joel Fernandes
2025-11-10 16:59                 ` Steven Rostedt
2025-11-10 17:09                   ` Joel Fernandes
2025-11-11 18:42               ` Lyude Paul
2025-11-12  0:45                 ` Alexandre Courbot
2025-11-10 13:50   ` Alexandre Courbot
2025-11-11 23:39     ` Joel Fernandes
2025-11-02 23:59 ` [PATCH v2 09/12] nova-core: sequencer: Add delay opcode support Joel Fernandes
2025-11-10 13:51   ` Alexandre Courbot
2025-11-02 23:59 ` [PATCH v2 10/12] nova-core: sequencer: Implement basic core operations Joel Fernandes
2025-11-11 19:04   ` Lyude Paul
2025-11-02 23:59 ` Joel Fernandes [this message]
2025-11-02 23:59 ` [PATCH v2 12/12] gpu: nova-core: gsp: Wait for gsp initialization to complete Joel Fernandes
2025-11-10 13:51   ` Alexandre Courbot
2025-11-03 19:12 ` [PATCH v2 00/12] nova-core: Complete GSP boot and begin RPC communication Timur Tabi
2025-11-03 19:35   ` Joel Fernandes
2025-11-03 19:54     ` Timur Tabi
2025-11-04 23:26   ` [PATCH v2 13/12] nova-core: sequencer: Refactor run() to handle unknown messages Joel Fernandes
2025-11-10 13:52     ` Alexandre Courbot
2025-11-06 23:11   ` [PATCH v3 00/14] nova-core: Complete GSP boot and begin RPC communication Joel Fernandes
2025-11-06 23:11     ` [PATCH v3 01/14] gpu: nova-core: falcon: Move waiting until halted to a helper Joel Fernandes
2025-11-06 23:11     ` [PATCH v3 02/14] gpu: nova-core: falcon: Move start functionality into separate helper Joel Fernandes
2025-11-06 23:11     ` [PATCH v3 03/14] gpu: nova-core: falcon: Move mbox functionalities into helper Joel Fernandes
2025-11-06 23:11     ` [PATCH v3 04/14] gpu: nova-core: falcon: Move dma_reset functionality " Joel Fernandes
2025-11-06 23:11     ` [PATCH v3 05/14] gpu: nova-core: gsp: Add support for checking if GSP reloaded Joel Fernandes
2025-11-06 23:11     ` [PATCH v3 06/14] gpu: nova-core: Add bindings required by GSP sequencer Joel Fernandes
2025-11-11 21:43       ` Lyude Paul
2025-11-13  0:48         ` Joel Fernandes
2025-11-06 23:11     ` [PATCH v3 07/14] gpu: nova-core: Implement the " Joel Fernandes
2025-11-11 20:57       ` Lyude Paul
2025-11-13  1:24         ` Joel Fernandes
2025-11-06 23:11     ` [PATCH v3 08/14] gpu: nova-core: sequencer: Add register opcodes Joel Fernandes
2025-11-11 21:09       ` Lyude Paul
2025-11-06 23:11     ` [PATCH v3 09/14] gpu: nova-core: sequencer: Add delay opcode support Joel Fernandes
2025-11-11 21:11       ` Lyude Paul
2025-11-06 23:11     ` [PATCH v3 10/14] gpu: nova-core: sequencer: Implement basic core operations Joel Fernandes
2025-11-11 21:12       ` Lyude Paul
2025-11-13  0:49         ` Joel Fernandes
2025-11-06 23:11     ` [PATCH v3 11/14] gpu: nova-core: sequencer: Implement core resume operation Joel Fernandes
2025-11-11 21:44       ` Lyude Paul
2025-11-06 23:11     ` [PATCH v3 12/14] gpu: nova-core: gsp: Wait for gsp initialization to complete Joel Fernandes
2025-11-11 21:47       ` Lyude Paul
2025-11-06 23:11     ` [PATCH v3 13/14] gpu: nova-core: sequencer: Refactor run() to handle unknown messages Joel Fernandes
2025-11-11 21:49       ` Lyude Paul
2025-11-06 23:11     ` [PATCH v3 14/14] gpu: nova-core: gsp: Retrieve GSP static info to gather GPU information Joel Fernandes
2025-11-11 22:02       ` Lyude Paul
2025-11-12 20:22         ` Joel Fernandes
2025-11-12 20:35           ` Joel Fernandes
2025-11-06  2:06 ` [PATCH v2 00/12] nova-core: Complete GSP boot and begin RPC communication John Hubbard
2025-11-11 20:24 ` Lyude Paul

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=20251102235920.3784592-12-joelagnelf@nvidia.com \
    --to=joelagnelf@nvidia.com \
    --cc=a.hindborg@kernel.org \
    --cc=acourbot@nvidia.com \
    --cc=airlied@gmail.com \
    --cc=alex.gaynor@gmail.com \
    --cc=aliceryhl@google.com \
    --cc=apopple@nvidia.com \
    --cc=bjorn3_gh@protonmail.com \
    --cc=boqun.feng@gmail.com \
    --cc=dakr@kernel.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=gary@garyguo.net \
    --cc=jhubbard@nvidia.com \
    --cc=joel@joelfernandes.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lossin@kernel.org \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=mripard@kernel.org \
    --cc=nouveau@lists.freedesktop.org \
    --cc=ojeda@kernel.org \
    --cc=rust-for-linux@vger.kernel.org \
    --cc=simona@ffwll.ch \
    --cc=tmgross@umich.edu \
    --cc=ttabi@nvidia.com \
    --cc=tzimmermann@suse.de \
    /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

all inboxes | Powered by JetHome®