gpu: nova-core: add Turing support
Subsystems (4)
v3 cover gpu: nova-core: add Turing support
This patch set adds basic support for pre-booting GSP-RM on Turing.
There is also partial support for GA100, but it's currently not fully implemented. GA100 is considered experimental in Nouveau, and so it hasn't been tested with NovaCore either.
That latest linux-firmware.git is required because it contains the Generic Bootloader image that has not yet been propogated to distros.
Summary of changes:
1. Introduce non-secure IMEM support. For GA102 and later, only secure IMEM is used.
2. Because of non-secure IMEM, Turing booter firmware images need some of the headers parsed differently for stuff like the load target address.
3. Add support the tu10x firmware signature section in the ELF image.
4. Add several new registers used only on Turing.
5. Some functions that were considered generic Falcon operations are actually different on Turing vs GA102+, so they are moved to the HAL.
6. The FRTS FWSEC firmware in VBIOS uses a different version of the descriptor header.
7. On Turing/GA100 LIBOS args struct needs to have its 'size' field aligned to 4KB. So pad the struct to make it 4K.
8. Turing Falcons do not support DMA, so PIO is used to copy images into IMEM/DMEM.
Changes from v2:
1. Added trait object for FalconUCodeDescriptor.
2. Replacing libos args size round-up with padding in struct.
3. Changed pio_wr_bytes to parse 32-bit words without panicking.
4. Depends on Alex's inline(always) for the I/O functions to avoid clippy errors.
Changes from v1:
1. Replaced pointer/length with slice in PIO code.
2. Added RFC patch to implement trait object FalconUCodeDescriptor .
3. Added comments to new registers, structs, and other places.
4. Fixed all CLIPPY complaints.
5. Added supports_dma() method for Falcon HAL
6. Renamed ImemSec and ImemNs to ImemSecure and ImemNonSecure
7. Several other miscellaneous fixes based on review comments.
Timur Tabi (12):
gpu: nova-core: rename Imem to ImemSecure
gpu: nova-core: add ImemNonSecure section infrastructure
gpu: nova-core: support header parsing on Turing/GA100
gpu: nova-core: add support for Turing/GA100 fwsignature
gpu: nova-core: add NV_PFALCON_FALCON_DMATRFCMD::with_falcon_mem()
gpu: nova-core: add Turing boot registers
gpu: nova-core: move some functions into the HAL
gpu: nova-core: Add basic Turing HAL
gpu: nova-core: add Falcon HAL method supports_dma()
gpu: nova-core: add FalconUCodeDescV2 support
gpu: nova-core: align LibosMemoryRegionInitArgument size to page size
gpu: nova-core: add PIO support for loading firmware images
drivers/gpu/nova-core/falcon.rs | 236 +++++++++++++++++----- drivers/gpu/nova-core/falcon/hal.rs | 19 +- drivers/gpu/nova-core/falcon/hal/ga102.rs | 47 +++++ drivers/gpu/nova-core/falcon/hal/tu102.rs | 78 +++++++ drivers/gpu/nova-core/firmware.rs | 145 ++++++++++++- drivers/gpu/nova-core/firmware/booter.rs | 46 ++++- drivers/gpu/nova-core/firmware/fwsec.rs | 215 +++++++++++++++++--- drivers/gpu/nova-core/firmware/gsp.rs | 9 +- drivers/gpu/nova-core/gsp/boot.rs | 10 +- drivers/gpu/nova-core/gsp/fw.rs | 24 ++- drivers/gpu/nova-core/regs.rs | 73 +++++++ drivers/gpu/nova-core/vbios.rs | 73 ++++--- 12 files changed, 843 insertions(+), 132 deletions(-) create mode 100644 drivers/gpu/nova-core/falcon/hal/tu102.rs
base-commit: 57dc2ea0b7bdb828c5d966d9135c28fe854933a4
prerequisite-patch-id: a3e23917ec535263604af95194422382f14c2f21
Signature · 1 line
2.52.0
PATCH v3 1/12 gpu: nova-core: rename Imem to ImemSecure
Rename FalconMem::Imem to ImemSecure to indicate that it references Secure Instruction Memory. This change has no functional impact.
On Falcon cores, pages in instruction memory can be tagged as Secure or Non-Secure. For GA102 and later, only Secure is used, which is why FalconMem::Imem seems appropriate. However, Turing firmware images can also contain non-secure sections, and so FalconMem needs to support that. By renaming Imem to ImemSec now, future patches for Turing support will be simpler.
Nouveau uses the term "IMEM" to refer both to the Instruction Memory block on Falcon cores as well as to the images of secure firmware uploaded to part of IMEM. OpenRM uses the terms "ImemSec" and "ImemNs" instead, and uses "IMEM" just to refer to the physical memory device.
Renaming these terms allows us to align with OpenRM, avoid confusion between IMEM and ImemSec, and makes future patches simpler.
--- drivers/gpu/nova-core/falcon.rs | 14 +++++++------- drivers/gpu/nova-core/firmware/booter.rs | 12 ++++++------ drivers/gpu/nova-core/firmware/fwsec.rs | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-)
drivers/gpu/nova-core/falcon.rs +7 -7
@@ -237,8 +237,8 @@ fn from(value: PeregrineCoreSelect) -> Self {/// Different types of memory present in a falcon core. #[derive( Debug , Clone , Copy , PartialEq , Eq )] pub (crate )enum FalconMem { -/// Instruction Memory. -Imem , +/// Secure Instruction Memory. +ImemSecure ,/// Data Memory. Dmem , }
@@ -345,8 +345,8 @@ pub(crate) struct FalconBromParams {/// Trait for providing load parameters of falcon firmwares. pub (crate )trait FalconLoadParams { -/// Returns the load parameters for `IMEM`. -fn imem_load_params (&self) ->FalconLoadTarget ; +/// Returns the load parameters for Secure `IMEM`. +fn imem_sec_load_params (&self) ->FalconLoadTarget ;/// Returns the load parameters for `DMEM`. fn dmem_load_params (&self) ->FalconLoadTarget ;
@@ -457,7 +457,7 @@ fn dma_wr<F: FalconFirmware<Target = E>>(// // For DMEM we can fold the start offset into the DMA handle. let (src_start, dma_start) =match target_mem { - FalconMem::Imem => (load_offsets.src_start, fw.dma_handle()), + FalconMem::ImemSecure => (load_offsets.src_start, fw.dma_handle()), FalconMem::Dmem => ( 0, fw.dma_handle_with_offset(load_offsets.src_start.into_safe_cast())?,
@@ -508,7 +508,7 @@ fn dma_wr<F: FalconFirmware<Target = E>>(let cmd = regs::NV_PFALCON_FALCON_DMATRFCMD ::default () .set_size (DmaTrfCmdSize ::Size256B ) - .set_imem (target_mem ==FalconMem ::Imem ) + .set_imem (target_mem ==FalconMem ::ImemSecure ) .set_sec (if sec {1 }else {0 });for posin (0 ..num_transfers).map (|i| i *DMA_LEN ) {
@@ -543,7 +543,7 @@ pub(crate) fn dma_load<F: FalconFirmware<Target = E>>(&self, bar: &Bar0, fw: &F) .set_mem_type(FalconFbifMemType::Physical) }); - self.dma_wr (bar, fw,FalconMem ::Imem , fw.imem_load_params (),true )?; + self.dma_wr (bar, fw,FalconMem ::ImemSecure , fw.imem_sec_load_params (),true )?; self.dma_wr (bar, fw,FalconMem ::Dmem , fw.dmem_load_params (),true )?; self.hal.program_brom (self, bar, &fw.brom_params ())?;
drivers/gpu/nova-core/firmware/booter.rs +6 -6
@@ -251,8 +251,8 @@ impl<'a> FirmwareSignature<BooterFirmware> for BooterSignature<'a> {}/// The `Booter` loader firmware, responsible for loading the GSP. pub (crate )struct BooterFirmware { -// Load parameters for `IMEM` falcon memory. - imem_load_target:FalconLoadTarget , +// Load parameters for Secure `IMEM` falcon memory. + imem_sec_load_target:FalconLoadTarget ,// Load parameters for `DMEM` falcon memory. dmem_load_target:FalconLoadTarget ,// BROM falcon parameters.
@@ -354,7 +354,7 @@ pub(crate) fn new( };Ok (Self { - imem_load_target:FalconLoadTarget { + imem_sec_load_target:FalconLoadTarget { src_start: app0.offset, dst_start:0 , len: app0.len,
@@ -371,8 +371,8 @@ pub(crate) fn new( }impl FalconLoadParams for BooterFirmware { -fn imem_load_params (&self) ->FalconLoadTarget { - self.imem_load_target.clone () +fn imem_sec_load_params (&self) ->FalconLoadTarget { + self.imem_sec_load_target.clone () }fn dmem_load_params (&self) ->FalconLoadTarget {
@@ -384,7 +384,7 @@ fn brom_params(&self) -> FalconBromParams { }fn boot_addr (&self) ->u32 { - self.imem_load_target.src_start + self.imem_sec_load_target.src_start } }
drivers/gpu/nova-core/firmware/fwsec.rs +1 -1
@@ -224,7 +224,7 @@ pub(crate) struct FwsecFirmware { }impl FalconLoadParams for FwsecFirmware { -fn imem_load_params (&self) ->FalconLoadTarget { +fn imem_sec_load_params (&self) ->FalconLoadTarget {FalconLoadTarget { src_start:0 , dst_start: self.desc.imem_phys_base,
Signature · 1 line
2.52.0
PATCH v3 2/12 gpu: nova-core: add ImemNonSecure section infrastructure
In reply to Timur TabiThe GSP booter firmware in Turing and GA100 includes a third memory section called ImemNonSecure, which is non-secure IMEM. This section must be loaded separately from DMEM and secure IMEM, but only if it actually exists.
--- drivers/gpu/nova-core/falcon.rs | 21 +++++++++++++++++++-- drivers/gpu/nova-core/firmware/booter.rs | 9 +++++++++ drivers/gpu/nova-core/firmware/fwsec.rs | 5 +++++ 3 files changed, 33 insertions(+), 2 deletions(-)
drivers/gpu/nova-core/falcon.rs +19 -2
@@ -239,6 +239,8 @@ fn from(value: PeregrineCoreSelect) -> Self {pub (crate )enum FalconMem {/// Secure Instruction Memory. ImemSecure , +/// Non-Secure Instruction Memory. +ImemNonSecure ,/// Data Memory. Dmem , }
@@ -348,6 +350,10 @@ pub(crate) trait FalconLoadParams {/// Returns the load parameters for Secure `IMEM`. fn imem_sec_load_params (&self) ->FalconLoadTarget ; +/// Returns the load parameters for Non-Secure `IMEM`, +/// used only on Turing and GA100. +fn imem_ns_load_params (&self) ->Option <FalconLoadTarget >; +/// Returns the load parameters for `DMEM`. fn dmem_load_params (&self) ->FalconLoadTarget ;
@@ -457,7 +463,10 @@ fn dma_wr<F: FalconFirmware<Target = E>>(// // For DMEM we can fold the start offset into the DMA handle. let (src_start, dma_start) =match target_mem { - FalconMem::ImemSecure => (load_offsets.src_start, fw.dma_handle()), + FalconMem::ImemSecure | FalconMem::ImemNonSecure => ( + load_offsets.src_start, + fw.dma_handle() + ), FalconMem::Dmem => ( 0, fw.dma_handle_with_offset(load_offsets.src_start.into_safe_cast())?,
@@ -508,7 +517,7 @@ fn dma_wr<F: FalconFirmware<Target = E>>(let cmd = regs::NV_PFALCON_FALCON_DMATRFCMD ::default () .set_size (DmaTrfCmdSize ::Size256B ) - .set_imem (target_mem ==FalconMem ::ImemSecure ) + .set_imem (target_mem !=FalconMem ::Dmem ) .set_sec (if sec {1 }else {0 });for posin (0 ..num_transfers).map (|i| i *DMA_LEN ) {
@@ -546,6 +555,14 @@ pub(crate) fn dma_load<F: FalconFirmware<Target = E>>(&self, bar: &Bar0, fw: &F) self.dma_wr (bar, fw,FalconMem ::ImemSecure , fw.imem_sec_load_params (),true )?; self.dma_wr (bar, fw,FalconMem ::Dmem , fw.dmem_load_params (),true )?; +if let Some (nmem) = fw.imem_ns_load_params () { +// This code should never actual get executed, because the Non-Secure +// section only exists on firmware used by Turing and GA100, and +// those platforms do not use DMA. But we include this code for +// consistency. + self.dma_wr (bar, fw,FalconMem ::ImemNonSecure , nmem,false )?; + } + self.hal.program_brom (self, bar, &fw.brom_params ())?;// Set `BootVec` to start of non-secure code.
drivers/gpu/nova-core/firmware/booter.rs +9 -0
@@ -253,6 +253,9 @@ impl<'a> FirmwareSignature<BooterFirmware> for BooterSignature<'a> {}pub (crate )struct BooterFirmware {// Load parameters for Secure `IMEM` falcon memory. imem_sec_load_target:FalconLoadTarget , +// Load parameters for Non-Secure `IMEM` falcon memory, +// used only on Turing and GA100 + imem_ns_load_target:Option <FalconLoadTarget >,// Load parameters for `DMEM` falcon memory. dmem_load_target:FalconLoadTarget ,// BROM falcon parameters.
@@ -359,6 +362,8 @@ pub(crate) fn new( dst_start: 0, len: app0.len, }, +// Exists only in the booter image for Turing and GA100 + imem_ns_load_target: None, dmem_load_target: FalconLoadTarget { src_start: load_hdr.os_data_offset, dst_start:0 ,
@@ -375,6 +380,10 @@ fn imem_sec_load_params(&self) -> FalconLoadTarget { self.imem_sec_load_target.clone () } +fn imem_ns_load_params (&self) ->Option <FalconLoadTarget > { + self.imem_ns_load_target.clone () + } +fn dmem_load_params (&self) ->FalconLoadTarget { self.dmem_load_target.clone () }
drivers/gpu/nova-core/firmware/fwsec.rs +5 -0
@@ -232,6 +232,11 @@ fn imem_sec_load_params(&self) -> FalconLoadTarget { } } +fn imem_ns_load_params (&self) ->Option <FalconLoadTarget > { +// Only used on Turing and GA100, so return None for now +None + } +fn dmem_load_params (&self) ->FalconLoadTarget {FalconLoadTarget { src_start: self.desc.imem_load_size,
Signature · 1 line
2.52.0
PATCH v3 3/12 gpu: nova-core: support header parsing on Turing/GA100
In reply to Timur TabiThe Turing/GA100 version of Booter is slightly different from the GA102+ version. The headers are the same, but different fields of the headers are used to identify the IMEM section. In addition, there is an NMEM section on Turing/GA100.
--- drivers/gpu/nova-core/firmware/booter.rs | 33 +++++++++++++++++++----- 1 file changed, 26 insertions(+), 7 deletions(-)
drivers/gpu/nova-core/firmware/booter.rs +26 -7
@@ -356,14 +356,27 @@ pub(crate) fn new( } }; +// 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. +Ok (Self { - imem_sec_load_target:FalconLoadTarget { - src_start: app0.offset, - dst_start:0 , - len: app0.len, + imem_sec_load_target: +FalconLoadTarget { + src_start: app0.offset, + dst_start:if chipset >Chipset ::GA100 {0 }else { app0.offset }, + len: app0.len, + }, + imem_ns_load_target:if chipset >Chipset ::GA100 { +None + }else { +Some (FalconLoadTarget { + src_start:0 , + dst_start: load_hdr.os_code_offset, + len: load_hdr.os_code_size, + }) }, -// Exists only in the booter image for Turing and GA100 - imem_ns_load_target:None , dmem_load_target:FalconLoadTarget { src_start: load_hdr.os_data_offset, dst_start:0 ,
@@ -393,7 +406,13 @@ fn brom_params(&self) -> FalconBromParams { }fn boot_addr (&self) ->u32 { - self.imem_sec_load_target.src_start +if let Some (ns_target) = &self.imem_ns_load_target { +// Turing and GA100 - use non-secure load target + ns_target.dst_start + }else { +// GA102 and later - use secure load target + self.imem_sec_load_target.src_start + } } }
Signature · 1 line
2.52.0
Alexandre Courbot
maintainerRe: [PATCH v3 03/12] gpu: nova-core: support header parsing on Turing/GA100
Quoted 15 lines · Timur Tabi
The Turing/GA100 version of Booter is slightly different from the GA102+ version. The headers are the same, but different fields of the headers are used to identify the IMEM section. In addition, there is an NMEM section on Turing/GA100.
Signed-off-by Timur Tabi <[email protected]>--- drivers/gpu/nova-core/firmware/booter.rs | 33 +++++++++++++++++++----- 1 file changed, 26 insertions(+), 7 deletions(-)drivers/gpu/nova-core/firmware/booter.rs +0
-0
drivers/gpu/nova-core/firmware/booter.rs pub(crate) fn new( · line 363
Quoted 8 lines
drivers/gpu/nova-core/firmware/booter.rs +5
-0@@ -356,14 +356,27 @@ pub(crate) fn new( } }; +// 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. +
This comment begs for some code following it, and I notice that below the same if chipset > Chipset::GA100 test is repeated twice.
How about doing the following:
let (imem_dst_start, imem_ns_load_target) = if chipset <= Chipset::GA100 {
(app0.offset, Some(FalconLoadTarget {
...
}))
} else {
(0, None)
}... and using the local variables to initialize the result?
That way the code relevant to the comment immediately follows it, you do the test only once, and the complex initializer below becomes a bit simpler.
Quoted 26 lines
drivers/gpu/nova-core/firmware/booter.rs +14
-6Ok (Self { - imem_sec_load_target:FalconLoadTarget { - src_start: app0.offset, - dst_start:0 , - len: app0.len, + imem_sec_load_target: +FalconLoadTarget { + src_start: app0.offset, + dst_start:if chipset >Chipset ::GA100 {0 }else { app0.offset }, + len: app0.len, + }, + imem_ns_load_target:if chipset >Chipset ::GA100 { +None + }else { +Some (FalconLoadTarget { + src_start:0 , + dst_start: load_hdr.os_code_offset, + len: load_hdr.os_code_size, + }) }, -// Exists only in the booter image for Turing and GA100 - imem_ns_load_target:None , dmem_load_target:FalconLoadTarget { src_start: load_hdr.os_data_offset, dst_start:0 ,
drivers/gpu/nova-core/firmware/booter.rs fn brom_params(&self) -> FalconBromParams { · line 410
Quoted 6 lines
drivers/gpu/nova-core/firmware/booter.rs +2
-1@@ -393,7 +406,13 @@ fn brom_params(&self) -> FalconBromParams { }fn boot_addr (&self) ->u32 { - self.imem_sec_load_target.src_start +if let Some (ns_target) = &self.imem_ns_load_target { +// Turing and GA100 - use non-secure load target
This comment is confusing - the logic is clear and doesn't mention the chipset, so let's remove it. Ideally we can limit these chipset-specific things to a single place and a single comment.
drivers/gpu/nova-core/firmware/booter.rs fn brom_params(&self) -> FalconBromParams { · line 413
Quoted 3 lines
drivers/gpu/nova-core/firmware/booter.rs +3
-0+ ns_target.dst_start + }else { +// GA102 and later - use secure load target
Same here, the code is explicit enough and doesn't mention the chipset.
Quoted 5 lines
drivers/gpu/nova-core/firmware/booter.rs +2
-0+ self.imem_sec_load_target.src_start + } } }
Re: [PATCH v3 03/12] gpu: nova-core: support header parsing on Turing/GA100
Quoted 19 lines · Alexandre Courbot
Quoted 5 lines
+ // 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. +
This comment begs for some code following it, and I notice that below the same
if chipset > Chipset::GA100test is repeated twice.How about doing the following:
let (
imem_dst_start,imem_ns_load_target) = if chipset <=Chipset::GA100{ (app0.offset, Some(FalconLoadTarget {
...
}))
} else {
(0, None)
}
Quoted 1 line
... and using the local variables to initialize the result?
Oh yeah, that's a great idea. Thanks.
Quoted 12 lines
Quoted 7 lines
(quoted diff) +0
-0@@ -393,7 +406,13 @@ fn brom_params(&self) -> FalconBromParams { }
fnboot_addr(&self)-> u32 {
- self.imem_sec_load_target.src_start
+ if letSome(ns_target)= &self.imem_ns_load_target { + // Turing and GA100 - use non-secure load targetThis comment is confusing - the logic is clear and doesn't mention the chipset, so let's remove it. Ideally we can limit these chipset-specific things to a single place and a single comment.
Quoted 5 lines
Quoted 3 lines
+ ns_target.dst_start
+ } else {
+ // GA102 and later - use secure load targetSame here, the code is explicit enough and doesn't mention the chipset.
Ok.
PATCH v3 4/12 gpu: nova-core: add support for Turing/GA100 fwsignature
In reply to Timur TabiTuring and GA100 share the same GSP-RM firmware binary, and the signature ELF section is labeled ".fwsignature_tu10x".
--- drivers/gpu/nova-core/firmware/gsp.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/nova-core/firmware/gsp.rs +7 -2
@@ -163,9 +163,14 @@ pub(crate) fn new<'a, 'b>(let fw_section = elf::elf64_section (fw.data (),".fwimage" ).ok_or (EINVAL )?;let sigs_section =match chipset.arch () { -Architecture ::Ampere =>".fwsignature_ga10x" , +Architecture ::Turing |Architecture ::Ampere => +if chipset >Chipset ::GA100 { +".fwsignature_ga10x" + }else { +// GA100 uses the same firmware as Turing +".fwsignature_tu10x" + },Architecture ::Ada =>".fwsignature_ad10x" , - _ =>return Err (ENOTSUPP ), };let signatures = elf::elf64_section (fw.data (), sigs_section) .ok_or (EINVAL )
Signature · 1 line
2.52.0
Alexandre Courbot
maintainerRe: [PATCH v3 04/12] gpu: nova-core: add support for Turing/GA100 fwsignature
Quoted 14 lines · Timur Tabi
Turing and GA100 share the same GSP-RM firmware binary, and the signature ELF section is labeled ".fwsignature_tu10x".
Signed-off-by Timur Tabi <[email protected]>--- drivers/gpu/nova-core/firmware/gsp.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)drivers/gpu/nova-core/firmware/gsp.rs +0
-0@@ -163,9 +163,14 @@ pub(crate) fn new<'a, 'b>(let fw_section = elf::elf64_section (fw.data (),".fwimage" ).ok_or (EINVAL )?;
drivers/gpu/nova-core/firmware/gsp.rs pub(crate) fn new<'a, 'b>( · line 172
Quoted 10 lines
drivers/gpu/nova-core/firmware/gsp.rs +7
-1let sigs_section =match chipset.arch () { -Architecture ::Ampere =>".fwsignature_ga10x" , +Architecture ::Turing |Architecture ::Ampere => +if chipset >Chipset ::GA100 { +".fwsignature_ga10x" + }else { +// GA100 uses the same firmware as Turing +".fwsignature_tu10x" + },
Please use the pattern discussed in [1] here as it better expresses the exception for GA100.
PATCH v3 5/12 gpu: nova-core: add NV_PFALCON_FALCON_DMATRFCMD::with_falcon_mem()
In reply to Timur TabiThe with_falcon_mem() method initializes the 'imem' and 'sec' fields of the NV_PFALCON_FALCON_DMATRFCMD register based on the value of the FalconMem type.
--- drivers/gpu/nova-core/falcon.rs | 10 ++++------ drivers/gpu/nova-core/regs.rs | 10 ++++++++++ 2 files changed, 14 insertions(+), 6 deletions(-)
drivers/gpu/nova-core/falcon.rs +4 -6
@@ -454,7 +454,6 @@ fn dma_wr<F: FalconFirmware<Target = E>>( fw: &F, target_mem: FalconMem, load_offsets: FalconLoadTarget, - sec: bool, ) -> Result { const DMA_LEN: u32 = 256;
@@ -517,8 +516,7 @@ fn dma_wr<F: FalconFirmware<Target = E>>(let cmd = regs::NV_PFALCON_FALCON_DMATRFCMD ::default () .set_size (DmaTrfCmdSize ::Size256B ) - .set_imem (target_mem !=FalconMem ::Dmem ) - .set_sec (if sec {1 }else {0 }); + .with_falcon_mem (target_mem);for posin (0 ..num_transfers).map (|i| i *DMA_LEN ) {// Perform a transfer of size `DMA_LEN`.
@@ -552,15 +550,15 @@ pub(crate) fn dma_load<F: FalconFirmware<Target = E>>(&self, bar: &Bar0, fw: &F) .set_mem_type(FalconFbifMemType::Physical) }); - self.dma_wr (bar, fw,FalconMem ::ImemSecure , fw.imem_sec_load_params (),true )?; - self.dma_wr (bar, fw,FalconMem ::Dmem , fw.dmem_load_params (),true )?; + self.dma_wr (bar, fw,FalconMem ::ImemSecure , fw.imem_sec_load_params ())?; + self.dma_wr (bar, fw,FalconMem ::Dmem , fw.dmem_load_params ())?;if let Some (nmem) = fw.imem_ns_load_params () {// This code should never actual get executed, because the Non-Secure // section only exists on firmware used by Turing and GA100, and // those platforms do not use DMA. But we include this code for // consistency. - self.dma_wr (bar, fw,FalconMem ::ImemNonSecure , nmem,false )?; + self.dma_wr (bar, fw,FalconMem ::ImemNonSecure , nmem)?; } self.hal.program_brom (self, bar, &fw.brom_params ())?;
drivers/gpu/nova-core/regs.rs +10 -0
@@ -16,6 +16,7 @@ FalconCoreRevSubversion, FalconFbifMemType, FalconFbifTarget, + FalconMem, FalconModSelAlgo, FalconSecurityModel, PFalcon2Base,
@@ -325,6 +326,15 @@ pub(crate) fn mem_scrubbing_done(self) -> bool { 16:16 set_dmtag as u8; }); +impl NV_PFALCON_FALCON_DMATRFCMD { +/// Programs the 'imem' and 'sec' fields for the given FalconMem +pub (crate )fn with_falcon_mem (self, mem:FalconMem ) ->Self { + self + .set_imem (mem !=FalconMem ::Dmem ) + .set_sec (if mem ==FalconMem ::ImemSecure {1 }else {0 }) + } +} +register! (NV_PFALCON_FALCON_DMATRFFBOFFS @PFalconBase [0x0000011c ] {31 :0 offsas u32 ; });
Signature · 1 line
2.52.0
PATCH v3 6/12 gpu: nova-core: add Turing boot registers
In reply to Timur TabiDefine some more GPU registers used to boot GSP-RM on Turing and GA100.
--- drivers/gpu/nova-core/regs.rs | 63 +++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+)
drivers/gpu/nova-core/regs.rs +63 -0
@@ -258,6 +258,11 @@ pub(crate) fn vga_workspace_addr(self) -> Option<u64> { 6:6 swgen0 as bool; }); +// Interrupt mask clear register. Writing 1 to a bit clears the corresponding interrupt mask. +register! (NV_PFALCON_FALCON_IRQMCLR @PFalconBase [0x00000014 ] { +31 :0 valueas u32 ; +}); +register! (NV_PFALCON_FALCON_MAILBOX0 @PFalconBase [0x00000040 ] {31 :0 valueas u32 ; });
@@ -266,6 +271,14 @@ pub(crate) fn vga_workspace_addr(self) -> Option<u64> { 31:0 value as u32; }); +// Interface enable register. +register! (NV_PFALCON_FALCON_ITFEN @PFalconBase [0x00000048 ] { +0 :0 ctxenas bool ,"Context interface enable" ; +1 :1 mthdenas bool ,"Method interface enable" ; +2 :2 postwras bool ; +4 :4 secwl_cpuctl_aliasas bool ; +}); +// Used to store version information about the firmware running // on the Falcon processor. register! (NV_PFALCON_FALCON_OS @PFalconBase [0x00000080 ] {
@@ -307,6 +320,13 @@ pub(crate) fn mem_scrubbing_done(self) -> bool { 7:7 secure_stat as bool; }); +impl NV_PFALCON_FALCON_DMACTL { +/// Returns `true` if memory scrubbing is completed. +pub (crate )fn mem_scrubbing_done (self) ->bool { + !self.dmem_scrubbing () && !self.imem_scrubbing () + } +} +register! (NV_PFALCON_FALCON_DMATRFBASE @PFalconBase [0x00000110 ] {31 :0 baseas u32 ; });
@@ -353,6 +373,42 @@ pub(crate) fn with_falcon_mem(self, mem: FalconMem) -> Self { 1:1 startcpu as bool; }); +// Config memory base address. Specifies the upper address bits that must be matched +// to access the config aperture. The base may not be zero as that would conflict with DMEM. +register! (NV_PFALCON2_FALCON_CMEMBASE @PFalcon2Base [0x00000160 ] { +31 :18 valueas u16 ; +}); + +// IMEM access control register. Up to 4 ports are available for IMEM access. +register! (NV_PFALCON_FALCON_IMEMC @PFalconBase [0x00000180 [4 ;16 ]] { +15 :0 offsas u16 ,"IMEM block and word offset" ; +24 :24 aincwas bool ,"Auto-increment on write" ; +28 :28 secureas bool ,"Access secure IMEM" ; +}); + +// IMEM data register. Reading/writing this register accesses IMEM at the address +// specified by the corresponding IMEMC register. +register! (NV_PFALCON_FALCON_IMEMD @PFalconBase [0x00000184 [4 ;16 ]] { +31 :0 dataas u32 ; +}); + +// IMEM tag register. Used to set the tag for the current IMEM block. +register! (NV_PFALCON_FALCON_IMEMT @PFalconBase [0x00000188 [4 ;16 ]] { +15 :0 tagas u16 ; +}); + +// DMEM access control register. Up to 8 ports are available for DMEM access. +register! (NV_PFALCON_FALCON_DMEMC @PFalconBase [0x000001c0 [8 ;8 ]] { +15 :0 offsas u16 ,"DMEM block and word offset" ; +24 :24 aincwas bool ,"Auto-increment on write" ; +}); + +// DMEM data register. Reading/writing this register accesses DMEM at the address +// specified by the corresponding DMEMC register. +register! (NV_PFALCON_FALCON_DMEMD @PFalconBase [0x000001c4 [8 ;8 ]] { +31 :0 dataas u32 ; +}); +// Actually known as `NV_PSEC_FALCON_ENGINE` and `NV_PGSP_FALCON_ENGINE` depending on the falcon // instance. register! (NV_PFALCON_FALCON_ENGINE @PFalconBase [0x000003c0 ] {
@@ -390,6 +446,13 @@ pub(crate) fn with_falcon_mem(self, mem: FalconMem) -> Self {// PRISCV +// RISC-V status register for debug (Turing and GA100 only). +// Reflects current RISC-V core status. +register! (NV_PRISCV_RISCV_CORE_SWITCH_RISCV_STATUS @PFalcon2Base [0x00000240 ] { +0 :0 active_statas bool ,"RISC-V core active/inactive status" ; +}); + +// GA102 and later register! (NV_PRISCV_RISCV_CPUCTL @PFalcon2Base [0x00000388 ] {0 :0 haltedas bool ;7 :7 active_statas bool ;
Signature · 1 line
2.52.0
Alexandre Courbot
maintainerRe: [PATCH v3 06/12] gpu: nova-core: add Turing boot registers
Quoted 12 lines · Timur Tabi
Define some more GPU registers used to boot GSP-RM on Turing and GA100.
Signed-off-by Timur Tabi <[email protected]>--- drivers/gpu/nova-core/regs.rs | 63 +++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+)drivers/gpu/nova-core/regs.rs +0
-0
drivers/gpu/nova-core/regs.rs pub(crate) fn vga_workspace_addr(self) -> Option<u64> { · line 265
Quoted 8 lines
drivers/gpu/nova-core/regs.rs +5
-0@@ -258,6 +258,11 @@ pub(crate) fn vga_workspace_addr(self) -> Option<u64> { 6:6 swgen0 as bool; }); +// Interrupt mask clear register. Writing 1 to a bit clears the corresponding interrupt mask. +register! (NV_PFALCON_FALCON_IRQMCLR @PFalconBase [0x00000014 ] { +31 :0 valueas u32 ; +}); +
This register doesn't appear to be used in this series.
Quoted 5 lines
drivers/gpu/nova-core/regs.rs +0
-0register! (NV_PFALCON_FALCON_MAILBOX0 @PFalconBase [0x00000040 ] {31 :0 valueas u32 ; });@@ -266,6 +271,14 @@ pub(crate) fn vga_workspace_addr(self) -> Option<u64> { 31:0 value as u32;
drivers/gpu/nova-core/regs.rs pub(crate) fn vga_workspace_addr(self) -> Option<u64> { · line 281
Quoted 10 lines
drivers/gpu/nova-core/regs.rs +8
-0}); +// Interface enable register. +register! (NV_PFALCON_FALCON_ITFEN @PFalconBase [0x00000048 ] { +0 :0 ctxenas bool ,"Context interface enable" ; +1 :1 mthdenas bool ,"Method interface enable" ; +2 :2 postwras bool ; +4 :4 secwl_cpuctl_aliasas bool ; +}); +
Neither is this one.
Quoted 18 lines
drivers/gpu/nova-core/regs.rs +7
-0// Used to store version information about the firmware running // on the Falcon processor. register! (NV_PFALCON_FALCON_OS @PFalconBase [0x00000080 ] {@@ -307,6 +320,13 @@ pub(crate) fn mem_scrubbing_done(self) -> bool { 7:7 secure_stat as bool; }); +impl NV_PFALCON_FALCON_DMACTL { +/// Returns `true` if memory scrubbing is completed. +pub (crate )fn mem_scrubbing_done (self) ->bool { + !self.dmem_scrubbing () && !self.imem_scrubbing () + } +} +register! (NV_PFALCON_FALCON_DMATRFBASE @PFalconBase [0x00000110 ] {31 :0 baseas u32 ; });
drivers/gpu/nova-core/regs.rs pub(crate) fn with_falcon_mem(self, mem: FalconMem) -> Self { · line 380
Quoted 8 lines
drivers/gpu/nova-core/regs.rs +5
-0@@ -353,6 +373,42 @@ pub(crate) fn with_falcon_mem(self, mem: FalconMem) -> Self { 1:1 startcpu as bool; }); +// Config memory base address. Specifies the upper address bits that must be matched +// to access the config aperture. The base may not be zero as that would conflict with DMEM. +register! (NV_PFALCON2_FALCON_CMEMBASE @PFalcon2Base [0x00000160 ] { +31 :18 valueas u16 ; +});
Or this one.
For the one that remains, please introduce them in the patch that adds PIO support - that way they are introduced alongside the code that makes use of them. regs.rs is not touched in the PIO patch, so this also won't complicate review.
PATCH v3 7/12 gpu: nova-core: move some functions into the HAL
In reply to Timur TabiA few Falcon methods are actually GPU-specific, so move them into the HAL.
--- drivers/gpu/nova-core/falcon.rs | 45 ++--------------------- drivers/gpu/nova-core/falcon/hal.rs | 10 +++++ drivers/gpu/nova-core/falcon/hal/ga102.rs | 43 ++++++++++++++++++++++ 3 files changed, 56 insertions(+), 42 deletions(-)
drivers/gpu/nova-core/falcon.rs +3 -42
@@ -13,7 +13,6 @@ prelude::*, sync::aref::ARef, time::{ - delay::fsleep,Delta ,// }, };
@@ -394,48 +393,11 @@ pub(crate) fn dma_reset(&self, bar: &Bar0) { regs::NV_PFALCON_FALCON_DMACTL ::default ().write (bar, &E ::ID ); } -/// Wait for memory scrubbing to complete. -fn reset_wait_mem_scrubbing (&self, bar: &Bar0 ) ->Result { -// TIMEOUT: memory scrubbing should complete in less than 20ms. -read_poll_timeout ( - ||Ok (regs::NV_PFALCON_FALCON_HWCFG2 ::read (bar, &E ::ID )), - |r| r.mem_scrubbing_done (), -Delta ::ZERO , -Delta ::from_millis (20 ), - ) - .map (|_| ()) - } - -/// Reset the falcon engine. -fn reset_eng (&self, bar: &Bar0 ) ->Result { -let _ = regs::NV_PFALCON_FALCON_HWCFG2 ::read (bar, &E ::ID ); - -// According to OpenRM's `kflcnPreResetWait_GA102` documentation, HW sometimes does not set -// RESET_READY so a non-failing timeout is used. -let _ =read_poll_timeout ( - ||Ok (regs::NV_PFALCON_FALCON_HWCFG2 ::read (bar, &E ::ID )), - |r| r.reset_ready (), -Delta ::ZERO , -Delta ::from_micros (150 ), - ); - - regs::NV_PFALCON_FALCON_ENGINE ::update (bar, &E ::ID , |v| v.set_reset (true )); - -// TIMEOUT: falcon engine should not take more than 10us to reset. -fsleep (Delta ::from_micros (10 )); - - regs::NV_PFALCON_FALCON_ENGINE ::update (bar, &E ::ID , |v| v.set_reset (false )); - - self.reset_wait_mem_scrubbing (bar)?; - -Ok (()) - } -/// Reset the controller, select the falcon core, and wait for memory scrubbing to complete. pub (crate )fn reset (&self, bar: &Bar0 ) ->Result { - self.reset_eng (bar)?; + self.hal.reset_eng (bar)?; self.hal.select_core (self, bar)?; - self.reset_wait_mem_scrubbing (bar)?; + self.hal.reset_wait_mem_scrubbing (bar)?; regs::NV_PFALCON_FALCON_RM ::default () .set_value (regs::NV_PMC_BOOT_0 ::read (bar).into ())
@@ -666,8 +628,7 @@ pub(crate) fn signature_reg_fuse_version(/// /// Returns `true` if the RISC-V core is active, `false` otherwise. pub (crate )fn is_riscv_active (&self, bar: &Bar0 ) ->bool { -let cpuctl = regs::NV_PRISCV_RISCV_CPUCTL ::read (bar, &E ::ID ); - cpuctl.active_stat () + self.hal.is_riscv_active (bar) }/// Write the application version to the OS register.
drivers/gpu/nova-core/falcon/hal.rs +10 -0
@@ -37,6 +37,16 @@ fn signature_reg_fuse_version(/// Program the boot ROM registers prior to starting a secure firmware. fn program_brom (&self, falcon: &Falcon <E >, bar: &Bar0 , params: &FalconBromParams ) ->Result ; + +/// Check if the RISC-V core is active. +/// Returns `true` if the RISC-V core is active, `false` otherwise. +fn is_riscv_active (&self, bar: &Bar0 ) ->bool ; + +/// Wait for memory scrubbing to complete. +fn reset_wait_mem_scrubbing (&self, bar: &Bar0 ) ->Result ; + +/// Reset the falcon engine. +fn reset_eng (&self, bar: &Bar0 ) ->Result ; }/// Returns a boxed falcon HAL adequate for `chipset`.
drivers/gpu/nova-core/falcon/hal/ga102.rs +43 -0
53 lines not on this page · raw message
Signature · 1 line
2.52.0
PATCH v3 8/12 gpu: nova-core: Add basic Turing HAL
In reply to Timur TabiAdd the basic HAL for recognizing Turing GPUs. This isn't enough to support booting GSP-RM on Turing, but it's a start.
Note that GA100, which boots using the same method as Turing, is not supported yet.
--- drivers/gpu/nova-core/falcon/hal.rs | 6 +- drivers/gpu/nova-core/falcon/hal/tu102.rs | 74 +++++++++++++++++++++++ 2 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/nova-core/falcon/hal/tu102.rs
drivers/gpu/nova-core/falcon/hal.rs +5 -1
@@ -13,6 +13,7 @@ };mod ga102; +mod tu102;/// Hardware Abstraction Layer for Falcon cores. ///
@@ -60,9 +61,12 @@ pub(super) fn falcon_hal<E: FalconEngine + 'static>(use Chipset ::*;let hal =match chipset { +TU102 |TU104 |TU106 |TU116 |TU117 => { +KBox ::new (tu102::Tu102 ::<E >::new (),GFP_KERNEL )?as KBox <dyn FalconHal <E >> + },GA102 |GA103 |GA104 |GA106 |GA107 |AD102 |AD103 |AD104 |AD106 |AD107 => {KBox ::new (ga102::Ga102 ::<E >::new (),GFP_KERNEL )?as KBox <dyn FalconHal <E >> - } + }, _ =>return Err (ENOTSUPP ), };
drivers/gpu/nova-core/falcon/hal/tu102.rs new file +74 -0
74 lines not on this page · raw message
Signature · 1 line
2.52.0
Alexandre Courbot
maintainerRe: [PATCH v3 08/12] gpu: nova-core: Add basic Turing HAL
Quoted 88 lines · Timur Tabi
Add the basic HAL for recognizing Turing GPUs. This isn't enough to support booting GSP-RM on Turing, but it's a start.
Note that GA100, which boots using the same method as Turing, is not supported yet.
Signed-off-by Timur Tabi <[email protected]>--- drivers/gpu/nova-core/falcon/hal.rs | 6 +- drivers/gpu/nova-core/falcon/hal/tu102.rs | 74 +++++++++++++++++++++++ 2 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/nova-core/falcon/hal/tu102.rsdrivers/gpu/nova-core/falcon/hal.rs +5
-1@@ -13,6 +13,7 @@ };mod ga102; +mod tu102;/// Hardware Abstraction Layer for Falcon cores. /// @@ -60,9 +61,12 @@ pub(super) fn falcon_hal<E: FalconEngine + 'static>(use Chipset ::*;let hal =match chipset { +TU102 |TU104 |TU106 |TU116 |TU117 => { +KBox ::new (tu102::Tu102 ::<E >::new (),GFP_KERNEL )?as KBox <dyn FalconHal <E >> + },GA102 |GA103 |GA104 |GA106 |GA107 |AD102 |AD103 |AD104 |AD106 |AD107 => {KBox ::new (ga102::Ga102 ::<E >::new (),GFP_KERNEL )?as KBox <dyn FalconHal <E >> - } + }, _ =>return Err (ENOTSUPP ), };drivers/gpu/nova-core/falcon/hal/tu102.rs new file +43
-0@@ -0,0 +1,74 @@ +// SPDX-License-Identifier: GPL-2.0 + +use core::marker::PhantomData ; + +use kernel::{ + io::poll::read_poll_timeout, + prelude::*, + time::delay::fsleep, + time::Delta ,// +}; + +use crate ::driver::Bar0 ; +use crate ::falcon::{ +Falcon ,FalconBromParams ,FalconEngine +}; +use crate ::regs; + +use super ::FalconHal ; + +pub (super )struct Tu102 <E :FalconEngine >(PhantomData <E >); + +impl <E :FalconEngine >Tu102 <E > { +pub (super )fn new () ->Self { +Self (PhantomData ) + } +} + +impl <E :FalconEngine >FalconHal <E >for Tu102 <E > { +fn select_core (&self, _falcon: &Falcon <E >, _bar: &Bar0 ) ->Result { +Ok (()) + } + +fn signature_reg_fuse_version ( + &self, + _falcon: &Falcon <E >, + _bar: &Bar0 , + _engine_id_mask:u16 , + _ucode_id:u8 , + ) ->Result <u32 > { +Ok (0 ) + } + +fn program_brom (&self, _falcon: &Falcon <E >, _bar: &Bar0 , _params: &FalconBromParams ) ->Result {
drivers/gpu/nova-core/falcon/hal/tu102.rs line 53
Quoted 10 lines
drivers/gpu/nova-core/falcon/hal/tu102.rs new file +10
-0+Ok (()) + } + +fn is_riscv_active (&self, bar: &Bar0 ) ->bool { +let cpuctl = regs::NV_PRISCV_RISCV_CORE_SWITCH_RISCV_STATUS ::read (bar, &E ::ID ); + cpuctl.active_stat () + } + +fn reset_wait_mem_scrubbing (&self, bar: &Bar0 ) ->Result { + read_poll_timeout(
Please add a TIMEOUT: comment here, similarly to what is done in ga102.rs.
PATCH v3 9/12 gpu: nova-core: add Falcon HAL method supports_dma()
In reply to Timur TabiSome GPUs do not support using DMA to transfer code/data from system memory to Falcon memory, and instead must use programmed I/O (PIO). Add a function to the Falcon HAL to indicate whether a given GPU's Falcons support DMA for this purpose.
--- drivers/gpu/nova-core/falcon.rs | 7 +++++++ drivers/gpu/nova-core/falcon/hal.rs | 3 +++ drivers/gpu/nova-core/falcon/hal/ga102.rs | 4 ++++ drivers/gpu/nova-core/falcon/hal/tu102.rs | 4 ++++ 4 files changed, 18 insertions(+)
drivers/gpu/nova-core/falcon.rs +7 -0
@@ -631,6 +631,13 @@ pub(crate) fn is_riscv_active(&self, bar: &Bar0) -> bool { self.hal.is_riscv_active (bar) } +/// Check if this Falcon supports DMA for loading firmware. +/// +/// Returns `true` if DMA is supported, `false` if PIO must be used instead. +pub (crate )fn supports_dma (&self) ->bool { + self.hal.supports_dma () + } +/// Write the application version to the OS register. pub (crate )fn write_os_version (&self, bar: &Bar0 , app_version:u32 ) { regs::NV_PFALCON_FALCON_OS ::default ()
drivers/gpu/nova-core/falcon/hal.rs +3 -0
@@ -48,6 +48,9 @@ fn signature_reg_fuse_version(/// Reset the falcon engine. fn reset_eng (&self, bar: &Bar0 ) ->Result ; + +/// Returns true of this Falcon supports DMA transfer from system memory to Falcon memory +fn supports_dma (&self) ->bool ; }/// Returns a boxed falcon HAL adequate for `chipset`.
drivers/gpu/nova-core/falcon/hal/ga102.rs +4 -0
@@ -160,4 +160,8 @@ fn reset_eng(&self, bar: &Bar0) -> Result {Ok (()) } + +fn supports_dma (&self) ->bool { +true + } }
drivers/gpu/nova-core/falcon/hal/tu102.rs +4 -0
@@ -71,4 +71,8 @@ fn reset_eng(&self, bar: &Bar0) -> Result {Ok (()) } + +fn supports_dma (&self) ->bool { +false + } }
Signature · 1 line
2.52.0
PATCH v3 10/12 gpu: nova-core: add FalconUCodeDescV2 support
In reply to Timur TabiThe FRTS firmware in Turing and GA100 VBIOS has an older header format (v2 instead of v3). To support both v2 and v3 at runtime, add the FalconUCodeDescV2 struct, and update code that references the FalconUCodeDescV3 directly with a FalconUCodeDesc enum that encapsulates both.
--- drivers/gpu/nova-core/firmware.rs | 141 +++++++++++++++++++++++- drivers/gpu/nova-core/firmware/fwsec.rs | 72 +++++++----- drivers/gpu/nova-core/vbios.rs | 73 ++++++------ 3 files changed, 228 insertions(+), 58 deletions(-)
drivers/gpu/nova-core/firmware.rs +139 -2
@@ -43,6 +43,46 @@ fn request_firmware( .and_then(|path| firmware::Firmware::request(&path, dev)) } +/// Structure used to describe some firmwares, notably FWSEC-FRTS. +#[repr( C )] +#[derive( Debug , Clone )] +pub (crate )struct FalconUCodeDescV2 { +/// Header defined by 'NV_BIT_FALCON_UCODE_DESC_HEADER_VDESC*' in OpenRM. + hdr:u32 , +/// Stored size of the ucode after the header, compressed or uncompressed + stored_size:u32 , +/// Uncompressed size of the ucode. If store_size == uncompressed_size, then the ucode +/// is not compressed. +pub (crate ) uncompressed_size:u32 , +/// Code entry point +pub (crate ) virtual_entry:u32 , +/// Offset after the code segment at which the Application Interface Table headers are located. +pub (crate ) interface_offset:u32 , +/// Base address at which to load the code segment into 'IMEM'. +pub (crate ) imem_phys_base:u32 , +/// Size in bytes of the code to copy into 'IMEM'. +pub (crate ) imem_load_size:u32 , +/// Virtual 'IMEM' address (i.e. 'tag') at which the code should start. +pub (crate ) imem_virt_base:u32 , +/// Virtual address of secure IMEM segment. +pub (crate ) imem_sec_base:u32 , +/// Size of secure IMEM segment. +pub (crate ) imem_sec_size:u32 , +/// Offset into stored (uncompressed) image at which DMEM begins. +pub (crate ) dmem_offset:u32 , +/// Base address at which to load the data segment into 'DMEM'. +pub (crate ) dmem_phys_base:u32 , +/// Size in bytes of the data to copy into 'DMEM'. +pub (crate ) dmem_load_size:u32 , +/// "Alternate" Size of data to load into IMEM. +pub (crate ) alt_imem_load_size:u32 , +/// "Alternate" Size of data to load into DMEM. +pub (crate ) alt_dmem_load_size:u32 , +} + +// SAFETY: all bit patterns are valid for this type, and it doesn't use interior mutability. +unsafe impl FromBytes for FalconUCodeDescV2 {} +/// Structure used to describe some firmwares, notably FWSEC-FRTS. #[repr( C )] #[derive( Debug , Clone )]
@@ -76,13 +116,110 @@ pub(crate) struct FalconUCodeDescV3 { _reserved: u16, } -impl FalconUCodeDescV3 { +// SAFETY: all bit patterns are valid for this type, and it doesn't use +// interior mutability. +unsafe impl FromBytes for FalconUCodeDescV3 {} + +/// Enum wrapping the different versions of Falcon microcode descriptors. +/// +/// This allows handling both V2 and V3 descriptor formats through a +/// unified type, providing version-agnostic access to firmware metadata +/// via the [`FalconUCodeDescriptor`] trait. +#[derive( Debug , Clone )] +pub (crate )enum FalconUCodeDesc { +V2 (FalconUCodeDescV2 ), +V3 (FalconUCodeDescV3 ), +} + +/// Trait providing a common interface for accessing Falcon microcode descriptor fields. +/// +/// This trait abstracts over the different descriptor versions ([`FalconUCodeDescV2`] and +/// [`FalconUCodeDescV3`]), allowing code to work with firmware metadata without needing to +/// know the specific descriptor version. Fields not present return zero. +pub (crate )trait FalconUCodeDescriptor { +fn hdr (&self) ->u32 ; +fn imem_load_size (&self) ->u32 ; +fn interface_offset (&self) ->u32 ; +fn dmem_load_size (&self) ->u32 ; +fn pkc_data_offset (&self) ->u32 ; +fn engine_id_mask (&self) ->u16 ; +fn ucode_id (&self) ->u8 ; +fn signature_count (&self) ->u8 ; +fn signature_versions (&self) ->u16 ; +} + +impl FalconUCodeDescriptor for FalconUCodeDescV2 { +fn hdr (&self) ->u32 { self.hdr } +fn imem_load_size (&self) ->u32 { self.imem_load_size } +fn interface_offset (&self) ->u32 { self.interface_offset } +fn dmem_load_size (&self) ->u32 { self.dmem_load_size } +fn pkc_data_offset (&self) ->u32 {0 } +fn engine_id_mask (&self) ->u16 {0 } +fn ucode_id (&self) ->u8 {0 } +fn signature_count (&self) ->u8 {0 } +fn signature_versions (&self) ->u16 {0 } +} + +impl FalconUCodeDescriptor for FalconUCodeDescV3 { +fn hdr (&self) ->u32 { self.hdr } +fn imem_load_size (&self) ->u32 { self.imem_load_size } +fn interface_offset (&self) ->u32 { self.interface_offset } +fn dmem_load_size (&self) ->u32 { self.dmem_load_size } +fn pkc_data_offset (&self) ->u32 { self.pkc_data_offset } +fn engine_id_mask (&self) ->u16 { self.engine_id_mask } +fn ucode_id (&self) ->u8 { self.ucode_id } +fn signature_count (&self) ->u8 { self.signature_count } +fn signature_versions (&self) ->u16 { self.signature_versions } +} + +impl FalconUCodeDesc { +// Return trait object, the only match needed. +pub (crate )fn as_descriptor (&self) -> &dyn FalconUCodeDescriptor { +match self { +FalconUCodeDesc ::V2 (v2) => v2, +FalconUCodeDesc ::V3 (v3) => v3, + } + } +/// Returns the size in bytes of the header. pub (crate )fn size (&self) ->usize { +let hdr = self.as_descriptor ().hdr (); +const HDR_SIZE_SHIFT :u32 =16 ;const HDR_SIZE_MASK :u32 =0xffff0000 ; + ((hdr &HDR_SIZE_MASK ) >>HDR_SIZE_SHIFT ).into_safe_cast () + } + +pub (crate )fn imem_load_size (&self) ->u32 { + self.as_descriptor ().imem_load_size () + } + +pub (crate )fn interface_offset (&self) ->u32 { + self.as_descriptor ().interface_offset () + } + +pub (crate )fn dmem_load_size (&self) ->u32 { + self.as_descriptor ().dmem_load_size () + } + +pub (crate )fn pkc_data_offset (&self) ->u32 { + self.as_descriptor ().pkc_data_offset () + } + +pub (crate )fn engine_id_mask (&self) ->u16 { + self.as_descriptor ().engine_id_mask () + } + +pub (crate )fn ucode_id (&self) ->u8 { + self.as_descriptor ().ucode_id () + } + +pub (crate )fn signature_count (&self) ->u8 { + self.as_descriptor ().signature_count () + } - ((self.hdr &HDR_SIZE_MASK ) >>HDR_SIZE_SHIFT ).into_safe_cast () +pub (crate )fn signature_versions (&self) ->u16 { + self.as_descriptor ().signature_versions () } }
drivers/gpu/nova-core/firmware/fwsec.rs +47 -25
141 lines not on this page · raw message
drivers/gpu/nova-core/vbios.rs +42 -31
110 lines not on this page · raw message
Signature · 1 line
2.52.0
PATCH v3 11/12 gpu: nova-core: align LibosMemoryRegionInitArgument size to page size
In reply to Timur TabiOn Turing and GA100 (i.e. the versions that use Libos v2), GSP-RM insists that the 'size' parameter of the LibosMemoryRegionInitArgument struct be aligned to 4KB. The logging buffers are already aligned to that size, so only the GSP_ARGUMENTS_CACHED struct needs to be adjusted. Make that adjustment by adding padding to the end of the struct.
--- drivers/gpu/nova-core/gsp/fw.rs | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-)
drivers/gpu/nova-core/gsp/fw.rs +17 -7
@@ -889,17 +889,27 @@ unsafe impl AsBytes for GspMsgElement {}unsafe impl FromBytes for GspMsgElement {}/// Arguments for GSP startup. -#[repr(transparent)] -pub (crate )struct GspArgumentsCached (bindings::GSP_ARGUMENTS_CACHED ); +/// +/// On Turing and GA100, the entries in the `LibosMemoryRegionInitArgument` +/// must all be a multiple of GSP_PAGE_SIZE in size, so add padding to force it +/// to that size. +#[repr( C )] +pub (crate )struct GspArgumentsCached ( + bindings::GSP_ARGUMENTS_CACHED , + [u8 ;GSP_PAGE_SIZE - core::mem::size_of ::<bindings::GSP_ARGUMENTS_CACHED >()], +);impl GspArgumentsCached {/// Creates the arguments for starting the GSP up using `cmdq` as its command queue. pub (crate )fn new (cmdq: &Cmdq ) ->Self { -Self (bindings::GSP_ARGUMENTS_CACHED { - messageQueueInitArguments:MessageQueueInitArguments ::new (cmdq).0 , - bDmemStack:1 , - ..Default ::default () - }) +Self ( + bindings::GSP_ARGUMENTS_CACHED { + messageQueueInitArguments:MessageQueueInitArguments ::new (cmdq).0 , + bDmemStack:1 , + ..Default ::default () + }, + [0u8 ;GSP_PAGE_SIZE - core::mem::size_of ::<bindings::GSP_ARGUMENTS_CACHED >()] + ) } }
Signature · 1 line
2.52.0
Alexandre Courbot
maintainerRe: [PATCH v3 11/12] gpu: nova-core: align LibosMemoryRegionInitArgument size to page size
Quoted 36 lines · Timur Tabi
On Turing and GA100 (i.e. the versions that use Libos v2), GSP-RM insists that the 'size' parameter of the LibosMemoryRegionInitArgument struct be aligned to 4KB. The logging buffers are already aligned to that size, so only the
GSP_ARGUMENTS_CACHEDstruct needs to be adjusted. Make that adjustment by adding padding to the end of the struct.Signed-off-by Timur Tabi <[email protected]>--- drivers/gpu/nova-core/gsp/fw.rs | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-)drivers/gpu/nova-core/gsp/fw.rs +9
-4@@ -889,17 +889,27 @@ unsafe impl AsBytes for GspMsgElement {}unsafe impl FromBytes for GspMsgElement {}/// Arguments for GSP startup. -#[repr(transparent)] -pub (crate )struct GspArgumentsCached (bindings::GSP_ARGUMENTS_CACHED ); +/// +/// On Turing and GA100, the entries in the `LibosMemoryRegionInitArgument` +/// must all be a multiple of GSP_PAGE_SIZE in size, so add padding to force it +/// to that size. +#[repr( C )] +pub (crate )struct GspArgumentsCached ( + bindings::GSP_ARGUMENTS_CACHED , + [u8 ;GSP_PAGE_SIZE - core::mem::size_of ::<bindings::GSP_ARGUMENTS_CACHED >()], +);impl GspArgumentsCached {/// Creates the arguments for starting the GSP up using `cmdq` as its command queue. pub (crate )fn new (cmdq: &Cmdq ) ->Self { -Self (bindings::GSP_ARGUMENTS_CACHED { - messageQueueInitArguments:MessageQueueInitArguments ::new (cmdq).0 ,
drivers/gpu/nova-core/gsp/fw.rs unsafe impl AsBytes for GspMsgElement {} · line 911
Quoted 10 lines
drivers/gpu/nova-core/gsp/fw.rs +7
-3- bDmemStack: 1, - ..Default ::default () - }) +Self ( + bindings::GSP_ARGUMENTS_CACHED { + messageQueueInitArguments:MessageQueueInitArguments ::new (cmdq).0 , + bDmemStack:1 , + ..Default ::default () + }, + [0u8; GSP_PAGE_SIZE - core::mem::size_of::<bindings::GSP_ARGUMENTS_CACHED>()]
You can use Zeroable::zeroed() instead of this last complex line.
PATCH v3 12/12 gpu: nova-core: add PIO support for loading firmware images
In reply to Timur TabiTuring and GA100 use programmed I/O (PIO) instead of DMA to upload firmware images into Falcon memory.
A new firmware called the Generic Bootloader (as opposed to the GSP Bootloader) is used to upload FWSEC.
--- drivers/gpu/nova-core/falcon.rs | 157 ++++++++++++++++++++++++ drivers/gpu/nova-core/firmware.rs | 4 +- drivers/gpu/nova-core/firmware/fwsec.rs | 142 ++++++++++++++++++++- drivers/gpu/nova-core/gsp/boot.rs | 10 +- 4 files changed, 304 insertions(+), 9 deletions(-)
drivers/gpu/nova-core/falcon.rs +157 -0
@@ -15,11 +15,16 @@ time::{ Delta, // }, + transmute::AsBytes, // };use crate ::{ dma::DmaObject , driver::Bar0 , + firmware::fwsec::{ +BootloaderDmemDescV2 , +GenericBootloader ,// + }, gpu::Chipset , num::{FromSafeCast ,
@@ -406,6 +411,158 @@ pub(crate) fn reset(&self, bar: &Bar0) -> Result {Ok (()) } +/// Write a byte array to Falcon memory using programmed I/O (PIO). +/// +/// Writes `img` to the specified `target_mem` (IMEM or DMEM) starting at `mem_base`. +/// For IMEM writes, tags are set for each 256-byte block starting from `tag`. +/// +/// Returns `EINVAL` if `img.len()` is not a multiple of 4. +fn pio_wr_bytes ( + &self, + bar: &Bar0 , + img: &[u8 ], + mem_base:u16 , + target_mem:FalconMem , + port:u8 , + tag:u16 + ) ->Result { +// Rejecting misaligned images here allows us to avoid checking +// inside the loops. +if img.len () %4 !=0 { +return Err (EINVAL ); + } + +let port = usize::from (port); + +match target_mem { +FalconMem ::ImemSecure |FalconMem ::ImemNonSecure => { + regs::NV_PFALCON_FALCON_IMEMC ::default () + .set_secure (target_mem ==FalconMem ::ImemSecure ) + .set_aincw (true ) + .set_offs (mem_base) + .write (bar, &E ::ID , port); + +let mut tag = tag; +for blockin img.chunks (256 ) { + regs::NV_PFALCON_FALCON_IMEMT ::default () + .set_tag (tag) + .write (bar, &E ::ID , port); +for wordin block.chunks_exact (4 ) { +let w = [word[0 ], word[1 ], word[2 ], word[3 ]]; + regs::NV_PFALCON_FALCON_IMEMD ::default () + .set_data (u32::from_le_bytes (w)) + .write (bar, &E ::ID , port); + } + tag +=1 ; + } + }, +FalconMem ::Dmem => { + regs::NV_PFALCON_FALCON_DMEMC ::default () + .set_aincw (true ) + .set_offs (mem_base) + .write (bar, &E ::ID , port); + +for blockin img.chunks (256 ) { +for wordin block.chunks_exact (4 ) { +let w = [word[0 ], word[1 ], word[2 ], word[3 ]]; + regs::NV_PFALCON_FALCON_DMEMD ::default () + .set_data (u32::from_le_bytes (w)) + .write (bar, &E ::ID , port); + } + } + }, + } + +Ok (()) + } + +fn pio_wr <F :FalconFirmware <Target =E >>( + &self, + bar: &Bar0 , + fw: &F , + target_mem:FalconMem , + load_offsets: &FalconLoadTarget , + port:u8 , + tag:u16 , + ) ->Result { +let start = usize::from_safe_cast (load_offsets.src_start); +let len = usize::from_safe_cast (load_offsets.len); +let mem_base = u16::try_from (load_offsets.dst_start)?; + +// SAFETY: as_slice() ensures that start+len is within range +let data =unsafe { fw.as_slice (start, len).map_err (|_|EINVAL )? }; + + self.pio_wr_bytes (bar, data, mem_base, target_mem, port, tag) + } + +/// Perform a PIO copy into `IMEM` and `DMEM` of `fw`, and prepare the falcon to run it. +pub (crate )fn pio_load <F :FalconFirmware <Target =E >>( + &self, + bar: &Bar0 , + fw: &F , + gbl:Option <&GenericBootloader > + ) ->Result { +let imem_sec = fw.imem_sec_load_params (); +let imem_ns = fw.imem_ns_load_params ().ok_or (EINVAL )?; +let dmem = fw.dmem_load_params (); + + regs::NV_PFALCON_FBIF_CTL ::read (bar, &E ::ID ) + .set_allow_phys_no_ctx (true ) + .write (bar, &E ::ID ); + + regs::NV_PFALCON_FALCON_DMACTL ::default () + .write (bar, &E ::ID ); + +// If the Generic Bootloader was passed, then use it to boot FRTS +if let Some (gbl) = gbl { +let dst_start = u16::try_from (0x10000 - gbl.desc.code_size)?; +let data = &gbl.ucode[..usize::from_safe_cast (gbl.desc.code_size)]; +let tag = u16::try_from (gbl.desc.start_tag)?; + + self.pio_wr_bytes (bar, data, dst_start,FalconMem ::ImemNonSecure ,0 , tag)?; + +// This structure tells the generic bootloader where to find the FWSEC +// image. +let dmem_desc =BootloaderDmemDescV2 { + reserved: [0 ;4 ], + signature: [0 ;4 ], + ctx_dma:4 ,// FALCON_DMAIDX_PHYS_SYS_NCOH + code_dma_base: fw.dma_handle (), + non_sec_code_off: imem_ns.dst_start, + non_sec_code_size: imem_ns.len, + sec_code_off: imem_sec.dst_start, + sec_code_size: imem_sec.len, + code_entry_point:0 , + data_dma_base: fw.dma_handle () + u64::from (dmem.src_start), + data_size: dmem.len, + argc:0 , + argv:0 , + }; + + regs::NV_PFALCON_FBIF_TRANSCFG ::update (bar, &E ::ID ,4 , |v| { + v.set_target (FalconFbifTarget ::CoherentSysmem ) + .set_mem_type (FalconFbifMemType ::Physical ) + }); + + self.pio_wr_bytes (bar, dmem_desc.as_bytes (),0 ,FalconMem ::Dmem ,0 ,0 )?; + }else { + self.pio_wr (bar, fw,FalconMem ::ImemNonSecure , &imem_ns,0 , + u16::try_from (imem_ns.dst_start >>8 )?)?; + self.pio_wr (bar, fw,FalconMem ::ImemSecure , &imem_sec,0 , + u16::try_from (imem_sec.dst_start >>8 )?)?; + self.pio_wr (bar, fw,FalconMem ::Dmem , &dmem,0 ,0 )?; + } + + self.hal.program_brom (self, bar, &fw.brom_params ())?; + +// Set `BootVec` to start of non-secure code. + regs::NV_PFALCON_FALCON_BOOTVEC ::default () + .set_value (fw.boot_addr ()) + .write (bar, &E ::ID ); + +Ok (()) + } +/// Perform a DMA write according to `load_offsets` from `dma_handle` into the falcon's /// `target_mem`. ///
drivers/gpu/nova-core/firmware.rs +2 -2
@@ -31,7 +31,7 @@pub (crate )const FIRMWARE_VERSION : &str ="570.144" ;/// Requests the GPU firmware `name` suitable for `chipset`, with version `ver`. -fn request_firmware ( +pub (crate )fn request_firmware ( dev: &device::Device , chipset: gpu::Chipset , name: &str,
@@ -285,7 +285,7 @@ fn no_patch_signature(self) -> FirmwareDmaObject<F, Signed> {/// Header common to most firmware files. #[repr( C )] #[derive( Debug , Clone )] -struct BinHdr { +pub (crate )struct BinHdr {/// Magic number, must be `0x10de`. bin_magic:u32 ,/// Version of the header.
drivers/gpu/nova-core/firmware/fwsec.rs +137 -5
192 lines not on this page · raw message
drivers/gpu/nova-core/gsp/boot.rs +8 -2
@@ -48,6 +48,7 @@ impl super::Gsp {/// created the WPR2 region. fn run_fwsec_frts ( dev: &device::Device <device::Bound >, + chipset:Chipset , falcon: &Falcon <Gsp >, bar: &Bar0 , bios: &Vbios,
@@ -65,6 +66,7 @@ fn run_fwsec_frts(let fwsec_frts =FwsecFirmware ::new ( dev, + chipset, falcon, bar, bios,
@@ -147,7 +149,7 @@ pub(crate) fn boot(let fb_layout =FbLayout ::new (chipset, bar, &gsp_fw)?;dev_dbg! (dev,"{:#x?}\n" , fb_layout); -Self ::run_fwsec_frts (dev, gsp_falcon, bar, &bios, &fb_layout)?; +Self ::run_fwsec_frts (dev, chipset, gsp_falcon, bar, &bios, &fb_layout)?;let booter_loader =BooterFirmware ::new ( dev,
@@ -186,7 +188,11 @@ pub(crate) fn boot( ); sec2_falcon.reset (bar)?; - sec2_falcon.dma_load (bar, &booter_loader)?; +if sec2_falcon.supports_dma () { + sec2_falcon.dma_load (bar, &booter_loader)?; + }else { + sec2_falcon.pio_load (bar, &booter_loader,None )?; + }let wpr_handle = wpr_meta.dma_handle ();let (mbox0, mbox1) = sec2_falcon.boot ( bar,
Signature · 1 line
2.52.0
Alexandre Courbot
maintainerQuoted 10 lines · Timur Tabi
This patch set adds basic support for pre-booting GSP-RM on Turing.
There is also partial support for GA100, but it's currently not fully implemented. GA100 is considered experimental in Nouveau, and so it hasn't been tested with NovaCore either.
That latest linux-firmware.git is required because it contains the Generic Bootloader image that has not yet been propogated to distros.
I had a pretty large diff after running make rustfmt on top of this series. Please make sure that each patch is properly formatted.