Commit 6f966213 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm-fixes 



One memory corruption fix in the MMUv2 GPU coredump code, a deadlock
fix also in the coredump code and reintroduction of a helpful message,
which got dropped by accident in this cycle.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Lucas Stach <l.stach@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/b0d640267662e3ce5e0089d0afedc1baba55058d.camel@pengutronix.de
parents d6d5df1d a2f10d4a

drivers/gpu/drm/etnaviv/etnaviv_dump.c

+2 −2
Original line number Diff line number Diff line
@@ -180,6 +180,8 @@ void etnaviv_core_dump(struct etnaviv_gem_submit *submit) 
			      etnaviv_cmdbuf_get_va(&submit->cmdbuf,

					&gpu->mmu_context->cmdbuf_mapping));



	mutex_unlock(&gpu->mmu_context->lock);



	/* Reserve space for the bomap */

	if (n_bomap_pages) {

		bomap_start = bomap = iter.data;
@@ -221,8 +223,6 @@ void etnaviv_core_dump(struct etnaviv_gem_submit *submit) 
					 obj->base.size);

	}



	mutex_unlock(&gpu->mmu_context->lock);



	etnaviv_core_dump_header(&iter, ETDUMP_BUF_END, iter.data);



	dev_coredumpv(gpu->dev, iter.start, iter.data - iter.start, GFP_KERNEL);

drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c

+4 −2
Original line number Diff line number Diff line
@@ -155,9 +155,11 @@ static void etnaviv_iommuv2_dump(struct etnaviv_iommu_context *context, void *bu 


	memcpy(buf, v2_context->mtlb_cpu, SZ_4K);

	buf += SZ_4K;

	for (i = 0; i < MMUv2_MAX_STLB_ENTRIES; i++, buf += SZ_4K)

		if (v2_context->mtlb_cpu[i] & MMUv2_PTE_PRESENT)

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

		if (v2_context->mtlb_cpu[i] & MMUv2_PTE_PRESENT) {

			memcpy(buf, v2_context->stlb_cpu[i], SZ_4K);

			buf += SZ_4K;

		}

}



static void etnaviv_iommuv2_restore_nonsec(struct etnaviv_gpu *gpu,

drivers/gpu/drm/etnaviv/etnaviv_mmu.c

+14 −3
Original line number Diff line number Diff line
@@ -328,12 +328,23 @@ etnaviv_iommu_context_init(struct etnaviv_iommu_global *global, 


	ret = etnaviv_cmdbuf_suballoc_map(suballoc, ctx, &ctx->cmdbuf_mapping,

					  global->memory_base);

	if (ret) {

		global->ops->free(ctx);

		return NULL;

	if (ret)

		goto out_free;



	if (global->version == ETNAVIV_IOMMU_V1 &&

	    ctx->cmdbuf_mapping.iova > 0x80000000) {

		dev_err(global->dev,

		        "command buffer outside valid memory window\n");

		goto out_unmap;

	}



	return ctx;



out_unmap:

	etnaviv_cmdbuf_suballoc_unmap(ctx, &ctx->cmdbuf_mapping);

out_free:

	global->ops->free(ctx);

	return NULL;

}



void etnaviv_iommu_restore(struct etnaviv_gpu *gpu,