Re: [PATCH 1/1] gpu: nova-core: populate GSP_VF_INFO when vGPU is enabled

["Alexandre Courbot" <acourbot@nvidia.com>]

On Fri Jul 31, 2026 at 3:14 AM JST, Zhi Wang wrote:
> GSP firmware requires VF BAR layout information to correctly route
> interrupts and doorbell events to individual virtual functions.
> Without this data the firmware cannot set up per-VF event routing.
>
> When vGPU mode is enabled, read the VF topology from the typed PCI
> SR-IOV extended capability and populate the GSP_VF_INFO embedded in
> the GSP_SYSTEM_INFO command.
>
> Register GpuacctPerfmonUtilSamples in MsgFunction so the receive path
> recognizes vGPU perfmon sampling events from GSP-RM.
>
> Signed-off-by: Zhi Wang <zhiw@nvidia.com>
> ---
>  drivers/gpu/nova-core/gsp/boot.rs        |  6 ++--
>  drivers/gpu/nova-core/gsp/commands.rs    | 15 ++++++++--
>  drivers/gpu/nova-core/gsp/fw.rs          |  4 +++
>  drivers/gpu/nova-core/gsp/fw/commands.rs | 35 +++++++++++++++++++++++-
>  4 files changed, 54 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/nova-core/gsp/boot.rs b/drivers/gpu/nova-core/gsp/boot.rs
> index 727b8ae4bcb7..c086026dc2d8 100644
> --- a/drivers/gpu/nova-core/gsp/boot.rs
> +++ b/drivers/gpu/nova-core/gsp/boot.rs
> @@ -86,8 +86,10 @@ pub(crate) fn boot(
>  
>          dev_dbg!(pdev, "RISC-V active? {}\n", gsp_falcon.is_riscv_active(),);
>  
> -        self.cmdq
> -            .send_command_no_wait(bar, commands::SetSystemInfo::new(pdev, chipset))?;
> +        self.cmdq.send_command_no_wait(
> +            bar,
> +            commands::SetSystemInfo::new(pdev, chipset, ctx.vgpu.state()),
> +        )?;
>          self.cmdq
>              .send_command_no_wait(bar, commands::SetRegistry::new(ctx.vgpu.state())?)?;
>  
> diff --git a/drivers/gpu/nova-core/gsp/commands.rs b/drivers/gpu/nova-core/gsp/commands.rs
> index ffc25fd8c47b..11d0c7ec371e 100644
> --- a/drivers/gpu/nova-core/gsp/commands.rs
> +++ b/drivers/gpu/nova-core/gsp/commands.rs
> @@ -41,12 +41,21 @@
>  pub(crate) struct SetSystemInfo<'a> {
>      pdev: &'a pci::Device<device::Bound>,
>      chipset: Chipset,
> +    vgpu_state: VgpuState,
>  }
>  
>  impl<'a> SetSystemInfo<'a> {
>      /// Creates a new `GspSetSystemInfo` command using the parameters of `pdev`.
> -    pub(crate) fn new(pdev: &'a pci::Device<device::Bound>, chipset: Chipset) -> Self {
> -        Self { pdev, chipset }
> +    pub(crate) fn new(
> +        pdev: &'a pci::Device<device::Bound>,
> +        chipset: Chipset,
> +        vgpu_state: VgpuState,
> +    ) -> Self {
> +        Self {
> +            pdev,
> +            chipset,
> +            vgpu_state,
> +        }
>      }
>  }
>  
> @@ -57,7 +66,7 @@ impl<'a> CommandToGsp for SetSystemInfo<'a> {
>      type InitError = Error;
>  
>      fn init(&self) -> impl Init<Self::Command, Self::InitError> {
> -        Self::Command::init(self.pdev, self.chipset)
> +        Self::Command::init(self.pdev, self.chipset, self.vgpu_state)
>      }
>  }
>  
> diff --git a/drivers/gpu/nova-core/gsp/fw.rs b/drivers/gpu/nova-core/gsp/fw.rs
> index 6e8e7d822ef1..6afe08abd868 100644
> --- a/drivers/gpu/nova-core/gsp/fw.rs
> +++ b/drivers/gpu/nova-core/gsp/fw.rs
> @@ -254,6 +254,7 @@ pub(crate) enum MsgFunction {
>      GspLockdownNotice = bindings::NV_VGPU_MSG_EVENT_GSP_LOCKDOWN_NOTICE,
>      GspPostNoCat = bindings::NV_VGPU_MSG_EVENT_GSP_POST_NOCAT_RECORD,
>      GspRunCpuSequencer = bindings::NV_VGPU_MSG_EVENT_GSP_RUN_CPU_SEQUENCER,
> +    GpuacctPerfmonUtilSamples = bindings::NV_VGPU_MSG_EVENT_GPUACCT_PERFMON_UTIL_SAMPLES,
>      MmuFaultQueued = bindings::NV_VGPU_MSG_EVENT_MMU_FAULT_QUEUED,
>      OsErrorLog = bindings::NV_VGPU_MSG_EVENT_OS_ERROR_LOG,
>      PostEvent = bindings::NV_VGPU_MSG_EVENT_POST_EVENT,
> @@ -303,6 +304,9 @@ fn try_from(value: u32) -> Result<MsgFunction> {
>              bindings::NV_VGPU_MSG_EVENT_GSP_RUN_CPU_SEQUENCER => {
>                  Ok(MsgFunction::GspRunCpuSequencer)
>              }
> +            bindings::NV_VGPU_MSG_EVENT_GPUACCT_PERFMON_UTIL_SAMPLES => {
> +                Ok(MsgFunction::GpuacctPerfmonUtilSamples)
> +            }
>              bindings::NV_VGPU_MSG_EVENT_MMU_FAULT_QUEUED => Ok(MsgFunction::MmuFaultQueued),
>              bindings::NV_VGPU_MSG_EVENT_OS_ERROR_LOG => Ok(MsgFunction::OsErrorLog),
>              bindings::NV_VGPU_MSG_EVENT_POST_EVENT => Ok(MsgFunction::PostEvent),
> diff --git a/drivers/gpu/nova-core/gsp/fw/commands.rs b/drivers/gpu/nova-core/gsp/fw/commands.rs
> index 6dc31d1bf5ae..edf21aa8c61b 100644
> --- a/drivers/gpu/nova-core/gsp/fw/commands.rs
> +++ b/drivers/gpu/nova-core/gsp/fw/commands.rs
> @@ -16,11 +16,42 @@
>  use crate::{
>      gpu::Chipset,
>      gsp::GSP_PAGE_SIZE,
> -    num::IntoSafeCast, //
> +    num::IntoSafeCast,
> +    vgpu::VgpuState, //
>  };
>  
>  use super::bindings;
>  
> +/// Builds the VF topology passed to GSP-RM as part of the system information.
> +fn build_vf_info(
> +    dev: &pci::Device<device::Bound>,
> +    vgpu_state: VgpuState,
> +) -> Result<bindings::GSP_VF_INFO> {
> +    let VgpuState::Enabled { total_vfs } = vgpu_state else {
> +        return Ok(Default::default());
> +    };
> +
> +    let sriov = dev
> +        .config_space_extended()?
> +        .find_ext_capability::<pci::ExtSriovRegs>()?;
> +
> +    let bar0 = sriov.read_vf_bar(0)?;
> +    let bar1 = sriov.read_vf_bar(bar0.next_index())?;
> +    let bar2 = sriov.read_vf_bar(bar1.next_index())?;

This basically confirms the discussion we had on the SR-IOV thread: the
iterator pattern is the correct one here.

The patch itself looks good, so I think we can merge it as soon as the
dependency is in and Danilo's feedback is addressed.