public inbox for rust-for-linux@vger.kernel.org
 help / color / mirror / Atom feed
From: John Hubbard <jhubbard@nvidia.com>
To: Danilo Krummrich <dakr@kernel.org>
Cc: "Alexandre Courbot" <acourbot@nvidia.com>,
	"Joel Fernandes" <joelagnelf@nvidia.com>,
	"Timur Tabi" <ttabi@nvidia.com>,
	"Alistair Popple" <apopple@nvidia.com>,
	"Eliot Courtney" <ecourtney@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>,
	nouveau@lists.freedesktop.org, rust-for-linux@vger.kernel.org,
	LKML <linux-kernel@vger.kernel.org>,
	"John Hubbard" <jhubbard@nvidia.com>
Subject: [PATCH v2 18/30] gpu: nova-core: Hopper/Blackwell: calculate reserved FB heap size
Date: Fri, 30 Jan 2026 16:55:52 -0800	[thread overview]
Message-ID: <20260131005604.454172-19-jhubbard@nvidia.com> (raw)
In-Reply-To: <20260131005604.454172-1-jhubbard@nvidia.com>

Various "reserved" areas of FB (frame buffer: vidmem) have to be
calculated, because the GSP booting process needs this information.

The calculations are const, so a new const-compatible alignment function
is also added to num.rs, in order to align the reserved areas.

Cc: Timur Tabi <ttabi@nvidia.com>
Cc: Gary Guo <gary@garyguo.net>
Signed-off-by: John Hubbard <jhubbard@nvidia.com>
---
 drivers/gpu/nova-core/fb.rs     | 18 ++++++++++++++++++
 drivers/gpu/nova-core/gsp/fw.rs |  6 +++++-
 drivers/gpu/nova-core/num.rs    | 10 ++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/nova-core/fb.rs b/drivers/gpu/nova-core/fb.rs
index e803e6e0cdb9..9b4407338724 100644
--- a/drivers/gpu/nova-core/fb.rs
+++ b/drivers/gpu/nova-core/fb.rs
@@ -170,6 +170,9 @@ pub(crate) struct FbLayout {
     pub(crate) wpr2: FbRange,
     pub(crate) heap: FbRange,
     pub(crate) vf_partition_count: u8,
+    /// Total reserved size (heap + PMU reserved), aligned to 2MB.
+    #[expect(unused)]
+    pub(crate) total_reserved_size: u32,
 }
 
 impl FbLayout {
@@ -257,6 +260,16 @@ pub(crate) fn new(chipset: Chipset, bar: &Bar0, gsp_fw: &GspFirmware) -> Result<
             FbRange(wpr2.start - HEAP_SIZE..wpr2.start)
         };
 
+        // Calculate reserved sizes. PMU reservation is a subset of the total reserved size.
+        let heap_size = (heap.end - heap.start) as u64;
+        let pmu_reserved_size = u64::from(PMU_RESERVED_SIZE);
+
+        let total_reserved_size = {
+            let total = heap_size + pmu_reserved_size;
+            const RSVD_ALIGN: Alignment = Alignment::new::<SZ_2M>();
+            total.align_up(RSVD_ALIGN).ok_or(EINVAL)?
+        };
+
         Ok(Self {
             fb,
             vga_workspace,
@@ -267,6 +280,11 @@ pub(crate) fn new(chipset: Chipset, bar: &Bar0, gsp_fw: &GspFirmware) -> Result<
             wpr2,
             heap,
             vf_partition_count: 0,
+            total_reserved_size: total_reserved_size as u32,
         })
     }
 }
+
+/// PMU reserved size, aligned to 128KB.
+pub(crate) const PMU_RESERVED_SIZE: u32 =
+    crate::num::const_align_up::<SZ_128K>(SZ_8M + SZ_16M + SZ_4K) as u32;
diff --git a/drivers/gpu/nova-core/gsp/fw.rs b/drivers/gpu/nova-core/gsp/fw.rs
index 83ff91614e36..086153edfa86 100644
--- a/drivers/gpu/nova-core/gsp/fw.rs
+++ b/drivers/gpu/nova-core/gsp/fw.rs
@@ -27,7 +27,10 @@
 };
 
 use crate::{
-    fb::FbLayout,
+    fb::{
+        FbLayout,
+        PMU_RESERVED_SIZE, //
+    },
     firmware::gsp::GspFirmware,
     gpu::Chipset,
     gsp::{
@@ -183,6 +186,7 @@ pub(crate) fn new(gsp_firmware: &GspFirmware, fb_layout: &FbLayout) -> Self {
             fbSize: fb_layout.fb.end - fb_layout.fb.start,
             vgaWorkspaceOffset: fb_layout.vga_workspace.start,
             vgaWorkspaceSize: fb_layout.vga_workspace.end - fb_layout.vga_workspace.start,
+            pmuReservedSize: PMU_RESERVED_SIZE,
             ..Default::default()
         })
     }
