mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: John Hubbard <jhubbard@nvidia.com>
To: Danilo Krummrich <dakr@kernel.org>,
	Alexandre Courbot <acourbot@nvidia.com>
Cc: "Joel Fernandes" <joelagnelf@nvidia.com>,
	"Timur Tabi" <ttabi@nvidia.com>,
	"Alistair Popple" <apopple@nvidia.com>,
	"Eliot Courtney" <ecourtney@nvidia.com>,
	"Shashank Sharma" <shashanks@nvidia.com>,
	"Zhi Wang" <zhiw@nvidia.com>, "David Airlie" <airlied@gmail.com>,
	"Simona Vetter" <simona@ffwll.ch>,
	"Bjorn Helgaas" <bhelgaas@google.com>,
	"Miguel Ojeda" <ojeda@kernel.org>,
	"Alex Gaynor" <alex.gaynor@gmail.com>,
	"Boqun Feng" <boqun.feng@gmail.com>,
	"Gary Guo" <gary@garyguo.net>,
	"Björn Roy Baron" <bjorn3_gh@protonmail.com>,
	"Benno Lossin" <lossin@kernel.org>,
	"Andreas Hindborg" <a.hindborg@kernel.org>,
	"Alice Ryhl" <aliceryhl@google.com>,
	"Trevor Gross" <tmgross@umich.edu>,
	rust-for-linux@vger.kernel.org,
	LKML <linux-kernel@vger.kernel.org>,
	"John Hubbard" <jhubbard@nvidia.com>
Subject: [PATCH v6 33/34] gpu: nova-core: Hopper/Blackwell: new location for PCI config mirror
Date: Mon,  9 Mar 2026 19:11:23 -0700	[thread overview]
Message-ID: <20260310021125.117855-34-jhubbard@nvidia.com> (raw)
In-Reply-To: <20260310021125.117855-1-jhubbard@nvidia.com>

Hopper and Blackwell GPUs use a different PCI config space mirror
address than older architectures. 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 | 18 +++++++++++++++---
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/nova-core/gsp/boot.rs b/drivers/gpu/nova-core/gsp/boot.rs
index 7bf160723acf..7b49ca6e7a41 100644
--- a/drivers/gpu/nova-core/gsp/boot.rs
+++ b/drivers/gpu/nova-core/gsp/boot.rs
@@ -257,7 +257,7 @@ pub(crate) fn boot(
         dma_write!(wpr_meta[0] = GspFwWprMeta::new(&gsp_fw, &fb_layout))?;
 
         self.cmdq
-            .send_command(bar, commands::SetSystemInfo::new(pdev))?;
+            .send_command(bar, commands::SetSystemInfo::new(pdev, chipset))?;
         self.cmdq.send_command(bar, commands::SetRegistry::new())?;
 
         gsp_falcon.reset(bar)?;
diff --git a/drivers/gpu/nova-core/gsp/commands.rs b/drivers/gpu/nova-core/gsp/commands.rs
index 8f270eca33be..e6a9a1fc6296 100644
--- a/drivers/gpu/nova-core/gsp/commands.rs
+++ b/drivers/gpu/nova-core/gsp/commands.rs
@@ -20,6 +20,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 }
     }
 }
 
@@ -52,7 +54,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..c8d1e025b047 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,10 @@ 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,
+            pciConfigMirrorBase: match chipset.arch() {
+                Architecture::Turing | Architecture::Ampere | Architecture::Ada => 0x088000,
+                Architecture::Hopper | Architecture::Blackwell => 0x092000,
+            },
             pciConfigMirrorSize: 0x001000,
 
             PCIDeviceID: (u32::from(dev.device_id()) << 16) | u32::from(dev.vendor_id().as_raw()),
