Commit bed4c73e authored by Lizhi Hou's avatar Lizhi Hou Committed by Jeff Hugo
Browse files

accel/amdxdna: Add suspend and resume 



Implement PCI power management suspend and resume callbacks.

Co-developed-by: default avatarNarendra Gutta <VenkataNarendraKumar.Gutta@amd.com>
Signed-off-by: default avatarNarendra Gutta <VenkataNarendraKumar.Gutta@amd.com>
Co-developed-by: default avatarXiaoming Ren <xiaoming.ren@amd.com>
Signed-off-by: default avatarXiaoming Ren <xiaoming.ren@amd.com>
Co-developed-by: default avatarMin Ma <min.ma@amd.com>
Signed-off-by: default avatarMin Ma <min.ma@amd.com>
Reviewed-by: default avatarJeffrey Hugo <quic_jhugo@quicinc.com>
Signed-off-by: default avatarLizhi Hou <lizhi.hou@amd.com>
Signed-off-by: default avatarJeffrey Hugo <quic_jhugo@quicinc.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241118172942.2014541-9-lizhi.hou@amd.com
parent aac24309

drivers/accel/amdxdna/aie2_ctx.c

+30 −0
Original line number Diff line number Diff line
@@ -137,6 +137,36 @@ static void aie2_hwctx_wait_for_idle(struct amdxdna_hwctx *hwctx) 
	dma_fence_put(fence);

}



void aie2_hwctx_suspend(struct amdxdna_hwctx *hwctx)

{

	struct amdxdna_dev *xdna = hwctx->client->xdna;



	/*

	 * Command timeout is unlikely. But if it happens, it doesn't

	 * break the system. aie2_hwctx_stop() will destroy mailbox

	 * and abort all commands.

	 */

	drm_WARN_ON(&xdna->ddev, !mutex_is_locked(&xdna->dev_lock));

	aie2_hwctx_wait_for_idle(hwctx);

	aie2_hwctx_stop(xdna, hwctx, NULL);

	hwctx->old_status = hwctx->status;

	hwctx->status = HWCTX_STAT_STOP;

}



void aie2_hwctx_resume(struct amdxdna_hwctx *hwctx)

{

	struct amdxdna_dev *xdna = hwctx->client->xdna;



	/*

	 * The resume path cannot guarantee that mailbox channel can be

	 * regenerated. If this happen, when submit message to this

	 * mailbox channel, error will return.

	 */

	drm_WARN_ON(&xdna->ddev, !mutex_is_locked(&xdna->dev_lock));

	hwctx->status = hwctx->old_status;

	aie2_hwctx_restart(xdna, hwctx);

}



static void

aie2_sched_notify(struct amdxdna_sched_job *job)

{

drivers/accel/amdxdna/aie2_pci.c

+4 −0
Original line number Diff line number Diff line
@@ -496,9 +496,13 @@ static void aie2_fini(struct amdxdna_dev *xdna) 
const struct amdxdna_dev_ops aie2_ops = {

	.init           = aie2_init,

	.fini           = aie2_fini,

	.resume         = aie2_hw_start,

	.suspend        = aie2_hw_stop,

	.hwctx_init     = aie2_hwctx_init,

	.hwctx_fini     = aie2_hwctx_fini,

	.hwctx_config   = aie2_hwctx_config,

	.cmd_submit     = aie2_cmd_submit,

	.hmm_invalidate = aie2_hmm_invalidate,

	.hwctx_suspend  = aie2_hwctx_suspend,

	.hwctx_resume   = aie2_hwctx_resume,

};

drivers/accel/amdxdna/aie2_pci.h

+2 −0
Original line number Diff line number Diff line
@@ -240,6 +240,8 @@ int aie2_sync_bo(struct amdxdna_hwctx *hwctx, struct amdxdna_sched_job *job, 
int aie2_hwctx_init(struct amdxdna_hwctx *hwctx);

void aie2_hwctx_fini(struct amdxdna_hwctx *hwctx);

int aie2_hwctx_config(struct amdxdna_hwctx *hwctx, u32 type, u64 value, void *buf, u32 size);

void aie2_hwctx_suspend(struct amdxdna_hwctx *hwctx);

void aie2_hwctx_resume(struct amdxdna_hwctx *hwctx);

int aie2_cmd_submit(struct amdxdna_hwctx *hwctx, struct amdxdna_sched_job *job, u64 *seq);

void aie2_hmm_invalidate(struct amdxdna_gem_obj *abo, unsigned long cur_seq);

void aie2_restart_ctx(struct amdxdna_client *client);

drivers/accel/amdxdna/amdxdna_ctx.c

+26 −0
Original line number Diff line number Diff line
@@ -59,6 +59,32 @@ static struct dma_fence *amdxdna_fence_create(struct amdxdna_hwctx *hwctx) 
	return &fence->base;

}



void amdxdna_hwctx_suspend(struct amdxdna_client *client)

{

	struct amdxdna_dev *xdna = client->xdna;

	struct amdxdna_hwctx *hwctx;

	int next = 0;



	drm_WARN_ON(&xdna->ddev, !mutex_is_locked(&xdna->dev_lock));

	mutex_lock(&client->hwctx_lock);

	idr_for_each_entry_continue(&client->hwctx_idr, hwctx, next)

		xdna->dev_info->ops->hwctx_suspend(hwctx);

	mutex_unlock(&client->hwctx_lock);

}



void amdxdna_hwctx_resume(struct amdxdna_client *client)

{

	struct amdxdna_dev *xdna = client->xdna;

	struct amdxdna_hwctx *hwctx;

	int next = 0;



	drm_WARN_ON(&xdna->ddev, !mutex_is_locked(&xdna->dev_lock));

	mutex_lock(&client->hwctx_lock);

	idr_for_each_entry_continue(&client->hwctx_idr, hwctx, next)

		xdna->dev_info->ops->hwctx_resume(hwctx);

	mutex_unlock(&client->hwctx_lock);

}



static void amdxdna_hwctx_destroy_rcu(struct amdxdna_hwctx *hwctx,

				      struct srcu_struct *ss)

{

drivers/accel/amdxdna/amdxdna_ctx.h

+2 −0
Original line number Diff line number Diff line
@@ -144,6 +144,8 @@ static inline u32 amdxdna_hwctx_col_map(struct amdxdna_hwctx *hwctx) 


void amdxdna_sched_job_cleanup(struct amdxdna_sched_job *job);

void amdxdna_hwctx_remove_all(struct amdxdna_client *client);

void amdxdna_hwctx_suspend(struct amdxdna_client *client);

void amdxdna_hwctx_resume(struct amdxdna_client *client);



int amdxdna_cmd_submit(struct amdxdna_client *client,

		       u32 cmd_bo_hdls, u32 *arg_bo_hdls, u32 arg_bo_cnt,