Skip to content

Commit ebe6587

Browse files
committed
gpu: nova-core: firmware: move firmware request code into a function
When all the firmware files are loaded from `Firmware::new`, it makes sense to have the firmware request code as a closure. However, since we eventually want each individual firmware constructor to request its own file (and get rid of `Firmware` altogether), move this code into a dedicated function that can be called by individual firmware types. Acked-by: Danilo Krummrich <dakr@kernel.org> Link: https://lore.kernel.org/r/20250913-nova_firmware-v6-4-9007079548b0@nvidia.com Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
1 parent b345c91 commit ebe6587

1 file changed

Lines changed: 14 additions & 6 deletions

File tree

drivers/gpu/nova-core/firmware.rs

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,19 @@ pub(crate) mod fwsec;
1919

2020
pub(crate) const FIRMWARE_VERSION: &str = "535.113.01";
2121

22+
/// Requests the GPU firmware `name` suitable for `chipset`, with version `ver`.
23+
fn request_firmware(
24+
dev: &device::Device,
25+
chipset: gpu::Chipset,
26+
name: &str,
27+
ver: &str,
28+
) -> Result<firmware::Firmware> {
29+
let chip_name = chipset.name();
30+
31+
CString::try_from_fmt(fmt!("nvidia/{chip_name}/gsp/{name}-{ver}.bin"))
32+
.and_then(|path| firmware::Firmware::request(&path, dev))
33+
}
34+
2235
/// Structure encapsulating the firmware blobs required for the GPU to operate.
2336
#[expect(dead_code)]
2437
pub(crate) struct Firmware {
@@ -30,12 +43,7 @@ pub(crate) struct Firmware {
3043

3144
impl Firmware {
3245
pub(crate) fn new(dev: &device::Device, chipset: Chipset, ver: &str) -> Result<Firmware> {
33-
let chip_name = chipset.name();
34-
35-
let request = |name_| {
36-
CString::try_from_fmt(fmt!("nvidia/{chip_name}/gsp/{name_}-{ver}.bin"))
37-
.and_then(|path| firmware::Firmware::request(&path, dev))
38-
};
46+
let request = |name| request_firmware(dev, chipset, name, ver);
3947

4048
Ok(Firmware {
4149
booter_load: request("booter_load")?,

0 commit comments

Comments
 (0)