Re: [PATCH v10 27/28] gpu: nova-core: Hopper/Blackwell: larger WPR2 (GSP) heap

[Alexandre Courbot]

On Sat Apr 11, 2026 at 11:49 AM JST, John Hubbard wrote:
> Hopper, Blackwell and later GPUs require a larger heap for WPR2.
>
> Signed-off-by: John Hubbard <jhubbard@xxxxxxxxxx>

Let's also move this one to the beginning of the series (right after the
new location of "larger non-WPR heap" sounds adequate).

> ---
>  drivers/gpu/nova-core/gsp/fw.rs | 61 +++++++++++++++++++++++++--------
>  1 file changed, 47 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/gpu/nova-core/gsp/fw.rs b/drivers/gpu/nova-core/gsp/fw.rs
> index 5d36604ea1a3..7352952e4ef1 100644
> --- a/drivers/gpu/nova-core/gsp/fw.rs
> +++ b/drivers/gpu/nova-core/gsp/fw.rs
> @@ -103,21 +103,40 @@ enum GspFwHeapParams {}
>  /// Minimum required alignment for the GSP heap.
>  const GSP_HEAP_ALIGNMENT: Alignment = Alignment::new::<{ 1 << 20 }>();
>  
> +// These constants override the generated bindings for architecture-specific heap sizing.

Err nope, we can and should update the bindings to also include these
new values, as they exist in OpenRM and can change with firmware
updates.

> +//
> +// 14MB for Hopper/Blackwell+.
> +const GSP_FW_HEAP_PARAM_BASE_RM_SIZE_GH100: u64 = 14 * u64::SZ_1M;

This constant for instance exists as-is in OpenRM, so that's an easy one.

> +// 142MB client alloc for ~188MB total.
> +const GSP_FW_HEAP_PARAM_CLIENT_ALLOC_SIZE_GH100: u64 = 142 * u64::SZ_1M;

This one though... I could not find the origin for this value in OpenRM
- it seems to use the same value for all chipsets, without any
particular expection for GH100+. And if I follow this behavior in
nova-core my GB203 probes just fine.

> +// Hopper/Blackwell+ minimum heap size: 170MB (88 + 12 + 70).
> +// See Open RM: GSP_FW_HEAP_SIZE_OVERRIDE_LIBOS3_BAREMETAL_MIN_MB for the base 88MB,
> +// plus Hopper+ additions in kgspCalculateGspFwHeapSize_GH100.

I also could not find `kgspCalculateGspFwHeapSize_GH100` in both the
`570.144` tag and the `main` branch of OpenRM, can you elaborate on the
origin of this value?

>From what I can infer, this `12 + 70` corresponds to OpenRM's
`BULLSEYE_ROOT_HEAP_ALLOC_RM_DATA_SECTION_SIZE_DELTA` and
`BULLSEYE_ROOT_HEAP_ALLOC_BAREMETAL_LIBOS_HEAP_SIZE_DELTA`. These values
have also changed in `main`, so if we use them we should import them
through the bindings.

But first let me question whether we need this at all, as these
`BULLSEYE*` value are only used if some build feature of OpenRM is
enabled.

Again, with the original value for this my GB203 probes without any
issue, so it would be nice to confirm if and why we are diverging from
what OpenRM seems to be doing.

> +const GSP_FW_HEAP_SIZE_OVERRIDE_LIBOS3_BAREMETAL_MIN_MB_HOPPER: u64 = 170;

> +
>  impl GspFwHeapParams {
>      /// Returns the amount of GSP-RM heap memory used during GSP-RM boot and initialization (up to
>      /// and including the first client subdevice allocation).
> -    fn base_rm_size(_chipset: Chipset) -> u64 {
> -        // TODO: this needs to be updated to return the correct value for Hopper+ once support for
> -        // them is added:
> -        // u64::from(bindings::GSP_FW_HEAP_PARAM_BASE_RM_SIZE_GH100)
> -        u64::from(bindings::GSP_FW_HEAP_PARAM_BASE_RM_SIZE_TU10X)
> +    fn base_rm_size(chipset: Chipset) -> u64 {
> +        use crate::gpu::Architecture;
> +        match chipset.arch() {
> +            Architecture::Hopper | Architecture::BlackwellGB10x | Architecture::BlackwellGB20x => {
> +                GSP_FW_HEAP_PARAM_BASE_RM_SIZE_GH100
> +            }
> +            _ => u64::from(bindings::GSP_FW_HEAP_PARAM_BASE_RM_SIZE_TU10X),

Let's do an exhaustive match, we will want to check the correct value
for newly-added architectures.