drm/amdkfd: avoid CONFIG_ prefix for non-Kconfig symbols
Subsystems (3)
PATCH 1/1 drm/amdkfd: avoid CONFIG_ prefix for non-Kconfig symbols
The CONFIG_ prefix is reserved for Kconfig options in Make and CPP syntax. Various static analysis tools rely on this naming convention and check if CONFIG_ prefixed symbols are defined Kconfig. Hence add yet another prefix AMD_ to CONFIG_REG_{BASE,END,SISE} to apply to this convention and make static analysis tools happy.
--- drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 10 +++++----- drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c +5 -5
@@ -445,7 +445,7 @@ static int dbgdev_address_watch_diq(struct kfd_dbgdev *dbgdev, aw_reg_add_dword /=sizeof (uint32_t ); packets_vec[0 ].bitfields2.reg_offset = - aw_reg_add_dword -CONFIG_REG_BASE ; + aw_reg_add_dword -AMD_CONFIG_REG_BASE ; packets_vec[0 ].reg_data[0 ] = cntl.u32All;
@@ -458,7 +458,7 @@ static int dbgdev_address_watch_diq(struct kfd_dbgdev *dbgdev, aw_reg_add_dword /=sizeof (uint32_t ); packets_vec[1 ].bitfields2.reg_offset = - aw_reg_add_dword -CONFIG_REG_BASE ; + aw_reg_add_dword -AMD_CONFIG_REG_BASE ; packets_vec[1 ].reg_data[0 ] = addrHi.u32All; aw_reg_add_dword =
@@ -470,7 +470,7 @@ static int dbgdev_address_watch_diq(struct kfd_dbgdev *dbgdev, aw_reg_add_dword /=sizeof (uint32_t ); packets_vec[2 ].bitfields2.reg_offset = - aw_reg_add_dword -CONFIG_REG_BASE ; + aw_reg_add_dword -AMD_CONFIG_REG_BASE ; packets_vec[2 ].reg_data[0 ] = addrLo.u32All;/* enable watch flag if address is not zero*/
@@ -488,7 +488,7 @@ static int dbgdev_address_watch_diq(struct kfd_dbgdev *dbgdev, aw_reg_add_dword /=sizeof (uint32_t ); packets_vec[3 ].bitfields2.reg_offset = - aw_reg_add_dword -CONFIG_REG_BASE ; + aw_reg_add_dword -AMD_CONFIG_REG_BASE ; packets_vec[3 ].reg_data[0 ] = cntl.u32All; status = dbgdev_diq_submit_ib(
@@ -690,7 +690,7 @@ static int dbgdev_wave_control_diq(struct kfd_dbgdev *dbgdev, packets_vec[1 ].header.opcode =IT_SET_CONFIG_REG ; packets_vec[1 ].header.type =PM4_TYPE_3 ; packets_vec[1 ].bitfields2.reg_offset =SQ_CMD / (sizeof (uint32_t )) - -CONFIG_REG_BASE ; +AMD_CONFIG_REG_BASE ; packets_vec[1 ].bitfields2.vmid_shift =SQ_CMD_VMID_OFFSET ; packets_vec[1 ].bitfields2.insert_vmid =1 ;
drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h +3 -3
@@ -48,9 +48,9 @@ enum {/* CONFIG reg space definition */ enum { -CONFIG_REG_BASE =0x2000 ,/* in dwords */ -CONFIG_REG_END =0x2B00 , -CONFIG_REG_SIZE =CONFIG_REG_END -CONFIG_REG_BASE +AMD_CONFIG_REG_BASE =0x2000 ,/* in dwords */ +AMD_CONFIG_REG_END =0x2B00 , +AMD_CONFIG_REG_SIZE =AMD_CONFIG_REG_END -AMD_CONFIG_REG_BASE };/* SH reg space definition */
Signature · 1 line
2.4.2
Quoted 79 lines · Valentin Rothberg
The
CONFIG_prefix is reserved forKconfigoptions in Make and CPP syntax. Various static analysis tools rely on this naming convention and check ifCONFIG_prefixed symbols are definedKconfig. Hence add yet another prefixAMD_to CONFIG_REG_{BASE,END,SISE} to apply to this convention and make static analysis tools happy.Signed-off-by Valentin Rothberg <[email protected]>--- drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 10 +++++----- drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-)drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c +5
-5@@ -445,7 +445,7 @@ static int dbgdev_address_watch_diq(struct kfd_dbgdev *dbgdev, aw_reg_add_dword /=sizeof (uint32_t ); packets_vec[0 ].bitfields2.reg_offset = - aw_reg_add_dword -CONFIG_REG_BASE ; + aw_reg_add_dword -AMD_CONFIG_REG_BASE ; packets_vec[0 ].reg_data[0 ] = cntl.u32All;@@ -458,7 +458,7 @@ static int dbgdev_address_watch_diq(struct kfd_dbgdev *dbgdev, aw_reg_add_dword /=sizeof (uint32_t ); packets_vec[1 ].bitfields2.reg_offset = - aw_reg_add_dword -CONFIG_REG_BASE ; + aw_reg_add_dword -AMD_CONFIG_REG_BASE ; packets_vec[1 ].reg_data[0 ] = addrHi.u32All; aw_reg_add_dword =@@ -470,7 +470,7 @@ static int dbgdev_address_watch_diq(struct kfd_dbgdev *dbgdev, aw_reg_add_dword /=sizeof (uint32_t ); packets_vec[2 ].bitfields2.reg_offset = - aw_reg_add_dword -CONFIG_REG_BASE ; + aw_reg_add_dword -AMD_CONFIG_REG_BASE ; packets_vec[2 ].reg_data[0 ] = addrLo.u32All;/* enable watch flag if address is not zero*/ @@ -488,7 +488,7 @@ static int dbgdev_address_watch_diq(struct kfd_dbgdev *dbgdev, aw_reg_add_dword /=sizeof (uint32_t ); packets_vec[3 ].bitfields2.reg_offset = - aw_reg_add_dword -CONFIG_REG_BASE ; + aw_reg_add_dword -AMD_CONFIG_REG_BASE ; packets_vec[3 ].reg_data[0 ] = cntl.u32All; status = dbgdev_diq_submit_ib(@@ -690,7 +690,7 @@ static int dbgdev_wave_control_diq(struct kfd_dbgdev *dbgdev, packets_vec[1 ].header.opcode =IT_SET_CONFIG_REG ; packets_vec[1 ].header.type =PM4_TYPE_3 ; packets_vec[1 ].bitfields2.reg_offset =SQ_CMD / (sizeof (uint32_t )) - -CONFIG_REG_BASE ; +AMD_CONFIG_REG_BASE ; packets_vec[1 ].bitfields2.vmid_shift =SQ_CMD_VMID_OFFSET ; packets_vec[1 ].bitfields2.insert_vmid =1 ;drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h +3
-4@@ -48,9 +48,9 @@ enum {/* CONFIG reg space definition */ enum { -CONFIG_REG_BASE =0x2000 ,/* in dwords */ -CONFIG_REG_END =0x2B00 , -CONFIG_REG_SIZE =CONFIG_REG_END -CONFIG_REG_BASE +AMD_CONFIG_REG_BASE =0x2000 ,/* in dwords */ +AMD_CONFIG_REG_END =0x2B00 , +AMD_CONFIG_REG_SIZE =AMD_CONFIG_REG_END -AMD_CONFIG_REG_BASE };/* SH reg space definition */ --
Quoted 2 lines
2.4.2
Thanks!
Applied to my -next-fixes tree
Oded
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel