Commit 54303a1a authored by Oded Gabbay's avatar Oded Gabbay
Browse files

habanalabs: split mmu/no-mmu code paths in memory ioctl 



To make the memory ioctl code more readable, this patch moves the
legacy/debug code path of mmu-disabled to a separate function, which is
called (if necessary) from the main memory ioctl function.

Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
parent 29593840

drivers/misc/habanalabs/memory.c

+92 −85
Original line number Diff line number Diff line
@@ -1090,36 +1090,27 @@ vm_type_err: 
	return rc;

}



int hl_mem_ioctl(struct hl_fpriv *hpriv, void *data)

static int mem_ioctl_no_mmu(struct hl_fpriv *hpriv, union hl_mem_args *args)

{

	union hl_mem_args *args = data;

	struct hl_device *hdev = hpriv->hdev;

	struct hl_ctx *ctx = hpriv->ctx;

	u64 device_addr = 0;

	u32 handle = 0;

	int rc;



	if (hl_device_disabled_or_in_reset(hdev)) {

		dev_warn_ratelimited(hdev->dev,

			"Device is disabled or in reset. Can't execute memory IOCTL\n");

		return -EBUSY;

	}



	if (hdev->mmu_enable) {

	switch (args->in.op) {

	case HL_MEM_OP_ALLOC:

			if (!hdev->dram_supports_virtual_memory) {

				dev_err(hdev->dev,

					"DRAM alloc is not supported\n");

				rc = -EINVAL;

				goto out;

			}

		if (args->in.alloc.mem_size == 0) {

			dev_err(hdev->dev,

				"alloc size must be larger than 0\n");

			rc = -EINVAL;

			goto out;

		}



		/* Force contiguous as there are no real MMU

		 * translations to overcome physical memory gaps

		 */

		args->in.flags |= HL_MEM_CONTIGUOUS;

		rc = alloc_device_memory(ctx, &args->in, &handle);



		memset(args, 0, sizeof(*args));
@@ -1127,25 +1118,24 @@ int hl_mem_ioctl(struct hl_fpriv *hpriv, void *data) 
		break;



	case HL_MEM_OP_FREE:

			if (!hdev->dram_supports_virtual_memory) {

				dev_err(hdev->dev,

					"DRAM free is not supported\n");

				rc = -EINVAL;

				goto out;

			}

		rc = free_device_memory(ctx, args->in.free.handle);

		break;



	case HL_MEM_OP_MAP:

			rc = map_device_va(ctx, &args->in, &device_addr);

		if (args->in.flags & HL_MEM_USERPTR) {

			device_addr = args->in.map_host.host_virt_addr;

			rc = 0;

		} else {

			rc = get_paddr_from_handle(ctx, &args->in,

					&device_addr);

		}



		memset(args, 0, sizeof(*args));

		args->out.device_virt_addr = device_addr;

		break;



	case HL_MEM_OP_UNMAP:

			rc = unmap_device_va(ctx,

					args->in.unmap.device_virt_addr);

		rc = 0;

		break;



	default:
@@ -1153,20 +1143,43 @@ int hl_mem_ioctl(struct hl_fpriv *hpriv, void *data) 
		rc = -ENOTTY;

		break;

	}

	} else {



out:

	return rc;

}



int hl_mem_ioctl(struct hl_fpriv *hpriv, void *data)

{

	union hl_mem_args *args = data;

	struct hl_device *hdev = hpriv->hdev;

	struct hl_ctx *ctx = hpriv->ctx;

	u64 device_addr = 0;

	u32 handle = 0;

	int rc;



	if (hl_device_disabled_or_in_reset(hdev)) {

		dev_warn_ratelimited(hdev->dev,

			"Device is disabled or in reset. Can't execute memory IOCTL\n");

		return -EBUSY;

	}



	if (!hdev->mmu_enable)

		return mem_ioctl_no_mmu(hpriv, args);



	switch (args->in.op) {

	case HL_MEM_OP_ALLOC:

		if (!hdev->dram_supports_virtual_memory) {

			dev_err(hdev->dev, "DRAM alloc is not supported\n");

			rc = -EINVAL;

			goto out;

		}



		if (args->in.alloc.mem_size == 0) {

			dev_err(hdev->dev,

				"alloc size must be larger than 0\n");

			rc = -EINVAL;

			goto out;

		}



			/* Force contiguous as there are no real MMU

			 * translations to overcome physical memory gaps

			 */

			args->in.flags |= HL_MEM_CONTIGUOUS;

		rc = alloc_device_memory(ctx, &args->in, &handle);



		memset(args, 0, sizeof(*args));
@@ -1178,20 +1191,15 @@ int hl_mem_ioctl(struct hl_fpriv *hpriv, void *data) 
		break;



	case HL_MEM_OP_MAP:

			if (args->in.flags & HL_MEM_USERPTR) {

				device_addr = args->in.map_host.host_virt_addr;

				rc = 0;

			} else {

				rc = get_paddr_from_handle(ctx, &args->in,

						&device_addr);

			}

		rc = map_device_va(ctx, &args->in, &device_addr);



		memset(args, 0, sizeof(*args));

		args->out.device_virt_addr = device_addr;

		break;



	case HL_MEM_OP_UNMAP:

			rc = 0;

		rc = unmap_device_va(ctx,

				args->in.unmap.device_virt_addr);

		break;



	default:
@@ -1199,7 +1207,6 @@ int hl_mem_ioctl(struct hl_fpriv *hpriv, void *data) 
		rc = -ENOTTY;

		break;

	}

	}



out:

	return rc;

CRA Git | Maintained and supported by SUSTech CRA and CCSE