accel/ivpu: Refactor memory ranges logic

Add new dma range and change naming convention for virtual address
memory ranges managed by KMD.

New available ranges are named as follows:
 * global range - global context accessible by FW
 * aliased range - user context accessible by FW
 * dma range - user context accessible by DMA
 * shave range - user context accessible by shaves
 * global shave range - global context accessible by shave nn

Signed-off-by: Karol Wachowski <karol.wachowski@linux.intel.com>
Reviewed-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230731161258.2987564-6-stanislaw.gruszka@linux.intel.com

diff --git a/drivers/accel/ivpu/ivpu_drv.c b/drivers/accel/ivpu/ivpu_drv.c
index d33eb17007bfec5bbb7620dbd9012490f061148f..3da15890bc59f9e061eb6a5f9362fe6e795f2bdc 100644 (file)
--- a/drivers/accel/ivpu/ivpu_drv.c
+++ b/drivers/accel/ivpu/ivpu_drv.c
@@ -122,7 +122,7 @@ static int ivpu_get_capabilities(struct ivpu_device *vdev, struct drm_ivpu_param
                args->value = 0;
                break;
        case DRM_IVPU_CAP_DMA_MEMORY_RANGE:
-               args->value = 0;
+               args->value = 1;
                break;
        default:
                return -EINVAL;
@@ -160,7 +160,7 @@ static int ivpu_get_param_ioctl(struct drm_device *dev, void *data, struct drm_f
                args->value = ivpu_get_context_count(vdev);
                break;
        case DRM_IVPU_PARAM_CONTEXT_BASE_ADDRESS:
-               args->value = vdev->hw->ranges.user_low.start;
+               args->value = vdev->hw->ranges.user.start;
                break;
        case DRM_IVPU_PARAM_CONTEXT_PRIORITY:
                args->value = file_priv->priority;

diff --git a/drivers/accel/ivpu/ivpu_fw.c b/drivers/accel/ivpu/ivpu_fw.c
index 7caf90a169a32d5b7799198d2df9d77053797851..7e75439dec601d4d68a1e1466a5ee5927f2bca02 100644 (file)
--- a/drivers/accel/ivpu/ivpu_fw.c
+++ b/drivers/accel/ivpu/ivpu_fw.c
@@ -204,7 +204,7 @@ static int ivpu_fw_update_global_range(struct ivpu_device *vdev)
                return -EINVAL;
        }
 
-       ivpu_hw_init_range(&vdev->hw->ranges.global_low, start, size);
+       ivpu_hw_init_range(&vdev->hw->ranges.global, start, size);
        return 0;
 }
 
