gpu: nova-core: firmware: Hopper/Blackwell support
Subsystems (4)
v6 cover gpu: nova-core: firmware: Hopper/Blackwell support
Hi,
This is based on today's drm-rust-next. A git branch is here:
https://github.com/johnhubbard/linux/tree/nova-core-blackwell-v6
It's been tested on Turing (new!), Ampere and Blackwell:
NovaCore 0000:e1:00.0: GPU name: NVIDIA GeForce GTX 1650
NovaCore 0000:e1:00.0: GPU name: NVIDIA RTX A4000
NovaCore 0000:01:00.0: GPU name: NVIDIA RTX PRO 6000 Blackwell Max-Q
Workstation EditionChanges in v6:
* Rebased onto drm-rust-next (v7.0-rc1 based).
* Dropped the first two patches from v5 (aux device fix and pdev macros), which have since been merged independently.
* const_align_up(): reworked per review from Gary Guo, Miguel Ojeda, and Danilo Krummrich: now returns Option<usize> instead of panicking, takes an Alignment argument instead of a const generic, and no longer needs the inline_const feature addition in scripts/Makefile.build.
* The rust/sizes and SZ_*_U64 patches from v5 are no longer included. I plan to post those as a separate series that depends on this one.
Changes in v5:
* Rebased onto linux.git master.
* Split MCTP protocol into its own module and file.
* Many Rust-based improvements: more use of types, especially. Also used Result and Option more.
* Lots of cleanup of comments and print output and error handling.
* Added const_align_up() to rust/ and used it in nova-core. This required enabling a Rust feature: inline_const, as recommended by Miguel Ojeda.
* Refactoring various things, such as Gpu::new() to own Spec creation, and several more such things.
* Fixed three Delta::ZERO busy-polls (patches 21, 24, 31) to use non-zero sleep intervals (after just realizing that it was a bad choice to have zero in there).
* Reduced GH100/GB100 HAL duplication. Made FSP_PKEY_SIZE/FSP_SIG_SIZE consistent across patches. Replaced fragile architecture checks with chipset.arch(). Renamed LIBOS_BLACKWELL.
* Narrowed the scope of some of the #![expect(dead_code)] cases, although that really only matters within the series, not once it is fully applied.
John Hubbard (34):
gpu: nova-core: print FB sizes, along with ranges
gpu: nova-core: add FbRange.len() and use it in boot.rs
gpu: nova-core: Hopper/Blackwell: basic GPU identification
gpu: nova-core: factor .fwsignature* selection into a new
find_gsp_sigs_section()
gpu: nova-core: use GPU Architecture to simplify HAL selections
gpu: nova-core: apply the one "use" item per line policy to
commands.rs
gpu: nova-core: move GPU init and DMA mask setup into Gpu::new()
gpu: nova-core: set DMA mask width based on GPU architecture
gpu: nova-core: Hopper/Blackwell: skip GFW boot waiting
gpu: nova-core: move firmware image parsing code to firmware.rs
gpu: nova-core: factor out an elf_str() function
gpu: nova-core: don't assume 64-bit firmware images
gpu: nova-core: add support for 32-bit firmware images
gpu: nova-core: add auto-detection of 32-bit, 64-bit firmware images
gpu: nova-core: Hopper/Blackwell: add FMC firmware image, in support
of FSP
gpu: nova-core: Hopper/Blackwell: add FSP falcon engine stub
gpu: nova-core: Hopper/Blackwell: add FSP falcon EMEM operations
gpu: nova-core: Hopper/Blackwell: add FSP message infrastructure
rust: ptr: add const_align_up()
gpu: nova-core: Hopper/Blackwell: calculate reserved FB heap size
gpu: nova-core: add MCTP/NVDM protocol types for firmware
communication
gpu: nova-core: Hopper/Blackwell: add FSP secure boot completion
waiting
gpu: nova-core: Hopper/Blackwell: add FSP message structures
gpu: nova-core: Hopper/Blackwell: add FMC signature extraction
gpu: nova-core: Hopper/Blackwell: add FSP send/receive messaging
gpu: nova-core: Hopper/Blackwell: add FspCotVersion type
gpu: nova-core: Hopper/Blackwell: larger non-WPR heap
gpu: nova-core: Hopper/Blackwell: add FSP Chain of Trust boot
gpu: nova-core: Blackwell: use correct sysmem flush registers
gpu: nova-core: Hopper/Blackwell: larger WPR2 (GSP) heap
gpu: nova-core: refactor SEC2 booter loading into
BooterFirmware::run()
gpu: nova-core: Hopper/Blackwell: add GSP lockdown release polling
gpu: nova-core: Hopper/Blackwell: new location for PCI config mirror
gpu: nova-core: Hopper/Blackwell: integrate FSP boot path into boot()
drivers/gpu/nova-core/driver.rs | 15 - drivers/gpu/nova-core/falcon.rs | 1 + drivers/gpu/nova-core/falcon/fsp.rs | 222 ++++++++++ drivers/gpu/nova-core/falcon/hal.rs | 20 +- drivers/gpu/nova-core/fb.rs | 113 ++++- drivers/gpu/nova-core/fb/hal.rs | 38 +- drivers/gpu/nova-core/fb/hal/ga102.rs | 2 +- drivers/gpu/nova-core/fb/hal/gb100.rs | 75 ++++ drivers/gpu/nova-core/fb/hal/gb202.rs | 62 +++ drivers/gpu/nova-core/fb/hal/gh100.rs | 38 ++ drivers/gpu/nova-core/firmware.rs | 186 ++++++++ drivers/gpu/nova-core/firmware/booter.rs | 35 +- drivers/gpu/nova-core/firmware/fsp.rs | 46 ++ drivers/gpu/nova-core/firmware/gsp.rs | 140 ++---- drivers/gpu/nova-core/fsp.rs | 525 +++++++++++++++++++++++ drivers/gpu/nova-core/gpu.rs | 117 ++++- drivers/gpu/nova-core/gsp/boot.rs | 300 ++++++++++--- drivers/gpu/nova-core/gsp/commands.rs | 8 +- drivers/gpu/nova-core/gsp/fw.rs | 80 +++- drivers/gpu/nova-core/gsp/fw/commands.rs | 32 +- drivers/gpu/nova-core/mctp.rs | 105 +++++ drivers/gpu/nova-core/nova_core.rs | 2 + drivers/gpu/nova-core/regs.rs | 97 +++++ rust/kernel/ptr.rs | 24 ++ 24 files changed, 2016 insertions(+), 267 deletions(-) create mode 100644 drivers/gpu/nova-core/falcon/fsp.rs create mode 100644 drivers/gpu/nova-core/fb/hal/gb100.rs create mode 100644 drivers/gpu/nova-core/fb/hal/gb202.rs create mode 100644 drivers/gpu/nova-core/fb/hal/gh100.rs create mode 100644 drivers/gpu/nova-core/firmware/fsp.rs create mode 100644 drivers/gpu/nova-core/fsp.rs create mode 100644 drivers/gpu/nova-core/mctp.rs
base-commit: dd8a93dafe6ef50b49d2a7b44862264d74a7aafa
prerequisite-patch-id: 1ec0faa352dab8fa7c0f209474b75cd21931340d
Signature · 1 line
2.53.0
PATCH v6 1/34 gpu: nova-core: print FB sizes, along with ranges
For convenience of the reader: now you can directly see the sizes of each range. It is surprising just how much this helps.
Sample output (using an Ampere GA104):
NovaCore 0000:e1:00.0: FbLayout {
fb: 0x0..0x3ff800000 (16376 MiB),
vga_workspace: 0x3ff700000..0x3ff800000 (1 MiB),
frts: 0x3ff600000..0x3ff700000 (1 MiB),
boot: 0x3ff5fa000..0x3ff600000 (24 KiB),
elf: 0x3fb960000..0x3ff5f9000 (60 MiB),
wpr2_heap: 0x3f3900000..0x3fb900000 (128 MiB),
wpr2: 0x3f3800000..0x3ff700000 (191 MiB),
heap: 0x3f3700000..0x3f3800000 (1 MiB),
vf_partition_count: 0x0,
}--- drivers/gpu/nova-core/fb.rs | 83 +++++++++++++++++++++++++++++-------- 1 file changed, 66 insertions(+), 17 deletions(-)
drivers/gpu/nova-core/fb.rs +66 -17
@@ -1,9 +1,13 @@// SPDX-License-Identifier: GPL-2.0 -use core::ops::Range ; +use core::ops::{ +Deref , +Range ,// +};use kernel::{ device, + fmt, prelude::*, ptr::{Alignable ,
@@ -94,26 +98,71 @@ pub(crate) fn unregister(&self, bar: &Bar0) { } } +pub (crate )struct FbRange (Range <u64 >); + +impl From <Range <u64 >>for FbRange { +fn from (range:Range <u64 >) ->Self { +Self (range) + } +} + +impl Deref for FbRange { +type Target =Range <u64 >; + +fn deref (&self) -> &Self ::Target { + &self.0 + } +} + +impl fmt::Debug for FbRange { +fn fmt (&self, f: &mut fmt::Formatter <'_>) -> fmt::Result { +// Use alternate format ({:#?}) to include size, compact format ({:?}) for just the range. +if f.alternate () { +let size = self.0 .end - self.0 .start; + +if size <usize_as_u64 (SZ_1M ) { +let size_kib = size /usize_as_u64 (SZ_1K ); + f.write_fmt (fmt! ( +"{:#x}..{:#x} ({} KiB)" , + self.0 .start, + self.0 .end, + size_kib + )) + }else { +let size_mib = size /usize_as_u64 (SZ_1M ); + f.write_fmt (fmt! ( +"{:#x}..{:#x} ({} MiB)" , + self.0 .start, + self.0 .end, + size_mib + )) + } + }else { + f.write_fmt (fmt! ("{:#x}..{:#x}" , self.0 .start, self.0 .end)) + } + } +} +/// Layout of the GPU framebuffer memory. /// /// Contains ranges of GPU memory reserved for a given purpose during the GSP boot process. #[derive( Debug )] pub (crate )struct FbLayout {/// Range of the framebuffer. Starts at `0`. -pub (crate ) fb:Range <u64 >, +pub (crate ) fb:FbRange ,/// VGA workspace, small area of reserved memory at the end of the framebuffer. -pub (crate ) vga_workspace:Range <u64 >, +pub (crate ) vga_workspace:FbRange ,/// FRTS range. -pub (crate ) frts:Range <u64 >, +pub (crate ) frts:FbRange ,/// Memory area containing the GSP bootloader image. -pub (crate ) boot:Range <u64 >, +pub (crate ) boot:FbRange ,/// Memory area containing the GSP firmware image. -pub (crate ) elf:Range <u64 >, +pub (crate ) elf:FbRange ,/// WPR2 heap. -pub (crate ) wpr2_heap:Range <u64 >, +pub (crate ) wpr2_heap:FbRange ,/// WPR2 region range, starting with an instance of `GspFwWprMeta`. -pub (crate ) wpr2:Range <u64 >, -pub (crate ) heap:Range <u64 >, +pub (crate ) wpr2:FbRange , +pub (crate ) heap:FbRange ,pub (crate ) vf_partition_count:u8 , }
@@ -125,7 +174,7 @@ pub(crate) fn new(chipset: Chipset, bar: &Bar0, gsp_fw: &GspFirmware) -> Result<let fb = {let fb_size = hal.vidmem_size (bar); -0 ..fb_size +FbRange (0 ..fb_size) };let vga_workspace = {
@@ -152,7 +201,7 @@ pub(crate) fn new(chipset: Chipset, bar: &Bar0, gsp_fw: &GspFirmware) -> Result< } }; - vga_base..fb.end +FbRange (vga_base..fb.end) };let frts = {
@@ -160,7 +209,7 @@ pub(crate) fn new(chipset: Chipset, bar: &Bar0, gsp_fw: &GspFirmware) -> Result<const FRTS_SIZE :u64 =usize_as_u64 (SZ_1M );let frts_base = vga_workspace.start.align_down (FRTS_DOWN_ALIGN ) -FRTS_SIZE ; - frts_base..frts_base +FRTS_SIZE +FbRange (frts_base..frts_base +FRTS_SIZE ) };let boot = {
@@ -168,7 +217,7 @@ pub(crate) fn new(chipset: Chipset, bar: &Bar0, gsp_fw: &GspFirmware) -> Result<let bootloader_size = u64::from_safe_cast (gsp_fw.bootloader.ucode.size ());let bootloader_base = (frts.start - bootloader_size).align_down (BOOTLOADER_DOWN_ALIGN ); - bootloader_base..bootloader_base + bootloader_size +FbRange (bootloader_base..bootloader_base + bootloader_size) };let elf = {
@@ -176,7 +225,7 @@ pub(crate) fn new(chipset: Chipset, bar: &Bar0, gsp_fw: &GspFirmware) -> Result<let elf_size = u64::from_safe_cast (gsp_fw.size);let elf_addr = (boot.start - elf_size).align_down (ELF_DOWN_ALIGN ); - elf_addr..elf_addr + elf_size +FbRange (elf_addr..elf_addr + elf_size) };let wpr2_heap = {
@@ -185,7 +234,7 @@ pub(crate) fn new(chipset: Chipset, bar: &Bar0, gsp_fw: &GspFirmware) -> Result< gsp::LibosParams ::from_chipset (chipset).wpr_heap_size (chipset, fb.end);let wpr2_heap_addr = (elf.start - wpr2_heap_size).align_down (WPR2_HEAP_DOWN_ALIGN ); - wpr2_heap_addr..(elf.start).align_down (WPR2_HEAP_DOWN_ALIGN ) +FbRange (wpr2_heap_addr..(elf.start).align_down (WPR2_HEAP_DOWN_ALIGN )) };let wpr2 = {
@@ -193,13 +242,13 @@ pub(crate) fn new(chipset: Chipset, bar: &Bar0, gsp_fw: &GspFirmware) -> Result<let wpr2_addr = (wpr2_heap.start - u64::from_safe_cast (size_of ::<gsp::GspFwWprMeta >())) .align_down (WPR2_DOWN_ALIGN ); - wpr2_addr..frts.end +FbRange (wpr2_addr..frts.end) };let heap = {const HEAP_SIZE :u64 =usize_as_u64 (SZ_1M ); - wpr2.start -HEAP_SIZE ..wpr2.start +FbRange (wpr2.start -HEAP_SIZE ..wpr2.start) };Ok (Self {
Signature · 1 line
2.53.0
Alexandre Courbot
maintainerRe: [PATCH v6 01/34] gpu: nova-core: print FB sizes, along with ranges
Quoted 17 lines · John Hubbard
For convenience of the reader: now you can directly see the sizes of each range. It is surprising just how much this helps.
Sample output (using an Ampere GA104):
NovaCore 0000:e1:00.0: FbLayout { fb: 0x0..0x3ff800000 (16376 MiB), vga_workspace: 0x3ff700000..0x3ff800000 (1 MiB), frts: 0x3ff600000..0x3ff700000 (1 MiB), boot: 0x3ff5fa000..0x3ff600000 (24 KiB), elf: 0x3fb960000..0x3ff5f9000 (60 MiB), wpr2_heap: 0x3f3900000..0x3fb900000 (128 MiB), wpr2: 0x3f3800000..0x3ff700000 (191 MiB), heap: 0x3f3700000..0x3f3800000 (1 MiB), vf_partition_count: 0x0, }
Quoted 3 lines
Cc Timur Tabi <[email protected]>Reviewed-by Gary Guo <[email protected]>Signed-off-by John Hubbard <[email protected]>
This one has been around for a while. Applied to drm-rust-next.
PATCH v6 2/34 gpu: nova-core: add FbRange.len() and use it in boot.rs
In reply to John HubbardA tiny simplification: now that FbLayout uses its own specific FbRange type, add an FbRange.len() method, and use that to (very slightly) simplify the calculation of Frts::frts_size initialization.
--- drivers/gpu/nova-core/fb.rs | 8 +++++++- drivers/gpu/nova-core/gsp/boot.rs | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/nova-core/fb.rs +7 -1
@@ -100,6 +100,12 @@ pub(crate) fn unregister(&self, bar: &Bar0) {pub (crate )struct FbRange (Range <u64 >); +impl FbRange { +pub (crate )fn len (&self) ->u64 { + self.0 .end - self.0 .start + } +} +impl From <Range <u64 >>for FbRange {fn from (range:Range <u64 >) ->Self {Self (range)
@@ -118,7 +124,7 @@ impl fmt::Debug for FbRange {fn fmt (&self, f: &mut fmt::Formatter <'_>) -> fmt::Result {// Use alternate format ({:#?}) to include size, compact format ({:?}) for just the range. if f.alternate () { -let size = self.0 .end - self.0 .start; +let size = self.len ();if size <usize_as_u64 (SZ_1M ) {let size_kib = size /usize_as_u64 (SZ_1K );
drivers/gpu/nova-core/gsp/boot.rs +1 -1
@@ -73,7 +73,7 @@ fn run_fwsec_frts( bios,FwsecCommand ::Frts { frts_addr: fb_layout.frts.start, - frts_size: fb_layout.frts.end - fb_layout.frts.start, + frts_size: fb_layout.frts.len (), }, )?;
Signature · 1 line
2.53.0
Re: [PATCH v6 02/34] gpu: nova-core: add FbRange.len() and use it in boot.rs
Quoted 7 lines · John Hubbard
A tiny simplification: now that FbLayout uses its own specific FbRange type, add an
FbRange.len()method, and use that to (very slightly) simplify the calculation ofFrts::frts_sizeinitialization.Suggested-by Alexandre Courbot <[email protected]>Reviewed-by Gary Guo <[email protected]>Signed-off-by John Hubbard <[email protected]>
Applied to drm-rust-next, thanks!
PATCH v6 3/34 gpu: nova-core: Hopper/Blackwell: basic GPU identification
In reply to John HubbardHopper (GH100) and Blackwell identification, including ELF .fwsignature_* items.
--- drivers/gpu/nova-core/falcon/hal.rs | 3 ++- drivers/gpu/nova-core/fb/hal.rs | 5 ++--- drivers/gpu/nova-core/firmware/gsp.rs | 17 +++++++++++++++++ drivers/gpu/nova-core/gpu.rs | 22 ++++++++++++++++++++++ 4 files changed, 43 insertions(+), 4 deletions(-)
drivers/gpu/nova-core/falcon/hal.rs +2 -1
@@ -80,7 +80,8 @@ pub(super) fn falcon_hal<E: FalconEngine + 'static>( TU102 | TU104 | TU106 | TU116 | TU117 => {KBox ::new (tu102::Tu102 ::<E >::new (),GFP_KERNEL )?as KBox <dyn FalconHal <E >> } - GA102 | GA103 | GA104 | GA106 | GA107 | AD102 | AD103 | AD104 | AD106 | AD107 => { + GA102 | GA103 | GA104 | GA106 | GA107 | AD102 | AD103 | AD104 | AD106 | AD107 | GH100 + | GB100 | GB102 | GB202 | GB203 | GB205 | GB206 | GB207 => {KBox ::new (ga102::Ga102 ::<E >::new (),GFP_KERNEL )?as KBox <dyn FalconHal <E >> } _ => return Err(ENOTSUPP),
drivers/gpu/nova-core/fb/hal.rs +2 -3
@@ -34,8 +34,7 @@ pub(super) fn fb_hal(chipset: Chipset) -> &'static dyn FbHal {match chipset {TU102 |TU104 |TU106 |TU117 |TU116 => tu102::TU102_HAL ,GA100 => ga100::GA100_HAL , -GA102 |GA103 |GA104 |GA106 |GA107 |AD102 |AD103 |AD104 |AD106 |AD107 => { - ga102::GA102_HAL - } +GA102 |GA103 |GA104 |GA106 |GA107 |AD102 |AD103 |AD104 |AD106 |AD107 |GH100 + |GB100 |GB102 |GB202 |GB203 |GB205 |GB206 |GB207 => ga102::GA102_HAL , } }
drivers/gpu/nova-core/firmware/gsp.rs +17 -0
@@ -222,6 +222,23 @@ pub(crate) fn new<'a>( Architecture::Ampere if chipset == Chipset::GA100 => ".fwsignature_tu10x", Architecture::Ampere => ".fwsignature_ga10x", Architecture::Ada => ".fwsignature_ad10x", + Architecture::Hopper => ".fwsignature_gh10x", + Architecture::Blackwell => { + // Distinguish between GB10x and GB20x series + match chipset { + // GB10x series: GB100, GB102 + Chipset::GB100 | Chipset::GB102 => ".fwsignature_gb10x", + // GB20x series: GB202, GB203, GB205, GB206, GB207 + Chipset::GB202 + | Chipset::GB203 + | Chipset::GB205 + | Chipset::GB206 + | Chipset::GB207 => ".fwsignature_gb20x", + // It's not possible to get here with a non-Blackwell chipset, but + // Rust doesn't know that. + _ => return Err(ENOTSUPP), + } + } }; elf::elf64_section(firmware.data(), sigs_section)
drivers/gpu/nova-core/gpu.rs +22 -0
@@ -83,12 +83,22 @@ fn try_from(value: u32) -> Result<Self, Self::Error> { GA104 = 0x174, GA106 = 0x176, GA107 = 0x177, +// Hopper + GH100 = 0x180,// Ada AD102 = 0x192, AD103 = 0x193, AD104 = 0x194, AD106 = 0x196, AD107 = 0x197, +// Blackwell + GB100 = 0x1a0, + GB102 = 0x1a2, + GB202 = 0x1b2, + GB203 = 0x1b3, + GB205 = 0x1b5, + GB206 = 0x1b6, + GB207 = 0x1b7, });impl Chipset {
@@ -100,9 +110,17 @@ pub(crate) const fn arch(self) -> Architecture { Self::GA100 | Self::GA102 | Self::GA103 | Self::GA104 | Self::GA106 | Self::GA107 => { Architecture::Ampere } + Self::GH100 => Architecture::Hopper, Self::AD102 | Self::AD103 | Self::AD104 | Self::AD106 | Self::AD107 => { Architecture::Ada } +Self ::GB100 + |Self ::GB102 + |Self ::GB202 + |Self ::GB203 + |Self ::GB205 + |Self ::GB206 + | Self::GB207 => Architecture::Blackwell, } }
@@ -139,7 +157,9 @@ pub(crate) enum Architecture {#[default] Turing = 0x16, Ampere = 0x17, + Hopper = 0x18, Ada = 0x19, + Blackwell = 0x1b, }impl TryFrom <u8 >for Architecture {
@@ -149,7 +169,9 @@ fn try_from(value: u8) -> Result<Self> {match value {0x16 =>Ok (Self ::Turing ),0x17 =>Ok (Self ::Ampere ), +0x18 =>Ok (Self ::Hopper ),0x19 =>Ok (Self ::Ada ), +0x1b =>Ok (Self ::Blackwell ), _ =>Err (ENODEV ), } }
Signature · 1 line
2.53.0
Alexandre Courbot
maintainerRe: [PATCH v6 03/34] gpu: nova-core: Hopper/Blackwell: basic GPU identification
Quoted 55 lines · John Hubbard
Hopper (GH100) and Blackwell identification, including ELF .fwsignature_* items.
Signed-off-by John Hubbard <[email protected]>--- drivers/gpu/nova-core/falcon/hal.rs | 3 ++- drivers/gpu/nova-core/fb/hal.rs | 5 ++--- drivers/gpu/nova-core/firmware/gsp.rs | 17 +++++++++++++++++ drivers/gpu/nova-core/gpu.rs | 22 ++++++++++++++++++++++ 4 files changed, 43 insertions(+), 4 deletions(-)drivers/gpu/nova-core/falcon/hal.rs +2
-1@@ -80,7 +80,8 @@ pub(super) fn falcon_hal<E: FalconEngine + 'static>( TU102 | TU104 | TU106 | TU116 | TU117 => {KBox ::new (tu102::Tu102 ::<E >::new (),GFP_KERNEL )?as KBox <dyn FalconHal <E >> } - GA102 | GA103 | GA104 | GA106 | GA107 | AD102 | AD103 | AD104 | AD106 | AD107 => { + GA102 | GA103 | GA104 | GA106 | GA107 | AD102 | AD103 | AD104 | AD106 | AD107 | GH100 + | GB100 | GB102 | GB202 | GB203 | GB205 | GB206 | GB207 => {KBox ::new (ga102::Ga102 ::<E >::new (),GFP_KERNEL )?as KBox <dyn FalconHal <E >> } _ => return Err(ENOTSUPP),drivers/gpu/nova-core/fb/hal.rs +2
-3@@ -34,8 +34,7 @@ pub(super) fn fb_hal(chipset: Chipset) -> &'static dyn FbHal {match chipset {TU102 |TU104 |TU106 |TU117 |TU116 => tu102::TU102_HAL ,GA100 => ga100::GA100_HAL , -GA102 |GA103 |GA104 |GA106 |GA107 |AD102 |AD103 |AD104 |AD106 |AD107 => { - ga102::GA102_HAL - } +GA102 |GA103 |GA104 |GA106 |GA107 |AD102 |AD103 |AD104 |AD106 |AD107 |GH100 + |GB100 |GB102 |GB202 |GB203 |GB205 |GB206 |GB207 => ga102::GA102_HAL , } }drivers/gpu/nova-core/firmware/gsp.rs +7
-0@@ -222,6 +222,23 @@ pub(crate) fn new<'a>( Architecture::Ampere if chipset == Chipset::GA100 => ".fwsignature_tu10x", Architecture::Ampere => ".fwsignature_ga10x", Architecture::Ada => ".fwsignature_ad10x", + Architecture::Hopper => ".fwsignature_gh10x", + Architecture::Blackwell => { + // Distinguish between GB10x and GB20x series + match chipset { + // GB10x series: GB100, GB102 + Chipset::GB100 | Chipset::GB102 => ".fwsignature_gb10x", + // GB20x series: GB202, GB203, GB205, GB206, GB207
drivers/gpu/nova-core/firmware/gsp.rs pub(crate) fn new<'a>( · line 241
Quoted 10 lines
drivers/gpu/nova-core/firmware/gsp.rs +10
-0+ Chipset::GB202 + | Chipset::GB203 + | Chipset::GB205 + | Chipset::GB206 + | Chipset::GB207 => ".fwsignature_gb20x", + // It's not possible to get here with a non-Blackwell chipset, but + // Rust doesn't know that. + _ => return Err(ENOTSUPP), + } + }
Can we use the same trick as Turing above to avoid the double-match and unused catch-all statement? That would look something like:
Architecture::Blackwell if matches!(chipset, Chipset::GB100 | Chipset::GB102) => {
Some(".fwsignature_gb10x")
}
Architecture::Blackwell => Some(".fwsignature_gb20x"),Note that this is not perfect either, but it is at least more succint.
Re: [PATCH v6 03/34] gpu: nova-core: Hopper/Blackwell: basic GPU identification
Quoted 1 line · Alexandre Courbot
On Tue Mar 10, 2026 at 11:10 AM JST, John Hubbard wrote:
...>> + Architecture::Blackwell => {
Quoted 19 lines
Quoted 5 lines
drivers/gpu/nova-core/firmware/gsp.rs +5
-0+// Distinguish between GB10x and GB20x series +match chipset { +// GB10x series: GB100, GB102 +Chipset ::GB100 |Chipset ::GB102 =>".fwsignature_gb10x" , +// GB20x series: GB202, GB203, GB205, GB206, GB207 drivers/gpu/nova-core/firmware/gsp.rs pub(crate) fn new<'a>( · line 241
Quoted 10 lines
drivers/gpu/nova-core/firmware/gsp.rs +10
-0+ Chipset::GB202 + | Chipset::GB203 + | Chipset::GB205 + | Chipset::GB206 + | Chipset::GB207 => ".fwsignature_gb20x", + // It's not possible to get here with a non-Blackwell chipset, but + // Rust doesn't know that. + _ => return Err(ENOTSUPP), + } + }Can we use the same trick as Turing above to avoid the double-match and unused catch-all statement? That would look something like:
Quoted 6 lines
Architecture::Blackwell if matches!(chipset, Chipset::GB100 | Chipset::GB102) => { Some(".fwsignature_gb10x") } Architecture::Blackwell => Some(".fwsignature_gb20x"),Note that this is not perfect either, but it is at least more succint.
Good catch, I was still in a Chipset mode when I wrote that, despite having the Architecture approach everywhere. Fixed in the upcoming v7 series.
thanks,
Signature · 1 line
John Hubbard
PATCH v6 4/34 gpu: nova-core: factor .fwsignature* selection into a new find_gsp_sigs_section()
In reply to John HubbardKeep Gsp::new() from getting too cluttered, by factoring out the selection of .fwsignature* items. This will continue to grow as we add GPUs.
--- drivers/gpu/nova-core/firmware/gsp.rs | 60 ++++++++++++++------------- 1 file changed, 31 insertions(+), 29 deletions(-)
drivers/gpu/nova-core/firmware/gsp.rs +31 -29
@@ -146,6 +146,36 @@ pub(crate) struct GspFirmware { }impl GspFirmware { +fn find_gsp_sigs_section (chipset:Chipset ) ->Option <&'staticstr > { +match chipset.arch () { +Architecture ::Turing if matches! (chipset,Chipset ::TU116 |Chipset ::TU117 ) => { +Some (".fwsignature_tu11x" ) + } +Architecture ::Turing =>Some (".fwsignature_tu10x" ), +// GA100 uses the same firmware as Turing +Architecture ::Ampere if chipset ==Chipset ::GA100 =>Some (".fwsignature_tu10x" ), +Architecture ::Ampere =>Some (".fwsignature_ga10x" ), +Architecture ::Ada =>Some (".fwsignature_ad10x" ), +Architecture ::Hopper =>Some (".fwsignature_gh10x" ), +Architecture ::Blackwell => { +// Distinguish between GB10x and GB20x series +match chipset { +// GB10x series: GB100, GB102 +Chipset ::GB100 |Chipset ::GB102 =>Some (".fwsignature_gb10x" ), +// GB20x series: GB202, GB203, GB205, GB206, GB207 +Chipset ::GB202 + |Chipset ::GB203 + |Chipset ::GB205 + |Chipset ::GB206 + |Chipset ::GB207 =>Some (".fwsignature_gb20x" ), +// It's not possible to get here with a non-Blackwell chipset, but Rust doesn't +// know that. + _ =>None , + } + } + } + } +/// Loads the GSP firmware binaries, map them into `dev`'s address-space, and creates the page /// tables expected by the GSP bootloader to load it. pub(crate) fn new<'a>(
@@ -211,35 +241,7 @@ pub(crate) fn new<'a>( }, size, signatures: { - let sigs_section = match chipset.arch() { -Architecture ::Turing -if matches! (chipset,Chipset ::TU116 |Chipset ::TU117 ) => - { -".fwsignature_tu11x" - } -Architecture ::Turing =>".fwsignature_tu10x" , -// GA100 uses the same firmware as Turing -Architecture ::Ampere if chipset ==Chipset ::GA100 =>".fwsignature_tu10x" , -Architecture ::Ampere =>".fwsignature_ga10x" , -Architecture ::Ada =>".fwsignature_ad10x" , -Architecture ::Hopper =>".fwsignature_gh10x" , -Architecture ::Blackwell => { -// Distinguish between GB10x and GB20x series -match chipset { -// GB10x series: GB100, GB102 -Chipset ::GB100 |Chipset ::GB102 =>".fwsignature_gb10x" , -// GB20x series: GB202, GB203, GB205, GB206, GB207 -Chipset ::GB202 - |Chipset ::GB203 - |Chipset ::GB205 - |Chipset ::GB206 - |Chipset ::GB207 =>".fwsignature_gb20x" , -// It's not possible to get here with a non-Blackwell chipset, but -// Rust doesn't know that. - _ =>return Err (ENOTSUPP ), - } - } - }; + let sigs_section = Self::find_gsp_sigs_section(chipset).ok_or(ENOTSUPP)?; elf::elf64_section (firmware.data (), sigs_section) .ok_or (EINVAL )
Signature · 1 line
2.53.0
PATCH v6 5/34 gpu: nova-core: use GPU Architecture to simplify HAL selections
In reply to John HubbardReplace per-chipset match arms with Architecture-based matching in the falcon and FB HAL selection functions. This reduces the number of match arms that need updating when new chipsets are added within an existing architecture.
--- drivers/gpu/nova-core/falcon/hal.rs | 21 +++++++++++++-------- drivers/gpu/nova-core/fb/hal.rs | 17 +++++++++-------- 2 files changed, 22 insertions(+), 16 deletions(-)
drivers/gpu/nova-core/falcon/hal.rs +13 -8
@@ -9,7 +9,10 @@ FalconBromParams, FalconEngine, // }, - gpu::Chipset, + gpu::{ +Architecture , +Chipset ,// + }, };mod ga102;
@@ -74,17 +77,19 @@ fn signature_reg_fuse_version(pub (super )fn falcon_hal <E :FalconEngine + 'static>( chipset:Chipset , ) ->Result <KBox <dyn FalconHal <E >>> { -use Chipset ::*; - -let hal =match chipset { -TU102 |TU104 |TU106 |TU116 |TU117 => { +let hal =match chipset.arch () { +Architecture ::Turing => {KBox ::new (tu102::Tu102 ::<E >::new (),GFP_KERNEL )?as KBox <dyn FalconHal <E >> } -GA102 |GA103 |GA104 |GA106 |GA107 |AD102 |AD103 |AD104 |AD106 |AD107 |GH100 - |GB100 |GB102 |GB202 |GB203 |GB205 |GB206 |GB207 => { +// TODO: support GA100. Its boot sequence is a lot like Turing, except that it handles the +// FRTS steps differently (specifically, it skips FWSEC-FRTS). +Architecture ::Ampere if chipset ==Chipset ::GA100 =>return Err (ENOTSUPP ), +Architecture ::Ampere + |Architecture ::Hopper + |Architecture ::Ada + |Architecture ::Blackwell => {KBox ::new (ga102::Ga102 ::<E >::new (),GFP_KERNEL )?as KBox <dyn FalconHal <E >> } - _ =>return Err (ENOTSUPP ), };Ok (hal)
drivers/gpu/nova-core/fb/hal.rs +9 -8
@@ -4,7 +4,10 @@use crate ::{ driver::Bar0 , - gpu::Chipset ,// + gpu::{ +Architecture , +Chipset ,// + }, };mod ga100;
@@ -29,12 +32,10 @@ pub(crate) trait FbHal {/// Returns the HAL corresponding to `chipset`. pub (super )fn fb_hal (chipset:Chipset ) -> &'staticdyn FbHal { -use Chipset ::*; - -match chipset { -TU102 |TU104 |TU106 |TU117 |TU116 => tu102::TU102_HAL , -GA100 => ga100::GA100_HAL , -GA102 |GA103 |GA104 |GA106 |GA107 |AD102 |AD103 |AD104 |AD106 |AD107 |GH100 - |GB100 |GB102 |GB202 |GB203 |GB205 |GB206 |GB207 => ga102::GA102_HAL , +match chipset.arch () { +Architecture ::Turing => tu102::TU102_HAL , +Architecture ::Ampere if chipset ==Chipset ::GA100 => ga100::GA100_HAL , +Architecture ::Ampere => ga102::GA102_HAL , +Architecture ::Ada |Architecture ::Hopper |Architecture ::Blackwell => ga102::GA102_HAL , } }
Signature · 1 line
2.53.0
PATCH v6 6/34 gpu: nova-core: apply the one "use" item per line policy to commands.rs
In reply to John HubbardAs per [1], we need one "use" item per line, in order to reduce merge conflicts. Furthermore, we need a trailing ", //" in order to tell rustfmt(1) to leave it alone.
This does that for commands.rs, which is the only file in nova-core that has any remaining instances of the old style.
[1] https://docs.kernel.org/rust/coding-guidelines.html#imports
--- drivers/gpu/nova-core/gsp/fw/commands.rs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/gpu/nova-core/gsp/fw/commands.rs +9 -3
@@ -1,8 +1,14 @@// SPDX-License-Identifier: GPL-2.0 -use kernel::prelude::*; -use kernel::transmute::{AsBytes ,FromBytes }; -use kernel::{device, pci}; +use kernel::{ + device, + pci, + prelude::*, + transmute::{ +AsBytes , +FromBytes ,// + },// +};use crate ::gsp::GSP_PAGE_SIZE ;
Signature · 1 line
2.53.0
Re: [PATCH v6 06/34] gpu: nova-core: apply the one "use" item per line policy to commands.rs
Quoted 11 lines · John Hubbard
As per [1], we need one "use" item per line, in order to reduce merge conflicts. Furthermore, we need a trailing ", //" in order to tell rustfmt(1) to leave it alone.
This does that for
commands.rs, which is the only file in nova-core that has any remaining instances of the old style.[1] https://docs.kernel.org/rust/coding-guidelines.html#imports
Reviewed-by Gary Guo <[email protected]>Signed-off-by John Hubbard <[email protected]>
Applied to drm-rust-next, thanks! There is no reason to delay this fix.
PATCH v6 7/34 gpu: nova-core: move GPU init and DMA mask setup into Gpu::new()
In reply to John HubbardMove Spec creation, the dev_info log, and DMA mask setup from the driver's probe() into Gpu::new(), so that all GPU-specific initialization lives in the Gpu constructor.
This restructures Gpu::new() to use pin_init_scope wrapping try_pin_init!, which allows running fallible setup code (Spec::new, dma_set_mask_and_coherent) before the pin-initializer. The parameter type changes from pci::Device<device::Bound> to pci::Device<device::Core> because the DMA call requires the Core device state.
Also makes Chipset::arch() const, adds Spec::chipset() accessor, and makes Spec::new() pub(crate) for use by later patches.
No functional change: the same 47-bit DMA mask is applied.
--- drivers/gpu/nova-core/driver.rs | 15 -------- drivers/gpu/nova-core/gpu.rs | 64 ++++++++++++++++++++++----------- 2 files changed, 43 insertions(+), 36 deletions(-)
drivers/gpu/nova-core/driver.rs +0 -15
@@ -4,8 +4,6 @@ auxiliary, device::Core, devres::Devres, - dma::Device, - dma::DmaMask, pci, pci::{Class ,
@@ -38,14 +36,6 @@ pub(crate) struct NovaCore {const BAR0_SIZE :usize =SZ_16M ; -// For now we only support Ampere which can use up to 47-bit DMA addresses. -// -// TODO: Add an abstraction for this to support newer GPUs which may support -// larger DMA addresses. Limiting these GPUs to smaller address widths won't -// have any adverse affects, unless installed on systems which require larger -// DMA addresses. These systems should be quite rare. -const GPU_DMA_BITS :u32 =47 ; -pub (crate )type Bar0 = pci::Bar <BAR0_SIZE >; kernel::pci_device_table!(
@@ -84,11 +74,6 @@ fn probe(pdev: &pci::Device<Core>, _info: &Self::IdInfo) -> impl PinInit<Self, E pdev.enable_device_mem ()?; pdev.set_master (); -// 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 >())? }; -let bar =Arc ::pin_init ( pdev.iomap_region_sized ::<BAR0_SIZE >(0 ,c"nova-core/bar0" ), GFP_KERNEL,
drivers/gpu/nova-core/gpu.rs +43 -21
104 lines not on this page · raw message
Signature · 1 line
2.53.0
Alexandre Courbot
maintainerRe: [PATCH v6 07/34] gpu: nova-core: move GPU init and DMA mask setup into Gpu::new()
Quoted 52 lines · John Hubbard
Move Spec creation, the
dev_infolog, and DMA mask setup from the driver'sprobe()intoGpu::new(), so that all GPU-specific initialization lives in the Gpu constructor.This restructures
Gpu::new()to usepin_init_scopewrappingtry_pin_init!, which allows running fallible setup code (Spec::new,dma_set_mask_and_coherent) before the pin-initializer. The parameter type changes from pci::Device<device::Bound> to pci::Device<device::Core> because the DMA call requires the Core device state.Also makes
Chipset::arch()const, addsSpec::chipset()accessor, and makesSpec::new()pub(crate) for use by later patches.No functional change: the same 47-bit DMA mask is applied.
Cc Danilo Krummrich <[email protected]>Cc Gary Guo <[email protected]>Signed-off-by John Hubbard <[email protected]>--- drivers/gpu/nova-core/driver.rs | 15 -------- drivers/gpu/nova-core/gpu.rs | 64 ++++++++++++++++++++++----------- 2 files changed, 43 insertions(+), 36 deletions(-)drivers/gpu/nova-core/driver.rs +0
-10@@ -4,8 +4,6 @@ auxiliary, device::Core, devres::Devres, - dma::Device, - dma::DmaMask, pci, pci::{Class ,@@ -38,14 +36,6 @@ pub(crate) struct NovaCore {const BAR0_SIZE :usize =SZ_16M ; -// For now we only support Ampere which can use up to 47-bit DMA addresses. -// -// TODO: Add an abstraction for this to support newer GPUs which may support -// larger DMA addresses. Limiting these GPUs to smaller address widths won't -// have any adverse affects, unless installed on systems which require larger -// DMA addresses. These systems should be quite rare. -const GPU_DMA_BITS :u32 =47 ; -pub (crate )type Bar0 = pci::Bar <BAR0_SIZE >; kernel::pci_device_table!(
drivers/gpu/nova-core/driver.rs fn probe(pdev: &pci::Device<Core>, _info: &Self::IdInfo) -> impl PinInit<Self, E · line 90
Quoted 7 lines
drivers/gpu/nova-core/driver.rs +0
-4@@ -84,11 +74,6 @@ fn probe(pdev: &pci::Device<Core>, _info: &Self::IdInfo) -> impl PinInit<Self, E pdev.enable_device_mem ()?; pdev.set_master (); -// 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 >())? };
I think the reason why this was in driver.rs is that the method we are in (probe) is enough to justify the safety argument.
Whereas Gpu::new can technically be called at a different time, and the safety requirement becomes more difficult to justify - we would actually need to make Gpu::new unsafe and set its own SAFETY section to cover the safety requirement of dma_set_mask_and_coherent.
So I think it is preferable to keep this part as-is.
Quoted 31 lines
drivers/gpu/nova-core/driver.rs +0
-1-let bar =Arc ::pin_init ( pdev.iomap_region_sized ::<BAR0_SIZE >(0 ,c"nova-core/bar0" ), GFP_KERNEL,drivers/gpu/nova-core/gpu.rs +8
-0@@ -3,6 +3,10 @@use kernel::{ device, devres::Devres , + dma::{ +Device , +DmaMask ,// + }, fmt, pci, prelude::*,@@ -162,6 +166,10 @@ 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 TryFrom <u8 >for Architecture {type Error =Error ;
drivers/gpu/nova-core/gpu.rs pub(crate) struct Spec { · line 222
Quoted 5 lines
drivers/gpu/nova-core/gpu.rs +1
-1@@ -211,7 +219,7 @@ pub(crate) struct Spec { }impl Spec { -fn new (dev: &device::Device , bar: &Bar0 ) ->Result <Spec > { +pub (crate )fn new (dev: &device::Device , bar: &Bar0 ) ->Result <Spec > {
The visibility of this methods doesn't need to be changed with the current code - although it will per the next patch if we keep the DMA mask setup in driver.rs. If we opt for that direction, let's merge that part into the next patch.
PATCH v6 8/34 gpu: nova-core: set DMA mask width based on GPU architecture
In reply to John HubbardReplace 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.
--- drivers/gpu/nova-core/gpu.rs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
drivers/gpu/nova-core/gpu.rs +13 -4
@@ -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 ();
Signature · 1 line
2.53.0
PATCH v6 9/34 gpu: nova-core: Hopper/Blackwell: skip GFW boot waiting
In reply to John HubbardHopper and Blackwell GPUs use FSP-based secure boot and do not require waiting for GFW_BOOT completion. Skip this step for these architectures, and in fact for all future architectures, because we have moved on:
there will not be any future GPUs using the older GFW_BOOT system.
--- drivers/gpu/nova-core/gpu.rs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
drivers/gpu/nova-core/gpu.rs +13 -4
@@ -177,6 +177,15 @@ pub(crate) const fn dma_mask(&self) -> DmaMask { Self::Hopper | Self::Blackwell => DmaMask::new::<52>(), } } + +/// Returns whether the GPU uses GFW_BOOT for firmware loading. +/// +/// Pre-Hopper architectures (Turing, Ampere, Ada) require waiting for GFW_BOOT completion +/// before any significant GPU setup. Hopper and later use the FSP Chain of Trust boot path +/// instead. +pub (crate )const fn needs_gfw_boot (&self) ->bool { +matches! (self,Self ::Turing |Self ::Ampere |Self ::Ada ) + } }impl TryFrom <u8 >for Architecture {
@@ -322,11 +331,11 @@ pub(crate) fn new<'a>(let chipset = spec.chipset (); Ok(try_pin_init!(Self { - // We must wait for GFW_BOOT completion before doing any significant setup - // on the GPU. _: { - gfw::wait_gfw_boot_completion(bar) - .inspect_err(|_| dev_err!(pdev, "GFW boot did not complete\n"))?; + if chipset.arch().needs_gfw_boot() { + gfw::wait_gfw_boot_completion(bar) + .inspect_err(|_| dev_err!(pdev, "GFW boot did not complete\n"))?; + } }, sysmem_flush: SysmemFlush::register(pdev.as_ref(), bar, chipset)?,
Signature · 1 line
2.53.0
Alexandre Courbot
maintainerRe: [PATCH v6 09/34] gpu: nova-core: Hopper/Blackwell: skip GFW boot waiting
Quoted 34 lines · John Hubbard
Hopper and Blackwell GPUs use FSP-based secure boot and do not require waiting for
GFW_BOOTcompletion. Skip this step for these architectures, and in fact for all future architectures, because we have moved on:
there will not be any future GPUs using the olderGFW_BOOTsystem.Cc Danilo Krummrich <[email protected]>Signed-off-by John Hubbard <[email protected]>--- drivers/gpu/nova-core/gpu.rs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)drivers/gpu/nova-core/gpu.rs +9
-0@@ -177,6 +177,15 @@ pub(crate) const fn dma_mask(&self) -> DmaMask { Self::Hopper | Self::Blackwell => DmaMask::new::<52>(), } } + +/// Returns whether the GPU uses GFW_BOOT for firmware loading. +/// +/// Pre-Hopper architectures (Turing, Ampere, Ada) require waiting for GFW_BOOT completion +/// before any significant GPU setup. Hopper and later use the FSP Chain of Trust boot path +/// instead. +pub (crate )const fn needs_gfw_boot (&self) ->bool { +matches! (self,Self ::Turing |Self ::Ampere |Self ::Ada ) + } }impl TryFrom <u8 >for Architecture {@@ -322,11 +331,11 @@ pub(crate) fn new<'a>(let chipset = spec.chipset ();
drivers/gpu/nova-core/gpu.rs pub(crate) fn new<'a>( · line 338
Quoted 10 lines
drivers/gpu/nova-core/gpu.rs +4
-4Ok(try_pin_init!(Self { - // We must wait for GFW_BOOT completion before doing any significant setup - // on the GPU. _: { - gfw::wait_gfw_boot_completion(bar) - .inspect_err(|_| dev_err!(pdev, "GFW boot did not complete\n"))?; + if chipset.arch().needs_gfw_boot() { + gfw::wait_gfw_boot_completion(bar) + .inspect_err(|_| dev_err!(pdev, "GFW boot did not complete\n"))?; + }
This looks like this should be a HAL method, wdyt?
PATCH v6 10/34 gpu: nova-core: move firmware image parsing code to firmware.rs
In reply to John HubbardUp until now, only the GSP required parsing of its firmware headers. However, upcoming support for Hopper/Blackwell+ adds another firmware image (FMC), along with another format (ELF32).
Therefore, the current ELF64 section parsing support needs to be moved up a level, so that both of the above can use it.
There are no functional changes. This is pure code movement.
--- drivers/gpu/nova-core/firmware.rs | 88 +++++++++++++++++++++++++ drivers/gpu/nova-core/firmware/gsp.rs | 93 ++------------------------- 2 files changed, 94 insertions(+), 87 deletions(-)
drivers/gpu/nova-core/firmware.rs +88 -0
@@ -457,3 +457,91 @@ pub(crate) const fn create( this.0 } } + +/// Ad-hoc and temporary module to extract sections from ELF images. +/// +/// Some firmware images are currently packaged as ELF files, where sections names are used as keys +/// to specific and related bits of data. Future firmware versions are scheduled to move away from +/// that scheme before nova-core becomes stable, which means this module will eventually be +/// removed. +mod elf { +use core::mem::size_of; + +use kernel::{ + bindings, + str::CStr , + transmute::FromBytes ,// + }; + +/// Newtype to provide a [`FromBytes`] implementation. +#[repr(transparent)] +struct Elf64Hdr (bindings::elf64_hdr ); +// SAFETY: all bit patterns are valid for this type, and it doesn't use interior mutability. +unsafe impl FromBytes for Elf64Hdr {} + +#[repr(transparent)] +struct Elf64SHdr (bindings::elf64_shdr ); +// SAFETY: all bit patterns are valid for this type, and it doesn't use interior mutability. +unsafe impl FromBytes for Elf64SHdr {} + +/// Tries to extract section with name `name` from the ELF64 image `elf`, and returns it. +pub (super )fn elf64_section <'a, 'b>(elf: &'a [u8 ], name: &'bstr ) ->Option <&'a [u8 ]> { +let hdr = &elf + .get (0 ..size_of ::<bindings::elf64_hdr >()) + .and_then (Elf64Hdr ::from_bytes)? + .0 ; + +// Get all the section headers. +let mut shdr = { +let shdr_num = usize::from (hdr.e_shnum); +let shdr_start = usize::try_from (hdr.e_shoff).ok ()?; +let shdr_end = shdr_num + .checked_mul (size_of ::<Elf64SHdr >()) + .and_then (|v| v.checked_add (shdr_start))?; + + elf.get (shdr_start..shdr_end) + .map (|slice| slice.chunks_exact (size_of ::<Elf64SHdr >()))? + }; + +// Get the strings table. +let strhdr = shdr + .clone () + .nth (usize::from (hdr.e_shstrndx)) + .and_then (Elf64SHdr ::from_bytes)?; + +// Find the section which name matches `name` and return it. + shdr.find (|&sh| { +let Some (hdr) =Elf64SHdr ::from_bytes (sh)else { +return false ; + }; + +let Some (name_idx) = strhdr + .0 + .sh_offset + .checked_add (u64::from (hdr.0 .sh_name)) + .and_then (|idx| usize::try_from (idx).ok ()) +else { +return false ; + }; + +// Get the start of the name. + elf.get (name_idx..) + .and_then (|nstr|CStr ::from_bytes_until_nul (nstr).ok ()) +// Convert into str. + .and_then (|c_str| c_str.to_str ().ok ()) +// Check that the name matches. + .map (|str| str == name) + .unwrap_or (false ) + }) +// Return the slice containing the section. + .and_then (|sh| { +let hdr =Elf64SHdr ::from_bytes (sh)?; +let start = usize::try_from (hdr.0 .sh_offset).ok ()?; +let end = usize::try_from (hdr.0 .sh_size) + .ok () + .and_then (|sh_size| start.checked_add (sh_size))?; + + elf.get (start..end) + }) + } +}
drivers/gpu/nova-core/firmware/gsp.rs +6 -87
110 lines not on this page · raw message
Signature · 1 line
2.53.0
Alexandre Courbot
maintainerRe: [PATCH v6 10/34] gpu: nova-core: move firmware image parsing code to firmware.rs
On Tue Mar 10, 2026 at 11:11 AM JST, John Hubbard wrote:
<snip>
drivers/gpu/nova-core/firmware/gsp.rs line 3
Quoted 8 lines
drivers/gpu/nova-core/firmware/gsp.rs +1
-0@@ -1,5 +1,7 @@// SPDX-License-Identifier: GPL-2.0 +use core::mem::size_of_val;
This new import is not needed.
PATCH v6 11/34 gpu: nova-core: factor out an elf_str() function
In reply to John HubbardFactor out a chunk of complexity into a new subroutine. This is an incremental step in adding ELF32 support to the existing ELF64 section support, for handling GPU firmware.
--- drivers/gpu/nova-core/firmware.rs | 40 ++++++++++++------------------- 1 file changed, 15 insertions(+), 25 deletions(-)
drivers/gpu/nova-core/firmware.rs +15 -25
@@ -484,6 +484,13 @@ unsafe impl FromBytes for Elf64Hdr {}// SAFETY: all bit patterns are valid for this type, and it doesn't use interior mutability. unsafe impl FromBytes for Elf64SHdr {} +/// Returns a NULL-terminated string from the ELF image at `offset`. +fn elf_str (elf: &[u8 ], offset:u64 ) ->Option <&str > { +let idx = usize::try_from (offset).ok ()?; +let bytes = elf.get (idx..)?; +CStr ::from_bytes_until_nul (bytes).ok ()?.to_str ().ok () + } +/// Tries to extract section with name `name` from the ELF64 image `elf`, and returns it. pub (super )fn elf64_section <'a, 'b>(elf: &'a [u8 ], name: &'bstr ) ->Option <&'a [u8 ]> {let hdr = &elf
@@ -510,32 +517,15 @@ pub(super) fn elf64_section<'a, 'b>(elf: &'a [u8], name: &'b str) -> Option<&'a .and_then(Elf64SHdr::from_bytes)?;// Find the section which name matches `name` and return it. - shdr.find (|&sh| { -let Some (hdr) =Elf64SHdr ::from_bytes (sh)else { -return false ; - }; - -let Some (name_idx) = strhdr - .0 - .sh_offset - .checked_add (u64::from (hdr.0 .sh_name)) - .and_then (|idx| usize::try_from (idx).ok ()) -else { -return false ; - }; - -// Get the start of the name. - elf.get (name_idx..) - .and_then (|nstr|CStr ::from_bytes_until_nul (nstr).ok ()) -// Convert into str. - .and_then (|c_str| c_str.to_str ().ok ()) -// Check that the name matches. - .map (|str| str == name) - .unwrap_or (false ) - }) -// Return the slice containing the section. - .and_then (|sh| { + shdr.find_map (|sh| {let hdr =Elf64SHdr ::from_bytes (sh)?; +let name_offset = strhdr.0 .sh_offset.checked_add (u64::from (hdr.0 .sh_name))?; +let section_name =elf_str (elf, name_offset)?; + +if section_name != name { +return None ; + } +let start = usize::try_from (hdr.0 .sh_offset).ok ()?;let end = usize::try_from (hdr.0 .sh_size) .ok ()
Signature · 1 line
2.53.0
PATCH v6 12/34 gpu: nova-core: don't assume 64-bit firmware images
In reply to John HubbardAdd ElfHeader and ElfSectionHeader traits to abstract out differences between ELF32 and ELF64. Implement these for ELF64.
This is in preparation for upcoming ELF32 section support, and for auto-selecting ELF32 or ELF64.
--- drivers/gpu/nova-core/firmware.rs | 99 ++++++++++++++++++++++--------- 1 file changed, 72 insertions(+), 27 deletions(-)
drivers/gpu/nova-core/firmware.rs +72 -27
@@ -473,17 +473,60 @@ mod elf { transmute::FromBytes, // }; -/// Newtype to provide a [`FromBytes`] implementation. +/// Trait to abstract over ELF header differences (32-bit vs 64-bit). +trait ElfHeader :FromBytes { +fn shnum (&self) ->u16 ; +fn shoff (&self) ->u64 ; +fn shstrndx (&self) ->u16 ; + } + +/// Trait to abstract over ELF section header differences (32-bit vs 64-bit). +trait ElfSectionHeader :FromBytes { +fn name (&self) ->u32 ; +fn offset (&self) ->u64 ; +fn size (&self) ->u64 ; + } + +/// Newtype to provide [`FromBytes`] and [`ElfHeader`] implementations. #[repr(transparent)] struct Elf64Hdr (bindings::elf64_hdr );// SAFETY: all bit patterns are valid for this type, and it doesn't use interior mutability. unsafe impl FromBytes for Elf64Hdr {} +impl ElfHeader for Elf64Hdr { +fn shnum (&self) ->u16 { + self.0 .e_shnum + } + +fn shoff (&self) ->u64 { + self.0 .e_shoff + } + +fn shstrndx (&self) ->u16 { + self.0 .e_shstrndx + } + } + +/// Newtype to provide [`FromBytes`] and [`ElfSectionHeader`] implementations. #[repr(transparent)] struct Elf64SHdr (bindings::elf64_shdr );// SAFETY: all bit patterns are valid for this type, and it doesn't use interior mutability. unsafe impl FromBytes for Elf64SHdr {} +impl ElfSectionHeader for Elf64SHdr { +fn name (&self) ->u32 { + self.0 .sh_name + } + +fn offset (&self) ->u64 { + self.0 .sh_offset + } + +fn size (&self) ->u64 { + self.0 .sh_size + } + } +/// Returns a NULL-terminated string from the ELF image at `offset`. fn elf_str (elf: &[u8 ], offset:u64 ) ->Option <&str > {let idx = usize::try_from (offset).ok ()?;
@@ -491,47 +534,49 @@ fn elf_str(elf: &[u8], offset: u64) -> Option<&str> {CStr ::from_bytes_until_nul (bytes).ok ()?.to_str ().ok () } -/// Tries to extract section with name `name` from the ELF64 image `elf`, and returns it. -pub (super )fn elf64_section <'a, 'b>(elf: &'a [u8 ], name: &'bstr ) ->Option <&'a [u8 ]> { -let hdr = &elf - .get (0 ..size_of ::<bindings::elf64_hdr >()) - .and_then (Elf64Hdr ::from_bytes)? - .0 ; +fn elf_section_generic <'a,H ,S >(elf: &'a [u8 ], name: &str ) ->Option <&'a [u8 ]> +where +H :ElfHeader , +S :ElfSectionHeader , + { +let hdr =H ::from_bytes (elf.get (0 ..size_of ::<H >())?)?; -// Get all the section headers. -let mut shdr = { -let shdr_num = usize::from (hdr.e_shnum); -let shdr_start = usize::try_from (hdr.e_shoff).ok ()?; -let shdr_end = shdr_num - .checked_mul (size_of ::<Elf64SHdr >()) - .and_then (|v| v.checked_add (shdr_start))?; +let shdr_num = usize::from (hdr.shnum ()); +let shdr_start = usize::try_from (hdr.shoff ()).ok ()?; +let shdr_end = shdr_num + .checked_mul (size_of ::<S >()) + .and_then (|v| v.checked_add (shdr_start))?; - elf.get (shdr_start..shdr_end) - .map (|slice| slice.chunks_exact (size_of ::<Elf64SHdr >()))? - }; +// Get all the section headers as an iterator over byte chunks. +let shdr_bytes = elf.get (shdr_start..shdr_end)?; +let mut shdr_iter = shdr_bytes.chunks_exact (size_of ::<S >());// Get the strings table. -let strhdr = shdr +let strhdr = shdr_iter .clone () - .nth (usize::from (hdr.e_shstrndx)) - .and_then (Elf64SHdr ::from_bytes)?; + .nth (usize::from (hdr.shstrndx ())) + .and_then (S ::from_bytes)?;// Find the section which name matches `name` and return it. - shdr.find_map (|sh| { -let hdr =Elf64SHdr ::from_bytes (sh)?; -let name_offset = strhdr.0 .sh_offset.checked_add (u64::from (hdr.0 .sh_name))?; + shdr_iter.find_map (|sh_bytes| { +let sh =S ::from_bytes (sh_bytes)?; +let name_offset = strhdr.offset ().checked_add (u64::from (sh.name ()))?;let section_name =elf_str (elf, name_offset)?;if section_name != name {return None ; } -let start = usize::try_from (hdr.0 .sh_offset).ok ()?; -let end = usize::try_from (hdr.0 .sh_size) +let start = usize::try_from (sh.offset ()).ok ()?; +let end = usize::try_from (sh.size ()) .ok () - .and_then (|sh_size| start.checked_add (sh_size))?; - + .and_then (|sz| start.checked_add (sz))?; elf.get (start..end) }) } + +/// Extract the section with name `name` from the ELF64 image `elf`. +pub (super )fn elf64_section <'a>(elf: &'a [u8 ], name: &str ) ->Option <&'a [u8 ]> { +elf_section_generic ::<Elf64Hdr ,Elf64SHdr >(elf, name) + } }
Signature · 1 line
2.53.0
Alexandre Courbot
maintainerRe: [PATCH v6 12/34] gpu: nova-core: don't assume 64-bit firmware images
On Tue Mar 10, 2026 at 11:11 AM JST, John Hubbard wrote:
<snip>
drivers/gpu/nova-core/firmware.rs fn elf_str(elf: &[u8], offset: u64) -> Option<&str> { · line 540
Quoted 10 lines
drivers/gpu/nova-core/firmware.rs +4
-6-/// Tries to extract section with name `name` from the ELF64 image `elf`, and returns it. -pub (super )fn elf64_section <'a, 'b>(elf: &'a [u8 ], name: &'bstr ) ->Option <&'a [u8 ]> { -let hdr = &elf - .get (0 ..size_of ::<bindings::elf64_hdr >()) - .and_then (Elf64Hdr ::from_bytes)? - .0 ; +fn elf_section_generic <'a,H ,S >(elf: &'a [u8 ], name: &str ) ->Option <&'a [u8 ]> +where +H :ElfHeader , +S :ElfSectionHeader ,
This allows mixing the 64-bit with the 32-bit section header. Let's have another trait combining the two using associated types, so this function takes only one generic parameter that unambiguously describes the correct format.
PATCH v6 13/34 gpu: nova-core: add support for 32-bit firmware images
In reply to John HubbardAdd ELF32 header and section header newtypes with ElfHeader and ElfSectionHeader trait implementations, mirroring the existing ELF64 support. Add elf32_section() for extracting sections from ELF32 images.
--- drivers/gpu/nova-core/firmware.rs | 46 +++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)
drivers/gpu/nova-core/firmware.rs +46 -0
@@ -527,6 +527,46 @@ fn size(&self) -> u64 { } } +/// Newtype to provide [`FromBytes`] and [`ElfHeader`] implementations for ELF32. +#[repr(transparent)] +struct Elf32Hdr (bindings::elf32_hdr ); +// SAFETY: all bit patterns are valid for this type, and it doesn't use interior mutability. +unsafe impl FromBytes for Elf32Hdr {} + +impl ElfHeader for Elf32Hdr { +fn shnum (&self) ->u16 { + self.0 .e_shnum + } + +fn shoff (&self) ->u64 { + u64::from (self.0 .e_shoff) + } + +fn shstrndx (&self) ->u16 { + self.0 .e_shstrndx + } + } + +/// Newtype to provide [`FromBytes`] and [`ElfSectionHeader`] implementations for ELF32. +#[repr(transparent)] +struct Elf32SHdr (bindings::elf32_shdr ); +// SAFETY: all bit patterns are valid for this type, and it doesn't use interior mutability. +unsafe impl FromBytes for Elf32SHdr {} + +impl ElfSectionHeader for Elf32SHdr { +fn name (&self) ->u32 { + self.0 .sh_name + } + +fn offset (&self) ->u64 { + u64::from (self.0 .sh_offset) + } + +fn size (&self) ->u64 { + u64::from (self.0 .sh_size) + } + } +/// Returns a NULL-terminated string from the ELF image at `offset`. fn elf_str (elf: &[u8 ], offset:u64 ) ->Option <&str > {let idx = usize::try_from (offset).ok ()?;
@@ -579,4 +619,10 @@ fn elf_section_generic<'a, H, S>(elf: &'a [u8], name: &str) -> Option<&'a [u8]>pub (super )fn elf64_section <'a>(elf: &'a [u8 ], name: &str ) ->Option <&'a [u8 ]> {elf_section_generic ::<Elf64Hdr ,Elf64SHdr >(elf, name) } + +/// Extract the section with name `name` from the ELF32 image `elf`. +#[expect(dead_code)] +pub (super )fn elf32_section <'a>(elf: &'a [u8 ], name: &str ) ->Option <&'a [u8 ]> { +elf_section_generic ::<Elf32Hdr ,Elf32SHdr >(elf, name) + } }
Signature · 1 line
2.53.0
PATCH v6 14/34 gpu: nova-core: add auto-detection of 32-bit, 64-bit firmware images
In reply to John HubbardAdd elf_section() which automatically detects ELF32 vs ELF64 based on the ELF header's class byte, and dispatches to the appropriate parser. Switch gsp.rs callers from elf64_section() to elf_section(), making both elf32_section() and elf64_section() private.
--- drivers/gpu/nova-core/firmware.rs | 20 +++++++++++++++++--- drivers/gpu/nova-core/firmware/gsp.rs | 4 ++-- 2 files changed, 19 insertions(+), 5 deletions(-)
drivers/gpu/nova-core/firmware.rs +17 -3
@@ -616,13 +616,27 @@ fn elf_section_generic<'a, H, S>(elf: &'a [u8], name: &str) -> Option<&'a [u8]> }/// Extract the section with name `name` from the ELF64 image `elf`. -pub (super )fn elf64_section <'a>(elf: &'a [u8 ], name: &str ) ->Option <&'a [u8 ]> { +fn elf64_section <'a>(elf: &'a [u8 ], name: &str ) ->Option <&'a [u8 ]> {elf_section_generic ::<Elf64Hdr ,Elf64SHdr >(elf, name) }/// Extract the section with name `name` from the ELF32 image `elf`. -#[expect(dead_code)] -pub (super )fn elf32_section <'a>(elf: &'a [u8 ], name: &str ) ->Option <&'a [u8 ]> { +fn elf32_section <'a>(elf: &'a [u8 ], name: &str ) ->Option <&'a [u8 ]> {elf_section_generic ::<Elf32Hdr ,Elf32SHdr >(elf, name) } + +/// Automatically detects ELF32 vs ELF64 based on the ELF header. +pub (super )fn elf_section <'a>(elf: &'a [u8 ], name: &str ) ->Option <&'a [u8 ]> { +// Check ELF magic. +if elf.len () <5 || elf.get (0 ..4 )? !=b"\x7fELF" { +return None ; + } + +// Check ELF class: 1 = 32-bit, 2 = 64-bit. +match elf.get (4 )? { +1 =>elf32_section (elf, name), +2 =>elf64_section (elf, name), + _ =>None , + } + } }
drivers/gpu/nova-core/firmware/gsp.rs +2 -2
@@ -105,7 +105,7 @@ pub(crate) fn new<'a>( pin_init::pin_init_scope (move || {let firmware =super ::request_firmware (dev, chipset,"gsp" , ver)?; -let fw_section = elf::elf64_section (firmware.data (),".fwimage" ).ok_or (EINVAL )?; +let fw_section = elf::elf_section (firmware.data (),".fwimage" ).ok_or (EINVAL )?;let size = fw_section.len ();
@@ -162,7 +162,7 @@ pub(crate) fn new<'a>( signatures: { let sigs_section = Self::find_gsp_sigs_section(chipset).ok_or(ENOTSUPP)?; - elf::elf64_section (firmware.data (), sigs_section) + elf::elf_section (firmware.data (), sigs_section) .ok_or (EINVAL ) .and_then (|data|DmaObject ::from_data (dev, data))? },
Signature · 1 line
2.53.0
PATCH v6 15/34 gpu: nova-core: Hopper/Blackwell: add FMC firmware image, in support of FSP
In reply to John HubbardFSP is a hardware unit that runs FMC firmware. The FMC ELF file is loaded and stored in two forms: the "image" ELF section alone (which FSP uses for boot) and the full ELF (needed later for signature extraction during Chain of Trust verification).
--- drivers/gpu/nova-core/firmware.rs | 1 + drivers/gpu/nova-core/firmware/fsp.rs | 44 +++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 drivers/gpu/nova-core/firmware/fsp.rs
drivers/gpu/nova-core/firmware.rs +1 -0
@@ -27,6 +27,7 @@ };pub (crate )mod booter; +pub (crate )mod fsp;pub (crate )mod fwsec;pub (crate )mod gsp;pub (crate )mod riscv;
drivers/gpu/nova-core/firmware/fsp.rs new file +44 -0
44 lines not on this page · raw message
Signature · 1 line
2.53.0
PATCH v6 16/34 gpu: nova-core: Hopper/Blackwell: add FSP falcon engine stub
In reply to John HubbardAdd the FSP (Firmware System Processor) falcon engine type that will handle secure boot and Chain of Trust operations on Hopper and Blackwell architectures.
The FSP falcon replaces SEC2's role in the boot sequence for these newer architectures. This initial stub just defines the falcon type and its base address.
--- drivers/gpu/nova-core/falcon.rs | 1 + drivers/gpu/nova-core/falcon/fsp.rs | 30 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 drivers/gpu/nova-core/falcon/fsp.rs
drivers/gpu/nova-core/falcon.rs +1 -0
@@ -33,6 +33,7 @@ regs::macros::RegisterBase, // }; +pub (crate )mod fsp;pub (crate )mod gsp;mod hal;pub (crate )mod sec2;
drivers/gpu/nova-core/falcon/fsp.rs new file +30 -0
@@ -0,0 +1,30 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! FSP (Firmware System Processor) falcon engine for Hopper/Blackwell GPUs. +//! +//! The FSP falcon handles secure boot and Chain of Trust operations +//! on Hopper and Blackwell architectures, replacing SEC2's role. + +use crate ::{ + falcon::{ +FalconEngine , +PFalcon2Base , +PFalconBase ,// + }, + regs::macros::RegisterBase , +}; + +/// Type specifying the `Fsp` falcon engine. Cannot be instantiated. +pub (crate )struct Fsp (()); + +impl RegisterBase <PFalconBase >for Fsp { +const BASE :usize =0x8f2000 ; +} + +impl RegisterBase <PFalcon2Base >for Fsp { +const BASE :usize =0x8f3000 ; +} + +impl FalconEngine for Fsp { +const ID :Self =Fsp (()); +}
Signature · 1 line
2.53.0
PATCH v6 17/34 gpu: nova-core: Hopper/Blackwell: add FSP falcon EMEM operations
In reply to John HubbardAdd external memory (EMEM) read/write operations to the GPU's FSP falcon engine. These operations use Falcon PIO (Programmed I/O) to communicate with the FSP through indirect memory access.
--- drivers/gpu/nova-core/falcon/fsp.rs | 122 +++++++++++++++++++++++++++- drivers/gpu/nova-core/regs.rs | 12 +++ 2 files changed, 133 insertions(+), 1 deletion(-)
drivers/gpu/nova-core/falcon/fsp.rs +121 -1
@@ -5,13 +5,26 @@//! The FSP falcon handles secure boot and Chain of Trust operations //! on Hopper and Blackwell architectures, replacing SEC2's role. +use kernel::{ + io::{ +Io , +IoCapable ,// + }, + prelude::*,// +}; +use crate ::{ + driver::Bar0 , falcon::{ +Falcon ,FalconEngine ,PFalcon2Base ,PFalconBase ,// }, - regs::macros::RegisterBase , + regs::{ + self, + macros::RegisterBase ,// + }, };/// Type specifying the `Fsp` falcon engine. Cannot be instantiated.
@@ -28,3 +41,110 @@ impl RegisterBase<PFalcon2Base> for Fsp {impl FalconEngine for Fsp {const ID :Self =Fsp (()); } + +/// Maximum addressable EMEM size, derived from the 24-bit offset field +/// in NV_PFALCON_FALCON_EMEM_CTL. +const EMEM_MAX_SIZE :usize =1 <<24 ; + +/// I/O backend for the FSP falcon's external memory (EMEM). +/// +/// Each 32-bit access programs a byte offset via the EMEM_CTL register, +/// then reads or writes through the EMEM_DATA register. +pub (crate )struct Emem <'a> { + bar: &'aBar0 , +} + +impl <'a>Emem <'a> { +fn new (bar: &'aBar0 ) ->Self { +Self { bar } + } +} + +impl IoCapable <u32 >for Emem <'_> {} + +impl Io for Emem <'_> { +fn addr (&self) ->usize { +0 + } + +fn maxsize (&self) ->usize { +EMEM_MAX_SIZE + } + +fn try_read32 (&self, offset:usize ) ->Result <u32 > { +// io_addr validates offset < EMEM_MAX_SIZE (2^24), so the u32 cast is safe. +let offset = self.io_addr ::<u32 >(offset)?as u32 ; + + regs::NV_PFALCON_FALCON_EMEM_CTL ::default () + .set_rd_mode (true ) + .set_offset (offset) + .write (self.bar, &Fsp ::ID ); + +Ok (regs::NV_PFALCON_FALCON_EMEM_DATA ::read (self.bar, &Fsp ::ID ).data ()) + } + +fn try_write32 (&self, value:u32 , offset:usize ) ->Result { +// io_addr validates offset < EMEM_MAX_SIZE (2^24), so the u32 cast is safe. +let offset = self.io_addr ::<u32 >(offset)?as u32 ; + + regs::NV_PFALCON_FALCON_EMEM_CTL ::default () + .set_wr_mode (true ) + .set_offset (offset) + .write (self.bar, &Fsp ::ID ); + + regs::NV_PFALCON_FALCON_EMEM_DATA ::default () + .set_data (value) + .write (self.bar, &Fsp ::ID ); + +Ok (()) + } +} + +impl Falcon <Fsp > { +/// Returns an EMEM I/O accessor for this FSP falcon. +pub (crate )fn emem <'a>(&self, bar: &'aBar0 ) ->Emem <'a> { +Emem ::new (bar) + } + +/// Writes `data` to FSP external memory at byte `offset`. +/// +/// Data is interpreted as little-endian 32-bit words. +/// Returns `EINVAL` if offset or data length is not 4-byte aligned. +#[expect(unused)] +pub (crate )fn write_emem (&self, bar: &Bar0 , offset:u32 , data: &[u8 ]) ->Result { +if offset %4 !=0 || data.len () %4 !=0 { +return Err (EINVAL ); + } + +let emem = self.emem (bar); +let mut off = offsetas usize ; +for chunkin data.chunks_exact (4 ) { +let word = u32::from_le_bytes ([chunk[0 ], chunk[1 ], chunk[2 ], chunk[3 ]]); + emem.try_write32 (word, off)?; + off +=4 ; + } + +Ok (()) + } + +/// Reads FSP external memory at byte `offset` into `data`. +/// +/// Data is stored as little-endian 32-bit words. +/// Returns `EINVAL` if offset or data length is not 4-byte aligned. +#[expect(unused)] +pub (crate )fn read_emem (&self, bar: &Bar0 , offset:u32 , data: &mut [u8 ]) ->Result { +if offset %4 !=0 || data.len () %4 !=0 { +return Err (EINVAL ); + } + +let emem = self.emem (bar); +let mut off = offsetas usize ; +for chunkin data.chunks_exact_mut (4 ) { +let word = emem.try_read32 (off)?; + chunk.copy_from_slice (&word.to_le_bytes ()); + off +=4 ; + } + +Ok (()) + } +}
drivers/gpu/nova-core/regs.rs +12 -0
@@ -461,6 +461,18 @@ pub(crate) fn reset_engine<E: FalconEngine>(bar: &Bar0) { 8:8 br_fetch as bool; }); +// Falcon EMEM PIO registers (used by FSP on Hopper/Blackwell). +// These provide the falcon external memory communication interface. +register! (NV_PFALCON_FALCON_EMEM_CTL @PFalconBase [0x00000ac0 ] { +23 :0 offsetas u32 ;// EMEM byte offset (must be 4-byte aligned) +24 :24 wr_modeas bool ;// Write mode +25 :25 rd_modeas bool ;// Read mode +}); + +register! (NV_PFALCON_FALCON_EMEM_DATA @PFalconBase [0x00000ac4 ] { +31 :0 dataas u32 ;// EMEM data register +}); +// The modules below provide registers that are not identical on all supported chips. They should // only be used in HAL modules.
Signature · 1 line
2.53.0
PATCH v6 18/34 gpu: nova-core: Hopper/Blackwell: add FSP message infrastructure
In reply to John HubbardAdd the FSP messaging infrastructure needed for Chain of Trust communication on Hopper/Blackwell GPUs.
--- drivers/gpu/nova-core/falcon/fsp.rs | 79 ++++++++++++++++++++++++++++- drivers/gpu/nova-core/regs.rs | 48 ++++++++++++++++++ 2 files changed, 125 insertions(+), 2 deletions(-)
drivers/gpu/nova-core/falcon/fsp.rs +77 -2
@@ -110,7 +110,6 @@ pub(crate) fn emem<'a>(&self, bar: &'a Bar0) -> Emem<'a> {/// /// Data is interpreted as little-endian 32-bit words. /// Returns `EINVAL` if offset or data length is not 4-byte aligned. -#[expect(unused)] pub (crate )fn write_emem (&self, bar: &Bar0 , offset:u32 , data: &[u8 ]) ->Result {if offset %4 !=0 || data.len () %4 !=0 {return Err (EINVAL );
@@ -131,7 +130,6 @@ pub(crate) fn write_emem(&self, bar: &Bar0, offset: u32, data: &[u8]) -> Result/// /// Data is stored as little-endian 32-bit words. /// Returns `EINVAL` if offset or data length is not 4-byte aligned. -#[expect(unused)] pub (crate )fn read_emem (&self, bar: &Bar0 , offset:u32 , data: &mut [u8 ]) ->Result {if offset %4 !=0 || data.len () %4 !=0 {return Err (EINVAL );
@@ -147,4 +145,81 @@ pub(crate) fn read_emem(&self, bar: &Bar0, offset: u32, data: &mut [u8]) -> ResuOk (()) } + +/// Poll FSP for incoming data. +/// +/// Returns the size of available data in bytes, or 0 if no data is available. +/// +/// The FSP message queue is not circular - pointers are reset to 0 after each +/// message exchange, so `tail >= head` is always true when data is present. +#[expect(unused)] +pub (crate )fn poll_msgq (&self, bar: &Bar0 ) ->u32 { +let head = regs::NV_PFSP_MSGQ_HEAD ::read (bar).address (); +let tail = regs::NV_PFSP_MSGQ_TAIL ::read (bar).address (); + +if head == tail { +return 0 ; + } + +// TAIL points at last DWORD written, so add 4 to get total size + tail.saturating_sub (head) +4 + } + +/// Send message to FSP. +/// +/// Writes a message to FSP EMEM and updates queue pointers to notify FSP. +/// +/// # Arguments +/// * `bar` - BAR0 memory mapping +/// * `packet` - Message data (must be 4-byte aligned in length) +/// +/// # Returns +/// `Ok(())` on success, `Err(EINVAL)` if packet is empty or not 4-byte aligned +#[expect(unused)] +pub (crate )fn send_msg (&self, bar: &Bar0 , packet: &[u8 ]) ->Result { +if packet.is_empty () { +return Err (EINVAL ); + } + +// Write message to EMEM at offset 0 (validates 4-byte alignment) + self.write_emem (bar,0 , packet)?; + +// Update queue pointers - TAIL points at last DWORD written +let tail_offset = u32::try_from (packet.len () -4 ).map_err (|_|EINVAL )?; + regs::NV_PFSP_QUEUE_TAIL ::default () + .set_address (tail_offset) + .write (bar); + regs::NV_PFSP_QUEUE_HEAD ::default () + .set_address (0 ) + .write (bar); + +Ok (()) + } + +/// Receive message from FSP. +/// +/// Reads a message from FSP EMEM and resets queue pointers. +/// +/// # Arguments +/// * `bar` - BAR0 memory mapping +/// * `buffer` - Buffer to receive message data +/// * `size` - Size of message to read in bytes (from `poll_msgq`) +/// +/// # Returns +/// `Ok(bytes_read)` on success, `Err(EINVAL)` if size is 0, exceeds buffer, or not aligned +#[expect(unused)] +pub (crate )fn recv_msg (&self, bar: &Bar0 , buffer: &mut [u8 ], size:usize ) ->Result <usize > { +if size ==0 || size > buffer.len () { +return Err (EINVAL ); + } + +// Read response from EMEM at offset 0 (validates 4-byte alignment) + self.read_emem (bar,0 , &mut buffer[..size])?; + +// Reset message queue pointers after reading + regs::NV_PFSP_MSGQ_TAIL ::default ().set_address (0 ).write (bar); + regs::NV_PFSP_MSGQ_HEAD ::default ().set_address (0 ).write (bar); + +Ok (size) + } }
drivers/gpu/nova-core/regs.rs +48 -0
60 lines not on this page · raw message
Signature · 1 line
2.53.0
Alexandre Courbot
maintainerRe: [PATCH v6 18/34] gpu: nova-core: Hopper/Blackwell: add FSP message infrastructure
On Tue Mar 10, 2026 at 11:11 AM JST, John Hubbard wrote:
<snip>
drivers/gpu/nova-core/regs.rs pub(crate) fn reset_engine<E: FalconEngine>(bar: &Bar0) { · line 522
Quoted 13 lines
drivers/gpu/nova-core/regs.rs +13
-0+/// FSP writes this value to indicate successful boot completion. +#[expect(unused)] +pub (crate )const FSP_BOOT_COMPLETE_SUCCESS :u32 =0xff ; + +// Helper function to read FSP boot completion status from the correct register +#[expect(unused)] +pub (crate )fn read_fsp_boot_complete_status ( + bar: &crate ::driver::Bar0 , + arch:Architecture , +) ->Result <u32 > { +let addr =fsp_thermal_scratch_reg_addr (arch)?; +Ok (bar.read32 (addr)) +}
This function is unused, and modified in patch 22 - so let's just move its definition to patch 22.
Re: [PATCH v6 18/34] gpu: nova-core: Hopper/Blackwell: add FSP message infrastructure
Quoted 4 lines · Alexandre Courbot
Quoted 4 lines
drivers/gpu/nova-core/regs.rs +4
-0+// Helper function to read FSP boot completion status from the correct register +#[expect(unused)] +pub (crate )fn read_fsp_boot_complete_status ( + bar: &crate::driver::Bar0,
Quoted 8 lines
drivers/gpu/nova-core/regs.rs pub(crate) fn reset_engine<E: FalconEngine>(bar: &Bar0) { · line 522
Quoted 5 lines
+ arch: Architecture,
drivers/gpu/nova-core/regs.rs +4
-0+) -> Result<u32> { + let addr = fsp_thermal_scratch_reg_addr(arch)?; + Ok(bar.read32(addr)) +}This function is unused, and modified in patch 22 - so let's just move its definition to patch 22.
Wouldn't it be better to actually use the function, so that we can verify successful FSP boot?
PATCH v6 19/34 rust: ptr: add const_align_up()
In reply to John HubbardAdd const_align_up() to kernel::ptr as the const-compatible equivalent of Alignable::align_up().
--- rust/kernel/ptr.rs | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
rust/kernel/ptr.rs +24 -0
@@ -225,3 +225,27 @@ fn align_up(self, alignment: Alignment) -> Option<Self> { }impl_alignable_uint! (u8 ,u16 ,u32 ,u64 ,usize ); + +/// Aligns `value` up to `align`. +/// +/// This is the const-compatible equivalent of [`Alignable::align_up`]. +/// +/// Returns [`None`] on overflow. +/// +/// # Examples +/// +/// ``` +/// use kernel::ptr::{const_align_up, Alignment}; +/// use kernel::sizes::SZ_4K; +/// +/// assert_eq!(const_align_up(0x4f, Alignment::new::<16>()), Some(0x50)); +/// assert_eq!(const_align_up(0x40, Alignment::new::<16>()), Some(0x40)); +/// assert_eq!(const_align_up(1, Alignment::new::<SZ_4K>()), Some(SZ_4K)); +/// ``` +#[inline(always)] +pub const fn const_align_up (value:usize , align:Alignment ) ->Option <usize > { +match value.checked_add (align.as_usize () -1 ) { +Some (v) =>Some (v & align.mask ()), +None =>None , + } +}
Signature · 1 line
2.53.0
PATCH v6 20/34 gpu: nova-core: Hopper/Blackwell: calculate reserved FB heap size
In reply to John HubbardVarious "reserved" areas of FB (frame buffer: vidmem) have to be calculated, because the GSP booting process needs this information.
PMU_RESERVED_SIZE is computed at compile time using const_align_up(). The total reserved size is computed at runtime using Alignable::align_up because it depends on the heap layout.
--- drivers/gpu/nova-core/fb.rs | 8 ++++++++ drivers/gpu/nova-core/gsp/fw.rs | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-)
drivers/gpu/nova-core/fb.rs +8 -0
@@ -10,6 +10,7 @@ fmt, prelude::*, ptr::{ + const_align_up,Alignable ,Alignment ,// },
@@ -270,3 +271,10 @@ pub(crate) fn new(chipset: Chipset, bar: &Bar0, gsp_fw: &GspFirmware) -> Result< }) } } + +/// PMU reserved size, aligned to 128KB. +pub (crate )const PMU_RESERVED_SIZE :u32 = +match const_align_up (SZ_8M +SZ_16M +SZ_4K ,Alignment ::new ::<SZ_128K >()) { +Some (v) => vas u32 , +None =>panic! ("PMU_RESERVED_SIZE: alignment overflow" ), + };
drivers/gpu/nova-core/gsp/fw.rs +5 -1
@@ -26,7 +26,10 @@ };use crate ::{ - fb::FbLayout , + fb::{ +FbLayout , +PMU_RESERVED_SIZE ,// + }, firmware::gsp::GspFirmware , gpu::Chipset , gsp::{
@@ -182,6 +185,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 () }) }
Signature · 1 line
2.53.0
PATCH v6 21/34 gpu: nova-core: add MCTP/NVDM protocol types for firmware communication
In reply to John HubbardAdd the MCTP (Management Component Transport Protocol) and NVDM (NVIDIA Device Management) wire-format types used for communication between the kernel driver and GPU firmware processors.
This includes typed MCTP transport headers, NVDM message headers, and NVDM message type identifiers. Both the FSP boot path and the upcoming GSP RPC message queue share this protocol layer.
--- drivers/gpu/nova-core/mctp.rs | 107 +++++++++++++++++++++++++++++ drivers/gpu/nova-core/nova_core.rs | 1 + 2 files changed, 108 insertions(+) create mode 100644 drivers/gpu/nova-core/mctp.rs
drivers/gpu/nova-core/mctp.rs new file +107 -0
@@ -0,0 +1,107 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! MCTP/NVDM protocol types for NVIDIA GPU firmware communication. +//! +//! MCTP (Management Component Transport Protocol) carries NVDM (NVIDIA +//! Device Management) messages between the kernel driver and GPU firmware +//! processors such as FSP and GSP. + +#![expect(dead_code)] + +/// NVDM message type identifiers carried over MCTP. +#[derive( Debug , Clone , Copy , PartialEq , Eq )] +#[repr( u32 )] +pub (crate )enum NvdmType { +/// Chain of Trust boot message. +Cot =0x14 , +/// FSP command response. +FspResponse =0x15 , +} + +/// MCTP transport header for NVIDIA firmware messages. +/// +/// Bit layout: `[31] SOM | [30] EOM | [29:28] SEQ | [23:16] SEID`. +#[derive( Debug , Clone , Copy )] +pub (crate )struct MctpHeader (u32 ); + +impl MctpHeader { +const SOM_SHIFT :u32 =31 ; +const EOM_SHIFT :u32 =30 ; + +/// Build a single-packet MCTP header (SOM=1, EOM=1, SEQ=0, SEID=0). +pub (crate )const fn single_packet () ->Self { +Self ((1 <<Self ::SOM_SHIFT ) | (1 <<Self ::EOM_SHIFT )) + } + +/// Return the raw packed u32. +pub (crate )const fn raw (self) ->u32 { + self.0 + } + +/// Check if this is a complete single-packet message (SOM=1 and EOM=1). +pub (crate )const fn is_single_packet (self) ->bool { +let som = (self.0 >>Self ::SOM_SHIFT ) &1 ; +let eom = (self.0 >>Self ::EOM_SHIFT ) &1 ; + som ==1 && eom ==1 + } +} + +impl From <u32 >for MctpHeader { +fn from (raw:u32 ) ->Self { +Self (raw) + } +} + +/// MCTP message type for PCI vendor-defined messages. +const MSG_TYPE_VENDOR_PCI :u32 =0x7e ; + +/// NVIDIA PCI vendor ID. +const VENDOR_ID_NV :u32 =0x10de ; + +/// NVIDIA Vendor-Defined Message (NVDM) header over MCTP. +/// +/// Bit layout: `[6:0] msg_type | [23:8] vendor_id | [31:24] nvdm_type`. +#[derive( Debug , Clone , Copy )] +pub (crate )struct NvdmHeader (u32 ); + +impl NvdmHeader { +const MSG_TYPE_MASK :u32 =0x7f ; +const VENDOR_ID_SHIFT :u32 =8 ; +const VENDOR_ID_MASK :u32 =0xffff ; +const TYPE_SHIFT :u32 =24 ; +const TYPE_MASK :u32 =0xff ; + +/// Build an NVDM header for the given message type. +pub (crate )const fn new (nvdm_type:NvdmType ) ->Self { +Self ( +MSG_TYPE_VENDOR_PCI + | (VENDOR_ID_NV <<Self ::VENDOR_ID_SHIFT ) + | ((nvdm_typeas u32 ) <<Self ::TYPE_SHIFT ), + ) + } + +/// Return the raw packed u32. +pub (crate )const fn raw (self) ->u32 { + self.0 + } + +/// Extract the NVDM type field as a raw value. +pub (crate )const fn nvdm_type_raw (self) ->u32 { + (self.0 >>Self ::TYPE_SHIFT ) &Self ::TYPE_MASK + } + +/// Validate this header against the expected NVIDIA NVDM format and type. +pub (crate )const fn validate (self, expected_type:NvdmType ) ->bool { +let msg_type = self.0 &Self ::MSG_TYPE_MASK ; +let vendor_id = (self.0 >>Self ::VENDOR_ID_SHIFT ) &Self ::VENDOR_ID_MASK ; + msg_type ==MSG_TYPE_VENDOR_PCI + && vendor_id ==VENDOR_ID_NV + && self.nvdm_type_raw () == expected_typeas u32 + } +} + +impl From <u32 >for NvdmHeader { +fn from (raw:u32 ) ->Self { +Self (raw) + } +}
drivers/gpu/nova-core/nova_core.rs +1 -0
@@ -13,6 +13,7 @@mod gfw;mod gpu;mod gsp; +mod mctp;mod num;mod regs;mod sbuffer;
Signature · 1 line
2.53.0
Alexandre Courbot
maintainerRe: [PATCH v6 21/34] gpu: nova-core: add MCTP/NVDM protocol types for firmware communication
Quoted 119 lines · John Hubbard
Add the MCTP (Management Component Transport Protocol) and NVDM (NVIDIA Device Management) wire-format types used for communication between the kernel driver and GPU firmware processors.
This includes typed MCTP transport headers, NVDM message headers, and NVDM message type identifiers. Both the FSP boot path and the upcoming GSP RPC message queue share this protocol layer.
Cc Joel Fernandes <[email protected]>Signed-off-by John Hubbard <[email protected]>--- drivers/gpu/nova-core/mctp.rs | 107 +++++++++++++++++++++++++++++ drivers/gpu/nova-core/nova_core.rs | 1 + 2 files changed, 108 insertions(+) create mode 100644 drivers/gpu/nova-core/mctp.rsdrivers/gpu/nova-core/mctp.rs new file +97
-0@@ -0,0 +1,107 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! MCTP/NVDM protocol types for NVIDIA GPU firmware communication. +//! +//! MCTP (Management Component Transport Protocol) carries NVDM (NVIDIA +//! Device Management) messages between the kernel driver and GPU firmware +//! processors such as FSP and GSP. + +#![expect(dead_code)] + +/// NVDM message type identifiers carried over MCTP. +#[derive( Debug , Clone , Copy , PartialEq , Eq )] +#[repr( u32 )] +pub (crate )enum NvdmType { +/// Chain of Trust boot message. +Cot =0x14 , +/// FSP command response. +FspResponse =0x15 , +} + +/// MCTP transport header for NVIDIA firmware messages. +/// +/// Bit layout: `[31] SOM | [30] EOM | [29:28] SEQ | [23:16] SEID`. +#[derive( Debug , Clone , Copy )] +pub (crate )struct MctpHeader (u32 ); + +impl MctpHeader { +const SOM_SHIFT :u32 =31 ; +const EOM_SHIFT :u32 =30 ; + +/// Build a single-packet MCTP header (SOM=1, EOM=1, SEQ=0, SEID=0). +pub (crate )const fn single_packet () ->Self { +Self ((1 <<Self ::SOM_SHIFT ) | (1 <<Self ::EOM_SHIFT )) + } + +/// Return the raw packed u32. +pub (crate )const fn raw (self) ->u32 { + self.0 + } + +/// Check if this is a complete single-packet message (SOM=1 and EOM=1). +pub (crate )const fn is_single_packet (self) ->bool { +let som = (self.0 >>Self ::SOM_SHIFT ) &1 ; +let eom = (self.0 >>Self ::EOM_SHIFT ) &1 ; + som ==1 && eom ==1 + } +} + +impl From <u32 >for MctpHeader { +fn from (raw:u32 ) ->Self { +Self (raw) + } +} + +/// MCTP message type for PCI vendor-defined messages. +const MSG_TYPE_VENDOR_PCI :u32 =0x7e ; + +/// NVIDIA PCI vendor ID. +const VENDOR_ID_NV :u32 =0x10de ; + +/// NVIDIA Vendor-Defined Message (NVDM) header over MCTP. +/// +/// Bit layout: `[6:0] msg_type | [23:8] vendor_id | [31:24] nvdm_type`. +#[derive( Debug , Clone , Copy )] +pub (crate )struct NvdmHeader (u32 ); + +impl NvdmHeader { +const MSG_TYPE_MASK :u32 =0x7f ; +const VENDOR_ID_SHIFT :u32 =8 ; +const VENDOR_ID_MASK :u32 =0xffff ; +const TYPE_SHIFT :u32 =24 ; +const TYPE_MASK :u32 =0xff ; + +/// Build an NVDM header for the given message type. +pub (crate )const fn new (nvdm_type:NvdmType ) ->Self { +Self ( +MSG_TYPE_VENDOR_PCI + | (VENDOR_ID_NV <<Self ::VENDOR_ID_SHIFT ) + | ((nvdm_typeas u32 ) <<Self ::TYPE_SHIFT ), + ) + } + +/// Return the raw packed u32. +pub (crate )const fn raw (self) ->u32 { + self.0 + } + +/// Extract the NVDM type field as a raw value. +pub (crate )const fn nvdm_type_raw (self) ->u32 { + (self.0 >>Self ::TYPE_SHIFT ) &Self ::TYPE_MASK + } + +/// Validate this header against the expected NVIDIA NVDM format and type. +pub (crate )const fn validate (self, expected_type:NvdmType ) ->bool { +let msg_type = self.0 &Self ::MSG_TYPE_MASK ; +let vendor_id = (self.0 >>Self ::VENDOR_ID_SHIFT ) &Self ::VENDOR_ID_MASK ; + msg_type ==MSG_TYPE_VENDOR_PCI
drivers/gpu/nova-core/mctp.rs line 107
Quoted 10 lines
drivers/gpu/nova-core/mctp.rs new file +10
-0+ && vendor_id ==VENDOR_ID_NV + && self.nvdm_type_raw () == expected_typeas u32 + } +} + +impl From <u32 >for NvdmHeader { +fn from (raw:u32 ) ->Self { +Self (raw) + } +}
I think you will want to use the bitfield macro in nova-core/bitfield.rs to define MctpHeader and NvdmHeader as that's precisely what it is designed to handle. It works like the register macro, without the I/O part.
PATCH v6 22/34 gpu: nova-core: Hopper/Blackwell: add FSP secure boot completion waiting
In reply to John HubbardAdd the FSP (Firmware System Processor) module for Hopper/Blackwell GPUs. These architectures use a simplified firmware boot sequence:
FMC --> FSP --> GSP, with no SEC2 involvement.
This commit adds the ability to wait for FSP secure boot completion by polling the I2CS thermal scratch register until FSP signals success.
--- drivers/gpu/nova-core/fsp.rs | 141 +++++++++++++++++++++++++++++ drivers/gpu/nova-core/nova_core.rs | 1 + drivers/gpu/nova-core/regs.rs | 12 +-- 3 files changed, 148 insertions(+), 6 deletions(-) create mode 100644 drivers/gpu/nova-core/fsp.rs
drivers/gpu/nova-core/fsp.rs new file +141 -0
@@ -0,0 +1,141 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! FSP (Firmware System Processor) interface for Hopper/Blackwell GPUs. +//! +//! Hopper/Blackwell use a simplified firmware boot sequence: FMC --> FSP --> GSP. +//! Unlike Turing/Ampere/Ada, there is NO SEC2 (Security Engine 2) usage. +//! FSP handles secure boot directly using FMC firmware + Chain of Trust. + +use kernel::{ + device, + io::poll::read_poll_timeout, + prelude::*, + time::Delta , + transmute::{ +AsBytes , +FromBytes ,// + }, +}; + +use crate ::regs; + +/// FSP secure boot completion timeout in milliseconds. +const FSP_SECURE_BOOT_TIMEOUT_MS :i64 =4000 ; + +/// GSP FMC initialization parameters. +#[repr( C )] +#[derive( Debug , Clone , Copy , Default )] +struct GspFmcInitParams { +/// CC initialization "registry keys". + regkeys:u32 , +} + +// SAFETY: GspFmcInitParams is a simple C struct with only primitive types. +unsafe impl AsBytes for GspFmcInitParams {} +// SAFETY: All bit patterns are valid for the primitive fields. +unsafe impl FromBytes for GspFmcInitParams {} + +/// GSP ACR (Authenticated Code RAM) boot parameters. +#[repr( C )] +#[derive( Debug , Clone , Copy , Default )] +struct GspAcrBootGspRmParams { +/// Physical memory aperture through which gspRmDescPa is accessed. + target:u32 , +/// Size in bytes of the GSP-RM descriptor structure. + gsp_rm_desc_size:u32 , +/// Physical offset in the target aperture of the GSP-RM descriptor structure. + gsp_rm_desc_offset:u64 , +/// Physical offset in FB to set the start of the WPR containing GSP-RM. + wpr_carveout_offset:u64 , +/// Size in bytes of the WPR containing GSP-RM. + wpr_carveout_size:u32 , +/// Whether to boot GSP-RM or GSP-Proxy through ACR. + b_is_gsp_rm_boot:u32 , +} + +// SAFETY: GspAcrBootGspRmParams is a simple C struct with only primitive types. +unsafe impl AsBytes for GspAcrBootGspRmParams {} +// SAFETY: All bit patterns are valid for the primitive fields. +unsafe impl FromBytes for GspAcrBootGspRmParams {} + +/// GSP RM boot parameters. +#[repr( C )] +#[derive( Debug , Clone , Copy , Default )] +struct GspRmParams { +/// Physical memory aperture through which bootArgsOffset is accessed. + target:u32 , +/// Physical offset in the memory aperture that will be passed to GSP-RM. + boot_args_offset:u64 , +} + +// SAFETY: GspRmParams is a simple C struct with only primitive types. +unsafe impl AsBytes for GspRmParams {} +// SAFETY: All bit patterns are valid for the primitive fields. +unsafe impl FromBytes for GspRmParams {} + +/// GSP SPDM (Security Protocol and Data Model) parameters. +#[repr( C )] +#[derive( Debug , Clone , Copy , Default )] +struct GspSpdmParams { +/// Physical memory aperture through which all addresses are accessed. + target:u32 , +/// Physical offset in the memory aperture where SPDM payload buffer is stored. + payload_buffer_offset:u64 , +/// Size of the above payload buffer. + payload_buffer_size:u32 , +} + +// SAFETY: GspSpdmParams is a simple C struct with only primitive types. +unsafe impl AsBytes for GspSpdmParams {} +// SAFETY: All bit patterns are valid for the primitive fields. +unsafe impl FromBytes for GspSpdmParams {} + +/// Complete GSP FMC boot parameters passed to FSP. +#[repr( C )] +#[derive( Debug , Clone , Copy , Default )] +pub (crate )struct GspFmcBootParams { + init_params:GspFmcInitParams , + boot_gsp_rm_params:GspAcrBootGspRmParams , + gsp_rm_params:GspRmParams , + gsp_spdm_params:GspSpdmParams , +} + +// SAFETY: GspFmcBootParams is composed of C structs with only primitive types. +unsafe impl AsBytes for GspFmcBootParams {} +// SAFETY: All bit patterns are valid for the primitive fields. +unsafe impl FromBytes for GspFmcBootParams {} + +/// FSP interface for Hopper/Blackwell GPUs. +pub (crate )struct Fsp ; + +impl Fsp { +/// Wait for FSP secure boot completion. +/// +/// Polls the thermal scratch register until FSP signals boot completion +/// or timeout occurs. +#[expect(dead_code)] +pub (crate )fn wait_secure_boot ( + dev: &device::Device <device::Bound >, + bar: &crate ::driver::Bar0 , + arch:crate ::gpu::Architecture , + ) ->Result { +debug_assert! ( + regs::read_fsp_boot_complete_status (bar, arch).is_some (), +"wait_secure_boot called on non-FSP architecture" + ); + +let timeout =Delta ::from_millis (FSP_SECURE_BOOT_TIMEOUT_MS ); + +read_poll_timeout ( + || regs::read_fsp_boot_complete_status (bar, arch).ok_or (ENOTSUPP ), + |&status| status == regs::FSP_BOOT_COMPLETE_SUCCESS , +Delta ::from_millis (10 ), + timeout, + ) + .map_err (|_| { +dev_err! (dev,"FSP secure boot completion timeout\n" ); +ETIMEDOUT + }) + .map (|_| ()) + } +}
drivers/gpu/nova-core/nova_core.rs +1 -0
@@ -10,6 +10,7 @@mod falcon;mod fb;mod firmware; +mod fsp;mod gfw;mod gpu;mod gsp;
drivers/gpu/nova-core/regs.rs +6 -6
@@ -508,17 +508,17 @@ pub(crate) fn fsp_thermal_scratch_reg_addr(arch: Architecture) -> Result<usize> }/// FSP writes this value to indicate successful boot completion. -#[expect(unused)] pub (crate )const FSP_BOOT_COMPLETE_SUCCESS :u32 =0xff ; -// Helper function to read FSP boot completion status from the correct register -#[expect(unused)] +/// Read FSP boot completion status from the architecture-specific thermal scratch register. +/// +/// Returns `None` if the architecture does not have an FSP. pub (crate )fn read_fsp_boot_complete_status ( bar: &crate ::driver::Bar0 , arch:Architecture , -) ->Result <u32 > { -let addr =fsp_thermal_scratch_reg_addr (arch)?; -Ok (bar.read32 (addr)) +) ->Option <u32 > { +let addr =fsp_thermal_scratch_reg_addr (arch).ok ()?; +Some (bar.read32 (addr)) }// The modules below provide registers that are not identical on all supported chips. They should
Signature · 1 line
2.53.0
PATCH v6 23/34 gpu: nova-core: Hopper/Blackwell: add FSP message structures
In reply to John HubbardAdd the NVDM COT payload, FSP message, and FSP response structures needed for FSP Chain of Trust communication. Also add FmcSignatures to hold the hash, public key, and signature extracted from FMC firmware.
--- drivers/gpu/nova-core/firmware.rs | 5 +- drivers/gpu/nova-core/fsp.rs | 78 +++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 1 deletion(-)
drivers/gpu/nova-core/firmware.rs +4 -1
@@ -26,6 +26,9 @@ }, }; +#[expect(unused)] +pub (crate )use elf::elf_section; +pub (crate )mod booter;pub (crate )mod fsp;pub (crate )mod fwsec;
@@ -627,7 +630,7 @@ fn elf32_section<'a>(elf: &'a [u8], name: &str) -> Option<&'a [u8]> { }/// Automatically detects ELF32 vs ELF64 based on the ELF header. -pub (super )fn elf_section <'a>(elf: &'a [u8 ], name: &str ) ->Option <&'a [u8 ]> { +pub (crate )fn elf_section <'a>(elf: &'a [u8 ], name: &str ) ->Option <&'a [u8 ]> {// Check ELF magic. if elf.len () <5 || elf.get (0 ..4 )? !=b"\x7fELF" {return None ;
drivers/gpu/nova-core/fsp.rs +78 -0
84 lines not on this page · raw message
Signature · 1 line
2.53.0
Alexandre Courbot
maintainerRe: [PATCH v6 23/34] gpu: nova-core: Hopper/Blackwell: add FSP message structures
Quoted 54 lines · John Hubbard
Add the NVDM COT payload, FSP message, and FSP response structures needed for FSP Chain of Trust communication. Also add FmcSignatures to hold the hash, public key, and signature extracted from FMC firmware.
Signed-off-by John Hubbard <[email protected]>--- drivers/gpu/nova-core/firmware.rs | 5 +- drivers/gpu/nova-core/fsp.rs | 78 +++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 1 deletion(-)drivers/gpu/nova-core/firmware.rs +4
-1@@ -26,6 +26,9 @@ }, }; +#[expect(unused)] +pub (crate )use elf::elf_section; +pub (crate )mod booter;pub (crate )mod fsp;pub (crate )mod fwsec;@@ -627,7 +630,7 @@ fn elf32_section<'a>(elf: &'a [u8], name: &str) -> Option<&'a [u8]> { }/// Automatically detects ELF32 vs ELF64 based on the ELF header. -pub (super )fn elf_section <'a>(elf: &'a [u8 ], name: &str ) ->Option <&'a [u8 ]> { +pub (crate )fn elf_section <'a>(elf: &'a [u8 ], name: &str ) ->Option <&'a [u8 ]> {// Check ELF magic. if elf.len () <5 || elf.get (0 ..4 )? !=b"\x7fELF" {return None ;drivers/gpu/nova-core/fsp.rs +13
-0@@ -105,6 +105,84 @@ unsafe impl AsBytes for GspFmcBootParams {}// SAFETY: All bit patterns are valid for the primitive fields. unsafe impl FromBytes for GspFmcBootParams {} +/// Size constraints for FSP security signatures (Hopper/Blackwell). +const FSP_HASH_SIZE :usize =48 ;// SHA-384 hash +const FSP_PKEY_SIZE :usize =384 ;// RSA-3072 public key +const FSP_SIG_SIZE :usize =384 ;// RSA-3072 signature + +/// Structure to hold FMC signatures. +#[derive( Debug , Clone , Copy )] +#[expect(dead_code)] +pub (crate )struct FmcSignatures { + hash384: [u8 ;FSP_HASH_SIZE ], + public_key: [u8 ;FSP_PKEY_SIZE ], + signature: [u8 ;FSP_SIG_SIZE ], +}
drivers/gpu/nova-core/fsp.rs unsafe impl AsBytes for GspFmcBootParams {} · line 130
Quoted 10 lines
drivers/gpu/nova-core/fsp.rs +10
-0+ +impl Default for FmcSignatures { +fn default () ->Self { +Self { + hash384: [0u8 ;FSP_HASH_SIZE ], + public_key: [0u8 ;FSP_PKEY_SIZE ], + signature: [0u8 ;FSP_SIG_SIZE ], + } + } +}
Since everything is initialized to zero you should be able to derive Default instead of bringing your own implementation.
Quoted 47 lines
drivers/gpu/nova-core/fsp.rs +47
-0+ +/// FSP Command Response payload structure. +/// NVDM_PAYLOAD_COMMAND_RESPONSE structure. +#[repr( C , packed)] +#[derive( Clone , Copy )] +struct NvdmPayloadCommandResponse { + task_id:u32 , + command_nvdm_type:u32 , + error_code:u32 , +} + +/// NVDM (NVIDIA Device Management) COT (Chain of Trust) payload structure. +/// This is the main message payload sent to FSP for Chain of Trust. +#[repr( C , packed)] +#[derive( Clone , Copy )] +struct NvdmPayloadCot { + version:u16 , + size:u16 , + gsp_fmc_sysmem_offset:u64 , + frts_sysmem_offset:u64 , + frts_sysmem_size:u32 , + frts_vidmem_offset:u64 , + frts_vidmem_size:u32 , + hash384: [u8 ;FSP_HASH_SIZE ], + public_key: [u8 ;FSP_PKEY_SIZE ], + signature: [u8 ;FSP_SIG_SIZE ], + gsp_boot_args_sysmem_offset:u64 , +} + +/// Complete FSP message structure with MCTP and NVDM headers. +#[repr( C , packed)] +#[derive( Clone , Copy )] +#[expect(dead_code)] +struct FspMessage { + mctp_header:u32 , + nvdm_header:u32 , + cot:NvdmPayloadCot , +} + +// SAFETY: FspMessage is a packed C struct with only integral fields. +unsafe impl AsBytes for FspMessage {} + +/// Complete FSP response structure with MCTP and NVDM headers. +#[repr( C , packed)] +#[derive( Clone , Copy )] +#[expect(dead_code)] +struct FspResponse {
drivers/gpu/nova-core/fsp.rs unsafe impl AsBytes for GspFmcBootParams {} · line 187
Quoted 10 lines
drivers/gpu/nova-core/fsp.rs +8
-0+ mctp_header: u32, + nvdm_header: u32, + response: NvdmPayloadCommandResponse, +} + +// SAFETY: FspResponse is a packed C struct with only integral fields. +unsafe impl FromBytes for FspResponse {} +/// FSP interface for Hopper/Blackwell GPUs. pub (crate )struct Fsp ;
All this code seems to be directly or indirectly dead for now - is there a way to merge this patch with the one that makes use of these? I don't mind larger patches if they mostly add new code, as it comes down to the same at the end of the day.
PATCH v6 24/34 gpu: nova-core: Hopper/Blackwell: add FMC signature extraction
In reply to John HubbardAdd extract_fmc_signatures() which extracts SHA-384 hash, RSA public key, and RSA signature from FMC ELF32 firmware sections. These are needed for FSP Chain of Trust verification.
--- drivers/gpu/nova-core/firmware.rs | 1 - drivers/gpu/nova-core/fsp.rs | 61 ++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 2 deletions(-)
drivers/gpu/nova-core/firmware.rs +0 -1
@@ -26,7 +26,6 @@ }, }; -#[expect(unused)] pub (crate )use elf::elf_section;pub (crate )mod booter;
drivers/gpu/nova-core/fsp.rs +60 -1
71 lines not on this page · raw message
Signature · 1 line
2.53.0
PATCH v6 25/34 gpu: nova-core: Hopper/Blackwell: add FSP send/receive messaging
In reply to John HubbardAdd send_sync_fsp() which sends an MCTP/NVDM message to FSP and waits for the response. Response validation uses the typed MctpHeader and NvdmHeader wrappers from the previous commit.
A MessageToFsp trait provides the NVDM type constant for each message struct, so send_sync_fsp() can verify that the response matches the request.
--- drivers/gpu/nova-core/falcon/fsp.rs | 3 - drivers/gpu/nova-core/fsp.rs | 107 +++++++++++++++++++++++++++- 2 files changed, 105 insertions(+), 5 deletions(-)
drivers/gpu/nova-core/falcon/fsp.rs +0 -3
@@ -152,7 +152,6 @@ pub(crate) fn read_emem(&self, bar: &Bar0, offset: u32, data: &mut [u8]) -> Resu/// /// The FSP message queue is not circular - pointers are reset to 0 after each /// message exchange, so `tail >= head` is always true when data is present. -#[expect(unused)] pub (crate )fn poll_msgq (&self, bar: &Bar0 ) ->u32 {let head = regs::NV_PFSP_MSGQ_HEAD ::read (bar).address ();let tail = regs::NV_PFSP_MSGQ_TAIL ::read (bar).address ();
@@ -175,7 +174,6 @@ pub(crate) fn poll_msgq(&self, bar: &Bar0) -> u32 {/// /// # Returns /// `Ok(())` on success, `Err(EINVAL)` if packet is empty or not 4-byte aligned -#[expect(unused)] pub (crate )fn send_msg (&self, bar: &Bar0 , packet: &[u8 ]) ->Result {if packet.is_empty () {return Err (EINVAL );
@@ -207,7 +205,6 @@ pub(crate) fn send_msg(&self, bar: &Bar0, packet: &[u8]) -> Result {/// /// # Returns /// `Ok(bytes_read)` on success, `Err(EINVAL)` if size is 0, exceeds buffer, or not aligned -#[expect(unused)] pub (crate )fn recv_msg (&self, bar: &Bar0 , buffer: &mut [u8 ], size:usize ) ->Result <usize > {if size ==0 || size > buffer.len () {return Err (EINVAL );
drivers/gpu/nova-core/fsp.rs +105 -2
135 lines not on this page · raw message
Signature · 1 line
2.53.0
PATCH v6 26/34 gpu: nova-core: Hopper/Blackwell: add FspCotVersion type
In reply to John HubbardAdd FspCotVersion to represent the FSP Chain of Trust protocol version, and Chipset::fsp_cot_version() which returns the version for each architecture. Hopper uses version 1, Blackwell uses version 2. Non-FSP architectures return None.
--- drivers/gpu/nova-core/fsp.rs | 19 +++++++++++++++++++ drivers/gpu/nova-core/gpu.rs | 14 ++++++++++++++ 2 files changed, 33 insertions(+)
drivers/gpu/nova-core/fsp.rs +19 -0
@@ -25,6 +25,25 @@ NvdmType, // }; +/// FSP Chain of Trust protocol version. +/// +/// Hopper (GH100) uses version 1, Blackwell uses version 2. +#[derive( Debug , Clone , Copy )] +pub (crate )struct FspCotVersion (u16 ); + +impl FspCotVersion { +/// Create a new FSP COT version. +pub (crate )const fn new (version:u16 ) ->Self { +Self (version) + } + +/// Return the raw protocol version number for the wire format. +#[expect(dead_code)] +pub (crate )const fn raw (self) ->u16 { + self.0 + } +} +/// FSP message timeout in milliseconds. const FSP_MSG_TIMEOUT_MS :i64 =2000 ;
drivers/gpu/nova-core/gpu.rs +14 -0
@@ -21,6 +21,7 @@ Falcon, // }, fb::SysmemFlush, + fsp::FspCotVersion, gfw, gsp::Gsp, regs,
@@ -134,6 +135,19 @@ pub(crate) const fn arch(self) -> Architecture {pub (crate )const fn needs_fwsec_bootloader (self) ->bool {matches! (self.arch (),Architecture ::Turing ) ||matches! (self,Self ::GA100 ) } + +/// Returns the FSP Chain of Trust (COT) protocol version for this chipset. +/// +/// Hopper (GH100) uses version 1, Blackwell uses version 2. +/// Returns `None` for architectures that do not use FSP. +#[expect(dead_code)] +pub (crate )const fn fsp_cot_version (self) ->Option <FspCotVersion > { +match self.arch () { +Architecture ::Hopper =>Some (FspCotVersion ::new (1 )), +Architecture ::Blackwell =>Some (FspCotVersion ::new (2 )), + _ =>None , + } + } }// TODO
Signature · 1 line
2.53.0
PATCH v6 27/34 gpu: nova-core: Hopper/Blackwell: larger non-WPR heap
In reply to John HubbardAdd dedicated FB HALs for Hopper (GH100) and Blackwell (GB100) with architecture-specific non-WPR heap sizes. Hopper uses 2 MiB, Blackwell uses 2 MiB + 128 KiB. These are needed for the larger reserved memory regions that Hopper/Blackwell GPUs require.
Also adds the non_wpr_heap_size() method to the FbHal trait, and the total_reserved_size field to FbLayout.
--- drivers/gpu/nova-core/fb.rs | 16 ++++++++--- drivers/gpu/nova-core/fb/hal.rs | 16 ++++++++--- drivers/gpu/nova-core/fb/hal/ga102.rs | 2 +- drivers/gpu/nova-core/fb/hal/gb100.rs | 38 +++++++++++++++++++++++++++ drivers/gpu/nova-core/fb/hal/gh100.rs | 38 +++++++++++++++++++++++++++ 5 files changed, 102 insertions(+), 8 deletions(-) create mode 100644 drivers/gpu/nova-core/fb/hal/gb100.rs create mode 100644 drivers/gpu/nova-core/fb/hal/gh100.rs
drivers/gpu/nova-core/fb.rs +12 -4
@@ -31,7 +31,7 @@ regs, }; -mod hal; +pub (crate )mod hal;/// Type holding the sysmem flush memory page, a page of memory to be written into the /// `NV_PFB_NISO_FLUSH_SYSMEM_ADDR*` registers and used to maintain memory coherency.
@@ -99,6 +99,15 @@ pub(crate) fn unregister(&self, bar: &Bar0) { } } +/// Calculate non-WPR heap size based on chipset architecture. +/// This matches the logic used in FSP for consistency. +pub (crate )fn calc_non_wpr_heap_size (chipset:Chipset ) ->u64 { + hal::fb_hal (chipset) + .non_wpr_heap_size () + .map (u64::from) + .unwrap_or (usize_as_u64 (SZ_1M )) +} +pub (crate )struct FbRange (Range <u64 >);impl FbRange {
@@ -253,9 +262,8 @@ pub(crate) fn new(chipset: Chipset, bar: &Bar0, gsp_fw: &GspFirmware) -> Result< };let heap = { -const HEAP_SIZE :u64 =usize_as_u64 (SZ_1M ); - -FbRange (wpr2.start -HEAP_SIZE ..wpr2.start) +let heap_size =calc_non_wpr_heap_size (chipset); +FbRange (wpr2.start - heap_size..wpr2.start) };Ok (Self {
drivers/gpu/nova-core/fb/hal.rs +13 -3
@@ -12,6 +12,8 @@mod ga100;mod ga102; +mod gb100; +mod gh100;mod tu102;pub (crate )trait FbHal {
@@ -28,14 +30,22 @@ pub(crate) trait FbHal {/// Returns the VRAM size, in bytes. fn vidmem_size (&self, bar: &Bar0 ) ->u64 ; + +/// Returns the non-WPR heap size for GPUs that need large reserved memory. +/// +/// Returns `None` for GPUs that don't need extra reserved memory. +fn non_wpr_heap_size (&self) ->Option <u32 > { +None + } }/// Returns the HAL corresponding to `chipset`. -pub (super )fn fb_hal (chipset:Chipset ) -> &'staticdyn FbHal { +pub (crate )fn fb_hal (chipset:Chipset ) -> &'staticdyn FbHal {match chipset.arch () {Architecture ::Turing => tu102::TU102_HAL ,Architecture ::Ampere if chipset ==Chipset ::GA100 => ga100::GA100_HAL , -Architecture ::Ampere => ga102::GA102_HAL , -Architecture ::Ada |Architecture ::Hopper |Architecture ::Blackwell => ga102::GA102_HAL , +Architecture ::Ampere |Architecture ::Ada => ga102::GA102_HAL , +Architecture ::Hopper => gh100::GH100_HAL , +Architecture ::Blackwell => gb100::GB100_HAL , } }
drivers/gpu/nova-core/fb/hal/ga102.rs +1 -1
@@ -8,7 +8,7 @@ regs, // }; -fn vidmem_size_ga102 (bar: &Bar0 ) ->u64 { +pub (super )fn vidmem_size_ga102 (bar: &Bar0 ) ->u64 { regs::NV_USABLE_FB_SIZE_IN_MB ::read (bar).usable_fb_size () }
drivers/gpu/nova-core/fb/hal/gb100.rs new file +38 -0
@@ -0,0 +1,38 @@ +// SPDX-License-Identifier: GPL-2.0 + +use kernel::prelude::*; + +use crate ::{ + driver::Bar0 , + fb::hal::FbHal ,// +}; + +struct Gb100 ; + +impl FbHal for Gb100 { +fn read_sysmem_flush_page (&self, bar: &Bar0 ) ->u64 { +super ::ga100::read_sysmem_flush_page_ga100 (bar) + } + +fn write_sysmem_flush_page (&self, bar: &Bar0 , addr:u64 ) ->Result { +super ::ga100::write_sysmem_flush_page_ga100 (bar, addr); + +Ok (()) + } + +fn supports_display (&self, bar: &Bar0 ) ->bool { +super ::ga100::display_enabled_ga100 (bar) + } + +fn vidmem_size (&self, bar: &Bar0 ) ->u64 { +super ::ga102::vidmem_size_ga102 (bar) + } + +fn non_wpr_heap_size (&self) ->Option <u32 > { +// 2 MiB + 128 KiB non-WPR heap for Blackwell (see Open RM: kgspCalculateFbLayout_GB100). +Some (0x220000 ) + } +} + +const GB100 :Gb100 =Gb100 ; +pub (super )const GB100_HAL : &dyn FbHal = &GB100 ;
drivers/gpu/nova-core/fb/hal/gh100.rs new file +38 -0
@@ -0,0 +1,38 @@ +// SPDX-License-Identifier: GPL-2.0 + +use kernel::prelude::*; + +use crate ::{ + driver::Bar0 , + fb::hal::FbHal ,// +}; + +struct Gh100 ; + +impl FbHal for Gh100 { +fn read_sysmem_flush_page (&self, bar: &Bar0 ) ->u64 { +super ::ga100::read_sysmem_flush_page_ga100 (bar) + } + +fn write_sysmem_flush_page (&self, bar: &Bar0 , addr:u64 ) ->Result { +super ::ga100::write_sysmem_flush_page_ga100 (bar, addr); + +Ok (()) + } + +fn supports_display (&self, bar: &Bar0 ) ->bool { +super ::ga100::display_enabled_ga100 (bar) + } + +fn vidmem_size (&self, bar: &Bar0 ) ->u64 { +super ::ga102::vidmem_size_ga102 (bar) + } + +fn non_wpr_heap_size (&self) ->Option <u32 > { +// 2 MiB non-WPR heap for Hopper (see Open RM: kgspCalculateFbLayout_GH100). +Some (0x200000 ) + } +} + +const GH100 :Gh100 =Gh100 ; +pub (super )const GH100_HAL : &dyn FbHal = &GH100 ;
Signature · 1 line
2.53.0
PATCH v6 28/34 gpu: nova-core: Hopper/Blackwell: add FSP Chain of Trust boot
In reply to John HubbardAdd boot_fmc() which builds and sends the Chain of Trust message to FSP, and FmcBootArgs which bundles the DMA-coherent boot parameters that FSP reads at boot time. The FspFirmware struct fields become pub(crate) and fmc_full changes from DmaObject to KVec<u8> for CPU-side signature extraction.
--- drivers/gpu/nova-core/firmware/fsp.rs | 14 ++- drivers/gpu/nova-core/fsp.rs | 134 +++++++++++++++++++++++++- drivers/gpu/nova-core/gpu.rs | 1 - drivers/gpu/nova-core/mctp.rs | 2 - 4 files changed, 141 insertions(+), 10 deletions(-)
drivers/gpu/nova-core/firmware/fsp.rs +9 -5
@@ -13,16 +13,16 @@ gpu::Chipset, // }; -#[expect(unused)] +#[expect(dead_code)] pub (crate )struct FspFirmware {/// FMC firmware image data (only the "image" ELF section). - fmc_image:DmaObject , +pub (crate ) fmc_image:DmaObject ,/// Full FMC ELF data (for signature extraction). - fmc_full:DmaObject , +pub (crate ) fmc_full:KVec <u8 >, }impl FspFirmware { -#[expect(unused)] +#[expect(dead_code)] pub (crate )fn new ( dev: &device::Device <device::Bound >, chipset: Chipset,
@@ -36,9 +36,13 @@ pub(crate) fn new(EINVAL })?; +// Copy the full ELF into a kernel vector for CPU-side signature extraction +let mut fmc_full =KVec ::with_capacity (fw.data ().len (),GFP_KERNEL )?; + fmc_full.extend_from_slice (fw.data (),GFP_KERNEL )?; +Ok (Self { fmc_image:DmaObject ::from_data (dev, fmc_image_data)?, - fmc_full:DmaObject ::from_data (dev, fw.data ())?, + fmc_full, }) } }
drivers/gpu/nova-core/fsp.rs +132 -2
161 lines not on this page · raw message
drivers/gpu/nova-core/gpu.rs +0 -1
@@ -140,7 +140,6 @@ pub(crate) const fn needs_fwsec_bootloader(self) -> bool {/// /// Hopper (GH100) uses version 1, Blackwell uses version 2. /// Returns `None` for architectures that do not use FSP. -#[expect(dead_code)] pub (crate )const fn fsp_cot_version (self) ->Option <FspCotVersion > {match self.arch () {Architecture ::Hopper =>Some (FspCotVersion ::new (1 )),
drivers/gpu/nova-core/mctp.rs +0 -2
@@ -6,8 +6,6 @@//! Device Management) messages between the kernel driver and GPU firmware //! processors such as FSP and GSP. -#![expect(dead_code)] -/// NVDM message type identifiers carried over MCTP. #[derive( Debug , Clone , Copy , PartialEq , Eq )] #[repr( u32 )]
Signature · 1 line
2.53.0
Alexandre Courbot
maintainerRe: [PATCH v6 28/34] gpu: nova-core: Hopper/Blackwell: add FSP Chain of Trust boot
Quoted 23 lines · John Hubbard
Add
boot_fmc()which builds and sends the Chain of Trust message to FSP, and FmcBootArgs which bundles the DMA-coherent boot parameters that FSP reads at boot time. The FspFirmware struct fields become pub(crate) andfmc_fullchanges from DmaObject to KVec<u8> for CPU-side signature extraction.Co-developed-by Alexandre Courbot <[email protected]>Signed-off-by Alexandre Courbot <[email protected]>Signed-off-by John Hubbard <[email protected]>--- drivers/gpu/nova-core/firmware/fsp.rs | 14 ++- drivers/gpu/nova-core/fsp.rs | 134 +++++++++++++++++++++++++- drivers/gpu/nova-core/gpu.rs | 1 - drivers/gpu/nova-core/mctp.rs | 2 - 4 files changed, 141 insertions(+), 10 deletions(-)drivers/gpu/nova-core/firmware/fsp.rs +0
-0@@ -13,16 +13,16 @@ gpu::Chipset, // };
drivers/gpu/nova-core/firmware/fsp.rs line 21
Quoted 10 lines
drivers/gpu/nova-core/firmware/fsp.rs +3
-3-#[expect(unused)] +#[expect(dead_code)] pub (crate )struct FspFirmware {/// FMC firmware image data (only the "image" ELF section). - fmc_image:DmaObject , +pub (crate ) fmc_image:DmaObject ,/// Full FMC ELF data (for signature extraction). - fmc_full:DmaObject , +pub (crate ) fmc_full:KVec <u8 >,
This looks like fmc_full should have been a KVec since the beginning
- unless I missed something there was no point in keeping it as a DmaObject for a while.
Quoted 29 lines
drivers/gpu/nova-core/firmware/fsp.rs +6
-2}impl FspFirmware { -#[expect(unused)] +#[expect(dead_code)] pub (crate )fn new ( dev: &device::Device <device::Bound >, chipset: Chipset,@@ -36,9 +36,13 @@ pub(crate) fn new(EINVAL })?; +// Copy the full ELF into a kernel vector for CPU-side signature extraction +let mut fmc_full =KVec ::with_capacity (fw.data ().len (),GFP_KERNEL )?; + fmc_full.extend_from_slice (fw.data (),GFP_KERNEL )?; +Ok (Self { fmc_image:DmaObject ::from_data (dev, fmc_image_data)?, - fmc_full:DmaObject ::from_data (dev, fw.data ())?, + fmc_full, }) } }drivers/gpu/nova-core/fsp.rs +0
-0@@ -8,8 +8,14 @@
drivers/gpu/nova-core/fsp.rs line 18
Quoted 10 lines
drivers/gpu/nova-core/fsp.rs +6
-0use kernel::{ device, + dma::CoherentAllocation , io::poll::read_poll_timeout, prelude::*, + ptr::{ +Alignable , +Alignment ,// + }, + sizes::{SZ_1M ,SZ_2M },
Nit: import format. (can't wait for the rustfmt support for that one).
Quoted 31 lines
drivers/gpu/nova-core/fsp.rs +16
-1time::Delta, transmute::{AsBytes ,@@ -38,7 +44,6 @@ pub(crate) const fn new(version: u16) -> Self { }/// Return the raw protocol version number for the wire format. -#[expect(dead_code)] pub (crate )const fn raw (self) ->u16 { self.0 }@@ -221,6 +226,73 @@ impl MessageToFsp for FspMessage {const NVDM_TYPE :u32 =NvdmType ::Cot as u32 ; } +/// Bundled arguments for FMC boot via FSP Chain of Trust. +pub (crate )struct FmcBootArgs <'a> { + chipset:crate ::gpu::Chipset , + fmc_image_fw: &'acrate ::dma::DmaObject , + fmc_boot_params: kernel::dma::CoherentAllocation <GspFmcBootParams >, + resume:bool , + signatures: &'aFmcSignatures , +} + +impl <'a>FmcBootArgs <'a> { +/// Build FMC boot arguments, allocating the DMA-coherent boot parameter +/// structure that FSP will read. +#[expect(dead_code)] +#[allow(clippy::too_many_arguments)] +pub (crate )fn new ( + dev: &device::Device<device::Bound>,
drivers/gpu/nova-core/fsp.rs impl MessageToFsp for FspMessage { · line 254
Quoted 10 lines
drivers/gpu/nova-core/fsp.rs +10
-0+ chipset: crate::gpu::Chipset, + fmc_image_fw: &'a crate::dma::DmaObject, + wpr_meta_addr: u64, + wpr_meta_size: u32, + libos_addr: u64, + resume: bool, + signatures: &'a FmcSignatures, + ) -> Result<Self> { +const GSP_DMA_TARGET_COHERENT_SYSTEM :u32 =1 ; +const GSP_DMA_TARGET_NONCOHERENT_SYSTEM :u32 =2 ;
I see these in OpenRM's src/nvidia/arch/nvalloc/common/inc/gsp/gspifpub.h - can we add them to the bindings?
drivers/gpu/nova-core/fsp.rs impl MessageToFsp for FspMessage { · line 264
Quoted 10 lines
drivers/gpu/nova-core/fsp.rs +10
-0+ +let fmc_boot_params =CoherentAllocation ::<GspFmcBootParams >::alloc_coherent ( + dev, +1 , +GFP_KERNEL | __GFP_ZERO, + )?; + + kernel::dma_write!( + fmc_boot_params[0 ].boot_gsp_rm_params.target =GSP_DMA_TARGET_COHERENT_SYSTEM + )?;
Note: on the latest drm-rust-next, this needs to be updated to
kernel::dma_write!(
fmc_boot_params,
[0]?.boot_gsp_rm_params.target,
GSP_DMA_TARGET_COHERENT_SYSTEM
);(same the those below)
drivers/gpu/nova-core/fsp.rs impl MessageToFsp for FspMessage { · line 272
Quoted 8 lines
drivers/gpu/nova-core/fsp.rs +8
-0+ kernel::dma_write!( + fmc_boot_params[0 ].boot_gsp_rm_params.gsp_rm_desc_offset = wpr_meta_addr + )?; + kernel::dma_write!(fmc_boot_params[0 ].boot_gsp_rm_params.gsp_rm_desc_size = wpr_meta_size)?; + +// Blackwell FSP expects wpr_carveout_offset and wpr_carveout_size to be zero; +// it obtains WPR info from other sources. + kernel::dma_write!(fmc_boot_params[0 ].boot_gsp_rm_params.b_is_gsp_rm_boot =1 )?;
... or better, if we factor these writes into a single one:
kernel::dma_write!(
fmc_boot_params,
[0]?.boot_gsp_rm_params,
GspAcrBootGspRmParams {
target: GSP_DMA_TARGET_COHERENT_SYSTEM,
gsp_rm_desc_offset: wpr_meta_addr,
gsp_rm_desc_size: wpr_meta_size,
..Default::default()
}
);drivers/gpu/nova-core/fsp.rs impl MessageToFsp for FspMessage { · line 277
Quoted 5 lines
drivers/gpu/nova-core/fsp.rs +5
-0+ + kernel::dma_write!( + fmc_boot_params[0 ].gsp_rm_params.target =GSP_DMA_TARGET_NONCOHERENT_SYSTEM + )?; + kernel::dma_write!(fmc_boot_params[0 ].gsp_rm_params.boot_args_offset = libos_addr)?;
Here as well:
kernel::dma_write!(
fmc_boot_params,
[0]?.gsp_rm_params,
GspRmParams {
target: GSP_DMA_TARGET_NONCOHERENT_SYSTEM,
boot_args_offset: libos_addr,
}
);Quoted 37 lines
drivers/gpu/nova-core/fsp.rs +28
-1+ +Ok (Self { + chipset, + fmc_image_fw, + fmc_boot_params, + resume, + signatures, + }) + } + +/// DMA address of the FMC boot parameters, needed after boot for lockdown +/// release polling. +#[expect(dead_code)] +pub (crate )fn boot_params_dma_handle (&self) ->u64 { + self.fmc_boot_params.dma_handle () + } +} +/// FSP interface for Hopper/Blackwell GPUs. pub (crate )struct Fsp ;@@ -315,8 +387,66 @@ pub(crate) fn extract_fmc_signatures(Ok (signatures) } -/// Send message to FSP and wait for response. +/// Boot GSP FMC via FSP Chain of Trust. +/// +/// Builds the COT message from the pre-configured [`FmcBootArgs`], sends it +/// to FSP, and waits for the response. #[expect(dead_code)] +pub (crate )fn boot_fmc ( + dev: &device::Device <device::Bound >, + bar: &crate ::driver::Bar0 , + fsp_falcon: &crate ::falcon::Falcon <crate ::falcon::fsp::Fsp >, + args: &FmcBootArgs <'_>, + ) ->Result {
drivers/gpu/nova-core/fsp.rs pub(crate) fn extract_fmc_signatures( · line 410
Quoted 10 lines
drivers/gpu/nova-core/fsp.rs +10
-0+dev_dbg! (dev,"Starting FSP boot sequence for {}\n" , args.chipset); + +let fmc_addr = args.fmc_image_fw.dma_handle (); +let fmc_boot_params_addr = args.fmc_boot_params.dma_handle (); + +// frts_offset is relative to FB end: FRTS_location = FB_END - frts_offset +let frts_offset =if !args.resume { +let mut frts_reserved_size =crate ::fb::calc_non_wpr_heap_size (args.chipset); + + frts_reserved_size += u64::from (crate ::fb::PMU_RESERVED_SIZE );
Let's use a checked operation here.
PATCH v6 29/34 gpu: nova-core: Blackwell: use correct sysmem flush registers
In reply to John HubbardBlackwell GPUs moved the sysmem flush page registers away from the legacy NV_PFB_NISO_FLUSH_SYSMEM_ADDR used by Ampere/Ada.
GB10x uses HSHUB0 registers, with both a primary and EG (egress) pair that must be programmed to the same address. GB20x uses FBHUB0 registers.
Add separate GB100 and GB202 fb HALs, and split the Blackwell HAL dispatch so that each uses its respective registers.
--- drivers/gpu/nova-core/fb/hal.rs | 10 ++++- drivers/gpu/nova-core/fb/hal/gb100.rs | 47 +++++++++++++++++--- drivers/gpu/nova-core/fb/hal/gb202.rs | 62 +++++++++++++++++++++++++++ drivers/gpu/nova-core/regs.rs | 36 ++++++++++++++++ 4 files changed, 149 insertions(+), 6 deletions(-) create mode 100644 drivers/gpu/nova-core/fb/hal/gb202.rs
drivers/gpu/nova-core/fb/hal.rs +9 -1
@@ -13,9 +13,14 @@mod ga100;mod ga102;mod gb100; +mod gb202;mod gh100;mod tu102; +/// Non-WPR heap size for Blackwell (2 MiB + 128 KiB). +/// See Open RM: kgspCalculateFbLayout_GB100. +const BLACKWELL_NON_WPR_HEAP_SIZE :u32 =0x220000 ; +pub (crate )trait FbHal {/// Returns the address of the currently-registered sysmem flush page. fn read_sysmem_flush_page (&self, bar: &Bar0 ) ->u64 ;
@@ -46,6 +51,9 @@ pub(crate) fn fb_hal(chipset: Chipset) -> &'static dyn FbHal { Architecture::Ampere if chipset == Chipset::GA100 => ga100::GA100_HAL, Architecture::Ampere | Architecture::Ada => ga102::GA102_HAL, Architecture::Hopper => gh100::GH100_HAL, - Architecture::Blackwell => gb100::GB100_HAL, + Architecture::Blackwell => match chipset { + Chipset::GB100 | Chipset::GB102 => gb100::GB100_HAL, + _ => gb202::GB202_HAL, + }, } }
drivers/gpu/nova-core/fb/hal/gb100.rs +42 -5
71 lines not on this page · raw message
drivers/gpu/nova-core/fb/hal/gb202.rs new file +62 -0
62 lines not on this page · raw message
drivers/gpu/nova-core/regs.rs +36 -0
@@ -116,6 +116,42 @@ fn fmt(&self, f: &mut kernel::fmt::Formatter<'_>) -> kernel::fmt::Result { 23:0 adr_63_40 as u32; }); +// Blackwell GB10x sysmem flush registers (HSHUB0). +// +// GB10x GPUs use two pairs of HSHUB registers for sysmembar: a primary pair and an EG +// (egress) pair. Both must be programmed to the same address. Hardware ignores bits 7:0 +// of each LO register. HSHUB0 base is 0x00891000. + +register! (NV_PFB_HSHUB0_PCIE_FLUSH_SYSMEM_ADDR_LO @0x00891e50 { +31 :0 adras u32 ; +}); + +register! (NV_PFB_HSHUB0_PCIE_FLUSH_SYSMEM_ADDR_HI @0x00891e54 { +19 :0 adras u32 ; +}); + +register! (NV_PFB_HSHUB0_EG_PCIE_FLUSH_SYSMEM_ADDR_LO @0x008916c0 { +31 :0 adras u32 ; +}); + +register! (NV_PFB_HSHUB0_EG_PCIE_FLUSH_SYSMEM_ADDR_HI @0x008916c4 { +19 :0 adras u32 ; +}); + +// Blackwell GB20x sysmem flush registers (FBHUB0). +// +// Unlike the older NV_PFB_NISO_FLUSH_SYSMEM_ADDR registers which encode the address with an +// 8-bit right-shift, these registers take the raw address split into lower/upper 32-bit halves. +// The hardware ignores bits 7:0 of the LO register. + +register! (NV_PFB_FBHUB0_PCIE_FLUSH_SYSMEM_ADDR_LO @0x008a1d58 { +31 :0 adras u32 ; +}); + +register! (NV_PFB_FBHUB0_PCIE_FLUSH_SYSMEM_ADDR_HI @0x008a1d5c { +19 :0 adras u32 ; +}); +register! (NV_PFB_PRI_MMU_LOCAL_MEMORY_RANGE @0x00100ce0 {3 :0 lower_scaleas u8 ;9 :4 lower_magas u8 ;
Signature · 1 line
2.53.0
PATCH v6 30/34 gpu: nova-core: Hopper/Blackwell: larger WPR2 (GSP) heap
In reply to John HubbardHopper, Blackwell and later GPUs require a larger heap for WPR2.
--- drivers/gpu/nova-core/fb.rs | 2 +- drivers/gpu/nova-core/gsp/fw.rs | 74 ++++++++++++++++++++++++--------- 2 files changed, 55 insertions(+), 21 deletions(-)
drivers/gpu/nova-core/fb.rs +1 -1
@@ -247,7 +247,7 @@ pub(crate) fn new(chipset: Chipset, bar: &Bar0, gsp_fw: &GspFirmware) -> Result<let wpr2_heap = {const WPR2_HEAP_DOWN_ALIGN :Alignment =Alignment ::new ::<SZ_1M >();let wpr2_heap_size = - gsp::LibosParams ::from_chipset (chipset).wpr_heap_size (chipset, fb.end); + gsp::LibosParams ::from_chipset (chipset).wpr_heap_size (chipset, fb.end)?;let wpr2_heap_addr = (elf.start - wpr2_heap_size).align_down (WPR2_HEAP_DOWN_ALIGN );FbRange (wpr2_heap_addr..(elf.start).align_down (WPR2_HEAP_DOWN_ALIGN ))
drivers/gpu/nova-core/gsp/fw.rs +54 -20
115 lines not on this page · raw message
Signature · 1 line
2.53.0
Alexandre Courbot
maintainerRe: [PATCH v6 30/34] gpu: nova-core: Hopper/Blackwell: larger WPR2 (GSP) heap
On Tue Mar 10, 2026 at 11:11 AM JST, John Hubbard wrote:
<snip>
drivers/gpu/nova-core/gsp/fw.rs enum GspFwHeapParams {} · line 96
Quoted 11 lines
/// Returns the amount of memory to reserve for management purposes for a framebuffer of size /// `fb_size`.drivers/gpu/nova-core/gsp/fw.rs +2
-2-fn management_overhead (fb_size:u64 ) ->u64 { +fn management_overhead (fb_size:u64 ) ->Result <u64 > {let fb_size_gb = fb_size.div_ceil (u64::from_safe_cast (kernel::sizes::SZ_1G )); u64::from (bindings::GSP_FW_HEAP_PARAM_SIZE_PER_GB_FB ) .saturating_mul (fb_size_gb) .align_up (GSP_HEAP_ALIGNMENT ) - .unwrap_or (u64::MAX ) + .ok_or (EINVAL )
Since we are turning this into a fallible method (which I agree is the good move), can we also turn the multiplication into a checked one?
This (alongside making wpr_heap_size fallible) should be in a separate patch, as it is relevant regardless of Blackwell support.
PATCH v6 31/34 gpu: nova-core: refactor SEC2 booter loading into BooterFirmware::run()
In reply to John HubbardMove the SEC2 reset/load/boot sequence into a BooterFirmware::run() method, and call it from a thin run_booter() helper on Gsp. This is almost a pure refactoring with no behavior change, done in preparation for adding an alternative FSP boot path. The one slight difference is that an MBOX1 printing typo is fixed:
Previous output:
NovaCore 0000:e1:00.0: SEC2 MBOX0: 0x0, MBOX10x1
Fixed output:
NovaCore 0000:e1:00.0: SEC2 MBOX0: 0x0, MBOX1: 0x1
--- drivers/gpu/nova-core/firmware/booter.rs | 35 ++++++++++++++++++- drivers/gpu/nova-core/gsp/boot.rs | 43 +++++++++++------------- 2 files changed, 54 insertions(+), 24 deletions(-)
drivers/gpu/nova-core/firmware/booter.rs +34 -1
@@ -8,8 +8,12 @@use kernel::{ device, + dma::CoherentAllocation , prelude::*, - transmute::FromBytes ,// + transmute::{ +AsBytes , +FromBytes ,// + }, };use crate ::{
@@ -396,6 +400,35 @@ pub(crate) fn new( ucode: ucode_signed, }) } + +/// Load and run the booter firmware on SEC2. +/// +/// Resets SEC2, loads this firmware image, then boots with the WPR metadata +/// address passed via the SEC2 mailboxes. +pub (crate )fn run <T :AsBytes +FromBytes >( + &self, + dev: &device::Device <device::Bound >, + bar: &Bar0 , + sec2_falcon: &Falcon <Sec2 >, + wpr_meta: &CoherentAllocation <T >, + ) ->Result { + sec2_falcon.reset (bar)?; + sec2_falcon.load (dev, bar, self)?; +let wpr_handle = wpr_meta.dma_handle (); +let (mbox0, mbox1) = sec2_falcon.boot ( + bar, +Some (wpr_handleas u32 ), +Some ((wpr_handle >>32 )as u32 ), + )?; +dev_dbg! (dev,"SEC2 MBOX0: {:#x}, MBOX1: {:#x}\n" , mbox0, mbox1); + +if mbox0 !=0 { +dev_err! (dev,"Booter-load failed with error {:#x}\n" , mbox0); +return Err (ENODEV ); + } + +Ok (()) + } }impl FalconDmaLoadable for BooterFirmware {
drivers/gpu/nova-core/gsp/boot.rs +20 -23
61 lines not on this page · raw message
Signature · 1 line
2.53.0
PATCH v6 32/34 gpu: nova-core: Hopper/Blackwell: add GSP lockdown release polling
In reply to John HubbardOn Hopper and Blackwell, FSP boots GSP with hardware lockdown enabled. After FSP Chain of Trust completes, the driver must poll for lockdown release before proceeding with GSP initialization. Add the register bit and helper functions needed for this polling.
--- drivers/gpu/nova-core/gsp/boot.rs | 80 ++++++++++++++++++++++++++++++- drivers/gpu/nova-core/regs.rs | 1 + 2 files changed, 80 insertions(+), 1 deletion(-)
drivers/gpu/nova-core/gsp/boot.rs +79 -1
@@ -15,7 +15,8 @@ falcon::{ gsp::Gsp, sec2::Sec2, - Falcon, // + Falcon, + FalconEngine, // }, fb::FbLayout, firmware::{
@@ -44,6 +45,54 @@ vbios::Vbios, }; +/// GSP lockdown pattern written by firmware to mbox0 while RISC-V branch privilege +/// lockdown is active. The low byte varies, the upper 24 bits are fixed. +const GSP_LOCKDOWN_PATTERN :u32 =0xbadf4100 ; +const GSP_LOCKDOWN_MASK :u32 =0xffffff00 ; + +/// GSP falcon mailbox state, used to track lockdown release status. +struct GspMbox { + mbox0:u32 , + mbox1:u32 , +} + +impl GspMbox { +/// Read both mailboxes from the GSP falcon. +fn read (gsp_falcon: &Falcon <Gsp >, bar: &Bar0 ) ->Self { +Self { + mbox0: gsp_falcon.read_mailbox0 (bar), + mbox1: gsp_falcon.read_mailbox1 (bar), + } + } + +/// Returns true if the lockdown pattern is present in mbox0. +fn is_locked_down (&self) ->bool { + self.mbox0 !=0 && (self.mbox0 &GSP_LOCKDOWN_MASK ) ==GSP_LOCKDOWN_PATTERN + } + +/// Combines mailbox0 and mailbox1 into a 64-bit address. +fn combined_addr (&self) ->u64 { + (u64::from (self.mbox1) <<32 ) | u64::from (self.mbox0) + } + +/// Returns true if GSP lockdown has been released. +/// +/// Checks the lockdown pattern, validates the boot params address, +/// and verifies the HWCFG2 lockdown bit is clear. +fn lockdown_released (&self, bar: &Bar0 , fmc_boot_params_addr:u64 ) ->bool { +if self.is_locked_down () { +return false ; + } + +if self.mbox0 !=0 && self.combined_addr () != fmc_boot_params_addr { +return true ; + } + +let hwcfg2 = regs::NV_PFALCON_FALCON_HWCFG2 ::read (bar, &crate ::falcon::gsp::Gsp ::ID ); + !hwcfg2.riscv_br_priv_lockdown () + } +} +impl super ::Gsp {/// Helper function to load and run the FWSEC-FRTS firmware and confirm that it has properly /// created the WPR2 region.
@@ -148,6 +197,35 @@ fn run_booter( booter.run (dev, bar, sec2_falcon, wpr_meta) } +/// Wait for GSP lockdown to be released after FSP Chain of Trust. +#[expect(dead_code)] +fn wait_for_gsp_lockdown_release ( + dev: &device::Device <device::Bound >, + bar: &Bar0 , + gsp_falcon: &Falcon <Gsp >, + fmc_boot_params_addr:u64 , + ) ->Result { +dev_dbg! (dev,"Waiting for GSP lockdown release\n" ); + +let mbox =read_poll_timeout ( + ||Ok (GspMbox ::read (gsp_falcon, bar)), + |mbox| mbox.lockdown_released (bar, fmc_boot_params_addr), +Delta ::from_millis (10 ), +Delta ::from_millis (4000 ), + ) + .inspect_err (|_| { +dev_err! (dev,"GSP lockdown release timeout\n" ); + })?; + +if mbox.mbox0 !=0 { +dev_err! (dev,"GSP-FMC boot failed (mbox: {:#x})\n" , mbox.mbox0); +return Err (EIO ); + } + +dev_dbg! (dev,"GSP lockdown released\n" ); +Ok (()) + } +/// Attempt to boot the GSP. /// /// This is a GPU-dependent and complex procedure that involves loading firmware files from
drivers/gpu/nova-core/regs.rs +1 -0
@@ -321,6 +321,7 @@ pub(crate) fn vga_workspace_addr(self) -> Option<u64> {register! (NV_PFALCON_FALCON_HWCFG2 @PFalconBase [0x000000f4 ] {10 :10 riscvas bool ;12 :12 mem_scrubbingas bool ,"Set to 0 after memory scrubbing is completed" ; +13 :13 riscv_br_priv_lockdownas bool ,"RISC-V branch privilege lockdown bit" ;31 :31 reset_readyas bool ,"Signal indicating that reset is completed (GA102+)" ; });
Signature · 1 line
2.53.0
PATCH v6 33/34 gpu: nova-core: Hopper/Blackwell: new location for PCI config mirror
In reply to John HubbardHopper 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.
--- 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(-)
drivers/gpu/nova-core/gsp/boot.rs +1 -1
@@ -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)?;
drivers/gpu/nova-core/gsp/commands.rs +5 -3
@@ -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) } }
drivers/gpu/nova-core/gsp/fw/commands.rs +15 -3
@@ -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()),
Signature · 1 line
2.53.0
Alexandre Courbot
maintainerRe: [PATCH v6 33/34] gpu: nova-core: Hopper/Blackwell: new location for PCI config mirror
Quoted 93 lines · John Hubbard
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 <[email protected]>--- 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(-)drivers/gpu/nova-core/gsp/boot.rs +1
-1@@ -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)?;drivers/gpu/nova-core/gsp/commands.rs +5
-3@@ -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) } }drivers/gpu/nova-core/gsp/fw/commands.rs +11
-2@@ -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)?,
drivers/gpu/nova-core/gsp/fw/commands.rs pub(crate) fn init<'a>(dev: &'a pci::Device<device::Bound>) -> impl Init<Self, E · line 50
Quoted 8 lines
drivers/gpu/nova-core/gsp/fw/commands.rs +4
-1@@ -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 , + },
Can we document this in the code? I.e. is the new mirror space unavailable on chips < Hopper?
Re: [PATCH v6 33/34] gpu: nova-core: Hopper/Blackwell: new location for PCI config mirror
Quoted 1 line · Alexandre Courbot
On Tue Mar 10, 2026 at 11:11 AM JST, John Hubbard wrote:
...
Quoted 11 lines
drivers/gpu/nova-core/gsp/fw/commands.rs pub(crate) fn init<'a>(dev: &'a pci::Device<device::Bound>) -> impl Init<Self, E · line 50
Quoted 9 lines
drivers/gpu/nova-core/gsp/fw/commands.rs +4
-1@@ -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 , + },Can we document this in the code? I.e. is the new mirror space unavailable on chips < Hopper?
Yes, done.
Thanks for all of these review comments across the series. I have applied all of them, and will post a v7 shortly on the very latest drm-rust-next.
thanks,
Signature · 1 line
John Hubbard
PATCH v6 34/34 gpu: nova-core: Hopper/Blackwell: integrate FSP boot path into boot()
In reply to John HubbardAdd the FSP boot path for Hopper and Blackwell GPUs. These architectures use FSP with FMC firmware for Chain of Trust boot, rather than SEC2.
boot() now dispatches to boot_via_sec2() or boot_via_fsp() based on architecture. The SEC2 path keeps its original command ordering. The FSP path sends SetSystemInfo/SetRegistry after GSP becomes active. The GSP sequencer only runs for SEC2-based architectures.
--- drivers/gpu/nova-core/firmware/fsp.rs | 2 - drivers/gpu/nova-core/fsp.rs | 5 - drivers/gpu/nova-core/gsp/boot.rs | 181 ++++++++++++++++++++------ 3 files changed, 144 insertions(+), 44 deletions(-)
drivers/gpu/nova-core/firmware/fsp.rs +0 -2
@@ -13,7 +13,6 @@ gpu::Chipset, // }; -#[expect(dead_code)] pub (crate )struct FspFirmware {/// FMC firmware image data (only the "image" ELF section). pub (crate ) fmc_image:DmaObject ,
@@ -22,7 +21,6 @@ pub(crate) struct FspFirmware { }impl FspFirmware { -#[expect(dead_code)] pub (crate )fn new ( dev: &device::Device <device::Bound >, chipset: Chipset,
drivers/gpu/nova-core/fsp.rs +0 -5
@@ -238,7 +238,6 @@ pub(crate) struct FmcBootArgs<'a> {impl <'a>FmcBootArgs <'a> {/// Build FMC boot arguments, allocating the DMA-coherent boot parameter /// structure that FSP will read. -#[expect(dead_code)] #[allow(clippy::too_many_arguments)] pub (crate )fn new ( dev: &device::Device<device::Bound>,
@@ -287,7 +286,6 @@ pub(crate) fn new(/// DMA address of the FMC boot parameters, needed after boot for lockdown /// release polling. -#[expect(dead_code)] pub (crate )fn boot_params_dma_handle (&self) ->u64 { self.fmc_boot_params.dma_handle () }
@@ -301,7 +299,6 @@ impl Fsp {/// /// Polls the thermal scratch register until FSP signals boot completion /// or timeout occurs. -#[expect(dead_code)] pub (crate )fn wait_secure_boot ( dev: &device::Device <device::Bound >, bar: &crate::driver::Bar0,
@@ -331,7 +328,6 @@ pub(crate) fn wait_secure_boot(/// /// Extracts real cryptographic signatures from FMC ELF32 firmware sections. /// Returns signatures in a heap-allocated structure to prevent stack overflow. -#[expect(dead_code)] pub (crate )fn extract_fmc_signatures ( dev: &device::Device <device::Bound >, fmc_fw_data: &[u8],
@@ -391,7 +387,6 @@ pub(crate) fn extract_fmc_signatures(/// /// Builds the COT message from the pre-configured [`FmcBootArgs`], sends it /// to FSP, and waits for the response. -#[expect(dead_code)] pub (crate )fn boot_fmc ( dev: &device::Device <device::Bound >, bar: &crate::driver::Bar0,
drivers/gpu/nova-core/gsp/boot.rs +144 -37
239 lines not on this page · raw message
Signature · 1 line
2.53.0