Skip to content

Commit 7b16a15

Browse files
gregkhgregkh
committed
habanalabs: fix up absolute include instructions
There's no need to try to be cute with the include file locations in the Makefile, so just specify exactly where the files are. Bonus is this fixes the problem of building with O= as well as trying to just build the subdirectory alone. Reported-by: Stephen Rothwell <[email protected]> Cc: Oded Gabbay <[email protected]> Cc: Omer Shpigelman <[email protected]> Cc: Tomer Tayar <[email protected]> Cc: Moti Haimovski <[email protected]> Cc: Ofir Bitton <[email protected]> Cc: Ben Segal <[email protected]> Cc: Christine Gharzuzi <[email protected]> Cc: Pawel Piskorski <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 65a9bde commit 7b16a15

File tree

18 files changed

+37
-43
lines changed

18 files changed

+37
-43
lines changed

‎drivers/misc/habanalabs/common/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2-
subdir-ccflags-y += -I$(src)/common
3-
42
HL_COMMON_FILES := common/habanalabs_drv.o common/device.o common/context.o \
53
common/asid.o common/habanalabs_ioctl.o \
64
common/command_buffer.o common/hw_queue.o common/irq.o \

‎drivers/misc/habanalabs/common/debugfs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
#include "habanalabs.h"
9-
#include "include/hw_ip/mmu/mmu_general.h"
9+
#include "../include/hw_ip/mmu/mmu_general.h"
1010

1111
#include <linux/pci.h>
1212
#include <linux/debugfs.h>

‎drivers/misc/habanalabs/common/firmware_if.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
#include "habanalabs.h"
9-
#include "include/common/hl_boot_if.h"
9+
#include "../include/common/hl_boot_if.h"
1010

1111
#include <linux/firmware.h>
1212
#include <linux/genalloc.h>

‎drivers/misc/habanalabs/common/habanalabs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
#ifndef HABANALABSP_H_
99
#define HABANALABSP_H_
1010

11-
#include "include/common/armcp_if.h"
12-
#include "include/common/qman_if.h"
11+
#include "../include/common/armcp_if.h"
12+
#include "../include/common/qman_if.h"
1313
#include <uapi/misc/habanalabs.h>
1414

1515
#include <linux/cdev.h>

‎drivers/misc/habanalabs/common/memory.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include <uapi/misc/habanalabs.h>
99
#include "habanalabs.h"
10-
#include "include/hw_ip/mmu/mmu_general.h"
10+
#include "../include/hw_ip/mmu/mmu_general.h"
1111

1212
#include <linux/uaccess.h>
1313
#include <linux/slab.h>

‎drivers/misc/habanalabs/common/mmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
#include "habanalabs.h"
9-
#include "include/hw_ip/mmu/mmu_general.h"
9+
#include "../include/hw_ip/mmu/mmu_general.h"
1010

1111
#include <linux/genalloc.h>
1212
#include <linux/slab.h>

‎drivers/misc/habanalabs/common/pci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
#include "habanalabs.h"
9-
#include "include/hw_ip/pci/pci_general.h"
9+
#include "../include/hw_ip/pci/pci_general.h"
1010

1111
#include <linux/pci.h>
1212
#include <linux/bitfield.h>

‎drivers/misc/habanalabs/gaudi/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2-
subdir-ccflags-y += -I$(src)/common
3-
42
HL_GAUDI_FILES := gaudi/gaudi.o gaudi/gaudi_hwmgr.o gaudi/gaudi_security.o \
53
gaudi/gaudi_coresight.o

‎drivers/misc/habanalabs/gaudi/gaudi.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
*/
77

88
#include "gaudiP.h"
9-
#include "include/hw_ip/mmu/mmu_general.h"
10-
#include "include/hw_ip/mmu/mmu_v1_1.h"
11-
#include "include/gaudi/gaudi_masks.h"
12-
#include "include/gaudi/gaudi_fw_if.h"
13-
#include "include/gaudi/gaudi_reg_map.h"
14-
#include "include/gaudi/gaudi_async_ids_map_extended.h"
9+
#include "../include/hw_ip/mmu/mmu_general.h"
10+
#include "../include/hw_ip/mmu/mmu_v1_1.h"
11+
#include "../include/gaudi/gaudi_masks.h"
12+
#include "../include/gaudi/gaudi_fw_if.h"
13+
#include "../include/gaudi/gaudi_reg_map.h"
14+
#include "../include/gaudi/gaudi_async_ids_map_extended.h"
1515

1616
#include <linux/module.h>
1717
#include <linux/pci.h>

‎drivers/misc/habanalabs/gaudi/gaudiP.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
#define GAUDIP_H_
1010

1111
#include <uapi/misc/habanalabs.h>
12-
#include "habanalabs.h"
13-
#include "include/common/hl_boot_if.h"
14-
#include "include/gaudi/gaudi_packets.h"
15-
#include "include/gaudi/gaudi.h"
16-
#include "include/gaudi/gaudi_async_events.h"
12+
#include "../common/habanalabs.h"
13+
#include "../include/common/hl_boot_if.h"
14+
#include "../include/gaudi/gaudi_packets.h"
15+
#include "../include/gaudi/gaudi.h"
16+
#include "../include/gaudi/gaudi_async_events.h"
1717

1818
#define NUMBER_OF_EXT_HW_QUEUES 12
1919
#define NUMBER_OF_CMPLT_QUEUES NUMBER_OF_EXT_HW_QUEUES

0 commit comments

Comments
 (0)