mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-16 09:02:21 -04:00
gpu: nova-core: convert PBUS registers to kernel register macro
Convert all PBUS registers to use the kernel's register macro and update the code accordingly. Reviewed-by: Eliot Courtney <ecourtney@nvidia.com> Reviewed-by: Gary Guo <gary@garyguo.net> Acked-by: Danilo Krummrich <dakr@kernel.org> Link: https://patch.msgid.link/20260325-b4-nova-register-v4-3-bdf172f0f6ca@nvidia.com Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
device,
|
||||
dma::Coherent,
|
||||
io::poll::read_poll_timeout,
|
||||
io::Io,
|
||||
pci,
|
||||
prelude::*,
|
||||
time::Delta, //
|
||||
@@ -86,7 +87,9 @@ fn run_fwsec_frts(
|
||||
}
|
||||
|
||||
// SCRATCH_E contains the error code for FWSEC-FRTS.
|
||||
let frts_status = regs::NV_PBUS_SW_SCRATCH_0E_FRTS_ERR::read(bar).frts_err_code();
|
||||
let frts_status = bar
|
||||
.read(regs::NV_PBUS_SW_SCRATCH_0E_FRTS_ERR)
|
||||
.frts_err_code();
|
||||
if frts_status != 0 {
|
||||
dev_err!(
|
||||
dev,
|
||||
|
||||
@@ -109,12 +109,14 @@ fn fmt(&self, f: &mut kernel::fmt::Formatter<'_>) -> kernel::fmt::Result {
|
||||
|
||||
// PBUS
|
||||
|
||||
register!(NV_PBUS_SW_SCRATCH @ 0x00001400[64] {});
|
||||
io::register! {
|
||||
pub(crate) NV_PBUS_SW_SCRATCH(u32)[64] @ 0x00001400 {}
|
||||
|
||||
register!(NV_PBUS_SW_SCRATCH_0E_FRTS_ERR => NV_PBUS_SW_SCRATCH[0xe],
|
||||
"scratch register 0xe used as FRTS firmware error code" {
|
||||
31:16 frts_err_code as u16;
|
||||
});
|
||||
/// Scratch register 0xe used as FRTS firmware error code.
|
||||
pub(crate) NV_PBUS_SW_SCRATCH_0E_FRTS_ERR(u32) => NV_PBUS_SW_SCRATCH[0xe] {
|
||||
31:16 frts_err_code;
|
||||
}
|
||||
}
|
||||
|
||||
// PFB
|
||||
|
||||
|
||||
Reference in New Issue
Block a user