From 4f1e35228636910c9df7d1bc8f60a4ddfacb5680 Mon Sep 17 00:00:00 2001 From: Vedashree Vidwans Date: Fri, 10 Jun 2022 09:49:37 -0700 Subject: [PATCH] tegra: hwpm: rename source files Shorten source file names by removing "tegra_hwpm" prefix. This will make understanding the code more legible. Jira THWPM-58 Change-Id: I39aac11c9f2a763a254b0605f9d96a7b0f372992 Signed-off-by: Vedashree Vidwans Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2729469 Reviewed-by: svc_kernel_abi Reviewed-by: Vasuki Shankar Reviewed-by: Seema Khowala GVS: Gerrit_Virtual_Submit --- Makefile | 76 +++++++++---------- .../{tegra_hwpm_alist_utils.c => allowlist.c} | 0 ...tegra_hwpm_aperture_utils.c => aperture.c} | 0 common/{tegra_hwpm_init.c => init.c} | 2 +- common/{tegra_hwpm_ip_utils.c => ip.c} | 0 .../{tegra_hwpm_mem_buf_utils.c => mem_buf.c} | 0 .../{tegra_hwpm_regops_utils.c => regops.c} | 0 ...tegra_hwpm_resource_utils.c => resource.c} | 0 ...{t234_hwpm_ip_display.c => t234_display.c} | 4 +- ...{t234_hwpm_ip_display.h => t234_display.h} | 0 .../ip/isp/{t234_hwpm_ip_isp.c => t234_isp.c} | 4 +- .../ip/isp/{t234_hwpm_ip_isp.h => t234_isp.h} | 0 .../mgbe/{t234_hwpm_ip_mgbe.c => t234_mgbe.c} | 4 +- .../mgbe/{t234_hwpm_ip_mgbe.h => t234_mgbe.h} | 0 ...pm_ip_mss_channel.c => t234_mss_channel.c} | 4 +- ...pm_ip_mss_channel.h => t234_mss_channel.h} | 0 ...pm_ip_mss_gpu_hub.c => t234_mss_gpu_hub.c} | 4 +- ...pm_ip_mss_gpu_hub.h => t234_mss_gpu_hub.h} | 0 ...o_niso_hubs.c => t234_mss_iso_niso_hubs.c} | 4 +- ...o_niso_hubs.h => t234_mss_iso_niso_hubs.h} | 0 ...{t234_hwpm_ip_mss_mcf.c => t234_mss_mcf.c} | 4 +- ...{t234_hwpm_ip_mss_mcf.h => t234_mss_mcf.h} | 0 .../{t234_hwpm_ip_nvdec.c => t234_nvdec.c} | 4 +- .../{t234_hwpm_ip_nvdec.h => t234_nvdec.h} | 0 .../{t234_hwpm_ip_nvdla.c => t234_nvdla.c} | 4 +- .../{t234_hwpm_ip_nvdla.h => t234_nvdla.h} | 0 .../{t234_hwpm_ip_nvenc.c => t234_nvenc.c} | 4 +- .../{t234_hwpm_ip_nvenc.h => t234_nvenc.h} | 0 .../ip/ofa/{t234_hwpm_ip_ofa.c => t234_ofa.c} | 4 +- .../ip/ofa/{t234_hwpm_ip_ofa.h => t234_ofa.h} | 0 .../pcie/{t234_hwpm_ip_pcie.c => t234_pcie.c} | 4 +- .../pcie/{t234_hwpm_ip_pcie.h => t234_pcie.h} | 0 .../ip/pma/{t234_hwpm_ip_pma.c => t234_pma.c} | 4 +- .../ip/pma/{t234_hwpm_ip_pma.h => t234_pma.h} | 0 .../ip/pva/{t234_hwpm_ip_pva.c => t234_pva.c} | 4 +- .../ip/pva/{t234_hwpm_ip_pva.h => t234_pva.h} | 0 .../ip/rtr/{t234_hwpm_ip_rtr.c => t234_rtr.c} | 4 +- .../ip/rtr/{t234_hwpm_ip_rtr.h => t234_rtr.h} | 0 .../ip/scf/{t234_hwpm_ip_scf.c => t234_scf.c} | 4 +- .../ip/scf/{t234_hwpm_ip_scf.h => t234_scf.h} | 0 .../ip/vi/{t234_hwpm_ip_vi.c => t234_vi.c} | 4 +- .../ip/vi/{t234_hwpm_ip_vi.h => t234_vi.h} | 0 .../ip/vic/{t234_hwpm_ip_vic.c => t234_vic.c} | 4 +- .../ip/vic/{t234_hwpm_ip_vic.h => t234_vic.h} | 0 .../{t234_hwpm_alist_utils.c => t234_alist.c} | 4 +- ..._hwpm_aperture_utils.c => t234_aperture.c} | 2 +- hal/t234/{t234_hwpm_init.h => t234_init.h} | 0 ...wpm_interface_utils.c => t234_interface.c} | 4 +- .../{t234_hwpm_internal.h => t234_internal.h} | 36 ++++----- hal/t234/{t234_hwpm_ip_utils.c => t234_ip.c} | 2 +- ...4_hwpm_mem_buf_utils.c => t234_mem_mgmt.c} | 2 +- ...ps_allowlist.c => t234_regops_allowlist.c} | 2 +- ...ps_allowlist.h => t234_regops_allowlist.h} | 0 ..._hwpm_resource_utils.c => t234_resource.c} | 2 +- os/linux/{tegra_hwpm_debugfs.c => debugfs.c} | 2 +- .../linux/debugfs.h | 6 +- os/linux/{tegra_hwpm_linux.c => driver.c} | 2 +- os/linux/{tegra_hwpm_io.c => io.c} | 0 os/linux/{tegra_hwpm_ioctl.c => ioctl.c} | 0 os/linux/{tegra_hwpm_ip.c => ip_utils.c} | 0 os/linux/{tegra_hwpm_log.c => log.c} | 0 61 files changed, 107 insertions(+), 107 deletions(-) rename common/{tegra_hwpm_alist_utils.c => allowlist.c} (100%) rename common/{tegra_hwpm_aperture_utils.c => aperture.c} (100%) rename common/{tegra_hwpm_init.c => init.c} (99%) rename common/{tegra_hwpm_ip_utils.c => ip.c} (100%) rename common/{tegra_hwpm_mem_buf_utils.c => mem_buf.c} (100%) rename common/{tegra_hwpm_regops_utils.c => regops.c} (100%) rename common/{tegra_hwpm_resource_utils.c => resource.c} (100%) rename hal/t234/ip/display/{t234_hwpm_ip_display.c => t234_display.c} (98%) rename hal/t234/ip/display/{t234_hwpm_ip_display.h => t234_display.h} (100%) rename hal/t234/ip/isp/{t234_hwpm_ip_isp.c => t234_isp.c} (98%) rename hal/t234/ip/isp/{t234_hwpm_ip_isp.h => t234_isp.h} (100%) rename hal/t234/ip/mgbe/{t234_hwpm_ip_mgbe.c => t234_mgbe.c} (99%) rename hal/t234/ip/mgbe/{t234_hwpm_ip_mgbe.h => t234_mgbe.h} (100%) rename hal/t234/ip/mss_channel/{t234_hwpm_ip_mss_channel.c => t234_mss_channel.c} (99%) rename hal/t234/ip/mss_channel/{t234_hwpm_ip_mss_channel.h => t234_mss_channel.h} (100%) rename hal/t234/ip/mss_gpu_hub/{t234_hwpm_ip_mss_gpu_hub.c => t234_mss_gpu_hub.c} (98%) rename hal/t234/ip/mss_gpu_hub/{t234_hwpm_ip_mss_gpu_hub.h => t234_mss_gpu_hub.h} (100%) rename hal/t234/ip/mss_iso_niso_hubs/{t234_hwpm_ip_mss_iso_niso_hubs.c => t234_mss_iso_niso_hubs.c} (99%) rename hal/t234/ip/mss_iso_niso_hubs/{t234_hwpm_ip_mss_iso_niso_hubs.h => t234_mss_iso_niso_hubs.h} (100%) rename hal/t234/ip/mss_mcf/{t234_hwpm_ip_mss_mcf.c => t234_mss_mcf.c} (99%) rename hal/t234/ip/mss_mcf/{t234_hwpm_ip_mss_mcf.h => t234_mss_mcf.h} (100%) rename hal/t234/ip/nvdec/{t234_hwpm_ip_nvdec.c => t234_nvdec.c} (98%) rename hal/t234/ip/nvdec/{t234_hwpm_ip_nvdec.h => t234_nvdec.h} (100%) rename hal/t234/ip/nvdla/{t234_hwpm_ip_nvdla.c => t234_nvdla.c} (98%) rename hal/t234/ip/nvdla/{t234_hwpm_ip_nvdla.h => t234_nvdla.h} (100%) rename hal/t234/ip/nvenc/{t234_hwpm_ip_nvenc.c => t234_nvenc.c} (98%) rename hal/t234/ip/nvenc/{t234_hwpm_ip_nvenc.h => t234_nvenc.h} (100%) rename hal/t234/ip/ofa/{t234_hwpm_ip_ofa.c => t234_ofa.c} (98%) rename hal/t234/ip/ofa/{t234_hwpm_ip_ofa.h => t234_ofa.h} (100%) rename hal/t234/ip/pcie/{t234_hwpm_ip_pcie.c => t234_pcie.c} (99%) rename hal/t234/ip/pcie/{t234_hwpm_ip_pcie.h => t234_pcie.h} (100%) rename hal/t234/ip/pma/{t234_hwpm_ip_pma.c => t234_pma.c} (98%) rename hal/t234/ip/pma/{t234_hwpm_ip_pma.h => t234_pma.h} (100%) rename hal/t234/ip/pva/{t234_hwpm_ip_pva.c => t234_pva.c} (98%) rename hal/t234/ip/pva/{t234_hwpm_ip_pva.h => t234_pva.h} (100%) rename hal/t234/ip/rtr/{t234_hwpm_ip_rtr.c => t234_rtr.c} (98%) rename hal/t234/ip/rtr/{t234_hwpm_ip_rtr.h => t234_rtr.h} (100%) rename hal/t234/ip/scf/{t234_hwpm_ip_scf.c => t234_scf.c} (97%) rename hal/t234/ip/scf/{t234_hwpm_ip_scf.h => t234_scf.h} (100%) rename hal/t234/ip/vi/{t234_hwpm_ip_vi.c => t234_vi.c} (98%) rename hal/t234/ip/vi/{t234_hwpm_ip_vi.h => t234_vi.h} (100%) rename hal/t234/ip/vic/{t234_hwpm_ip_vic.c => t234_vic.c} (98%) rename hal/t234/ip/vic/{t234_hwpm_ip_vic.h => t234_vic.h} (100%) rename hal/t234/{t234_hwpm_alist_utils.c => t234_alist.c} (96%) rename hal/t234/{t234_hwpm_aperture_utils.c => t234_aperture.c} (99%) rename hal/t234/{t234_hwpm_init.h => t234_init.h} (100%) rename hal/t234/{t234_hwpm_interface_utils.c => t234_interface.c} (99%) rename hal/t234/{t234_hwpm_internal.h => t234_internal.h} (82%) rename hal/t234/{t234_hwpm_ip_utils.c => t234_ip.c} (99%) rename hal/t234/{t234_hwpm_mem_buf_utils.c => t234_mem_mgmt.c} (99%) rename hal/t234/{t234_hwpm_regops_allowlist.c => t234_regops_allowlist.c} (99%) rename hal/t234/{t234_hwpm_regops_allowlist.h => t234_regops_allowlist.h} (100%) rename hal/t234/{t234_hwpm_resource_utils.c => t234_resource.c} (98%) rename os/linux/{tegra_hwpm_debugfs.c => debugfs.c} (97%) rename include/tegra_hwpm_debugfs.h => os/linux/debugfs.h (88%) rename os/linux/{tegra_hwpm_linux.c => driver.c} (99%) rename os/linux/{tegra_hwpm_io.c => io.c} (100%) rename os/linux/{tegra_hwpm_ioctl.c => ioctl.c} (100%) rename os/linux/{tegra_hwpm_ip.c => ip_utils.c} (100%) rename os/linux/{tegra_hwpm_log.c => log.c} (100%) diff --git a/Makefile b/Makefile index 206089b..40f83ee 100644 --- a/Makefile +++ b/Makefile @@ -8,33 +8,33 @@ ccflags-y += -I$(srctree.nvidia)/drivers/platform/tegra/hwpm ccflags-y += -I$(srctree.nvidia)/drivers/platform/tegra/hwpm/include ccflags-y += -I$(srctree.nvidia)/include -obj-$(CONFIG_DEBUG_FS) += os/linux/tegra_hwpm_debugfs.o -obj-y += os/linux/tegra_hwpm_linux.o -obj-y += os/linux/tegra_hwpm_io.o -obj-y += os/linux/tegra_hwpm_ip.o -obj-y += os/linux/tegra_hwpm_ioctl.o -obj-y += os/linux/tegra_hwpm_log.o +obj-$(CONFIG_DEBUG_FS) += os/linux/debugfs.o +obj-y += os/linux/driver.o +obj-y += os/linux/io.o +obj-y += os/linux/ip_utils.o +obj-y += os/linux/ioctl.o +obj-y += os/linux/log.o -obj-y += common/tegra_hwpm_alist_utils.o -obj-y += common/tegra_hwpm_aperture_utils.o -obj-y += common/tegra_hwpm_ip_utils.o -obj-y += common/tegra_hwpm_mem_buf_utils.o -obj-y += common/tegra_hwpm_regops_utils.o -obj-y += common/tegra_hwpm_resource_utils.o -obj-y += common/tegra_hwpm_init.o +obj-y += common/allowlist.o +obj-y += common/aperture.o +obj-y += common/ip.o +obj-y += common/mem_buf.o +obj-y += common/regops.o +obj-y += common/resource.o +obj-y += common/init.o ifeq ($(CONFIG_TEGRA_T234_HWPM),y) -obj-y += hal/t234/t234_hwpm_alist_utils.o -obj-y += hal/t234/t234_hwpm_aperture_utils.o -obj-y += hal/t234/t234_hwpm_interface_utils.o -obj-y += hal/t234/t234_hwpm_ip_utils.o -obj-y += hal/t234/t234_hwpm_mem_buf_utils.o -obj-y += hal/t234/t234_hwpm_regops_allowlist.o -obj-y += hal/t234/t234_hwpm_resource_utils.o +obj-y += hal/t234/t234_alist.o +obj-y += hal/t234/t234_aperture.o +obj-y += hal/t234/t234_interface.o +obj-y += hal/t234/t234_ip.o +obj-y += hal/t234/t234_mem_mgmt.o +obj-y += hal/t234/t234_regops_allowlist.o +obj-y += hal/t234/t234_resource.o -obj-y += hal/t234/ip/pma/t234_hwpm_ip_pma.o -obj-y += hal/t234/ip/rtr/t234_hwpm_ip_rtr.o +obj-y += hal/t234/ip/pma/t234_pma.o +obj-y += hal/t234/ip/rtr/t234_rtr.o # # Control IP config @@ -55,75 +55,75 @@ endif ifeq ($(CONFIG_TEGRA_GRHOST_NVDLA),y) ccflags-y += -DCONFIG_T234_HWPM_IP_NVDLA -obj-y += hal/t234/ip/nvdla/t234_hwpm_ip_nvdla.o +obj-y += hal/t234/ip/nvdla/t234_nvdla.o endif ifeq ($(CONFIG_TEGRA_GRHOST_PVA),y) ccflags-y += -DCONFIG_T234_HWPM_IP_PVA -obj-y += hal/t234/ip/pva/t234_hwpm_ip_pva.o +obj-y += hal/t234/ip/pva/t234_pva.o endif ifeq ($(CONFIG_NV_TEGRA_MC),y) ccflags-y += -DCONFIG_T234_HWPM_IP_MSS_CHANNEL -obj-y += hal/t234/ip/mss_channel/t234_hwpm_ip_mss_channel.o +obj-y += hal/t234/ip/mss_channel/t234_mss_channel.o endif ifneq ($(CONFIG_TEGRA_HWPM_MINIMAL_IP_ENABLE),y) ccflags-y += -DCONFIG_T234_HWPM_IP_DISPLAY -obj-y += hal/t234/ip/display/t234_hwpm_ip_display.o +obj-y += hal/t234/ip/display/t234_display.o ifeq ($(CONFIG_TEGRA_GRHOST_ISP),y) ccflags-y += -DCONFIG_T234_HWPM_IP_ISP -obj-y += hal/t234/ip/isp/t234_hwpm_ip_isp.o +obj-y += hal/t234/ip/isp/t234_isp.o endif ifeq ($(CONFIG_NVETHERNET),y) ccflags-y += -DCONFIG_T234_HWPM_IP_MGBE -obj-y += hal/t234/ip/mgbe/t234_hwpm_ip_mgbe.o +obj-y += hal/t234/ip/mgbe/t234_mgbe.o endif ifeq ($(CONFIG_NV_TEGRA_MC),y) ccflags-y += -DCONFIG_T234_HWPM_IP_MSS_ISO_NISO_HUBS -obj-y += hal/t234/ip/mss_iso_niso_hubs/t234_hwpm_ip_mss_iso_niso_hubs.o +obj-y += hal/t234/ip/mss_iso_niso_hubs/t234_mss_iso_niso_hubs.o ccflags-y += -DCONFIG_T234_HWPM_IP_MSS_MCF -obj-y += hal/t234/ip/mss_mcf/t234_hwpm_ip_mss_mcf.o +obj-y += hal/t234/ip/mss_mcf/t234_mss_mcf.o endif ccflags-y += -DCONFIG_T234_HWPM_IP_MSS_GPU_HUB -obj-y += hal/t234/ip/mss_gpu_hub/t234_hwpm_ip_mss_gpu_hub.o +obj-y += hal/t234/ip/mss_gpu_hub/t234_mss_gpu_hub.o ifeq ($(CONFIG_TEGRA_GRHOST_NVDEC),y) ccflags-y += -DCONFIG_T234_HWPM_IP_NVDEC -obj-y += hal/t234/ip/nvdec/t234_hwpm_ip_nvdec.o +obj-y += hal/t234/ip/nvdec/t234_nvdec.o endif ifeq ($(CONFIG_TEGRA_GRHOST_NVENC),y) ccflags-y += -DCONFIG_T234_HWPM_IP_NVENC -obj-y += hal/t234/ip/nvenc/t234_hwpm_ip_nvenc.o +obj-y += hal/t234/ip/nvenc/t234_nvenc.o endif ifeq ($(CONFIG_TEGRA_GRHOST_OFA),y) ccflags-y += -DCONFIG_T234_HWPM_IP_OFA -obj-y += hal/t234/ip/ofa/t234_hwpm_ip_ofa.o +obj-y += hal/t234/ip/ofa/t234_ofa.o endif ifeq ($(CONFIG_PCIE_TEGRA194),y) ccflags-y += -DCONFIG_T234_HWPM_IP_PCIE -obj-y += hal/t234/ip/pcie/t234_hwpm_ip_pcie.o +obj-y += hal/t234/ip/pcie/t234_pcie.o endif ccflags-y += -DCONFIG_T234_HWPM_IP_SCF -obj-y += hal/t234/ip/scf/t234_hwpm_ip_scf.o +obj-y += hal/t234/ip/scf/t234_scf.o ifeq ($(CONFIG_VIDEO_TEGRA_VI),y) ccflags-y += -DCONFIG_T234_HWPM_IP_VI -obj-y += hal/t234/ip/vi/t234_hwpm_ip_vi.o +obj-y += hal/t234/ip/vi/t234_vi.o endif ifeq ($(CONFIG_TEGRA_GRHOST_VIC),y) ccflags-y += -DCONFIG_T234_HWPM_IP_VIC -obj-y += hal/t234/ip/vic/t234_hwpm_ip_vic.o +obj-y += hal/t234/ip/vic/t234_vic.o endif endif diff --git a/common/tegra_hwpm_alist_utils.c b/common/allowlist.c similarity index 100% rename from common/tegra_hwpm_alist_utils.c rename to common/allowlist.c diff --git a/common/tegra_hwpm_aperture_utils.c b/common/aperture.c similarity index 100% rename from common/tegra_hwpm_aperture_utils.c rename to common/aperture.c diff --git a/common/tegra_hwpm_init.c b/common/init.c similarity index 99% rename from common/tegra_hwpm_init.c rename to common/init.c index 85abfda..d2c0cb0 100644 --- a/common/tegra_hwpm_init.c +++ b/common/init.c @@ -30,7 +30,7 @@ #include #include -#include +#include #ifdef CONFIG_TEGRA_NEXT1_HWPM #include #endif diff --git a/common/tegra_hwpm_ip_utils.c b/common/ip.c similarity index 100% rename from common/tegra_hwpm_ip_utils.c rename to common/ip.c diff --git a/common/tegra_hwpm_mem_buf_utils.c b/common/mem_buf.c similarity index 100% rename from common/tegra_hwpm_mem_buf_utils.c rename to common/mem_buf.c diff --git a/common/tegra_hwpm_regops_utils.c b/common/regops.c similarity index 100% rename from common/tegra_hwpm_regops_utils.c rename to common/regops.c diff --git a/common/tegra_hwpm_resource_utils.c b/common/resource.c similarity index 100% rename from common/tegra_hwpm_resource_utils.c rename to common/resource.c diff --git a/hal/t234/ip/display/t234_hwpm_ip_display.c b/hal/t234/ip/display/t234_display.c similarity index 98% rename from hal/t234/ip/display/t234_hwpm_ip_display.c rename to hal/t234/ip/display/t234_display.c index 01bd438..1470ffd 100644 --- a/hal/t234/ip/display/t234_hwpm_ip_display.c +++ b/hal/t234/ip/display/t234_display.c @@ -11,10 +11,10 @@ * more details. */ -#include "t234_hwpm_ip_display.h" +#include "t234_display.h" #include -#include +#include #include static struct hwpm_ip_aperture t234_display_inst0_perfmon_element_static_array[ diff --git a/hal/t234/ip/display/t234_hwpm_ip_display.h b/hal/t234/ip/display/t234_display.h similarity index 100% rename from hal/t234/ip/display/t234_hwpm_ip_display.h rename to hal/t234/ip/display/t234_display.h diff --git a/hal/t234/ip/isp/t234_hwpm_ip_isp.c b/hal/t234/ip/isp/t234_isp.c similarity index 98% rename from hal/t234/ip/isp/t234_hwpm_ip_isp.c rename to hal/t234/ip/isp/t234_isp.c index 4d01f16..86e3489 100644 --- a/hal/t234/ip/isp/t234_hwpm_ip_isp.c +++ b/hal/t234/ip/isp/t234_isp.c @@ -11,10 +11,10 @@ * more details. */ -#include "t234_hwpm_ip_isp.h" +#include "t234_isp.h" #include -#include +#include #include static struct hwpm_ip_aperture t234_isp_inst0_perfmon_element_static_array[ diff --git a/hal/t234/ip/isp/t234_hwpm_ip_isp.h b/hal/t234/ip/isp/t234_isp.h similarity index 100% rename from hal/t234/ip/isp/t234_hwpm_ip_isp.h rename to hal/t234/ip/isp/t234_isp.h diff --git a/hal/t234/ip/mgbe/t234_hwpm_ip_mgbe.c b/hal/t234/ip/mgbe/t234_mgbe.c similarity index 99% rename from hal/t234/ip/mgbe/t234_hwpm_ip_mgbe.c rename to hal/t234/ip/mgbe/t234_mgbe.c index 71154f4..d6b9164 100644 --- a/hal/t234/ip/mgbe/t234_hwpm_ip_mgbe.c +++ b/hal/t234/ip/mgbe/t234_mgbe.c @@ -11,10 +11,10 @@ * more details. */ -#include "t234_hwpm_ip_mgbe.h" +#include "t234_mgbe.h" #include -#include +#include #include static struct hwpm_ip_aperture t234_mgbe_inst0_perfmon_element_static_array[ diff --git a/hal/t234/ip/mgbe/t234_hwpm_ip_mgbe.h b/hal/t234/ip/mgbe/t234_mgbe.h similarity index 100% rename from hal/t234/ip/mgbe/t234_hwpm_ip_mgbe.h rename to hal/t234/ip/mgbe/t234_mgbe.h diff --git a/hal/t234/ip/mss_channel/t234_hwpm_ip_mss_channel.c b/hal/t234/ip/mss_channel/t234_mss_channel.c similarity index 99% rename from hal/t234/ip/mss_channel/t234_hwpm_ip_mss_channel.c rename to hal/t234/ip/mss_channel/t234_mss_channel.c index b7898cf..80d8103 100644 --- a/hal/t234/ip/mss_channel/t234_hwpm_ip_mss_channel.c +++ b/hal/t234/ip/mss_channel/t234_mss_channel.c @@ -11,10 +11,10 @@ * more details. */ -#include "t234_hwpm_ip_mss_channel.h" +#include "t234_mss_channel.h" #include -#include +#include #include static struct hwpm_ip_aperture t234_mss_channel_inst0_perfmon_element_static_array[ diff --git a/hal/t234/ip/mss_channel/t234_hwpm_ip_mss_channel.h b/hal/t234/ip/mss_channel/t234_mss_channel.h similarity index 100% rename from hal/t234/ip/mss_channel/t234_hwpm_ip_mss_channel.h rename to hal/t234/ip/mss_channel/t234_mss_channel.h diff --git a/hal/t234/ip/mss_gpu_hub/t234_hwpm_ip_mss_gpu_hub.c b/hal/t234/ip/mss_gpu_hub/t234_mss_gpu_hub.c similarity index 98% rename from hal/t234/ip/mss_gpu_hub/t234_hwpm_ip_mss_gpu_hub.c rename to hal/t234/ip/mss_gpu_hub/t234_mss_gpu_hub.c index 371a6d5..25d3c1a 100644 --- a/hal/t234/ip/mss_gpu_hub/t234_hwpm_ip_mss_gpu_hub.c +++ b/hal/t234/ip/mss_gpu_hub/t234_mss_gpu_hub.c @@ -11,10 +11,10 @@ * more details. */ -#include "t234_hwpm_ip_mss_gpu_hub.h" +#include "t234_mss_gpu_hub.h" #include -#include +#include #include static struct hwpm_ip_aperture t234_mss_gpu_hub_inst0_perfmon_element_static_array[ diff --git a/hal/t234/ip/mss_gpu_hub/t234_hwpm_ip_mss_gpu_hub.h b/hal/t234/ip/mss_gpu_hub/t234_mss_gpu_hub.h similarity index 100% rename from hal/t234/ip/mss_gpu_hub/t234_hwpm_ip_mss_gpu_hub.h rename to hal/t234/ip/mss_gpu_hub/t234_mss_gpu_hub.h diff --git a/hal/t234/ip/mss_iso_niso_hubs/t234_hwpm_ip_mss_iso_niso_hubs.c b/hal/t234/ip/mss_iso_niso_hubs/t234_mss_iso_niso_hubs.c similarity index 99% rename from hal/t234/ip/mss_iso_niso_hubs/t234_hwpm_ip_mss_iso_niso_hubs.c rename to hal/t234/ip/mss_iso_niso_hubs/t234_mss_iso_niso_hubs.c index 65c7547..2cf83b3 100644 --- a/hal/t234/ip/mss_iso_niso_hubs/t234_hwpm_ip_mss_iso_niso_hubs.c +++ b/hal/t234/ip/mss_iso_niso_hubs/t234_mss_iso_niso_hubs.c @@ -11,10 +11,10 @@ * more details. */ -#include "t234_hwpm_ip_mss_iso_niso_hubs.h" +#include "t234_mss_iso_niso_hubs.h" #include -#include +#include #include static struct hwpm_ip_aperture t234_mss_iso_niso_hub_inst0_perfmon_element_static_array[ diff --git a/hal/t234/ip/mss_iso_niso_hubs/t234_hwpm_ip_mss_iso_niso_hubs.h b/hal/t234/ip/mss_iso_niso_hubs/t234_mss_iso_niso_hubs.h similarity index 100% rename from hal/t234/ip/mss_iso_niso_hubs/t234_hwpm_ip_mss_iso_niso_hubs.h rename to hal/t234/ip/mss_iso_niso_hubs/t234_mss_iso_niso_hubs.h diff --git a/hal/t234/ip/mss_mcf/t234_hwpm_ip_mss_mcf.c b/hal/t234/ip/mss_mcf/t234_mss_mcf.c similarity index 99% rename from hal/t234/ip/mss_mcf/t234_hwpm_ip_mss_mcf.c rename to hal/t234/ip/mss_mcf/t234_mss_mcf.c index 5d92803..be83d6b 100644 --- a/hal/t234/ip/mss_mcf/t234_hwpm_ip_mss_mcf.c +++ b/hal/t234/ip/mss_mcf/t234_mss_mcf.c @@ -11,10 +11,10 @@ * more details. */ -#include "t234_hwpm_ip_mss_mcf.h" +#include "t234_mss_mcf.h" #include -#include +#include #include static struct hwpm_ip_aperture t234_mss_mcf_inst0_perfmon_element_static_array[ diff --git a/hal/t234/ip/mss_mcf/t234_hwpm_ip_mss_mcf.h b/hal/t234/ip/mss_mcf/t234_mss_mcf.h similarity index 100% rename from hal/t234/ip/mss_mcf/t234_hwpm_ip_mss_mcf.h rename to hal/t234/ip/mss_mcf/t234_mss_mcf.h diff --git a/hal/t234/ip/nvdec/t234_hwpm_ip_nvdec.c b/hal/t234/ip/nvdec/t234_nvdec.c similarity index 98% rename from hal/t234/ip/nvdec/t234_hwpm_ip_nvdec.c rename to hal/t234/ip/nvdec/t234_nvdec.c index b99cadf..c1313b1 100644 --- a/hal/t234/ip/nvdec/t234_hwpm_ip_nvdec.c +++ b/hal/t234/ip/nvdec/t234_nvdec.c @@ -11,10 +11,10 @@ * more details. */ -#include "t234_hwpm_ip_nvdec.h" +#include "t234_nvdec.h" #include -#include +#include #include static struct hwpm_ip_aperture t234_nvdec_inst0_perfmon_element_static_array[ diff --git a/hal/t234/ip/nvdec/t234_hwpm_ip_nvdec.h b/hal/t234/ip/nvdec/t234_nvdec.h similarity index 100% rename from hal/t234/ip/nvdec/t234_hwpm_ip_nvdec.h rename to hal/t234/ip/nvdec/t234_nvdec.h diff --git a/hal/t234/ip/nvdla/t234_hwpm_ip_nvdla.c b/hal/t234/ip/nvdla/t234_nvdla.c similarity index 98% rename from hal/t234/ip/nvdla/t234_hwpm_ip_nvdla.c rename to hal/t234/ip/nvdla/t234_nvdla.c index 21b0bfd..2d8659b 100644 --- a/hal/t234/ip/nvdla/t234_hwpm_ip_nvdla.c +++ b/hal/t234/ip/nvdla/t234_nvdla.c @@ -11,10 +11,10 @@ * more details. */ -#include "t234_hwpm_ip_nvdla.h" +#include "t234_nvdla.h" #include -#include +#include #include static struct hwpm_ip_aperture t234_nvdla_inst0_perfmon_element_static_array[ diff --git a/hal/t234/ip/nvdla/t234_hwpm_ip_nvdla.h b/hal/t234/ip/nvdla/t234_nvdla.h similarity index 100% rename from hal/t234/ip/nvdla/t234_hwpm_ip_nvdla.h rename to hal/t234/ip/nvdla/t234_nvdla.h diff --git a/hal/t234/ip/nvenc/t234_hwpm_ip_nvenc.c b/hal/t234/ip/nvenc/t234_nvenc.c similarity index 98% rename from hal/t234/ip/nvenc/t234_hwpm_ip_nvenc.c rename to hal/t234/ip/nvenc/t234_nvenc.c index 7e7199d..b66710d 100644 --- a/hal/t234/ip/nvenc/t234_hwpm_ip_nvenc.c +++ b/hal/t234/ip/nvenc/t234_nvenc.c @@ -11,10 +11,10 @@ * more details. */ -#include "t234_hwpm_ip_nvenc.h" +#include "t234_nvenc.h" #include -#include +#include #include static struct hwpm_ip_aperture t234_nvenc_inst0_perfmon_element_static_array[ diff --git a/hal/t234/ip/nvenc/t234_hwpm_ip_nvenc.h b/hal/t234/ip/nvenc/t234_nvenc.h similarity index 100% rename from hal/t234/ip/nvenc/t234_hwpm_ip_nvenc.h rename to hal/t234/ip/nvenc/t234_nvenc.h diff --git a/hal/t234/ip/ofa/t234_hwpm_ip_ofa.c b/hal/t234/ip/ofa/t234_ofa.c similarity index 98% rename from hal/t234/ip/ofa/t234_hwpm_ip_ofa.c rename to hal/t234/ip/ofa/t234_ofa.c index 72688ba..e6c012f 100644 --- a/hal/t234/ip/ofa/t234_hwpm_ip_ofa.c +++ b/hal/t234/ip/ofa/t234_ofa.c @@ -11,10 +11,10 @@ * more details. */ -#include "t234_hwpm_ip_ofa.h" +#include "t234_ofa.h" #include -#include +#include #include static struct hwpm_ip_aperture t234_ofa_inst0_perfmon_element_static_array[ diff --git a/hal/t234/ip/ofa/t234_hwpm_ip_ofa.h b/hal/t234/ip/ofa/t234_ofa.h similarity index 100% rename from hal/t234/ip/ofa/t234_hwpm_ip_ofa.h rename to hal/t234/ip/ofa/t234_ofa.h diff --git a/hal/t234/ip/pcie/t234_hwpm_ip_pcie.c b/hal/t234/ip/pcie/t234_pcie.c similarity index 99% rename from hal/t234/ip/pcie/t234_hwpm_ip_pcie.c rename to hal/t234/ip/pcie/t234_pcie.c index dddb2c9..a57fbc0 100644 --- a/hal/t234/ip/pcie/t234_hwpm_ip_pcie.c +++ b/hal/t234/ip/pcie/t234_pcie.c @@ -11,10 +11,10 @@ * more details. */ -#include "t234_hwpm_ip_pcie.h" +#include "t234_pcie.h" #include -#include +#include #include static struct hwpm_ip_aperture t234_pcie_inst0_perfmon_element_static_array[ diff --git a/hal/t234/ip/pcie/t234_hwpm_ip_pcie.h b/hal/t234/ip/pcie/t234_pcie.h similarity index 100% rename from hal/t234/ip/pcie/t234_hwpm_ip_pcie.h rename to hal/t234/ip/pcie/t234_pcie.h diff --git a/hal/t234/ip/pma/t234_hwpm_ip_pma.c b/hal/t234/ip/pma/t234_pma.c similarity index 98% rename from hal/t234/ip/pma/t234_hwpm_ip_pma.c rename to hal/t234/ip/pma/t234_pma.c index caa1636..37291bd 100644 --- a/hal/t234/ip/pma/t234_hwpm_ip_pma.c +++ b/hal/t234/ip/pma/t234_pma.c @@ -11,10 +11,10 @@ * more details. */ -#include "t234_hwpm_ip_pma.h" +#include "t234_pma.h" #include -#include +#include #include static struct hwpm_ip_aperture t234_pma_inst0_perfmon_element_static_array[ diff --git a/hal/t234/ip/pma/t234_hwpm_ip_pma.h b/hal/t234/ip/pma/t234_pma.h similarity index 100% rename from hal/t234/ip/pma/t234_hwpm_ip_pma.h rename to hal/t234/ip/pma/t234_pma.h diff --git a/hal/t234/ip/pva/t234_hwpm_ip_pva.c b/hal/t234/ip/pva/t234_pva.c similarity index 98% rename from hal/t234/ip/pva/t234_hwpm_ip_pva.c rename to hal/t234/ip/pva/t234_pva.c index 3a562bb..5589fad 100644 --- a/hal/t234/ip/pva/t234_hwpm_ip_pva.c +++ b/hal/t234/ip/pva/t234_pva.c @@ -11,10 +11,10 @@ * more details. */ -#include "t234_hwpm_ip_pva.h" +#include "t234_pva.h" #include -#include +#include #include static struct hwpm_ip_aperture t234_pva_inst0_perfmon_element_static_array[ diff --git a/hal/t234/ip/pva/t234_hwpm_ip_pva.h b/hal/t234/ip/pva/t234_pva.h similarity index 100% rename from hal/t234/ip/pva/t234_hwpm_ip_pva.h rename to hal/t234/ip/pva/t234_pva.h diff --git a/hal/t234/ip/rtr/t234_hwpm_ip_rtr.c b/hal/t234/ip/rtr/t234_rtr.c similarity index 98% rename from hal/t234/ip/rtr/t234_hwpm_ip_rtr.c rename to hal/t234/ip/rtr/t234_rtr.c index d41c9fd..cd84b3d 100644 --- a/hal/t234/ip/rtr/t234_hwpm_ip_rtr.c +++ b/hal/t234/ip/rtr/t234_rtr.c @@ -11,10 +11,10 @@ * more details. */ -#include "t234_hwpm_ip_rtr.h" +#include "t234_rtr.h" #include -#include +#include #include /* RTR aperture should be placed in instance T234_HWPM_IP_RTR_STATIC_RTR_INST */ diff --git a/hal/t234/ip/rtr/t234_hwpm_ip_rtr.h b/hal/t234/ip/rtr/t234_rtr.h similarity index 100% rename from hal/t234/ip/rtr/t234_hwpm_ip_rtr.h rename to hal/t234/ip/rtr/t234_rtr.h diff --git a/hal/t234/ip/scf/t234_hwpm_ip_scf.c b/hal/t234/ip/scf/t234_scf.c similarity index 97% rename from hal/t234/ip/scf/t234_hwpm_ip_scf.c rename to hal/t234/ip/scf/t234_scf.c index 5f12409..ebcfa64 100644 --- a/hal/t234/ip/scf/t234_hwpm_ip_scf.c +++ b/hal/t234/ip/scf/t234_scf.c @@ -11,10 +11,10 @@ * more details. */ -#include "t234_hwpm_ip_scf.h" +#include "t234_scf.h" #include -#include +#include #include static struct hwpm_ip_aperture t234_scf_inst0_perfmon_element_static_array[ diff --git a/hal/t234/ip/scf/t234_hwpm_ip_scf.h b/hal/t234/ip/scf/t234_scf.h similarity index 100% rename from hal/t234/ip/scf/t234_hwpm_ip_scf.h rename to hal/t234/ip/scf/t234_scf.h diff --git a/hal/t234/ip/vi/t234_hwpm_ip_vi.c b/hal/t234/ip/vi/t234_vi.c similarity index 98% rename from hal/t234/ip/vi/t234_hwpm_ip_vi.c rename to hal/t234/ip/vi/t234_vi.c index 3192eff..11ac327 100644 --- a/hal/t234/ip/vi/t234_hwpm_ip_vi.c +++ b/hal/t234/ip/vi/t234_vi.c @@ -11,10 +11,10 @@ * more details. */ -#include "t234_hwpm_ip_vi.h" +#include "t234_vi.h" #include -#include +#include #include static struct hwpm_ip_aperture t234_vi_inst0_perfmon_element_static_array[ diff --git a/hal/t234/ip/vi/t234_hwpm_ip_vi.h b/hal/t234/ip/vi/t234_vi.h similarity index 100% rename from hal/t234/ip/vi/t234_hwpm_ip_vi.h rename to hal/t234/ip/vi/t234_vi.h diff --git a/hal/t234/ip/vic/t234_hwpm_ip_vic.c b/hal/t234/ip/vic/t234_vic.c similarity index 98% rename from hal/t234/ip/vic/t234_hwpm_ip_vic.c rename to hal/t234/ip/vic/t234_vic.c index 8faf4c3..ad2ead5 100644 --- a/hal/t234/ip/vic/t234_hwpm_ip_vic.c +++ b/hal/t234/ip/vic/t234_vic.c @@ -11,10 +11,10 @@ * more details. */ -#include "t234_hwpm_ip_vic.h" +#include "t234_vic.h" #include -#include +#include #include static struct hwpm_ip_aperture t234_vic_inst0_perfmon_element_static_array[ diff --git a/hal/t234/ip/vic/t234_hwpm_ip_vic.h b/hal/t234/ip/vic/t234_vic.h similarity index 100% rename from hal/t234/ip/vic/t234_hwpm_ip_vic.h rename to hal/t234/ip/vic/t234_vic.h diff --git a/hal/t234/t234_hwpm_alist_utils.c b/hal/t234/t234_alist.c similarity index 96% rename from hal/t234/t234_hwpm_alist_utils.c rename to hal/t234/t234_alist.c index bb4e54c..60916bf 100644 --- a/hal/t234/t234_hwpm_alist_utils.c +++ b/hal/t234/t234_alist.c @@ -18,8 +18,8 @@ #include #include #include -#include -#include +#include +#include size_t t234_hwpm_get_alist_buf_size(struct tegra_soc_hwpm *hwpm) { diff --git a/hal/t234/t234_hwpm_aperture_utils.c b/hal/t234/t234_aperture.c similarity index 99% rename from hal/t234/t234_hwpm_aperture_utils.c rename to hal/t234/t234_aperture.c index 9e18264..a7bd9e5 100644 --- a/hal/t234/t234_hwpm_aperture_utils.c +++ b/hal/t234/t234_aperture.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include diff --git a/hal/t234/t234_hwpm_init.h b/hal/t234/t234_init.h similarity index 100% rename from hal/t234/t234_hwpm_init.h rename to hal/t234/t234_init.h diff --git a/hal/t234/t234_hwpm_interface_utils.c b/hal/t234/t234_interface.c similarity index 99% rename from hal/t234/t234_hwpm_interface_utils.c rename to hal/t234/t234_interface.c index befc807..be9fdca 100644 --- a/hal/t234/t234_hwpm_interface_utils.c +++ b/hal/t234/t234_interface.c @@ -18,8 +18,8 @@ #include #include #include -#include -#include +#include +#include static struct tegra_soc_hwpm_chip t234_chip_info = { .chip_ips = NULL, diff --git a/hal/t234/t234_hwpm_internal.h b/hal/t234/t234_internal.h similarity index 82% rename from hal/t234/t234_hwpm_internal.h rename to hal/t234/t234_internal.h index c1383e1..65eae22 100644 --- a/hal/t234/t234_hwpm_internal.h +++ b/hal/t234/t234_internal.h @@ -14,24 +14,24 @@ #ifndef T234_HWPM_INTERNAL_H #define T234_HWPM_INTERNAL_H -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #define T234_HWPM_ACTIVE_IP_MAX T234_HWPM_IP_MAX diff --git a/hal/t234/t234_hwpm_ip_utils.c b/hal/t234/t234_ip.c similarity index 99% rename from hal/t234/t234_hwpm_ip_utils.c rename to hal/t234/t234_ip.c index 4e44638..02a7d9a 100644 --- a/hal/t234/t234_hwpm_ip_utils.c +++ b/hal/t234/t234_ip.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include /* diff --git a/hal/t234/t234_hwpm_mem_buf_utils.c b/hal/t234/t234_mem_mgmt.c similarity index 99% rename from hal/t234/t234_hwpm_mem_buf_utils.c rename to hal/t234/t234_mem_mgmt.c index 2336079..15d45e6 100644 --- a/hal/t234/t234_hwpm_mem_buf_utils.c +++ b/hal/t234/t234_mem_mgmt.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff --git a/hal/t234/t234_hwpm_regops_allowlist.c b/hal/t234/t234_regops_allowlist.c similarity index 99% rename from hal/t234/t234_hwpm_regops_allowlist.c rename to hal/t234/t234_regops_allowlist.c index a13920a..46024df 100644 --- a/hal/t234/t234_hwpm_regops_allowlist.c +++ b/hal/t234/t234_regops_allowlist.c @@ -16,7 +16,7 @@ * This file is autogenerated. Do not edit. */ -#include "t234_hwpm_regops_allowlist.h" +#include "t234_regops_allowlist.h" struct allowlist t234_perfmon_alist[67] = { {0x00000000, true}, diff --git a/hal/t234/t234_hwpm_regops_allowlist.h b/hal/t234/t234_regops_allowlist.h similarity index 100% rename from hal/t234/t234_hwpm_regops_allowlist.h rename to hal/t234/t234_regops_allowlist.h diff --git a/hal/t234/t234_hwpm_resource_utils.c b/hal/t234/t234_resource.c similarity index 98% rename from hal/t234/t234_hwpm_resource_utils.c rename to hal/t234/t234_resource.c index 958b80c..72f1ad5 100644 --- a/hal/t234/t234_hwpm_resource_utils.c +++ b/hal/t234/t234_resource.c @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include diff --git a/os/linux/tegra_hwpm_debugfs.c b/os/linux/debugfs.c similarity index 97% rename from os/linux/tegra_hwpm_debugfs.c rename to os/linux/debugfs.c index fcc9336..45aa317 100644 --- a/os/linux/tegra_hwpm_debugfs.c +++ b/os/linux/debugfs.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include /* FIXME: This is a placeholder for now. We can add debugfs nodes as needed. */ void tegra_hwpm_debugfs_init(struct tegra_soc_hwpm *hwpm) diff --git a/include/tegra_hwpm_debugfs.h b/os/linux/debugfs.h similarity index 88% rename from include/tegra_hwpm_debugfs.h rename to os/linux/debugfs.h index e8b348c..18ac0a3 100644 --- a/include/tegra_hwpm_debugfs.h +++ b/os/linux/debugfs.h @@ -11,8 +11,8 @@ * more details. */ -#ifndef TEGRA_HWPM_DEBUGFS_H -#define TEGRA_HWPM_DEBUGFS_H +#ifndef TEGRA_HWPM_OS_LINUX_DEBUGFS_H +#define TEGRA_HWPM_OS_LINUX_DEBUGFS_H struct tegra_soc_hwpm; @@ -24,4 +24,4 @@ static inline void tegra_hwpm_debugfs_init(struct tegra_soc_hwpm *hwpm) {} static inline void tegra_hwpm_debugfs_deinit(struct tegra_soc_hwpm *hwpm) {} #endif /* CONFIG_DEBUG_FS */ -#endif /* TEGRA_HWPM_DEBUGFS_H */ +#endif /* TEGRA_HWPM_OS_LINUX_DEBUGFS_H */ diff --git a/os/linux/tegra_hwpm_linux.c b/os/linux/driver.c similarity index 99% rename from os/linux/tegra_hwpm_linux.c rename to os/linux/driver.c index a39e9ef..38f5ed1 100644 --- a/os/linux/tegra_hwpm_linux.c +++ b/os/linux/driver.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/os/linux/tegra_hwpm_io.c b/os/linux/io.c similarity index 100% rename from os/linux/tegra_hwpm_io.c rename to os/linux/io.c diff --git a/os/linux/tegra_hwpm_ioctl.c b/os/linux/ioctl.c similarity index 100% rename from os/linux/tegra_hwpm_ioctl.c rename to os/linux/ioctl.c diff --git a/os/linux/tegra_hwpm_ip.c b/os/linux/ip_utils.c similarity index 100% rename from os/linux/tegra_hwpm_ip.c rename to os/linux/ip_utils.c diff --git a/os/linux/tegra_hwpm_log.c b/os/linux/log.c similarity index 100% rename from os/linux/tegra_hwpm_log.c rename to os/linux/log.c