Re: [PATCH v10 09/28] gpu: nova-core: Hopper/Blackwell: new location for PCI config mirror

Alexandre Courbot
2026-04-17T14:24:09Z

On Sat Apr 11, 2026 at 11:49 AM JST, John Hubbard wrote:
> Hopper and Blackwell GPUs use a different PCI config space mirror
> address (0x092000) compared to older architectures (0x088000). Update
> SetSystemInfo to accept a chipset parameter and select the correct
> address based on architecture.
>
> Signed-off-by: John Hubbard <jhubbard@nvidia.com>
> ---
> drivers/gpu/nova-core/gsp/boot.rs | 2 +-
> drivers/gpu/nova-core/gsp/commands.rs | 8 +++++---
> drivers/gpu/nova-core/gsp/fw/commands.rs | 22 +++++++++++++++++++---
> 3 files changed, 25 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/nova-core/gsp/boot.rs b/drivers/gpu/nova-core/gsp/boot.rs
> index 18f356c9178e..1aa869693b75 100644
> --- a/drivers/gpu/nova-core/gsp/boot.rs
> +++ b/drivers/gpu/nova-core/gsp/boot.rs
> @@ -169,7 +169,7 @@ pub(crate) fn boot(
> let wpr_meta = Coherent::init(dev, GFP_KERNEL, GspFwWprMeta::new(&gsp_fw, &fb_layout))?;
>
> self.cmdq
> - .send_command_no_wait(bar, commands::SetSystemInfo::new(pdev))?;
> + .send_command_no_wait(bar, commands::SetSystemInfo::new(pdev, chipset))?;
> self.cmdq
> .send_command_no_wait(bar, commands::SetRegistry::new())?;
>
> diff --git a/drivers/gpu/nova-core/gsp/commands.rs b/drivers/gpu/nova-core/gsp/commands.rs
> index c89c7b57a751..9551a789433c 100644
> --- a/drivers/gpu/nova-core/gsp/commands.rs
> +++ b/drivers/gpu/nova-core/gsp/commands.rs
> @@ -19,6 +19,7 @@
>
> use crate::{
> driver::Bar0,
> + gpu::Chipset,
> gsp::{
> cmdq::{
> Cmdq,
> @@ -37,12 +38,13 @@
> /// The `GspSetSystemInfo` command.
> pub(crate) struct SetSystemInfo<'a> {
> pdev: &'a pci::Device<device::Bound>,
> + chipset: Chipset,
> }
>
> impl<'a> SetSystemInfo<'a> {
> /// Creates a new `GspSetSystemInfo` command using the parameters of `pdev`.
> - pub(crate) fn new(pdev: &'a pci::Device<device::Bound>) -> Self {
> - Self { pdev }
> + pub(crate) fn new(pdev: &'a pci::Device<device::Bound>, chipset: Chipset) -> Self {
> + Self { pdev, chipset }
> }
> }
>
> @@ -53,7 +55,7 @@ impl<'a> CommandToGsp for SetSystemInfo<'a> {
> type InitError = Error;
>
> fn init(&self) -> impl Init<Self::Command, Self::InitError> {
> - GspSetSystemInfo::init(self.pdev)
> + GspSetSystemInfo::init(self.pdev, self.chipset)
> }
> }
>
> diff --git a/drivers/gpu/nova-core/gsp/fw/commands.rs b/drivers/gpu/nova-core/gsp/fw/commands.rs
> index db46276430be..c16acbb0237f 100644
> --- a/drivers/gpu/nova-core/gsp/fw/commands.rs
> +++ b/drivers/gpu/nova-core/gsp/fw/commands.rs
> @@ -10,7 +10,13 @@
> }, //
> };
>
> -use crate::gsp::GSP_PAGE_SIZE;
> +use crate::{
> + gpu::{
> + Architecture,
> + Chipset, //
> + },
> + gsp::GSP_PAGE_SIZE, //
> +};
>
> use super::bindings;
>
> @@ -24,7 +30,10 @@ pub(crate) struct GspSetSystemInfo {
> impl GspSetSystemInfo {
> /// Returns an in-place initializer for the `GspSetSystemInfo` command.
> #[allow(non_snake_case)]
> - pub(crate) fn init<'a>(dev: &'a pci::Device<device::Bound>) -> impl Init<Self, Error> + 'a {
> + pub(crate) fn init<'a>(
> + dev: &'a pci::Device<device::Bound>,
> + chipset: Chipset,
> + ) -> impl Init<Self, Error> + 'a {
> type InnerGspSystemInfo = bindings::GspSystemInfo;
> let init_inner = try_init!(InnerGspSystemInfo {
> gpuPhysAddr: dev.resource_start(0)?,
> @@ -35,7 +44,14 @@ pub(crate) fn init<'a>(dev: &'a pci::Device<device::Bound>) -> impl Init<Self, E
> // Using TASK_SIZE in r535_gsp_rpc_set_system_info() seems wrong because
> // TASK_SIZE is per-task. That's probably a design issue in GSP-RM though.
> maxUserVa: (1 << 47) - 4096,
> - pciConfigMirrorBase: 0x088000,
> + // Hopper, Blackwell, and later moved the PCI config mirror window to 0x092000.
> + // Older architectures continue to use the legacy window at 0x088000.
> + pciConfigMirrorBase: match chipset.arch() {
> + Architecture::Turing | Architecture::Ampere | Architecture::Ada => 0x088000,
> + Architecture::Hopper
> + | Architecture::BlackwellGB10x
> + | Architecture::BlackwellGB20x => 0x092000,
> + },

Mmm, similarly to the previous patch, I would prefer to have this behind
a HAL, but I am not quite sure which one would fit. Any idea?