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 08/34] gpu: nova-core: set DMA mask width based on GPU architecture
Date: Mon,  9 Mar 2026 19:10:58 -0700	[thread overview]
Message-ID: <20260310021125.117855-9-jhubbard@nvidia.com> (raw)
In-Reply-To: <20260310021125.117855-1-jhubbard@nvidia.com>

Replace the hardcoded 47-bit DMA mask with per-architecture values.
Hopper and Blackwell support 52-bit DMA addresses, while Turing,
Ampere, and Ada use 47-bit.

Add Architecture::dma_mask() as a const method with an exhaustive
match, so that new architectures will get a compile-time reminder
to specify their DMA mask width.

Cc: Danilo Krummrich <dakr@kernel.org>
Cc: Gary Guo <gary@garyguo.net>
Signed-off-by: John Hubbard <jhubbard@nvidia.com>
---
 drivers/gpu/nova-core/gpu.rs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/nova-core/gpu.rs b/drivers/gpu/nova-core/gpu.rs
index a7f1957880ff..efd1765b4f86 100644
--- a/drivers/gpu/nova-core/gpu.rs
+++ b/drivers/gpu/nova-core/gpu.rs
@@ -166,9 +166,18 @@ pub(crate) enum Architecture {
     Blackwell = 0x1b,
 }
 
-// TODO: Set the DMA mask per-architecture. Hopper and Blackwell support 52-bit
-// DMA addresses. For now, use 47-bit which is correct for Turing, Ampere, and Ada.
-const GPU_DMA_BITS: u32 = 47;
+impl Architecture {
+    /// Returns the DMA mask supported by this architecture.
+    ///
+    /// Hopper and Blackwell support 52-bit DMA addresses, while earlier architectures
+    /// (Turing, Ampere, Ada) support 47-bit DMA addresses.
+    pub(crate) const fn dma_mask(&self) -> DmaMask {
+        match self {
+            Self::Turing | Self::Ampere | Self::Ada => DmaMask::new::<47>(),
+            Self::Hopper | Self::Blackwell => DmaMask::new::<52>(),
+        }
+    }
+}
 
 impl TryFrom<u8> for Architecture {
     type Error = Error;
@@ -308,7 +317,7 @@ pub(crate) fn new<'a>(
             // SAFETY: No concurrent DMA allocations or mappings can be made because
             // the device is still being probed and therefore isn't being used by
             // other threads of execution.
-            unsafe { pdev.dma_set_mask_and_coherent(DmaMask::new::<GPU_DMA_BITS>())? };
+            unsafe { pdev.dma_set_mask_and_coherent(spec.chipset().arch().dma_mask())? };
 
             let chipset = spec.chipset();
 
-- 
2.53.0


  parent reply	other threads:[~2026-03-10  2:11 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 ` John Hubbard [this message]
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 ` [PATCH v6 33/34] gpu: nova-core: Hopper/Blackwell: new location for PCI config mirror John Hubbard
2026-03-17  8:27   ` 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-9-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®