diff options
| -rw-r--r-- | drivers/gpu/nova-core/firmware/booter.rs | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/drivers/gpu/nova-core/firmware/booter.rs b/drivers/gpu/nova-core/firmware/booter.rs index 1b98bb47424c..86556cee8e67 100644 --- a/drivers/gpu/nova-core/firmware/booter.rs +++ b/drivers/gpu/nova-core/firmware/booter.rs @@ -356,14 +356,30 @@ impl BooterFirmware { } }; + // There are two versions of Booter, one for Turing/GA100, and another for + // GA102+. The extraction of the IMEM sections differs between the two + // versions. Unfortunately, the file names are the same, and the headers + // don't indicate the versions. The only way to differentiate is by the Chipset. + let (imem_sec_dst_start, imem_ns_load_target) = if chipset <= Chipset::GA100 { + ( + app0.offset, + Some(FalconLoadTarget { + src_start: 0, + dst_start: load_hdr.os_code_offset, + len: load_hdr.os_code_size, + }), + ) + } else { + (0, None) + }; + Ok(Self { imem_sec_load_target: FalconLoadTarget { src_start: app0.offset, - dst_start: 0, + dst_start: imem_sec_dst_start, len: app0.len, }, - // Exists only in the booter image for Turing and GA100 - imem_ns_load_target: None, + imem_ns_load_target, dmem_load_target: FalconLoadTarget { src_start: load_hdr.os_data_offset, dst_start: 0, @@ -393,7 +409,11 @@ impl FalconLoadParams for BooterFirmware { } fn boot_addr(&self) -> u32 { - self.imem_sec_load_target.src_start + if let Some(ns_target) = &self.imem_ns_load_target { + ns_target.dst_start + } else { + self.imem_sec_load_target.src_start + } } } |