drm/amdgpu/mes: add mes register access interface

Add mes register access routines:
1. read register
2. write register
3. wait register
4. write and wait register

Signed-off-by: Jack Xiao <Jack.Xiao@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
index 0c9cb49..bffde4a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
@@ -189,15 +189,29 @@ int amdgpu_mes_init(struct amdgpu_device *adev)
 
        r = amdgpu_device_wb_get(adev, &adev->mes.query_status_fence_offs);
        if (r) {
+               amdgpu_device_wb_free(adev, adev->mes.sch_ctx_offs);
                dev_err(adev->dev,
                        "(%d) query_status_fence_offs wb alloc failed\n", r);
-               return r;
+               goto error_ids;
        }
        adev->mes.query_status_fence_gpu_addr =
                adev->wb.gpu_addr + (adev->mes.query_status_fence_offs * 4);
        adev->mes.query_status_fence_ptr =
                (uint64_t *)&adev->wb.wb[adev->mes.query_status_fence_offs];
 
+       r = amdgpu_device_wb_get(adev, &adev->mes.read_val_offs);
+       if (r) {
+               amdgpu_device_wb_free(adev, adev->mes.sch_ctx_offs);
+               amdgpu_device_wb_free(adev, adev->mes.query_status_fence_offs);
+               dev_err(adev->dev,
+                       "(%d) read_val_offs alloc failed\n", r);
+               goto error_ids;
+       }
+       adev->mes.read_val_gpu_addr =
+               adev->wb.gpu_addr + (adev->mes.read_val_offs * 4);
+       adev->mes.read_val_ptr =
+               (uint32_t *)&adev->wb.wb[adev->mes.read_val_offs];
+
        r = amdgpu_mes_doorbell_init(adev);
        if (r)
                goto error;
@@ -206,6 +220,8 @@ int amdgpu_mes_init(struct amdgpu_device *adev)
 
 error:
        amdgpu_device_wb_free(adev, adev->mes.sch_ctx_offs);
+       amdgpu_device_wb_free(adev, adev->mes.query_status_fence_offs);
+       amdgpu_device_wb_free(adev, adev->mes.read_val_offs);
 error_ids:
        idr_destroy(&adev->mes.pasid_idr);
        idr_destroy(&adev->mes.gang_id_idr);
@@ -218,6 +234,8 @@ error_ids:
 void amdgpu_mes_fini(struct amdgpu_device *adev)
 {
        amdgpu_device_wb_free(adev, adev->mes.sch_ctx_offs);
+       amdgpu_device_wb_free(adev, adev->mes.query_status_fence_offs);
+       amdgpu_device_wb_free(adev, adev->mes.read_val_offs);
 
        idr_destroy(&adev->mes.pasid_idr);
        idr_destroy(&adev->mes.gang_id_idr);
@@ -794,6 +812,118 @@ int amdgpu_mes_unmap_legacy_queue(struct amdgpu_device *adev,
        return r;
 }
 
+uint32_t amdgpu_mes_rreg(struct amdgpu_device *adev, uint32_t reg)
+{
+       struct mes_misc_op_input op_input;
+       int r, val = 0;
+
+       amdgpu_mes_lock(&adev->mes);
+
+       op_input.op = MES_MISC_OP_READ_REG;
+       op_input.read_reg.reg_offset = reg;
+       op_input.read_reg.buffer_addr = adev->mes.read_val_gpu_addr;
+
+       if (!adev->mes.funcs->misc_op) {
+               DRM_ERROR("mes rreg is not supported!\n");
+               goto error;
+       }
+
+       r = adev->mes.funcs->misc_op(&adev->mes, &op_input);
+       if (r)
+               DRM_ERROR("failed to read reg (0x%x)\n", reg);
+       else
+               val = *(adev->mes.read_val_ptr);
+
+error:
+       amdgpu_mes_unlock(&adev->mes);
+       return val;
+}
+
+int amdgpu_mes_wreg(struct amdgpu_device *adev,
+                   uint32_t reg, uint32_t val)
+{
+       struct mes_misc_op_input op_input;
+       int r;
+
+       amdgpu_mes_lock(&adev->mes);
+
+       op_input.op = MES_MISC_OP_WRITE_REG;
+       op_input.write_reg.reg_offset = reg;
+       op_input.write_reg.reg_value = val;
+
+       if (!adev->mes.funcs->misc_op) {
+               DRM_ERROR("mes wreg is not supported!\n");
+               r = -EINVAL;
+               goto error;
+       }
+
+       r = adev->mes.funcs->misc_op(&adev->mes, &op_input);
+       if (r)
+               DRM_ERROR("failed to write reg (0x%x)\n", reg);
+
+error:
+       amdgpu_mes_unlock(&adev->mes);
+       return r;
+}
+
+int amdgpu_mes_reg_write_reg_wait(struct amdgpu_device *adev,
+                                 uint32_t reg0, uint32_t reg1,
+                                 uint32_t ref, uint32_t mask)
+{
+       struct mes_misc_op_input op_input;
+       int r;
+
+       amdgpu_mes_lock(&adev->mes);
+
+       op_input.op = MES_MISC_OP_WRM_REG_WR_WAIT;
+       op_input.wrm_reg.reg0 = reg0;
+       op_input.wrm_reg.reg1 = reg1;
+       op_input.wrm_reg.ref = ref;
+       op_input.wrm_reg.mask = mask;
+
+       if (!adev->mes.funcs->misc_op) {
+               DRM_ERROR("mes reg_write_reg_wait is not supported!\n");
+               r = -EINVAL;
+               goto error;
+       }
+
+       r = adev->mes.funcs->misc_op(&adev->mes, &op_input);
+       if (r)
+               DRM_ERROR("failed to reg_write_reg_wait\n");
+
+error:
+       amdgpu_mes_unlock(&adev->mes);
+       return r;
+}
+
+int amdgpu_mes_reg_wait(struct amdgpu_device *adev, uint32_t reg,
+                       uint32_t val, uint32_t mask)
+{
+       struct mes_misc_op_input op_input;
+       int r;
+
+       amdgpu_mes_lock(&adev->mes);
+
+       op_input.op = MES_MISC_OP_WRM_REG_WAIT;
+       op_input.wrm_reg.reg0 = reg;
+       op_input.wrm_reg.ref = val;
+       op_input.wrm_reg.mask = mask;
+
+       if (!adev->mes.funcs->misc_op) {
+               DRM_ERROR("mes reg wait is not supported!\n");
+               r = -EINVAL;
+               goto error;
+       }
+
+       r = adev->mes.funcs->misc_op(&adev->mes, &op_input);
+       if (r)
+               DRM_ERROR("failed to reg_write_reg_wait\n");
+
+error:
+       amdgpu_mes_unlock(&adev->mes);
+       return r;
+}
+
 static void
 amdgpu_mes_ring_to_queue_props(struct amdgpu_device *adev,
                               struct amdgpu_ring *ring,