Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 453d9f72 authored Nov 20, 2006 by Arnd Bergmann Committed by Paul Mackerras Dec 04, 2006

[POWERPC] spufs: Return correct event for data storage interrupt



When we attempt an MFC DMA to an unmapped address, the event
returned from spu_run should be SPE_EVENT_SPE_DATA_STORAGE,
not SPE_EVENT_INVALID_DMA.

Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

parent 0021550c

arch/powerpc/platforms/cell/spu_base.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -507,7 +507,7 @@ int spu_irq_class_1_bottom(struct spu *spu)
	if (!error) {		if (!error) {
	spu_restart_dma(spu);		spu_restart_dma(spu);
	} else {		} else {
	__spu_trap_invalid_dma(spu);		spu->dma_callback(spu, SPE_EVENT_SPE_DATA_STORAGE);
	}		}
	return ret;		return ret;
	}		}

arch/powerpc/platforms/cell/spufs/run.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,6 +26,7 @@ void spufs_dma_callback(struct spu *spu, int type)
	} else {		} else {
	switch (type) {		switch (type) {
	case SPE_EVENT_DMA_ALIGNMENT:		case SPE_EVENT_DMA_ALIGNMENT:
			case SPE_EVENT_SPE_DATA_STORAGE:
	case SPE_EVENT_INVALID_DMA:		case SPE_EVENT_INVALID_DMA:
	force_sig(SIGBUS, /* info, */ current);		force_sig(SIGBUS, /* info, */ current);
	break;		break;