mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-02-19 06:38:26 -05:00
gpu: nova-core: register: allow fields named offset
`offset` is a common field name, yet using it triggers a build error due to the conflict between the uppercased field constant (which becomes `OFFSET` in this case) containing the bitrange of the field, and the `OFFSET` constant constaining the offset of the register. Fix this by adding `_RANGE` the field's range constant to avoid the name collision. [acourbot@nvidia.com: fix merge conflict due to switch from `as u32` to `u32::from`.] Reported-by: Timur Tabi <ttabi@nvidia.com> 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-3-7b6a762aa1cd@nvidia.com Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
This commit is contained in:
@@ -28,7 +28,7 @@ impl NV_PMC_BOOT_0 {
|
||||
/// Combines `architecture_0` and `architecture_1` to obtain the architecture of the chip.
|
||||
pub(crate) fn architecture(self) -> Result<Architecture> {
|
||||
Architecture::try_from(
|
||||
self.architecture_0() | (self.architecture_1() << Self::ARCHITECTURE_0.len()),
|
||||
self.architecture_0() | (self.architecture_1() << Self::ARCHITECTURE_0_RANGE.len()),
|
||||
)
|
||||
}
|
||||
|
||||
@@ -36,7 +36,8 @@ pub(crate) fn architecture(self) -> Result<Architecture> {
|
||||
pub(crate) fn chipset(self) -> Result<Chipset> {
|
||||
self.architecture()
|
||||
.map(|arch| {
|
||||
((arch as u32) << Self::IMPLEMENTATION.len()) | u32::from(self.implementation())
|
||||
((arch as u32) << Self::IMPLEMENTATION_RANGE.len())
|
||||
| u32::from(self.implementation())
|
||||
})
|
||||
.and_then(Chipset::try_from)
|
||||
}
|
||||
|
||||
@@ -278,7 +278,7 @@ impl $name {
|
||||
{ $process:expr } $to_type:ty => $res_type:ty $(, $comment:literal)?;
|
||||
) => {
|
||||
::kernel::macros::paste!(
|
||||
const [<$field:upper>]: ::core::ops::RangeInclusive<u8> = $lo..=$hi;
|
||||
const [<$field:upper _RANGE>]: ::core::ops::RangeInclusive<u8> = $lo..=$hi;
|
||||
const [<$field:upper _MASK>]: u32 = ((((1 << $hi) - 1) << 1) + 1) - ((1 << $lo) - 1);
|
||||
const [<$field:upper _SHIFT>]: u32 = Self::[<$field:upper _MASK>].trailing_zeros();
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user