From: Alexandre Courbot <acourbot@nvidia.com>
To: "Miguel Ojeda" <ojeda@kernel.org>,
"Alex Gaynor" <alex.gaynor@gmail.com>,
"Boqun Feng" <boqun.feng@gmail.com>,
"Gary Guo" <gary@garyguo.net>,
"Björn Roy Baron" <bjorn3_gh@protonmail.com>,
"Benno Lossin" <benno.lossin@proton.me>,
"Andreas Hindborg" <a.hindborg@kernel.org>,
"Alice Ryhl" <aliceryhl@google.com>,
"Trevor Gross" <tmgross@umich.edu>,
"Danilo Krummrich" <dakr@kernel.org>,
"David Airlie" <airlied@gmail.com>,
"Simona Vetter" <simona@ffwll.ch>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Maxime Ripard" <mripard@kernel.org>,
"Thomas Zimmermann" <tzimmermann@suse.de>
Cc: John Hubbard <jhubbard@nvidia.com>,
Ben Skeggs <bskeggs@nvidia.com>,
Joel Fernandes <joelagnelf@nvidia.com>,
Timur Tabi <ttabi@nvidia.com>,
Alistair Popple <apopple@nvidia.com>,
linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org,
nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
Alexandre Courbot <acourbot@nvidia.com>
Subject: [PATCH v4 13/20] gpu: nova-core: register sysmem flush page
Date: Wed, 21 May 2025 15:45:08 +0900 [thread overview]
Message-ID: <20250521-nova-frts-v4-13-05dfd4f39479@nvidia.com> (raw)
In-Reply-To: <20250521-nova-frts-v4-0-05dfd4f39479@nvidia.com>
Reserve a page of system memory so sysmembar can perform a read on it if
a system write occurred since the last flush. Do this early as it can be
required to e.g. reset the GPU falcons.
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
---
drivers/gpu/nova-core/gpu.rs | 45 +++++++++++++++++++++++++++++++++++++++++--
drivers/gpu/nova-core/regs.rs | 10 ++++++++++
2 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/nova-core/gpu.rs b/drivers/gpu/nova-core/gpu.rs
index 50417f608dc7b445958ae43444a13c7593204fcf..a4e2cf1b529cc25fc168f68f9eaa6f4a7a9748eb 100644
--- a/drivers/gpu/nova-core/gpu.rs
+++ b/drivers/gpu/nova-core/gpu.rs
@@ -2,6 +2,7 @@
use kernel::{device, devres::Devres, error::code::*, pci, prelude::*};
+use crate::dma::DmaObject;
use crate::driver::Bar0;
use crate::firmware::{Firmware, FIRMWARE_VERSION};
use crate::gfw;
@@ -158,12 +159,32 @@ fn new(bar: &Bar0) -> Result<Spec> {
}
/// Structure holding the resources required to operate the GPU.
-#[pin_data]
+#[pin_data(PinnedDrop)]
pub(crate) struct Gpu {
spec: Spec,
/// MMIO mapping of PCI BAR 0
bar: Devres<Bar0>,
fw: Firmware,
+ /// System memory page required for flushing all pending GPU-side memory writes done through
+ /// PCIE into system memory.
+ sysmem_flush: DmaObject,
+}
+
+#[pinned_drop]
+impl PinnedDrop for Gpu {
+ fn drop(self: Pin<&mut Self>) {
+ // Unregister the sysmem flush page before we release it.
+ let _ = self.bar.try_access_with(|b| {
+ regs::NV_PFB_NISO_FLUSH_SYSMEM_ADDR::default()
+ .set_adr_39_08(0)
+ .write(b);
+ if self.spec.chipset >= Chipset::GA102 {
+ regs::NV_PFB_NISO_FLUSH_SYSMEM_ADDR_HI::default()
+ .set_adr_63_40(0)
+ .write(b);
+ }
+ });
+ }
}
impl Gpu {
@@ -187,10 +208,30 @@ pub(crate) fn new(
gfw::wait_gfw_boot_completion(bar)
.inspect_err(|_| dev_err!(pdev.as_ref(), "GFW boot did not complete"))?;
+ // System memory page required for sysmembar to properly flush into system memory.
+ let sysmem_flush = {
+ let page = DmaObject::new(pdev.as_ref(), kernel::bindings::PAGE_SIZE)?;
+
+ // Register the sysmem flush page.
+ let handle = page.dma_handle();
+
+ regs::NV_PFB_NISO_FLUSH_SYSMEM_ADDR::default()
+ .set_adr_39_08((handle >> 8) as u32)
+ .write(bar);
+ if spec.chipset >= Chipset::GA102 {
+ regs::NV_PFB_NISO_FLUSH_SYSMEM_ADDR_HI::default()
+ .set_adr_63_40((handle >> 40) as u32)
+ .write(bar);
+ }
+
+ page
+ };
+
Ok(pin_init!(Self {
spec,
bar: devres_bar,
- fw
+ fw,
+ sysmem_flush,
}))
}
}
diff --git a/drivers/gpu/nova-core/regs.rs b/drivers/gpu/nova-core/regs.rs
index cba442da51181971f209b338249307c11ac481e3..b599e7ddad57ed8defe0324056571ba46b926cf6 100644
--- a/drivers/gpu/nova-core/regs.rs
+++ b/drivers/gpu/nova-core/regs.rs
@@ -38,6 +38,16 @@ pub(crate) fn chipset(self) -> Result<Chipset> {
}
}
+/* PFB */
+
+register!(NV_PFB_NISO_FLUSH_SYSMEM_ADDR @ 0x00100c10 {
+ 31:0 adr_39_08 as u32;
+});
+
+register!(NV_PFB_NISO_FLUSH_SYSMEM_ADDR_HI @ 0x00100c40 {
+ 23:0 adr_63_40 as u32;
+});
+
/* PGC6 */
register!(NV_PGC6_AON_SECURE_SCRATCH_GROUP_05_PRIV_LEVEL_MASK @ 0x00118128 {
--
2.49.0
next prev parent reply other threads:[~2025-05-21 6:45 UTC|newest]
Thread overview: 109+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-21 6:44 [PATCH v4 00/20] nova-core: run FWSEC-FRTS to perform first stage of GSP initialization Alexandre Courbot
2025-05-21 6:44 ` [PATCH v4 01/20] rust: dma: expose the count and size of CoherentAllocation Alexandre Courbot
2025-05-21 8:00 ` Danilo Krummrich
2025-05-22 5:24 ` Alexandre Courbot
2025-05-21 12:43 ` Boqun Feng
2025-05-21 15:57 ` Joel Fernandes
2025-05-21 15:59 ` Joel Fernandes
2025-05-22 5:29 ` Alexandre Courbot
2025-06-02 9:24 ` Danilo Krummrich
2025-05-21 6:44 ` [PATCH v4 02/20] rust: make ETIMEDOUT error available Alexandre Courbot
2025-05-21 7:27 ` Benno Lossin
2025-05-21 6:44 ` [PATCH v4 03/20] rust: sizes: add constants up to SZ_2G Alexandre Courbot
2025-05-21 12:45 ` Boqun Feng
2025-05-21 6:44 ` [PATCH v4 04/20] rust: add new `num` module with useful integer operations Alexandre Courbot
2025-05-22 4:00 ` Alexandre Courbot
2025-05-22 8:44 ` Miguel Ojeda
2025-05-22 9:31 ` Alexandre Courbot
2025-05-28 19:56 ` Alice Ryhl
2025-05-29 1:35 ` Alexandre Courbot
2025-05-28 20:17 ` Benno Lossin
2025-05-29 1:18 ` Alexandre Courbot
2025-05-29 7:27 ` Benno Lossin
2025-06-02 9:39 ` Danilo Krummrich
2025-06-03 22:53 ` Benno Lossin
2025-06-03 23:54 ` Alexandre Courbot
2025-06-04 7:21 ` Benno Lossin
2025-06-02 13:09 ` Alexandre Courbot
2025-06-03 23:02 ` Benno Lossin
2025-06-04 0:05 ` Alexandre Courbot
2025-06-04 7:18 ` Benno Lossin
2025-06-12 13:17 ` Alexandre Courbot
2025-06-12 13:27 ` Alexandre Courbot
2025-06-12 14:49 ` Benno Lossin
2025-06-13 5:31 ` Alexandre Courbot
2025-05-21 6:45 ` [PATCH v4 05/20] gpu: nova-core: use absolute paths in register!() macro Alexandre Courbot
2025-05-30 21:38 ` Lyude Paul
2025-05-21 6:45 ` [PATCH v4 06/20] gpu: nova-core: add delimiter for helper rules " Alexandre Courbot
2025-05-30 21:39 ` Lyude Paul
2025-05-21 6:45 ` [PATCH v4 07/20] gpu: nova-core: expose the offset of each register as a type constant Alexandre Courbot
2025-05-30 21:40 ` Lyude Paul
2025-05-21 6:45 ` [PATCH v4 08/20] gpu: nova-core: allow register aliases Alexandre Courbot
2025-05-21 8:37 ` Danilo Krummrich
2025-05-22 5:14 ` Alexandre Courbot
2025-05-21 6:45 ` [PATCH v4 09/20] gpu: nova-core: increase BAR0 size to 16MB Alexandre Courbot
2025-05-30 21:46 ` Lyude Paul
2025-06-02 11:21 ` Alexandre Courbot
2025-05-21 6:45 ` [PATCH v4 10/20] gpu: nova-core: add helper function to wait on condition Alexandre Courbot
2025-05-21 6:45 ` [PATCH v4 11/20] gpu: nova-core: wait for GFW_BOOT completion Alexandre Courbot
2025-05-30 21:51 ` Lyude Paul
2025-05-31 14:09 ` Miguel Ojeda
2025-05-31 14:37 ` Danilo Krummrich
2025-05-31 14:45 ` Miguel Ojeda
2025-06-02 11:21 ` Alexandre Courbot
2025-05-21 6:45 ` [PATCH v4 12/20] gpu: nova-core: add DMA object struct Alexandre Courbot
2025-05-30 21:53 ` Lyude Paul
2025-05-21 6:45 ` Alexandre Courbot [this message]
2025-05-30 21:57 ` [PATCH v4 13/20] gpu: nova-core: register sysmem flush page Lyude Paul
2025-06-02 11:09 ` Danilo Krummrich
2025-06-02 11:20 ` Alexandre Courbot
2025-05-21 6:45 ` [PATCH v4 14/20] gpu: nova-core: add falcon register definitions and base code Alexandre Courbot
2025-05-30 22:22 ` Lyude Paul
2025-06-03 8:03 ` Alexandre Courbot
2025-06-02 12:06 ` Danilo Krummrich
2025-06-03 7:59 ` Alexandre Courbot
2025-05-21 6:45 ` [PATCH v4 15/20] gpu: nova-core: firmware: add ucode descriptor used by FWSEC-FRTS Alexandre Courbot
2025-05-30 22:23 ` Lyude Paul
2025-06-02 12:26 ` Danilo Krummrich
2025-06-04 3:58 ` Alexandre Courbot
2025-05-21 6:45 ` [PATCH v4 16/20] nova-core: Add support for VBIOS ucode extraction for boot Alexandre Courbot
2025-05-27 20:38 ` Joel Fernandes
2025-05-29 6:47 ` Alexandre Courbot
2025-06-03 21:15 ` Lyude Paul
2025-06-05 16:18 ` Joel Fernandes
2025-06-02 13:33 ` Danilo Krummrich
2025-06-02 15:15 ` Joel Fernandes
2025-06-03 8:12 ` Alexandre Courbot
2025-06-03 13:47 ` Joel Fernandes
2025-06-03 13:49 ` Danilo Krummrich
2025-06-03 14:29 ` Joel Fernandes
2025-06-04 18:23 ` Joel Fernandes
2025-06-03 21:05 ` Lyude Paul
2025-06-04 10:03 ` Miguel Ojeda
2025-06-05 16:09 ` Joel Fernandes
2025-06-05 16:21 ` Danilo Krummrich
2025-06-05 16:28 ` Joel Fernandes
2025-05-21 6:45 ` [PATCH v4 17/20] gpu: nova-core: compute layout of the FRTS region Alexandre Courbot
2025-06-03 21:14 ` Lyude Paul
2025-06-04 4:18 ` Alexandre Courbot
2025-06-04 10:24 ` Danilo Krummrich
2025-06-05 13:14 ` Alexandre Courbot
2025-06-04 10:23 ` Danilo Krummrich
2025-06-05 13:36 ` Alexandre Courbot
2025-05-21 6:45 ` [PATCH v4 18/20] gpu: nova-core: add types for patching firmware binaries Alexandre Courbot
2025-06-03 21:16 ` Lyude Paul
2025-06-04 10:28 ` Danilo Krummrich
2025-06-12 7:19 ` Alexandre Courbot
2025-06-12 10:54 ` Danilo Krummrich
2025-06-12 12:52 ` Alexandre Courbot
2025-05-21 6:45 ` [PATCH v4 19/20] gpu: nova-core: extract FWSEC from BIOS and patch it to run FWSEC-FRTS Alexandre Courbot
2025-06-03 21:32 ` Lyude Paul
2025-06-04 1:11 ` Alexandre Courbot
2025-06-04 10:42 ` Danilo Krummrich
2025-06-12 7:20 ` Alexandre Courbot
2025-05-21 6:45 ` [PATCH v4 20/20] gpu: nova-core: load and " Alexandre Courbot
2025-05-29 21:30 ` Timur Tabi
2025-05-30 22:32 ` Lyude Paul
2025-06-04 1:37 ` Alexandre Courbot
2025-06-03 21:45 ` Lyude Paul
2025-06-04 1:38 ` Alexandre Courbot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250521-nova-frts-v4-13-05dfd4f39479@nvidia.com \
--to=acourbot@nvidia.com \
--cc=a.hindborg@kernel.org \
--cc=airlied@gmail.com \
--cc=alex.gaynor@gmail.com \
--cc=aliceryhl@google.com \
--cc=apopple@nvidia.com \
--cc=benno.lossin@proton.me \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun.feng@gmail.com \
--cc=bskeggs@nvidia.com \
--cc=dakr@kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=gary@garyguo.net \
--cc=jhubbard@nvidia.com \
--cc=joelagnelf@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=nouveau@lists.freedesktop.org \
--cc=ojeda@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=simona@ffwll.ch \
--cc=tmgross@umich.edu \
--cc=ttabi@nvidia.com \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®