@@ -245,7 +245,7 @@ static int ivpu_fw_mem_init(struct ivpu_device *vdev)
        }
 
        if (fw->shave_nn_size) {
-               fw->mem_shave_nn = ivpu_bo_alloc_internal(vdev, vdev->hw->ranges.global_high.start,
+               fw->mem_shave_nn = ivpu_bo_alloc_internal(vdev, vdev->hw->ranges.shave.start,
                                                          fw->shave_nn_size, DRM_IVPU_BO_UNCACHED);
                if (!fw->mem_shave_nn) {
                        ivpu_err(vdev, "Failed to allocate shavenn buffer\n");
@@ -443,9 +443,9 @@ void ivpu_fw_boot_params_setup(struct ivpu_device *vdev, struct vpu_boot_params
         * Uncached region of VPU address space, covers IPC buffers, job queues
         * and log buffers, programmable to L2$ Uncached by VPU MTRR
         */
-       boot_params->shared_region_base = vdev->hw->ranges.global_low.start;
-       boot_params->shared_region_size = vdev->hw->ranges.global_low.end -
-                                         vdev->hw->ranges.global_low.start;
+       boot_params->shared_region_base = vdev->hw->ranges.global.start;
+       boot_params->shared_region_size = vdev->hw->ranges.global.end -
+                                         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;
@@ -453,10 +453,8 @@ void ivpu_fw_boot_params_setup(struct ivpu_device *vdev, struct vpu_boot_params
        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->global_aliased_pio_base =
-               vdev->hw->ranges.global_aliased_pio.start;
-       boot_params->global_aliased_pio_size =
-               ivpu_hw_range_size(&vdev->hw->ranges.global_aliased_pio);
+       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);
 
        /* Allow configuration for L2C_PAGE_TABLE with boot param value */
        boot_params->autoconfig = 1;
@@ -464,7 +462,7 @@ void ivpu_fw_boot_params_setup(struct ivpu_device *vdev, struct vpu_boot_params
        /* Enable L2 cache for first 2GB of high memory */
        boot_params->cache_defaults[VPU_BOOT_L2_CACHE_CFG_NN].use = 1;
        boot_params->cache_defaults[VPU_BOOT_L2_CACHE_CFG_NN].cfg =
-               ADDR_TO_L2_CACHE_CFG(vdev->hw->ranges.global_high.start);
+               ADDR_TO_L2_CACHE_CFG(vdev->hw->ranges.shave.start);
 
        if (vdev->fw->mem_shave_nn)
                boot_params->shave_nn_fw_base = vdev->fw->mem_shave_nn->vpu_addr;

diff --git a/drivers/accel/ivpu/ivpu_gem.c b/drivers/accel/ivpu/ivpu_gem.c
index 52b339aefadcae0dd01f5d0d5d1a20aec44c1412..2981bb32c75506d00065748a65a01f5757f85fe9 100644 (file)
--- a/drivers/accel/ivpu/ivpu_gem.c
+++ b/drivers/accel/ivpu/ivpu_gem.c
@@ -279,10 +279,12 @@ ivpu_bo_alloc_vpu_addr(struct ivpu_bo *bo, struct ivpu_mmu_context *ctx,
        int ret;
 
        if (!range) {
-               if (bo->flags & DRM_IVPU_BO_HIGH_MEM)
-                       range = &vdev->hw->ranges.user_high;
+               if (bo->flags & DRM_IVPU_BO_SHAVE_MEM)
+                       range = &vdev->hw->ranges.shave;
+               else if (bo->flags & DRM_IVPU_BO_DMA_MEM)
+                       range = &vdev->hw->ranges.dma;
                else
-                       range = &vdev->hw->ranges.user_low;
+                       range = &vdev->hw->ranges.user;
        }
 
        mutex_lock(&ctx->lock);
@@ -570,7 +572,7 @@ ivpu_bo_alloc_internal(struct ivpu_device *vdev, u64 vpu_addr, u64 size, u32 fla
                fixed_range.end = vpu_addr + size;
                range = &fixed_range;
        } else {
-               range = &vdev->hw->ranges.global_low;
+               range = &vdev->hw->ranges.global;
        }
 
        bo = ivpu_bo_alloc(vdev, &vdev->gctx, size, flags, &internal_ops, range, 0);

diff --git a/drivers/accel/ivpu/ivpu_hw.h b/drivers/accel/ivpu/ivpu_hw.h
index 335b7f707752791a3a66afbb1a62802ec7d2f8ed..69e52d21cd10c3bbf3ed2770c78597f3de3403bc 100644 (file)
--- a/drivers/accel/ivpu/ivpu_hw.h
+++ b/drivers/accel/ivpu/ivpu_hw.h
@@ -38,11 +38,10 @@ struct ivpu_addr_range {
 struct ivpu_hw_info {
        const struct ivpu_hw_ops *ops;
        struct {
-               struct ivpu_addr_range global_low;
-               struct ivpu_addr_range global_high;
-               struct ivpu_addr_range user_low;
-               struct ivpu_addr_range user_high;
-               struct ivpu_addr_range global_aliased_pio;
+               struct ivpu_addr_range global;
+               struct ivpu_addr_range user;
+               struct ivpu_addr_range shave;
+               struct ivpu_addr_range dma;
        } ranges;
        struct {
                u8 min_ratio;

diff --git a/drivers/accel/ivpu/ivpu_hw_37xx.c b/drivers/accel/ivpu/ivpu_hw_37xx.c
index 2cda8e4c4a3da75139cff2f17d256bb493918fef..9eae1c241bc0e51f86b394b7aabb05e7936a59aa 100644 (file)
--- a/drivers/accel/ivpu/ivpu_hw_37xx.c
+++ b/drivers/accel/ivpu/ivpu_hw_37xx.c
@@ -620,11 +620,10 @@ static int ivpu_hw_37xx_info_init(struct ivpu_device *vdev)
 
        ivpu_pll_init_frequency_ratios(vdev);
 
-       ivpu_hw_init_range(&hw->ranges.global_low, 0x80000000, SZ_512M);
-       ivpu_hw_init_range(&hw->ranges.global_high, 0x180000000, SZ_2M);
-       ivpu_hw_init_range(&hw->ranges.user_low, 0xc0000000, 255 * SZ_1M);
-       ivpu_hw_init_range(&hw->ranges.user_high, 0x180000000, SZ_2G);
-       hw->ranges.global_aliased_pio = hw->ranges.user_low;
+       ivpu_hw_init_range(&hw->ranges.global, 0x80000000, SZ_512M);
+       ivpu_hw_init_range(&hw->ranges.user,   0xc0000000, 255 * SZ_1M);
+       ivpu_hw_init_range(&hw->ranges.shave, 0x180000000, SZ_2G);
+       ivpu_hw_init_range(&hw->ranges.dma,   0x200000000, SZ_8G);
 
        return 0;
 }

diff --git a/drivers/accel/ivpu/ivpu_mmu_context.c b/drivers/accel/ivpu/ivpu_mmu_context.c
index 465a8229847679c8cf1765aa73b876768fc32b62..1d2e554e2c4a071d6b6974051252762c9ee2e790 100644 (file)
--- a/drivers/accel/ivpu/ivpu_mmu_context.c
+++ b/drivers/accel/ivpu/ivpu_mmu_context.c
@@ -431,11 +431,11 @@ ivpu_mmu_context_init(struct ivpu_device *vdev, struct ivpu_mmu_context *ctx, u3
                return ret;
 
        if (!context_id) {
-               start = vdev->hw->ranges.global_low.start;
-               end = vdev->hw->ranges.global_high.end;
+               start = vdev->hw->ranges.global.start;
+               end = vdev->hw->ranges.shave.end;
        } else {
-               start = vdev->hw->ranges.user_low.start;
-               end = vdev->hw->ranges.user_high.end;
+               start = vdev->hw->ranges.user.start;
+               end = vdev->hw->ranges.dma.end;
        }
 
        drm_mm_init(&ctx->mm, start, end - start);

diff --git a/include/uapi/drm/ivpu_accel.h b/include/uapi/drm/ivpu_accel.h
index 3e99b74eef04be3a97c1d6df9e6c24320eba6232..a58a14c9f22285a35adbb0ded8f09f695b12f7a8 100644 (file)
--- a/include/uapi/drm/ivpu_accel.h
+++ b/include/uapi/drm/ivpu_accel.h
@@ -133,8 +133,10 @@ struct drm_ivpu_param {
        __u64 value;
 };
 
-#define DRM_IVPU_BO_HIGH_MEM   0x00000001
+#define DRM_IVPU_BO_SHAVE_MEM  0x00000001
+#define DRM_IVPU_BO_HIGH_MEM   DRM_IVPU_BO_SHAVE_MEM
 #define DRM_IVPU_BO_MAPPABLE   0x00000002
+#define DRM_IVPU_BO_DMA_MEM    0x00000004
 
 #define DRM_IVPU_BO_CACHED     0x00000000
 #define DRM_IVPU_BO_UNCACHED   0x00010000
@@ -144,6 +146,7 @@ struct drm_ivpu_param {
 #define DRM_IVPU_BO_FLAGS \
        (DRM_IVPU_BO_HIGH_MEM | \
         DRM_IVPU_BO_MAPPABLE | \
+        DRM_IVPU_BO_DMA_MEM | \
         DRM_IVPU_BO_CACHE_MASK)
 
 /**