Commit e8458e20 authored by Ohad Sharabi's avatar Ohad Sharabi Committed by Oded Gabbay
Browse files

habanalabs: make sure device mem alloc is page aligned 



Working with MMU that supports multiple page sizes requires that mapping
of a page of a certain size will be aligned to the same size (e.g. the
physical address of 32MB page shall be aligned to 32MB).

To achieve this the gen_poll allocation is now using the "align" variant
to comply with the alignment requirements.

Signed-off-by: default avatarOhad Sharabi <osharabi@habana.ai>
Reviewed-by: default avatarOded Gabbay <ogabbay@kernel.org>
Signed-off-by: default avatarOded Gabbay <ogabbay@kernel.org>
parent 100fcf1e

drivers/misc/habanalabs/common/memory.c

+14 −5
Original line number Diff line number Diff line
@@ -90,8 +90,8 @@ static int alloc_device_memory(struct hl_ctx *ctx, struct hl_mem_in *args, 
	struct hl_vm_phys_pg_pack *phys_pg_pack;

	u64 paddr = 0, total_size, num_pgs, i;

	u32 num_curr_pgs, page_size;

	int handle, rc;

	bool contiguous;

	int handle, rc;



	num_curr_pgs = 0;
@@ -110,7 +110,11 @@ static int alloc_device_memory(struct hl_ctx *ctx, struct hl_mem_in *args, 
	contiguous = args->flags & HL_MEM_CONTIGUOUS;



	if (contiguous) {

		paddr = (u64) gen_pool_alloc(vm->dram_pg_pool, total_size);

		if (is_power_of_2(page_size))

			paddr = (u64) (uintptr_t) gen_pool_dma_alloc_align(vm->dram_pg_pool,

								total_size, NULL, page_size);

		else

			paddr = (u64) (uintptr_t) gen_pool_alloc(vm->dram_pg_pool, total_size);

		if (!paddr) {

			dev_err(hdev->dev,

				"failed to allocate %llu contiguous pages with total size of %llu\n",
@@ -144,8 +148,13 @@ static int alloc_device_memory(struct hl_ctx *ctx, struct hl_mem_in *args, 
			phys_pg_pack->pages[i] = paddr + i * page_size;

	} else {

		for (i = 0 ; i < num_pgs ; i++) {

			phys_pg_pack->pages[i] = (u64) gen_pool_alloc(

							vm->dram_pg_pool,

			if (is_power_of_2(page_size))

				phys_pg_pack->pages[i] =

						(u64) gen_pool_dma_alloc_align(vm->dram_pg_pool,

										page_size, NULL,

										page_size);

			else

				phys_pg_pack->pages[i] = (u64) gen_pool_alloc(vm->dram_pg_pool,

										page_size);

			if (!phys_pg_pack->pages[i]) {

				dev_err(hdev->dev,