Commit f7a33a67 authored by Danilo Krummrich's avatar Danilo Krummrich Committed by Alexandre Courbot
Browse files

gpu: nova-core: gsp: do not unwrap() SGEntry 



Don't use unwrap() to extract an Option<SGEntry>, instead handle the
error condition gracefully.

Fixes: a841614e ("gpu: nova-core: firmware: process and prepare the GSP firmware")
Signed-off-by: default avatarDanilo Krummrich <dakr@kernel.org>
Reviewed-by: default avatarJohn Hubbard <jhubbard@nvidia.com>
Signed-off-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Message-ID: <20250926130623.61316-2-dakr@kernel.org>
parent 87990025

drivers/gpu/nova-core/firmware/gsp.rs

+4 −3
Original line number Diff line number Diff line
@@ -202,9 +202,10 @@ pub(crate) fn new<'a, 'b>( 
                let mut level0_data = kvec![0u8; GSP_PAGE_SIZE]?;



                // Fill level 1 page entry.

                let level1_entry = level1.iter().next().unwrap().dma_address();

                let dst = &mut level0_data[..size_of_val(&level1_entry)];

                dst.copy_from_slice(&level1_entry.to_le_bytes());

                let level1_entry = level1.iter().next().ok_or(EINVAL)?;

                let level1_entry_addr = level1_entry.dma_address();

                let dst = &mut level0_data[..size_of_val(&level1_entry_addr)];

                dst.copy_from_slice(&level1_entry_addr.to_le_bytes());



                // Turn the level0 page table into a [`DmaObject`].

                DmaObject::from_data(dev, &level0_data)?