mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-10 07:59:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nova-core: register: move OFFSET declaration to I/O impl block

Browse Source 
The OFFSET const is an I/O property, and having to pass it to the
@common rule makes it impossible to make I/O optional, as we want to get
to eventually.

Thus, move OFFSET to the I/O impl block so it is not needed by the
@common rule anymore.

Reviewed-by: Daniel Almeida <daniel.almeida@collabora.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Link: https://lore.kernel.org/r/20250718-nova-regs-v2-7-7b6a762aa1cd@nvidia.com
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
This commit is contained in:
Alexandre Courbot
2025-07-18 16:26:12 +09:00
parent b567daf4ea
commit 036c5fa250
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpu/nova-core/regs/macros.rs
View File

@@ -92,7 +92,7 @@ macro_rules! register {
$($fields:tt)*
}
) => {
register!(@common $name @ $offset $(, $comment)?);
register!(@common $name $(, $comment)?);
register!(@field_accessors $name { $($fields)* });
register!(@io $name @ $offset);
};
@@ -103,7 +103,7 @@ macro_rules! register {
$($fields:tt)*
}
) => {
register!(@common $name @ $alias::OFFSET $(, $comment)?);
register!(@common $name $(, $comment)?);
register!(@field_accessors $name { $($fields)* });
register!(@io $name @ $alias::OFFSET);
};
@@ -114,7 +114,7 @@ macro_rules! register {
$($fields:tt)*
}
) => {
register!(@common $name @ $offset $(, $comment)?);
register!(@common $name $(, $comment)?);
register!(@field_accessors $name { $($fields)* });
register!(@io $name @ + $offset);
};
@@ -125,7 +125,7 @@ macro_rules! register {
$($fields:tt)*
}
) => {
register!(@common $name @ $alias::OFFSET $(, $comment)?);
register!(@common $name $(, $comment)?);
register!(@field_accessors $name { $($fields)* });
register!(@io $name @ + $alias::OFFSET);
};
@@ -134,7 +134,7 @@ macro_rules! register {
// Defines the wrapper `$name` type, as well as its relevant implementations (`Debug`, `BitOr`,
// and conversion to regular `u32`).
(@common $name:ident @ $offset:expr $(, $comment:literal)?) => {
(@common $name:ident $(, $comment:literal)?) => {
$(
#[doc=$comment]
)?
@@ -142,11 +142,6 @@ macro_rules! register {
#[derive(Clone, Copy, Default)]
pub(crate) struct $name(u32);
#[allow(dead_code)]
impl $name {
pub(crate) const OFFSET: usize = $offset;
}
// TODO[REGA]: display the raw hex value, then the value of all the fields. This requires
// matching the fields, which will complexify the syntax considerably...
impl ::core::fmt::Debug for $name {
@@ -319,6 +314,8 @@ pub(crate) fn [<set_ $field>](mut self, value: $to_type) -> Self {
(@io $name:ident @ $offset:expr) => {
#[allow(dead_code)]
impl $name {
pub(crate) const OFFSET: usize = $offset;
#[inline]
pub(crate) fn read<const SIZE: usize, T>(io: &T) -> Self where
T: ::core::ops::Deref<Target = ::kernel::io::Io<SIZE>>,
@@ -351,6 +348,8 @@ pub(crate) fn alter<const SIZE: usize, T, F>(
(@io $name:ident @ + $offset:literal) => {
#[allow(dead_code)]
impl $name {
pub(crate) const OFFSET: usize = $offset;
#[inline]
pub(crate) fn read<const SIZE: usize, T>(
io: &T,