Commit 82629c71 authored by Oded Gabbay's avatar Oded Gabbay
Browse files

habanalabs: rename enum vm_type_t to vm_type 



We don't use typedefs so the enum name shouldn't end with _t

Signed-off-by: default avatarOded Gabbay <ogabbay@kernel.org>
parent c67b0579

drivers/misc/habanalabs/common/debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ static int vm_show(struct seq_file *s, void *data) 
	struct hl_vm_hash_node *hnode;

	struct hl_userptr *userptr;

	struct hl_vm_phys_pg_pack *phys_pg_pack = NULL;

	enum vm_type_t *vm_type;

	enum vm_type *vm_type;

	bool once = true;

	u64 j;

	int i;
@@ -492,7 +492,7 @@ static int device_va_to_pa(struct hl_device *hdev, u64 virt_addr, u32 size, 
	struct hl_ctx *ctx = hdev->compute_ctx;

	struct hl_vm_hash_node *hnode;

	struct hl_userptr *userptr;

	enum vm_type_t *vm_type;

	enum vm_type *vm_type;

	bool valid = false;

	u64 end_address;

	u32 range_size;

drivers/misc/habanalabs/common/habanalabs.h

+4 −4
Original line number Diff line number Diff line
@@ -317,11 +317,11 @@ struct hw_queue_properties { 
};



/**

 * enum vm_type_t - virtual memory mapping request information.

 * enum vm_type - virtual memory mapping request information.

 * @VM_TYPE_USERPTR: mapping of user memory to device virtual address.

 * @VM_TYPE_PHYS_PACK: mapping of DRAM memory to device virtual address.

 */

enum vm_type_t {

enum vm_type {

	VM_TYPE_USERPTR = 0x1,

	VM_TYPE_PHYS_PACK = 0x2

};
@@ -1421,7 +1421,7 @@ struct hl_ctx_mgr { 
 * @dma_mapped: true if the SG was mapped to DMA addresses, false otherwise.

 */

struct hl_userptr {

	enum vm_type_t		vm_type; /* must be first */

	enum vm_type		vm_type; /* must be first */

	struct list_head	job_node;

	struct page		**pages;

	unsigned int		npages;
@@ -1635,7 +1635,7 @@ struct hl_vm_hw_block_list_node { 
 * @created_from_userptr: is product of host virtual address.

 */

struct hl_vm_phys_pg_pack {

	enum vm_type_t		vm_type; /* must be first */

	enum vm_type		vm_type; /* must be first */

	u64			*pages;

	u64			npages;

	u64			total_size;

drivers/misc/habanalabs/common/memory.c

+6 −8
Original line number Diff line number Diff line
@@ -607,8 +607,7 @@ static u64 get_va_block(struct hl_device *hdev, 
			do_div(tmp_hint_addr, va_range->page_size))) {



		if (force_hint) {

			/* Hint must be repected, so here we just fail.

			 */

			/* Hint must be respected, so here we just fail */

			dev_err(hdev->dev,

				"Hint address 0x%llx is not page aligned - cannot be respected\n",

				hint_addr);
@@ -1067,7 +1066,7 @@ static int map_device_va(struct hl_ctx *ctx, struct hl_mem_in *args, 
	struct hl_userptr *userptr = NULL;

	struct hl_vm_hash_node *hnode;

	struct hl_va_range *va_range;

	enum vm_type_t *vm_type;

	enum vm_type *vm_type;

	u64 ret_vaddr, hint_addr;

	u32 handle = 0, va_block_align;

	int rc;
@@ -1098,7 +1097,7 @@ static int map_device_va(struct hl_ctx *ctx, struct hl_mem_in *args, 
			goto init_page_pack_err;

		}



		vm_type = (enum vm_type_t *) userptr;

		vm_type = (enum vm_type *) userptr;

		hint_addr = args->map_host.hint_addr;

		handle = phys_pg_pack->handle;
@@ -1140,7 +1139,7 @@ static int map_device_va(struct hl_ctx *ctx, struct hl_mem_in *args, 


		spin_unlock(&vm->idr_lock);



		vm_type = (enum vm_type_t *) phys_pg_pack;

		vm_type = (enum vm_type *) phys_pg_pack;



		hint_addr = args->map_device.hint_addr;
@@ -1171,8 +1170,7 @@ static int map_device_va(struct hl_ctx *ctx, struct hl_mem_in *args, 


	if (hint_addr && phys_pg_pack->offset) {

		if (args->flags & HL_MEM_FORCE_HINT) {

			/* If hint must be repected, since we can't - just fail.

			 */

			/* Fail if hint must be respected but it can't be */

			dev_err(hdev->dev,

				"Hint address 0x%llx cannot be respected because source memory is not aligned 0x%x\n",

				hint_addr, phys_pg_pack->offset);
@@ -1273,7 +1271,7 @@ static int unmap_device_va(struct hl_ctx *ctx, struct hl_mem_in *args, 
	struct hl_userptr *userptr = NULL;

	struct hl_va_range *va_range;

	u64 vaddr = args->unmap.device_virt_addr;

	enum vm_type_t *vm_type;

	enum vm_type *vm_type;

	bool is_userptr;

	int rc = 0;