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

Commit 932f535d authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Paul Mackerras
Browse files

[POWERPC] spufs: Always map local store non-guarded 



When fixing spufs to map the 'mem' file backing store cacheable,
I incorrectly set the physical mapping to use both cache-inhibited
and guarded mapping, which resulted in a serious performance
degradation.

Debugged-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarArnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 5c3ecd65

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -105,11 +105,11 @@ spufs_mem_mmap_nopage(struct vm_area_struct *vma, 




	if (ctx->state == SPU_STATE_SAVED) {

	if (ctx->state == SPU_STATE_SAVED) {

		vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)

		vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)

					& ~(_PAGE_NO_CACHE | _PAGE_GUARDED));

							& ~_PAGE_NO_CACHE);

		page = vmalloc_to_page(ctx->csa.lscsa->ls + offset);

		page = vmalloc_to_page(ctx->csa.lscsa->ls + offset);

	} else {

	} else {

		vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)

		vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)

					| _PAGE_NO_CACHE | _PAGE_GUARDED);

							| _PAGE_NO_CACHE);

		page = pfn_to_page((ctx->spu->local_store_phys + offset)

		page = pfn_to_page((ctx->spu->local_store_phys + offset)

				   >> PAGE_SHIFT);

				   >> PAGE_SHIFT);

	}

	}