John Hubbard
2025-Oct-29 03:03 UTC
[PATCH v3 0/2] gpu: nova: add boot42 support for next-gen GPUs
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: 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 be zeroed out. 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 (2): gpu: nova-core: prepare Spec and Revision types for boot0/boot42 gpu: nova-core: add boot42 support for next-gen GPUs drivers/gpu/nova-core/gpu.rs | 94 ++++++++++++++++++++++++++++------- drivers/gpu/nova-core/regs.rs | 27 ++++++++++ 2 files changed, 103 insertions(+), 18 deletions(-) base-commit: ca16b15e78f4dee1631c0a68693f5e7d9b3bb3ec -- 2.51.2
John Hubbard
2025-Oct-29 03:03 UTC
[PATCH v3 1/2] 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) Also, slightly enhance the comment about Spec, to be more precise.
Signed-off-by: John Hubbard <jhubbard at nvidia.com>
---
drivers/gpu/nova-core/gpu.rs | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/drivers/gpu/nova-core/gpu.rs b/drivers/gpu/nova-core/gpu.rs
index 9d182bffe8b4..6f1486d4e9c6 100644
--- a/drivers/gpu/nova-core/gpu.rs
+++ b/drivers/gpu/nova-core/gpu.rs
@@ -134,22 +134,13 @@ pub(crate) struct Revision {
minor: u8,
}
-impl Revision {
- fn from_boot0(boot0: regs::NV_PMC_BOOT_0) -> Self {
- Self {
- major: boot0.major_revision(),
- minor: boot0.minor_revision(),
- }
- }
-}
-
impl fmt::Display for Revision {
fn fmt(&self, f: &mut fmt::Formatter<'_>) ->
fmt::Result {
write!(f, "{:x}.{:x}", self.major, self.minor)
}
}
-/// 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.
@@ -162,11 +153,26 @@ fn new(bar: &Bar0) -> Result<Spec> {
Ok(Self {
chipset: boot0.chipset()?,
- revision: Revision::from_boot0(boot0),
+ revision: Revision {
+ major: boot0.major_revision(),
+ minor: boot0.minor_revision(),
+ },
})
}
}
+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
+ )
+ }
+}
+
/// Structure holding the resources required to operate the GPU.
#[pin_data]
pub(crate) struct Gpu {
@@ -193,13 +199,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.
--
2.51.2
John Hubbard
2025-Oct-29 03:03 UTC
[PATCH v3 2/2] gpu: nova-core: add boot42 support for next-gen GPUs
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 be zeroed out.
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.
Signed-off-by: John Hubbard <jhubbard at nvidia.com>
---
drivers/gpu/nova-core/gpu.rs | 72 +++++++++++++++++++++++++++++++----
drivers/gpu/nova-core/regs.rs | 27 +++++++++++++
2 files changed, 92 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/nova-core/gpu.rs b/drivers/gpu/nova-core/gpu.rs
index 6f1486d4e9c6..6762493206ec 100644
--- a/drivers/gpu/nova-core/gpu.rs
+++ b/drivers/gpu/nova-core/gpu.rs
@@ -134,6 +134,34 @@ pub(crate) struct Revision {
minor: u8,
}
+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: Revision {
+ major: boot0.major_revision(),
+ minor: boot0.minor_revision(),
+ },
+ })
+ }
+}
+
+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: Revision {
+ major: boot42.major_revision(),
+ minor: boot42.minor_revision(),
+ },
+ })
+ }
+}
+
impl fmt::Display for Revision {
fn fmt(&self, f: &mut fmt::Formatter<'_>) ->
fmt::Result {
write!(f, "{:x}.{:x}", self.major, self.minor)
@@ -151,13 +179,43 @@ impl Spec {
fn new(bar: &Bar0) -> Result<Spec> {
let boot0 = regs::NV_PMC_BOOT_0::read(bar);
- Ok(Self {
- chipset: boot0.chipset()?,
- revision: Revision {
- major: boot0.major_revision(),
- minor: boot0.minor_revision(),
- },
- })
+ // "next-gen" GPUs (some time after Blackwell) will zero out
boot0, and put the architecture
+ // details in boot42 instead. Avoid reading boot42 unless we are in
that case.
+ let boot42 = if boot0.is_next_gen() {
+ Some(regs::NV_PMC_BOOT_42::read(bar))
+ } else {
+ None
+ };
+
+ // 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.boot42
+ //
+ // 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.
+ //
+ // Future "next-gen" GPUs:
+ //
+ // Only supported by Nova. boot42 has the architecture details,
boot0 is zeroed out.
+
+ // NV04, the very first NVIDIA GPU to be supported on Linux, is
identified by a specific bit
+ // pattern in boot0. Although Nova does not support NV04 (see above),
it is possible to
+ // confuse NV04 with a "next-gen" GPU. Therefore, return
early if we specifically detect
+ // NV04, thus simplifying the remaining selection logic.
+ if boot0.is_nv04() {
+ Err(ENODEV)?
+ }
+
+ // Now that we know it is something more recent than NV04, use boot42
if we previously
+ // determined that boot42 was both valid and relevant, and boot0
otherwise.
+ boot42
+ .map(Spec::try_from)
+ .unwrap_or_else(|| Spec::try_from(boot0))
}
}
diff --git a/drivers/gpu/nova-core/regs.rs b/drivers/gpu/nova-core/regs.rs
index 206dab2e1335..ed3a2c39edbc 100644
--- a/drivers/gpu/nova-core/regs.rs
+++ b/drivers/gpu/nova-core/regs.rs
@@ -25,6 +25,18 @@
});
impl NV_PMC_BOOT_0 {
+ pub(crate) fn is_nv04(self) -> bool {
+ // The very first supported GPU was NV04, and it is identified by a
specific bit pattern in
+ // boot0. This provides a way to check for that, which in turn is
required in order to avoid
+ // confusing future "next-gen" GPUs with NV04.
+ self.architecture_0() == 0 && (self.0 & 0xff00fff0) ==
0x20004000
+ }
+
+ pub(crate) fn is_next_gen(self) -> bool {
+ // "next-gen" GPUs (some time after Blackwell) will set
`architecture_0` to 0, and put the
+ // architecture details in boot42 instead.
+ self.architecture_0() == 0 && !self.is_nv04()
+ }
/// Combines `architecture_0` and `architecture_1` to obtain the
architecture of the chip.
pub(crate) fn architecture(self) -> Result<Architecture> {
Architecture::try_from(
@@ -43,6 +55,21 @@ pub(crate) fn chipset(self) -> Result<Chipset> {
}
}
+register!(NV_PMC_BOOT_42 @ 0x00000108, "Extended architecture
information" {
+ 7:0 implementation as u8, "Implementation version of the
architecture";
+ 15:8 architecture as u8, "Architecture value";
+ 19:16 minor_revision as u8, "Minor revision of the chip";
+ 23:20 major_revision as u8, "Major revision of the chip";
+});
+
+impl NV_PMC_BOOT_42 {
+ pub(crate) fn chipset(self) -> Result<Chipset> {
+ let arch = Architecture::try_from(self.architecture())?;
+ let chipset_value = ((arch as u32) << 8) |
u32::from(self.implementation());
+ Chipset::try_from(chipset_value)
+ }
+}
+
// PBUS
register!(NV_PBUS_SW_SCRATCH @ 0x00001400[64] {});
--
2.51.2