diff --git a/arch/nvgpu-common.yaml b/arch/nvgpu-common.yaml index 5ba1576b6..e06482eda 100644 --- a/arch/nvgpu-common.yaml +++ b/arch/nvgpu-common.yaml @@ -316,16 +316,7 @@ fifo: children: channel: safe: yes - # Note: the chip channel code should be moved to hal/fifo/. - sources: [ common/fifo/channel_gk20a.c, - common/fifo/channel_gk20a.h, - common/fifo/channel_gm20b.c, - common/fifo/channel_gm20b.h, - common/fifo/channel_gv100.c, - common/fifo/channel_gv100.h, - common/fifo/channel_gv11b.c, - common/fifo/channel_gv11b.h, - common/fifo/channel.c, + sources: [ common/fifo/channel.c, include/nvgpu/channel.h, include/nvgpu/error_notifier.h ] deps: [ ] diff --git a/arch/nvgpu-hal-new.yaml b/arch/nvgpu-hal-new.yaml index 392626ab2..642ea6133 100644 --- a/arch/nvgpu-hal-new.yaml +++ b/arch/nvgpu-hal-new.yaml @@ -158,7 +158,16 @@ fifo: hal/fifo/runlist_ram_gv11b.h, hal/fifo/runlist_ram_tu104.c, hal/fifo/runlist_ram_tu104.h ] - + channel: + safe: yes + sources: [ hal/fifo/channel_gk20a.c, + hal/fifo/channel_gk20a.h, + hal/fifo/channel_gm20b.c, + hal/fifo/channel_gm20b.h, + hal/fifo/channel_gv100.c, + hal/fifo/channel_gv100.h, + hal/fifo/channel_gv11b.c, + hal/fifo/channel_gv11b.h ] tsg: safe: yes sources: [ hal/fifo/tsg_gv11b.h, diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 8c272ad99..5d91b461f 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -308,6 +308,10 @@ nvgpu-y += \ hal/fifo/runlist_fifo_gv11b.o \ hal/fifo/runlist_fifo_gv100.o \ hal/fifo/runlist_fifo_tu104.o \ + hal/fifo/channel_gk20a.o \ + hal/fifo/channel_gm20b.o \ + hal/fifo/channel_gv11b.o \ + hal/fifo/channel_gv100.o \ hal/fifo/tsg_gk20a.o \ hal/fifo/tsg_gv11b.o \ hal/fifo/userd_gk20a.o \ @@ -554,10 +558,6 @@ nvgpu-y += \ common/fifo/submit.o \ common/fifo/tsg.o \ common/fifo/runlist.o \ - common/fifo/channel_gk20a.o \ - common/fifo/channel_gm20b.o \ - common/fifo/channel_gv11b.o \ - common/fifo/channel_gv100.o \ common/fifo/engine_status.o \ common/fifo/engines.o \ common/fifo/pbdma_status.o \ diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index 21c611257..80c660351 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -181,10 +181,6 @@ srcs += common/sim/sim.c \ common/fifo/submit.c \ common/fifo/tsg.c \ common/fifo/runlist.c \ - common/fifo/channel_gk20a.c \ - common/fifo/channel_gm20b.c \ - common/fifo/channel_gv11b.c \ - common/fifo/channel_gv100.c \ common/fifo/engine_status.c \ common/fifo/engines.c \ common/fifo/pbdma_status.c \ @@ -402,6 +398,10 @@ srcs += common/sim/sim.c \ hal/fifo/runlist_fifo_gv11b.c \ hal/fifo/runlist_fifo_gv100.c \ hal/fifo/runlist_fifo_tu104.c \ + hal/fifo/channel_gk20a.c \ + hal/fifo/channel_gm20b.c \ + hal/fifo/channel_gv11b.c \ + hal/fifo/channel_gv100.c \ hal/fifo/tsg_gk20a.c \ hal/fifo/tsg_gv11b.c \ hal/fifo/userd_gk20a.c \ diff --git a/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c index 083b3fb66..f9d452569 100644 --- a/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c @@ -76,7 +76,7 @@ #include "hal/init/hal_gp10b.h" #include "hal/init/hal_gp10b_litter.h" -#include "common/fifo/channel_gm20b.h" +#include "hal/fifo/channel_gm20b.h" #include "common/clk_arb/clk_arb_gp10b.h" #include "common/vgpu/fifo/fifo_vgpu.h" diff --git a/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c index beb95002b..872d25d46 100644 --- a/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c @@ -83,7 +83,7 @@ #include "hal/init/hal_gv11b.h" #include "hal/init/hal_gv11b_litter.h" -#include "common/fifo/channel_gv11b.h" +#include "hal/fifo/channel_gv11b.h" #include "common/clk_arb/clk_arb_gp10b.h" #include diff --git a/drivers/gpu/nvgpu/common/fifo/channel_gk20a.c b/drivers/gpu/nvgpu/hal/fifo/channel_gk20a.c similarity index 100% rename from drivers/gpu/nvgpu/common/fifo/channel_gk20a.c rename to drivers/gpu/nvgpu/hal/fifo/channel_gk20a.c diff --git a/drivers/gpu/nvgpu/common/fifo/channel_gk20a.h b/drivers/gpu/nvgpu/hal/fifo/channel_gk20a.h similarity index 100% rename from drivers/gpu/nvgpu/common/fifo/channel_gk20a.h rename to drivers/gpu/nvgpu/hal/fifo/channel_gk20a.h diff --git a/drivers/gpu/nvgpu/common/fifo/channel_gm20b.c b/drivers/gpu/nvgpu/hal/fifo/channel_gm20b.c similarity index 100% rename from drivers/gpu/nvgpu/common/fifo/channel_gm20b.c rename to drivers/gpu/nvgpu/hal/fifo/channel_gm20b.c diff --git a/drivers/gpu/nvgpu/common/fifo/channel_gm20b.h b/drivers/gpu/nvgpu/hal/fifo/channel_gm20b.h similarity index 100% rename from drivers/gpu/nvgpu/common/fifo/channel_gm20b.h rename to drivers/gpu/nvgpu/hal/fifo/channel_gm20b.h diff --git a/drivers/gpu/nvgpu/common/fifo/channel_gv100.c b/drivers/gpu/nvgpu/hal/fifo/channel_gv100.c similarity index 100% rename from drivers/gpu/nvgpu/common/fifo/channel_gv100.c rename to drivers/gpu/nvgpu/hal/fifo/channel_gv100.c diff --git a/drivers/gpu/nvgpu/common/fifo/channel_gv100.h b/drivers/gpu/nvgpu/hal/fifo/channel_gv100.h similarity index 100% rename from drivers/gpu/nvgpu/common/fifo/channel_gv100.h rename to drivers/gpu/nvgpu/hal/fifo/channel_gv100.h diff --git a/drivers/gpu/nvgpu/common/fifo/channel_gv11b.c b/drivers/gpu/nvgpu/hal/fifo/channel_gv11b.c similarity index 100% rename from drivers/gpu/nvgpu/common/fifo/channel_gv11b.c rename to drivers/gpu/nvgpu/hal/fifo/channel_gv11b.c diff --git a/drivers/gpu/nvgpu/common/fifo/channel_gv11b.h b/drivers/gpu/nvgpu/hal/fifo/channel_gv11b.h similarity index 100% rename from drivers/gpu/nvgpu/common/fifo/channel_gv11b.h rename to drivers/gpu/nvgpu/hal/fifo/channel_gv11b.h diff --git a/drivers/gpu/nvgpu/hal/init/hal_gm20b.c b/drivers/gpu/nvgpu/hal/init/hal_gm20b.c index 593a8d8c3..05f09dcc3 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_gm20b.c +++ b/drivers/gpu/nvgpu/hal/init/hal_gm20b.c @@ -99,8 +99,8 @@ #include "hal/top/top_gm20b.h" #include "hal/clk/clk_gm20b.h" -#include "common/fifo/channel_gk20a.h" -#include "common/fifo/channel_gm20b.h" +#include "hal/fifo/channel_gk20a.h" +#include "hal/fifo/channel_gm20b.h" #include "common/pmu/pg/pg_sw_gm20b.h" #include "hal_gm20b.h" diff --git a/drivers/gpu/nvgpu/hal/init/hal_gp10b.c b/drivers/gpu/nvgpu/hal/init/hal_gp10b.c index 20c449526..664468bea 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_gp10b.c +++ b/drivers/gpu/nvgpu/hal/init/hal_gp10b.c @@ -122,8 +122,8 @@ #include "common/pmu/pg/pg_sw_gm20b.h" #include "common/pmu/pg/pg_sw_gp10b.h" -#include "common/fifo/channel_gk20a.h" -#include "common/fifo/channel_gm20b.h" +#include "hal/fifo/channel_gk20a.h" +#include "hal/fifo/channel_gm20b.h" #include "common/clk_arb/clk_arb_gp10b.h" #include "hal_gp10b.h" diff --git a/drivers/gpu/nvgpu/hal/init/hal_gv100.c b/drivers/gpu/nvgpu/hal/init/hal_gv100.c index 149365820..fd1ec7aca 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_gv100.c +++ b/drivers/gpu/nvgpu/hal/init/hal_gv100.c @@ -148,10 +148,10 @@ #include "hal/nvlink/link_mode_transitions_gv100.h" #include "common/nvlink/nvlink_gv100.h" #include "common/pmu/perf/perf_gv100.h" -#include "common/fifo/channel_gk20a.h" -#include "common/fifo/channel_gm20b.h" -#include "common/fifo/channel_gv11b.h" -#include "common/fifo/channel_gv100.h" +#include "hal/fifo/channel_gk20a.h" +#include "hal/fifo/channel_gm20b.h" +#include "hal/fifo/channel_gv11b.h" +#include "hal/fifo/channel_gv100.h" #include "common/vbios/bios_sw_gp106.h" #include "common/vbios/bios_sw_gv100.h" diff --git a/drivers/gpu/nvgpu/hal/init/hal_gv11b.c b/drivers/gpu/nvgpu/hal/init/hal_gv11b.c index bc6bbc77a..9bf517d05 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_gv11b.c +++ b/drivers/gpu/nvgpu/hal/init/hal_gv11b.c @@ -139,9 +139,9 @@ #include "common/pmu/pg/pg_sw_gm20b.h" #include "common/pmu/pg/pg_sw_gp106.h" #include "common/pmu/pg/pg_sw_gv11b.h" -#include "common/fifo/channel_gk20a.h" -#include "common/fifo/channel_gm20b.h" -#include "common/fifo/channel_gv11b.h" +#include "hal/fifo/channel_gk20a.h" +#include "hal/fifo/channel_gm20b.h" +#include "hal/fifo/channel_gv11b.h" #include "common/clk_arb/clk_arb_gp10b.h" #include "hal_gv11b.h" diff --git a/drivers/gpu/nvgpu/hal/init/hal_tu104.c b/drivers/gpu/nvgpu/hal/init/hal_tu104.c index 611d2ff52..64bd11f06 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_tu104.c +++ b/drivers/gpu/nvgpu/hal/init/hal_tu104.c @@ -166,10 +166,10 @@ #include "hal/nvlink/link_mode_transitions_tu104.h" #include "common/nvlink/nvlink_gv100.h" #include "common/nvlink/nvlink_tu104.h" -#include "common/fifo/channel_gk20a.h" -#include "common/fifo/channel_gm20b.h" -#include "common/fifo/channel_gv11b.h" -#include "common/fifo/channel_gv100.h" +#include "hal/fifo/channel_gk20a.h" +#include "hal/fifo/channel_gm20b.h" +#include "hal/fifo/channel_gv11b.h" +#include "hal/fifo/channel_gv100.h" #include "common/clk_arb/clk_arb_gv100.h" #include "hal/clk/clk_gv100.h" diff --git a/userspace/units/mm/page_table_faults/page_table_faults.c b/userspace/units/mm/page_table_faults/page_table_faults.c index b8f460c76..831149ba6 100644 --- a/userspace/units/mm/page_table_faults/page_table_faults.c +++ b/userspace/units/mm/page_table_faults/page_table_faults.c @@ -35,7 +35,7 @@ #include #include #include "os/posix/os_posix.h" -#include "common/fifo/channel_gv11b.h" +#include "hal/fifo/channel_gv11b.h" #include "hal/mm/mmu_fault/mmu_fault_gv11b.h" #include "hal/mm/mm_gv11b.h"