Commit 34d03f2a authored by Karol Wachowski's avatar Karol Wachowski Committed by Stanislaw Gruszka
Browse files

accel/ivpu: Initialize context with SSID = 1 



Context with SSID = 1 is reserved and accesses on that context happen
only when context is uninitialized on the VPU side. Such access triggers
MMU fault (0xa) "Invalid CD Fetch", which doesn't contain any useful
information besides context ID.

This commit will change that state, now (0x10) "Translation fault" will
be triggered and accessed address will shown in the log.

Signed-off-by: default avatarKarol Wachowski <karol.wachowski@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-7-stanislaw.gruszka@linux.intel.com
parent edee62c0

drivers/accel/ivpu/ivpu_drv.c

+8 −1
Original line number Diff line number Diff line
@@ -543,10 +543,14 @@ static int ivpu_dev_init(struct ivpu_device *vdev) 
	if (ret)

		goto err_mmu_gctx_fini;



	ret = ivpu_fw_init(vdev);

	ret = ivpu_mmu_reserved_context_init(vdev);

	if (ret)

		goto err_mmu_gctx_fini;



	ret = ivpu_fw_init(vdev);

	if (ret)

		goto err_mmu_rctx_fini;



	ret = ivpu_ipc_init(vdev);

	if (ret)

		goto err_fw_fini;
@@ -575,6 +579,8 @@ static int ivpu_dev_init(struct ivpu_device *vdev) 
	ivpu_ipc_fini(vdev);

err_fw_fini:

	ivpu_fw_fini(vdev);

err_mmu_rctx_fini:

	ivpu_mmu_reserved_context_fini(vdev);

err_mmu_gctx_fini:

	ivpu_mmu_global_context_fini(vdev);

err_power_down:
@@ -598,6 +604,7 @@ static void ivpu_dev_fini(struct ivpu_device *vdev) 


	ivpu_ipc_fini(vdev);

	ivpu_fw_fini(vdev);

	ivpu_mmu_reserved_context_fini(vdev);

	ivpu_mmu_global_context_fini(vdev);



	drm_WARN_ON(&vdev->drm, !xa_empty(&vdev->submitted_jobs_xa));

drivers/accel/ivpu/ivpu_drv.h

+7 −5
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ 
#define IVPU_HW_40XX	40



#define IVPU_GLOBAL_CONTEXT_MMU_SSID   0

/* SSID 1 is used by the VPU to represent invalid context */

/* SSID 1 is used by the VPU to represent reserved context */

#define IVPU_RESERVED_CONTEXT_MMU_SSID 1

#define IVPU_USER_CONTEXT_MIN_SSID     2

#define IVPU_USER_CONTEXT_MAX_SSID     (IVPU_USER_CONTEXT_MIN_SSID + 63)
@@ -104,6 +105,7 @@ struct ivpu_device { 
	struct ivpu_pm_info *pm;



	struct ivpu_mmu_context gctx;

	struct ivpu_mmu_context rctx;

	struct xarray context_xa;

	struct xa_limit context_xa_limit;

drivers/accel/ivpu/ivpu_mmu_context.c

+10 −0
Original line number Diff line number Diff line
@@ -469,6 +469,16 @@ void ivpu_mmu_global_context_fini(struct ivpu_device *vdev) 
	return ivpu_mmu_context_fini(vdev, &vdev->gctx);

}



int ivpu_mmu_reserved_context_init(struct ivpu_device *vdev)

{

	return ivpu_mmu_user_context_init(vdev, &vdev->rctx, IVPU_RESERVED_CONTEXT_MMU_SSID);

}



void ivpu_mmu_reserved_context_fini(struct ivpu_device *vdev)

{

	return ivpu_mmu_user_context_fini(vdev, &vdev->rctx);

}



void ivpu_mmu_user_context_mark_invalid(struct ivpu_device *vdev, u32 ssid)

{

	struct ivpu_file_priv *file_priv;

drivers/accel/ivpu/ivpu_mmu_context.h

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ struct ivpu_mmu_context { 


int ivpu_mmu_global_context_init(struct ivpu_device *vdev);

void ivpu_mmu_global_context_fini(struct ivpu_device *vdev);

int ivpu_mmu_reserved_context_init(struct ivpu_device *vdev);

void ivpu_mmu_reserved_context_fini(struct ivpu_device *vdev);



int ivpu_mmu_user_context_init(struct ivpu_device *vdev, struct ivpu_mmu_context *ctx, u32 ctx_id);

void ivpu_mmu_user_context_fini(struct ivpu_device *vdev, struct ivpu_mmu_context *ctx);