Messages in this thread Patch in this message | | | From | Oded Gabbay <> | Subject | [PATCH 1/4] habanalabs: separate common code to dedicated folders | Date | Sun, 3 Jan 2021 22:29:06 +0200 |
| |
From: Ofir Bitton <obitton@habana.ai>
We separate some of the common code source files to different folders for a better maintainability and testability.
Signed-off-by: Ofir Bitton <obitton@habana.ai> Reviewed-by: Oded Gabbay <ogabbay@kernel.org> Signed-off-by: Oded Gabbay <ogabbay@kernel.org> --- drivers/misc/habanalabs/common/Makefile | 10 ++++++++-- drivers/misc/habanalabs/common/mmu/Makefile | 2 ++ drivers/misc/habanalabs/common/{ => mmu}/mmu.c | 2 +- drivers/misc/habanalabs/common/{ => mmu}/mmu_v1.c | 4 ++-- drivers/misc/habanalabs/common/pci/Makefile | 2 ++ drivers/misc/habanalabs/common/{ => pci}/pci.c | 4 ++-- 6 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 drivers/misc/habanalabs/common/mmu/Makefile rename drivers/misc/habanalabs/common/{ => mmu}/mmu.c (99%) rename drivers/misc/habanalabs/common/{ => mmu}/mmu_v1.c (99%) create mode 100644 drivers/misc/habanalabs/common/pci/Makefile rename drivers/misc/habanalabs/common/{ => pci}/pci.c (99%)
diff --git a/drivers/misc/habanalabs/common/Makefile b/drivers/misc/habanalabs/common/Makefile index eccd8c7dc62d..5d8b48288cf4 100644 --- a/drivers/misc/habanalabs/common/Makefile +++ b/drivers/misc/habanalabs/common/Makefile @@ -1,7 +1,13 @@ # SPDX-License-Identifier: GPL-2.0-only + +include $(src)/common/mmu/Makefile +habanalabs-y += $(HL_COMMON_MMU_FILES) + +include $(src)/common/pci/Makefile +habanalabs-y += $(HL_COMMON_PCI_FILES) + HL_COMMON_FILES := common/habanalabs_drv.o common/device.o common/context.o \ common/asid.o common/habanalabs_ioctl.o \ common/command_buffer.o common/hw_queue.o common/irq.o \ common/sysfs.o common/hwmon.o common/memory.o \ - common/command_submission.o common/mmu.o common/mmu_v1.o \ - common/firmware_if.o common/pci.o + common/command_submission.o common/firmware_if.o diff --git a/drivers/misc/habanalabs/common/mmu/Makefile b/drivers/misc/habanalabs/common/mmu/Makefile new file mode 100644 index 000000000000..d852c3874658 --- /dev/null +++ b/drivers/misc/habanalabs/common/mmu/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +HL_COMMON_MMU_FILES := common/mmu/mmu.o common/mmu/mmu_v1.o diff --git a/drivers/misc/habanalabs/common/mmu.c b/drivers/misc/habanalabs/common/mmu/mmu.c similarity index 99% rename from drivers/misc/habanalabs/common/mmu.c rename to drivers/misc/habanalabs/common/mmu/mmu.c index ec11111aee8a..105d556e3028 100644 --- a/drivers/misc/habanalabs/common/mmu.c +++ b/drivers/misc/habanalabs/common/mmu/mmu.c @@ -7,7 +7,7 @@ #include <linux/slab.h> -#include "habanalabs.h" +#include "../habanalabs.h" static bool is_dram_va(struct hl_device *hdev, u64 virt_addr) { diff --git a/drivers/misc/habanalabs/common/mmu_v1.c b/drivers/misc/habanalabs/common/mmu/mmu_v1.c similarity index 99% rename from drivers/misc/habanalabs/common/mmu_v1.c rename to drivers/misc/habanalabs/common/mmu/mmu_v1.c index 2ce6ea89d4fa..9d37ac9bf316 100644 --- a/drivers/misc/habanalabs/common/mmu_v1.c +++ b/drivers/misc/habanalabs/common/mmu/mmu_v1.c @@ -5,8 +5,8 @@ * All Rights Reserved. */ -#include "habanalabs.h" -#include "../include/hw_ip/mmu/mmu_general.h" +#include "../habanalabs.h" +#include "../../include/hw_ip/mmu/mmu_general.h" #include <linux/slab.h> diff --git a/drivers/misc/habanalabs/common/pci/Makefile b/drivers/misc/habanalabs/common/pci/Makefile new file mode 100644 index 000000000000..dc922a686683 --- /dev/null +++ b/drivers/misc/habanalabs/common/pci/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +HL_COMMON_PCI_FILES := common/pci/pci.o diff --git a/drivers/misc/habanalabs/common/pci.c b/drivers/misc/habanalabs/common/pci/pci.c similarity index 99% rename from drivers/misc/habanalabs/common/pci.c rename to drivers/misc/habanalabs/common/pci/pci.c index b4725e6101f6..c56ec1574127 100644 --- a/drivers/misc/habanalabs/common/pci.c +++ b/drivers/misc/habanalabs/common/pci/pci.c @@ -5,8 +5,8 @@ * All Rights Reserved. */ -#include "habanalabs.h" -#include "../include/hw_ip/pci/pci_general.h" +#include "../habanalabs.h" +#include "../../include/hw_ip/pci/pci_general.h" #include <linux/pci.h> -- 2.25.1
| |