diff --git a/Makefile.umbrella.tmk b/Makefile.umbrella.tmk index 3fa6acb2b..1d7e3590c 100644 --- a/Makefile.umbrella.tmk +++ b/Makefile.umbrella.tmk @@ -22,12 +22,13 @@ NV_REPOSITORY_COMPONENTS := ifneq ($(NV_BUILD_CONFIGURATION_OS_IS_INTEGRITY),1) NV_REPOSITORY_COMPONENTS := drivers/gpu/nvgpu NV_REPOSITORY_COMPONENTS += userspace -NV_REPOSITORY_COMPONENTS += userspace/units/posix-bitops -NV_REPOSITORY_COMPONENTS += userspace/units/posix-env -NV_REPOSITORY_COMPONENTS += userspace/units/posix-mockio -NV_REPOSITORY_COMPONENTS += userspace/units/posix-fault-injection -NV_REPOSITORY_COMPONENTS += userspace/units/nvgpu-pramin +NV_REPOSITORY_COMPONENTS += userspace/units/posix/bitops +NV_REPOSITORY_COMPONENTS += userspace/units/posix/env +NV_REPOSITORY_COMPONENTS += userspace/units/posix/mockio +NV_REPOSITORY_COMPONENTS += userspace/units/posix/fault-injection +NV_REPOSITORY_COMPONENTS += userspace/units/pramin NV_REPOSITORY_COMPONENTS += userspace/units/mm/nvgpu_allocator +NV_REPOSITORY_COMPONENTS += userspace/units/fifo/runlist endif # Local Variables: diff --git a/drivers/gpu/nvgpu/libnvgpu-drv.export b/drivers/gpu/nvgpu/libnvgpu-drv.export index 0189eabd3..122247493 100644 --- a/drivers/gpu/nvgpu/libnvgpu-drv.export +++ b/drivers/gpu/nvgpu/libnvgpu-drv.export @@ -15,6 +15,8 @@ find_first_bit find_first_zero_bit find_next_bit gk20a_bus_set_bar0_window +gk20a_get_ch_runlist_entry +gk20a_get_tsg_runlist_entry nvgpu_alloc nvgpu_alloc_base nvgpu_alloc_common_init @@ -60,6 +62,8 @@ nvgpu_pramin_memset nvgpu_pramin_rd_n nvgpu_pramin_wr_n nvgpu_readl +nvgpu_runlist_construct_locked +nvgpu_rwsem_init nvgpu_sgt_create_from_mem nvgpu_usermode_writel nvgpu_writel diff --git a/userspace/Makefile.sources b/userspace/Makefile.sources index 5c561de52..f3371a968 100644 --- a/userspace/Makefile.sources +++ b/userspace/Makefile.sources @@ -47,13 +47,13 @@ CORE_HEADERS := \ # Each directory under the UNIT_SRC directory should correspond to one module. UNITS := \ - $(UNIT_SRC)/posix-env \ - $(UNIT_SRC)/posix-bitops \ - $(UNIT_SRC)/posix-mockio \ - $(UNIT_SRC)/posix-fault-injection \ - $(UNIT_SRC)/nvgpu-pramin \ + $(UNIT_SRC)/posix/env \ + $(UNIT_SRC)/posix/bitops \ + $(UNIT_SRC)/posix/mockio \ + $(UNIT_SRC)/posix/fault-injection \ + $(UNIT_SRC)/pramin \ $(UNIT_SRC)/mm/nvgpu_allocator \ - $(UNIT_SRC)/fifo/nvgpu-runlist \ + $(UNIT_SRC)/fifo/runlist \ $(UNIT_SRC)/list # A test unit. Not really needed any more... diff --git a/userspace/units/fifo/nvgpu-runlist/Makefile b/userspace/units/fifo/runlist/Makefile similarity index 100% rename from userspace/units/fifo/nvgpu-runlist/Makefile rename to userspace/units/fifo/runlist/Makefile diff --git a/userspace/units/fifo/nvgpu-runlist/Makefile.interface.tmk b/userspace/units/fifo/runlist/Makefile.interface.tmk similarity index 100% rename from userspace/units/fifo/nvgpu-runlist/Makefile.interface.tmk rename to userspace/units/fifo/runlist/Makefile.interface.tmk diff --git a/userspace/units/fifo/nvgpu-runlist/Makefile.tmk b/userspace/units/fifo/runlist/Makefile.tmk similarity index 100% rename from userspace/units/fifo/nvgpu-runlist/Makefile.tmk rename to userspace/units/fifo/runlist/Makefile.tmk diff --git a/userspace/units/fifo/nvgpu-runlist/nvgpu-runlist.c b/userspace/units/fifo/runlist/nvgpu-runlist.c similarity index 100% rename from userspace/units/fifo/nvgpu-runlist/nvgpu-runlist.c rename to userspace/units/fifo/runlist/nvgpu-runlist.c diff --git a/userspace/units/posix-bitops/Makefile b/userspace/units/posix/bitops/Makefile similarity index 97% rename from userspace/units/posix-bitops/Makefile rename to userspace/units/posix/bitops/Makefile index 1b4d091e7..3b813cce5 100644 --- a/userspace/units/posix-bitops/Makefile +++ b/userspace/units/posix/bitops/Makefile @@ -23,4 +23,4 @@ OBJS = posix-bitops.o MODULE = posix-bitops -include ../Makefile.units +include ../../Makefile.units diff --git a/userspace/units/posix-bitops/Makefile.interface.tmk b/userspace/units/posix/bitops/Makefile.interface.tmk similarity index 91% rename from userspace/units/posix-bitops/Makefile.interface.tmk rename to userspace/units/posix/bitops/Makefile.interface.tmk index 4e3e56824..8f652e546 100644 --- a/userspace/units/posix-bitops/Makefile.interface.tmk +++ b/userspace/units/posix/bitops/Makefile.interface.tmk @@ -14,7 +14,7 @@ NVGPU_UNIT_NAME=posix-bitops -include $(NV_COMPONENT_DIR)/../Makefile.units.common.interface.tmk +include $(NV_COMPONENT_DIR)/../../Makefile.units.common.interface.tmk # Local Variables: # indent-tabs-mode: t diff --git a/userspace/units/posix-bitops/Makefile.tmk b/userspace/units/posix/bitops/Makefile.tmk similarity index 92% rename from userspace/units/posix-bitops/Makefile.tmk rename to userspace/units/posix/bitops/Makefile.tmk index 94683a9a9..a5ae82516 100644 --- a/userspace/units/posix-bitops/Makefile.tmk +++ b/userspace/units/posix/bitops/Makefile.tmk @@ -14,7 +14,7 @@ NVGPU_UNIT_NAME=posix-bitops -include $(NV_COMPONENT_DIR)/../Makefile.units.common.tmk +include $(NV_COMPONENT_DIR)/../../Makefile.units.common.tmk # Local Variables: # indent-tabs-mode: t diff --git a/userspace/units/posix-bitops/posix-bitops.c b/userspace/units/posix/bitops/posix-bitops.c similarity index 100% rename from userspace/units/posix-bitops/posix-bitops.c rename to userspace/units/posix/bitops/posix-bitops.c diff --git a/userspace/units/posix-env/Makefile b/userspace/units/posix/env/Makefile similarity index 97% rename from userspace/units/posix-env/Makefile rename to userspace/units/posix/env/Makefile index c693813ec..20bb734ca 100644 --- a/userspace/units/posix-env/Makefile +++ b/userspace/units/posix/env/Makefile @@ -23,4 +23,4 @@ OBJS = posix-env.o MODULE = posix-env -include ../Makefile.units +include ../../Makefile.units diff --git a/userspace/units/posix-env/Makefile.interface.tmk b/userspace/units/posix/env/Makefile.interface.tmk similarity index 91% rename from userspace/units/posix-env/Makefile.interface.tmk rename to userspace/units/posix/env/Makefile.interface.tmk index 11a80dd7d..3eb3009fa 100644 --- a/userspace/units/posix-env/Makefile.interface.tmk +++ b/userspace/units/posix/env/Makefile.interface.tmk @@ -14,7 +14,7 @@ NVGPU_UNIT_NAME=posix-env -include $(NV_COMPONENT_DIR)/../Makefile.units.common.interface.tmk +include $(NV_COMPONENT_DIR)/../../Makefile.units.common.interface.tmk # Local Variables: # indent-tabs-mode: t diff --git a/userspace/units/posix-env/Makefile.tmk b/userspace/units/posix/env/Makefile.tmk similarity index 92% rename from userspace/units/posix-env/Makefile.tmk rename to userspace/units/posix/env/Makefile.tmk index af6e24060..ee3283708 100644 --- a/userspace/units/posix-env/Makefile.tmk +++ b/userspace/units/posix/env/Makefile.tmk @@ -14,7 +14,7 @@ NVGPU_UNIT_NAME=posix-env -include $(NV_COMPONENT_DIR)/../Makefile.units.common.tmk +include $(NV_COMPONENT_DIR)/../../Makefile.units.common.tmk # Local Variables: # indent-tabs-mode: t diff --git a/userspace/units/posix-env/posix-env.c b/userspace/units/posix/env/posix-env.c similarity index 100% rename from userspace/units/posix-env/posix-env.c rename to userspace/units/posix/env/posix-env.c diff --git a/userspace/units/posix-fault-injection/Makefile b/userspace/units/posix/fault-injection/Makefile similarity index 97% rename from userspace/units/posix-fault-injection/Makefile rename to userspace/units/posix/fault-injection/Makefile index 391bb7d52..0aafca582 100644 --- a/userspace/units/posix-fault-injection/Makefile +++ b/userspace/units/posix/fault-injection/Makefile @@ -25,4 +25,4 @@ OBJS = posix-fault-injection.o \ posix-fault-injection-dma-alloc.o MODULE = posix-fault-injection -include ../Makefile.units +include ../../Makefile.units diff --git a/userspace/units/posix-fault-injection/Makefile.interface.tmk b/userspace/units/posix/fault-injection/Makefile.interface.tmk similarity index 91% rename from userspace/units/posix-fault-injection/Makefile.interface.tmk rename to userspace/units/posix/fault-injection/Makefile.interface.tmk index 962156267..53bd1224c 100644 --- a/userspace/units/posix-fault-injection/Makefile.interface.tmk +++ b/userspace/units/posix/fault-injection/Makefile.interface.tmk @@ -14,7 +14,7 @@ NVGPU_UNIT_NAME=posix-fault-injection -include $(NV_COMPONENT_DIR)/../Makefile.units.common.interface.tmk +include $(NV_COMPONENT_DIR)/../../Makefile.units.common.interface.tmk # Local Variables: # indent-tabs-mode: t diff --git a/userspace/units/posix-fault-injection/Makefile.tmk b/userspace/units/posix/fault-injection/Makefile.tmk similarity index 93% rename from userspace/units/posix-fault-injection/Makefile.tmk rename to userspace/units/posix/fault-injection/Makefile.tmk index e2c92f2a3..327622e6f 100644 --- a/userspace/units/posix-fault-injection/Makefile.tmk +++ b/userspace/units/posix/fault-injection/Makefile.tmk @@ -17,7 +17,7 @@ NVGPU_UNIT_SRCS=posix-fault-injection.c \ posix-fault-injection-kmem.c \ posix-fault-injection-dma-alloc.c -include $(NV_COMPONENT_DIR)/../Makefile.units.common.tmk +include $(NV_COMPONENT_DIR)/../../Makefile.units.common.tmk # Local Variables: # indent-tabs-mode: t diff --git a/userspace/units/posix-fault-injection/posix-fault-injection-dma-alloc.c b/userspace/units/posix/fault-injection/posix-fault-injection-dma-alloc.c similarity index 99% rename from userspace/units/posix-fault-injection/posix-fault-injection-dma-alloc.c rename to userspace/units/posix/fault-injection/posix-fault-injection-dma-alloc.c index 8c91fe9d3..f7c0e066e 100644 --- a/userspace/units/posix-fault-injection/posix-fault-injection-dma-alloc.c +++ b/userspace/units/posix/fault-injection/posix-fault-injection-dma-alloc.c @@ -26,6 +26,7 @@ #include #include #include + #include "posix-fault-injection-dma-alloc.h" #define TEST_DEFAULT_SIZE 4096 diff --git a/userspace/units/posix-fault-injection/posix-fault-injection-dma-alloc.h b/userspace/units/posix/fault-injection/posix-fault-injection-dma-alloc.h similarity index 100% rename from userspace/units/posix-fault-injection/posix-fault-injection-dma-alloc.h rename to userspace/units/posix/fault-injection/posix-fault-injection-dma-alloc.h diff --git a/userspace/units/posix-fault-injection/posix-fault-injection-kmem.c b/userspace/units/posix/fault-injection/posix-fault-injection-kmem.c similarity index 100% rename from userspace/units/posix-fault-injection/posix-fault-injection-kmem.c rename to userspace/units/posix/fault-injection/posix-fault-injection-kmem.c diff --git a/userspace/units/posix-fault-injection/posix-fault-injection-kmem.h b/userspace/units/posix/fault-injection/posix-fault-injection-kmem.h similarity index 100% rename from userspace/units/posix-fault-injection/posix-fault-injection-kmem.h rename to userspace/units/posix/fault-injection/posix-fault-injection-kmem.h diff --git a/userspace/units/posix-fault-injection/posix-fault-injection.c b/userspace/units/posix/fault-injection/posix-fault-injection.c similarity index 100% rename from userspace/units/posix-fault-injection/posix-fault-injection.c rename to userspace/units/posix/fault-injection/posix-fault-injection.c diff --git a/userspace/units/posix-mockio/Makefile b/userspace/units/posix/mockio/Makefile similarity index 97% rename from userspace/units/posix-mockio/Makefile rename to userspace/units/posix/mockio/Makefile index f247ad0f1..aeb5e623e 100644 --- a/userspace/units/posix-mockio/Makefile +++ b/userspace/units/posix/mockio/Makefile @@ -23,4 +23,4 @@ OBJS = posix-mockio.o MODULE = posix-mockio -include ../Makefile.units +include ../../Makefile.units diff --git a/userspace/units/posix-mockio/Makefile.interface.tmk b/userspace/units/posix/mockio/Makefile.interface.tmk similarity index 91% rename from userspace/units/posix-mockio/Makefile.interface.tmk rename to userspace/units/posix/mockio/Makefile.interface.tmk index 2d42ffdc0..9f9486a98 100644 --- a/userspace/units/posix-mockio/Makefile.interface.tmk +++ b/userspace/units/posix/mockio/Makefile.interface.tmk @@ -14,7 +14,7 @@ NVGPU_UNIT_NAME=posix-mockio -include $(NV_COMPONENT_DIR)/../Makefile.units.common.interface.tmk +include $(NV_COMPONENT_DIR)/../../Makefile.units.common.interface.tmk # Local Variables: # indent-tabs-mode: t diff --git a/userspace/units/posix-mockio/Makefile.tmk b/userspace/units/posix/mockio/Makefile.tmk similarity index 92% rename from userspace/units/posix-mockio/Makefile.tmk rename to userspace/units/posix/mockio/Makefile.tmk index d90e568d3..169b07994 100644 --- a/userspace/units/posix-mockio/Makefile.tmk +++ b/userspace/units/posix/mockio/Makefile.tmk @@ -14,7 +14,7 @@ NVGPU_UNIT_NAME=posix-mockio -include $(NV_COMPONENT_DIR)/../Makefile.units.common.tmk +include $(NV_COMPONENT_DIR)/../../Makefile.units.common.tmk # Local Variables: # indent-tabs-mode: t diff --git a/userspace/units/posix-mockio/posix-mockio.c b/userspace/units/posix/mockio/posix-mockio.c similarity index 100% rename from userspace/units/posix-mockio/posix-mockio.c rename to userspace/units/posix/mockio/posix-mockio.c diff --git a/userspace/units/nvgpu-pramin/Makefile b/userspace/units/pramin/Makefile similarity index 100% rename from userspace/units/nvgpu-pramin/Makefile rename to userspace/units/pramin/Makefile diff --git a/userspace/units/nvgpu-pramin/Makefile.interface.tmk b/userspace/units/pramin/Makefile.interface.tmk similarity index 100% rename from userspace/units/nvgpu-pramin/Makefile.interface.tmk rename to userspace/units/pramin/Makefile.interface.tmk diff --git a/userspace/units/nvgpu-pramin/Makefile.tmk b/userspace/units/pramin/Makefile.tmk similarity index 100% rename from userspace/units/nvgpu-pramin/Makefile.tmk rename to userspace/units/pramin/Makefile.tmk diff --git a/userspace/units/nvgpu-pramin/nvgpu-pramin.c b/userspace/units/pramin/nvgpu-pramin.c similarity index 100% rename from userspace/units/nvgpu-pramin/nvgpu-pramin.c rename to userspace/units/pramin/nvgpu-pramin.c