Commit cde54021 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/fifo/gk104-: fix parsing of mmu fault data 



Pascal was particularly incorrect, as the register changed to be more in the
same format as the MMU fault buffers are.

Shouldn't have impacted much more than confusing MMU fault log messages.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent cf9518b5

drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c

+2 −26
Original line number Diff line number Diff line
@@ -646,31 +646,6 @@ gk104_fifo_intr_dropped_fault(struct gk104_fifo *fifo) 
	nvkm_error(subdev, "DROPPED_MMU_FAULT %08x\n", stat);

}



static void

gk104_fifo_intr_fault(struct gk104_fifo *fifo, int unit)

{

	struct nvkm_subdev *subdev = &fifo->base.engine.subdev;

	struct nvkm_device *device = subdev->device;

	u32 inst = nvkm_rd32(device, 0x002800 + (unit * 0x10));

	u32 valo = nvkm_rd32(device, 0x002804 + (unit * 0x10));

	u32 vahi = nvkm_rd32(device, 0x002808 + (unit * 0x10));

	u32 type = nvkm_rd32(device, 0x00280c + (unit * 0x10));

	struct nvkm_fault_data info;



	info.inst   =  (u64)inst << 12;

	info.addr   = ((u64)vahi << 32) | valo;

	info.time   = 0;

	info.engine = unit;

	info.valid  = 1;

	info.gpc    = (type & 0x1f000000) >> 24;

	info.client = (type & 0x00001f00) >> 8;

	info.access = (type & 0x00000080) >> 7;

	info.hub    = (type & 0x00000040) >> 6;

	info.reason = (type & 0x0000001f);



	nvkm_fifo_fault(&fifo->base, &info);

}



static const struct nvkm_bitfield gk104_fifo_pbdma_intr_0[] = {

	{ 0x00000001, "MEMREQ" },

	{ 0x00000002, "MEMACK_TIMEOUT" },
@@ -849,7 +824,7 @@ gk104_fifo_intr(struct nvkm_fifo *base) 
		u32 mask = nvkm_rd32(device, 0x00259c);

		while (mask) {

			u32 unit = __ffs(mask);

			gk104_fifo_intr_fault(fifo, unit);

			fifo->func->intr.fault(&fifo->base, unit);

			nvkm_wr32(device, 0x00259c, (1 << unit));

			mask &= ~(1 << unit);

		}
@@ -1204,6 +1179,7 @@ gk104_fifo_fault_gpcclient[] = { 


static const struct gk104_fifo_func

gk104_fifo = {

	.intr.fault = gf100_fifo_intr_fault,

	.pbdma = &gk104_fifo_pbdma,

	.fault.access = gk104_fifo_fault_access,

	.fault.engine = gk104_fifo_fault_engine,

drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h

+6 −0
Original line number Diff line number Diff line
@@ -45,6 +45,10 @@ struct gk104_fifo { 
};



struct gk104_fifo_func {

	struct {

		void (*fault)(struct nvkm_fifo *, int unit);

	} intr;



	const struct gk104_fifo_pbdma_func {

		int (*nr)(struct gk104_fifo *);

		void (*init)(struct gk104_fifo *);
@@ -110,12 +114,14 @@ void gk110_fifo_runlist_cgrp(struct nvkm_fifo_cgrp *, 
extern const struct gk104_fifo_pbdma_func gk208_fifo_pbdma;

void gk208_fifo_pbdma_init_timeout(struct gk104_fifo *);



void gm107_fifo_intr_fault(struct nvkm_fifo *, int);

extern const struct nvkm_enum gm107_fifo_fault_engine[];

extern const struct gk104_fifo_runlist_func gm107_fifo_runlist;



extern const struct gk104_fifo_pbdma_func gm200_fifo_pbdma;

int gm200_fifo_pbdma_nr(struct gk104_fifo *);



void gp100_fifo_intr_fault(struct nvkm_fifo *, int);

extern const struct nvkm_enum gp100_fifo_fault_engine[];



extern const struct nvkm_enum gv100_fifo_fault_access[];

drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk110.c

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ gk110_fifo_runlist = { 


static const struct gk104_fifo_func

gk110_fifo = {

	.intr.fault = gf100_fifo_intr_fault,

	.pbdma = &gk104_fifo_pbdma,

	.fault.access = gk104_fifo_fault_access,

	.fault.engine = gk104_fifo_fault_engine,

drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk208.c

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ gk208_fifo_pbdma = { 


static const struct gk104_fifo_func

gk208_fifo = {

	.intr.fault = gf100_fifo_intr_fault,

	.pbdma = &gk208_fifo_pbdma,

	.fault.access = gk104_fifo_fault_access,

	.fault.engine = gk104_fifo_fault_engine,

drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk20a.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


static const struct gk104_fifo_func

gk20a_fifo = {

	.intr.fault = gf100_fifo_intr_fault,

	.pbdma = &gk208_fifo_pbdma,

	.fault.access = gk104_fifo_fault_access,

	.fault.engine = gk104_fifo_fault_engine,