Commit a18f1724 authored by Jacek Lawrynowicz's avatar Jacek Lawrynowicz Committed by Stanislaw Gruszka
Browse files

accel/ivpu: Add ivpu_bo_vaddr() and ivpu_bo_size() 



Use:
  - ivpu_bo_vaddr(bo) instead of bo->kvaddr
  - ivpu_bo_size(bo) instead of bo->base.size

This is a preparation for switch to a drm_gem_shmem_object as a base for
ivpu_bo, where:
  - bo->kvaddr becomes bo->base.vaddr
  - bo->base.size becomes bo->base.base.size

Using ivpu_bo_vaddr() and ivpu_bo_size() increases the readability of
the code.

Signed-off-by: default avatarJacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Reviewed-by: default avatarStanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Reviewed-by: default avatarJeffrey Hugo <quic_jhugo@quicinc.com>
Signed-off-by: default avatarStanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230901094957.168898-9-stanislaw.gruszka@linux.intel.com
parent c395c83a

drivers/accel/ivpu/ivpu_fw.c

+9 −9
Original line number Diff line number Diff line
@@ -321,13 +321,13 @@ void ivpu_fw_load(struct ivpu_device *vdev) 
	struct ivpu_fw_info *fw = vdev->fw;

	u64 image_end_offset = fw->image_load_offset + fw->image_size;



	memset(fw->mem->kvaddr, 0, fw->image_load_offset);

	memcpy(fw->mem->kvaddr + fw->image_load_offset,

	memset(ivpu_bo_vaddr(fw->mem), 0, fw->image_load_offset);

	memcpy(ivpu_bo_vaddr(fw->mem) + fw->image_load_offset,

	       fw->file->data + FW_FILE_IMAGE_OFFSET, fw->image_size);



	if (IVPU_WA(clear_runtime_mem)) {

		u8 *start = fw->mem->kvaddr + image_end_offset;

		u64 size = fw->mem->base.size - image_end_offset;

		u8 *start = ivpu_bo_vaddr(fw->mem) + image_end_offset;

		u64 size = ivpu_bo_size(fw->mem) - image_end_offset;



		memset(start, 0, size);

	}
@@ -450,10 +450,10 @@ void ivpu_fw_boot_params_setup(struct ivpu_device *vdev, struct vpu_boot_params 
					  vdev->hw->ranges.global.start;



	boot_params->ipc_header_area_start = ipc_mem_rx->vpu_addr;

	boot_params->ipc_header_area_size = ipc_mem_rx->base.size / 2;

	boot_params->ipc_header_area_size = ivpu_bo_size(ipc_mem_rx) / 2;



	boot_params->ipc_payload_area_start = ipc_mem_rx->vpu_addr + ipc_mem_rx->base.size / 2;

	boot_params->ipc_payload_area_size = ipc_mem_rx->base.size / 2;

	boot_params->ipc_payload_area_start = ipc_mem_rx->vpu_addr + ivpu_bo_size(ipc_mem_rx) / 2;

	boot_params->ipc_payload_area_size = ivpu_bo_size(ipc_mem_rx) / 2;



	boot_params->global_aliased_pio_base = vdev->hw->ranges.user.start;

	boot_params->global_aliased_pio_size = ivpu_hw_range_size(&vdev->hw->ranges.user);
@@ -485,9 +485,9 @@ void ivpu_fw_boot_params_setup(struct ivpu_device *vdev, struct vpu_boot_params 
	boot_params->trace_destination_mask = vdev->fw->trace_destination_mask;

	boot_params->trace_hw_component_mask = vdev->fw->trace_hw_component_mask;

	boot_params->crit_tracing_buff_addr = vdev->fw->mem_log_crit->vpu_addr;

	boot_params->crit_tracing_buff_size = vdev->fw->mem_log_crit->base.size;

	boot_params->crit_tracing_buff_size = ivpu_bo_size(vdev->fw->mem_log_crit);

	boot_params->verbose_tracing_buff_addr = vdev->fw->mem_log_verb->vpu_addr;

	boot_params->verbose_tracing_buff_size = vdev->fw->mem_log_verb->base.size;

	boot_params->verbose_tracing_buff_size = ivpu_bo_size(vdev->fw->mem_log_verb);



	boot_params->punit_telemetry_sram_base = ivpu_hw_reg_telemetry_offset_get(vdev);

	boot_params->punit_telemetry_sram_size = ivpu_hw_reg_telemetry_size_get(vdev);

drivers/accel/ivpu/ivpu_fw_log.c

+3 −3
Original line number Diff line number Diff line
@@ -31,10 +31,10 @@ static int fw_log_ptr(struct ivpu_device *vdev, struct ivpu_bo *bo, u32 *offset, 
{

	struct vpu_tracing_buffer_header *log;



	if ((*offset + sizeof(*log)) > bo->base.size)

	if ((*offset + sizeof(*log)) > ivpu_bo_size(bo))

		return -EINVAL;



	log = bo->kvaddr + *offset;

	log = ivpu_bo_vaddr(bo) + *offset;



	if (log->vpu_canary_start != VPU_TRACING_BUFFER_CANARY)

		return -EINVAL;
@@ -43,7 +43,7 @@ static int fw_log_ptr(struct ivpu_device *vdev, struct ivpu_bo *bo, u32 *offset, 
		ivpu_dbg(vdev, FW_BOOT, "Invalid header size 0x%x\n", log->header_size);

		return -EINVAL;

	}

	if ((char *)log + log->size > (char *)bo->kvaddr + bo->base.size) {

	if ((char *)log + log->size > (char *)ivpu_bo_vaddr(bo) + ivpu_bo_size(bo)) {

		ivpu_dbg(vdev, FW_BOOT, "Invalid log size 0x%x\n", log->size);

		return -EINVAL;

	}

drivers/accel/ivpu/ivpu_gem.c

+15 −15
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static const struct ivpu_bo_ops prime_ops = { 


static int __must_check shmem_alloc_pages_locked(struct ivpu_bo *bo)

{

	int npages = bo->base.size >> PAGE_SHIFT;

	int npages = ivpu_bo_size(bo) >> PAGE_SHIFT;

	struct page **pages;



	pages = drm_gem_get_pages(&bo->base);
@@ -88,7 +88,7 @@ static int __must_check shmem_alloc_pages_locked(struct ivpu_bo *bo) 
static void shmem_free_pages_locked(struct ivpu_bo *bo)

{

	if (ivpu_bo_cache_mode(bo) != DRM_IVPU_BO_CACHED)

		set_pages_array_wb(bo->pages, bo->base.size >> PAGE_SHIFT);

		set_pages_array_wb(bo->pages, ivpu_bo_size(bo) >> PAGE_SHIFT);



	drm_gem_put_pages(&bo->base, bo->pages, true, false);

	bo->pages = NULL;
@@ -96,7 +96,7 @@ static void shmem_free_pages_locked(struct ivpu_bo *bo) 


static int ivpu_bo_map_pages_locked(struct ivpu_bo *bo)

{

	int npages = bo->base.size >> PAGE_SHIFT;

	int npages = ivpu_bo_size(bo) >> PAGE_SHIFT;

	struct ivpu_device *vdev = ivpu_bo_to_vdev(bo);

	struct sg_table *sgt;

	int ret;
@@ -142,7 +142,7 @@ static const struct ivpu_bo_ops shmem_ops = { 


static int __must_check internal_alloc_pages_locked(struct ivpu_bo *bo)

{

	unsigned int i, npages = bo->base.size >> PAGE_SHIFT;

	unsigned int i, npages = ivpu_bo_size(bo) >> PAGE_SHIFT;

	struct page **pages;

	int ret;
@@ -171,10 +171,10 @@ static int __must_check internal_alloc_pages_locked(struct ivpu_bo *bo) 


static void internal_free_pages_locked(struct ivpu_bo *bo)

{

	unsigned int i, npages = bo->base.size >> PAGE_SHIFT;

	unsigned int i, npages = ivpu_bo_size(bo) >> PAGE_SHIFT;



	if (ivpu_bo_cache_mode(bo) != DRM_IVPU_BO_CACHED)

		set_pages_array_wb(bo->pages, bo->base.size >> PAGE_SHIFT);

		set_pages_array_wb(bo->pages, ivpu_bo_size(bo) >> PAGE_SHIFT);



	for (i = 0; i < npages; i++)

		put_page(bo->pages[i]);
@@ -291,7 +291,7 @@ ivpu_bo_alloc_vpu_addr(struct ivpu_bo *bo, struct ivpu_mmu_context *ctx, 
	}



	mutex_lock(&ctx->lock);

	ret = ivpu_mmu_context_insert_node_locked(ctx, range, bo->base.size, &bo->mm_node);

	ret = ivpu_mmu_context_insert_node_locked(ctx, range, ivpu_bo_size(bo), &bo->mm_node);

	if (!ret) {

		bo->ctx = ctx;

		bo->vpu_addr = bo->mm_node.start;
@@ -438,7 +438,7 @@ static int ivpu_bo_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) 
	struct ivpu_device *vdev = ivpu_bo_to_vdev(bo);



	ivpu_dbg(vdev, BO, "mmap: ctx %u handle %u vpu_addr 0x%llx size %zu type %s",

		 bo->ctx->id, bo->handle, bo->vpu_addr, bo->base.size, bo->ops->name);

		 bo->ctx->id, bo->handle, bo->vpu_addr, ivpu_bo_size(bo), bo->ops->name);



	if (obj->import_attach) {

		/* Drop the reference drm_gem_mmap_obj() acquired.*/
@@ -553,7 +553,7 @@ ivpu_bo_create_ioctl(struct drm_device *dev, void *data, struct drm_file *file) 
	drm_gem_object_put(&bo->base);



	ivpu_dbg(vdev, BO, "alloc shmem: ctx %u vpu_addr 0x%llx size %zu flags 0x%x\n",

		 file_priv->ctx.id, bo->vpu_addr, bo->base.size, bo->flags);

		 file_priv->ctx.id, bo->vpu_addr, ivpu_bo_size(bo), bo->flags);



	return ret;

}
@@ -590,22 +590,22 @@ ivpu_bo_alloc_internal(struct ivpu_device *vdev, u64 vpu_addr, u64 size, u32 fla 
		goto err_put;



	if (ivpu_bo_cache_mode(bo) != DRM_IVPU_BO_CACHED)

		drm_clflush_pages(bo->pages, bo->base.size >> PAGE_SHIFT);

		drm_clflush_pages(bo->pages, ivpu_bo_size(bo) >> PAGE_SHIFT);



	if (bo->flags & DRM_IVPU_BO_WC)

		set_pages_array_wc(bo->pages, bo->base.size >> PAGE_SHIFT);

		set_pages_array_wc(bo->pages, ivpu_bo_size(bo) >> PAGE_SHIFT);

	else if (bo->flags & DRM_IVPU_BO_UNCACHED)

		set_pages_array_uc(bo->pages, bo->base.size >> PAGE_SHIFT);

		set_pages_array_uc(bo->pages, ivpu_bo_size(bo) >> PAGE_SHIFT);



	prot = ivpu_bo_pgprot(bo, PAGE_KERNEL);

	bo->kvaddr = vmap(bo->pages, bo->base.size >> PAGE_SHIFT, VM_MAP, prot);

	bo->kvaddr = vmap(bo->pages, ivpu_bo_size(bo) >> PAGE_SHIFT, VM_MAP, prot);

	if (!bo->kvaddr) {

		ivpu_err(vdev, "Failed to map BO into kernel virtual memory\n");

		goto err_put;

	}



	ivpu_dbg(vdev, BO, "alloc internal: ctx 0 vpu_addr 0x%llx size %zu flags 0x%x\n",

		 bo->vpu_addr, bo->base.size, flags);

		 bo->vpu_addr, ivpu_bo_size(bo), flags);



	return bo;
@@ -718,7 +718,7 @@ static void ivpu_bo_print_info(struct ivpu_bo *bo, struct drm_printer *p) 
		dma_refcount = atomic_long_read(&bo->base.dma_buf->file->f_count);



	drm_printf(p, "%5u %6d %16llx %10lu %10u %12lu %14s\n",

		   bo->ctx->id, bo->handle, bo->vpu_addr, bo->base.size,

		   bo->ctx->id, bo->handle, bo->vpu_addr, ivpu_bo_size(bo),

		   kref_read(&bo->base.refcount), dma_refcount, bo->ops->name);

}

drivers/accel/ivpu/ivpu_gem.h

+16 −6
Original line number Diff line number Diff line
@@ -68,9 +68,19 @@ static inline struct ivpu_bo *to_ivpu_bo(struct drm_gem_object *obj) 
	return container_of(obj, struct ivpu_bo, base);

}



static inline void *ivpu_bo_vaddr(struct ivpu_bo *bo)

{

	return bo->kvaddr;

}



static inline size_t ivpu_bo_size(struct ivpu_bo *bo)

{

	return bo->base.size;

}



static inline struct page *ivpu_bo_get_page(struct ivpu_bo *bo, u64 offset)

{

	if (offset > bo->base.size || !bo->pages)

	if (offset > ivpu_bo_size(bo) || !bo->pages)

		return NULL;



	return bo->pages[offset / PAGE_SIZE];
@@ -107,21 +117,21 @@ static inline void *ivpu_to_cpu_addr(struct ivpu_bo *bo, u32 vpu_addr) 
	if (vpu_addr < bo->vpu_addr)

		return NULL;



	if (vpu_addr >= (bo->vpu_addr + bo->base.size))

	if (vpu_addr >= (bo->vpu_addr + ivpu_bo_size(bo)))

		return NULL;



	return bo->kvaddr + (vpu_addr - bo->vpu_addr);

	return ivpu_bo_vaddr(bo) + (vpu_addr - bo->vpu_addr);

}



static inline u32 cpu_to_vpu_addr(struct ivpu_bo *bo, void *cpu_addr)

{

	if (cpu_addr < bo->kvaddr)

	if (cpu_addr < ivpu_bo_vaddr(bo))

		return 0;



	if (cpu_addr >= (bo->kvaddr + bo->base.size))

	if (cpu_addr >= (ivpu_bo_vaddr(bo) + ivpu_bo_size(bo)))

		return 0;



	return bo->vpu_addr + (cpu_addr - bo->kvaddr);

	return bo->vpu_addr + (cpu_addr - ivpu_bo_vaddr(bo));

}



#endif /* __IVPU_GEM_H__ */

drivers/accel/ivpu/ivpu_ipc.c

+3 −3
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ int ivpu_ipc_init(struct ivpu_device *vdev) 
		goto err_free_rx;

	}



	ret = gen_pool_add(ipc->mm_tx, ipc->mem_tx->vpu_addr, ipc->mem_tx->base.size, -1);

	ret = gen_pool_add(ipc->mm_tx, ipc->mem_tx->vpu_addr, ivpu_bo_size(ipc->mem_tx), -1);

	if (ret) {

		ivpu_err(vdev, "gen_pool_add failed, ret %d\n", ret);

		goto err_free_rx;
@@ -505,8 +505,8 @@ void ivpu_ipc_reset(struct ivpu_device *vdev) 


	mutex_lock(&ipc->lock);



	memset(ipc->mem_tx->kvaddr, 0, ipc->mem_tx->base.size);

	memset(ipc->mem_rx->kvaddr, 0, ipc->mem_rx->base.size);

	memset(ivpu_bo_vaddr(ipc->mem_tx), 0, ivpu_bo_size(ipc->mem_tx));

	memset(ivpu_bo_vaddr(ipc->mem_rx), 0, ivpu_bo_size(ipc->mem_rx));

	wmb(); /* Flush WC buffers for TX and RX rings */



	mutex_unlock(&ipc->lock);