From 6480e6bc125b9d7a10c3b076b5e9b192238085b5 Mon Sep 17 00:00:00 2001 From: smadhavan Date: Fri, 28 Sep 2018 15:53:52 +0530 Subject: [PATCH] gpu: nvgpu: gv100: MISRA 21.2 header guard fixes MISRA rule 21.2 doesn't allow the use of macro names which start with an underscore. These leading underscores are to be removed from the macro names. This patch will fix such violations in gv100 hw headers by renaming them to follow the convention, 'NVGPU_HEADER_NAME'. JIRA NVGPU-1028 Change-Id: I78945233d16e47483b3c1f03fc0c7ca5774c3e95 Signed-off-by: smadhavan Reviewed-on: https://git-master.nvidia.com/r/1850997 Reviewed-by: Konsta Holtta Reviewed-by: Terje Bergstrom GVS: Gerrit_Virtual_Submit Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_bus_gv100.h | 6 +++--- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ccsr_gv100.h | 6 +++--- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ce_gv100.h | 6 +++--- .../gpu/nvgpu/include/nvgpu/hw/gv100/hw_ctxsw_prog_gv100.h | 4 ++-- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_falcon_gv100.h | 4 ++-- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fb_gv100.h | 4 ++-- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fifo_gv100.h | 4 ++-- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_flush_gv100.h | 6 +++--- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fuse_gv100.h | 4 ++-- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_gmmu_gv100.h | 4 ++-- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_gr_gv100.h | 4 ++-- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ioctrl_gv100.h | 4 ++-- .../gpu/nvgpu/include/nvgpu/hw/gv100/hw_ioctrlmif_gv100.h | 4 ++-- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ltc_gv100.h | 4 ++-- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_mc_gv100.h | 4 ++-- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_minion_gv100.h | 4 ++-- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_nvl_gv100.h | 4 ++-- .../include/nvgpu/hw/gv100/hw_nvlinkip_discovery_gv100.h | 4 ++-- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_nvlipt_gv100.h | 4 ++-- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_nvtlc_gv100.h | 4 ++-- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pbdma_gv100.h | 4 ++-- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pgsp_gv100.h | 4 ++-- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pram_gv100.h | 6 +++--- .../nvgpu/include/nvgpu/hw/gv100/hw_pri_ringmaster_gv100.h | 6 +++--- .../include/nvgpu/hw/gv100/hw_pri_ringstation_gpc_gv100.h | 6 +++--- .../include/nvgpu/hw/gv100/hw_pri_ringstation_sys_gv100.h | 6 +++--- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_proj_gv100.h | 4 ++-- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pwr_gv100.h | 6 +++--- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ram_gv100.h | 4 ++-- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_therm_gv100.h | 6 +++--- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_timer_gv100.h | 6 +++--- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_top_gv100.h | 4 ++-- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_trim_gv100.h | 4 ++-- .../gpu/nvgpu/include/nvgpu/hw/gv100/hw_usermode_gv100.h | 6 +++--- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_xp_gv100.h | 6 +++--- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_xve_gv100.h | 6 +++--- drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_perf_gv11b.h | 4 ++-- 37 files changed, 88 insertions(+), 88 deletions(-) diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_bus_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_bus_gv100.h index 7771f1ea1..0770a6fb2 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_bus_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_bus_gv100.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_bus_gv100_h_ -#define _hw_bus_gv100_h_ +#ifndef NVGPU_HW_BUS_GV100_H +#define NVGPU_HW_BUS_GV100_H static inline u32 bus_sw_scratch_r(u32 i) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ccsr_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ccsr_gv100.h index b1478037c..c08420402 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ccsr_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ccsr_gv100.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_ccsr_gv100_h_ -#define _hw_ccsr_gv100_h_ +#ifndef NVGPU_HW_CCSR_GV100_H +#define NVGPU_HW_CCSR_GV100_H static inline u32 ccsr_channel_inst_r(u32 i) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ce_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ce_gv100.h index 18b5fc664..3779fd836 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ce_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ce_gv100.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_ce_gv100_h_ -#define _hw_ce_gv100_h_ +#ifndef NVGPU_HW_CE_GV100_H +#define NVGPU_HW_CE_GV100_H static inline u32 ce_intr_status_r(u32 i) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ctxsw_prog_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ctxsw_prog_gv100.h index b7f3df240..82ed147bd 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ctxsw_prog_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ctxsw_prog_gv100.h @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_ctxsw_prog_gv100_h_ -#define _hw_ctxsw_prog_gv100_h_ +#ifndef NVGPU_HW_CTXSW_PROG_GV100_H +#define NVGPU_HW_CTXSW_PROG_GV100_H static inline u32 ctxsw_prog_fecs_header_v(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_falcon_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_falcon_gv100.h index 3492d68c9..119a677cf 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_falcon_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_falcon_gv100.h @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_falcon_gv100_h_ -#define _hw_falcon_gv100_h_ +#ifndef NVGPU_HW_FALCON_GV100_H +#define NVGPU_HW_FALCON_GV100_H static inline u32 falcon_falcon_irqsset_r(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fb_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fb_gv100.h index 66727b94b..efe992ec4 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fb_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fb_gv100.h @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_fb_gv100_h_ -#define _hw_fb_gv100_h_ +#ifndef NVGPU_HW_FB_GV100_H +#define NVGPU_HW_FB_GV100_H static inline u32 fb_fbhub_num_active_ltcs_r(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fifo_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fifo_gv100.h index cd40dcc15..29a5db2b4 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fifo_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fifo_gv100.h @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_fifo_gv100_h_ -#define _hw_fifo_gv100_h_ +#ifndef NVGPU_HW_FIFO_GV100_H +#define NVGPU_HW_FIFO_GV100_H static inline u32 fifo_userd_writeback_r(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_flush_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_flush_gv100.h index b60456261..46d29d791 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_flush_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_flush_gv100.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_flush_gv100_h_ -#define _hw_flush_gv100_h_ +#ifndef NVGPU_HW_FLUSH_GV100_H +#define NVGPU_HW_FLUSH_GV100_H static inline u32 flush_l2_system_invalidate_r(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fuse_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fuse_gv100.h index 48194ea9c..a2c46b3df 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fuse_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fuse_gv100.h @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_fuse_gv100_h_ -#define _hw_fuse_gv100_h_ +#ifndef NVGPU_HW_FUSE_GV100_H +#define NVGPU_HW_FUSE_GV100_H static inline u32 fuse_status_opt_gpc_r(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_gmmu_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_gmmu_gv100.h index 8cccfa94c..241d7df47 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_gmmu_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_gmmu_gv100.h @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_gmmu_gv100_h_ -#define _hw_gmmu_gv100_h_ +#ifndef NVGPU_HW_GMMU_GV100_H +#define NVGPU_HW_GMMU_GV100_H static inline u32 gmmu_new_pde_is_pte_w(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_gr_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_gr_gv100.h index 0f83d6ba9..7652661e9 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_gr_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_gr_gv100.h @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_gr_gv100_h_ -#define _hw_gr_gv100_h_ +#ifndef NVGPU_HW_GR_GV100_H +#define NVGPU_HW_GR_GV100_H static inline u32 gr_intr_r(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ioctrl_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ioctrl_gv100.h index c27e607c8..c774dda0d 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ioctrl_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ioctrl_gv100.h @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_ioctrl_gv100_h_ -#define _hw_ioctrl_gv100_h_ +#ifndef NVGPU_HW_IOCTRL_GV100_H +#define NVGPU_HW_IOCTRL_GV100_H static inline u32 ioctrl_reset_r(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ioctrlmif_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ioctrlmif_gv100.h index 5747a9ba3..05fd2ff53 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ioctrlmif_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ioctrlmif_gv100.h @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_ioctrlmif_gv100_h_ -#define _hw_ioctrlmif_gv100_h_ +#ifndef NVGPU_HW_IOCTRLMIF_GV100_H +#define NVGPU_HW_IOCTRLMIF_GV100_H static inline u32 ioctrlmif_rx_err_contain_en_0_r(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ltc_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ltc_gv100.h index 042cb7d10..a389388d8 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ltc_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ltc_gv100.h @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_ltc_gv100_h_ -#define _hw_ltc_gv100_h_ +#ifndef NVGPU_HW_LTC_GV100_H +#define NVGPU_HW_LTC_GV100_H static inline u32 ltc_pltcg_base_v(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_mc_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_mc_gv100.h index cf406c346..913dc6e75 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_mc_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_mc_gv100.h @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_mc_gv100_h_ -#define _hw_mc_gv100_h_ +#ifndef NVGPU_HW_MC_GV100_H +#define NVGPU_HW_MC_GV100_H static inline u32 mc_boot_0_r(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_minion_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_minion_gv100.h index e4bbf23fd..e2ee4adbb 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_minion_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_minion_gv100.h @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_minion_gv100_h_ -#define _hw_minion_gv100_h_ +#ifndef NVGPU_HW_MINION_GV100_H +#define NVGPU_HW_MINION_GV100_H static inline u32 minion_minion_status_r(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_nvl_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_nvl_gv100.h index 2e4ec168b..52e92b8a0 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_nvl_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_nvl_gv100.h @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_nvl_gv100_h_ -#define _hw_nvl_gv100_h_ +#ifndef NVGPU_HW_NVL_GV100_H +#define NVGPU_HW_NVL_GV100_H static inline u32 nvl_link_state_r(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_nvlinkip_discovery_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_nvlinkip_discovery_gv100.h index 9d33a9fda..217c3aece 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_nvlinkip_discovery_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_nvlinkip_discovery_gv100.h @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_nvlinkip_discovery_gv100_h_ -#define _hw_nvlinkip_discovery_gv100_h_ +#ifndef NVGPU_HW_NVLINKIP_DISCOVERY_GV100_H +#define NVGPU_HW_NVLINKIP_DISCOVERY_GV100_H static inline u32 nvlinkip_discovery_common_r(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_nvlipt_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_nvlipt_gv100.h index 5f73fabd9..895bc4a3d 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_nvlipt_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_nvlipt_gv100.h @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_nvlipt_gv100_h_ -#define _hw_nvlipt_gv100_h_ +#ifndef NVGPU_HW_NVLIPT_GV100_H +#define NVGPU_HW_NVLIPT_GV100_H static inline u32 nvlipt_intr_control_link0_r(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_nvtlc_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_nvtlc_gv100.h index cc31b12b2..76c4e16b7 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_nvtlc_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_nvtlc_gv100.h @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_nvtlc_gv100_h_ -#define _hw_nvtlc_gv100_h_ +#ifndef NVGPU_HW_NVTLC_GV100_H +#define NVGPU_HW_NVTLC_GV100_H static inline u32 nvtlc_tx_err_report_en_0_r(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pbdma_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pbdma_gv100.h index 41d7d1b65..bb0eff0b3 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pbdma_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pbdma_gv100.h @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_pbdma_gv100_h_ -#define _hw_pbdma_gv100_h_ +#ifndef NVGPU_HW_PBDMA_GV100_H +#define NVGPU_HW_PBDMA_GV100_H static inline u32 pbdma_gp_entry1_r(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pgsp_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pgsp_gv100.h index 34d0eae80..86eed69c3 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pgsp_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pgsp_gv100.h @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_pgsp_gv100_h_ -#define _hw_pgsp_gv100_h_ +#ifndef NVGPU_HW_PGSP_GV100_H +#define NVGPU_HW_PGSP_GV100_H static inline u32 pgsp_falcon_irqsset_r(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pram_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pram_gv100.h index 8f005a22f..23d535332 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pram_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pram_gv100.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_pram_gv100_h_ -#define _hw_pram_gv100_h_ +#ifndef NVGPU_HW_PRAM_GV100_H +#define NVGPU_HW_PRAM_GV100_H static inline u32 pram_data032_r(u32 i) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pri_ringmaster_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pri_ringmaster_gv100.h index 5eca93cc6..0554acf64 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pri_ringmaster_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pri_ringmaster_gv100.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_pri_ringmaster_gv100_h_ -#define _hw_pri_ringmaster_gv100_h_ +#ifndef NVGPU_HW_PRI_RINGMASTER_GV100_H +#define NVGPU_HW_PRI_RINGMASTER_GV100_H static inline u32 pri_ringmaster_command_r(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pri_ringstation_gpc_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pri_ringstation_gpc_gv100.h index fc522d51b..36051c618 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pri_ringstation_gpc_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pri_ringstation_gpc_gv100.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_pri_ringstation_gpc_gv100_h_ -#define _hw_pri_ringstation_gpc_gv100_h_ +#ifndef NVGPU_HW_PRI_RINGSTATION_GPC_GV100_H +#define NVGPU_HW_PRI_RINGSTATION_GPC_GV100_H static inline u32 pri_ringstation_gpc_master_config_r(u32 i) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pri_ringstation_sys_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pri_ringstation_sys_gv100.h index 885ea30a5..51a34528d 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pri_ringstation_sys_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pri_ringstation_sys_gv100.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_pri_ringstation_sys_gv100_h_ -#define _hw_pri_ringstation_sys_gv100_h_ +#ifndef NVGPU_HW_PRI_RINGSTATION_SYS_GV100_H +#define NVGPU_HW_PRI_RINGSTATION_SYS_GV100_H static inline u32 pri_ringstation_sys_master_config_r(u32 i) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_proj_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_proj_gv100.h index f46eaa091..ddb413403 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_proj_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_proj_gv100.h @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_proj_gv100_h_ -#define _hw_proj_gv100_h_ +#ifndef NVGPU_HW_PROJ_GV100_H +#define NVGPU_HW_PROJ_GV100_H static inline u32 proj_gpc_base_v(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pwr_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pwr_gv100.h index 4b0b03262..c77907074 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pwr_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pwr_gv100.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_pwr_gv100_h_ -#define _hw_pwr_gv100_h_ +#ifndef NVGPU_HW_PWR_GV100_H +#define NVGPU_HW_PWR_GV100_H static inline u32 pwr_falcon_irqsset_r(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ram_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ram_gv100.h index 77b5b096d..b0da9caa0 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ram_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_ram_gv100.h @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_ram_gv100_h_ -#define _hw_ram_gv100_h_ +#ifndef NVGPU_HW_RAM_GV100_H +#define NVGPU_HW_RAM_GV100_H static inline u32 ram_in_ramfc_s(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_therm_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_therm_gv100.h index 2ea71ef14..be6a39118 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_therm_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_therm_gv100.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_therm_gv100_h_ -#define _hw_therm_gv100_h_ +#ifndef NVGPU_HW_THERM_GV100_H +#define NVGPU_HW_THERM_GV100_H static inline u32 therm_weight_1_r(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_timer_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_timer_gv100.h index 9d76e2419..a530764a6 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_timer_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_timer_gv100.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_timer_gv100_h_ -#define _hw_timer_gv100_h_ +#ifndef NVGPU_HW_TIMER_GV100_H +#define NVGPU_HW_TIMER_GV100_H static inline u32 timer_pri_timeout_r(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_top_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_top_gv100.h index 506a8181f..1f6ca6b5d 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_top_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_top_gv100.h @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_top_gv100_h_ -#define _hw_top_gv100_h_ +#ifndef NVGPU_HW_TOP_GV100_H +#define NVGPU_HW_TOP_GV100_H static inline u32 top_num_gpcs_r(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_trim_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_trim_gv100.h index d537145c2..58300c9f6 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_trim_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_trim_gv100.h @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_trim_gv100_h_ -#define _hw_trim_gv100_h_ +#ifndef NVGPU_HW_TRIM_GV100_H +#define NVGPU_HW_TRIM_GV100_H static inline u32 trim_sys_nvlink_uphy_cfg_r(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_usermode_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_usermode_gv100.h index 7b1d861ec..3703dad16 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_usermode_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_usermode_gv100.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_usermode_gv100_h_ -#define _hw_usermode_gv100_h_ +#ifndef NVGPU_HW_USERMODE_GV100_H +#define NVGPU_HW_USERMODE_GV100_H static inline u32 usermode_cfg0_r(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_xp_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_xp_gv100.h index 4296e0432..b9b28a258 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_xp_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_xp_gv100.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_xp_gv100_h_ -#define _hw_xp_gv100_h_ +#ifndef NVGPU_HW_XP_GV100_H +#define NVGPU_HW_XP_GV100_H static inline u32 xp_dl_mgr_r(u32 i) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_xve_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_xve_gv100.h index fc7aa72e8..7b3ad39f2 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_xve_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_xve_gv100.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_xve_gv100_h_ -#define _hw_xve_gv100_h_ +#ifndef NVGPU_HW_XVE_GV100_H +#define NVGPU_HW_XVE_GV100_H static inline u32 xve_rom_ctrl_r(void) { diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_perf_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_perf_gv11b.h index a3341df70..2226b95d7 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_perf_gv11b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_perf_gv11b.h @@ -53,8 +53,8 @@ * comparison with unshifted values appropriate for use in field * of register . */ -#ifndef _hw_perf_gv11b_h_ -#define _hw_perf_gv11b_h_ +#ifndef NVGPU_HW_PERF_GV11B_H +#define NVGPU_HW_PERF_GV11B_H static inline u32 perf_pmmgpc_perdomain_offset_v(void) {