* [PATCH] gpu: nova-core: make bar1 optional
@ 2026-10-26 3:50 ` Dave Airlie
0 siblings, 0 replies; 3+ messages in thread
From: Dave Airlie via B4 Relay @ 2026-10-26 3:50 UTC (permalink / raw)
To: Danilo Krummrich, Alice Ryhl, Alexandre Courbot, David Airlie,
Benno Lossin, Gary Guo
Cc: nova-gpu, dri-devel, Dave Airlie
From: Dave Airlie <airlied@redhat.com>
Not all devices have BAR1 so make it optional.
Signed-off-by: Dave Airlie <airlied@redhat.com>
---
drivers/gpu/nova-core/driver.rs | 15 ++++++++++++---
drivers/gpu/nova-core/gpu.rs | 37 ++++++++++++++++++++----------------
drivers/gpu/nova-core/mm.rs | 2 +-
drivers/gpu/nova-core/mm/bar_user.rs | 7 ++++++-
4 files changed, 40 insertions(+), 21 deletions(-)
diff --git a/drivers/gpu/nova-core/driver.rs b/drivers/gpu/nova-core/driver.rs
index 560a70c4f5a7..ccf26008abe8 100644
--- a/drivers/gpu/nova-core/driver.rs
+++ b/drivers/gpu/nova-core/driver.rs
@@ -37,7 +37,7 @@ pub(crate) struct NovaCore<'bound> {
#[pin]
pub(crate) gpu: Gpu<'bound>,
bar: pci::Bar<'bound, BAR0_SIZE>,
- bar1: pci::Bar<'bound>,
+ bar1: Option<pci::Bar<'bound>>,
}
pub(crate) struct NovaCoreDriver;
@@ -112,7 +112,11 @@ fn probe<'bound>(
bar1: {
let bar1_idx = bar1_resource_index(pdev)?;
- pdev.iomap_region(bar1_idx, c"nova-core/bar1")?
+ if pdev.resource_len(bar1_idx)? == 0 {
+ None
+ } else {
+ Some(pdev.iomap_region(bar1_idx, c"nova-core/bar1")?)
+ }
},
// Run self-tests that do not depend on the `Gpu` instance.
@@ -135,7 +139,12 @@ fn probe<'bound>(
// SAFETY: `bar` is initialized above, pinned, and outlives `gpu`.
unsafe { &*core::ptr::from_ref(bar) },
// SAFETY: `bar1` is initialized above, pinned, and outlives `gpu`.
- unsafe { &*core::ptr::from_ref(bar1) },
+ unsafe {
+ match bar1 {
+ None => None,
+ Some(bar1) => Some(&*core::ptr::from_ref(bar1)),
+ }
+ },
).pin_chain(|_gpu| {
#[cfg(CONFIG_NOVA_CORE_SELFTESTS)]
_gpu.run_selftests(pdev);
diff --git a/drivers/gpu/nova-core/gpu.rs b/drivers/gpu/nova-core/gpu.rs
index 4e59072cab50..79018aff37f3 100644
--- a/drivers/gpu/nova-core/gpu.rs
+++ b/drivers/gpu/nova-core/gpu.rs
@@ -394,9 +394,8 @@ pub(crate) struct Gpu<'gpu> {
/// Must be kept declared *before* `gsp_resources`, so that its components are dropped while
/// the GSP is still operational.
mm: GpuMm<'gpu>,
- /// BAR1 user interface for CPU access to GPU virtual memory.
- #[pin]
- bar_user: BarUser<'gpu>,
+ /// BAR1 user interface for CPU access to GPU virtual memory, if the device has BAR1.
+ bar_user: Option<Pin<KBox<BarUser<'gpu>>>>,
/// GSP and its resources.
#[pin]
gsp_resources: GspResources<'gpu>,
@@ -448,7 +447,7 @@ impl<'gpu> Gpu<'gpu> {
pub(crate) fn new<'a>(
pdev: &'gpu pci::Device<device::Core<'a>>,
bar: Bar0<'gpu>,
- bar1: Bar1<'gpu>,
+ bar1: Option<Bar1<'gpu>>,
) -> impl PinInit<Self, Error> + use<'gpu, 'a> {
let dev = pdev.as_ref();
@@ -580,17 +579,23 @@ pub(crate) fn new<'a>(
},
// Create BAR1 user interface for CPU access to GPU virtual memory.
- bar_user <- {
- let pdb_addr = VramAddress::from_raw(gsp_static_info.bar1_pde_base);
- let bar1_idx = crate::driver::bar1_resource_index(pdev)?;
- let bar1_size = pdev.resource_len(bar1_idx)?;
-
- BarUser::new(
- pdb_addr,
- gsp_resources.spec.chipset,
- bar1_size,
- bar1,
- )
+ bar_user: match bar1 {
+ None => None,
+ Some(bar1) => Some({
+ let pdb_addr = VramAddress::from_raw(gsp_static_info.bar1_pde_base);
+ let bar1_idx = crate::driver::bar1_resource_index(pdev)?;
+ let bar1_size = pdev.resource_len(bar1_idx)?;
+
+ KBox::pin_init(
+ BarUser::new(
+ pdb_addr,
+ gsp_resources.spec.chipset,
+ bar1_size,
+ bar1,
+ ),
+ GFP_KERNEL,
+ )?
+ }),
},
})
}
@@ -623,7 +628,7 @@ pub(crate) fn run_selftests(self: Pin<&mut Self>, pdev: &pci::Device<device::Bou
dev,
this.mm,
regions,
- &this.bar_user,
+ this.bar_user.as_deref(),
this.gsp_static_info.bar1_pde_base,
this.spec.chipset,
) {
diff --git a/drivers/gpu/nova-core/mm.rs b/drivers/gpu/nova-core/mm.rs
index 8a934c55169f..557bf76c2f5b 100644
--- a/drivers/gpu/nova-core/mm.rs
+++ b/drivers/gpu/nova-core/mm.rs
@@ -308,7 +308,7 @@ pub(crate) fn run(
dev: &device::Device<device::Bound>,
mm: &mut GpuMm<'_>,
usable_fb_regions: &[Range<u64>],
- bar_user: &bar_user::BarUser<'_>,
+ bar_user: Option<&bar_user::BarUser<'_>>,
bar1_pdb: u64,
chipset: Chipset,
) -> Result {
diff --git a/drivers/gpu/nova-core/mm/bar_user.rs b/drivers/gpu/nova-core/mm/bar_user.rs
index 6e9384f06f43..205082df27bc 100644
--- a/drivers/gpu/nova-core/mm/bar_user.rs
+++ b/drivers/gpu/nova-core/mm/bar_user.rs
@@ -184,7 +184,7 @@ fn drop(&mut self) {
pub(crate) fn run_self_test(
dev: &device::Device<device::Bound>,
mm: &mut GpuMm<'_>,
- bar_user: &BarUser<'_>,
+ bar_user: Option<&BarUser<'_>>,
bar1_pdb: u64,
chipset: Chipset,
) -> Result {
@@ -202,6 +202,11 @@ pub(crate) fn run_self_test(
},
};
+ let Some(bar_user) = bar_user else {
+ dev_info!(dev, "MM: Self-test SKIPPED - no BAR1\n");
+ return Ok(());
+ };
+
// Test patterns.
const PATTERN_PRAMIN: u32 = 0xDEAD_BEEF;
const PATTERN_BAR1: u32 = 0xCAFE_BABE;
---
base-commit: 3497a403264b094ebd61b8b755165d56e7d9dc37
change-id: 20261026-nova-bar1-option-407f1f49fd1c
Best regards,
--
Dave Airlie <airlied@redhat.com>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] gpu: nova-core: make bar1 optional
@ 2026-10-26 3:50 ` Dave Airlie
0 siblings, 0 replies; 3+ messages in thread
From: Dave Airlie @ 2026-10-26 3:50 UTC (permalink / raw)
To: Danilo Krummrich, Alice Ryhl, Alexandre Courbot, David Airlie,
Benno Lossin, Gary Guo
Cc: nova-gpu, dri-devel, Dave Airlie
Not all devices have BAR1 so make it optional.
Signed-off-by: Dave Airlie <airlied@redhat.com>
---
drivers/gpu/nova-core/driver.rs | 15 ++++++++++++---
drivers/gpu/nova-core/gpu.rs | 37 ++++++++++++++++++++----------------
drivers/gpu/nova-core/mm.rs | 2 +-
drivers/gpu/nova-core/mm/bar_user.rs | 7 ++++++-
4 files changed, 40 insertions(+), 21 deletions(-)
diff --git a/drivers/gpu/nova-core/driver.rs b/drivers/gpu/nova-core/driver.rs
index 560a70c4f5a7..ccf26008abe8 100644
--- a/drivers/gpu/nova-core/driver.rs
+++ b/drivers/gpu/nova-core/driver.rs
@@ -37,7 +37,7 @@ pub(crate) struct NovaCore<'bound> {
#[pin]
pub(crate) gpu: Gpu<'bound>,
bar: pci::Bar<'bound, BAR0_SIZE>,
- bar1: pci::Bar<'bound>,
+ bar1: Option<pci::Bar<'bound>>,
}
pub(crate) struct NovaCoreDriver;
@@ -112,7 +112,11 @@ fn probe<'bound>(
bar1: {
let bar1_idx = bar1_resource_index(pdev)?;
- pdev.iomap_region(bar1_idx, c"nova-core/bar1")?
+ if pdev.resource_len(bar1_idx)? == 0 {
+ None
+ } else {
+ Some(pdev.iomap_region(bar1_idx, c"nova-core/bar1")?)
+ }
},
// Run self-tests that do not depend on the `Gpu` instance.
@@ -135,7 +139,12 @@ fn probe<'bound>(
// SAFETY: `bar` is initialized above, pinned, and outlives `gpu`.
unsafe { &*core::ptr::from_ref(bar) },
// SAFETY: `bar1` is initialized above, pinned, and outlives `gpu`.
- unsafe { &*core::ptr::from_ref(bar1) },
+ unsafe {
+ match bar1 {
+ None => None,
+ Some(bar1) => Some(&*core::ptr::from_ref(bar1)),
+ }
+ },
).pin_chain(|_gpu| {
#[cfg(CONFIG_NOVA_CORE_SELFTESTS)]
_gpu.run_selftests(pdev);
diff --git a/drivers/gpu/nova-core/gpu.rs b/drivers/gpu/nova-core/gpu.rs
index 4e59072cab50..79018aff37f3 100644
--- a/drivers/gpu/nova-core/gpu.rs
+++ b/drivers/gpu/nova-core/gpu.rs
@@ -394,9 +394,8 @@ pub(crate) struct Gpu<'gpu> {
/// Must be kept declared *before* `gsp_resources`, so that its components are dropped while
/// the GSP is still operational.
mm: GpuMm<'gpu>,
- /// BAR1 user interface for CPU access to GPU virtual memory.
- #[pin]
- bar_user: BarUser<'gpu>,
+ /// BAR1 user interface for CPU access to GPU virtual memory, if the device has BAR1.
+ bar_user: Option<Pin<KBox<BarUser<'gpu>>>>,
/// GSP and its resources.
#[pin]
gsp_resources: GspResources<'gpu>,
@@ -448,7 +447,7 @@ impl<'gpu> Gpu<'gpu> {
pub(crate) fn new<'a>(
pdev: &'gpu pci::Device<device::Core<'a>>,
bar: Bar0<'gpu>,
- bar1: Bar1<'gpu>,
+ bar1: Option<Bar1<'gpu>>,
) -> impl PinInit<Self, Error> + use<'gpu, 'a> {
let dev = pdev.as_ref();
@@ -580,17 +579,23 @@ pub(crate) fn new<'a>(
},
// Create BAR1 user interface for CPU access to GPU virtual memory.
- bar_user <- {
- let pdb_addr = VramAddress::from_raw(gsp_static_info.bar1_pde_base);
- let bar1_idx = crate::driver::bar1_resource_index(pdev)?;
- let bar1_size = pdev.resource_len(bar1_idx)?;
-
- BarUser::new(
- pdb_addr,
- gsp_resources.spec.chipset,
- bar1_size,
- bar1,
- )
+ bar_user: match bar1 {
+ None => None,
+ Some(bar1) => Some({
+ let pdb_addr = VramAddress::from_raw(gsp_static_info.bar1_pde_base);
+ let bar1_idx = crate::driver::bar1_resource_index(pdev)?;
+ let bar1_size = pdev.resource_len(bar1_idx)?;
+
+ KBox::pin_init(
+ BarUser::new(
+ pdb_addr,
+ gsp_resources.spec.chipset,
+ bar1_size,
+ bar1,
+ ),
+ GFP_KERNEL,
+ )?
+ }),
},
})
}
@@ -623,7 +628,7 @@ pub(crate) fn run_selftests(self: Pin<&mut Self>, pdev: &pci::Device<device::Bou
dev,
this.mm,
regions,
- &this.bar_user,
+ this.bar_user.as_deref(),
this.gsp_static_info.bar1_pde_base,
this.spec.chipset,
) {
diff --git a/drivers/gpu/nova-core/mm.rs b/drivers/gpu/nova-core/mm.rs
index 8a934c55169f..557bf76c2f5b 100644
--- a/drivers/gpu/nova-core/mm.rs
+++ b/drivers/gpu/nova-core/mm.rs
@@ -308,7 +308,7 @@ pub(crate) fn run(
dev: &device::Device<device::Bound>,
mm: &mut GpuMm<'_>,
usable_fb_regions: &[Range<u64>],
- bar_user: &bar_user::BarUser<'_>,
+ bar_user: Option<&bar_user::BarUser<'_>>,
bar1_pdb: u64,
chipset: Chipset,
) -> Result {
diff --git a/drivers/gpu/nova-core/mm/bar_user.rs b/drivers/gpu/nova-core/mm/bar_user.rs
index 6e9384f06f43..205082df27bc 100644
--- a/drivers/gpu/nova-core/mm/bar_user.rs
+++ b/drivers/gpu/nova-core/mm/bar_user.rs
@@ -184,7 +184,7 @@ fn drop(&mut self) {
pub(crate) fn run_self_test(
dev: &device::Device<device::Bound>,
mm: &mut GpuMm<'_>,
- bar_user: &BarUser<'_>,
+ bar_user: Option<&BarUser<'_>>,
bar1_pdb: u64,
chipset: Chipset,
) -> Result {
@@ -202,6 +202,11 @@ pub(crate) fn run_self_test(
},
};
+ let Some(bar_user) = bar_user else {
+ dev_info!(dev, "MM: Self-test SKIPPED - no BAR1\n");
+ return Ok(());
+ };
+
// Test patterns.
const PATTERN_PRAMIN: u32 = 0xDEAD_BEEF;
const PATTERN_BAR1: u32 = 0xCAFE_BABE;
---
base-commit: 3497a403264b094ebd61b8b755165d56e7d9dc37
change-id: 20261026-nova-bar1-option-407f1f49fd1c
Best regards,
--
Dave Airlie <airlied@redhat.com>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] gpu: nova-core: make bar1 optional
2026-10-26 3:50 ` Dave Airlie
(?)
@ 2026-10-26 12:11 ` Danilo Krummrich
-1 siblings, 0 replies; 3+ messages in thread
From: Danilo Krummrich @ 2026-10-26 12:11 UTC (permalink / raw)
To: Dave Airlie via B4 Relay
Cc: airlied, Alice Ryhl, Alexandre Courbot, David Airlie,
Benno Lossin, Gary Guo, nova-gpu, dri-devel
On Mon Oct 26, 2026 at 4:50 AM CET, Dave Airlie via B4 Relay wrote:
> @@ -135,7 +139,12 @@ fn probe<'bound>(
> // SAFETY: `bar` is initialized above, pinned, and outlives `gpu`.
> unsafe { &*core::ptr::from_ref(bar) },
> // SAFETY: `bar1` is initialized above, pinned, and outlives `gpu`.
> - unsafe { &*core::ptr::from_ref(bar1) },
> + unsafe {
> + match bar1 {
> + None => None,
> + Some(bar1) => Some(&*core::ptr::from_ref(bar1)),
> + }
> + },
This can just be
bar1.as_ref().map(|b| unsafe { &*core::ptr::from_ref(b) })
> + /// BAR1 user interface for CPU access to GPU virtual memory, if the device has BAR1.
> + bar_user: Option<Pin<KBox<BarUser<'gpu>>>>,
Can we please add a TODO to replace this, once we can get rid of the extra
allocation?
> + bar_user: match bar1 {
> + None => None,
> + Some(bar1) => Some({
> + let pdb_addr = VramAddress::from_raw(gsp_static_info.bar1_pde_base);
> + let bar1_idx = crate::driver::bar1_resource_index(pdev)?;
> + let bar1_size = pdev.resource_len(bar1_idx)?;
> +
> + KBox::pin_init(
> + BarUser::new(
> + pdb_addr,
> + gsp_resources.spec.chipset,
> + bar1_size,
> + bar1,
> + ),
> + GFP_KERNEL,
> + )?
> + }),
I think this could also use map().
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-10-26 12:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-10-26 3:50 [PATCH] gpu: nova-core: make bar1 optional Dave Airlie via B4 Relay
2026-10-26 3:50 ` Dave Airlie
2026-10-26 12:11 ` Danilo Krummrich
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.