From: Zhi Wang <[email protected]> The GSP boot paths pass the device, chipset, BAR and vGPU state to the VRAM layout and GSP_INIT helpers as separate arguments. These values are already available in GspBootContext, and some are forwarded again to the WPR2 heap and VF topology helpers.
Pass the boot context through these helpers so each can read the fields it needs. This simplifies the helper signatures and their call sites. No functional change is intended. Cc: Alexandre Courbot <[email protected]> Signed-off-by: Zhi Wang <[email protected]> Signed-off-by: Alok Kumar <[email protected]> --- drivers/gpu/nova-core/fb.rs | 26 +++++++++----------- drivers/gpu/nova-core/gsp/boot.rs | 8 +++--- drivers/gpu/nova-core/gsp/commands/gmc.rs | 17 ++++--------- drivers/gpu/nova-core/gsp/fw/commands.rs | 30 ++++++++++------------- drivers/gpu/nova-core/gsp/hal/gh100.rs | 2 +- drivers/gpu/nova-core/gsp/hal/tu102.rs | 2 +- 6 files changed, 34 insertions(+), 51 deletions(-) diff --git a/drivers/gpu/nova-core/fb.rs b/drivers/gpu/nova-core/fb.rs index 5ceb7760c78e..26e94d908b77 100644 --- a/drivers/gpu/nova-core/fb.rs +++ b/drivers/gpu/nova-core/fb.rs @@ -174,13 +174,9 @@ pub(crate) struct FbRanges { impl FbRanges { /// Computes concrete framebuffer ranges required on non-FSP booting architectures. - pub(crate) fn new( - chipset: Chipset, - bar: Bar0<'_>, - gsp_fw: &GspFirmware<'_>, - vgpu_state: VgpuState, - ) -> Result<Self> { - let hal = hal::fb_hal(chipset); + pub(crate) fn new(ctx: &gsp::GspBootContext<'_, '_>, gsp_fw: &GspFirmware<'_>) -> Result<Self> { + let bar = ctx.bar; + let hal = hal::fb_hal(ctx.chipset); let fb = { let fb_size = hal.vidmem_size(bar); @@ -242,7 +238,7 @@ pub(crate) fn new( FbRange(fw_image_addr..fw_image_addr + fw_image_size) }; - let (vf_partition_count, wpr2_heap_size) = wpr2_heap_params(chipset, vgpu_state, fb.end)?; + let (vf_partition_count, wpr2_heap_size) = wpr2_heap_params(ctx, fb.end)?; let wpr2_heap = { const WPR2_HEAP_DOWN_ALIGN: Alignment = Alignment::SZ_1M; @@ -298,11 +294,11 @@ pub(crate) fn wpr2_range(bar: Bar0<'_>) -> Option<Range<u64>> { } /// Computes the number of VF partitions and the WPR2 heap size from the vGPU state. -fn wpr2_heap_params(chipset: Chipset, vgpu_state: VgpuState, fb_size: u64) -> Result<(u8, u64)> { - Ok(match vgpu_state { +fn wpr2_heap_params(ctx: &gsp::GspBootContext<'_, '_>, fb_size: u64) -> Result<(u8, u64)> { + Ok(match ctx.vgpu.state() { VgpuState::Disabled => ( 0, - gsp::LibosParams::from_chipset(chipset).wpr_heap_size(chipset, fb_size)?, + gsp::LibosParams::from_chipset(ctx.chipset).wpr_heap_size(ctx.chipset, fb_size)?, ), VgpuState::Enabled { total_vfs } => ( u8::try_from(total_vfs.get()).map_err(|_| EINVAL)?, @@ -328,10 +324,10 @@ pub(crate) struct FbSizes { impl FbSizes { /// Computes the framebuffer region sizes for GSP-FMC boot. - pub(crate) fn new(chipset: Chipset, bar: Bar0<'_>, vgpu_state: VgpuState) -> Result<Self> { - let hal = hal::fb_hal(chipset); - let fb_size = hal.vidmem_size(bar); - let (vf_partition_count, wpr2_heap_size) = wpr2_heap_params(chipset, vgpu_state, fb_size)?; + pub(crate) fn new(ctx: &gsp::GspBootContext<'_, '_>) -> Result<Self> { + let hal = hal::fb_hal(ctx.chipset); + let fb_size = hal.vidmem_size(ctx.bar); + let (vf_partition_count, wpr2_heap_size) = wpr2_heap_params(ctx, fb_size)?; Ok(Self { frts_size: hal.frts_size(), diff --git a/drivers/gpu/nova-core/gsp/boot.rs b/drivers/gpu/nova-core/gsp/boot.rs index 072b00e9c2bf..72353270fce6 100644 --- a/drivers/gpu/nova-core/gsp/boot.rs +++ b/drivers/gpu/nova-core/gsp/boot.rs @@ -526,11 +526,9 @@ pub(crate) fn boot( bootloader_app_version: gsp_fw.bootloader.app_version, libos_dma_handle: self.libos.dma_address(), }; - let static_info = self - .cmdq - .send_gmc_command(GspInit::new(pdev, chipset, ctx.vgpu.state())?, |event| { - load_exec.dispatch_gmc_boot_event(event) - })?; + let static_info = self.cmdq.send_gmc_command(GspInit::new(ctx)?, |event| { + load_exec.dispatch_gmc_boot_event(event) + })?; Ok(super::BootResult { unload_bundle: unload_guard.dismiss().1, diff --git a/drivers/gpu/nova-core/gsp/commands/gmc.rs b/drivers/gpu/nova-core/gsp/commands/gmc.rs index 3ff44c867288..890462beb11f 100644 --- a/drivers/gpu/nova-core/gsp/commands/gmc.rs +++ b/drivers/gpu/nova-core/gsp/commands/gmc.rs @@ -6,14 +6,11 @@ use core::convert::Infallible; use kernel::{ - device, - pci, prelude::*, transmute::AsBytes, // }; use crate::{ - gpu::Chipset, gsp::{ cmdq::{ gmc::{ @@ -38,9 +35,9 @@ Schema, UnknownKeyPolicy, // }, + GspBootContext, // }, - sbuffer::SBufferIter, - vgpu::VgpuState, // + sbuffer::SBufferIter, // }; /// The `GSP_INIT` command, which carries the system information and registry keys to GSP-RM. @@ -52,7 +49,7 @@ pub(crate) struct GspInit { } impl GspInit { - /// Builds the request for `pdev`. + /// Builds the request using the device, chipset and vGPU state from `ctx`. /// /// # Errors /// @@ -60,13 +57,9 @@ impl GspInit { /// - `ENODEV` if vGPU mode is enabled but the SR-IOV capability is missing. /// /// Errors reading the PCI configuration or decoding the VF BAR layout are propagated as-is. - pub(crate) fn new( - pdev: &pci::Device<device::Bound>, - chipset: Chipset, - vgpu_state: VgpuState, - ) -> Result<Self> { + pub(crate) fn new(ctx: &GspBootContext<'_, '_>) -> Result<Self> { let mut encoder = Encoder::new(); - GspInitRequest::new(pdev, chipset, vgpu_state)?.encode(&mut encoder)?; + GspInitRequest::new(ctx)?.encode(&mut encoder)?; Ok(Self { payload: encoder.finish(), diff --git a/drivers/gpu/nova-core/gsp/fw/commands.rs b/drivers/gpu/nova-core/gsp/fw/commands.rs index f196a56dd7ee..689b7417597a 100644 --- a/drivers/gpu/nova-core/gsp/fw/commands.rs +++ b/drivers/gpu/nova-core/gsp/fw/commands.rs @@ -6,7 +6,6 @@ use kernel::{ alloc::ArrayVec, bitfield, - device, pci, prelude::*, transmute::{ @@ -16,7 +15,6 @@ }; use crate::{ - gpu::Chipset, gsp::{ commands::GspStaticInfo, nvkv::{ @@ -29,6 +27,7 @@ Required, TruncatingArray, // }, + GspBootContext, // }, vgpu::VgpuState, // }; @@ -229,16 +228,14 @@ struct DomainBusDevice(u64) { ]; impl GspInitRequest { - fn build_vf_info( - dev: &pci::Device<device::Bound>, - vgpu_state: VgpuState, - ) -> Result<Option<VfInfo>> { - let total_vfs = match vgpu_state { + fn build_vf_info(ctx: &GspBootContext<'_, '_>) -> Result<Option<VfInfo>> { + let total_vfs = match ctx.vgpu.state() { VgpuState::Disabled => return Ok(None), VgpuState::Enabled { total_vfs } => total_vfs, }; - let sriov = dev + let sriov = ctx + .pdev .config_space_extended()? .find_ext_capability::<pci::ExtSriovRegs>()? .ok_or(ENODEV)?; @@ -261,10 +258,10 @@ fn build_vf_info( })) } - /// Creates the request for `dev`. + /// Creates the request using the device, chipset and vGPU state from `ctx`. /// - /// The registry keys are [`REGISTRY_ENTRIES`], plus `RMSetSriovMode` when `vgpu_state` reports - /// that vGPU is enabled. + /// The registry keys are [`REGISTRY_ENTRIES`], plus `RMSetSriovMode` when the boot context + /// reports that vGPU is enabled. /// /// # Errors /// @@ -272,11 +269,10 @@ fn build_vf_info( /// - `ENODEV` if vGPU mode is enabled but the SR-IOV capability is missing. /// /// Errors reading the PCI configuration or decoding the VF BAR layout are propagated as-is. - pub(crate) fn new( - dev: &pci::Device<device::Bound>, - chipset: Chipset, - vgpu_state: VgpuState, - ) -> Result<Self> { + pub(crate) fn new(ctx: &GspBootContext<'_, '_>) -> Result<Self> { + let dev = ctx.pdev; + let chipset = ctx.chipset; + let vgpu_state = ctx.vgpu.state(); let mut regkeys = KVVec::new(); for &(name, value) in REGISTRY_ENTRIES { regkeys.push(RegKey::new(name, value), GFP_KERNEL)?; @@ -304,7 +300,7 @@ pub(crate) fn new( host_arch: HostArch::host().into(), bus_device_func: u64::from(bus_device_func).into(), regkeys, - vf_info: Self::build_vf_info(dev, vgpu_state)?, + vf_info: Self::build_vf_info(ctx)?, }) } } diff --git a/drivers/gpu/nova-core/gsp/hal/gh100.rs b/drivers/gpu/nova-core/gsp/hal/gh100.rs index 91201b51030e..f91cdd061706 100644 --- a/drivers/gpu/nova-core/gsp/hal/gh100.rs +++ b/drivers/gpu/nova-core/gsp/hal/gh100.rs @@ -151,7 +151,7 @@ fn boot<'gpu>( let chipset = ctx.chipset; let gsp_falcon = ctx.gsp_falcon; - let fb_sizes = FbSizes::new(chipset, ctx.bar, ctx.vgpu.state())?; + let fb_sizes = FbSizes::new(ctx)?; dev_dbg!(dev, "{:#x?}\n", fb_sizes); let wpr_meta = diff --git a/drivers/gpu/nova-core/gsp/hal/tu102.rs b/drivers/gpu/nova-core/gsp/hal/tu102.rs index f8a7b8d9f36f..a7639a98e60a 100644 --- a/drivers/gpu/nova-core/gsp/hal/tu102.rs +++ b/drivers/gpu/nova-core/gsp/hal/tu102.rs @@ -260,7 +260,7 @@ fn boot<'gpu>( let gsp_falcon = ctx.gsp_falcon; let sec2_falcon = ctx.sec2_falcon; - let fb_ranges = FbRanges::new(chipset, bar, gsp_fw, ctx.vgpu.state())?; + let fb_ranges = FbRanges::new(ctx, gsp_fw)?; dev_dbg!(dev, "{:#x?}\n", fb_ranges); // Declared before the unload guard so that if Booter fails while running, SEC2 is reset -- 2.53.0
