Alexandre Courbot
2025-Nov-10 13:43 UTC
[PATCH v2 07/12] nova-core: Implement the GSP sequencer
Hi Joel, I guess you will want to rebase the series on top of the GSP boot v9, for fixing the conflicts with the imports, squash patch 13 where it should belong, and also because it adds a few things that should simplify this patch. As a general comment, the structures and their members could benefit from short doccomments (thankfully after this review there should be a few less :)). On Mon Nov 3, 2025 at 8:59 AM JST, Joel Fernandes wrote: <snip>> diff --git a/drivers/gpu/nova-core/gsp/sequencer.rs b/drivers/gpu/nova-core/gsp/sequencer.rs > new file mode 100644 > index 000000000000..48c40140876b > --- /dev/null > +++ b/drivers/gpu/nova-core/gsp/sequencer.rs > @@ -0,0 +1,208 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +//! GSP Sequencer implementation for Pre-hopper GSP boot sequence. > + > +use core::mem::size_of; > +use kernel::alloc::flags::GFP_KERNEL; > +use kernel::device; > +use kernel::prelude::*; > +use kernel::time::Delta; > +use kernel::transmute::FromBytes; > + > +use crate::driver::Bar0; > +use crate::falcon::{ > + gsp::Gsp, > + sec2::Sec2, > + Falcon, // > +}; > +use crate::firmware::gsp::GspFirmware; > +use crate::gsp::cmdq::{ > + Cmdq, > + MessageFromGsp, // > +}; > +use crate::gsp::fw; > + > +use kernel::{ > + dev_dbg, > + dev_err, // > +}; > + > +impl MessageFromGsp for fw::rpc_run_cpu_sequencer_v17_00 { > + const FUNCTION: fw::MsgFunction = fw::MsgFunction::GspRunCpuSequencer; > +} > + > +const CMD_SIZE: usize = size_of::<fw::GSP_SEQUENCER_BUFFER_CMD>(); > + > +struct GspSequencerInfo<'a> { > + info: &'a fw::rpc_run_cpu_sequencer_v17_00, > + cmd_data: KVec<u8>, > +} > + > +/// GSP Sequencer Command types with payload data. > +/// Commands have an opcode and a opcode-dependent struct. > +#[allow(dead_code)] > +pub(crate) enum GspSeqCmd {} > + > +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 new(data: &[u8], dev: &device::Device<device::Bound>) -> Result<Self> { > + let fw_cmd = fw::GSP_SEQUENCER_BUFFER_CMD::from_bytes(data).ok_or(EINVAL)?; > + let cmd = Self::from_fw_cmd(fw_cmd)?; > + > + if data.len() < cmd.size_bytes() { > + dev_err!(dev, "data is not enough for command.\n"); > + return Err(EINVAL); > + } > + > + Ok(cmd) > + } > + > + /// 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 > + }Instead of having this (which involves another dedicated match statement), how about having the `new` method return the size in bytes that are read, that the caller can add to its cursor?> +} > + > +#[expect(dead_code)] > +pub(crate) struct GspSequencer<'a> { > + seq_info: GspSequencerInfo<'a>, > + bar: &'a Bar0, > + sec2_falcon: &'a Falcon<Sec2>, > + gsp_falcon: &'a Falcon<Gsp>, > + libos_dma_handle: u64, > + gsp_fw: &'a GspFirmware,`gsp_fw` seems to be only needed to obtain the bootloader app version - let's store that information directly instead a reference to a whole structure we don't need.> + dev: &'a device::Device<device::Bound>,Since this is only used for logging purposes, we don't need a bound device. This can be an `ARef<device::Device>`, which removes a reference.> +} > + > +pub(crate) trait GspSeqCmdRunner { > + fn run(&self, sequencer: &GspSequencer<'_>) -> Result; > +} > + > +impl GspSeqCmdRunner for GspSeqCmd { > + fn run(&self, _seq: &GspSequencer<'_>) -> Result { > + Ok(()) > + } > +} > + > +pub(crate) struct GspSeqIter<'a> { > + cmd_data: &'a [u8], > + current_offset: usize, // Tracking the current position. > + total_cmds: u32, > + cmds_processed: u32, > + dev: &'a device::Device<device::Bound>, > +} > + > +impl<'a> Iterator for GspSeqIter<'a> { > + type Item = Result<GspSeqCmd>; > + > + fn next(&mut self) -> Option<Self::Item> { > + // Stop if we've processed all commands or reached the end of data. > + if self.cmds_processed >= self.total_cmds || self.current_offset >= self.cmd_data.len() { > + return None; > + } > + > + // Check if we have enough data for opcode. > + let opcode_size = size_of::<fw::GSP_SEQ_BUF_OPCODE>(); > + if self.current_offset + opcode_size > self.cmd_data.len() {`opcode_size` looks superfluous as it is only used once.> + return Some(Err(EINVAL));Should probably be `EIO` as the data is not the expected size.> + } > + > + let offset = self.current_offset; > + > + // Handle command creation based on available data, > + // zero-pad if necessary (since last command may not be full size). > + let mut buffer = [0u8; CMD_SIZE]; > + let copy_len = if offset + CMD_SIZE <= self.cmd_data.len() { > + CMD_SIZE > + } else { > + self.cmd_data.len() - offset > + }; > + buffer[..copy_len].copy_from_slice(&self.cmd_data[offset..offset + copy_len]); > + let cmd_result = GspSeqCmd::new(&buffer, self.dev); > + > + cmd_result.map_or_else( > + |_err| { > + dev_err!(self.dev, "Error parsing command at offset {}", offset); > + None > + },This looks a bit redundant: we are processing errors here, but then we also have another error handler in the caller (the one that says "Error running command..."). I'm pretty sure there is room for simplification here.> + |cmd| { > + self.current_offset += cmd.size_bytes(); > + self.cmds_processed += 1; > + Some(Ok(cmd)) > + }, > + ) > + } > +} > + > +impl<'a, 'b> IntoIterator for &'b GspSequencer<'a> { > + type Item = Result<GspSeqCmd>; > + type IntoIter = GspSeqIter<'b>; > + > + fn into_iter(self) -> Self::IntoIter { > + let cmd_data = &self.seq_info.cmd_data[..]; > + > + GspSeqIter { > + cmd_data, > + current_offset: 0, > + total_cmds: self.seq_info.info.cmdIndex, > + cmds_processed: 0, > + dev: self.dev, > + } > + } > +}You can do without this implementation by just having an `iter` method returning the iterator where appropriate (in the current version this would be `GspSequencer`, but I suggest moving that to the `GspSequencerInfo/GspSequence`).
Joel Fernandes
2025-Nov-11 22:51 UTC
[PATCH v2 07/12] nova-core: Implement the GSP sequencer
On 11/10/2025 8:43 AM, Alexandre Courbot wrote:>> +impl<'a> Iterator for GspSeqIter<'a> { >> + type Item = Result<GspSeqCmd>; >> + >> + fn next(&mut self) -> Option<Self::Item> { >> + // Stop if we've processed all commands or reached the end of data. >> + if self.cmds_processed >= self.total_cmds || self.current_offset >= self.cmd_data.len() { >> + return None; >> + } >> + >> + // Check if we have enough data for opcode. >> + let opcode_size = size_of::<fw::GSP_SEQ_BUF_OPCODE>(); >> + if self.current_offset + opcode_size > self.cmd_data.len() {[..]>> + let offset = self.current_offset;>> + >> + // Handle command creation based on available data, >> + // zero-pad if necessary (since last command may not be full size). >> + let mut buffer = [0u8; CMD_SIZE]; >> + let copy_len = if offset + CMD_SIZE <= self.cmd_data.len() { >> + CMD_SIZE >> + } else { >> + self.cmd_data.len() - offset >> + }; >> + buffer[..copy_len].copy_from_slice(&self.cmd_data[offset..offset + copy_len]); >> + let cmd_result = GspSeqCmd::new(&buffer, self.dev); >> + >> + cmd_result.map_or_else( >> + |_err| { >> + dev_err!(self.dev, "Error parsing command at offset {}", offset); >> + None >> + }, >> This looks a bit redundant: we are processing errors here, but then we > also have another error handler in the caller (the one that says "Error > running command..."). I'm pretty sure there is room for simplification > here.No, "Error running command" is because of .run() failure. We won't even get there if .next() fails. AFAICS, there is no other diagnostic other than this if command parsing fails. Thanks.
Joel Fernandes
2025-Nov-11 23:02 UTC
[PATCH v2 07/12] nova-core: Implement the GSP sequencer
On 11/10/2025 8:43 AM, Alexandre Courbot wrote: [..]> >> + |cmd| { >> + self.current_offset += cmd.size_bytes(); >> + self.cmds_processed += 1; >> + Some(Ok(cmd)) >> + }, >> + ) >> + } >> +} >> + >> +impl<'a, 'b> IntoIterator for &'b GspSequencer<'a> { >> + type Item = Result<GspSeqCmd>; >> + type IntoIter = GspSeqIter<'b>; >> + >> + fn into_iter(self) -> Self::IntoIter { >> + let cmd_data = &self.seq_info.cmd_data[..]; >> + >> + GspSeqIter { >> + cmd_data, >> + current_offset: 0, >> + total_cmds: self.seq_info.info.cmdIndex, >> + cmds_processed: 0, >> + dev: self.dev, >> + } >> + } >> +} > > You can do without this implementation by just having an `iter` method > returning the iterator where appropriate (in the current version this > would be `GspSequencer`, but I suggest moving that to the > `GspSequencerInfo/GspSequence`). >If I do that, it becomes ugly on the caller side. Caller side becomes: for cmd_result in sequencer.seq_info.iter(&sequencer.dev) { .. } instead of the current: for cmd_result in sequencer { .. } Does it work for you if I remove IntoIterator and just have GspSequencer::iter() return the iterator? Then the caller becomes: for cmd_result in sequencer.iter() { .. } Although I think IntoIterator makes a lot of sense here too, and there are other usages of it in rust kernel code. But the sequencer.iter() would work for me. Thanks.