diff --git a/drivers/gpu/nova-core/num.rs b/drivers/gpu/nova-core/num.rs
index c952a834e662..f068722c5bdf 100644
--- a/drivers/gpu/nova-core/num.rs
+++ b/drivers/gpu/nova-core/num.rs
@@ -215,3 +215,13 @@ pub(crate) const fn [<$from _into_ $into>]<const N: $from>() -> $into {
 impl_const_into!(u64 => { u8, u16, u32 });
 impl_const_into!(u32 => { u8, u16 });
 impl_const_into!(u16 => { u8 });
+
+/// Aligns `value` up to `ALIGN` at compile time.
+///
+/// This is the const-compatible equivalent of [`kernel::ptr::Alignable::align_up`].
+/// `ALIGN` must be a power of two (enforced at compile time).
+#[inline(always)]
+pub(crate) const fn const_align_up<const ALIGN: usize>(value: usize) -> usize {
+    build_assert!(ALIGN.is_power_of_two());
+    (value + (ALIGN - 1)) & !(ALIGN - 1)
+}
-- 
2.52.0


  parent reply	other threads:[~2026-01-31  0:56 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-01-31  0:55 [PATCH v2 00/30] gpu: nova-core: firmware: Hopper/Blackwell support John Hubbard
2026-01-31  0:55 ` [PATCH v2 01/30] gpu: nova-core: print FB sizes, along with ranges John Hubbard
2026-02-02 14:47   ` Gary Guo
2026-01-31  0:55 ` [PATCH v2 02/30] gpu: nova-core: add FbRange.len() and use it in boot.rs John Hubbard
2026-01-31  0:55 ` [PATCH v2 03/30] gpu: nova-core: Hopper/Blackwell: basic GPU identification John Hubbard
2026-01-31  0:55 ` [PATCH v2 04/30] gpu: nova-core: factor .fwsignature* selection into a new get_gsp_sigs_section() John Hubbard
2026-01-31  0:55 ` [PATCH v2 05/30] gpu: nova-core: use GPU Architecture to simplify HAL selections John Hubbard
2026-01-31  0:55 ` [PATCH v2 06/30] gpu: nova-core: apply the one "use" item per line policy to commands.rs John Hubbard
2026-01-31  0:55 ` [PATCH v2 07/30] gpu: nova-core: set DMA mask width based on GPU architecture John Hubbard
2026-01-31  0:55 ` [PATCH v2 08/30] gpu: nova-core: Hopper/Blackwell: skip GFW boot waiting John Hubbard
2026-02-02 14:49   ` Gary Guo
2026-02-02 14:52     ` Danilo Krummrich
2026-02-02 21:37       ` John Hubbard
2026-01-31  0:55 ` [PATCH v2 09/30] gpu: nova-core: move firmware image parsing code to firmware.rs John Hubbard
2026-01-31  0:55 ` [PATCH v2 10/30] gpu: nova-core: factor out a section_name_eq() function John Hubbard
2026-01-31  0:55 ` [PATCH v2 11/30] gpu: nova-core: don't assume 64-bit firmware images John Hubbard
2026-01-31  0:55 ` [PATCH v2 12/30] gpu: nova-core: add support for 32-bit " John Hubbard
2026-01-31  0:55 ` [PATCH v2 13/30] gpu: nova-core: add auto-detection of 32-bit, 64-bit " John Hubbard
2026-01-31  0:55 ` [PATCH v2 14/30] gpu: nova-core: Hopper/Blackwell: add FMC firmware image, in support of FSP John Hubbard
2026-01-31  0:55 ` [PATCH v2 15/30] gpu: nova-core: Hopper/Blackwell: add FSP falcon engine stub John Hubbard
2026-01-31  0:55 ` [PATCH v2 16/30] gpu: nova-core: Hopper/Blackwell: add FSP falcon EMEM operations John Hubbard
2026-01-31  0:55 ` [PATCH v2 17/30] gpu: nova-core: Hopper/Blackwell: add FSP message infrastructure John Hubbard
2026-01-31  0:55 ` John Hubbard [this message]
2026-01-31  0:55 ` [PATCH v2 19/30] gpu: nova-core: Hopper/Blackwell: add FSP secure boot completion waiting John Hubbard
2026-01-31  0:55 ` [PATCH v2 20/30] gpu: nova-core: Hopper/Blackwell: add FSP message structures John Hubbard
2026-01-31  0:55 ` [PATCH v2 21/30] gpu: nova-core: Hopper/Blackwell: add FMC signature extraction John Hubbard
2026-01-31  0:55 ` [PATCH v2 22/30] gpu: nova-core: Hopper/Blackwell: add FSP send/receive messaging John Hubbard
2026-01-31  0:55 ` [PATCH v2 23/30] gpu: nova-core: Hopper/Blackwell: add FSP Chain of Trust boot John Hubbard
2026-01-31  0:55 ` [PATCH v2 24/30] gpu: nova-core: Hopper/Blackwell: larger non-WPR heap John Hubbard
2026-01-31  0:55 ` [PATCH v2 25/30] gpu: nova-core: Hopper/Blackwell: larger WPR2 (GSP) heap John Hubbard
2026-01-31  0:56 ` [PATCH v2 26/30] gpu: nova-core: refactor SEC2 booter loading into run_booter() helper John Hubbard
2026-01-31  0:56 ` [PATCH v2 27/30] gpu: nova-core: Hopper/Blackwell: add GSP lockdown release polling John Hubbard
2026-01-31  0:56 ` [PATCH v2 28/30] gpu: nova-core: Hopper/Blackwell: add FSP Chain of Trust boot path John Hubbard
2026-01-31  0:56 ` [PATCH v2 29/30] gpu: nova-core: Hopper/Blackwell: new location for PCI config mirror John Hubbard
2026-01-31  0:56 ` [PATCH v2 30/30] gpu: nova-core: clarify the GPU firmware boot steps 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=20260131005604.454172-19-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=nouveau@lists.freedesktop.org \
    --cc=ojeda@kernel.org \
    --cc=rust-for-linux@vger.kernel.org \
    --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