gpu: nova: add boot42 support for next-gen GPUs
Subsystems (4)
v5 cover gpu: nova: add boot42 support for next-gen GPUs
Hi Danilo, Alex, Timur,
This latest one addresses everything so far, of course. I'm hoping to pick up some reviewed-by or acked-by tags at this point, unless anyone spots additional issues.
Changes in v5:
Two fixes, both from Timur's review feedback (thanks!):
1) Updated both the cover letter, and patch 3 commit description, with the correct description of the future contents of NV_PMC_BOOT_0.
2) Removed a trailing "boot42" typo from a comment in the code.
Changes in v4:
1) Simplified and improved the decision logic: reads both arch_0 and arch_1 fields in boot0, and skips the unnecessary is_nv04() logic as well. Thanks to Timur Tabi and Danilo for noticing these issues.
2) Added a patch to represent Architecture as a u8. This simplifies a few things. (Thanks to Alex Courbot. I added your Suggested-by to that patch.)
3) Enhanced the Revision type to do more, which simplifies the callers. (Thanks to Danilo.)
Changes in v3:
1) Restored the Revision type as recommended by Danilo, but decoupled it from boot0.
2) Applied Alex Courbot's suggestion to use TryFrom<NV_PMC_BOOT_0/42> for Spec.
3) Reflowed the new comment documentation to 100 cols, to avoid wasting a few vertical lines.
Changes in v2:
1) Restored the Spec type, and used that to encapsulate the subsequent boot42 enhancements. Thanks to Danilo Krummrich's feedback for that improvement.
v1 cover letter (with typos fixed)
NVIDIA GPUs are moving away from using NV_PMC_BOOT_0 to contain architecture and revision details, and will instead use NV_PMC_BOOT_42 in the future. NV_PMC_BOOT_0 will contain a specific set of values that will mean "go read NV_PMC_BOOT_42 instead".
Change the selection logic in Nova so that it will claim Turing and later GPUs. This will work for the foreseeable future, without any further code changes here, because all NVIDIA GPUs are considered, from the oldest supported on Linux (NV04), through the future GPUs.
Add some comment documentation to explain, chronologically, how boot0 and boot42 change with the GPU eras, and how that affects the selection logic.
Also, remove the Revision type, because Revision is no longer valuable as a stand-alone type, because we only ever want the full information that Spec provides.
This is based on today's drm-rust-next, which in turn is based on Linux 6.18-rc2.
John Hubbard (3):
gpu: nova-core: prepare Spec and Revision types for boot0/boot42
gpu: nova-core: make Architecture behave as a u8 type
gpu: nova-core: add boot42 support for next-gen GPUs
drivers/gpu/nova-core/gpu.rs | 92 +++++++++++++++++++++++++++-------- drivers/gpu/nova-core/regs.rs | 41 ++++++++++++++++ 2 files changed, 112 insertions(+), 21 deletions(-)
base-commit: ade19c5060dfa39b84a9475a4a6b05e2a8a2b3ac
Signature · 1 line
2.51.2
PATCH v5 1/3 gpu: nova-core: prepare Spec and Revision types for boot0/boot42
1) Implement Display for Spec. This simplifies the dev_info!() code for printing banners such as:
NVIDIA (Chipset: GA104, Architecture: Ampere, Revision: a.1)
2) Decouple Revision from boot0.
3) Enhance Revision, which in turn simplifies Spec::new().
4) Also, slightly enhance the comment about Spec, to be more precise.
--- drivers/gpu/nova-core/gpu.rs | 45 +++++++++++++++++++---------------- drivers/gpu/nova-core/regs.rs | 8 +++++++ 2 files changed, 33 insertions(+), 20 deletions(-)
drivers/gpu/nova-core/gpu.rs +25 -20
@@ -130,16 +130,18 @@ fn try_from(value: u8) -> Result<Self> { }pub (crate )struct Revision { - major:u8 , - minor:u8 , +pub (crate ) major:u8 , +pub (crate ) minor:u8 , } -impl Revision { -fn from_boot0 (boot0: regs::NV_PMC_BOOT_0 ) ->Self { -Self { - major: boot0.major_revision (), - minor: boot0.minor_revision (), - } +impl TryFrom <regs::NV_PMC_BOOT_0 >for Spec { +type Error =Error ; + +fn try_from (boot0: regs::NV_PMC_BOOT_0 ) ->Result <Self > { +Ok (Self { + chipset: boot0.chipset ()?, + revision: boot0.revision (), + }) } }
@@ -149,7 +151,7 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { } } -/// Structure holding the metadata of the GPU. +/// Structure holding a basic description of the GPU: Architecture, Chipset and Revision. pub (crate )struct Spec { chipset:Chipset ,/// The revision of the chipset.
@@ -160,10 +162,19 @@ impl Spec {fn new (bar: &Bar0 ) ->Result <Spec > {let boot0 = regs::NV_PMC_BOOT_0 ::read (bar); -Ok (Self { - chipset: boot0.chipset ()?, - revision:Revision ::from_boot0 (boot0), - }) +Spec ::try_from (boot0) + } +} + +impl fmt::Display for Spec { +fn fmt (&self, f: &mut fmt::Formatter <'_>) -> fmt::Result { +write! ( + f, +"Chipset: {}, Architecture: {:?}, Revision: {}" , + self.chipset, + self.chipset.arch (), + self.revision + ) } }
@@ -193,13 +204,7 @@ pub(crate) fn new<'a>( ) -> impl PinInit<Self, Error> + 'a {try_pin_init! (Self { spec:Spec ::new (bar).inspect (|spec| { -dev_info! ( - pdev.as_ref (), -"NVIDIA (Chipset: {}, Architecture: {:?}, Revision: {})\n" , - spec.chipset, - spec.chipset.arch (), - spec.revision - ); +dev_info! (pdev.as_ref (),"NVIDIA ({})\n" , spec); })?,// We must wait for GFW_BOOT completion before doing any significant setup on the GPU.
drivers/gpu/nova-core/regs.rs +8 -0
@@ -41,6 +41,14 @@ pub(crate) fn chipset(self) -> Result<Chipset> { }) .and_then (Chipset ::try_from) } + +/// Returns the revision information of the chip. +pub (crate )fn revision (self) ->crate ::gpu::Revision { +crate ::gpu::Revision { + major: self.major_revision (), + minor: self.minor_revision (), + } + } }// PBUS
Signature · 1 line
2.51.2
Alexandre Courbot
maintainerRe: [PATCH v5 1/3] gpu: nova-core: prepare Spec and Revision types for boot0/boot42
Quoted 10 lines · John Hubbard
1) Implement Display for Spec. This simplifies the dev_info!() code for printing banners such as:
NVIDIA (Chipset: GA104, Architecture: Ampere, Revision: a.1)
2) Decouple Revision from boot0.
3) Enhance Revision, which in turn simplifies
Spec::new().4) Also, slightly enhance the comment about Spec, to be more precise.
A bullet-list in a patch description is a sure sign you will be asked to split things up. :)
And in this case I think it makes all the more sense, since all these things taken separately ought to be simple, but having them in the same diff makes it confusing to review.
Although it's mostly the Display implementation that at the very least should be its own patch, the rest can probably be kept together as it is related, and adding an intermediate patch would require temporary code to build Revision. The diff becomes much clearer once the impl blocks are moved where they should be (please see below).
The comment update can be squashed together with the Revision/Spec patch.
Quoted 28 lines
Cc Alexandre Courbot <[email protected]>Cc Danilo Krummrich <[email protected]>Cc Timur Tabi <[email protected]>Signed-off-by John Hubbard <[email protected]>--- drivers/gpu/nova-core/gpu.rs | 45 +++++++++++++++++++---------------- drivers/gpu/nova-core/regs.rs | 8 +++++++ 2 files changed, 33 insertions(+), 20 deletions(-)drivers/gpu/nova-core/gpu.rs +2
-6@@ -130,16 +130,18 @@ fn try_from(value: u8) -> Result<Self> { }pub (crate )struct Revision { - major:u8 , - minor:u8 , +pub (crate ) major:u8 , +pub (crate ) minor:u8 , } -impl Revision { -fn from_boot0 (boot0: regs::NV_PMC_BOOT_0 ) ->Self { -Self { - major: boot0.major_revision (),
drivers/gpu/nova-core/gpu.rs fn try_from(value: u8) -> Result<Self> { · line 144
Quoted 10 lines
drivers/gpu/nova-core/gpu.rs +8
-2- minor: boot0.minor_revision(), - } +impl TryFrom <regs::NV_PMC_BOOT_0 >for Spec { +type Error =Error ; + +fn try_from (boot0: regs::NV_PMC_BOOT_0 ) ->Result <Self > { +Ok (Self { + chipset: boot0.chipset ()?, + revision: boot0.revision (), + })
This impl block for Revision gets replaced by a block for Spec, which is only declared later. Can you move it (and the one for BOOT_42 in the third patch) to the right place, next to the other impl blocks for Spec?
Quoted 56 lines
drivers/gpu/nova-core/gpu.rs +15
-12} }@@ -149,7 +151,7 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { } } -/// Structure holding the metadata of the GPU. +/// Structure holding a basic description of the GPU: Architecture, Chipset and Revision. pub (crate )struct Spec { chipset:Chipset ,/// The revision of the chipset. @@ -160,10 +162,19 @@ impl Spec {fn new (bar: &Bar0 ) ->Result <Spec > {let boot0 = regs::NV_PMC_BOOT_0 ::read (bar); -Ok (Self { - chipset: boot0.chipset ()?, - revision:Revision ::from_boot0 (boot0), - }) +Spec ::try_from (boot0) + } +} + +impl fmt::Display for Spec { +fn fmt (&self, f: &mut fmt::Formatter <'_>) -> fmt::Result { +write! ( + f, +"Chipset: {}, Architecture: {:?}, Revision: {}" , + self.chipset, + self.chipset.arch (), + self.revision + ) } }@@ -193,13 +204,7 @@ pub(crate) fn new<'a>( ) -> impl PinInit<Self, Error> + 'a {try_pin_init! (Self { spec:Spec ::new (bar).inspect (|spec| { -dev_info! ( - pdev.as_ref (), -"NVIDIA (Chipset: {}, Architecture: {:?}, Revision: {})\n" , - spec.chipset, - spec.chipset.arch (), - spec.revision - ); +dev_info! (pdev.as_ref (),"NVIDIA ({})\n" , spec); })?,// We must wait for GFW_BOOT completion before doing any significant setup on the GPU. drivers/gpu/nova-core/regs.rs +0
-0
drivers/gpu/nova-core/regs.rs pub(crate) fn chipset(self) -> Result<Chipset> { · line 47
Quoted 7 lines
drivers/gpu/nova-core/regs.rs +4
-0@@ -41,6 +41,14 @@ pub(crate) fn chipset(self) -> Result<Chipset> { }) .and_then (Chipset ::try_from) } + +/// Returns the revision information of the chip. +pub (crate )fn revision (self) ->crate ::gpu::Revision { +crate ::gpu::Revision {
nit: let's import Revision, or at least gpu, to align with what we do with the other structures.
Re: [PATCH v5 1/3] gpu: nova-core: prepare Spec and Revision types for boot0/boot42
Quoted 6 lines · Alexandre Courbot
Quoted 5 lines · John Hubbard
1) Implement Display for Spec. This simplifies the dev_info!() code for printing banners such as:
NVIDIA (Chipset: GA104, Architecture: Ampere, Revision: a.1)
Quoted 8 lines
Quoted 5 lines
2) Decouple Revision from boot0.
3) Enhance Revision, which in turn simplifies
Spec::new().4) Also, slightly enhance the comment about Spec, to be more precise.
A bullet-list in a patch description is a sure sign you will be asked to split things up. :)
Yes. That is an eternal truth, which I foolishly ignored here. haha
Quoted 5 lines
And in this case I think it makes all the more sense, since all these things taken separately ought to be simple, but having them in the same diff makes it confusing to review.
Quoted 9 lines
Although it's mostly the
Displayimplementation that at the very least should be its own patch, the rest can probably be kept together as it is related, and adding an intermediate patch would require temporary code to build Revision. The diff becomes much clearer once the impl blocks are moved where they should be (please see below).The comment update can be squashed together with the Revision/Spec patch.
Will do.
Quoted 35 lines
Quoted 35 lines
Cc Alexandre Courbot <[email protected]>Cc Danilo Krummrich <[email protected]>Cc Timur Tabi <[email protected]>Signed-off-by John Hubbard <[email protected]>--- drivers/gpu/nova-core/gpu.rs | 45 +++++++++++++++++++---------------- drivers/gpu/nova-core/regs.rs | 8 +++++++ 2 files changed, 33 insertions(+), 20 deletions(-)drivers/gpu/nova-core/gpu.rs +7
-8@@ -130,16 +130,18 @@ fn try_from(value: u8) -> Result<Self> { }pub (crate )struct Revision { - major:u8 , - minor:u8 , +pub (crate ) major:u8 , +pub (crate ) minor:u8 , } -impl Revision { -fn from_boot0 (boot0: regs::NV_PMC_BOOT_0 ) ->Self { -Self { - major: boot0.major_revision (), - minor: boot0.minor_revision (), - } +impl TryFrom <regs::NV_PMC_BOOT_0 >for Spec { +type Error =Error ; + +fn try_from (boot0: regs::NV_PMC_BOOT_0 ) ->Result <Self > { +Ok (Self {
Quoted 8 lines
drivers/gpu/nova-core/gpu.rs fn try_from(value: u8) -> Result<Self> { · line 144
Quoted 3 lines
drivers/gpu/nova-core/gpu.rs +3
-0+ chipset: boot0.chipset()?, + revision: boot0.revision(), + })This impl block for
Revisiongets replaced by a block forSpec, which is only declared later. Can you move it (and the one forBOOT_42in the third patch) to the right place, next to the other impl blocks forSpec?
Yes.
Quoted 51 lines
Quoted 51 lines
drivers/gpu/nova-core/gpu.rs +15
-12} }@@ -149,7 +151,7 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { } } -/// Structure holding the metadata of the GPU. +/// Structure holding a basic description of the GPU: Architecture, Chipset and Revision. pub (crate )struct Spec { chipset:Chipset ,/// The revision of the chipset. @@ -160,10 +162,19 @@ impl Spec {fn new (bar: &Bar0 ) ->Result <Spec > {let boot0 = regs::NV_PMC_BOOT_0 ::read (bar); -Ok (Self { - chipset: boot0.chipset ()?, - revision:Revision ::from_boot0 (boot0), - }) +Spec ::try_from (boot0) + } +} + +impl fmt::Display for Spec { +fn fmt (&self, f: &mut fmt::Formatter <'_>) -> fmt::Result { +write! ( + f, +"Chipset: {}, Architecture: {:?}, Revision: {}" , + self.chipset, + self.chipset.arch (), + self.revision + ) } }@@ -193,13 +204,7 @@ pub(crate) fn new<'a>( ) -> impl PinInit<Self, Error> + 'a {try_pin_init! (Self { spec:Spec ::new (bar).inspect (|spec| { -dev_info! ( - pdev.as_ref (), -"NVIDIA (Chipset: {}, Architecture: {:?}, Revision: {})\n" , - spec.chipset, - spec.chipset.arch (), - spec.revision - ); +dev_info! (pdev.as_ref (),"NVIDIA ({})\n" , spec); })?,
Quoted 16 lines
drivers/gpu/nova-core/regs.rs pub(crate) fn chipset(self) -> Result<Chipset> { · line 47
Quoted 13 lines
drivers/gpu/nova-core/gpu.rs +0
-0// We must wait for GFW_BOOT completion before doing any significant setup on the GPU. drivers/gpu/nova-core/regs.rs +4
-0@@ -41,6 +41,14 @@ pub(crate) fn chipset(self) -> Result<Chipset> { }) .and_then (Chipset ::try_from) } + +/// Returns the revision information of the chip. +pub (crate )fn revision (self) ->crate ::gpu::Revision { +crate ::gpu::Revision {nit: let's import
Revision, or at leastgpu, to align with what we do with the other structures.
Yes.
thanks,
Signature · 1 line
John Hubbard
PATCH v5 2/3 gpu: nova-core: make Architecture behave as a u8 type
In reply to John HubbardThis allows Architecture to be passed into register!() and bitfield!() macro calls. That in turn requires a default implementation for Architecture.
This simplifies transforming BOOT0 (and later, BOOT42) register values into GPU architectures.
--- drivers/gpu/nova-core/gpu.rs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/gpu/nova-core/gpu.rs +10 -1
@@ -109,8 +109,10 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { }/// Enum representation of the GPU generation. -#[derive(fmt:: Debug )] +#[derive(fmt:: Debug , Default )] +#[repr( u8 )] pub (crate )enum Architecture { +#[default] Turing =0x16 ,Ampere =0x17 ,Ada =0x19 ,
@@ -129,6 +131,13 @@ fn try_from(value: u8) -> Result<Self> { } } +impl From <Architecture >for u8 { +fn from (value:Architecture ) ->Self { +// CAST: `Architecture` is `repr(u8)`, so this cast is always lossless. + valueas u8 + } +} +pub (crate )struct Revision {pub (crate ) major:u8 ,pub (crate ) minor:u8 ,
Signature · 1 line
2.51.2
PATCH v5 3/3 gpu: nova-core: add boot42 support for next-gen GPUs
In reply to John HubbardNVIDIA GPUs are moving away from using NV_PMC_BOOT_0 to contain architecture and revision details, and will instead use NV_PMC_BOOT_42 in the future. NV_PMC_BOOT_0 will contain a specific set of values that will mean "go read NV_PMC_BOOT_42 instead".
Change the selection logic in Nova so that it will claim Turing and later GPUs. This will work for the foreseeable future, without any further code changes here, because all NVIDIA GPUs are considered, from the oldest supported on Linux (NV04), through the future GPUs.
Add some comment documentation to explain, chronologically, how boot0 and boot42 change with the GPU eras, and how that affects the selection logic.
--- drivers/gpu/nova-core/gpu.rs | 38 ++++++++++++++++++++++++++++++++++- drivers/gpu/nova-core/regs.rs | 33 ++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletion(-)
drivers/gpu/nova-core/gpu.rs +37 -1
@@ -154,6 +154,17 @@ fn try_from(boot0: regs::NV_PMC_BOOT_0) -> Result<Self> { } } +impl TryFrom <regs::NV_PMC_BOOT_42 >for Spec { +type Error =Error ; + +fn try_from (boot42: regs::NV_PMC_BOOT_42 ) ->Result <Self > { +Ok (Self { + chipset: boot42.chipset ()?, + revision: boot42.revision (), + }) + } +} +impl fmt::Display for Revision {fn fmt (&self, f: &mut fmt::Formatter <'_>) -> fmt::Result {write! (f,"{:x}.{:x}" , self.major, self.minor)
@@ -169,9 +180,34 @@ pub(crate) struct Spec {impl Spec {fn new (bar: &Bar0 ) ->Result <Spec > { +// Some brief notes about boot0 and boot42, in chronological order: +// +// NV04 through Volta: +// +// Not supported by Nova. boot0 is necessary and sufficient to identify these GPUs. +// boot42 may not even exist on some of these GPUs. +// +// Turing through Blackwell: +// +// Supported by both Nouveau and Nova. boot0 is still necessary and sufficient to +// identify these GPUs. boot42 exists on these GPUs but we don't need to use it. +// +// Rubin: +// +// Only supported by Nova. Need to use boot42 to fully identify these GPUs. +// +// "Future" (after Rubin) GPUs: +// +// Only supported by Nova. NV_PMC_BOOT's ARCH_0 (bits 28:24) will be zeroed out, and +// ARCH_1 (bit 8:8) will be set to 1, which will mean, "refer to NV_PMC_BOOT_42". +let boot0 = regs::NV_PMC_BOOT_0 ::read (bar); -Spec ::try_from (boot0) +if boot0.use_boot42_instead () { +Spec ::try_from (regs::NV_PMC_BOOT_42 ::read (bar)) + }else { +Spec ::try_from (boot0) + } } }
drivers/gpu/nova-core/regs.rs +33 -0
@@ -25,6 +25,13 @@ });impl NV_PMC_BOOT_0 { +pub (crate )fn use_boot42_instead (self) ->bool { +// "Future" GPUs (some time after Rubin) will set `architecture_0` +// to 0, and `architecture_1` to 1, and put the architecture details in +// boot42 instead. + self.architecture_0 () ==0 && self.architecture_1 () ==1 + } +/// Combines `architecture_0` and `architecture_1` to obtain the architecture of the chip. pub (crate )fn architecture (self) ->Result <Architecture > { Architecture::try_from(
@@ -51,6 +58,32 @@ pub(crate) fn revision(self) -> crate::gpu::Revision { } } +register! (NV_PMC_BOOT_42 @0x00000108 ,"Extended architecture information" { +7 :0 implementationas u8 ,"Implementation version of the architecture" ; +15 :8 architectureas u8 ?=>Architecture ,"Architecture value" ; +19 :16 minor_revisionas u8 ,"Minor revision of the chip" ; +23 :20 major_revisionas u8 ,"Major revision of the chip" ; +}); + +impl NV_PMC_BOOT_42 { +pub (crate )fn chipset (self) ->Result <Chipset > { + self.architecture () + .map (|arch| { + ((archas u32 ) <<Self ::IMPLEMENTATION_RANGE .len ()) + | u32::from (self.implementation ()) + }) + .and_then (Chipset ::try_from) + } + +/// Returns the revision information of the chip. +pub (crate )fn revision (self) ->crate ::gpu::Revision { +crate ::gpu::Revision { + major: self.major_revision (), + minor: self.minor_revision (), + } + } +} +// PBUS register! (NV_PBUS_SW_SCRATCH @0x00001400 [64 ] {});
Signature · 1 line
2.51.2
Alexandre Courbot
maintainerRe: [PATCH v5 3/3] gpu: nova-core: add boot42 support for next-gen GPUs
Quoted 59 lines · John Hubbard
NVIDIA GPUs are moving away from using
NV_PMC_BOOT_0to contain architecture and revision details, and will instead useNV_PMC_BOOT_42in the future.NV_PMC_BOOT_0will contain a specific set of values that will mean "go readNV_PMC_BOOT_42instead".Change the selection logic in Nova so that it will claim Turing and later GPUs. This will work for the foreseeable future, without any further code changes here, because all NVIDIA GPUs are considered, from the oldest supported on Linux (NV04), through the future GPUs.
Add some comment documentation to explain, chronologically, how boot0 and boot42 change with the GPU eras, and how that affects the selection logic.
Cc Alexandre Courbot <[email protected]>Cc Danilo Krummrich <[email protected]>Cc Timur Tabi <[email protected]>Signed-off-by John Hubbard <[email protected]>--- drivers/gpu/nova-core/gpu.rs | 38 ++++++++++++++++++++++++++++++++++- drivers/gpu/nova-core/regs.rs | 33 ++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletion(-)drivers/gpu/nova-core/gpu.rs +21
-0@@ -154,6 +154,17 @@ fn try_from(boot0: regs::NV_PMC_BOOT_0) -> Result<Self> { } } +impl TryFrom <regs::NV_PMC_BOOT_42 >for Spec { +type Error =Error ; + +fn try_from (boot42: regs::NV_PMC_BOOT_42 ) ->Result <Self > { +Ok (Self { + chipset: boot42.chipset ()?, + revision: boot42.revision (), + }) + } +} +impl fmt::Display for Revision {fn fmt (&self, f: &mut fmt::Formatter <'_>) -> fmt::Result {write! (f,"{:x}.{:x}" , self.major, self.minor)@@ -169,9 +180,34 @@ pub(crate) struct Spec {impl Spec {fn new (bar: &Bar0 ) ->Result <Spec > { +// Some brief notes about boot0 and boot42, in chronological order: +// +// NV04 through Volta: +// +// Not supported by Nova. boot0 is necessary and sufficient to identify these GPUs. +// boot42 may not even exist on some of these GPUs. +// +// Turing through Blackwell: +// +// Supported by both Nouveau and Nova. boot0 is still necessary and sufficient to
drivers/gpu/nova-core/gpu.rs pub(crate) struct Spec { · line 202
Quoted 10 lines
drivers/gpu/nova-core/gpu.rs +10
-0+// identify these GPUs. boot42 exists on these GPUs but we don't need to use it. +// +// Rubin: +// +// Only supported by Nova. Need to use boot42 to fully identify these GPUs. +// +// "Future" (after Rubin) GPUs: +// +// Only supported by Nova. NV_PMC_BOOT's ARCH_0 (bits 28:24) will be zeroed out, and +// ARCH_1 (bit 8:8) will be set to 1, which will mean, "refer to NV_PMC_BOOT_42".
From the code it looks like Rubin and "Future" GPUs are handled exactly the same - do we need two paragraphs to describe them, or can we just have one for "Rubing and future GPUs"?
Quoted 17 lines
drivers/gpu/nova-core/gpu.rs +6
-1+let boot0 = regs::NV_PMC_BOOT_0 ::read (bar); -Spec ::try_from (boot0) +if boot0.use_boot42_instead () { +Spec ::try_from (regs::NV_PMC_BOOT_42 ::read (bar)) + }else { +Spec ::try_from (boot0) + } } }drivers/gpu/nova-core/regs.rs +0
-0
drivers/gpu/nova-core/regs.rs line 31
Quoted 7 lines
drivers/gpu/nova-core/regs.rs +4
-0@@ -25,6 +25,13 @@ });impl NV_PMC_BOOT_0 { +pub (crate )fn use_boot42_instead (self) ->bool { +// "Future" GPUs (some time after Rubin) will set `architecture_0` +// to 0, and `architecture_1` to 1, and put the architecture details in +// boot42 instead.
If this is "some time after Rubin", how do we infer that we must use boot42 for Rubin, as the previous comment suggests?
Re: [PATCH v5 3/3] gpu: nova-core: add boot42 support for next-gen GPUs
Quoted 57 lines · Alexandre Courbot
Quoted 56 lines · John Hubbard
NVIDIA GPUs are moving away from using
NV_PMC_BOOT_0to contain architecture and revision details, and will instead useNV_PMC_BOOT_42in the future.NV_PMC_BOOT_0will contain a specific set of values that will mean "go readNV_PMC_BOOT_42instead".Change the selection logic in Nova so that it will claim Turing and later GPUs. This will work for the foreseeable future, without any further code changes here, because all NVIDIA GPUs are considered, from the oldest supported on Linux (NV04), through the future GPUs.
Add some comment documentation to explain, chronologically, how boot0 and boot42 change with the GPU eras, and how that affects the selection logic.
Cc Alexandre Courbot <[email protected]>Cc Danilo Krummrich <[email protected]>Cc Timur Tabi <[email protected]>Signed-off-by John Hubbard <[email protected]>--- drivers/gpu/nova-core/gpu.rs | 38 ++++++++++++++++++++++++++++++++++- drivers/gpu/nova-core/regs.rs | 33 ++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletion(-)drivers/gpu/nova-core/gpu.rs +18
-0@@ -154,6 +154,17 @@ fn try_from(boot0: regs::NV_PMC_BOOT_0) -> Result<Self> { } } +impl TryFrom <regs::NV_PMC_BOOT_42 >for Spec { +type Error =Error ; + +fn try_from (boot42: regs::NV_PMC_BOOT_42 ) ->Result <Self > { +Ok (Self { + chipset: boot42.chipset ()?, + revision: boot42.revision (), + }) + } +} +impl fmt::Display for Revision {fn fmt (&self, f: &mut fmt::Formatter <'_>) -> fmt::Result {write! (f,"{:x}.{:x}" , self.major, self.minor)@@ -169,9 +180,34 @@ pub(crate) struct Spec {impl Spec {fn new (bar: &Bar0 ) ->Result <Spec > { +// Some brief notes about boot0 and boot42, in chronological order: +// +// NV04 through Volta: +// +// Not supported by Nova. boot0 is necessary and sufficient to identify these GPUs. +// boot42 may not even exist on some of these GPUs. +//
Quoted 8 lines
drivers/gpu/nova-core/gpu.rs pub(crate) struct Spec { · line 197
Quoted 8 lines
drivers/gpu/nova-core/gpu.rs +8
-0+// Turing through Blackwell: +// +// Supported by both Nouveau and Nova. boot0 is still necessary and sufficient to +// identify these GPUs. boot42 exists on these GPUs but we don't need to use it. +// +// Rubin: +// +// Only supported by Nova. Need to use boot42 to fully identify these GPUs.
Ohh, I scrambled the comment when I added Rubin to the discussion. Actually, the first sentence is correct, but the second is dead wrong. :)
Rubin will still key off of boot0.
I'll fix this up.
Quoted 9 lines
drivers/gpu/nova-core/gpu.rs pub(crate) struct Spec { · line 202
Quoted 5 lines
drivers/gpu/nova-core/gpu.rs +5
-0+// +// "Future" (after Rubin) GPUs: +// +// Only supported by Nova. NV_PMC_BOOT's ARCH_0 (bits 28:24) will be zeroed out, and +// ARCH_1 (bit 8:8) will be set to 1, which will mean, "refer to NV_PMC_BOOT_42". From the code it looks like Rubin and "Future" GPUs are handled exactly the same - do we need two paragraphs to describe them, or can we just have one for "Rubing and future GPUs"?
They are not. The code is correct but the comment is wrong.
Quoted 20 lines
Quoted 20 lines
drivers/gpu/nova-core/gpu.rs +6
-1+let boot0 = regs::NV_PMC_BOOT_0 ::read (bar); -Spec ::try_from (boot0) +if boot0.use_boot42_instead () { +Spec ::try_from (regs::NV_PMC_BOOT_42 ::read (bar)) + }else { +Spec ::try_from (boot0) + } } }drivers/gpu/nova-core/regs.rs +0
-0@@ -25,6 +25,13 @@ });
Quoted 8 lines
drivers/gpu/nova-core/regs.rs line 31
Quoted 5 lines
drivers/gpu/nova-core/regs.rs +4
-0impl NV_PMC_BOOT_0 { +pub (crate )fn use_boot42_instead (self) ->bool { +// "Future" GPUs (some time after Rubin) will set `architecture_0` +// to 0, and `architecture_1` to 1, and put the architecture details in +// boot42 instead. If this is "some time after Rubin", how do we infer that we must use boot42 for Rubin, as the previous comment suggests?
Right, we will actually use boot0 for Rubin. Thanks for catching the inconsistency!
thanks,
Signature · 1 line
John Hubbard
Re: [PATCH v5 3/3] gpu: nova-core: add boot42 support for next-gen GPUs
Quoted 11 lines · John Hubbard
Quoted 4 lines · Alexandre Courbot
drivers/gpu/nova-core/gpu.rs pub(crate) struct Spec { · line 197
Quoted 3 lines · John Hubbard
drivers/gpu/nova-core/gpu.rs +3
-0+// Rubin: +// +// Only supported by Nova. Need to use boot42 to fully identify these GPUs. Ohh, I scrambled the comment when I added Rubin to the discussion. Actually, the first sentence is correct, but the second is dead wrong. :)
Rubin will still key off of boot0.
Correction, the dividing line for when this changes over turns out to be mid-Rubin. So I'm looking at going back to "if later than Fermi, use boot42" after all (Timur was advocating for that, earlier, too.)
thanks,
Signature · 1 line
John Hubbard