-- 
2.53.0


  parent reply	other threads:[~2026-03-10  2:12 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-10  2:10 [PATCH v6 00/34] gpu: nova-core: firmware: Hopper/Blackwell support John Hubbard
2026-03-10  2:10 ` [PATCH v6 01/34] gpu: nova-core: print FB sizes, along with ranges John Hubbard
2026-03-10 11:21   ` Alexandre Courbot
2026-03-10  2:10 ` [PATCH v6 02/34] gpu: nova-core: add FbRange.len() and use it in boot.rs John Hubbard
2026-03-10 11:21   ` Alexandre Courbot
2026-03-10  2:10 ` [PATCH v6 03/34] gpu: nova-core: Hopper/Blackwell: basic GPU identification John Hubbard
2026-03-10  8:06   ` Alexandre Courbot
2026-03-10 16:54     ` John Hubbard
2026-03-10  2:10 ` [PATCH v6 04/34] gpu: nova-core: factor .fwsignature* selection into a new find_gsp_sigs_section() John Hubbard
2026-03-10  2:10 ` [PATCH v6 05/34] gpu: nova-core: use GPU Architecture to simplify HAL selections John Hubbard
2026-03-10  2:10 ` [PATCH v6 06/34] gpu: nova-core: apply the one "use" item per line policy to commands.rs John Hubbard
2026-03-10 11:21   ` Alexandre Courbot
2026-03-10  2:10 ` [PATCH v6 07/34] gpu: nova-core: move GPU init and DMA mask setup into Gpu::new() John Hubbard
2026-03-10  8:23   ` Alexandre Courbot
2026-03-10  2:10 ` [PATCH v6 08/34] gpu: nova-core: set DMA mask width based on GPU architecture John Hubbard
2026-03-10  2:10 ` [PATCH v6 09/34] gpu: nova-core: Hopper/Blackwell: skip GFW boot waiting John Hubbard
2026-03-10 10:23   ` Alexandre Courbot
2026-03-10  2:11 ` [PATCH v6 10/34] gpu: nova-core: move firmware image parsing code to firmware.rs John Hubbard
2026-03-10 10:28   ` Alexandre Courbot
2026-03-10  2:11 ` [PATCH v6 11/34] gpu: nova-core: factor out an elf_str() function John Hubbard
2026-03-10  2:11 ` [PATCH v6 12/34] gpu: nova-core: don't assume 64-bit firmware images John Hubbard
2026-03-10 10:38   ` Alexandre Courbot
2026-03-10  2:11 ` [PATCH v6 13/34] gpu: nova-core: add support for 32-bit " John Hubbard
2026-03-10  2:11 ` [PATCH v6 14/34] gpu: nova-core: add auto-detection of 32-bit, 64-bit " John Hubbard
2026-03-10  2:11 ` [PATCH v6 15/34] gpu: nova-core: Hopper/Blackwell: add FMC firmware image, in support of FSP John Hubbard
2026-03-10  2:11 ` [PATCH v6 16/34] gpu: nova-core: Hopper/Blackwell: add FSP falcon engine stub John Hubbard
2026-03-10  2:11 ` [PATCH v6 17/34] gpu: nova-core: Hopper/Blackwell: add FSP falcon EMEM operations John Hubbard
2026-03-10  2:11 ` [PATCH v6 18/34] gpu: nova-core: Hopper/Blackwell: add FSP message infrastructure John Hubbard
2026-03-10 10:57   ` Alexandre Courbot
2026-03-11 17:53     ` Timur Tabi
2026-03-10  2:11 ` [PATCH v6 19/34] rust: ptr: add const_align_up() John Hubbard
2026-03-10  2:11 ` [PATCH v6 20/34] gpu: nova-core: Hopper/Blackwell: calculate reserved FB heap size John Hubbard
2026-03-10  2:11 ` [PATCH v6 21/34] gpu: nova-core: add MCTP/NVDM protocol types for firmware communication John Hubbard
2026-03-10 10:53   ` Alexandre Courbot
2026-03-10  2:11 ` [PATCH v6 22/34] gpu: nova-core: Hopper/Blackwell: add FSP secure boot completion waiting John Hubbard
2026-03-10  2:11 ` [PATCH v6 23/34] gpu: nova-core: Hopper/Blackwell: add FSP message structures John Hubbard
2026-03-10 11:01   ` Alexandre Courbot
2026-03-10  2:11 ` [PATCH v6 24/34] gpu: nova-core: Hopper/Blackwell: add FMC signature extraction John Hubbard
2026-03-10  2:11 ` [PATCH v6 25/34] gpu: nova-core: Hopper/Blackwell: add FSP send/receive messaging John Hubbard
2026-03-10  2:11 ` [PATCH v6 26/34] gpu: nova-core: Hopper/Blackwell: add FspCotVersion type John Hubbard
2026-03-10  2:11 ` [PATCH v6 27/34] gpu: nova-core: Hopper/Blackwell: larger non-WPR heap John Hubbard
2026-03-10  2:11 ` [PATCH v6 28/34] gpu: nova-core: Hopper/Blackwell: add FSP Chain of Trust boot John Hubbard
2026-03-17  8:20   ` Alexandre Courbot
2026-03-10  2:11 ` [PATCH v6 29/34] gpu: nova-core: Blackwell: use correct sysmem flush registers John Hubbard
2026-03-10  2:11 ` [PATCH v6 30/34] gpu: nova-core: Hopper/Blackwell: larger WPR2 (GSP) heap John Hubbard
2026-03-17  8:25   ` Alexandre Courbot
2026-03-10  2:11 ` [PATCH v6 31/34] gpu: nova-core: refactor SEC2 booter loading into BooterFirmware::run() John Hubbard
2026-03-10  2:11 ` [PATCH v6 32/34] gpu: nova-core: Hopper/Blackwell: add GSP lockdown release polling John Hubbard
2026-03-10  2:11 ` John Hubbard [this message]
2026-03-17  8:27   ` [PATCH v6 33/34] gpu: nova-core: Hopper/Blackwell: new location for PCI config mirror Alexandre Courbot
2026-03-17 22:17     ` John Hubbard
2026-03-10  2:11 ` [PATCH v6 34/34] gpu: nova-core: Hopper/Blackwell: integrate FSP boot path into boot() John Hubbard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260310021125.117855-34-jhubbard@nvidia.com \
    --to=jhubbard@nvidia.com \
    --cc=a.hindborg@kernel.org \
    --cc=acourbot@nvidia.com \
    --cc=airlied@gmail.com \
    --cc=alex.gaynor@gmail.com \
    --cc=aliceryhl@google.com \
    --cc=apopple@nvidia.com \
    --cc=bhelgaas@google.com \
    --cc=bjorn3_gh@protonmail.com \
    --cc=boqun.feng@gmail.com \
    --cc=dakr@kernel.org \
    --cc=ecourtney@nvidia.com \
    --cc=gary@garyguo.net \
    --cc=joelagnelf@nvidia.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lossin@kernel.org \
    --cc=ojeda@kernel.org \
    --cc=rust-for-linux@vger.kernel.org \
    --cc=shashanks@nvidia.com \
    --cc=simona@ffwll.ch \
    --cc=tmgross@umich.edu \
    --cc=ttabi@nvidia.com \
    --cc=zhiw@nvidia.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®