[PATCH v2 13/19] gpu: nova-core: register: split @io rule into fixed and relative versions

[Daniel Almeida]

> On 18 Jul 2025, at 04:26, Alexandre Courbot <acourbot at nvidia.com> wrote:
> 
> We used the same @io rule with different patterns to define both the
> fixed and relative I/O accessors. This can be confusing as the matching
> rules are very similar.
> 
> Since all call sites know which version they want to call, split @io
> into @io_fixed and @io_relative to remove any ambiguity.
> 
> Signed-off-by: Alexandre Courbot <acourbot at nvidia.com>
> ---
> drivers/gpu/nova-core/regs/macros.rs | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/nova-core/regs/macros.rs b/drivers/gpu/nova-core/regs/macros.rs
> index f0942dc29210f703fddd4d86b758173f75b3477a..bfa0220050d4ba03c9fcd75c9be1ed8dbaa4f290 100644
> --- a/drivers/gpu/nova-core/regs/macros.rs
> +++ b/drivers/gpu/nova-core/regs/macros.rs
> @@ -89,25 +89,25 @@ macro_rules! register {
>     // Creates a register at a fixed offset of the MMIO space.
>     ($name:ident @ $offset:literal $(, $comment:literal)? { $($fields:tt)* } ) => {
>         register!(@core $name $(, $comment)? { $($fields)* } );
> -        register!(@io $name @ $offset);
> +        register!(@io_fixed $name @ $offset);
>     };
> 
>     // Creates an alias register of fixed offset register `alias` with its own fields.
>     ($name:ident => $alias:ident $(, $comment:literal)? { $($fields:tt)* } ) => {
>         register!(@core $name $(, $comment)? { $($fields)* } );
> -        register!(@io $name @ $alias::OFFSET);
> +        register!(@io_fixed $name @ $alias::OFFSET);
>     };
> 
>     // Creates a register at a relative offset from a base address.
>     ($name:ident @ + $offset:literal $(, $comment:literal)? { $($fields:tt)* } ) => {
>         register!(@core $name $(, $comment)? { $($fields)* } );
> -        register!(@io $name @ + $offset);
> +        register!(@io_relative $name @ + $offset);
>     };
> 
>     // Creates an alias register of relative offset register `alias` with its own fields.
>     ($name:ident => + $alias:ident $(, $comment:literal)? { $($fields:tt)* } ) => {
>         register!(@core $name $(, $comment)? { $($fields)* } );
> -        register!(@io $name @ + $alias::OFFSET);
> +        register!(@io_relative $name @ + $alias::OFFSET);
>     };
> 
>     // All rules below are helpers.
> @@ -342,7 +342,7 @@ fn default() -> Self {
>     };
> 
>     // Generates the IO accessors for a fixed offset register.
> -    (@io $name:ident @ $offset:expr) => {
> +    (@io_fixed $name:ident @ $offset:expr) => {
>         #[allow(dead_code)]
>         impl $name {
>             pub(crate) const OFFSET: usize = $offset;
> @@ -380,7 +380,7 @@ pub(crate) fn alter<const SIZE: usize, T, F>(
>     };
> 
>     // Generates the IO accessors for a relative offset register.
> -    (@io $name:ident @ + $offset:literal) => {
> +    (@io_relative $name:ident @ + $offset:literal) => {
>         #[allow(dead_code)]
>         impl $name {
>             pub(crate) const OFFSET: usize = $offset;
> 
> -- 
> 2.50.1
> 
> 

Reviewed-by: Daniel Almeida <daniel.almeida at collabora.com>