[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20251106231153.2925637-9-joelagnelf@nvidia.com>
Date: Thu, 6 Nov 2025 18:11:47 -0500
From: Joel Fernandes <joelagnelf@...dia.com>
To: linux-kernel@...r.kernel.org,
rust-for-linux@...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,
Daniel Almeida <daniel.almeida@...labora.com>,
nouveau@...ts.freedesktop.org
Subject: [PATCH v3 08/14] gpu: nova-core: sequencer: Add register opcodes
These opcodes are used for register write, modify, poll and store (save)
sequencer operations.
Signed-off-by: Joel Fernandes <joelagnelf@...dia.com>
---
drivers/gpu/nova-core/gsp/sequencer.rs | 106 +++++++++++++++++++++++--
1 file changed, 99 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/nova-core/gsp/sequencer.rs b/drivers/gpu/nova-core/gsp/sequencer.rs
index ee096c04d9eb..32a0446b8c75 100644
--- a/drivers/gpu/nova-core/gsp/sequencer.rs
+++ b/drivers/gpu/nova-core/gsp/sequencer.rs
@@ -5,6 +5,7 @@
use core::mem::size_of;
use kernel::alloc::flags::GFP_KERNEL;
use kernel::device;
+use kernel::io::poll::read_poll_timeout;
use kernel::prelude::*;
use kernel::time::Delta;
use kernel::transmute::FromBytes;
@@ -40,13 +41,36 @@ struct GspSequencerInfo<'a> {
/// GSP Sequencer Command types with payload data.
/// Commands have an opcode and a opcode-dependent struct.
-#[allow(dead_code)]
-pub(crate) enum GspSeqCmd {}
+#[allow(clippy::enum_variant_names)]
+pub(crate) enum GspSeqCmd {
+ RegWrite(fw::GSP_SEQ_BUF_PAYLOAD_REG_WRITE),
+ RegModify(fw::GSP_SEQ_BUF_PAYLOAD_REG_MODIFY),
+ RegPoll(fw::GSP_SEQ_BUF_PAYLOAD_REG_POLL),
+ RegStore(fw::GSP_SEQ_BUF_PAYLOAD_REG_STORE),
+}
impl GspSeqCmd {
/// Creates a new GspSeqCmd from a firmware GSP_SEQUENCER_BUFFER_CMD.
- pub(crate) fn from_fw_cmd(_cmd: &fw::GSP_SEQUENCER_BUFFER_CMD) -> Result<Self> {
- Err(EINVAL)
+ pub(crate) fn from_fw_cmd(cmd: &fw::GSP_SEQUENCER_BUFFER_CMD) -> Result<Self> {
+ match cmd.opCode {
+ fw::GSP_SEQ_BUF_OPCODE_GSP_SEQ_BUF_OPCODE_REG_WRITE => {
+ // SAFETY: We're using the union field that corresponds to the opCode.
+ Ok(GspSeqCmd::RegWrite(unsafe { cmd.payload.regWrite }))
+ }
+ fw::GSP_SEQ_BUF_OPCODE_GSP_SEQ_BUF_OPCODE_REG_MODIFY => {
+ // SAFETY: We're using the union field that corresponds to the opCode.
+ Ok(GspSeqCmd::RegModify(unsafe { cmd.payload.regModify }))
+ }
+ fw::GSP_SEQ_BUF_OPCODE_GSP_SEQ_BUF_OPCODE_REG_POLL => {
+ // SAFETY: We're using the union field that corresponds to the opCode.
+ Ok(GspSeqCmd::RegPoll(unsafe { cmd.payload.regPoll }))
+ }
+ fw::GSP_SEQ_BUF_OPCODE_GSP_SEQ_BUF_OPCODE_REG_STORE => {
+ // SAFETY: We're using the union field that corresponds to the opCode.
+ Ok(GspSeqCmd::RegStore(unsafe { cmd.payload.regStore }))
+ }
+ _ => Err(EINVAL),
+ }
}
pub(crate) fn new(data: &[u8], dev: &device::Device<device::Bound>) -> Result<Self> {
@@ -64,7 +88,16 @@ pub(crate) fn new(data: &[u8], dev: &device::Device<device::Bound>) -> Result<Se
/// Get the size of this command in bytes, the command consists of
/// a 4-byte opcode, and a variable-sized payload.
pub(crate) fn size_bytes(&self) -> usize {
- 0
+ let opcode_size = size_of::<fw::GSP_SEQ_BUF_OPCODE>();
+ match self {
+ // For commands with payloads, add the payload size in bytes.
+ GspSeqCmd::RegWrite(_) => opcode_size + size_of::<fw::GSP_SEQ_BUF_PAYLOAD_REG_WRITE>(),
+ GspSeqCmd::RegModify(_) => {
+ opcode_size + size_of::<fw::GSP_SEQ_BUF_PAYLOAD_REG_MODIFY>()
+ }
+ GspSeqCmd::RegPoll(_) => opcode_size + size_of::<fw::GSP_SEQ_BUF_PAYLOAD_REG_POLL>(),
+ GspSeqCmd::RegStore(_) => opcode_size + size_of::<fw::GSP_SEQ_BUF_PAYLOAD_REG_STORE>(),
+ }
}
}
@@ -83,12 +116,71 @@ pub(crate) trait GspSeqCmdRunner {
fn run(&self, sequencer: &GspSequencer<'_>) -> Result;
}
-impl GspSeqCmdRunner for GspSeqCmd {
- fn run(&self, _seq: &GspSequencer<'_>) -> Result {
+impl GspSeqCmdRunner for fw::GSP_SEQ_BUF_PAYLOAD_REG_WRITE {
+ fn run(&self, sequencer: &GspSequencer<'_>) -> Result {
+ let addr = self.addr as usize;
+ let val = self.val;
+ let _ = sequencer.bar.try_write32(val, addr);
+ Ok(())
+ }
+}
+
+impl GspSeqCmdRunner for fw::GSP_SEQ_BUF_PAYLOAD_REG_MODIFY {
+ fn run(&self, sequencer: &GspSequencer<'_>) -> Result {
+ let addr = self.addr as usize;
+ if let Ok(temp) = sequencer.bar.try_read32(addr) {
+ let _ = sequencer
+ .bar
+ .try_write32((temp & !self.mask) | self.val, addr);
+ }
Ok(())
}
}
+impl GspSeqCmdRunner for fw::GSP_SEQ_BUF_PAYLOAD_REG_POLL {
+ fn run(&self, sequencer: &GspSequencer<'_>) -> Result {
+ let addr = self.addr as usize;
+ let mut timeout_us = i64::from(self.timeout);
+
+ // Default timeout to 4 seconds.
+ timeout_us = if timeout_us == 0 { 4000000 } else { timeout_us };
+
+ // First read.
+ sequencer.bar.try_read32(addr)?;
+
+ // Poll the requested register with requested timeout.
+ read_poll_timeout(
+ || sequencer.bar.try_read32(addr),
+ |current| (current & self.mask) == self.val,
+ Delta::ZERO,
+ Delta::from_micros(timeout_us),
+ )
+ .map(|_| ())
+ }
+}
+
+impl GspSeqCmdRunner for fw::GSP_SEQ_BUF_PAYLOAD_REG_STORE {
+ fn run(&self, sequencer: &GspSequencer<'_>) -> Result {
+ let addr = self.addr as usize;
+ let _index = self.index;
+
+ let _val = sequencer.bar.try_read32(addr)?;
+
+ Ok(())
+ }
+}
+
+impl GspSeqCmdRunner for GspSeqCmd {
+ fn run(&self, seq: &GspSequencer<'_>) -> Result {
+ match self {
+ GspSeqCmd::RegWrite(cmd) => cmd.run(seq),
+ GspSeqCmd::RegModify(cmd) => cmd.run(seq),
+ GspSeqCmd::RegPoll(cmd) => cmd.run(seq),
+ GspSeqCmd::RegStore(cmd) => cmd.run(seq),
+ }
+ }
+}
+
pub(crate) struct GspSeqIter<'a> {
cmd_data: &'a [u8],
current_offset: usize, // Tracking the current position.
--
2.34.1
Powered by blists - more mailing lists