[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20250829173254.2068763-4-joelagnelf@nvidia.com>
Date: Fri, 29 Aug 2025 13:32:40 -0400
From: Joel Fernandes <joelagnelf@...dia.com>
To: linux-kernel@...r.kernel.org,
dri-devel@...ts.freedesktop.org,
dakr@...nel.org,
acourbot@...dia.com
Cc: Alistair Popple <apopple@...dia.com>,
Miguel Ojeda <ojeda@...nel.org>,
Alex Gaynor <alex.gaynor@...il.com>,
Boqun Feng <boqun.feng@...il.com>,
Gary Guo <gary@...yguo.net>,
bjorn3_gh@...tonmail.com,
Benno Lossin <lossin@...nel.org>,
Andreas Hindborg <a.hindborg@...nel.org>,
Alice Ryhl <aliceryhl@...gle.com>,
Trevor Gross <tmgross@...ch.edu>,
David Airlie <airlied@...il.com>,
Simona Vetter <simona@...ll.ch>,
Maarten Lankhorst <maarten.lankhorst@...ux.intel.com>,
Maxime Ripard <mripard@...nel.org>,
Thomas Zimmermann <tzimmermann@...e.de>,
John Hubbard <jhubbard@...dia.com>,
Joel Fernandes <joelagnelf@...dia.com>,
Timur Tabi <ttabi@...dia.com>,
joel@...lfernandes.org,
nouveau@...ts.freedesktop.org,
rust-for-linux@...r.kernel.org
Subject: [PATCH 03/17] nova-core: falcon: Move mbox functionalities into helper
Move falcon reading/writing to mbox functionality into helper so we can
use it from the sequencer resume flow.
Signed-off-by: Joel Fernandes <joelagnelf@...dia.com>
---
drivers/gpu/nova-core/falcon.rs | 51 +++++++++++++++++++++++----------
1 file changed, 36 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/nova-core/falcon.rs b/drivers/gpu/nova-core/falcon.rs
index e51f4d7469c0..054be6c094ba 100644
--- a/drivers/gpu/nova-core/falcon.rs
+++ b/drivers/gpu/nova-core/falcon.rs
@@ -576,19 +576,13 @@ pub(crate) fn start(&self, bar: &Bar0) -> Result<()> {
Ok(())
}
- /// Start running the loaded firmware.
- ///
- /// `mbox0` and `mbox1` are optional parameters to write into the `MBOX0` and `MBOX1` registers
- /// prior to running.
- ///
- /// Wait up to two seconds for the firmware to complete, and return its exit status read from
- /// the `MBOX0` and `MBOX1` registers.
- pub(crate) fn boot(
+ /// Write values to the mailbox registers if provided.
+ pub(crate) fn write_mailboxes(
&self,
bar: &Bar0,
mbox0: Option<u32>,
mbox1: Option<u32>,
- ) -> Result<(u32, u32)> {
+ ) -> Result<()> {
if let Some(mbox0) = mbox0 {
regs::NV_PFALCON_FALCON_MAILBOX0::default()
.set_value(mbox0)
@@ -600,18 +594,45 @@ pub(crate) fn boot(
.set_value(mbox1)
.write(bar, &E::ID);
}
+ Ok(())
+ }
- self.start(bar)?;
- self.wait_till_halted(bar)?;
+ /// Read the value from mbox0 register.
+ pub(crate) fn read_mailbox0(&self, bar: &Bar0) -> Result<u32> {
+ Ok(regs::NV_PFALCON_FALCON_MAILBOX0::read(bar, &E::ID).value())
+ }
- let (mbox0, mbox1) = (
- regs::NV_PFALCON_FALCON_MAILBOX0::read(bar, &E::ID).value(),
- regs::NV_PFALCON_FALCON_MAILBOX1::read(bar, &E::ID).value(),
- );
+ /// Read the value from mbox1 register.
+ pub(crate) fn read_mailbox1(&self, bar: &Bar0) -> Result<u32> {
+ Ok(regs::NV_PFALCON_FALCON_MAILBOX1::read(bar, &E::ID).value())
+ }
+ /// Read values from both mailbox registers.
+ pub(crate) fn read_mailboxes(&self, bar: &Bar0) -> Result<(u32, u32)> {
+ let mbox0 = self.read_mailbox0(bar)?;
+ let mbox1 = self.read_mailbox1(bar)?;
Ok((mbox0, mbox1))
}
+ /// Start running the loaded firmware.
+ ///
+ /// `mbox0` and `mbox1` are optional parameters to write into the `MBOX0` and `MBOX1` registers
+ /// prior to running.
+ ///
+ /// Wait up to two seconds for the firmware to complete, and return its exit status read from
+ /// the `MBOX0` and `MBOX1` registers.
+ pub(crate) fn boot(
+ &self,
+ bar: &Bar0,
+ mbox0: Option<u32>,
+ mbox1: Option<u32>,
+ ) -> Result<(u32, u32)> {
+ self.write_mailboxes(bar, mbox0, mbox1)?;
+ self.start(bar)?;
+ self.wait_till_halted(bar)?;
+ self.read_mailboxes(bar)
+ }
+
/// Returns the fused version of the signature to use in order to run a HS firmware on this
/// falcon instance. `engine_id_mask` and `ucode_id` are obtained from the firmware header.
pub(crate) fn signature_reg_fuse_version(
--
2.34.1
Powered by blists - more mailing lists